diff -ruN 4.5.4/CHANGELOG.php 4.6rc2/CHANGELOG.php
--- 4.5.4/CHANGELOG.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/CHANGELOG.php	2006-07-02 15:21:22.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: CHANGELOG.php,v 1.32 2005/11/27 07:06:46 cauld Exp $
-* @package Mambo_4.5
-* @copyright (C) 2000 - 2004 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -11,10 +13,10 @@
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 ?>
 
-1. Changelog
+Changelog:
 ------------
 This is a non-exhaustive (but still near complete) changelog for
-Mambo 4.5.x, including beta and release candidate versions.
+Mambo 4.6, including beta and release candidate versions.
 Our thanks to all those people who've contributed bug reports and
 code fixes.
 
@@ -24,752 +26,1399 @@
 + -> Addition
 ! -> Change
 - -> Removed
-! -> Note
--------------------- 4.5.4 --------------------------------------------------
+! -> Note
 
-23-March-2006 Chad Auld (cauld)
-! Found and updated help key reference for all toolbars to use new 454 help files
+-------------------- 4.6 Release ---------------------------------------
 
-22-March-2006 Chad Auld (cauld) *Checking in for Ninekrit*
-- Removed 453 help files
-+ Adding 454 help files
-! Updating help file URL to look locally
-
-19-March-2006 Chad Auld (cauld)
-! Updated TinyMCE from v2.0.2 to 2.0.6.1 (loads of fixes and enhancements)
-! Updated overLIB from 4.06 to 4.21
-! Updated "What's New in 4.5.4"
-
-16-May-2006 Akarawuth Tamrareang (NineKrit)
-# include 453h security patch1
-# Fixed com_trash   
-# Low risk RSS feed vulnerability special thank you IrishStevo 
-!  update admin_content.php line 201 , 312  for support mysql 5
-!  update sample_data.sql
-!  Minor bug in Mambo Installation install1.php  
-+ add file \installatin\sql\migrate_Joomla108_to_Mambo453.sql
+-------------------- 4.6 (RC2) Release ---------------------------------
 
-14-March-2006 Chad Auld (cauld)
-+ Back porting Mambo 4.6 end user survey functionality for PC World CD release
-
--------------------- 4.5.3 (Holiday Patch) Release --------------------------
-
-31-Dec-2005 Chad Auld (cauld)
-# Fixing PHP 5 related issues with admin.content.php
-! Updating credits file
-! Adjusting static content editor so it doesn't shift during editing with TinyMCE 2.0.1
-
-31-Dec-2005 Carlos Souza (csouza)
-# Replaced inconsistent short open tags that caused parse errors in some php versions
-
-31-Dec-2005 Martin Brampton (counterpoint)
-! Modified one line in pathway that was using globals no longer set - changed to super globals
-
-29-Dec-2005 Chanh Ong (cong)
-# Fix Parse error: parse error, unexpected '}' in php 5.1
-
-26-Dec-2005 Chad Auld (cauld)
-! Making some changes for the TinyMCE 2.0.1 update to handle the default to simple template change
-! Updating version.php for release
-# Fixing trash so that it is empty after a fresh install with sample data
-
-23-Dec-2005 Chad Auld (cauld)
-! Removing experimental Safari warning in TinyMCE
-! Updating version.php for holiday patch
-
-22-Dec-2005 Martin Brampton (counterpoint)
-# Altered incorrect method for error message on row in admin.section.php
-# Added default of null string to params field in mos_section.
-
-21-Dec-2005 Chad Auld (cauld)
-! Updating default templates with some minor fixes 
-# Fixing some formatting errors on the sample data
-
-21-Dec-2005 Carlos Souza (csouza)
-# added session_start() calls to index.php and index2.php
-
-21-Dec-2005 Chanh Ong (cong)
-- Revert the change below due to the fix csouza made in index2.php which is better and more secure
-
-20-Dec-2005 Chanh Ong (cong)
-# Fix problem where Email icon on content not working where session lost its previous value.
-
-20-Dec-2005 Chad Auld (cauld)
-+ Adding 453 to 453h sql patch for TinyMCE 2.0.1 upgrade
-
-19-Dec-2005 Chad Auld (cauld)
-# Fixing admin content preview & upload session issue
-
-18-Dec-2005 Chad Auld (cauld)
-! Updated the default TinyMCE editor from 1.45 to 2.0.1
-+ Added back in the old System Information administrator link
-
-19-Dec-2005 Carlos Souza (csouza)
-# Changed register globals emulation to default to 'On'
-
-18-Dec-2005 Martin Brampton(counterpoint)
-# Modified SQL statements having LEFT JOIN after list of joined tables
-# Modified contact searchbot to set Itemid
-# Modified content searchbot to avoid warnings on merge of nulls to arrays
-# Modified content component to avoid warnings on merge of nulls to arrays
-
-17-Dec-2005 Martin Brampton (counterpoint)
-# Modified index.php to avoid conflict with SMF over $_REQUEST['message']
-# Modified admin trash manager to fix failures and lack of page control
-
-16-Dec-2005 Chanh Ong (cong)
-# Fix bug that causes the "top" position always overlay other component
-
--------------------- 4.5.3 Release --------------------------
-
-26-Nov-2005 Chad Auld (cauld)
-! Fixed GPL text in install (made all 1 font, easier to read)
-- Removed old templates
-+ Added new Mambo default template
-! Changed more sample data 
-! Updated the default setup to fit new template
-! Adding setting to default register globals emulation to "On"
-
-24-Nov-2005 Chad Auld (cauld)
-! Changed the default on the new admin simple/advanced interface to advanced
-
-23-Nov-2005 Chad Auld (cauld)
-! Changed header logos.  Removed references to 4.5.2.
-! Updated most of the sample install data
-! Update some of the default installation settings
-! Changed out the included sample banners, install header banner, and admin header banners
-- Removed old sample images no longer in use
-
-23-Nov-2005 Carlos Souza (csouza)
- !  Replaced globals.php and sef.php to address the globals emulation overwrite vulnerability
- +  Added option in com_config to toggle register_globals emulation
-
-16-Nov-2005 Carlos Souza (csouza)
-+  Added fix in index*.php to address the Globals overwrite problem in versions < 4.4.1
-
-14-Nov-2005 Ilias Antonopoulos (eliasan)
-# Added Vcard option on Contact Items Parameters
-  /administrator/components/com_contact/contact_items.xml
-# Fixed. Link type, menu items don't show up on Pages/Items List.
-  /includes/mambo.php
-# Fixed. Empty Categories don't show up, although 'Show Empty Categories' is selected on a Table-Content Section menu Item
-  /components/com_content/content.php
-! 'List - Content Section' corrected to 'Table - Content Section'
-  /administrator/components/com_menus/content_section/content_section.menu.html.php
-
-13-Nov-2005 Chad Auld (cauld)
-! Updated install screens to display 453 and release dates.  
-! Changed the newsflash articles included with the sample data.
-# [#8199] Database queries in gacl_api.class
-# [#7713] mosMail fix bcc bug + add missing ReplyTo fields
-
-12-Nov-2005 Giorgio Nordo (gin)
- # [#7590] fixed the bug of the related items module (the module showed also expired content items)
-
-11-Nov-2005 Chad Auld (cauld)
- + [#8364] OSI Certification: Added README file.  Added OSI logo to install screens.
-
-08-Nov-2005 Ilias Antonopoulos (eliasan)
- # [#8338] Help Mechanishm Unreliable: Changed all key references. Added new. Modified the code to display the right help screens. Expanded code to display the right help screen when adding a new menu item.
-    For testing, set your help server to point at: http://www.mambobook.gr/draftdoc
-    New Help screen will be uploaded to http://help.mamboserver.com
-
-27-Oct-2005 Shaoying Sun (lang3)
- # [#7447] Image path input from backend results in broken links on frontend
-
-26-Oct-2005 Carlos Souza (csouza)
- !  Hardened 'Email To Friend' form in com_content
-
-22-Oct-2005 Shaoying Sun (lang3)
- !  Changed date format "Y-m-d h:i:s" to "Y-m-d H:i:s" in content, frontpage, typedcontent show in backend
- !  Changed date format "Y-m-d h:i:s" to "Y-m-d H:i:s" in message send in frontend
-
-20-Oct-2005 Chad Auld (cauld)
- !  Fixed SQL injection hole in content submission 
-
-20-Oct-2005 Cameron Fraser
-+ Added Simple / Advanced functionality to Add / Edit (Content/Section/Category) pages
-	admin.admin.html.php
-	admin.content.html.php
-	admin.sections.html.php
-	admin.categories.html.php
-	admin.typedcontent.html.php
-	index2.php
-		 
-19-Oct-2005 Chad Auld (cauld)
- # [#8260] Search highlighting fails when a "?" is entered
-
-16-Oct-2005 Chad Auld (cauld)
- # [#7601] MySQL password textbox is shown as a plain text box
- # [#7410] Mambo gzip fails when gzip compression is already enabled in php.ini
- # [#7746] Missing space in mosimage IMG tags
- # [#8157] Use of $mosConfig_abolute_path instead of $mosConfig_absolute_path
- # [#7714] User Registration allows dots and other chars besides A-Z 0-9
-
-08-Aug-2005 Andrew Eddie
- ^ Encased text files in PHP wrapper to help obsfucate version info
- # Changed admin session name to hash of live_site to allow you to log into more than one mambo on the same host
- # Fixed hardcoded (c) character in web installer files
- # Fixed slow query in admin User Manager list screen
- # Fixed bug in poll stats calculation
- # Fixed SQL injection bugs in user activation (thanks Enno Klasing)
- # Updated bug fixes in phpMailer class
- # Fixed login bug for nested Mambo sites on the same domain
-
-02-Aug-2005 Alex Kempkens
- # [#6775] Display of static content without Itemid
- # [#6330] Corrected default value of field
-
--------------------- 4.5.2.3 Patch Released ----------------------
-
-15-Jun-2005 Andrew Eddie
- # Fixed sql injection vulnerability in voting form
- # Fixed over-sensitive filtering of content intro and full text fields
- ^ Updates database::setQuery code to more efficient version
-
--------------------- 4.5.2.2 Patch Released ----------------------
-
-04-May-2005 Andrew Eddie
- # Fixed vulnerability with bind method in mosDBTable class
- # Fixed session id spoofing via administrator/index3.php
- # Fixed bug in mosAbstractTasker redirect method
- # Prevented attacks via injection of POST variables through GET
- # Fix injection bugs in various class 'check' methods
- + Added input filter class (replacement for built-in strip tags)
- - Removed vulnerable file in DOMIT library
-
-4-Mar-2005 Rey Gigataras
- # Fixed [#4642] Can't login to ADMINISTATION
- # Fixed [#4768] emailCloaking() doesn't completely combine parts of mail address
- # Fixed [#4972] Truncated email address in Contacts
- # Fixed [#4607] admin.typedcontent.php missing $lists['_caption_align'] initialisation code
- # Fixed [#4610] MOSimage doesn't work in static content manager
- # Fixed [#4586] `List Length` is ignored
-
--------------------- 4.5.2.1 Patch Released ----------------------
-19-Feb-2005 Andrew Eddie
- # Fixed security vulnerability in Tar.php
-
-18-Feb-2005 Andy Miller
- # Fixed com_content to use <div> for componentheading
- ! Changed implementation of new -3 module style for more robust solution
-
--------------------- 4.5.2 Stable Released ----------------------
-
-16-Feb-2005 Emir Sakic
- # Fixed JS Bug with save order button not refreshing the page in IE
- + Added support for language variable in content URL
-
-16-Feb-2005 Andy Miller
- + Added css elements for image/caption in sf2
- ! Removed hardcoded default padding/margin in mosimage mambot
-
-16-Feb-2005 Alex Kempkens
- # Fixed handling of header and search phrases in search component
-
-16-Feb-2005 Rey Gigataras
- ! `Cancel` button replaced with `Close` button when editing existing items
- ! Moved `Mass Mail` to `Component` Sub-menu
- # Fixed [#4517]  Menu order incorrect
- # Fixed [#4466] Administrator may delete other administrator
- # Fixed [#4468] Administrator may change the level they belong to
- # Fixed [#4536] Logout Link wrong in User Menu
- # Fixed [#4467] Back-end Group may create 'Public Front-end' or 'Public Back-end' user
- # Fixed 'Other Categories' param problem in 'Newsfeeds` and `Contacts` components
- # Fixed [#4482] Error in WebLink Parameters
- # Fixed [#4532] Display problem in Table - Content Category
- # Fixed [#4533] Display problem in Table - Content Section
- # Fixed missing published button in `Newsfeed` Component edit page
- # Fixed [#4500] No Caption in Static Content
-
-16-Feb-2005 Peter Koch
- # Fixed [#4090] navigation between archived articles is not possible
- # Fixed error in 'make unwriteable' when editing language and template files
- # Fixed category redirection error after calling from content item manager
- ! Updated cpanel icons and modules for hiding mainmenu when calling edit pages
- ! Updated typed/static content for hiding mainmenu when calling edit pages
- ! Spread menubar icons for improved usability
- ! Updated installation step 1 hints and warnings
-
-16-Feb-2005 Andrew Eddie
- + Added new site module stype to allow for rounded corner styling techniques
- # Fixed bug in database error reporting when in debug mode
- # Fixed bug showing Not Auth message when linking via Key reference
- # Fixed help links to support and removed useless index link
- # Fixed [#4483] 4.5.2 Pre1: Powerd by Logo still shows 4.5.1
- # Fixed [#4496] Pre-1 Section Creation: No menu link creation possible
- + Added [#4502] Pre-1: User "Select Log Status" lacks "logged out" option
- # Fixed [#4480] 4.5.2 CVS missing language string in contacts (Download as Vcard)
-
-15-Feb-2005 Rey Gigataras
- # Fixed bug `Search Category` mambot
-
-15-Feb-2005 Peter Koch
- # Fixed creation of menuitems for weblink, newsfeed and contact categories
- # Fixed content menu should recognize empty sections and categories
- ! Hide main menu whenever an item is edited to reduce risk of lost checkouts.
- ! Improved backend messaging
-
-15-Feb-2005 Andrew Eddie
- # Fixed spurious installer error msg when xml file is included in package file list
- + Added experimental task routing class
- + Added mainframe function to add custom html to the head tag of a template
-
-14-Feb-2005 Emir Sakic
- # Fixed [#4207] Bug in Blog-Content Category Archives
-
-14-Feb-2005 Peter Koch
- # Fixed [#4472] 4.5.2 CVS Menu Manager [menu] Overlib oddities
- # Fixed sample installation inconsistents
- # Fixed phrasing for all menuitem names
- # Fixed wrong category mgr if no weblink or newsfeed cat. exists
-
-14-Feb-2005 Alex Kempkins
- # Fixed problem with RSS feeds & live feed
- # Removed config_ml_support from configuration dialogs
-
-14-Feb-2005 Andrew Eddie
- # Fixed [#4305,3971] User with Manager or Administrator Access pb
- ! Converted help files to html, help index can point to help site
-
-13-Feb-2005 Rey Gigataras
- # Fixed [#3840] Some curious things in the Groupmanagement
- # Fixed [#4272] Configuration: no 'back'; link to control panel
- ! Added logged filter to `User Manager`
- + mod_logged Admin module
-
-12-Feb-2005 Rey Gigataras
- # Fixed [#4319] 4.5.2 CVS mod_rssfeed malfunction
-
-12-Feb-2005 Peter Koch
- # Fixed [#4345] stripslashes on array in includes/mambo.php:mosBindArrayToObject()
- + Added optional parameters for $cc, $bcc, $attachment to mosMail()
- + Made path to sendmail configurable ($mosConfig_sendmail)
-
-11-Feb-2005 Andy Miller
- # Fixed Long SEF URLs showing up in search results
- + Added a function to show area of text in search results based on keyword
- # Fixed rotate image module to include trailing <br /> for IE compatibility
- # Fixed search highlighting to display properly
-
-11-Feb-2005 Peter Koch
- # Fixed [#4321] 4.5.2 CVS mod_sections module displays empty sections
- # Fixed [#3072] Update DB from 4.5.0 to 4.5.1
-
-11-Feb-2005 Rey Gigataras
- # Fixed Live Bookmarks handling
- + Additional parameters for TinyMCE
- ! Added group filtering for User Manager
- ! Added `User Manager` & `Media Manager` to Admin Panel Quickicons
- ! Restrutured Admin `Content` Sub-Menu
-
-10-Feb-2005 Peter Koch
- # Fixed [#4251] (Again) Issues with other categories display
- # Fixed [#4361] script tag in submit news bloqs admin backend
-
-10-Feb-2005 Alex Kempkens
- ! Removed multi lingual calls from index and searchbot scripts
-
-10-Feb-2005 Andrew Eddie
- # Fixed bug in module display for free text and style=-1
- # fixed bug in mambot uninstaller
-
-09-Feb-2005 Peter Koch
- # Fixed [#4396] 4.5.2 CVS Order column in lists? Editing can't be saved.
- # Fixed [#4251] 4.5.2 CVS Menu Manager/Menu Items Editing window typos and bugs
-
-08-Feb-2005 Peter Koch
- # Fixed [#4404] 4.5.2 CVS mod_templatechooser Typo
- # Fixed [#4405] 4.5.2 CVS mod_whosonline oddity
- # Fixed [#4400] problem with copying menu in admin panel
-
-07-Feb-2005 Peter Koch
- # Fixed [#4105] Fixes to new item counters, category display, etc.
- # Fixed [#4359] 4.5.2 CVS new Menu Manager display bug after 05/02/cvs update
-
-07-Feb-2005 Alex Kempkens
- # Fixed small variable notices
- ! Added configuration value for ml support
- # Fixed small issues about content categories & notice warnings for news-flash module
-
-06-Feb-2005
- # Fixed bug that in usermenu logout link that prevents access to com_login
-
-05-Feb-2005 Alex Kempkens
- + Added small corrections in the select handling for multi lingual contents
- + Integrated basic check for multi lingual component, same technique like
-   SEF
- ! Added the use of css 'sectiontableentry1/2' in the content item table of
-   the category list
-
-05-Feb-2005 Emir Sakic
- # Fixed JS error in TinyMCE advanced editor
- # Fixed SEF bug
- # Fixed TOC SEF bug
- # Fixed cosmetic admin menu bug
- ! Removed IFRAME borders on admin help page
- # Fixed [#4267] Module Manager list default bug
- ! Added icon for save order admin listing
-
-05-Feb-2005 Andrew Eddie
- + Added Quote method to database class
- + Added php 4.1.2 compat functions
-
-03-Feb-2005 Andrew Eddie
- + Add Walter Zorn tooltip library
-
-02-Feb-2005 Andrew Eddie
- ! Fixed x-site injection vulnerability related to PHP bug
-
-30-Jan-2005 Andy Stewart
- # Fixed [#4520] Changed singular "Module" into plural "Module(s)" when deleting a menu.
- # Fixed [#4220] Static content linking to content item in menu manager.
-
-29-Jan-2005 Alex Kempkens
- # Fixed live feed handling of RRS and integrated possibility to name
-   the feed file
-
-27-Jan-2005 Andy Stewart
- # Fixed [#2938] Added strtolower to filename when chmod after upload
-
-27-Jan-2005 Andrew Eddie
- + Added folder offset to <files> tag in installer
-
-26-Jan-2005 Peter Koch
- ! Change content editors width to 100%
-
-25-Jan-2005 Peter Koch
- # Fixed weblinks not working with SEF enabled
- # Fixed [#3851] Alternative gzip page compression doesn't work (for example in Opera)
- # Fixed non-standard HTML in user manager
-
-24-Jan-2005 Andy Stewart
- # Fixed [3565] updated publish_array to point to correct key
- # Fixed [3824] Closed, resolved by [3289] fix
- # Fixed [3473] Closed, resolved by [3289] fix
- # Fixed [3752] Not a bug, user not understood ini_get function
-
-24-Jan-2005 Peter Koch
- # Fixed misspelling cateogry/category in english.php
- # Fixed non-standard HTML in admin control panel
-
-23-Jan-2005 Levis Bisson
- + Added the global configuration -> Show UnAuthorized Links condition
-   to the mod_latestnews.php, mod_mostread.php and mod_newsflash.php
-
-23-Jan-2005 Peter Koch
- + Added write protection handling to template html and css editors.
- + Added write protection handling to language file editor.
- # Fixed [#3289] Media Manager not working with globals off
- # Fixed [#3352] Global configuration and Logout Fail
-
-22-Jan-2005 Rey Gigataras
- # Fixed missing Back Button option for Search component page
- # Fixed 'no results' found when first entering Search component - without engaging a search
- # Fixed pathway html entity problem
-
-21-Jan-2005 Peter Koch
- + Added checkboxes in site global configuration to make configuration.php
-   unwritable after saving, or to override write protection while saving
-   respectively.
- + Added function mosIsChmodable($file) to administrator/includes/admin.php.
-   Returns TRUE if mambo can chmod the file. Used for overwrite/add write
-   protection functions in administration editors.
-
-19-Jan-2005 Rey Gigataras
- + Added Vcard capability to Contact Component
-
-18-Jan-2005 Peter Koch
- # General fix for chmod issues [#3842] [#3727] [#3275]:
- + Added configurable file and directory permissions (chmod) to installation steps.
- + Added configurable file & directory permissions (chmod) to global configuration
- + Added function mosChmodRecursive($path, $filemode=NULL, $dirmode=NULL) to mambo.php.
- + Added function mosChmod($path) to mambo.php.
- ! 3rd party addons may adopt the permission flags while still keeping backward compatibility.
- ! Updated com_installer to use the new chmod options above
- ! Updated com_media to use the new chmod options above
- # Fixed $mosConfig_absolute_path having double slashes after installing on windows
- # Fixed several minor html errors in installer and com_config
-
-18-Jan-2005 Rey Gigataras
- ! Added Date column to Content Managers
-
-17-Jan-2005 Rey Gigataras
- + Added Caption support to {mosimage}
- # Fixed Category param in Blog Category
- # Fixed inability to hide Categories in Category view of 'List - Content Section'
-
-16-Jan-2005 Rey Gigataras
- ! Separated Menu Item Types into groups
-
-15-Jan-2005 Rey Gigataras
- ! Added param for `title` & `heading` attribs of 'mospagebreak' to be added to <site> tag
- ! Added `heading` attribute to 'mospagebreak' to control title of first item in TOC
- ! Add Search button params for `Search Module`
- ! Add forget password and register new user for Login Component page
-
-14-Jan-2005 Rey Gigataras
- + Added new Ordering ability for Admin list/table views
- ! Template Manager preview template thumbnail, on by default
- ! Improved New Menu Item creation page - added tooltips from XML file
- ! Improved MOSTooltip function
-
-13-Jan-2005 Rey Gigataras
- + Added Reset Clicks button to Banner manager
- ! Added Author column and Author filter to Content Item and Static Content Manager
-
-12-Jan-2005 Rey Gigataras
- + Added `Load Module Position` mambot
-
-11-Jan-2005 Rey Gigataras
- + Added `Wrapper` module
- + Added option to send HTML emails in `Massmail` component
- # Fixed Wrapper Component XHTML validation issue
- # Fixed [#4051] Can search sections and categories even if they have not been published
-
-10-Jan-2005 Rey Gigataras
- ! 'Latest News' module can now show Static Content - configurable via new `Module Mode` param
- ! 'Most Read' module can now show Static Content - configurable via new `Module Mode` param
-
-09-Jan-2005 Rey Gigataras
- + Site `Favourite Icon` now configurable via Global Configuration
- + Added Syndication support for Firefox `Live Bookmarks`
- + Added 'Apply' action to Menu Items
- + Added 'Apply' action to Content Item, Static Content, Section, Category & Global Config
- + Added 'Apply' button ( saves item but does not exit `edit` mode )
- ! Reordered `Page Title` to have sitename appear before page name
- # Fixed unnecessary extra commas in Meta Tags
-
-07-Jan-2005 Rey Gigataras
- ! Added action message to 'Copy' module function
- ! Replace `split` funtion with faster `explode` function to determine ISO encoding
- # Fixed Error messages in 'Copy' Menu Item confirmation page
-
-05-Jan-2005 Rey Gigataras
- # Fixed [#3990] Saving or editing existing categories gives errors
-
-04-Jan-2005 Andy Stewart
- # Fixed [#3473] Added code to auto delete index.html from empty media manager folder
- ! Added code to media manager function create_folder to create index.html
-
-04-Jan-2005 Rey Gigataras
- # Fixed handling of menus when more than one module assigned to display a particular menutype
- # Fixed Search Contacts mambot sql error
-
-04-Jan-2005 Andrew Eddie
- # Fixed hardcoded classname in mosParameters that prevents derived classes from working
- # Fixed wrongly named iscore property in mosComponents class
- ! Updated mosReadDirectory function to be able to recurse into sub-directories
-
-03-Jan-2005 Rey Gigataras
- # Fixed Admin Module 'Components' being visible for Managers
- # Fixed Admin Module 'Menu Stats' including Trashed menu items in count
-
-02-Jan-2005 Rey Gigataras
- + New 'Installer' sub-menu for Admin and Super Admin - amalgamates links for all installers
- ! Improvement to Category 'Link to Menu' handling
- ! Improvement to Section 'Link to Menu' handling
- # Fixed page title param for Contact Component menu items
-
-01-Jan-2005 Rey Gigataras
- ! Improvement to Static Content 'Link to Menu' handling
- ! Improvement to Content Item 'Link to Menu' handling
- ! Improvement to Menu Manager edit menu item linking
-
-31-Dec-2004 Rey Gigataras
- ! Improvement to Content Item 'Reset Hits' handling
- ! Improvement to Static Content 'Reset Hits' handling
- # Fixed RSS Syndication author validation error - removed author info
-
-31-Dec-2004 Andrew Eddie
- # Fixed stripping of backslashes when loading an object
- # Fixed error if xml didn't exist in Mambot and Module install screens
-
-30-Dec-2004 Rey Gigataras
- # Fixed [#2706] Bug(?) with 'time to publish' in relation to timezone (time offset)
- # Fixed [#3922] POLL: Page Title is missing (Parameters)
- # Fixed params for 'Component - Search' menu item
- # Fixed Poll dropdown select missing Itemid
-
-30-Dec-2004 Peter Koch
- # Fixed [#3610] Missing #__ in admin.content.php
- # Fixed [#3503] Missing quote in admin.media.html.php
- # Fixed [#3217] Typo in variable name, missing $ sign
-
-30-Dec-2004 Andrew Eddie
- ! Admin custom toolbar now displays only text if images not defined
-
-29-Dec-2004 Rey Gigataras
- + Search Newsfeeds mambot
- + Added Feed Image, Feed descrip, Item descrip & word count params to 'Link - Newsfeed'
- + Added Feed Image, Feed descrip, Item descrip & word count params to 'Component - Newsfeed'
- + Added Feed Image, Item description & word count params to RSS Feed module
- ! Modified Search Weblinks mambot
-
-27-Dec-2004 Rey Gigataras
- + Added hyperlink to Frontpage Manager list linking to Category Edit
- + Added hyperlink to Frontpage Manager list linking to Section Edit
- + Added hyperlink to Content Manager list linking to Category Edit
- + Added hyperlink to Content Manager list linking to Section Edit
- + Added hyperlink to Category Manager list linking to Section Edit
- ! Cosmetic change to Module Item layout - shifted from tab to column layout
- # Fixed mambot description in Edit Mambot page
-
-26-Dec-2004 Rey Gigataras
- + Added hyperlink to Menu Manager for Contact Item menu items directly to the item itself
- + Added hyperlink to Menu Manager for Newsfeed Item menu items directly to the item itself
- + Added hyperlink to Menu Manager for Content Item menu items directly to the item itself
- + Ability to link to Content Items from Edit Content Item menu page
- + Ability to link to Static Content from Edit Static Content Item menu page
- ! Cosmetic change to Menu Item layout - shifted from tab to column layout
- # Fixed [#3551] Failed during uninstallation of Admin's module
- # Fixed [#3056] No handling of illegal section names in Category Manager
- # Fixed [#3030] Query in archive modul don't work
- # Fixed [#2847] archive module not using SEO
-
-25-Dec-2004 Rey Gigataras
- ! Disabled edit icon appearing in newsflash module
- # Fixed [#3891] Checkout for Banner Clients don't work
- # Fixed [#2986] com_banner option listclients doesn't work in FireFox 1.0
- # Fixed [#3048] Problem with Frontend editing checked-out Content
-
-24-Dec-2004 Andrew Eddie
- ! Added PEAR Archive Tar library
-
-24-Dec-2004 Rey Gigataras
- # Fixed [#3287] Login fails if index.php is not the default for the domain
- # Fixed [#3669] str_replace( '&', '&amp;', $path ) may break unicode
- # Fixed [#2982] minor error in pathway.php
- # Fixed [#3290] Sort by button broken in 'Browser, OS, Domain Statistics' page
- # Fixed [#2984] Centering of text in install components
- # Fixed [#2791] Administrators can delete themselves
- # Fixed [#3058] Control Panel
- # Fixed [#3426] component com_contacts several issues
- # Fixed [#3375] Multiple contacts printing error
- # Fixed [#3482] Contacts Page Class Suffix and Page Title don`t work
-
-23-Dec-2004 Rey Gigataras
- # Fixed [#3895] 'Active' Column in Contact Categories list always zero
- # Fixed mambot xml group attribute
-
-22-Dec-2004 Andrew Eddie
- ! Replaced Incutio xmlrpc library with DOMIT xmlrpc library
-
-20-Dec-2004 Andrew Eddie
- # Removed display of href in returned search results (long urls corrupt display)
-
-19-Dec-2004 Rey Gigataras
- + Block renaming of menutype for 'mainmenu' menu
- + Block deletion of 'mainmenu' menu
- + Block deletion of 'mainmenu' module
- ! Hides email by default on Contacts component table view
- ! Cosmetic change to representation of Menu Tree
- ! Administrator Group now able to access Trash Manager
- # Fixed [#3127] typo in 'List - Content Section' menu item params: Filter Field
- # Fixed [#2693] Bug by install local 4.51a local WIN XP PRP XAMPP
- # Fixed [#2752] blogsection mode, shows IMG element wwhen no image is selected
- # Fixed [#2734] 'Register Globals' set to OFF, Bug with viewing page as PDF or to Print
- # Fixed [#2743] index2.php option-variable used before initialisation
- # Fixed [#2867] $author not visible in email for user submitted weblink
- # Fixed [#2917] Can't edit static content in backend via edit button
- # Fixed [#3152] menu class suffix parameter does not work for sublevels
- # Fixed [#3513] 'Do not use image' doesn't remove weblink icon
- # Fixed [#2862] menu copy doesn't copy sublevel items
- # Fixed [#3827] Trashed Content is displayed to those with frontend edit access
- # Fixed [#2689] Link to Menu, will not show empty menus in Menu Select list
- # Fixed [#3829] Access to Menu Manager not allowed for Administrators
- # Fixed [#3701] Changing menu module menu class suffix interferes with menu menutype
- # Fixed [#3128] Menu manager issues
- # Fixed [#3109] menutype shows a wrong value
- # Fixed [#2710] Problem with menu manager
- # Fixed renaming of Menu Type also renames type for menu items
-
-18-Dec-2004 Andy Stewart
- # Fixed [#3794] Replaced $mainframe->getCfg("mosConfig_dbprefix") with $mosConfig_dbprefix
-
-18-Dec-2004 Rey Gigataras
- # Fixed [#2992] Spelling error in Registration module
- # Fixed [#3725] Spelling Error in Global Config
- # Fixed [#2717] Missing parameters for 'Component - Search' menu item
- # Fixed [#2690] Newsfeed Component not outputing Feeds image
- # Fixed [#2825] Poll Lag is Broken
- # Fixed [#3748] Impossible to reply to mails from contact component
- # Fixed [#3802] Contact component js redirect fails on submit in Firefox
-
-17-Dec-2004 Rey Gigataras
- + Email Cloaking mambot
- + Search Content Sections mambot
- + Search Content Categories mambot
- ! Added css class distinction between next and previous item navigation buttons
- ! TinyMCE removed from uninstall list
- ! On clean install TinyMCE in 'Advanced' mode loaded as default editor
- ! Upgraded feedcreator to 1.72
- # Fixed [#2923] Pb when Using Textarea as module parameter
- # Fixed [#3770] RSS - not correctly validating
- # Fixed [#3771] RSS - encoding German Umlauts
- # Fixed [#3025] Bugs in encoding in rss feeds
- # Fixed [#3067] Content without a category is gone but still there
- # Fixed [#3321] Editing Administrator Module does not load corrent parameter from xml file
- # Fixed [#3122] "table - newsfeed category" have contact category's parameters
- # Fixed [#3123] typo on popup info help on login component menu item's parameters tab
- # Fixed [#3125] typo in "List - Content Section" parameters tab
- # Fixed [#3018] Menu Bug? or Style issues w/ Solarflare template
- # Fixed [#2701] Read more on all frontpage items
- # Fixed [#3071] missing <selected> tag in create user
- # Fixed [#2788] Submit News returns Not authorised for Author level
- # Fixed [#2930] Search Module (Search Box) - Display extra line below the input box
- # Fixed [#3050] Filter in com_contact is broken
- # Fixed [#3078] errors in mosmenubar
- # Fixed [#2874] css for news module
- # Fixed [#2896] Mod_mainmenu Spacer settings not functional
- # Fixed [#2899] Saving content - mosmessages missing Slashes
- # Fixed [#2871] no edit-icon if show_title set to off
- # Fixed [#2687] page class suffix for home (w3c xhtml)
- # Fixed [#2630] 4.5.1 and Static Contant Manager and Link to Menu
- # Fixed [#3057] Error with Help in Static Content Manager
- # Fixed RSS IE display error
- # Fixed RSS feed Itemid problem
- # Fixed Banner Client Manager Checked Out field not showing data
- # Fixed Contact Manager Checked Out field showing incorrect data
- # Fixed Contact Item Link not displaying correct info when editing menu item entry
- # Fixed 'Blog - Content Category' Param to show/hide Category description & image
- # Fixed 'Blog - Content Section' Param to show/hide Section description & image
-
-17-Dec-2004 Andrew Eddie
- # Fixed possible bug with PHP 4.3.10
- # Fixed colon in _NEW_USER_MESSAGE causing problems with some url's
- ! Upgraded TinyMCE to version 1.38
- # Fixed wrong field in weblinks search for newest/oldest/default
- ! Improvements to search engine to facilitate xml-rpc integration
- # Fixed [#2813] database query bug
- + Added improve code highlight bot based on GeSHi
-
-16-Dec-2004 Andrew Eddie
- # [#3225] Site Preview uses base URL not a call to index.php
-
-15-Dec-2004 Andrew Eddie
- ! Updated DOMIT version to 1.0 pre_g
- + Added desciption to Modules edit page
- + Added linkable title option to newsflash module
- # Fixed access parameter and select query
-
-13-Dec-2004 Andrew Eddie
- # Random Image: Corrected noted default image type, improved parameter help text
-
-10-Dec-2004 Andrew Eddie
- ! Updated screen help pages
- ! Moved system info, credits, license & support from menu to help page
-
-06-Dec-2004 Andrew Eddie
- + Added Id and Component Id column to menu item list
- + Added hyperlink to Menu Manager for Static Content menu items directly to the item itself
- + Parameter added to control how weblink opens
- ! New weblinks will assign category if selected in the links list
- ! Allow parameters handler to assign different control name
-
--------------------- 4.5.1a Stable Released ----------------------
-
-2. Copyright and disclaimer
----------------------------
-This application is opensource software released under the GPL.  Please
-see source code and the LICENSE file
+------------------------------------------------------------------------
+r584 | cauld | 2006-07-02 14:02:19 -0600 (Sun, 02 Jul 2006) | 1 line
+
+Fixing MySQL 5 params NOT NULL issue.  Allowing default to be NULL for 
+components, modules, and mambots.  A broader fix will happen with v5.
+------------------------------------------------------------------------
+r583 | cauld | 2006-07-02 11:05:31 -0600 (Sun, 02 Jul 2006) | 1 line
+
+Eliminating the use of realpath() to determine dynamic URLs.  This was 
+creating issues with some shared host plans.
+------------------------------------------------------------------------
+r582 | cauld | 2006-06-22 22:17:06 -0600 (Thu, 22 Jun 2006) | 1 line
+
+MOStlyCE config change to fix Javascript errors.  Now not loading several 
+external plugins (ex) htmltemplate, mambo, etc.  These were not written for 
+TinyMCE 2.x and therefore do not work.  Will have to revisit at a later time.
+------------------------------------------------------------------------
+r581 | cauld | 2006-06-22 21:32:32 -0600 (Thu, 22 Jun 2006) | 1 line
+
+MOStlyCE Admin change to remove onclick config section.
+------------------------------------------------------------------------
+r580 | cauld | 2006-06-20 11:43:43 -0600 (Tue, 20 Jun 2006) | 1 line
+
+turning off MOStlyCE compression by default until the compressor works in IE.
+------------------------------------------------------------------------
+r579 | csouza | 2006-06-20 05:54:04 -0600 (Tue, 20 Jun 2006) | 1 line
+
+removing charset conversion button from language form
+------------------------------------------------------------------------
+------------------------------------------------------------------------
+r577 | cauld | 2006-06-20 00:05:22 -0600 (Tue, 20 Jun 2006) | 1 line
+
+adding some missing / unversioned MOStlyCE files
+------------------------------------------------------------------------
+r576 | cauld | 2006-06-20 00:01:27 -0600 (Tue, 20 Jun 2006) | 1 line
+
+tweaking MOStlyCE based on the 4.5.4 MOStlyCE feedback in the forums
+------------------------------------------------------------------------
+r575 | cauld | 2006-06-19 23:17:39 -0600 (Mon, 19 Jun 2006) | 1 line
+
+committing weblinks SQL injection fix
+------------------------------------------------------------------------
+r572 | cauld | 2006-06-18 11:53:59 -0600 (Sun, 18 Jun 2006) | 1 line
+
+! changing mambo.sql to fix utf8 / mysql 5 issue with #__core_acl_aro.
+------------------------------------------------------------------------
+r571 | cauld | 2006-06-18 11:22:02 -0600 (Sun, 18 Jun 2006) | 1 line
+
+! Turning off MOStlyCE compression by default since it doesn't work in IE.  
+Adding warning to tip so users see why it is off.  OK and recommended for use with FF.
+------------------------------------------------------------------------
+r570 | neilt | 2006-06-18 04:04:34 -0600 (Sun, 18 Jun 2006) | 1 line
+
+commit test
+------------------------------------------------------------------------
+r569 | chanh | 2006-06-17 22:47:09 -0600 (Sat, 17 Jun 2006) | 1 line
+
+Make a comment commit on SG SVN to make sure the commit work
+------------------------------------------------------------------------
+r568 | cauld | 2006-06-17 19:13:30 -0600 (Sat, 17 Jun 2006) | 1 line
+
+!test commit against Mambo's new SVN repository
+------------------------------------------------------------------------
+r567 | chanh | 2006-06-16 13:03:24 -0600 (Fri, 16 Jun 2006) | 1 line
+
+Fix bug with STRICT_TRANS_TABLES cause installer to fail in mysql 5 when 
+install module and mambot
+------------------------------------------------------------------------
+r566 | csouza | 2006-06-14 06:50:53 -0600 (Wed, 14 Jun 2006) | 1 line
+
+updated brazilian portuguese glossary
+------------------------------------------------------------------------
+r565 | cauld | 2006-06-13 21:58:48 -0600 (Tue, 13 Jun 2006) | 1 line
+
+!Changing format of CHANGELOG to use the SVN log.  Easier to maintain.
+------------------------------------------------------------------------
+r564 | cauld | 2006-06-13 21:17:10 -0600 (Tue, 13 Jun 2006) | 2 lines
+
+!updating mostlyce.php and mostlyce.xml based on recent test for 454.  
+Fixing paste plugin issue.
+------------------------------------------------------------------------
+r563 | csouza | 2006-06-11 10:05:40 -0600 (Sun, 11 Jun 2006) | 1 line
+
+bug fix in language charset conversion
+------------------------------------------------------------------------
+r562 | csouza | 2006-06-10 11:37:53 -0600 (Sat, 10 Jun 2006) | 1 line
+
+updated .pot templates
+------------------------------------------------------------------------
+r560 | csouza | 2006-06-07 02:35:31 -0600 (Wed, 07 Jun 2006) | 1 line
+
+language - updated .pot templates
+------------------------------------------------------------------------
+r557 | csouza | 2006-06-07 02:21:25 -0600 (Wed, 07 Jun 2006) | 1 line
+
+including italian, thai and brazilian portuguese language files for the rc. These should be installable.
+------------------------------------------------------------------------
+r556 | csouza | 2006-06-07 02:15:51 -0600 (Wed, 07 Jun 2006) | 1 line
+
+internationalization modifications
+------------------------------------------------------------------------
+r555 | cauld | 2006-05-31 21:26:19 -0600 (Wed, 31 May 2006) | 4 lines
+
+! removing all mentions of mamboforge and replacing with mamboxchange or something else like The Source.
+! updating the support page to update links, add better wording, etc.
+! updating version.php for RC2
+------------------------------------------------------------------------
+r554 | csouza | 2006-05-31 10:52:24 -0600 (Wed, 31 May 2006) | 1 line
+
+minor tweaks to HTML_admin_misc::help() in admin.admin.html.php
+------------------------------------------------------------------------
+r553 | csouza | 2006-05-31 10:49:28 -0600 (Wed, 31 May 2006) | 1 line
+
+replaced help files with xhtml compliant ones with title tag needed for help index
+------------------------------------------------------------------------
+r552 | csouza | 2006-05-30 17:38:18 -0600 (Tue, 30 May 2006) | 1 line
+
+removed obsolete help screens
+------------------------------------------------------------------------
+r551 | csouza | 2006-05-30 17:35:27 -0600 (Tue, 30 May 2006) | 1 line
+
+final installment of new and renamed help screens and component toolbars changed to reflect new naming.
+------------------------------------------------------------------------
+r550 | csouza | 2006-05-29 11:21:00 -0600 (Mon, 29 May 2006) | 1 line
+
+first installment of new and renamed help screens and component toolbars changed to reflect new naming
+------------------------------------------------------------------------
+r549 | cauld | 2006-05-26 21:42:35 -0600 (Fri, 26 May 2006) | 2 lines
+
+! Updated "What's new" & "Credits"
+------------------------------------------------------------------------
+r548 | cauld | 2006-05-26 20:05:58 -0600 (Fri, 26 May 2006) | 2 lines
+
++ Adding new site templates (Donated by Water&Stone, coded by Nalisa)
+------------------------------------------------------------------------
+r533 | csouza | 2006-05-22 08:32:01 -0600 (Mon, 22 May 2006) | 1 line
+
+fixed some bugs caused by index.php cleanup
+------------------------------------------------------------------------
+r532 | csouza | 2006-05-21 03:41:05 -0600 (Sun, 21 May 2006) | 1 line
+
+moved commented 'ErrorHandler' class in index.php to includes/core.classes.php
+------------------------------------------------------------------------
+r531 | cauld | 2006-05-20 18:54:45 -0600 (Sat, 20 May 2006) | 1 line
+
+cauld:  (trivial) correcting a few spelling errors
+------------------------------------------------------------------------
+r530 | csouza | 2006-05-20 17:17:51 -0600 (Sat, 20 May 2006) | 1 line
+
+corrected mambocore->rootpath in includes/core.classes.php and added phpdoc templates to undocumented classes
+------------------------------------------------------------------------
+r529 | csouza | 2006-05-20 15:01:36 -0600 (Sat, 20 May 2006) | 1 line
+
+moved classes in index.php to includes/core.classes.php
+------------------------------------------------------------------------
+r528 | cauld | 2006-05-20 14:57:10 -0600 (Sat, 20 May 2006) | 1 line
+
+cauld:  # Fixing a Offline bug which caused an error rather than the offline message when MySQL was down
+------------------------------------------------------------------------
+r524 | neilt | 2006-05-19 06:18:36 -0600 (Fri, 19 May 2006) | 1 line
+
+general javascript and formatting bug fixes
+------------------------------------------------------------------------
+r523 | neilt | 2006-05-19 00:20:15 -0600 (Fri, 19 May 2006) | 1 line
+
+Fixed Trac Ticket #86
+------------------------------------------------------------------------
+r521 | cauld | 2006-05-16 22:54:20 -0600 (Tue, 16 May 2006) | 1 line
+
+cauld - # Rewrote uninstall_template() to fix bug where the wrong template dir was removed
+------------------------------------------------------------------------
+r520 | neilt | 2006-05-16 07:13:53 -0600 (Tue, 16 May 2006) | 1 line
+
+Modification to center menubar labels
+------------------------------------------------------------------------
+r517 | neilt | 2006-05-16 06:05:37 -0600 (Tue, 16 May 2006) | 1 line
+
+bug fix
+------------------------------------------------------------------------
+r516 | neilt | 2006-05-16 03:44:41 -0600 (Tue, 16 May 2006) | 1 line
+
+minor bug fixes
+------------------------------------------------------------------------
+r515 | cauld | 2006-05-15 22:20:58 -0600 (Mon, 15 May 2006) | 1 line
+
+cauld - fixing minor mis-spelling
+------------------------------------------------------------------------
+r514 | neilt | 2006-05-15 06:52:09 -0600 (Mon, 15 May 2006) | 1 line
+
+inclusion of .message class in front end css
+------------------------------------------------------------------------
+r512 | cauld | 2006-05-14 17:16:29 -0600 (Sun, 14 May 2006) | 2 lines
+
+cauld - Added the uploadfiles dir to the installation write permission check
+
+------------------------------------------------------------------------
+r511 | cauld | 2006-05-14 16:22:54 -0600 (Sun, 14 May 2006) | 1 line
+
+cauld - missed a few weblink name changes.
+------------------------------------------------------------------------
+r510 | cauld | 2006-05-14 15:46:22 -0600 (Sun, 14 May 2006) | 1 line
+
+cauld:  Standardized / Updated the label for New Feeds for the whole app (aka: Newsfeeds)
+------------------------------------------------------------------------
+r509 | cauld | 2006-05-14 15:14:22 -0600 (Sun, 14 May 2006) | 1 line
+
+cauld:  Updated MOStlyCE spellchecker plugin tip
+------------------------------------------------------------------------
+r508 | cauld | 2006-05-14 14:48:05 -0600 (Sun, 14 May 2006) | 3 lines
+
+! Updated the "What's New" help doc
+! Standardized / Updated the label for Web Links for the whole app (aka: Weblinks)
+------------------------------------------------------------------------
+r507 | cauld | 2006-05-13 19:23:34 -0600 (Sat, 13 May 2006) | 7 lines
+
+! Upgraded MOStlyCE's guts to TinyMCE 2.0.6.1 (bugs fixes, enhancements, etc)
++ Added a layers plugin to MOStlyCE and an experimental spellchecker plugin (works well in IE)
++ Added options in MOStlyCE Admin to control layer & spellchecker plugins
+! Various other minor MOStlyCE tweaks and enhancements
+------------------------------------------------------------------------
+r506 | adi | 2006-05-13 00:03:27 -0600 (Sat, 13 May 2006) | 1 line
+
+fix trac #85
+------------------------------------------------------------------------
+r505 | cauld | 2006-05-11 06:54:09 -0600 (Thu, 11 May 2006) | 1 line
+
+cauld - fixing mambo.sql table prefix bug
+------------------------------------------------------------------------
+r504 | neilt | 2006-05-01 11:55:35 -0600 (Mon, 01 May 2006) | 1 line
+
+Fixed errors occuring whilst copying empty sections - Trac #83
+------------------------------------------------------------------------
+r502 | cauld | 2006-04-30 14:57:33 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - Updating MOStlyCE Admin to handle the language file structure change.
+------------------------------------------------------------------------
+r500 | cauld | 2006-04-30 14:27:06 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - checking in tinymce 2.0.5.1
+------------------------------------------------------------------------
+r499 | cauld | 2006-04-30 13:02:06 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - For whatever reason the last time I tried to commit the new version of
+the MOStlyCE mambot it disappeared.  Trying again.
+------------------------------------------------------------------------
+r497 | cauld | 2006-04-30 12:23:50 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - Removing old basic TinyMCE 2.0.1, will replace with TinyMCE 2.0.5.1.
+Tons of enhancements and bug fixes.
+------------------------------------------------------------------------
+r496 | cauld | 2006-04-30 12:18:38 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - Rolling MOStlyCE Admin back to v1.5 since the Img & File mgr plugins have been pulled.
+------------------------------------------------------------------------
+r495 | cauld | 2006-04-30 12:10:47 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - Checking in MOStlyCE 1.7 mambot.  Now using TinyMCE 2.0.5.1.
+The image mgr and file mgr plugins have been pulled for compatibility reasons.
+------------------------------------------------------------------------
+r494 | cauld | 2006-04-30 12:05:15 -0600 (Sun, 30 Apr 2006) | 1 line
+
+cauld - Removing the old mostlyce install.  I will be bringing in a fresh
+version with the most recent TinyMCE 2.0.5.1 guts.  I didn't want to deal with
+new files vs deleted files, etc.  Just easier to replace the whole darn thing :)
+------------------------------------------------------------------------
+r493 | neilt | 2006-04-27 11:43:45 -0600 (Thu, 27 Apr 2006) | 1 line
+
+Missing argument 6 for moscomponentusermanager() - Trac #81
+------------------------------------------------------------------------
+r492 | neilt | 2006-04-26 15:31:58 -0600 (Wed, 26 Apr 2006) | 2 lines
+
+Fixed empty admin module bugs
+Fixed bugs adding new content with no section / categories
+
+-------------------- 4.6 (RC1) Release ---------------------------------
+
+------------------------------------------------------------------------
+r491 | csouza | 2006-04-23 16:43:10 -0600 (Sun, 23 Apr 2006) | 1 line
+
+fix javascript language bugs and mosmenubar::help()
+------------------------------------------------------------------------
+r490 | cauld | 2006-04-23 10:39:53 -0600 (Sun, 23 Apr 2006) | 1 line
+
+cauld - fixing Image Manager plugin image list bug.
+------------------------------------------------------------------------
+r489 | cauld | 2006-04-23 01:35:31 -0600 (Sun, 23 Apr 2006) | 1 line
+
+cauld - Big commit here for the newly configured MOStlyCE Image & File Manager plugins.  Also contains the new MOStlyCE Admin tabs that go along with these.
+------------------------------------------------------------------------
+r488 | neilt | 2006-04-22 14:46:52 -0600 (Sat, 22 Apr 2006) | 1 line
+
+non purged multiple session problems fixed. Trac #79
+------------------------------------------------------------------------
+r487 | counterpoint | 2006-04-22 02:49:01 -0600 (Sat, 22 Apr 2006) | 1 line
+
+Further relaxation of Itemid check to avoid "not authorized" errors
+------------------------------------------------------------------------
+r486 | counterpoint | 2006-04-21 11:08:02 -0600 (Fri, 21 Apr 2006) | 1 line
+
+Fix bug in showing "shortcut" icon
+------------------------------------------------------------------------
+r485 | counterpoint | 2006-04-21 07:10:48 -0600 (Fri, 21 Apr 2006) | 1 line
+
+Modified search mambots to include correct Itemid and prevent search results from being blocked by "unauthorized access"
+------------------------------------------------------------------------
+r484 | cauld | 2006-04-20 12:37:58 -0600 (Thu, 20 Apr 2006) | 1 line
+
+cauld - updating version.php for Monday's RC1 release.
+------------------------------------------------------------------------
+r483 | csouza | 2006-04-19 07:17:58 -0600 (Wed, 19 Apr 2006) | 1 line
+
+Language Manager Javascript and bug fixes
+------------------------------------------------------------------------
+r482 | neilt | 2006-04-19 02:17:21 -0600 (Wed, 19 Apr 2006) | 1 line
+
+addition of missing index.html files to numerous folders
+------------------------------------------------------------------------
+r481 | counterpoint | 2006-04-18 10:54:46 -0600 (Tue, 18 Apr 2006) | 1 line
+
+Small bug fixes to text items
+------------------------------------------------------------------------
+r479 | counterpoint | 2006-04-16 09:27:34 -0600 (Sun, 16 Apr 2006) | 1 line
+
+Patch installer and file permission bug fixes note.
+------------------------------------------------------------------------
+r478 | counterpoint | 2006-04-16 09:25:59 -0600 (Sun, 16 Apr 2006) | 2 lines
+
+Patch installer and file handling bug fixes
+------------------------------------------------------------------------
+r477 | counterpoint | 2006-04-16 09:25:27 -0600 (Sun, 16 Apr 2006) | 1 line
+
+Patch installer
+------------------------------------------------------------------------
+r475 | counterpoint | 2006-04-15 02:28:04 -0600 (Sat, 15 Apr 2006) | 1 line
+
+Added code to put admin side custom modules into effect, not including RSS feeds.
+------------------------------------------------------------------------
+r474 | neilt | 2006-04-13 10:21:17 -0600 (Thu, 13 Apr 2006) | 1 line
+
+Atom 1.0 changes
+------------------------------------------------------------------------
+r473 | counterpoint | 2006-04-13 10:18:01 -0600 (Thu, 13 Apr 2006) | 1 line
+
+Modified to process the XML for language package installation.
+------------------------------------------------------------------------
+r472 | counterpoint | 2006-04-13 09:38:43 -0600 (Thu, 13 Apr 2006) | 1 line
+
+Extended XML tags for installing language packages.
+------------------------------------------------------------------------
+r471 | neilt | 2006-04-13 07:29:26 -0600 (Thu, 13 Apr 2006) | 1 line
+
+minor changes to dates and path
+------------------------------------------------------------------------
+r470 | neilt | 2006-04-13 04:02:43 -0600 (Thu, 13 Apr 2006) | 2 lines
+
+Corrected declaration and assigning of 3 new field values
+$item_created, $item_modified and $item_author
+------------------------------------------------------------------------
+r469 | neilt | 2006-04-13 03:52:39 -0600 (Thu, 13 Apr 2006) | 4 lines
+
+Removal of depricated Atom0.3 syndication
+Addition of Atom1.0 standards and RSS feed image
+Modifications to language files
+Trac #72
+------------------------------------------------------------------------
+r468 | cauld | 2006-04-12 23:11:44 -0600 (Wed, 12 Apr 2006) | 1 line
+
+cauld - fixing mospagebreak to work with php 4 & 5
+------------------------------------------------------------------------
+r467 | csouza | 2006-04-12 21:55:19 -0600 (Wed, 12 Apr 2006) | 3 lines
+
+Language fixes
+export language functionality
+italian language translations
+------------------------------------------------------------------------
+r464 | chanh | 2006-04-12 13:59:36 -0600 (Wed, 12 Apr 2006) | 1 line
+
+Fix missing cid variable for backward compatible with 3PD component.
+------------------------------------------------------------------------
+r462 | cauld | 2006-04-11 23:47:58 -0600 (Tue, 11 Apr 2006) | 1 line
+
+cauld - updating version.php with RC1 details
+------------------------------------------------------------------------
+r461 | cauld | 2006-04-11 23:45:32 -0600 (Tue, 11 Apr 2006) | 1 line
+
+cauld - adding uploadfiles dir for MOStlyDBAdmin local restore function
+------------------------------------------------------------------------
+r460 | cauld | 2006-04-11 23:44:29 -0600 (Tue, 11 Apr 2006) | 1 line
+
+cauld - Commenting out the containers component for now since we are about to
+put out 4.6 RC1 and this is not ready.
+------------------------------------------------------------------------
+r458 | counterpoint | 2006-04-11 08:36:50 -0600 (Tue, 11 Apr 2006) | 1 line
+
+Fixed problem with newly created menu not appearing; other minor bugs
+------------------------------------------------------------------------
+r456 | cauld | 2006-04-10 20:01:42 -0600 (Mon, 10 Apr 2006) | 1 line
+
+cauld - Committing the last major revision of MOStlyCE for 4.6, version 1.6.
+------------------------------------------------------------------------
+r455 | cauld | 2006-04-10 19:55:50 -0600 (Mon, 10 Apr 2006) | 1 line
+
+cauld - Checking in the last major revision of MOStlyCE Admin for 4.6, version 1.5.
+------------------------------------------------------------------------
+r454 | cauld | 2006-04-10 19:48:15 -0600 (Mon, 10 Apr 2006) | 1 line
+
+cauld - Checking in updated overlib_mini.js.  We are running version 4.0 which is really old.
+Updating us to the latest version 4.21.
+------------------------------------------------------------------------
+r453 | neilt | 2006-04-07 06:51:31 -0600 (Fri, 07 Apr 2006) | 1 line
+
+Fixed problem with html in parameters textfield within the admin modules. Trac ticket #73
+------------------------------------------------------------------------
+r452 | neilt | 2006-04-07 06:30:18 -0600 (Fri, 07 Apr 2006) | 1 line
+
+fixed missing close </tr> tags in admin module
+------------------------------------------------------------------------
+r450 | neilt | 2006-04-06 12:41:09 -0600 (Thu, 06 Apr 2006) | 1 line
+
+Bug fixes within the Admin Modules
+------------------------------------------------------------------------
+r449 | counterpoint | 2006-04-05 12:41:48 -0600 (Wed, 05 Apr 2006) | 1 line
+
+Modification to relax check on Itemid for components not having menu entries
+------------------------------------------------------------------------
+r448 | neilt | 2006-04-03 12:37:56 -0600 (Mon, 03 Apr 2006) | 1 line
+
+Changed 2 labels in poll component to Question from Title
+------------------------------------------------------------------------
+r447 | counterpoint | 2006-04-03 11:51:53 -0600 (Mon, 03 Apr 2006) | 1 line
+
+Modification to avoid over complex search and replace of #__ in database query strings
+------------------------------------------------------------------------
+r446 | counterpoint | 2006-04-03 07:47:34 -0600 (Mon, 03 Apr 2006) | 1 line
+
+Small bug fixes and optimisation
+------------------------------------------------------------------------
+r445 | counterpoint | 2006-04-03 07:30:46 -0600 (Mon, 03 Apr 2006) | 1 line
+
+Add user side of containers component (forgotten!)
+------------------------------------------------------------------------
+r444 | neilt | 2006-04-03 05:58:09 -0600 (Mon, 03 Apr 2006) | 1 line
+
+Added The Source URL to weblinks, Mambo Foundation and The Source links to Other Menu
+------------------------------------------------------------------------
+r443 | neilt | 2006-04-03 05:51:01 -0600 (Mon, 03 Apr 2006) | 2 lines
+
+Added The Source URL to weblinks (Trac #63)
+Added Mambo Foundation and The Source links in Other Menu and changed title to show (Trac #71)
+------------------------------------------------------------------------
+r442 | counterpoint | 2006-04-03 02:46:54 -0600 (Mon, 03 Apr 2006) | 1 line
+
+Bug fix uninstaller error with array merge
+------------------------------------------------------------------------
+r440 | cauld | 2006-04-02 20:40:16 -0600 (Sun, 02 Apr 2006) | 1 line
+
+cauld - Updating MOStlyDBAdmin.xml file
+------------------------------------------------------------------------
+r439 | cauld | 2006-04-02 17:33:27 -0600 (Sun, 02 Apr 2006) | 1 line
+
+cauld - Adding the new MOStlyDBAdmin component for db backup and restore functionality.
+------------------------------------------------------------------------
+r438 | cauld | 2006-04-02 15:34:16 -0600 (Sun, 02 Apr 2006) | 1 line
+
+cauld - Making a quick mod to the MOStlyCE $adminside check
+------------------------------------------------------------------------
+r437 | neilt | 2006-04-02 14:07:50 -0600 (Sun, 02 Apr 2006) | 1 line
+
+incomplete <?php tag fixed in pathway.php
+------------------------------------------------------------------------
+r435 | cauld | 2006-04-02 13:37:55 -0600 (Sun, 02 Apr 2006) | 1 line
+
+cauld - Committing the MOStlyCE v1.4 Admin component (major overhaul)
+------------------------------------------------------------------------
+r434 | cauld | 2006-04-02 13:34:14 -0600 (Sun, 02 Apr 2006) | 1 line
+
+cauld - Commiting the MOStlyCE v1.5 mambot (major overhaul)
+------------------------------------------------------------------------
+r433 | cauld | 2006-04-02 13:27:50 -0600 (Sun, 02 Apr 2006) | 1 line
+
+cauld - MOStlyCE work: removing imgmanager, filemanager, & preview plugins.
+Also removed auth_mostlyce.php.
+------------------------------------------------------------------------
+r432 | counterpoint | 2006-04-01 01:30:03 -0700 (Sat, 01 Apr 2006) | 1 line
+
+Add Mambo Containers admin side component.
+------------------------------------------------------------------------
+r431 | neilt | 2006-03-31 04:13:07 -0700 (Fri, 31 Mar 2006) | 1 line
+
+changed admin to show advanced_mode as default
+------------------------------------------------------------------------
+r430 | adi | 2006-03-31 03:55:04 -0700 (Fri, 31 Mar 2006) | 1 line
+
+fix bugs #8109
+------------------------------------------------------------------------
+r429 | neilt | 2006-03-30 12:19:21 -0700 (Thu, 30 Mar 2006) | 6 lines
+
+Fixed mod_latest_content no content error
+Fixed handlers in mod_latest_content
+Corrected cases in mod_latest_content
+Removed mod_latest_content fixed width limit in horizontal td case
+Fixed bug in content.class.php getBlogSectionCount() not returning 0 count
+Module mod_latest_content changed to default unpublished
+------------------------------------------------------------------------
+r428 | adi | 2006-03-29 01:20:05 -0700 (Wed, 29 Mar 2006) | 1 line
+
+fixed bugs #8118
+------------------------------------------------------------------------
+r426 | neilt | 2006-03-28 12:09:32 -0700 (Tue, 28 Mar 2006) | 1 line
+
+omission of echo in <?php T_('... statements
+------------------------------------------------------------------------
+r425 | counterpoint | 2006-03-27 09:09:50 -0700 (Mon, 27 Mar 2006) | 1 line
+
+Optimisation and bug fix for ampersand processing in the universal installer.
+------------------------------------------------------------------------
+r424 | cauld | 2006-03-26 21:11:14 -0700 (Sun, 26 Mar 2006) | 1 line
+
+cauld - updating security list email address on installation survey
+------------------------------------------------------------------------
+r423 | counterpoint | 2006-03-23 09:32:52 -0700 (Thu, 23 Mar 2006) | 1 line
+
+Bug fix to stop foreach on null failure.
+------------------------------------------------------------------------
+r422 | counterpoint | 2006-03-22 11:41:29 -0700 (Wed, 22 Mar 2006) | 1 line
+
+Optimisation of menu types handling, mostlyce.php request for template.  Fixed
+admin side failure to consistently find session data.  Reorganised admin side to
+ignore repeated logins.  Fixed offline check validation of admin session.
+------------------------------------------------------------------------
+r421 | counterpoint | 2006-03-22 01:29:54 -0700 (Wed, 22 Mar 2006) | 1 line
+
+Hardening of contact component.
+------------------------------------------------------------------------
+r420 | counterpoint | 2006-03-22 01:29:28 -0700 (Wed, 22 Mar 2006) | 1 line
+
+Optimisation of admin user and session management
+------------------------------------------------------------------------
+r419 | counterpoint | 2006-03-21 11:12:17 -0700 (Tue, 21 Mar 2006) | 1 line
+
+Optimisation and modified document root discovery.
+------------------------------------------------------------------------
+r418 | counterpoint | 2006-03-21 11:11:00 -0700 (Tue, 21 Mar 2006) | 1 line
+
+Changes to include index.php to establish the environment for editor popups.
+Optimisation of requests for information about the current user's ACL status.
+------------------------------------------------------------------------
+r417 | counterpoint | 2006-03-21 11:06:53 -0700 (Tue, 21 Mar 2006) | 1 line
+
+Optimisation, merging of mosDBTable and mosDBTableEntry methods.
+------------------------------------------------------------------------
+r416 | cauld | 2006-03-20 22:44:47 -0700 (Mon, 20 Mar 2006) | 1 line
+
+cauld - Adding a donation icon to the new installation survey
+------------------------------------------------------------------------
+r415 | csouza | 2006-03-20 18:29:11 -0700 (Mon, 20 Mar 2006) | 1 line
+
+changes to com_admin/admin.admin.html.php to grab local help files
+------------------------------------------------------------------------
+r413 | csouza | 2006-03-20 18:24:13 -0700 (Mon, 20 Mar 2006) | 1 line
+
+changes to com_admin/admin.admin.html.php to grab local help files
+------------------------------------------------------------------------
+r412 | csouza | 2006-03-20 18:19:39 -0700 (Mon, 20 Mar 2006) | 1 line
+
+changes to com_admin/admin.admin.html.php to grab local help files
+------------------------------------------------------------------------
+r411 | csouza | 2006-03-20 18:10:48 -0700 (Mon, 20 Mar 2006) | 1 line
+
+changes to com_admin/admin.admin.html.php to grab local help files
+------------------------------------------------------------------------
+r410 | csouza | 2006-03-20 17:58:54 -0700 (Mon, 20 Mar 2006) | 1 line
+
+mod to pull help screens locally
+------------------------------------------------------------------------
+r409 | csouza | 2006-03-20 17:22:21 -0700 (Mon, 20 Mar 2006) | 1 line
+
+language stuff
+------------------------------------------------------------------------
+r408 | csouza | 2006-03-20 16:47:49 -0700 (Mon, 20 Mar 2006) | 1 line
+
+language defaults in install4.php
+------------------------------------------------------------------------
+r406 | cauld | 2006-03-19 18:03:14 -0700 (Sun, 19 Mar 2006) | 1 line
+
+cauld - Fixing MOStlyCE print plugin and disabling preview plugin in favor
+own Mambo's preview option.
+------------------------------------------------------------------------
+r403 | csouza | 2006-03-19 13:41:39 -0700 (Sun, 19 Mar 2006) | 1 line
+
+language manager
+------------------------------------------------------------------------
+r402 | counterpoint | 2006-03-19 07:32:34 -0700 (Sun, 19 Mar 2006) | 1 line
+
+Extended new contact popup for linking to user, so as to show both full name and user name.
+------------------------------------------------------------------------
+r401 | counterpoint | 2006-03-19 03:28:33 -0700 (Sun, 19 Mar 2006) | 1 line
+
+Recorded changes to restore functioning of popups.
+------------------------------------------------------------------------
+r400 | counterpoint | 2006-03-19 03:22:44 -0700 (Sun, 19 Mar 2006) | 1 line
+
+Reinstate popup changes that had got lost
+------------------------------------------------------------------------
+r397 | cauld | 2006-03-16 23:19:47 -0700 (Thu, 16 Mar 2006) | 1 line
+
+cauld - Bringing back MOStlyCE / TinyMCE 2.0.2 with fixed IE issue reported during Beta 1.
+------------------------------------------------------------------------
+r396 | cauld | 2006-03-16 22:57:17 -0700 (Thu, 16 Mar 2006) | 1 line
+
+cauld - Removing mostlyce directory.  Reverting back to TinyMCE 2.0.2.
+Too many issues with 2.0.4.  Fixed IE error without upgrading.
+------------------------------------------------------------------------
+r393 | counterpoint | 2006-03-14 14:59:44 -0700 (Tue, 14 Mar 2006) | 1 line
+
+Tightened security
+------------------------------------------------------------------------
+r392 | counterpoint | 2006-03-14 14:59:00 -0700 (Tue, 14 Mar 2006) | 1 line
+
+Mods to support new container component, and to secure RSS feeds.
+------------------------------------------------------------------------
+r391 | counterpoint | 2006-03-13 11:15:58 -0700 (Mon, 13 Mar 2006) | 1 line
+
+Modified SEF code so that when SEO is switched off, URL still has ampersands encoded.
+------------------------------------------------------------------------
+r390 | counterpoint | 2006-03-13 11:15:11 -0700 (Mon, 13 Mar 2006) | 1 line
+
+Reverted mosPathway makePathway, moved change into sefRelToAbs.  Modified error reporting
+slightly to suppress errors during setup.
+------------------------------------------------------------------------
+r388 | cauld | 2006-03-12 12:39:31 -0700 (Sun, 12 Mar 2006) | 1 line
+
+cauld - Changing end user installation survey to hand comments a bit differently.
+Comments now go to feedback@mambo-foundation.org.
+------------------------------------------------------------------------
+r387 | cauld | 2006-03-12 12:03:29 -0700 (Sun, 12 Mar 2006) | 1 line
+
+cauld - Fixing mostlyce.xml for IE contextmenu change
+------------------------------------------------------------------------
+r386 | cauld | 2006-03-12 12:00:28 -0700 (Sun, 12 Mar 2006) | 1 line
+
+cauld - Adding IE fix for the MOStlyCE contextmenu plugin
+------------------------------------------------------------------------
+r385 | counterpoint | 2006-03-12 08:46:12 -0700 (Sun, 12 Mar 2006) | 1 line
+
+Optimisation of mosDBTable move method.
+------------------------------------------------------------------------
+r384 | counterpoint | 2006-03-12 08:44:55 -0700 (Sun, 12 Mar 2006) | 1 line
+
+Bug fixes
+------------------------------------------------------------------------
+r383 | counterpoint | 2006-03-12 08:43:56 -0700 (Sun, 12 Mar 2006) | 1 line
+
+Hardened against misuse
+------------------------------------------------------------------------
+r382 | counterpoint | 2006-03-12 08:43:33 -0700 (Sun, 12 Mar 2006) | 1 line
+
+Removed reliance on register_globals
+------------------------------------------------------------------------
+r380 | counterpoint | 2006-03-09 07:48:49 -0700 (Thu, 09 Mar 2006) | 1 line
+
+Changes to mosDBTableEntry - not in live use - but needed for mosContainer development.
+------------------------------------------------------------------------
+r379 | cauld | 2006-03-08 22:54:56 -0700 (Wed, 08 Mar 2006) | 1 line
+
+cauld - updating MOStlyCE xml file for TinyMCE 2.0.4 update
+------------------------------------------------------------------------
+r378 | cauld | 2006-03-08 22:51:54 -0700 (Wed, 08 Mar 2006) | 1 line
+
+cauld - finishing MOStlyCE 1.5 / TinyMCE 2.0.4 upgrade
+------------------------------------------------------------------------
+r376 | cauld | 2006-03-08 22:01:09 -0700 (Wed, 08 Mar 2006) | 1 line
+
+cauld - MOStlyCE Admin update to disable default compression
+------------------------------------------------------------------------
+r372 | cauld | 2006-03-08 21:27:28 -0700 (Wed, 08 Mar 2006) | 1 line
+
+cauld - working on a mostlyce upgrade
+------------------------------------------------------------------------
+r371 | counterpoint | 2006-03-08 10:51:49 -0700 (Wed, 08 Mar 2006) | 1 line
+
+Fix problem with mass chmod not recursing correctly
+------------------------------------------------------------------------
+r370 | counterpoint | 2006-03-08 10:51:22 -0700 (Wed, 08 Mar 2006) | 1 line
+
+Fix access to Mambo configuration - cope in different contexts
+------------------------------------------------------------------------
+r369 | counterpoint | 2006-03-08 10:50:42 -0700 (Wed, 08 Mar 2006) | 1 line
+
+Fix foreach failure on empty database results
+------------------------------------------------------------------------
+r363 | adi | 2006-03-06 19:42:01 -0700 (Mon, 06 Mar 2006) | 1 line
+
+fix ticket #32
+------------------------------------------------------------------------
+r362 | adi | 2006-03-06 19:26:20 -0700 (Mon, 06 Mar 2006) | 1 line
+
+fix typo
+------------------------------------------------------------------------
+r361 | cauld | 2006-03-06 07:02:33 -0700 (Mon, 06 Mar 2006) | 1 line
+
+cauld - rechecking in gin's trash fix that was overwritten a while back
+------------------------------------------------------------------------
+r359 | adi | 2006-03-06 04:11:53 -0700 (Mon, 06 Mar 2006) | 1 line
+
+fix ticket #31
+------------------------------------------------------------------------
+r357 | cauld | 2006-03-04 23:59:11 -0700 (Sat, 04 Mar 2006) | 1 line
+
+cauld - updating version info for 4.6 public RC1
+------------------------------------------------------------------------
+r355 | cauld | 2006-03-04 23:54:55 -0700 (Sat, 04 Mar 2006) | 1 line
+
+cauld - Adding new end user survey functionality to the last install screen
+------------------------------------------------------------------------
+r353 | counterpoint | 2006-03-02 10:26:20 -0700 (Thu, 02 Mar 2006) | 1 line
+
+Bug fix - was reliant on register_globals.
+------------------------------------------------------------------------
+r352 | oziris | 2006-03-01 12:18:50 -0700 (Wed, 01 Mar 2006) | 1 line
+
+Ticket #10 changing www.mamboserver.com to www.mambo-foundation.org
+------------------------------------------------------------------------
+r351 | oziris | 2006-03-01 11:57:37 -0700 (Wed, 01 Mar 2006) | 1 line
+
+Ticket #8
+------------------------------------------------------------------------
+r350 | oziris | 2006-03-01 11:35:50 -0700 (Wed, 01 Mar 2006) | 1 line
+
+Ticket #9
+------------------------------------------------------------------------
+r348 | cauld | 2006-03-01 07:35:46 -0700 (Wed, 01 Mar 2006) | 1 line
+
+cauld - updating "Lost Password" error message to make it more clear that
+both username and email address are required.
+------------------------------------------------------------------------
+r347 | adi | 2006-02-28 21:33:11 -0700 (Tue, 28 Feb 2006) | 1 line
+
+ticket #46
+------------------------------------------------------------------------
+r346 | oziris | 2006-02-28 09:07:58 -0700 (Tue, 28 Feb 2006) | 1 line
+
+updated calls to new help file names
+------------------------------------------------------------------------
+r345 | oziris | 2006-02-28 08:32:43 -0700 (Tue, 28 Feb 2006) | 1 line
+
+Renamed help files so they don't contain 453 in the file name
+------------------------------------------------------------------------
+r342 | cauld | 2006-02-28 07:53:09 -0700 (Tue, 28 Feb 2006) | 1 line
+
+cauld - Changing default MOStlyCE plugin layout based on suggestions from Water & Stone
+------------------------------------------------------------------------
+r341 | cauld | 2006-02-28 06:31:13 -0700 (Tue, 28 Feb 2006) | 1 line
+
+cauld - Creating a empty files directory for use by MOStlyCE.  Uses this with
+HTML templates and the file manager.  Closing Trac ticket #45.
+------------------------------------------------------------------------
+r339 | adi | 2006-02-27 21:48:46 -0700 (Mon, 27 Feb 2006) | 1 line
+
+add mambo version info in administrator pages
+------------------------------------------------------------------------
+r338 | adi | 2006-02-27 03:55:24 -0700 (Mon, 27 Feb 2006) | 1 line
+
+Trac Ticket #49
+------------------------------------------------------------------------
+r337 | adi | 2006-02-27 01:23:16 -0700 (Mon, 27 Feb 2006) | 1 line
+
+fix makePathway() to correctly encode & entity into &amp;
+------------------------------------------------------------------------
+r336 | adi | 2006-02-26 23:14:05 -0700 (Sun, 26 Feb 2006) | 1 line
+
+Trac Ticket #41
+------------------------------------------------------------------------
+r334 | adi | 2006-02-26 21:36:06 -0700 (Sun, 26 Feb 2006) | 1 line
+
+add mod_latestcontent record
+------------------------------------------------------------------------
+r333 | adi | 2006-02-26 21:32:34 -0700 (Sun, 26 Feb 2006) | 1 line
+
+add latest_content module
+------------------------------------------------------------------------
+r331 | cauld | 2006-02-25 12:49:00 -0700 (Sat, 25 Feb 2006) | 1 line
+
+cauld - setting htmltemplate and caption to the list of auto started plugins within mostlyce
+------------------------------------------------------------------------
+r328 | cauld | 2006-02-25 12:28:09 -0700 (Sat, 25 Feb 2006) | 1 line
+
+cauld - fixing a bug that caused the "Not Authorized" error when someone was trying to edit content from the frontend
+------------------------------------------------------------------------
+r327 | cauld | 2006-02-25 11:55:31 -0700 (Sat, 25 Feb 2006) | 1 line
+
+cauld - correcting a mostlyce htmltemplate plugin issue
+------------------------------------------------------------------------
+r326 | cauld | 2006-02-25 11:54:12 -0700 (Sat, 25 Feb 2006) | 2 lines
+
+cauld - correcting mostlyce config files for plugin changes
+------------------------------------------------------------------------
+r325 | cauld | 2006-02-25 11:03:32 -0700 (Sat, 25 Feb 2006) | 1 line
+
+cauld - removing 4 unused mostlyce plugins
+------------------------------------------------------------------------
+r324 | cauld | 2006-02-25 10:57:35 -0700 (Sat, 25 Feb 2006) | 1 line
+
+cauld - adding back in to old tinymce plugins that I removed before (caption & htmltemplate)
+------------------------------------------------------------------------
+r323 | oziris | 2006-02-24 13:57:52 -0700 (Fri, 24 Feb 2006) | 1 line
+
+Updated for copyright notices.
+------------------------------------------------------------------------
+r322 | oziris | 2006-02-24 13:55:29 -0700 (Fri, 24 Feb 2006) | 1 line
+
+Updated Copyright notices in XML files.
+------------------------------------------------------------------------
+r320 | counterpoint | 2006-02-24 09:46:13 -0700 (Fri, 24 Feb 2006) | 1 line
+
+Improved (un)installer error handling. Modified session purge, making distinction between user side and admin side.
+------------------------------------------------------------------------
+r319 | counterpoint | 2006-02-23 04:30:16 -0700 (Thu, 23 Feb 2006) | 1 line
+
+Bug fixes
+------------------------------------------------------------------------
+r316 | adi | 2006-02-22 23:25:01 -0700 (Wed, 22 Feb 2006) | 1 line
+
+update mamboforge to mamboxchange
+------------------------------------------------------------------------
+r315 | konlong | 2006-02-22 06:31:46 -0700 (Wed, 22 Feb 2006) | 2 lines
+
+Reference to undefined variable fixed in admin.menus.php function copyMenuSave
+The use of the variable $and should be avoided in deference to $_and, $and gives an unknown token notice 8 files
+------------------------------------------------------------------------
+r314 | konlong | 2006-02-22 05:57:20 -0700 (Wed, 22 Feb 2006) | 2 lines
+
+added call to addDescendants to the remove case.
+Fixed undefined variable $database; in saveOrder()
+------------------------------------------------------------------------
+r313 | chanh | 2006-02-21 16:20:16 -0700 (Tue, 21 Feb 2006) | 2 lines
+
+Missing closing php tags!
+------------------------------------------------------------------------
+r312 | chanh | 2006-02-21 16:08:14 -0700 (Tue, 21 Feb 2006) | 1 line
+
+Missing closing php tags!
+------------------------------------------------------------------------
+r311 | chanh | 2006-02-21 16:07:58 -0700 (Tue, 21 Feb 2006) | 1 line
+
+Missing closing php tags!
+------------------------------------------------------------------------
+r310 | cauld | 2006-02-21 07:02:46 -0700 (Tue, 21 Feb 2006) | 1 line
+
+cauld - committing a change to database.php to fix a content update / insert
+issue based on a suggested fix by counterpoint
+------------------------------------------------------------------------
+r309 | adi | 2006-02-20 20:47:49 -0700 (Mon, 20 Feb 2006) | 1 line
+
+Trac ticket #36
+------------------------------------------------------------------------
+r305 | cauld | 2006-02-18 16:10:53 -0700 (Sat, 18 Feb 2006) | 1 line
+
+cauld - Adding some stuff for MOStlyCE and fixing Safari warning
+------------------------------------------------------------------------
+r304 | csouza | 2006-02-16 20:07:10 -0700 (Thu, 16 Feb 2006) | 2 lines
+
+corrected a few non i18ned strings
+------------------------------------------------------------------------
+r303 | csouza | 2006-02-16 20:06:03 -0700 (Thu, 16 Feb 2006) | 1 line
+
+added localization vars to configuration.php-dist
+------------------------------------------------------------------------
+r302 | csouza | 2006-02-16 20:05:11 -0700 (Thu, 16 Feb 2006) | 1 line
+
+fixed fixlanguage()
+------------------------------------------------------------------------
+r301 | csouza | 2006-02-16 20:04:10 -0700 (Thu, 16 Feb 2006) | 1 line
+
+updated mod_whosonline to select a plural string from a specific language file
+------------------------------------------------------------------------
+r300 | csouza | 2006-02-16 20:02:31 -0700 (Thu, 16 Feb 2006) | 1 line
+
+updated com_languages
+------------------------------------------------------------------------
+r299 | csouza | 2006-02-16 20:02:08 -0700 (Thu, 16 Feb 2006) | 1 line
+
+updated com_languages
+------------------------------------------------------------------------
+r298 | csouza | 2006-02-16 20:00:30 -0700 (Thu, 16 Feb 2006) | 1 line
+
+updated com_languages
+------------------------------------------------------------------------
+r297 | csouza | 2006-02-16 14:43:38 -0700 (Thu, 16 Feb 2006) | 1 line
+
+replacement of copyright notices
+------------------------------------------------------------------------
+r296 | cauld | 2006-02-16 08:02:03 -0700 (Thu, 16 Feb 2006) | 1 line
+
+cauld - fixing PHP version to low notice on install
+------------------------------------------------------------------------
+r295 | cauld | 2006-02-16 07:58:50 -0700 (Thu, 16 Feb 2006) | 1 line
+
+cauld - updating install screen to display PHP version 4.3.0 as min requirement
+------------------------------------------------------------------------
+r294 | adi | 2006-02-16 01:59:01 -0700 (Thu, 16 Feb 2006) | 1 line
+
+remove td width in printicon function
+------------------------------------------------------------------------
+r293 | adi | 2006-02-16 01:57:15 -0700 (Thu, 16 Feb 2006) | 1 line
+
+remove td width in pdficon and emailicon function
+------------------------------------------------------------------------
+r292 | adi | 2006-02-16 01:34:47 -0700 (Thu, 16 Feb 2006) | 1 line
+
+Trac ticket #38
+------------------------------------------------------------------------
+r290 | counterpoint | 2006-02-15 16:16:04 -0700 (Wed, 15 Feb 2006) | 1 line
+
+Fix submit news problems by changing to submit faq (also removed itemid)
+------------------------------------------------------------------------
+r289 | counterpoint | 2006-02-15 10:56:19 -0700 (Wed, 15 Feb 2006) | 1 line
+
+Fixed bugs in resequencing various types of item
+------------------------------------------------------------------------
+r288 | counterpoint | 2006-02-15 10:18:43 -0700 (Wed, 15 Feb 2006) | 1 line
+
+Bug fixes
+------------------------------------------------------------------------
+r287 | counterpoint | 2006-02-15 09:49:55 -0700 (Wed, 15 Feb 2006) | 1 line
+
+Bug fixes
+------------------------------------------------------------------------
+r286 | counterpoint | 2006-02-15 04:18:27 -0700 (Wed, 15 Feb 2006) | 2 lines
+
+Bug fixes
+------------------------------------------------------------------------
+r284 | adi | 2006-02-14 22:18:19 -0700 (Tue, 14 Feb 2006) | 1 line
+
+fix css problem for menu height in firefox
+------------------------------------------------------------------------
+r283 | counterpoint | 2006-02-14 15:39:59 -0700 (Tue, 14 Feb 2006) | 1 line
+
+Bug fix problem analysing parameters from XML
+------------------------------------------------------------------------
+r282 | counterpoint | 2006-02-14 15:38:15 -0700 (Tue, 14 Feb 2006) | 1 line
+
+Bug fix theme.js incorrect path to find menu images
+------------------------------------------------------------------------
+r281 | counterpoint | 2006-02-14 14:42:10 -0700 (Tue, 14 Feb 2006) | 2 lines
+
+Bug fix
+------------------------------------------------------------------------
+r277 | adi | 2006-02-14 01:14:48 -0700 (Tue, 14 Feb 2006) | 2 lines
+
+hide secret word in global config based on, Trac ticket #9
+------------------------------------------------------------------------
+r276 | adi | 2006-02-14 00:38:24 -0700 (Tue, 14 Feb 2006) | 1 line
+
+Trac ticket #5
+------------------------------------------------------------------------
+r275 | adi | 2006-02-14 00:32:53 -0700 (Tue, 14 Feb 2006) | 2 lines
+
+update sample data, Trac ticket #4
+------------------------------------------------------------------------
+r274 | adi | 2006-02-14 00:17:41 -0700 (Tue, 14 Feb 2006) | 2 lines
+
+remove key reference based on
+http://forum.mamboserver.com/showthread.php?t=66453
+------------------------------------------------------------------------
+r273 | adi | 2006-02-13 22:46:12 -0700 (Mon, 13 Feb 2006) | 2 lines
+
+add client id column in showClients function, based on
+Trac ticket #15
+------------------------------------------------------------------------
+r272 | counterpoint | 2006-02-13 08:41:51 -0700 (Mon, 13 Feb 2006) | 1 line
+
+Installer developments and bugs, syndstyle handling.
+------------------------------------------------------------------------
+r271 | counterpoint | 2006-02-13 08:37:07 -0700 (Mon, 13 Feb 2006) | 1 line
+
+Installer bug fixes and development.
+------------------------------------------------------------------------
+r270 | counterpoint | 2006-02-13 08:31:12 -0700 (Mon, 13 Feb 2006) | 1 line
+
+Syndstyle and file handling bug fixes.
+------------------------------------------------------------------------
+r269 | counterpoint | 2006-02-13 08:12:12 -0700 (Mon, 13 Feb 2006) | 1 line
+
+Introduce syndstyle to allow components to be used as objects at other sites.
+------------------------------------------------------------------------
+r268 | adi | 2006-02-13 03:59:27 -0700 (Mon, 13 Feb 2006) | 1 line
+
+fix global variables
+------------------------------------------------------------------------
+r267 | adi | 2006-02-13 03:52:27 -0700 (Mon, 13 Feb 2006) | 1 line
+
+fix showInstallMessage function, add third parameter for redirect
+------------------------------------------------------------------------
+r266 | csouza | 2006-02-12 16:49:56 -0700 (Sun, 12 Feb 2006) | 2 lines
+
+fixed some localization bugs
+------------------------------------------------------------------------
+r265 | csouza | 2006-02-12 16:49:14 -0700 (Sun, 12 Feb 2006) | 1 line
+
+localization
+------------------------------------------------------------------------
+r264 | csouza | 2006-02-12 16:45:24 -0700 (Sun, 12 Feb 2006) | 1 line
+
+fixed some localization bugs
+------------------------------------------------------------------------
+r263 | csouza | 2006-02-12 16:44:33 -0700 (Sun, 12 Feb 2006) | 1 line
+
+localization fixes
+------------------------------------------------------------------------
+r262 | csouza | 2006-02-12 16:43:25 -0700 (Sun, 12 Feb 2006) | 1 line
+
+fixed some localization bugs
+------------------------------------------------------------------------
+r260 | cauld | 2006-02-12 15:11:01 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - Adding MOStlyCE onclick plugin
+------------------------------------------------------------------------
+r259 | cauld | 2006-02-12 13:41:12 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - MOStlyCE table plugin upgrade
+------------------------------------------------------------------------
+r258 | cauld | 2006-02-12 13:39:40 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - MOStlyCE advlink plugin upgrade
+------------------------------------------------------------------------
+r257 | cauld | 2006-02-12 13:38:07 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - MOStlyCE advimage plugin fix
+------------------------------------------------------------------------
+r256 | cauld | 2006-02-12 13:36:52 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - MOStlyCE advhr plugin fix
+------------------------------------------------------------------------
+r255 | cauld | 2006-02-12 13:34:32 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - MOStlyCE preview plugin fix
+------------------------------------------------------------------------
+r254 | cauld | 2006-02-12 13:31:54 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - MOStlyCE auth_plugin.php change to handle the removal of auth.php
+------------------------------------------------------------------------
+r253 | csouza | 2006-02-12 12:38:26 -0700 (Sun, 12 Feb 2006) | 1 line
+
+mostlyce popup fix
+------------------------------------------------------------------------
+r252 | csouza | 2006-02-12 12:37:34 -0700 (Sun, 12 Feb 2006) | 2 lines
+
+fix for mostlyce popup and localization calls to select language file
+------------------------------------------------------------------------
+r251 | cauld | 2006-02-12 10:25:32 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - more MOStlyCE changes
+------------------------------------------------------------------------
+r250 | cauld | 2006-02-12 10:17:00 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - adding mclayer.js for MOStlyCE
+------------------------------------------------------------------------
+r247 | cauld | 2006-02-12 08:52:29 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - removing old MOStlyCE onclick plugin
+------------------------------------------------------------------------
+r246 | cauld | 2006-02-12 08:49:29 -0700 (Sun, 12 Feb 2006) | 1 line
+
+cauld - Upgrading MOStlyCE guts to 2.0.2 and fixing a few MOStlyCE bugs
+------------------------------------------------------------------------
+r245 | counterpoint | 2006-02-10 10:38:03 -0700 (Fri, 10 Feb 2006) | 1 line
+
+Mambot handler fix, compatibility fixes.
+------------------------------------------------------------------------
+r244 | counterpoint | 2006-02-10 07:08:05 -0700 (Fri, 10 Feb 2006) | 1 line
+
+Compatibility fixes.
+------------------------------------------------------------------------
+r243 | counterpoint | 2006-02-10 05:42:40 -0700 (Fri, 10 Feb 2006) | 1 line
+
+Handle https and non standard ports; reduce volume of metadata by restricting to one item.
+------------------------------------------------------------------------
+r238 | counterpoint | 2006-02-07 11:03:58 -0700 (Tue, 07 Feb 2006) | 1 line
+
+Bug fixes, mostly missing ampersands.
+------------------------------------------------------------------------
+r237 | counterpoint | 2006-02-06 09:36:18 -0700 (Mon, 06 Feb 2006) | 1 line
+
+Remove "generator" tag, improve SEF to cover archived material, correct bugs in contact component.
+------------------------------------------------------------------------
+r236 | csouza | 2006-02-06 08:35:49 -0700 (Mon, 06 Feb 2006) | 1 line
+
+fixed php4 reference to component handler
+------------------------------------------------------------------------
+r235 | counterpoint | 2006-02-05 10:46:04 -0700 (Sun, 05 Feb 2006) | 1 line
+
+Bug fix
+------------------------------------------------------------------------
+r234 | counterpoint | 2006-02-05 09:08:28 -0700 (Sun, 05 Feb 2006) | 1 line
+
+Security fixes.  Add universal installer code.
+------------------------------------------------------------------------
+r233 | cauld | 2006-02-04 14:29:29 -0700 (Sat, 04 Feb 2006) | 1 line
+
+cauld - updating version info for release
+------------------------------------------------------------------------
+r232 | csouza | 2006-02-04 13:36:36 -0700 (Sat, 04 Feb 2006) | 2 lines
+
+corrected path to phpInputFilter
+------------------------------------------------------------------------
+r231 | csouza | 2006-02-04 13:36:24 -0700 (Sat, 04 Feb 2006) | 2 lines
+
+corrected path to phpInputFilter
+------------------------------------------------------------------------
+r230 | csouza | 2006-02-04 13:13:58 -0700 (Sat, 04 Feb 2006) | 1 line
+
+added admin.languages.class.php
+------------------------------------------------------------------------
+r229 | cauld | 2006-02-04 11:45:08 -0700 (Sat, 04 Feb 2006) | 1 line
+
+cauld - fixing phpInputFilter path
+------------------------------------------------------------------------
+r228 | cauld | 2006-02-04 10:32:51 -0700 (Sat, 04 Feb 2006) | 1 line
+
+cauld - fixing issue with __parameters create table statement
+------------------------------------------------------------------------
+r226 | counterpoint | 2006-02-03 02:43:17 -0700 (Fri, 03 Feb 2006) | 1 line
+
+Delete patTemplate
+------------------------------------------------------------------------
+r223 | counterpoint | 2006-02-02 15:13:45 -0700 (Thu, 02 Feb 2006) | 1 line
+
+Tidying up and bug fixing.
+------------------------------------------------------------------------
+r222 | counterpoint | 2006-02-02 07:50:48 -0700 (Thu, 02 Feb 2006) | 1 line
+
+Various bug fixes and tidying up.
+------------------------------------------------------------------------
+r221 | csouza | 2006-02-01 16:44:54 -0700 (Wed, 01 Feb 2006) | 1 line
+
+corrected notice in fixlanguages
+------------------------------------------------------------------------
+r220 | csouza | 2006-02-01 16:21:57 -0700 (Wed, 01 Feb 2006) | 1 line
+
+language fix
+------------------------------------------------------------------------
+r219 | csouza | 2006-02-01 16:04:51 -0700 (Wed, 01 Feb 2006) | 1 line
+
+language/english.xml
+------------------------------------------------------------------------
+r218 | counterpoint | 2006-02-01 13:38:06 -0700 (Wed, 01 Feb 2006) | 1 line
+
+Universal installer UI.
+------------------------------------------------------------------------
+r216 | csouza | 2006-02-01 09:45:51 -0700 (Wed, 01 Feb 2006) | 1 line
+
+complete set of language files for translation
+------------------------------------------------------------------------
+r213 | counterpoint | 2006-01-31 05:11:42 -0700 (Tue, 31 Jan 2006) | 1 line
+
+Mambot developments.
+------------------------------------------------------------------------
+r212 | counterpoint | 2006-01-31 01:30:02 -0700 (Tue, 31 Jan 2006) | 1 line
+
+Add support for free standing parameter object installation.
+------------------------------------------------------------------------
+r211 | csouza | 2006-01-30 16:38:54 -0700 (Mon, 30 Jan 2006) | 1 line
+
+added define check to prevent notices
+------------------------------------------------------------------------
+r210 | csouza | 2006-01-30 16:31:55 -0700 (Mon, 30 Jan 2006) | 1 line
+
+restored english.php and english.ignore.php
+------------------------------------------------------------------------
+r209 | counterpoint | 2006-01-30 15:13:58 -0700 (Mon, 30 Jan 2006) | 1 line
+
+Extra mambot hooks for registration, password changes.
+------------------------------------------------------------------------
+r208 | counterpoint | 2006-01-30 10:58:42 -0700 (Mon, 30 Jan 2006) | 1 line
+
+Handle language issue causing double display of modules.
+------------------------------------------------------------------------
+r207 | counterpoint | 2006-01-30 07:25:33 -0700 (Mon, 30 Jan 2006) | 1 line
+
+Possible fix for authenticator not found bug.
+------------------------------------------------------------------------
+r206 | counterpoint | 2006-01-30 07:14:36 -0700 (Mon, 30 Jan 2006) | 1 line
+
+Installer error handling, version to point to Foundation web site, attempted fix for redirect.
+------------------------------------------------------------------------
+r205 | cauld | 2006-01-28 10:06:06 -0700 (Sat, 28 Jan 2006) | 1 line
+------------------------------------------------------------------------
+r204 | cauld | 2006-01-28 10:03:42 -0700 (Sat, 28 Jan 2006) | 1 line
+
+cauld - adding MOStlyCE admin component
+------------------------------------------------------------------------
+r202 | cauld | 2006-01-28 09:45:00 -0700 (Sat, 28 Jan 2006) | 1 line
+
+cauld - MOStlyCE change
+------------------------------------------------------------------------
+r199 | counterpoint | 2006-01-27 08:37:12 -0700 (Fri, 27 Jan 2006) | 1 line
+
+Installer bug fixes and changes to handle Docman latest.  Bug fix in installation/index.php.
+------------------------------------------------------------------------
+r198 | csouza | 2006-01-26 17:20:20 -0700 (Thu, 26 Jan 2006) | 1 line
+
+added the final complete language catalog containing 2027 unique strings.
+------------------------------------------------------------------------
+r197 | counterpoint | 2006-01-26 16:40:05 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Correction for archive manager - error when database objects not an array - used for array merge.
+------------------------------------------------------------------------
+r196 | counterpoint | 2006-01-26 16:23:04 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Improved site search.
+------------------------------------------------------------------------
+r195 | csouza | 2006-01-26 13:20:17 -0700 (Thu, 26 Jan 2006) | 1 line
+
+removed unnecessary file from com_languages
+------------------------------------------------------------------------
+r194 | csouza | 2006-01-26 13:11:56 -0700 (Thu, 26 Jan 2006) | 1 line
+
+verified and corrected all deprecated localization constants
+------------------------------------------------------------------------
+r193 | counterpoint | 2006-01-26 11:09:47 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Optimise DB access in admin of users.  Correct HTML yes/no radio buttons.
+------------------------------------------------------------------------
+r192 | counterpoint | 2006-01-26 11:07:55 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Replaced ACL related code for storing new users (removed during testing of new access mechanisms).
+------------------------------------------------------------------------
+r191 | counterpoint | 2006-01-26 09:07:51 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Small bug fixes
+------------------------------------------------------------------------
+r190 | cauld | 2006-01-26 07:45:16 -0700 (Thu, 26 Jan 2006) | 1 line
+
+cauld - fixing a mostlyce xml issue
+------------------------------------------------------------------------
+r189 | cauld | 2006-01-26 07:44:44 -0700 (Thu, 26 Jan 2006) | 1 line
+
+cauld - fixing a mostlyce xml issue
+------------------------------------------------------------------------
+r188 | csouza | 2006-01-26 06:06:55 -0700 (Thu, 26 Jan 2006) | 1 line
+
+fixed localization notices
+------------------------------------------------------------------------
+r187 | counterpoint | 2006-01-26 05:49:51 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Fix problem in mambo.sql losing user login authenticator mambot.
+------------------------------------------------------------------------
+r186 | counterpoint | 2006-01-26 04:51:01 -0700 (Thu, 26 Jan 2006) | 1 line
+
+Merge and other bug fixes.  Suppress pathway if only says "Home".  Suppress warnings from Magpie.
+------------------------------------------------------------------------
+r185 | csouza | 2006-01-25 16:55:33 -0700 (Wed, 25 Jan 2006) | 1 line
+
+replaced language constants
+------------------------------------------------------------------------
+r183 | csouza | 2006-01-25 14:36:13 -0700 (Wed, 25 Jan 2006) | 1 line
+
+fixed i18n bugs and notices
+------------------------------------------------------------------------
+r182 | counterpoint | 2006-01-25 10:21:03 -0700 (Wed, 25 Jan 2006) | 1 line
+
+Adjust for database.php moving back to /includes.  Remove executable code from version.php (should be just class, executable code is in index.php).
+------------------------------------------------------------------------
+r180 | csouza | 2006-01-25 06:42:26 -0700 (Wed, 25 Jan 2006) | 1 line
+
+fixed localization bug
+------------------------------------------------------------------------
+r179 | csouza | 2006-01-25 06:41:01 -0700 (Wed, 25 Jan 2006) | 1 line
+
+phpgettext update
+------------------------------------------------------------------------
+r178 | csouza | 2006-01-24 09:16:09 -0700 (Tue, 24 Jan 2006) | 1 line
+
+update phpgettext.catalog.php
+------------------------------------------------------------------------
+r177 | csouza | 2006-01-24 09:15:11 -0700 (Tue, 24 Jan 2006) | 1 line
+
+updating language directory and first complete string catalog
+------------------------------------------------------------------------
+r176 | cauld | 2006-01-24 07:36:50 -0700 (Tue, 24 Jan 2006) | 1 line
+
+cauld - fixing MOStlyCE undefined variable notice
+------------------------------------------------------------------------
+r175 | csouza | 2006-01-24 04:45:38 -0700 (Tue, 24 Jan 2006) | 1 line
+
+corrected return value in ngettext
+------------------------------------------------------------------------
+r174 | counterpoint | 2006-01-24 03:27:45 -0700 (Tue, 24 Jan 2006) | 1 line
+
+Correct problem with merge.
+------------------------------------------------------------------------
+r172 | counterpoint | 2006-01-24 02:23:40 -0700 (Tue, 24 Jan 2006) | 1 line
+
+Correct short tag
+------------------------------------------------------------------------
+r171 | cauld | 2006-01-23 21:57:24 -0700 (Mon, 23 Jan 2006) | 1 line
+
+cauld - fixing an include file in mostlyce.php
+------------------------------------------------------------------------
+r170 | counterpoint | 2006-01-23 16:11:50 -0700 (Mon, 23 Jan 2006) | 1 line
+
+Bring 4.5.4 /includes/frontend.php into 4.6
+------------------------------------------------------------------------
+r169 | counterpoint | 2006-01-23 10:57:22 -0700 (Mon, 23 Jan 2006) | 1 line
+
+Fix installation bugs.
+------------------------------------------------------------------------
+r168 | csouza | 2006-01-22 21:47:31 -0700 (Sun, 22 Jan 2006) | 1 line
+
+modified getConfig () in index.php to remove 'administrator' from mosConfig_live_site
+------------------------------------------------------------------------
+r167 | csouza | 2006-01-22 21:45:40 -0700 (Sun, 22 Jan 2006) | 1 line
+
+switched phpgettext debugging off
+------------------------------------------------------------------------
+r166 | csouza | 2006-01-22 21:44:09 -0700 (Sun, 22 Jan 2006) | 1 line
+
+added two css classes to remove <font> tags
+------------------------------------------------------------------------
+r162 | cauld | 2006-01-22 01:10:42 -0700 (Sun, 22 Jan 2006) | 1 line
+
+cauld - updating install sql file to include entries for MOStlyCE
+------------------------------------------------------------------------
+r160 | cauld | 2006-01-22 01:04:13 -0700 (Sun, 22 Jan 2006) | 1 line
+
+cauld - adding MOStlyCE mambot
+------------------------------------------------------------------------
+r159 | cauld | 2006-01-22 01:01:09 -0700 (Sun, 22 Jan 2006) | 1 line
+
+cauld - adding MOStlyCE component
+------------------------------------------------------------------------
+r158 | cauld | 2006-01-22 00:58:59 -0700 (Sun, 22 Jan 2006) | 1 line
+
+cauld - cleaning merge artifacts in index.php that were causing failures
+------------------------------------------------------------------------
+r157 | mambo | 2006-01-21 09:20:19 -0700 (Sat, 21 Jan 2006) | 1 line
+
+cauld - Merging in the final 4.5.4 branch revisions (155 & 156).
+
+The 4.5.4 branch is now closed.
+------------------------------------------------------------------------
+r153 | csouza | 2006-01-19 10:11:47 -0700 (Thu, 19 Jan 2006) | 1 line
+
+added debugging capabilities
+------------------------------------------------------------------------
+r152 | csouza | 2006-01-19 10:10:57 -0700 (Thu, 19 Jan 2006) | 1 line
+
+added gettext support to mamboCore::fixLanguage()
+------------------------------------------------------------------------
+r151 | csouza | 2006-01-19 07:24:56 -0700 (Thu, 19 Jan 2006) | 1 line
+
+csouza - Merging 4.5.4 changes (revisions 139 to 148) into 4.6.
+------------------------------------------------------------------------
+r150 | csouza | 2006-01-19 06:37:49 -0700 (Thu, 19 Jan 2006) | 1 line
+
+csouza - i18n - uploaded/removed i18n files
+------------------------------------------------------------------------
+r149 | csouza | 2006-01-19 06:29:35 -0700 (Thu, 19 Jan 2006) | 1 line
+
+csouza - i18n - uploaded several internationalized files
+------------------------------------------------------------------------
+r138 | csouza | 2006-01-16 04:12:43 -0700 (Mon, 16 Jan 2006) | 1 line
+
+csouza - Merging 4.5.4 changes (revisions 131 to 137) into 4.6.
+------------------------------------------------------------------------
+r129 | csouza | 2006-01-14 11:19:40 -0700 (Sat, 14 Jan 2006) | 1 line
+
+csouza - Merging 4.5.4 changes (revisions 118 to 127) into 4.6.
+------------------------------------------------------------------------
+r117 | mambo | 2006-01-07 14:26:39 -0700 (Sat, 07 Jan 2006) | 1 line
+
+cauld - Merging the current 4.5.4 changes (revisions 2 thru 99) into 4.6.
+------------------------------------------------------------------------
+r114 | mambo | 2006-01-06 14:16:56 -0700 (Fri, 06 Jan 2006) | 1 line
+
+cauld - merging 453h revisions 30 thru 38 into 4.6
+------------------------------------------------------------------------
+r113 | mambo | 2006-01-06 13:05:43 -0700 (Fri, 06 Jan 2006) | 1 line
+
+cauld - removing the old tinymce dir from 4.6.  it is causing merge issues with this branch as well.
+------------------------------------------------------------------------
+r112 | mambo | 2006-01-05 22:54:35 -0700 (Thu, 05 Jan 2006) | 1 line
+
+cauld - merging revisions 22 thru 30 into 4.6.
+------------------------------------------------------------------------
+r3 | root | 2005-12-12 20:49:45 -0700 (Mon, 12 Dec 2005) | 1 line
+
+creating branch
+------------------------------------------------------------------------
diff -ruN 4.5.4/administrator/components/com_admin/admin.admin.html.php 4.6rc2/administrator/components/com_admin/admin.admin.html.php
--- 4.5.4/administrator/components/com_admin/admin.admin.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_admin/admin.admin.html.php	2006-05-31 11:52:24.000000000 -0500
@@ -1,614 +1,588 @@
-<?php
-/**
-* @version $Id: admin.admin.html.php,v 1.3 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo Open Source
-* @subpackage Admin
-* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-*
-* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
-* that Mambo remained free Open Source software owned and managed by the community.
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* @package Mambo
-* @subpackage Admin
-*/
-class HTML_admin_misc {
-
-	/**
-	* Control panel
-	*/
-	function controlPanel() {
-	    global $mosConfig_absolute_path, $mainframe;
-		?>
-		<table class="adminheading" border="0">
-		<tr>
-			<th class="cpanel">
-			Home
-			</th>
-		</tr>
-		</table>
-		<table width="100%" class="adminheading">
-		<tr>
-		<?php if($_SESSION['simple_editing'] == 'on' || ($_SESSION['simple_editing'] == ''))
-		{
-			$_SESSION['simple_editing'] = 'on';
-		?>
-		<td align="left" width="20%">&nbsp;</td><td align="left" ><a class="selected" href="index2.php?option=simple_mode" title="Simple Mode (selected)">Simple Mode</a> / <a class="unselected" href="index2.php?option=advanced_mode" title="Advanced Mode (unselected)">Advanced Mode</a></td>
-		<?php }else{?>
-		<td align="left" width="20%">&nbsp;</td><td align="left" ><a class="unselected"href="index2.php?option=simple_mode" title="Simple Mode (unselected)" >Simple Mode</a> / <a class="selected" href="index2.php?option=advanced_mode" title="Advanced Mode (selected)">Advanced Mode</a></td>
-		<?php }?>
-		</tr>
-		</table>
-		<?php
-		$path = $mosConfig_absolute_path . '/administrator/templates/' . $mainframe->getTemplate() . '/cpanel.php';
-		if (file_exists( $path )) {
-		    require $path;
-		} else {
-		    echo '<br />';
-			mosLoadAdminModules( 'cpanel', 1 );
-		}
-	}
-
-	function get_php_setting($val) {
-		$r =  (ini_get($val) == '1' ? 1 : 0);
-		return $r ? 'ON' : 'OFF';
-	}
-
-	function get_server_software() {
-		if (isset($_SERVER['SERVER_SOFTWARE'])) {
-			return $_SERVER['SERVER_SOFTWARE'];
-		} else if (($sf = getenv('SERVER_SOFTWARE'))) {
-			return $sf;
-		} else {
-			return 'n/a';
-		}
-	}
-
-	function system_info( $version ) {
-		global $mosConfig_absolute_path, $database;
-		//$tab = mosGetParam( $_REQUEST, 'tab', 'tab1' );
-		$width = 400;	// width of 100%
-		$tabs = new mosTabs(0);
-		?>
-
-		<table class="adminheading">
-		<tr>
-			<th class="info">
-			Information
-			</th>
-		</tr>
-		</table>
-		<?php
-		$tabs->startPane("sysinfo");
-		$tabs->startTab("System Info","system-page");
-		?>
-		<table class="adminform">
-		<tr>
-			<th colspan="2">
-			System Information
-			</th>
-		</tr>
-		<tr>
-			<td valign="top" width="250">
-			<b>
-			PHP built On:
-			</b>
-			</td>
-			<td>
-			<?php echo php_uname(); ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<b>
-			Database Version:
-			</b>
-			</td>
-			<td>
-			<?php echo mysql_get_server_info(); ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<b>
-			PHP Version:
-			</b>
-			</td>
-			<td>
-			<?php echo phpversion(); ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<b>
-			Web Server:
-			</b>
-			</td>
-			<td>
-			<?php echo HTML_admin_misc::get_server_software(); ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<b>
-			WebServer to PHP interface:
-			</b>
-			</td>
-			<td>
-			<?php echo php_sapi_name(); ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<b>
-			Mambo Version:
-			</b>
-			</td>
-			<td>
-			<?php echo $version; ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<b>
-			User Agent:
-			</b>
-			</td>
-			<td>
-			<?php echo phpversion() <= "4.2.1" ? getenv( "HTTP_USER_AGENT" ) : $_SERVER['HTTP_USER_AGENT'];?>
-			</td>
-		</tr>
-		<tr>
-			<td valign="top">
-			<b>
-			Relevant PHP Settings:
-			</b>
-			</td>
-			<td>
-				<table cellspacing="1" cellpadding="1" border="0">
-				<tr>
-					<td>
-					Safe Mode:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('safe_mode'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Open basedir:
-					</td>
-					<td>
-					<?php echo (($ob = ini_get('open_basedir')) ? $ob : 'none'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Display Errors:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('display_errors'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Short Open Tags:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('short_open_tag'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					File Uploads:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('file_uploads'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Magic Quotes:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('magic_quotes_gpc'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Register Globals:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('register_globals'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Output Buffering:
-					</td>
-					<td>
-					<?php echo HTML_admin_misc::get_php_setting('output_buffering'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Session save path:
-					</td>
-					<td>
-					<?php echo (($sp=ini_get('session.save_path'))?$sp:'none'); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Session auto start:
-					</td>
-					<td>
-					<?php echo intval( ini_get( 'session.auto_start' ) ); ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					XML enabled:
-					</td>
-					<td>
-					<?php echo extension_loaded('xml')?'Yes':'No'; ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Zlib enabled:
-					</td>
-					<td>
-					<?php echo extension_loaded('zlib')?'Yes':'No'; ?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					Disabled Functions:
-					</td>
-					<td>
-					<?php echo (($df=ini_get('disable_functions'))?$df:'none'); ?>
-					</td>
-				</tr>
-				<?php
-				$query = "SELECT name FROM #__mambots"
-				. "\nWHERE folder='editors' AND published='1'"
-				. "\nLIMIT 1";
-				$database->setQuery( $query );
-				$editor = $database->loadResult();
-				?>
-				<tr>
-					<td>
-					WYSIWYG Editor:
-					</td>
-					<td>
-					<?php echo $editor; ?>
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td valign="top">
-			<b>
-			Configuration File:
-			</b>
-			</td>
-			<td>
-			<?php
-			$cf = file( $mosConfig_absolute_path . '/configuration.php' );
-			foreach ($cf as $k=>$v) {
-				if (eregi( 'mosConfig_host', $v)) {
-					$cf[$k] = '$mosConfig_host = \'xxxxxx\'';
-				} else if (eregi( 'mosConfig_user', $v)) {
-					$cf[$k] = '$mosConfig_user = \'xxxxxx\'';
-				} else if (eregi( 'mosConfig_password', $v)) {
-					$cf[$k] = '$mosConfig_password = \'xxxxxx\'';
-				} else if (eregi( 'mosConfig_db ', $v)) {
-					$cf[$k] = '$mosConfig_db = \'xxxxxx\'';
-				} else if (eregi( '<?php', $v)) {
-					$cf[$k] = '&lt;?php';
-				}
-			}
-			echo implode( "<br />", $cf );
-			?>
-			</td>
-		</tr>
-		</table>
-		<?php
-		$tabs->endTab();
-		$tabs->startTab("PHP Info","php-page");
-		?>
-		<table class="adminform">
-		<tr>
-			<th colspan="2">
-			PHP Information
-			</th>
-		</tr>
-		<tr>
-			<td>
-			<?php
-			ob_start();
-			phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
-			$phpinfo = ob_get_contents();
-			ob_end_clean();
-			preg_match_all('#<body[^>]*>(.*)</body>#siU', $phpinfo, $output);
-			$output = preg_replace('#<table#', '<table class="adminlist" align="center"', $output[1][0]);
-			$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
-			$output = preg_replace('#border="0" cellpadding="3" width="600"#', 'border="0" cellspacing="1" cellpadding="4" width="95%"', $output);
-			$output = preg_replace('#<hr />#', '', $output);
-			echo $output;
-			?>
-			</td>
-		</tr>
-		</table>
-		<?php
-		$tabs->endTab();
-		$tabs->startTab('Permissions','perms');
-		?>
-		<table class="adminform">
-          <tr>
-            <th colspan="2"> Directory Permissions</th>
-          </tr>
-          <tr>
-            <td>
-        <strong>For all Mambo functions and features to work ALL of the following directories should be writeable:</strong>
-			<?php
-mosHTML::writableCell( 'administrator/backups' );
-mosHTML::writableCell( 'administrator/components' );
-mosHTML::writableCell( 'administrator/modules' );
-mosHTML::writableCell( 'administrator/templates' );
-mosHTML::writableCell( 'cache' );
-mosHTML::writableCell( 'components' );
-mosHTML::writableCell( 'images' );
-mosHTML::writableCell( 'images/banners' );
-mosHTML::writableCell( 'images/stories' );
-mosHTML::writableCell( 'language' );
-mosHTML::writableCell( 'mambots' );
-mosHTML::writableCell( 'mambots/content' );
-mosHTML::writableCell( 'mambots/search' );
-mosHTML::writableCell( 'media' );
-mosHTML::writableCell( 'modules' );
-mosHTML::writableCell( 'templates' );
-
-?>
-
-            </td>
-          </tr>
-        </table>
-		<?php
-		$tabs->endTab();
-		$tabs->endPane();
-		?>
-		<?php
-	}
-
-	function ListComponents() {
-			mosLoadAdminModule( 'components' );
-		}
-
-	/**
-	* Display Help Page
-	*/
-	function help() {
-		global $mosConfig_live_site;
-		$helpurl = mosGetParam( $GLOBALS, 'mosConfig_helpurl', '' );
-		$fullhelpurl = $helpurl . '/index2.php?option=com_content&amp;task=findkey&pop=1&keyref=';  // This line don't used?  NineKrit
-		$fullhelpurl = $helpurl.'/help/';   // add by NineKrit
-//      $helpexit=file_exists( $helpurl.'/help/454.mambo.whatsnew.html' );
-		$helpexit=true;
-		$helpsearch = mosGetParam( $_REQUEST, 'helpsearch', '' );
-		$page 		= mosGetParam( $_REQUEST, 'page', '454.mambo.whatsnew.html' );
-		$toc 		= getHelpToc( $helpsearch );
-		if (!eregi( '\.html$', $page )) {
-			$page .= '.xml';
-		}
-		?>
-		<style type="text/css">
-		.helpIndex {
-			border: 0px;
-			width: 95%;
-			height: 100%;
-			padding: 0px 5px 0px 10px;
-			overflow: auto;
-		}
-		.helpFrame {
-			border-left: 0px solid #222;
-			border-right: none;
-			border-top: none;
-			border-bottom: none;
-			width: 100%;
-			height: 700px;
-			padding: 0px 5px 0px 10px;
-		}
-		</style>
-		<form name="adminForm">
-		<table class="adminform" border="1">
-		<tr>
-			<th colspan="2" class="title">
-			Help
-			</th>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<table width="100%">
-				<tr>
-					<td>
-					<strong>Search:</strong>
-					<input class="text_area" type="hidden" name="option" value="com_admin" />
-					<input type="text" name="helpsearch" value="<?php echo $helpsearch;?>" class="inputbox" />
-					<input type="submit" value="Go" class="button" />
-					<input type="button" value="Clear Results" class="button" onclick="f=document.adminForm;f.helpsearch.value='';f.submit()" />
-					</td>
-					<td style="text-align:right">
-					<?php
-//					if ($helpurl) {    // change to check the exist file
-					if ($helpexit) {
-					?>
-					<a href="<?php echo $fullhelpurl;?>454.mambo.glossary.html" target="helpFrame">
-						Glossary</a>
-					|
-					<a href="<?php echo $fullhelpurl;?>454.mambo.credits.html" target="helpFrame">
-						Credits</a>
-					|
-					<a href="<?php echo $fullhelpurl;?>454.mambo.support.html" target="helpFrame">
-						Support</a>
-					<?php
-					} else {
-					?>
-					<a href="<?php echo $mosConfig_live_site;?>/help/454.mambo.glossary.html" target="helpFrame">
-						Glossary</a>
-					|
-					<a href="<?php echo $mosConfig_live_site;?>/help/454.mambo.credits.html" target="helpFrame">
-						Credits</a>
-					|
-					<a href="<?php echo $mosConfig_live_site;?>/help/454.mambo.support.html" target="helpFrame">
-						Support</a>
-					<?php
-					}
-					?>
-					|
-					<a href="http://www.gnu.org/copyleft/gpl.html" target="helpFrame">
-						License</a>
-					|
-					<a href="http://help.mamboserver.com" target="_blank">
-						help.mamboserver.com</a>
-					|
-					<a href="<?php echo $mosConfig_live_site;?>/administrator/index2.php?option=com_admin&task=sysinfo&no_html=1" target="helpFrame">
-						System Info</a>
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr valign="top">
-			<td width="20%" valign="top">
-				<strong>Index</strong>
-				<div class="helpIndex">
-				<?php
-				foreach ($toc as $k=>$v) {
-//					if ($helpurl) {
-				if ($helpexit) {
-						echo '<br /><a href="' . $fullhelpurl . urlencode( $k ) . '" target="helpFrame">' . $v . '</a>';
-					} else {
-						echo '<br /><a href="' . $mosConfig_live_site . '/help/' . $k . '" target="helpFrame">' . $v . '</a>';
-					}
-				}
-				?>
-				</div>
-			</td>
-			<td valign="top">
-				<iframe name="helpFrame" src="<?php echo $mosConfig_live_site . '/help/' . $page;?>" class="helpFrame" frameborder="0" /></iframe>
-			</td>
-		</tr>
-		</table>
-		
-		<input type="hidden" name="task" value="help" />
-		</form>
-		<?php
-	}
-
-	/**
-	* Preview site
-	*/
-	function preview( $tp=0 ) {
-	    global $mosConfig_live_site;
-	    $tp = intval( $tp );
-		?>
-		<style type="text/css">
-		.previewFrame {
-			border: none;
-			width: 95%;
-			height: 600px;
-			padding: 0px 5px 0px 10px;
-		}
-		</style>
-		<table class="adminform">
-		<tr>
-			<th width="50%" class="title">
-			Site Preview
-			</th>
-			<th width="50%" style="text-align:right">
-			<a href="<?php echo $mosConfig_live_site . '/index.php?tp=' . $tp;?>" target="_blank">
-			Open in new window
-			</a>
-			</th>
-		</tr>
-		<tr>
-			<td width="100%" valign="top" colspan="2">
-			<iframe name="previewFrame" src="<?php echo $mosConfig_live_site . '/index.php?tp=' . $tp;?>" class="previewFrame" /></iframe>
-			</td>
-		</tr>
-		</table>
-		<?php
-	}
-}
-
-/**
- * Compiles the help table of contents
- * @param string A specific keyword on which to filter the resulting list
- */
-function getHelpTOC( $helpsearch ) {
-	global $mosConfig_absolute_path;
-	$helpurl = mosGetParam( $GLOBALS, 'mosConfig_helpurl', '' );
-
-	$files = mosReadDirectory( $mosConfig_absolute_path . '/help/', '\.xml$|\.html$' );
-
-	require_once( $mosConfig_absolute_path . '/includes/domit/xml_domit_lite_include.php' );
-
-	$toc = array();
-	foreach ($files as $file) {
-		$buffer = file_get_contents( $mosConfig_absolute_path . '/help/' . $file );
-		if (preg_match( '#<title>(.*?)</title>#', $buffer, $m )) {
-			$title = trim( $m[1] );
-			if ($title) {
-//				if ($helpurl) {
-				if ($helpexit) {
-					// strip the extension
-					$file = preg_replace( '#\.xml$|\.html$#', '', $file );
-				}
-		        if ($helpsearch) {
-		            if (strpos( strip_tags( $buffer ), $helpsearch ) !== false) {
-				    	$toc[$file] = $title;
-					}
-				} else {
-				    $toc[$file] = $title;
-				}
-			}
-		}
-		/*
-		$xmlDoc =& new DOMIT_Lite_Document();
-		$xmlDoc->resolveErrors( true );
-		echo "<br>$file ";
-	    if ($xmlDoc->loadXML( $mosConfig_absolute_path . '/help/' . $file, false, true )) {
-	    	if (eregi( '\.html$', $file )) {
-	    		// html file
-	    		$elem = $xmlDoc->getElementsByPath( 'head/title', 1 );
-	    	} else {
-	    		// xml file
-			    $elem = $xmlDoc->getElementsByPath( 'title', 1 );
-	    	}
-		    if ($elem) {
-		        if ($helpsearch) {
-		            if (strpos( $xmlDoc->getText(), $helpsearch ) !== false) {
-				    	$toc[$file] = $elem->getText();
-					}
-				} else {
-				    $toc[$file] = $elem->getText();
-				}
-			}
-		} else {
-			echo $xmlDoc->getErrorString();
-	    }
-	    */
-	}
-	asort( $toc );
-	return $toc;
-}
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Admin
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+class HTML_admin_misc {
+
+	/**
+	* Control panel
+	*/
+	function controlPanel() {
+	    global $mosConfig_absolute_path, $mainframe;
+		?>
+		<table class="adminheading" border="0">
+		<tr>
+			<th class="cpanel">
+			<?php echo T_('Home') ?>
+			</th>
+		</tr>
+		</table>
+		<table width="100%" class="adminheading">
+		<tr>
+		<?php if($_SESSION['simple_editing'] == 'on' )
+		{
+			$_SESSION['simple_editing'] = 'on';
+		?>
+		<td align="left" width="20%">&nbsp;</td><td align="left" ><a class="selected" href="index2.php?option=simple_mode" title="<?php echo T_('Simple Mode') ?> (<?php echo T_('selected') ?>)"><?php echo T_('Simple Mode') ?></a> / <a class="unselected" href="index2.php?option=advanced_mode" title="<?php echo T_('Advanced Mode') ?> (<?php echo T_('unselected') ?>)"><?php echo T_('Advanced Mode') ?></a></td>
+		<?php }else{
+			$_SESSION['simple_editing'] = 'off';
+		?>
+		<td align="left" width="20%">&nbsp;</td><td align="left" ><a class="unselected"href="index2.php?option=simple_mode" title="<?php echo T_('Simple Mode') ?> (<?php echo T_('unselected') ?>)" ><?php echo T_('Simple Mode') ?></a> / <a class="selected" href="index2.php?option=advanced_mode" title="<?php echo T_('Advanced Mode') ?> (<?php echo T_('selected') ?>)"><?php echo T_('Advanced Mode') ?></a></td>
+		<?php }?>
+		</tr>
+		</table>
+		<?php
+		$path = $mosConfig_absolute_path . '/administrator/templates/' . $mainframe->getTemplate() . '/cpanel.php';
+		if (file_exists( $path )) {
+		    require $path;
+		} else {
+		    echo '<br />';
+			mosLoadAdminModules( 'cpanel', 1 );
+		}
+	}
+
+	function get_php_setting($val) {
+		$r =  (ini_get($val) == '1' ? 1 : 0);
+		return $r ? 'ON' : 'OFF';
+	}
+
+	function get_server_software() {
+		if (isset($_SERVER['SERVER_SOFTWARE'])) {
+			return $_SERVER['SERVER_SOFTWARE'];
+		} else if (($sf = getenv('SERVER_SOFTWARE'))) {
+			return $sf;
+		} else {
+			return 'n/a';
+		}
+	}
+
+	function system_info( $version ) {
+		global $mosConfig_absolute_path, $database;
+		//$tab = mosGetParam( $_REQUEST, 'tab', 'tab1' );
+		$width = 400;	// width of 100%
+		$tabs = new mosTabs(0);
+		?>
+
+		<table class="adminheading">
+		<tr>
+			<th class="info">
+			<?php echo T_('Information') ?>
+			</th>
+		</tr>
+		</table>
+		<?php
+		$tabs->startPane("sysinfo");
+		$tabs->startTab(T_("System Info"),"system-page");
+		?>
+		<table class="adminform">
+		<tr>
+			<th colspan="2">
+			<?php echo T_('System Information') ?>
+			</th>
+		</tr>
+		<tr>
+			<td valign="top" width="250">
+			<b>
+			<?php echo T_('PHP built On:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo php_uname(); ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<b>
+			<?php echo T_('Database Version:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo mysql_get_server_info(); ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<b>
+			<?php echo T_('PHP Version:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo phpversion(); ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<b>
+			<?php echo T_('Web Server:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo HTML_admin_misc::get_server_software(); ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<b>
+			<?php echo T_('WebServer to PHP interface:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo php_sapi_name(); ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<b>
+			<?php echo T_('Mambo Version:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo $version; ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<b>
+			<?php echo T_('User Agent:') ?>
+			</b>
+			</td>
+			<td>
+			<?php echo phpversion() <= "4.2.1" ? getenv( "HTTP_USER_AGENT" ) : $_SERVER['HTTP_USER_AGENT'];?>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<b>
+			<?php echo T_('Relevant PHP Settings:') ?>
+			</b>
+			</td>
+			<td>
+				<table cellspacing="1" cellpadding="1" border="0">
+				<tr>
+					<td>
+					<?php echo T_('Safe Mode:') ?>
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('safe_mode'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Open basedir:') ?>
+					</td>
+					<td>
+					<?php echo (($ob = ini_get('open_basedir')) ? $ob : 'none'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Display Errors:') ?>
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('display_errors'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Short Open Tags:') ?>
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('short_open_tag'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('File Uploads:') ?>
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('file_uploads'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Magic Quotes') ?>:
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('magic_quotes_gpc'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Register Globals:') ?>
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('register_globals'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Output Buffering:') ?>
+					</td>
+					<td>
+					<?php echo HTML_admin_misc::get_php_setting('output_buffering'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Session save path:') ?>
+					</td>
+					<td>
+					<?php echo (($sp=ini_get('session.save_path'))?$sp:'none'); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Session auto start:') ?>
+					</td>
+					<td>
+					<?php echo intval( ini_get( 'session.auto_start' ) ); ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('XML enabled:') ?>
+					</td>
+					<td>
+					<?php echo extension_loaded('xml')?'Yes':'No'; ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Zlib enabled:') ?>
+					</td>
+					<td>
+					<?php echo extension_loaded('zlib')?'Yes':'No'; ?>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<?php echo T_('Disabled Functions:') ?>
+					</td>
+					<td>
+					<?php echo (($df=ini_get('disable_functions'))?$df:'none'); ?>
+					</td>
+				</tr>
+				<?php
+				$query = "SELECT name FROM #__mambots"
+				. "\nWHERE folder='editors' AND published='1'"
+				. "\nLIMIT 1";
+				$database->setQuery( $query );
+				$editor = $database->loadResult();
+				?>
+				<tr>
+					<td>
+					<?php echo T_('WYSIWYG Editor:') ?>
+					</td>
+					<td>
+					<?php echo $editor; ?>
+					</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<b>
+			<?php echo T_('Configuration File:') ?>
+			</b>
+			</td>
+			<td>
+			<?php
+			$cf = file( $mosConfig_absolute_path . '/configuration.php' );
+			foreach ($cf as $k=>$v) {
+				if (eregi( 'mosConfig_host', $v)) {
+					$cf[$k] = '$mosConfig_host = \'xxxxxx\'';
+				} else if (eregi( 'mosConfig_user', $v)) {
+					$cf[$k] = '$mosConfig_user = \'xxxxxx\'';
+				} else if (eregi( 'mosConfig_password', $v)) {
+					$cf[$k] = '$mosConfig_password = \'xxxxxx\'';
+				} else if (eregi( 'mosConfig_db ', $v)) {
+					$cf[$k] = '$mosConfig_db = \'xxxxxx\'';
+				} else if (eregi( '<?php', $v)) {
+					$cf[$k] = '&lt;?php';
+				}
+			}
+			echo implode( "<br />", $cf );
+			?>
+			</td>
+		</tr>
+		</table>
+		<?php
+		$tabs->endTab();
+		$tabs->startTab(T_("PHP Info"),"php-page");
+		?>
+		<table class="adminform">
+		<tr>
+			<th colspan="2">
+			<?php echo T_('PHP Information') ?>
+			</th>
+		</tr>
+		<tr>
+			<td>
+			<?php
+			ob_start();
+			phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
+			$phpinfo = ob_get_contents();
+			ob_end_clean();
+			preg_match_all('#<body[^>]*>(.*)</body>#siU', $phpinfo, $output);
+			$output = preg_replace('#<table#', '<table class="adminlist" align="center"', $output[1][0]);
+			$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
+			$output = preg_replace('#border="0" cellpadding="3" width="600"#', 'border="0" cellspacing="1" cellpadding="4" width="95%"', $output);
+			$output = preg_replace('#<hr />#', '', $output);
+			echo $output;
+			?>
+			</td>
+		</tr>
+		</table>
+		<?php
+		$tabs->endTab();
+		$tabs->startTab(T_('Permissions'),'perms');
+		?>
+		<table class="adminform">
+          <tr>
+            <th colspan="2"> <?php echo T_('Directory Permissions') ?></th>
+          </tr>
+          <tr>
+            <td>
+        <strong><?php echo T_('For all Mambo functions and features to work ALL of the following directories should be writeable:') ?></strong>
+			<?php
+mosHTML::writableCell( 'administrator/backups' );
+mosHTML::writableCell( 'administrator/components' );
+mosHTML::writableCell( 'administrator/modules' );
+mosHTML::writableCell( 'administrator/templates' );
+mosHTML::writableCell( 'cache' );
+mosHTML::writableCell( 'components' );
+mosHTML::writableCell( 'images' );
+mosHTML::writableCell( 'images/banners' );
+mosHTML::writableCell( 'images/stories' );
+mosHTML::writableCell( 'language' );
+mosHTML::writableCell( 'mambots' );
+mosHTML::writableCell( 'mambots/content' );
+mosHTML::writableCell( 'mambots/editors' );
+mosHTML::writableCell( 'mambots/editors-xtd' );
+mosHTML::writableCell( 'mambots/search' );
+mosHTML::writableCell( 'media' );
+mosHTML::writableCell( 'modules' );
+mosHTML::writableCell( 'templates' );
+
+?>
+
+            </td>
+          </tr>
+        </table>
+		<?php
+		$tabs->endTab();
+		$tabs->endPane();
+		?>
+		<?php
+	}
+
+	function ListComponents() {
+			mosLoadAdminModule( 'components' );
+		}
+
+	/**
+	* Display Help Page
+	*/
+	function help() {
+		global $mosConfig_live_site;
+		$helpurl = mosGetParam( $GLOBALS, 'mosConfig_helpurl', '' );
+		$helpurl = false;
+		$fullhelpurl = $helpurl . '/index2.php?option=com_content&amp;task=findkey&pop=1&keyref=';
+		$fullhelpurl = $mosConfig_live_site.'/help/';
+
+		$helpsearch = mosGetParam( $_REQUEST, 'helpsearch', '' );
+		$page 		= mosGetParam( $_REQUEST, 'page', 'mambo.whatsnew.html' );
+		$toc 		= getHelpToc( $helpsearch );
+		if (!eregi( '\.html$', $page )) {
+			$page .= '.xml';
+		}
+		?>
+		<style type="text/css">
+		.helpIndex {
+			border: 0px;
+			width: 95%;
+			height: 100%;
+			padding: 0px 5px 0px 10px;
+			overflow: auto;
+		}
+		.helpFrame {
+			border-left: 0px solid #222;
+			border-right: none;
+			border-top: none;
+			border-bottom: none;
+			width: 100%;
+			height: 700px;
+			padding: 0px 5px 0px 10px;
+		}
+		</style>
+		<form name="adminForm">
+		<table class="adminform" border="1">
+		<tr>
+			<th colspan="2" class="title">
+			<?php echo T_('Help') ?>
+			</th>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<table width="100%">
+				<tr>
+					<td>
+					<strong><?php echo T_('Search:') ?></strong>
+					<input class="text_area" type="hidden" name="option" value="com_admin" />
+					<input type="text" name="helpsearch" value="<?php echo $helpsearch;?>" class="inputbox" />
+					<input type="submit" value="<?php echo T_('Go') ?>" class="button" />
+					<input type="button" value="<?php echo T_('Clear Results') ?>" class="button" onclick="f=document.adminForm;f.helpsearch.value='';f.submit()" />
+					</td>
+					<td style="text-align:right">
+					<?php
+					if ($helpurl) {
+					?>
+					<a href="<?php echo $fullhelpurl;?>mambo.glossary" target="helpFrame">
+						<?php echo T_('Glossary') ?></a>
+					|
+					<a href="<?php echo $fullhelpurl;?>mambo.credits" target="helpFrame">
+						<?php echo T_('Credits') ?></a>
+					|
+					<a href="<?php echo $fullhelpurl;?>mambo.support" target="helpFrame">
+						<?php echo T_('Support') ?></a>
+					<?php
+					} else {
+					?>
+					<a href="<?php echo $mosConfig_live_site;?>/help/mambo.glossary.html" target="helpFrame">
+						<?php echo T_('Glossary') ?></a>
+					|
+					<a href="<?php echo $mosConfig_live_site;?>/help/mambo.credits.html" target="helpFrame">
+						<?php echo T_('Credits') ?></a>
+					|
+					<a href="<?php echo $mosConfig_live_site;?>/help/mambo.support.html" target="helpFrame">
+						<?php echo T_('Support') ?></a>
+					<?php
+					}
+					?>
+					|
+					<a href="http://www.gnu.org/copyleft/gpl.html" target="helpFrame">
+						<?php echo T_('License') ?></a>
+					|
+					<a href="http://help.mamboserver.com" target="_blank">
+						help.mamboserver.com</a>
+					|
+					<a href="<?php echo $mosConfig_live_site;?>/administrator/index2.php?option=com_admin&task=sysinfo&no_html=1" target="helpFrame">
+						<?php echo T_('System Info') ?></a>
+					</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		<tr valign="top">
+			<td width="20%" valign="top">
+			<?php if ($helpsearch):?>
+				<strong><?php echo T_('Search Results') ?></strong>
+			<?php else :?>
+				<strong><?php echo T_('Index') ?></strong>
+		    <?php endif;?>
+				<div class="helpIndex">
+				<?php
+				foreach ($toc as $k=>$v) {
+					if ($helpurl) {
+						echo '<br /><a href="' . $fullhelpurl . urlencode( $k ) . '" target="helpFrame">' . $v . '</a>';
+					} else {
+						echo '<br /><a href="' . $mosConfig_live_site . '/help/' . $k . '" target="helpFrame">' . $v . '</a>';
+					}
+				}
+				?>
+				</div>
+			</td>
+			<td valign="top">
+				<iframe name="helpFrame" src="<?php echo $mosConfig_live_site . '/help/' . $page;?>" class="helpFrame" frameborder="0" /></iframe>
+			</td>
+		</tr>
+		</table>
+
+		<input type="hidden" name="task" value="help" />
+		</form>
+		<?php
+	}
+
+	/**
+	* Preview site
+	*/
+	function preview( $tp=0 ) {
+	    global $mosConfig_live_site;
+	    $tp = intval( $tp );
+		?>
+		<style type="text/css">
+		.previewFrame {
+			border: none;
+			width: 95%;
+			height: 600px;
+			padding: 0px 5px 0px 10px;
+		}
+		</style>
+		<table class="adminform">
+		<tr>
+			<th width="50%" class="title">
+			<?php echo T_('Site Preview') ?>
+			</th>
+			<th width="50%" style="text-align:right">
+			<a href="<?php echo $mosConfig_live_site . '/index.php?tp=' . $tp;?>" target="_blank">
+			<?php echo T_('Open in new window') ?>
+			</a>
+			</th>
+		</tr>
+		<tr>
+			<td width="100%" valign="top" colspan="2">
+			<iframe name="previewFrame" src="<?php echo $mosConfig_live_site . '/index.php?tp=' . $tp;?>" class="previewFrame" /></iframe>
+			</td>
+		</tr>
+		</table>
+		<?php
+	}
+}
+
+/**
+ * Compiles the help table of contents
+ * @param string A specific keyword on which to filter the resulting list
+ */
+function getHelpTOC( $helpsearch ) {
+	global $mosConfig_absolute_path;
+	$helpurl = mosGetParam( $GLOBALS, 'mosConfig_helpurl', '' );
+	$helpurl = mamboCore::get('mosConfig_live_site');
+
+	$files = mosReadDirectory( $mosConfig_absolute_path . '/help/', '\.xml$|\.html$' );
+
+	$toc = array();
+	foreach ($files as $file) {
+		$buffer = file_get_contents( $mosConfig_absolute_path . '/help/' . $file );
+		if (preg_match( '#<title>(.*?)</title>#', $buffer, $m )) {
+			$title = trim( $m[1] );
+			if ($title) {
+				if ($helpurl) {
+					// strip the extension
+					#$file = preg_replace( '#\.xml$|\.html$#', '', $file );
+				}
+		        if ($helpsearch) {
+		            if (stripos( strip_tags( $buffer ), $helpsearch ) !== false) {
+				    	$toc[$file] = $title;
+					}
+				} else {
+				    $toc[$file] = $title;
+				}
+			}
+		}
+	}
+	asort( $toc );
+	return $toc;
+}
+?>
diff -ruN 4.5.4/administrator/components/com_admin/admin.admin.php 4.6rc2/administrator/components/com_admin/admin.admin.php
--- 4.5.4/administrator/components/com_admin/admin.admin.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_admin/admin.admin.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.admin.php,v 1.1 2005/07/22 01:51:58 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Admin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -17,7 +19,7 @@
 	case 'redirect':
 		$goto = trim( strtolower( mosGetParam( $_REQUEST, 'link' ) ) );
 		if ($goto == 'null') {
-			$msg = 'There is no link associated with this item';
+			$msg = T_('There is no link associated with this item');
 			mosRedirect( 'index2.php?option=com_admin&task=listcomponents', $msg );
 			exit();
 		}
diff -ruN 4.5.4/administrator/components/com_admin/toolbar.admin.html.php 4.6rc2/administrator/components/com_admin/toolbar.admin.html.php
--- 4.5.4/administrator/components/com_admin/toolbar.admin.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_admin/toolbar.admin.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,21 +1,19 @@
 <?php
 /**
-* @version $Id: toolbar.admin.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Admin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Admin
-*/
 class TOOLBAR_admin {
 	function _SYSINFO() {
 		mosMenuBar::startTable();
-		mosMenuBar::help( '453.screen.system.info' );
+		mosMenuBar::help( 'system.info' );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -23,7 +21,7 @@
 	*/
 	function _CPANEL() {
 		mosMenuBar::startTable();
-		mosMenuBar::help( '453.screen.cpanel' );
+		mosMenuBar::help( 'cpanel' );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -31,7 +29,7 @@
 	*/
 	function _DEFAULT() {
 		mosMenuBar::startTable();
-		//mosMenuBar::help( '454.screen.system.info' );
+		mosMenuBar::help( 'cpanel' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_admin/toolbar.admin.php 4.6rc2/administrator/components/com_admin/toolbar.admin.php
--- 4.5.4/administrator/components/com_admin/toolbar.admin.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_admin/toolbar.admin.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.admin.php,v 1.1 2005/07/22 01:51:58 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Admin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_banners/admin.banners.html.php 4.6rc2/administrator/components/com_banners/admin.banners.html.php
--- 4.5.4/administrator/components/com_banners/admin.banners.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_banners/admin.banners.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.banners.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Banners
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Banners
-*/
 class HTML_banners {
 
 	function showBanners( &$rows, &$pageNav, $option ) {
@@ -26,7 +24,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Banner Manager
+			<?php echo T_('Banner Manager') ?>
 			</th>
 		</tr>
 		</table>
@@ -40,22 +38,22 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th align="left" nowrap>
-			Banner Name
+			<?php echo T_('Banner Name') ?>
 			</th>
 			<th width="10%" nowrap>
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th width="11%" nowrap>
-			Impressions Made
+			<?php echo T_('Impressions Made') ?>
 			</th>
 			<th width="11%" nowrap>
-			Impressions Left
+			<?php echo T_('Impressions Left') ?>
 			</th>
 			<th width="8%">
-			Clicks
+			<?php echo T_('Clicks') ?>
 			</th>
 			<th width="8%" nowrap>
-			% Clicks
+			% <?php echo T_('Clicks') ?>
 			</th>
 		</tr>
 		<?php
@@ -96,7 +94,7 @@
 					echo $row->name;
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Banner">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Banner') ?>">
 					<?php echo $row->name; ?>
 					</a>
 					<?php
@@ -156,13 +154,13 @@
 			}
 			// do field validation
 			if (form.name.value == "") {
-				alert( "You must provide a banner name." );
+				alert( "<?php echo T_('You must provide a banner name') ?>." );
 			} else if (getSelectedValue('adminForm','cid') < 1) {
-				alert( "Please select a client." );
+				alert( "<?php echo T_('Please select a client') ?>." );
 			} else if (!getSelectedValue('adminForm','imageurl')) {
-				alert( "Please select an image." );
+				alert( "<?php echo T_('Please select an image.') ?>" );
 			} else if (form.clickurl.value == "") {
-				alert( "Please fill in the URL for the banner." );
+				alert( "<?php echo T_('Please fill in the URL for the banner.') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -173,9 +171,9 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Banner:
+			<?php echo T_('Banner:') ?>
 			<small>
-			<?php echo $_row->cid ? 'Edit' : 'New';?>
+			<?php echo $_row->cid ? T_('Edit') : T_('New');?>
 			</small>
 			</th>
 		</tr>
@@ -184,12 +182,12 @@
 		<table class="adminform">
 		<tr>
 			<th colspan="2">
-			Details
+			<?php echo T_('Details') ?>
 			</th>
 		</tr>
 		<tr>
 			<td width="20%">
-			Banner Name:
+			<?php echo T_('Banner Name:') ?>
 			</td>
 			<td width="80%">
 			<input class="inputbox" type="text" name="name" value="<?php echo $_row->name;?>">
@@ -197,7 +195,7 @@
 		</tr>
 		<tr>
 			<td>
-			Client Name:
+			<?php echo T_('Client Name:') ?>
 			</td>
 			<td align="left">
 			<?php echo $lists['cid']; ?>
@@ -205,7 +203,7 @@
 		</tr>
 		<tr>
 			<td>
-			Impressions Purchased:
+			<?php echo T_('Impressions Purchased:') ?>
 			</td>
 			<?php
 			if ($_row->imptotal == "0") {
@@ -216,12 +214,12 @@
 			}
 			?>
 			<td>
-			<input class="inputbox" type="text" name="imptotal" size="12" maxlength="11" value="<?php echo $_row->imptotal;?>">&nbsp;Unlimited <input type="checkbox" name="unlimited" <?php echo $unlimited;?>>
+			<input class="inputbox" type="text" name="imptotal" size="12" maxlength="11" value="<?php echo $_row->imptotal;?>">&nbsp;<?php echo T_('Unlimited') ?> <input type="checkbox" name="unlimited" <?php echo $unlimited;?>>
 			</td>
 		</tr>
 		<tr>
 			<td valign="top">
-			Banner URL:
+			<?php echo T_('Banner URL') ?>:
 			</td>
 			<td align="left">
 			<?php echo $lists['imageurl']; ?>
@@ -229,7 +227,7 @@
 		</tr>
 		<tr>
 			<td>
-			Show Banner :
+			<?php echo T_('Show Banner :') ?>
 			</td>
 			<td>
 			<?php echo $lists['showBanner']; ?>
@@ -237,7 +235,7 @@
 		</tr>
 		<tr>
 			<td>
-			Click URL:
+			<?php echo T_('Click URL:') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="clickurl" size="50" maxlength="200" value="<?php echo $_row->clickurl;?>">
@@ -245,7 +243,7 @@
 		</tr>
 		<tr>
 			<td valign="top">
-			Custom banner code:
+			<?php echo T_('Custom banner code:') ?>
 			</td>
 			<td>
 			<textarea class="inputbox" cols="70" rows="5" name="custombannercode"><?php echo $_row->custombannercode;?></textarea>
@@ -253,9 +251,9 @@
 		</tr>
 		<tr >
 			<td valign="top" align="right">
-			Clicks
+			<?php echo T_('Clicks') ?>
 			<br/>
-			<input name="reset_hits" type="button" class="button" value="Reset Clicks" onClick="submitbutton('resethits');">
+			<input name="reset_hits" type="button" class="button" value="<?php echo T_('Reset Clicks') ?>" onClick="submitbutton('resethits');">
 			</td>
 			<td colspan="2">
 			<?php echo $_row->clicks;?>
@@ -267,7 +265,7 @@
 		</tr>
 		<tr>
 			<td valign="top">
-			Banner Image:
+			<?php echo T_('Banner Image:') ?>
 			</td>
 			<td valign="top">
 			<?php
@@ -317,7 +315,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Banner Client Manager
+			<?php echo T_('Banner Client Manager') ?>
 			</th>
 		</tr>
 		</table>
@@ -331,13 +329,16 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th align="left" nowrap>
-			Client Name
+			<?php echo T_('Client Name') ?>
+			</th>
+			<th align="left" nowrap>
+			<?php echo T_('Client ID') ?>
 			</th>
 			<th align="left" nowrap>
-			Contact
+			<?php echo T_('Contact') ?>
 			</th>
 			<th align="center" nowrap>
-			No. of Active Banners
+			<?php echo T_('No. of Active Banners') ?>
 			</th>
 		</tr>
 		<?php
@@ -357,20 +358,23 @@
 				<td width="20">
 				<?php echo $checked; ?>
 				</td>
-				<td width="40%">
+				<td width="30%">
 				<?php
 				if ( $row->checked_out && ( $row->checked_out != $my->id ) ) {
 					echo $row->name;
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Banner Client">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Banner Client') ?>">
 					<?php echo $row->name; ?>
 					</a>
 					<?php
 				}
 				?>
 				</td>
-				<td width="40%">
+				<td width="20%">
+				<?php echo $row->id;?>
+				</td>
+				<td width="30%">
 				<?php echo $row->contact;?>
 				</td>
 				<td width="20%" align="center">
@@ -404,11 +408,11 @@
 			}
 			// do field validation
 			if (form.name.value == "") {
-				alert( "Please fill in the Client Name." );
+				alert( "<?php echo T_('Please fill in the Client Name.') ?>" );
 			} else if (form.contact.value == "") {
-				alert( "Please fill in the Contact Name." );
+				alert( "<?php echo T_('Please fill in the Contact Name.') ?>" );
 			} else if (form.email.value == "") {
-				alert( "Please fill in the Contact Email." );
+				alert( "<?php echo T_('Please fill in the Contact Email.') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -418,9 +422,9 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Banner Client:
+			<?php echo T_('Banner Client:') ?>
 			<small>
-			<?php echo $row->cid ? 'Edit' : 'New';?>
+			<?php echo $row->cid ? T_('Edit') : T_('New');?>
 			</small>
 			</th>
 		</tr>
@@ -430,12 +434,12 @@
 		<table class="adminform">
 		<tr>
 			<th colspan="2">
-			Details
+			<?php echo T_('Details') ?>
 			</th>
 		</tr>
 		<tr>
 			<td width="10%">
-			Client Name:
+			<?php echo T_('Client Name:') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="name" size="30" maxlength="60" valign="top" value="<?php echo $row->name; ?>">
@@ -443,7 +447,7 @@
 		</tr>
 		<tr>
 			<td width="10%">
-			Contact Name:
+			<?php echo T_('Contact Name:') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="contact" size="30" maxlength="60" value="<?php echo $row->contact; ?>">
@@ -451,7 +455,7 @@
 		</tr>
 		<tr>
 			<td width="10%">
-			Contact Email:
+			<?php echo T_('Contact Email:') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="email" size="30" maxlength="60" value="<?php echo $row->email; ?>">
@@ -459,7 +463,7 @@
 		</tr>
 		<tr>
 			<td valign="top">
-			Extra Info:
+			<?php echo T_('Extra Info:') ?>
 			</td>
 			<td>
 			<textarea class="inputbox" name="extrainfo" cols="60" rows="10"><?php echo str_replace('&','&amp;',$row->extrainfo);?></textarea>
diff -ruN 4.5.4/administrator/components/com_banners/admin.banners.php 4.6rc2/administrator/components/com_banners/admin.banners.php
--- 4.5.4/administrator/components/com_banners/admin.banners.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_banners/admin.banners.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,19 +1,21 @@
 <?php
 /**
-* @version $Id: admin.banners.php,v 1.1 2005/07/22 01:52:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Banners
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_banners' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -149,8 +151,8 @@
 
 
 	// make the select list for the image positions
-	$yesno[] = mosHTML::makeOption( '0', 'No' );
-  	$yesno[] = mosHTML::makeOption( '1', 'Yes' );
+	$yesno[] = mosHTML::makeOption( '0', T_('No') );
+  	$yesno[] = mosHTML::makeOption( '1', T_('Yes') );
   
   	$lists['showBanner'] = mosHTML::selectList( $yesno, 'showBanner', 'class="inputbox" size="1"' , 'value', 'text', $row->showBanner );
 
@@ -162,10 +164,10 @@
 	
 	$row = new mosBanner($database);
 
-	$msg = 'Saved Banner info';
+	$msg = T_('Saved Banner info');
 	if ( $task == 'resethits' ) {
 		$row->clicks = 0;
-		$msg = 'Reset Banner clicks';
+		$msg = T_('Reset Banner clicks');
 	}
 	if (!$row->bind( $_POST )) {
 		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
@@ -198,8 +200,8 @@
 	global $database, $my;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select an item to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -273,7 +275,7 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		$msg = 'The client [ '. $row->name. ' ] is currently being edited by another person.';
+		$msg = sprintf(T_('The client [ %s ] is currently being edited by another person.'), $row->name);
 		mosRedirect( 'index2.php?option='. $option .'&task=listclients', $msg );
 	}
 
@@ -331,7 +333,7 @@
 
 		if ($count != 0) {
 			mosRedirect( "index2.php?option=$option&task=listclients",
-			"Cannot delete client at this time as they have a banner still running" );
+			T_("Cannot delete client at this time as they have a banner still running") );
 		} else {
 			$query="DELETE FROM #__bannerfinish WHERE `cid`='".$cid[$i]."'";
 			$database->setQuery($query);
diff -ruN 4.5.4/administrator/components/com_banners/banners.xml 4.6rc2/administrator/components/com_banners/banners.xml
--- 4.5.4/administrator/components/com_banners/banners.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_banners/banners.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
   <name>Banners</name>
   <author>Mambo Project</author>
   <creationDate>July 2004</creationDate>
-  <copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+  <copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
   <license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-  <authorEmail>admin@mamboserver.com</authorEmail>
-  <authorUrl>www.mamboserver.com</authorUrl>
+  <authorEmail>core@mambo-foundation.org</authorEmail>
+  <authorUrl>www.mambo-foundation.org</authorUrl>
   <version>4.5.2</version>
   <description>This component manages banners and banner clients</description>
   <params />
diff -ruN 4.5.4/administrator/components/com_banners/toolbar.banners.html.php 4.6rc2/administrator/components/com_banners/toolbar.banners.html.php
--- 4.5.4/administrator/components/com_banners/toolbar.banners.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_banners/toolbar.banners.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,20 +1,17 @@
 <?php
 /**
-* @version $Id: toolbar.banners.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Banners
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* @package Mambo
-* @subpackage Banners
-*/
 class TOOLBAR_banners {
 	/**
 	* Draws the menu for to Edit a banner
@@ -29,12 +26,16 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.banners.edit' );
+		if ($GLOBALS['task'] == 'edit' || $GLOBALS['task'] == 'editA') {
+		    mosMenuBar::help( 'manager.edit' );
+		} else {
+		    mosMenuBar::help( 'manager.new' );
+		}
 		mosMenuBar::endTable();
 	}
 	function _DEFAULT() {
@@ -45,7 +46,7 @@
 		mosMenuBar::addNewX();
 		mosMenuBar::editListX();
 		mosMenuBar::deleteList();
-		mosMenuBar::help( '453.screen.banners.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
@@ -65,12 +66,16 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancelclient', 'Close' );
+			mosMenuBar::cancel( 'cancelclient', T_('Close') );
 		} else {
 			mosMenuBar::cancel( 'cancelclient' );
 		}
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.banners.client.edit' );
+		mosMenuBar::spacer();		
+		if ($GLOBALS['task'] == 'editclient' || $GLOBALS['task'] == 'editclientA') {
+		    mosMenuBar::help( 'client.edit' );
+		} else {
+		    mosMenuBar::help( 'client.new' );
+		}
 		mosMenuBar::endTable();
 	}
 	/**
@@ -84,7 +89,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList( '', 'removeclients' );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.banners.client.main' );
+		mosMenuBar::help( 'client' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_banners/toolbar.banners.php 4.6rc2/administrator/components/com_banners/toolbar.banners.php
--- 4.5.4/administrator/components/com_banners/toolbar.banners.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_banners/toolbar.banners.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.banners.php,v 1.1 2005/07/22 01:52:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Banners
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_categories/admin.categories.html.php 4.6rc2/administrator/components/com_categories/admin.categories.html.php
--- 4.5.4/administrator/components/com_categories/admin.categories.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_categories/admin.categories.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.categories.html.php,v 1.2 2005/10/20 01:11:37 cfraser Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Categories
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Categories
-*/
 class categories_html {
 
 	/**
@@ -34,7 +32,7 @@
 			if ( $section == 'content') {
 				?>
 				<th class="categories">
-				Category Manager <small><small>[ Content: All ]</small></small>
+				<?php echo T_('Category Manager') ?> <small><small>[ <?php echo T_('Content: All') ?> ]</small></small>
 				</th>
 				<td width="right">
 				<?php echo $lists['sectionid'];?>
@@ -52,7 +50,7 @@
 				}
 				?>
 				<th class="categories">
-				Category Manager <small><small>[ <?php echo $section_name;?> ]</small></small>
+				<?php echo T_('Category Manager') ?> <small><small>[ <?php echo $section_name;?> ]</small></small>
 				</th>
 				<?php
 			}
@@ -69,49 +67,49 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows );?>);" />
 			</th>
 			<th class="title">
-			Category Name
+			<?php echo T_('Category Name') ?>
 			</th>
 			<th width="10%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<?php
 			if ( $section <> 'content') {
 				?>
 				<th colspan="2" width="5%">
-				Reorder
+				<?php echo T_('Reorder') ?>
 				</th>
 				<?php
 			}
 			?>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th width="10%">
-			Access
+			<?php echo T_('Access') ?>
 			</th>
 			<?php
 			if ( $section == 'content') {
 				?>
 				<th width="12%" align="left">
-				Section
+				<?php echo T_('Section') ?>
 				</th>
 				<?php
 			}
 			?>
 			<th width="5%" nowrap>
-			Category ID
+			<?php echo T_('Category ID') ?>
 			</th>
 			<?php
 			if ( $type == 'content') {
 				?>
 				<th width="5%">
-				# Active
+				# <?php echo T_('Active') ?>
 				</th>
 				<th width="5%">
-				# Trash
+				# <?php echo T_('Trash') ?>
 				</th>
 				<?php
 			} else {
@@ -180,7 +178,7 @@
 				if ( $section == 'content' ) {
 					?>
 					<td align="left">
-					<a href="<?php echo $row->sect_link; ?>" title="Edit Section">
+					<a href="<?php echo $row->sect_link; ?>" title="<?php echo T_('Edit Section') ?>">
 					<?php echo $row->section_name; ?>
 					</a>
 					</td>
@@ -240,11 +238,11 @@
 		}
 
 		if ( $redirect == 'content' ) {
-			$component = 'Content';
+			$component = T_('Content');
 		} else {
 			$component = ucfirst( substr( $redirect, 4 ) );
 			if ( $redirect == 'com_contact_details' ) {
-				$component = 'Contact';
+				$component = T_('Contact');
 			}
 		}
 		mosMakeHtmlSafe( $row, ENT_QUOTES, 'description' );
@@ -259,19 +257,19 @@
 
 			if ( pressbutton == 'menulink' ) {
 				if ( form.menuselect.value == "" ) {
-					alert( "Please select a Menu" );
+					alert( "<?php echo T_('Please select a Menu') ?>" );
 					return;
 				} else if ( form.link_type.value == "" ) {
-					alert( "Please select a menu type" );
+					alert( "<?php echo T_('Please select a menu type') ?>" );
 					return;
 				} else if ( form.link_name.value == "" ) {
-					alert( "Please enter a Name for this menu item" );
+					alert( "<?php echo T_('Please enter a Name for this menu item') ?>" );
 					return;
 				}
 			}
 
 			if ( form.name.value == "" ) {
-				alert("Category must have a name");
+				alert("<?php echo T_('Category must have a name') ?>");
 			} else {
 				<?php getEditorContents( 'editor1', 'description' ) ; ?>
 				submitform(pressbutton);
@@ -319,9 +317,9 @@
 		<table class="adminheading">
 		<tr>
 			<th class="categories">
-			Category:
+			<?php echo T_('Category:') ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			<small><small>
 			[ <?php echo $component; ?>: <?php echo $row->name; ?> ]
@@ -333,10 +331,10 @@
 			<tr>
 				<td valign="top" align="right">
 				<div id = "show" style="display:<?php echo $simple;?>">
-				<a href="javascript:displayParameterInfo();">Show Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Show Advanced Details') ?></a>
 				</div>
 				<div id = "hide" style="display:<?php echo $advanced;?>">
-				<a href="javascript:displayParameterInfo();">Hide Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Hide Advanced Details') ?></a>
 				</div>
 				</td>
 			</tr>
@@ -347,28 +345,28 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Category Details
+					<?php echo T_('Category Details') ?>
 					</th>
 				<tr>
 				<tr>
 					<td>
-					Category Title:
+					<?php echo T_('Category Title:') ?>
 					</td>
 					<td colspan="2">
-					<input class="text_area" type="text" name="title" value="<?php echo $row->title; ?>" size="50" maxlength="50" title="A short name to appear in menus" />
+					<input class="text_area" type="text" name="title" value="<?php echo $row->title; ?>" size="50" maxlength="50" title="<?php echo T_('A short name to appear in menus') ?>" />
 					</td>
 				</tr>
 				<tr>
 					<td>
-					Category Name:
+					<?php echo T_('Category Name:') ?>
 					</td>
 					<td colspan="2">
-					<input class="text_area" type="text" name="name" value="<?php echo $row->name; ?>" size="50" maxlength="255" title="A long name to be displayed in headings" />
+					<input class="text_area" type="text" name="name" value="<?php echo $row->name; ?>" size="50" maxlength="255" title="<?php echo T_('A long name to be displayed in headings') ?>" />
 					</td>
 				</tr>
 				<tr>
 					<td>
-					Section:
+					<?php echo T_('Section:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['section']; ?>
@@ -376,7 +374,7 @@
 				</tr>
 				<tr>
 					<td>
-					Image:
+					<?php echo T_('Image:') ?>
 					</td>
 					<td>
 					<?php echo $lists['image']; ?>
@@ -388,13 +386,13 @@
 					} else {
 					  jsimg='../images/M_images/blank.png';
 					}
-					document.write('<img src=' + jsimg + ' name="imagelib" width="80" height="80" border="2" alt="Preview" />');
+					document.write('<img src=' + jsimg + ' name="imagelib" width="80" height="80" border="2" alt="<?php echo T_('Preview') ?>" />');
 					</script>
 					</td>
 				</tr>
 				<tr>
 					<td>
-					Image Position:
+					<?php echo T_('Image Position:') ?>
 					</td>
 					<td>
 					<?php echo $lists['image_position']; ?>
@@ -402,7 +400,7 @@
 				</tr>
 				<tr>
 					<td>
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -410,7 +408,7 @@
 				</tr>
 				<tr>
 					<td>
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -418,7 +416,7 @@
 				</tr>
 				<tr>
 					<td>
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -426,7 +424,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Description:
+					<?php echo T_('Description:') ?>
 					</td>
 					<td colspan="2">
 					<?php
@@ -447,18 +445,18 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Link to Menu
+					<?php echo T_('Link to Menu') ?>
 					</th>
 				<tr>
 				<tr>
 					<td colspan="2">
-					This will create a new menu item in the menu you select
+					<?php echo T_('This will create a new menu item in the menu you select') ?>
 					<br /><br />
 					</td>
 				<tr>
 				<tr>
 					<td valign="top" width="100px">
-					Select a Menu
+					<?php echo T_('Select a Menu') ?>
 					</td>
 					<td>
 					<?php echo $lists['menuselect']; ?>
@@ -466,7 +464,7 @@
 				<tr>
 				<tr>
 					<td valign="top" width="100px">
-					Select Menu Type
+					<?php echo T_('Select Menu Typ') ?>e
 					</td>
 					<td>
 					<?php echo $lists['link_type']; ?>
@@ -474,7 +472,7 @@
 				<tr>
 				<tr>
 					<td valign="top" width="100px">
-					Menu Item Name
+					<?php echo T_('Menu Item Name') ?>
 					</td>
 					<td>
 					<input type="text" name="link_name" class="inputbox" value="" size="25" />
@@ -484,12 +482,12 @@
 					<td>
 					</td>
 					<td>
-					<input name="menu_link" type="button" class="button" value="Link to Menu" onClick="submitbutton('menulink');" />
+					<input name="menu_link" type="button" class="button" value="<?php echo T_('Link to Menu') ?>" onClick="submitbutton('menulink');" />
 					</td>
 				<tr>
 				<tr>
 					<th colspan="2">
-					Existing Menu Links
+					<?php echo T_('Existing Menu Links') ?>
 					</th>
 				</tr>
 				<?php
@@ -497,7 +495,7 @@
 					?>
 					<tr>
 						<td colspan="2">
-						None
+						<?php echo T_('None') ?>
 						</td>
 					</tr>
 					<?php
@@ -515,7 +513,7 @@
 			?>
 			<table class="adminform" width="40%">
 				<tr><th>&nbsp;</th></tr>
-				<tr><td>Menu links available when saved</td></tr>
+				<tr><td><?php echo T_('Menu links available when saved') ?></td></tr>
 			</table>
 			<?php
 			}
@@ -552,7 +550,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="categories">
-			Move Category
+			<?php echo T_('Move Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -562,13 +560,13 @@
 		<tr>
 			<td width="3%"></td>
 			<td align="left" valign="top" width="30%">
-			<strong>Move to Section:</strong>
+			<strong><?php echo T_('Move to Section:') ?></strong>
 			<br />
 			<?php echo $SectionList ?>
 			<br /><br />
 			</td>
 			<td align="left" valign="top" width="20%">
-			<strong>Categories being moved:</strong>
+			<strong><?php echo T_('Categories being moved:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
@@ -579,7 +577,7 @@
 			?>
 			</td>
 			<td valign="top" width="20%">
-			<strong>Content Items being moved:</strong>
+			<strong><?php echo T_('Content Items being moved:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
@@ -590,11 +588,11 @@
 			?>
 			</td>
 			<td valign="top">
-			This will move the Categories listed
+			<?php echo T_('This will move the Categories listed
 			<br />
 			and all the items within the category (also listed)
 			<br />
-			to the selected Section.
+			to the selected Section.') ?>
 			</td>.
 		</tr>
 		</table>
@@ -625,7 +623,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="categories">
-			Copy Category
+			<?php echo T_('Copy Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -635,13 +633,13 @@
 		<tr>
 			<td width="3%"></td>
 			<td align="left" valign="top" width="30%">
-			<strong>Copy to Section:</strong>
+			<strong><?php echo T_('Copy to Section:') ?></strong>
 			<br />
 			<?php echo $SectionList ?>
 			<br /><br />
 			</td>
 			<td align="left" valign="top" width="20%">
-			<strong>Categories being copied:</strong>
+			<strong><?php echo T_('Categories being copied:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
@@ -652,7 +650,7 @@
 			?>
 			</td>
 			<td valign="top" width="20%">
-			<strong>Content Items being copied:</strong>
+			<strong><?php echo T_('Content Items being copied:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
@@ -663,12 +661,12 @@
 			echo "</ol>";
 			?>
 			</td>
-			<td valign="top">
+			<td valign="top"><?php echo T_('
 			This will copy the Categories listed
 			<br />
 			and all the items within the category (also listed)
 			<br />
-			to the selected Section.
+			to the selected Section.') ?>
 			</td>.
 		</tr>
 		</table>
diff -ruN 4.5.4/administrator/components/com_categories/admin.categories.php 4.6rc2/administrator/components/com_categories/admin.categories.php
--- 4.5.4/administrator/components/com_categories/admin.categories.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_categories/admin.categories.php	2006-05-14 16:46:22.000000000 -0500
@@ -1,17 +1,20 @@
 <?php
 /**
-* @version $Id: admin.categories.php,v 1.1 2005/07/22 01:52:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Categories
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 require_once( $mainframe->getPath( 'admin_html' ) );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
 
 // get parameters from the URL or submitted form
 $section 	= mosGetParam( $_REQUEST, 'section', 'content' );
@@ -136,9 +139,9 @@
 		$type 	= 'other';
 		// special handling for contact component
 		if ( $section == 'com_contact_details' ) {
-			$section_name 	= 'Contact';
+			$section_name 	= T_('Contact');
 		}
-		$section_name = 'Component: '. $section_name;
+		$section_name = T_('Component: '). $section_name;
 	} else {
 		$table 	= $section;
 		$where 	= "\n WHERE c.section='$section'";
@@ -247,7 +250,7 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		mosRedirect( 'index2.php?option=categories&section='. $row->section, 'The category '. $row->title .' is currently being edited by another administrator' );
+		mosRedirect( 'index2.php?option=categories&section='. $row->section, sprintf(T_('The category %s is currently being edited by another administrator'), $row->title) );
 	}
 
 	if ($uid) {
@@ -266,15 +269,15 @@
 			for( $i = 0; $i < $count; $i++ ) {
 				switch ( $menus[$i]->type ) {
 					case 'content_category':
-						$menus[$i]->type = 'Category Table';
+						$menus[$i]->type = T_('Category Table');
 						break;
 
 					case 'content_blog_category':
-						$menus[$i]->type = 'Category Blog';
+						$menus[$i]->type = T_('Category Blog');
 						break;
 
 					case 'content_archive_category':
-						$menus[$i]->type = 'Category Blog Archive';
+						$menus[$i]->type = T_('Category Blog Archive');
 						break;
 				}
 			}
@@ -318,19 +321,19 @@
 	}
 
 	// build the html select list for category types
-	$types[] = mosHTML::makeOption( '', 'Select Type' );
+	$types[] = mosHTML::makeOption( '', T_('Select Type') );
 	if ($row->section == 'com_contact_details') {
-		$types[] = mosHTML::makeOption( 'contact_category_table', 'Contact Category Table' );
+		$types[] = mosHTML::makeOption( 'contact_category_table', T_('Contact Category Table') );
 	} else
 	if ($row->section == 'com_newsfeeds') {
-		$types[] = mosHTML::makeOption( 'newsfeed_category_table', 'Newsfeed Category Table' );
+		$types[] = mosHTML::makeOption( 'newsfeed_category_table', T_('News Feed Category Table') );
 	} else
 	if ($row->section == 'com_weblinks') {
-		$types[] = mosHTML::makeOption( 'weblink_category_table', 'Weblink Category Table' );
+		$types[] = mosHTML::makeOption( 'weblink_category_table', T_('Web Link Category Table') );
 	} else {
-		$types[] = mosHTML::makeOption( 'content_category', 'Content Category Table' );
-		$types[] = mosHTML::makeOption( 'content_blog_category', 'Content Category Blog' );
-		$types[] = mosHTML::makeOption( 'content_archive_category', 'Content Category Archive Blog' );
+		$types[] = mosHTML::makeOption( 'content_category', T_('Content Category Table') );
+		$types[] = mosHTML::makeOption( 'content_blog_category', T_('Content Category Blog') );
+		$types[] = mosHTML::makeOption( 'content_archive_category', T_('Content Category Archive Blog') );
 	} // if
 	$lists['link_type'] 		= mosHTML::selectList( $types, 'link_type', 'class="inputbox" size="1"', 'value', 'text' );;
 
@@ -443,7 +446,7 @@
 	global $database;
 
 	if (count( $cid ) < 1) {
-		echo "<script> alert('Select a category to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select a category to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -519,8 +522,8 @@
 	}
 
 	if (count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select a category to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select a category to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -581,7 +584,7 @@
 	$redirect = mosGetParam( $_POST, 'section', 'content' );;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -651,7 +654,7 @@
 	$redirect = mosGetParam( $_POST, 'section', 'content' );;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -737,7 +740,7 @@
 	$sectionNew = new mosSection ( $database );
 	$sectionNew->load( $sectionMove );
 
-	$msg = $total .' Categories copied to '. $sectionNew->name;
+	$msg = sprintf(Tn_('%d Category copied to %s', '%d Categories copied to %s', $total), $total, $sectionNew->name);
 	mosRedirect( 'index2.php?option=com_categories&section='. $sectionOld .'&mosmsg='. $msg );
 }
 
@@ -778,32 +781,32 @@
 	switch ( $type ) {
 		case 'content_category':
 			$link 		= 'index.php?option=com_content&task=category&sectionid='. $sectionid .'&id='. $id;
-			$menutype	= 'Content Category Table';
+			$menutype	= T_('Content Category Table');
 			break;
 
 		case 'content_blog_category':
 			$link 		= 'index.php?option=com_content&task=blogcategory&id='. $id;
-			$menutype	= 'Content Category Blog';
+			$menutype	= T_('Content Category Blog');
 			break;
 
 		case 'content_archive_category':
 			$link 		= 'index.php?option=com_content&task=archivecategory&id='. $id;
-			$menutype	= 'Content Category Blog Archive';
+			$menutype	= T_('Content Category Blog Archive');
 			break;
 
 		case 'contact_category_table':
 			$link 		= 'index.php?option=com_contact&catid='. $id;
-			$menutype	= 'Contact Category Table';
+			$menutype	= T_('Contact Category Table');
 			break;
 
 		case 'newsfeed_category_table':
 			$link 		= 'index.php?option=com_newsfeeds&catid='. $id;
-			$menutype	= 'Newsfeed Category Table';
+			$menutype	= T_('News Feed Category Table');
 			break;
 
 		case 'weblink_category_table':
 			$link 		= 'index.php?option=com_weblinks&catid='. $id;
-			$menutype	= 'Weblink Category Table';
+			$menutype	= T_('Web Link Category Table');
 			break;
 
 		default:;
@@ -829,47 +832,34 @@
 	$row->checkin();
 	$row->updateOrder( "menutype='". $menu ."'" );
 
-	$msg = $name .' ( '. $menutype .' ) in menu: '. $menu .' successfully created';
+	$msg = sprintf(T_('%s ( %s ) in menu: %s successfully created'),$name, $menutype,$menu);
 	mosRedirect( 'index2.php?option=com_categories&section='. $redirect .'&task=editA&hidemainmenu=1&id='. $id, $msg );
 }
 
 function saveOrder( &$cid, $section ) {
 	global $database;
-
-	$total		= count( $cid );
 	$order 		= mosGetParam( $_POST, 'order', array(0) );
 	$row		= new mosCategory( $database );
-	$conditions = array();
-
+	$sections = array();
     // update ordering values
-	for( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
 		if ($row->ordering != $order[$i]) {
 			$row->ordering = $order[$i];
 	        if (!$row->store()) {
 	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
 	            exit();
-	        } // if
+	        }
 	        // remember to updateOrder this group
-	        $condition = "section='$row->section'";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // if
-	} // for
-
+	        $sections[$row->section] = $row->id;
+	    }
+	}
 	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
+	foreach ($sections as $section=>$rowid) {
+		$row->updateOrder("section='$section'");
 	} // foreach
-
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_categories&section='. $section, $msg );
 } // saveOrder
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_categories/toolbar.categories.html.php 4.6rc2/administrator/components/com_categories/toolbar.categories.html.php
--- 4.5.4/administrator/components/com_categories/toolbar.categories.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_categories/toolbar.categories.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,17 +1,15 @@
 <?php
 /**
-* @version $Id: toolbar.categories.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Categories
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Categories
-*/
 class TOOLBAR_categories {
 	/**
 	* Draws the menu for Editing an existing category
@@ -29,12 +27,27 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.categories.edit' );
+		$section='';
+		if (strstr($GLOBALS['section'], 'com_contact')){
+		    $section = 'contact.';
+		} 
+		if (strstr($GLOBALS['section'], 'com_newsfeeds')){
+		    $section = 'newsfeeds.';		    
+		}
+		if (strstr($GLOBALS['section'], 'com_weblinks')){
+		    $section = 'weblinks.';		    
+		}
+		
+		if ($GLOBALS['task'] == 'new') {
+		    mosMenuBar::help( $section.'new' );
+		} else {
+		    mosMenuBar::help( $section.'edit' );
+		}
 		mosMenuBar::endTable();
 	}
 	/**
@@ -47,7 +60,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.categories.copymove' );
+		mosMenuBar::help( 'move' );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -60,7 +73,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.categories.copymove' );
+		mosMenuBar::help( 'copy' );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -77,16 +90,28 @@
 		mosMenuBar::addNewX();
 		mosMenuBar::spacer();
 		if ( $section == 'content' || ( $section > 0 ) ) {
-			mosMenuBar::customX( 'moveselect', 'move.png', 'move_f2.png', 'Move', true );
+			mosMenuBar::customX( 'moveselect', 'move.png', 'move_f2.png', T_('Move'), true );
 			mosMenuBar::spacer();
-			mosMenuBar::customX( 'copyselect', 'copy.png', 'copy_f2.png', 'Copy', true );
+			mosMenuBar::customX( 'copyselect', 'copy.png', 'copy_f2.png', T_('Copy'), true );
 			mosMenuBar::spacer();
 		}
 		mosMenuBar::editListX();
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.categories.main' );
+		
+		$section='';
+		
+		if (strstr($GLOBALS['section'], 'com_contact')){
+		    $section = 'contact.';
+		} 
+		if (strstr($GLOBALS['section'], 'com_newsfeeds')){
+		    $section = 'newsfeeds.';		    
+		}
+		if (strstr($GLOBALS['section'], 'com_weblinks')){
+		    $section = 'weblinks.';		    
+		}
+		mosMenuBar::help( $section.'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_categories/toolbar.categories.php 4.6rc2/administrator/components/com_categories/toolbar.categories.php
--- 4.5.4/administrator/components/com_categories/toolbar.categories.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_categories/toolbar.categories.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.categories.php,v 1.1 2005/07/22 01:52:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Categories
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_checkin/admin.checkin.html.php 4.6rc2/administrator/components/com_checkin/admin.checkin.html.php
--- 4.5.4/administrator/components/com_checkin/admin.checkin.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_checkin/admin.checkin.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.checkin.html.php,v 1.1 2005/07/22 01:52:10 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Checkin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_checkin/admin.checkin.php 4.6rc2/administrator/components/com_checkin/admin.checkin.php
--- 4.5.4/administrator/components/com_checkin/admin.checkin.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_checkin/admin.checkin.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,30 +1,32 @@
 <?php
 /**
-* @version $Id: admin.checkin.php,v 1.1 2005/07/22 01:52:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Checkin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 if (!$acl->acl_check( 'administration', 'config', 'users', $my->usertype )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 ?>
 <table class="adminheading">
 <tr>
-<th class="checkin">Global Check-in</th>
+<th class="checkin"><?php echo T_('Global Check-in') ?></th>
 </tr>
 </table>
 <table class="adminform">
 <tr>
-	<th class="title">Database Table</th>
-	<th class="title"># of Items</th>
-	<th class="title">Checked-In</th>
+	<th class="title"><?php echo T_('Database Table') ?></th>
+	<th class="title"><?php echo T_('# of Items') ?></th>
+	<th class="title"><?php echo T_('Checked-In') ?></th>
 	<th class="title">&nbsp;</th>
 </tr>
 <?php
@@ -71,15 +73,15 @@
 		if ($res == 1) {
 			if ($num > 0) {
 				echo "<tr class=\"row$k\">";
-				echo "\n	<td width=\"350\">Checking table - $tn</td>";
-				echo "\n	<td width=\"150\">Checked in <b>$num</b> items</td>";
+				echo "\n	<td width=\"350\">".T_('Checking table')." - $tn</td>";
+				echo "\n	<td width=\"150\">".printf(Tn_('Checked in <strong>%d</strong> item','Checked in <strong>%d</strong> items', $num), $num)."</td>";
 				echo "\n	<td width=\"100\" align=\"center\"><img src=\"images/tick.png\" border=\"0\" alt=\"tick\" /></td>";
 				echo "\n	<td>&nbsp;</td>";
 				echo "\n</tr>";
 			} else {
 				echo "<tr class=\"row$k\">";
-				echo "\n	<td width=\"350\">Checking table - $tn</td>";
-				echo "\n	<td width=\"150\">Checked in <b>$num</b> items</td>";
+				echo "\n	<td width=\"350\">".T_('Checking table')." - $tn</td>";
+				echo "\n	<td width=\"150\">".printf(Tn_('Checked in <strong>%d</strong> item','Checked in <strong>%d</strong> items', $num), $num)."</td>";
 				echo "\n	<td width=\"100\">&nbsp;</td>";
 				echo "\n	<td>&nbsp;</td>";
 				echo "\n</tr>";
@@ -90,6 +92,6 @@
 }
 ?>
 <tr>
-	<td colspan="4"><b>Checked out items have now been all checked in</b></td>
+	<td colspan="4"><b><?php echo T_('Checked out items have now been all checked in') ?></b></td>
 </tr>
 </table>
diff -ruN 4.5.4/administrator/components/com_checkin/toolbar.checkin.html.php 4.6rc2/administrator/components/com_checkin/toolbar.checkin.html.php
--- 4.5.4/administrator/components/com_checkin/toolbar.checkin.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_checkin/toolbar.checkin.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,24 +1,22 @@
 <?php
 /**
-* @version $Id: toolbar.checkin.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Checkin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Checkin
-*/
 class TOOLBAR_checkin {
 	/**
 	* Draws the menu for a New category
 	*/
 	function _DEFAULT() {
 		mosMenuBar::startTable();
-		mosMenuBar::help( '453.screen.checkin' );
+		mosMenuBar::help( 'main' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_checkin/toolbar.checkin.php 4.6rc2/administrator/components/com_checkin/toolbar.checkin.php
--- 4.5.4/administrator/components/com_checkin/toolbar.checkin.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_checkin/toolbar.checkin.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.checkin.php,v 1.1 2005/07/22 01:52:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Checkin
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_config/admin.config.html.php 4.6rc2/administrator/components/com_config/admin.config.html.php
--- 4.5.4/administrator/components/com_config/admin.config.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_config/admin.config.html.php	2006-05-20 19:54:45.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.config.html.php,v 1.5 2005/11/27 16:33:25 csouza Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Config
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Config
-*/
 class HTML_config {
 
 	function showconfig( &$row, &$lists, $option) {
@@ -101,10 +99,10 @@
 		<div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>
 	    <table cellpadding="1" cellspacing="1" border="0" width="100%">
 	    <tr>
-	        <td width="250"><table class="adminheading"><tr><th nowrap class="config">Global Configuration</th></tr></table></td>
+	        <td width="250"><table class="adminheading"><tr><th nowrap class="config"><?php echo T_('Global Configuration') ?></th></tr></table></td>
 	        <td width="270">
-	            <span class="componentheading">configuration.php is :
-	            <?php echo is_writable( '../configuration.php' ) ? '<b><font color="green"> Writeable</font></b>' : '<b><font color="red"> Unwriteable</font></b>' ?>
+	            <span class="componentheading"><?php echo T_('configuration.php is :') ?>
+	            <b><?php echo is_writable( '../configuration.php' ) ? '<span class="green"> '.T_('Writeable').'</span>' : '<span class="red"> '.T_('Unwriteable').'</span>' ?></b>
 	            </span>
 	        </td>
 <?php
@@ -113,14 +111,14 @@
 ?>
 	        <td>
 	            <input type="checkbox" id="disable_write" name="disable_write" value="1"/>
-	            <label for="disable_write">Make unwriteable after saving</label>
+	            <label for="disable_write"><?php echo T_('Make unwriteable after saving') ?></label>
 	        </td>
 <?php
 	            } else {
 ?>
 	        <td>
 	            <input type="checkbox" id="enable_write" name="enable_write" value="1"/>
-	            <label for="enable_write">Override write protection while saving</label>
+	            <label for="enable_write"><?php echo T_('Override write protection while saving') ?></label>
 	        </td>
 <?php
 	            } // if
@@ -130,182 +128,190 @@
 	    </table>
 <?php
 		$tabs->startPane("configPane");
-		$tabs->startTab("Site","site-page");
+		$tabs->startTab(T_("Site"),"site-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td width="185">Site Offline:</td>
+			<td width="185"><?php echo T_('Site Offline:') ?></td>
 			<td><?php echo $lists['offline']; ?></td>
 		</tr>
 		<tr>
-			<td valign="top">Offline Message:</td>
+			<td valign="top"><?php echo T_('Offline Message:') ?></td>
 			<td><textarea class="text_area" cols="60" rows="2" style="width:500px; height:40px" name="config_offline_message"><?php echo htmlspecialchars($row->config_offline_message, ENT_QUOTES); ?></textarea><?php
-				$tip = 'A message that displays if your site is offline';
+				$tip = T_('A message that displays if your site is offline');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td valign="top">System Error Message:</td>
+			<td valign="top"><?php echo T_('System Error Message:') ?></td>
 			<td><textarea class="text_area" cols="60" rows="2" style="width:500px; height:40px" name="config_error_message"><?php echo htmlspecialchars($row->config_error_message, ENT_QUOTES); ?></textarea><?php
-				$tip = 'A message that displays if Mambo could not connect to the database';
+				$tip = T_('A message that displays if Mambo could not connect to the database');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Site Name:</td>
+			<td><?php echo T_('Site Name:') ?></td>
 			<td><input class="text_area" type="text" name="config_sitename" size="50" value="<?php echo $row->config_sitename; ?>"/></td>
 		</tr>
 		<tr>
-			<td>Show UnAuthorized Links:</td>
+			<td><?php echo T_('Show UnAuthorized Links:') ?></td>
 			<td><?php echo $lists['auth']; ?><?php
-				$tip = 'If yes, will show links to content to registered content even if you are not logged in.  The user will need to login to see the item in full.';
+				$tip = T_('If yes, will show links to content to registered content even if you are not logged in.  The user will need to login to see the item in full.');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Allow User Registration:</td>
+			<td><?php echo T_('Allow User Registration:') ?></td>
 			<td><?php echo $lists['allowuserregistration']; ?><?php
-				$tip = 'If yes, allows users to self-register';
+				$tip = T_('If yes, allows users to self-register');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Use New Account Activation:</td>
+			<td><?php echo T_('Use New Account Activation:') ?></td>
 			<td><?php echo $lists['useractivation']; ?>
 			<?php
-				$tip = 'If yes, the user will be mailed a link to activate their account before they can log in.';
+				$tip = T_('If yes, the user will be mailed a link to activate their account before they can log in.');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Require Unique Email:</td>
+			<td><?php echo T_('Require Unique Email:') ?></td>
 			<td><?php echo $lists['uniquemail']; ?><?php
-				$tip = 'If yes, users cannot share the smae email address';
+				$tip = T_('If yes, users cannot share the same email address');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Debug Site:</td>
+			<td><?php echo T_('Debug Site:') ?></td>
 			<td><?php echo $lists['debug']; ?><?php
-				$tip = 'If yes, displays diagnostic information and SQL errors if present';
+				$tip = T_('If yes, displays diagnostic information and SQL errors if present');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>WYSIWYG Editor:</td>
+			<td><?php echo T_('WYSIWYG Editor:') ?></td>
 			<td><?php echo $lists['editor']; ?></td>
 		</tr>
 		<tr>
-			<td>List Length:</td>
+			<td><?php echo T_('List Length:') ?></td>
 			<td><?php echo $lists['list_length']; ?><?php
-				$tip = 'Sets the default length of lists in the administrator for all users';
+				$tip = T_('Sets the default length of lists in the administrator for all users');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Favorites Site Icon:</td>
+			<td><?php echo T_('Favorites Site Icon:') ?></td>
 			<td>
 			<input class="text_area" type="text" name="config_favicon" size="20" value="<?php echo $row->config_favicon; ?>"/>
 <?php
-			$tip = 'If left blank or the file cannot be found, the default favicon.ico will be used.';
-			echo mosToolTip( $tip, 'Favourite Icon' );
+			$tip = T_('If left blank or the file cannot be found, the default favicon.ico will be used.');
+			echo mosToolTip( $tip, T_('Favourite Icon') );
 ?>			</td>
 		</tr>
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Locale","Locale-page");
+		$tabs->startTab(T_('Locale'),"Locale-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td width="185">Language:</td>
+			<td width="185"><?php echo T_('Language:') ?></td>
 			<td><?php echo $lists['lang']; ?></td>
 		</tr>
 		<tr>
-			<td width="185">Time Offset:</td>
+			<td width="185"><?php echo T_('Time Offset:') ?></td>
 			<td>
 			<?php echo $lists['offset']; ?>
 <?php
-			$tip = "Current date/time configured to display: " . mosCurrentDate(_DATE_FORMAT_LC2);
+			$tip = sprintf(T_("Current date/time configured to display: %s"), mosCurrentDate(_DATE_FORMAT_LC2));
 			echo mosToolTip($tip);
 ?>			</td>
+		</tr>		
+		<tr>
+			<td width="185"><?php echo T_('Debugging:') ?></td>
+			<td><?php echo $lists['locale_debug']; ?></td>
 		</tr>
 		<tr>
-			<td width="185">Country Locale:</td>
+			<td width="185"><?php echo T_('Use Gettext:') ?></td>
+			<td><?php echo $lists['locale_use_gettext']; ?></td>
+		</tr>
+		<tr>
+			<td width="185"><?php echo T_('Country Locale:') ?></td>
 			<td><input class="text_area" type="text" name="config_locale" size="15" value="<?php echo $row->config_locale; ?>"/></td>
 		</tr>
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Content","content-page");
+		$tabs->startTab(T_('Content'),"content-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td colspan="3">* These Parameters control Output elements*<br/><br/></td>
+			<td colspan="3">* <?php echo T_('These Parameters control Output elements') ?> *<br/><br/></td>
 		</tr>
 		<tr>
-			<td width="200">Linked Titles:</td>
+			<td width="200"><?php echo T_('Linked Titles:') ?></td>
 			<td width="100"><?php echo $lists['link_titles']; ?></td>
 			<td><?php
-				$tip = 'If yes, the title of content items will be hyperlinked to the item';
+				$tip = T_('If yes, the title of content items will be hyperlinked to the item');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td width="200">Read More Link:</td>
+			<td width="200"><?php echo T_('Read More Link:') ?></td>
 			<td width="100"><?php echo $lists['readmore']; ?></td>
 			<td><?php
-				$tip = 'If set to show, the read-more link will show if main-text has been provided for the item';
+				$tip = T_('If set to show, the read-more link will show if main-text has been provided for the item');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Item Rating/Voting:</td>
+			<td><?php echo T_('Item Rating/Voting:') ?></td>
 			<td><?php echo $lists['vote']; ?></td>
 			<td><?php
-				$tip = 'If set to show, a voting system will be enabled for content items';
+				$tip = T_('If set to show, a voting system will be enabled for content items');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Author Names:</td>
+			<td><?php echo T_('Author Names:') ?></td>
 			<td><?php echo $lists['hideauthor']; ?></td>
 			<td><?php
-				$tip = 'If set to show, the name of the author will be displayed.  This a global setting but can be changed at menu and item levels.';
+				$tip = T_('If set to show, the name of the author will be displayed.  This a global setting but can be changed at menu and item levels.');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Created Date and Time:</td>
+			<td><?php echo T_('Created Date and Time:') ?></td>
 			<td><?php echo $lists['hidecreate']; ?></td>
 			<td><?php
-				$tip = 'If set to show, the date and time an item was created will be displayed. This a global setting but can be changed at menu and item levels.';
+				$tip = T_('If set to show, the date and time an item was created will be displayed. This a global setting but can be changed at menu and item levels.');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Modified Date and Time:</td>
+			<td><?php echo T_('Modified Date and Time:') ?></td>
 			<td><?php echo $lists['hidemodify']; ?></td>
 			<td><?php
-				$tip = 'If set to show, the date and time an item was last modified will be displayed.  This a global setting but can be changed at menu and item levels.';
+				$tip = T_('If set to show, the date and time an item was last modified will be displayed.  This a global setting but can be changed at menu and item levels.');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>Hits:</td>
+			<td><?php echo T_('Hits:') ?></td>
 			<td><?php echo $lists['hits']; ?></td>
 			<td><?php
-				$tip = 'If set to show, the hits for a particular item will be displayed.  This a global setting but can be changed at menu and item levels.';
+				$tip = T_('If set to show, the hits for a particular item will be displayed.  This a global setting but can be changed at menu and item levels.');
 				echo mosToolTip( $tip );
 			?></td>
 		</tr>
 		<tr>
-			<td>PDF Icon:</td>
+			<td><?php echo T_('PDF Icon:') ?></td>
 			<td><?php echo $lists['hidepdf']; ?></td>
 <?php
 			if (!is_writable( "$mosConfig_absolute_path/media/" )) {
 				echo "<td align=\"left\">";
-				echo mosToolTip('Option not available as /media directory not writable');
+				echo mosToolTip(T_('Option not available as /media directory not writable'));
 				echo "</td>";
 			} else {
 ?>				<td>&nbsp;</td>
@@ -313,32 +319,32 @@
 			}
 ?>		</tr>
 		<tr>
-			<td>Print Icon:</td>
+			<td><?php echo T_('Print Icon:') ?></td>
 			<td><?php echo $lists['hideprint']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Email Icon:</td>
+			<td><?php echo T_('Email Icon:') ?></td>
 			<td><?php echo $lists['hideemail']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Icons:</td>
+			<td><?php echo T_('Icons:') ?></td>
 			<td><?php echo $lists['icons']; ?></td>
-			<td><?php echo mosToolTip('Print, PDF and Email will utilise Icons or Text'); ?></td>
+			<td><?php echo mosToolTip(T_('Print, PDF and Email will utilise Icons or Text')); ?></td>
 		</tr>
 		<tr>
-			<td>Table of Contents on multi-page items:</td>
+			<td><?php echo T_('Table of Contents on multi-page items:') ?></td>
 			<td><?php echo $lists['multipage_toc']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Back Button:</td>
+			<td><?php echo T_('Back Button:') ?></td>
 			<td><?php echo $lists['back_button']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Content Item Navigation:</td>
+			<td><?php echo T_('Content Item Navigation:') ?></td>
 			<td><?php echo $lists['item_navigation']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
@@ -353,88 +359,89 @@
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Database","db-page");
+		$tabs->startTab(T_("Database"),"db-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td width="185">Hostname:</td>
+			<td width="185"><?php echo T_('Hostname:') ?></td>
 			<td><input class="text_area" type="text" name="config_host" size="25" value="<?php echo $row->config_host; ?>"/></td>
 		</tr>
 		<tr>
-			<td>MySQL Username:</td>
+			<td><?php echo T_('MySQL Username:') ?></td>
 			<td><input class="text_area" type="text" name="config_user" size="25" value="<?php echo $row->config_user; ?>"/></td>
 		</tr>
 		<tr>
-			<td>MySQL Password:</td>
+			<td><?php echo T_('MySQL Password:') ?></td>
 			<td><input class="text_area" type="text" name="config_password" size="25" value="<?php echo $row->config_password; ?>"/></td>
 		</tr>
 		<tr>
-			<td>MySQL Database:</td>
+			<td><?php echo T_('MySQL Database:') ?></td>
 			<td><input class="text_area" type="text" name="config_db" size="25" value="<?php echo $row->config_db; ?>"/></td>
 		</tr>
 		<tr>
-			<td>MySQL Database Prefix:</td>
+			<td><?php echo T_('MySQL Database Prefix:') ?></td>
 			<td>
 			<input class="text_area" type="text" name="config_dbprefix" size="10" value="<?php echo $row->config_dbprefix; ?>"/>
-			&nbsp;<?php echo mosWarning('!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE PREFIX YOU ARE SETTING !!'); ?>
+			&nbsp;<?php echo mosWarning(T_('!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE PREFIX YOU ARE SETTING !!')); ?>
 			</td>
 		</tr>
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Server","server-page");
+		$tabs->startTab(T_('Server'),"server-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td width="185">Absolute Path:</td>
+			<td width="185"><?php echo T_('Absolute Path:') ?></td>
 			<td width="450"><strong><?php echo $row->config_path; ?></strong></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Live Site:</td>
+			<td><?php echo T_('Live Site:') ?></td>
 			<td><strong><?php echo $row->config_live_site; ?></strong></td>
 			<td>&nbsp;</td>
 		</tr>
+		<!--  
 		<tr>
-			<td>Secret Word:</td>
+			<td><?php echo T_('Secret Word:') ?></td>
 			<td><strong><?php echo $row->config_secret; ?></strong></td>
 			<td>&nbsp;</td>
 		</tr>
+		-->
 		<tr>
-			<td>GZIP Page Compression:</td>
+			<td><?php echo T_('GZIP Page Compression:') ?></td>
 			<td>
 			<?php echo $lists['gzip']; ?>
-			<?php echo mosToolTip('Compress buffered output if supported'); ?>
+			<?php echo mosToolTip(T_('Compress buffered output if supported')); ?>
 			</td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Login Session Lifetime:</td>
+			<td><?php echo T_('Login Session Lifetime:') ?></td>
 			<td>
 			<input class="text_area" type="text" name="config_lifetime" size="10" value="<?php echo $row->config_lifetime; ?>"/>
-			&nbsp;seconds&nbsp;
-			<?php echo mosToolTip('Auto logout after this time of inactivity'); ?>
+			&nbsp;<?php echo T_('seconds') ?>&nbsp;
+			<?php echo mosToolTip(T_('Auto logout after this time of inactivity')); ?>
 			</td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Error Reporting:</td>
+			<td><?php echo T_('Error Reporting:') ?></td>
 			<td><?php echo $lists['error_reporting']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Register Globals Emulation:</td>
+			<td><?php echo T_('Register Globals Emulation:') ?></td>
 			<td>
 			<?php echo $lists['register_globals']; ?>
 			<?php 
-			$rg = ini_get('register_globals') == 1 ? 'On' : 'Off';
-			echo mosToolTip(sprintf("Register globals emulation. Some components may stop working if this option is set to Off.")); 
+			echo mosToolTip(T_("Register globals emulation. Some components may stop working if this option is set to Off.")); 
 			?>
 			</td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Help Server:</td>
+			<td><?php echo T_('Help Server:') ?></td>
 			<td><input class="text_area" type="text" name="config_helpurl" size="50" value="<?php echo $row->config_helpurl; ?>"/></td>
 		</tr>
 		<tr>
@@ -446,23 +453,23 @@
 		$flags = octdec($row->config_fileperms);
 	} // if
 ?>
-			<td valign="top">File Creation:</td>
+			<td valign="top"><?php echo T_('File Creation:') ?></td>
 	        <td>
-	            <fieldset><legend>File Permissions</legend>
+	            <fieldset><legend><?php echo T_('File Permissions') ?></legend>
 	                <table cellpadding="1" cellspacing="1" border="0">
 	                    <tr>
 	                        <td><input type="radio" id="filePermsMode0" name="filePermsMode" value="0" onclick="changeFilePermsMode(0)"<?php if (!$mode) echo ' checked="checked"'; ?>/></td>
-	                        <td><label for="filePermsMode0">Dont CHMOD new files (use server defaults)</label></td>
+	                        <td><label for="filePermsMode0"><?php echo T_('Dont CHMOD new files (use server defaults)') ?></label></td>
 	                    </tr>
 	                    <tr>
 	                        <td><input type="radio" id="filePermsMode1" name="filePermsMode" value="1" onclick="changeFilePermsMode(1)"<?php if ($mode) echo ' checked="checked"'; ?>/></td>
 	                        <td>
-								<label for="filePermsMode1">CHMOD new files</label>
+								<label for="filePermsMode1"><?php echo T_('CHMOD new files') ?></label>
 								<span id="filePermsValue"<?php if (!$mode) echo ' style="display:none"'; ?>>
-								to:	<input class="text_area" type="text" readonly="readonly" name="config_fileperms" size="4" value="<?php echo $row->config_fileperms; ?>"/>
+								<?php echo T_('to:') ?>	<input class="text_area" type="text" readonly="readonly" name="config_fileperms" size="4" value="<?php echo $row->config_fileperms; ?>"/>
 								</span>
 								<span id="filePermsTooltip"<?php if ($mode) echo ' style="display:none"'; ?>>
-								&nbsp;<?php echo mosToolTip('Select this option to define permission flags for new created files'); ?>
+								&nbsp;<?php echo mosToolTip(T_('Select this option to define permission flags for new created files')); ?>
 								</span>
 							</td>
 	                    </tr>
@@ -471,42 +478,42 @@
 	                        <td>
 	                            <table cellpadding="0" cellspacing="1" border="0">
 	                                <tr>
-	                                    <td style="padding:0px">User:</td>
+	                                    <td style="padding:0px"><?php echo T_('User:') ?></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsUserRead" name="filePermsUserRead" value="1" onclick="saveFilePerms()"<?php if ($flags & 0400) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="filePermsUserRead">read</label></td>
+	                                    <td style="padding:0px"><label for="filePermsUserRead"><?php echo T_('read') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsUserWrite" name="filePermsUserWrite" value="1" onclick="saveFilePerms()"<?php if ($flags & 0200) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="filePermsUserWrite">write</label></td>
+	                                    <td style="padding:0px"><label for="filePermsUserWrite"><?php echo T_('write') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsUserExecute" name="filePermsUserExecute" value="1" onclick="saveFilePerms()"<?php if ($flags & 0100) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px" colspan="3"><label for="filePermsUserExecute">execute</label></td>
+	                                    <td style="padding:0px" colspan="3"><label for="filePermsUserExecute"><?php echo T_('execute') ?></label></td>
 	                                </tr>
 	                                <tr>
-	                                    <td style="padding:0px">Group:</td>
+	                                    <td style="padding:0px"><?php echo T_('Group:') ?></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsGroupRead" name="filePermsGroupRead" value="1" onclick="saveFilePerms()"<?php if ($flags & 040) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="filePermsGroupRead">read</label></td>
+	                                    <td style="padding:0px"><label for="filePermsGroupRead"><?php echo T_('read') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsGroupWrite" name="filePermsGroupWrite" value="1" onclick="saveFilePerms()"<?php if ($flags & 020) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="filePermsGroupWrite">write</label></td>
+	                                    <td style="padding:0px"><label for="filePermsGroupWrite"><?php echo T_('write') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsGroupExecute" name="filePermsGroupExecute" value="1" onclick="saveFilePerms()"<?php if ($flags & 010) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px" width="70"><label for="filePermsGroupExecute">execute</label></td>
+	                                    <td style="padding:0px" width="70"><label for="filePermsGroupExecute"><?php echo T_('execute') ?></label></td>
 										<td><input type="checkbox" id="applyFilePerms" name="applyFilePerms" value="1"/></td>
 	                                    <td nowrap="nowrap">
 											<label for="applyFilePerms">
-												Apply to existing files
+												<?php echo T_('Apply to existing files') ?>
 												&nbsp;<?php
 												echo mosWarning(
-													'Checking here will apply the permission flags to <em>all existing files</em> of the site.<br/>'.
-													'<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>'
+													T_('Checking here will apply the permission flags to <em>all existing files</em> of the site.<br/>'.
+													'<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>')
 												);?>
 											</label>
 										</td>
 	                                </tr>
 	                                <tr>
-	                                    <td style="padding:0px">World:</td>
+	                                    <td style="padding:0px"><?php echo T_('World:') ?></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsWorldRead" name="filePermsWorldRead" value="1" onclick="saveFilePerms()"<?php if ($flags & 04) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="filePermsWorldRead">read</label></td>
+	                                    <td style="padding:0px"><label for="filePermsWorldRead"><?php echo T_('read') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsWorldWrite" name="filePermsWorldWrite" value="1" onclick="saveFilePerms()"<?php if ($flags & 02) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="filePermsWorldWrite">write</label></td>
+	                                    <td style="padding:0px"><label for="filePermsWorldWrite"><?php echo T_('write') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="filePermsWorldExecute" name="filePermsWorldExecute" value="1" onclick="saveFilePerms()"<?php if ($flags & 01) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px" colspan="4"><label for="filePermsWorldExecute">execute</label></td>
+	                                    <td style="padding:0px" colspan="4"><label for="filePermsWorldExecute"><?php echo T_('execute') ?></label></td>
 	                                </tr>
 	                            </table>
 	                        </td>
@@ -525,23 +532,23 @@
 		$flags = octdec($row->config_dirperms);
 	} // if
 ?>
-			<td valign="top">Directory Creation:</td>
+			<td valign="top"><?php echo T_('Directory Creation:') ?></td>
 	        <td>
-	            <fieldset><legend>Directory Permissions</legend>
+	            <fieldset><legend><?php echo T_('Directory Permissions') ?></legend>
 	                <table cellpadding="1" cellspacing="1" border="0">
 	                    <tr>
 	                        <td><input type="radio" id="dirPermsMode0" name="dirPermsMode" value="0" onclick="changeDirPermsMode(0)"<?php if (!$mode) echo ' checked="checked"'; ?>/></td>
-	                        <td><label for="dirPermsMode0">Dont CHMOD new directories (use server defaults)</label></td>
+	                        <td><label for="dirPermsMode0"><?php echo T_('Dont CHMOD new directories (use server defaults)') ?></label></td>
 	                    </tr>
 	                    <tr>
 	                        <td><input type="radio" id="dirPermsMode1" name="dirPermsMode" value="1" onclick="changeDirPermsMode(1)"<?php if ($mode) echo ' checked="checked"'; ?>/></td>
 	                        <td>
-								<label for="dirPermsMode1">CHMOD new directories</label>
+								<label for="dirPermsMode1"><?php echo T_('CHMOD new directories') ?></label>
 								<span id="dirPermsValue"<?php if (!$mode) echo ' style="display:none"'; ?>>
    							    to: <input class="text_area" type="text" readonly="readonly" name="config_dirperms" size="4" value="<?php echo $row->config_dirperms; ?>"/>
 								</span>
 								<span id="dirPermsTooltip"<?php if ($mode) echo ' style="display:none"'; ?>>
-								&nbsp;<?php echo mosToolTip('Select this option to define permission flags for new created directories'); ?>
+								&nbsp;<?php echo mosToolTip(T_('Select this option to define permission flags for new created directories')); ?>
 								</span>
 							</td>
 	                    </tr>
@@ -550,42 +557,40 @@
 	                        <td>
 	                            <table cellpadding="1" cellspacing="0" border="0">
 	                                <tr>
-	                                    <td style="padding:0px">User:</td>
+	                                    <td style="padding:0px"><?php echo T_('User:') ?></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsUserRead" name="dirPermsUserRead" value="1" onclick="saveDirPerms()"<?php if ($flags & 0400) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="dirPermsUserRead">read</label></td>
+	                                    <td style="padding:0px"><label for="dirPermsUserRead"><?php echo T_('read') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsUserWrite" name="dirPermsUserWrite" value="1" onclick="saveDirPerms()"<?php if ($flags & 0200) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="dirPermsUserWrite">write</label></td>
+	                                    <td style="padding:0px"><label for="dirPermsUserWrite"><?php echo T_('write') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsUserSearch" name="dirPermsUserSearch" value="1" onclick="saveDirPerms()"<?php if ($flags & 0100) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px" colspan="3"><label for="dirPermsUserSearch">search</label></td>
+	                                    <td style="padding:0px" colspan="3"><label for="dirPermsUserSearch"><?php echo T_('search') ?></label></td>
 	                                </tr>
 	                                <tr>
-	                                    <td style="padding:0px">Group:</td>
+	                                    <td style="padding:0px"><?php echo T_('Group:') ?></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsGroupRead" name="dirPermsGroupRead" value="1" onclick="saveDirPerms()"<?php if ($flags & 040) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="dirPermsGroupRead">read</label></td>
+	                                    <td style="padding:0px"><label for="dirPermsGroupRead"><?php echo T_('read') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsGroupWrite" name="dirPermsGroupWrite" value="1" onclick="saveDirPerms()"<?php if ($flags & 020) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="dirPermsGroupWrite">write</label></td>
+	                                    <td style="padding:0px"><label for="dirPermsGroupWrite"><?php echo T_('write') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsGroupSearch" name="dirPermsGroupSearch" value="1" onclick="saveDirPerms()"<?php if ($flags & 010) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px" width="70"><label for="dirPermsGroupSearch">search</label></td>
+	                                    <td style="padding:0px" width="70"><label for="dirPermsGroupSearch"><?php echo T_('search') ?></label></td>
 										<td><input type="checkbox" id="applyDirPerms" name="applyDirPerms" value="1"/></td>
 	                                    <td nowrap="nowrap">
 											<label for="applyDirPerms">
-												Apply to existing directories
+												<?php echo T_('Apply to existing directories') ?>
 												&nbsp;<?php
-												echo mosWarning(
-													'Checking here will apply the permission flags to <em>all existing directories</em> of the site.<br/>'.
-													'<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>'
-												);?>
+												echo mosWarning(T_('Checking here will apply the permission flags to <em>all existing directories</em> of the site.<br/>'.
+													'<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>'));?>
 											</label>
 										</td>
 	                                </tr>
 	                                <tr>
-	                                    <td style="padding:0px">World:</td>
+	                                    <td style="padding:0px"><?php echo T_('World:') ?></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsWorldRead" name="dirPermsWorldRead" value="1" onclick="saveDirPerms()"<?php if ($flags & 04) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="dirPermsWorldRead">read</label></td>
+	                                    <td style="padding:0px"><label for="dirPermsWorldRead"><?php echo T_('read') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsWorldWrite" name="dirPermsWorldWrite" value="1" onclick="saveDirPerms()"<?php if ($flags & 02) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px"><label for="dirPermsWorldWrite">write</label></td>
+	                                    <td style="padding:0px"><label for="dirPermsWorldWrite"><?php echo T_('write') ?></label></td>
 	                                    <td style="padding:0px"><input type="checkbox" id="dirPermsWorldSearch" name="dirPermsWorldSearch" value="1" onclick="saveDirPerms()"<?php if ($flags & 01) echo ' checked="checked"'; ?>/></td>
-	                                    <td style="padding:0px" colspan="3"><label for="dirPermsWorldSearch">search</label></td>
+	                                    <td style="padding:0px" colspan="3"><label for="dirPermsWorldSearch"><?php echo T_('search') ?></label></td>
 	                                </tr>
 	                            </table>
 	                        </td>
@@ -598,82 +603,82 @@
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Metadata","metadata-page");
+		$tabs->startTab(T_('Metadata'),"metadata-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td width="185" valign="top">Global Site Meta Description:</td>
+			<td width="185" valign="top"><?php echo T_('Global Site Meta Description:') ?></td>
 			<td><textarea class="text_area" cols="50" rows="3" style="width:500px; height:50px" name="config_metadesc"><?php echo htmlspecialchars($row->config_metadesc, ENT_QUOTES); ?></textarea></td>
 		</tr>
 		<tr>
-			<td valign="top">Global Site Meta Keywords:</td>
+			<td valign="top"><?php echo T_('Global Site Meta Keywords:') ?></td>
 			<td><textarea class="text_area" cols="50" rows="3" style="width:500px; height:50px" name="config_metakeys"><?php echo htmlspecialchars($row->config_metakeys, ENT_QUOTES); ?></textarea></td>
 		</tr>
 		<tr>
-			<td valign="top">Show Title Meta Tag:</td>
+			<td valign="top"><?php echo T_('Show Title Meta Tag:') ?></td>
 			<td>
 			<?php echo $lists['metatitle']; ?>
 			&nbsp;&nbsp;&nbsp;
-			<?php echo mosToolTip('Show the title meta tag when viewing content items'); ?>
+			<?php echo mosToolTip(T_('Show the title meta tag when viewing content items')); ?>
 			</td>
 		  	</tr>
 		<tr>
-			<td valign="top">Show Author Meta Tag:</td>
+			<td valign="top"><?php echo T_('Show Author Meta Tag:') ?></td>
 			<td>
 			<?php echo $lists['metaauthor']; ?>
 			&nbsp;&nbsp;&nbsp;
-			<?php echo mosToolTip('Show the author meta tag when viewing content items'); ?>
+			<?php echo mosToolTip(T_('Show the author meta tag when viewing content items')); ?>
 			</td>
 		</tr>
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Mail","mail-page");
+		$tabs->startTab(T_('Mail'),"mail-page");
 ?>
 		<table class="adminform">
 		<tr>
-			<td width="185">Mailer:</td>
+			<td width="185"><?php echo T_('Mailer:') ?></td>
 			<td><?php echo $lists['mailer']; ?></td>
 		</tr>
 		<tr>
-			<td>Mail From:</td>
+			<td><?php echo T_('Mail From:') ?></td>
 			<td><input class="text_area" type="text" name="config_mailfrom" size="50" value="<?php echo $row->config_mailfrom; ?>"/></td>
 		</tr>
 		<tr>
-			<td>From Name:</td>
+			<td><?php echo T_('From Name:') ?></td>
 			<td><input class="text_area" type="text" name="config_fromname" size="50" value="<?php echo $row->config_fromname; ?>"/></td>
 		</tr>
 		<tr>
-			<td>Sendmail Path:</td>
+			<td><?php echo T_('Sendmail Path:') ?></td>
 			<td><input class="text_area" type="text" name="config_sendmail" size="50" value="<?php echo $row->config_sendmail; ?>"/></td>
 		</tr>
 		<tr>
-			<td>SMTP Auth:</td>
+			<td><?php echo T_('SMTP Auth:') ?></td>
 			<td><?php echo $lists['smtpauth']; ?></td>
 		</tr>
 		<tr>
-			<td>SMTP User:</td>
+			<td><?php echo T_('SMTP User:') ?></td>
 			<td><input class="text_area" type="text" name="config_smtpuser" size="50" value="<?php echo $row->config_smtpuser; ?>"/></td>
 		</tr>
 		<tr>
-			<td>SMTP Pass:</td>
+			<td><?php echo T_('SMTP Pass') ?>:</td>
 			<td><input class="text_area" type="text" name="config_smtppass" size="50" value="<?php echo $row->config_smtppass; ?>"/></td>
 		</tr>
 		<tr>
-			<td>SMTP Host:</td>
+			<td><?php echo T_('SMTP Host:') ?></td>
 			<td><input class="text_area" type="text" name="config_smtphost" size="50" value="<?php echo $row->config_smtphost; ?>"/></td>
 		</tr>
 		</table>
 <?php
 		$tabs->endTab();
-		$tabs->startTab("Cache","cache-page");
+		$tabs->startTab(T_("Cache"),"cache-page");
 ?>
 		<table class="adminform" border="0">
 		<?php
 		if (is_writeable($row->config_cachepath)) {
 			?>
 			<tr>
-				<td width="185">Caching:</td>
+				<td width="185"><?php echo T_('Caching:') ?></td>
 				<td width="500"><?php echo $lists['caching']; ?></td>
 				<td>&nbsp;</td>
 			</tr>
@@ -681,64 +686,64 @@
 		}
 		?>
 		<tr>
-			<td>Cache Folder:</td>
+			<td><?php echo T_('Cache Folder:') ?></td>
 			<td>
 			<input class="text_area" type="text" name="config_cachepath" size="50" value="<?php echo $row->config_cachepath; ?>"/>
 <?php
 			if (is_writeable($row->config_cachepath)) {
-				echo mosToolTip('Current cache is directory is <b>Writeable</b>');
+				echo mosToolTip(T_('Current cache is directory is <b>Writeable</b>'));
 			} else {
-				echo mosWarning('The cache directory is UNWRITEABLE - please set this directory to CHMOD755 before turning on the cache');
+				echo mosWarning(T_('The cache directory is UNWRITEABLE - please set this directory to CHMOD755 before turning on the cache'));
 			}
 ?>			</td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Cache Time:</td>
-			<td><input class="text_area" type="text" name="config_cachetime" size="5" value="<?php echo $row->config_cachetime; ?>"/> seconds</td>
+			<td><?php echo T_('Cache Time:') ?></td>
+			<td><input class="text_area" type="text" name="config_cachetime" size="5" value="<?php echo $row->config_cachetime; ?>"/> <?php echo T_('seconds') ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		</table>
 		<?php
 		$tabs->endTab();
-		$tabs->startTab("Statistics","stats-page");
+		$tabs->startTab(T_('Statistics'),"stats-page");
 		?>
 		<table class="adminform">
 		<tr>
-			<td width="185">Statistics:</td>
+			<td width="185"><?php echo T_('Statistics:') ?></td>
 			<td width="100"><?php echo $lists['enable_stats']; ?></td>
-			<td><?php echo mostooltip('Enable/disable collection of site statistics'); ?></td>
+			<td><?php echo mostooltip(T_('Enable/disable collection of site statistics')); ?></td>
 		</tr>
 		<tr>
-			<td>Log Content Hits by Date:</td>
+			<td><?php echo T_('Log Content Hits by Date:') ?></td>
 			<td><?php echo $lists['log_items']; ?></td>
-			<td><span class="error"><?php echo mosWarning('WARNING : Large amounts of data will be collected'); ?></span></td>
+			<td><span class="error"><?php echo mosWarning(T_('WARNING : Large amounts of data will be collected')); ?></span></td>
 		</tr>
 		<tr>
-			<td>Log Search Strings:</td>
+			<td><?php echo T_('Log Search Strings:') ?></td>
 			<td><?php echo $lists['log_searches']; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		</table>
 		<?php
 		$tabs->endTab();
-		$tabs->startTab("SEO","seo-page");
+		$tabs->startTab(T_('SEO'),"seo-page");
 		?>
 		<table class="adminform">
 		<tr>
-			<td width="200"><strong>Search Engine Optimization</strong></td>
+			<td width="200"><strong><?php echo T_('Search Engine Optimization') ?></strong></td>
 			<td width="100">&nbsp;</td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<td>Search Engine Friendly URLs:</td>
+			<td><?php echo T_('Search Engine Friendly URLs:') ?></td>
 			<td><?php echo $lists['sef']; ?>&nbsp;</td>
-			<td><span class="error"><?php echo mosWarning('Apache only! Rename htaccess.txt to .htaccess before activating'); ?></span></td>
+			<td><span class="error"><?php echo mosWarning(T_('Apache only! Rename htaccess.txt to .htaccess before activating')); ?></span></td>
 		</tr>
 		<tr>
-			<td>Dynamic Page Titles:</td>
+			<td><?php echo T_('Dynamic Page Titles:') ?></td>
 			<td><?php echo $lists['pagetitles']; ?></td>
-			<td><?php echo mosToolTip('Dynamically changes the page title to reflect current content viewed'); ?></td>
+			<td><?php echo mosToolTip(T_('Dynamically changes the page title to reflect current content viewed')); ?></td>
 		</tr>
 		</table>
 <?php
diff -ruN 4.5.4/administrator/components/com_config/admin.config.php 4.6rc2/administrator/components/com_config/admin.config.php
--- 4.5.4/administrator/components/com_config/admin.config.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_config/admin.config.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,24 +1,22 @@
 <?php
 /**
-* @version $Id: admin.config.php,v 1.4 2005/11/25 23:30:20 csouza Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Config
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 if (!$acl->acl_check( 'administration', 'config', 'users', $my->usertype )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
-/**
-* @package Mambo
-* @subpackage Config
-*/
 class mosConfig extends mosDBTable {
 	/** @var int */
 	var $config_offline=null;
@@ -33,8 +31,6 @@
 	/** @var string */
 	var $config_dbprefix=null;
 	/** @var string */
-	var $config_lang=null;
-	/** @var string */
 	var $config_path=null;
 	/** @var string */
 	var $config_live_site=null;
@@ -63,6 +59,12 @@
 	/** @var int */
 	var $config_debug=0;
 	/** @var string */
+	var $config_lang=null;
+	/** @var string */
+	var $config_locale_debug=0;
+	/** @var string */
+	var $config_locale_use_gettext=0;
+	/** @var string */
 	var $config_locale=null;
 	/** @var int */
 	var $config_offset=null;
@@ -159,7 +161,6 @@
 		'config_password'				=>'mosConfig_password',
 		'config_db'						=>'mosConfig_db',
 		'config_dbprefix'				=>'mosConfig_dbprefix',
-		'config_lang'					=>'mosConfig_lang',
 		'config_path'					=>'mosConfig_absolute_path',
 		'config_live_site'				=>'mosConfig_live_site',
 		'config_sitename'				=>'mosConfig_sitename',
@@ -174,7 +175,10 @@
 		'config_metakeys'				=>'mosConfig_MetaKeys',
 		'config_metaauthor'				=>'mosConfig_MetaAuthor',
 		'config_metatitle'				=>'mosConfig_MetaTitle',
+		'config_lang'					=>'mosConfig_lang',
 		'config_locale'					=>'mosConfig_locale',
+		'config_locale_debug'			=>'mosConfig_locale_debug',
+		'config_locale_use_gettext'		=>'mosConfig_locale_use_gettext',
 		'config_offset'					=>'mosConfig_offset',
 		'config_hideauthor'				=>'mosConfig_hideAuthor',
 		'config_hidecreate'				=>'mosConfig_hideCreateDate',
@@ -263,12 +267,13 @@
 
 	// compile list of the languages
 	$langs = array();
-	$menuitems = array();
+	// menuitems appears never to be used - so commented out by Martin Brampton 15 Dec 2005
+//	$menuitems = array();
 
 	if ($handle=opendir( "$mosConfig_absolute_path/language/" )) {
 		$i=0;
 		while (false !== ($file = readdir($handle))) {
-			if (!strcasecmp(substr($file,-4),".php") && $file <> "." && $file <> ".." && strcasecmp(substr($file,-11),".ignore.php")) {
+			if (!strcasecmp(substr($file,-4),".xml") && $file <> "." && $file <> ".." && strcasecmp(substr($file,-11),".ignore.php")) {
 				$langs[] = mosHTML::makeOption( substr($file,0,-4) );
 			}
 		}
@@ -302,28 +307,29 @@
 	// build the html select list
 	$lists['lang'] = mosHTML::selectList( $langs, 'config_lang', 'class="inputbox" size="1"', 'value', 'text', $row->config_lang );
 	// make a generic -24 - 24 list
-	for ($i=-24;$i<=24;$i++) {
+	for ($i=-12;$i<=12;$i++) {
 		$timeoffset[] = mosHTML::makeOption( $i, $i );
 	}
 
+	// menuitems appears not to be used anywhere - so commented out Martin Brampton 15 Dec 2005
 	// get list of menuitems
-	$query = "SELECT id AS value, name AS text FROM #__menu"
-	. "\n WHERE (type='content_section' OR type='components' OR type='content_typed')"
-	. "\n AND published=1"
-	. "\n AND access=0"
-	. "\n ORDER BY name"
-	;
-	$database->setQuery( $query );
-	$menuitems = array_merge( $menuitems, $database->loadObjectList() );
+//	$query = "SELECT id AS value, name AS text FROM #__menu"
+//	. "\n WHERE (type='content_section' OR type='components' OR type='content_typed')"
+//	. "\n AND published=1"
+//	. "\n AND access=0"
+//	. "\n ORDER BY name"
+//	;
+//	$database->setQuery( $query );
+//	$menuitems = array_merge( $menuitems, $database->loadObjectList() );
 
 	$show_hide = array(
-		mosHTML::makeOption( 1, 'Hide' ),
-		mosHTML::makeOption( 0, 'Show' ),
+		mosHTML::makeOption( 1, T_('Hide') ),
+		mosHTML::makeOption( 0, T_('Show') ),
 	);
 
 	$show_hide_r = array(
-		mosHTML::makeOption( 0, 'Hide' ),
-		mosHTML::makeOption( 1, 'Show' ),
+		mosHTML::makeOption( 0, T_('Hide') ),
+		mosHTML::makeOption( 1, T_('Show') ),
 	);
 
 	$list_length = array(
@@ -337,21 +343,29 @@
 	);
 
 	$errors = array(
-		mosHTML::makeOption( -1, 'System Default' ),
-		mosHTML::makeOption( 0, 'None' ),
-		mosHTML::makeOption( E_ERROR|E_WARNING|E_PARSE, 'Simple' ),
-		mosHTML::makeOption( E_ALL , 'Maximum' )
+		mosHTML::makeOption( -1, T_('System Default') ),
+		mosHTML::makeOption( 0, T_('None') ),
+		mosHTML::makeOption( E_ERROR|E_WARNING|E_PARSE, T_('Simple') ),
+		mosHTML::makeOption( E_ALL , T_('Maximum') )
 	);
 
 	$register_globals = array(
-		mosHTML::makeOption( 1, 'On' ),
-		mosHTML::makeOption( 0, 'Off' ),
+		mosHTML::makeOption( 1, T_('On') ),
+		mosHTML::makeOption( 0, T_('Off') ),
+	);
+	$locale_debug = array(
+		mosHTML::makeOption( 1, T_('On') ),
+		mosHTML::makeOption( 0, T_('Off') ),
+	);
+	$locale_use_gettext = array(
+		mosHTML::makeOption( 1, T_('Yes') ),
+		mosHTML::makeOption( 0, T_('No') ),
 	);
 
 	$mailer = array(
-		mosHTML::makeOption( 'mail', 'PHP mail function', true ),
-		mosHTML::makeOption( 'sendmail', 'Sendmail', true ),
-		mosHTML::makeOption( 'smtp', 'SMTP Server', true )
+		mosHTML::makeOption( 'mail', T_('PHP mail function'), true ),
+		mosHTML::makeOption( 'sendmail', T_('Sendmail'), true ),
+		mosHTML::makeOption( 'smtp', T_('SMTP Server'), true )
 	);
 
 	// build the html select lists
@@ -382,7 +396,7 @@
 	if (is_writable( "$mosConfig_absolute_path/media/" )) {
 		$lists['hidepdf'] 			= mosHTML::RadioList( $show_hide, 'config_hidepdf', 'class="inputbox"', $row->config_hidepdf, 'value', 'text' );
 	} else {
-		$lists['hidepdf'] 			= '<input type="hidden" name="config_hidepdf" value="1" /><strong>Yes</strong>';
+		$lists['hidepdf'] 			= '<input type="hidden" name="config_hidepdf" value="1" /><strong>'.T_('Yes').'</strong>';
 	}
 
 	$lists['hideprint'] 			= mosHTML::RadioList( $show_hide, 'config_hideprint', 'class="inputbox"', $row->config_hideprint, 'value', 'text' );
@@ -395,7 +409,7 @@
 
 	$lists['enable_stats'] 			= mosHTML::yesnoRadioList( 'config_enable_stats', 'class="inputbox"', $row->config_enable_stats );
 
-	$lists['sef'] 					= mosHTML::yesnoRadioList( 'config_sef', 'class="inputbox" onclick="javascript: if (document.adminForm.config_sef[1].checked) { alert(\'Remember to rename htaccess.txt to .htaccess\') }"', $row->config_sef );
+	$lists['sef'] 					= mosHTML::yesnoRadioList( 'config_sef', 'class="inputbox" onclick="javascript: if (document.adminForm.config_sef[1].checked) { alert(\''.T_('Remember to rename htaccess.txt to .htaccess').'\') }"', $row->config_sef );
 
 	$lists['vote'] 					= mosHTML::RadioList( $show_hide_r, 'config_vote', 'class="inputbox"', $row->config_vote, 'value', 'text' );
 
@@ -408,6 +422,11 @@
 	$lists['error_reporting'] 		= mosHTML::selectList( $errors, 'config_error_reporting', 'class="inputbox" size="1"', 'value', 'text', $row->config_error_reporting );
 
 	$lists['register_globals'] 		= mosHTML::RadioList( $register_globals, 'config_register_globals', 'class="inputbox" size="1"', $row->config_register_globals, 'value', 'text' );
+	
+	$lists['locale_debug'] 		    = mosHTML::RadioList( $locale_debug, 'config_locale_debug', 'class="inputbox" size="1"', $row->config_locale_debug, 'value', 'text' );
+	
+	$disabled = (extension_loaded('gettext')) ? '' : 'disabled="disabled" ';
+	$lists['locale_use_gettext'] 	= mosHTML::RadioList( $locale_use_gettext, 'config_locale_use_gettext', $disabled.'class="inputbox" size="1"', $row->config_locale_use_gettext, 'value', 'text' );
 
 	$lists['link_titles'] 			= mosHTML::yesnoRadioList( 'config_link_titles', 'class="inputbox"', $row->config_link_titles );
 
@@ -423,7 +442,7 @@
 
 	$lists['item_navigation'] 		= mosHTML::RadioList( $show_hide_r, 'config_item_navigation', 'class="inputbox"', $row->config_item_navigation, 'value', 'text' );
 
-	$lists['ml_support'] 			= mosHTML::yesnoRadioList( 'config_ml_support', 'class="inputbox" onclick="javascript: if (document.adminForm.config_ml_support[1].checked) { alert(\'Remember to install the MambelFish component.\') }"', $row->config_ml_support );
+	$lists['ml_support'] 			= mosHTML::yesnoRadioList( 'config_ml_support', 'class="inputbox" onclick="javascript: if (document.adminForm.config_ml_support[1].checked) { alert(\''.T_('Remember to install the MambelFish component.').'\') }"', $row->config_ml_support );
 
 	$lists['readmore'] 				= mosHTML::RadioList( $show_hide_r, 'config_readmore', 'class="inputbox"', $row->config_readmore, 'value', 'text' );
 
@@ -463,7 +482,7 @@
 
 	$config = "<?php \n";
 	$config .= $row->getVarText();
-	$config .= "setlocale (LC_TIME, \$mosConfig_locale);\n";
+	//$config .= "setlocale (LC_TIME, \$mosConfig_locale);\n";
 	$config .= '?>';
 
 	$fname = '../configuration.php';
@@ -480,7 +499,7 @@
 				@chmod($fname, $oldperms & 0777555);
 		} // if
 
-		$msg = 'The Configuration Details have been updated';
+		$msg = T_('The Configuration Details have been updated');
 
 	    // apply file and directory permissions if requested by user
 	    $applyFilePerms = mosGetParam($_POST,'applyFilePerms',0) && $row->config_fileperms!='';
@@ -494,6 +513,7 @@
 	            'help',
 	            'images',
 	            'includes',
+	            'parameters',
 	            'installation',
 	            'language',
 	            'mambots',
@@ -501,17 +521,18 @@
 	            'modules',
 	            'templates',
 	            'CHANGELOG',
-	            'configuration.php-dist',
 	            'configuration.php',
-	            'globals.php',
 	            'htaccess.txt',
 	            'index.php',
 	            'index2.php',
+	            'index3.php',
 	            'INSTALL',
 	            'LICENSE',
 	            'mainbody.php',
 	            'offline.php',
+	            'page404.php',
 	            'pathway.php',
+	            'README',
 	            'robots.txt'
 	        );
 	        $filemode = NULL;
@@ -534,7 +555,7 @@
 		}
 	} else {
 		if ($enable_write) @chmod($fname, $oldperms);
-		mosRedirect( 'index2.php', 'An Error Has Occurred! Unable to open config file to write!' );
+		mosRedirect( 'index2.php', T_('An Error Has Occurred! Unable to open config file to write!') );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_config/toolbar.config.html.php 4.6rc2/administrator/components/com_config/toolbar.config.html.php
--- 4.5.4/administrator/components/com_config/toolbar.config.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_config/toolbar.config.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.config.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Config
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Config
-*/
 class TOOLBAR_config {
 	function _DEFAULT() {
 		mosMenuBar::startTable();
@@ -24,7 +22,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.config' );
+		mosMenuBar::help( 'main' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_config/toolbar.config.php 4.6rc2/administrator/components/com_config/toolbar.config.php
--- 4.5.4/administrator/components/com_config/toolbar.config.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_config/toolbar.config.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.config.php,v 1.1 2005/07/22 01:52:16 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Config
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_contact/admin.contact.html.php 4.6rc2/administrator/components/com_contact/admin.contact.html.php
--- 4.5.4/administrator/components/com_contact/admin.contact.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_contact/admin.contact.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.contact.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Contact
-*/
 class HTML_contact {
 
 	function showContacts( &$rows, &$pageNav, $search, $option, &$lists ) {
@@ -26,10 +24,10 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Contact Manager
+			<?php echo T_('Contact Manager') ?>
 			</th>
 			<td>
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="inputbox" onChange="document.adminForm.submit();" />
@@ -49,19 +47,19 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count($rows); ?>);" />
 			</th>
 			<th class="title">
-			Name
+			<?php echo T_('Name') ?>
 			</th>
 			<th width="5%" class="title" nowrap="true">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th colspan="2" nowrap="nowrap" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th width="15%" align="left">
-			Category
+			<?php echo T_('Category') ?>
 			</th>
 			<th class="title" nowrap="nowrap" width="15%">
-			Linked to User
+			<?php echo T_('Linked to User') ?>
 			</th>
 		</tr>
 		<?php
@@ -93,7 +91,7 @@
 					echo $row->name;
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Contact">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Contact') ?>">
 					<?php echo $row->name; ?>
 					</a>
 					<?php
@@ -112,12 +110,12 @@
 				<?php echo $pageNav->orderDownIcon( $i, $n, ( $row->catid == @$rows[$i+1]->catid ) ); ?>
 				</td>
 				<td>
-				<a href="<?php echo $row->cat_link; ?>" title="Edit Category">
+				<a href="<?php echo $row->cat_link; ?>" title="<?php echo T_('Edit Category') ?>">
 				<?php echo $row->category; ?>
 				</a>
 				</td>
 				<td>
-				<a href="<?php echo $row->user_link; ?>" title="Edit User">
+				<a href="<?php echo $row->user_link; ?>" title="<?php echo T_('Edit User') ?>">
 				<?php echo $row->user; ?>
 				</a>
 				</td>
@@ -159,9 +157,9 @@
 
 			// do field validation
 			if ( form.name.value == "" ) {
-				alert( "You must provide a name." );
+				alert( "<?php echo T_('You must provide a name.') ?>" );
 			} else if ( form.catid.value == 0 ) {
-				alert( "Please select a Category." );
+				alert( "<?php echo T_('Please select a Category.') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -173,9 +171,9 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Contact:
+			<?php echo T_('Contact:') ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			</th>
 		</tr>
@@ -187,12 +185,12 @@
 				<table width="100%" class="adminform">
 				<tr>
 					<th colspan="2">
-					Contact Details
+					<?php echo T_('Contact Details') ?>
 					</th>
 				<tr>
 				<tr>
 					<td width="20%" align="right">
-					Category:
+					<?php echo T_('Category:') ?>
 					</td>
 					<td width="40%">
 					<?php echo $lists['catid'];?>
@@ -200,7 +198,7 @@
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Linked to User:
+					<?php echo T_('Linked to User:') ?>
 					</td>
 					<td >
 					<?php echo $lists['user_id'];?>
@@ -208,7 +206,7 @@
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td >
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $row->name; ?>" />
@@ -216,7 +214,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Contact's Position:
+					<?php echo T_('Contact\'s Position:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="con_position" size="50" maxlength="50" value="<?php echo $row->con_position; ?>" />
@@ -224,7 +222,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					E-mail:
+					<?php echo T_('E-mail:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="email_to" size="50" maxlength="100" value="<?php echo $row->email_to; ?>" />
@@ -232,7 +230,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Street Address:
+					<?php echo T_('Street Address:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="address" size="50" value="<?php echo $row->address; ?>" />
@@ -240,7 +238,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Town/Suburb:
+					<?php echo T_('Town/Suburb:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="suburb" size="50" maxlength="50" value="<?php echo $row->suburb;?>" />
@@ -248,7 +246,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					State/County:
+					<?php echo T_('State/County:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="state" size="50" maxlength="20" value="<?php echo $row->state;?>" />
@@ -256,7 +254,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Country:
+					<?php echo T_('Country:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="country" size="50" maxlength="50" value="<?php echo $row->country;?>" />
@@ -264,7 +262,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Postal Code/ZIP:
+					<?php echo T_('Postal Code/ZIP:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="postcode" size="25" maxlength="10" value="<?php echo $row->postcode; ?>" />
@@ -272,7 +270,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Telephone:
+					<?php echo T_('Telephone:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="telephone" size="25" maxlength="25" value="<?php echo $row->telephone; ?>" />
@@ -280,7 +278,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Fax:
+					<?php echo T_('Fax:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="fax" size="25" maxlength="25" value="<?php echo $row->fax; ?>" />
@@ -288,7 +286,7 @@
 				</tr>
 				<tr>
 					<td align="right" valign="top">
-					Miscellaneous Info:
+					<?php echo T_('Miscellaneous Info:') ?>
 					</td>
 					<td>
 					<textarea name="misc" rows="5" cols="50" class="inputbox"><?php echo $row->misc; ?></textarea>
@@ -305,12 +303,12 @@
 				<table width="100%" class="adminform">
 				<tr>
 					<th colspan="2">
-					Publishing Info
+					<?php echo T_('Publishing Info') ?>
 					</th>
 				<tr>
 				<tr>
 					<td width="20%" align="right">
-					Site Default:
+					<?php echo T_('Site Default:') ?>
 					</td>
 					<td >
 					<?php echo $lists['default_con']; ?>
@@ -318,7 +316,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -326,7 +324,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -334,7 +332,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access:
+					<?php echo T_('Access:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -348,17 +346,17 @@
 				</table>
 				<?php
 				$tabs->endTab();
-				$tabs->startTab("Images","images-page");
+				$tabs->startTab(T_("Images"),"images-page");
 				?>
 				<table width="100%" class="adminform">
 				<tr>
 					<th colspan="2">
-					Image Info
+					<?php echo T_('Image Info') ?>
 					</th>
 				<tr>
 				<tr>
 					<td align="left" width="20%">
-					Image:
+					<?php echo T_('Image') ?>:
 					</td>
 					<td align="left">
 					<?php echo $lists['image']; ?>
@@ -374,24 +372,24 @@
 					} else {
 						jsimg='../images/M_images/blank.png';
 					}
-					document.write('<img src=' + jsimg + ' name="imagelib" width="100" height="100" border="2" alt="Preview" />');
+					document.write('<img src=' + jsimg + ' name="imagelib" width="100" height="100" border="2" alt="<?php echo T_('Preview') ?>" />');
 					</script>
 					</td>
 				</tr>
 				</table>
 				<?php
 				$tabs->endTab();
-				$tabs->startTab("Parameters","params-page");
+				$tabs->startTab(T_("Parameters"),"params-page");
 				?>
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
 					<td>
-					* These Parameters only control what you see when you click to view a Contact item *
+					* <?php echo T_('These Parameters only control what you see when you click to view a Contact item') ?> *
 					<br /><br />
 					</td>
 				</tr>
diff -ruN 4.5.4/administrator/components/com_contact/admin.contact.php 4.6rc2/administrator/components/com_contact/admin.contact.php
--- 4.5.4/administrator/components/com_contact/admin.contact.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_contact/admin.contact.php	2006-03-12 09:43:33.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.contact.php,v 1.1 2005/07/22 01:52:16 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,17 +16,15 @@
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
 		| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_contact' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
 require_once( $mainframe->getPath( 'class' ) );
 
-$id 	= mosGetParam( $_GET, 'id', 0 );
-$cid 	= mosGetParam( $_POST, 'cid', array(0) );
-if (!is_array( $cid )) {
-	$cid = array(0);
-}
+$id = mosGetParam($_GET, 'id', 0);
+$cid = mosGetParam($_POST, 'cid', array(0));
+if (!is_array( $cid )) $cid = array(0);
 
 switch ($task) {
 
@@ -173,7 +173,7 @@
 
 	// get params definitions
 	$file = $mosConfig_absolute_path .'/administrator/components/com_contact/contact_items.xml';
-	$params =& new mosParameters( $row->params, $file, 'component' );
+	$params =& new mosAdminParameters( $row->params, $file, 'component' );
 
 	HTML_contact::editcontact( $row, $lists, $option, $params );
 }
@@ -252,7 +252,7 @@
 
 	if (count( $cid ) < 1) {
 		$action = $state == 1 ? 'publish' : 'unpublish';
-		echo "<script> alert('Select a record to $action'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".sprintf(T_('Select a record to %s'),$action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -299,4 +299,4 @@
 	$row->checkin();
 	mosRedirect('index2.php?option=com_contact');
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_contact/contact.xml 4.6rc2/administrator/components/com_contact/contact.xml
--- 4.5.4/administrator/components/com_contact/contact.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_contact/contact.xml	2006-04-06 14:57:27.000000000 -0500
@@ -2,14 +2,13 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Contact</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component shows a listing of Contact Information</description>
 	<params>
-		<param name="menu_image" type="imagelist" directory="/images/stories" hide_default="1" default="" label="Menu Image" description="A small image to be placed to the left or right of your menu item, images must be in images/stories/" />
 		<param name="pageclass_sfx" type="text" default="" label="Page Class Suffix" description="A suffix to be applied to the css classes of the page, this allows individual page styling" />
 		<param name="back_button" type="list" default="" label="Back Button" description="Show/Hide a Back Button, that returns you to the previously view page">
 			<option value="">Use Global</option>
diff -ruN 4.5.4/administrator/components/com_contact/contact_items.xml 4.6rc2/administrator/components/com_contact/contact_items.xml
--- 4.5.4/administrator/components/com_contact/contact_items.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_contact/contact_items.xml	2006-04-06 14:57:27.000000000 -0500
@@ -2,14 +2,13 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Contact Items</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Parameters for individual Contact Items</description>
 	<params>
-		<param name="menu_image" type="imagelist" directory="/images/stories" hide_default="1" default="" label="Menu Image" description="A small image to be placed to the left or right of your menu item, images must be in images/stories/" />
 		<param name="pageclass_sfx" type="text" size="20" default="" label="Page Class Suffix" description="A suffix to be applied to the css classes of the page, this allows individual page styling" />
 		<param name="print" type="list" default="" label="Print Icon" description="Show/Hide the item print button - only affects this page">
 			<option value="">Use Global</option>
diff -ruN 4.5.4/administrator/components/com_contact/toolbar.contact.html.php 4.6rc2/administrator/components/com_contact/toolbar.contact.html.php
--- 4.5.4/administrator/components/com_contact/toolbar.contact.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_contact/toolbar.contact.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.contact.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Contact
-*/
 class TOOLBAR_contact {
 	/**
 	* Draws the menu for a New Contact
@@ -27,12 +25,16 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.contactmanager.edit' );
+		if ($GLOBALS['task'] == 'new') {
+		    mosMenuBar::help( 'new' );
+		} else {
+		    mosMenuBar::help( 'edit' );
+		}
 		mosMenuBar::endTable();
 	}
 
@@ -48,7 +50,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.contactmanager.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_contact/toolbar.contact.php 4.6rc2/administrator/components/com_contact/toolbar.contact.php
--- 4.5.4/administrator/components/com_contact/toolbar.contact.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_contact/toolbar.contact.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.contact.php,v 1.1 2005/07/22 01:52:16 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_containers/admin.containers.html.php 4.6rc2/administrator/components/com_containers/admin.containers.html.php
--- 4.5.4/administrator/components/com_containers/admin.containers.html.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/admin.containers.html.php	2006-04-03 08:47:34.000000000 -0500
@@ -0,0 +1,259 @@
+<?php
+
+class containersAdminHTML extends basicAdminHTML {
+	var $repository = '';
+	var $clist = '';
+	
+	function containersAdminHTML (&$controller, $limit, $clist) {
+	    basicAdminHTML::basicAdminHTML($controller, $limit);
+		$this->repository =& $controller->repository;
+		$this->clist = $clist;
+	}
+
+	function displayIcons ($object, $iconList) {
+		if (is_object($object)) $icon = $object->icon;
+		else $icon = '';
+		?>
+		<script type="text/javascript">
+		function paste_strinL(strinL){
+			var input=document.forms["adminForm"].elements["icon"];
+			input.value='';
+			input.value=strinL;
+		}
+		</script>
+		<tr>
+			<td width="30%" valign="top" align="right">
+				<b><?php echo T_('Icon'); ?></b>&nbsp;
+			</td>
+			<td valign="top">
+				<input class="inputbox" type="text" name="icon" size="25" value="<?php echo $icon; ?>" />
+				<table>
+					<tr>
+						<td>
+							<?php echo $iconList; ?>
+						</td>
+					</tr>
+				</table>
+			</td>
+  		</tr>
+  		<?php
+	}
+	
+	function listHeader ($descendants, $search) {
+		?>
+		<tr>
+    		<td align="left"><?php echo T_('Display number').$this->pageNav->writeLimitBox(); ?>
+			</td>
+			<td align="left"><?php echo T_('Search:'); ?><input type="text" name="search" value="<?php echo $search;?>" class="inputbox" onChange="document.adminForm.submit();" />
+    		</td>
+			<td align="left"><?php echo T_('Show Descendants?'); ?><input type="checkbox" name="descendants" value="1" <?php if ($descendants) echo 'checked="checked"'; ?> onChange="document.adminForm.submit();" />
+			</td>
+		</tr>
+		<tr>
+		<?php
+		if ($this->clist<>'') {
+			echo '<td align="left" colspan=3>'.$this->clist.'</td>';
+		} 
+		echo '</tr>';
+	}
+	
+	function containerSelectBox () {
+		?>
+		<tr>
+			<td width="30%" valign="top" align="right">
+				<b><?php echo T_('Parent container'); ?></b>&nbsp;
+			</td>
+			<td valign="top">
+				<?php echo $this->clist; ?>
+			</td>
+		</tr>
+		<?php
+	}
+	
+	function startEditHeader ($title) {
+		?>
+		<form method="post" name="adminForm" action="index2.php">
+			<table width="100%" border="0" cellspacing="0" cellpadding="0">
+   		<tr>
+			<td width="100%" colspan="4">
+			<div class="title">
+			<img src="<?php echo mamboCore::get('mosConfig_live_site').'/administrator/images/asterisk.png'; ?>" alt="<?php echo $title; ?>" />
+			<span class="sectionname">&nbsp;<?php echo T_('Mambo '); echo $title; ?></span>
+			</div>
+			</td>
+    	</tr>
+		<?php
+		$this->blankRow();
+		$this->containerSelectBox();
+	}
+	
+	function publishedBox (&$object) {
+		?>
+				<tr>
+					<td width="30%" align="right">
+				  	<b><?php echo T_('Published'); ?></b>&nbsp;
+				  </td>
+				  	<?php $this->tickBox($object, 'published'); ?>
+				</tr>
+		<?php
+	}
+	
+	function editLink ($id, $containerid=0) {
+		$url = "index2.php?option=com_containers&amp;act=$this->act&amp;task=edit&amp;cfid=$id";
+		if ($containerid) $url .= "&amp;containerid=$containerid";
+		return $url;
+	}
+	
+	function legalTypeList ($current) {
+		$alternatives = explode(',',_REMOS_LEGAL_TYPES);
+		foreach ($alternatives as $one) {
+			if ($one == $current) $mark = 'selected=\'selected\'';
+			else $mark = '';
+			echo "<option $mark value='$one'>$one</option>";
+		}
+	}
+
+}
+
+class listContainersHTML extends containersAdminHTML {
+	
+	function columnHeads ($containers, $descendants) {
+		$this->listHeadingStart(count($containers));
+		$this->headingItem('30%', T_('Title'));
+		if ($this->clist) { 
+			$this->headingItem('5%', 'ID');
+			if (!$descendants) {
+				$this->headingItem('5%', T_('Reorder'), 2);
+				$this->headingItem('2%', T_('Order'));
+				?>
+				<th width="1%">
+				<a href="javascript: saveorder( <?php echo count( $containers )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
+				</th>
+				<?php
+			}
+			$this->headingItem('25%', T_('Top level container'));
+			$this->headingItem('25%', T_('Immediate container'));
+		}
+		$this->headingItem('7%', T_('Published'));
+		echo '</tr>';
+	}
+	
+	function filecount ($container) {
+		if ($container->filecount) {
+			$link = "<a href='index2.php?option=com_containers&amp;act=files&amp;task=list&amp;containerid=$container->id'>";
+			$link .= $container->filecount;
+			$link .= '</a>';
+			return $link;
+		}
+		else return '0';
+	}
+	
+	function listLine ($container, $descendants, $i, $k, $n) {
+		global $mosConfig_live_site;
+		?>
+				<tr class="<?php echo "row$k"; ?>">
+					<td width="5">
+						<input type="checkbox" id="cb<?php echo $i;?>" name="cfid[]" value="<?php echo $container->id; ?>" onclick="isChecked(this.checked);" />
+					</td>
+					<td width="30%" align="left">
+							<a href="<?php echo $this->editLink($container->id); ?>">
+							<?php echo $container->name; ?>
+						</a>
+					</td>
+					<?php if ($this->clist) { ?>
+					<td width="5%" align="left"><?php echo $container->id; ?></td>
+					<?php if (!$descendants) { echo '<td>'.$this->pageNav->orderUpIcon( $i ); ?>
+					</td>
+					<td>
+					<?php echo $this->pageNav->orderDownIcon( $i, $n ); ?>
+					</td>
+					<td align="center" colspan="2">
+					<input type="text" name="order[]" size="5" value="<?php echo $container->ordering; ?>" class="text_area" style="text-align: center" />
+					<?php echo '</td>'; } ?>
+					<td width="25%" align="left"><?php echo $container->getCategoryName();?></td>
+					<td width="25%" align="left"><?php echo $container->getFamilyNames();?></td>
+					<?php }
+					if ($container->published==1) { ?>
+					<td width="7%" align="center"><img src="<?php echo $mosConfig_live_site; ?>/administrator/images/publish_g.png" border="0" alt="Published" /></td>
+					<?php } else { ?>
+					<td width="7%" align="center"><img src="<?php echo $mosConfig_live_site; ?>/administrator/images/publish_x.png" border="0" alt="Published" /></td>
+					<?php } ?>
+					</td>
+				</tr>
+		<?php
+	}
+
+	// was showContainersHTML
+	function view (&$containers, $descendants, $search='')  {
+		$this->formStart(T_('Containers'), mamboCore::get('mosConfig_live_site').'/administrator/images/asterisk.png');
+		$this->blankRow();
+		$this->listHeader($descendants, $search);
+		echo '</table>';
+		$this->columnHeads($containers, $descendants);
+		$n = count($containers);
+		$k = 0;
+		foreach ($containers as $i=>$container) {
+			$this->listLine($container, $descendants, $i, $k, $n);
+			$k = 1 - $k;
+		}
+		$this->listFormEnd();
+	}
+}
+
+class editContainersHTML extends containersAdminHTML {
+
+	function selectList ($title, $selector, $redstar) {
+		$this->inputTop ($title, $redstar);
+		?>
+			<td valign="top">
+				<?php echo $selector; ?>
+			</td>
+		</tr>
+		<?php
+	}
+	
+	function permission ($title,$container,$updown,$name) {
+		$this->inputTop($title, true);
+		?>
+					<td valign="top">
+					<?php
+					for ($i=0; $i<4; $i++) {
+						echo '<input type="radio" name="'.$name.'" value="'.$i;
+						if ($container->$name == $i) echo '" checked="checked" />';
+						else echo '" />';
+						echo $updown[$i];
+					}
+					?>
+				    </td>
+			</tr>
+		<?php
+	}
+	
+	function groupOptions ($object, $property) {
+		?>
+		<td valign="top">
+			<select NAME="<?php echo $property; ?>" class="inputbox">
+				<option value="0"><?php echo _GLOBAL; ?></option>
+				<option value="1" <?php if ($object->$property) echo 'selected="selected"'; echo '>'._YES; ?></option>
+			</select>
+		</td>
+		<?php
+	}
+
+	function view (&$container)
+	{
+		$iconList = mosContainer::getIcons ();
+		$this->commonScripts('description');
+		echo '<br/>';
+		$this->startEditHeader(T_('Edit Container details'));
+		$this->publishedBox($container);
+		$this->fileInputBox(T_('Container name'), 'name', $container->name, 50);
+		$this->fileInputArea(T_('Description'), T_('Up to 500 characters'), 'description', $container->description, 50, 100, true);
+		$this->fileInputBox(T_('Keywords'),'keywords',$container->keywords,50);
+		$this->fileInputBox(T_('Window title'),'windowtitle',$container->windowtitle,50);
+		$this->displayIcons($container, $iconList);
+		$this->editFormEnd ($container->id);
+	}
+}
+
+?>
diff -ruN 4.5.4/administrator/components/com_containers/admin.containers.php 4.6rc2/administrator/components/com_containers/admin.containers.php
--- 4.5.4/administrator/components/com_containers/admin.containers.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/admin.containers.php	2006-04-01 02:30:03.000000000 -0600
@@ -0,0 +1,167 @@
+<?php
+/**
+* FileName: admin.containers.php
+* Date: 10 March 2006
+* License: GNU General Public License
+* Script Version #: 3.40
+* MOS Version #: 4.5+ (Tested on 4.5 (1.0.9 security fixed) and 4.5.2.1)
+* Script TimeStamp: "05Mar2005 10:50AM"
+* Original Script: psx-dude - psx-dude@psx-dude.net
+* Enhancements & Integration: Matt Smith, Martin Brampton - remository@black-sheep-research.com (http://www.black-sheep-research.com)
+**/
+
+// Don't allow direct linking
+if (!defined( '_VALID_MOS' )) die( 'Direct Access to this location is not allowed.' );
+
+require_once($mosConfig_absolute_path.'/components/com_containers/containers.class.php');
+require_once( $mainframe->getPath( 'admin_html' ) );
+
+class containersAdminContainers extends mosComponentAdminControllers {
+	var $parentid = 0;
+	
+	function getRequestData () {
+		$this->parentid = mosGetParam($_REQUEST, 'parentid', 0);
+	}
+	
+	function listTask () {
+		// Get the search string that will constrain the list of containers displayed
+		$search = trim( strtolower( mosGetParam( $_POST, 'search', '' ) ) );
+		// Get the flag that tells us whether to continue to nested containers right down to the bottom
+		$descendants = intval(mosGetParam($_POST, 'descendants', 0));
+		// Create the container above our present position - might be degenerate
+		$handler = mosContainerHandler::getInstance();
+		$container =& $handler->getBasicContainer($this->parentid);
+		// Get all the containers that are to be displayed
+		if ($descendants) $folders = $container->getDescendants($search);
+		else $folders = $container->getChildren(false,$search);
+		// Generate a container list for user to select where to be
+		$clist = $container->getSelectList('parentid', 'class="inputbox" size="1" onchange="document.adminForm.submit();"', false);
+		// Create and activate a View object
+		$view = $this->admin->newHTMLClassCheck ('listContainersHTML', $this, count($folders), $clist);
+		$view->view(array_slice($folders,$this->admin->limitstart,$this->admin->limit), $descendants, $search);
+	}
+	
+	function addTask () {
+		// This is our new container - nothing much in it to start with
+		$container =& new mosContainer();
+		// Its parent is by default the situation we are in at present
+		$container->parentid = $this->parentid;
+		// Generate a container list so the user can change the parent
+		$clist = $container->getSelectList('parentid', 'class="inputbox"', false);
+		// Create and activate a View object
+		$view = $this->admin->newHTMLClassCheck ('editContainersHTML', $this, 0, $clist);
+		$view->view($container);
+	}
+	
+	function editTask () {
+		// Create a container object that will be filled with data from the DB using currid as key
+		$handler = mosContainerHandler::getInstance();
+		$container =& $handler->getContainer($this->admin->currid);
+		$parent =& $container->getParent();
+		// Generate a container list so the user can change the parent
+		$clist = $parent->getSelectList('parentid', 'class="inputbox"', false, $container->id);
+		// Create and activate a View object
+		$view = $this->admin->newHTMLClassCheck ('editContainersHTML', $this, 0, $clist);
+		$view->view($container);
+	}
+	
+	function saveTask () {
+		// Create a container object that will be filled with data from the DB using currid as key
+		$handler = mosContainerHandler::getInstance();
+	    $container =& $handler->getContainer($this->admin->currid);
+	    // Clear tick box fields as nothing will be received if they are unticked
+	    $container->published = 0;
+	    // Add the new information from the form just submitted
+	    $container->addPostData();
+	    // By default, a new container is automatically published
+	    if ($this->admin->currid == 0) $container->published = 1;
+	    // Save the new information about the container to the database
+	    $container->saveValues ();
+		// Next we locate ourselves where this container has finished up and list containers
+		$this->parentid = $container->parentid;
+		$this->listTask();
+	}
+	
+	function saveorderTask () {
+		// Create a container object that will be filled with data from the DB using currid as key
+		$handler = mosContainerHandler::getInstance();
+	    $container =& $handler->getContainer($this->admin->currid);
+	    // Reorder based on the first container in the list
+	    $where = "parentid = ".$container->parentid;
+	    $container->updateOrder($where, $this->admin->cfid, $this->admin->order);
+	    $handler->resetData();
+		$this->parentid = $container->parentid;
+		$this->listTask();
+	}
+	
+	function orderupTask () {
+		// Create a container object that will be filled with data from the DB using currid as key
+		$handler = mosContainerHandler::getInstance();
+	    $container =& $handler->getContainer($this->admin->currid);
+	    // Reorder based on the first container in the list
+	    $where = "parentid = ".$container->parentid;
+	    $container->move(-1, $where);
+	    $handler->resetData();
+		$this->parentid = $container->parentid;
+		$this->listTask();
+	}
+
+	function orderdownTask () {
+		// Create a container object that will be filled with data from the DB using currid as key
+		$handler = mosContainerHandler::getInstance();
+	    $container =& $handler->getContainer($this->admin->currid);
+	    // Reorder based on the first container in the list
+	    $where = "parentid = ".$container->parentid;
+	    $container->move(+1, $where);
+	    $handler->resetData();
+		$this->parentid = $container->parentid;
+		$this->listTask();
+	}
+	
+	function deleteTask () {
+		// In case the Javascript cannot do the check, ensure at least one item selected
+		$this->admin->check_selection(_DOWN_SEL_FILE_DEL);
+		// For each selected container, create an object then delete (will delete from DB)
+		$dlist = array();
+		$handler = mosContainerHandler::getInstance();
+		foreach ($this->admin->cfid as $id) $dlist[] = $handler->getDescendantIDList($id);
+		$deletelist = implode (',', $dlist);
+		$mambothandler = mosMambotHandler::getInstance();
+		$mambothandler->loadBotGroup('container');
+		$messages = $mambothandler->trigger('preDelete', $deletelist);
+		foreach ($messages as $message) if ($message) {
+			// Create and activate a View object
+			$view = $this->admin->newHTMLClassCheck ('messageContainersHTML', $this, 0, '');
+			$view->view($container);
+		}
+		else {
+			$mambothandler->trigger('doDelete', $deletelist);
+			// Now show the list of containers again
+			$this->listTask();
+		}
+	}
+	
+	function publishTask () {
+		$this->publishToggle(1);
+	}
+
+	function unpublishTask () {
+		$this->publishToggle(0);
+	}
+	
+	function publishToggle ($publish) {
+		// Check that one or more items have been selected (Javascript may not have run)
+		$this->admin->check_selection(_DOWN_PUB_PROMPT.($publish ? 'publish' : 'unpublish'));
+	    mosContainer::togglePublished($this->admin->cfid,$publish);
+	    // The file/folder counts only include published items, so recalculate
+		$this->repository->resetCounts(array());
+		// List out the containers again
+		$this->listTask();
+	}
+
+
+}
+	
+new mosComponentAdminManager('Containers');
+
+?>
diff -ruN 4.5.4/administrator/components/com_containers/containers.xml 4.6rc2/administrator/components/com_containers/containers.xml
--- 4.5.4/administrator/components/com_containers/containers.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/containers.xml	2006-04-01 02:30:03.000000000 -0600
@@ -0,0 +1,90 @@
+<?xml version="1.0" ?>
+<mosinstall type="component" version="4.6">
+  <name>Containers</name>
+  <creationDate>10 March 2006</creationDate>
+  <author>Mambo Foundation</author>
+  <copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
+  <authorEmail>project_manager@mambo-foundation.org</authorEmail>
+  <authorUrl>www.mambo-foundation.org</authorUrl>
+  <version>4.6</version>
+  <description>Nested container system for Mambo</description>
+  <files>
+    <filename>containers.class.php</filename>
+  </files>
+   <install>
+    <queries>
+    </queries>
+  </install>
+  <uninstall>
+    <queries>
+      <query>
+		CREATE TABLE IF NOT EXISTS `mos_containers` (
+		  `id` int(11) NOT NULL auto_increment,
+		  `name` varchar(100) NOT NULL default '',
+		  `description` text NOT NULL,
+		  `ordering` int(11) NOT NULL default '0',
+		  `windowtitle` varchar(50) NOT NULL default '',
+		  `keywords` varchar(255) NOT NULL default '',
+		  `published` smallint(6) NOT NULL default '0',
+		  `icon` varchar(25) NOT NULL default '',
+		  `parentid` int(11) NOT NULL default '0',
+		  `params` text NOT NULL,
+		  `callbacks` text NOT NULL,
+		  PRIMARY KEY  (`id`)
+		);
+	  </query>
+    </queries>
+  </uninstall>
+  <administration>
+    <menu>Mambo Containers</menu>
+    <files>
+		<filename>admin.containers.php</filename>
+		<filename>admin.containers.html.php</filename>
+		<filename>toolbar.containers.php</filename>
+    </files>
+	<images>
+        <filename>images/add_file.gif</filename>
+		<filename>images/approve.png</filename>
+		<filename>images/approve_f2.png</filename>
+		<filename>images/back.gif</filename>
+		<filename>images/blank.gif</filename>
+		<filename>images/calendar.gif</filename>
+		<filename>images/download_trans.gif</filename>
+		<filename>images/edit.gif</filename>
+		<filename>images/gohome.gif</filename>
+		<filename>images/header.gif</filename>
+		<filename>images/home.gif</filename>
+		<filename>images/search.gif</filename>
+		<filename>images/folder_icons/folder_blue.gif</filename>
+		<filename>images/folder_icons/folder_blue_docs.gif</filename>
+		<filename>images/folder_icons/folder_blue_favourites.gif</filename>
+		<filename>images/folder_icons/folder_blue_games.gif</filename>
+		<filename>images/folder_icons/folder_blue_music.gif</filename>
+		<filename>images/folder_icons/folder_blue_paint.gif</filename>
+		<filename>images/folder_icons/folder_blue_pics.gif</filename>
+		<filename>images/folder_icons/folder_blue_settings.gif</filename>
+		<filename>images/folder_icons/folder_blue_software.gif</filename>
+		<filename>images/folder_icons/folder_blue_stuff.gif</filename>
+		<filename>images/folder_icons/folder_blue_themes.gif</filename>
+		<filename>images/folder_icons/folder_blue_video.gif</filename>
+		<filename>images/folder_icons/folder_blue_web.gif</filename>
+		<filename>images/folder_icons/folder_green.gif</filename>
+		<filename>images/folder_icons/folder_orange.gif</filename>
+		<filename>images/folder_icons/folder_red.gif</filename>
+		<filename>images/folder_icons/folder_red_settings.gif</filename>
+		<filename>images/folder_icons/folder_yellow.gif</filename>
+		<filename>images/folder_icons/folder_yellow_docs.gif</filename>
+		<filename>images/folder_icons/folder_yellow_favourites.gif</filename>
+		<filename>images/folder_icons/folder_yellow_games.gif</filename>
+		<filename>images/folder_icons/folder_yellow_music.gif</filename>
+		<filename>images/folder_icons/folder_yellow_paint.gif</filename>
+		<filename>images/folder_icons/folder_yellow_pics.gif</filename>
+		<filename>images/folder_icons/folder_yellow_settings.gif</filename>
+		<filename>images/folder_icons/folder_yellow_software.gif</filename>
+		<filename>images/folder_icons/folder_yellow_stuff.gif</filename>
+		<filename>images/folder_icons/folder_yellow_themes.gif</filename>
+		<filename>images/folder_icons/folder_yellow_video.gif</filename>
+		<filename>images/folder_icons/folder_yellow_web.gif</filename>
+	</images>
+  </administration>
+</mosinstall>
Binary files 4.5.4/administrator/components/com_containers/images/add_file.gif and 4.6rc2/administrator/components/com_containers/images/add_file.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/approve.png and 4.6rc2/administrator/components/com_containers/images/approve.png differ
Binary files 4.5.4/administrator/components/com_containers/images/approve_f2.png and 4.6rc2/administrator/components/com_containers/images/approve_f2.png differ
Binary files 4.5.4/administrator/components/com_containers/images/back.gif and 4.6rc2/administrator/components/com_containers/images/back.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/blank.gif and 4.6rc2/administrator/components/com_containers/images/blank.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/calendar.gif and 4.6rc2/administrator/components/com_containers/images/calendar.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/download_trans.gif and 4.6rc2/administrator/components/com_containers/images/download_trans.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/edit.gif and 4.6rc2/administrator/components/com_containers/images/edit.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_docs.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_docs.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_favourites.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_favourites.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_games.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_games.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_music.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_music.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_paint.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_paint.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_pics.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_pics.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_settings.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_settings.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_software.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_software.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_stuff.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_stuff.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_themes.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_themes.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_video.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_video.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_blue_web.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_blue_web.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_green.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_green.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_orange.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_orange.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_red.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_red.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_red_settings.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_red_settings.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_docs.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_docs.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_favourites.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_favourites.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_games.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_games.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_music.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_music.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_paint.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_paint.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_pics.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_pics.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_settings.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_settings.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_software.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_software.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_stuff.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_stuff.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_themes.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_themes.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_video.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_video.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/folder_icons/folder_yellow_web.gif and 4.6rc2/administrator/components/com_containers/images/folder_icons/folder_yellow_web.gif differ
diff -ruN 4.5.4/administrator/components/com_containers/images/folder_icons/index.html 4.6rc2/administrator/components/com_containers/images/folder_icons/index.html
--- 4.5.4/administrator/components/com_containers/images/folder_icons/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/images/folder_icons/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/administrator/components/com_containers/images/gohome.gif and 4.6rc2/administrator/components/com_containers/images/gohome.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/header.gif and 4.6rc2/administrator/components/com_containers/images/header.gif differ
Binary files 4.5.4/administrator/components/com_containers/images/home.gif and 4.6rc2/administrator/components/com_containers/images/home.gif differ
diff -ruN 4.5.4/administrator/components/com_containers/images/index.html 4.6rc2/administrator/components/com_containers/images/index.html
--- 4.5.4/administrator/components/com_containers/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/images/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/administrator/components/com_containers/images/search.gif and 4.6rc2/administrator/components/com_containers/images/search.gif differ
diff -ruN 4.5.4/administrator/components/com_containers/index.html 4.6rc2/administrator/components/com_containers/index.html
--- 4.5.4/administrator/components/com_containers/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_containers/toolbar.containers.php 4.6rc2/administrator/components/com_containers/toolbar.containers.php
--- 4.5.4/administrator/components/com_containers/toolbar.containers.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_containers/toolbar.containers.php	2006-04-01 02:30:03.000000000 -0600
@@ -0,0 +1,70 @@
+<?php
+
+// ensure this file is being included by a parent file
+if (!defined( '_VALID_MOS' ) AND !defined('_JEXEC')) die( 'Direct Access to this location is not allowed.' );
+
+class mosToolbar {
+	var $act;
+	var $task;
+	// Create an instance, get the controlling parameters from the request
+	function mosToolbar () {
+		if ($this->act = mosGetParam ($_REQUEST, 'act', 'containers'));
+		else $this->act = 'containers';
+		if ($this->task = mosGetParam($_REQUEST, 'task', 'list'));
+		else $this->task = 'list';
+		$this->makeBar();
+	}
+	// create a toolbar based on the parameters found in $_REQUEST
+	function makeBar () {
+		$this->start();
+		$act = $this->act;
+		$call_check = array(&$this,$act);
+		if (is_callable($call_check)) $this->$act();
+		$this->finish();
+	}
+	// Any initial actions
+	function start () {
+		mosMenuBar::startTable();
+	}
+	// The following methods correspond exactly to the possible values
+	// of 'act' in the request.  They in turn correspond to all the
+	// possible options in the admin side drop down menu for Remository.
+	function containers () {
+		if ($this->task == 'add') $this->addMenu('Container');
+		elseif ($this->task == 'edit') $this->editMenu('Container');
+		else $this->listMenu('');
+	}
+	
+	// The cancel option is always formed the same way
+	function cancelButton () {
+		mosMenuBar::custom( 'list', 'cancel.png', 'cancel_f2.png', 'Cancel', false );
+	}
+	// The menu for adding something is always the same apart from the text
+	function addMenu ($entity) {
+		mosMenuBar::save( 'save', 'Save '.$entity );
+		$this->cancelButton();
+	}
+	// The menu for editing something is always the same apart from the text
+	function editMenu ($entity) {
+		mosMenuBar::save( 'save', 'Save '.$entity );
+		$this->cancelButton();
+	}
+	// The menu for a list of items is always the same apart from the text
+	function listMenu ($entity) {
+		mosMenuBar::publishList( 'publish', 'Publish '.$entity );
+		mosMenuBar::unpublishList( 'unpublish', 'UnPublish '.$entity );
+		mosMenuBar::addNew( 'add', 'Add '.$entity );
+		mosMenuBar::editList( 'edit', 'Edit '.$entity );
+		mosMenuBar::deleteList( '', 'delete', 'Delete '.$entity );
+	}
+	// Any concluding actions
+	function finish () {
+		mosMenuBar::spacer();
+		mosMenuBar::endTable();
+	}
+
+}
+
+$toolbar = new mosToolbar();
+
+?>
diff -ruN 4.5.4/administrator/components/com_content/admin.content.html.php 4.6rc2/administrator/components/com_content/admin.content.html.php
--- 4.5.4/administrator/components/com_content/admin.content.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_content/admin.content.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.content.html.php,v 1.6 2005/11/23 23:46:48 counterpoint Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
 class HTML_content {
 
 	/**
@@ -34,11 +32,11 @@
 			<?php
 			if ( $all ) {
 				?>
-				Content Items Manager <small><small>[ Section: All ]</small></small>
+				<?php echo T_('Content Items Manager') ?> <small><small>[ <?php echo T_('Section: All') ?> ]</small></small>
 				<?php
 			} else {
 				?>
-				Content Items Manager <small><small>[ Section: <?php echo $section->title; ?> ]</small></small>
+				<?php echo T_('Content Items Manager') ?> <small><small>[ <?php echo T_('Section:') ?> <?php echo $section->title; ?> ]</small></small>
 				<?php
 			}
 			?>
@@ -61,7 +59,7 @@
 		</tr>
 		<tr>
 			<td align="right">
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -78,46 +76,46 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th class="title">
-			Title
+			<?php echo T_('Title') ?>
 			</th>
 			<th width="5%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th nowrap="nowrap" width="5%">
-			Front Page
+			<?php echo T_('Front Page') ?>
 			</th>
 			<th colspan="2" align="center" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th >
-			Access
+			<?php echo T_('Access') ?>
 			</th>
 			<th width="2%">
-			ID
+			<?php echo T_('ID') ?>
 			</th>
 			<?php
 			if ( $all ) {
 				?>
 				<th align="left">
-				Section
+				<?php echo T_('Section') ?>
 				</th>
 				<?php
 			}
 			?>
 			<th align="left">
-			Category
+			<?php echo T_('Category') ?>
 			</th>
 			<th align="left">
-			Author
+			<?php echo T_('Author') ?>
 			</th>
 			<th align="center" width="10">
-			Date
+			<?php echo T_('Date') ?>
 			</th>
 		  </tr>
 		<?php
@@ -133,30 +131,30 @@
 			$now = date( "Y-m-d H:i:s" );
 			if ( $now <= $row->publish_up && $row->state == "1" ) {
 				$img = 'publish_y.png';
-				$alt = 'Published';
+				$alt = T_('Published');
 			} else if ( ( $now <= $row->publish_down || $row->publish_down == "0000-00-00 00:00:00" ) && $row->state == "1" ) {
 				$img = 'publish_g.png';
-				$alt = 'Published';
+				$alt = T_('Published');
 			} else if ( $now > $row->publish_down && $row->state == "1" ) {
 				$img = 'publish_r.png';
-				$alt = 'Expired';
+				$alt = T_('Expired');
 			} elseif ( $row->state == "0" ) {
 				$img = "publish_x.png";
-				$alt = 'Unpublished';
+				$alt = T_('Unpublished');
 			}
 			$times = '';
 			if (isset($row->publish_up)) {
 				if ($row->publish_up == '0000-00-00 00:00:00') {
-					$times .= "<tr><td>Start: Always</td></tr>";
+					$times .= "<tr><td>".T_('Start:')." ".T_('Always')."</td></tr>";
 				} else {
 					$times .= "<tr><td>Start: $row->publish_up</td></tr>";
 				}
 			}
 			if (isset($row->publish_down)) {
 				if ($row->publish_down == '0000-00-00 00:00:00') {
-					$times .= "<tr><td>Finish: No Expiry</td></tr>";
+					$times .= "<tr><td>".T_('Finish:')." ".T_('No Expiry')."</td></tr>";
 				} else {
-					$times .= "<tr><td>Finish: $row->publish_down</td></tr>";
+					$times .= "<tr><td>".T_('Finish:')." $row->publish_down</td></tr>";
 				}
 			}
 
@@ -165,7 +163,7 @@
 					$author = $row->created_by_alias;
 				} else {
 					$linkA 	= 'index2.php?option=com_users&task=editA&hidemainmenu=1&id='. $row->created_by;
-					$author = '<a href="'. $linkA .'" title="Edit User">'. $row->author .'</a>';
+					$author = '<a href="'. $linkA .'" title="'.T_('Edit User').'">'. $row->author .'</a>';
 				}
 			} else {
 				if ( $row->created_by_alias ) {
@@ -193,7 +191,7 @@
 					echo $row->title;
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Content">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Content') ?>">
 					<?php echo htmlspecialchars($row->title, ENT_QUOTES); ?>
 					</a>
 					<?php
@@ -204,7 +202,7 @@
 				if ( $times ) {
 					?>
 					<td align="center">
-					<a href="javascript: void(0);" onMouseOver="return overlib('<table><?php echo $times; ?></table>', CAPTION, 'Publish Information', BELOW, RIGHT);" onMouseOut="return nd();" onClick="return listItemTask('cb<?php echo $i;?>','<?php echo $row->state ? "unpublish" : "publish";?>')">
+					<a href="javascript: void(0);" onMouseOver="return overlib('<table><?php echo $times; ?></table>', CAPTION, '<?php echo T_('Publish Information') ?>', BELOW, RIGHT);" onMouseOut="return nd();" onClick="return listItemTask('cb<?php echo $i;?>','<?php echo $row->state ? "unpublish" : "publish";?>')">
 					<img src="images/<?php echo $img;?>" width="12" height="12" border="0" alt="<?php echo $alt; ?>" />
 					</a>
 					</td>
@@ -213,7 +211,7 @@
 				?>
 				<td align="center">
 				<a href="javascript: void(0);" onClick="return listItemTask('cb<?php echo $i;?>','toggle_frontpage')">
-				<img src="images/<?php echo ( $row->frontpage ) ? 'tick.png' : 'publish_x.png';?>" width="12" height="12" border="0" alt="<?php echo ( $row->frontpage ) ? 'Yes' : 'No';?>" />
+				<img src="images/<?php echo ( $row->frontpage ) ? 'tick.png' : 'publish_x.png';?>" width="12" height="12" border="0" alt="<?php echo ( $row->frontpage ) ? T_('Yes') : T_('No');?>" />
 				</a>
 				</td>
 				<td align="right">
@@ -235,7 +233,7 @@
 				if ( $all ) {
 					?>
 					<td align="left">
-					<a href="<?php echo $row->sect_link; ?>" title="Edit Section">
+					<a href="<?php echo $row->sect_link; ?>" title="<?php echo T_('Edit Section') ?>">
 					<?php echo $row->section_name; ?>
 					</a>
 					</td>
@@ -243,7 +241,7 @@
 				}
 				?>
 				<td align="left">
-				<a href="<?php echo $row->cat_link; ?>" title="Edit Category">
+				<a href="<?php echo $row->cat_link; ?>" title="<?php echo T_('Edit Category') ?>">
 				<?php echo $row->name; ?>
 				</a>
 				</td>
@@ -286,8 +284,8 @@
 		function submitbutton(pressbutton) {
 			if (pressbutton == 'remove') {
 				if (document.adminForm.boxchecked.value == 0) {
-					alert('Please make a selection from the list to send to Trash');
-				} else if ( confirm('Are you sure you want to Trash the selected items? \nThis will not permanently delete the items.')) {
+					alert('<?php echo T_('Please make a selection from the list to send to Trash') ?>');
+				} else if ( confirm('<?php echo T_('Are you sure you want to Trash the selected items? \nThis will not permanently delete the items.') ?>')) {
 					submitform('remove');
 				}
 			} else {
@@ -303,11 +301,11 @@
 			<?php
 			if ( $all ) {
 				?>
-				Archive Manager <small><small>[ Section: All ]</small></small>
+				<?php echo T_('Archive Manager') ?> <small><small>[ <?php echo T_('Section:') ?> <?php echo T_('All') ?> ]</small></small>
 				<?php
 			} else {
 				?>
-				Archive Manager <small><small>[ Section: <?php echo $section->title; ?> ]</small></small>
+				<?php echo T_('Archive Manager') ?> <small><small>[ <?php echo T_('Section:') ?> <?php echo $section->title; ?> ]</small></small>
 				<?php
 			}
 			?>
@@ -330,7 +328,7 @@
 		</tr>
 		<tr>
 			<td align="right">
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -347,22 +345,22 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th class="title">
-			Title
+			<?php echo T_('Title') ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th width="15%" align="left">
-			Category
+			<?php echo T_('Category') ?>
 			</th>
 			<th width="15%" align="left">
-			Author
+			<?php echo T_('Author') ?>
 			</th>
 			<th align="center" width="10">
-			Date
+			<?php echo T_('Date') ?>
 			</th>
 		</tr>
 		<?php
@@ -377,7 +375,7 @@
 					$author = $row->created_by_alias;
 				} else {
 					$linkA 	= 'index2.php?option=com_users&task=editA&hidemainmenu=1&id='. $row->created_by;
-					$author = '<a href="'. $linkA .'" title="Edit User">'. $row->author .'</a>';
+					$author = '<a href="'. $linkA .'" title="'.T_('Edit User').'">'. $row->author .'</a>';
 				}
 			} else {
 				if ( $row->created_by_alias ) {
@@ -403,7 +401,7 @@
 				<input type="text" name="order[]" size="5" value="<?php echo $row->ordering; ?>" class="text_area" style="text-align: center" />
 				</td>
 				<td>
-				<a href="<?php echo $row->cat_link; ?>" title="Edit Category">
+				<a href="<?php echo $row->cat_link; ?>" title="<?php echo T_('Edit Category') ?>">
 				<?php echo $row->name; ?>
 				</a>
 				</td>
@@ -497,10 +495,10 @@
 
 			if ( pressbutton == 'menulink' ) {
 				if ( form.menuselect.value == "" ) {
-					alert( "Please select a Menu" );
+					alert( "<?php echo T_('Please select a Menu') ?>" );
 					return;
 				} else if ( form.link_name.value == "" ) {
-					alert( "Please enter a Name for this menu item" );
+					alert( "<?php echo T_('Please enter a Name for this menu item') ?>" );
 					return;
 				}
 			}
@@ -518,13 +516,13 @@
 
 			// do field validation
 			if (form.title.value == ""){
-				alert( "Content item must have a title" );
+				alert( "<?php echo T_('Content item must have a title') ?>" );
 			} else if (form.sectionid.value == "-1"){
-				alert( "You must select a Section." );
+				alert( "<?php echo T_('You must select a Section.') ?>" );
 			} else if (form.catid.value == "-1"){
-				alert( "You must select a Category." );
+				alert( "<?php echo T_('You must select a Category.') ?>" );
  			} else if (form.catid.value == ""){
- 				alert( "You must select a Category." );
+ 				alert( "<?php echo T_('You must select a Category.') ?>" );
 			} else {
 				<?php getEditorContents( 'editor1', 'introtext' ) ; ?>
 				<?php getEditorContents( 'editor2', 'fulltext' ) ; ?>
@@ -576,15 +574,15 @@
 		<table class="adminheading" border="1">
 		<tr>
 			<th class="edit">
-			Content Item:
+			<?php echo T_('Content Item:') ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			<?php
 			if ( $row->id ) {
 				?>
 				<small><small>
-				[ Section: <?php echo $section?> ]
+				[ <?php echo T_('Section:') ?> <?php echo $section?> ]
 				</small></small>
 				<?php
 			}
@@ -597,10 +595,10 @@
 			<tr>
 				<td valign="top" align="right">
 				<div id = "show" style="display:<?php echo $simple;?>">
-				<a href="javascript:displayParameterInfo();">Show Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Show Advanced Details') ?></a>
 				</div>
 				<div id = "hide" style="display:<?php echo $advanced;?>">
-				<a href="javascript:displayParameterInfo();">Hide Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Hide Advanced Details') ?></a>
 				</div>
 				</td>
 			</tr>
@@ -615,18 +613,18 @@
 						<table cellspacing="0" cellpadding="0" border="0" width="100%">
 						<tr >
 							<th colspan="4">
-							Item Details
+							<?php echo T_('Item Details') ?>
 							</th>
 						<tr>
 						<tr>
 							<td>
-							Title:
+							<?php echo T_('Title:') ?>
 							</td>
 							<td>
 							<input class="text_area" type="text" name="title" size="30" maxlength="100" value="<?php echo $row->title; ?>" />
 							</td>
 							<td>
-							Section:
+							<?php echo T_('Section:') ?>
 							</td>
 							<td>
 							<?php echo $lists['sectionid']; ?>
@@ -634,13 +632,13 @@
 						</tr>
 						<tr>
 							<td>
-							Title Alias:
+							<?php echo T_('Title Alias:') ?>
 							</td>
 							<td>
 							<input name="title_alias" type="text" class="text_area" id="title_alias" value="<?php echo $row->title_alias; ?>" size="30" maxlength="100" />
 							</td>
 							<td>
-							Category:
+							<?php echo T_('Category:') ?>
 							</td>
 							<td>
 							<?php echo $lists['catid']; ?>
@@ -652,7 +650,7 @@
 			
 				<tr>
 					<td width="100%">
-					Intro Text: (required)
+					<?php echo T_('Intro Text:') ?> (<?php echo T_('required') ?>)
 					<br /><?php
 					// parameters : areaname, content, hidden field, width, height, rows, cols
 					editorArea( 'editor1',  $row->introtext , 'introtext', '100%;', '200', '75', '20' ) ; ?>
@@ -660,7 +658,7 @@
 				</tr>
 				<tr>
 					<td width="100%">
-					Main Text: (optional)
+					<?php echo T_('Main Text:') ?> (<?php echo T_('optional') ?>)
 					<br /><?php
 					// parameters : areaname, content, hidden field, width, height, rows, cols
 					editorArea( 'editor2',  $row->fulltext , 'fulltext', '100%;', '350', '75', '30' ) ; ?>
@@ -679,17 +677,17 @@
 							<td >
 							<?php
 							$tabs->startPane("content-pane");
-							$tabs->startTab("Publishing","publish-page");
+							$tabs->startTab(T_("Publishing"),"publish-page");
 							?>
 							<table class="adminform">
 							<tr>
 								<th colspan="2">
-								Publishing Info
+								<?php echo T_('Publishing Info') ?>
 								</th>
 							<tr>
 							<tr>
 								<td valign="top" align="right">
-								Show on Frontpage:
+								<?php echo T_('Show on Frontpage:') ?>
 								</td>
 								<td>
 								<input type="checkbox" name="frontpage" value="1" <?php echo $row->frontpage ? 'checked="checked"' : ''; ?> />
@@ -697,7 +695,7 @@
 							</tr>
 							<tr>
 								<td valign="top" align="right">
-								Published:
+								<?php echo T_('Published:') ?>
 								</td>
 								<td>
 								<input type="checkbox" name="published" value="1" <?php echo $row->state ? 'checked="checked"' : ''; ?> />
@@ -705,14 +703,14 @@
 							</tr>
 							<tr>
 								<td valign="top" align="right">
-								Access Level:
+								<?php echo T_('Access Level:') ?>
 								</td>
 								<td>
 								<?php echo $lists['access']; ?> </td>
 								</tr>
 							<tr>
 								<td valign="top" align="right">
-								Author Alias:
+								<?php echo T_('Author Alias:') ?>
 								</td>
 								<td>
 								<input type="text" name="created_by_alias" size="30" maxlength="100" value="<?php echo $row->created_by_alias; ?>" class="text_area" />
@@ -720,19 +718,19 @@
 							</tr>
 							<tr>
 								<td valign="top" align="right">
-								Change Creator:
+								<?php echo T_('Change Creator:') ?>
 								</td>
 								<td>
 								<?php echo $lists['created_by']; ?> </td>
 							</tr>
 							<tr>
-								<td valign="top" align="right">Ordering:</td>
+								<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 								<td>
 								<?php echo $lists['ordering']; ?> </td>
 							</tr>
 							<tr>
 								<td valign="top" align="right">
-								Override Created Date
+								<?php echo T_('Override Created Date') ?>
 								</td>
 								<td>
 								<input class="text_area" type="text" name="created" id="created" size="25" maxlength="19" value="<?php echo $row->created; ?>" />
@@ -741,7 +739,7 @@
 							</tr>
 							<tr>
 								<td valign="top" align="right">
-								Start Publishing:
+								<?php echo T_('Start Publishing:') ?>
 								</td>
 								<td>
 								<input class="text_area" type="text" name="publish_up" id="publish_up" size="25" maxlength="19" value="<?php echo $row->publish_up; ?>" />
@@ -750,7 +748,7 @@
 							</tr>
 							<tr>
 								<td valign="top" align="right">
-								Finish Publishing:
+								<?php echo T_('Finish Publishing:') ?>
 								</td>
 								<td>
 								<input class="text_area" type="text" name="publish_down" id="publish_down" size="25" maxlength="19" value="<?php echo $row->publish_down; ?>" />
@@ -765,7 +763,7 @@
 								?>
 								<tr>
 									<td>
-									<strong>Content ID:</strong>
+									<strong><?php echo T_('Content ID:') ?></strong>
 									</td>
 									<td>
 									<?php echo $row->id; ?>
@@ -776,72 +774,72 @@
 							?>
 							<tr>
 								<td width="90px" valign="top" align="right">
-								<strong>State:</strong>
+								<strong><?php echo T_('State:') ?></strong>
 								</td>
 								<td>
-								<?php echo $row->state > 0 ? 'Published' : ($row->state < 0 ? 'Archived' : 'Draft Unpublished');?>
+								<?php echo $row->state > 0 ? T_('Published') : ($row->state < 0 ? T_('Archived') : T_('Draft Unpublished'));?>
 								</td>
 							</tr>
 							<tr >
 								<td valign="top" align="right">
 								<strong>
-								Hits
+								<?php echo T_('Hits') ?>
 								</strong>:
 								</td>
 								<td>
 								<?php echo $row->hits;?>
 								<div <?php echo $visibility; ?>>
-								<input name="reset_hits" type="button" class="button" value="Reset Hit Count" onClick="submitbutton('resethits');">
+								<input name="reset_hits" type="button" class="button" value="<?php echo T_('Reset Hit Count') ?>" onClick="submitbutton('resethits');">
 								</div>
 								</td>
 							</tr>
 							<tr>
 								<td valign="top" align="right">
 								<strong>
-								Revised
+								<?php echo T_('Revised') ?>
 								</strong>:
 								</td>
 								<td>
-								<?php echo $row->version;?> times
+								<?php echo $row->version;?> <?php echo T_('times') ?>
 								</td>
 							</tr>
 							<tr>
 								<td valign="top" align="right">
 								<strong>
-								Created
+								<?php echo T_('Created') ?>
 								</strong>
 								</td>
 								<td>
-								<?php echo $row->created ? "$create_date</td></tr><tr><td valign='top' align='right'><strong>By</strong></td><td>$row->creator" : "New document"; ?>
+								<?php echo $row->created ? "$create_date</td></tr><tr><td valign='top' align='right'><strong>".T_('By')."</strong></td><td>$row->creator" : "New document"; ?>
 								</td>
 							</tr>
 							<tr>
 								<td valign="top" align="right">
 								<strong>
-								Last Modified
+								<?php echo T_('Last Modified') ?>
 								</strong>
 								</td>
 								<td>
-								<?php echo $row->modified ? "$mod_date</td></tr><tr><td valign='top' align='right'><strong>By</strong></td><td>$row->modifier" : "Not modified";?>
+								<?php echo $row->modified ? "$mod_date</td></tr><tr><td valign='top' align='right'><strong>".T_('By')."</strong></td><td>$row->modifier" : "Not modified";?>
 								</td>
 							</tr>
 							</table>
 							<?php
 							$tabs->endTab();
-							$tabs->startTab("Images","images-page");
+							$tabs->startTab(T_("Images"),"images-page");
 							?>
 							<table class="adminform" width="100%">
 							<tr>
 								<th colspan="2">
-								MOSImage Control
+								<?php echo T_('MOSImage Control') ?>
 								</th>
 							</tr>
 							<tr>
-								<td colspan="6">Sub-folder: <?php echo $lists['folders'];?></td>
+								<td colspan="6"><?php echo T_('Sub-folder:') ?> <?php echo $lists['folders'];?></td>
 							</tr>
 							<tr>
 								<td>
-								Gallery Images:
+								<?php echo T_('Gallery Images:') ?>
 								<br />
 								<?php echo $lists['imagefiles'];?>
 								</td>
@@ -851,12 +849,12 @@
 							</tr>
 							<tr>
 								<td>
-								<input class="button" type="button" value="Add" onClick="addSelectedToList('adminForm','imagefiles','imagelist')" />
+								<input class="button" type="button" value="<?php echo T_('Add') ?>" onClick="addSelectedToList('adminForm','imagefiles','imagelist')" />
 								</td>
 							</tr>
 							<tr>
 								<td>
-								Content Images:
+								<?php echo T_('Content Images:') ?>
 								<br />
 								<?php echo $lists['imagelist'];?>
 								</td>
@@ -866,18 +864,18 @@
 							</tr>
 							<tr>
 								<td>
-								<input class="button" type="button" value="up" onClick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,-1)" />
-								<input class="button" type="button" value="down" onClick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,+1)" />
-								<input class="button" type="button" value="remove" onClick="delSelectedFromList('adminForm','imagelist')" />
+								<input class="button" type="button" value="<?php echo T_('up') ?>" onClick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,-1)" />
+								<input class="button" type="button" value="<?php echo T_('down') ?>" onClick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,+1)" />
+								<input class="button" type="button" value="<?php echo T_('remove') ?>" onClick="delSelectedFromList('adminForm','imagelist')" />
 								</td>
 							</tr>
 							<tr>
 								<td colspan="2">
-									Edit the image selected:
+									<?php echo T_('Edit the image selected:') ?>
 									<table>
 									<tr>
 										<td align="right">
-										Source:
+										<?php echo T_('Source:') ?>
 										</td>
 										<td>
 										<input class="text_area" type="text" name= "_source" value="" />
@@ -885,7 +883,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Image Align:
+										<?php echo T_('Image Align:') ?>
 										</td>
 										<td>
 										<?php echo $lists['_align']; ?>
@@ -893,7 +891,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Alt Text:
+										<?php echo T_('Alt Text:') ?>
 										</td>
 										<td>
 										<input class="text_area" type="text" name="_alt" value="" />
@@ -901,7 +899,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Border:
+										<?php echo T_('Border:') ?>
 										</td>
 										<td>
 										<input class="text_area" type="text" name="_border" value="" size="3" maxlength="1" />
@@ -909,7 +907,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Caption:
+										<?php echo T_('Caption:') ?>
 										</td>
 										<td>
 										<input class="text_area" type="text" name="_caption" value="" size="30" />
@@ -917,7 +915,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Caption Position:
+										<?php echo T_('Caption Position:') ?>
 										</td>
 										<td>
 										<?php echo $lists['_caption_position']; ?>
@@ -925,7 +923,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Caption Align:
+										<?php echo T_('Caption Align:') ?>
 										</td>
 										<td>
 										<?php echo $lists['_caption_align']; ?>
@@ -933,7 +931,7 @@
 									</tr>
 									<tr>
 										<td align="right">
-										Width:
+										<?php echo T_('Width:') ?>
 										</td>
 										<td>
 										<input class="text_area" type="text" name="_width" value="" size="5" maxlength="5" />
@@ -941,7 +939,7 @@
 									</tr>
 									<tr>
 										<td colspan="2">
-										<input class="button" type="button" value="Apply" onClick="applyImageProps()" />
+										<input class="button" type="button" value="<?php echo T_('Apply') ?>" onClick="applyImageProps()" />
 										</td>
 									</tr>
 									</table>
@@ -950,17 +948,17 @@
 							</table>
 							<?php
 							$tabs->endTab();
-							$tabs->startTab("Parameters","params-page");
+							$tabs->startTab(T_("Parameters"),"params-page");
 							?>
 							<table class="adminform">
 							<tr>
 								<th colspan="2">
-								Parameter Control
+								<?php echo T_('Parameter Control') ?>
 								</th>
 							<tr>
 							<tr>
 								<td>
-								* These Parameters only control what you see when you click to view an item fully *
+								* <?php echo T_('These Parameters only control what you see when you click to view an item fully') ?> *
 								<br /><br />
 								</td>
 							</tr>
@@ -972,53 +970,53 @@
 							</table>
 							<?php
 							$tabs->endTab();
-							$tabs->startTab("Meta Info","metadata-page");
+							$tabs->startTab(T_("Meta Info"),"metadata-page");
 							?>
 							<table class="adminform">
 							<tr>
 								<th colspan="2">
-								Meta Data
+								<?php echo T_('Meta Data') ?>
 								</th>
 							</tr>
 							<tr>
 								<td>
-								Description:
+								<?php echo T_('Description:') ?>
 								<br />
 								<textarea class="text_area" cols="30" rows="3" style="width:300px; height:50px" name="metadesc" width="500"><?php echo str_replace('&','&amp;',$row->metadesc); ?></textarea>
 								</td>
 							</tr>
 								<tr>
 								<td>
-								Keywords:
+								<?php echo T_('Keywords:') ?>
 								<br />
 								<textarea class="text_area" cols="30" rows="3" style="width:300px; height:50px" name="metakey" width="500"><?php echo str_replace('&','&amp;',$row->metakey); ?></textarea>
 								</td>
 							</tr>
 							<tr>
 								<td>
-								<input type="button" class="button" value="Add Sect/Cat/Title" onClick="f=document.adminForm;f.metakey.value=document.adminForm.sectionid.options[document.adminForm.sectionid.selectedIndex].text+', '+getSelectedText('adminForm','catid')+', '+f.title.value+f.metakey.value;" />
+								<input type="button" class="button" value="<?php echo T_('Add Sect/Cat/Title') ?>" onClick="f=document.adminForm;f.metakey.value=document.adminForm.sectionid.options[document.adminForm.sectionid.selectedIndex].text+', '+getSelectedText('adminForm','catid')+', '+f.title.value+f.metakey.value;" />
 								</td>
 							</tr>
 							</table>
 							<?php
 							$tabs->endTab();
-							$tabs->startTab("Link to Menu","link-page");
+							$tabs->startTab(T_("Link to Menu"),"link-page");
 							?>
 							<table class="adminform">
 							<tr>
 								<th colspan="2">
-								Link to Menu
+								<?php echo T_('Link to Menu') ?>
 								</th>
 							</tr>
 							<tr>
 								<td colspan="2">
-								This will create a 'Link - Content Item' in the menu you select
+								<?php echo T_("This will create a 'Link - Content Item' in the menu you select") ?>
 								<br /><br />
 								</td>
 							</tr>
 							<tr>
 								<td valign="top" width="90px">
-								Select a Menu
+								<?php echo T_('Select a Menu') ?>
 								</td>
 								<td>
 								<?php echo $lists['menuselect']; ?>
@@ -1026,7 +1024,7 @@
 							</tr>
 							<tr>
 								<td valign="top" width="90px">
-								Menu Item Name
+								<?php echo T_('Menu Item Name') ?>
 								</td>
 								<td>
 								<input type="text" name="link_name" class="inputbox" value="" size="30" />
@@ -1036,12 +1034,12 @@
 								<td>
 								</td>
 								<td>
-								<input name="menu_link" type="button" class="button" value="Link to Menu" onClick="submitbutton('menulink');" />
+								<input name="menu_link" type="button" class="button" value="<?php echo T_('Link to Menu') ?>" onClick="submitbutton('menulink');" />
 								</td>
 							</tr>
 							<tr>
 								<th colspan="2">
-								Existing Menu Links
+								<?php echo T_('Existing Menu Links') ?>
 								</th>
 							</tr>
 							<?php
@@ -1049,7 +1047,7 @@
 								?>
 								<tr>
 									<td colspan="2">
-									None
+									<?php echo T_('None') ?>
 									</td>
 								</tr>
 								<?php
@@ -1115,7 +1113,7 @@
 
 			// do field validation
 			if (!getSelectedValue( 'adminForm', 'sectcat' )) {
-				alert( "Please select something" );
+				alert( "<?php echo T_('Please select something') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -1127,7 +1125,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="edit">
-			Move Items
+			<?php echo T_('Move Items') ?>
 			</th>
 		</tr>
 		</table>
@@ -1136,13 +1134,13 @@
 		<table class="adminform">
 		<tr>
 			<td align="left" valign="top" width="40%">
-			<strong>Move to Section/Category:</strong>
+			<strong><?php echo T_('Move to Section/Category:') ?></strong>
 			<br />
 			<?php echo $sectCatList; ?>
 			<br /><br />
 			</td>
 			<td align="left" valign="top">
-			<strong>Items being Moved:</strong>
+			<strong><?php echo T_('Items being Moved:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
@@ -1185,7 +1183,7 @@
 
 			// do field validation
 			if (!getSelectedValue( 'adminForm', 'sectcat' )) {
-				alert( "Please select a Section/Category to copy the items to" );
+				alert( "<?php echo T_('Please select a Section/Category to copy the items to') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -1196,7 +1194,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="edit">
-			Copy Content Items
+			<?php echo T_('Copy Content Items') ?>
 			</th>
 		</tr>
 		</table>
@@ -1205,13 +1203,13 @@
 		<table class="adminform">
 		<tr>
 			<td align="left" valign="top" width="40%">
-			<strong>Copy to Section/Category:</strong>
+			<strong><?php echo T_('Copy to Section/Category:') ?></strong>
 			<br />
 			<?php echo $sectCatList; ?>
 			<br /><br />
 			</td>
 			<td align="left" valign="top">
-			<strong>Items being copied:</strong>
+			<strong><?php echo T_('Items being copied:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
diff -ruN 4.5.4/administrator/components/com_content/admin.content.php 4.6rc2/administrator/components/com_content/admin.content.php
--- 4.5.4/administrator/components/com_content/admin.content.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_content/admin.content.php	2006-05-16 07:05:37.000000000 -0500
@@ -1,1208 +1,1202 @@
-<?php
-/**
-* @version $Id: admin.content.php,v 1.24 2005/12/31 14:09:21 cauld Exp $
-* @package Mambo
-* @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-require_once( $mainframe->getPath( 'admin_html' ) );
-
-$sectionid = mosGetParam( $_REQUEST, 'sectionid', 0 );
-$id = mosGetParam( $_REQUEST, 'id', '' );
-$cid = mosGetParam( $_POST, 'cid', array(0) );
-if (!is_array( $cid )) {
-	$cid = array(0);
-}
-
-switch ($task) {
-	case 'clean_cache':
-		mosCache::cleanCache( 'com_content' );
-		mosRedirect( 'index2.php', 'Cache cleaned' );
-		break;
-
-	case 'new':
-		editContent( 0, $sectionid, $option );
-		break;
-
-	case 'edit':
-		editContent( $id, $sectionid, $option );
-		break;
-
-	case 'editA':
-		editContent( $cid[0], '', $option );
-		break;
-
-	case 'go2menu':
-	case 'go2menuitem':
-	case 'resethits':
-	case 'menulink':
-	case 'apply':
-	case 'save':
-		mosCache::cleanCache( 'com_content' );
-		saveContent( $sectionid, $task );
-		break;
-
-	case 'remove':
-		removeContent( $cid, $sectionid, $option );
-		break;
-
-	case 'publish':
-		changeContent( $cid, 1, $option );
-		break;
-
-	case 'unpublish':
-		changeContent( $cid, 0, $option );
-		break;
-
-	case 'toggle_frontpage':
-		toggleFrontPage( $cid, $sectionid, $option );
-		break;
-
-	case 'archive':
-		changeContent( $cid, -1, $option );
-		break;
-
-	case 'unarchive':
-		changeContent( $cid, 0, $option );
-		break;
-
-	case 'cancel':
-		cancelContent();
-		break;
-
-	case 'orderup':
-		orderContent( $cid[0], -1, $option );
-		break;
-
-	case 'orderdown':
-		orderContent( $cid[0], 1, $option );
-		break;
-
-	case 'showarchive':
-		viewArchive( $sectionid, $option );
-		break;
-
-	case 'movesect':
-		moveSection( $cid, $sectionid, $option );
-		break;
-
-	case 'movesectsave':
-		moveSectionSave( $cid, $sectionid, $option );
-		break;
-
-	case 'copy':
-		copyItem( $cid, $sectionid, $option );
-		break;
-
-	case 'copysave':
-		copyItemSave( $cid, $sectionid, $option );
-		break;
-
-	case 'accesspublic':
-		accessMenu( $cid[0], 0, $option );
-		break;
-
-	case 'accessregistered':
-		accessMenu( $cid[0], 1, $option );
-		break;
-
-	case 'accessspecial':
-		accessMenu( $cid[0], 2, $option );
-		break;
-
-	case 'saveorder':
-		saveOrder( $cid );
-		break;
-
-	default:
-		viewContent( $sectionid, $option );
-		break;
-}
-
-/**
-* Compiles a list of installed or defined modules
-* @param database A database connector object
-*/
-function viewContent( $sectionid, $option ) {
-	global $database, $mainframe, $mosConfig_list_limit;
-
-	$catid 				= $mainframe->getUserStateFromRequest( "catid{$option}{$sectionid}", 'catid', 0 );
-	$filter_authorid 	= $mainframe->getUserStateFromRequest( "filter_authorid{$option}{$sectionid}", 'filter_authorid', 0 );
-	$filter_sectionid 	= $mainframe->getUserStateFromRequest( "filter_sectionid{$option}{$sectionid}", 'filter_sectionid', 0 );
-	$limit 				= $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
-	$limitstart 		= $mainframe->getUserStateFromRequest( "view{$option}{$sectionid}limitstart", 'limitstart', 0 );
-	$search 			= $mainframe->getUserStateFromRequest( "search{$option}{$sectionid}", 'search', '' );
-	$search 			= $database->getEscaped( trim( strtolower( $search ) ) );
-	$redirect 			= $sectionid;
-	$filter 			= ''; //getting a undefined variable error
-
-	if ( $sectionid == 0 ) {
-		// used to show All content items
-		$where = array(
-		"c.state >= 0",
-		"c.catid=cc.id",
-		"cc.section=s.id",
-		"s.scope='content'",
-		);
-		$order = "\n ORDER BY s.title, c.catid, cc.ordering, cc.title, c.ordering";
-		$all = 1;
-		//$filter = "\n , #__sections AS s WHERE s.id = c.section";
-
-		if ($filter_sectionid > 0) {
-		    $filter = "\nWHERE cc.section=$filter_sectionid";
-		}
-		$section->title = 'All Content Items';
-		$section->id = 0;
-	} else {
-		$where = array(
-		"c.state >= 0",
-		"c.catid=cc.id",
-		"cc.section=s.id",
-		"s.scope='content'",
-		"c.sectionid='$sectionid'"
-		);
-		$order = "\n ORDER BY cc.ordering, cc.title, c.ordering";
-		$all = NULL;
-		$filter = "\n WHERE cc.section = '$sectionid'";
-		$section = new mosSection( $database );
-		$section->load( $sectionid );
-	}
-
-	// used by filter
-	if ( $filter_sectionid > 0 ) {
-		$where[] = "c.sectionid = '$filter_sectionid'";
-	}
-	if ( $catid > 0 ) {
-		$where[] = "c.catid = '$catid'";
-	}
-	if ( $filter_authorid > 0 ) {
-		$where[] = "c.created_by = '$filter_authorid'";
-	}
-
-	if ( $search ) {
-		$where[] = "LOWER( c.title ) LIKE '%$search%'";
-	}
-
-	// get the total number of records
-	$database->setQuery( "SELECT count(*) FROM #__content AS c, #__categories AS cc, #__sections AS s"
-	. (count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : "")
-	);
-	$total = $database->loadResult();
-	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
-	$pageNav = new mosPageNav( $total, $limitstart, $limit );
-
-	$query = "SELECT c.*, g.name AS groupname, cc.name, u.name AS editor, f.content_id AS frontpage, s.title AS section_name, v.name AS author"
-	. "\n FROM #__categories AS cc, #__sections AS s, #__content AS c "
-	. "\n LEFT JOIN #__groups AS g ON g.id = c.access"
-	. "\n LEFT JOIN #__users AS u ON u.id = c.checked_out"
-	. "\n LEFT JOIN #__users AS v ON v.id = c.created_by"
-	. "\n LEFT JOIN #__content_frontpage AS f ON f.content_id = c.id"
-	. ( count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : '' )
-	. $order
-	. "\n LIMIT $pageNav->limitstart,$pageNav->limit"
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
-	if ($database->getErrorNum()) {
-		echo $database->stderr();
-		return false;
-	}
-
-	// get list of categories for dropdown filter
-	$query = "SELECT cc.id AS value, cc.title AS text, section"
-	. "\n FROM #__categories AS cc"
-	. "\n INNER JOIN #__sections AS s ON s.id=cc.section "
-	. $filter
-	. "\n ORDER BY s.ordering, cc.ordering"
-	;
-	$lists['catid'] 	= filterCategory( $query, $catid );
-
-	// get list of sections for dropdown filter
-	$javascript = 'onchange="document.adminForm.submit();"';
-	$lists['sectionid']	= mosAdminMenus::SelectSection( 'filter_sectionid', $filter_sectionid, $javascript );
-
-	// get list of Authors for dropdown filter
-	$query = "SELECT c.created_by AS value, u.name AS text"
-	. "\n FROM #__content AS c"
-	. "\n INNER JOIN #__sections AS s ON s.id = c.sectionid"
-	. "\n LEFT JOIN #__users AS u ON u.id = c.created_by"
-	. "\n WHERE c.state <> '-1'"
-	. "\n AND c.state <> '-2'"
-	. "\n GROUP BY u.name"
-	. "\n ORDER BY u.name"
-	;
-	$authors[] = mosHTML::makeOption( '0', _SEL_AUTHOR );
-	$database->setQuery( $query );
-	$authors = array_merge( $authors, $database->loadObjectList() );
-	$lists['authorid']	= mosHTML::selectList( $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_authorid );
-
-	HTML_content::showContent( $rows, $section, $lists, $search, $pageNav, $all, $redirect );
-}
-
-/**
-* Shows a list of archived content items
-* @param int The section id
-*/
-function viewArchive( $sectionid, $option ) {
-	global $database, $mainframe, $mosConfig_list_limit;
-
-	$catid 				= $mainframe->getUserStateFromRequest( "catidarc{$option}{$sectionid}", 'catid', 0 );
-	$limit 				= $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
-	$limitstart 		= $mainframe->getUserStateFromRequest( "viewarc{$option}{$sectionid}limitstart", 'limitstart', 0 );
-	$search 			= $mainframe->getUserStateFromRequest( "searcharc{$option}{$sectionid}", 'search', '' );
-	$filter_authorid 	= $mainframe->getUserStateFromRequest( "filter_authorid{$option}{$sectionid}", 'filter_authorid', 0 );
-	$filter_sectionid 	= $mainframe->getUserStateFromRequest( "filter_sectionid{$option}{$sectionid}", 'filter_sectionid', 0 );
-	$search 			= $database->getEscaped( trim( strtolower( $search ) ) );
-	$redirect 			= $sectionid;
-
-	if ( $sectionid == 0 ) {
-		$where = array(
-		"c.state = -1",
-		"c.catid=cc.id",
-		"cc.section=s.id",
-		"s.scope='content'"
-		);
-		$filter = "\n , #__sections AS s WHERE s.id = c.section";
-		$all = 1;
-	} else {
-		$where = array(
-		"c.state = -1",
-		"c.catid=cc.id",
-		"cc.section=s.id",
-		"s.scope='content'",
-		"c.sectionid='$sectionid'"
-		);
-		$filter = "\n WHERE section = '$sectionid'";
-		$all = NULL;
-	}
-
-	// used by filter
-	if ( $filter_sectionid > 0 ) {
-		$where[] = "c.sectionid = '$filter_sectionid'";
-	}
-	if ( $filter_authorid > 0 ) {
-		$where[] = "c.created_by = '$filter_authorid'";
-	}
-	if ($catid > 0) {
-		$where[] = "c.catid='$catid'";
-	}
-	if ($search) {
-		$where[] = "LOWER(c.title) LIKE '%$search%'";
-	}
-
-	// get the total number of records
-	$query = "SELECT count(*)"
-	. "FROM #__content AS c, #__categories AS cc, #__sections AS s"
-	. ( count( $where ) ? "\n WHERE " . implode( ' AND ', $where ) : '' )
-	;
-	$database->setQuery( $query );
-	$total = $database->loadResult();
-
-	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
-	$pageNav = new mosPageNav( $total, $limitstart, $limit  );
-
-	$query = "SELECT c.*, g.name AS groupname, cc.name, v.name AS author"
-	. "\n FROM #__categories AS cc, #__sections AS s, #__content AS c "
-	. "\n LEFT JOIN #__groups AS g ON g.id = c.access"
-	. "\n LEFT JOIN #__users AS v ON v.id = c.created_by"
-	. ( count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : '' )
-	. "\n ORDER BY c.catid, c.ordering"
-	. "\n LIMIT $pageNav->limitstart,$pageNav->limit"
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-	if ($database->getErrorNum()) {
-		echo $database->stderr();
-		return;
-	}
-
-	// get list of categories for dropdown filter
-	$query = "SELECT c.id AS value, c.title AS text"
-	. "\n FROM #__categories AS c"
-	. $filter
-	. "\n ORDER BY c.ordering"
-	;
-	$lists['catid'] 			= filterCategory( $query, $catid );
-
-	// get list of sections for dropdown filter
-	$javascript = 'onchange="document.adminForm.submit();"';
-	$lists['sectionid']			= mosAdminMenus::SelectSection( 'filter_sectionid', $filter_sectionid, $javascript );
-
-	$section = new mosSection( $database );
-	$section->load( $sectionid );
-
-	// get list of Authors for dropdown filter
-	$query = "SELECT c.created_by AS value, u.name AS text"
-	. "\n FROM #__content AS c"
-	. "\n INNER JOIN #__sections AS s ON s.id = c.sectionid"
-	. "\n LEFT JOIN #__users AS u ON u.id = c.created_by"
-	. "\n WHERE c.state = '-1'"
-	. "\n GROUP BY u.name"
-	. "\n ORDER BY u.name"
-	;
-	$authors[] = mosHTML::makeOption( '0', _SEL_AUTHOR );
-	$database->setQuery( $query );
-	$authors = array_merge( $authors, $database->loadObjectList() );
-	$lists['authorid']	= mosHTML::selectList( $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_authorid );
-
-	HTML_content::showArchive( $rows, $section, $lists, $search, $pageNav, $option, $all, $redirect );
-}
-
-/**
-* Compiles information to add or edit the record
-* @param database A database connector object
-* @param integer The unique id of the record to edit (0 if new)
-* @param integer The id of the content section
-*/
-function editContent( $uid=0, $sectionid=0, $option ) {
-	global $database, $my, $mainframe;
-	global $mosConfig_absolute_path, $mosConfig_live_site, $mosConfig_offset;
-
-	$redirect = mosGetParam( $_POST, 'redirect', '' );
-	if ( !$redirect ) {
-		$redirect = $sectionid;
-	}
-
-	// load the row from the db table
-	$row = new mosContent( $database );
-	$row->load( $uid );
-
-	if ($uid) {
-		$sectionid = $row->sectionid;
-		if ($row->state < 0) {
-			mosRedirect( 'index2.php?option=com_content&sectionid='. $row->sectionid, 'You cannot edit an archived item' );
-		}
-	}
-
-	if ( $sectionid == 0 ) {
-		$where = "\n WHERE section NOT LIKE '%com_%'";
-	} else {
-		$where = "\n WHERE section='$sectionid'";
-	}
-
-	// get the type name - which is a special category
-	 if ($row->sectionid){
-		$query = "SELECT name FROM #__sections WHERE id=$row->sectionid";
-		$database->setQuery( $query );
-		$section = $database->loadResult();
-		$contentSection = $section;
-	} else {
-		$query = "SELECT name FROM #__sections WHERE id=$sectionid";
-		$database->setQuery( $query );
-		$section = $database->loadResult();
-		$contentSection = $section;
-	}
-
-	// fail if checked out not by 'me'
-	if ($row->checked_out && $row->checked_out <> $my->id) {
-		mosRedirect( 'index2.php?option=com_content', 'The module '. $row->title .' is currently being edited by another administrator' );
-	}
-
-	if ($uid) {
-		$row->checkout( $my->id );
-		if (trim( $row->images )) {
-			$row->images = explode( "\n", $row->images );
-		} else {
-			$row->images = array();
-		}
-
- 		$row->created 		= mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S' );
-		$row->modified 		= mosFormatDate( $row->modified, '%Y-%m-%d %H:%M:%S' );
-		$row->publish_up 	= mosFormatDate( $row->publish_up, '%Y-%m-%d %H:%M:%S' );
-
-  	    if (trim( $row->publish_down ) == '0000-00-00 00:00:00') {
-			$row->publish_down = 'Never';
-		}
-
-		$query = "SELECT name from #__users"
-		. "\n WHERE id=$row->created_by"
-		;
-		$database->setQuery( $query );
-		$row->creator = $database->loadResult();
-
-		$query = "SELECT name from #__users"
-		. "\n WHERE id=$row->modified_by"
-		;
-		$database->setQuery( $query );
-		$row->modifier = $database->loadResult();
-
-		$query = "SELECT content_id from #__content_frontpage"
-		. "\n WHERE content_id=$row->id"
-		;
-		$database->setQuery( $query );
-		$row->frontpage = $database->loadResult();
-
-		// get list of links to this item
-		$and = "\n AND componentid = ". $row->id;
-		$menus = mosAdminMenus::Links2Menu( 'content_item_link', $and );
-	} else {
-		$row->sectionid 	= $sectionid;
-		$row->version 		= 0;
-		$row->state 		= 1;
-		$row->ordering 		= 0;
-		$row->images 		= array();
-		//$row->publish_up 	= date( 'Y-m-d', time() );
-		$row->publish_up 	= date( 'Y-m-d', time() + $mosConfig_offset * 60 * 60 );
-		$row->publish_down 	= 'Never';
-		$row->catid 		= NULL;
-		$row->creator 		= '';
-		$row->modifier 		= '';
-		$row->frontpage 	= 0;
-		$menus = array();
-	}
-
-	$javascript = "onchange=\"changeDynaList( 'catid', sectioncategories, document.adminForm.sectionid.options[document.adminForm.sectionid.selectedIndex].value, 0, 0);\"";
-
-	$query = "SELECT s.id AS value, s.title AS text"
-	. "\n FROM #__sections AS s"
-	. "\n ORDER BY s.ordering";
-	$database->setQuery( $query );
-	if ( $sectionid == 0 ) {
-		$sections[] = mosHTML::makeOption( '-1', 'Select Section' );
-		$sections = array_merge( $sections, $database->loadObjectList() );
-		$lists['sectionid'] = mosHTML::selectList( $sections, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text' );
-	} else {
-	    $intval = intval( $row->sectionid);
-      $dbLoadObjectList = $database->loadObjectList();
-			$lists['sectionid'] = mosHTML::selectList( $dbLoadObjectList, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text', $intval );
-	}
-
-	$sections = $database->loadObjectList();
-
-	$sectioncategories 			= array();
-	$sectioncategories[-1] 		= array();
-	$sectioncategories[-1][] 	= mosHTML::makeOption( '-1', 'Select Category' );
-	foreach($sections as $section) {
-		$sectioncategories[$section->value] = array();
-		$query = "SELECT id AS value, name AS text"
-			. "\n FROM #__categories"
-			. "\n WHERE section='$section->value'"
-			. "\n ORDER BY ordering";
-		$database->setQuery( $query );
-		$rows2 = $database->loadObjectList();
-		foreach($rows2 as $row2) {
-			$sectioncategories[$section->value][] = mosHTML::makeOption( $row2->value, $row2->text );
-		}
-	}
-
- 	// get list of categories
-  	if ( !$row->catid && !$row->sectionid ) {
- 		$categories[] 		= mosHTML::makeOption( '-1', 'Select Category' );
- 		$lists['catid'] 	= mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1"', 'value', 'text' );
-  	} else {
- 		$query = "SELECT id AS value, name AS text"
- 		. "\n FROM #__categories"
- 		. $where
- 		. "\n ORDER BY ordering";
- 		$database->setQuery( $query );
- 		$categories[] 		= mosHTML::makeOption( '-1', 'Select Category' );
- 		$categories 		= array_merge( $categories, $database->loadObjectList() );
- 		$lists['catid'] 	= mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1"', 'value', 'text', intval( $row->catid ) );
-  	}
-
-	// build the html select list for ordering
-	$query = "SELECT ordering AS value, title AS text"
-	. "\n FROM #__content"
-	. "\n WHERE catid='$row->catid'"
-	. "\n AND state >= 0"
-	. "\n ORDER BY ordering"
-	;
-	$lists['ordering'] = mosAdminMenus::SpecificOrdering( $row, $uid, $query, 1 );
-
-	// calls function to read image from directory
-	$pathA 		= $mosConfig_absolute_path .'/images/stories';
-	$pathL 		= $mosConfig_live_site .'/images/stories';
-	$images 	= array();
-	$folders 	= array();
-	$folders[] 	= mosHTML::makeOption( '/' );
-	mosAdminMenus::ReadImages( $pathA, '/', $folders, $images );
-
-	// list of folders in images/stories/
-	$lists['folders'] 			= mosAdminMenus::GetImageFolders( $folders, $pathL );
-	// list of images in specfic folder in images/stories/
-	$lists['imagefiles']		= mosAdminMenus::GetImages( $images, $pathL );
-	// list of saved images
-	$lists['imagelist'] 		= mosAdminMenus::GetSavedImages( $row, $pathL );
-
-	// build list of users
-	$active = ( intval( $row->created_by ) ? intval( $row->created_by ) : $my->id );
-	$lists['created_by'] 		= mosAdminMenus::UserSelect( 'created_by', $active );
-	// build the select list for the image position alignment
-	$lists['_align'] 			= mosAdminMenus::Positions( '_align' );
-	// build the select list for the image caption alignment
-	$lists['_caption_align'] 	= mosAdminMenus::Positions( '_caption_align' );
-	// build the html select list for the group access
-	$lists['access'] 			= mosAdminMenus::Access( $row );
-	// build the html select list for menu selection
-	$lists['menuselect']		= mosAdminMenus::MenuSelect( );
-
-	// build the select list for the image caption position
-	$pos[] = mosHTML::makeOption( 'bottom', _CMN_BOTTOM );
-	$pos[] = mosHTML::makeOption( 'top', _CMN_TOP );
-	$lists['_caption_position'] = mosHTML::selectList( $pos, '_caption_position', 'class="inputbox" size="1"', 'value', 'text' );
-
-
-	// get params definitions
-	$params =& new mosParameters( $row->attribs, $mainframe->getPath( 'com_xml', 'com_content' ), 'component' );
-
-	HTML_content::editContent( $row, $contentSection, $lists, $sectioncategories, $images, $params, $option, $redirect, $menus );
-}
-
-/**
-* Saves the content item an edit form submit
-* @param database A database connector object
-*/
-function saveContent( $sectionid, $task ) {
-	global $database, $my, $mainframe, $mosConfig_offset;
-
-	$menu 		= mosGetParam( $_POST, 'menu', 'mainmenu' );
-	$menuid		= mosGetParam( $_POST, 'menuid', 0 );
-
-	$row = new mosContent( $database );
-	if (!$row->bind( $_POST )) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	$isNew = ( $row->id < 1 );
-	if ($isNew) {
-		//$row->created		= $row->created ? $row->created : date( "Y-m-d H:i:s" );
-		$row->created 		= $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset * 60 * 60 ) : date( "Y-m-d H:i:s" );
-		$row->created_by 	= $row->created_by ? $row->created_by : $my->id;
-	} else {
-		$row->modified 		= date( "Y-m-d H:i:s" );
-		$row->modified_by 	= $my->id;
-		//$row->created 	= $row->created ? $row->created : date( "Y-m-d H:i:s" );
-		$row->created 		= $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset ) : date( "Y-m-d H:i:s" );
-		$row->created_by 	= $row->created_by ? $row->created_by : $my->id;
-	}
-
-	if (strlen(trim( $row->publish_up )) <= 10) {
-  		$row->publish_up .= " 00:00:00";
-	}
-	$row->publish_up = mosFormatDate($row->publish_up, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset );
-
-	if (trim( $row->publish_down ) == "Never") {
-		$row->publish_down = "0000-00-00 00:00:00";
-	}
-
-	$row->state = mosGetParam( $_REQUEST, 'published', 0 );
-
-	$params = mosGetParam( $_POST, 'params', '' );
-	if (is_array( $params )) {
-		$txt = array();
-		foreach ( $params as $k=>$v) {
-			$txt[] = "$k=$v";
-		}
-		$row->attribs = implode( "\n", $txt );
-	}
-
-	// code cleaner for xhtml transitional compliance
-	$row->introtext = str_replace( '<br>', '<br />', $row->introtext );
-	$row->fulltext 	= str_replace( '<br>', '<br />', $row->fulltext );
-
- 	// remove <br /> take being automatically added to empty fulltext
- 	$length	= strlen( $row->fulltext ) < 9;
- 	$search = strstr( $row->fulltext, '<br />');
- 	if ( $length && $search ) {
- 		$row->fulltext = NULL;
- 	}
-
- 	if (!$row->check()) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-	$row->version++;
-	if (!$row->store()) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	// manage frontpage items
-	require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
-	$fp = new mosFrontPage( $database );
-
-	if (mosGetParam( $_REQUEST, 'frontpage', 0 )) {
-
-		// toggles go to first place
-		if (!$fp->load( $row->id )) {
-			// new entry
-			$database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$row->id','1')" );
-			if (!$database->query()) {
-				echo "<script> alert('".$database->stderr()."');</script>\n";
-				exit();
-			}
-			$fp->ordering = 1;
-		}
-	} else {
-		// no frontpage mask
-		if (!$fp->delete( $row->id )) {
-			$msg .= $fp->stderr();
-		}
-		$fp->ordering = 0;
-	}
-	$fp->updateOrder();
-
-	$row->checkin();
-	$row->updateOrder( "catid='$row->catid' AND state >= 0" );
-
-	$redirect = mosGetParam( $_POST, 'redirect', $sectionid );
-	switch ( $task ) {
-		case 'go2menu':
-			mosRedirect( 'index2.php?option=com_menus&menutype='. $menu );
-			break;
-
-		case 'go2menuitem':
-			mosRedirect( 'index2.php?option=com_menus&menutype='. $menu .'&task=edit&hidemainmenu=1&id='. $menuid );
-			break;
-
-		case 'menulink':
-			menuLink( $redirect, $row->id );
-			break;
-
-		case 'resethits':
-			resethits( $redirect, $row->id );
-			break;
-
-		case 'apply':
-			$msg = 'Successfully Saved changes to Item: '. $row->title;
-			mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $row->id, $msg );
-
-		case 'save':
-		default:
-			$msg = 'Successfully Saved Item: '. $row->title;
-			mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect, $msg );
-
-			break;
-	}
-}
-
-/**
-* Changes the state of one or more content pages
-* @param string The name of the category section
-* @param integer A unique category id (passed from an edit form)
-* @param array An array of unique category id numbers
-* @param integer 0 if unpublishing, 1 if publishing
-* @param string The name of the current user
-*/
-function changeContent( $cid=null, $state=0, $option ) {
-	global $database, $my;
-
-	if (count( $cid ) < 1) {
-		$action = $state == 1 ? 'publish' : ($state == -1 ? 'archive' : 'unpublish');
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
-		exit;
-	}
-
-	$total = count ( $cid );
-	$cids = implode( ',', $cid );
-
-	$database->setQuery( "UPDATE #__content SET state='$state'"
-	. "\nWHERE id IN ($cids) AND (checked_out=0 OR (checked_out='".$my->id."'))"
-	);
-	if (!$database->query()) {
-		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	if (count( $cid ) == 1) {
-		$row = new mosContent( $database );
-		$row->checkin( $cid[0] );
-	}
-
-	if ( $state == "-1" ) {
-		$msg = $total ." Item(s) successfully Archived";
-	} else if ( $state == "1" ) {
-		$msg = $total ." Item(s) successfully Published";
-	} else if ( $state == "0" ) {
-		$msg = $total ." Item(s) successfully Unpublished";
-	}
-
-	$redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
-	$task = mosGetParam( $_POST, 'returntask', '' );
-	if ( $task ) {
-		$task = '&task='. $task;
-	} else {
-		$task = '';
-	}
-
-	mosRedirect( 'index2.php?option='. $option . $task .'&sectionid='. $redirect .'&mosmsg='. $msg );
-}
-
-/**
-* Changes the state of one or more content pages
-* @param string The name of the category section
-* @param integer A unique category id (passed from an edit form)
-* @param array An array of unique category id numbers
-* @param integer 0 if unpublishing, 1 if publishing
-* @param string The name of the current user
-*/
-function toggleFrontPage( $cid, $section, $option ) {
-	global $database, $my, $mainframe;
-
-	if (count( $cid ) < 1) {
-		echo "<script> alert('Select an item to toggle'); window.history.go(-1);</script>\n";
-		exit;
-	}
-
-	$msg = '';
-	require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
-
-	$fp = new mosFrontPage( $database );
-	foreach ($cid as $id) {
-		// toggles go to first place
-		if ($fp->load( $id )) {
-			if (!$fp->delete( $id )) {
-				$msg .= $fp->stderr();
-			}
-			$fp->ordering = 0;
-		} else {
-			// new entry
-			$database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$id','0')" );
-			if (!$database->query()) {
-				echo "<script> alert('".$database->stderr()."');</script>\n";
-				exit();
-			}
-			$fp->ordering = 0;
-		}
-		$fp->updateOrder();
-	}
-
-	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $section, $msg );
-}
-
-function removeContent( &$cid, $sectionid, $option ) {
-	global $database, $mainframe;
-
-	$total = count( $cid );
-	if ( $total < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
-		exit;
-	}
-
-	$state = '-2';
-	$ordering = '0';
-	//seperate contentids
-	$cids = implode( ',', $cid );
-	$query = 	"UPDATE #__content SET state = '". $state ."', ordering = '". $ordering ."'"
-	. "\n WHERE id IN ( ". $cids ." )"
-	;
-	$database->setQuery( $query );
-	if ( !$database->query() ) {
-		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	$msg = $total ." Item(s) sent to the Trash";
-	$return = mosGetParam( $_POST, 'returntask', '' );
-	mosRedirect( 'index2.php?option='. $option .'&task='. $return .'&sectionid='. $sectionid, $msg );
-}
-
-/**
-* Cancels an edit operation
-*/
-function cancelContent( ) {
-	global $database;
-
-	$row = new mosContent( $database );
-	$row->bind( $_POST );
-	$row->checkin();
-
-	$redirect = mosGetParam( $_POST, 'redirect', 0 );
-	mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect );
-}
-
-/**
-* Moves the order of a record
-* @param integer The increment to reorder by
-*/
-function orderContent( $uid, $inc, $option ) {
-	global $database;
-
-	$row = new mosContent( $database );
-	$row->load( $uid );
-	$row->move( $inc, "catid='$row->catid' AND state >= 0" );
-
-	$redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
-
-	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $redirect );
-}
-
-/**
-* Form for moving item(s) to a different section and category
-*/
-function moveSection( $cid, $sectionid, $option ) {
-	global $database;
-
-	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
-		exit;
-	}
-
-	//seperate contentids
-	$cids = implode( ',', $cid );
-	// Content Items query
-	$query = 	"SELECT a.title"
-	. "\n FROM #__content AS a"
-	. "\n WHERE ( a.id IN (". $cids .") )"
-	. "\n ORDER BY a.title"
-	;
-	$database->setQuery( $query );
-	$items = $database->loadObjectList();
-
-	$database->setQuery(
-	$query = 	"SELECT CONCAT_WS( ', ', s.id, c.id ) AS `value`, CONCAT_WS( '/', s.name, c.name ) AS `text`"
-	. "\n FROM #__sections AS s"
-	. "\n INNER JOIN #__categories AS c ON c.section = s.id"
-	. "\n WHERE s.scope = 'content'"
-	. "\n ORDER BY s.name, c.name"
-	);
-	$rows = $database->loadObjectList();
-	// build the html select list
-	$sectCatList = mosHTML::selectList( $rows, 'sectcat', 'class="inputbox" size="8"', 'value', 'text', null );
-
-	HTML_content::moveSection( $cid, $sectCatList, $option, $sectionid, $items );
-}
-
-/**
-* Save the changes to move item(s) to a different section and category
-*/
-function moveSectionSave( &$cid, $sectionid, $option ) {
-	global $database, $my;
-
-	$sectcat = mosGetParam( $_POST, 'sectcat', '' );
-	list( $newsect, $newcat ) = explode( ',', $sectcat );
-
-	if (!$newsect && !$newcat ) {
-		mosRedirect( "index.php?option=com_content&sectionid=$sectionid&mosmsg=An error has occurred" );
-	}
-
-	// find section name
-	$query = "SELECT a.name"
-	. "\n FROM #__sections AS a"
-	. "\n WHERE a.id = ". $newsect .""
-	;
-	$database->setQuery( $query );
-	$section = $database->loadResult();
-
-	// find category name
-	$query = "SELECT  a.name"
-	. "\n FROM #__categories AS a"
-	. "\n WHERE a.id = ". $newcat .""
-	;
-	$database->setQuery( $query );
-	$category = $database->loadResult();
-
-	$total = count( $cid );
-	$cids = implode( ',', $cid );
-
-	$row = new mosContent( $database );
-	// update old orders - put existing items in last place
-	foreach ($cid as $id) {
-		$row->load( intval( $id ) );
-		$row->ordering = 0;
-		$row->store();
-		$row->updateOrder( "catid='$row->catid' AND state >= 0" );
-	}
-
-	$query = "UPDATE #__content SET sectionid = '". $newsect ."', catid='". $newcat ."'"
-	. "\n WHERE id IN ($cids)"
-	. "\n AND ( checked_out='0' OR ( checked_out='". $my->id ."') )"
-	;
-	$database->setQuery( $query );
-	if ( !$database->query() ) {
-		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	// update new orders - put items in last place
-	foreach ($cid as $id) {
-		$row->load( intval( $id ) );
-		$row->ordering = 0;
-		$row->store();
-		$row->updateOrder( "catid='". $row->catid ."' AND state >= 0" );
-	}
-
-	$msg = $total. ' Item(s) successfully moved to Section: '. $section .', Category: '. $category;
-	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $sectionid .'&mosmsg='. $msg );
-}
-
-
-/**
-* Form for copying item(s)
-**/
-function copyItem( $cid, $sectionid, $option ) {
-	global $database;
-
-	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
-		exit;
-	}
-
-	//seperate contentids
-	$cids = implode( ',', $cid );
-	## Content Items query
-	$query = 	"SELECT a.title"
-	. "\n FROM #__content AS a"
-	. "\n WHERE ( a.id IN (". $cids .") )"
-	. "\n ORDER BY a.title"
-	;
-	$database->setQuery( $query );
-	$items = $database->loadObjectList();
-
-	## Section & Category query
-	$query = 	"SELECT CONCAT_WS(',',s.id,c.id) AS `value`, CONCAT_WS(' // ', s.name, c.name) AS `text`"
-	. "\n FROM #__sections AS s"
-	. "\n INNER JOIN #__categories AS c ON c.section = s.id"
-	. "\n WHERE s.scope='content'"
-	. "\n ORDER BY s.name, c.name"
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-	// build the html select list
-	$sectCatList = mosHTML::selectList( $rows, 'sectcat', 'class="inputbox" size="10"', 'value', 'text', NULL );
-
-	HTML_content::copySection( $option, $cid, $sectCatList, $sectionid, $items );
-}
-
-
-/**
-* saves Copies of items
-**/
-function copyItemSave( $cid, $sectionid, $option ) {
-	global $database, $my;
-
-	$sectcat = mosGetParam( $_POST, 'sectcat', '' );
-	//seperate sections and categories from selection
-	$sectcat = explode( ',', $sectcat );
-	list( $newsect, $newcat ) = $sectcat;
-
-	if ( !$newsect && !$newcat ) {
-		mosRedirect( 'index.php?option=com_content&sectionid='. $sectionid .'&mosmsg=An error has occurred' );
-	}
-
-	// find section name
-	$query = 	"SELECT a.name"
-	. "\n FROM #__sections AS a"
-	. "\n WHERE a.id = ". $newsect .""
-	;
-	$database->setQuery( $query );
-	$section = $database->loadResult();
-
-	// find category name
-	$query = 	"SELECT  a.name"
-	. "\n FROM #__categories AS a"
-	. "\n WHERE a.id = ". $newcat .""
-	;
-	$database->setQuery( $query );
-	$category = $database->loadResult();
-
-	$total = count( $cid );
-	for ( $i = 0; $i < $total; $i++ ) {
-		$row = new mosContent( $database );
-
-		// main query
-		$query =	"SELECT a.* FROM #__content AS a"
-		. "\n WHERE a.id = ". $cid[$i] ."";
-		;
-		$database->setQuery( $query );
-		$item = $database->loadObjectList();
-
-		// values loaded into array set for store
-		$row->id 				= NULL;
-		$row->sectionid 		= $newsect;
-		$row->catid 			= $newcat;
-		$row->hits 				= '0';
-		$row->ordering			= '0';
-		$row->title 			= $item[0]->title;
-		$row->title_alias 		= $item[0]->title_alias;
-		$row->introtext 		= $item[0]->introtext;
-		$row->fulltext 			= $item[0]->fulltext;
-		$row->state 			= $item[0]->state;
-		$row->mask 				= $item[0]->mask;
-		$row->created 			= $item[0]->created;
-		$row->created_by 		= $item[0]->created_by;
-		$row->created_by_alias 	= $item[0]->created_by_alias;
-		$row->modified 			= $item[0]->modified;
-		$row->modified_by 		= $item[0]->modified_by;
-		$row->checked_out 		= $item[0]->checked_out;
-		$row->checked_out_time 	= $item[0]->checked_out_time;
-		$row->frontpage_up 		= $item[0]->frontpage_up;
-		$row->frontpage_down 	= $item[0]->frontpage_down;
-		$row->publish_up 		= $item[0]->publish_up;
-		$row->publish_down 		= $item[0]->publish_down;
-		$row->images 			= $item[0]->images;
-		$row->attribs 			= $item[0]->attribs;
-		$row->version 			= $item[0]->parentid;
-		$row->parentid 			= $item[0]->parentid;
-		$row->metakey 			= $item[0]->metakey;
-		$row->metadesc 			= $item[0]->metadesc;
-		$row->access 			= $item[0]->access;
-
-		if (!$row->check()) {
-			echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-			exit();
-		}
-		if (!$row->store()) {
-			echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-			exit();
-		}
-		$row->updateOrder( "catid='". $row->catid ."' AND state >= 0" );
-	}
-
-	$msg = $total. ' Item(s) successfully copied to Section: '. $section .', Category: '. $category;
-	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $sectionid .'&mosmsg='. $msg );
-}
-
-/**
-* Function to reset Hit count of a content item
-* PT
-*/
-function resethits( $redirect, $id ) {
-	global $database;
-
-	$row = new mosContent($database);
-	$row->Load($id);
-	$row->hits = "0";
-	$row->store();
-	$row->checkin();
-
-	$msg = 'Successfully Reset Hit count';
-	mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $id, $msg );
-}
-
-/**
-* @param integer The id of the content item
-* @param integer The new access level
-* @param string The URL option
-*/
-function accessMenu( $uid, $access, $option ) {
-	global $database;
-
-	$row = new mosContent( $database );
-	$row->load( $uid );
-	$row->access = $access;
-
-	if ( !$row->check() ) {
-		return $row->getError();
-	}
-	if ( !$row->store() ) {
-		return $row->getError();
-	}
-
-	$redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
-
-	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $redirect );
-}
-
-function filterCategory( $query, $active=NULL ) {
-	global $database;
-
-	$categories[] = mosHTML::makeOption( '0', _SEL_CATEGORY );
-	$database->setQuery( $query );
-	$categories = array_merge( $categories, $database->loadObjectList() );
-
-	$category = mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $active );
-
-	return $category;
-}
-
-function menuLink( $redirect, $id ) {
-	global $database;
-
-	$menu = mosGetParam( $_POST, 'menuselect', '' );
-	$link = mosGetParam( $_POST, 'link_name', '' );
-
-	$row = new mosMenu( $database );
-	$row->menutype 		= $menu;
-	$row->name 			= $link;
-	$row->type 			= 'content_item_link';
-	$row->published		= 1;
-	$row->componentid	= $id;
-	$row->link			= 'index.php?option=com_content&task=view&id='. $id;
-	$row->ordering		= 9999;
-
-	if (!$row->check()) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-	if (!$row->store()) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-	$row->checkin();
-	$row->updateOrder( "menutype='$row->menutype' AND parent='$row->parent'" );
-
-	$msg = $link .' (Link - Static Content) in menu: '. $menu .' successfully created';
-	mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $id, $msg );
-}
-
-function go2menu() {
-	$menu = mosGetParam( $_POST, 'menu', 'mainmenu' );
-
-	mosRedirect( 'index2.php?option=com_menus&menutype='. $menu );
-}
-
-function go2menuitem() {
-	$menu 	= mosGetParam( $_POST, 'menu', 'mainmenu' );
-	$id		= mosGetParam( $_POST, 'menuid', 0 );
-
-	mosRedirect( 'index2.php?option=com_menus&menutype='. $menu .'&task=edit&hidemainmenu=1&id='. $id );
-}
-
-function saveOrder( &$cid ) {
-	global $database;
-
-	$total		= count( $cid );
-	$order 		= mosGetParam( $_POST, 'order', array(0) );
-	$redirect 	= mosGetParam( $_POST, 'redirect', 0 );
-	$rettask	= mosGetParam( $_POST, 'returntask', '' );
-	$row 		= new mosContent( $database );
-	$conditions = array();
-
-    // update ordering values
-	for( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
-		if ($row->ordering != $order[$i]) {
-			$row->ordering = $order[$i];
-	        if (!$row->store()) {
-	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-	            exit();
-	        } // if
-	        // remember to updateOrder this group
-	        $condition = "catid='$row->catid' AND state>=0";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // if
-	} // for
-
-	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
-	} // foreach
-
-	$msg 	= 'New ordering saved';
-	switch ( $rettask ) {
-		case 'showarchive':
-			mosRedirect( 'index2.php?option=com_content&task=showarchive&sectionid='. $redirect, $msg );
-			break;
-
-		default:
-			mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect, $msg );
-			break;
-	} // switch
-} // saveOrder
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Content
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+require_once( $mainframe->getPath( 'admin_html' ) );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
+
+$sectionid = mosGetParam( $_REQUEST, 'sectionid', 0 );
+$id = mosGetParam( $_REQUEST, 'id', '' );
+$cid = mosGetParam( $_POST, 'cid', array(0) );
+if (!is_array( $cid )) {
+	$cid = array(0);
+}
+
+switch ($task) {
+	case 'clean_cache':
+		mosCache::cleanCache( 'com_content' );
+		mosRedirect( 'index2.php', 'Cache cleaned' );
+		break;
+
+	case 'new':
+		editContent( 0, $sectionid, $option );
+		break;
+
+	case 'edit':
+		editContent( $id, $sectionid, $option );
+		break;
+
+	case 'editA':
+		editContent( $cid[0], '', $option );
+		break;
+
+	case 'go2menu':
+	case 'go2menuitem':
+	case 'resethits':
+	case 'menulink':
+	case 'apply':
+	case 'save':
+		mosCache::cleanCache( 'com_content' );
+		saveContent( $sectionid, $task );
+		break;
+
+	case 'remove':
+		removeContent( $cid, $sectionid, $option );
+		break;
+
+	case 'publish':
+		changeContent( $cid, 1, $option );
+		break;
+
+	case 'unpublish':
+		changeContent( $cid, 0, $option );
+		break;
+
+	case 'toggle_frontpage':
+		toggleFrontPage( $cid, $sectionid, $option );
+		break;
+
+	case 'archive':
+		changeContent( $cid, -1, $option );
+		break;
+
+	case 'unarchive':
+		changeContent( $cid, 0, $option );
+		break;
+
+	case 'cancel':
+		cancelContent();
+		break;
+
+	case 'orderup':
+		orderContent( $cid[0], -1, $option );
+		break;
+
+	case 'orderdown':
+		orderContent( $cid[0], 1, $option );
+		break;
+
+	case 'showarchive':
+		viewArchive( $sectionid, $option );
+		break;
+
+	case 'movesect':
+		moveSection( $cid, $sectionid, $option );
+		break;
+
+	case 'movesectsave':
+		moveSectionSave( $cid, $sectionid, $option );
+		break;
+
+	case 'copy':
+		copyItem( $cid, $sectionid, $option );
+		break;
+
+	case 'copysave':
+		copyItemSave( $cid, $sectionid, $option );
+		break;
+
+	case 'accesspublic':
+		accessMenu( $cid[0], 0, $option );
+		break;
+
+	case 'accessregistered':
+		accessMenu( $cid[0], 1, $option );
+		break;
+
+	case 'accessspecial':
+		accessMenu( $cid[0], 2, $option );
+		break;
+
+	case 'saveorder':
+		saveOrder( $cid );
+		break;
+
+	default:
+		viewContent( $sectionid, $option );
+		break;
+}
+
+/**
+* Compiles a list of installed or defined modules
+* @param database A database connector object
+*/
+function viewContent( $sectionid, $option ) {
+	global $database, $mainframe, $mosConfig_list_limit;
+
+	$catid 				= $mainframe->getUserStateFromRequest( "catid{$option}{$sectionid}", 'catid', 0 );
+	$filter_authorid 	= $mainframe->getUserStateFromRequest( "filter_authorid{$option}{$sectionid}", 'filter_authorid', 0 );
+	$filter_sectionid 	= $mainframe->getUserStateFromRequest( "filter_sectionid{$option}{$sectionid}", 'filter_sectionid', 0 );
+	$limit 				= $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
+	$limitstart 		= $mainframe->getUserStateFromRequest( "view{$option}{$sectionid}limitstart", 'limitstart', 0 );
+	$search 			= $mainframe->getUserStateFromRequest( "search{$option}{$sectionid}", 'search', '' );
+	$search 			= $database->getEscaped( trim( strtolower( $search ) ) );
+	$redirect 			= $sectionid;
+	$filter 			= ''; //getting a undefined variable error
+
+	if ( $sectionid == 0 ) {
+		// used to show All content items
+		$where = array(
+		"c.state >= 0",
+		"c.catid=cc.id",
+		"cc.section=s.id",
+		"s.scope='content'",
+		);
+		$order = "\n ORDER BY s.title, c.catid, cc.ordering, cc.title, c.ordering";
+		$all = 1;
+		//$filter = "\n , #__sections AS s WHERE s.id = c.section";
+
+		if ($filter_sectionid > 0) {
+		    $filter = "\nWHERE cc.section=$filter_sectionid";
+		}
+		$section->title = T_('All Content Items');
+		$section->id = 0;
+	} else {
+		$where = array(
+		"c.state >= 0",
+		"c.catid=cc.id",
+		"cc.section=s.id",
+		"s.scope='content'",
+		"c.sectionid='$sectionid'"
+		);
+		$order = "\n ORDER BY cc.ordering, cc.title, c.ordering";
+		$all = NULL;
+		$filter = "\n WHERE cc.section = '$sectionid'";
+		$section = new mosSection( $database );
+		$section->load( $sectionid );
+	}
+
+	// used by filter
+	if ( $filter_sectionid > 0 ) {
+		$where[] = "c.sectionid = '$filter_sectionid'";
+	}
+	if ( $catid > 0 ) {
+		$where[] = "c.catid = '$catid'";
+	}
+	if ( $filter_authorid > 0 ) {
+		$where[] = "c.created_by = '$filter_authorid'";
+	}
+
+	if ( $search ) {
+		$where[] = "LOWER( c.title ) LIKE '%$search%'";
+	}
+
+	// get the total number of records
+	$database->setQuery( "SELECT count(*) FROM #__content AS c, #__categories AS cc, #__sections AS s"
+	. (count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : "")
+	);
+	$total = $database->loadResult();
+	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
+	$pageNav = new mosPageNav( $total, $limitstart, $limit );
+
+	$query = "SELECT c.*, g.name AS groupname, cc.name, u.name AS editor, f.content_id AS frontpage, s.title AS section_name, v.name AS author"
+	. "\n FROM #__categories AS cc, #__sections AS s, #__content AS c"
+	. "\n LEFT JOIN #__groups AS g ON g.id = c.access"
+	. "\n LEFT JOIN #__users AS u ON u.id = c.checked_out"
+	. "\n LEFT JOIN #__users AS v ON v.id = c.created_by"
+	. "\n LEFT JOIN #__content_frontpage AS f ON f.content_id = c.id"
+	. ( count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : '' )
+	. $order
+	. "\n LIMIT $pageNav->limitstart,$pageNav->limit"
+	;
+	$database->setQuery( $query );
+	$rows = $database->loadObjectList();
+
+	if ($database->getErrorNum()) {
+		echo $database->stderr();
+		return false;
+	}
+
+	// get list of categories for dropdown filter
+	$query = "SELECT cc.id AS value, cc.title AS text, section"
+	. "\n FROM #__categories AS cc"
+	. "\n INNER JOIN #__sections AS s ON s.id=cc.section "
+	. $filter
+	. "\n ORDER BY s.ordering, cc.ordering"
+	;
+	$lists['catid'] 	= filterCategory( $query, $catid );
+
+	// get list of sections for dropdown filter
+	$javascript = 'onchange="document.adminForm.submit();"';
+	$lists['sectionid']	= mosAdminMenus::SelectSection( 'filter_sectionid', $filter_sectionid, $javascript );
+
+	// get list of Authors for dropdown filter
+	$query = "SELECT c.created_by AS value, u.name AS text"
+	. "\n FROM #__content AS c"
+	. "\n INNER JOIN #__sections AS s ON s.id = c.sectionid"
+	. "\n LEFT JOIN #__users AS u ON u.id = c.created_by"
+	. "\n WHERE c.state <> '-1'"
+	. "\n AND c.state <> '-2'"
+	. "\n GROUP BY u.name"
+	. "\n ORDER BY u.name"
+	;
+	$authors[] = mosHTML::makeOption( '0', T_('- All Authors -') );
+	$database->setQuery( $query );
+	$authors = array_merge( $authors, $database->loadObjectList() );
+	$lists['authorid']	= mosHTML::selectList( $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_authorid );
+
+	HTML_content::showContent( $rows, $section, $lists, $search, $pageNav, $all, $redirect );
+}
+
+/**
+* Shows a list of archived content items
+* @param int The section id
+*/
+function viewArchive( $sectionid, $option ) {
+	global $database, $mainframe, $mosConfig_list_limit;
+
+	$catid 				= $mainframe->getUserStateFromRequest( "catidarc{$option}{$sectionid}", 'catid', 0 );
+	$limit 				= $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
+	$limitstart 		= $mainframe->getUserStateFromRequest( "viewarc{$option}{$sectionid}limitstart", 'limitstart', 0 );
+	$search 			= $mainframe->getUserStateFromRequest( "searcharc{$option}{$sectionid}", 'search', '' );
+	$filter_authorid 	= $mainframe->getUserStateFromRequest( "filter_authorid{$option}{$sectionid}", 'filter_authorid', 0 );
+	$filter_sectionid 	= $mainframe->getUserStateFromRequest( "filter_sectionid{$option}{$sectionid}", 'filter_sectionid', 0 );
+	$search 			= $database->getEscaped( trim( strtolower( $search ) ) );
+	$redirect 			= $sectionid;
+
+	if ( $sectionid == 0 ) {
+		$where = array(
+		"c.state = -1",
+		"c.catid=cc.id",
+		"cc.section=s.id",
+		"s.scope='content'"
+		);
+		$filter = "\n , #__sections AS s WHERE s.id = c.section";
+		$all = 1;
+	} else {
+		$where = array(
+		"c.state = -1",
+		"c.catid=cc.id",
+		"cc.section=s.id",
+		"s.scope='content'",
+		"c.sectionid='$sectionid'"
+		);
+		$filter = "\n WHERE section = '$sectionid'";
+		$all = NULL;
+	}
+
+	// used by filter
+	if ( $filter_sectionid > 0 ) {
+		$where[] = "c.sectionid = '$filter_sectionid'";
+	}
+	if ( $filter_authorid > 0 ) {
+		$where[] = "c.created_by = '$filter_authorid'";
+	}
+	if ($catid > 0) {
+		$where[] = "c.catid='$catid'";
+	}
+	if ($search) {
+		$where[] = "LOWER(c.title) LIKE '%$search%'";
+	}
+
+	// get the total number of records
+	$query = "SELECT count(*)"
+	. "FROM #__content AS c, #__categories AS cc, #__sections AS s"
+	. ( count( $where ) ? "\n WHERE " . implode( ' AND ', $where ) : '' )
+	;
+	$database->setQuery( $query );
+	$total = $database->loadResult();
+
+	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
+	$pageNav = new mosPageNav( $total, $limitstart, $limit  );
+
+	$query = "SELECT c.*, g.name AS groupname, cc.name, v.name AS author"
+	. "\n FROM #__categories AS cc, #__sections AS s, #__content AS c"
+	. "\n LEFT JOIN #__groups AS g ON g.id = c.access"
+	. "\n LEFT JOIN #__users AS v ON v.id = c.created_by"
+	. ( count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : '' )
+	. "\n ORDER BY c.catid, c.ordering"
+	. "\n LIMIT $pageNav->limitstart,$pageNav->limit"
+	;
+	$database->setQuery( $query );
+	$rows = $database->loadObjectList();
+	if ($database->getErrorNum()) {
+		echo $database->stderr();
+		return;
+	}
+
+	// get list of categories for dropdown filter
+	$query = "SELECT c.id AS value, c.title AS text"
+	. "\n FROM #__categories AS c"
+	. $filter
+	. "\n ORDER BY c.ordering"
+	;
+	$lists['catid'] 			= filterCategory( $query, $catid );
+
+	// get list of sections for dropdown filter
+	$javascript = 'onchange="document.adminForm.submit();"';
+	$lists['sectionid']			= mosAdminMenus::SelectSection( 'filter_sectionid', $filter_sectionid, $javascript );
+
+	$section = new mosSection( $database );
+	$section->load( $sectionid );
+
+	// get list of Authors for dropdown filter
+	$query = "SELECT c.created_by AS value, u.name AS text"
+	. "\n FROM #__content AS c"
+	. "\n INNER JOIN #__sections AS s ON s.id = c.sectionid"
+	. "\n LEFT JOIN #__users AS u ON u.id = c.created_by"
+	. "\n WHERE c.state = '-1'"
+	. "\n GROUP BY u.name"
+	. "\n ORDER BY u.name"
+	;
+	$authors[] = mosHTML::makeOption( '0', T_('- All Authors -') );
+	$database->setQuery( $query );
+	$moreauthors = $database->loadObjectList();
+	if ($moreauthors) $authors = array_merge( $authors, $moreauthors );
+	$lists['authorid']	= mosHTML::selectList( $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_authorid );
+
+	HTML_content::showArchive( $rows, $section, $lists, $search, $pageNav, $option, $all, $redirect );
+}
+
+/**
+* Compiles information to add or edit the record
+* @param database A database connector object
+* @param integer The unique id of the record to edit (0 if new)
+* @param integer The id of the content section
+*/
+function editContent( $uid=0, $sectionid=0, $option ) {
+	global $database, $my, $mainframe;
+	global $mosConfig_absolute_path, $mosConfig_live_site, $mosConfig_offset;
+
+	$redirect = mosGetParam( $_POST, 'redirect', '' );
+	if ( !$redirect ) {
+		$redirect = $sectionid;
+	}
+
+	// load the row from the db table
+	$row = new mosContent( $database );
+	$row->load( $uid );
+
+	if ($uid) {
+		$sectionid = $row->sectionid;
+		if ($row->state < 0) {
+			mosRedirect( 'index2.php?option=com_content&sectionid='. $row->sectionid, T_('You cannot edit an archived item') );
+		}
+	}
+
+	if ( $sectionid == 0 ) {
+		$where = "\n WHERE section NOT LIKE '%com_%'";
+	} else {
+		$where = "\n WHERE section='$sectionid'";
+	}
+
+	// get the type name - which is a special category
+	 if ($row->sectionid){
+		$query = "SELECT name FROM #__sections WHERE id=$row->sectionid";
+		$database->setQuery( $query );
+		$section = $database->loadResult();
+		$contentSection = $section;
+	} else {
+		$query = "SELECT name FROM #__sections WHERE id=$sectionid";
+		$database->setQuery( $query );
+		$section = $database->loadResult();
+		$contentSection = $section;
+	}
+
+	// fail if checked out not by 'me'
+	if ($row->checked_out && $row->checked_out <> $my->id) {
+		mosRedirect( 'index2.php?option=com_content', sprintf(T_('The module %s is currently being edited by another administrator'), $row->title) );
+	}
+
+	if ($uid) {
+		$row->checkout( $my->id );
+		if (trim( $row->images )) {
+			$row->images = explode( "\n", $row->images );
+		} else {
+			$row->images = array();
+		}
+
+ 		$row->created 		= mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S' );
+		$row->modified 		= mosFormatDate( $row->modified, '%Y-%m-%d %H:%M:%S' );
+		$row->publish_up 	= mosFormatDate( $row->publish_up, '%Y-%m-%d %H:%M:%S' );
+
+  	    if (trim( $row->publish_down ) == '0000-00-00 00:00:00') {
+			$row->publish_down = T_('Never');
+		}
+
+		$query = "SELECT name from #__users"
+		. "\n WHERE id=$row->created_by"
+		;
+		$database->setQuery( $query );
+		$row->creator = $database->loadResult();
+
+		$query = "SELECT name from #__users"
+		. "\n WHERE id=$row->modified_by"
+		;
+		$database->setQuery( $query );
+		$row->modifier = $database->loadResult();
+
+		$query = "SELECT content_id from #__content_frontpage"
+		. "\n WHERE content_id=$row->id"
+		;
+		$database->setQuery( $query );
+		$row->frontpage = $database->loadResult();
+
+		// get list of links to this item
+		$_and = "\n AND componentid = ". $row->id;
+		$menus = mosAdminMenus::Links2Menu( 'content_item_link', $_and );
+	} else {
+		$row->sectionid 	= $sectionid;
+		$row->version 		= 0;
+		$row->state 		= 1;
+		$row->ordering 		= 0;
+		$row->images 		= array();
+		//$row->publish_up 	= date( 'Y-m-d', time() );
+		$row->publish_up 	= date( 'Y-m-d', time() + $mosConfig_offset * 60 * 60 );
+		$row->publish_down 	= T_('Never');
+		$row->catid 		= NULL;
+		$row->creator 		= '';
+		$row->modifier 		= '';
+		$row->frontpage 	= 0;
+		$menus = array();
+	}
+
+	$javascript = "onchange=\"changeDynaList( 'catid', sectioncategories, document.adminForm.sectionid.options[document.adminForm.sectionid.selectedIndex].value, 0, 0);\"";
+
+	$query = "SELECT s.id AS value, s.title AS text"
+	. "\n FROM #__sections AS s"
+	. "\n ORDER BY s.ordering";
+	$database->setQuery( $query );
+	
+	$sections = $database->loadObjectList();
+		
+	if ( $sectionid == 0 ) {		
+		if ($sections) {
+			array_unshift ($sections, mosHTML::makeOption( '-1', T_('Select Section')));
+		} else {
+			$sections[] = mosHTML::makeOption( '-1', T_('Add Section(s) First') );
+		}	
+		$lists['sectionid'] = mosHTML::selectList( $sections, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text' );
+	} else {
+			$lists['sectionid'] = mosHTML::selectList( $sections, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text', intval( $row->sectionid));
+	}
+			
+	$sectioncategories 			= array();
+	$sectioncategories[-1] 		= array();
+	$sectioncategories[-1][] 	= mosHTML::makeOption( '-1', T_('Select Category') );
+	if ($sections) foreach($sections as $section) {
+		$sectioncategories[$section->value] = array();
+		$query = "SELECT id AS value, name AS text"
+			. "\n FROM #__categories"
+			. "\n WHERE section='$section->value'"
+			. "\n ORDER BY ordering";
+		$database->setQuery( $query );
+		$rows2 = $database->loadObjectList();
+		if ($rows2) foreach($rows2 as $row2) $sectioncategories[$section->value][] = mosHTML::makeOption( $row2->value, $row2->text );
+		else $sectioncategories[$section->value][] = mosHTML::makeOption( "-1", T_('Add Categories First') );
+	}
+
+ 	// get list of categories
+  	if ( !$row->catid && !$row->sectionid ) {
+ 		$categories[] 		= mosHTML::makeOption( '-1', T_('Select Category') );
+ 		$lists['catid'] 	= mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1"', 'value', 'text' );
+  	} else {
+ 		$query = "SELECT id AS value, name AS text"
+ 		. "\n FROM #__categories"
+ 		. $where
+ 		. "\n ORDER BY ordering";
+ 		$database->setQuery( $query );
+ 		$categories[] 		= mosHTML::makeOption( '-1', T_('Select Category') );
+ 		$categories 		= array_merge( $categories, $database->loadObjectList() );
+ 		$lists['catid'] 	= mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1"', 'value', 'text', intval( $row->catid ) );
+  	}
+
+	// build the html select list for ordering
+	$query = "SELECT ordering AS value, title AS text"
+	. "\n FROM #__content"
+	. "\n WHERE catid='$row->catid'"
+	. "\n AND state >= 0"
+	. "\n ORDER BY ordering"
+	;
+	$lists['ordering'] = mosAdminMenus::SpecificOrdering( $row, $uid, $query, 1 );
+
+	// calls function to read image from directory
+	$pathA 		= $mosConfig_absolute_path .'/images/stories';
+	$pathL 		= $mosConfig_live_site .'/images/stories';
+	$images 	= array();
+	$folders 	= array();
+	$folders[] 	= mosHTML::makeOption( '/' );
+	mosAdminMenus::ReadImages( $pathA, '/', $folders, $images );
+
+	// list of folders in images/stories/
+	$lists['folders'] 			= mosAdminMenus::GetImageFolders( $folders, $pathL );
+	// list of images in specfic folder in images/stories/
+	$lists['imagefiles']		= mosAdminMenus::GetImages( $images, $pathL );
+	// list of saved images
+	$lists['imagelist'] 		= mosAdminMenus::GetSavedImages( $row, $pathL );
+
+	// build list of users
+	$active = ( intval( $row->created_by ) ? intval( $row->created_by ) : $my->id );
+	$lists['created_by'] 		= mosAdminMenus::UserSelect( 'created_by', $active );
+	// build the select list for the image position alignment
+	$lists['_align'] 			= mosAdminMenus::Positions( '_align' );
+	// build the select list for the image caption alignment
+	$lists['_caption_align'] 	= mosAdminMenus::Positions( '_caption_align' );
+	// build the html select list for the group access
+	$lists['access'] 			= mosAdminMenus::Access( $row );
+	// build the html select list for menu selection
+	$lists['menuselect']		= mosAdminMenus::MenuSelect( );
+
+	// build the select list for the image caption position
+	$pos[] = mosHTML::makeOption( 'bottom', T_('Bottom') );
+	$pos[] = mosHTML::makeOption( 'top', T_('Top') );
+	$lists['_caption_position'] = mosHTML::selectList( $pos, '_caption_position', 'class="inputbox" size="1"', 'value', 'text' );
+
+
+	// get params definitions
+	$params =& new mosAdminParameters( $row->attribs, $mainframe->getPath( 'com_xml', 'com_content' ), 'component' );
+
+	HTML_content::editContent( $row, $contentSection, $lists, $sectioncategories, $images, $params, $option, $redirect, $menus );
+}
+
+/**
+* Saves the content item an edit form submit
+* @param database A database connector object
+*/
+function saveContent( $sectionid, $task ) {
+	global $database, $my, $mainframe, $mosConfig_offset;
+
+	$menu 		= mosGetParam( $_POST, 'menu', 'mainmenu' );
+	$menuid		= mosGetParam( $_POST, 'menuid', 0 );
+
+	$row = new mosContent( $database );
+	if (!$row->bind( $_POST )) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	$isNew = ( $row->id < 1 );
+	if ($isNew) {
+		//$row->created		= $row->created ? $row->created : date( "Y-m-d H:i:s" );
+		$row->created 		= $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset * 60 * 60 ) : date( "Y-m-d H:i:s" );
+		$row->created_by 	= $row->created_by ? $row->created_by : $my->id;
+	} else {
+		$row->modified 		= date( "Y-m-d H:i:s" );
+		$row->modified_by 	= $my->id;
+		//$row->created 	= $row->created ? $row->created : date( "Y-m-d H:i:s" );
+		$row->created 		= $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset ) : date( "Y-m-d H:i:s" );
+		$row->created_by 	= $row->created_by ? $row->created_by : $my->id;
+	}
+
+	if (strlen(trim( $row->publish_up )) <= 10) {
+  		$row->publish_up .= " 00:00:00";
+	}
+	$row->publish_up = mosFormatDate($row->publish_up, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset );
+
+	if (trim( $row->publish_down ) == T_("Never")) {
+		$row->publish_down = "0000-00-00 00:00:00";
+	}
+
+	$row->state = mosGetParam( $_REQUEST, 'published', 0 );
+
+	$params = mosGetParam( $_POST, 'params', '' );
+	if (is_array( $params )) {
+		$txt = array();
+		foreach ( $params as $k=>$v) {
+			$txt[] = "$k=$v";
+		}
+		$row->attribs = implode( "\n", $txt );
+	}
+
+	// code cleaner for xhtml transitional compliance
+	$row->introtext = str_replace( '<br>', '<br />', $row->introtext );
+	$row->fulltext 	= str_replace( '<br>', '<br />', $row->fulltext );
+
+ 	// remove <br /> take being automatically added to empty fulltext
+ 	$length	= strlen( $row->fulltext ) < 9;
+ 	$search = strstr( $row->fulltext, '<br />');
+ 	if ( $length && $search ) {
+ 		$row->fulltext = NULL;
+ 	}
+
+ 	if (!$row->check()) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+	$row->version++;
+	if (!$row->store()) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	// manage frontpage items
+	require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
+	$fp = new mosFrontPage( $database );
+
+	if (mosGetParam( $_REQUEST, 'frontpage', 0 )) {
+
+		// toggles go to first place
+		if (!$fp->load( $row->id )) {
+			// new entry
+			$database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$row->id','1')" );
+			if (!$database->query()) {
+				echo "<script> alert('".$database->stderr()."');</script>\n";
+				exit();
+			}
+			$fp->ordering = 1;
+		}
+	} else {
+		// no frontpage mask
+		if (!$fp->delete( $row->id )) {
+			$msg .= $fp->stderr();
+		}
+		$fp->ordering = 0;
+	}
+	$fp->updateOrder();
+
+	$row->checkin();
+	$row->updateOrder( "catid='$row->catid' AND state >= 0" );
+
+	$redirect = mosGetParam( $_POST, 'redirect', $sectionid );
+	switch ( $task ) {
+		case 'go2menu':
+			mosRedirect( 'index2.php?option=com_menus&menutype='. $menu );
+			break;
+
+		case 'go2menuitem':
+			mosRedirect( 'index2.php?option=com_menus&menutype='. $menu .'&task=edit&hidemainmenu=1&id='. $menuid );
+			break;
+
+		case 'menulink':
+			menuLink( $redirect, $row->id );
+			break;
+
+		case 'resethits':
+			resethits( $redirect, $row->id );
+			break;
+
+		case 'apply':
+			$msg = T_('Successfully Saved changes to Item: '). $row->title;
+			mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $row->id, $msg );
+
+		case 'save':
+		default:
+			$msg = T_('Successfully Saved Item: '). $row->title;
+			mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect, $msg );
+
+			break;
+	}
+}
+
+/**
+* Changes the state of one or more content pages
+* @param string The name of the category section
+* @param integer A unique category id (passed from an edit form)
+* @param array An array of unique category id numbers
+* @param integer 0 if unpublishing, 1 if publishing
+* @param string The name of the current user
+*/
+function changeContent( $cid=null, $state=0, $option ) {
+	global $database, $my;
+
+	if (count( $cid ) < 1) {
+		$action = $state == 1 ? T_('publish') : ($state == -1 ? T_('archive') : T_('unpublish'));
+		echo "<script> alert('".sprintf(T_('Select an item to %s'),$action)."'); window.history.go(-1);</script>\n";
+		exit;
+	}
+
+	$total = count ( $cid );
+	$cids = implode( ',', $cid );
+
+	$database->setQuery( "UPDATE #__content SET state='$state'"
+	. "\nWHERE id IN ($cids) AND (checked_out=0 OR (checked_out='".$my->id."'))"
+	);
+	if (!$database->query()) {
+		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	if (count( $cid ) == 1) {
+		$row = new mosContent( $database );
+		$row->checkin( $cid[0] );
+	}
+
+	if ( $state == "-1" ) {
+		$msg = sprintf(Tn_('%d Item successfully Archived', '%d Items successfully Archived',$total),$total);
+	} else if ( $state == "1" ) {
+		$msg = sprintf(Tn_('%d Item successfully Published', '%d Items successfully Published',$total),$total);
+	} else if ( $state == "0" ) {
+		$msg = sprintf(Tn_('%d Item successfully Unpublished', '%d Items successfully Unpublished',$total),$total);
+	}
+
+	$redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
+	$task = mosGetParam( $_POST, 'returntask', '' );
+	if ( $task ) {
+		$task = '&task='. $task;
+	} else {
+		$task = '';
+	}
+
+	mosRedirect( 'index2.php?option='. $option . $task .'&sectionid='. $redirect .'&mosmsg='. $msg );
+}
+
+/**
+* Changes the state of one or more content pages
+* @param string The name of the category section
+* @param integer A unique category id (passed from an edit form)
+* @param array An array of unique category id numbers
+* @param integer 0 if unpublishing, 1 if publishing
+* @param string The name of the current user
+*/
+function toggleFrontPage( $cid, $section, $option ) {
+	global $database, $my, $mainframe;
+
+	if (count( $cid ) < 1) {
+		echo "<script> alert('".T_('Select an item to toggle')."'); window.history.go(-1);</script>\n";
+		exit;
+	}
+
+	$msg = '';
+	require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
+
+	$fp = new mosFrontPage( $database );
+	foreach ($cid as $id) {
+		// toggles go to first place
+		if ($fp->load( $id )) {
+			if (!$fp->delete( $id )) {
+				$msg .= $fp->stderr();
+			}
+			$fp->ordering = 0;
+		} else {
+			// new entry
+			$database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$id','0')" );
+			if (!$database->query()) {
+				echo "<script> alert('".$database->stderr()."');</script>\n";
+				exit();
+			}
+			$fp->ordering = 0;
+		}
+		$fp->updateOrder();
+	}
+
+	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $section, $msg );
+}
+
+function removeContent( &$cid, $sectionid, $option ) {
+	global $database, $mainframe;
+
+	$total = count( $cid );
+	if ( $total < 1) {
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
+		exit;
+	}
+
+	$state = '-2';
+	$ordering = '0';
+	//seperate contentids
+	$cids = implode( ',', $cid );
+	$query = 	"UPDATE #__content SET state = '". $state ."', ordering = '". $ordering ."'"
+	. "\n WHERE id IN ( ". $cids ." )"
+	;
+	$database->setQuery( $query );
+	if ( !$database->query() ) {
+		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	$msg = sprintf(Tn_('%d Item sent to the Trash', '%d Items sent to the Trash',$total),$total);
+	$return = mosGetParam( $_POST, 'returntask', '' );
+	mosRedirect( 'index2.php?option='. $option .'&task='. $return .'&sectionid='. $sectionid, $msg );
+}
+
+/**
+* Cancels an edit operation
+*/
+function cancelContent( ) {
+	global $database;
+
+	$row = new mosContent( $database );
+	$row->bind( $_POST );
+	$row->checkin();
+
+	$redirect = mosGetParam( $_POST, 'redirect', 0 );
+	mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect );
+}
+
+/**
+* Moves the order of a record
+* @param integer The increment to reorder by
+*/
+function orderContent( $uid, $inc, $option ) {
+	global $database;
+
+	$row = new mosContent( $database );
+	$row->load( $uid );
+	$row->move( $inc, "catid='$row->catid' AND state >= 0" );
+
+	$redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
+
+	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $redirect );
+}
+
+/**
+* Form for moving item(s) to a different section and category
+*/
+function moveSection( $cid, $sectionid, $option ) {
+	global $database;
+
+	if (!is_array( $cid ) || count( $cid ) < 1) {
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
+		exit;
+	}
+
+	//seperate contentids
+	$cids = implode( ',', $cid );
+	// Content Items query
+	$query = 	"SELECT a.title"
+	. "\n FROM #__content AS a"
+	. "\n WHERE ( a.id IN (". $cids .") )"
+	. "\n ORDER BY a.title"
+	;
+	$database->setQuery( $query );
+	$items = $database->loadObjectList();
+
+	$database->setQuery(
+	$query = 	"SELECT CONCAT_WS( ', ', s.id, c.id ) AS `value`, CONCAT_WS( '/', s.name, c.name ) AS `text`"
+	. "\n FROM #__sections AS s"
+	. "\n INNER JOIN #__categories AS c ON c.section = s.id"
+	. "\n WHERE s.scope = 'content'"
+	. "\n ORDER BY s.name, c.name"
+	);
+	$rows = $database->loadObjectList();
+	// build the html select list
+	$sectCatList = mosHTML::selectList( $rows, 'sectcat', 'class="inputbox" size="8"', 'value', 'text', null );
+
+	HTML_content::moveSection( $cid, $sectCatList, $option, $sectionid, $items );
+}
+
+/**
+* Save the changes to move item(s) to a different section and category
+*/
+function moveSectionSave( &$cid, $sectionid, $option ) {
+	global $database, $my;
+
+	$sectcat = mosGetParam( $_POST, 'sectcat', '' );
+	list( $newsect, $newcat ) = explode( ',', $sectcat );
+
+	if (!$newsect && !$newcat ) {
+		mosRedirect( "index.php?option=com_content&sectionid=$sectionid&mosmsg=".T_('An error has occurred')."" );
+	}
+
+	// find section name
+	$query = "SELECT a.name"
+	. "\n FROM #__sections AS a"
+	. "\n WHERE a.id = ". $newsect .""
+	;
+	$database->setQuery( $query );
+	$section = $database->loadResult();
+
+	// find category name
+	$query = "SELECT  a.name"
+	. "\n FROM #__categories AS a"
+	. "\n WHERE a.id = ". $newcat .""
+	;
+	$database->setQuery( $query );
+	$category = $database->loadResult();
+
+	$total = count( $cid );
+	$cids = implode( ',', $cid );
+
+	$row = new mosContent( $database );
+	// update old orders - put existing items in last place
+	foreach ($cid as $id) {
+		$row->load( intval( $id ) );
+		$row->ordering = 0;
+		$row->store();
+		$row->updateOrder( "catid='$row->catid' AND state >= 0" );
+	}
+
+	$query = "UPDATE #__content SET sectionid = '". $newsect ."', catid='". $newcat ."'"
+	. "\n WHERE id IN ($cids)"
+	. "\n AND ( checked_out='0' OR ( checked_out='". $my->id ."') )"
+	;
+	$database->setQuery( $query );
+	if ( !$database->query() ) {
+		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	// update new orders - put items in last place
+	foreach ($cid as $id) {
+		$row->load( intval( $id ) );
+		$row->ordering = 0;
+		$row->store();
+		$row->updateOrder( "catid='". $row->catid ."' AND state >= 0" );
+	}
+
+	$msg = sprintf(Tn_('%d Item successfully moved to Section: %s, Category: %s', '%d Items successfully moved to Section: %s, Category: %s',$total),$total, $section, $category);
+	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $sectionid .'&mosmsg='. $msg );
+}
+
+
+/**
+* Form for copying item(s)
+**/
+function copyItem( $cid, $sectionid, $option ) {
+	global $database;
+
+	if (!is_array( $cid ) || count( $cid ) < 1) {
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
+		exit;
+	}
+
+	//seperate contentids
+	$cids = implode( ',', $cid );
+	## Content Items query
+	$query = 	"SELECT a.title"
+	. "\n FROM #__content AS a"
+	. "\n WHERE ( a.id IN (". $cids .") )"
+	. "\n ORDER BY a.title"
+	;
+	$database->setQuery( $query );
+	$items = $database->loadObjectList();
+
+	## Section & Category query
+	$query = 	"SELECT CONCAT_WS(',',s.id,c.id) AS `value`, CONCAT_WS(' // ', s.name, c.name) AS `text`"
+	. "\n FROM #__sections AS s"
+	. "\n INNER JOIN #__categories AS c ON c.section = s.id"
+	. "\n WHERE s.scope='content'"
+	. "\n ORDER BY s.name, c.name"
+	;
+	$database->setQuery( $query );
+	$rows = $database->loadObjectList();
+	// build the html select list
+	$sectCatList = mosHTML::selectList( $rows, 'sectcat', 'class="inputbox" size="10"', 'value', 'text', NULL );
+
+	HTML_content::copySection( $option, $cid, $sectCatList, $sectionid, $items );
+}
+
+
+/**
+* saves Copies of items
+**/
+function copyItemSave( $cid, $sectionid, $option ) {
+	global $database, $my;
+
+	$sectcat = mosGetParam( $_POST, 'sectcat', '' );
+	//seperate sections and categories from selection
+	$sectcat = explode( ',', $sectcat );
+	list( $newsect, $newcat ) = $sectcat;
+
+	if ( !$newsect && !$newcat ) {
+		mosRedirect( 'index.php?option=com_content&sectionid='. $sectionid .'&mosmsg='.urlencode(T_('An error has occurred')));
+	}
+
+	// find section name
+	$query = 	"SELECT a.name"
+	. "\n FROM #__sections AS a"
+	. "\n WHERE a.id = ". $newsect .""
+	;
+	$database->setQuery( $query );
+	$section = $database->loadResult();
+
+	// find category name
+	$query = 	"SELECT  a.name"
+	. "\n FROM #__categories AS a"
+	. "\n WHERE a.id = ". $newcat .""
+	;
+	$database->setQuery( $query );
+	$category = $database->loadResult();
+
+	$total = count( $cid );
+	for ( $i = 0; $i < $total; $i++ ) {
+		$row = new mosContent( $database );
+
+		// main query
+		$query =	"SELECT a.* FROM #__content AS a"
+		. "\n WHERE a.id = ". $cid[$i] ."";
+		;
+		$database->setQuery( $query );
+		$item = $database->loadObjectList();
+
+		// values loaded into array set for store
+		$row->id 				= NULL;
+		$row->sectionid 		= $newsect;
+		$row->catid 			= $newcat;
+		$row->hits 				= '0';
+		$row->ordering			= '0';
+		$row->title 			= $item[0]->title;
+		$row->title_alias 		= $item[0]->title_alias;
+		$row->introtext 		= $item[0]->introtext;
+		$row->fulltext 			= $item[0]->fulltext;
+		$row->state 			= $item[0]->state;
+		$row->mask 				= $item[0]->mask;
+		$row->created 			= $item[0]->created;
+		$row->created_by 		= $item[0]->created_by;
+		$row->created_by_alias 	= $item[0]->created_by_alias;
+		$row->modified 			= $item[0]->modified;
+		$row->modified_by 		= $item[0]->modified_by;
+		$row->checked_out 		= $item[0]->checked_out;
+		$row->checked_out_time 	= $item[0]->checked_out_time;
+		$row->frontpage_up 		= $item[0]->frontpage_up;
+		$row->frontpage_down 	= $item[0]->frontpage_down;
+		$row->publish_up 		= $item[0]->publish_up;
+		$row->publish_down 		= $item[0]->publish_down;
+		$row->images 			= $item[0]->images;
+		$row->attribs 			= $item[0]->attribs;
+		$row->version 			= $item[0]->parentid;
+		$row->parentid 			= $item[0]->parentid;
+		$row->metakey 			= $item[0]->metakey;
+		$row->metadesc 			= $item[0]->metadesc;
+		$row->access 			= $item[0]->access;
+
+		if (!$row->check()) {
+			echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+			exit();
+		}
+		if (!$row->store()) {
+			echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+			exit();
+		}
+		$row->updateOrder( "catid='". $row->catid ."' AND state >= 0" );
+	}
+
+	$msg = sprintf(Tn_('%d Item successfully copied to Section: %s, Category: %s', '%d Items successfully copied to Section: %s, Category: %s',$total),$total, $section, $category);
+	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $sectionid .'&mosmsg='. $msg );
+}
+
+/**
+* Function to reset Hit count of a content item
+* PT
+*/
+function resethits( $redirect, $id ) {
+	global $database;
+
+	$row = new mosContent($database);
+	$row->Load($id);
+	$row->hits = "0";
+	$row->store();
+	$row->checkin();
+
+	$msg = T_('Successfully Reset Hit count');
+	mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $id, $msg );
+}
+
+/**
+* @param integer The id of the content item
+* @param integer The new access level
+* @param string The URL option
+*/
+function accessMenu( $uid, $access, $option ) {
+	global $database;
+
+	$row = new mosContent( $database );
+	$row->load( $uid );
+	$row->access = $access;
+
+	if ( !$row->check() ) {
+		return $row->getError();
+	}
+	if ( !$row->store() ) {
+		return $row->getError();
+	}
+
+	$redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
+
+	mosRedirect( 'index2.php?option='. $option .'&sectionid='. $redirect );
+}
+
+function filterCategory( $query, $active=NULL ) {
+	global $database;
+
+	$categories[] = mosHTML::makeOption( '0', T_('- All Categories -') );
+	$database->setQuery( $query );
+	$categories = array_merge( $categories, $database->loadObjectList() );
+
+	$category = mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $active );
+
+	return $category;
+}
+
+function menuLink( $redirect, $id ) {
+	global $database;
+
+	$menu = mosGetParam( $_POST, 'menuselect', '' );
+	$link = mosGetParam( $_POST, 'link_name', '' );
+
+	$row = new mosMenu( $database );
+	$row->menutype 		= $menu;
+	$row->name 			= $link;
+	$row->type 			= 'content_item_link';
+	$row->published		= 1;
+	$row->componentid	= $id;
+	$row->link			= 'index.php?option=com_content&task=view&id='. $id;
+	$row->ordering		= 9999;
+
+	if (!$row->check()) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+	if (!$row->store()) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+	$row->checkin();
+	$row->updateOrder( "menutype='$row->menutype' AND parent='$row->parent'" );
+
+	$msg =  sprintf(T_('%s (Link - Static Content) in menu: %s successfully created'),$link, $menu);
+	mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $id, $msg );
+}
+
+function go2menu() {
+	$menu = mosGetParam( $_POST, 'menu', 'mainmenu' );
+
+	mosRedirect( 'index2.php?option=com_menus&menutype='. $menu );
+}
+
+function go2menuitem() {
+	$menu 	= mosGetParam( $_POST, 'menu', 'mainmenu' );
+	$id		= mosGetParam( $_POST, 'menuid', 0 );
+
+	mosRedirect( 'index2.php?option=com_menus&menutype='. $menu .'&task=edit&hidemainmenu=1&id='. $id );
+}
+
+function saveOrder( &$cid ) {
+	global $database;
+	$order 		= mosGetParam( $_POST, 'order', array(0) );
+	$redirect 	= mosGetParam( $_POST, 'redirect', 0 );
+	$rettask	= mosGetParam( $_POST, 'returntask', '' );
+	$row		= new mosContent( $database );
+	$categories = array();
+    // update ordering values
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
+		if ($row->ordering != $order[$i]) {
+			$row->ordering = $order[$i];
+	        if (!$row->store()) {
+	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
+	            exit();
+	        }
+	        // remember to updateOrder this group
+	        $categories[$row->catid] = $row->id;
+	    }
+	}
+	// execute updateOrder for each group
+	foreach ($categories as $catid=>$rowid) {
+		$row->updateOrder("catid = $catid AND state >= 0");
+	} // foreach
+
+	$msg 	= T_('New ordering saved');
+	switch ( $rettask ) {
+		case 'showarchive':
+			mosRedirect( 'index2.php?option=com_content&task=showarchive&sectionid='. $redirect, $msg );
+			break;
+
+		default:
+			mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect, $msg );
+			break;
+	} // switch
+} // saveOrder
+?>
diff -ruN 4.5.4/administrator/components/com_content/content.xml 4.6rc2/administrator/components/com_content/content.xml
--- 4.5.4/administrator/components/com_content/content.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_content/content.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Content Page</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This shows a single content page</description>
 	<params>
@@ -80,6 +80,5 @@
 			<option value="0">Hide</option>
 			<option value="1">Show</option>
 		</param>
-		<param name="keyref" type="text" size="25" default="" label="Key Reference" description="A text key that an item may be referenced by (like a help reference)" />
 	</params>
 </mosinstall>
diff -ruN 4.5.4/administrator/components/com_content/toolbar.content.html.php 4.6rc2/administrator/components/com_content/toolbar.content.html.php
--- 4.5.4/administrator/components/com_content/toolbar.content.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_content/toolbar.content.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,17 +1,15 @@
 <?php
 /**
-* @version $Id: toolbar.content.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
 class TOOLBAR_content {
 	function _EDIT() {
 		global $id;
@@ -27,12 +25,16 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.content.edit' );
+		if ($GLOBALS['task'] == 'new') {
+		    mosMenuBar::help( 'new' );
+		} else {
+		    mosMenuBar::help( 'edit' );
+		}
 		mosMenuBar::endTable();
 	}
 
@@ -40,29 +42,29 @@
 		mosMenuBar::startTable();
 		mosMenuBar::unarchiveList();
 		mosMenuBar::spacer();
-		mosMenuBar::custom( 'remove', 'delete.png', 'delete_f2.png', 'Trash', false );
+		mosMenuBar::custom( 'remove', 'delete.png', 'delete_f2.png', T_('Trash'), false );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.content.archive' );
+		mosMenuBar::help( 'archive' );
 		mosMenuBar::endTable();
 	}
 
 	function _MOVE() {
 		mosMenuBar::startTable();
-		mosMenuBar::custom( 'movesectsave', 'save.png', 'save_f2.png', 'Save', false );
+		mosMenuBar::custom( 'movesectsave', 'save.png', 'save_f2.png', T_('Save'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.content.copymove' );
+		mosMenuBar::help( 'move' );
 		mosMenuBar::endTable();
 	}
 
 	function _COPY() {
 		mosMenuBar::startTable();
-		mosMenuBar::custom( 'copysave', 'save.png', 'save_f2.png', 'Save', false );
+		mosMenuBar::custom( 'copysave', 'save.png', 'save_f2.png', T_('Save'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.content.copymove' );
+		mosMenuBar::help( 'copy' );
 		mosMenuBar::endTable();
 	}
 
@@ -76,15 +78,15 @@
 		mosMenuBar::spacer();
 		mosMenuBar::unpublishList();
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'movesect', 'move.png', 'move_f2.png', 'Move' );
+		mosMenuBar::customX( 'movesect', 'move.png', 'move_f2.png', T_('Move') );
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'copy', 'copy.png', 'copy_f2.png', 'Copy' );
+		mosMenuBar::customX( 'copy', 'copy.png', 'copy_f2.png', T_('Copy') );
 		mosMenuBar::spacer();
 		mosMenuBar::archiveList();
 		mosMenuBar::spacer();
 		mosMenuBar::trash();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.content.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_content/toolbar.content.php 4.6rc2/administrator/components/com_content/toolbar.content.php
--- 4.5.4/administrator/components/com_content/toolbar.content.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_content/toolbar.content.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.content.php,v 1.1 2005/07/22 01:52:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_frontpage/admin.frontpage.html.php 4.6rc2/administrator/components/com_frontpage/admin.frontpage.html.php
--- 4.5.4/administrator/components/com_frontpage/admin.frontpage.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_frontpage/admin.frontpage.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.frontpage.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
 class HTML_content {
 	/**
 	* Writes a list of the content items
@@ -29,7 +27,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="frontpage" rowspan="2">
-			Frontpage Manager
+			<?php echo T_('Frontpage Manager') ?>
 			</th>
 			<td width="right">
 			<?php echo $lists['sectionid'];?>
@@ -43,7 +41,7 @@
 		</tr>
 		<tr>
 			<td align="right" colspan="2">
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -60,31 +58,31 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th class="title">
-			Title
+			<?php echo T_('Title') ?>
 			</th>
 			<th width="10%" nowrap="nowrap">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th colspan="2" nowrap="nowrap" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th width="8%" nowrap="nowrap">
-			Access
+			<?php echo T_('Access') ?>
 			</th>
 			<th width="10%" align="left">
-			Section
+			<?php echo T_('Section') ?>
 			</th>
 			<th width="10%" align="left">
-			Category
+			<?php echo T_('Category') ?>
 			</th>
 			<th width="10%" align="left">
-			Author
+			<?php echo T_('Author') ?>
 			</th>
 		</tr>
 		<?php
@@ -100,31 +98,31 @@
 			$now = date( "Y-m-d H:i:s" );
 			if ( $now <= $row->publish_up && $row->state == "1" ) {
 				$img = 'publish_y.png';
-				$alt = 'Published';
+				$alt = T_('Published');
 			} else if ( ( $now <= $row->publish_down || $row->publish_down == "0000-00-00 00:00:00" ) && $row->state == "1" ) {
 				$img = 'publish_g.png';
-				$alt = 'Published';
+				$alt = T_('Published');
 			} else if ( $now > $row->publish_down && $row->state == "1" ) {
 				$img = 'publish_r.png';
-				$alt = 'Expired';
+				$alt = T_('Expired');
 			} elseif ( $row->state == "0" ) {
 				$img = "publish_x.png";
-				$alt = 'Unpublished';
+				$alt = T_('Unpublished');
 			}
 
 			$times = '';
 		    if ( isset( $row->publish_up ) ) {
 				  if ( $row->publish_up == '0000-00-00 00:00:00' ) {
-						$times .= '<tr><td>Start: Always</td></tr>';
+						$times .= '<tr><td>'.T_('Start:').' '.T_('Always').'</td></tr>';
 				  } else {
-						$times .= '<tr><td>Start: '. $row->publish_up .'</td></tr>';
+						$times .= '<tr><td>'.T_('Start:').' '. $row->publish_up .'</td></tr>';
 				  }
 		    }
 		    if ( isset( $row->publish_down ) ) {
 				  if ( $row->publish_down == '0000-00-00 00:00:00' ) {
-						$times .= '<tr><td>Finish: No Expiry</td></tr>';
+						$times .= '<tr><td>'.T_('Finish:').' '.T_('No Expiry').'</td></tr>';
 				  } else {
-				  $times .= '<tr><td>Finish: '. $row->publish_down .'</td></tr>';
+				  $times .= '<tr><td>'.T_('Finish:').' '. $row->publish_down .'</td></tr>';
 				  }
 		    }
 
@@ -136,7 +134,7 @@
 					$author = $row->created_by_alias;
 				} else {
 					$linkA 	= 'index2.php?option=com_users&task=editA&hidemainmenu=1&id='. $row->created_by;
-					$author = '<a href="'. $linkA .'" title="Edit User">'. $row->author .'</a>';
+					$author = '<a href="'. $linkA .'" title="'.T_('Edit User').'">'. $row->author .'</a>';
 				}
 			} else {
 				if ( $row->created_by_alias ) {
@@ -159,7 +157,7 @@
 					echo $row->title;
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Content">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Content') ?>">
 					<?php echo $row->title; ?>
 					</a>
 					<?php
@@ -170,7 +168,7 @@
 				if ( $times ) {
 					?>
 					<td align="center">
-					<a href="javascript: void(0);" onmouseover="return overlib('<table><?php echo $times; ?></table>', CAPTION, 'Publish Information', BELOW, RIGHT);" onMouseOut="return nd();" onclick="return listItemTask('cb<?php echo $i;?>','<?php echo $row->state ? "unpublish" : "publish";?>')">
+					<a href="javascript: void(0);" onmouseover="return overlib('<table><?php echo $times; ?></table>', CAPTION, '<?php echo T_('Publish Information') ?>', BELOW, RIGHT);" onMouseOut="return nd();" onclick="return listItemTask('cb<?php echo $i;?>','<?php echo $row->state ? "unpublish" : "publish";?>')">
 					<img src="images/<?php echo $img;?>" width="12" height="12" border="0" alt="<?php echo $alt;?>" />
 					</a>
 					</td>
@@ -190,12 +188,12 @@
 				<?php echo $access;?>
 				</td>
 				<td>
-				<a href="<?php echo $row->sect_link; ?>" title="Edit Section">
+				<a href="<?php echo $row->sect_link; ?>" title="<?php echo T_('Edit Section') ?>">
 				<?php echo $row->sect_name; ?>
 				</a>
 				</td>
 				<td>
-				<a href="<?php echo $row->cat_link; ?>" title="Edit Category">
+				<a href="<?php echo $row->cat_link; ?>" title="<?php echo T_('Edit Category') ?>">
 				<?php echo $row->name; ?>
 				</a>
 				</td>
diff -ruN 4.5.4/administrator/components/com_frontpage/admin.frontpage.php 4.6rc2/administrator/components/com_frontpage/admin.frontpage.php
--- 4.5.4/administrator/components/com_frontpage/admin.frontpage.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_frontpage/admin.frontpage.php	2006-05-13 01:03:27.000000000 -0500
@@ -1,20 +1,23 @@
 <?php
 /**
-* @version $Id: admin.frontpage.php,v 1.1 2005/07/22 01:52:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
 
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
 		| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_frontpage' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 // call
@@ -148,7 +151,7 @@
 	. "\n INNER JOIN #__sections AS s ON s.id=cc.section "
 	. "\n ORDER BY s.ordering, cc.ordering"
 	;
-	$categories[] = mosHTML::makeOption( '0', _SEL_CATEGORY );
+	$categories[] = mosHTML::makeOption( '0', T_('- All Categories -'));
 	$database->setQuery( $query );
 	$categories = array_merge( $categories, $database->loadObjectList() );
 	$lists['catid'] = mosHTML::selectList( $categories, 'catid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $catid );
@@ -167,9 +170,9 @@
 	. "\n GROUP BY u.name"
 	. "\n ORDER BY u.name"
 	;
-	$authors[] = mosHTML::makeOption( '0', _SEL_AUTHOR );
+	$authors[] = mosHTML::makeOption( '0', T_('- All Authors -') );
 	$database->setQuery( $query );
-	$authors = array_merge( $authors, $database->loadObjectList() );
+	$authors = array_merge( $authors, (array)$database->loadObjectList() );
 	$lists['authorid']	= mosHTML::selectList( $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_authorid );
 
 	HTML_content::showList( $rows, $search, $pageNav, $option, $lists );
@@ -184,8 +187,8 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		$action = $publish == 1 ? 'publish' : ($publish == -1 ? 'archive' : 'unpublish');
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
+		$action = $publish == 1 ? T_('publish') : ($publish == -1 ? T_('archive') : T_('unpublish'));
+		echo "<script> alert('".sprintf(T_('Select an item to %a'),$action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -212,7 +215,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 	$fp = new mosFrontPage( $database );
@@ -290,7 +293,7 @@
 		$row->updateOrder();
 	}
 
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_frontpage', $msg );
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_frontpage/frontpage.xml 4.6rc2/administrator/components/com_frontpage/frontpage.xml
--- 4.5.4/administrator/components/com_frontpage/frontpage.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_frontpage/frontpage.xml	2006-03-01 13:18:50.000000000 -0600
@@ -2,10 +2,10 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Frontpage</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component shows all the published content items from your site marked Show on Frontpage.</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_frontpage/toolbar.frontpage.html.php 4.6rc2/administrator/components/com_frontpage/toolbar.frontpage.html.php
--- 4.5.4/administrator/components/com_frontpage/toolbar.frontpage.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_frontpage/toolbar.frontpage.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.frontpage.html.php,v 1.1 2005/07/22 01:52:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
 class TOOLBAR_FrontPage {
 	function _DEFAULT() {
 		mosMenuBar::startTable();
@@ -24,9 +22,9 @@
 		mosMenuBar::spacer();
 		mosMenuBar::archiveList();
 		mosMenuBar::spacer();
-		mosMenuBar::custom('remove','delete.png','delete_f2.png','Remove', true);
+		mosMenuBar::custom('remove','delete.png','delete_f2.png',T_('Remove'), true);
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.frontpage' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_frontpage/toolbar.frontpage.php 4.6rc2/administrator/components/com_frontpage/toolbar.frontpage.php
--- 4.5.4/administrator/components/com_frontpage/toolbar.frontpage.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_frontpage/toolbar.frontpage.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.frontpage.php,v 1.1 2005/07/22 01:52:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_installer/admin.installer.html.php 4.6rc2/administrator/components/com_installer/admin.installer.html.php
--- 4.5.4/administrator/components/com_installer/admin.installer.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/admin.installer.html.php	2006-02-24 10:46:13.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.installer.html.php,v 1.1 2005/07/22 01:52:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -15,7 +17,7 @@
 	echo '<tr>';
 	echo '<td class="item">' . $folder . '/</td>';
 	echo '<td align="left">';
-	echo is_writable( $GLOBALS['mosConfig_absolute_path'] . '/' . $folder ) ? '<b><font color="green">Writeable</font></b>' : '<b><font color="red">Unwriteable</font></b>' . '</td>';
+	echo is_writable( $GLOBALS['mosConfig_absolute_path'] . '/' . $folder ) ? '<b><span class="green">'.T_('Writeable').'</span></b>' : '<b><span class="red">'.T_('Unwriteable').'</span></b>' . '</td>';
 	echo '</tr>';
 }
 
@@ -32,7 +34,7 @@
 	
 			// do field validation
 			if (form.userfile.value == ""){
-				alert( "Please select a directory" );
+				alert( "<?php echo T_('Please select a directory') ?>" );
 			} else {
 				form.submit();
 			}
@@ -53,14 +55,14 @@
 		<table class="adminform">
 		<tr>
 			<th>
-			Upload Package File
+			<?php echo T_('Upload Package File') ?>
 			</th>
 		</tr>
 		<tr>
 			<td align="left">
-			Package File:
+			<?php echo T_('Package File:')?>
 			<input class="text_area" name="userfile" type="file" size="70"/>
-			<input class="button" type="submit" value="Upload File &amp; Install" />
+			<input class="button" type="submit" value="<?php echo T_('Upload File &amp; Install')?>" />
 			</td>
 		</tr>
 		</table>
@@ -71,19 +73,23 @@
 		<input type="hidden" name="client" value="<?php echo $client;?>"/>
 		</form>
 		<br />
+
+		<?php
+		if (ini_get('allow_url_fopen')) HTML_installer::showUrlForm('http://', $option, $element, $client);
+		?>
 		
-		<form enctype="multipart/form-data" action="index2.php" method="post" name="adminForm_dir">
+		<form action="index2.php" method="post" name="adminForm_dir">
 		<table class="adminform">
 		<tr>
 			<th>
-			Install from directory
+			<?php echo T_('Install from directory')?>
 			</th>
 		</tr>
 		<tr>
 			<td align="left">
-			Install directory:&nbsp;
+			<?php echo T_('Install directory:')?>&nbsp;
 			<input type="text" name="userfile" class="text_area" size="65" value="<?php echo $p_startdir; ?>"/>&nbsp;
-			<input type="button" class="button" value="Install" onclick="submitbutton3()" />
+			<input type="button" class="button" value="<?php echo T_('Install')?>" onclick="submitbutton3()" />
 			</td>
 		</tr>
 		</table>
@@ -93,17 +99,52 @@
 		<input type="hidden" name="element" value="<?php echo $element;?>"/>
 		<input type="hidden" name="client" value="<?php echo $client;?>"/>
 		</form>
+		<br />
+		<?php
+	}
+	
+	function showUrlForm ($prompt, $option, $element, $client) {
+		?>
+		<form action="index2.php" method="post" name="adminForm_url">
+		<table class="adminform">
+		<tr>
+			<th>
+			<?php echo T_('Install from HTTP URL')?>
+			</th>
+		</tr>
+		<tr>
+			<td align="left">
+			<?php echo T_('Install HTTP URL:')?>&nbsp;
+			<input type="text" name="userurl" class="text_area" size="65" value="<?php echo $prompt; ?>" />&nbsp;
+			<input type="submit" class="button" value="<?php echo T_('Upload URL &amp; Install')?>" />
+			</td>
+		</tr>
+		</table>
+
+		<input type="hidden" name="task" value="installfromurl" />
+		<input type="hidden" name="option" value="<?php echo $option;?>"/>
+		<input type="hidden" name="element" value="<?php echo $element;?>"/>
+		<input type="hidden" name="client" value="<?php echo $client;?>"/>
+		</form>
+		<br />
 		<?php
 	}
 	
+	function theSourceForm ($option, $element, $client) {
+	    HTML_installer::showUrlForm('', $option, $element, $client);
+	    echo '<object type="text/html" data="http://source.mambo-foundation.org/component/syndstyle/option,com_remository/" width="500" height="1000">'
+	        .T_('Sorry, it seems that The Source is not available').'</object>';
+	}
+	
 	/**
 	* @param string
 	* @param string
 	* @param string
 	* @param string
 	*/
-	function showInstallMessage( $message, $title, $url ) {
+	function showInstallMessage ($messages, $title, $return) {
 		global $PHP_SELF;
+		if (!$return) $return = mamboCore::get('mosConfig_live_site').'/administrator/index2.php';
 		?>
 		<table class="adminheading">
 		<tr>
@@ -114,18 +155,43 @@
 		</table>
 		
 		<table class="adminform">
-		<tr>
-			<td align="left">
-			<strong><?php echo $message; ?></strong>
-			</td>
+		<?php
+		if (!is_array($messages)) $messages = array($messages);
+		foreach ($messages as $message) {
+			switch ($message->level) {
+				case _MOS_ERROR_INFORM:
+				$colour = 'green';
+				$level = 'Information: ';
+				break;
+				case _MOS_ERROR_WARN:
+				$colour = 'red';
+				$level = 'Warning: ';
+				break;
+				case _MOS_ERROR_SEVERE:
+				$colour = 'red';
+				$level = 'Severe: ';
+				break;
+				case _MOS_ERROR_FATAL:
+				$colour = 'red';
+				$level = 'Fatal: ';
+				break;
+			}
+			?>
+			<tr>
+				<td align="left">
+				<span class="<?php echo $colour; ?>"><strong><?php echo $level.$message->text; ?></strong></span>
+				</td>
 		</tr>
+		<?php
+		}
+		?>
 		<tr>
 			<td colspan="2" align="center">
-			[&nbsp;<a href="<?php echo $url;?>" style="font-size: 16px; font-weight: bold">Continue ...</a>&nbsp;]
+			[&nbsp;<a href="<?php echo $return;?>" style="font-size: 16px; font-weight: bold"><?php echo T_('Continue ...')?></a>&nbsp;]
 			</td>
 		</tr>
 		</table>
 		<?php
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_installer/admin.installer.php 4.6rc2/administrator/components/com_installer/admin.installer.php
--- 4.5.4/administrator/components/com_installer/admin.installer.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/admin.installer.php	2006-05-16 23:54:20.000000000 -0500
@@ -1,41 +1,42 @@
 <?php
 /**
-* @version $Id: admin.installer.php,v 1.1 2005/07/22 01:52:25 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+defined( '_VALID_MOS' ) or die( T_('Direct Access to this location is not allowed.') );
 
-// XML library
-require_once( $mosConfig_absolute_path . '/includes/domit/xml_domit_lite_include.php' );
 require_once( $mainframe->getPath( 'admin_html' ) );
 require_once( $mainframe->getPath( 'class' ) );
 
 $element 	= mosGetParam( $_REQUEST, 'element', '' );
 $client 	= mosGetParam( $_REQUEST, 'client', '' );
-$path 		= $mosConfig_absolute_path . "/administrator/components/com_installer/$element/$element.php";
-
 // ensure user has access to this function
-if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+if (!$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 // map the element to the required derived class
 $classMap = array(
-    'component' => 'mosInstallerComponent',
-    'language' => 'mosInstallerLanguage',
-    'mambot' => 'mosInstallerMambot',
-    'module' => 'mosInstallerModule',
-    'template' => 'mosInstallerTemplate'
+	'universal' => 'mosInstaller',
+    'component' => 'mosInstaller',
+    'language' => 'mosInstaller',
+    'mambot' => 'mosInstaller',
+    'module' => 'mosInstaller',
+    'template' => 'mosInstaller',
+    'include' => 'mosInstaller',
+    'parameters' => 'mosInstaller'
 );
 
 if (array_key_exists ( $element, $classMap )) {
-	require_once( $mainframe->getPath( 'installer_class', $element ) );
+//	require_once( $mainframe->getPath( 'installer_class', $element ) );
 
 	switch ($task) {
 
@@ -46,9 +47,26 @@
 		case 'installfromdir':
 			installFromDirectory( $classMap[$element], $option, $element, $client );
 			break;
+		
+		case 'installfromurl':
+		    installFromUrl ($classMap[$element], $option, $element, $client);
+		    break;
+		    
+		case 'thesource':
+		    HTML_installer::theSourceForm($option, $element, $client);
+		    break;
 
 		case 'remove':
-		    removeElement( $classMap[$element], $option, $element, $client );
+		    $uninstaller = $element.'_uninstall';
+		    if (is_callable($uninstaller)) {
+				$cid = mosGetParam($_REQUEST, 'cid', array(0));
+				if (is_array($cid) AND isset($cid[0])) {
+				    $uninstaller ($cid[0], $option, $client);
+				    exit ();
+				}
+				mosRedirect(returnTo($option, $element, $client), T_('There was nothing selected to be uninstalled') );
+			}
+		    else mosRedirect(returnTo($option, $element, $client), T_('Uninstaller not found for element [%s]') );
 			break;
 
 		default:
@@ -57,12 +75,25 @@
 			if (file_exists( $path )) {
 				require $path;
 			} else {
-				echo "Installer not found for element [$element]";
+				echo sprintf(T_('Installer not found for element [%s]'), $element);
 			}
 		    break;
 	}
-} else {
-	echo "Installer not available for element [$element]";
+}
+else {
+	echo sprintf(T_('Installer not available for element [%s]'), $element);
+}
+
+
+function returnTo ($option, $element, $client) {
+	switch ($element) {
+		case 'template':
+			return "index2.php?option=com_templates&client=$client";
+		case 'language':
+			return "index2.php?option=com_languages";
+		default:
+			return "index2.php?option=$option&element=$element";
+	}
 }
 
 /**
@@ -73,49 +104,44 @@
 function uploadPackage( $installerClass, $option, $element, $client ) {
 	global $mainframe;
 
-	$installer = new $installerClass();
-
 	// Check if file uploads are enabled
 	if (!(bool)ini_get('file_uploads')) {
-		HTML_installer::showInstallMessage( "The installer can't continue before file uploads are enabled. Please use the install from directory method.",
-			'Installer - Error', $installer->returnTo( $option, $element, $client ) );
+		$message = new mosError (T_('The installer can\'t continue before file uploads are enabled. Please use the install from directory method.'), _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo( $option, $element, $client ));
 		exit();
 	}
 
 	// Check that the zlib is available
 	if(!extension_loaded('zlib')) {
-		HTML_installer::showInstallMessage( "The installer can't continue before zlib is installed",
-			'Installer - Error', $installer->returnTo( $option, $element, $client ) );
+		$message = new mosError (T_('The installer can\'t continue before zlib is installed'), _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo( $option, $element, $client ));
 		exit();
 	}
 
 	$userfile = mosGetParam( $_FILES, 'userfile', null );
 
 	if (!$userfile) {
-		HTML_installer::showInstallMessage( 'No file selected', 'Upload new module - error',
-			$installer->returnTo( $option, $element, $client ));
+		$message = new mosError (T_('No file selected'), _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage($message, T_('Upload new module - error'), returnTo($option, $element, $client));
 		exit();
 	}
 
 	$userfile_name = $userfile['name'];
 
-	$msg = '';
-	$resultdir = uploadFile( $userfile['tmp_name'], $userfile['name'], $msg );
-
-	if ($resultdir !== false) {
-		if (!$installer->upload( $userfile['name'] )) {
-			HTML_installer::showInstallMessage( $installer->getError(), 'Upload '.$element.' - Upload Failed',
-				$installer->returnTo( $option, $element, $client ) );
+	if (uploadFile( $userfile['tmp_name'], $userfile['name'], $message )) {
+		$installer =& new $installerClass();
+		if (!$installer->extractArchive( $userfile['name'] )) {
+			$installer->cleanUpInstall();
+			HTML_installer::showInstallMessage( $installer->getErrors(), sprintf(T_('Upload %s - Upload Failed'), $element),
+				returnTo( $option, $element, $client ) );
 		}
 		$ret = $installer->install();
-
-		HTML_installer::showInstallMessage( $installer->getError(), 'Upload '.$element.' - '.($ret ? 'Success' : 'Failed'),
-			$installer->returnTo( $option, $element, $client ) );
-		cleanupInstall( $userfile['name'], $installer->unpackDir() );
-	} else {
-		HTML_installer::showInstallMessage( $msg, 'Upload '.$element.' -  Upload Error',
-			$installer->returnTo( $option, $element, $client ) );
+		$installer->cleanUpInstall();
+		HTML_installer::showInstallMessage( $installer->getErrors(), T_('Upload ').$element.' - '.($ret ? T_('Success') : T_('Failed')),
+			returnTo( $option, $element, $client ) );
 	}
+	else HTML_installer::showInstallMessage( $message, sprintf(T_('Upload %s -  Upload Error'), $element),
+			returnTo( $option, $element, $client ) );
 }
 
 /**
@@ -124,48 +150,64 @@
 */
 function installFromDirectory( $installerClass, $option, $element, $client ) {
 	$userfile = mosGetParam( $_REQUEST, 'userfile', '' );
-
 	if (!$userfile) {
-		mosRedirect( "index2.php?option=$option&element=module", "Please select a directory" );
+		mosRedirect( "index2.php?option=$option&element=module", T_('Please select a directory') );
 	}
-
-	$installer = new $installerClass();
-
 	$path = mosPathName( $userfile );
 	if (!is_dir( $path )) {
 		$path = dirname( $path );
 	}
-
+	$installer =& new $installerClass();
 	$ret = $installer->install( $path );
-	HTML_installer::showInstallMessage( $installer->getError(), 'Upload new '.$element.' - '.($ret ? 'Success' : 'Error'),
-		$installer->returnTo( $option, $element, $client ) );
+	$installer->cleanUpInstall();
+	HTML_installer::showInstallMessage( $installer->getErrors(), T_('Install new ').$element.' - '.($ret ? T_('Success') : T_('Error')),
+		returnTo( $option, $element, $client ) );
 }
 /**
-*
-* @param
+* Install a template from an HTTP URL
+* @param string The URL option
 */
-function removeElement( $installerClass, $option, $element, $client ) {
-	$cid = mosGetParam( $_REQUEST, 'cid', array(0) );
-	if (!is_array( $cid )) {
-	    $cid = array(0);
+function installFromUrl( $installerClass, $option, $element, $client ) {
+	// Check that the zlib is available
+	if(!extension_loaded('zlib')) {
+		$message = new mosError (T_('The installer can\'t continue before zlib is installed'), _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage($message, 'Installer - Error', returnTo( $option, $element, $client ));
+		exit();
 	}
-
-	$installer = new $installerClass();
-	$result = false;
-	if ($cid[0]) {
-	    $result = $installer->uninstall( $cid[0], $option, $client );
+	$userurl = mosGetParam( $_REQUEST, 'userurl', '' );
+	if (!$userurl) {
+		$message = new mosError (T_('Please select an HTTP URL'), _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo($option, $element, $client));
+	}
+	$url_data = parse_url($userurl);
+	if (isset($url_data['path'])) $userfilename = basename($url_data['path']);
+	else $userfilename = '';
+	if (!$userfilename) {
+		$message = new mosError (T_('The URL did not define a file name'), _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage($message, T_('Installer - Error'), returnTo($option, $element, $client));
+	}
+	if (uploadUrl($userurl, $userfilename, $message )) {
+		$installer = new $installerClass();
+		if (!$installer->extractArchive($userfilename)) {
+			$installer->cleanUpInstall();
+			HTML_installer::showInstallMessage( $installer->getErrors(), T_('Upload ').$element.' - '.T_('Failed'),
+				returnTo( $option, $element, $client ) );
+		}
+		$ret = $installer->install();
+		$installer->cleanUpInstall();
+		HTML_installer::showInstallMessage( $installer->getErrors(), T_('Upload ').$element.' - '.($ret ? T_('Success') : T_('Failed')),
+			returnTo( $option, $element, $client ) );
+	} else {
+		HTML_installer::showInstallMessage( $message, T_('Upload ').$element.' - '.T_('Error'),
+			returnTo( $option, $element, $client ) );
 	}
-
-	$msg = $installer->getError();
-
-	mosRedirect( $installer->returnTo( $option, $element, $client ), $result ? 'Success ' . $msg : 'Failed ' . $msg );
 }
 /**
 * @param string The name of the php (temporary) uploaded file
 * @param string The name of the file to put in the temp directory
 * @param string The message to return
 */
-function uploadFile( $filename, $userfile_name, &$msg ) {
+function uploadFile( $filename, $userfile_name, &$error ) {
 	global $mosConfig_absolute_path;
 	$baseDir = mosPathName( $mosConfig_absolute_path . '/media' );
 
@@ -175,17 +217,227 @@
 			    if (mosChmod( $baseDir . $userfile_name )) {
 			        return true;
 				} else {
-					$msg = 'Failed to change the permissions of the uploaded file.';
+					$msg = T_('Failed to change the permissions of the uploaded file.');
 				}
 			} else {
-				$msg = 'Failed to move uploaded file to <code>/media</code> directory.';
+				$msg = T_('Failed to move uploaded file to <code>/media</code> directory.');
 			}
 		} else {
-		    $msg = 'Upload failed as <code>/media</code> directory is not writable.';
+		    $msg = T_('Upload failed as <code>/media</code> directory is not writable.');
 		}
 	} else {
-	    $msg = 'Upload failed as <code>/media</code> directory does not exist.';
+	    $msg = T_('Upload failed as <code>/media</code> directory does not exist.');
+	}
+	$error = new mosError ($msg, _MOS_ERROR_FATAL);
+	return false;
+}
+/**
+* @param string The name of the php (temporary) uploaded file
+* @param string The name of the file to put in the temp directory
+* @param string The message to return
+*/
+function uploadUrl( $userurl, $userfilename, &$error ) {
+	global $mosConfig_absolute_path;
+	$baseDir = mosPathName( $mosConfig_absolute_path . '/media' );
+	if (file_exists( $baseDir )) {
+		if (is_writable( $baseDir )) {
+			if ($fpin = fopen($userurl, 'rb') AND is_resource($fpin)) {
+			    if ($fpout = fopen($baseDir.$userfilename, 'wb') AND is_resource($fpout)) {
+			        while (!feof($fpin)) {
+			            $data = fgets($fpin, 1024);
+			            fwrite($fpout, $data);
+			        }
+					fclose($fpout);
+					fclose($fpin);
+				    if (mosChmod( $baseDir.$userfilename )) return true;
+					else $msg = T_('Failed to change the permissions of the uploaded file.');
+				}
+				else $msg = T_('Failed to open the local file from the URL.');
+			}
+			else $msg = T_('Failed to open the specified URL.');
+		}
+		else $msg = T_('Upload failed as <code>/media</code> directory is not writable.');
 	}
+	else $msg = T_('Upload failed as <code>/media</code> directory does not exist.');
+	$error = new mosError ($msg, _MOS_ERROR_FATAL);
 	return false;
 }
-?>
\ No newline at end of file
+
+	/**
+	* Component uninstall method
+	* @param int The id of the module
+	* @param string The URL option
+	* @param int The client id
+	*/
+	function component_uninstall( $cid, $option, $client=0 ) {
+		$database =& mamboDatabase::getInstance();
+		$sql = "SELECT * FROM #__components WHERE id=$cid";
+		$database->setQuery($sql);
+		if (!$database->loadObject( $row )) {
+			$message = new mosError ($database->stderr(true), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), "index2.php?option=$option&element=component");
+			exit();
+		}
+		if ($row->iscore) {
+			$message = new mosError (sprintf(T_('Component %s is a core component, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it'), $row->name), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, 'Uninstall -  error', "index2.php?option=$option&element=component");
+			exit();
+		}
+		// Try to find the XML file
+		$here = mosPathName( mamboCore::get('mosConfig_absolute_path').'/administrator/components/'.$row->option );
+		$filesindir = mosReadDirectory($here, '.xml$');
+		if (count($filesindir) > 0) {
+			$allerrors = new mosErrorSet();
+			foreach ($filesindir as $file) {
+				$parser =& new mosUninstallXML ($here.$file);
+				$parser->uninstall();
+				$allerrors->mergeAnother($parser->errors);
+			}
+	  		$ret = ($allerrors->getMaxLevel() < _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage( $allerrors->getErrors(), T_('Uninstall component - ').($ret ? T_('Success') : T_('Error')),
+				returnTo( $option, 'component', $client ) );
+		}
+		else {
+		    $com_name = $row->option;
+			$dir = new mosDirectory(mosPathName(mamboCore::get('mosConfig_absolute_path').'/components/'.$com_name));
+			$dir->deleteAll();
+			$dir = new mosDirectory(mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/components/'.$com_name));
+			$dir->deleteAll();
+			$sql = "DELETE FROM #__components WHERE `option`='$com_name'";
+			$database->setQuery($sql);
+			$database->query();
+			$message = new mosError (T_('Uninstaller could not find XML file, but cleaned database'), _MOS_ERROR_WARN);
+			HTML_installer::showInstallMessage($message, T_('Uninstall ').T_('component - ').T_('Success'), returnTo($option, 'component', $client));
+		}
+		exit();
+	}
+
+	/**
+	* Module uninstall method
+	* @param int The id of the module
+	* @param string The URL option
+	* @param int The client id
+	*/
+	function module_uninstall( $id, $option, $client=0 ) {
+		$database =& mamboDatabase::getInstance();
+		$mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+		$query = "SELECT module, iscore, client_id FROM #__modules WHERE id = '$id'";
+		$database->setQuery( $query );
+		$database->loadObject( $row );
+		if ($row->iscore) {
+			$message = new mosError (sprintf(T_('%s is a core module, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it'), $row->title), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, 'Uninstall -  error', returnTo( $option, 'module', $row->client_id ? '' : 'admin' ) );
+			exit();
+		}
+		$query = "DELETE FROM #__modules_menu WHERE moduleid=$id";
+		$database->setQuery( $query );
+		if (!$database->query()) {
+		    $msg = $database->stderr;
+		    die( $msg );
+		}
+		if ( $row->client_id ) $basepath = $mosConfig_absolute_path . '/administrator/modules/';
+		else $basepath = $mosConfig_absolute_path . '/modules/';
+  		$xmlfile = $basepath . $row->module . '.xml';
+  		$parser =& new mosUninstallXML ($xmlfile);
+  		$parser->uninstall();
+  		$ret = ($parser->errors->getMaxLevel() < _MOS_ERROR_FATAL);
+		HTML_installer::showInstallMessage( $parser->errors->getErrors(), T_('Uninstall module - ').($ret ? T_('Success') : T_('Error')),
+			returnTo( $option, 'module', $client ) );
+  		exit ();
+	}
+
+	/**
+	* Mambot install method
+	* @param int The id of the module
+	* @param string The URL option
+	* @param int The client id
+	*/
+	function mambot_uninstall( $id, $option, $client=0 ) {
+		$database =& mamboDatabase::getInstance();
+		$mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+		$database->setQuery( "SELECT name, folder, element, iscore FROM #__mambots WHERE id = $id" );
+		$database->loadObject( $row );
+		if ($database->getErrorNum()) {
+			$message = new mosError ($database->stderr(), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, T_('Uninstall -  error'),
+			returnTo( $option, 'mambot', $client ) );
+			exit();
+		}
+		if ($row == null) {
+			$message = new mosError (T_('Invalid object id'), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), returnTo($option, 'mambot', $client));
+			exit();
+		}
+		if (trim( $row->folder ) == '') {
+			$message = new mosError (T_('Folder field empty, cannot remove files'), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), returnTo($option, 'mambot', $client));
+			exit();
+		}
+		$xmlfile = $mosConfig_absolute_path.'/mambots/'.$row->folder.'/'.$row->element.'.xml';
+		if (file_exists($xmlfile)) {
+			$parser =& new mosUninstallXML ($xmlfile);
+			$ret = $parser->uninstall();
+			$showerrors = $parser->getErrors();
+		}
+		else {
+			$database->setQuery("DELETE FROM #__mambots WHERE id = $id");
+			$ret = $database->query();
+			$showerrors = new mosError (T_('Uninstaller did its best with no XML file present'), _MOS_ERROR_WARN);
+		}
+		HTML_installer::showInstallMessage( $showerrors, T_('Uninstall mambot - ').($ret ? T_('Success') : T_('Error')),
+			returnTo( $option, 'mambot', $client ) );
+		exit ();
+	}
+
+	/**
+	* Template uninstall method
+	* @param int The id of the module
+	* @param string The URL option
+	* @param int The client id
+	*/
+	function template_uninstall( $id, $option, $client=0 ) {
+		$id = str_replace( array( '\\', '/' ), '', $id );
+		$mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+		// Find if normal or admin template and delete corresponding files & directories
+		if ($client=='admin') {
+			$basepath = mamboCore::get('mosConfig_absolute_path').'/administrator/templates/' . $id; 
+		}
+		else {
+			$basepath = mamboCore::get('mosConfig_absolute_path').'/templates/' . $id; 
+		}
+		//Use $basepath to remove the template files and directory	
+		$tdir = new mosDirectory($basepath);
+		$tdir->deleteAll();
+
+		$message = new mosError (T_('Uninstall template - '), _MOS_ERROR_INFORM);
+		HTML_installer::showInstallMessage($message, T_('Success'), returnTo($option, 'template', $client));
+	    exit ();
+	}
+
+	/**
+	* Language uninstall method
+	* @param int The id of the module
+	* @param string The URL option
+	* @param int The client id
+	*/
+	function language_uninstall( $id, $option, $client=0 ) {
+		$id = str_replace( array( '\\', '/' ), '', $id );
+		$basepath = mamboCore::get('mosConfig_absolute_path').'/language/';
+		$xmlfile = $basepath . $id . '.xml';
+		// see if there is an xml install file, must be same name as element
+		if (file_exists( $xmlfile )) {
+			$parser =& new mosUninstallXML ($xmlfile);
+			$parser->uninstall();
+	  		$ret = ($parser->errors->getMaxLevel() < _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage( $parser->errors->getErrors(), T_('Uninstall language - ').($ret ? T_('Success') : T_('Error')),
+				returnTo( $option, 'language', $client ) );
+		}
+		else {
+			$message = new mosError (T_('Language id empty, cannot remove files'), _MOS_ERROR_FATAL);
+			HTML_installer::showInstallMessage($message, T_('Uninstall -  error'), "index2.php?option=com_languages");
+		}
+		exit();
+	}
+
+
+?>
diff -ruN 4.5.4/administrator/components/com_installer/component/component.class.php 4.6rc2/administrator/components/com_installer/component/component.class.php
--- 4.5.4/administrator/components/com_installer/component/component.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/component/component.class.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,340 +0,0 @@
-<?php
-/**
-* @version $Id: component.class.php,v 1.1 2005/07/22 01:52:30 eddieajau Exp $
-* @package Mambo
-* @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* Component installer
-* @package Mambo
-* @subpackage Installer
-*/
-class mosInstallerComponent extends mosInstaller {
-	var $i_componentadmindir = "";
-	var $i_hasinstallfile = false;
-	var $i_installfile = "";
-
-	function componentAdminDir($p_dirname = null) {
-		if(!is_null($p_dirname)) {
-			$this->i_componentadmindir = mosPathName($p_dirname);
-		}
-		return $this->i_componentadmindir;
-	}
-
-	/**
-	* Custom install method
-	* @param boolean True if installing from directory
-	*/
-	function install($p_fromdir = null) {
-		global $mosConfig_absolute_path,$database;
-
-		if (!$this->preInstallCheck( $p_fromdir, 'component' )) {
-			return false;
-		}
-
-		// aje moved down to here. ??  seemed to be some referencing problems
-		$xml = $this->xmlDoc();
-
-		// Set some vars
-		$e = &$xml->getElementsByPath('name', 1);
-		$this->elementName($e->getText());
-		$this->elementDir( mosPathName( $mosConfig_absolute_path . "/components/"
-			. strtolower("com_" . str_replace(" ","",$this->elementName())) . "/" )
-		);
-		$this->componentAdminDir( mosPathName( $mosConfig_absolute_path . "/administrator/components/"
-			. strtolower( "com_" . str_replace( " ","",$this->elementName() ) ) )
-		);
-
-    if (file_exists($this->elementDir())) {
-      $this->setError( 1, 'Another component is already using directory: "' . $this->elementDir() . '"' );
-			return false;
-    }
-
-		if(!file_exists($this->elementDir()) && !mosMakePath($this->elementDir())) {
-			$this->setError( 1, 'Failed to create directory "' . $this->elementDir() . '"' );
-			return false;
-		}
-
-		if(!file_exists($this->componentAdminDir()) && !mosMakePath($this->componentAdminDir())) {
-			$this->setError( 1, 'Failed to create directory "' . $this->componentAdminDir() . '"' );
-			return false;
-		}
-
-		// Find files to copy
-		if ($this->parseFiles( 'files' ) === false) {
-		    return false;
-		}
-		$this->parseFiles( 'images' );
-		$this->parseFiles( 'administration/files','','',1 );
-		$this->parseFiles( 'administration/images','','',1 );
-
-		// Are there any SQL queries??
-		$query_element = &$xml->getElementsByPath('install/queries', 1);
-		if (!is_null($query_element)) {
-			$queries = $query_element->childNodes;
-			foreach($queries as $query)
-			{
-				$database->setQuery( $query->getText());
-				if (!$database->query())
-				{
-					$this->setError( 1, "SQL Error " . $database->stderr( true ) );
-					return false;
-				}
-			}
-		}
-
-		// Is there an installfile
-		$installfile_elemet = &$xml->getElementsByPath('installfile', 1);
-
-		if (!is_null($installfile_elemet)) {
-	        // check if parse files has already copied the install.component.php file (error in 3rd party xml's!)
-	        if (!file_exists($this->componentAdminDir().$installfile_elemet->getText())) {
-	            if(!$this->copyFiles($this->installDir(), $this->componentAdminDir(), array($installfile_elemet->getText())))  			{
-	                $this->setError( 1, 'Could not copy PHP install file.' );
-	                return false;
-	            }
-	        }
-	        $this->hasInstallfile(true);
-	        $this->installFile($installfile_elemet->getText());
-		}
-		// Is there an uninstallfile
-		$uninstallfile_elemet = &$xml->getElementsByPath('uninstallfile',1);
-	    if(!is_null($uninstallfile_elemet)) {
-	        if (!file_exists($this->componentAdminDir().$uninstallfile_elemet->getText())) {
-	            if(!$this->copyFiles($this->installDir(), $this->componentAdminDir(), array($uninstallfile_elemet->getText()))) {
-	                $this->setError( 1, 'Could not copy PHP uninstall file' );
-	                return false;
-	            }
-	        }
-	    }
-
-		// Is the menues ?
-		$adminmenu_element = &$xml->getElementsByPath('administration/menu',1);
-		if(!is_null($adminmenu_element))
-		{
-			$adminsubmenu_element	= &$xml->getElementsByPath('administration/submenu',1);
-			$com_name				= strtolower("com_" . str_replace(" ","",$this->elementName()));
-			$com_admin_menuname		= $adminmenu_element->getText();
-
-			if(!is_null($adminsubmenu_element))
-			{
-				$com_admin_menu_id	= $this->createParentMenu($com_admin_menuname,$com_name);
-				if($com_admin_menu_id === false)
-				{
-					return false;
-				}
-				$com_admin_submenus = $adminsubmenu_element->childNodes;
-
-				$submenuordering = 0;
-				foreach($com_admin_submenus as $admin_submenu)
-				{
-					$com = new mosComponent( $database );
-					$com->name		= $admin_submenu->getText();
-					$com->link		= '';
-					$com->menuid	= 0;
-					$com->parent	= $com_admin_menu_id;
-					$com->iscore	= 0;
-
-					if ( $admin_submenu->getAttribute("act"))
-					{
-						$com->admin_menu_link = "option=$com_name&act=" . $admin_submenu->getAttribute("act");
-					}
-					else if ($admin_submenu->getAttribute("task"))
-					{
-						$com->admin_menu_link = "option=$com_name&task=" . $admin_submenu->getAttribute("task");
-					}
-					else if ($admin_submenu->getAttribute("link"))
-					{
-						$com->admin_menu_link = $admin_submenu->getAttribute("link");
-					}
-					else
-					{
-						$com->admin_menu_link = "option=$com_name";
-					}
-					$com->admin_menu_alt = $admin_submenu->getText();
-					$com->option = $com_name;
-					$com->ordering = $submenuordering++;
-					$com->admin_menu_img = "js/ThemeOffice/component.png";
-
-					if (!$com->store())
-					{
-						$this->setError( 1, $database->stderr( true ) );
-						return false;
-					}
-				}
-			}
-			else
-			{
-				$this->createParentMenu($com_admin_menuname,$com_name);
-			}
-		}
-
-		$desc= '';
-		if ($e = &$xml->getElementsByPath( 'description', 1 )) {
-			$desc = $this->elementName() . '<p>' . $e->getText() . '</p>';
-		}
-		$this->setError( 0, $desc );
-
-		if ($this->hasInstallfile()) {
-			if (is_file($this->componentAdminDir() . '/' . $this->installFile())) {
-				require_once($this->componentAdminDir() . "/" . $this->installFile());
-				$ret = com_install();
-				if ($ret != '') {
-					$this->setError( 0, $desc . $ret );
-				}
-			}
-		}
-		return $this->copySetupFile();
-	}
-
-	function createParentMenu($_menuname,$_comname, $_image = "js/ThemeOffice/component.png") {
-		global $database;
-		$db_name		= $_menuname;
-		$db_link		= "option=$_comname";
-		$db_menuid		= 0;
-		$db_parent		= 0;
-		$db_admin_menu_link	= "option=$_comname";
-		$db_admin_menu_alt	= $_menuname;
-		$db_option		= $_comname;
-		$db_ordering		= 0;
-		$db_admin_menu_img	= $_image;
-		$db_iscore		= 0;
-		$db_params		= '';
-
-		$sql = "INSERT INTO #__components ";
-		$sql .=" VALUES('','$db_name','$db_link','$db_menuid','$db_parent','$db_admin_menu_link','$db_admin_menu_alt','$db_option','$db_ordering','$db_admin_menu_img',$db_iscore,'')";
-		$database->setQuery($sql);
-		if(!$database->query())
-		{
-			$this->setError( 1, $database->stderr( true ) );
-			return false;
-		}
-		$menuid = $database->insertid();
-		return $menuid;
-	}
-	/**
-	* Custom install method
-	* @param int The id of the module
-	* @param string The URL option
-	* @param int The client id
-	*/
-	function uninstall( $cid, $option, $client=0 ) {
-		global $database,$mosConfig_absolute_path;
-
-		$uninstallret = "";
-
-		$sql = "SELECT * FROM #__components WHERE id=$cid";
-		$database->setQuery($sql);
-
-		$row = null;
-		if (!$database->loadObject( $row )) {
-			HTML_installer::showInstallMessage($database->stderr(true),'Uninstall -  error',
-				$this->returnTo( $option, 'component', $client ) );
-			exit();
-		}
-
-		if ($row->iscore) {
-			HTML_installer::showInstallMessage("Component $row->name is a core component, and can not be uninstalled.<br />You need to unpublish it if you don't want to use it", 'Uninstall -  error',
-				$this->returnTo( $option, 'component', $client ) );
-			exit();
-		}
-
-		// Delete entries in the DB
-		$sql = "DELETE FROM #__components WHERE parent=$row->id";
-		$database->setQuery($sql);
-		if (!$database->query()) {
-			HTML_installer::showInstallMessage($database->stderr(true),'Uninstall -  error',
-				$this->returnTo( $option, 'component', $client ) );
-			exit();
-		}
-
-		$sql = "DELETE FROM #__components WHERE id=$row->id";
-		$database->setQuery($sql);
-		if (!$database->query()) {
-			HTML_installer::showInstallMessage($database->stderr(true),'Uninstall -  error',
-				$this->returnTo( $option, 'component', $client ) );
-			exit();
-		}
-
-		// Try to find the uninstall file
-		$filesindir = mosReadDirectory( $mosConfig_absolute_path.'/administrator/components/'.$row->option, 'uninstall' );
-		if (count( $filesindir ) > 0) {
-			$uninstall_file = $filesindir[0];
-			if(file_exists($mosConfig_absolute_path.'/administrator/components/'.$row->option .'/'.$uninstall_file))
-			{
-				require_once($mosConfig_absolute_path.'/administrator/components/'.$row->option .'/'.$uninstall_file );
-				$uninstallret = com_uninstall();
-			}
-		}
-
-		// Try to find the XML file
-		$filesindir = mosReadDirectory( mosPathName( $mosConfig_absolute_path.'/administrator/components/'.$row->option ), '.xml$');
-		if (count($filesindir) > 0) {
-			$ismosinstall = false;
-			foreach ($filesindir as $file) {
-				$xmlDoc =& new DOMIT_Lite_Document();
-				$xmlDoc->resolveErrors( true );
-				if (!$xmlDoc->loadXML( $mosConfig_absolute_path."/administrator/components/".$row->option . "/" . $file, false, true )) {
-					return false;
-				}
-				$element = &$xmlDoc->documentElement;
-
-				if ($element->getTagName() != 'mosinstall') {
-					HTML_installer::showInstallMessage('XML File invalid','Uninstall -  error',
-						$this->returnTo( $option, 'component', $client ) );
-					exit();
-				}
-
-				$query_element = &$xmlDoc->getElementsbyPath( 'uninstall/queries', 1 );
-				if(!is_null($query_element))
-				{
-					$queries = $query_element->childNodes;
-					foreach($queries as $query)
-					{
-						$database->setQuery( $query->getText());
-						if (!$database->query())
-						{
-							HTML_installer::showInstallMessage($database->stderr(true),'Uninstall -  error',
-								$this->returnTo( $option, 'component', $client ) );
-							exit();
-						}
-					}
-				}
-			}
-		} else {
-		    /*
-			HTML_installer::showInstallMessage( 'Could not find XML Setup file in '.$mosConfig_absolute_path.'/administrator/components/'.$row->option,
-				'Uninstall -  error', $option, 'component' );
-			exit();
-			*/
-		}
-
-		// Delete directories
-
-		if (trim( $row->option )) {
-		    $result = 0;
-		    $path = mosPathName( $mosConfig_absolute_path.'/administrator/components/' . $row->option );
-		    if (is_dir( $path )) {
-		        $result |= deldir( $path );
-			}
-		    $path = mosPathName( $mosConfig_absolute_path.'/components/'.$row->option );
-		    if (is_dir( $path )) {
-		        $result |= deldir( $path );
-			}
-			return $result;
-		} else {
-			HTML_installer::showInstallMessage( 'Option field empty, cannot remove files', 'Uninstall -  error', $option,'component');
-			exit();
-		}
-
-		return $uninstallret;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_installer/component/component.html.php 4.6rc2/administrator/components/com_installer/component/component.html.php
--- 4.5.4/administrator/components/com_installer/component/component.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/component/component.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: component.html.php,v 1.1 2005/07/22 01:52:30 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Installer
-*/
 class HTML_component {
 /**
 * @param array An array of records
@@ -27,7 +25,7 @@
 			<table class="adminheading">
 			<tr>
 				<th class="install">
-				Installed Components
+				<?php echo T_('Installed Components') ?>
 				</th>
 			</tr>
 			</table>
@@ -35,25 +33,25 @@
 			<table class="adminlist">
 			<tr>
 				<th width="20%" class="title">
-				Currently Installed
+				<?php echo T_('Currently Installed') ?>
 				</th>
 				<th width="20%" class="title">
-				Component Menu Link
+				<?php echo T_('Component Menu Link') ?>
 				</th>
 				<th width="10%" align="left">
-				Author
+				<?php echo T_('Author') ?>
 				</th>
 				<th width="5%" align="center">
-				Version
+				<?php echo T_('Version') ?>
 				</th>
 				<th width="10%" align="center">
-				Date
+				<?php echo T_('Date') ?>
 				</th>
 				<th width="15%" align="left">
-				Author Email
+				<?php echo T_('Author Email') ?>
 				</th>
 				<th width="15%" align="left">
-				Author URL
+				<?php echo T_('Author URL') ?>
 				</th>
 			</tr>
 			<?php
@@ -93,7 +91,7 @@
 		} else {
 			?>
 			<td class="small">
-			There are no custom components installed
+			<?php echo T_('There are no custom components installed') ?>
 			</td>
 			<?php
 		}
diff -ruN 4.5.4/administrator/components/com_installer/component/component.php 4.6rc2/administrator/components/com_installer/component/component.php
--- 4.5.4/administrator/components/com_installer/component/component.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/component/component.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: component.php,v 1.1 2005/07/22 01:52:30 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -13,22 +15,11 @@
 
 // ensure user has access to this function
 if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'installer_html', 'component' ) );
 
-HTML_installer::showInstallForm( 'Install new Component', $option, 'component', '', dirname(__FILE__) );
-?>
-<table class="content">
-<?php
-writableCell( 'media' );
-writableCell( 'administrator/components' );
-writableCell( 'components' );
-writableCell( 'images/stories' );
-?>
-</table>
-<?php
 showInstalledComponents( $option );
 
 /**
@@ -45,56 +36,29 @@
 	$rows = $database->loadObjectList();
 
 	// Read the component dir to find components
-	$componentBaseDir	= mosPathName( $mosConfig_absolute_path . '/administrator/components' );
+	$componentBaseDir	= mosPathName($mosConfig_absolute_path.'/administrator/components');
 	$componentDirs = mosReadDirectory( $componentBaseDir );
 
 	$n = count( $rows );
 	for ($i = 0; $i < $n; $i++) {
 	    $row =& $rows[$i];
 
-		$dirName = $componentBaseDir . $row->option;
+		$dirName = mosPathName($componentBaseDir.$row->option);
 		$xmlFilesInDir = mosReadDirectory( $dirName, '.xml$' );
-
 		foreach ($xmlFilesInDir as $xmlfile) {
 			// Read the file to see if it's a valid component XML file
-			$xmlDoc =& new DOMIT_Lite_Document();
-			$xmlDoc->resolveErrors( true );
-
-			if (!$xmlDoc->loadXML( $dirName . '/' . $xmlfile, false, true )) {
-				continue;
-			}
-
-			$element = &$xmlDoc->documentElement;
-
-			if ($element->getTagName() != 'mosinstall') {
-				continue;
-			}
-			if ($element->getAttribute( "type" ) != "component") {
-				continue;
-			}
-
-			$element = &$xmlDoc->getElementsByPath('creationDate', 1);
-			$row->creationdate = $element ? $element->getText() : 'Unknown';
-
-			$element = &$xmlDoc->getElementsByPath('author', 1);
-			$row->author = $element ? $element->getText() : 'Unknown';
-
-			$element = &$xmlDoc->getElementsByPath('copyright', 1);
-			$row->copyright = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('authorEmail', 1);
-			$row->authorEmail = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('authorUrl', 1);
-			$row->authorUrl = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('version', 1);
-			$row->version = $element ? $element->getText() : '';
-
+			$parser =& new mosXMLDescription($dirName.$xmlfile);
+			if ($parser->getType() != 'component') continue;
+			$row->creationdate = $parser->getCreationDate('component');
+			$row->author = $parser->getAuthor('component');
+			$row->copyright = $parser->getCopyright('component');
+			$row->authorEmail = $parser->getAuthorEmail('component');
+			$row->authorUrl = $parser->getAuthorUrl('component');
+			$row->version = $parser->getVersion('component');
 			$row->mosname = strtolower( str_replace( " ", "_", $row->name ) );
 		}
 	}
 
 	HTML_component::showInstalledComponents( $rows, $option );
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_installer/installer.class.php 4.6rc2/administrator/components/com_installer/installer.class.php
--- 4.5.4/administrator/components/com_installer/installer.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/installer.class.php	2006-06-17 23:47:09.000000000 -0500
@@ -1,16 +1,638 @@
 <?php
 /**
-* @version $Id: installer.class.php,v 1.1 2005/07/22 01:52:29 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
+class mosCommonInstallXML extends mosXMLDescription {
+    var $type = '';
+    var $name = '';
+    var $special_attr = '';
+    var $group = '';
+    var $userdir = '';
+    var $admindir = '';
+    var $files = array();
+    var $rem_files = array();
+    var $images = array();
+    var $admin_files = array();
+    var $admin_images = array();
+    var $queryid = 0;
+    var $queries = array();
+    var $mainmenu = '';
+    var $subact = '';
+    var $submenus = array();
+    var $submenuordering = 0;
+    var $special_filetitle = '';
+    var $isspecial = false;
+    var $special_file = null;
+    var $installfile = '';
+    var $uninstallfile = '';
+    var $client = '';
+    var $media = array();
+    var $css = array();
+    var $language_attrs = '';
+
+    var $user_dir = '';
+    var $admin_dir = '';
+
+    function tagNestIs ($next, $last=null) {
+        if ($next == $this->opentags[1] AND ($last == null OR $last == $this->opentags[2])) return true;
+        else return false;
+    }
+
+    function element_mosinstall ($attrs) {
+        if (isset($attrs['TYPE'])) {
+            $this->type = $attrs['TYPE'];
+            $method = 'init_'.$attrs['TYPE'];
+            $setup = array (&$this, $method);
+            if (is_callable($setup)) $this->$method($attrs);
+            else $this->errors->addErrorDetails(sprintf(T_('XML error in %s: no handler %s'), $this->xmlfile, $method), _MOS_ERROR_FATAL);
+        }
+        else $this->errors->addErrorDetails(sprintf(T_('XML error in %s: mosinstall has no type'), $this->xmlfile), _MOS_ERROR_FATAL);
+    }
+
+    function end_element_mosinstall () {
+        if ($this->name = $this->getName($this->type));
+        elseif ($this->type != 'params') $this->errors->addErrorDetails(sprintf(T_('XML Error in %s: install has no name'), $this->xmlfile), _MOS_ERROR_FATAL);
+    }
+
+    function element_filename ($attrs) {
+        if ($this->type == 'language') $this->language_attrs = $attrs;
+        elseif (isset($attrs[$this->special_attr])) $this->special_filetitle = $attrs[$this->special_attr];
+    }
+
+    function end_element_filename () {
+        if ($this->special_filetitle) $this->special_file = array($this->special_filetitle, $this->chardata);
+        $this->special_filetitle = '';
+        if ($this->type == 'language') $this->files[] = array($this->language_attrs, $this->chardata);
+        elseif ($this->tagNestIs('FILES', 'MOSINSTALL')) $this->files[] = $this->chardata;
+        elseif ($this->tagNestIs('REMOVE_FILES', 'MOSINSTALL')) $this->rem_files[] = $this->chardata;
+        elseif ($this->tagNestIs('IMAGES', 'MOSINSTALL')) $this->images[] = $this->chardata;
+        elseif ($this->tagNestIs('FILES', 'ADMINISTRATION')) $this->admin_files[] = $this->chardata;
+        elseif ($this->tagNestIs('IMAGES', 'ADMINISTRATION')) $this->admin_images[] = $this->chardata;
+        elseif ($this->tagNestIs('MEDIA', 'MOSINSTALL')) $this->media[] = $this->chardata;
+        elseif ($this->tagNestIs('CSS', 'MOSINSTALL')) $this->css[] = $this->chardata;
+    }
+
+    function element_query ($attrs) {
+        if (isset($attrs['ID'])) $this->queryid = $attrs['ID'];
+    }
+
+    function element_menu ($attrs) {
+        if ($this->type != 'component') {
+            $this->errors->addErrorDetails(sprintf(T_('XML error in %s: MENU found, but this is not component XML'), $this->xmlfile), _MOS_ERROR_WARNING);
+            return;
+        }
+        if ($this->tagNestIs('SUBMENU', 'ADMINISTRATION')) {
+            if (isset($attrs['ACT'])) $this->subact = '&act='.$attrs['ACT'];
+            elseif (isset($attrs['TASK'])) $this->subact = '&task='.$attrs['TASK'];
+            elseif (isset($attrs['LINK'])) $this->subact = $attrs['LINK'];
+        }
+    }
+
+    function end_element_menu (){
+        if ($this->tagNestIs('ADMINISTRATION')) $this->mainmenu = $this->chardata;
+        elseif ($this->tagNestIs('SUBMENU', 'ADMINISTRATION')) $this->submenus[] = array ($this->chardata, $this->subact);
+        $this->subact = '';
+    }
+
+    function end_element_installfile () {
+        $this->installfile = $this->chardata;
+    }
+
+    function end_element_uninstallfile (){
+        $this->uninstallfile = $this->chardata;
+    }
+
+    function init_component ($attrs) {
+    }
+
+    function init_module ($attrs) {
+        $this->special_attr = 'MODULE';
+        if (isset($attrs['CLIENT'])) $this->client = $attrs['CLIENT'];
+    }
+
+    function init_mambot ($attrs) {
+        $this->special_attr = 'MAMBOT';
+        if (isset($attrs['GROUP'])) {
+            $this->group = $attrs['GROUP'];
+        }
+        else $this->errors->addErrorDetails(sprintf(T_('XML Error in %s: Mambot does not have a group specified'), $this->xmlfile), _MOS_ERROR_FATAL);
+    }
+
+    function init_template ($attrs) {
+        if (isset($attrs['CLIENT'])) $this->client = $attrs['CLIENT'];
+    }
+
+    function init_language ($attrs) {
+    }
+
+    function init_params ($attrs) {
+    }
+
+    function init_include($attrs) {
+    }
+
+    function init_parameter($attrs) {
+    }
+
+    function init_patch ($attrs) {
+    }
+
+}
+
+class mosInstallXML extends mosCommonInstallXML {
+
+    function install () {
+        if ($this->errors->getMaxLevel() >= _MOS_ERROR_FATAL) return;
+        $method = 'install_'.$this->type;
+        $setup = array (&$this, $method);
+        if (is_callable($setup)) $this->$method();
+        else $this->errors->addErrorDetails(sprintf(T_('XML error in %s: no installer %s'), $this->xmlfile, $method), _MOS_ERROR_FATAL);
+        if ($this->errors->getMaxLevel() >= _MOS_ERROR_FATAL) {
+            $killmethod = 'kill_'.$this->type;
+            $killer = array (&$this, $killmethod);
+            if (is_callable($killer)) $this->$killmethod();
+        }
+    }
+
+    function end_element_query () {
+        if ($this->tagNestIs('QUERIES', 'INSTALL')) $this->queries[] = array ($this->chardata, $this->queryid);
+        $this->queryid = 0;
+    }
+
+    function createDirectories ($name) {
+        if ($this->admin_dir) {
+            $adirectory = new mosDirectory ($this->admin_dir);
+            $type = $this->type;
+            if (!$adirectory->createFresh()) {
+                $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: unable to create admin directory for %s %s'), $this->xmlfile, $type, $name), _MOS_ERROR_SEVERE);
+                return false;
+            }
+        }
+        if ($this->user_dir) {
+            $udirectory = new mosDirectory ($this->user_dir);
+            if (!$udirectory->createFresh()) {
+                $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: unable to create user directory for %s %s'), $this->xmlfile, $type, $name), _MOS_ERROR_SEVERE);
+                return false;
+            }
+            return true;
+        }
+    }
+
+    function createComponentMenu ($item, $name, $toplevel=0) {
+        $text = $item[0];
+        $database =& mamboDatabase::getInstance();
+        $component =& new mosComponent($database);
+        $component->name = $component->admin_menu_alt = $text;
+        if ($toplevel == 0) $component->link = "option=$name";
+        $component->menuid = 0;
+        $component->parent = $toplevel;
+        $component->iscore = 0;
+        $component->admin_menu_link = "option=$name";
+        if ($toplevel AND ($linkdetail = $item[1])) {
+            if ($linkdetail[0] == '&') $component->admin_menu_link .= $linkdetail;
+            else $component->admin_menu_link = $linkdetail;
+        }
+        $component->option = $name;
+        $component->ordering = $toplevel ? $this->submenuordering++ : 0;
+        $component->admin_menu_img = 'js/ThemeOffice/component.png';
+        $component->params = '';
+        if ($component->store()) return $component->id;
+        $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: writing component menu SQL error %s'), $this->xmlfile, $database->stderr(true)), _MOS_ERROR_FATAL);
+        return 0;
+    }
+
+    function install_component (){
+        $com_name = 'com_'.str_replace(' ', '', strtolower($this->name));
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/components/'.$com_name);
+        $this->admin_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/components/'.$com_name);
+        $database =& mamboDatabase::getInstance();
+        $sql = "SELECT COUNT(id) FROM #__components WHERE `option`='$com_name'";
+        $database->setQuery($sql);
+        if ($count = $database->loadResult()) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s already installed'), $this->xmlfile, 'component', $com_name), _MOS_ERROR_FATAL);
+            return;
+        }
+        if (!$this->createDirectories($com_name)) return;
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $fmanager->forceCopy($this->xmlfile, $this->admin_dir.basename($this->xmlfile));
+        foreach ($this->files as $ufile) $fmanager->forceCopy($here.$ufile, $this->user_dir.$ufile);
+        foreach ($this->images as $uimage) $fmanager->forceCopy($here.$uimage, $this->user_dir.$uimage);
+        foreach ($this->admin_files as $afile) $fmanager->forceCopy($here.$afile, $this->admin_dir.$afile);
+        foreach ($this->admin_images as $aimage) $fmanager->forceCopy($here.$aimage, $this->admin_dir.$aimage);
+        if ($this->installfile) $fmanager->forceCopy($here.$this->installfile, $this->admin_dir.$this->installfile);
+        if ($this->uninstallfile) $fmanager->forceCopy($here.$this->uninstallfile, $this->admin_dir.$this->uninstallfile);
+        foreach ($this->queries as $query) {
+            $database->setQuery($query[0]);
+            if (!$database->query()) {
+                $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s SQL error %s'), $this->xmlfile, 'component', $com_name, $database->stderr(true)), _MOS_ERROR_FATAL);
+            }
+        }
+        if ($this->mainmenu) {
+            $topid = $this->createComponentMenu (array($this->mainmenu), $com_name);
+            foreach ($this->submenus as $submenu) {
+                $this->createComponentMenu ($submenu, $com_name, $topid);
+            }
+        }
+        if ($this->installfile) {
+            $ifile = mosPathName($this->admin_dir).$this->installfile;
+            if (is_file($ifile)) {
+                global $mosConfig_absolute_path, $mosConfig_live_site, $acl, $database;
+                require_once($ifile);
+                com_install();
+            }
+        }
+        $this->errors->addErrorDetails($this->getDescription('component'), _MOS_ERROR_INFORM);
+    }
+
+    function install_module () {
+        if (!is_array($this->special_file)) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: no file identified as the %s'), $this->xmlfile, 'module'), _MOS_ERROR_FATAL);
+            return;
+        }
+        $special = $this->special_file[0];
+        $database =& mamboDatabase::getInstance();
+        $client_id = $this->client == 'administrator' ? 1 : 0;
+        $sql = "SELECT COUNT(id) FROM #__modules WHERE module='$special' AND client_id='$client_id'";
+        $database->setQuery($sql);
+        if ($database->loadResult()) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s already installed'), $this->xmlfile, 'module', $com_name), _MOS_ERROR_FATAL);
+            return;
+        }
+        if ($client_id) $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/modules/');
+        else $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/modules');
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $fmanager->forceCopy($this->xmlfile, $this->user_dir.basename($this->xmlfile));
+        foreach ($this->files as $ufile) $fmanager->forceCopy($here.$ufile, $this->user_dir.$ufile);
+        foreach ($this->images as $uimage) $fmanager->forceCopy($here.$uimage, $this->user_dir.$uimage);
+        $module =& new mosModule($database);
+        $module->title = $this->name;
+        $module->ordering = 99;
+        $module->position = 'left';
+        $module->showtitle = 1;
+        $module->iscore = 0;
+        $module->access = $client_id ? 99 : 0;
+        $module->client_id = $client_id;
+        $module->module = $special;
+        $module->content = '';   // double check the last chance at wush to be here at SG new SVN
+        $module->params = '';
+        $module->store();
+        if ($module->store()) $this->errors->addErrorDetails($this->getDescription('module'), _MOS_ERROR_INFORM);
+        else {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s SQL error %s'), $this->xmlfile, 'mambot', $this->name, $database->stderr(true)), _MOS_ERROR_FATAL);
+        }
+        
+        $database->setQuery("INSERT INTO #__modules_menu VALUES ('$module->id', 0)");
+        if (!$database->query()) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s SQL error %s'), $this->xmlfile, 'module', $this->name, $database->stderr(true)), _MOS_ERROR_FATAL);
+        }
+        $this->errors->addErrorDetails($this->getDescription('module'), _MOS_ERROR_INFORM);
+    }
+
+    function install_mambot () {
+        if (!is_array($this->special_file)) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: no file identified as the %s'), $this->xmlfile, 'mambot'), _MOS_ERROR_FATAL);
+            return;
+        }
+        $database =& mamboDatabase::getInstance();
+        $name = $this->name;
+        $sql = "SELECT COUNT(id) FROM #__mambots WHERE element='$name'";
+        $database->setQuery($sql);
+        if ($database->loadResult()) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s already installed'), $this->xmlfile, 'mambot', $this->name), _MOS_ERROR_FATAL);
+            return;
+        }
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/mambots/'.$this->group);
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $fmanager->forceCopy($this->xmlfile, $this->user_dir.basename($this->xmlfile));
+        foreach ($this->files as $ufile) $fmanager->forceCopy($here.$ufile, $this->user_dir.$ufile);
+        foreach ($this->images as $uimage) $fmanager->forceCopy($here.$uimage, $this->user_dir.$uimage);
+        $mambot =& new mosMambot($database);
+        $mambot->name = $this->name;
+        $mambot->ordering = 0;
+        $mambot->folder = $this->group;
+        $mambot->iscore = 0;
+        $mambot->access = 0;
+        $mambot->client_id = 0;
+        $mambot->element = $this->special_file[0];
+        $mambot->params = '';
+        if ($mambot->store()) $this->errors->addErrorDetails($this->getDescription('mambot'), _MOS_ERROR_INFORM);
+        else {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s SQL error %s'), $this->xmlfile, 'mambot', $this->name, $database->stderr(true)), _MOS_ERROR_FATAL);
+        }
+    }
+
+    function install_template () {
+        $client_id = $this->client == 'administrator' ? 1 : 0;
+        if ($client_id) $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/templates/');
+        else $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/templates/'.str_replace(' ', '_', strtolower($this->name)));
+        if (file_exists($this->user_dir)) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s already installed'), $this->xmlfile, 'template', $this->name), _MOS_ERROR_FATAL);
+            return;
+        }
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $fmanager->forceCopy($this->xmlfile, $this->user_dir.basename($this->xmlfile));
+        foreach ($this->files as $ufile) $fmanager->forceCopy($here.$ufile, $this->user_dir.$ufile);
+        foreach ($this->images as $uimage) $fmanager->forceCopy($here.$uimage, $this->user_dir.$uimage);
+        foreach ($this->css as $acss) $fmanager->forceCopy($here.$acss, $this->user_dir.$acss);
+        $mediadir = mamboCore::get('mosConfig_absolute_path').'/images/stories/';
+        foreach ($this->media as $simage) $fmanager->forceCopy($here.$simage, $mediadir.$simage);
+        $this->errors->addErrorDetails($this->getDescription('template'), _MOS_ERROR_INFORM);
+    }
+
+    function install_language () {
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/language');
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $fmanager->forceCopy($this->xmlfile, $this->user_dir.basename($this->xmlfile));
+        $lang =  substr(basename($this->xmlfile), 0, -4);
+        foreach ($this->files as $ufile) {
+            $file = str_replace('language', '', $ufile[1]);
+            $fmanager->forceCopy($here.$file, $this->user_dir.$file);
+        }
+        $this->errors->addErrorDetails($this->getDescription('language'), _MOS_ERROR_INFORM);
+    }
+
+    function install_include () {
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/includes');
+        $this->admin_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/includes');
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        foreach ($this->files as $ufile) $fmanager->lightCopy($here.$ufile, $this->user_dir.$ufile);
+        foreach ($this->admin_files as $afile) $fmanager->lightCopy($here.$afile, $this->admin_dir.$afile);
+    }
+
+    function install_parameter () {
+        $database =& mamboDatabase::getInstance();
+        $name = $this->name;
+        $sql = "SELECT COUNT(id) FROM #__parameters WHERE param_name='$name'";
+        $database->setQuery($sql);
+        if ($database->loadResult()) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s already installed'), $this->xmlfile, 'parameter', $this->name), _MOS_ERROR_FATAL);
+            return;
+        }
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/parameters/');
+        $fmanager =& mosFileManager::getInstance();
+        $xmlfile = $this->xmlfile;
+        $filexmlfile = basename($xmlfile);
+        $fmanager->forceCopy($xmlfile, $this->user_dir.basename($filexmlfile));
+        $sql = "INSERT INTO #__parameters (param_name, param_file, param_version, params) VALUES ('$name', '$filexmlfile', '', '')";
+        $database->setQuery($sql);
+        if (!$database->query()) {
+            $this->errors->addErrorDetails(sprintf(T_('Installer error with %s: %s %s SQL error %s'), $xmlfile, 'parameter', $name, $database->stderr(true)), _MOS_ERROR_FATAL);
+        }
+        $this->errors->addErrorDetails($this->getDescription('parameter'), _MOS_ERROR_INFORM);
+    }
+
+    function install_patch () {
+        $permit_problem = false;
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $basedir = mosPathName(mamboCore::get('mosConfig_absolute_path'));
+        foreach ($this->files as $file) {
+            if (!$fmanager->acceptCopy($basedir.$file) OR (file_exists($basedir.$file) AND !is_writable($basedir.$file))) {
+                $this->errors->addErrorDetails(sprintf(T_('Patch install error with %s: cannot write %s'), $this->xmlfile, $basedir.$file), _MOS_ERROR_WARN);
+                $permit_problem = true;
+            }
+        }
+        foreach ($this->rem_files as $file) {
+            if (!is_writable($basedir.$file)) {
+                $this->errors->addErrorDetails(sprintf(T_('Patch install error with %s: cannot delete %s'), $this->xmlfile, $basedir.$file), _MOS_ERROR_WARN);
+                $permit_problem = true;
+            }
+        }
+        if ($permit_problem) {
+            $this->errors->addErrorDetails(sprintf(T_('Patch install error with %s: file permissions prevent patch application'), $this->xmlfile), _MOS_ERROR_FATAL);
+            return;
+        }
+        foreach ($this->rem_files as $file) {
+            if (!@unlink($basedir.$file)) {
+                $this->errors->addErrorDetails(sprintf(T_('Patch install error with %s: failed to delete %s'), $this->xmlfile, $basedir.$file), _MOS_ERROR_WARN);
+                $permit_problem = true;
+            }
+        }
+        foreach ($this->files as $file) {
+            if (!$fmanager->forceCopy($here.$file, $basedir.$file)) {
+                $this->errors->addErrorDetails(sprintf(T_('Patch install error with %s: failed to write %s'), $this->xmlfile, $basedir.$file), _MOS_ERROR_WARN);
+                $permit_problem = true;
+            }
+        }
+        if ($permit_problem) $this->errors->addErrorDetails(sprintf(T_('Patch install error with %s: check was OK, but application failed'), $this->xmlfile), _MOS_ERROR_FATAL);
+        else $this->errors->addErrorDetails(sprintf(T_('Patch install %s: completed successfully'), $this->xmlfile), _MOS_ERROR_INFORM);
+    }
+
+    function kill_component () {
+        if (isset($this->user_dir)) {
+            $dir = new mosDirectory($this->user_dir);
+            $dir->deleteAll();
+        }
+        if (isset($this->admin_dir)) {
+            $dir = new mosDirectory($this->admin_dir);
+            $dir->deleteAll();
+        }
+        $com_name = 'com_'.strtolower($this->name);
+        $sql = "DELETE FROM #__components WHERE `option`='$com_name'";
+        $database =& mamboDatabase::getInstance();
+        $database->setQuery($sql);
+        $database->query();
+    }
+
+    function kill_module () {
+        $name = $this->name;
+        $sql = "DELETE FROM #__modules WHERE title='$name'";
+        $database =& mamboDatabase::getInstance();
+        $database->setQuery($sql);
+        $database->query();
+    }
+
+    function kill_mambot () {
+        $name = $this->name;
+        $sql = "DELETE FROM #__mambots WHERE name='$name'";
+        $database =& mamboDatabase::getInstance();
+        $database->setQuery($sql);
+        $database->query();
+    }
+
+    function kill_template () {
+        if (isset($this->user_dir)) {
+            $dir = new mosDirectory($this->user_dir);
+            $dir->deleteAll();
+        }
+    }
+
+    function kill_language () {
+    }
+
+    function kill_include () {
+    }
+
+    function kill_parameter () {
+        $database =& mamboDatabase::getInstance();
+        $name = $this->name;
+        $sql = "DELETE FROM #__parameters WHERE param_name='$name'";
+        $database->setQuery($sql);
+        $database->query();
+    }
+
+    function kill_patch () {
+    }
+
+}
+
+
+class mosUninstallXML extends mosCommonInstallXML {
+
+    function uninstall () {
+        $method = 'uninstall_'.$this->type;
+        $setup = array (&$this, $method);
+        if (is_callable($setup)) $this->$method();
+        else $this->errors->addErrorDetails(sprintf(T_('Uninstaller error with %s: no uninstaller %s'), $this->xmlfile, $method), _MOS_ERROR_FATAL);
+        if ($this->errors->getMaxLevel() >= _MOS_ERROR_FATAL) return false;
+        return true;
+    }
+
+    function end_element_query () {
+        if ($this->tagNestIs('QUERIES', 'UNINSTALL')) $this->queries[] = array ($this->chardata, $this->queryid);
+        $this->queryid = 0;
+    }
+
+    function deleteFileSet ($files, $rootdir) {
+        $dirs = array();
+        $fmanager =& mosFileManager::getInstance();
+        foreach ($files as $file) {
+            $parts = split ('/', $file);
+            if (count($parts) > 1 AND !in_array($parts[0], $dirs)) $dirs[] = $parts[0];
+            $fmanager->deleteFile($rootdir.'/'.$file);
+        }
+        foreach ($dirs as $dir) {
+            $dirobj = new mosDirectory($rootdir.'/'.$dir);
+            $dirobj->deleteAll();
+        }
+    }
+
+
+    function uninstall_component (){
+        $com_name = 'com_'.str_replace(' ', '', strtolower($this->getName('component')));
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/components/'.$com_name);
+        $this->admin_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/components/'.$com_name);
+        if ($this->uninstallfile) {
+            $ufile = mosPathName($this->admin_dir).$this->uninstallfile;
+            if (is_file($ufile)) {
+                require_once($ufile);
+                com_uninstall();
+            }
+        }
+        $database =& mamboDatabase::getInstance();
+        foreach ($this->queries as $query) {
+            $database->setQuery($query[0]);
+            if (!$database->query()) {
+                $this->errors->addErrorDetails(sprintf(T_('Uninstaller error with %s: %s %s SQL error %s'), $this->xmlfile, 'component', $com_name, $database->stderr(true)), _MOS_ERROR_SEVERE);
+            }
+        }
+        $udir = new mosDirectory($this->user_dir);
+        $udir->deleteAll();
+        $adir = new mosDirectory($this->admin_dir);
+        $adir->deleteAll();
+        $sql = "DELETE FROM #__components WHERE `option`='$com_name'";
+        $database->setQuery($sql);
+        if (!$database->query()) {
+            $this->errors->addErrorDetails(sprintf(T_('Uninstaller error with %s: %s %s not fully deleted from database'), $this->xmlfile, 'component', $com_name), _MOS_ERROR_SEVERE);
+            return;
+        }
+        $this->errors->addErrorDetails($this->getDescription('component'), _MOS_ERROR_INFORM);
+    }
+
+    function uninstall_module () {
+        $client_id = $this->client == 'administrator' ? 1 : 0;
+        if ($client_id) $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/modules/');
+        else $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/modules');
+        $this->deleteFileSet($this->files, $this->user_dir);
+        $this->deleteFileSet($this->images, $this->user_dir);
+        if (!is_array($this->special_file)) {
+            $this->errors->addErrorDetails(sprintf(T_('Uninstaller error with %s: no file identified as the %s'), $this->xmlfile, 'module'), _MOS_ERROR_FATAL);
+            return;
+        }
+        $special = $this->special_file[0];
+        $database =& mamboDatabase::getInstance();
+        $name = $this->getName('module');
+        $sql = "DELETE FROM #__modules WHERE module='$special' AND client_id='$client_id'";
+        $database->setQuery($sql);
+        if (!$database->query()) {
+            $this->errors->addErrorDetails(sprintf(T_('Uninstaller error with %s: %s %s not fully deleted from database'), $this->xmlfile, 'module', $name), _MOS_ERROR_SEVERE);
+            return;
+        }
+        $fmanager =& mosFileManager::getInstance();
+        $fmanager->deleteFile($this->xmlfile);
+        $this->errors->addErrorDetails($this->getDescription('module'), _MOS_ERROR_INFORM);
+    }
+
+    function uninstall_mambot () {
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/mambots/'.$this->group);
+        $this->deleteFileSet($this->files, $this->user_dir);
+        $this->deleteFileSet($this->images, $this->user_dir);
+        $database =& mamboDatabase::getInstance();
+        $name = $this->getName('mambot');
+        $element = $this->special_file[0];
+        $group = $this->group;
+        $sql = "DELETE FROM #__mambots WHERE element='$element' AND folder='$group'";
+        $database->setQuery($sql);
+        if (!$database->query()) {
+            $this->errors->addErrorDetails(sprintf(T_('Uninstaller error with %s: %s %s not fully deleted from database'), $this->xmlfile, 'mambot', $name), _MOS_ERROR_SEVERE);
+            return;
+        }
+        $fmanager =& mosFileManager::getInstance();
+        $fmanager->deleteFile($this->xmlfile);
+        $this->errors->addErrorDetails($this->getDescription('mambot'), _MOS_ERROR_INFORM);
+    }
+
+    /**
+	* This routine is not called - uninstalling templates is done by just deleting
+	* the whole directory.  It might be better to manage the uninstall via the XML.
+	* Just deleting the template leaves all the files in the "media" directory.
+	* But the following code has never been tested.
+	**/
+    function uninstall_template () {
+        $name = str_replace(' ', '_', strtolower($this->getName('template')));
+        $client_id = $this->client == 'administrator' ? 1 : 0;
+        if ($client_id) $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/administrator/templates/');
+        else $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/templates/'.$name);
+        $userdir = new mosDirectory($this->user_dir);
+        $userdir->deleteAll();
+        $mediadir = mamboCore::get('mosConfig_absolute_path').'/images/stories/';
+        $this->deleteFileSet($this->media, $mediadir);
+        $fmanager =& mosFileManager::getInstance();
+        $fmanager->deleteFile($this->xmlfile);
+        $this->errors->addErrorDetails($this->getDescription('template'), _MOS_ERROR_INFORM);
+    }
+
+    function uninstall_language () {
+        $this->user_dir = mosPathName(mamboCore::get('mosConfig_absolute_path').'/language/');
+        $fmanager =& mosFileManager::getInstance();
+        $here = mosPathName(dirname($this->xmlfile));
+        $fmanager->deleteFile($this->user_dir.basename($this->xmlfile));
+        foreach ($this->files as $ufile) $fmanager->deleteFile($this->user_dir.$ufile);
+        $this->errors->addErrorDetails($this->getDescription('language'), _MOS_ERROR_INFORM);
+    }
+
+    function uninstall_params () {
+    }
+
+}
+
 /**
 * Installer class
 * @package Mambo
@@ -18,477 +640,87 @@
 * @abstract
 */
 class mosInstaller {
-	// name of the XML file with installation information
-	var $i_installfilename	= "";
-	var $i_installarchive	= "";
-	var $i_installdir		= "";
-	var $i_iswin			= false;
-	var $i_errno			= 0;
-	var $i_error			= "";
-	var $i_installtype		= "";
-	var $i_unpackdir		= "";
-	var $i_docleanup		= true;
-
-	/** @var string The directory where the element is to be installed */
-	var $i_elementdir = '';
-	/** @var string The name of the Mambo element */
-	var $i_elementname = '';
-	/** @var string The name of a special atttibute in a tag */
-	var $i_elementspecial = '';
-	/** @var object A DOMIT XML document */
-	var $i_xmldoc			= null;
+    var $archiveName = '';
+    var $extractDir = '';
+    var $cleanDir = '';
+    var $errors = '';
+
+    function mosInstaller () {
+        $this->errors = new mosErrorSet();
+    }
 
-	var $i_hasinstallfile = null;
-	var $i_installfile = null;
-
-	/**
-	* Constructor
-	*/
-	function mosInstaller() {
-		$this->i_iswin = (substr(PHP_OS, 0, 3) == 'WIN');
-	}
-	/**
-	* Uploads and unpacks a file
-	* @param string The uploaded package filename or install directory
-	* @param boolean True if the file is an archive file
-	* @return boolean True on success, False on error
-	*/
-	function upload($p_filename = null, $p_unpack = true) {
-		$this->i_iswin = (substr(PHP_OS, 0, 3) == 'WIN');
-		$this->installArchive( $p_filename );
-
-		if ($p_unpack) {
-			if ($this->extractArchive()) {
-				return $this->findInstallFile();
-			} else {
-				return false;
-			}
-		}
-	}
-	/**
+    /**
 	* Extracts the package archive file
 	* @return boolean True on success, False on error
 	*/
-	function extractArchive() {
-		global $mosConfig_absolute_path;
-
-		$base_Dir = mosPathName( $mosConfig_absolute_path . '/media' );
-
-		$archivename = $base_Dir . $this->installArchive();
-		$tmpdir = uniqid( 'install_' );
+    function extractArchive($filename) {
+        $mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+        $base_Dir = mosPathName($mosConfig_absolute_path.'/media');
+        $this->archiveName = $base_Dir.$filename;
+        $tmpdir = uniqid('install_');
+        $this->extractDir = $this->cleanDir = mosPathName($base_Dir.uniqid('install_'));
+        if (eregi( '.zip$', $filename )) {
+            // Extract functions
+            require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pclzip.lib.php' );
+            require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pclerror.lib.php' );
+            //require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pcltrace.lib.php' );
+            //require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pcltar.lib.php' );
+            $zipfile = new PclZip( $this->archiveName );
+            $ret = $zipfile->extract( PCLZIP_OPT_PATH, $this->extractDir );
+            if($ret == 0) {
+                $this->errors->addErrorDetails(sprintf(T_('Installer unrecoverable ZIP error %s in %s'), $zipfile->errorName(true), $this->archiveName), _MOS_ERROR_FATAL);
+                return false;
+            }
+        } else {
+            require_once( $mosConfig_absolute_path . '/includes/Archive/Tar.php' );
+            $archive =& new Archive_Tar( $this->archiveName );
+            $archive->setErrorHandling( PEAR_ERROR_PRINT );
+
+            if (!$archive->extractModify( $this->extractDir, '' )) {
+                $this->errors->addErrorDetails(sprintf(T_('Installer unrecoverable TAR error in %s'), $this->archiveName), _MOS_ERROR_FATAL);
+                return false;
+            }
+        }
+        // Try to find the correct install dir. in case that the package have subdirs
+        // Save the install dir for later cleanup
+        $dir =& new mosDirectory($this->extractDir);
+        $singledir = $dir->soleDir();
+        if ($singledir) $this->extractDir = mosPathName($this->extractDir.$singledir);
+        return true;
+    }
+    /**
+	* Custom install method
+	* @param boolean True if installing from directory
+	*/
+    function install($p_fromdir = null) {
+        if (!is_null($p_fromdir)) $this->extractDir = $p_fromdir;
+        $here = $this->extractDir;
+        $installdir =& new mosDirectory($here);
+        $xmlfiles =& $installdir->listFiles('.xml$');
+        foreach ($xmlfiles as $file) {
+            $parser = new mosInstallXML ($here.$file);
+            $parser->install();
+            $this->errors->mergeAnother($parser->errors);
+            if ($parser->errors->getMaxLevel() >= _MOS_ERROR_FATAL) return false;
+        }
+        return true;
+    }
+
+    function cleanUpInstall () {
+        if ($this->archiveName) {
+            $fmanager =& mosFileManager::getInstance();
+            $fmanager->deleteFile($this->archiveName);
+        }
+        if ($this->cleanDir) {
+            $edir =& new mosDirectory ($this->cleanDir);
+            $edir->deleteAll();
+        }
+    }
+
+    function getErrors () {
+        return $this->errors->getErrors();
+    }
 
-		$extractdir = mosPathName( $base_Dir . $tmpdir );
-		$archivename = mosPathName( $archivename, false );
-
-		$this->unpackDir( $extractdir );
-
-		if (eregi( '.zip$', $archivename )) {
-			// Extract functions
-			require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pclzip.lib.php' );
-			require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pclerror.lib.php' );
-			//require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pcltrace.lib.php' );
-			//require_once( $mosConfig_absolute_path . '/administrator/includes/pcl/pcltar.lib.php' );
-			$zipfile = new PclZip( $archivename );
-			if($this->isWindows()) {
-				define('OS_WINDOWS',1);
-			} else {
-				define('OS_WINDOWS',0);
-			}
-
-			$ret = $zipfile->extract( PCLZIP_OPT_PATH, $extractdir );
-			if($ret == 0) {
-				$this->setError( 1, 'Unrecoverable error "'.$zipfile->errorName(true).'"' );
-				return false;
-			}
-		} else {
-			require_once( $mosConfig_absolute_path . '/includes/Archive/Tar.php' );
-			$archive =& new Archive_Tar( $archivename );
-			$archive->setErrorHandling( PEAR_ERROR_PRINT );
-
-			if (!$archive->extractModify( $extractdir, '' )) {
-				$this->setError( 1, 'Extract Error' );
-				return false;
-			}
-		}
-
-		$this->installDir( $extractdir );
-
-		// Try to find the correct install dir. in case that the package have subdirs
-		// Save the install dir for later cleanup
-		$filesindir = mosReadDirectory( $this->installDir(), '' );
-
-		if (count( $filesindir ) == 1) {
-			if (is_dir( $extractdir . $filesindir[0] )) {
-				$this->installDir( mosPathName( $extractdir . $filesindir[0] ) );
-			}
-		}
-		return true;
-	}
-	/**
-	* Tries to find the package XML file
-	* @return boolean True on success, False on error
-	*/
-	function findInstallFile() {
-		$found = false;
-		// Search the install dir for an xml file
-		$files = mosReadDirectory( $this->installDir(), '.xml$', true, true );
-
-		if (count( $files ) > 0) {
-			foreach ($files as $file) {
-				$packagefile = $this->isPackageFile( $file );
-				if (!is_null( $packagefile ) && !$found ) {
-					$this->xmlDoc( $packagefile );
-					return true;
-				}
-			}
-			$this->setError( 1, 'ERROR: Could not find a Mambo XML setup file in the package.' );
-			return false;
-		} else {
-			$this->setError( 1, 'ERROR: Could not find an XML setup file in the package.' );
-			return false;
-		}
-	}
-	/**
-	* @param string A file path
-	* @return object A DOMIT XML document, or null if the file failed to parse
-	*/
-	function isPackageFile( $p_file ) {
-		$xmlDoc =& new DOMIT_Lite_Document();
-		$xmlDoc->resolveErrors( true );
-
-		if (!$xmlDoc->loadXML( $p_file, false, true )) {
-			return null;
-		}
-		$element = &$xmlDoc->documentElement;
-
-		if ($element->getTagName() != 'mosinstall') {
-			return null;
-		}
-		// Set the type
-		$this->installType( $element->getAttribute( 'type' ) );
-		$this->installFilename( $p_file );
-		return $xmlDoc;
-	}
-	/**
-	* Loads and parses the XML setup file
-	* @return boolean True on success, False on error
-	*/
-	function readInstallFile() {
-
-		if ($this->installFilename() == "") {
-			$this->setError( 1, 'No filename specified' );
-			return false;
-		}
-
-		$this->i_xmldoc =& new DOMIT_Lite_Document();
-		$this->i_xmldoc->resolveErrors( true );
-		if (!$this->i_xmldoc->loadXML( $this->installFilename(), false, true )) {
-			return false;
-		}
-		$main_element = &$this->i_xmldoc->documentElement;
-
-		// Check that it's am installation file
-		if ($main_element->getTagName() != 'mosinstall') {
-			$this->setError( 1, 'File :"' . $this->installFilename() . '" is not a valid Mambo installation file' );
-			return false;
-		}
-
-		$this->installType( $main_element->getAttribute( 'type' ) );
-		return true;
-	}
-	/**
-	* Abstract install method
-	*/
-	function install() {
-		die( 'Method "install" cannot be called by class ' . strtolower(get_class( $this )) );
-	}
-	/**
-	* Abstract uninstall method
-	*/
-	function uninstall() {
-		die( 'Method "uninstall" cannot be called by class ' . strtolower(get_class( $this )) );
-	}
-	/**
-	* return to method
-	*/
-	function returnTo( $option, $element ) {
-		return "index2.php?option=$option&element=$element";
-	}
-	/**
-	* @param string Install from directory
-	* @param string The install type
-	* @return boolean
-	*/
-	function preInstallCheck( $p_fromdir, $type ) {
-
-		if (!is_null($p_fromdir)) {
-			$this->installDir($p_fromdir);
-		}
-
-		if (!$this->installfile()) {
-			$this->findInstallFile();
-		}
-
-		if (!$this->readInstallFile()) {
-			$this->setError( 1, 'Installation file not found:<br />' . $this->installDir() );
-			return false;
-		}
-
-		if ($this->installType() != $type) {
-			$this->setError( 1, 'XML setup file is not for a "'.$type.'".' );
-			return false;
-		}
-
-		// In case there where an error doring reading or extracting the archive
-		if ($this->errno()) {
-			return false;
-		}
-
-		return true;
-	}
-	/**
-	* @param string The tag name to parse
-	* @param string An attribute to search for in a filename element
-	* @param string The value of the 'special' element if found
-	* @param boolean True for Administrator components
-	* @return mixed Number of file or False on error
-	*/
-	function parseFiles( $tagName='files', $special='', $specialError='', $adminFiles=0 ) {
-		global $mosConfig_absolute_path;
-		// Find files to copy
-		$xml =& $this->xmlDoc();
-
-		$files_element =& $xml->getElementsByPath( $tagName, 1 );
-		if (is_null( $files_element )) {
-			return 0;
-		}
-
-		if (!$files_element->hasChildNodes()) {
-			// no files
-			return 0;
-		}
-		$files = $files_element->childNodes;
-		$copyfiles = array();
-		if (count( $files ) == 0) {
-			// nothing more to do
-			return 0;
-		}
-
-		if ($folder = $files_element->getAttribute( 'folder' )) {
-			$temp = mosPathName( $this->unpackDir() . $folder );
-			if ($temp == $this->installDir()) {
-				// this must be only an admin component
-				$installFrom = $this->installDir();
-			} else {
-				$installFrom = mosPathName( $this->installDir() . $folder );
-			}
-		} else {
-			$installFrom = $this->installDir();
-		}
-
-		foreach ($files as $file) {
-			if (basename( $file->getText() ) != $file->getText()) {
-				$newdir = dirname( $file->getText() );
-
-				if ($adminFiles){
-					if (!mosMakePath( $this->componentAdminDir(), $newdir )) {
-						$this->setError( 1, 'Failed to create directory "' . ($this->componentAdminDir()) . $newdir . '"' );
-						return false;
-					}
-				} else {
-					if (!mosMakePath( $this->elementDir(), $newdir )) {
-						$this->setError( 1, 'Failed to create directory "' . ($this->elementDir()) . $newdir . '"' );
-						return false;
-					}
-				}
-			}
-			$copyfiles[] = $file->getText();
-
-			// check special for attribute
-			if ($file->getAttribute( $special )) {
-				$this->elementSpecial( $file->getAttribute( $special ) );
-			}
-		}
-
-		if ($specialError) {
-			if ($this->elementSpecial() == '') {
-				$this->setError( 1, $specialError );
-				return false;
-			}
-		}
-
-		if ($tagName == 'media') {
-			// media is a special tag
-			$installTo = mosPathName( $mosConfig_absolute_path . '/images/stories' );
-		} else if ($adminFiles) {
-			$installTo = $this->componentAdminDir();
-		} else {
-			$installTo = $this->elementDir();
-		}
-		$result = $this->copyFiles( $installFrom, $installTo, $copyfiles );
-
-		return $result;
-	}
-	/**
-	* @param string Source directory
-	* @param string Destination directory
-	* @param array array with filenames
-	* @param boolean True is existing files can be replaced
-	* @return boolean True on success, False on error
-	*/
-	function copyFiles( $p_sourcedir, $p_destdir, $p_files, $overwrite=false ) {
-		if (is_array( $p_files ) && count( $p_files ) > 0) {
-			foreach($p_files as $_file) {
-				$filesource	= mosPathName( mosPathName( $p_sourcedir ) . $_file, false );
-				$filedest	= mosPathName( mosPathName( $p_destdir ) . $_file, false );
-
-				if (!file_exists( $filesource )) {
-					$this->setError( 1, "File $filesource does not exist!" );
-					return false;
-				} else if (file_exists( $filedest ) && !$overwrite) {
-					$this->setError( 1, "There is already a file called $filedest - Are you trying to install the same CMT twice?" );
-					return false;
-				} else {
-					if( !( copy($filesource,$filedest) && mosChmod($filedest) ) ) {
-						$this->setError( 1, "Failed to copy file: $filesource to $filedest" );
-						return false;
-					}
-				}
-			}
-		} else {
-			return false;
-		}
-		return count( $p_files );
-	}
-	/**
-	* Copies the XML setup file to the element Admin directory
-	* Used by Components/Modules/Mambot Installer Installer
-	* @return boolean True on success, False on error
-	*/
-	function copySetupFile( $where='admin' ) {
-		if ($where == 'admin') {
-			return $this->copyFiles( $this->installDir(), $this->componentAdminDir(), array( basename( $this->installFilename() ) ), true );
-		} else if ($where == 'front') {
-			return $this->copyFiles( $this->installDir(), $this->elementDir(), array( basename( $this->installFilename() ) ), true );
-		}
-	}
-
-	/**
-	* @param int The error number
-	* @param string The error message
-	*/
-	function setError( $p_errno, $p_error ) {
-		$this->errno( $p_errno );
-		$this->error( $p_error );
-	}
-	/**
-	* @param boolean True to display both number and message
-	* @param string The error message
-	* @return string
-	*/
-	function getError($p_full = false) {
-		if ($p_full) {
-			return $this->errno() . " " . $this->error();
-		} else {
-			return $this->error();
-		}
-	}
-	/**
-	* @param string The name of the property to set/get
-	* @param mixed The value of the property to set
-	* @return The value of the property
-	*/
-	function setVar( $name, $value=null ) {
-		if (!is_null( $value )) {
-			$this->$name = $value;
-		}
-		return $this->$name;
-	}
-
-	function installFilename( $p_filename = null ) {
-		if(!is_null($p_filename)) {
-			if($this->isWindows()) {
-				$this->i_installfilename = str_replace('/','\\',$p_filename);
-			} else {
-				$this->i_installfilename = str_replace('\\','/',$p_filename);
-			}
-		}
-		return $this->i_installfilename;
-	}
-
-	function installType( $p_installtype = null ) {
-		return $this->setVar( 'i_installtype', $p_installtype );
-	}
-
-	function error( $p_error = null ) {
-		return $this->setVar( 'i_error', $p_error );
-	}
-
-	function xmlDoc( $p_xmldoc = null ) {
-		return $this->setVar( 'i_xmldoc', $p_xmldoc );
-	}
-
-	function installArchive( $p_filename = null ) {
-		return $this->setVar( 'i_installarchive', $p_filename );
-	}
-
-	function installDir( $p_dirname = null ) {
-		return $this->setVar( 'i_installdir', $p_dirname );
-	}
-
-	function unpackDir( $p_dirname = null ) {
-		return $this->setVar( 'i_unpackdir', $p_dirname );
-	}
-
-	function isWindows() {
-		return $this->i_iswin;
-	}
-
-	function errno( $p_errno = null ) {
-		return $this->setVar( 'i_errno', $p_errno );
-	}
-
-	function hasInstallfile( $p_hasinstallfile = null ) {
-		return $this->setVar( 'i_hasinstallfile', $p_hasinstallfile );
-	}
-
-	function installfile( $p_installfile = null ) {
-		return $this->setVar( 'i_installfile', $p_installfile );
-	}
-
-	function elementDir( $p_dirname = null )	{
-		return $this->setVar( 'i_elementdir', $p_dirname );
-	}
-
-	function elementName( $p_name = null )	{
-		return $this->setVar( 'i_elementname', $p_name );
-	}
-	function elementSpecial( $p_name = null )	{
-		return $this->setVar( 'i_elementspecial', $p_name );
-	}
 }
 
-function cleanupInstall( $userfile_name, $resultdir) {
-	global $mosConfig_absolute_path;
-
-	if (file_exists( $resultdir )) {
-		deldir( $resultdir );
-		unlink( mosPathName( $mosConfig_absolute_path . '/media/' . $userfile_name, false ) );
-	}
-}
-
-function deldir( $dir ) {
-	$current_dir = opendir( $dir );
-	while ($entryname = readdir( $current_dir )) {
-		if ($entryname != '.' and $entryname != '..') {
-			if (is_dir( $dir . $entryname )) {
-				deldir( mosPathName( $dir . $entryname ) );
-			} else {
-				unlink( $dir . $entryname );
-			}
-		}
-	}
-	closedir( $current_dir );
-	return rmdir( $dir );
-}
 ?>
diff -ruN 4.5.4/administrator/components/com_installer/language/language.class.php 4.6rc2/administrator/components/com_installer/language/language.class.php
--- 4.5.4/administrator/components/com_installer/language/language.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/language/language.class.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,102 +0,0 @@
-<?php
-/**
-* @version $Id: language.class.php,v 1.1 2005/07/22 01:52:31 eddieajau Exp $
-* @package Mambo
-* @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-/**
-* Language installer
-* @package Mambo
-* @subpackage Installer
-*/
-class mosInstallerLanguage extends mosInstaller {
-	/**
-	* Custom install method
-	* @param boolean True if installing from directory
-	*/
-	function install( $p_fromdir = null ) {
-		global $mosConfig_absolute_path,$database;
-
-		if (!$this->preInstallCheck( $p_fromdir, 'language' )) {
-			return false;
-		}
-
-		$xml = $this->xmlDoc();
-
-		// Set some vars
-		$e = &$xml->getElementsByPath( 'name', 1);
-		$this->elementName($e->getText());
-		$this->elementDir( mosPathName( $mosConfig_absolute_path . "/language/" ) );
-
-		// Find files to copy
-		if ($this->parseFiles( 'files', 'language' ) === false) {
-			return false;
-		}
-		if ($e = &$xml->getElementsByPath( 'description', 1 )) {
-			$this->setError( 0, $this->elementName() . '<p>' . $e->getText() . '</p>' );
-		}
-
-		return $this->copySetupFile('front');
-	}
-	/**
-	* Custom install method
-	* @param int The id of the module
-	* @param string The URL option
-	* @param int The client id
-	*/
-	function uninstall( $id, $option, $client=0 ) {
-		global $mosConfig_absolute_path;
-		$id = str_replace( array( '\\', '/' ), '', $id );
-
-		$basepath = $mosConfig_absolute_path . '/language/';
-		$xmlfile = $basepath . $id . '.xml';
-
-		// see if there is an xml install file, must be same name as element
-		if (file_exists( $xmlfile )) {
-			$this->i_xmldoc =& new DOMIT_Lite_Document();
-			$this->i_xmldoc->resolveErrors( true );
-
-			if ($this->i_xmldoc->loadXML( $xmlfile, false, true )) {
-				$mosinstall =& $this->i_xmldoc->documentElement;
-				// get the files element
-				$files_element =& $mosinstall->getElementsByPath( 'files', 1 );
-
-				if (!is_null( $files_element )) {
-					$files = $files_element->childNodes;
-					foreach ($files as $file) {
-						// delete the files
-						$filename = $file->getText();
-						echo $filename;
-						if (file_exists( $basepath . $filename )) {
-							echo '<br />Deleting: '. $basepath . $filename;
-							$result = unlink( $basepath . $filename );
-						}
-						echo intval( $result );
-					}
-				}
-			}
-		} else {
-			HTML_installer::showInstallMessage( 'Language id empty, cannot remove files', 'Uninstall -  error', $this->returnTo( $option, 'language', $client ) );
-			exit();
-		}
-
-		// remove XML file from front
-    	@unlink( $xmlfile );
-
-		return true;
-	}
-	/**
-	* return to method
-	*/
-	function returnTo( $option, $element, $client ) {
-		return "index2.php?option=com_languages";
-	}
-
-}
-?>
diff -ruN 4.5.4/administrator/components/com_installer/language/language.php 4.6rc2/administrator/components/com_installer/language/language.php
--- 4.5.4/administrator/components/com_installer/language/language.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/language/language.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: language.php,v 1.1 2005/07/22 01:52:31 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -13,11 +15,11 @@
 
 // ensure user has access to this function
 if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
-$backlink = '<a href="index2.php?option=com_languages">Back to Language Manager</a>';
-HTML_installer::showInstallForm( 'Install new Language - Site', $option, 'language', '', dirname(__FILE__), $backlink );
+$backlink = '<a href="index2.php?option=com_languages">'.T_('Back to Language Manager').'</a>';
+HTML_installer::showInstallForm( T_('Install new Language - Site'), $option, 'language', '', dirname(__FILE__), $backlink );
 ?>
 <table class="content">
 <?php
diff -ruN 4.5.4/administrator/components/com_installer/mambot/mambot.class.php 4.6rc2/administrator/components/com_installer/mambot/mambot.class.php
--- 4.5.4/administrator/components/com_installer/mambot/mambot.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/mambot/mambot.class.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,180 +0,0 @@
-<?php
-/**
-* @version $Id: mambot.class.php,v 1.1 2005/07/22 01:52:31 eddieajau Exp $
-* @package Mambo
-* @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* Module installer
-* @package Mambo
-* @subpackage Installer
-*/
-class mosInstallerMambot extends mosInstaller {
-	/**
-	* Custom install method
-	* @param boolean True if installing from directory
-	*/
-	function install( $p_fromdir = null ) {
-		global $mosConfig_absolute_path, $database;
-
-		if (!$this->preInstallCheck( $p_fromdir, 'mambot' )) {
-			return false;
-		}
-
-		$xml = $this->xmlDoc();
-		$mosinstall =& $xml->documentElement;
-
-		// Set some vars
-		$e = &$xml->getElementsByPath( 'name', 1 );
-		$this->elementName( $e->getText() );
-
-		$folder = $mosinstall->getAttribute( 'group' );
-		$this->elementDir( mosPathName( $mosConfig_absolute_path
-		. '/mambots/' . $folder )
-		);
-
-		if(!file_exists($this->elementDir()) && !mosMakePath($this->elementDir())) {
-			$this->setError( 1, 'Failed to create directory "' . $this->elementDir() . '"' );
-			return false;
-		}
-
-		if ($this->parseFiles( 'files', 'mambot', 'No file is marked as mambot file' ) === false) {
-			return false;
-		}
-
-		// Insert in module in DB
-		$database->setQuery( "SELECT id FROM #__mambots WHERE element = '" . $this->elementName() . "'" );
-		if (!$database->query()) {
-			$this->setError( 1, 'SQL error: ' . $database->stderr( true ) );
-			return false;
-		}
-
-		$id = $database->loadResult();
-
-		if (!$id) {
-			$row = new mosMambot( $database );
-			$row->name = $this->elementName();
-			$row->ordering = 0;
-			$row->folder = $folder;
-			$row->iscore = 0;
-			$row->access = 0;
-			$row->client_id = 0;
-			$row->element = $this->elementSpecial();
-
-			if (!$row->store()) {
-				$this->setError( 1, 'SQL error: ' . $row->getError() );
-				return false;
-			}
-		} else {
-			$this->setError( 1, 'Mambot "' . $this->elementName() . '" already exists!' );
-			return false;
-		}
-		if ($e = &$xml->getElementsByPath( 'description', 1 )) {
-			$this->setError( 0, $this->elementName() . '<p>' . $e->getText() . '</p>' );
-		}
-
-		return $this->copySetupFile('front');
-	}
-	/**
-	* Custom install method
-	* @param int The id of the module
-	* @param string The URL option
-	* @param int The client id
-	*/
-	function uninstall( $id, $option, $client=0 ) {
-		global $database, $mosConfig_absolute_path;
-
-		$id = intval( $id );
-		$database->setQuery( "SELECT name, folder, element, iscore FROM #__mambots WHERE id = '$id'" );
-
-		$row = null;
-		$database->loadObject( $row );
-		if ($database->getErrorNum()) {
-			HTML_installer::showInstallMessage( $database->stderr(), 'Uninstall -  error',
-			$this->returnTo( $option, 'mambot', $client ) );
-			exit();
-		}
-		if ($row == null) {
-			HTML_installer::showInstallMessage( 'Invalid object id', 'Uninstall -  error',
-			$this->returnTo( $option, 'mambot', $client ) );
-			exit();
-		}
-
-		if (trim( $row->folder ) == '') {
-			HTML_installer::showInstallMessage( 'Folder field empty, cannot remove files', 'Uninstall -  error',
-			$this->returnTo( $option, 'mambot', $client ) );
-			exit();
-		}
-
-		$basepath = $mosConfig_absolute_path . '/mambots/' . $row->folder . '/';
-		$xmlfile = $basepath . $row->element . '.xml';
-
-		// see if there is an xml install file, must be same name as element
-		if (file_exists( $xmlfile )) {
-			$this->i_xmldoc =& new DOMIT_Lite_Document();
-			$this->i_xmldoc->resolveErrors( true );
-
-			if ($this->i_xmldoc->loadXML( $xmlfile, false, true )) {
-				$mosinstall =& $this->i_xmldoc->documentElement;
-				// get the files element
-				$files_element =& $mosinstall->getElementsByPath( 'files', 1 );
-				if (!is_null( $files_element )) {
-					$files = $files_element->childNodes;
-					foreach ($files as $file) {
-						// delete the files
-						$filename = $file->getText();
-						if (file_exists( $basepath . $filename )) {
-							$parts = pathinfo( $filename );
-							$subpath = $parts['dirname'];
-							if ($subpath <> '' && $subpath <> '.' && $subpath <> '..') {
-								echo '<br />Deleting: '. $basepath . $subpath;
-								$result = deldir(mosPathName( $basepath . $subpath . '/' ));
-							} else {
-								echo '<br />Deleting: '. $basepath . $filename;
-								$result = unlink( mosPathName ($basepath . $filename, false));
-							}
-							echo intval( $result );
-						}
-					}
-
-					// remove XML file from front
-          echo "Deleting XML File: $xmlfile";
-          @unlink(  mosPathName ($xmlfile, false ) );
-
-					// define folders that should not be removed
-					$sysFolders = array(
-					'content',
-					'search'
-					);
-					if (!in_array( $row->folder, $sysFolders )) {
-						// delete the non-system folders if empty
-						if (count( mosReadDirectory( $basepath ) ) < 1) {
-							deldir( $basepath );
-						}
-					}
-				}
-			}
-		}
-
-		if ($row->iscore) {
-			HTML_installer::showInstallMessage( $row->name .' is a core element, and cannot be uninstalled.<br />You need to unpublish it if you don\'t want to use it',
-			'Uninstall -  error', $this->returnTo( $option, 'mambot', $client ) );
-			exit();
-		}
-
-		$database->setQuery( "DELETE FROM #__mambots WHERE id = '$id'" );
-		if (!$database->query()) {
-			$msg = $database->stderr;
-			die( $msg );
-		}
-		return true;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_installer/mambot/mambot.html.php 4.6rc2/administrator/components/com_installer/mambot/mambot.html.php
--- 4.5.4/administrator/components/com_installer/mambot/mambot.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/mambot/mambot.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: mambot.html.php,v 1.1 2005/07/22 01:52:31 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Installer
-*/
 class HTML_mambot {
 /**
 * Displays the installed non-core Mambot
@@ -26,12 +24,12 @@
 		<table class="adminheading">
 		<tr>
 			<th class="install">
-			Installed Mambots
+			<?php echo T_('Installed Mambots') ?>
 			</th>
 		</tr>
 		<tr>
 			<td>
-			Only those Mambots that can be uninstalled are displayed - some Core Mambots cannot be removed.
+			<?php echo T_('Only those Mambots that can be uninstalled are displayed - some Core Mambots cannot be removed.') ?>
 			<br /><br />
 			</td>
 		</tr>
@@ -42,10 +40,10 @@
 			<table class="adminlist">
 			<tr>
 				<th width="20%" class="title">
-				Mambot
+				<?php echo T_('Mambot') ?>
 				</th>
 				<th width="10%" class="title">
-				Type
+				<?php echo T_('Type') ?>
 				</th>
 				<!--
 				Currently Unsupported
@@ -54,19 +52,19 @@
 				</th>
 				-->
 				<th width="10%" align="left">
-				Author
+				<?php echo T_('Author') ?>
 				</th>
 				<th width="5%" align="center">
-				Version
+				<?php echo T_('Version') ?>
 				</th>
 				<th width="10%" align="center">
-				Date
+				<?php echo T_('Date') ?>
 				</th>
 				<th width="15%" align="left">
-				Author Email
+				<?php echo T_('Author Email') ?>
 				</th>
 				<th width="15%" align="left">
-				Author URL
+				<?php echo T_('Author URL') ?>
 				</th>
 			</tr>
 			<?php
@@ -121,7 +119,7 @@
 			<?php
 		} else {
 			?>
-			There are no non-core, custom mambots installed.
+			<?php echo T_('There are no non-core, custom mambots installed.') ?>
 			<?php
 		}
 	}
diff -ruN 4.5.4/administrator/components/com_installer/mambot/mambot.php 4.6rc2/administrator/components/com_installer/mambot/mambot.php
--- 4.5.4/administrator/components/com_installer/mambot/mambot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/mambot/mambot.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,93 +1,93 @@
-<?php
-/**
-* @version $Id: mambot.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
-* @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-* */
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-// ensure user has access to this function
-if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
-}
-
-require_once( $mainframe->getPath( 'installer_html', 'mambot' ) );
-
-HTML_installer::showInstallForm( 'Install new Mambots', $option, 'mambot', '', dirname(__FILE__) );
-?>
-<table class="content">
-<?php
-writableCell( 'media' );
-writableCell( 'language' );
-writableCell( 'mambots' );
-writableCell( 'mambots/content' );
-writableCell( 'mambots/search' );
-?>
-</table>
-<?php
-showInstalledMambots( $option );
-
-function showInstalledMambots( $_option ) {
-	global $database, $mosConfig_absolute_path;
-
-	$database->setQuery( "SELECT id, name, folder, element, client_id"
-	. "\n FROM #__mambots"
-	. "\n WHERE iscore='0'"
-	. "\n ORDER BY folder, name"
-	);
-	$rows = $database->loadObjectList();
-
-	// path to mambot directory
-	$mambotBaseDir	= mosPathName( mosPathName( $mosConfig_absolute_path ) . "mambots" );
-
-	$id = 0;
-	$n = count( $rows );
-	for ($i = 0; $i < $n; $i++) {
-	    $row =& $rows[$i];
-		// xml file for module
-		$xmlfile = $mambotBaseDir. "/" .$row->folder . '/' . $row->element .".xml";
-
-		if (file_exists( $xmlfile )) {
-			$xmlDoc =& new DOMIT_Lite_Document();
-			$xmlDoc->resolveErrors( true );
-			if (!$xmlDoc->loadXML( $xmlfile, false, true )) {
-				continue;
-			}
-
-			$element = &$xmlDoc->documentElement;
-
-			if ($element->getTagName() != 'mosinstall') {
-				continue;
-			}
-			if ($element->getAttribute( "type" ) != "mambot") {
-				continue;
-			}
-
-			$element = &$xmlDoc->getElementsByPath('creationDate', 1);
-			$row->creationdate = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('author', 1);
-			$row->author = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('copyright', 1);
-			$row->copyright = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('authorEmail', 1);
-			$row->authorEmail = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('authorUrl', 1);
-			$row->authorUrl = $element ? $element->getText() : '';
-
-			$element = &$xmlDoc->getElementsByPath('version', 1);
-			$row->version = $element ? $element->getText() : '';
-		}
-	}
-
-	HTML_mambot::showInstalledMambots($rows, $_option, $id, $xmlfile );
-}
-?>
\ No newline at end of file
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Installer
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+// ensure user has access to this function
+if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
+}
+
+require_once( $mainframe->getPath( 'installer_html', 'mambot' ) );
+
+showInstalledMambots( $option );
+
+function showInstalledMambots( $_option ) {
+	global $database, $mosConfig_absolute_path;
+
+	$database->setQuery( "SELECT id, name, folder, element, client_id"
+	. "\n FROM #__mambots"
+	. "\n WHERE iscore='0'"
+	. "\n ORDER BY folder, name"
+	);
+	$rows = $database->loadObjectList();
+
+	// path to mambot directory
+	$mambotBaseDir	= mosPathName($mosConfig_absolute_path.'/mambots');
+
+	$id = 0;
+	$n = count( $rows );
+	for ($i = 0; $i < $n; $i++) {
+	    $row =& $rows[$i];
+		// xml file for module
+		$xmlfile = mosPathName ($mambotBaseDir.$row->folder).$row->element.".xml";
+
+		if (file_exists( $xmlfile )) {
+			$parser =& new mosXMLDescription($xmlfile);
+			if ($parser->getType() != 'mambot') continue;
+			$row->creationdate = $parser->getCreationDate('mambot');
+			$row->author = $parser->getAuthor('mambot');
+			$row->copyright = $parser->getCopyright('mambot');
+			$row->authorEmail = $parser->getAuthorEmail('mambot');
+			$row->authorUrl = $parser->getAuthorUrl('mambot');
+			$row->version = $parser->getVersion('mambot');
+
+/*			$xmlDoc =& new DOMIT_Lite_Document();
+			$xmlDoc->resolveErrors( true );
+			if (!$xmlDoc->loadXML( $xmlfile, false, true )) {
+				continue;
+			}
+
+			$element = &$xmlDoc->documentElement;
+
+			if ($element->getTagName() != 'mosinstall') {
+				continue;
+			}
+			if ($element->getAttribute( "type" ) != "mambot") {
+				continue;
+			}
+
+			$element = &$xmlDoc->getElementsByPath('creationDate', 1);
+			$row->creationdate = $element ? $element->getText() : '';
+
+			$element = &$xmlDoc->getElementsByPath('author', 1);
+			$row->author = $element ? $element->getText() : '';
+
+			$element = &$xmlDoc->getElementsByPath('copyright', 1);
+			$row->copyright = $element ? $element->getText() : '';
+
+			$element = &$xmlDoc->getElementsByPath('authorEmail', 1);
+			$row->authorEmail = $element ? $element->getText() : '';
+
+			$element = &$xmlDoc->getElementsByPath('authorUrl', 1);
+			$row->authorUrl = $element ? $element->getText() : '';
+
+			$element = &$xmlDoc->getElementsByPath('version', 1);
+			$row->version = $element ? $element->getText() : '';
+*/
+		}
+	}
+
+	HTML_mambot::showInstalledMambots($rows, $_option, $id, $xmlfile );
+}
+?>
diff -ruN 4.5.4/administrator/components/com_installer/module/module.class.php 4.6rc2/administrator/components/com_installer/module/module.class.php
--- 4.5.4/administrator/components/com_installer/module/module.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/module/module.class.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,184 +0,0 @@
-<?php
-/**
-* @version $Id: module.class.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
-* @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-* */
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* Module installer
-* @package Mambo
-*/
-class mosInstallerModule extends mosInstaller {
-	/**
-	* Custom install method
-	* @param boolean True if installing from directory
-	*/
-	function install( $p_fromdir = null ) {
-		global $mosConfig_absolute_path, $database;
-
-		if (!$this->preInstallCheck( $p_fromdir, 'module' )) {
-			return false;
-		}
-
-		$xml = $this->xmlDoc();
-		$mosinstall =& $xml->documentElement;
-
-		$client = '';
-		if ($mosinstall->getAttribute( 'client' )) {
-		    $validClients = array( 'administrator' );
-			if (!in_array( $mosinstall->getAttribute( 'client' ), $validClients )) {
-				$this->setError( 1, 'Unknown client type ['.$mosinstall->getAttribute( 'client' ).']' );
-				return false;
-			}
-			$client = 'admin';
-		}
-
-		// Set some vars
-		$e = &$xml->getElementsByPath('name',1);
-		$this->elementName($e->getText());
-		$this->elementDir( mosPathName( $mosConfig_absolute_path
-		    . ($client == 'admin' ? '/administrator' : '')
-			. '/modules/' )
-		);
-
-		if ($this->parseFiles( 'files', 'module', 'No file is marked as module file' ) === false) {
-		    return false;
-		}
-		$this->parseFiles( 'images' );
-
-		$client_id = intval( $client == 'admin' );
-		// Insert in module in DB
-		$database->setQuery( "SELECT id FROM #__modules"
-			. "\nWHERE module = '" . $this->elementSpecial() . "' AND client_id=$client_id" );
-		if (!$database->query()) {
-			$this->setError( 1, 'SQL error: ' . $database->stderr( true ) );
-			return false;
-		}
-
-		$id = $database->loadResult();
-
-		if (!$id) {
-			$row = new mosModule( $database );
-			$row->title = $this->elementName();
-			$row->ordering = 99;
-			$row->position = 'left';
-			$row->showtitle = 1;
-			$row->iscore = 0;
-			$row->access = $client == 'admin' ? 99 : 0;
-			$row->client_id = $client_id;
-			$row->module = $this->elementSpecial();
-
-			$row->store();
-
-			$database->setQuery( "INSERT INTO #__modules_menu VALUES ('$row->id', 0)" );
-			if(!$database->query()) {
-				$this->setError( 1, 'SQL error: ' . $database->stderr( true ) );
-				return false;
-			}
-		} else {
-			$this->setError( 1, 'Module "' . $this->elementName() . '" already exists!' );
-			return false;
-		}
-		if ($e = &$xml->getElementsByPath( 'description', 1 )) {
-			$this->setError( 0, $this->elementName() . '<p>' . $e->getText() . '</p>' );
-		}
-
-		return $this->copySetupFile('front');
-	}
-	/**
-	* Custom install method
-	* @param int The id of the module
-	* @param string The URL option
-	* @param int The client id
-	*/
-	function uninstall( $id, $option, $client=0 ) {
-		global $database, $mosConfig_absolute_path;
-
-		$id = intval( $id );
-
-		$query = "SELECT module, iscore, client_id FROM #__modules WHERE id = '$id'";
-		$database->setQuery( $query );
-		$row = null;
-		$database->loadObject( $row );
-
-		if ($row->iscore) {
-			HTML_installer::showInstallMessage( $row->title .'is a core module, and can not be uninstalled.<br />You need to unpublish it if you don\'t want to use it', 'Uninstall -  error', $this->returnTo( $option, 'module', $row->client_id ? '' : 'admin' ) );
-			exit();
-		}
-
-		$query = "SELECT id FROM #__modules WHERE module = '$row->module'";
-		$database->setQuery( $query );
-		$modules = $database->loadResultArray();
-
-		if (count( $modules )) {
-			$query = "DELETE FROM #__modules_menu"
-			. "\n WHERE moduleid IN ('".implode( "','", $modules ) ."')"
-			;
-			$database->setQuery( $query );
-			if (!$database->query()) {
-			    $msg = $database->stderr;
-			    die( $msg );
-			}
-		}
-
-		$query = "DELETE FROM #__modules WHERE module = '$row->module'";
-		$database->setQuery( $query );
-		if (!$database->query()) {
-		    $msg = $database->stderr;
-		    die( $msg );
-		}
-
-		if ( $row->client_id ) {
-			$basepath = $mosConfig_absolute_path . '/administrator/modules/';
-		} else {
-			$basepath = $mosConfig_absolute_path . '/modules/';
-		}
-
-  		$xmlfile = $basepath . $row->module . '.xml';
-
-			// see if there is an xml install file, must be same name as element
-		if (file_exists( $xmlfile )) {
-			$this->i_xmldoc =& new DOMIT_Lite_Document();
-			$this->i_xmldoc->resolveErrors( true );
-
-			if ($this->i_xmldoc->loadXML( $xmlfile, false, true )) {
-				$mosinstall =& $this->i_xmldoc->documentElement;
-				// get the files element
-				$files_element =& $mosinstall->getElementsByPath( 'files', 1 );
-				if (!is_null( $files_element )) {
-					$files = $files_element->childNodes;
-					foreach ($files as $file) {
-						// delete the files
-						$filename = $file->getText();
-						if (file_exists( $basepath . $filename )) {
-							$parts = pathinfo( $filename );
-							$subpath = $parts['dirname'];
-							if ($subpath <> '' && $subpath <> '.' && $subpath <> '..') {
-								echo '<br />Deleting: '. $basepath . $subpath;
-								$result = deldir(mosPathName( $basepath . $subpath . '/' ));
-							} else {
-								echo '<br />Deleting: '. $basepath . $filename;
-								$result = unlink( mosPathName ($basepath . $filename, false));
-							}
-							echo intval( $result );
-						}
-					}
-
-					// remove XML file from front
-					echo "Deleting XML File: $xmlfile";
-					@unlink(  mosPathName ($xmlfile, false ) );
-					return true;
-				}
-			}
-		}
-
-	}
-}
-?>
diff -ruN 4.5.4/administrator/components/com_installer/module/module.html.php 4.6rc2/administrator/components/com_installer/module/module.html.php
--- 4.5.4/administrator/components/com_installer/module/module.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/module/module.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: module.html.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Installer
-*/
 class HTML_module {
 
 	function showInstalledModules( &$rows, $option, &$xmlfile, &$lists ) {
@@ -24,10 +22,10 @@
 			<table class="adminheading">
 			<tr>
 				<th class="install">
-				Installed Modules
+				<?php echo T_('Installed Modules') ?>
 				</th>
 				<td>
-				Filter:
+				<?php echo T_('Filter:') ?>
 				</td>
 				<td width="right">
 				<?php echo $lists['filter'];?>
@@ -35,7 +33,7 @@
 			</tr>
 			<tr>
 				<td colspan="3">
-				Only those Modules that can be uninstalled are displayed - some Core Modules cannot be removed.
+				<?php echo T_('Only those Modules that can be uninstalled are displayed - some Core Modules cannot be removed.') ?>
 				<br /><br />
 				</td>
 			</tr>
@@ -44,25 +42,25 @@
 			<table class="adminlist">
 			<tr>
 				<th width="20%" class="title">
-				Module File
+				<?php echo T_('Module File') ?>
 				</th>
 				<th width="10%" align="left">
-				Client
+				<?php echo T_('Client') ?>
 				</th>
 				<th width="10%" align="left">
-				Author
+				<?php echo T_('Author') ?>
 				</th>
 				<th width="5%" align="center">
-				Version
+				<?php echo T_('Version') ?>
 				</th>
 				<th width="10%" align="center">
-				Date
+				<?php echo T_('Date') ?>
 				</th>
 				<th width="15%" align="left">
-				Author Email
+				<?php echo T_('Author Email') ?>
 				</th>
 				<th width="15%" align="left">
-				Author URL
+				<?php echo T_('Author URL') ?>
 				</th>
 			</tr>
 			<?php
@@ -74,7 +72,7 @@
 					<td>
 					<input type="radio" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $row->id; ?>" onclick="isChecked(this.checked);"><span class="bold"><?php echo $row->module; ?></span></td>
 					<td>
-					<?php echo $row->client_id == "0" ? 'Site' : 'Administrator'; ?>
+					<?php echo $row->client_id == "0" ? T_('Site') : T_('Administrator'); ?>
 					</td>
 					<td>
 					<?php echo @$row->author != "" ? $row->author : "&nbsp;"; ?>
@@ -98,7 +96,7 @@
 		} else {
 			?>
 			<td class="small">
-			No custom modules installed
+			<?php echo T_('No custom modules installed') ?>
 			</td>
 			<?php
 		}
diff -ruN 4.5.4/administrator/components/com_installer/module/module.php 4.6rc2/administrator/components/com_installer/module/module.php
--- 4.5.4/administrator/components/com_installer/module/module.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/module/module.php	2006-02-22 07:31:46.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: module.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -13,21 +15,11 @@
 
 // ensure user has access to this function
 if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'installer_html', 'module' ) );
 
-HTML_installer::showInstallForm( 'Install new Modules', $option, 'module', '', dirname(__FILE__) );
-?>
-<table class="content">
-<?php
-writableCell( 'media' );
-writableCell( 'administrator/modules' );
-writableCell( 'modules' );
-?>
-</table>
-<?php
 showInstalledModules( $option );
 
 /**
@@ -37,22 +29,22 @@
 	global $database, $mosConfig_absolute_path;
 
 	$filter = mosGetParam( $_POST, 'filter', '' );
-	$select[] = mosHTML::makeOption( '', 'All' );
-	$select[] = mosHTML::makeOption( '0', 'Site Modules' );
-	$select[] = mosHTML::makeOption( '1', 'Admin Modules' );
+	$select[] = mosHTML::makeOption( '', T_('All') );
+	$select[] = mosHTML::makeOption( '0', T_('Site Modules') );
+	$select[] = mosHTML::makeOption( '1', T_('Admin Modules') );
 	$lists['filter'] = mosHTML::selectList( $select, 'filter', 'class="inputbox" size="1" onchange="document.adminForm.submit();"', 'value', 'text', $filter );
 	if ( $filter == NULL ) {
-		$and = '';
+		$_and = '';
 	} else if ( !$filter ) {
-		$and = "\n AND client_id = '0'";
+		$_and = "\n AND client_id = '0'";
 	} else if ( $filter ) {
-		$and = "\n AND client_id = '1'";
+		$_and = "\n AND client_id = '1'";
 	}
 
 	$database->setQuery( "SELECT id, module, client_id"
 		. "\n FROM #__modules"
 		. "\n WHERE module LIKE 'mod_%' AND iscore='0'"
-		. $and
+		. $_and
 		. "\n GROUP BY module, client_id"
 		. "\n ORDER BY client_id, module"
 	);
@@ -64,15 +56,24 @@
 
 		// path to module directory
 		if ($row->client_id == "1"){
-			$moduleBaseDir	= mosPathName( mosPathName( $mosConfig_absolute_path ) . "administrator/modules" );
+			$moduleBaseDir	= mosPathName($mosConfig_absolute_path.'/administrator/modules');
 		} else {
-			$moduleBaseDir	= mosPathName( mosPathName( $mosConfig_absolute_path ) . "modules" );
+			$moduleBaseDir	= mosPathName($mosConfig_absolute_path.'/modules');
 		}
 
 		// xml file for module
-		$xmlfile = $moduleBaseDir. "/" .$row->module .".xml";
+		$xmlfile = $moduleBaseDir.$row->module.".xml";
 
 		if (file_exists( $xmlfile )) {
+			$parser =& new mosXMLDescription($xmlfile);
+			if ($parser->getType() != 'module') continue;
+			$row->creationdate = $parser->getCreationDate('module');
+			$row->author = $parser->getAuthor('module');
+			$row->copyright = $parser->getCopyright('module');
+			$row->authorEmail = $parser->getAuthorEmail('module');
+			$row->authorUrl = $parser->getAuthorUrl('module');
+			$row->version = $parser->getVersion('module');
+/*
 			$xmlDoc =& new DOMIT_Lite_Document();
 			$xmlDoc->resolveErrors( true );
 			if (!$xmlDoc->loadXML( $xmlfile, false, true )) {
@@ -105,6 +106,7 @@
 
 			$element = &$xmlDoc->getElementsByPath( 'version', 1 );
 			$row->version = $element ? $element->getText() : '';
+*/
     	}
 	}
 
diff -ruN 4.5.4/administrator/components/com_installer/template/template.class.php 4.6rc2/administrator/components/com_installer/template/template.class.php
--- 4.5.4/administrator/components/com_installer/template/template.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/template/template.class.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,115 +0,0 @@
-<?php
-/**
-* @version $Id: template.class.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @subpackage Installer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-// ensure user has access to this function
-if (!$acl->acl_check( 'administration', 'manage', 'users', $GLOBALS['my']->usertype, 'components', 'com_templates' )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
-}
-
-/**
-* Template installer
-* @package Mambo
-* @subpackage Installer
-*/
-class mosInstallerTemplate extends mosInstaller {
-	/**
-	* Custom install method
-	* @param boolean True if installing from directory
-	*/
-	function install( $p_fromdir = null ) {
-		global $mosConfig_absolute_path,$database;
-
-		if (!$this->preInstallCheck( $p_fromdir, 'template' )) {
-			return false;
-		}
-
-		$xml =& $this->xmlDoc();
-		$mosinstall =& $xml->documentElement;
-
-		$client = '';
-		if ($mosinstall->getAttribute( 'client' )) {
-			$validClients = array( 'administrator' );
-			if (!in_array( $mosinstall->getAttribute( 'client' ), $validClients )) {
-				$this->setError( 1, 'Unknown client type ['.$mosinstall->getAttribute( 'client' ).']' );
-				return false;
-			}
-			$client = 'admin';
-		}
-
-		// Set some vars
-		$e = &$xml->getElementsByPath('name',1);
-		$this->elementName($e->getText());
-		$this->elementDir( mosPathName( $mosConfig_absolute_path
-		. ($client == 'admin' ? '/administrator' : '')
-		. '/templates/' . strtolower(str_replace(" ","_",$this->elementName())))
-		);
-
-		if (!file_exists( $this->elementDir() ) && !mosMakePath( $this->elementDir() )) {
-			$this->setError(1, 'Failed to create directory "' . $this->elementDir() . '"' );
-			return false;
-		}
-
-		if ($this->parseFiles( 'files' ) === false) {
-			return false;
-		}
-		if ($this->parseFiles( 'images' ) === false) {
-			return false;
-		}
-		if ($this->parseFiles( 'css' ) === false) {
-			return false;
-		}
-		if ($this->parseFiles( 'media' ) === false) {
-			return false;
-		}
-		if ($e = &$xml->getElementsByPath( 'description', 1 )) {
-			$this->setError( 0, $this->elementName() . '<p>' . $e->getText() . '</p>' );
-		}
-
-		return $this->copySetupFile('front');
-	}
-	/**
-	* Custom install method
-	* @param int The id of the module
-	* @param string The URL option
-	* @param int The client id
-	*/
-	function uninstall( $id, $option, $client=0 ) {
-		global $database, $mosConfig_absolute_path;
-
-		// Delete directories
-		$path = $mosConfig_absolute_path
-		. ($client == 'admin' ? '/administrator' : '' )
-		. '/templates/' . $id;
-
-		$id = str_replace( '..', '', $id );
-		if (trim( $id )) {
-			if (is_dir( $path )) {
-				return deldir( mosPathName( $path ) );
-			} else {
-				HTML_installer::showInstallMessage( 'Directory does not exist, cannot remove files', 'Uninstall -  error',
-					$this->returnTo( $option, 'template', $client ) );
-			}
-		} else {
-			HTML_installer::showInstallMessage( 'Template id is empty, cannot remove files', 'Uninstall -  error',
-				$this->returnTo( $option, 'template', $client ) );
-			exit();
-		}
-	}
-	/**
-	* return to method
-	*/
-	function returnTo( $option, $element, $client ) {
-		return "index2.php?option=com_templates&client=$client";
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_installer/template/template.php 4.6rc2/administrator/components/com_installer/template/template.php
--- 4.5.4/administrator/components/com_installer/template/template.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/template/template.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: template.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -13,7 +15,7 @@
 
 // ensure user has access to this function
 if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 $client = mosGetParam( $_REQUEST, 'client', '' );
@@ -21,9 +23,9 @@
 $userfile = mosGetParam( $_REQUEST, 'userfile', dirname( __FILE__ ) );
 $userfile = mosPathName( $userfile );
 
-HTML_installer::showInstallForm( 'Install new Template <small><small>[ ' . ($client == 'admin' ? 'Administrator' : 'Site') .' ]</small></small>',
+HTML_installer::showInstallForm( T_('Install new Template').' <small><small>[ ' . ($client == 'admin' ? T_('Administrator') : T_('Site')) .' ]</small></small>',
 	$option, 'template', $client, $userfile,
-	'<a href="index2.php?option=com_templates&client='.$client.'">Back to Templates</a>'
+	'<a href="index2.php?option=com_templates&client='.$client.'">'.T_('Back to Templates').'</a>'
 );
 ?>
 <table class="content">
diff -ruN 4.5.4/administrator/components/com_installer/toolbar.installer.html.php 4.6rc2/administrator/components/com_installer/toolbar.installer.html.php
--- 4.5.4/administrator/components/com_installer/toolbar.installer.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/toolbar.installer.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,30 +1,32 @@
 <?php
 /**
-* @version $Id: toolbar.installer.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
-/**
-* @package Mambo
-* @subpackage Installer
-*/
 class TOOLBAR_installer
 {
 	function _DEFAULT()	{
 		mosMenuBar::startTable();
-		mosMenuBar::help( '453.screen.installer.lang' );
+		if ($GLOBALS['task'] == 'thesource') {
+		    mosMenuBar::help( 'source' );
+		} else {
+		    mosMenuBar::help( 'universal' );
+		}
 		mosMenuBar::endTable();
 	}
 
-	function _DEFAULT2()	{
+	function _DEFAULT2($element)	{
 		mosMenuBar::startTable();
-		mosMenuBar::deleteList( '', 'remove', 'Uninstall' );
+		mosMenuBar::deleteList( '', 'remove', T_('Uninstall'));
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.installer.cmm' );
+		mosMenuBar::help( $element );
 		mosMenuBar::endTable();
 	}
 
diff -ruN 4.5.4/administrator/components/com_installer/toolbar.installer.php 4.6rc2/administrator/components/com_installer/toolbar.installer.php
--- 4.5.4/administrator/components/com_installer/toolbar.installer.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_installer/toolbar.installer.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: toolbar.installer.php,v 1.1 2005/07/22 01:52:29 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Installer
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -21,7 +23,7 @@
 	default:
 	    $element = mosGetParam( $_REQUEST, 'element', '' );
 	    if ($element == 'component' || $element == 'module' || $element == 'mambot') {
-			TOOLBAR_installer::_DEFAULT2();
+			TOOLBAR_installer::_DEFAULT2($element);
 		} else {
 			TOOLBAR_installer::_DEFAULT();
 		}
diff -ruN 4.5.4/administrator/components/com_installer/universal/universal.php 4.6rc2/administrator/components/com_installer/universal/universal.php
--- 4.5.4/administrator/components/com_installer/universal/universal.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_installer/universal/universal.php	2006-05-14 18:16:29.000000000 -0500
@@ -0,0 +1,51 @@
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Installer
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+// ensure user has access to this function
+//if ( !$acl->acl_check( 'administration', 'install', 'users', $my->usertype, $element . 's', 'all' ) ) {
+//	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
+//}
+
+require_once( $mainframe->getPath( 'installer_html', 'component' ) );
+
+$suppress_install = false;
+if (!$suppress_install) {
+HTML_installer::showInstallForm( T_('Install Mambo plugin (component, module, mambot, template, include, parameter, composite)'), $option, 'universal', '', dirname(__FILE__) );
+?>
+<table class="content">
+<?php
+writableCell( 'media' );
+writableCell( 'administrator/components' );
+writableCell( 'components' );
+writableCell( 'administrator/modules' );
+writableCell( 'modules' );
+writableCell( 'mambots' );
+writableCell( 'mambots/content' );
+writableCell( 'mambots/editors' );
+writableCell( 'mambots/editors-xtd' );
+writableCell( 'mambots/search' );
+writableCell( 'administrator/templates' );
+writableCell( 'templates' );
+writableCell( 'includes' );
+writableCell( 'administrator/includes' );
+writableCell( 'parameters' );
+writableCell( 'images/stories' );
+writableCell( 'uploadfiles' );
+?>
+</table>
+<?php
+}
+
+?>
diff -ruN 4.5.4/administrator/components/com_languages/actions/apply.action.php 4.6rc2/administrator/components/com_languages/actions/apply.action.php
--- 4.5.4/administrator/components/com_languages/actions/apply.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/apply.action.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,59 @@
+<?php
+class applyAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        
+        $domain     = $_POST['domain'];
+        $textdomain = $_POST['textdomain'];
+        $lang       = $_POST['lang'];
+
+        
+        $catalog = new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', 'po');
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+
+        $catalog->setComments($_POST['comments']);
+        $catalog->setHeaders($_POST['headers']);        
+
+        foreach ($_POST as $key => $value) {
+            if (preg_match('/^([a-z]+)[_]?([0-9]+)?_([0-9]+)$/', $key, $matches))  {
+                switch ($matches[1])
+                {
+                    case 'msgid':
+                    $messages[$matches[3]]['msgid'] = $value;
+                    break;
+                    case 'msgid_plural':
+                    $messages[$matches[3]]['msgid_plural'] = $value;
+                    break;
+                    case 'msgstr':
+                    if ($matches[2] != '') {
+                        $messages[$matches[3]]['msgstr'][$matches[2]] =  stripslashes($value);
+                    } else {
+                        $messages[$matches[3]]['msgstr'] =  stripslashes($value);
+                    }
+                    break;
+                    case 'fuzzy':
+                    $messages[$matches[3]]['fuzzy'] = $value == 'true' ? true : false;
+                    break;
+                }
+            }
+        }
+        foreach ($messages as $index => $arr) {
+            if (strcmp($catalog->strings[$index]->msgid, $arr['msgid']) == 0) {
+                $catalog->strings[$index]->setmsgstr($arr['msgstr']);
+                if ($arr['fuzzy']) {
+                    $catalog->strings[$index]->setfuzzy($arr['fuzzy']);
+                }
+            }
+        }
+        $catalog->save();        
+        
+        if ($request->get('act') == 'catalogs') {
+            $request->set('domain', $domain);
+        }
+        $controller->view('edit');
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/auto_translate.action.php 4.6rc2/administrator/components/com_languages/actions/auto_translate.action.php
--- 4.5.4/administrator/components/com_languages/actions/auto_translate.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/auto_translate.action.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,63 @@
+<?php
+class auto_translateAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        #FIXME
+        $domain     = $_POST['domain'];
+        $textdomain = $_POST['textdomain'];
+        $lang       = $_POST['lang'];
+
+        $language = new mamboLanguage($lang, $textdomain);
+        $catalog = new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', 'po');
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+
+        $catalog->setComments($_POST['comments']);
+        $catalog->setHeaders($_POST['headers']);        
+
+        foreach ($_POST as $key => $value) {
+            if (preg_match('/^([a-z]+)[_]?([0-9]+)?_([0-9]+)$/', $key, $matches))  {
+                switch ($matches[1])
+                {
+                    case 'msgid':
+                    $messages[$matches[3]]['msgid'] = $value;
+                    break;
+                    case 'msgid_plural':
+                    $messages[$matches[3]]['msgid_plural'] = $value;
+                    break;
+                    case 'msgstr':
+                    if ($matches[2] != '') {
+                        $messages[$matches[3]]['msgstr'][$matches[2]] =  stripslashes($value);
+                    } else {
+                        $messages[$matches[3]]['msgstr'] =  stripslashes($value);
+                    }
+                    break;
+                    case 'fuzzy':
+                    $messages[$matches[3]]['fuzzy'] = $value == 'true' ? true : false;
+                    break;
+                }
+            }
+        }
+        foreach ($messages as $index => $arr) {
+            if (strcmp($catalog->strings[$index]->msgid, $arr['msgid']) == 0) {
+                $catalog->strings[$index]->setmsgstr($arr['msgstr']);
+                if ($arr['fuzzy']) {
+                    $catalog->strings[$index]->setfuzzy($arr['fuzzy']);
+                }
+            }
+        }
+        $catalog->save();        
+        
+        $gettext_admin = new PHPGettextAdmin();
+        $gettext_admin->update_translation($domain, $textdomain, $lang);
+
+        if ($request->get('act') == 'catalogs') {
+            $request->set('domain', $domain);
+        }
+        $controller->view('edit');
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/cancel.action.php 4.6rc2/administrator/components/com_languages/actions/cancel.action.php
--- 4.5.4/administrator/components/com_languages/actions/cancel.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/cancel.action.php	2006-04-11 19:03:38.000000000 -0500
@@ -0,0 +1,13 @@
+<?php
+class cancelAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        if (isset($_POST['catalogs'])) {
+            $_REQUEST['act'] = 'language';
+        }
+        $controller->redirect('index', mosGetParam($_REQUEST, 'act', $act));
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/convert.action.php 4.6rc2/administrator/components/com_languages/actions/convert.action.php
--- 4.5.4/administrator/components/com_languages/actions/convert.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/convert.action.php	2006-06-11 11:05:40.000000000 -0500
@@ -0,0 +1,37 @@
+<?php
+class convertAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+
+        $from_charset   = $_POST['charset'];
+        $to_charset     = $_POST['newcharset'];
+        $lang           = $_POST['language'];
+        $textdomain = mamboCore::get('rootPath')."/language";
+
+        $language = new mamboLanguage($lang);
+        $language->load();
+        $language->charset = $to_charset;
+        $language->save();
+        
+        $gettext_admin = new PHPGettextAdmin();
+        foreach ($language->files as $arr) { 
+            $gettext_admin->convert_charset($arr['domain'], $textdomain, $lang, $from_charset, $to_charset);                                    
+            $gettext_admin->message_format($arr['domain'], $textdomain, $lang);            
+        }
+        
+        #return $controller->redirect('index', 'language');
+
+        $request->set('task', 'edit');
+        $request->set('act', 'language');
+        $request->set('lang', $lang);
+        $controller->view('edit');
+        #
+
+        /*$admin = new PHPGettextAdmin();
+        $admin->convert_encoding($catalog, $from, $to);
+        dump(iconv_get_encoding());*/
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/default.action.php 4.6rc2/administrator/components/com_languages/actions/default.action.php
--- 4.5.4/administrator/components/com_languages/actions/default.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/default.action.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,32 @@
+<?php
+class defaultAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $lang = mosGetParam( $_REQUEST, 'lang' ); 
+        $root = mamboCore::get('rootPath');            
+        $fp = fopen("../configuration.php","r");
+        $config = "";
+        $session =& $request->session();
+        
+     
+        while(!feof($fp)){
+            $buffer = fgets($fp,4096);
+            if (strstr($buffer,"\$mosConfig_lang =")){
+                $config .= "\$mosConfig_lang = \"{$lang}\";\n";
+            } else {
+                $config .= $buffer;
+            }
+        }
+        fclose($fp);
+        if ($fp = fopen("../configuration.php","w")){
+            fputs($fp, $config, strlen($config));
+            fclose($fp);
+            $session['mosmsg'] =  T_('Default Language succesfully updated!');
+        } else {
+            $session['mosmsg'] =  T_('Error! Make sure that configuration.php is writeable.');
+        }                   
+        return $controller->redirect();
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/edit.action.php 4.6rc2/administrator/components/com_languages/actions/edit.action.php
--- 4.5.4/administrator/components/com_languages/actions/edit.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/edit.action.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,12 @@
+<?php
+class editAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        if ($request->get('act') == 'catalogs') {
+            $request->set('domain', $_REQUEST['domain']);
+        }
+        $controller->view('edit');
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/export.action.php 4.6rc2/administrator/components/com_languages/actions/export.action.php
--- 4.5.4/administrator/components/com_languages/actions/export.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/export.action.php	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,31 @@
+<?php
+class exportAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $root = mamboCore::get('rootPath');
+        include($root.'/administrator/includes/pcl/pclzip.lib.php');
+        chdir($root);
+        $lang = mosGetParam($_POST, 'lang', '');
+        $language = new mamboLanguage($lang);
+        $language->load(true);
+        $zipfile = "$root/language/MamboLanguage_$lang.zip";
+        $archive = new PclZip($zipfile);
+        $archive->create( "$root/language/$lang.xml", PCLZIP_OPT_REMOVE_PATH, $root.'/language');
+        $archive->add("$root/language/glossary/$lang.po",  PCLZIP_OPT_REMOVE_PATH, $root.'/language');
+        foreach ($language->files as $file) {
+            $archive->add($root.'/'.$file['filename'], PCLZIP_OPT_REMOVE_PATH, $root.'/language');
+        }
+        
+        /*$zip = new PclZip("$root/MamboLanguage_$lang.zip");
+        dump($zip->extract());      
+        dump($zip);  ;*/
+        header("Content-Type: application/octet-stream");
+        header("Content-Disposition: attachment; filename=MamboLanguage_$lang.zip");
+        #header("Content-length: ".filesize($zipfile));
+        readfile($zipfile);
+        exit(0);        
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/extract.action.php 4.6rc2/administrator/components/com_languages/actions/extract.action.php
--- 4.5.4/administrator/components/com_languages/actions/extract.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/extract.action.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,188 @@
+<?php
+class extractAction extends Action
+{
+
+    function execute(&$controller, &$request)
+    {
+        //if (!isset($_POST['domain']))
+
+        $path = mamboCore::get('rootPath');
+        $frontpaths  = array("$path/templates", "$path/modules", "$path/includes");
+        $adminpaths  = array("$path/administrator/modules", "$path/administrator/popups", "$path/administrator/includes", "$path/administrator/templates");
+        $cmtpaths = array_merge(glob("$path/administrator/components/com*"), glob("$path/components/com*"));
+
+        foreach ($cmtpaths as $p) {
+            preg_match('/com_(.*)$/', $p, $matches);
+            $components[$matches[1]][]  =  $p;
+        }
+
+        $dir = $path.'/language/untranslated';
+        // only continue if we have no .pot files
+        if (!is_dir($dir)) {
+            @mkdir($dir);
+        } else {
+            return $controller->redirect('index', 'language');
+        }/**/
+
+        set_time_limit(300);
+        if (!file_exists("$dir/installation.pot")) {
+            $this->extract('installation', array($path.'/installation'));
+        }
+        if (!file_exists("$dir/frontend.pot")) {
+            $this->extract('frontend', $frontpaths);
+        }
+        if (!file_exists("$dir/administrator.pot")) {
+            $this->extract('administrator', $adminpaths);
+        }
+
+        foreach ($components as $name => $dirs) {
+            if (!file_exists("$dir/$name.pot")) {
+                $this->extract($name, $dirs);
+            }
+        }
+        $controller->redirect('index', 'language');
+        #$controller->view('language');
+
+    }
+
+    function extract($domain, $scandirs, $language='untranslated')
+    {
+
+        $path = mamboCore::get('rootPath');
+        $textdomain = $path.'/language';
+
+        if (!file_exists("$textdomain/$language/$domain.pot")) {
+            $catalog = new PHPGettext_Catalog($domain, $textdomain);
+            $catalog->setproperty('mode', _MODE_POT_);
+            $catalog->setproperty('lang', $language);
+            $headers = $this->header();
+            $catalog->setproperty('comments', $headers[0]);
+            $catalog->setproperty('headers', $headers[1]);
+            $catalog->save();
+        }
+
+        $this->scan_xml($domain, $textdomain, $scandirs, $language);
+        
+        $gettext_admin = new PHPGettextAdmin();
+        $cwd = getcwd();
+        chdir($path);
+
+        $php_sources = array();
+        if (is_array($scandirs))  {
+            foreach ($scandirs as $subdir)  {
+                $php_sources = array_merge($php_sources, $this->read_dir($subdir, 'php'));
+            }
+        } else {
+            $php_sources = $this->read_dir($scandirs, 'php');
+        }
+        $gettext_admin->xgettext($domain, $textdomain, $php_sources, $language);
+
+        chdir($cwd);
+
+        return true;
+    }
+
+    function scan_xml($domain, $path, $scandirs, $language='untranslated')
+    {
+        $catalog = new PHPGettext_Catalog($domain, $path);
+        $catalog->setproperty('mode', _MODE_POT_);
+        $catalog->setproperty('lang', $language);
+        $catalog->load();
+        $xml_sources = array();
+        if (is_array($scandirs))  {
+            foreach ($scandirs as $subdir)  {
+                $xml_sources = array_merge($xml_sources, $this->read_dir($subdir, 'xml'));
+            }
+        } else {
+            $xml_sources = $this->read_dir($scandirs, 'xml');
+        }
+
+        if (count($xml_sources) > 0) {
+            $strings = array();
+            foreach ($xml_sources as $file) {
+                $p = xml_parser_create();
+                xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+                xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
+                xml_parse_into_struct($p, file_get_contents(mamboCore::get('rootPath').'/'.$file), $values);
+                xml_parser_free($p);
+                foreach($values as $key => $value)
+                {
+                    switch ($value['tag'])
+                    {
+                        case 'name':
+                        case 'description':
+                        case 'option':
+                        if (isset($value['value']) && strlen($value['value']) >=1) $strings[$file][] = $value['value'];
+                        break;
+                        case 'param':
+                        if (isset($value['attributes']) && $value['attributes']['type'] != 'spacer') {
+                            if (isset($value['attributes']['label'])) $strings[$file][] = $value['attributes']['label'];
+                            if (isset($value['attributes']['description'])) $strings[$file][] = $value['attributes']['description'];
+                        }
+                        break;
+                    }
+                }
+                if (is_array($strings[$file]))
+                $strings[$file] = array_values(array_unique($strings[$file]));
+            }
+            foreach ($strings as $file => $str) {
+                foreach ($str as $msg)
+                $messages[trim($msg)][] = '#: '.$file;
+            }
+            foreach ($messages as $msgid => $comments) {
+                if (!empty($msgid))
+                $catalog->addentry($msgid, null, null, $comments);#($msgid, $msgid_plural=null, $msgstr=null, $comments=array())
+            }
+            $catalog->save();
+        }
+    }
+
+    function read_dir($dir, $filetype='php')
+    {
+        static $root_path;
+        if (is_null($root_path))
+        $root_path = str_replace( '\\', '/', mamboCore::get('rootPath') );
+        $array = array();
+        $d = dir($dir);
+        while (false !== ($entry = $d->read())) {
+            if($entry!='.' && $entry!='..') {
+                $entry = "$dir/$entry";
+                $entry = str_replace( '\\', '/', $entry );
+                if(is_dir($entry)) {
+                    $array = array_merge($array, $this->read_dir($entry, $filetype));
+                } elseif (preg_match('/.'.$filetype.'$/', $entry)) {
+                    $array[] = str_replace($root_path.'/', '', $entry);
+                }
+            }
+        }
+        $d->close();
+        return $array;
+    }
+
+    function header($charset='utf-8', $plurals='nplurals=2; plural=n == 1 ? 0 : 1;'){
+        $year = date('Y');
+        $comments = <<<EOT
+# Mambo Open Source.
+# Copyright (C) 2005 - $year Mambo Foundation Inc.
+# This file is distributed under the same license as the Mambo package.
+# Translation Team <translation@mambo-foundation.org>, $year#
+#
+#, fuzzy
+EOT;
+        $comments = explode("\n", $comments);
+        $headers = array(
+        'Project-Id-Version'    => 'Mambo 4.6',
+        'Report-Msgid-Bugs-To'  => 'translation@mambo-foundation.org',
+        'POT-Creation-Date'     => date('Y-m-d h:iO'),
+        'PO-Revision-Date'      => date('Y-m-d h:iO'),
+        'Last-Translator'       => 'Translation <translation@mambo-foundation.org>',
+        'Language-Team'         => 'Translation <translation@mambo-foundation.org>',
+        'MIME-Version'          => '1.0',
+        'Content-Type'          => 'text/plain; charset='.$charset,
+        'Content-Transfer-Encoding' => '8bit',
+        'Plural-Forms'              => $plurals
+        );
+        return array($comments, $headers);
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/index.action.php 4.6rc2/administrator/components/com_languages/actions/index.action.php
--- 4.5.4/administrator/components/com_languages/actions/index.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/index.action.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,9 @@
+<?php
+class indexAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $controller->view(mosGetParam($_REQUEST, 'act', 'language'));
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/new.action.php 4.6rc2/administrator/components/com_languages/actions/new.action.php
--- 4.5.4/administrator/components/com_languages/actions/new.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/new.action.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,9 @@
+<?php
+class newAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $controller->view('edit');
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/publish.action.php 4.6rc2/administrator/components/com_languages/actions/publish.action.php
--- 4.5.4/administrator/components/com_languages/actions/publish.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/publish.action.php	2006-02-16 21:00:30.000000000 -0600
@@ -0,0 +1,45 @@
+<?php
+class publishAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $lang = mosGetParam( $_REQUEST, 'lang', array(0) ); 
+        $root = mamboCore::get('rootPath');            
+        $fp = fopen("../configuration.php","r");
+        $config = "";
+        
+        $langfile = $root.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR.$lang[0].'.xml';        
+        $p = xml_parser_create();
+        xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
+        xml_parse_into_struct($p, implode("", file($langfile)), $values);
+        xml_parser_free($p);
+        foreach($values as $key => $value)
+        {
+            if ($value['tag'] == 'param') {
+                $name = $value['attributes']['name'];
+                $language[$name] = $value['attributes']['default'];
+            }
+        }        
+        while(!feof($fp)){
+            $buffer = fgets($fp,4096);
+            if (strstr($buffer,"\$mosConfig_lang =")){
+                $config .= "\$mosConfig_lang = \"{$lang[0]}\";\n";
+            } elseif (strstr($buffer,"\$mosConfig_locale =")){
+                $config .= "\$mosConfig_locale = \"{$language['locale']}\";\n";
+            } else {
+                $config .= $buffer;
+            }
+        }
+        fclose($fp);
+        if ($fp = fopen("../configuration.php","w")){
+            fputs($fp, $config, strlen($config));
+            fclose($fp);
+            $request->setAttribute('msg', T_('Configuration succesfully updated!'));
+        } else {
+            $request->setAttribute('msg', T_('Error! Make sure that configuration.php is writeable.'));
+        }                   
+        return $controller->redirect();
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/remove.action.php 4.6rc2/administrator/components/com_languages/actions/remove.action.php
--- 4.5.4/administrator/components/com_languages/actions/remove.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/remove.action.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,23 @@
+<?php
+class removeAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $langpath = mamboCore::get('rootPath').'/language/';
+        if ($_POST['lang'] && $_POST['lang'] != 'en') {
+            @unlink($langpath.$_POST['lang'].'.xml');
+            $this->rmdir($langpath.$_POST['lang']);
+        }
+        $controller->redirect('index', mosGetParam($_REQUEST, 'act', 'language'));
+    }
+    function rmdir($dir) {
+        if($files = glob($dir."/*")){
+            foreach($files as $file) {
+                is_dir($file)? $this->rmdir($file) : unlink($file);
+            }
+        }
+        rmdir($dir);
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/save.action.php 4.6rc2/administrator/components/com_languages/actions/save.action.php
--- 4.5.4/administrator/components/com_languages/actions/save.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/save.action.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,175 @@
+<?php
+class saveAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $iso639 = strtolower(mosGetParam($_POST, 'iso639'));
+        $iso3166 = mosGetParam($_POST, 'iso3166_2');
+        $lang  = $iso639;
+        $lang .= strlen($iso3166) == 2 ? '_'.$iso3166 : '';
+        $root = mamboCore::get('rootPath');
+        $langfile = $root.'/language/'.$lang.'.xml';
+
+        switch ($_POST['act'])
+        {
+            case 'language':
+            if (file_exists($langfile)) {
+                $this->updatelanguage($lang);
+                return $controller->redirect('index', 'language');
+            }
+            else {
+                $this->createlanguage($iso639, $iso3166);
+                $request->set('task', 'edit');
+                $request->set('act', 'language');
+                $request->set('lang', $lang);
+                return $controller->forward('edit');
+            }
+            break;
+
+            case 'catalogs':
+            default:
+            $this->updatecatalog();
+            return $controller->redirect('index', 'catalogs');
+            break;
+        }
+    }
+
+
+
+    function createLanguage($iso639, $iso3166) {
+        $locales = mamboLanguage::getLocales();
+        $default = $locales['locales'][$iso639];
+        $lang  = $iso639;
+        $lang .= strlen($iso3166) == 2 ? '_'.$iso3166 : '';
+        $language =& new mamboLanguage($lang);
+        foreach ($default as $k => $v) {
+            if (in_array($k, array_keys(get_class_vars(get_class($language))))) {
+                $language->$k = $v;
+            }
+        }
+        foreach ($_POST as $k => $v) {
+            if (in_array($k, array_keys(get_class_vars(get_class($language))))) {
+                $language->$k = $v;
+            }
+        }
+        $language->name = $lang;
+        $language->description = $language->title.' Locale';
+        if (!empty($language->territory)) $language->description .= ' For '.$language->territory;
+        $language->locale = $lang.'.'.$language->charset.','.$lang.','.$iso639.','.strtolower($language->title);
+        $language->creationdate = date('d-m-Y');
+        $language->author = 'Mambo Foundation Inc.';
+        $language->authorurl = 'http://www.mambo-foundation.org';
+        $language->authoremail = 'translation@mambo-foundation.org';
+        $language->copyright = '(C) 2005 - 2006 Mambo Foundation Inc.';
+        $language->license = 'http://www.gnu.org/copyleft/gpl.html GNU/GPL';
+        $language->setPlurals($_POST['plural_form']);
+
+        $textdomain = rtrim($language->path, '\/');
+        $dir = $textdomain.'/'.$language->name;
+        $untranslated = $textdomain.'/untranslated';
+        $charset = $language->charset;
+        $langfiles  = mosReadDirectory($untranslated,'.pot$');
+        @mkdir($dir);
+        @mkdir($dir.'/LC_MESSAGES');
+
+        $gettext_admin = new PHPGettextAdmin();
+        foreach ($langfiles as $domain)  {
+            $domain = substr($domain,0,-4);
+            if (file_exists("$textdomain/glossary/$lang.$charset.po")) {
+                copy("$textdomain/glossary/$lang.$charset.po", "$dir/$lang.po");
+                $gettext_admin->initialize_translation($domain, $textdomain, $lang, $charset);
+                $gettext_admin->compile($lang, $textdomain, $charset);
+            } else {
+                copy("$untranslated/$domain.pot", "$dir/$domain.po");
+            }
+        }        
+        if (!file_exists("$textdomain/$lang/$lang.po")) {
+            @copy("$textdomain/glossary/untranslated.pot", "$textdomain/$lang/$lang.po");
+        }
+        $language->save();
+    }
+    
+    function updatelanguage($lang)
+    {
+
+        $language =& new mamboLanguage($lang);
+        $language->load();
+        foreach ($_POST as $k => $v) {
+            if (in_array($k, array_keys(get_class_vars(get_class($language))))) {
+                $language->$k = $v;
+            }
+        }
+        $language->setPlurals($_POST['plural_form']);
+        $language->save();
+    }
+
+    function updatecatalog($compile = true, $add_to_dict = true)
+    {
+
+        $domain     = $_POST['domain'];
+        $textdomain = $_POST['textdomain'];
+        $lang       = $_POST['lang'];
+
+        $catalog = new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', 'po');
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+
+        $catalog->setComments($_POST['comments']);
+        $catalog->setHeaders($_POST['headers']);
+
+        foreach ($_POST as $key => $value) {
+            if (preg_match('/^([a-z]+)[_]?([0-9]+)?_([0-9]+)$/', $key, $matches))  {
+                switch ($matches[1])
+                {
+                    case 'msgid':
+                    $messages[$matches[3]]['msgid'] = $value;
+                    break;
+                    case 'msgid_plural':
+                    $messages[$matches[3]]['msgid_plural'] = $value;
+                    break;
+                    case 'msgstr':
+                    if (!empty($messages[$matches[3]]['msgid_plural'])) {
+
+                        if ($matches[2] != '') {
+                            $messages[$matches[3]]['msgstr'][$matches[2]] =  stripslashes($value);
+                        } else {
+                            $messages[$matches[3]]['msgstr'][0] =  stripslashes($value);
+                            $messages[$matches[3]]['msgstr'][1] =  '';
+                        }
+                    } else {
+                        $messages[$matches[3]]['msgstr'] =  stripslashes($value);
+                    }
+                    break;
+                    case 'fuzzy':
+                    $messages[$matches[3]]['fuzzy'] = $value == 'true' ? true : false;
+                    break;
+                }
+            }
+        }
+        foreach ($messages as $index => $arr) {
+            if (strcmp($catalog->strings[$index]->msgid, $arr['msgid']) == 0) {
+                $catalog->strings[$index]->setmsgstr($arr['msgstr']);
+                if ($arr['fuzzy']) {
+                    $catalog->strings[$index]->setfuzzy($arr['fuzzy']);
+                }
+            }
+        }
+        $catalog->save();
+
+
+        $gettext_admin = new PHPGettextAdmin();
+        $gettext_admin->add_to_dict($domain, $textdomain, $lang);
+        $catalog->load();
+
+        if ($compile) {
+            $catalog->setproperty('mode', 'mo');
+            $catalog->save();
+        }
+        $language = new mamboLanguage($lang);
+        $language->save();
+    }
+}
+
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/sort.action.php 4.6rc2/administrator/components/com_languages/actions/sort.action.php
--- 4.5.4/administrator/components/com_languages/actions/sort.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/sort.action.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,13 @@
+<?php
+class sortAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $session =& $request->session();
+        $session['col'] =  $_REQUEST['col'];
+        $session['asc'] =  $_REQUEST['asc'];
+        $controller->view('catalogs');
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/translate.action.php 4.6rc2/administrator/components/com_languages/actions/translate.action.php
--- 4.5.4/administrator/components/com_languages/actions/translate.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/translate.action.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,12 @@
+<?php
+class translateAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+       $session =& $request->session();
+       $session['lang'] = $_REQUEST['lang'];
+       $controller->redirect('index', 'catalogs');
+    }
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/actions/update.action.php 4.6rc2/administrator/components/com_languages/actions/update.action.php
--- 4.5.4/administrator/components/com_languages/actions/update.action.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/actions/update.action.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,31 @@
+<?php
+class updateAction extends Action
+{
+    function execute(&$controller, &$request)
+    {
+        $lang = $request->get('lang');
+        $language = new mamboLanguage($lang);
+        $language->save();
+        $language->load(true);
+        $domain = $_POST['domain'];
+        $textdomain = mamboCore::get('rootPath')."/language";
+        $gettext_admin = new PHPGettextAdmin(true);
+        $create_dict = false;
+
+        if (!file_exists("$textdomain/glossary/$lang.$language->charset.po")) {
+            $create_dict = true;
+        }
+
+        $gettext_admin->add_to_dict($domain, $textdomain, $lang, $language->charset);
+        $gettext_admin->message_format($domain, $textdomain, $lang);
+        $gettext_admin->compile($lang, $textdomain,  $language->charset);
+/*
+        $request->set('task', 'index');
+        $request->set('act', 'catalogs');
+        $request->set('lang', $lang);
+        $controller->view('catalogs');
+        */
+        return  $controller->redirect('index', 'catalogs');
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/admin.languages.class.php 4.6rc2/administrator/components/com_languages/admin.languages.class.php
--- 4.5.4/administrator/components/com_languages/admin.languages.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/admin.languages.class.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,321 @@
+<?php
+
+class Request
+{
+    var $name;
+    var $vars;
+
+    function Request($name)
+    {
+        $this->name = $name;
+        $this->attributes = array();
+    }
+    function set($var, $value)
+    {
+        $this->vars[$var] = $value;
+    }
+    function get($var=null)
+    {
+        return is_null($var) ? $this->vars : $this->vars[$var];
+    }
+    function addFromRequest($var, $global='request'){
+        switch (strtolower($global))
+        {
+            case 'get':
+            $this->vars[$var] = mosGetParam($_GET, $var);
+            break;
+            case 'post':
+            $this->vars[$var] = mosGetParam($_POST, $var);
+            break;
+            case 'cookie':
+            $this->vars[$var] = mosGetParam($_COOKIE, $var);
+            break;
+            case 'request':
+            $this->vars[$var] = mosGetParam($_REQUEST, $var);
+            break;
+            default:
+            trigger_error('Invalid Request Array', E_USER_ERROR);
+            break;
+        }
+    }
+    function setByRef($var, &$value)
+    {
+        $this->vars[$var] = &$value;
+    }
+    function &getByRef($var)
+    {
+        return $this->vars[$var];
+    }
+    function &session($reset = false)
+    {
+        $name = '__' . $this->name . '_session';
+        if (!isset($_SESSION[$name]) || $reset) {
+            $_SESSION[$name] = array();
+        }
+        return $_SESSION[$name];
+    }
+    function &getInstance($name)
+    {
+        static $requests;
+        if (!isset($requests[$name])) {
+            $requests[$name] = new Request($name);
+        }
+        return $requests[$name];
+    }
+}
+
+class Controller
+{
+    var $name;
+    var $dir;
+    var $request;
+    var $action;
+    var $renderer;
+
+
+    function Controller($name)
+    {
+        $this->name = $name;
+        $this->request     =& Request::getInstance($name);
+        $this->renderer    =& Renderer::getInstance();
+        $this->renderer->setdir(dirname(__FILE__).DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'templates');
+    }
+
+    function forward($actionname)
+    {
+        if (!$actionname) return $this->view('index');
+
+        $actionfile = dirname(__FILE__)."/actions/$actionname.action.php";
+        $actionclass = $actionname.'Action';
+        if (file_exists($actionfile)) include($actionfile);
+        else return trigger_error("Action file '$actionfile' not found.", E_USER_ERROR);
+        if (class_exists($actionclass))  $action = new $actionclass();
+        else return trigger_error("Action class '$actionclass' not found.", E_USER_ERROR);
+        $action->execute($this, $this->request);
+    }
+
+
+    function view($viewname)
+    {
+        $viewfile = dirname(__FILE__)."/views/$viewname.view.php";
+        $viewclass = $viewname.'View';
+        if (file_exists($viewfile)) include($viewfile);
+        #else return trigger_error("View file '$viewfile' not found.", E_USER_ERROR);
+        if (class_exists($viewclass))  $view = new $viewclass($this);
+        else return trigger_error("View class '$viewclass' not found.", E_USER_ERROR);
+        $view->render($this->renderer, $this->request);
+    }
+    function redirect($task=null, $act=null)
+    {
+        $url  = $_SERVER['PHP_SELF'].'?option='.$this->name;
+        $url .= !is_null($task) ? '&task='.$task : '';
+        $url .= !is_null($act) ? '&act='.$act : '';
+        if (headers_sent()) {
+            echo "<script>document.location.href='$url';</script>";
+        } else {
+            #if (ob_get_contents()) while (@ob_end_clean()); // clear output buffer if one exists
+            header( "Location: $url" );
+        }
+        exit;
+    }
+}
+
+class Action
+{
+    var $view;
+
+    function Action()
+    {
+    }
+    function execute(&$controller, &$request)
+    {
+        return trigger_error('Action::execute() must be overridden.', E_USER_ERROR);
+    }
+    function setView($view)
+    {
+        $this->viewname = $view;
+    }
+    function getView()
+    {
+        return $this->view;
+    }
+}
+
+class View
+{
+    var $controller;
+
+    function View(&$controller){
+        $this->controller = $controller;
+    }
+    function render(&$request, &$renderer)
+    {
+        return trigger_error('View::render() must be overridden');
+    }
+}
+
+class Renderer
+{
+
+    var $dir;
+    var $vars = array();
+    var $engine = 'php';
+    var $template = '';
+    var $debug = 0;
+
+    function Renderer(){}
+
+    function &getInstance($type = 'php') {
+        static $renderer;
+        if (is_null($renderer[$type])) {
+            if ($type == 'php') {
+                $renderer[$type] = new Renderer();
+            } else {
+                $classname = $type . 'Renderer';
+                if (class_exists($classname))
+                $renderer[$type] = new $classname();
+            }
+        }
+        return $renderer[$type];
+    }
+
+    function display($template, $return = false){
+        if ($template == NULL){
+            return trigger_error('A template has not been specified', E_USER_ERROR);
+        }
+        $this->template = $this->dir . $template;
+        if ($this->debug) echo nl2br($this->template."\n");
+
+        if (is_readable($this->template)) {
+            extract($this->getvars());
+            if ($return) {
+                ob_start();
+                include_once($this->template);
+                $ret = ob_get_contents();
+                ob_end_clean();
+                return $ret;
+            } else {
+                include_once($this->template);
+            }
+        } else {
+            return trigger_error("Template file $template does not exist or is not readable", E_USER_ERROR);
+        }
+        return false;
+    }
+
+    function fetch($template){
+        return $this->display($template, true);
+    }
+
+    function &getengine(){
+        return $this->engine;
+    }
+
+    function addvar($key, $value){
+        $this->vars[$key] = $value;
+    }
+
+    function addbyref ($key, &$value) {
+        $this->vars[$key] = $value;
+    }
+
+    function getvars($name = false){
+        return (isset($this->vars[$name])) ? $this->vars[$name] : $this->vars;
+    }
+
+    function setdir($dir){
+        $this->dir = (substr($dir, -1) == DIRECTORY_SEPARATOR) ? $dir : $dir.DIRECTORY_SEPARATOR;
+    }
+
+    function getdir(){
+        return $this->dir;
+    }
+
+    function settemplate($template){
+        $this->template = $template;
+    }
+}
+
+class XMLUtils
+{
+    function parse_into_array($xml) {
+        $p = xml_parser_create();
+        xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
+        xml_parse_into_struct($p, $xml, $values);
+        xml_parser_free($p);
+        $current = $prev = array();
+        $xmlarray =& $current;
+        foreach($values as $key => $value) {
+            $index = count($xmlarray);
+            switch ($value['type'])
+            {
+                case 'open':
+                $xmlarray[$index] = array();
+                $xmlarray[$index]['tag']        = isset($value["tag"]) ? $value["tag"] : null;
+                $xmlarray[$index]['value']      = isset($value["value"]) ? $value["value"] : null;
+                $xmlarray[$index]['attributes'] = isset($value["attributes"]) ? $value["attributes"] : null;
+                $xmlarray[$index]['nodes']   = array();
+                $prev[count($prev)] = &$xmlarray;
+                $xmlarray = &$xmlarray[$index]['nodes'];
+                break;
+                case 'complete':
+                $xmlarray[$index] = array();
+                $xmlarray[$index]['tag']        = isset($value["tag"]) ? $value["tag"] : null;
+                $xmlarray[$index]['value']      = isset($value["value"]) ? $value["value"] : null;
+                $xmlarray[$index]['attributes'] = isset($value["attributes"]) ? $value["attributes"] : null;
+                break;
+                case 'close':
+                $xmlarray = &$prev[count($prev) - 1];
+                unset($prev[count($prev) - 1]);
+                break;
+            }
+        }
+        return $xmlarray;
+    }
+    function parse_file_into_array($file) {
+        return XMLUtils::parse_into_array(file_get_contents($file));
+    }
+
+    function array_to_xml($array, $encoding='utf-8') {
+        $xml = "<?xml version=\"1.0\" encoding=\"$encoding\"?>\n";
+        if ((!empty($array)) AND (is_array($array))) {
+            foreach ($array as $key => $value) {
+                switch ($value["type"]) {
+                    case "open":
+                    $xml .= str_repeat("\t", $value["level"] - 1);
+                    $xml .= "<" . strtolower($value["tag"]);
+                    if (isset($value["attributes"])) {
+                        foreach ($value["attributes"] as $k => $v) {
+                            $xml .= sprintf(' %s="%s"', strtolower($k), $v);
+                        }
+                    }
+                    $xml .= ">\n";
+                    break;
+                    case "complete":
+                    $xml .= str_repeat("\t", $value["level"] - 1);
+                    $xml .= "<" . strtolower($value["tag"]);
+                    if (isset($value["attributes"])) {
+                        foreach ($value["attributes"] as $k => $v) {
+                            $xml .= sprintf(' %s="%s"', strtolower($k), $v);
+                        }
+                    }
+                    $xml .= ">";
+                    $xml .= isset($value['value']) ? $value['value'] : false;
+                    $xml .= "</".strtolower($value["tag"]).">\n";
+                    break;
+                    case "close":
+                    $xml .= str_repeat("\t", $value["level"] - 1);
+                    $xml .= "</" . strtolower($value["tag"]) . ">\n";
+                    break;
+                    default:
+                    break;
+                }
+            }
+        }
+        return $xml;
+    }
+}
+
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/admin.languages.html.php 4.6rc2/administrator/components/com_languages/admin.languages.html.php
--- 4.5.4/administrator/components/com_languages/admin.languages.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_languages/admin.languages.html.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,156 +0,0 @@
-<?php
-/**
-* @version $Id: admin.languages.html.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
-* @subpackage Languages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* @package Mambo
-* @subpackage Languages
-*/
-class HTML_languages {
-
-	function showLanguages( $cur_lang, &$rows, &$pageNav, $option ) {
-		global $my;
-		?>
-		<form action="index2.php" method="post" name="adminForm">
-		<table class="adminheading">
-		<tr>
-			<th class="langmanager">
-			Language Manager <small><small>[ Site ]</small></small>
-			</th>
-		</tr>
-		</table>
-
-		<table class="adminlist">
-		<tr>
-			<th width="20">
-			#
-			</th>
-			<th width="30">
-			&nbsp;
-			</th>
-			<th width="25%" class="title">
-			Language
-			</th>
-			<th width="5%">
-			Published
-			</th>
-			<th width="10%">
-			Version
-			</th>
-			<th width="10%">
-			Date
-			</th>
-			<th width="20%">
-			Author
-			</th>
-			<th width="25%">
-			Author Email
-			</th>
-		</tr>
-		<?php
-		$k = 0;
-		for ($i=0, $n=count( $rows ); $i < $n; $i++) {
-			$row = &$rows[$i];
-			?>
-			<tr class="<?php echo "row$k"; ?>">
-				<td width="20"><?php echo $pageNav->rowNumber( $i ); ?></td>
-				<td width="20">
-				<input type="radio" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $row->language; ?>" onClick="isChecked(this.checked);" />
-				</td>
-				<td width="25%">
-				<a href="#edit" onclick="hideMainMenu();return listItemTask('cb<?php echo $i;?>','edit_source')"><?php echo $row->name;?></a></td>
-				<td width="5%" align="center">
-				<?php
-				if ($row->published == 1) {	 ?>
-					<img src="images/tick.png" alt="Published"/>
-					<?php
-				} else {
-					?>
-					&nbsp;
-				<?php
-				}
-				?>
-				</td>
-				<td align=center>
-				<?php echo $row->version; ?>
-				</td>
-				<td align=center>
-				<?php echo $row->creationdate; ?>
-				</td>
-				<td align=center>
-				<?php echo $row->author; ?>
-				</td>
-				<td align=center>
-				<?php echo $row->authorEmail; ?>
-				</td>
-			</tr>
-		<?php
-		}
-		?>
-		</table>
-		<?php echo $pageNav->getListFooter(); ?>
-
-		<input type="hidden" name="option" value="<?php echo $option;?>" />
-		<input type="hidden" name="task" value="" />
-		<input type="hidden" name="hidemainmenu" value="0" />
-		<input type="hidden" name="boxchecked" value="0" />
-		</form>
-		<?php
-	}
-
-	function editLanguageSource( $language, &$content, $option ) {
-		global $mosConfig_absolute_path;
-		$language_path = $mosConfig_absolute_path . "/language/" . $language . ".php";
-		?>
-		<form action="index2.php" method="post" name="adminForm">
-	    <table cellpadding="1" cellspacing="1" border="0" width="100%">
-		<tr>
-	        <td width="270"><table class="adminheading"><tr><th class="langmanager">Language Editor</th></tr></table></td>
-	        <td width="240">
-	            <span class="componentheading"><?php echo $language; ?>.php is :
-	            <b><?php echo is_writable($language_path) ? '<font color="green"> Writeable</font>' : '<font color="red"> Unwriteable</font>' ?></b>
-	            </span>
-	        </td>
-<?php
-	        if (mosIsChmodable($language_path)) {
-	            if (is_writable($language_path)) {
-?>
-	        <td>
-	            <input type="checkbox" id="disable_write" name="disable_write" value="1"/>
-	            <label for="disable_write">Make unwriteable after saving</label>
-	        </td>
-<?php
-	            } else {
-?>
-	        <td>
-	            <input type="checkbox" id="enable_write" name="enable_write" value="1"/>
-	            <label for="enable_write">Override write protection while saving</label>
-	        </td>
-<?php
-	            } // if
-	        } // if
-?>
-	    </tr>
-	    </table>
-		<table class="adminform">
-	        <tr><th><?php echo $language_path; ?></th></tr>
-	        <tr><td><textarea style="width:100%" cols="110" rows="25" name="filecontent" class="inputbox"><?php echo $content; ?></textarea></td></tr>
-		</table>
-		<input type="hidden" name="language" value="<?php echo $language; ?>" />
-		<input type="hidden" name="option" value="<?php echo $option;?>" />
-		<input type="hidden" name="task" value="" />
-		</form>
-	<?php
-	}
-
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/admin.languages.php 4.6rc2/administrator/components/com_languages/admin.languages.php
--- 4.5.4/administrator/components/com_languages/admin.languages.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_languages/admin.languages.php	2006-06-08 04:17:26.000000000 -0500
@@ -1,254 +1,58 @@
 <?php
 /**
-* @version $Id: admin.languages.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
-* @subpackage Languages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
+ * @package Mambo Open Source
+ * @subpackage Languages
+ * @author Carlos Souza <csouza@mambo-foundation.org>
+ * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL * 
+ *
+ * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure 
+ * that Mambo remained free Open Source software owned and managed by the community.
+ * Mambo is Free Software
+ */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-// ensure user has access to this function
-if (!$acl->acl_check( 'administration', 'config', 'users', $my->usertype )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+// ensure user has access to this component
+if (!$acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_languages' ) ) {
+    mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
+require_once(mamboCore::get('rootPath').'/includes/phpgettext/error.php');
+require_once(mamboCore::get('rootPath').'/includes/phpgettext/phpgettext.catalog.php');
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'admin.languages.class.php');
 
-require_once( $mainframe->getPath( 'admin_html' ) );
-// XML library
-require_once( "$mosConfig_absolute_path/includes/domit/xml_domit_lite_include.php" );
+$include_path = ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.dirname(__FILE__));
 
-$task = trim( strtolower( mosGetParam( $_REQUEST, "task", "" ) ) );
-$cid = mosGetParam( $_REQUEST, "cid", array(0) );
-
-if (!is_array( $cid )) {
-	$cid = array(0);
+$request =& Request::getInstance('com_languages');
+$session =& $request->session();
+if (isset($session['mosmsg'])) {
+    $request->set('mosmsg',  $session['mosmsg']);
+    unset($session['mosmsg']);
 }
 
-switch ($task) {
-	case "new":
-	mosRedirect( "index2.php?option=com_installer&element=language" );
-	break;
-
-	case "edit_source":
-	editLanguageSource( $cid[0], $option );
-	break;
-
-	case "save_source":
-	saveLanguageSource( $option );
-	break;
-
-	case "remove":
-	removeLanguage( $cid[0], $option );
-	break;
-
-	case "publish":
-	publishLanguage( $cid[0], $option );
-	break;
-
-	case "cancel":
-	mosRedirect( "index2.php?option=$option" );
-	break;
-
-	default:
-	viewLanguages( $option );
-	break;
-}
+$lang = $session['lang'] = mosGetParam($_POST, 'lang', isset($session['lang']) ? $session['lang'] : mamboCore::get('mosConfig_lang'));
+$mamboLanguage =& new mamboLanguage($lang);
+$languages = $mamboLanguage->getLanguages();
+$task = mosGetParam($_REQUEST, 'task', 'index');
+$act  = mosGetParam($_REQUEST, 'act' , 'language');
 
-/**
-* Compiles a list of installed languages
-*/
-function viewLanguages( $option ) {
-	global $languages;
-	global $mainframe;
-	global $mosConfig_lang, $mosConfig_absolute_path, $mosConfig_list_limit;
-
-	$limit = $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
-	$limitstart = $mainframe->getUserStateFromRequest( "view{$option}limitstart", 'limitstart', 0 );
-
-	// get current languages
-	$cur_language = $mosConfig_lang;
-
-	$rows = array();
-	// Read the template dir to find templates
-	$languageBaseDir = mosPathName(mosPathName($mosConfig_absolute_path) . "language");
-
-	$rowid = 0;
-
-	$xmlFilesInDir = mosReadDirectory($languageBaseDir,'.xml$');
-
-	$dirName = $languageBaseDir;
-	foreach($xmlFilesInDir as $xmlfile) {
-		// Read the file to see if it's a valid template XML file
-		$xmlDoc =& new DOMIT_Lite_Document();
-		$xmlDoc->resolveErrors( true );
-		if (!$xmlDoc->loadXML( $dirName . $xmlfile, false, true )) {
-			continue;
-		}
-
-		$element = &$xmlDoc->documentElement;
-
-		if ($element->getTagName() != 'mosinstall') {
-			continue;
-		}
-		if ($element->getAttribute( "type" ) != "language") {
-			continue;
-		}
-
-		$row = new StdClass();
-		$row->id = $rowid;
-		$row->language = substr($xmlfile,0,-4);
-		$element = &$xmlDoc->getElementsByPath('name', 1 );
-		$row->name = $element->getText();
-
-		$element = &$xmlDoc->getElementsByPath('creationDate', 1);
-		$row->creationdate = $element ? $element->getText() : 'Unknown';
-
-		$element = &$xmlDoc->getElementsByPath('author', 1);
-		$row->author = $element ? $element->getText() : 'Unknown';
-
-		$element = &$xmlDoc->getElementsByPath('copyright', 1);
-		$row->copyright = $element ? $element->getText() : '';
-
-		$element = &$xmlDoc->getElementsByPath('authorEmail', 1);
-		$row->authorEmail = $element ? $element->getText() : '';
-
-		$element = &$xmlDoc->getElementsByPath('authorUrl', 1);
-		$row->authorUrl = $element ? $element->getText() : '';
-
-		$element = &$xmlDoc->getElementsByPath('version', 1);
-		$row->version = $element ? $element->getText() : '';
-
-		// if current than set published
-		if ($cur_language == $row->language) {
-			$row->published	= 1;
-		} else {
-			$row->published = 0;
-		}
-
-		$row->checked_out = 0;
-		$row->mosname = strtolower( str_replace( " ", "_", $row->name ) );
-		$rows[] = $row;
-		$rowid++;
-	}
+$request->set('task',  $task);
+$request->set('act',  $act);
+$request->set('lang', $lang);
+$request->set('languages', $languages);
 
-	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
-	$pageNav = new mosPageNav( count( $rows ), $limitstart, $limit );
 
-	$rows = array_slice( $rows, $pageNav->limitstart, $pageNav->limit );
-
-	HTML_languages::showLanguages( $cur_language, $rows, $pageNav, $option );
+$renderer =& Renderer::getInstance();
+foreach ($request->get() as $key => $value) {
+    $renderer->addvar($key, $value);
 }
 
-/**
-* Publish, or make current, the selected language
-*/
-function publishLanguage( $p_lname, $option ) {
-	global $mosConfig_lang;
-
-	$config = "";
-
-	$fp = fopen("../configuration.php","r");
-	while(!feof($fp)){
-		$buffer = fgets($fp,4096);
-		if (strstr($buffer,"\$mosConfig_lang")){
-			$config .= "\$mosConfig_lang = \"$p_lname\";\n";
-		} else {
-			$config .= $buffer;
-		}
-	}
-	fclose($fp);
-
-	if ($fp = fopen("../configuration.php","w")){
-		fputs($fp, $config, strlen($config));
-		fclose($fp);
-		mosRedirect("index2.php","Configuration succesfully updated!");
-	} else {
-		mosRedirect("index2.php","Error! Make sure that configuration.php is writeable.");
-	}
-
-}
-
-/**
-* Remove the selected language
-*/
-function removeLanguage( $cid, $option, $client ) {
-	global $mosConfig_lang;
-
-	$client_id = $client=='admin' ? 1 : 0;
-
-	$cur_language = $mosConfig_lang;
-
-	if ($cur_language == $cid) {
-		echo "<script>alert(\"You can not delete language in use.\"); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	/*$lang_path = "../language/$cid.php";
-	$lang_ignore_path = "../language/$cid.ignore.php";
-	$xml_path = "../language/$cid.xml";
-
-	unlink($lang_path);
-	unlink($lang_ignore_path);
-	unlink($xml_path);
-	*/
+$controller = new Controller('com_languages');
+$controller->forward($task);
+ini_set('include_path', $include_path);
 
-	mosRedirect( 'index2.php?option=com_installer&element=language&client='. $client .'&task=remove&cid[]='. $cid );
-
-}
-
-function editLanguageSource( $p_lname, $option) {
-	$file = stripslashes( "../language/$p_lname.php" );
-
-	if ($fp = fopen( $file, "r" )) {
-		$content = fread( $fp, filesize( $file ) );
-		$content = htmlspecialchars( $content );
-
-		HTML_languages::editLanguageSource( $p_lname, $content, $option );
-	} else {
-		mosRedirect( "index2.php?option=$option&mosmsg=Operation Failed: Could not open $file" );
-	}
-}
-
-function saveLanguageSource( $option ) {
-	$language = trim( mosGetParam( $_POST, 'language', '' ) );
-	$filecontent = mosGetParam( $_POST, 'filecontent', '', _MOS_ALLOWHTML );
-
-	if (!$language) {
-		mosRedirect( "index2.php?option=$option&mosmsg=Operation failed: No language specified." );
-	}
-	if (!$filecontent) {
-		mosRedirect( "index2.php?option=$option&mosmsg=Operation failed: Content empty." );
-	}
-
-	$file = "../language/$language.php";
-    $enable_write = mosGetParam($_POST,'enable_write',0);
-	$oldperms = fileperms($file);
-	if ($enable_write) @chmod($file, $oldperms | 0222);
-
-	clearstatcache();
-	if (is_writable( $file ) == false) {
-		mosRedirect( "index2.php?option=$option&mosmsg=Operation failed: The file is not writable." );
-	}
-
-	if ($fp = fopen ($file, "w")) {
-		fputs( $fp, stripslashes( $filecontent ) );
-		fclose( $fp );
-		if ($enable_write) {
-			@chmod($file, $oldperms);
-		} else {
-			if (mosGetParam($_POST,'disable_write',0))
-				@chmod($file, $oldperms & 0777555);
-		} // if
-		mosRedirect( "index2.php?option=$option" );
-	} else {
-		if ($enable_write) @chmod($file, $oldperms);
-		mosRedirect( "index2.php?option=$option&mosmsg=Operation failed: Failed to open file for writing." );
-	}
-
-}
+#dump($_REQUEST);
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_languages/languages.js 4.6rc2/administrator/components/com_languages/languages.js
--- 4.5.4/administrator/components/com_languages/languages.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/languages.js	2006-04-23 17:43:10.000000000 -0500
@@ -0,0 +1,60 @@
+
+
+function update(value, is_plural, nplural)
+{
+    var row_id = document.getElementById('row_id');
+    if(is_plural) {
+        var trans = document.getElementById('msgstr_'+nplural+'_'+row_id.value);
+        trans.value = value;
+        if(nplural == 0) display = value;
+    } else {
+        var trans = document.getElementById('msgstr_'+row_id.value);
+        var transspan = document.getElementById('msgstr_'+row_id.value+'_span');
+        trans.value = value;
+        display = value;
+    }    
+    transspan = document.getElementById('msgstr_'+row_id.value+'_span');
+    transspan.innerHTML = display;
+}
+function translate(id, is_plural, nplurals){
+
+    var singular   = document.getElementById('singular');
+    var plural     = document.getElementById('plural');
+    var row_id     = document.getElementById('row_id');
+    row_id.value   = id;
+    if(is_plural) {
+        plural.style.display = 'block';
+        singular.style.display = 'none';
+        msgid      = document.getElementById('msgid_'+id);
+        original   = document.getElementById('p_msgid');
+        original.value = msgid.value;
+        msgid_plural    = document.getElementById('msgid_plural_'+id);
+        original_plural = document.getElementById('p_msgid_plural');
+        original_plural.value = msgid_plural.value;
+        for(a = 0; a < nplurals; a++) {
+            msgstr = document.getElementById('msgstr_'+a+'_'+id);
+            translation  = document.getElementById('p_msgstr_'+a);
+            translation.value = msgstr.value
+        }
+    } else {
+        plural.style.display = 'none';
+        singular.style.display = 'block';
+        msgid      = document.getElementById('msgid_'+id);
+        original   = document.getElementById('s_msgid');
+        original.value = msgid.value;
+        msgstr      = document.getElementById('msgstr_'+id);
+        translation = document.getElementById('s_msgstr');
+        translation.value = msgstr.value;
+    }
+    
+}
+
+function togglefuzzy(img, checkbox) {
+    if(checkbox.value == 'false') {
+        checkbox.value = 'true';
+        img.src = 'images/publish_x.png';
+    } else if(checkbox.value == 'true') {        
+        checkbox.value = 'false';
+        img.src = 'images/tick.png';
+    }
+}
diff -ruN 4.5.4/administrator/components/com_languages/tables.js 4.6rc2/administrator/components/com_languages/tables.js
--- 4.5.4/administrator/components/com_languages/tables.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/tables.js	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,144 @@
+
+    function dump(variable) {
+        if(!variable) return false;
+        debugwin = window.open('', 'debugwin', 'left=0,top=0,width=300,height=700,scrollbars=yes,status=no,resizable=yes');
+        debugwin.document.write("<html><head><title>Javascript Debug Window</title></head><body>");
+        debugwin.document.write("Variable information for variable: "+typeof(variable)+" ("+variable.constructor+")<br />");
+        for (var prop in variable) {
+            debugwin.document.writeln('"'+prop+'" => ' + variable[prop] + '<br /> ');
+        }
+        debugwin.document.close();
+    }
+    function isset(variable){return(typeof(window.variable)!='undefined');}
+
+    function Table(tblid)
+    {
+        var tbl = document.getElementById(tblid);
+        var rows = tbl.tBodies[0].rows;
+        var active_row = null;
+        var handlers = new Array();
+        tbl.init = function() {
+            for (var i = 0; i < rows.length; i++) {
+                rows[i].parity    = i % 2;
+                rows[i].default_class = rows[i].className;
+                rows[i].onmouseover =  function(){
+                    if (active_row != this) {
+                        this.style.backgroundColor = '#6699cc';
+                        this.className = 'hover';
+                    }
+                };
+                rows[i].onmouseout  =  function () {
+                    if (active_row != this) {
+                        this.style.backgroundColor = this.parity ? '#F5F5F5' : '#ffffff';
+                        this.className = this.default_class;
+                    }
+                };
+                rows[i].onmousedown =  function () {
+                    if (active_row == this) {
+                        active_row = null;
+                        this.onmouseover();
+                    }
+                    else {
+                        var last_active = active_row;
+                        active_row = this;
+                        if (last_active != null) {
+                            last_active.onmouseout();
+                        }
+                        active_row.style.backgroundColor = '#4C7DAB';
+                        active_row.className = 'active';
+                    }
+                };
+                rows[i].ischecked  =  function() {
+                    var checkbox = this.getElementsByTagName('input')[0];
+                    if (checkbox.checked) {
+                        checkbox.checked = false;
+                        document.adminForm.boxchecked.value = 0;
+                    } else {
+                        checkbox.checked = true;
+                        document.adminForm.boxchecked.value = 1;
+                    }
+                };
+                rows[i].onmouseout();
+            }
+        }
+
+        this.makeSortable = function(idxSort,sortProps){
+            var arrMethods = sortProps.split(",");
+            var arrHead = tbl.getElementsByTagName('thead')[0].getElementsByTagName('th');
+            var arrow = document.createElement("span");
+            for(var i=0;i<arrHead.length;i++){
+                if(arrHead[i].className == 'input') {
+                    continue;
+                }
+                arrHead[i].onclick =  function(){
+                    intCol = this.cellIndex;
+                    strMethod = arrMethods[intCol];
+                    var arrRows = rows;
+                    intDir = (arrHead[intCol].className=="asc")?-1:1;
+                    arrHead[intCol].className = (arrHead[intCol].className=="asc")?"des":"asc";
+                    txt = getInnerText(this);
+                    arrow.innerHTML = (intDir > 0) ? '&nbsp;&nbsp;&uarr;' : '&nbsp;&nbsp;&darr;';
+                    this.appendChild(arrow);
+                    for(var i=0;i<arrHead.length;i++){
+                    if(i!=intCol){arrHead[i].className="";}
+                    }
+                    var arrRowsSort = new Array();
+                    for(var i=0;i<arrRows.length;i++){
+                        arrRowsSort[i]=arrRows[i].cloneNode(true);
+                        if(active_row == arrRows[i]) {
+                            active_row = arrRowsSort[i];
+                        }
+                    }
+                    arrRowsSort.sort(sort2dFnc);
+                    for(var i=0;i<arrRows.length;i++){
+                        arrRows[i].parentNode.replaceChild(arrRowsSort[i],arrRows[i]);
+                    }
+                    this.parentNode.parentNode.parentNode.init();
+                }
+            }
+        }
+
+
+        function getInnerText(el) {
+        if (typeof el == "string") {return el};
+        if (typeof el == "undefined") { return el };
+            if (el.innerText) return el.innerText;
+            var str = "";
+            var cs = el.childNodes;
+            for (var i = 0; i < cs.length; i++) {
+                switch (cs[i].nodeType) {
+                    case 1: //ELEMENT_NODE
+                    str += getInnerText(cs[i]);
+                    break;
+                    case 3:    //TEXT_NODE
+                    str += cs[i].nodeValue;
+                    break;
+                }
+            }
+            return str;
+        }
+
+        function sort2dFnc(a,b){
+            var col = intCol;
+            var dir = intDir;
+            var aCell = getInnerText(a.getElementsByTagName("td")[col]);
+            var bCell = getInnerText(b.getElementsByTagName("td")[col]);
+
+            switch (strMethod){
+                case "int":
+                    aCell = parseInt(aCell);
+                    bCell = parseInt(bCell);
+                break;
+                case "float":
+                    aCell = parseFloat(aCell);
+                    bCell = parseFloat(bCell);
+                break;
+                case "date":
+                    aCell = new Date(aCell);
+                    bCell = new Date(bCell);
+                break;
+            }
+            return (aCell>bCell)?dir:(aCell<bCell)?-dir:0;
+        }
+        tbl.init();
+    }
diff -ruN 4.5.4/administrator/components/com_languages/toolbar.languages.html.php 4.6rc2/administrator/components/com_languages/toolbar.languages.html.php
--- 4.5.4/administrator/components/com_languages/toolbar.languages.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_languages/toolbar.languages.html.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,51 +0,0 @@
-<?php
-/**
-* @version $Id: toolbar.languages.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
-* @subpackage Languages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* @package Mambo
-* @subpackage Languages
-*/
-class TOOLBAR_languages {
-	function _DEFAULT() {
-		mosMenuBar::startTable();
-		mosMenuBar::publishList();
-		mosMenuBar::spacer();
-		mosMenuBar::addNew();
-		mosMenuBar::spacer();
-		mosMenuBar::editListX( 'edit_source' );
-		mosMenuBar::spacer();
-		mosMenuBar::deleteList();
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.languages.main' );
-		mosMenuBar::endTable();
-	}
-	function _NEW() {
-		mosMenuBar::startTable();
-		mosMenuBar::save();
-		mosMenuBar::spacer();
-		mosMenuBar::cancel();
-		mosMenuBar::endTable();
-	}
-
-	function _EDIT_SOURCE(){
-		mosMenuBar::startTable();
-		mosMenuBar::save( 'save_source' );
-		mosMenuBar::spacer();
-		mosMenuBar::cancel();
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.languages.edit' );
-		mosMenuBar::endTable();
-	}
-
-}
-?>
diff -ruN 4.5.4/administrator/components/com_languages/toolbar.languages.php 4.6rc2/administrator/components/com_languages/toolbar.languages.php
--- 4.5.4/administrator/components/com_languages/toolbar.languages.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_languages/toolbar.languages.php	2006-06-10 12:37:53.000000000 -0500
@@ -1,26 +1,112 @@
 <?php
 /**
-* @version $Id: toolbar.languages.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Languages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+class ToolBar
+{
+    var $request = array();
+    var $map 	 = array();
 
-require_once( $mainframe->getPath( 'toolbar_html' ) );
+    function ToolBar()
+    {
+        $this->request = $_REQUEST;
+    }
+    function display($method = null)
+    {
+        $task = isset($_REQUEST['task']) && !empty($_REQUEST['task']) ? $_REQUEST['task'] : 'index';
+        if($task == 'index' && isset($_REQUEST['act'])) $task = $_REQUEST['act'];
+        if (is_null($method))$method = $task;
+        if (in_array($method,  array_keys($this->map)))$method = $this->map[$method];
+        if ($method && strlen($method) > 2 && method_exists($this, $method))
+        return $this->$method();
+        return false;
+    }
+    function _default(){}
+}
+
+class languagesToolbar extends ToolBar {
+
+    var $map = array('index' => 'language','extract' => 'language', 'sort' => 'catalogs', 'new' => 'newlang', 'save' => 'edit', 'auto_translate' => 'edit', 'convert' => 'edit', 'apply' => 'edit');
 
-switch ($task) {
+    function edit() {
+        mosMenuBar::startTable();
+        if ($this->request['act'] != 'catalogs') {
+            #mosMenuBar::custom( 'translate', 'edit.png', 'edit_f2.png', T_('Manage Translations'), false );
+            #mosMenuBar::spacer();
+        } else {
+            mosMenuBar::custom( 'auto_translate', 'copy.png', 'copy_f2.png', T_('Auto Translate'), false );
+            mosMenuBar::spacer(20);
+            mosMenuBar::apply();
+            mosMenuBar::spacer();
+        }
+        mosMenuBar::save();
+        mosMenuBar::spacer();
+        mosMenuBar::cancel();
+        mosMenuBar::spacer();
+        #mosMenuBar::help( 'screen.languages.edit' );
+        mosMenuBar::endTable();
+    }
+    function update() {
+        mosMenuBar::startTable();
+        mosMenuBar::cancel();
+        mosMenuBar::spacer();
+        #mosMenuBar::help( 'screen.languages.update' );
+        mosMenuBar::endTable();
+    }
 
-	case "edit_source":
-		TOOLBAR_languages::_EDIT_SOURCE();
-		break;
+    function language() {
+        mosMenuBar::startTable();
+        if (!is_dir(mamboCore::get('rootPath').'/language/untranslated')) {
+            mosMenuBar::customX( 'extract', 'query.png', 'query.png', T_('Scan Sources'), false );
+            mosMenuBar::spacer(50);
+        }
+        mosMenuBar::custom( 'translate', 'edit.png', 'edit_f2.png', T_('Manage Translations'), true );
+        mosMenuBar::spacer();
+        mosMenuBar::custom( 'export', 'upload.png', 'upload_f2.png', T_('Export'));
+        mosMenuBar::spacer();
+        mosMenuBar::addNewX();
+        mosMenuBar::spacer();
+        mosMenuBar::editListX( 'edit' );
+        mosMenuBar::spacer();
+        mosMenuBar::deleteList();
+        mosMenuBar::spacer();
+        #mosMenuBar::help( 'screen.languages.language' );
+        mosMenuBar::endTable();
+    }
 
-	default:
-		TOOLBAR_languages::_DEFAULT();
-		break;
+    function newlang() {
+        mosMenuBar::startTable();
+        mosMenuBar::save();
+        mosMenuBar::spacer();
+        mosMenuBar::cancel();
+        mosMenuBar::spacer();
+        #mosMenuBar::help( 'screen.languages.main' );
+        mosMenuBar::endTable();
+    }
+
+    function catalogs()
+    {
+        mosMenuBar::startTable();
+        mosMenuBar::customX( 'update', 'publish.png', 'publish_f2.png', T_('Update'), false );
+        mosMenuBar::spacer();
+        mosMenuBar::editListX( 'edit' );
+        mosMenuBar::spacer();
+        mosMenuBar::cancel();
+        mosMenuBar::spacer();
+        #mosMenuBar::help( 'screen.languages.main' );
+        mosMenuBar::endTable();
+    }
 }
+
+$toolbar = new languagesToolbar('languages');
+$toolbar->display();
+
 ?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/catalogs.view.php 4.6rc2/administrator/components/com_languages/views/catalogs.view.php
--- 4.5.4/administrator/components/com_languages/views/catalogs.view.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/catalogs.view.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,27 @@
+<?php
+class catalogsView extends View
+{
+    function render(&$renderer, &$request)
+    {
+        $lang = $request->get('lang');
+        $language =& new mamboLanguage($lang);
+        $language->load(true);
+        $session =& $request->session();
+        $col = isset($session['col']) ? $session['col'] : 'domain';
+        $asc = isset($session['asc']) ? $session['asc'] : 1;
+        $order = array();
+        $files = $language->files;
+        // Obtain a list of columns
+        foreach ($files as $key => $row) {
+            $order[$key]  = $row[$col];
+        }
+        array_multisort($order, $asc == 1 ? SORT_ASC : SORT_DESC, $files);
+        $renderer->addvar('col', $col);
+        $renderer->addvar('asc', $asc);
+        $renderer->addvar('rows', $files);
+        $renderer->addvar('header', sprintf(T_('Manage Translations: %s'), $lang));        
+        $renderer->addvar('content', $renderer->fetch('catalogs.tpl.php'));
+        $renderer->display('form.tpl.php');
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/edit.view.php 4.6rc2/administrator/components/com_languages/views/edit.view.php
--- 4.5.4/administrator/components/com_languages/views/edit.view.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/edit.view.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,110 @@
+<?php
+class editView extends View
+{
+    function render(&$renderer, &$request)
+    {
+        $task = $request->get('task');
+        $act  = $request->get('act');
+        
+        foreach ($request->get() as $key => $value) $renderer->addvar($key, $value);
+        switch ($act)
+        {
+            case 'language':
+            if ($task == 'new')$this->newlanguage($renderer, $request);
+            else $this->editlanguage($renderer, $request);
+            break;
+
+            case 'catalogs':
+            default:
+            $this->editcatalog($renderer, $request);
+            break;
+        }
+        $renderer->display('form.tpl.php');
+    }
+
+    
+    function newlanguage(&$renderer, &$request) {
+        $locales = getlocales();
+        $header = T_('Language').' : <small>'.T_('New language').'</small>';
+        $renderer->addvar('header', $header);
+        $renderer->addvar('locales',        $locales['locales']);
+        $renderer->addvar('territories',    $locales['territories'] );
+        $renderer->addvar('codesets',       $locales['codesets']);
+        $renderer->addvar('dateformats',    $locales['dateformats']);
+        $renderer->addvar('directions',     $locales['directions']);
+        $renderer->addvar('plural_forms',   $locales['plural_forms']);
+        $renderer->addvar('content', $renderer->fetch('langform.tpl.php'));
+    }
+
+    function editlanguage(&$renderer, &$request) {
+        
+        $lang = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : $request->get('lang');
+        $language =& new mamboLanguage($lang);
+        $header = T_('Language').' : <small>'.T_('Edit language') . "  [ {$language->title} ]  ".'</small>';
+        $renderer->addvar('header', $header);
+        $renderer->addvar('language', $language);
+        $renderer->addvar('plurals', $this->plurals());
+        $renderer->addvar('content', $renderer->fetch('langform.tpl.php'));
+    }
+    
+    function editcatalog(&$renderer, &$request) {
+        $lang = $request->get('lang');
+        $language = new mamboLanguage($lang);
+        $domain = $request->get('domain');
+        $catalog = new PHPGettext_catalog($domain, mamboCore::get('rootPath')."/language");
+        $catalog->setproperty('mode', _MODE_PO_);
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+        $nplurals = 2;
+        $_VERSION = new version();
+        
+        
+        if (strpos($catalog->headers['Last-Translator'], 'FULL NAME')) {
+            $catalog->headers['Last-Translator'] = "Translation <translation@mambo-foundation.org>";
+        }
+        if (strpos($catalog->headers['Language-Team'], 'LANGUAGE')) {
+            $catalog->headers['Language-Team'] = "Translation <translation@mambo-foundation.org>";
+        }
+        $catalog->headers['Project-Id-Version'] = $_VERSION->PRODUCT.' '.$_VERSION->RELEASE;
+        $catalog->headers['Report-Msgid-Bugs-To'] = 'translation@mambo-foundation.org';
+        $catalog->headers['Plural-Forms'] = $language->plural_form['expression'];
+        $catalog->headers['Content-Type'] = 'text/plain; charset='.$language->charset;
+        $renderer->addvar('header', sprintf(T_('Translate Catalog: %s [%s]'),$domain, $lang));
+        $renderer->addvar('nplurals', $language->plural_form['nplurals']);
+        $renderer->addbyref('catalog', $catalog);
+        $renderer->addvar('domain', $domain);
+        $renderer->addvar('content', $renderer->fetch('editcatalog.tpl.php'));
+    }
+
+
+
+
+    function plurals() {
+        return array(
+        array('Two forms, singular used for one only', 'nplurals=2; plural=n != 1;', array('danish','dutch','english','german','norwegian','swedish','estonian','finnish','greek','hebrew','italian','portuguese','spanish')),
+        array('One single form', 'nplurals=1; plural=0;', array('Hungarian','Japanese','Korean','Turkish')),
+        array('Two forms, singular used for zero and one', 'nplurals=2; plural=n>1;', array('french','brazilian portuguese')),
+        array('Three forms, special case for zero', 'nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;', array('Latvian')),
+        array('Three forms, special cases for one and two', 'nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;', array('Gaeilge')),
+        array('Three forms, special case for numbers ending in 1[2-9]', 'nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;', array('lithuanian')),
+        array('Three forms, special cases for numbers ending in 1 and 2, 3, 4, except those ending in 1[1-4]', 'nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;', explode(',', 'croatian,czech,russian,slovak,ukrainian')),
+        array('Three forms, special case for one and some numbers ending in 2, 3, or 4', 'nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;', array('polish')),
+        array('Four forms, special case for one and all numbers ending in 02, 03, or 04', 'nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;', array('slovenian'))
+        );
+    }
+}
+
+
+if (!function_exists('array_combine')) {
+    function array_combine($a, $b) {
+        $c = array();
+        if (is_array($a) && is_array($b))
+        while (list(, $va) = each($a))
+        if (list(, $vb) = each($b))
+        $c[$va] = $vb;
+        else
+        break 1;
+        return $c;
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/index.view.php 4.6rc2/administrator/components/com_languages/views/index.view.php
--- 4.5.4/administrator/components/com_languages/views/index.view.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/index.view.php	2006-02-16 21:00:30.000000000 -0600
@@ -0,0 +1,39 @@
+<?php
+class indexView extends View
+{
+    function render(&$renderer, &$request)
+    {
+        $rows           = array();
+        $languageDir    = mamboCore::get('mosConfig_absolute_path')."/language/";
+        $xmlFilesInDir  = mosReadDirectory($languageDir,'.xml$');
+        $rowid = 0;               
+        
+        foreach($xmlFilesInDir as $xmlfile) {
+            // Read the file to see if it's a valid template XML file
+            $parser =& new mosXMLDescription($languageDir.$xmlfile);
+            if ($parser->getType() != 'language') continue;
+            $row                = new StdClass();
+            $row->id            = $rowid;
+            $row->language      = substr($xmlfile,0,-4);
+            $row->name          = $parser->getName('language');
+            $row->creationdate  = $parser->getCreationDate('language');
+            $row->author        = $parser->getAuthor('language');
+            $row->copyright     = $parser->getCopyright('language');
+            $row->authorEmail   = $parser->getAuthorEmail('language');
+            $row->authorUrl     = $parser->getAuthorUrl('language');
+            $row->version       = $parser->getVersion('language');
+            $row->checked_out = 0;
+            $row->mosname = strtolower( str_replace( " ", "_", $row->name ) );
+            $row->published = (mamboCore::get('mosConfig_lang') == $row->language) ? 1 : 0;
+            $rows[] = $row;
+            $rowid++;
+            
+        
+        }
+        
+        $renderer->addvar('rows', $rows);
+        $renderer->addvar('content', $renderer->fetch('table.tpl.php'));
+        $renderer->display('form.tpl.php');
+    }    
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/language.view.php 4.6rc2/administrator/components/com_languages/views/language.view.php
--- 4.5.4/administrator/components/com_languages/views/language.view.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/language.view.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,11 @@
+<?php
+class languageView extends View
+{
+    function render(&$renderer, &$request)
+    {
+        $renderer->addvar('rows', array_values($request->get('languages')));
+        $renderer->addvar('content', $renderer->fetch('languages.tpl.php'));
+        $renderer->display('form.tpl.php');
+    }
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/catalogs.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/catalogs.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/catalogs.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/catalogs.tpl.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,58 @@
+<?php defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); ?>
+<script type="text/javascript">
+function order(col, asc) {
+    c = document.getElementById('col');
+    a = document.getElementById('asc');
+    c.value = col;
+    a.value = asc;
+    submitform('sort');
+}
+</script>
+
+<script type="text/javascript" src="<?php echo mamboCore::get('mosConfig_live_site');?>/administrator/components/com_languages/languages.js"></script>
+
+<input type="hidden" id="col" name="col" value="" />
+<input type="hidden" id="asc" name="asc" value="" />
+<input type="hidden" id="catalogs" name="catalogs" value="1" />
+<table class="adminlist" id="catalog_table" cellpadding="3" cellspacing="0" width="80%">
+<thead>
+<tr>
+	<th width="5" class="input">
+	<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
+	</th>			
+	<th width="20%"><?php echo T_('Language File'); ?></th>
+	<th width="20%"><?php echo T_('% Translated'); ?></th>
+	<th width="20%"><?php echo T_('Total Strings'); ?></th>
+	<th width="20%"><?php echo T_('Translated Strings'); ?></th>
+	<th width="20%"><?php echo T_('Fuzzy'); ?></th>
+</tr>	
+</thead>
+<tbody>
+<?php $a=0; $b=0; foreach ($rows as $row) :?>
+	<tr class="<?php echo "row$a"; ?>">			
+		<td>
+		<input type="checkbox" id="cb<?php echo $b;?>" name="domain" value="<?php echo $row['domain']; ?>" onClick="isChecked(this.checked);" />
+		</td>
+		<td width="25%">
+		<a href="#" onclick="hideMainMenu();return listItemTask('cb<?php echo $b;?>','edit')"><?php echo $row['domain'];?></a></td>
+		<td width="5%">
+       <?php echo $row['percent'];?>
+		</td>
+		<td width="5%">
+       <?php echo $row['strings'];?>
+		</td>
+		<td>
+		<?php echo $row['translated']; ?>
+		</td>
+		<td>
+		<?php echo $row['fuzzy']; ?>
+		</td>
+	</tr>
+<?php $a=1-$a; $b++; endforeach; ?>
+</tbody>
+</table>
+
+<script type="text/javascript">
+table = new Table('catalog_table');
+table.makeSortable(1,"null,str,float,float,float,float");
+</script>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/edit.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/edit.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/edit.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/edit.tpl.php	2006-02-16 21:00:30.000000000 -0600
@@ -0,0 +1,98 @@
+	<script language="javascript" type="text/javascript">
+	function submitbutton(pressbutton) {
+	    var form = document.adminForm;
+	    if (pressbutton == 'cancel') {
+	        submitform( pressbutton );
+	        return;
+	    }
+
+	    // do field validation
+	    if (form.name.value == "") {
+	        alert( "<?php echo T_('You must provide a Language Name.') ?>" );
+	    } else if (form.id.value == "") {
+	        alert( "<?php echo T_('You must provide a Language Identifier.') ?>" );
+	    } else if (form.locale.value == "") {
+	        alert( "<?php echo T_('You must provide a locale.') ?>" );
+	    } else if (form.encoding.value == "") {
+	        alert( "<?php echo T_('You must provide a character encoding.') ?>" );
+	    } else if (form.dateformat.value == "") {
+	        alert( "<?php echo T_('You must provide a date format.') ?>" );
+	    }  else {
+	        submitform( pressbutton );
+	    }
+	}
+	</script>
+<?php 
+$tabs = new mosTabs(1);
+mosCommonHTML::loadOverlib();
+mosCommonHTML::loadCalendar();
+?>	
+<table class="adminheading">
+	<tr>
+		<th class="langmanager">
+		<?php echo T_('New Language') ?>
+		</th>
+		<td style="white-space: nowrap;text-align:right">
+		<?php echo mosCurrentDate();?>   			
+        </td>
+	</tr>
+</table>
+<?php $tabs->startPane('language-pane'); $tabs->startTab(T_('Details'), 'details');?>
+	<table class="adminform">
+		<tr>
+			<td style="width:200px"><?php echo T_('Language Identifier') ?></td>
+			<td>
+				<input type="text" name="id" maxlength="100" class="inputbox" disabled="disabled" style="width:180px" value="<?php echo $language['id'] ?>" />
+				<?php echo mosToolTip( T_('The identifier for this language. This is used for naming the language xml file and translations directory.') ); ?>
+			</td>
+		</tr>
+		<tr>
+			<td style="width:200px"><?php echo T_('Language Name') ?></td>
+			<td>
+				<input type="text" name="name" maxlength="100" class="inputbox" style="width:180px" value="<?php echo $language['name'] ?>" />
+				<?php echo mosToolTip( T_('The official name for this language') ); ?>
+			</td>
+		</tr>
+		<tr>
+			<td><?php echo T_('Locale') ?></td>
+			<td>
+				<input type="text" name="locale" maxlength="100" class="inputbox" style="width:180px" value="<?php echo $language['locale'] ?>" />
+				<?php echo mosToolTip( T_('The locale list for this language. \nLocale names must be comma separated.') ); ?>
+			</td>
+		</tr>
+		<tr>
+			<td><?php echo T_('Encoding') ?></td>
+			<td>
+				<input type="text" name="encoding"  maxlength="100" class="inputbox" style="width:180px" value="<?php echo $language['encoding'] ?>" />				
+				<?php echo mosToolTip( T_('The character encoding for this language. Ex. utf-8') ); ?>
+			</td>
+		</tr>
+		<tr>
+			<td><?php echo T_('Direction') ?></td>
+			<td>
+				<select	 name="direction" class="inputbox" style="width:185px">
+				<option value="ltr"><?php echo T_('Left-to-Right') ?></option>				
+				<option value="rtl"><?php echo T_('Right-to-Left') ?></option>
+				</select>			
+				<?php echo mosToolTip( T_('Text direction.') ); ?>
+			</td>
+		</tr>
+		<tr>
+			<td><?php echo T_('Date Format') ?></td>
+			<td>
+				<input type="text" name="dateformat" maxlength="100" class="inputbox" style="width:180px" value="<?php echo $language['dateformat'] ?>" />
+				<?php echo mosToolTip( T_('Date format for strftime().') ); ?>
+			</td>
+		</tr>
+		<tr>
+			<td><?php echo T_('Plural forms') ?></td>
+			<td>
+				<input type="text" name="plural-forms"  maxlength="100" class="inputbox" style="width:180px" value="<?php echo $language['plural-forms'] ?>" /></label>				
+				<?php echo mosToolTip( T_('Plural forms for gettext.') ); ?>
+			</td>
+		</tr>
+	</table>
+	<?php $tabs->endTab(); 
+	
+	
+	$tabs->endPane(); ?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/editcatalog.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/editcatalog.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/editcatalog.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/editcatalog.tpl.php	2006-04-19 08:17:58.000000000 -0500
@@ -0,0 +1,144 @@
+<input type="hidden" name="domain" value="<?php echo $catalog->name ?>" />
+<input type="hidden" name="textdomain" value="<?php echo $catalog->path ?>" />
+<input type="hidden" name="lang" value="<?php echo $catalog->lang ?>" />
+<?php mosCommonHTML::loadOverlib();?>
+<script type="text/javascript" src="<?php echo mamboCore::get('mosConfig_live_site');?>/administrator/components/com_languages/prototype.js"></script>
+<script type="text/javascript" src="<?php echo mamboCore::get('mosConfig_live_site');?>/administrator/components/com_languages/languages.js"></script>
+<style>
+table.adminlist th {text-align:left}
+legend {font-weight:bold;} 
+div.strings {height:400px;overflow:auto;}
+</style>
+
+
+<table><tr><td style="width:75%;vertical-align:top">
+<?php 
+$tabs = new mosTabs(1);
+$tabs->startPane("catalog");
+$tabs->startTab(T_("Messages"),"messages");
+?>
+<table class="adminlist">
+<tr>
+	<th style="width:50px">
+	<?php echo T_('Verified') ?>
+	</th>
+	<th style="width:40%;text-align:center;">
+	<?php echo T_('Original') ?>
+	</th>
+	<th style="width:40%;text-align:center;">
+	<?php echo T_('Translation') ?>
+	</th>
+	<th style="width:70px;text-align:right;">
+	<?php echo T_('Ref') ?>
+	</th>
+</tr>	
+</table>
+<div class="strings">
+<table class="adminlist" id="catalog_editor">
+<tbody>      
+<?php $a=0; foreach ($catalog->strings as $id => $message) :?>
+        <?php
+        if(is_array($message->comments)) {
+            $ref = '';
+            $tt  = '';
+            foreach($message->comments as $comment) {
+                if(strncmp($comment, "#: ",3) == 0)
+                $ref .= ltrim(trim($comment), '#: ')."\n";
+                $tt  .= ltrim(trim($comment),'#: ')."<br />";
+            }
+            $tip = mosToolTip( $tt);
+        }
+        $is_plural = strlen($message->msgid_plural) > 1 ? 1 : 0;
+        ?>  
+	<tr class="<?php echo "row$a"; ?>" id="row_<?php echo $id ?>" onclick="translate(<?php echo $id ?>, <?php echo $is_plural ?>, <?php echo $nplurals ?>)">			
+		<td style="width:50px">
+		<img style="cursor:pointer;" onclick="return togglefuzzy(this, document.forms[0].fuzzy_<?php echo $id ?>)" src="images/<?php echo ( $message->is_fuzzy ) ? 'publish_x.png' : 'tick.png';?>" width="12" height="12" border="0" alt="<?php echo ( $message->is_fuzzy ) ? T_('Verify Translation') : T_('Translation OK');?>" />
+		<input type="hidden" name="fuzzy_<?php echo $id ?>" value="<?php echo ( $message->is_fuzzy ) ? 'true' : 'false';?>"/>
+		</td>
+		<td style="width:40%">
+		<textarea style="display:none" readonly="readonly" id="msgid_<?php echo $id ?>" name="msgid_<?php echo $id ?>"><?php echo $message->msgid ?></textarea>
+		<?php if ($is_plural): ?>
+		<textarea style="display:none" readonly="readonly" id="msgid_plural_<?php echo $id ?>" name="msgid_plural_<?php echo $id ?>"><?php echo $message->msgid_plural ?></textarea>
+		<?php endif; ?>
+		<?php echo $message->msgid; ?>
+		</td>
+		<td style="width:40%">
+		<?php if ($is_plural): ?>
+		<?php for ($b=0; $b < $nplurals; $b++):?>
+		<textarea style="display:none" readonly="readonly" id="msgstr_<?php echo $b ?>_<?php echo $id ?>" name="msgstr_<?php echo $b ?>_<?php echo $id ?>"><?php echo $message->msgstr[$b] ?></textarea>
+		<?php endfor; ?>
+		<?php else : ?>
+		<textarea style="display:none" readonly="readonly" id="msgstr_<?php echo $id ?>" name="msgstr_<?php echo $id ?>"><?php echo $message->msgstr ?></textarea>
+		<?php endif; ?>
+		<span id="msgstr_<?php echo $id ?>_span"><?php echo $is_plural ? $message->msgstr[0] : $message->msgstr;?></span>
+		</td>
+		<td style="width:50px;text-align:right">
+		<?php if ($tip) echo $tip; ?>
+        </td>
+	</tr>
+<?php $a=1-$a;endforeach; ?>
+</tbody>
+</table>
+<script type="text/javascript">
+table = new Table('catalog_editor');  
+</script>
+</div>
+<?php $tabs->endTab(); $tabs->startTab(T_('Headers'),"headers");?>
+<table class="adminform" style="width:250px">
+<tr><td>
+<?php  
+foreach($catalog->headers as $key => $value) {
+    $disabled = ($key == 'POT-Creation-Date') ? 'readonly="readonly"' : '';
+    $str = "<tr>\n\t<td>\n\t<label style=\"font-weight:bold\">$key<br />\n";
+    $str .= "<input type=\"text\" size=\"100\" name=\"headers[$key]\" value=\"".str_replace("\\n", "", trim($value))."\" $disabled />";
+    $str .= "</label>\n</td>\n\t</tr>\n";
+    echo $str;
+}
+?>    
+</td></tr>
+</table>
+<?php $tabs->endTab(); $tabs->startTab(T_('Comments'),"comments"); ?>
+<table class="adminform" style="width:250px">
+<tr><td>
+<textarea rows="20" cols="75" name="comments"><?php echo implode("", $catalog->comments) ?></textarea>
+</td></tr>
+</table>
+<?php $tabs->endTab(); $tabs->endPane(); ?>
+</td><td style="vertical-align:top;padding-top:20px">
+<input type="hidden" id="row_class" name="row_class" value="" />
+<input type="hidden" id="row_id" name="row_id" value="" />
+
+
+<div id="singular" style="position:relative;top:0;left:0;height:250px">
+<table class="adminform"><tr><td>
+<fieldset><legend><?php echo T_('Original') ?></legend><textarea id="s_msgid" name="s_msgid" cols="40" rows="11" readonly="readonly"></textarea></fieldset>
+</td></tr><tr><td>
+<fieldset><legend><?php echo T_('Translation') ?></legend><textarea id="s_msgstr" name="s_msgstr" cols="40" rows="11" onblur="update(this.value, 0, 0)"></textarea></fieldset>
+</td></tr></table>
+</div>
+<div id="plural" style="position:relative;top:0;left:0;height:250px;display:none">
+<table class="adminform"><tr><td>
+<fieldset><legend><?php echo T_('Original') ?></legend>
+<label><?php echo T_('Singular') ?><textarea id="p_msgid" name="p_msgid" cols="40" rows="4" readonly="readonly"></textarea></label>
+<label><?php echo T_('Plural') ?><textarea id="p_msgid_plural" name="p_msgid_plural" cols="40" rows="4" readonly="readonly"></textarea></label></fieldset>
+</td></tr><tr><td>
+<fieldset><legend><?php echo T_('Translation') ?></legend>
+<div id="plurals">      
+<script type="text/javascript">
+var pluralPane1 = new WebFXTabPane( document.getElementById( "plurals" ), 0);
+</script>
+<?php for ($a=0; $a < $nplurals; $a++):?>
+<div class="tab-page" id="plural_<?php echo $a ?>">
+<h2 class="tab"><?php echo T_("Plural") ?>[<?php echo $a ?>]</h2>
+<script type="text/javascript">
+pluralPane1.addTabPage( document.getElementById( "plural_<?php echo $a ?>" ) );
+</script>            
+<textarea id="p_msgstr_<?php echo $a ?>" name="p_msgstr_<?php echo $a ?>" cols="38" rows="9" onchange="update(this.value, 1, <?php echo $a ?> )"></textarea>
+</div>
+<?php endfor; ?>
+</div> 
+</fieldset>
+</td></tr></table>
+</div>
+
+</td></tr></table>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/form.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/form.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/form.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/form.tpl.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,55 @@
+<?php defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); ?>
+<style type="text/css">
+.sortbutton {
+	border-top : solid 1px #3872B2;
+	border-right : solid 1px #3872B2;
+	border-bottom : solid 1px #3872B2;
+	border-left : solid 1px #fff;
+	background-color : #3872B2;
+	color : #FFF;
+	font-weight : bold;
+	height : 2em;
+	width : 100%;
+	font-size : .9em;
+	cursor: pointer;
+}
+</style>
+<style type="text/css">
+table.adminlist th {text-align:left;   
+                	margin: 0px;
+                	padding: 0px;
+                	height: 25px;
+                	font-size: 11px;
+                	color: #ffffff;
+                   }
+</style>
+<script type="text/javascript" src="<?php echo mamboCore::get('mosConfig_live_site');?>/administrator/components/com_languages/tables.js"></script>
+
+<?php if (isset($mosmsg)) : ?><div class="message"><?php echo $mosmsg ?></div> <?php endif; ?>
+<form action="<?php echo $_SERVER['PHP_SELF'] ?>" method="post" name="adminForm">
+<input type="hidden" name="option" value="com_languages" />
+<input type="hidden" name="task" value="<?php echo $task ?>" />
+<input type="hidden" name="act" value="<?php echo $act ?>" />
+<input type="hidden" name="hidemainmenu" value="0" />
+<input type="hidden" name="boxchecked" value="0" />
+
+<table class="adminheading">
+	<tr>
+		<th class="langmanager">
+		<?php echo isset($header) ? $header : T_('Mambo Language Editor') ?>
+		</th> <!-- 
+        <td>
+        <?php if ($task == 'index'): ?>
+           <select name="lang" class="inputbox" size="1" onchange="document.adminForm.submit();">
+            	<option value="en"><?php echo T_('Select Language') ?></option>            	
+            <?php foreach ($languages as $name => $obj): ?>        
+            <option value="<?php echo $name.'"';?> <?php echo $lang==$name?' selected="selected"':''?>><?php echo $obj->title; if (!empty($obj->territory)) echo ' ('.$obj->territory.')' ?></option>  
+            <?php endforeach; ?>        
+           </select>
+       <?php endif;/**/ ?> 
+       </td> -->
+	</tr>
+</table>
+<br />
+<?php echo isset($content) ? $content : T_('No content to display.'); ?>
+</form>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/langform.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/langform.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/langform.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/langform.tpl.php	2006-06-20 06:54:04.000000000 -0500
@@ -0,0 +1,274 @@
+<?php mosCommonHTML::loadOverlib();?>	
+<script type="text/javascript">	
+function submitbutton(pressbutton) {
+    var form = document.adminForm;
+    if (pressbutton == 'cancel') {
+        submitform( pressbutton );
+        return;
+    }	    // do field validation
+    if (form.language.value == "") {
+        alert( "<?php echo T_('You must choose a language.') ?>" );
+    } else if (form.charset.value == "") {
+        alert( "<?php echo T_('You must choose a character set.') ?>" );
+    }  else {
+        submitform( pressbutton );
+    }
+}
+</script>
+<?php if ($task == 'new') : ?>	
+<script language="javascript" type="text/javascript">
+function langselect(select) {
+    var language       = select.form.elements["language"];
+    var iso3166_2      = select.form.elements["iso3166_2"];
+    var charset        = select.form.elements["charset"];
+    var plural_form    = select.form.elements["plural_form"];
+    var date_format    = select.form.elements["date_format"];
+    var text_direction = select.form.elements["text_direction"];
+    var territory      = select.form.elements["territory"];
+    lang               = select.options[select.selectedIndex].value;
+    language.value     = select.options[select.selectedIndex].text;
+    territory.value     = '';
+    iso3166_2.options.length = 0;
+    charset.options.length = 0;
+    select.options[0] = new Option("<?php echo T_("choose language"); ?>", "", true, false);
+    if (lang != "") {
+        if(plurals[lang])  plural_form.value = plurals[lang];
+        if(dateformats[lang])  date_format.value = dateformats[lang];
+        if(directions[lang])  text_direction.value = directions[lang];
+        var t_options   = territories[lang];
+        var c_options   = codesets[lang];
+        iso3166_2.options[0] = new Option("<?php echo T_("choose territory"); ?>", "", true, false);
+        charset.options[0]   = new Option("<?php echo T_("choose character set"); ?>", "utf-8", true, false);
+        for (var a = 0; a < t_options.length; a++) {
+            iso3166_2.options[a + 1] = new Option(t_options[a].territory, t_options[a].iso3166_2);
+        }
+        for (var b = 0; b < c_options.length; b++) {
+            charset.options[b + 1] = new Option(c_options[b].text, c_options[b].value);
+        }
+    }
+}
+function territoryselect(select) {
+    var territory  = select.form.elements["territory"];
+    var iso3166_3  = select.form.elements["iso3166_3"];
+    iso3166_3.value= '';
+    iso            = select.options[select.selectedIndex].value;
+    if(iso != '') territory.value= select.options[select.selectedIndex].text;
+    else territory.value= '';
+
+    var tarr   = territories[lang];
+    for (var a = 0; a < tarr.length; a++) {
+        if(iso == tarr[a].iso3166_2) {
+            iso3166_3.value = tarr[a].iso3166_3;
+        }
+    }
+}
+var territories = new Object();
+<?php foreach ($territories as $name => $territory) : ?>
+territories['<?php echo $name ?>'] =  [<?php
+$str = '';
+$cnt = count($territories[$name]);
+for ($a=0; $a<$cnt; $a++) {
+    $str .= '{iso3166_2:"'.$territory[$a]['iso3166_2'].'", iso3166_3:"'.$territory[$a]['iso3166_3'].'", territory:"'.$territory[$a]['territory'].'"}';
+    $str .= $a != $cnt-1 ? ", " : "";
+    echo $str;
+    $str = '';
+}
+?>];
+<?php endforeach; ?>
+var codesets = new Object();
+<?php foreach ($codesets as $name => $charset) : ?>
+codesets['<?php echo $name ?>'] =  [<?php
+$str = '';
+$cnt = count($codesets[$name]);
+for ($b=0; $b<count($codesets[$name]); $b++) {
+    $str .= '{value:"'.$charset[$b].'", text:"'.$charset[$b].'"}';
+    $str .= $b != $cnt-1 ? ", " : "";
+    echo $str;
+    $str = '';
+}
+?>];
+<?php endforeach; ?>
+var directions = new Object();
+<?php foreach ($directions as $name => $dir) : ?>
+directions['<?php echo $name ?>'] =  <?php echo "'$dir'"; ?>;
+<?php endforeach; ?>
+var dateformats = new Object();
+<?php foreach ($dateformats as $name => $fmt) : ?>
+dateformats['<?php echo $name ?>'] =  <?php echo "'$fmt'"; ?>;
+<?php endforeach; ?>
+var plurals = new Object();
+<?php foreach ($plural_forms as $name => $exp) : ?>
+plurals['<?php echo $name ?>'] =  <?php echo "'$exp'"; ?>;
+<?php endforeach; ?>
+</script>
+<table class="adminform">
+	<tr>
+		<td style="width:200px"><?php echo T_('Language') ?></td>
+		<td>               
+            <select id="iso639" name="iso639" style="width:250px" class="inputbox" onchange="langselect(this)">     
+            <option value=""><?php echo T_('choose language') ?></option>   
+            <?php foreach ($locales as $name => $locale): ?>        
+            <option value="<?php echo $name ?>"><?php echo $locale['title'] ?></option>  
+            <?php endforeach; ?>
+            </select>
+		</td>
+	</tr>
+	<tr>
+		<td style="width:200px"><?php echo T_('Territory') ?>:</td>
+		<td>			
+            <select id="iso3166_2" name="iso3166_2" style="width:250px" class="inputbox" onchange="territoryselect(this)">       
+            <option value=""><?php echo T_('choose territory') ?></option>   
+    		</select> 		    
+       </td>
+	</tr>    
+	<tr>
+		<td><?php echo T_('Character Set') ?>:</td>
+		<td>
+            <select id="codeset" name="charset" style="width:250px" class="inputbox">        
+            <option value="utf-8"><?php echo T_('choose charset') ?></option>   
+            </select>
+    		<?php #echo mosToolTip( T_('The character encoding for this language. Ex. utf-8') ); ?>
+		</td>
+	</tr>
+</table>
+<?php endif; //if ($task == 'new') : ?>
+
+<input type="hidden" id="language" name="language" value="<?php echo isset($language->name) ? $language->name : '' ?>" />
+<input type="hidden" id="text_direction" name="text_direction" value="<?php echo isset($language->text_direction) ? $language->text_direction : '' ?>" />
+<input type="hidden" id="plural_form" name="plural_form" value="<?php echo isset($language) && isset($language->plural_form['expression']) ? $language->plural_form['expression'] : 'nplurals=2; plural=n != 1;' ?>" />
+<input type="hidden" id="date_format" name="date_format" value="<?php echo isset($language->date_format) ? $language->date_format : '' ?>" />
+<input type="hidden" id="territory" name="territory" value="<?php echo isset($language->territory) ? $language->territory : '' ?>" />
+<input type="hidden" id="iso3166_3" name="iso3166_3" value="<?php echo isset($language->iso3166_3) ? $language->iso3166_3 : '' ?>" />
+
+<?php if ($task == 'edit') : ?> 
+<?php 
+$tabs = new mosTabs(1);
+$tabs->startPane("editlanguage");
+$tabs->startTab(T_("Details"),"details");
+
+?>
+<table class="adminform">  
+<tr><td style="width:150px">&nbsp;</td><td>&nbsp;</td></tr> 
+    <tr>
+        <td><?php echo T_('Language') ?>:</td>
+        <td>               			
+        <input type="hidden" id="iso639" name="iso639" value="<?php echo $language->iso639 ?>" />
+        <span style="font-weight:bold;font-size:110%"><?php echo $language->title; ?></span>
+        </td>
+    </tr>
+    <?php if (!empty($language->territory)) : ?> 
+    <tr>
+        <td><?php echo T_('Territory') ?>:</td>
+        <td>
+            <input type="hidden" id="iso3166_2" name="iso3166_2" value="<?php echo $language->iso3166_2  ?>" />  
+            <span style="font-weight:bold;font-size:110%"><?php echo $language->territory; ?> </span>
+        </td>
+    </tr>
+    <?php endif; ?>            
+    <tr>
+        <td><?php echo T_('Character Set') ?>:</td>
+        <!-- <td><div style="width:400px">
+        <input type="hidden" id="charset" name="charset" value="<?php echo $language->charset ?>" />
+        <div style="display:inline;;margin-right:120px;font-weight:bold;font-size:110%"><?php echo $language->charset; ?> </div>
+        <?php /*if (function_exists('iconv')) : ?>
+        <div style="display:inline;text-align:right;margin-right:0px">
+        <button class="button" onclick="submitbutton('convert')"><?php echo T_('Convert to') ?>:</button>
+        <select name="newcharset" id="newcharset">
+        <?php foreach ($language->codesets as $chr): 
+        if ($chr != $language->charset) echo '<option value="'.$chr.'">'.$chr.'</option>';
+        endforeach; ?>
+        </select>
+        </div>
+        <?php endif;*/ ?>
+        </div>
+        </td> -->
+    </tr>
+    <tr>
+        <td><?php echo T_('Description') ?>:</td>
+        <td>
+            <input type="text" name="description" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $language->description ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Author') ?>:</td>
+        <td>
+            <input type="text" name="author" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $language->author ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Author Email') ?>:</td>
+        <td>
+            <input type="text" name="authoremail" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $language->authoremail ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Author Url') ?>:</td>
+        <td>
+            <input type="text" name="authorurl" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $language->authorurl ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Text Direction') ?>:</td>
+        <td>
+            <select	 name="text_direction" class="inputbox"  style="width:400px">  
+            <option value="ltr"<?php if ($language->text_direction == 'ltr') echo ' selected="selected"' ?>><?php echo T_('left to right') ?></option>				
+            <option value="rtl"<?php if ($language->text_direction == 'rtl') echo ' selected="selected"' ?>><?php echo T_('right to left') ?></option>
+            </select>			
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Plural Forms'); ?></td>
+        <td>
+            <select	 name="plural_form" class="inputbox"  style="width:400px">    
+            <?php foreach ($plurals as $plural): ?>       
+            <option value="<?php echo $plural[1] ?>"<?php if ($language->plural_form['expression'] == $plural[1]) echo ' selected="selected"' ?>><?php echo $plural[0] ?></option>                   
+            <?php endforeach; ?> 
+            </select>						
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Date Format') ?></td>
+        <td>
+            <input type="text" name="date_format" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $language->date_format ?>" />
+            <?php echo mosToolTip( T_('Date format for strftime().') ); ?>
+        </td>
+    </tr>
+    <tr>
+        <td><?php echo T_('Locales') ?></td>
+        <td>
+            <input type="text" name="locale" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $language->locale ?>" />
+            <?php echo mosToolTip( T_('The locale list for setlocale(). \nLocale names must be comma separated.') ); ?>
+        </td>
+    </tr>
+</table>
+<?php $tabs->endTab(); $tabs->startTab(T_('Days'),"days"); ?>
+<table class="adminform">
+<tr><td style="width:150px">&nbsp;</td><td>&nbsp;</td></tr> 
+    <?php foreach ($language->days as $kd => $day): ?>
+    <tr>
+        <td>
+            <?php echo strtoupper($kd); ?>
+        </td>
+        <td>
+            <input type="text" name="days[<?php echo $kd ?>]" maxlength="100" class="inputbox" style="width:400px" value="<?php echo $day ?>" />
+        </td>
+    </tr>
+    <?php endforeach; ?> 
+</table>
+<?php $tabs->endTab(); $tabs->startTab(T_('Months'),"months"); ?>
+<table class="adminform">
+<tr><td style="width:150px">&nbsp;</td><td>&nbsp;</td></tr> 
+    <?php foreach ($language->months as $km => $month): ?>
+    <tr>
+        <td>
+            <?php echo strtoupper($km); ?>
+        </td>
+        <td>
+            <input type="text" name="months[<?php echo $km ?>]" maxlength="100" class="inputbox" style="width:250px" value="<?php echo $month ?>" />
+        </td>
+    </tr>
+    <?php endforeach; ?> 
+</table>
+<?php $tabs->endTab(); $tabs->endPane(); ?>
+<?php endif;  ?>
+		
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/languages.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/languages.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/languages.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/languages.tpl.php	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,64 @@
+<script type="text/javascript">
+function submitbutton(pressbutton) {
+    var form = document.adminForm;
+    if (pressbutton == 'remove') {
+        if (form.lang.value == "en") {
+            alert( "<?php echo T_('You cannot delete English.') ?>" );
+        } else {
+            submitform( pressbutton );
+        }
+    } else {
+        submitform( pressbutton );
+    }
+}
+</script>
+
+
+<table class="adminlist" id="lang_table" cellpadding="3" cellspacing="0" width="80%">
+<thead>
+<tr>
+    <th style="width:10px">&nbsp;</th>
+    <th><?php echo T_('Language') ?></th>
+    <th><?php echo T_('Country - Region') ?></th>
+    <th><?php echo T_('Default') ?></th>
+    <th><?php echo T_('Character Set') ?></th>
+    <th><?php echo T_('Version') ?></th>
+    <th><?php echo T_('Date') ?></th>
+</tr>
+</thead>
+<tbody>
+<?php for ($i=0, $n=count( $rows ); $i < $n; $i++) :  $row = $rows[$i];?>
+	<tr id="<?php echo $i;?>">			
+		<td style="width:10px">
+		<input type="radio" id="cb<?php echo $i;?>" name="lang" value="<?php echo $row->name; ?>" onClick="isChecked(this.checked);" />
+		</td>
+		<td>
+		<a href="#" onclick="hideMainMenu();return listItemTask('cb<?php echo $i;?>','edit')"><?php echo $row->title; ?></a>
+		</td>
+		<td>
+		<?php echo $row->territory ?>
+		</td>
+		<td>					
+		<?php $default = (mamboCore::get('mosConfig_lang') == $row->name) ? 1 : 0; ?>
+		<a href="javascript: void(0);" onClick="return listItemTask('cb<?php echo $i;?>','default')">
+		<img src="images/<?php echo ( $default ) ? 'tick.png' : 'publish_x.png';?>" width="12" height="12" border="0" alt="<?php echo ( $default ) ? T_('Yes') : T_('No');?>" />
+		</a>
+		</td>
+		<td>
+		<?php echo $row->charset ?>
+		</td>
+		<td>
+		<?php echo $row->version; ?>
+		</td>
+		<td>
+		<?php echo $row->creationdate; ?>
+		</td>
+	</tr>
+<?php endfor; ?>
+</tbody>
+</table>
+
+<script type="text/javascript">
+table = new Table('lang_table');  
+table.makeSortable(1,"null,str,null,str,str,date");
+</script>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_languages/views/templates/table.tpl.php 4.6rc2/administrator/components/com_languages/views/templates/table.tpl.php
--- 4.5.4/administrator/components/com_languages/views/templates/table.tpl.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_languages/views/templates/table.tpl.php	2006-02-16 21:00:30.000000000 -0600
@@ -0,0 +1,61 @@
+<table class="adminheading">
+	<tr>
+		<th class="langmanager">
+		<?php echo T_('Language Manager') ?>
+		</th>
+		<td style="white-space: nowrap;text-align:right">
+		<?php echo mosCurrentDate();?>   			
+        </td>
+	</tr>
+</table>
+<table class="adminlist">
+<tr>
+	<th width="30">
+	&nbsp;
+	</th>
+	<th width="25%" class="title">
+	<?php echo T_('Languages') ?>
+	</th>
+	<th width="5%">
+	<?php echo T_('Default') ?>
+	</th>
+	<th width="10%">
+	<?php echo T_('Version') ?>
+	</th>
+	<th width="10%">
+	<?php echo T_('Date') ?>
+	</th>
+	<th width="20%">
+	<?php echo T_('Author') ?>
+	</th>
+	<th width="25%">
+	<?php echo T_('Author Email') ?>
+	</th>
+</tr>	
+<?php for ($i=0, $n=count( $rows ); $i < $n; $i++) :  $row = $rows[$i];?>
+	<tr class="<?php echo "row$i"; ?>">			
+		<td width="20">
+		<input type="radio" id="cb<?php echo $i;?>" name="lang[]" value="<?php echo $row->language; ?>" onClick="isChecked(this.checked);" />
+		</td>
+		<td width="25%">
+		<a href="#" onclick="hideMainMenu();return listItemTask('cb<?php echo $i;?>','edit')"><?php echo $row->name;?></a></td>
+		<td width="5%" align="center">			
+		<a href="javascript: void(0);" onClick="return listItemTask('cb<?php echo $i;?>','publish')">
+		<img src="images/<?php echo ( $row->published ) ? 'tick.png' : 'publish_x.png';?>" width="12" height="12" border="0" alt="<?php echo ( $row->published ) ? T_('Yes') : T_('No');?>" />
+		</a>
+		</td>
+		<td align=center>
+		<?php echo $row->version; ?>
+		</td>
+		<td align=center>
+		<?php echo $row->creationdate; ?>
+		</td>
+		<td align=center>
+		<?php echo $row->author; ?>
+		</td>
+		<td align=center>
+		<?php echo $row->authorEmail; ?>
+		</td>
+	</tr>
+<?php endfor; ?>
+</table>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_login/login.xml 4.6rc2/administrator/components/com_login/login.xml
--- 4.5.4/administrator/components/com_login/login.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_login/login.xml	2006-03-01 13:18:50.000000000 -0600
@@ -2,10 +2,10 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Contact Items</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Parameters for individual Contact Items</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_mambots/admin.mambots.html.php 4.6rc2/administrator/components/com_mambots/admin.mambots.html.php
--- 4.5.4/administrator/components/com_mambots/admin.mambots.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_mambots/admin.mambots.html.php	2006-05-19 07:18:36.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.mambots.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Mambots
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Mambots
-*/
 class HTML_modules {
 
 	/**
@@ -31,10 +29,10 @@
 		<table class="adminheading">
 		<tr>
 			<th class="modules">
-			Mambot Manager <small><small>[ <?php echo $client == 'admin' ? 'Administrator' : 'Site';?> ]</small></small>
+			<?php echo T_('Mambot Manager')?> <small><small>[ <?php echo $client == 'admin' ? T_('Administrator') : T_('Site');?> ]</small></small>
 			</th>
 			<td>
-			Filter:
+			<?php echo T_('Filter:')?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -52,28 +50,28 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count( $rows );?>);" />
 			</th>
 			<th class="title">
-			Mambot Name
+			<?php echo T_('Mambot Name')?>
 			</th>
 			<th nowrap="nowrap" width="10%">
-	  		Published
+	  		<?php echo T_('Published')?>
 			</th>
 			<th colspan="2" nowrap="true" width="5%">
-			Reorder
+			<?php echo T_('Reorder')?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order')?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th nowrap="nowrap" width="10%">
-			Access
+			<?php echo T_('Access')?>
 			</th>
 			<th nowrap="nowrap" align="left" width="10%">
-			Type
+			<?php echo T_('Type')?>
 			</th>
 			<th nowrap="nowrap" align="left" width="10%">
-			File
+			<?php echo T_('File')?>
 			</th>
 		</tr>
 		<?php
@@ -176,9 +174,9 @@
 			// validation
 			var form = document.adminForm;
 			if (form.name.value == "") {
-				alert( "Mambot must have a name" );
+				alert( '<?php echo T_('Mambot must have a name'); ?>' );
 			} else if (form.element.value == "") {
-				alert( "Mambot must have a filename" );
+				alert( '<?php echo T_('Mambot must have a filename'); ?>' );
 			} else {
 				submitform(pressbutton);
 			}
@@ -187,9 +185,9 @@
 		<table class="adminheading">
 		<tr>
 			<th class="mambots">
-			Site Mambot:
+			<?php echo T_('Site Mambot:')?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			<?php echo $row->nameA; ?>
 			</th>
@@ -203,12 +201,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Mambot Details
+					<?php echo T_('Mambot Details'); ?>
 					</th>
 				<tr>
 				<tr>
 					<td width="100" align="left">
-					Name:
+					<?php echo T_('Name:'); ?>
 					</td>
 					<td>
 					<input class="text_area" type="text" name="name" size="35" value="<?php echo $row->name; ?>" />
@@ -216,7 +214,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Folder:
+					<?php echo T_('Folder:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['folder']; ?>
@@ -224,7 +222,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Mambot file:
+					<?php echo T_('Mambot file:'); ?>
 					</td>
 					<td>
 					<input class="text_area" type="text" name="element" size="35" value="<?php echo $row->element; ?>" />.php
@@ -232,7 +230,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Mambot Order:
+					<?php echo T_('Mambot Order:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -240,7 +238,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Access Level:
+					<?php echo T_('Access Level:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -248,7 +246,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Published:
+					<?php echo T_('Published:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -261,7 +259,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Description:
+					<?php echo T_('Description:'); ?>
 					</td>
 					<td>
 					<?php echo $row->description; ?>
@@ -273,7 +271,7 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Parameters
+					<?php echo T_('Parameters'); ?>
 					</th>
 				<tr>
 				<tr>
@@ -282,7 +280,7 @@
 					if ( $row->id ) {
 						echo $params->render();
 					} else {
-						echo '<i>No Parameters</i>';
+						echo '<i>'.T_('No Parameters').'</i>';
 					}
 					?>
 					</td>
diff -ruN 4.5.4/administrator/components/com_mambots/admin.mambots.php 4.6rc2/administrator/components/com_mambots/admin.mambots.php
--- 4.5.4/administrator/components/com_mambots/admin.mambots.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_mambots/admin.mambots.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.mambots.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Mambots
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,7 +16,7 @@
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'mambots', 'all' )
 | $acl->acl_check( 'administration', 'install', 'users', $my->usertype, 'mambots', 'all' ))) {
-        mosRedirect( 'index2.php', _NOT_AUTH );
+        mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -134,7 +136,7 @@
 	. "\n GROUP BY folder"
 	. "\n ORDER BY folder"
 	;
-	$types[] = mosHTML::makeOption( '0', _SEL_TYPE );
+	$types[] = mosHTML::makeOption( '0', T_('- All Types -') );
 	$database->setQuery( $query );
 	$types = array_merge( $types, $database->loadObjectList() );
 	$lists['type']	= mosHTML::selectList( $types, 'filter_type', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_type );
@@ -181,12 +183,12 @@
 
 	switch ( $task ) {
 		case 'apply':
-			$msg = 'Successfully Saved changes to Mambot: '. $row->name;
+			$msg = sprintf(T_('Successfully Saved changes to Mambot: %s'), $row->name);
 			mosRedirect( 'index2.php?option='. $option .'&client='. $client .'&task=editA&hidemainmenu=1&id='. $row->id, $msg );
 
 		case 'save':
 		default:
-			$msg = 'Successfully Saved Mambot: '. $row->name;
+			$msg = sprintf(T_('Successfully Saved Mambot: %s'), $row->name);
 			mosRedirect( 'index2.php?option='. $option .'&client='. $client, $msg );
 			break;
 	}
@@ -209,7 +211,7 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		echo "<script>alert('The module $row->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+		echo "<script>alert(".sprintf(T_('The module %s is currently being edited by another administrator'), $row->title)."); document.location.href='index2.php?option=$option'</script>\n";
 		exit(0);
 	}
 
@@ -221,7 +223,7 @@
 
 	// get list of groups
 	if ($row->access == 99 || $row->client_id == 1) {
-		$lists['access'] = 'Administrator<input type="hidden" name="access" value="99" />';
+		$lists['access'] = T_('Administrator').'<input type="hidden" name="access" value="99" />';
 	} else {
 		// build the html select list for the group access
 		$lists['access'] = mosAdminMenus::Access( $row );
@@ -244,24 +246,14 @@
 			$order = mosGetOrderingList( $query );
 			$lists['ordering'] = mosHTML::selectList( $order, 'ordering', 'class="inputbox" size="1"', 'value', 'text', intval( $row->ordering ) );
 		} else {
-			$lists['ordering'] = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />This mambot cannot be reordered';
+			$lists['ordering'] = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />'.T_('This mambot cannot be reordered');
 		}
 		$lists['folder'] = '<input type="hidden" name="folder" value="'. $row->folder .'" />'. $row->folder;
 
-		// XML library
-		require_once( $mosConfig_absolute_path . '/includes/domit/xml_domit_lite_include.php' );
 		// xml file for module
 		$xmlfile = $mosConfig_absolute_path . '/mambots/' .$row->folder . '/' . $row->element .'.xml';
-		$xmlDoc =& new DOMIT_Lite_Document();
-		$xmlDoc->resolveErrors( true );
-		if ($xmlDoc->loadXML( $xmlfile, false, true )) {
-			$element = &$xmlDoc->documentElement;
-			if ($element->getTagName() == 'mosinstall' && $element->getAttribute( 'type' ) == 'mambot' ) {
-				$element = &$xmlDoc->getElementsByPath( 'description', 1 );
-				$row->description = $element ? trim( $element->getText() ) : '';
-
-			}
-		}
+		$xmlparser =& new mosXMLDescription ($xmlfile);
+		$row->description = $xmlparser->getDescription('mambot');
 	} else {
 		$row->folder 		= '';
 		$row->ordering 		= 999;
@@ -276,13 +268,13 @@
 			}
 		}
 		$lists['folder'] = mosHTML::selectList( $folders2, 'folder', 'class="inputbox" size="1"', 'value', 'text', null );
-		$lists['ordering'] = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />New items default to the last place. Ordering can be changed after this item is saved.';
+		$lists['ordering'] = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />'.T_('New items default to the last place. Ordering can be changed after this item is saved.').'';
 	}
 
 	$lists['published'] = mosHTML::yesnoRadioList( 'published', 'class="inputbox"', $row->published );
 
 	// get params definitions
-	$params =& new mosParameters( $row->params, $mainframe->getPath( 'bot_xml', $row->folder.'/'.$row->element ), 'mambot' );
+	$params =& new mosAdminParameters( $row->params, $mainframe->getPath( 'bot_xml', $row->folder.'/'.$row->element ), 'mambot' );
 
 	HTML_modules::editMambot( $row, $lists, $params, $option );
 }
@@ -297,7 +289,7 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		echo "<script> alert('Select a module to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert(".T_('Select a module to delete')."); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -313,8 +305,8 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select a mambot to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert(".sprintf(T_('Select a mambot to %s'), $action)."); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -409,40 +401,31 @@
 
 function saveOrder( &$cid ) {
 	global $database;
-
-	$total		= count( $cid );
 	$order 		= mosGetParam( $_POST, 'order', array(0) );
-	$row 		= new mosMambot( $database );
-	$conditions = array();
-
+	$row		= new mosMenu( $database );
+	$folders = array();
     // update ordering values
-	for ( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
 		if ($row->ordering != $order[$i]) {
 			$row->ordering = $order[$i];
 	        if (!$row->store()) {
 	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
 	            exit();
-	        } // if
+	        }
 	        // remember to updateOrder this group
-	        $condition = "folder='$row->folder' AND ordering > -10000 AND ordering < 10000 AND client_id='$row->client_id'";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // if
-	} // for
-
+	        $folders[$row->folder][$row->client_id] = $row->id;
+	    }
+	}
 	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
+	foreach ($folders as $folder=>$clients) {
+	    foreach ($clients as $client=>$rowid) {
+			$row->updateOrder("folder = '$folder' AND ordering > -10000 AND ordering < 10000 AND client_id = '$client'");
+		}
 	} // foreach
 
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_mambots', $msg );
 } // saveOrder
-?>
\ No newline at end of file
+
+?>
diff -ruN 4.5.4/administrator/components/com_mambots/toolbar.mambots.html.php 4.6rc2/administrator/components/com_mambots/toolbar.mambots.html.php
--- 4.5.4/administrator/components/com_mambots/toolbar.mambots.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_mambots/toolbar.mambots.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,54 +1,64 @@
 <?php
 /**
-* @version $Id: toolbar.mambots.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Mambots
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Mambots
-*/
 class TOOLBAR_modules {
-	/**
+    /**
 	* Draws the menu for Editing an existing module
 	*/
-	function _EDIT() {
-		global $id;
-		
-		mosMenuBar::startTable();
-		mosMenuBar::save();
-		mosMenuBar::spacer();
-		mosMenuBar::apply();
-		mosMenuBar::spacer();
-		if ( $id ) {
-			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
-		} else {
-			mosMenuBar::cancel();
-		}
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.mambots.edit' );
-		mosMenuBar::endTable();
-	}
+    function _EDIT() {
+        global $id;
+
+        mosMenuBar::startTable();
+        mosMenuBar::save();
+        mosMenuBar::spacer();
+        mosMenuBar::apply();
+        mosMenuBar::spacer();
+        if ( $id ) {
+            // for existing content items the button is renamed `close`
+            mosMenuBar::cancel( 'cancel', T_('Close') );
+        } else {
+            mosMenuBar::cancel();
+        }
+        mosMenuBar::spacer();
+        if ($GLOBALS['task'] == 'new') {
+            mosMenuBar::help( 'new' );
+        } else {
+            if ($_POST) {
+                $cid = (int) $GLOBALS['cid'][0];
+            } else {
+                $cid = (int) $_GET['id'];
+            }
+            $database =& mamboDatabase::getInstance();
+            $database->setQuery('select element from #__mambots where id = '.$cid);
+            $result = $database->loadResult();
+            mosMenuBar::help( $result ? $result : 'edit' );
+        }
+        mosMenuBar::endTable();
+    }
 
-	function _DEFAULT() {
-		mosMenuBar::startTable();
-		mosMenuBar::publishList();
-		mosMenuBar::spacer();
-		mosMenuBar::unpublishList();
-		mosMenuBar::spacer();
-		mosMenuBar::addNewX();
-		mosMenuBar::spacer();
-		mosMenuBar::editListX();
-		mosMenuBar::spacer();
-		mosMenuBar::deleteList();
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.mambots.main' );
-		mosMenuBar::endTable();
-	}
+    function _DEFAULT() {
+        mosMenuBar::startTable();
+        mosMenuBar::publishList();
+        mosMenuBar::spacer();
+        mosMenuBar::unpublishList();
+        mosMenuBar::spacer();
+        mosMenuBar::addNewX();
+        mosMenuBar::spacer();
+        mosMenuBar::editListX();
+        mosMenuBar::spacer();
+        mosMenuBar::deleteList();
+        mosMenuBar::spacer();
+        mosMenuBar::help( 'manager' );
+        mosMenuBar::endTable();
+    }
 }
 ?>
diff -ruN 4.5.4/administrator/components/com_mambots/toolbar.mambots.php 4.6rc2/administrator/components/com_mambots/toolbar.mambots.php
--- 4.5.4/administrator/components/com_mambots/toolbar.mambots.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_mambots/toolbar.mambots.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.mambots.php,v 1.1 2005/07/22 01:52:34 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Mambots
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_massmail/admin.massmail.html.php 4.6rc2/administrator/components/com_massmail/admin.massmail.html.php
--- 4.5.4/administrator/components/com_massmail/admin.massmail.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_massmail/admin.massmail.html.php	2006-05-19 07:18:36.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.massmail.html.php,v 1.1 2005/07/22 01:52:35 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -27,11 +29,11 @@
 				}
 				// do field validation
 				if (form.mm_subject.value == ""){
-					alert( "Please fill in the subject" );
+					alert( '<?php echo T_('Please fill in the subject'); ?>' );
 				} else if (getSelectedValue('adminForm','mm_group') < 0){
-					alert( "Please select a group" );
+					alert( '<?php echo T_('Please select a group'); ?>' );
 				} else if (form.mm_message.value == ""){
-					alert( "Please fillin the message" );
+					alert( '<?php echo T_('Please fill in the message'); ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -42,7 +44,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="massemail">
-			Mass Mail
+			<?php echo T_('Mass Mail'); ?>
 			</th>
 		</tr>
 		</table>
@@ -50,12 +52,12 @@
 		<table class="adminform">
 		<tr>
 			<th colspan="2">
-			Details
+			<?php echo T_('Details'); ?>
 			</th>
 		</tr>
 		<tr>
 			<td width="150" valign="top">
-			Group:
+			<?php echo T_('Group:'); ?>
 			</td>
 			<td width="85%">
 			<?php echo $lists['gid']; ?>
@@ -63,7 +65,7 @@
 		</tr>
 		<tr>
 			<td>
-			Mail to Child Groups:
+			<?php echo T_('Mail to Child Groups:'); ?>
 			</td>
 			<td>
 			<input type="checkbox" name="mm_recurse" value="RECURSE" />
@@ -71,7 +73,7 @@
 		</tr>
 		<tr>
 			<td>
-			Send in HTML mode:
+			<?php echo T_('Send in HTML mode:'); ?>
 			</td>
 			<td>
 			<input type="checkbox" name="mm_mode" value="1" />
@@ -79,7 +81,7 @@
 		</tr>
 		<tr>
 			<td>
-			Subject:
+			<?php echo T_('Subject'); ?>:
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="mm_subject" value="" size="50"/>
@@ -87,7 +89,7 @@
 		</tr>
 		<tr>
 			<td valign="top">
-			Message:
+			<?php echo T_('Message:'); ?>
 			</td>
 			<td>
 			<textarea cols="80" rows="25" name="mm_message" class="inputbox"></textarea>
diff -ruN 4.5.4/administrator/components/com_massmail/admin.massmail.php 4.6rc2/administrator/components/com_massmail/admin.massmail.php
--- 4.5.4/administrator/components/com_massmail/admin.massmail.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_massmail/admin.massmail.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,19 +1,21 @@
 <?php
 /**
-* @version $Id: admin.massmail.php,v 1.1 2005/07/22 01:52:35 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 // ensure user has access to this function
 if (!$acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_massmail' )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -36,7 +38,7 @@
 	global $acl;
 
 	$gtree = array(
-	mosHTML::makeOption( 0, '- All User Groups -' )
+	mosHTML::makeOption( 0, T_('- All User Groups -') )
 	);
 
 	// get list of groups
@@ -66,7 +68,8 @@
 	$message_body 		= stripslashes( $message_body );
 	
 	if (!$message_body || !$subject || $gou === null) {
-		mosRedirect( 'index2.php?option=com_massmail&mosmsg=Please fill in the form correctly' );
+	    $msg = T_('Please fill in the form correctly');
+		mosRedirect( 'index2.php?option=com_massmail&mosmsg='.$msg );
 	}
 
 	// get users in the group out of the acl
@@ -88,7 +91,10 @@
 		$rows = $database->loadObjectList();
 
 		// Build e-mail message format
-		$message_header 	= sprintf( _MASSMAIL_MESSAGE, $mosConfig_sitename );
+		$message_header 	= sprintf( T_("This is an email from '%s'
+
+Message:
+"), $mosConfig_sitename );
 		$message 			= $message_header . $message_body;
 		$subject 			= $mosConfig_sitename. ' / '. stripslashes( $subject);
 
@@ -98,7 +104,7 @@
 		}
 	}
 	
-	$msg = 'E-mail sent to '. count( $rows ) .' users';
+	$msg = sprintf(Tn_('E-mail sent to %d user.', 'E-mail sent to %d users.', count($rows)), count($rows));
 	mosRedirect( 'index2.php?option=com_massmail', $msg );
 }
 ?>
diff -ruN 4.5.4/administrator/components/com_massmail/massmail.xml 4.6rc2/administrator/components/com_massmail/massmail.xml
--- 4.5.4/administrator/components/com_massmail/massmail.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_massmail/massmail.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Mass Mail</name>
 	<author>Mambo Project</author>
 	<creationDate>February 2005</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.1</version>
 	<description>This component allows you to send a mass email to certain user groups</description>
 	<params/>
diff -ruN 4.5.4/administrator/components/com_massmail/toolbar.massmail.html.php 4.6rc2/administrator/components/com_massmail/toolbar.massmail.html.php
--- 4.5.4/administrator/components/com_massmail/toolbar.massmail.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_massmail/toolbar.massmail.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,31 +1,29 @@
 <?php
 /**
-* @version $Id: toolbar.massmail.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Massmail
-*/
 class TOOLBAR_massmail {
 	/**
 	* Draws the menu for a New Contact
 	*/
 	function _DEFAULT() {
 		mosMenuBar::startTable();
-		mosMenuBar::custom('send','publish.png','publish_f2.png','Send Mail',false);
+		mosMenuBar::custom('send','publish.png','publish_f2.png',T_('Send Mail'),false);
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.users.massmail' );
+		mosMenuBar::help( 'main' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_massmail/toolbar.massmail.php 4.6rc2/administrator/components/com_massmail/toolbar.massmail.php
--- 4.5.4/administrator/components/com_massmail/toolbar.massmail.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_massmail/toolbar.massmail.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.massmail.php,v 1.1 2005/07/22 01:52:35 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_media/admin.media.html.php 4.6rc2/administrator/components/com_media/admin.media.html.php
--- 4.5.4/administrator/components/com_media/admin.media.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_media/admin.media.html.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: admin.media.html.php,v 1.1 2005/07/22 01:52:35 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -81,14 +83,14 @@
 	<form action="index2.php" name="adminForm" method="post" enctype="multipart/form-data" >
 	  <table class="adminheading">
 		<tr>
-	    <th class="mediamanager">Media Manager</th>
+	    <th class="mediamanager"><?php echo T_('Media Manager') ?></th>
 	    <tr>
 	      <td align="center">	  <fieldset>
 	        <table width="99%" align="center" border="0" cellspacing="2" cellpadding="2">
 	          <tr>
 	            <td><table border="0" cellspacing="1" cellpadding="3">
     	            <tr>
-	                  <td>Directory</td>
+	                  <td><?php echo T_('Directory') ?></td>
 	                  <td>
 					  <?php echo $dirPath;?>
 					  </td>
@@ -109,18 +111,18 @@
 	    <tr>
 	      <td><table border="0" align="center" cellpadding="2" cellspacing="2" width="100%">
 	      		<tr>
-	            <td align="left">Upload</td>
+	            <td align="left"><?php echo T_('Upload') ?></td>
 	            <td>
 	            	<input class="inputbox" type="file" name="upload" id="upload" size="79">&nbsp;
-	            	Max size = <?php echo ini_get( 'post_max_size' );?>
+	            	<?php echo T_('Max size') ?> = <?php echo ini_get( 'post_max_size' );?>
 	            	</td>
     	        </tr>
         	  <tr>
-			  <td align="left">Code</td>
+			  <td align="left"><?php echo T_('Code') ?></td>
 			<td><input class="inputbox" type="text" name="imagecode" size="80" /></td>
         	  </tr>
 			  <tr>
-			  <td align="left">Create Directory</td>
+			  <td align="left"><?php echo T_('Create Directory') ?></td>
    				<td><input class="inputbox" type="text" name="foldername" size="80" />
 				 </td>
 	          </tr>
@@ -160,7 +162,7 @@
 	?>
 	<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
 	  <tr>
-	    <td><div align="center" style="font-size:large;font-weight:bold;color:#CCCCCC;font-family: Helvetica, sans-serif;">No Images Found</div></td>
+	    <td><div align="center" style="font-size:large;font-weight:bold;color:#CCCCCC;font-family: Helvetica, sans-serif;"><?php echo T_('No Images Found') ?></div></td>
 	  </tr>
 	</table>
 	<?php
@@ -171,7 +173,7 @@
 	?>
 	<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
 	  <tr>
-	    <td><div align="center" style="font-size:small;font-weight:bold;color:#CC0000;font-family: Helvetica, sans-serif;">Configuration Problem: &quot;<?php echo $BASE_DIR.$BASE_ROOT; ?>&quot; does not exist.</div></td>
+	    <td><div align="center" style="font-size:small;font-weight:bold;color:#CC0000;font-family: Helvetica, sans-serif;"><?php printf(T_('Configuration Problem: &quot; %s &quot; does not exist.'), $BASE_DIR.$BASE_ROOT) ?></div></td>
 	  </tr>
 	</table>
 	<?php
@@ -209,9 +211,9 @@
 	    <td><table width="100%" border="0" cellspacing="0" cellpadding="2">
     	    <tr>
         	  <td width="1%" class="buttonOut">
-				<a href="javascript:;" onClick="javascript:window.top.document.forms[0].imagecode.value = '<img src=&quot;<?php echo $img_url;?>&quot; align=&quot;left&quot; hspace=&quot;6&quot; alt=&quot;Code&quot; />';"><img src="components/com_media/images/edit_pencil.gif" width="15" height="15" border="0" alt="Code"></a></td>
+				<a href="javascript:;" onClick="javascript:window.top.document.forms[0].imagecode.value = '<img src=&quot;<?php echo $img_url;?>&quot; align=&quot;left&quot; hspace=&quot;6&quot; alt=&quot;Code&quot; />';"><img src="components/com_media/images/edit_pencil.gif" width="15" height="15" border="0" alt="<?php echo T_('Code') ?>"></a></td>
 	          <td width="1%" class="buttonOut">
-				<a href="index2.php?option=com_media&task=delete&delFile=<?php echo $file; ?>&listdir=<?php echo $listdir; ?>" target="_top" onClick="return deleteImage('<?php echo $file; ?>');"><img src="components/com_media/images/edit_trash.gif" width="15" height="15" border="0" alt="Delete"></a></td>
+				<a href="index2.php?option=com_media&task=delete&delFile=<?php echo $file; ?>&listdir=<?php echo $listdir; ?>" target="_top" onClick="return deleteImage('<?php echo $file; ?>');"><img src="components/com_media/images/edit_trash.gif" width="15" height="15" border="0" alt="<?php echo T_('Delete') ?>"></a></td>
 	          <td width="98%" class="imgCaption"><?php echo $info[0].'x'.$info[1]; ?></td>
 	        </tr>
 	      </table></td>
@@ -248,7 +250,7 @@
 	    <td><table width="100%" border="0" cellspacing="1" cellpadding="2">
 	        <tr>
 	          <td width="1%" class="buttonOut">
-				<a href="index2.php?option=com_media&task=deletefolder&delFolder=<?php echo $path; ?>&listdir=<?php echo $listdir; ?>" target="_top" onClick="return deleteFolder('<?php echo $dir; ?>', <?php echo $num_files; ?>);"><img src="components/com_media/images/edit_trash.gif" width="15" height="15" border="0" alt="Delete"></a></td>
+				<a href="index2.php?option=com_media&task=deletefolder&delFolder=<?php echo $path; ?>&listdir=<?php echo $listdir; ?>" target="_top" onClick="return deleteFolder('<?php echo $dir; ?>', <?php echo $num_files; ?>);"><img src="components/com_media/images/edit_trash.gif" width="15" height="15" border="0" alt="<?php echo T_('Delete') ?>"></a></td>
 	          <td width="99%" class="imgCaption"></td>
 	        </tr>
 	      </table></td>
@@ -267,7 +269,7 @@
 	<table width="102" border="0" cellpadding="0" cellspacing="2">
 	  <tr>
 	    <td align="center" class="imgBorder">
-		  <a href="index3.php?option=com_media&task=list&listdir=<?php echo $listdir; ?>" onClick="javascript:window.top.document.forms[0].imagecode.value = '<a href=&quot;<?php echo $mosConfig_live_site.'/images/stories'.$listdir.'/'.$doc;?>&quot;>Insert your text here</a>';">
+		  <a href="index3.php?option=com_media&task=list&listdir=<?php echo $listdir; ?>" onClick="javascript:window.top.document.forms[0].imagecode.value = '<a href=&quot;<?php echo $mosConfig_live_site.'/images/stories'.$listdir.'/'.$doc;?>&quot;><?php echo T_('Insert your text here') ?></a>';">
 		  <img border="0" src="<?php echo $icon ?>" alt="<?php echo $doc; ?>"></a>
 		</td>
 	  </tr>
@@ -278,9 +280,9 @@
 	      <td><table width="100%" border="0" cellspacing="0" cellpadding="2">
 	        <tr>
 	          <td width="1%" class="buttonOut">
-				<a href="javascript:;" onClick="javascript:window.top.document.forms[0].imagecode.value = '<a href=&quot;<?php echo $mosConfig_live_site.'/images/stories'.$listdir.'/'.$doc;?>&quot;>Insert your text here</a>';"><img src="components/com_media/images/edit_pencil.gif" width="15" height="15" border="0" alt="Code"></a></td>
+				<a href="javascript:;" onClick="javascript:window.top.document.forms[0].imagecode.value = '<a href=&quot;<?php echo $mosConfig_live_site.'/images/stories'.$listdir.'/'.$doc;?>&quot;>Insert your text here</a>';"><img src="components/com_media/images/edit_pencil.gif" width="15" height="15" border="0" alt="<?php echo T_('Code') ?>"></a></td>
 	          <td width="1%" class="buttonOut">
-				<a href="index2.php?option=com_media&task=delete&delFile=<?php echo $doc; ?>&listdir=<?php echo $listdir; ?>" target="_top" onClick="return deleteImage('<?php echo $doc; ?>');"><img src="components/com_media/images/edit_trash.gif" width="15" height="15" border="0" alt="Delete"></a></td>
+				<a href="index2.php?option=com_media&task=delete&delFile=<?php echo $doc; ?>&listdir=<?php echo $listdir; ?>" target="_top" onClick="return deleteImage('<?php echo $doc; ?>');"><img src="components/com_media/images/edit_trash.gif" width="15" height="15" border="0" alt="<?php echo T_('Delete') ?>"></a></td>
 	          <td width="98%" class="imgCaption"></td>
 	        </tr>
 	      </table></td>
@@ -366,7 +368,7 @@
 
 	function deleteImage(file)
 	{
-		if(confirm("Delete file \""+file+"\"?"))
+		if(confirm(<?php echo T_('"Delete file \""+file+"\"?"') ?>))
 		return true;
 
 		return false;
@@ -374,11 +376,11 @@
 	function deleteFolder(folder, numFiles)
 	{
 		if(numFiles > 0) {
-			alert("There are "+numFiles+" files/folders in \""+folder+"\".\n\nPlease delete all files/folder in \""+folder+"\" first.");
+			alert(<?php echo T_('"There are "+numFiles+" files/folders in \""+folder+"\".\n\nPlease delete all files/folder in \""+folder+"\" first."') ?>);
 			return false;
 		}
 
-		if(confirm("Delete folder \""+folder+"\"?"))
+		if(confirm(<?php echo T_('"Delete folder \""+folder+"\"?"') ?>))
 		return true;
 
 		return false;
diff -ruN 4.5.4/administrator/components/com_media/admin.media.php 4.6rc2/administrator/components/com_media/admin.media.php
--- 4.5.4/administrator/components/com_media/admin.media.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_media/admin.media.php	2006-03-02 11:26:20.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: admin.media.php,v 1.1 2005/07/22 01:52:35 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -14,23 +16,25 @@
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
 		| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_media' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
 //require_once( $mainframe->getPath( 'class' ) );
 
 $cid = mosGetParam( $_POST, 'cid', array(0) );
+$foldername = mosGetParam($_POST, 'foldername', '');
+$listdir = mosGetParam($_REQUEST, 'listdir', '');
+$dirPath = mosGetParam($_POST, 'dirPath', '');
+$task = mosGetParam($_REQUEST, 'task', '');
+
+
 if (!is_array( $cid )) {
 	$cid = array(0);
 }
 
-if (!(isset($listdir))){
-	$listdir='';
-	}
-
 if (is_int(strpos ($listdir, "..")) && $listdir<>'') {
-	mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "NO HACKING PLEASE" );
+	mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("NO HACKING PLEASE") );
 	}
 
 switch ($task) {
@@ -42,7 +46,7 @@
 
 	case "newdir":
 		if (ini_get('safe_mode')=="On") {
-			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "Directory creation not allowed while running in SAFE MODE as this can cause problems." );
+			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("Directory creation not allowed while running in SAFE MODE as this can cause problems.") );
 			}
 		else {
 			create_folder($foldername,$dirPath);
@@ -86,7 +90,7 @@
 	if(strlen($folder_name) >0)
 	{
 		if (eregi("[^0-9a-zA-Z_]", $folder_name)) {
-			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "Directory name must only contain alphanumeric characters and no spaces please." );
+			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("Directory name must only contain alphanumeric characters and no spaces please.") );
 		}
 		$folder = $mosConfig_absolute_path."/images/stories".$dirPath."/".$folder_name;
 		if(!is_dir($folder) && !is_file($folder))
@@ -122,7 +126,7 @@
 		@unlink($del_html);
 		rmdir($del_folder);
 	} else {
-		echo '<font color="red">Unable to delete: not empty!</font>';
+		echo '<font color="red">'.T_('Unable to delete: not empty!').'</font>';
 	}
 }
 
@@ -154,19 +158,19 @@
 	global $clearUploads;
 
 		if (file_exists($dest_dir.$file['name'])) {
-			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "Upload FAILED.File allready exists" );
+			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("Upload FAILED. File already exists") );
 		}
 
 		if ((strcasecmp(substr($file['name'],-4),".gif")) && (strcasecmp(substr($file['name'],-4),".jpg")) && (strcasecmp(substr($file['name'],-4),".png")) && (strcasecmp(substr($file['name'],-4),".bmp")) &&(strcasecmp(substr($file['name'],-4),".doc")) && (strcasecmp(substr($file['name'],-4),".xls")) && (strcasecmp(substr($file['name'],-4),".ppt")) && (strcasecmp(substr($file['name'],-4),".swf")) && (strcasecmp(substr($file['name'],-4),".pdf"))) {
-			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "Only files of type gif, png, jpg, bmp, pdf, swf, doc, xls or ppt can be uploaded" );
+			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("Only files of type gif, png, jpg, bmp, pdf, swf, doc, xls or ppt can be uploaded") );
 		}
 
 		if (!move_uploaded_file($file['tmp_name'], $dest_dir.strtolower($file['name']))){
-			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "Upload FAILED" );
+			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("Upload FAILED") );
 			}
 		else {
 			mosChmod($dest_dir.strtolower($file['name']));
-			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], "Upload complete" );
+			mosRedirect( "index2.php?option=com_media&listdir=".$_POST['dirPath'], T_("Upload complete") );
 		}
 
 	$clearUploads = true;
diff -ruN 4.5.4/administrator/components/com_media/media.xml 4.6rc2/administrator/components/com_media/media.xml
--- 4.5.4/administrator/components/com_media/media.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_media/media.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
   <name>Media Manager</name>
   <author>Mambo Project</author>
   <creationDate>July 2004</creationDate>
-  <copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+  <copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
   <license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-  <authorEmail>admin@mamboserver.com</authorEmail>
-  <authorUrl>www.mamboserver.com</authorUrl>
+  <authorEmail>core@mambo-foundation.org</authorEmail>
+  <authorUrl>www.mambo-foundation.org</authorUrl>
   <version>4.5.2</version>
   <description>This component manages site media</description>
   <params />
diff -ruN 4.5.4/administrator/components/com_media/toolbar.media.html.php 4.6rc2/administrator/components/com_media/toolbar.media.html.php
--- 4.5.4/administrator/components/com_media/toolbar.media.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_media/toolbar.media.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: toolbar.media.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -22,11 +24,11 @@
 
 	function _DEFAULT() {
 		mosMenuBar::startTable();
-		mosMenuBar::custom('upload','upload.png','upload_f2.png','Upload',false);
+		mosMenuBar::custom('upload','upload.png','upload_f2.png',T_('Upload'),false);
 		mosMenuBar::spacer();
-		mosMenuBar::custom('newdir','new.png','new_f2.png','Create' ,false);
+		mosMenuBar::custom('newdir','new.png','new_f2.png',T_('Create') ,false);
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.mediamanager' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 
diff -ruN 4.5.4/administrator/components/com_media/toolbar.media.php 4.6rc2/administrator/components/com_media/toolbar.media.php
--- 4.5.4/administrator/components/com_media/toolbar.media.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_media/toolbar.media.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: toolbar.media.php,v 1.1 2005/07/22 01:52:35 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Massmail
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/administrator/components/com_menumanager/admin.menumanager.html.php 4.6rc2/administrator/components/com_menumanager/admin.menumanager.html.php
--- 4.5.4/administrator/components/com_menumanager/admin.menumanager.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menumanager/admin.menumanager.html.php	2006-03-06 20:42:01.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: admin.menumanager.html.php,v 1.1 2005/07/22 01:52:39 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * HTML class for all menumanager component output
-* @package Mambo
-* @subpackage Menus
 */
 class HTML_menumanager {
 	/**
@@ -39,7 +39,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="menus">
-			Menu Manager
+			<?php echo T_('Menu Manager') ?>
 			</th>
 		</tr>
 		</table>
@@ -50,22 +50,22 @@
 			<th width="20px">
 			</th>
 			<th class="title" nowrap="nowrap">
-			Menu Name
+			<?php echo T_('Menu Name') ?>
 			</th>
 			<th width="5%" nowrap="nowrap">
-			Menu Items
+			<?php echo T_('Menu Items') ?>
 			</th>
 			<th width="10%">
-			# Published
+			<?php echo T_('# Published') ?>
 			</th>
 			<th width="15%">
-			# Unpublished
+			<?php echo T_('# Unpublished') ?>
 			</th>
 			<th width="15%">
-			# Trash
+			<?php echo T_('# Trash') ?>
 			</th>
 			<th width="15%">
-			# Modules
+			<?php echo T_('# Modules') ?>
 			</th>
 		</tr>
 		<?php
@@ -91,12 +91,12 @@
 				<input type="radio" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $menu->type; ?>" onclick="isChecked(this.checked);" />
 				</td>
 				<td>
-				<a href="<?php echo $link; ?>" title="Edit Menu Name">
+				<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Menu Name') ?>">
 				<?php echo $menu->type; ?>
 				</a>
 				</td>
 				<td align="center">
-				<a href="<?php echo $linkA; ?>" title="Edit Menu Items">
+				<a href="<?php echo $linkA; ?>" title="<?php echo T_('Edit Menu Items') ?>">
 				<img src="<?php echo $mosConfig_live_site; ?>/includes/js/ThemeOffice/mainmenu.png" border="0"/>
 				</a>
 				</td>
@@ -153,7 +153,7 @@
 
 			if (pressbutton == 'savemenu') {
 				if ( form.menutype.value == '' ) {
-					alert( 'Please enter a menu name' );
+					alert( '<?php echo T_('Please enter a menu name') ?>' );
 					form.menutype.focus();
 					return;
 				}
@@ -161,7 +161,7 @@
 				if ( $new ) {
 					?>
 					if ( form.title.value == '' ) {
-						alert( 'Please enter a module name for your menu' );
+						alert( '<?php echo T_('Please enter a module name for your menu') ?>' );
 						form.title.focus();
 						return;
 					}
@@ -179,7 +179,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="menus">
-			Menu Details
+			<?php echo T_('Menu Details') ?>
 			</th>
 		</tr>
 		</table>
@@ -187,12 +187,12 @@
 		<table class="adminform">
 		<tr height="45px;">
 			<td width="100px" align="left">
-			<strong>Menu Name:</strong>
+			<strong><?php echo T_('Menu Name:') ?></strong>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="menutype" size="30" value="<?php echo isset( $row->menutype ) ? $row->menutype : ''; ?>" />
 			<?php
-			$tip = 'This is the identification name used by mambo to identify this menu within the code - it must be unique. Recommend that you do not have any spaces in your Menu Name';
+			$tip = T_('This is the identification name used by mambo to identify this menu within the code - it must be unique. It is recommended that you do not have any spaces in your Menu Name');
 			echo mosToolTip( $tip );
 			?>
 			</td>
@@ -207,14 +207,15 @@
 				<td>
 				<input class="inputbox" type="text" name="title" size="30" value="<?php echo $row->title ? $row->title : '';?>" />
 				<?php
-				$tip = 'Title of the mod_mainmenu module required to show this Menu';
+				$tip = T_('Title of the mod_mainmenu module required to show this Menu');
 				echo mosToolTip( $tip );
 				?>
 				<br/><br/><br/>
 				<strong>
-				* A new mod_mainmenu module, with the Title you have entered above will automatically be created when you save this menu. *
+				
+				* <?php echo T_('A new mod_mainmenu module, with the Title you have entered above will automatically be created when you save this menu.') ?> *
 				<br/><br/>
-				Parameters for the module created are to be edited through the 'Modules Manager [site]': Modules -> Site Modules
+				<?php echo T_('Parameters for the module created are to be edited through the "Modules Manager [site]": Modules -> Site Modules') ?>
 				</strong>
 				</td>
 			</tr>
@@ -262,7 +263,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Delete Menu: <?php echo $type;?>
+			<?php printf(T_('Delete Menu: %s'), $type) ?> 
 			</th>
 		</tr>
 		</table>
@@ -275,7 +276,7 @@
 			<?php
 			if ( $modules ) {
 				?>
-				<strong>Module(s) being Deleted:</strong>
+				<strong><?php echo T_('Module(s) being Deleted:') ?></strong>
 				<ol>
 				<?php
 				foreach ( $modules as $module ) {
@@ -297,10 +298,11 @@
 			?>
 			</td>
 			<td align="left" valign="top" width="25%">
-			<strong>Menu Items being Deleted:</strong>
+			<strong><?php echo T_('Menu Items being Deleted:') ?></strong>
 			<br />
 			<ol>
 			<?php
+			if (is_array($items)) {
 			foreach ( $items as $item ) {
 				?>
 				<li>
@@ -311,16 +313,17 @@
 				<input type="hidden" name="mids[]" value="<?php echo $item->id; ?>" />
 				<?php
 			}
+			}
 			?>
 			</ol>
 			</td>
 			<td>
-			* This will <strong><font color="#FF0000">Delete</font></strong> this Menu, <br />ALL its Menu Items and the Module(s) associated with it *
+			* <?php echo T_('This will <span style="font-weight:bold;color:#FF0000">Delete</span> this Menu, <br />ALL its Menu Items and the Module(s) associated with it') ?>  *
 			<br /><br /><br />
 			<div style="border: 1px dotted gray; width: 70px; padding: 10px; margin-left: 100px;">
-			<a class="toolbar" href="javascript:if (confirm('Are you sure you want to Delete this menu? \nThis will Delete the Menu, its Items and the Module(s).')){ submitbutton('deletemenu');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('remove','','images/delete_f2.png',1);">
-			<img name="remove" src="images/delete.png" alt="Delete" border="0" align="middle" />
-			&nbsp;Delete
+			<a class="toolbar" href="javascript:if (confirm('<?php echo T_('Are you sure you want to Delete this menu? \nThis will Delete the Menu, its Items and the Module(s).') ?>')){ submitbutton('deletemenu');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('remove','','images/delete_f2.png',1);">
+			<img name="remove" src="images/delete.png" alt="<?php echo T_('Delete') ?>" border="0" align="middle" />
+			&nbsp;<?php echo T_('Delete') ?>
 			</a>
 			</div>
 			</td>
@@ -350,10 +353,10 @@
 		function submitbutton(pressbutton) {
 			if (pressbutton == 'copymenu') {
 				if ( document.adminForm.menu_name.value == '' ) {
-					alert( 'Please enter a name for the copy of the Menu' );
+					alert( '<?php echo T_('Please enter a name for the copy of the Menu') ?>' );
 					return;
 				} else if ( document.adminForm.module_name.value == '' ) {
-					alert( 'Please enter a name for the new Module' );
+					alert( '<?php echo T_('Please enter a name for the new Module') ?>' );
 					return;
 				} else {
 					submitform( 'copymenu' );
@@ -367,7 +370,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Copy Menu
+			<?php echo T_('Copy Menu') ?>
 			</th>
 		</tr>
 		</table>
@@ -377,18 +380,18 @@
 		<tr>
 			<td width="3%"></td>
 			<td align="left" valign="top" width="30%">
-			<strong>New Menu Name:</strong>
+			<strong><?php echo T_('New Menu Name:') ?></strong>
 			<br />
 			<input class="inputbox" type="text" name="menu_name" size="30" value="" />
 			<br /><br /><br />
-			<strong>New Module Name:</strong>
+			<strong><?php echo T_('New Module Name:') ?></strong>
 			<br />
 			<input class="inputbox" type="text" name="module_name" size="30" value="" />
 			<br /><br />
 			</td>
 			<td align="left" valign="top" width="25%">
 			<strong>
-			Menu being copied:
+			<?php echo T_('Menu being copied:') ?>
 			</strong>
 			<br />
 			<font color="#000066">
@@ -398,7 +401,7 @@
 			</font>
 			<br /><br />
 			<strong>
-			Menu Items being copied:
+			<?php echo T_('Menu Items being copied:') ?>
 			</strong>
 			<br />
 			<ol>
diff -ruN 4.5.4/administrator/components/com_menumanager/admin.menumanager.php 4.6rc2/administrator/components/com_menumanager/admin.menumanager.php
--- 4.5.4/administrator/components/com_menumanager/admin.menumanager.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menumanager/admin.menumanager.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,19 +1,21 @@
 <?php
 /**
-* @version $Id: admin.menumanager.php,v 1.1 2005/07/22 01:52:39 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 // ensure user has access to this function
 if (!$acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_menumanager' )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -116,6 +118,7 @@
 	;
 	$database->setQuery( $query );
 	$unpublished = $database->loadObjectList();
+	if (!$unpublished) $unpublished = array();
 
 	// Query to get trash menu item counts
 	$query = "SELECT a.menutype, count( a.menutype ) as num"
@@ -126,6 +129,7 @@
 	;
 	$database->setQuery( $query );
 	$trash = $database->loadObjectList();
+	if (!$trash) $trash = array();
 
 	for( $i = 0; $i < $total; $i++ ) {
 		// adds published count
@@ -202,7 +206,7 @@
 	// block to stop renaming of 'mainmenu' menutype
 	if ( $old_menutype == 'mainmenu' ) {
 		if ( $menutype <> 'mainmenu' ) {
-			echo "<script> alert('You cannot rename the \'mainmenu\' Menu as this will disrupt the proper operation of Mambo'); window.history.go(-1); </script>\n";
+			echo "<script> alert(".T_('You cannot rename the "mainmenu" Menu as this will disrupt the proper operation of Mambo')."); window.history.go(-1); </script>\n";
 			exit;			
 		}
 	}
@@ -215,9 +219,10 @@
 	$database->setQuery( $query );
 	$menus = $database->loadResultArray();	
 	foreach ( $menus as $menu ) {
-		$params = mosParseParams( $menu );	
+		$pparser = new mosParameters($menu);
+		$params = $pparser->getParams();
 		if ( $params->menutype == $menutype ) {
-			echo "<script> alert('A menu already exists with that name - you must enter a unique Menu Name'); window.history.go(-1); </script>\n";
+			echo "<script> alert(".T_('A menu already exists with that name - you must enter a unique Menu Name')."); window.history.go(-1); </script>\n";
 			exit;
 		}
 	}
@@ -252,7 +257,7 @@
 				exit();
 			}
 			
-			$msg = 'New Menu created [ '. $menutype .' ]';			
+			$msg = sprintf(T_('New Menu created [ %s ]'), $menutype);			
 			break;
 	
 		default:
@@ -270,7 +275,8 @@
 				$row->load( $module );
 				
 				$save = 0;
-				$params = mosParseParams( $row->params );	
+				$pparser = new mosParameters($row->params);
+				$params = $pparser->getParams();
 				if ( $params->menutype == $old_menutype ) {
 					$params->menutype 	= $menutype;
 					$save 				= 1;
@@ -305,7 +311,7 @@
 				$database->query();
 			}
 			
-			$msg = 'Menu Items & Modules updated';
+			$msg = T_('Menu Items & Modules updated');
 			break;
 	}
 		
@@ -319,7 +325,7 @@
 	global $database;
 
 	if ( $type == 'mainmenu' ) {
-		echo "<script> alert('You cannot delete the \'mainmenu\' menu as it is core menu'); window.history.go(-1); </script>\n";
+		echo "<script> alert(".T_('You cannot delete the "mainmenu" menu as it is a core menu')."); window.history.go(-1); </script>\n";
 		exit();		
 	}
 	
@@ -344,8 +350,8 @@
 	foreach ( $mods as $module ) {
 		$row = new mosModule( $database );
 		$row->load( $module );
-		
-		$params = mosParseParams( $row->params );	
+		$pparser = new mosParameters($row->params);
+		$params = $pparser->getParams();
 		if ( $params->menutype == $type ) {
 			$mid[] = $module;
 		}		
@@ -369,7 +375,7 @@
 	global $database;
 
 	if ( $type == 'mainmenu' ) {
-		echo "<script> alert('You cannot delete the \'mainmenu\' menu as it is core menu'); window.history.go(-1); </script>\n";
+		echo "<script> alert(".T_('You cannot delete the "mainmenu" menu as it is a core menu')."); window.history.go(-1); </script>\n";
 		exit();		
 	}
 	
@@ -457,9 +463,10 @@
 	$database->setQuery( $query );
 	$menus = $database->loadResultArray();	
 	foreach ( $menus as $menu ) {
-		$params = mosParseParams( $menu );	
+		$pparser = new mosParameters($menu);
+		$params = $pparser->getParams();
 		if ( $params->menutype == $menu_name ) {
-			echo "<script> alert('A menu already exists with that name - you must enter a unique Menu Name'); window.history.go(-1); </script>\n";
+			echo "<script> alert(".T_('A menu with that name already exists - you must enter a unique Menu Name')."); window.history.go(-1); </script>\n";
 			exit;
 		}
 	}
@@ -519,7 +526,7 @@
 		exit();
 	}
 
-	$msg = 'Copy of Menu `'. $type .'` created, consisting of '. $total .' items';
+	$msg = sprintf(Tn_('Copy of Menu `%s` created, consisting of %d item', 'Copy of Menu `%s` created, consisting of %d items', $total), $type, $total);
 	mosRedirect( 'index2.php?option=' . $option, $msg );
 }
 
@@ -530,4 +537,4 @@
 function cancelMenu( $option ) {
 	mosRedirect( 'index2.php?option=' . $option . '&task=view' );
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menumanager/menumanager.xml 4.6rc2/administrator/components/com_menumanager/menumanager.xml
--- 4.5.4/administrator/components/com_menumanager/menumanager.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menumanager/menumanager.xml	2006-03-01 13:18:50.000000000 -0600
@@ -2,10 +2,10 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Menu Manager</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component manages your Menus.</description>
 	<params/>
diff -ruN 4.5.4/administrator/components/com_menumanager/toolbar.menumanager.html.php 4.6rc2/administrator/components/com_menumanager/toolbar.menumanager.html.php
--- 4.5.4/administrator/components/com_menumanager/toolbar.menumanager.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menumanager/toolbar.menumanager.html.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.menumanager.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class TOOLBAR_menumanager {
 	/**
 	* Draws the menu for the Menu Manager
@@ -25,11 +23,11 @@
 		mosMenuBar::spacer();
 		mosMenuBar::editListX();
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'copyconfirm', 'copy.png', 'copy_f2.png', 'Copy', true );
+		mosMenuBar::customX( 'copyconfirm', 'copy.png', 'copy_f2.png', T_('Copy'), true );
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'deleteconfirm', 'delete.png', 'delete_f2.png', 'Delete', true );
+		mosMenuBar::customX( 'deleteconfirm', 'delete.png', 'delete_f2.png', T_('Delete'), true );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menumanager.main' );
+		mosMenuBar::help( 'main' );
 		mosMenuBar::endTable();
 	}
 
@@ -45,13 +43,13 @@
 	/**
 	* Draws the menu to create a New menu
 	*/
-	function _NEWMENU()	{
+	function _NEWMENU($task = 'new')	{
 		mosMenuBar::startTable();
-		mosMenuBar::custom( 'savemenu', 'save.png', 'save_f2.png', 'Save', false );
+		mosMenuBar::custom( 'savemenu', 'save.png', 'save_f2.png', T_('Save'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menumanager.new' );
+		mosMenuBar::help( $task );
 		mosMenuBar::endTable();
 	}
 
@@ -60,11 +58,11 @@
 	*/
 	function _COPYMENU()	{
 		mosMenuBar::startTable();
-		mosMenuBar::custom( 'copymenu', 'copy.png', 'copy_f2.png', 'Copy', false );
+		mosMenuBar::custom( 'copymenu', 'copy.png', 'copy_f2.png', T_('Copy'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menumanager.copy' );
+		mosMenuBar::help( 'copy' );
 		mosMenuBar::endTable();
 	}
 
diff -ruN 4.5.4/administrator/components/com_menumanager/toolbar.menumanager.php 4.6rc2/administrator/components/com_menumanager/toolbar.menumanager.php
--- 4.5.4/administrator/components/com_menumanager/toolbar.menumanager.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menumanager/toolbar.menumanager.php	2006-05-29 12:21:00.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.menumanager.php,v 1.1 2005/07/22 01:52:39 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -22,7 +24,7 @@
 switch ($task) {
 	case "new":
 	case "edit":
-		TOOLBAR_menumanager::_NEWMENU();
+		TOOLBAR_menumanager::_NEWMENU($task);
 		break;
 
 	case "copyconfirm":
diff -ruN 4.5.4/administrator/components/com_menus/admin.menus.html.php 4.6rc2/administrator/components/com_menus/admin.menus.html.php
--- 4.5.4/administrator/components/com_menus/admin.menus.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/admin.menus.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.menus.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class HTML_menusections {
 
 	function showMenusections( $rows, $pageNav, $search, $levellist, $menutype, $option ) {
@@ -26,16 +24,16 @@
 		<table class="adminheading">
 		<tr>
 			<th class="menus">
-			Menu Manager <small><small>[ <?php echo $menutype;?> ]</small></small>
+			<?php printf(T_('Menu Manager <small><small>[ %s ]</small></small>'), $menutype)  ?>
 			</th>
 			<td nowrap="true">
-			Max Levels
+			<?php echo T_('Max Levels') ?>
 			</td>
 			<td>
 			<?php echo $levellist;?>
 			</td>
 			<td>
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="inputbox" />
@@ -46,10 +44,10 @@
 			?>
 			<tr>
 				<td align="right" nowrap style="color: red; font-weight: normal;" colspan="5">
-				<?php echo _MAINMENU_DEL; ?>
+				* <?php echo T_('You cannot `delete` this menu as it is required for the proper operation of Mambo') ?> *
 				<br/>
-				<span style="color: black;">
-				<?php echo _MAINMENU_HOME; ?>
+				<span style="color: black;">				
+				* <?php echo T_('The 1st Published item in this menu [mainmenu] is the default `Homepage` for the site') ?> *
 				</span>
 				</td>
 			</tr>
@@ -67,31 +65,31 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count($rows); ?>);" />
 			</th>
 			<th class="title" width="40%">
-			Menu Item
+			<?php echo T_('Menu Item') ?>
 			</th>
 			<th width="5%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th colspan="2" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th width="10%">
-			Access
+			<?php echo T_('Access') ?>
 			</th>
 			<th>
-			Itemid
+			<?php echo T_('Itemid') ?>
 			</th>
 			<th width="35%" align="left">
-			Type
+			<?php echo T_('Type') ?>
 			</th>
 			<th>
-			CID
+			<?php echo T_('CID') ?>
 			</th>
 		</tr>
 	    <?php
@@ -181,7 +179,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="menus">
-			New Menu Item
+			<?php echo T_('New Menu Item') ?>
 			</th>
 			<td valign="bottom" nowrap style="color: red;">
 			<?php //echo _MENU_GROUP; ?>
@@ -200,7 +198,7 @@
 	<tr>
 		<td width="50%" valign="top">
 			<fieldset>
-				<legend>Content</legend>
+				<legend><?php echo T_('Content') ?></legend>
 				<table class="adminform">
 				<?php
 				$k 		= 0;
@@ -232,7 +230,7 @@
 				</table>
 			</fieldset>
 			<fieldset>
-				<legend>Miscellaneous</legend>
+				<legend><?php echo T_('Miscellaneous') ?></legend>
 				<table class="adminform">
 				<?php
 				$k 		= 0;
@@ -263,11 +261,11 @@
 				?>
 				</table>
 			</fieldset>
-			* Note that some menu types appear in more that one grouping, but they are still the same menu type.
+			* <?php echo T_('Note that some menu types appear in more that one grouping, but they are still the same menu type.') ?>
 		</td>
 		<td width="50%" valign="top">
 			<fieldset>
-				<legend>Components</legend>
+				<legend><?php echo T_('Components') ?></legend>
 				<table class="adminform">
 				<?php
 				$k 		= 0;
@@ -299,7 +297,7 @@
 				</table>
 			</fieldset>
 			<fieldset>
-				<legend>Links</legend>
+				<legend><?php echo T_('Links') ?></legend>
 				<table class="adminform">
 				<?php
 				$k 		= 0;
@@ -334,257 +332,7 @@
 	</tr>
 </table>
 
-<?php /* ?>
-
-		<table width="100%">
-		<tr>
-			<td width="60%">
-				<h2 align="left">Content</h2>
-				<table class="adminlist">
-				<tr>
-					<th width="5">
-					#
-					</th>
-					<th width="20">
-					</th>
-					<th class="title">
-					Menu Item Type
-					</th>
-					<th class="title" align="center" width="20px">
-					Description
-					</th>
-					<th>
-					</th>
-				</tr>
-				<?php
-				$k 		= 0;
-				$count 	= count( $types_content );
-					for ( $i=0; $i < $count; $i++ ) {
-					$row = &$types_content[$i];
-
-					$link = 'index2.php?option=com_menus&menutype='. $menutype .'&task=edit&type='. $row->type;
-					?>
-					<tr class="<?php echo "row$k"; ?>">
-						<td>
-						<?php echo $i+1; ?>
-						</td>
-						<td>
-						<input type="radio" id="cb<?php echo $i;?>" name="type" value="<?php echo $row->type; ?>" onClick="isChecked(this.checked);" />
-						</td>
-						<td>
-						<a href="<?php echo $link; ?>">
-						<?php echo $row->name; ?>
-						</a>
-						</td>
-						<td align="center">
-						<?php
-						echo mosToolTip( $row->descrip, $row->name, 250 );
-						?>
-						</td>
-						<td>
-						</td>
-					</tr>
-					<?php
-					$k = 1 - $k;
-				}
-				?>
-				<tr>
-					<th colspan="5">
-					</th>
-				</tr>
-				</table>
-				<br/>
-
-				<h2 align="left">Components</h2>
-				<table class="adminlist">
-				<tr>
-					<th width="5">
-					#
-					</th>
-					<th width="20">
-					</th>
-					<th class="title">
-					Menu Item Type
-					</th>
-					<th class="title" align="center" width="20">
-					Description
-					</th>
-					<th>
-					</th>
-				</tr>
-				<?php
-				$k 		= 0;
-				$count 	= count( $types_component );
-					for ( $i=0; $i < $count; $i++ ) {
-					$row = &$types_component[$i];
-
-					$link = 'index2.php?option=com_menus&menutype='. $menutype .'&task=edit&type='. $row->type;
-					?>
-					<tr class="<?php echo "row$k"; ?>">
-						<td>
-						<?php echo $i+1; ?>
-						</td>
-						<td>
-						<input type="radio" id="cb<?php echo $i;?>" name="type" value="<?php echo $row->type; ?>" onClick="isChecked(this.checked);" />
-						</td>
-						<td>
-						<a href="<?php echo $link; ?>">
-						<?php echo $row->name; ?>
-						</a>
-						</td>
-						<td align="center">
-						<?php
-						echo mosToolTip( $row->descrip, $row->name, 250 );
-						?>
-						</td>
-						<td>
-						</td>
-					</tr>
-					<?php
-					$k = 1 - $k;
-				}
-				?>
-				<tr>
-					<th colspan="5">
-					</th>
-				</tr>
-				</table>
-				<br/>
-
 
-				<h2 align="left">Links</h2>
-				<table class="adminlist">
-				<tr>
-					<th width="5">
-					#
-					</th>
-					<th width="20">
-					</th>
-					<th class="title">
-					Menu Item Type
-					</th>
-					<th class="title" align="center" width="20">
-					Description
-					</th>
-					<th>
-					</th>
-				</tr>
-				<?php
-				$k 		= 0;
-				$count 	= count( $types_link );
-					for ( $i=0; $i < $count; $i++ ) {
-					$row = &$types_link[$i];
-
-					$link = 'index2.php?option=com_menus&menutype='. $menutype .'&task=edit&type='. $row->type;
-					?>
-					<tr class="<?php echo "row$k"; ?>">
-						<td>
-						<?php echo $i+1; ?>
-						</td>
-						<td>
-						<input type="radio" id="cb<?php echo $i;?>" name="type" value="<?php echo $row->type; ?>" onClick="isChecked(this.checked);" />
-						</td>
-						<td>
-						<a href="<?php echo $link; ?>">
-						<?php echo $row->name; ?>
-						</a>
-						</td>
-						<td align="center">
-						<?php
-						echo mosToolTip( $row->descrip, $row->name, 250 );
-						?>
-						</td>
-						<td>
-						</td>
-					</tr>
-					<?php
-					$k = 1 - $k;
-				}
-				?>
-				<tr>
-					<th colspan="5">
-					</th>
-				</tr>
-				</table>
-				<br/>
-
-				<h2 align="left">Other</h2>
-				<table class="adminlist">
-				<tr>
-					<th width="5">
-					#
-					</th>
-					<th width="20">
-					</th>
-					<th class="title">
-					Menu Item Type
-					</th>
-					<th class="title" align="center" width="20">
-					Description
-					</th>
-					<th>
-					</th>
-				</tr>
-				<?php
-				$k 		= 0;
-				$count 	= count( $types_other );
-					for ( $i=0; $i < $count; $i++ ) {
-					$row = &$types_other[$i];
-
-					$link = 'index2.php?option=com_menus&menutype='. $menutype .'&task=edit&type='. $row->type;
-					?>
-					<tr class="<?php echo "row$k"; ?>">
-						<td>
-						<?php echo $i+1; ?>
-						</td>
-						<td>
-						<input type="radio" id="cb<?php echo $i;?>" name="type" value="<?php echo $row->type; ?>" onClick="isChecked(this.checked);" />
-						</td>
-						<td>
-						<a href="<?php echo $link; ?>">
-						<?php echo $row->name; ?>
-						</a>
-						</td>
-						<td align="center">
-						<?php
-						echo mosToolTip( $row->descrip, $row->name, 250 );
-						?>
-						</td>
-						<td>
-						</td>
-					</tr>
-					<?php
-					$k = 1 - $k;
-				}
-				?>
-				<tr>
-					<th colspan="5">
-					</th>
-				</tr>
-				</table>
-			</td>
-			<td width="40%" valign="top" align="center">
-			<h2>Help</h2>
-			<br/>
-			<a href="#">
-			What is a 'Blog' view
-			</a>
-			<br/><br/><br/>
-			<a href="#">
-			What is a 'Table' view
-			</a>
-			<br/><br/><br/>
-			<a href="#">
-			What is a 'List' view
-			</a>
-			<br/><br/><br/><br/><br/>
-			<div style="color: red; font-weight: bold;">
-			<?php echo _MENU_GROUP; ?>
-			</div>
-			</td>
-		</tr>
-		</table>
-<?php */ ?>
 
 		<input type="hidden" name="option" value="<?php echo $option; ?>" />
 		<input type="hidden" name="menutype" value="<?php echo $menutype; ?>" />
@@ -606,7 +354,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Move Menu Items
+			<?php echo T_('Move Menu Items') ?>
 			</th>
 		</tr>
 		</table>
@@ -616,14 +364,14 @@
 		<tr>
 			<td width="3%"></td>
 			<td align="left" valign="top" width="30%">
-			<strong>Move to Menu:</strong>
+			<strong><?php echo T_('Move to Menu:') ?></strong>
 			<br />
 			<?php echo $MenuList ?>
 			<br /><br />
 			</td>
 			<td align="left" valign="top">
 			<strong>
-			Menu Items being moved:
+			<?php echo T_('Menu Items being moved:') ?>
 			</strong>
 			<br />
 			<ol>
@@ -666,7 +414,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Copy Menu Items
+			<?php echo T_('Copy Menu Items') ?>
 			</th>
 		</tr>
 		</table>
@@ -677,7 +425,7 @@
 			<td width="3%"></td>
 			<td align="left" valign="top" width="30%">
 			<strong>
-			Copy to Menu:
+			<?php echo T_('Copy to Menu:') ?>
 			</strong>
 			<br />
 			<?php echo $MenuList ?>
@@ -685,7 +433,7 @@
 			</td>
 			<td align="left" valign="top">
 			<strong>
-			Menu Items being copied:
+			<?php echo T_('Menu Items being copied:') ?>
 			</strong>
 			<br />
 			<ol>
diff -ruN 4.5.4/administrator/components/com_menus/admin.menus.php 4.6rc2/administrator/components/com_menus/admin.menus.php
--- 4.5.4/administrator/components/com_menus/admin.menus.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/admin.menus.php	2006-05-14 16:46:22.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.menus.php,v 1.1 2005/07/22 01:52:39 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -66,7 +68,14 @@
 		break;
 
 	case 'remove':
-		if ($msg = TrashMenusection( $cid )) {
+		$msg = '';
+		foreach($cid as $_id){
+			$_cid = array();
+			$_cid[] = $_id;
+			addDescendants($_id, $_cid);
+			$msg .= TrashMenuSection( $_cid );
+		}
+		if ($msg) {
 			mosRedirect( 'index2.php?option=com_menus&menutype='. $menutype .'&mosmsg= '.$msg );
 		} else {
 			mosRedirect( 'index2.php?option=com_menus&menutype='. $menutype );
@@ -174,7 +183,7 @@
 	// establish the hierarchy of the menu
 	$children = array();
 	// first pass - collect children
-	foreach ($rows as $v ) {
+	if ($rows) foreach ($rows as $v ) {
 		$pt = $v->parent;
 		$list = @$children[$pt] ? $children[$pt] : array();
 		array_push( $list, $v );
@@ -225,7 +234,7 @@
 
 			case 'newsfeed_link':
 				$edit = 'index2.php?option=com_newsfeeds&task=edit&hidemainmenu=1A&id=' . $mitem->componentid;
-				$list[$i]->descrip 	= 'Edit this Newsfeed';
+				$list[$i]->descrip 	= 'Edit this News Feed';
 				$mitem->link .= '&Itemid='. $mitem->id;
 				break;
 
@@ -402,7 +411,8 @@
 	global $database, $mosConfig_absolute_path;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		return 'Select an item to ' . ($publish ? 'publish' : 'unpublish');
+	    $pub = $publish ? T_('publish') : T_('unpublish');
+		return sprintf(T_('Select an item to %s'), $pub);
 	}
 
 	$menu = new mosMenu( $database );
@@ -445,7 +455,7 @@
 	}
 
 	$total = count( $cid );
-	$msg = $total ." Item(s) sent to the Trash";
+	$msg = sprintf(Tn_("%d Item sent to the Trash", "%d Items sent to the Trash", $total), $total);
 	return $msg;
 }
 
@@ -516,7 +526,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -532,7 +542,8 @@
 	$modules = $database->loadObjectList();
 
 	foreach ( $modules as $module) {
-		$params = mosParseParams( $module->params );
+	    $pparser = new mosParameters($module->params);
+		$params = $pparser->getParams();
 		// adds menutype to array
 		$type = trim( @$params->menutype );
 		$menu[] = mosHTML::makeOption( $type, $type );
@@ -609,7 +620,7 @@
 		$row->updateOrder( "menutype='". $row->menutype ."' AND parent='". $row->parent ."'" );
 	} // if
 
-	$msg = count($cid) .' Menu Items moved to '. $menu;
+	$msg = sprintf(Tn_('%d Menu Item moved to %s', '%d Menu Items moved to %s', count($cid)), count($cid), $menu);
 	mosRedirect( 'index2.php?option='. $option .'&menutype='. $menutype .'&mosmsg='. $msg );
 } // moveMenuSave
 
@@ -620,7 +631,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -653,7 +664,7 @@
 		$curr->load( $id );
 		$curr->id = NULL;
 		if ( !$curr->store() ) {
-			echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+			echo "<script> alert('".$curr->getError()."'); window.history.go(-1); </script>\n";
 			exit();
 		}
 		$cidref[] = array($id, $curr->id);
@@ -674,40 +685,24 @@
 		$curr->menutype = $menu;
 		$curr->ordering = '9999';
 		if ( !$curr->store() ) {
-			echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+			echo "<script> alert('".$curr->getError()."'); window.history.go(-1); </script>\n";
 			exit();
 		}
 		$curr->updateOrder( "menutype='". $curr->menutype ."' AND parent='". $curr->parent ."'" );
 	} // foreach
-	$msg = count( $cid ) .' Menu Items Copied to '. $menu;
+	$msg = sprintf(Tn_('%d Menu Item Copied to %s', '%d Menu Items Copied to %s', count($cid)), count($cid), $menu);
 	mosRedirect( 'index2.php?option='. $option .'&menutype='. $menutype .'&mosmsg='. $msg );
 }
 
 function ReadMenuXML( $type, $component=-1 ) {
 	global $mosConfig_absolute_path;
 
-	// XML library
-	require_once( $mosConfig_absolute_path . '/includes/domit/xml_domit_lite_include.php' );
 	// xml file for module
 	$xmlfile = $mosConfig_absolute_path .'/administrator/components/com_menus/'. $type .'/'. $type .'.xml';
-	$xmlDoc =& new DOMIT_Lite_Document();
-	$xmlDoc->resolveErrors( true );
-
-	if ($xmlDoc->loadXML( $xmlfile, false, true )) {
-		$element = &$xmlDoc->documentElement;
-
-		if ( $element->getTagName() == 'mosinstall' && ( $element->getAttribute( 'type' ) == 'component' || $element->getAttribute( 'type' ) == 'menu' ) ) {
-			// Menu Type Name
-			$element 	= &$xmlDoc->getElementsByPath( 'name', 1 );
-			$name 		= $element ? trim( $element->getText() ) : '';
-			// Menu Type Description
-			$element 	= &$xmlDoc->getElementsByPath( 'description', 1 );
-			$descrip 	= $element ? trim( $element->getText() ) : '';
-			// Menu Type Group
-			$element 	= &$xmlDoc->getElementsByPath( 'group', 1 );
-			$group 		= $element ? trim( $element->getText() ) : '';
-		}
-	}
+	$parser = new mosXMLDescription ($xmlfile);
+	$name = $parser->getName('menu');
+	$descrip = $parser->getDescription('menu');
+	$group = $parser->getGroup('menu');
 
 	if ( ( $component <> -1 ) && ( $name == 'Component') ) {
 			$name .= ' - '. $component;
@@ -722,15 +717,12 @@
 
 function saveOrder( &$cid, $menutype ) {
 	global $database;
-
-	$total		= count( $cid );
 	$order 		= mosGetParam( $_POST, 'order', array(0) );
 	$row		= new mosMenu( $database );
-	$conditions = array();
-
+	$parents = array();
     // update ordering values
-	for( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
 		if ($row->ordering != $order[$i]) {
 			$row->ordering = $order[$i];
 	        if (!$row->store()) {
@@ -738,24 +730,17 @@
 	            exit();
 	        }
 	        // remember to updateOrder this group
-	        $condition = "menutype = '$menutype' AND parent = '$row->parent' AND published >= 0";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // for
-	} // for
-
+	        $parents[$row->parent] = $row->id;
+	    }
+	}
 	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
+	foreach ($parents as $parent=>$rowid) {
+		$row->updateOrder("menutype = '$menutype' AND parent = '$parent' AND published >= 0");
 	} // foreach
 
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_menus&menutype='. $menutype, $msg );
 } // saveOrder
+
+
 ?>
diff -ruN 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.class.php 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.class.php
--- 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,19 @@
 <?php
 /**
-* @version $Id: component_item_link.class.php,v 1.1 2005/07/22 01:52:45 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
-
+*/ 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Component item link class
-* @package Mambo
-* @subpackage Menus
 */
 class component_item_link_menu {
 
@@ -26,7 +25,7 @@
 	
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module %s is currently being edited by another administrator'),$menu->title )."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 	
@@ -81,9 +80,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid, 1 );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 	
 		component_item_link_menu_html::edit( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.menu.html.php 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.menu.html.php
--- 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: component_item_link.menu.html.php,v 1.1 2005/07/22 01:52:45 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Display Component item link
-* @package Mambo
-* @subpackage Menus
 */
 class component_item_link_menu_html {
 
@@ -32,9 +32,9 @@
 
 			// do field validation
 			if ( trim(form.name.value) == "" ){
-				alert( "Link must have a name" );
+				alert( "<?php echo T_('Link must have a name') ?>" );
 			} else if ( trim( form.link.value ) == "" ){
-				alert( "You must select a Component to link to" );
+				alert( "<?php echo T_('You must select a Component to link to') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -45,7 +45,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Link - Component Item
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Link - Component Item') ?>
 			</th>
 		</tr>
 		</table>
@@ -56,12 +56,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $menu->name; ?>" />
@@ -69,21 +69,21 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Component to Link:
+					<?php echo T_('Component to Link:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['components']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td width="10%" align="right">Url:</td>
+					<td width="10%" align="right"><?php echo T_('Url:') ?></td>
 					<td width="80%">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					On Click, Open in:
+					<?php echo T_('On Click, Open in:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['target']; ?>
@@ -91,7 +91,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -99,7 +99,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -107,14 +107,14 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -128,7 +128,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.menu.php 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.menu.php
--- 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: component_item_link.menu.php,v 1.1 2005/07/22 01:52:45 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.xml 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.xml
--- 4.5.4/administrator/components/com_menus/component_item_link/component_item_link.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/component_item_link/component_item_link.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Component|Link</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a link to an existing Mambo Component</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/components/components.class.php 4.6rc2/administrator/components/com_menus/components/components.class.php
--- 4.5.4/administrator/components/com_menus/components/components.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/components/components.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: components.class.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class components_menu {
 	/**
 	* @param database A database connector object
@@ -32,7 +30,7 @@
 
 		// fail if checked out not by 'me'
 		if ( $menu->checked_out && $menu->checked_out <> $my->id ) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('"The module %s is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -74,7 +72,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
 
 		components_menu_html::edit( $menu, $components, $lists, $params, $option );
 	}
diff -ruN 4.5.4/administrator/components/com_menus/components/components.menu.html.php 4.6rc2/administrator/components/com_menus/components/components.menu.html.php
--- 4.5.4/administrator/components/com_menus/components/components.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/components/components.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,13 +1,14 @@
 <?php
 /**
-* @version $Id: components.menu.html.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
-
+*/ 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
@@ -16,8 +17,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class components_menu_html {
 
@@ -38,7 +37,7 @@
 			if (pressbutton == 'cancel') {
 				submitform( pressbutton );
 				return;
-			}
+			}			
 
 			var comp_links = new Array;
 			<?php
@@ -56,9 +55,9 @@
 			}
 
 			if ( trim( form.name.value ) == "" ){
-				alert( "Item must have a name" );
+				alert( "<?php echo T_('Item must have a name') ?>" );
 			} else if (form.componentid.value == ""){
-				alert( "Please select a Component" );
+				alert( "<?php echo T_('Please select a Component') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -70,7 +69,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Component <small><small><?php echo $title; ?></small></small>
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php printf(T_('Menu Item :: Component <small><small>%s</small></small>'), $title) ?>
 			</th>
 		</tr>
 		</table>
@@ -81,48 +80,48 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
-					<td width="10%" align="right">Name:</td>
+					<td width="10%" align="right"><?php echo T_('Name:') ?></td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo htmlspecialchars( $menu->name, ENT_QUOTES ); ?>" />
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Component:</td>
+					<td valign="top" align="right"><?php echo T_('Component:') ?></td>
 					<td>
 					<?php echo $lists['componentid']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td width="10%" align="right">Url:</td>
+					<td width="10%" align="right"><?php echo T_('Url:') ?></td>
 					<td width="80%">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Parent Item:</td>
+					<td align="right"><?php echo T_('Parent Item:') ?></td>
 					<td>
 					<?php echo $lists['parent'];?>
 					</td>
 				</tr>
 
 				<tr>
-					<td valign="top" align="right">Ordering:</td>
+					<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 					<td>
 					<?php echo $lists['ordering']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Access Level:</td>
+					<td valign="top" align="right"><?php echo T_('Access Level:') ?></td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -136,7 +135,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
@@ -146,7 +145,7 @@
 						echo $params->render();
 					} else {
 						?>
-						<strong>Parameter list will be available once you save this New menu item</strong>
+						<strong><?php echo T_('Parameter list will be available once you save this New menu item') ?></strong>
 						<?php
 					}
 					?>
diff -ruN 4.5.4/administrator/components/com_menus/components/components.menu.php 4.6rc2/administrator/components/com_menus/components/components.menu.php
--- 4.5.4/administrator/components/com_menus/components/components.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/components/components.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: components.menu.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/components/components.xml 4.6rc2/administrator/components/com_menus/components/components.xml
--- 4.5.4/administrator/components/com_menus/components/components.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/components/components.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Component</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Displays the frontend interface for a Component</description>
 	<params/>
diff -ruN 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.class.php 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.class.php
--- 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: contact_category_table.class.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class contact_category_table_menu {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module %s is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -70,9 +68,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		contact_category_table_menu_html::editCategory( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php
--- 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: contact_category_table.menu.html.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class contact_category_table_menu_html {
 
@@ -36,7 +36,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 1 ) {
-					alert( 'You must select a category' );
+					alert( '<?php echo T_('You must select a category') ?>' );
 					return;
 				}
 				cat = getSelectedText( 'adminForm', 'componentid' );
@@ -50,7 +50,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -63,7 +63,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Table - Contact Category
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Table - Contact Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -74,12 +74,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
@@ -87,14 +87,14 @@
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Category name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Category name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Category:
+					<?php echo T_('Category:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['componentid']; ?>
@@ -102,7 +102,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Url:
+					<?php echo T_('Url:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
@@ -110,7 +110,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
@@ -118,7 +118,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
@@ -126,7 +126,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
@@ -134,7 +134,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
@@ -149,7 +149,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.menu.php 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.menu.php
--- 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: contact_category_table.menu.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.xml 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.xml
--- 4.5.4/administrator/components/com_menus/contact_category_table/contact_category_table.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_category_table/contact_category_table.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Component</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Shows a Table view of Contact items for a particular Category</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.class.php 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.class.php
--- 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: contact_item_link.class.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Contact item link class
-* @package Mambo
-* @subpackage Menus
 */
 class contact_item_link_menu {
 
@@ -27,7 +27,7 @@
 	
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 	
@@ -56,7 +56,7 @@
 			<table width="100%">
 			<tr>
 				<td width="10%">
-				Name:
+				'.T_('Name:').'
 				</td>
 				<td>
 				'. $contact[0]->name .'
@@ -64,7 +64,7 @@
 			</tr>
 			<tr>
 				<td width="10%">
-				Position:
+				'.T_('Position:').'
 				</td>
 				<td>
 				'. $contact[0]->con_position .'
@@ -102,9 +102,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 	
 		contact_item_link_menu_html::edit( $menu, $lists, $params, $option, $contacts );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php
--- 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: contact_item_link.menu.html.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Disaply contact item link
-* @package Mambo
-* @subpackage Menus
 */
 class contact_item_link_menu_html {
 
@@ -32,9 +32,9 @@
 
 			// do field validation
 			if (trim(form.name.value) == ""){
-				alert( "Link must have a name" );
+				alert( "<?php echo T_('Link must have a name') ?>" );
 			} else if (trim(form.contact_item_link.value) == ""){
-				alert( "You must select a Contact to link to" );
+				alert( "<?php echo T_('You must select a Contact to link to') ?>" );
 			} else {
 				form.link.value = "index.php?option=com_contact&task=view&contact_id=" + form.contact_item_link.value;
 				form.componentid.value = form.contact_item_link.value;
@@ -47,7 +47,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Link - Contact Item
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Link - Contact Item') ?>
 			</th>
 		</tr>
 		</table>
@@ -58,12 +58,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $menu->name; ?>" />
@@ -71,7 +71,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Contact to Link:
+					<?php echo T_('Contact to Link:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['contact']; ?>
@@ -85,7 +85,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					On Click, Open in:
+					<?php echo T_('On Click, Open in:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['target']; ?>
@@ -93,7 +93,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -101,7 +101,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -109,14 +109,14 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -130,7 +130,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.menu.php 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.menu.php
--- 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: contact_item_link.menu.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.xml 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.xml
--- 4.5.4/administrator/components/com_menus/contact_item_link/contact_item_link.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/contact_item_link/contact_item_link.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Component|Link</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a link to a Published Contact Item</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.class.php 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.class.php
--- 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_archive_category.class.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_archive_category_menu {
 	/**
 	* @param database A database connector object
@@ -29,7 +27,7 @@
 	
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 	
@@ -58,9 +56,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 	
 		content_archive_category_menu_html::editCategory( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_archive_category.menu.html.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_archive_category_menu_html {
 
@@ -36,7 +36,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 1 ) {
-					alert( 'You must select a category' );
+					alert( '<?php echo T_('You must select a category') ?>' );
 					return;
 				}
 				sectcat = getSelectedText( 'adminForm', 'componentid' );
@@ -52,7 +52,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -65,7 +65,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Blog - Content Category Archive
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Blog - Content Category Archive') ?>
 			</th>
 		</tr>
 		</table>
@@ -76,54 +76,54 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
-					<td width="10%" align="right" valign="top">Name:</td>
+					<td width="10%" align="right" valign="top"><?php echo T_('Name:') ?></td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
 					</td>
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Category name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Category name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Category:</td>
+					<td valign="top" align="right"><?php echo T_('Category:') ?></td>
 					<td>
 					<?php echo $lists['componentid']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Url:</td>
+					<td align="right"><?php echo T_('Url:') ?></td>
 					<td>
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Parent Item:</td>
+					<td align="right"><?php echo T_('Parent Item:') ?></td>
 					<td>
 					<?php echo $lists['parent']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Ordering:</td>
+					<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 					<td>
 					<?php echo $lists['ordering']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Access Level:</td>
+					<td valign="top" align="right"><?php echo T_('Access Level:') ?></td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -137,7 +137,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.menu.php 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.menu.php
--- 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_archive_category.menu.php,v 1.1 2005/07/22 01:52:50 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.xml 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.xml
--- 4.5.4/administrator/components/com_menus/content_archive_category/content_archive_category.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_category/content_archive_category.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Shows a listing of Content items archived for a particular category</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.class.php 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.class.php
--- 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_archive_section.class.php,v 1.1 2005/07/22 01:52:51 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_archive_section_menu {
 	/**
 	* @param database A database connector object
@@ -28,7 +26,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -57,7 +55,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		content_archive_section_menu_html::editSection( $menu, $lists, $params, $option );
 	}
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_archive_section.menu.html.php,v 1.1 2005/07/22 01:52:51 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_archive_section_menu_html {
 
@@ -36,13 +36,13 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 0 ) {
-					alert( 'You must select a Section' );
+					alert( '<?php echo T_('You must select a Section') ?>' );
 					return;
 				}
 
 				if ( form.name.value == '' ) {
 					if ( form.componentid.value == 0 ) {
-						form.name.value = "All Sections";
+						form.name.value = "<?php echo T_('All Sections') ?>";
 					} else {
 						form.name.value = form.componentid.options[form.componentid.selectedIndex].text;
 					}
@@ -53,7 +53,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -67,7 +67,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Blog - Content Section Archive
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Blog - Content Section Archive') ?>
 			</th>
 		</tr>
 		</table>
@@ -78,54 +78,54 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
-					<td width="10%" align="right" valign="top">Name:</td>
+					<td width="10%" align="right" valign="top"><strong><?php echo T_('Name:') ?></strong></td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
 					</td>
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Section name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Section name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Section:</td>
+					<td valign="top" align="right"><?php echo T_('Section:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['componentid']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Url:</td>
+					<td align="right"><?php echo T_('Url:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Parent Item:</td>
+					<td align="right"><?php echo T_('Parent Item:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['parent']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Ordering:</td>
+					<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Access Level:</td>
+					<td valign="top" align="right"><?php echo T_('Access Level:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
 					</td>
@@ -139,7 +139,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.menu.php 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.menu.php
--- 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_archive_section.menu.php,v 1.1 2005/07/22 01:52:51 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.xml 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.xml
--- 4.5.4/administrator/components/com_menus/content_archive_section/content_archive_section.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_archive_section/content_archive_section.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Shows a listing of Content items archived for a particular section</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.class.php 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.class.php
--- 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_blog_category.class.php,v 1.1 2005/07/22 01:52:51 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_blog_category {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -86,7 +84,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		/* chipjack: passing $sectCatList (categories) instead of $slist (sections) */
 		content_blog_category_html::edit( $menu, $lists, $params, $option );
@@ -145,4 +143,4 @@
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_blog_category.menu.html.php,v 1.1 2005/07/22 01:52:51 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_blog_category_html {
 
@@ -37,7 +37,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 					return;
 				} else {
 					submitform( pressbutton );
@@ -46,7 +46,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -61,7 +61,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Blog - Content Category
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Blog - Content Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -72,11 +72,11 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
-					<td width="10%" align="right">Name:</td>
+					<td width="10%" align="right"><?php echo T_('Name:') ?></td>
 					<td width="200px">
 					<input class="inputbox" type="text" name="name" size="30" maxlength="100" value="<?php echo $menu->name; ?>" />
 					</td>
@@ -85,43 +85,43 @@
 				</tr>
 				<tr>
 			  		<td valign="top" align="right">
-			  		Category:
+			  		<?php echo T_('Category:') ?>
 			  		</td>
 			 		<td>
 			  		<?php echo $lists['categoryid']; ?>
 			 		</td>
 			 		<td valign="top">
 			 		<?php
-			 		echo mosToolTip( 'You can select multiple Categories' )
+			 		echo mosToolTip( T_('You can select multiple Categories') )
 			 		?>
 			  		</td>
 				</tr>
 				<tr>
-					<td align="right">Url:</td>
+					<td align="right"><?php echo T_('Url:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Parent Item:</td>
+					<td align="right"><?php echo T_('Parent Item:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Ordering:</td>
+					<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Access Level:</td>
+					<td valign="top" align="right"><?php echo T_('Access Level:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
 					</td>
@@ -135,7 +135,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.menu.php 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.menu.php
--- 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_blog_category.menu.php,v 1.1 2005/07/22 01:52:51 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.xml 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.xml
--- 4.5.4/administrator/components/com_menus/content_blog_category/content_blog_category.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_category/content_blog_category.xml	2006-05-19 01:20:15.000000000 -0500
@@ -4,10 +4,10 @@
 	<group>Content</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Displays a page of content items from multiple categories in a blog format</description>
 	<params>
@@ -64,7 +64,7 @@
  			<option value="0">Hide</option>
  			<option value="1">Show</option>
  		</param>
-		<param name="description_image" type="radio" default="0" label="Dscription Image" description="Show/Hide the Category Description">
+		<param name="description_image" type="radio" default="0" label="Description Image" description="Show/Hide the Category Description">
  			<option value="0">Hide</option>
  			<option value="1">Show</option>
  		</param>
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.class.php 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.class.php
--- 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_blog_section.class.php,v 1.1 2005/07/22 01:52:58 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_blog_section {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -61,7 +59,7 @@
 		}
 
 		// build the html select list for section
-		$rows[] = mosHTML::makeOption( '', 'All Sections' );
+		$rows[] = mosHTML::makeOption( '', T_('All Sections') );
 		$query = "SELECT s.id AS `value`, s.id AS `id`, s.title AS `text`"
 		. "\n FROM #__sections AS s"
 		. "\n WHERE s.scope = 'content'"
@@ -84,7 +82,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		content_blog_section_html::edit( $menu, $lists, $params, $option );
 	}
@@ -142,4 +140,4 @@
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_blog_section.menu.html.php,v 1.1 2005/07/22 01:52:58 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_blog_section_html {
 
@@ -37,7 +37,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 					return;
 				} else {
 					submitform( pressbutton );
@@ -46,7 +46,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -61,7 +61,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Blog - Content Section
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Blog - Content Section') ?>
 			</th>
 		</tr>
 		</table>
@@ -72,11 +72,11 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
-					<td width="10%" align="right">Name:</td>
+					<td width="10%" align="right"><?php echo T_('Name:') ?></td>
 					<td width="200px">
 					<input class="inputbox" type="text" name="name" size="30" maxlength="100" value="<?php echo $menu->name; ?>" />
 					</td>
@@ -85,43 +85,43 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					section:
+					<?php echo T_('Section:') ?>
 					</td>
 					<td>
 					<?php echo $lists['sectionid']; ?>
 			 		</td>
 			 		<td valign="top">
 			 		<?php
-			 		echo mosToolTip( 'You can select multiple Sections' )
+			 		echo mosToolTip( T_('You can select multiple Sections') )
 			 		?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Url:</td>
+					<td align="right"><?php echo T_('Url:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Parent Item:</td>
+					<td align="right"><?php echo T_('Parent Item:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Ordering:</td>
+					<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Access Level:</td>
+					<td valign="top" align="right"><?php echo T_('Access Level:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
 					</td>
@@ -135,7 +135,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.menu.php 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.menu.php
--- 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_blog_section.menu.php,v 1.1 2005/07/22 01:52:58 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.xml 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.xml
--- 4.5.4/administrator/components/com_menus/content_blog_section/content_blog_section.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_blog_section/content_blog_section.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Displays a page of content items from multiple sections in a blog format</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_category/content_category.class.php 4.6rc2/administrator/components/com_menus/content_category/content_category.class.php
--- 4.5.4/administrator/components/com_menus/content_category/content_category.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_category/content_category.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_category.class.php,v 1.1 2005/07/22 01:52:58 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_category_menu {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -59,9 +57,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		content_category_menu_html::editCategory( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/content_category/content_category.menu.html.php 4.6rc2/administrator/components/com_menus/content_category/content_category.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_category/content_category.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_category/content_category.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_category.menu.html.php,v 1.1 2005/07/22 01:52:59 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_category_menu_html {
 
@@ -36,7 +36,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 1 ) {
-					alert( 'You must select a category' );
+					alert( '<?php echo T_('You must select a category') ?>' );
 					return;
 				}
 				sectcat = getSelectedText( 'adminForm', 'componentid' );
@@ -52,7 +52,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -65,7 +65,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Table - Content Category
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Table - Content Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -76,12 +76,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
@@ -89,14 +89,14 @@
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Category name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Category name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Category:
+					<?php echo T_('Category:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['componentid']; ?>
@@ -104,7 +104,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Url:
+					<?php echo T_('Url:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
@@ -112,7 +112,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
@@ -120,7 +120,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
@@ -128,7 +128,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
@@ -136,7 +136,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
@@ -151,7 +151,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_category/content_category.menu.php 4.6rc2/administrator/components/com_menus/content_category/content_category.menu.php
--- 4.5.4/administrator/components/com_menus/content_category/content_category.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_category/content_category.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_category.menu.php,v 1.1 2005/07/22 01:52:59 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_category/content_category.xml 4.6rc2/administrator/components/com_menus/content_category/content_category.xml
--- 4.5.4/administrator/components/com_menus/content_category/content_category.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_category/content_category.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Shows a Table view of Content items for a particular Category</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.class.php 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.class.php
--- 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: content_item_link.class.php,v 1.1 2005/07/22 01:53:05 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Content item link class
-* @package Mambo
-* @subpackage Menus
 */
 class content_item_link_menu {
 
@@ -27,7 +27,7 @@
 	
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 	
@@ -63,14 +63,14 @@
 				Item:
 				</td>
 				<td>
-				<a href="'. $link .'" title="Edit Content Item">
+				<a href="'. $link .'" title="'.T_('Edit Content Item').'">
 				'. $content[0]->title .'
 				</a>
 				</td>
 			</tr>
 			<tr>
 				<td width="10%">
-				Category:
+				'.T_('Category:').'
 				</td>
 				<td>
 				'. $content[0]->category .'
@@ -78,7 +78,7 @@
 			</tr>
 			<tr>
 				<td width="10%">
-				Section:
+				'.T_('Section:').'
 				</td>
 				<td>
 				'. $content[0]->section .'
@@ -138,7 +138,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 	
 		content_item_link_menu_html::edit( $menu, $lists, $params, $option, $contents );
 	}
@@ -157,4 +157,4 @@
 		mosRedirect( 'index2.php?option=com_content&task=edit&id='. $id );	
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.menu.html.php 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: content_item_link.menu.html.php,v 1.1 2005/07/22 01:53:05 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Disaply content item link
-* @package Mambo
-* @subpackage Menus
 */
 class content_item_link_menu_html {
 
@@ -38,9 +38,9 @@
 
 			// do field validation
 			if (trim(form.name.value) == ""){
-				alert( "Link must have a name" );
+				alert( "<?php echo T_('Link must have a name') ?>" );
 			} else if (trim(form.content_item_link.value) == ""){
-				alert( "You must select a Content to link to" );
+				alert( "<?php echo T_('You must select a Content to link to') ?>" );
 			} else {
 				form.link.value = "index.php?option=com_content&task=view&id=" + form.content_item_link.value;
 				form.componentid.value = form.content_item_link.value;
@@ -53,7 +53,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Link - Content Item
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Link - Content Item') ?>
 			</th>
 		</tr>
 		</table>
@@ -64,12 +64,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $menu->name; ?>" />
@@ -77,21 +77,21 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Content to Link:
+					<?php echo T_('Content to Link:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['content']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td width="10%" align="right">Url:</td>
+					<td width="10%" align="right"><?php echo T_('Url:') ?></td>
 					<td width="80%">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					On Click, Open in:
+					<?php echo T_('On Click, Open in:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['target']; ?>
@@ -99,7 +99,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -107,7 +107,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -115,14 +115,14 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -136,7 +136,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.menu.php 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.menu.php
--- 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_item_link.menu.php,v 1.1 2005/07/22 01:53:05 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.xml 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.xml
--- 4.5.4/administrator/components/com_menus/content_item_link/content_item_link.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_item_link/content_item_link.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content|Link</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a link to a published Content Item in full view</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_section/content_section.class.php 4.6rc2/administrator/components/com_menus/content_section/content_section.class.php
--- 4.5.4/administrator/components/com_menus/content_section/content_section.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_section/content_section.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_section.class.php,v 1.1 2005/07/22 01:53:05 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_section_menu {
 
 	/**
@@ -29,7 +27,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -58,9 +56,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		content_section_menu_html::editSection( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/content_section/content_section.menu.html.php 4.6rc2/administrator/components/com_menus/content_section/content_section.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_section/content_section.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_section/content_section.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_section.menu.html.php,v 1.2 2005/11/14 21:56:04 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_section_menu_html {
 
@@ -36,7 +36,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 1 ) {
-					alert( 'You must select a Section' );
+					alert( '<?php echo T_('You must select a Section') ?>' );
 					return;
 				}
 
@@ -49,7 +49,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -65,7 +65,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Table - Content Section
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Table - Content Section') ?>
 			</th>
 		</tr>
 		</table>
@@ -76,54 +76,54 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
-					<td width="10%" align="right" valign="top">Name:</td>
+					<td width="10%" align="right" valign="top"><?php echo T_('Name:') ?></td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
 					</td>
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Section name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Section name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right" valign="top">Section:</td>
+					<td align="right" valign="top"><?php echo T_('Section:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['componentid']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Url:</td>
+					<td align="right"><?php echo T_('Url:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td align="right">Parent Item:</td>
+					<td align="right"><?php echo T_('Parent Item:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Ordering:</td>
+					<td valign="top" align="right"><?php echo T_('Ordering:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Access Level:</td>
+					<td valign="top" align="right"><?php echo T_('Access Level:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
 					</td>
@@ -137,7 +137,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_section/content_section.menu.php 4.6rc2/administrator/components/com_menus/content_section/content_section.menu.php
--- 4.5.4/administrator/components/com_menus/content_section/content_section.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_section/content_section.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_section.menu.php,v 1.1 2005/07/22 01:53:05 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_section/content_section.xml 4.6rc2/administrator/components/com_menus/content_section/content_section.xml
--- 4.5.4/administrator/components/com_menus/content_section/content_section.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_section/content_section.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a listing of Content categories for a particular section</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/content_typed/content_typed.class.php 4.6rc2/administrator/components/com_menus/content_typed/content_typed.class.php
--- 4.5.4/administrator/components/com_menus/content_typed/content_typed.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_typed/content_typed.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: content_typed.class.php,v 1.1 2005/07/22 01:53:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class content_typed_menu {
 
 	function edit( &$uid, $menutype, $option ) {
@@ -26,7 +24,7 @@
 	
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 	
@@ -90,7 +88,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 	
 		content_menu_html::edit( $menu, $lists, $params, $option, $contents );
 	}
diff -ruN 4.5.4/administrator/components/com_menus/content_typed/content_typed.menu.html.php 4.6rc2/administrator/components/com_menus/content_typed/content_typed.menu.html.php
--- 4.5.4/administrator/components/com_menus/content_typed/content_typed.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_typed/content_typed.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_typed.menu.html.php,v 1.1 2005/07/22 01:53:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class content_menu_html {
 
@@ -39,9 +39,9 @@
 
 			// do field validation
 			if (trim(form.name.value) == ""){
-				alert( "Link must have a name" );
+				alert( "<?php echo T_('Link must have a name') ?>" );
 			} else if (trim(form.content_typed.value) == ""){
-				alert( "You must select a Content to link to" );
+				alert( "<?php echo T_('You must select a Content to link to') ?>" );
 			} else {
 				form.link.value = "index.php?option=com_content&task=view&id=" + form.content_typed.value;
 				form.componentid.value = form.content_typed.value;
@@ -54,7 +54,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Link - Static Content
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Link - Static Content') ?>
 			</th>
 		</tr>
 		</table>
@@ -65,12 +65,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $menu->name; ?>" />
@@ -78,7 +78,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Static Content:
+					<?php echo T_('Static Content:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['content']; ?>
@@ -92,7 +92,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					On Click, open:
+					<?php echo T_('On Click, open:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['target']; ?>
@@ -100,7 +100,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -108,7 +108,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -116,14 +116,14 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -137,7 +137,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/content_typed/content_typed.menu.php 4.6rc2/administrator/components/com_menus/content_typed/content_typed.menu.php
--- 4.5.4/administrator/components/com_menus/content_typed/content_typed.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_typed/content_typed.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content_typed.menu.php,v 1.1 2005/07/22 01:53:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/content_typed/content_typed.xml 4.6rc2/administrator/components/com_menus/content_typed/content_typed.xml
--- 4.5.4/administrator/components/com_menus/content_typed/content_typed.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/content_typed/content_typed.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Content|Link</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a link to Static Content Item</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.class.php 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.class.php
--- 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: newsfeed_category_table.class.php,v 1.1 2005/07/22 01:53:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class newsfeed_category_table_menu {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -70,9 +68,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		newsfeed_category_table_menu_html::editCategory( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php
--- 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php	2006-05-14 16:46:22.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: newsfeed_category_table.menu.html.php,v 1.1 2005/07/22 01:53:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class newsfeed_category_table_menu_html {
 
@@ -36,7 +36,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 1 ) {
-					alert( 'You must select a category' );
+					alert( '<?php echo T_('You must select a category') ?>' );
 					return;
 				}
 				cat = getSelectedText( 'adminForm', 'componentid' );
@@ -50,7 +50,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -63,7 +63,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Table - Newsfeed Category
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Table - News Feed Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -74,12 +74,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
@@ -87,14 +87,14 @@
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Category name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Category name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Category:
+					<?php echo T_('Category:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['componentid']; ?>
@@ -102,7 +102,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Url:
+					<?php echo T_('Url:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
@@ -110,7 +110,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
@@ -118,7 +118,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
@@ -126,7 +126,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
@@ -134,7 +134,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
@@ -149,7 +149,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.php 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.php
--- 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: newsfeed_category_table.menu.php,v 1.1 2005/07/22 01:53:06 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
--- 4.5.4/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml	2006-05-14 16:46:22.000000000 -0500
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <mosinstall type="menu" version="4.5.2">
-	<name>Table - Newsfeed Category</name>
+	<name>Table - News Feed Category</name>
 	<group>Component</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
-	<description>Shows a Table view of Newsfeed items for a particular Category</description>
+	<description>Shows a Table view of News Feed items for a particular Category</description>
 	<params>
 		<param name="menu_image" type="imagelist" directory="/images" hide_default="1" default="" label="Menu Image" description="A small image to be placed to the left or right of your menu item, images must be in /images" />
 		<param name="pageclass_sfx" type="text" default="" label="Page Class Suffix" description="A suffix to be applied to the css classes of the page, this allows individual page styling" />
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php
--- 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: newsfeed_link.class.php,v 1.1 2005/07/22 01:53:09 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Newsfeed item link class
-* @package Mambo
-* @subpackage Menus
 */
 class newsfeed_link_menu {
 
@@ -27,7 +27,7 @@
 	
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 	
@@ -57,7 +57,7 @@
 			<table width="100%">
 			<tr>
 				<td width="10%">
-				Item:
+				'.T_('Item:').'
 				</td>
 				<td>
 				'. $newsfeed[0]->name .'
@@ -65,7 +65,7 @@
 			</tr>
 			<tr>
 				<td width="10%">
-				Position:
+				'.T_('Position:').'
 				</td>
 				<td>
 				'. $newsfeed[0]->category .'
@@ -103,9 +103,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 	
 		newsfeed_link_menu_html::edit( $menu, $lists, $params, $option, $newsfeeds );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php
--- 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php	2006-05-14 16:46:22.000000000 -0500
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: newsfeed_link.menu.html.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Disaply newsfeed item link
-* @package Mambo
-* @subpackage Menus
 */
 class newsfeed_link_menu_html {
 
@@ -32,9 +32,9 @@
 
 			// do field validation
 			if (trim(form.name.value) == ""){
-				alert( "Link must have a name" );
+				alert( "<?php echo T_('Link must have a name') ?>" );
 			} else if (trim(form.newsfeed_link.value) == ""){
-				alert( "You must select a Newsfeed to link to" );
+				alert( "<?php echo T_('You must select a News Feed to link to') ?>" );
 			} else {
 				form.link.value = "index.php?option=com_newsfeeds&task=view&feedid=" + form.newsfeed_link.value;
 				form.componentid.value = form.newsfeed_link.value;
@@ -47,7 +47,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Link - Newsfeed
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Link - News Feed') ?>
 			</th>
 		</tr>
 		</table>
@@ -58,12 +58,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $menu->name; ?>" />
@@ -71,7 +71,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Newsfeed to Link:
+					<?php echo T_('News Feed to Link:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['newsfeed']; ?>
@@ -85,7 +85,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					On Click, Open in:
+					<?php echo T_('On Click, Open in:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['target']; ?>
@@ -93,7 +93,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -101,7 +101,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -109,14 +109,14 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -130,7 +130,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.php 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.php
--- 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: newsfeed_link.menu.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.xml 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
--- 4.5.4/administrator/components/com_menus/newsfeed_link/newsfeed_link.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/newsfeed_link/newsfeed_link.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Component|Link</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a link to an individual Published Newsfeed</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/separator/separator.class.php 4.6rc2/administrator/components/com_menus/separator/separator.class.php
--- 4.5.4/administrator/components/com_menus/separator/separator.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/separator/separator.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: separator.class.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class separator_menu {
 
 	/**
@@ -29,7 +27,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -61,9 +59,9 @@
 		$lists['published'] 	= mosAdminMenus::Published( $menu );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		separator_menu_html::edit( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/separator/separator.menu.html.php 4.6rc2/administrator/components/com_menus/separator/separator.menu.html.php
--- 4.5.4/administrator/components/com_menus/separator/separator.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/separator/separator.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: separator.menu.html.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class separator_menu_html {
 
@@ -41,7 +41,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Separator / Placeholder
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Separator / Placeholder') ?>
 			</th>
 		</tr>
 		</table>
@@ -52,12 +52,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td align="right">
-					Pattern/Name:
+					<?php echo T_('Pattern/Name:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="name" size="50" maxlength="100" value="<?php echo $menu->name; ?>" />
@@ -65,7 +65,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -73,7 +73,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -81,14 +81,14 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
 					</td>
 				</tr>
 				<tr>
-					<td valign="top" align="right">Published:</td>
+					<td valign="top" align="right"><?php echo T_('Published:') ?></td>
 					<td>
 					<?php echo $lists['published']; ?>
 					</td>
@@ -102,7 +102,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/separator/separator.menu.php 4.6rc2/administrator/components/com_menus/separator/separator.menu.php
--- 4.5.4/administrator/components/com_menus/separator/separator.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/separator/separator.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: separator.menu.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/separator/separator.xml 4.6rc2/administrator/components/com_menus/separator/separator.xml
--- 4.5.4/administrator/components/com_menus/separator/separator.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/separator/separator.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Other</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates a menu placeholder or separator </description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/toolbar.menus.html.php 4.6rc2/administrator/components/com_menus/toolbar.menus.html.php
--- 4.5.4/administrator/components/com_menus/toolbar.menus.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/toolbar.menus.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,31 +1,29 @@
 <?php
 /**
-* @version $Id: toolbar.menus.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class TOOLBAR_menus {
 	/**
 	* Draws the menu for a New top menu item
 	*/
 	function _NEW()	{
 		mosMenuBar::startTable();
-		mosMenuBar::customX( 'edit', 'next.png', 'next_f2.png', 'Next', true );
+		mosMenuBar::customX( 'edit', 'next.png', 'next_f2.png', T_('Next'), true );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menus.new' );
+		mosMenuBar::help( 'new' );
 		mosMenuBar::endTable();
 	}
 
@@ -34,11 +32,11 @@
 	*/
 	function _MOVEMENU()	{
 		mosMenuBar::startTable();
-		mosMenuBar::custom( 'movemenusave', 'move.png', 'move_f2.png', 'Move', false );
+		mosMenuBar::custom( 'movemenusave', 'move.png', 'move_f2.png', T_('Move'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel( 'cancelmovemenu' );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menus.move' );
+		mosMenuBar::help( 'move' );
 		mosMenuBar::endTable();
 	}
 
@@ -47,11 +45,11 @@
 	*/
 	function _COPYMENU()	{
 		mosMenuBar::startTable();
-		mosMenuBar::custom( 'copymenusave', 'copy.png', 'copy_f2.png', 'Copy', false );
+		mosMenuBar::custom( 'copymenusave', 'copy.png', 'copy_f2.png', T_('Copy'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel( 'cancelcopymenu' );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menus.copy' );
+		mosMenuBar::help( 'copy' );
 		mosMenuBar::endTable();
 	}
 
@@ -71,7 +69,7 @@
 		mosMenuBar::startTable();
 		if ( !$id ) {
 			$link = 'index2.php?option=com_menus&menutype='. $menutype .'&task=new&hidemainmenu=1';
-			mosMenuBar::back( 'Back', $link );
+			mosMenuBar::back( T_('Back'), $link );
 			mosMenuBar::spacer();
 		}
 		mosMenuBar::save();
@@ -80,92 +78,12 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		//Displays the right help screen based on the
-		//$type parameter
-    switch ($type){
-		  case 'content_blog_category': //Blog - Content Category 
-		    $hs='453.screen.menus.content_blog_category';
-		    break;
-		    
-		  case 'content_archive_category': //Blog - Content Category Archive 
-		    $hs='453.screen.menus.content_archive_category';
-		    break;
-		    
-		  case 'content_blog_section': //Blog - Content Section 
-		    $hs='453.screen.menus.content_blog_section';
-		    break;
-		    
-		  case 'content_archive_section': //Blog - Content Section Archive 
-		    $hs='453.screen.menus.content_archive_section';
-		    break;
-		    
-		  case 'content_item_link': //Link - Content Item 
-		    $hs='453.screen.menus.content_item_link';
-		    break;
-		    
-		  case 'content_typed': //Link - Static Content 
-		    $hs='453.screen.menus.content_typed';
-		    break;
-		    
-		  case 'content_category': //Table - Content Category 
-		    $hs='453.screen.menus.content_category';
-		    break;
-		    
-		  case 'content_section': //Table - Content Section 
-		    $hs='453.screen.menus.content_section';
-		    break;
-		    
-		  case 'components': //Component
-		    $hs='453.screen.menus.components';
-		    break;
-		    
-		  case 'component_item_link': //Link - Component Item 
-		    $hs='453.screen.menus.component_item_link';
-		    break;
-		    
-		  case 'contact_item_link': //Link - Contact Item
-		    $hs='453.screen.menus.contact_item_link';
-		    break;
-		    
-		  case 'newsfeed_link': //Link - Newsfeed
-		    $hs='453.screen.menus.newsfeed_link';
-		    break;
-		    
-		  case 'contact_category_table': //Table - Contact Category
-		    $hs='453.screen.menus.contact_category_table';
-		    break;
-		    
-		  case 'newsfeed_category_table': //Table - Newsfeed Category
-		    $hs='453.screen.menus.newsfeed_category_table';
-		    break;
-		    
-		  case 'weblink_category_table': //Table - Weblink Category
-		    $hs='453.screen.menus.weblink_category_table';
-		    break;
-		    
-		  case 'url': //Link - URL
-		    $hs='453.screen.menus.url';
-		    break;
-		    
-		  case 'separator': //Separator / Placeholder
-		    $hs='453.screen.menus.separator';
-		    break;
-		    
-		  case 'wrapper': //Wrapper
-		    $hs='453.screen.menus.wrapper';
-		    break;
-		    
-		  default:
-		    $hs='default';
-		    break;
-		}
-		mosMenuBar::help( $hs );  
-    //mosMenuBar::help( '453.screen.menus.edit' );
+		mosMenuBar::help( $type ); 
 		mosMenuBar::endTable();
 	}
 
@@ -179,13 +97,13 @@
 		mosMenuBar::spacer();
 		mosMenuBar::unpublishList();
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'movemenu', 'move.png', 'move_f2.png', 'Move', true );
+		mosMenuBar::customX( 'movemenu', 'move.png', 'move_f2.png', T_('Move'), true );
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'copymenu', 'copy.png', 'copy_f2.png', 'Copy', true );
+		mosMenuBar::customX( 'copymenu', 'copy.png', 'copy_f2.png', T_('Copy'), true );
 		mosMenuBar::spacer();
 		mosMenuBar::trash();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.menus.main' );
+		mosMenuBar::help( 'main' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_menus/toolbar.menus.php 4.6rc2/administrator/components/com_menus/toolbar.menus.php
--- 4.5.4/administrator/components/com_menus/toolbar.menus.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/toolbar.menus.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.menus.php,v 1.3 2005/11/11 10:07:35 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/url/url.class.php 4.6rc2/administrator/components/com_menus/url/url.class.php
--- 4.5.4/administrator/components/com_menus/url/url.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/url/url.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: url.class.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class url_menu {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -60,9 +58,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		url_menu_html::edit( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/url/url.menu.html.php 4.6rc2/administrator/components/com_menus/url/url.menu.html.php
--- 4.5.4/administrator/components/com_menus/url/url.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/url/url.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: url.menu.html.php,v 1.1 2005/07/22 01:53:11 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class url_menu_html {
 
@@ -35,9 +35,9 @@
 
 			// do field validation
 			if (trim(form.name.value) == ""){
-				alert( "Link must have a name" );
+				alert( "<?php echo T_('Link must have a name') ?>" );
 			} else if (trim(form.link.value) == ""){
-				alert( "You must provide a url." );
+				alert( "<?php echo T_('You must provide a url.') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -48,7 +48,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Link - URL
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Link - URL') ?>
 			</th>
 		</tr>
 		</table>
@@ -59,12 +59,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="name" size="50" maxlength="150" value="<?php echo $menu->name; ?>" />
@@ -72,7 +72,7 @@
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Link:
+					<?php echo T_('Link:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="link" size="50" maxlength="250" value="<?php echo $menu->link; ?>" />
@@ -80,7 +80,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					On Click, Open in:
+					<?php echo T_('On Click, Open in:') ?>
 					</td>
 					<td>
 					<?php echo $lists['target']; ?>
@@ -88,7 +88,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td>
 					<?php echo $lists['parent']; ?>
@@ -96,7 +96,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -104,7 +104,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -112,7 +112,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -124,7 +124,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/url/url.menu.php 4.6rc2/administrator/components/com_menus/url/url.menu.php
--- 4.5.4/administrator/components/com_menus/url/url.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/url/url.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: url.menu.php,v 1.1 2005/07/22 01:53:12 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/url/url.xml 4.6rc2/administrator/components/com_menus/url/url.xml
--- 4.5.4/administrator/components/com_menus/url/url.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/url/url.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Link</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates url link</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.class.php 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.class.php
--- 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: weblink_category_table.class.php,v 1.1 2005/07/22 01:53:12 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Menus
-*/
 class weblink_category_table_menu {
 
 	/**
@@ -30,7 +28,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -70,9 +68,9 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 
 		weblink_category_table_menu_html::editCategory( $menu, $lists, $params, $option );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php
--- 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php	2006-05-14 15:48:05.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: weblink_category_table.menu.html.php,v 1.1 2005/07/22 01:53:12 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -16,8 +18,6 @@
 *
 * A new record is defined when <var>$row</var> is passed with the <var>id</var>
 * property set to 0.
-* @package Mambo
-* @subpackage Menus
 */
 class weblink_category_table_menu_html {
 
@@ -36,7 +36,7 @@
 			if ( !$menu->id ) {
 				?>
 				if ( getSelectedValue( 'adminForm', 'componentid' ) < 1 ) {
-					alert( 'You must select a category' );
+					alert( '<?php echo T_('You must select a category') ?>' );
 					return;
 				}
 				cat = getSelectedText( 'adminForm', 'componentid' );
@@ -50,7 +50,7 @@
 			} else {
 				?>
 				if ( form.name.value == '' ) {
-					alert( 'This Menu item must have a title' );
+					alert( '<?php echo T_('This Menu item must have a title') ?>' );
 				} else {
 					submitform( pressbutton );
 				}
@@ -63,7 +63,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Table - Weblink Category
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Table - Web Link Category') ?>
 			</th>
 		</tr>
 		</table>
@@ -74,13 +74,13 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
@@ -88,14 +88,14 @@
 					<td>
 					<?php
 					if ( !$menu->id ) {
-						echo mosToolTip( 'If you leave this blank the Category name will be automatically used' );
+						echo mosToolTip( T_('If you leave this blank the Category name will be automatically used') );
 					}
 					?>
 					</td>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Category:
+					<?php echo T_('Category:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['componentid']; ?>
@@ -103,7 +103,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Url:
+					<?php echo T_('Url:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['link']; ?>
@@ -111,7 +111,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
@@ -119,7 +119,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
@@ -127,7 +127,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
@@ -135,7 +135,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
@@ -150,7 +150,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.php 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.php
--- 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: weblink_category_table.menu.php,v 1.1 2005/07/22 01:53:12 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.xml 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
--- 4.5.4/administrator/components/com_menus/weblink_category_table/weblink_category_table.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/weblink_category_table/weblink_category_table.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Component</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Shows a Table view of Weblink items for a particular Weblink Category</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_menus/wrapper/wrapper.class.php 4.6rc2/administrator/components/com_menus/wrapper/wrapper.class.php
--- 4.5.4/administrator/components/com_menus/wrapper/wrapper.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/wrapper/wrapper.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: wrapper.class.php,v 1.1 2005/07/22 01:53:16 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Wrapper class
-* @package Mambo
-* @subpackage Menus
 */
 class wrapper_menu {
 
@@ -27,7 +27,7 @@
 
 		// fail if checked out not by 'me'
 		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('The module $menu->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 			exit(0);
 		}
 
@@ -54,7 +54,7 @@
 		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
 		
 		// get params definitions
-		$params =& new mosParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
 		if ( $uid ) {
 			$menu->url = $params->def( 'url', '' );
 		}
@@ -111,4 +111,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_menus/wrapper/wrapper.menu.html.php 4.6rc2/administrator/components/com_menus/wrapper/wrapper.menu.html.php
--- 4.5.4/administrator/components/com_menus/wrapper/wrapper.menu.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/wrapper/wrapper.menu.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: wrapper.menu.html.php,v 1.1 2005/07/22 01:53:16 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Display wrapper
-* @package Mambo
-* @subpackage Menus
 */
 class wrapper_menu_html {
 
@@ -32,13 +32,13 @@
 			}
 			var form = document.adminForm;
 			if ( form.name.value == "" ) {
-				alert( 'This Menu item must have a title' );
+				alert( '<?php echo T_('This Menu item must have a title') ?>' );
 			} else {
 				<?php
 				if ( !$menu->id ) {
 					?>
 					if ( form.url.value == "" ){
-						alert( "You must provide a url." );
+						alert( "<?php echo T_('You must provide a url.') ?>" );
 					} else {
 						submitform( pressbutton );
 					}
@@ -56,7 +56,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			<?php echo $menu->id ? 'Edit' : 'Add';?> Menu Item :: Wrapper
+			<?php echo $menu->id ? T_('Edit') : T_('Add');?> <?php echo T_('Menu Item :: Wrapper') ?>
 			</th>
 		</tr>
 		</table>
@@ -67,12 +67,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="10%" align="right" valign="top">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="200px">
 					<input type="text" name="name" size="30" maxlength="100" class="inputbox" value="<?php echo $menu->name; ?>"/>
@@ -80,7 +80,7 @@
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Wrapper Link:
+					<?php echo T_('Wrapper Link:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="url" size="50" maxlength="250" value="<?php echo @$menu->url; ?>" />
@@ -88,7 +88,7 @@
 				</tr>
 				<tr>
 					<td width="10%" align="right">
-					Url:
+					<?php echo T_('Url:') ?>
 					</td>
 					<td width="80%">
 					<?php echo $lists['link']; ?>
@@ -96,7 +96,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					Parent Item:
+					<?php echo T_('Parent Item:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['parent'];?>
@@ -104,7 +104,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['ordering']; ?>
@@ -112,7 +112,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['access']; ?>
@@ -120,7 +120,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td colspan="2">
 					<?php echo $lists['published']; ?>
@@ -135,7 +135,7 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_menus/wrapper/wrapper.menu.php 4.6rc2/administrator/components/com_menus/wrapper/wrapper.menu.php
--- 4.5.4/administrator/components/com_menus/wrapper/wrapper.menu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/wrapper/wrapper.menu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: wrapper.menu.php,v 1.1 2005/07/22 01:53:16 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Menus
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_menus/wrapper/wrapper.xml 4.6rc2/administrator/components/com_menus/wrapper/wrapper.xml
--- 4.5.4/administrator/components/com_menus/wrapper/wrapper.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_menus/wrapper/wrapper.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,10 +4,10 @@
 	<group>Other</group>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Creates an IFrame that will wrap an external page/site into Mambo</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_messages/admin.messages.html.php 4.6rc2/administrator/components/com_messages/admin.messages.html.php
--- 4.5.4/administrator/components/com_messages/admin.messages.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_messages/admin.messages.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,28 +1,26 @@
 <?php
 /**
-* @version $Id: admin.messages.html.php,v 1.1 2005/07/22 01:53:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Messages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Messages
-*/
 class HTML_messages {
 	function showMessages( &$rows, $pageNav, $search, $option ) {
 ?>
 <form action="index2.php" method="post" name="adminForm">
   <table class="adminheading">
     <tr>
-      <th class="inbox">Private Messaging</th>
-      <td>Search:</td>
+      <th class="inbox"><?php echo T_('Private Messaging') ?></th>
+      <td><?php echo T_('Search:') ?></td>
       <td> <input type="text" name="search" value="<?php echo $search;?>" class="inputbox" onChange="document.adminForm.submit();" />
       </td>
     </tr>
@@ -32,11 +30,11 @@
       <th width="20">#</th>
       <th width="5%" class="title"> <input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count($rows); ?>);" />
       </th>
-      <th width="60%" class="title">Subject</th>
-      <th width="15%" class="title">From</th>
+      <th width="60%" class="title"><?php echo T_('Subject') ?></th>
+      <th width="15%" class="title"><?php echo T_('From') ?></th>
       <!-- <th width="20%" class="title">UserType</th> -->
-      <th width="15%" class="title">Date</th>
-      <th width="5%" class="title">Read</th>
+      <th width="15%" class="title"><?php echo T_('Date') ?></th>
+      <th width="5%" class="title"><?php echo T_('Read') ?></th>
     </tr>
 <?php
 $k = 0;
@@ -52,9 +50,9 @@
       <td width="15%"><?php echo $row->date_time; ?></td>
       <td width="15%"><?php
       if (intval( $row->state ) == "1") {
-      	echo "Read";
+      	echo T_("Read");
       } else {
-      	echo "Unread";
+      	echo T_("Unread");
 	  } ?></td>
     </tr>
     <?php $k = 1 - $k;
@@ -74,19 +72,19 @@
 ?>
 <table class="adminheading">
   <tr>
-    <th class="msgconfig">Private Messaging Configuration</th>
+    <th class="msgconfig"><?php echo T_('Private Messaging Configuration') ?></th>
   </tr>
 </table>
 <?php
 $tabs->startPane("messages");
-$tabs->startTab("General","general-page");
+$tabs->startTab(T_("General"),"general-page");
 ?>
 <form action="index2.php" method="post" name="adminForm">
 <script language="javascript" type="text/javascript">
 function submitbutton(pressbutton) {
 	var form = document.adminForm;
 	if (pressbutton == 'saveconfig') {
-		if (confirm ("Are you sure?")) {
+		if (confirm ("<?php echo T_('Are you sure?') ?>")) {
 			submitform( pressbutton );
 		}
 	} else {
@@ -98,11 +96,11 @@
 
     <table class="adminform">
       <tr>
-        <td width="20%">Lock Inbox:</td>
+        <td width="20%"><?php echo T_('Lock Inbox:') ?></td>
         <td> <?php echo $vars['lock']; ?> </td>
       </tr>
       <tr>
-        <td width="20%">Mail me on new Message:</td>
+        <td width="20%"><?php echo T_('Mail me on new Message:') ?></td>
         <td> <?php echo $vars['mail_on_new']; ?> </td>
       </tr>
     </table>
@@ -120,26 +118,26 @@
 ?>
 	<table class="adminheading">
 		<tr>
-			<th class="inbox">View Private Message</th>
+			<th class="inbox"><?php echo T_('View Private Message') ?></th>
 		</tr>
 	</table>
 
 	<form action="index2.php" method="post" name="adminForm">
 	<table class="adminform">
 		<tr>
-			<td width="100">From:</td>
+			<td width="100"><?php echo T_('From:') ?></td>
 			<td width="85%" bgcolor="#ffffff"><?php echo $row->user_from;?></td>
 		</tr>
 		<tr>
-			<td>Posted:</td>
+			<td><?php echo T_('Posted:') ?></td>
 			<td bgcolor="#ffffff"><?php echo $row->date_time;?></td>
 		</tr>
 		<tr>
-			<td>Subject:</td>
+			<td><?php echo T_('Subject:') ?></td>
 			<td bgcolor="#ffffff"><?php echo $row->subject;?></td>
 		</tr>
 		<tr>
-			<td valign="top">Message:</td>
+			<td valign="top"><?php echo T_('Message:') ?></td>
 			<td width="100%" bgcolor="#ffffff"><pre><?php echo htmlspecialchars( $row->message );?></pre></td>
 		</tr>
 	</table>
@@ -166,11 +164,11 @@
 
 		// do field validation
 		if (form.subject.value == "") {
-			alert( "You must provide a subject." );
+			alert( "<?php echo T_('You must provide a subject.') ?>" );
 		} else if (form.message.value == "") {
-			alert( "You must provide a message." );
+			alert( "<?php echo T_('You must provide a message.') ?>" );
 		} else if (getSelectedValue('adminForm','user_id_to') < 1) {
-			alert( "You must select a recipient." );
+			alert( "<?php echo T_('You must select a recipient.') ?>" );
 		} else {
 			submitform( pressbutton );
 		}
@@ -179,24 +177,24 @@
 
 	<table class="adminheading">
 		<tr>
-			<th class="inbox">New Private Message</th>
+			<th class="inbox"><?php echo T_('New Private Message') ?></th>
 		</tr>
 	</table>
 
 	<form action="index2.php" method="post" name="adminForm">
 	<table class="adminform">
 		<tr>
-			<td width="100">To:</td>
+			<td width="100"><?php echo T_('To:') ?></td>
 			<td width="85%"><?php echo $recipientslist; ?></td>
 		</tr>
 		<tr>
-			<td>Subject:</td>
+			<td><?php echo T_('Subject:') ?></td>
 			<td>
 				<input type="text" name="subject" size="50" maxlength="100" class="inputbox" value="<?php echo $subject; ?>"/>
 			</td>
 		</tr>
 		<tr>
-			<td valign="top">Message:</td>
+			<td valign="top"><?php echo T_('Message:') ?></td>
 			<td width="100%">
 				<textarea name="message" style="width:100%" rows="30" class="inputbox"></textarea>
 			</td>
diff -ruN 4.5.4/administrator/components/com_messages/admin.messages.php 4.6rc2/administrator/components/com_messages/admin.messages.php
--- 4.5.4/administrator/components/com_messages/admin.messages.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_messages/admin.messages.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.messages.php,v 1.1 2005/07/22 01:53:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Messages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -195,7 +197,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 	if (count( $cid )) {
diff -ruN 4.5.4/administrator/components/com_messages/toolbar.messages.html.php 4.6rc2/administrator/components/com_messages/toolbar.messages.html.php
--- 4.5.4/administrator/components/com_messages/toolbar.messages.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_messages/toolbar.messages.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,24 +1,22 @@
 <?php
 /**
-* @version $Id: toolbar.messages.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Messages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Messages
-*/
 class TOOLBAR_messages {
 	function _VIEW() {
 		mosMenuBar::startTable();
-		mosMenuBar::customX('reply', 'restore.png', 'restore_f2.png', 'Reply', false );
+		mosMenuBar::customX('reply', 'restore.png', 'restore_f2.png', T_('Reply'), false );
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
@@ -28,11 +26,11 @@
 
 	function _EDIT() {
 		mosMenuBar::startTable();
-		mosMenuBar::save( 'save', 'Send' );
+		mosMenuBar::save( 'save', T_('Send') );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.messages.new' );
+		mosMenuBar::help( 'new' );
 		mosMenuBar::endTable();
 	}
 
@@ -42,7 +40,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel( 'cancelconfig' );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.messages.conf' );
+		mosMenuBar::help( 'configuration' );
 		mosMenuBar::endTable();
 	}
 
@@ -52,7 +50,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.messages.inbox' );
+		mosMenuBar::help( 'inbox' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_messages/toolbar.messages.php 4.6rc2/administrator/components/com_messages/toolbar.messages.php
--- 4.5.4/administrator/components/com_messages/toolbar.messages.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_messages/toolbar.messages.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.messages.php,v 1.1 2005/07/22 01:53:17 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Messages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_modules/admin.modules.html.php 4.6rc2/administrator/components/com_modules/admin.modules.html.php
--- 4.5.4/administrator/components/com_modules/admin.modules.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_modules/admin.modules.html.php	2006-04-07 07:30:18.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.modules.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Modules
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Modules
-*/
 class HTML_modules {
 
 	/**
@@ -31,7 +29,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="modules" rowspan="2">
-			Module Manager <small><small>[ <?php echo $client == 'admin' ? 'Administrator' : 'Site';?> ]</small></small>
+			<?php echo T_('Module Manager'); ?> <small><small>[ <?php echo $client == 'admin' ? T_('Administrator') : T_('Site');?> ]</small></small>
 			</th>
 			<td width="right">
 			<?php echo $lists['position'];?>
@@ -42,7 +40,7 @@
 		</tr>
 		<tr>
 			<td align="right">
-			Filter:
+			<?php echo T_('Filter:'); ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -57,40 +55,40 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count( $rows );?>);" />
 			</th>
 			<th class="title">
-			Module Name
+			<?php echo T_('Module Name'); ?>
 			</th>
 			<th nowrap="nowrap" width="10%">
-			Published
+			<?php echo T_('Published'); ?>
 			</th>
 			<th colspan="2" align="center" width="5%">
-			Reorder
+			<?php echo T_('Reorder'); ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order'); ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order'); ?>" /></a>
 			</th>
 			<?php
 			if ( !$client ) {
 				?>
 				<th nowrap="nowrap" width="7%">
-				Access
+				<?php echo T_('Access'); ?>
 				</th>
 				<?php
 			}
 			?>
 			<th nowrap="nowrap" width="7%">
-			Position
+			<?php echo T_('Position'); ?>
 			</th>
 			<th nowrap="nowrap" width="5%">
-			Pages
+			<?php echo T_('Pages'); ?>
 			</th>
 			<th nowrap="nowrap" width="5%">
-			ID
+			<?php echo T_('ID'); ?>
 			</th>
 			<th nowrap="nowrap" width="10%" align="left">
-			Type
+			<?php echo T_('Type'); ?>
 			</th>
 		</tr>
 		<?php
@@ -151,11 +149,11 @@
 				<td align="center">
 				<?php
 				if (is_null( $row->pages )) {
-					echo 'None';
+					echo T_('None');
 				} else if ($row->pages > 0) {
-					echo 'Varies';
+					echo T_('Varies');
 				} else {
-					echo 'All';
+					echo T_('All');
 				}
 				?>
 				</td>
@@ -163,7 +161,7 @@
 				<?php echo $row->id;?>
 				</td>
 				<td align="left">
-				<?php echo $row->module ? $row->module : "User";?>
+				<?php echo $row->module ? $row->module : T_("User");?>
 				</td>
 			</tr>
 			<?php
@@ -210,7 +208,7 @@
 		<script language="javascript" type="text/javascript">
 		function submitbutton(pressbutton) {
 			if ( ( pressbutton == 'save' ) && ( document.adminForm.title.value == "" ) ) {
-				alert("Module must have a title");
+				alert("<?php echo T_('Module must have a title'); ?>");
 			} else {
 				<?php if ($row->module == "") {
 					getEditorContents( 'editor1', 'content' );
@@ -235,10 +233,10 @@
 		<table class="adminheading">
 		<tr>
 			<th class="modules">
-			<?php echo $lists['client_id'] ? 'Administrator' : 'Site';?>
-			Module:
+			<?php echo $lists['client_id'] ? T_('Administrator') : T_('Site');?>
+			<?php echo T_('Module:'); ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			<?php echo $row->titleA; ?>
 			</th>
@@ -253,12 +251,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details'); ?>
 					</th>
-				<tr>
+				</tr>
 				<tr>
 					<td width="100" align="left">
-					Title:
+					<?php echo T_('Title:'); ?>
 					</td>
 					<td>
 					<input class="text_area" type="text" name="title" size="35" value="<?php echo $row->title; ?>" />
@@ -267,7 +265,7 @@
 				<!-- START selectable pages -->
 				<tr>
 					<td width="100" align="left">
-					Show title:
+					<?php echo T_('Show title:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['showtitle']; ?>
@@ -275,7 +273,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Position:
+					<?php echo T_('Position:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['position']; ?>
@@ -283,7 +281,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Module Order:
+					<?php echo T_('Module Order:'); ?>
 					</td>
 					<td>
 					<script language="javascript" type="text/javascript">
@@ -295,7 +293,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left">
-					Access Level:
+					<?php echo T_('Access Level:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -303,7 +301,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Published:
+					<?php echo T_('Published:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -315,7 +313,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					ID:
+					<?php echo T_('ID:'); ?>
 					</td>
 					<td>
 					<?php echo $row->id; ?>
@@ -323,7 +321,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Description:
+					<?php echo T_('Description:'); ?>
 					</td>
 					<td>
 					<?php echo $row->description; ?>
@@ -334,9 +332,9 @@
 				<table class="adminform">
 				<tr>
 					<th >
-					Parameters
+					<?php echo T_('Parameters'); ?>
 					</th>
-				<tr>
+				</tr>
 				<tr>
 					<td>
 					<?php echo $params->render();?>
@@ -348,12 +346,12 @@
 				<table width="100%" class="adminform">
 				<tr>
 					<th>
-					Pages / Items
+					<?php echo T_('Pages / Items'); ?>
 					</th>
-				<tr>
+				</tr>
 				<tr>
 					<td>
-					Menu Item Link(s):
+					<?php echo T_('Menu Item Link(s):'); ?>
 					<br />
 					<?php echo $lists['selections']; ?>
 					</td>
@@ -369,12 +367,12 @@
 						<table width="100%" class="adminform">
 						<tr>
 							<th colspan="2">
-							Custom Output
+							<?php echo T_('Custom Output'); ?>
 							</th>
-						<tr>
+						</tr>
 						<tr>
 							<td valign="top" align="left">
-							Content:
+							<?php echo T_('Content:'); ?>
 							</td>
 							<td>
 							<?php
diff -ruN 4.5.4/administrator/components/com_modules/admin.modules.php 4.6rc2/administrator/components/com_modules/admin.modules.php
--- 4.5.4/administrator/components/com_modules/admin.modules.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_modules/admin.modules.php	2006-04-06 13:41:09.000000000 -0500
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: admin.modules.php,v 1.1 2005/07/22 01:53:20 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Modules
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -13,7 +15,7 @@
 
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'modules', 'all' ) | $acl->acl_check( 'administration', 'install', 'users', $my->usertype, 'modules', 'all' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -146,7 +148,7 @@
 	. "\n GROUP BY t.position"
 	. "\n ORDER BY t.position"
 	;
-	$positions[] = mosHTML::makeOption( '0', _SEL_POSITION );
+	$positions[] = mosHTML::makeOption( '0', T_('- All Positions -') );
 	$database->setQuery( $query );
 	$positions = array_merge( $positions, $database->loadObjectList() );
 	$lists['position']	= mosHTML::selectList( $positions, 'filter_position', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', "$filter_position" );
@@ -158,7 +160,7 @@
 	. "\n GROUP BY module"
 	. "\n ORDER BY module"
 	;
-	$types[] = mosHTML::makeOption( '0', _SEL_TYPE );
+	$types[] = mosHTML::makeOption( '0', T_('- All Types -') );
 	$database->setQuery( $query );
 	$types = array_merge( $types, $database->loadObjectList() );
 	$lists['type']	= mosHTML::selectList( $types, 'filter_type', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', "$filter_type" );
@@ -208,7 +210,7 @@
 		$database->query();
 	}
 
-	$msg = 'Module Copied ['. $row->title .']';
+	$msg = sprintf(T_('Module Copied [%s]'), $row->title);
 	mosRedirect( 'index2.php?option='. $option .'&client='. $client, $msg );
 }
 
@@ -265,13 +267,13 @@
 
 	switch ( $task ) {
 		case 'apply':
-			$msg = 'Successfully Saved changes to Module: '. $row->title;
+			$msg = sprintf(T_('Successfully Saved changes to Module: %s'), $row->title) ;
 			mosRedirect( 'index2.php?option='. $option .'&client='. $client .'&task=editA&hidemainmenu=1&id='. $row->id, $msg );
 			break;
 
 		case 'save':
 		default:
-			$msg = 'Successfully Saved Module: '. $row->title;
+			$msg = sprintf(T_('Successfully Saved Module: %s'), $row->title);
 			mosRedirect( 'index2.php?option='. $option .'&client='. $client, $msg );
 			break;
 	}
@@ -292,7 +294,7 @@
 	$row->load( $uid );
 	// fail if checked out not by 'me'
 	if ( $row->checked_out && $row->checked_out <> $my->id ) {
-		echo "<script>alert('The module $row->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+		echo "<script>alert('".sprintf(T_('The module %s is currently being edited by another administrator'), $row->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 		exit(0);
 	}
 
@@ -321,11 +323,13 @@
 		$lists['client_id'] = 0;
 		$path				= 'mod0_xml';
 	}
+
 	$query = "SELECT position, ordering, showtitle, title"
 	. "\n FROM #__modules"
 	. "\n WHERE ". $where
 	. "\n ORDER BY ordering"
 	;
+
 	$database->setQuery( $query );
 	if ( !($orders = $database->loadObjectList()) ) {
 		echo $database->stderr();
@@ -373,13 +377,13 @@
 	}
 
 	if ( $row->access == 99 || $row->client_id == 1 || $lists['client_id'] ) {
-		$lists['access'] 			= 'Administrator<input type="hidden" name="access" value="99" />';
-		$lists['showtitle'] 		= 'N/A <input type="hidden" name="showtitle" value="1" />';
-		$lists['selections'] 		= 'N/A';
+		$lists['access'] 			= T_('Administrator').'<input type="hidden" name="access" value="99" />';
+		$lists['showtitle'] 		= T_('N/A').' <input type="hidden" name="showtitle" value="1" />';
+		$lists['selections'] 		= T_('N/A');
 	} else {
 		if ( $client == 'admin' ) {
-			$lists['access'] 		= 'N/A';
-			$lists['selections'] 	= 'N/A';
+			$lists['access'] 		= T_('N/A');
+			$lists['selections'] 	= T_('N/A');
 		} else {
 			$lists['access'] 		= mosAdminMenus::Access( $row );
 			$lists['selections'] 	= mosAdminMenus::MenuLinks( $lookup, 1, 1 );
@@ -390,24 +394,17 @@
 	// build the html select list for published
 	$lists['published'] 			= mosAdminMenus::Published( $row );
 
-    $row->description = '';
-	// XML library
-	require_once( $mosConfig_absolute_path . '/includes/domit/xml_domit_lite_include.php' );
 	// xml file for module
 	$xmlfile = $mainframe->getPath( $path, $row->module );
-	$xmlDoc =& new DOMIT_Lite_Document();
-	$xmlDoc->resolveErrors( true );
-	if ($xmlDoc->loadXML( $xmlfile, false, true )) {
-		$element = &$xmlDoc->documentElement;
-
-		if ($element->getTagName() == 'mosinstall' && $element->getAttribute( 'type' ) == 'module' ) {
-			$element = &$xmlDoc->getElementsByPath( 'description', 1 );
-			$row->description = $element ? trim( $element->getText() ) : '';
-		}
+	if ($xmlfile) {
+		$xmlparser =& new mosXMLDescription ($xmlfile);
+		$row->description = $xmlparser->getDescription('module');
+	} else {
+		$row->description = '';
 	}
 
 	// get params definitions
-	$params =& new mosParameters( $row->params, $xmlfile, 'module' );
+	$params =& new mosAdminParameters( $row->params, $xmlfile, 'module' );
 
 	HTML_modules::editModule( $row, $orders2, $lists, $params, $option );
 }
@@ -422,7 +419,7 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		echo "<script> alert('Select a module to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select a module to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -445,7 +442,7 @@
 		// mod_mainmenu modules only deletable via Menu Manager
 		if ( $row->module == 'mod_mainmenu' ) {
 			if ( strstr( $row->params, 'mainmenu' ) ) {
-				echo "<script> alert('You cannot delete mod_mainmenu module that displays the \'mainmenu\' as it is a core Menu'); window.history.go(-1); </script>\n";
+				echo "<script> alert('".T_('You cannot delete mod_mainmenu module that displays the "mainmenu" as it is a core Menu')."'); window.history.go(-1); </script>\n";
 				exit;
 			}
 		}
@@ -471,7 +468,7 @@
 
 	if (count( $err )) {
 		$cids = addslashes( implode( "', '", $err ) );
-		echo "<script>alert('Module(s): \'$cids\' cannot be deleted they can only be un-installed as they are Mambo modules.');</script>\n";
+		echo "<script>alert('".sprintf(T_('Module(s): "%s" cannot be deleted they can only be un-installed as they are Mambo modules.'), $cids)."');</script>\n";
 	}
 
 	mosRedirect( 'index2.php?option='. $option .'&client='. $client );
@@ -486,8 +483,8 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select a module to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish' ): T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select a module to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -590,40 +587,30 @@
 
 function saveOrder( &$cid, $client ) {
 	global $database;
-
-	$total		= count( $cid );
 	$order 		= mosGetParam( $_POST, 'order', array(0) );
-	$row 		= new mosModule( $database );
-	$conditions = array();
-
+	$row		= new mosMenu( $database );
+	$positions = array();
     // update ordering values
-	for( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
 		if ($row->ordering != $order[$i]) {
 			$row->ordering = $order[$i];
 	        if (!$row->store()) {
 	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
 	            exit();
-	        } // if
+	        }
 	        // remember to updateOrder this group
-	        $condition = "position='$row->position' AND client_id='$row->client_id'";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // if
-	} // for
-
+	        $positions[$row->position][$row->client_id] = $row->id;
+	    }
+	}
 	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
+	foreach ($positions as $position=>$clients) {
+	    foreach ($clients as $client=>$rowid) {
+			$row->updateOrder("position = '$position' AND client_id = '$client'");
+		}
 	} // foreach
 
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_modules&client='. $client, $msg );
 } // saveOrder
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_modules/toolbar.modules.html.php 4.6rc2/administrator/components/com_modules/toolbar.modules.html.php
--- 4.5.4/administrator/components/com_modules/toolbar.modules.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_modules/toolbar.modules.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,44 +1,45 @@
 <?php
 /**
-* @version $Id: toolbar.modules.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Modules
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Modules
-*/
 class TOOLBAR_modules {
-	/**
+    /**
 	* Draws the menu for a New module
 	*/
-	function _NEW()	{
-		mosMenuBar::startTable();
-		mosMenuBar::preview( 'modulewindow' );
-		mosMenuBar::spacer();
-		mosMenuBar::save();
-		mosMenuBar::spacer();
-		mosMenuBar::apply();
-		mosMenuBar::spacer();
-		mosMenuBar::cancel();
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.modules.new' );
-		mosMenuBar::endTable();
-	}
+    function _NEW()	{
+        mosMenuBar::startTable();
+        mosMenuBar::preview( 'modulewindow' );
+        mosMenuBar::spacer();
+        mosMenuBar::save();
+        mosMenuBar::spacer();
+        mosMenuBar::apply();
+        mosMenuBar::spacer();
+        mosMenuBar::cancel();
+        mosMenuBar::spacer();
+        if ($GLOBALS['client'] == 'admin') {
+            $ref = 'admin.';
+        }
+        mosMenuBar::help( $ref.'new' );
+        mosMenuBar::endTable();
+    }
 
-	/**
+    /**
 	* Draws the menu for Editing an existing module
 	*/
-	function _EDIT( $cur_template, $publish ) {
-		global $id;
-		
-		mosMenuBar::startTable();
+    function _EDIT( $cur_template, $publish ) {
+        global $id;
+
+        mosMenuBar::startTable();
 		?>
-			<td><a class="toolbar" href="#" onClick="if (typeof document.adminForm.content == 'undefined') { alert('You can only preview typed modules.'); } else { var content = document.adminForm.content.value; content = content.replace('#', '');  var title = document.adminForm.title.value; title = title.replace('#', ''); window.open('popups/modulewindow.php?title=' + title + '&content=' + content + '&t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=auto,titlebar=no,menubar=no,resizable=yes,width=200,height=400,directories=no,location=no'); }" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('preview','','images/preview_f2.png',1);"><img src="images/preview.png" alt="Preview" border="0" name="preview" align="middle">Preview</a></td>
+			<td><a class="toolbar" href="#" onClick="if (typeof document.adminForm.content == 'undefined') { alert('<?php echo T_('You can only preview typed modules.') ?>'); } else { var content = document.adminForm.content.value; content = content.replace('#', '');  var title = document.adminForm.title.value; title = title.replace('#', ''); window.open('popups/modulewindow.php?title=' + title + '&content=' + content + '&t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=auto,titlebar=no,menubar=no,resizable=yes,width=200,height=400,directories=no,location=no'); }" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('preview','','images/preview_f2.png',1);"><img src="images/preview.png" alt="<?php echo T_('Preview') ?>" border="0" name="preview" align="middle"><?php echo T_('Preview') ?></a></td>
 		<?php
 		mosMenuBar::spacer();
 		mosMenuBar::save();
@@ -46,31 +47,51 @@
 		mosMenuBar::apply();
 		mosMenuBar::spacer();
 		if ( $id ) {
-			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+		    // for existing content items the button is renamed `close`
+		    mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
-			mosMenuBar::cancel();
+		    mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.modules.edit' );
-		mosMenuBar::endTable();
-	}
-	function _DEFAULT() {
-		mosMenuBar::startTable();
-		mosMenuBar::publishList();
-		mosMenuBar::spacer();
-		mosMenuBar::unpublishList();
-		mosMenuBar::spacer();
-		mosMenuBar::custom( 'copy', 'copy.png', 'copy_f2.png', 'Copy', true );
-		mosMenuBar::spacer();
-		mosMenuBar::addNewX();
-		mosMenuBar::spacer();
-		mosMenuBar::editListX();
-		mosMenuBar::spacer();
-		mosMenuBar::deleteList();
-		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.modules.main' );
+
+		$result = '';
+		if ($_POST) {
+		    $cid = (int) $GLOBALS['cid'][0];
+		} else {
+		    $cid = (int) $_GET['id'];
+		}
+		$database =& mamboDatabase::getInstance();
+		$database->setQuery('select module from #__modules where id = '.$cid);
+		$result = substr($database->loadResult(), 4);
+
+		if ($result) {
+		    if ($GLOBALS['client'] == 'admin') {
+		        $result = 'admin.'.$result;
+		    }
+
+		}
+		mosMenuBar::help( $result ? $result : 'edit' );
 		mosMenuBar::endTable();
-	}
+    }
+    function _DEFAULT() {
+        mosMenuBar::startTable();
+        mosMenuBar::publishList();
+        mosMenuBar::spacer();
+        mosMenuBar::unpublishList();
+        mosMenuBar::spacer();
+        mosMenuBar::custom( 'copy', 'copy.png', 'copy_f2.png', T_('Copy'), true );
+        mosMenuBar::spacer();
+        mosMenuBar::addNewX();
+        mosMenuBar::spacer();
+        mosMenuBar::editListX();
+        mosMenuBar::spacer();
+        mosMenuBar::deleteList();
+        mosMenuBar::spacer();
+        if ($GLOBALS['client'] == 'admin') {
+            $ref = 'admin.';
+        }
+        mosMenuBar::help( $ref.'manager' );
+        mosMenuBar::endTable();
+    }
 }
 ?>
diff -ruN 4.5.4/administrator/components/com_modules/toolbar.modules.php 4.6rc2/administrator/components/com_modules/toolbar.modules.php
--- 4.5.4/administrator/components/com_modules/toolbar.modules.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_modules/toolbar.modules.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.modules.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Modules
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_mostlyce/admin.mostlyce.html.php 4.6rc2/administrator/components/com_mostlyce/admin.mostlyce.html.php
--- 4.5.4/administrator/components/com_mostlyce/admin.mostlyce.html.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/admin.mostlyce.html.php	2006-06-22 22:32:32.000000000 -0500
@@ -0,0 +1,398 @@
+<?php
+/**
+* @package MOStlyCE Admin
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+/**
+* @package Mambo_4.6
+*/
+class HTML_expConfig {
+
+        function showconfig( &$row, &$lists, $option) {
+                global $mosConfig_absolute_path, $mosConfig_live_site, $mosConfig_lang;
+                $tabs = new mosTabs(0);
+
+                if (!file_exists("$mosConfig_absolute_path/administrator/components/com_mostlyce/info/admin_info_$mosConfig_lang.txt"))
+                {
+                  $admin_info_lang = "english";
+                }else{
+                  $admin_info_lang = "$mosConfig_lang";
+                }
+                
+                if (!file_exists("$mosConfig_absolute_path/mambots/editors/mostlyce/jscripts/tiny_mce/info/editor_info_$mosConfig_lang.php"))
+                {
+                  $editor_info_lang = "english";
+                }else{
+                  $editor_info_lang = "$mosConfig_lang";
+                }
+
+                ?>
+                <div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>
+                <table class="adminheading">
+                <tr>
+                        <th class="config">
+                        MOStlyCE Configuration :
+                        <span class="componentheading">
+                        mostlyce_config.php is :
+                         <?php echo is_writable( '../mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php' ) ? '<b><font color="green"> Writeable</font></b>' : '<b><font color="red">Unwriteable</font></b>'?>
+                        </span>
+                        </th>
+                </tr>
+                </table>
+                <script language="javascript" type="text/javascript">
+                function submitbutton(pressbutton) {
+                        var form = document.adminForm;
+                        if (pressbutton == 'save') {
+                                //if (confirm ("Are you sure?")) {
+                                submitform( pressbutton );
+                                //}
+                        } else {
+                                document.location.href = 'index2.php';
+                        }
+                }
+                </script>
+                <form action="index2.php" method="post" name="adminForm">
+                <?php
+                $tabs->startPane("mosCE");
+                $tabs->startTab(_EDITOR_OPTIONS,"editor_options");
+                ?>
+                <table class="adminform">
+                <tr>
+                    <td colspan="2">The URL specified in $mosConfig_live_site in configuration.php is <strong><?php echo $mosConfig_live_site ?></strong><br />
+                    You <strong>MUST</strong> access this site from this <strong>exact URL</strong> when editing content.
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_THEMES ?>:
+                        </td>
+                        <td><?php echo $lists['editor_themes'];?></td>
+                </tr>
+		<tr>
+                        <td width="185">
+                        <?php echo _EDITOR_COMPRESSION ?>:
+                        </td>
+                        <td><?php echo $lists['editor_compression'];
+			$tip = _EDITOR_COMPRESSION_TIP;
+                                echo mosToolTip( $tip );?>
+			</td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_LANG ?>:
+                        </td>
+                        <td><?php echo $lists['editor_lang']; 
+                        $tip = _EDITOR_ADD_LANG;
+                                echo mosToolTip( $tip );?></td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_LANG_LIST ?>:
+                        </td>
+                        <td><input type="text" class="text_area" size="50" name="editor_lang_list" value="<?php echo $row->editor_lang_list; ?>"></td>
+                </tr>
+
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_CSS_OVERRIDE ?>:
+                        </td>
+                        <td><?php echo $lists['editor_css_override'];
+                        $tip = _EDITOR_CSS_OVERRIDE_TIP;
+                                echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td valign="top">
+                        <?php echo _EDITOR_CUSTOM_CSS ?>:
+                        </td>
+                        <td>
+                        <input type="text" class="text_area" size="30" name="editor_custom_css" value="<?php echo $row->editor_custom_css; ?>">
+                        <?php $tip = _EDITOR_CUSTOM_CSS_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_NEWLINES ?>:
+                        </td>
+                        <td><?php echo $lists['editor_newlines'];
+                        $tip = _EDITOR_NEWLINES_TIP;
+                                echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_CONVERT_URLS ?>:
+                        </td>
+                        <td><?php echo $lists['editor_convert_urls'];
+                        $tip = _EDITOR_CONVERT_URLS_TIP;
+                                echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_SCRIPT ?>:
+                        </td>
+                        <td><?php echo $lists['editor_script_acl'];?>
+                        &nbsp;
+                        <?php echo _EDITOR_SCRIPT_ELMS ?>
+                        <input type="text" class="text_area" size="40" name="editor_script_elms" value="<?php echo $row->editor_script_elms; ?>">
+                        <?php $tip = _EDITOR_SCRIPT_ELMS_TIP;
+                               echo mosToolTip( $tip );?></td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_IFRAME ?>:
+                        </td>
+                        <td><?php echo $lists['editor_iframe_acl'];?>
+                        &nbsp;
+                        <?php echo _EDITOR_IFRAME_ELEMENTS ?>
+                        <input type="text" class="text_area" size="40" name="editor_iframe_elms" value="<?php echo $row->editor_iframe_elms; ?>">
+                        <?php $tip = _EDITOR_IFRAME_ELEMENTS_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_XTD_ELMS ?>:
+                        </td>
+                        <td><input type="text" class="text_area" size="80" name="editor_xtd_elms" value="<?php echo $row->editor_xtd_elms; ?>">
+                        <?php $tip = _EDITOR_XTD_ELMS_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_TMPL_DIR ?>:
+                        </td>
+                        <td><?php echo $mosConfig_absolute_path;?><input type="text" class="text_area" size="30" name="editor_tmpl_dir" value="<?php echo $row->editor_tmpl_dir; ?>">
+                        <?php $tip = _EDITOR_TMPL_DIR_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_DIRECTION ?>:
+                        </td>
+                        <td><?php echo $lists['editor_direction']; ?></td>
+                </tr>
+                </table>
+                <?php
+                $tabs->endTab();
+                $tabs->startTab(_EDITOR_LAYOUT,"editor_layout");
+                ?>
+                <table class="adminform" border="1">
+                <tr>
+                    <td>Preview :</td>
+                    <td>
+                        <div style="width:<?php echo $row->editor_width; ?>px; border: 1px solid #cccccc; background:#F0F0EE;">
+                            <div style="padding:3px; border-bottom:1px solid #cccccc" />
+                            <?php $row_buttons1 = explode(',', $row->editor_layout_row1);
+                            foreach ($row_buttons1 as $btnImg1){
+                              echo'<img src="components/com_mostlyce/images/'.$btnImg1.'.gif" alt="'.$btnImg1.'" title="'.$btnImg1.'" />';
+                            }?></div>
+                            <div style="padding:3px; border-bottom:1px solid #cccccc" />
+                            <?php $row_buttons2 = explode(',', $row->editor_layout_row2);
+                            foreach ($row_buttons2 as $btnImg2){
+                              echo'<img src="components/com_mostlyce/images/'.$btnImg2.'.gif" alt="'.$btnImg2.'" title="'.$btnImg2.'" />';
+                            }?></div>
+                            <div style="padding:3px; border-bottom:1px solid #cccccc" />
+                            <?php $row_buttons3 = explode(',', $row->editor_layout_row3);
+                            foreach ($row_buttons3 as $btnImg3){
+                              echo'<img src="components/com_mostlyce/images/'.$btnImg3.'.gif" alt="'.$btnImg3.'" title="'.$btnImg3.'" />';
+                            }?></div>
+                            <div style="padding:3px; "/>
+                            <?php $row_buttons4 = explode(',', $row->editor_layout_row4);
+                            foreach ($row_buttons4 as $btnImg4){
+                              echo'<img src="components/com_mostlyce/images/'.$btnImg4.'.gif" alt="'.$btnImg4.'" title="'.$btnImg4.'" />';
+                            }?></div>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                        <td valign="top">
+                        <?php echo _EDITOR_WIDTH ?>:
+                        </td>
+                        <td>
+                        <input type="text" class="text_area" size="5" name="editor_width" value="<?php echo $row->editor_width; ?>">&nbsp;px
+                        </td>
+                </tr>
+                <tr>
+                        <td valign="top">
+                        <?php echo _EDITOR_HEIGHT ?>:
+                        </td>
+                        <td>
+                        <input type="text" class="text_area" size="5" name="editor_height" value="<?php echo $row->editor_height; ?>">&nbsp;px
+                        </td>
+                </tr>
+                <tr>
+                        <td valign="top" colspan="2">
+                        <?php echo _EDITOR_LAYOUT_TIP ?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="100">
+                        <?php echo _EDITOR_LAYOUT_ROW1 ?>:
+                        </td>
+                        <td><textarea class="text_area" cols="70" rows="5" name="editor_layout_row1"><?php echo $row->editor_layout_row1; ?></textarea></td>
+                </tr>
+                <tr>
+                        <td width="100">
+                        <?php echo _EDITOR_LAYOUT_ROW2 ?>:
+                        </td>
+                        <td><textarea class="text_area" cols="70" rows="5" name="editor_layout_row2"><?php echo $row->editor_layout_row2; ?></textarea></td>
+                </tr>
+                <tr>
+                        <td width="100">
+                        <?php echo _EDITOR_LAYOUT_ROW3 ?>:
+                        </td>
+                        <td><textarea class="text_area" cols="70" rows="5" name="editor_layout_row3"><?php echo $row->editor_layout_row3; ?></textarea></td>
+                </tr>
+                <tr>
+                        <td width="100">
+                        <?php echo _EDITOR_LAYOUT_ROW4 ?>:
+                        </td>
+                        <td><textarea class="text_area" cols="70" rows="5" name="editor_layout_row4"><?php echo $row->editor_layout_row4; ?></textarea></td>
+                </tr>
+                </table>
+                <?php
+                $tabs->endTab();
+                $tabs->startTab(_EDITOR_PLUGINS,"editor_plugins");
+                ?>
+                <table class="adminform">
+                <tr>
+                <td width="350"><?php echo "<b>Note:</b>  Disabling these may speed up the editor since there is less to load,
+                            but it will also mean the editor has less functionality.  If you disable plugins you'll probably want to 
+                            rearrange your plugin icon layout as well."; ?>
+                </td>
+                </tr>
+                </table>
+                <table class="adminform">
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_DATETIME ?>:
+                        </td>
+                        <td>
+                        <?php echo $lists['editor_plugin_datetime_acl']; ?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_DATEFORMAT ?>:
+                        </td>
+                        <td>
+                        <input type="text" class="text_area" size="30" name="editor_plugin_dateformat" value="<?php echo $row->editor_plugin_dateformat; ?>">
+                        <?php $tip = _EDITOR_DATEFORMAT_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_TIMEFORMAT ?>:
+                        </td>
+                        <td>
+                        <input type="text" class="text_area" size="30" name="editor_plugin_timeformat" value="<?php echo $row->editor_plugin_timeformat; ?>">
+                        <?php $tip = _EDITOR_TIMEFORMAT_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_EMOTIONS ?>:
+                        </td>
+                        <td>
+                        <?php echo $lists['editor_plugin_emotions_acl']; ?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_FLASH ?>:
+                        </td>
+                        <td>
+                        <?php echo $lists['editor_plugin_flash_acl']; ?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_TABLE ?>:
+                        </td>
+                        <td>
+                        <?php echo $lists['editor_plugin_table_acl']; ?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_FONT ?>:
+                        </td>
+                        <td>
+                        <?php echo $lists['editor_font_tools_acl']; ?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_PRINT ?>:
+                        </td>
+                        <td><?php echo $lists['editor_plugin_print']; ?></td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_SEARCH_REPLACE ?>:
+                        </td>
+                        <td><?php echo $lists['editor_plugin_searchreplace']; ?></td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_SPELLCHECKER ?>:
+                        </td>
+                        <td>
+                        <?php echo $lists['editor_plugin_spellchecker']; ?>
+                        <?php $tip = _EDITOR_SPELLCHECKER_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_LAYER ?>:
+                        </td>
+                        <td><?php echo $lists['editor_plugin_layer']; ?></td>
+                </tr>
+                <tr>
+                        <td width="185">
+                        <?php echo _EDITOR_EXTRA_PLUGINS ?>:
+                        </td>
+                        <td>
+                        <input type="text" class="text_area" size="30" name="editor_extra_plugins" value="<?php echo $row->editor_extra_plugins; ?>">
+                        <?php $tip = _EDITOR_EXTRA_PLUGINS_TIP;
+                              echo mosToolTip( $tip );?>
+                        </td>
+                </tr>
+                </table>
+                <?php
+                $tabs->endTab();
+                $tabs->startTab(_EDITOR_EDITOR_INFO,"editor_info2");
+                ?>
+                <table class="adminform">
+                <tr>
+                    <td>
+                    <?php readfile( "$mosConfig_absolute_path/mambots/editors/mostlyce/jscripts/tiny_mce/info/editor_info_$editor_info_lang.txt" ); ?>
+                    </td>
+                </tr>
+                </table>
+                <?php
+                $tabs->endTab();
+                $tabs->endPane();
+                ?>
+
+                <input type="hidden" name="option" value="<?php echo $option; ?>">
+                <input type="hidden" name="task" value="">
+                </form>
+                <script language="Javascript" src="<?php echo $mosConfig_live_site;?>/includes/js/overlib_mini.js"></script>
+                <?php
+        }
+
+}
+?>
diff -ruN 4.5.4/administrator/components/com_mostlyce/admin.mostlyce.php 4.6rc2/administrator/components/com_mostlyce/admin.mostlyce.php
--- 4.5.4/administrator/components/com_mostlyce/admin.mostlyce.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/admin.mostlyce.php	2006-06-22 22:32:32.000000000 -0500
@@ -0,0 +1,251 @@
+<?php
+/**
+* @package admin.mostlyce.php
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+// ensure user has access to this function
+if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
+                | $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_mostlyce' ))) {
+        mosRedirect( 'index2.php', _NOT_AUTH );
+}
+if (file_exists($mosConfig_absolute_path.'/administrator/components/com_mostlyce/language/'.$mosConfig_lang.'.php')){
+   include ($mosConfig_absolute_path.'/administrator/components/com_mostlyce/language/'.$mosConfig_lang.'.php');
+}else{
+   include ($mosConfig_absolute_path.'/administrator/components/com_mostlyce/language/english.php');
+}
+
+if (!file_exists($mosConfig_absolute_path.'/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php')){
+   mosRedirect( 'index2.php', _EDITOR_NO_CONFIG);
+}
+
+include($mosConfig_absolute_path.'/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php');
+
+class mosCE_Config extends mosDBTable {
+        /** @var int */
+	    var $editor_themes=null;
+        var $editor_compression=null;
+        var $editor_lang=null;
+        var $editor_lang_list=null;
+        var $editor_width=null;
+        var $editor_height=null;
+        var $editor_css_override=null;
+        var $editor_custom_css=null;
+        var $editor_newlines=null;
+        var $editor_convert_urls=null;
+        var $editor_script_acl=null;
+        var $editor_script_elms;
+        var $editor_iframe_acl=null;
+        var $editor_iframe_elms;
+        var $editor_xtd_elms=null;
+        var $editor_direction=null;
+        var $editor_preview_bgcolor=null;
+        var $editor_extra_plugins=null;
+        var $editor_font_tools_acl=null;
+        var $editor_plugin_datetime_acl=null;
+        var $editor_plugin_dateformat=null;
+        var $editor_plugin_timeformat=null;
+        var $editor_plugin_emotions_acl=null;
+        var $editor_plugin_print=null;
+        var $editor_plugin_searchreplace=null;
+        var $editor_plugin_flash_acl=null;
+        var $editor_plugin_table_acl=null;
+        var $editor_plugin_spellchecker=null;
+        var $editor_plugin_layer=null;
+        var $editor_layout_row1=null;
+        var $editor_layout_row2=null;
+        var $editor_layout_row3=null;
+        var $editor_layout_row4=null;
+        var $editor_tmpl_dir=null;
+
+        function mosCE_Config() {
+                $this->_alias = array(
+		        'editor_themes'				                 =>'editor_themes',
+                'editor_compression'                         =>'editor_compression',
+                'editor_lang'                                =>'editor_lang',
+                'editor_lang_list'                           =>'editor_lang_list',
+                'editor_width'                               =>'editor_width',
+                'editor_height'                              =>'editor_height',
+                'editor_css_override'                        =>'editor_css_override',
+                'editor_custom_css'                          =>'editor_custom_css',
+                'editor_newlines'                            =>'editor_newlines',
+                'editor_convert_urls'                        =>'editor_convert_urls',
+                'editor_script_acl'                          =>'editor_script_acl',
+                'editor_script_elms'                         =>'editor_script_elms',
+                'editor_iframe_acl'                          =>'editor_iframe_acl',
+                'editor_iframe_elms'                         =>'editor_iframe_elms',
+                'editor_xtd_elms'                            =>'editor_xtd_elms',
+                'editor_direction'                           =>'editor_direction',
+                'editor_extra_plugins'                       =>'editor_extra_plugins',
+                'editor_font_tools_acl'                      =>'editor_font_tools_acl',
+                'editor_plugin_datetime_acl'                 =>'editor_plugin_datetime_acl',
+                'editor_plugin_dateformat'                   =>'editor_plugin_dateformat',
+                'editor_plugin_timeformat'                   =>'editor_plugin_timeformat',
+                'editor_plugin_emotions_acl'                 =>'editor_plugin_emotions_acl',
+                'editor_plugin_print'                        =>'editor_plugin_print',
+                'editor_plugin_searchreplace'                =>'editor_plugin_searchreplace',
+                'editor_plugin_flash_acl'                    =>'editor_plugin_flash_acl',
+                'editor_plugin_table_acl'                    =>'editor_plugin_table_acl',
+                'editor_plugin_spellchecker'                 =>'editor_plugin_spellchecker',
+                'editor_plugin_layer'                        =>'editor_plugin_layer',
+                'editor_layout_row1'                         =>'editor_layout_row1',
+                'editor_layout_row2'                         =>'editor_layout_row2',
+                'editor_layout_row3'                         =>'editor_layout_row3',
+                'editor_layout_row4'                         =>'editor_layout_row4',
+                'editor_tmpl_dir'                            =>'editor_tmpl_dir'
+                );
+        }
+
+        function getVarText() {
+                $txt = '';
+                foreach ($this->_alias as $k=>$v) {
+                        $txt .= "\$$v = '".addslashes( $this->$k )."';\n";
+                }
+                return $txt;
+        }
+
+        function bindGlobals() {
+                foreach ($this->_alias as $k=>$v) {
+                        if(isset($GLOBALS[$v]))
+                        $this->$k = $GLOBALS[$v];
+                        else
+                        $this->$k = "";
+                }
+        }
+}
+
+require_once( 'components/com_mostlyce/admin.mostlyce.html.php' );
+$confightml = new HTML_expConfig();
+
+switch ($task) {
+        case 'save':
+                saveconfig();
+                break;
+        case 'config':
+                showconfig($confightml, $database, $option);
+                break;
+        default:
+                showconfig($confightml, $database, $option);
+                break;
+}
+
+function showconfig($confightml, &$database, $option) {
+        global $database, $mosConfig_absolute_path;
+        $row = new mosCE_Config();
+        $row->bindGlobals();
+
+        // compile list of the languages
+        $editor_lang = array();
+
+        if ($handle=opendir( "$mosConfig_absolute_path/mambots/editors/mostlyce/jscripts/tiny_mce/langs/" )) {
+                $i=0;
+                while (false !== ($file = readdir($handle))) {
+                        if ($file <> "." && $file <> "..") {
+                                $editor_lang[] = mosHTML::makeOption( substr($file,0,-3) );
+                        }
+                }
+        closedir($handle);
+      }
+
+       // sort list of languages
+        sort($editor_lang);
+        reset($editor_lang);
+
+        $lists = array();
+
+        $editor_newlines = array(
+                mosHTML::makeOption( 'br', _EDITOR_BR_ELEM ),
+                mosHTML::makeOption( 'p', _EDITOR_P_ELEM )
+        );
+
+	    $editor_themes = array(
+                mosHTML::makeOption( 'advanced', _EDITOR_ADVANCED ),
+                mosHTML::makeOption( 'simple', _EDITOR_SIMPLE )
+        );
+
+	    $editor_compression = array(
+                mosHTML::makeOption( 'true', _EDITOR_ON ),
+                mosHTML::makeOption( 'false', _EDITOR_OFF )
+        );
+        
+        $editor_direction = array(
+                mosHTML::makeOption( 'ltr', _EDITOR_LTR ),
+                mosHTML::makeOption( 'rtl', _EDITOR_RTL )
+        );
+        
+        //No specific, used by several plugins
+        $editor_true_false = array(
+                mosHTML::makeOption( 'true', _EDITOR_YES ),
+                mosHTML::makeOption( 'false', _EDITOR_NO )
+        );
+
+        $php_settings = new mosCE_Config();
+
+        // build the html select lists
+        //Standard Editor options
+        $lists['editor_themes']                             = mosHTML::selectList( $editor_themes, 'editor_themes', 'class="inputbox" size="1"', 'value', 'text', $row->editor_themes );
+
+	    $lists['editor_compression']                        = mosHTML::selectList( $editor_compression, 'editor_compression', 'class="inputbox" size="1"', 'value', 'text', $row->editor_compression );
+
+        $lists['editor_lang']                               = mosHTML::selectList( $editor_lang, 'editor_lang', 'class="inputbox" size="1"', 'value', 'text', $row->editor_lang );
+
+        $lists['editor_css_override']                       = mosHTML::yesnoSelectList( 'editor_css_override', 'class="inputbox" size="1"', $row->editor_css_override );
+
+        $lists['editor_newlines']                           = mosHTML::selectList( $editor_newlines, 'editor_newlines', 'class="inputbox" size="1"', 'value', 'text', $row->editor_newlines );
+
+        $lists['editor_convert_urls']                       = mosHTML::selectList( $editor_true_false, 'editor_convert_urls', 'class="inputbox" size="1"', 'value', 'text', $row->editor_convert_urls );
+
+        $lists['editor_script_acl']                         = mosHTML::selectList( $editor_true_false, 'editor_script_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_script_acl );
+
+        $lists['editor_iframe_acl']                         = mosHTML::selectList( $editor_true_false, 'editor_iframe_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_iframe_acl );
+
+        $lists['editor_direction']                          = mosHTML::selectList( $editor_direction, 'editor_direction', 'class="inputbox" size="1"', 'value', 'text', $row->editor_direction );
+
+        //Editor Plugin options
+        $lists['editor_font_tools_acl']                     = mosHTML::selectList( $editor_true_false, 'editor_font_tools_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_font_tools_acl );
+
+        $lists['editor_plugin_emotions_acl']                = mosHTML::selectList( $editor_true_false, 'editor_plugin_emotions_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_plugin_emotions_acl );
+
+        $lists['editor_plugin_print']                       = mosHTML::selectList( $editor_true_false, 'editor_plugin_print', 'class="inputbox" size="1"', 'value', 'text',  $row->editor_plugin_print );
+
+        $lists['editor_plugin_searchreplace']               = mosHTML::selectList( $editor_true_false, 'editor_plugin_searchreplace', 'class="inputbox" size="1"', 'value', 'text',  $row->editor_plugin_searchreplace );
+
+        $lists['editor_plugin_flash_acl']                   = mosHTML::selectList( $editor_true_false, 'editor_plugin_flash_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_plugin_flash_acl );
+        
+        $lists['editor_plugin_datetime_acl']                = mosHTML::selectList( $editor_true_false, 'editor_plugin_datetime_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_plugin_datetime_acl );
+
+        $lists['editor_plugin_table_acl']                   = mosHTML::selectList( $editor_true_false, 'editor_plugin_table_acl', 'class="inputbox" size="1"', 'value', 'text', $row->editor_plugin_table_acl );
+        
+        $lists['editor_plugin_spellchecker']                = mosHTML::selectList( $editor_true_false, 'editor_plugin_spellchecker', 'class="inputbox" size="1"', 'value', 'text', $row->editor_plugin_spellchecker );
+        
+        $lists['editor_plugin_layer']                       = mosHTML::selectList( $editor_true_false, 'editor_plugin_layer', 'class="inputbox" size="1"', 'value', 'text', $row->editor_plugin_layer );
+
+        $confightml->showconfig( $row, $lists, $option );
+}
+
+function saveconfig() {
+        global $database;
+
+        $row = new mosCE_Config();
+
+        if (!$row->bind( $_POST )) {
+                mosRedirect( "index2.php?option=com_mostlyce", $row->getError() );
+        }
+
+        $config = "<?php \n";
+        $config .= $row->getVarText();
+        $config .= '?>';
+
+        if ($fp = fopen('../mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php', 'w')) {
+                fputs($fp, $config, strlen($config));
+                fclose ($fp);
+
+                mosRedirect( 'index2.php?option=com_mostlyce&task=config', 'The configuration details have been updated!' );
+        } else {
+                mosRedirect( 'index2.php?option=com_mostlyce&task=config', 'An Error Has Occurred! Unable to open config file to write!' );
+        }
+}
+?>
Binary files 4.5.4/administrator/components/com_mostlyce/images/absolute.gif and 4.6rc2/administrator/components/com_mostlyce/images/absolute.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/anchor.gif and 4.6rc2/administrator/components/com_mostlyce/images/anchor.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/backcolor.gif and 4.6rc2/administrator/components/com_mostlyce/images/backcolor.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/bold.gif and 4.6rc2/administrator/components/com_mostlyce/images/bold.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/bullist.gif and 4.6rc2/administrator/components/com_mostlyce/images/bullist.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/caption.gif and 4.6rc2/administrator/components/com_mostlyce/images/caption.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/charmap.gif and 4.6rc2/administrator/components/com_mostlyce/images/charmap.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/cleanup.gif and 4.6rc2/administrator/components/com_mostlyce/images/cleanup.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/code.gif and 4.6rc2/administrator/components/com_mostlyce/images/code.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/copy.gif and 4.6rc2/administrator/components/com_mostlyce/images/copy.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/cut.gif and 4.6rc2/administrator/components/com_mostlyce/images/cut.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/emotions.gif and 4.6rc2/administrator/components/com_mostlyce/images/emotions.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/filemanager.gif and 4.6rc2/administrator/components/com_mostlyce/images/filemanager.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/flash.gif and 4.6rc2/administrator/components/com_mostlyce/images/flash.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/fontselect.gif and 4.6rc2/administrator/components/com_mostlyce/images/fontselect.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/fontsizeselect.gif and 4.6rc2/administrator/components/com_mostlyce/images/fontsizeselect.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/forecolor.gif and 4.6rc2/administrator/components/com_mostlyce/images/forecolor.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/formatselect.gif and 4.6rc2/administrator/components/com_mostlyce/images/formatselect.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/fullscreen.gif and 4.6rc2/administrator/components/com_mostlyce/images/fullscreen.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/help.gif and 4.6rc2/administrator/components/com_mostlyce/images/help.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/hr.gif and 4.6rc2/administrator/components/com_mostlyce/images/hr.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/htmltemplate.gif and 4.6rc2/administrator/components/com_mostlyce/images/htmltemplate.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/image.gif and 4.6rc2/administrator/components/com_mostlyce/images/image.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/imgmanager.gif and 4.6rc2/administrator/components/com_mostlyce/images/imgmanager.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/indent.gif and 4.6rc2/administrator/components/com_mostlyce/images/indent.gif differ
diff -ruN 4.5.4/administrator/components/com_mostlyce/images/index.html 4.6rc2/administrator/components/com_mostlyce/images/index.html
--- 4.5.4/administrator/components/com_mostlyce/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/images/index.html	2006-01-28 11:03:42.000000000 -0600
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/administrator/components/com_mostlyce/images/insertdate.gif and 4.6rc2/administrator/components/com_mostlyce/images/insertdate.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/insertlayer.gif and 4.6rc2/administrator/components/com_mostlyce/images/insertlayer.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/inserttime.gif and 4.6rc2/administrator/components/com_mostlyce/images/inserttime.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/italic.gif and 4.6rc2/administrator/components/com_mostlyce/images/italic.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/justifycenter.gif and 4.6rc2/administrator/components/com_mostlyce/images/justifycenter.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/justifyfull.gif and 4.6rc2/administrator/components/com_mostlyce/images/justifyfull.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/justifyleft.gif and 4.6rc2/administrator/components/com_mostlyce/images/justifyleft.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/justifyright.gif and 4.6rc2/administrator/components/com_mostlyce/images/justifyright.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/link.gif and 4.6rc2/administrator/components/com_mostlyce/images/link.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/ltr.gif and 4.6rc2/administrator/components/com_mostlyce/images/ltr.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/mosimage.gif and 4.6rc2/administrator/components/com_mostlyce/images/mosimage.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/mospagebreak.gif and 4.6rc2/administrator/components/com_mostlyce/images/mospagebreak.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/movebackward.gif and 4.6rc2/administrator/components/com_mostlyce/images/movebackward.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/moveforward.gif and 4.6rc2/administrator/components/com_mostlyce/images/moveforward.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/newdocument.gif and 4.6rc2/administrator/components/com_mostlyce/images/newdocument.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/numlist.gif and 4.6rc2/administrator/components/com_mostlyce/images/numlist.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/outdent.gif and 4.6rc2/administrator/components/com_mostlyce/images/outdent.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/paste.gif and 4.6rc2/administrator/components/com_mostlyce/images/paste.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/pastetext.gif and 4.6rc2/administrator/components/com_mostlyce/images/pastetext.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/pasteword.gif and 4.6rc2/administrator/components/com_mostlyce/images/pasteword.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/preview.gif and 4.6rc2/administrator/components/com_mostlyce/images/preview.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/print.gif and 4.6rc2/administrator/components/com_mostlyce/images/print.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/redo.gif and 4.6rc2/administrator/components/com_mostlyce/images/redo.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/removeformat.gif and 4.6rc2/administrator/components/com_mostlyce/images/removeformat.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/replace.gif and 4.6rc2/administrator/components/com_mostlyce/images/replace.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/rtl.gif and 4.6rc2/administrator/components/com_mostlyce/images/rtl.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/search.gif and 4.6rc2/administrator/components/com_mostlyce/images/search.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/selectall.gif and 4.6rc2/administrator/components/com_mostlyce/images/selectall.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/separator.gif and 4.6rc2/administrator/components/com_mostlyce/images/separator.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/spellchecker.gif and 4.6rc2/administrator/components/com_mostlyce/images/spellchecker.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/strikethrough.gif and 4.6rc2/administrator/components/com_mostlyce/images/strikethrough.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/styleselect.gif and 4.6rc2/administrator/components/com_mostlyce/images/styleselect.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/sub.gif and 4.6rc2/administrator/components/com_mostlyce/images/sub.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/sup.gif and 4.6rc2/administrator/components/com_mostlyce/images/sup.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/tablecontrols.gif and 4.6rc2/administrator/components/com_mostlyce/images/tablecontrols.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/underline.gif and 4.6rc2/administrator/components/com_mostlyce/images/underline.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/undo.gif and 4.6rc2/administrator/components/com_mostlyce/images/undo.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/unlink.gif and 4.6rc2/administrator/components/com_mostlyce/images/unlink.gif differ
Binary files 4.5.4/administrator/components/com_mostlyce/images/visualaid.gif and 4.6rc2/administrator/components/com_mostlyce/images/visualaid.gif differ
diff -ruN 4.5.4/administrator/components/com_mostlyce/index.html 4.6rc2/administrator/components/com_mostlyce/index.html
--- 4.5.4/administrator/components/com_mostlyce/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_mostlyce/info/admin_info_english.txt 4.6rc2/administrator/components/com_mostlyce/info/admin_info_english.txt
--- 4.5.4/administrator/components/com_mostlyce/info/admin_info_english.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/info/admin_info_english.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,10 @@
+<big><span style="font-weight: bold;">MOStlyCE Admin 1.6</span></big><br>
+    Admin Component for MOStlyCE<br>
+    <br>
+        <span style="font-weight: bold;">Changelog from MOStlyCE Admin:<br></span><ul>
+        <li>Originally based on mosCE & mosCE Admin</li>
+	<li>Added the ability to toggle the editor theme (i.e.) simple or advanced</li>
+	<li>Added editor compression & option to enable or disable</li>
+	<li>Ability to enable / disable certain plugins as needed</li>
+	<li>Added date/time formatting option</li>
+        <li>Added experimental spellchecker & layer options</li>
diff -ruN 4.5.4/administrator/components/com_mostlyce/info/index.html 4.6rc2/administrator/components/com_mostlyce/info/index.html
--- 4.5.4/administrator/components/com_mostlyce/info/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/info/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_mostlyce/language/english.php 4.6rc2/administrator/components/com_mostlyce/language/english.php
--- 4.5.4/administrator/components/com_mostlyce/language/english.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/language/english.php	2006-06-22 22:32:32.000000000 -0500
@@ -0,0 +1,120 @@
+<?php
+DEFINE('_EDITOR_NO_CONFIG','Cannot find mostlyce_config.php! Please install the MOStlyCE mambot.');
+
+DEFINE('_EDITOR_OPTIONS','General');
+DEFINE('_EDITOR_LOCATION','Editor Location');
+DEFINE('_EDITOR_LOCATION_TIP','Position of the editor');
+DEFINE('_EDITOR_SAFE_MODE_ON','Safe Mode is ON');
+DEFINE('_EDITOR_SAFE_MODE_OFF','Safe Mode is OFF');
+
+DEFINE('_EDITOR_TOP','Top');
+DEFINE('_EDITOR_BOTTOM','Bottom');
+
+DEFINE('_EDITOR_PATH','Base Path');
+DEFINE('_EDITOR_PATH_TIP','The URL of your Site. This is typically the same as the $mosConfig_live_site setting. No trailing slash!');
+DEFINE('_EDITOR_LANG','Editor Language');
+DEFINE('_EDITOR_ADD_LANG','Additional languages can be added by downloading and install TinyMCE language packs found here - http://tinymce.moxiecode.com/language.php');
+DEFINE('_EDITOR_LANG_LIST','List of supported Languages.');
+DEFINE('_EDITOR_THEMES','Editor Themes');
+DEFINE('_EDITOR_COMPRESSION','Editor Compression');
+DEFINE('_EDITOR_COMPRESSION_TIP', 'Turning compression on enables the TinyMCE compressor. This reduces traffic and speeds up the editor by up to 75%. NOTE: Not recommended for IE users at this time.  Causes editor in IE not to appear.');
+DEFINE('_EDITOR_WIDTH','Editor Width');
+DEFINE('_EDITOR_HEIGHT','Editor Height');
+DEFINE('_EDITOR_LAYOUT', 'Layout');
+DEFINE('_EDITOR_LAYOUT_TIP', 'You can remove buttons from the layout by placing a minus sign (-) in front of the button name, eg: -cut');
+DEFINE('_EDITOR_LAYOUT_ROW1', 'Row 1 buttons');
+DEFINE('_EDITOR_LAYOUT_ROW2', 'Row 2 buttons');
+DEFINE('_EDITOR_LAYOUT_ROW3', 'Row 3 buttons');
+DEFINE('_EDITOR_LAYOUT_ROW4', 'Row 4 buttons');
+DEFINE('_EDITOR_GZIP', 'GZip Compression');
+DEFINE('_EDITOR_GZIP_TIP', 'If GZip is supported, this option bundles all .js files together into two HTTP requests instead of one for each plugin, language file and theme and it also GZip compresses these files. Improves loading speed.');
+
+DEFINE('_EDITOR_EXTRA_PLUGINS','3rd Party Plugins');
+DEFINE('_EDITOR_EXTRA_PLUGINS_TIP','Comma seperated list of extra plugins. The plugins indicated should be placed in the MOStlyCE plugins directory and should be named exactly as specified.');
+DEFINE('_EDITOR_EXTRA_PLUGINS_IMG','3rd Party Plugin Image');
+DEFINE('_EDITOR_EXTRA_PLUGINS_IMG_TIP','Comma seperated list of extra plugins button images.');
+DEFINE('_EDITOR_ONCLICK_ELMS_TIP','Comma seperated list elements to support onclick action.');
+DEFINE('_EDITOR_TMPL_DIR','Path to HTML Template Directory');
+DEFINE('_EDITOR_TMPL_DIR_TIP','Absolute path to the directory where HTML templates are stored (HTML Template plugin).');
+
+DEFINE('_EDITOR_CSS_OVERRIDE', 'Override Template CSS');
+DEFINE('_EDITOR_CSS_OVERRIDE_TIP', 'Override your Template CSS file');
+DEFINE('_EDITOR_CUSTOM_CSS', 'Custom CSS File');
+DEFINE('_EDITOR_CUSTOM_CSS_TIP', 'Name of custom css file. This file should be placed in your Template CSS directory.');
+
+DEFINE('_EDITOR_NEWLINES', 'Newlines');
+DEFINE('_EDITOR_NEWLINES_TIP', 'Result of a carriage return in the editor content area, BR or P.');
+
+DEFINE('_EDITOR_CONVERT_URLS', 'Convert Absolute URLS.');
+DEFINE('_EDITOR_CONVERT_URLS_TIP', 'If Yes, Absolute URLS from the Editor are converted to Relative URLS for page display. Necessary for SEF support.');
+
+DEFINE('_EDITOR_BR_ELEM', 'BR Elements');
+DEFINE('_EDITOR_P_ELEM', 'P Elements');
+DEFINE('_EDITOR_SIMPLE', 'Simple');
+DEFINE('_EDITOR_ADVANCED', 'Advanced');
+DEFINE('_EDITOR_ON', 'On');
+DEFINE('_EDITOR_OFF', 'Off');
+DEFINE('_EDITOR_YES', 'Yes');
+DEFINE('_EDITOR_NO', 'No');
+
+
+DEFINE('_EDITOR_SCRIPT', 'Allow script elements');
+DEFINE('_EDITOR_SCRIPT_ELMS', 'SCRIPT Elements');
+DEFINE('_EDITOR_SCRIPT_ELMS_TIP', 'List of SCRIPT Elements. Must be seperated by | ');
+
+DEFINE('_EDITOR_IFRAME', 'Allow IFRAME elements');
+DEFINE('_EDITOR_IFRAME_ELEMENTS', 'IFRAME Elements');
+DEFINE('_EDITOR_IFRAME_ELEMENTS_TIP', 'List of IFRAME Elements. Must be seperated by | ');
+
+DEFINE('_EDITOR_XTD_ELMS', 'Extended Elements List');
+DEFINE('_EDITOR_XTD_ELMS_TIP', 'List of Extended Elements. Format is tag1[element1|element2],tag2[element1|element2]');
+
+DEFINE('_EDITOR_DIRECTION', 'Directionality');
+DEFINE('_EDITOR_LTR', 'Left to Right');
+DEFINE('_EDITOR_RTL', 'Right to Left');
+
+DEFINE('_EDITOR_PLUGINS','Plugins');
+DEFINE('_EDITOR_EMOTIONS', 'Load Emotions');
+DEFINE('_EDITOR_SPELLCHECKER', 'Load Spellchecker');
+DEFINE('_EDITOR_SPELLCHECKER_TIP', 'The Spellchecker plugin is still experimental, but seems to work well in IE' .
+' and FireFox 1.5+ (on non-Windows machines)');
+DEFINE('_EDITOR_LAYER', 'Load Layers');
+DEFINE('_EDITOR_PRINT', 'Load Print');
+DEFINE('_EDITOR_SEARCH_REPLACE', 'Load Search & Replace');
+DEFINE('_EDITOR_FLASH', 'Load Flash');
+DEFINE('_EDITOR_TABLE', 'Load Tables');
+DEFINE('_EDITOR_FONT', 'Load Font Options');
+DEFINE('_EDITOR_DATETIME', 'Load Date/Time');
+DEFINE('_EDITOR_DATEFORMAT', 'Date Format');
+DEFINE('_EDITOR_TIMEFORMAT', 'Time Format');
+DEFINE('_EDITOR_DATEFORMAT_TIP', '%y  year as number without century (00 to 99), ' .
+'%Y year as number including the century, %d day of month as number (01 to 31), ' .
+'%m month as number (01 to 12), %D same as %m/%d/%y');
+DEFINE('_EDITOR_TIMEFORMAT_TIP', '%r time with a.m./p.m. , ' .
+'%H hour as number 24-hour clock (00 to 23), ' .
+'%I hour as number 12-hour clock (01 to 12), ' .
+'%M min as number (00-59), %S sec as number (00-59), ' .
+'%p either a.m. or p.m. based on given time');
+
+DEFINE('_EDITOR_FORM_ELMS_TIP', 'List of FORM Elements. Must be seperated by |');
+DEFINE('_EDITOR_SELECT_ELMS_TIP', 'List of SELECT Elements. Must be seperated by |');
+DEFINE('_EDITOR_OPTION_ELMS_TIP', 'List of OPTION Elements. Must be seperated by |');
+DEFINE('_EDITOR_INPUT_ELMS_TIP', 'List of INPUT Elements. Must be seperated by |');
+
+DEFINE('_EDITOR_ADMIN_INFO','Admin Info');
+DEFINE('_EDITOR_EDITOR_INFO', 'Editor Info');
+
+DEFINE('_editor_align_default','Default');
+DEFINE('_editor_align_baseline','Baseline');
+DEFINE('_editor_align_top','Top');
+DEFINE('_editor_align_middle','Middle');
+DEFINE('_editor_align_bottom','Bottom');
+DEFINE('_editor_align_texttop','TextTop');
+DEFINE('_editor_align_absmiddle','Absolute Middle');
+DEFINE('_editor_align_absbottom','Absolute Bottom');
+DEFINE('_editor_align_left','Left');
+DEFINE('_editor_align_right','Right');
+
+DEFINE('_EDITOR_TABLE_OPTIONS', 'Tables');
+DEFINE('_EDITOR_TABLE_COLOUR', 'Use Table Background & Border Colours');
+?>
diff -ruN 4.5.4/administrator/components/com_mostlyce/language/index.html 4.6rc2/administrator/components/com_mostlyce/language/index.html
--- 4.5.4/administrator/components/com_mostlyce/language/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/language/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_mostlyce/mostlyce.xml 4.6rc2/administrator/components/com_mostlyce/mostlyce.xml
--- 4.5.4/administrator/components/com_mostlyce/mostlyce.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/mostlyce.xml	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,96 @@
+<?xml version="1.0" ?>
+<mosinstall type="component" version="4.6">
+<name>mostlyce</name>
+<version>1.6</version>
+<creationDate>May 2006</creationDate>
+<author>Chad Auld</author>
+<authorEmail>cauld@mambo-foundation.org</authorEmail>
+<authorUrl>http://opensourcepenguin.net</authorUrl>
+<copyright>This component is released under the LGPL License</copyright>
+<description>
+<![CDATA[
+<p>Admin component for the MOStlyCE editor mambot.  Helps customize your MOStlyCE editor installation.</p>
+]]>
+</description>
+<administration>
+   <menu link="option=com_mostlyce&task=config">MOStlyCE Admin</menu>
+     <files>
+      <filename>admin.mostlyce.html.php</filename>
+      <filename>admin.mostlyce.php</filename>
+      <filename>index.html</filename>
+      <filename>mostlyce.xml</filename>
+      <filename>mostlyce_install.php</filename>
+      <filename>toolbar.mostlyce.html.php</filename>
+      <filename>toolbar.mostlyce.php</filename>
+      <filename>images/absolute.gif</filename>
+      <filename>images/anchor.gif</filename>
+      <filename>images/backcolor.gif</filename>
+      <filename>images/bold.gif</filename>
+      <filename>images/bullist.gif</filename>
+      <filename>images/caption.gif</filename>
+      <filename>images/charmap.gif</filename>
+      <filename>images/cleanup.gif</filename>
+      <filename>images/code.gif</filename>
+      <filename>images/copy.gif</filename>
+      <filename>images/cut.gif</filename>
+      <filename>images/emotions.gif</filename>
+      <filename>images/filemanager.gif</filename>
+      <filename>images/flash.gif</filename>
+      <filename>images/fontselect.gif</filename>
+      <filename>images/fontsizeselect.gif</filename>
+      <filename>images/forecolor.gif</filename>
+      <filename>images/formatselect.gif</filename>
+      <filename>images/fullscreen.gif</filename>
+      <filename>images/help.gif</filename>
+      <filename>images/hr.gif</filename>
+      <filename>images/htmltemplate.gif</filename>
+      <filename>images/image.gif</filename>
+      <filename>images/imgmanager.gif</filename>
+      <filename>images/indent.gif</filename>
+      <filename>images/index.html</filename>
+      <filename>images/insertdate.gif</filename>
+      <filename>images/insertlayer.gif</filename>
+      <filename>images/inserttime.gif</filename>
+      <filename>images/italic.gif</filename>
+      <filename>images/justifycenter.gif</filename>
+      <filename>images/justifyfull.gif</filename>
+      <filename>images/justifyleft.gif</filename>
+      <filename>images/justifyright.gif</filename>
+      <filename>images/link.gif</filename>
+      <filename>images/ltr.gif</filename>
+      <filename>images/mosimage.gif</filename>
+      <filename>images/mospagebreak.gif</filename>
+      <filename>images/movebackward.gif</filename>
+      <filename>images/moveforward.gif</filename>
+      <filename>images/newdocument.gif</filename>
+      <filename>images/numlist.gif</filename>
+      <filename>images/outdent.gif</filename>
+      <filename>images/paste.gif</filename>
+      <filename>images/pastetext.gif</filename>
+      <filename>images/pasteword.gif</filename>
+      <filename>images/preview.gif</filename>
+      <filename>images/print.gif</filename>
+      <filename>images/redo.gif</filename>
+      <filename>images/removeformat.gif</filename>
+      <filename>images/replace.gif</filename>
+      <filename>images/rtl.gif</filename>
+      <filename>images/search.gif</filename>
+      <filename>images/selectall.gif</filename>
+      <filename>images/separator.gif</filename>
+      <filename>images/spellchecker.gif</filename>
+      <filename>images/strikethrough.gif</filename>
+      <filename>images/styleselect.gif</filename>
+      <filename>images/sub.gif</filename>
+      <filename>images/sup.gif</filename>
+      <filename>images/tablecontrols.gif</filename>
+      <filename>images/underline.gif</filename>
+      <filename>images/undo.gif</filename>
+      <filename>images/unlink.gif</filename>
+      <filename>images/visualaid.gif</filename>
+      <filename>info/admin_info_english.txt</filename>
+      <filename>info/index.html</filename>
+      <filename>language/english.php</filename>
+      <filename>language/index.html</filename>
+    </files>
+</administration>
+</mosinstall>
diff -ruN 4.5.4/administrator/components/com_mostlyce/mostlyce_install.php 4.6rc2/administrator/components/com_mostlyce/mostlyce_install.php
--- 4.5.4/administrator/components/com_mostlyce/mostlyce_install.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/mostlyce_install.php	2006-01-28 11:03:42.000000000 -0600
@@ -0,0 +1,5 @@
+<?php
+// Don't allow direct linking
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+?>
diff -ruN 4.5.4/administrator/components/com_mostlyce/toolbar.mostlyce.html.php 4.6rc2/administrator/components/com_mostlyce/toolbar.mostlyce.html.php
--- 4.5.4/administrator/components/com_mostlyce/toolbar.mostlyce.html.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/toolbar.mostlyce.html.php	2006-04-02 14:37:55.000000000 -0500
@@ -0,0 +1,22 @@
+<?php
+/**
+* @package MOStlyCE Admin
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+/**
+* @package Mambo_4.6
+*/
+class TOOLBAR_mosceConfig {
+        function _CONFIG() {
+                mosMenuBar::startTable();
+                mosMenuBar::save();
+                mosMenuBar::cancel();
+                mosMenuBar::spacer();
+                mosMenuBar::endTable();
+        }
+}
+?>
diff -ruN 4.5.4/administrator/components/com_mostlyce/toolbar.mostlyce.php 4.6rc2/administrator/components/com_mostlyce/toolbar.mostlyce.php
--- 4.5.4/administrator/components/com_mostlyce/toolbar.mostlyce.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlyce/toolbar.mostlyce.php	2006-02-16 15:43:38.000000000 -0600
@@ -0,0 +1,17 @@
+<?php
+/**
+* @package TinyMCE-EXP Admin
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+require_once( $mainframe->getPath( 'toolbar_html' ) );
+
+//switch ( $task ) {
+        //case 'default':
+                TOOLBAR_mosceConfig::_CONFIG();
+       // break;
+//}
+?>
diff -ruN 4.5.4/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.html.php 4.6rc2/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.html.php
--- 4.5.4/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.html.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.html.php	2006-04-02 18:33:27.000000000 -0500
@@ -0,0 +1,229 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+/**
+* @package Mambo_4.6
+*/
+class HTML_dbadmin
+{
+	function backupIntro( $tablelist, $p_option )
+	{
+	?>
+		<table cellpadding="4" cellspacing="0" border="0" width="100%">
+		<tr>
+			<td width="100%" class="sectionname"><img src="images/backup.png" align="middle">Database Backup</td>
+		</tr>
+		</table>
+		<form action="index2.php?option=com_mostlydbadmin&task=doBackup" method="post">
+		<table border="0" align="center" cellspacing="0" cellpadding="2" width="100%" class="adminform">
+		</tr>
+		<tr>
+			<td>Where would you like to back up your Database Tables to?<br /> <br />
+				<input type="radio" name="OutDest" value="screen" />
+					Display Results on the Screen<br /> 
+				<input type="radio" name="OutDest" value="remote"/>
+					Download to a file on my local computer<br /> 
+				<input type="radio" name="OutDest" value="local" / checked="checked" >
+					Store the file in the backup directory on the server
+			</td>
+			<td>&nbsp;</td>
+			<td>What format would you like to save them as?<br /> <br />
+			<?php if (function_exists('gzcompress'))
+			{
+			?>
+			<input type="radio" name="OutType" value="zip" />As a Zip file<br />
+			<?php
+			}
+			if (function_exists('bzcompress'))
+			{
+			?>
+			<input type="radio" name="OutType" value="bzip" />As a BZip file<br />
+			<?php
+			}
+			if (function_exists('gzencode'))
+			{
+			?>
+			<input type="radio" name="OutType" value="gzip" />As a GZip file<br />
+			<?php
+			}
+			?>
+			<input type="radio" name="OutType" value="sql" checked="checked" /> As a SQL (plain text) file
+			<br />
+			<input type="radio" name="OutType" value="html" /> As formatted HTML </td>
+		</tr>
+		<tr>
+		<td> <p>What do you want to back up?<br /><br />
+			<input type="radio" name="toBackUp" value="data" />Data Only<br />
+			<input type="radio" name="toBackUp" value="structure" />Structure Only<br />
+			<input type="radio" name="toBackUp" value="both" checked="checked" />Data and Structure </p>
+		</td>
+		<td>&nbsp;</td>
+		<td> <p align="left">Which Database Tables would you like to back up?<br />
+          Please note, it is highly recommended you select ALL your tables.</p>
+		  <?php echo $tablelist; ?>
+		</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td align="center">&nbsp;<br /> <input type="submit" value="Backup the Selected Tables" class="button" /></td>
+		</tr>
+	</table>
+	</form>
+	<?php
+	}
+	
+	function restoreIntro($enctype,$uploads_okay,$local_backup_path)
+	{
+	?>
+		<table cellpadding="4" cellspacing="0" border="0" width="100%">
+		<tr>
+			<td width="100%" class="sectionname"><img src="images/dbrestore.png" align="middle">Database Restore</td>
+		</tr>
+		</table>
+		<table border="0" align="center" cellspacing="0" cellpadding="2" width="100%" class="adminform">
+		<form action="index2.php?option=com_mostlydbadmin&task=doRestore" method="post" <?php echo $enctype;?>>
+		<tr>
+			<th class="title" colspan="3">Existing Backups</th>
+		</tr>
+		<?php
+	if (isset($local_backup_path))
+	{
+		if ($handle = @opendir($local_backup_path))
+		{
+		?>
+		<tr><td>&nbsp;</td><td><b>Backup File Name</b></td><td><b>Created Date/Time</b></td></tr>
+		<?php
+		while ($file = @readdir($handle))
+		{
+			if (is_file($local_backup_path . "/" . $file))
+			{
+				if (eregi(".\.sql$",$file) || eregi(".\.bz2$",$file) || eregi(".\.gz$",$file) || eregi(".\.zip$",$file))
+				{
+					echo "\t\t<tr><td align=\"center\"><input type=\"radio\" name=\"file\" value=\"$file\"></td><td>$file</td><td>" . date("m/d/y H:i:sa", filemtime($local_backup_path . "/" . $file)) . "</td></tr>\n";
+				}
+			}
+		}
+		}
+		else
+		{
+			echo "\t\t<tr><td colspan=\"3\" class=\"error\">Error!<br />Invalid or non-existant backup path in your configuration file : <br />" . $local_backup_path . "/" . $file . "</td></tr>\n";
+		}
+		@closedir($handle);
+	}
+	else
+	{
+		echo "\t\t<tr><td colspan=\"3\" class=\"error\">Error!<br />Backup path in your configuration file has not been configured.</td></tr>\n";
+	}
+	if ($uploads_okay)
+	{
+		?>
+		<tr>
+			<td colspan="3"><br />Or alternatively, if you've downloaded a backup to your computer, you can restore from a local file :</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td><br /><input type="file" name="upfile" class="button"></td>
+			<td>&nbsp;</td>
+		</tr>
+		<?php
+	}
+		?>
+		<tr>
+			<td>&nbsp;</td>
+			<td>&nbsp;<br />
+			<input type="submit" class="button" value="Perform the Restore" />&nbsp;&nbsp; <input type="reset" class="button" value="Reset" /></td>
+			<td>&nbsp;</td>
+		</tr>
+		</form>
+	</table>
+	<?php
+	}
+	function showDbAdminMessage($message,$title,$option,$task)
+	{
+		global $PHP_SELF;
+		?>
+			<table border="0" cellpadding="4" cellspacing="0" width="100%" class="adminlist">
+		<tr>
+			<th width="55%" class="title"><?php echo $title; ?></th>
+		</tr>
+		<tr>
+			<td align="left"><b><?php echo $message; ?></td>
+		</tr>
+		</table>
+		<?php
+	}
+
+	function xquery( $sql='', $msg='', $rows=null, $option ) {
+?>
+<form action="index2.php" method="post" name="adminForm">
+  <table cellpadding="4" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td width="100%" class="sectionname"><img src="images/query.png" align="middle">Execute Query</td> 
+      <td nowrap="nowrap">&nbsp;</td>
+    </tr>
+  </table>
+ <table cellpadding="4" cellspacing="1" border="0" width="100%" class="adminform">
+	<tr>
+		<td>SQL:</td>
+	</tr>
+	<tr>
+		<td><textarea name="sql" rows="10" cols="80" class="inputbox"><?php echo $sql;?></textarea></td>
+	</tr>
+	<tr>
+		<td>
+			<input type="submit" value="Execute Query" class="button" />
+			<input type="button" value="Clear Query" class="button" onclick="document.adminForm.sql.value=''" />
+			<input type="checkbox" name="batch" value="1" /> Batch Mode
+		</td>
+	</tr>
+<?php	if ($msg) { ?>
+	<tr>
+		<td><?php echo $msg;?></td>
+	</tr>
+<?php	} ?>
+<?php	
+		if (is_array( $rows ) && count( $rows ) > 0) {
+			$n = count( $rows );
+?>
+	<tr>
+		<td>
+			<table cellspacing="0" cellpadding="2" border="1">
+				<tr>
+					<th>#</th>
+<?php		foreach($rows[0] as $key => $value) { ?>
+					<th><?php echo $key;?></th>
+<?php 		} ?>
+				<tr>
+<?php		for ($i=0; $i < $n; $i++) {
+				echo "\n	<tr>";
+				echo "\n		<td>$i</td>";
+				foreach($rows[$i] as $key => $value) {
+					echo "\n		<td>$value</td>";
+				}
+				echo "\n	</tr>";
+			}
+?>
+			</table>
+		</td>
+	</tr>
+<?php	} ?>
+ </table>
+<input type="hidden" name="option" value="<?php echo $option; ?>" />
+<input type="hidden" name="task" value="xquery" />
+</form>
+<?php
+	}
+}
+?>
diff -ruN 4.5.4/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.php 4.6rc2/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.php
--- 4.5.4/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.php	2006-04-02 18:33:27.000000000 -0500
@@ -0,0 +1,647 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+// ensure user is coming from the admin side and has access to this function
+if (($adminside>0) && (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )))) {
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
+}
+
+require_once( $mainframe->getPath( 'admin_html' ) );
+require_once( "$mosConfig_absolute_path/administrator/includes/pcl/pclzip.lib.php" );
+
+$task	= mosGetParam( $_REQUEST, "task", "" );
+$file	= mosGetParam( $_POST, "file", null );
+$upfile	= mosGetParam($_FILES,"upfile",null);
+$tables = mosGetParam( $_POST, "tables", null );
+$OutType = mosGetParam( $_POST, "OutType", null );
+$OutDest = mosGetParam( $_POST, "OutDest", null );
+$toBackUp = mosGetParam( $_POST, "toBackUp", null );
+
+switch ($task) {
+	case "dbBackup":
+		dbBackup( $option);
+		break;
+
+	case "doBackup":
+		doBackup( $tables,$OutType,$OutDest,$toBackUp,$_SERVER['HTTP_USER_AGENT'], $local_backup_path);
+		break;
+
+	case "dbRestore":
+		dbRestore( $local_backup_path);
+		break;
+
+	case "doRestore":
+		doRestore( $file,$upfile,$local_backup_path);
+		break;
+
+	case "xquery":
+		xquery( $option );
+		break;
+}
+
+
+function dbBackup( $p_option ) {
+	global $database;
+
+	$database->setQuery( "SHOW tables" );
+	$tables = $database->loadResultArray();
+	$tables2 = array( mosHTML::makeOption( 'all', 'All Mambo Tables' ) );
+	foreach ($tables as $table) {
+		$tables2[] = mosHTML::makeOption( $table );
+	}
+
+	$tablelist = mosHTML::selectList( $tables2, 'tables[]', 'class="inputbox" size="5" multiple="multiple"',
+	'value', 'text', 'all' );
+
+	HTML_dbadmin::backupIntro( $tablelist, $p_option );
+}
+
+function doBackup( $tables, $OutType, $OutDest, $toBackUp, $UserAgent, $local_backup_path) {
+	global $database;
+	global $mosConfig_db, $mosConfig_sitename, $version,$option,$task;
+
+	if (!$tables[0])
+	{
+		HTML_dbadmin::showDbAdminMessage("Error! No database table(s) specified. Please select at least one table and re-try.</p>", "DB Admin",$option,$task);
+		return;
+	}
+
+	/* Need to know what browser the user has to accomodate nonstandard headers */
+
+	if (ereg('Opera(/| )([0-9].[0-9]{1,2})', $UserAgent)) {
+		$UserBrowser = "Opera";
+	}
+	elseif (ereg('MSIE ([0-9].[0-9]{1,2})', $UserAgent)) {
+		$UserBrowser = "IE";
+	} else {
+		$UserBrowser = '';
+	}
+
+	/* Determine the mime type and file extension for the output file */
+
+	if ($OutType == "bzip") {
+		$filename = $mosConfig_db . "_" . date("jmYHis") . ".bz2";
+		$mime_type = 'application/x-bzip';
+	} elseif ($OutType == "gzip") {
+		$filename = $mosConfig_db . "_" . date("jmYHis") . ".sql.gz";
+		$mime_type = 'application/x-gzip';
+	} elseif ($OutType == "zip") {
+		$filename = $mosConfig_db . "_" . date("jmYHis") . ".zip";
+		$mime_type = 'application/x-zip';
+	} elseif ($OutType == "html") {
+		$filename = $mosConfig_db . "_" . date("jmYHis") . ".html";
+		$mime_type = ($UserBrowser == 'IE' || $UserBrowser == 'Opera') ? 'application/octetstream' : 'application/octet-stream';
+	} else {
+		$filename = $mosConfig_db . "_" . date("jmYHis") . ".sql";
+		$mime_type = ($UserBrowser == 'IE' || $UserBrowser == 'Opera') ? 'application/octetstream' : 'application/octet-stream';
+	};
+
+	/* Store all the tables we want to back-up in variable $tables[] */
+
+	if ($tables[0] == "all") {
+		array_pop($tables);
+		$database->setQuery("SHOW tables");
+		$database->query();
+		$tables = array_merge($tables, $database->loadResultArray());
+	}
+
+	/* Store the "Create Tables" SQL in variable $CreateTable[$tblval] */
+	if ($toBackUp!="data")
+	{
+		foreach ($tables as $tblval)
+		{
+			$database->setQuery("SHOW CREATE table $tblval");
+			$database->query();
+			$CreateTable[$tblval] = $database->loadResultArray(1);
+		}
+	}
+
+	/* Store all the FIELD TYPES being backed-up (text fields need to be delimited) in variable $FieldType*/
+	if ($toBackUp!="structure")
+	{
+		foreach ($tables as $tblval)
+		{
+			$database->setQuery("SHOW FIELDS FROM $tblval");
+			$database->query();
+			$fields = $database->loadObjectList();
+			foreach($fields as $field)
+			{
+				$FieldType[$tblval][$field->Field] = preg_replace("/[(0-9)]/",'', $field->Type);
+			}
+		}
+	}
+
+	/* Build the fancy header on the dump file */
+	$OutBuffer = "";
+	if ($OutType == 'html') {
+	} else {
+		$OutBuffer .= "#\n";
+		$OutBuffer .= "# Mambo MySQL-Dump\n";
+		$OutBuffer .= "# http://www.mambo-foundation.org\n";
+		$OutBuffer .= "#\n";
+		$OutBuffer .= "# Host: $mosConfig_sitename\n";
+		$OutBuffer .= "# Generation Time: " . date("M j, Y \a\\t H:i") . "\n";
+		$OutBuffer .= "# Server version: " . $database->getVersion() . "\n";
+		$OutBuffer .= "# PHP Version: " . phpversion() . "\n";
+		$OutBuffer .= "# Database : `" . $mosConfig_db . "`\n# --------------------------------------------------------\n";
+	}
+
+	/* Okay, here's the meat & potatoes */
+	foreach ($tables as $tblval) {
+		if ($toBackUp != "data") {
+			if ($OutType == 'html') {
+			} else {
+				$OutBuffer .= "#\n# Table structure for table `$tblval`\n";
+				$OutBuffer .= "#\nDROP table IF EXISTS $tblval;\n";
+				$OutBuffer .= $CreateTable[$tblval][0].";\r\n";
+			}
+		}
+		if ($toBackUp != "structure") {
+			if ($OutType == 'html') {
+				$OutBuffer .= "<div align=\"left\">";
+				$OutBuffer .= "<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">";
+				$database->setQuery("SELECT * FROM $tblval");
+				$rows = $database->loadObjectList();
+
+				$OutBuffer .= "<tr><th colspan=\"".count( @array_keys( @$rows[0] ) )."\">`$tblval`</th></tr>";
+				if (count( $rows )) {
+					$OutBuffer .= "<tr>";
+					foreach($rows[0] as $key => $value) {
+						$OutBuffer .= "<th>$key</th>";
+					}
+					$OutBuffer .= "</tr>";
+				}
+
+				if ($rows) foreach($rows as $row)
+				{
+					$OutBuffer .= "<tr>";
+					foreach (get_object_vars($row) as $key=>$value)
+					{
+						$value = addslashes( $value );
+						$value = str_replace( "\n", '\r\n', $value );
+						$value = str_replace( "\r", '', $value );
+
+						$value = htmlspecialchars( $value );
+
+						if (preg_match ("/\b" . $FieldType[$tblval][$key] . "\b/i", "DATE TIME DATETIME CHAR VARCHAR TEXT TINYTEXT MEDIUMTEXT LONGTEXT BLOB TINYBLOB MEDIUMBLOB LONGBLOB ENUM SET"))
+						{
+							$OutBuffer .= "<td>'$value'</td>";
+						}
+						else
+						{
+							$OutBuffer .= "<td>$value</td>";
+						}
+					}
+					$OutBuffer .= "</tr>";
+				}
+				$OutBuffer .= "</table></div><br />";
+			} else {
+				$OutBuffer .= "#\n# Dumping data for table `$tblval`\n#\n";
+				$database->setQuery("SELECT * FROM $tblval");
+				$rows = $database->loadObjectList(); if (!$rows) $rows = array();
+				foreach($rows as $row)
+				{
+					$InsertDump = "INSERT INTO $tblval VALUES (";
+					//$arr = mosObjectToArray($row);
+					//foreach($arr as $key => $value)
+					foreach (get_object_vars($row) as $key=>$value)
+					{
+						$value = addslashes( $value );
+						$value = str_replace( "\n", '\r\n', $value );
+						$value = str_replace( "\r", '', $value );
+						if (preg_match ("/\b" . $FieldType[$tblval][$key] . "\b/i", "DATE TIME DATETIME CHAR VARCHAR TEXT TINYTEXT MEDIUMTEXT LONGTEXT BLOB TINYBLOB MEDIUMBLOB LONGBLOB ENUM SET"))
+						{
+							$InsertDump .= "'$value',";
+						}
+						else
+						{
+							$InsertDump .= "$value,";
+						}
+					}
+					$OutBuffer .= rtrim($InsertDump,',') . ");\n";
+				}
+			}
+		}
+	}
+
+	/* Send the HTML headers */
+	if ($OutDest == "remote") {
+		// dump anything in the buffer
+		@ob_end_clean();
+		ob_start();
+		header('Content-Type: ' . $mime_type);
+		header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+		if ($UserBrowser == 'IE') {
+			header('Content-Disposition: inline; filename="' . $filename . '"');
+			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+			header('Pragma: public');
+		} else {
+			header('Content-Disposition: attachment; filename="' . $filename . '"');
+			header('Pragma: no-cache');
+		}
+	}
+
+	if ($OutDest == "screen" || $OutType == "html" ) {
+		if ($OutType == "html") {
+				echo $OutBuffer;
+		} else {
+			$OutBuffer = str_replace("<","&lt;",$OutBuffer);
+			$OutBuffer = str_replace(">","&gt;",$OutBuffer);
+			?>
+			<form>
+				<textarea rows="20" cols="80" name="sqldump"  style="background-color:#e0e0e0"><?php echo $OutBuffer;?></textarea>
+				<br />
+				<input type="button" onclick="javascript:this.form.sqldump.focus();this.form.sqldump.select();" class="button" value="Select All" />
+			</form>
+			<?php
+		}
+		exit();
+	}
+			
+	switch ($OutType) {
+		case "sql" :
+			if ($OutDest == "local") {
+				$fp = fopen("$local_backup_path/$filename", "w");
+				if (!$fp) {
+					HTML_dbadmin::showDbAdminMessage("Database backup FAILURE!!<br />File $local_backup_path/$filename not writable<br />Please contact your admin/webmaster!</p>","DB Admin",$option,$task);
+					return;
+				} else {
+					fwrite($fp, $OutBuffer);
+					fclose($fp);
+					HTML_dbadmin::showDbAdminMessage("Database backup successful! Your file was saved on the server in directory :<br />$local_backup_path/$filename</p>","DB Admin",$option,$task);
+					return;
+				}
+			} else {
+				echo $OutBuffer;
+				ob_end_flush();
+				ob_start();
+				// do no more
+				exit();
+			}
+			break;
+		case "bzip" :
+			if (function_exists('bzcompress')) {
+				if ($OutDest == "local") {
+					$fp = fopen("$local_backup_path/$filename", "wb");
+					if (!$fp) {
+						echo "<p align=\"center\"  class=\"error\">Database backup FAILURE!!<br />File $local_backup_path/$filename not writable<br />Please contact your admin/webmaster!</p>";
+					} else {
+						fwrite($fp, bzcompress($OutBuffer));
+						fclose($fp);
+						HTML_dbadmin::showDbAdminMessage("Database backup successful! Your file was saved on the server in directory :<br />$local_backup_path/$filename</p>","DB Admin", $option,$task);
+						return;
+					}
+				} else {
+					echo bzcompress($OutBuffer);
+					ob_end_flush();
+					ob_start();
+					// do no more
+					exit();
+				}
+			} else {
+				echo $OutBuffer;
+			}
+			break;
+		case "gzip" :
+			if (function_exists('gzencode')) {
+				if ($OutDest == "local") {
+					$fp = gzopen("$local_backup_path/$filename", "wb");
+					if (!$fp) {
+						HTML_dbadmin::showDbAdminMessage("Database backup FAILURE!!<br />File $local_backup_path/$filename not writable<br />Please contact your admin/webmaster!</p>","DB Admin",$option,$task);
+						return;
+					} else {
+						gzwrite($fp,$OutBuffer);
+						gzclose($fp);
+						HTML_dbadmin::showDbAdminMessage("Database backup successful! Your file was saved on the server in directory :<br />$local_backup_path/$filename</p>","DB Admin",$option,$task);
+						return;
+					}
+				} else {
+					echo gzencode($OutBuffer);
+					ob_end_flush();
+					ob_start();
+					// do no more
+					exit();
+				}
+			} else {
+				echo $OutBuffer;
+			}
+			break;
+		case "zip" :
+			if (function_exists('gzcompress')) {
+				include "classes/zip.lib.php";
+				$zipfile = new zipfile();
+				$zipfile -> addFile($OutBuffer, $filename . ".sql");
+				}
+			switch ($OutDest) {
+				case "local" :
+					$fp = fopen("$local_backup_path/$filename", "wb");
+					if (!$fp) {
+						HTML_dbadmin::showDbAdminMessage("Database backup FAILURE!!<br />File $local_backup_path/$filename not writable<br />Please contact your admin/webmaster!</p>","DB Admin",$option,$task);
+						return;
+					} else {
+						fwrite($fp, $zipfile->file());
+						fclose($fp);
+						HTML_dbadmin::showDbAdminMessage("Database backup successful! Your file was saved on the server in directory :<br />$local_backup_path/$filename</p>","DB Admin",$option,$task);
+						return;
+					}
+					break;
+				case "remote" :
+					echo $zipfile->file();
+					ob_end_flush();
+					ob_start();
+					// do no more
+					exit();
+					break;
+				default :
+					echo $OutBuffer;
+					break;
+			}
+			break;
+	}
+}
+
+function dbRestore( $local_backup_path) {
+	global $database;
+
+	$uploads_okay = (function_exists('ini_get')) ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize'))) : (intval(@get_cfg_var('upload_max_filesize')));
+	if ($uploads_okay)
+	{
+		$enctype = " enctype=\"multipart/form-data\"";
+	}
+	else
+	{
+		$enctype = '';
+	}
+
+	HTML_dbadmin::restoreIntro($enctype,$uploads_okay,$local_backup_path);
+}
+
+function doRestore( $file, $uploadedFile, $local_backup_path ) {
+	global $database, $option,$task,$mosConfig_absolute_path;
+
+	if(!is_null($uploadedFile) && is_array($uploadedFile) && $uploadedFile["name"] != "")
+	{
+		$base_Dir = $mosConfig_absolute_path . "/uploadfiles/";
+		if (!move_uploaded_file($uploadedFile['tmp_name'], $base_Dir . $uploadedFile['name']))
+		{
+			HTML_dbadmin::showDbAdminMessage("Error! could not move uploaded file.</p>","DB Admin - Restore",$option,$task);
+			return false;
+		}
+
+	}
+	if ((!$file) && (!$uploadedFile['name']))
+	{
+		HTML_dbadmin::showDbAdminMessage("Error! No restore file specified.</p>","DB Admin - Restore",$option,$task);
+		return;
+	}
+
+	if ($file)
+	{
+		if (isset($local_backup_path))
+		{
+			$infile		= $local_backup_path . "/" . $file;
+			$upfileFull	= $file;
+			$destfile = $mosConfig_absolute_path . "/uploadfiles/$file";
+
+			// If it's a zip file, we copy it so we can extract it
+			if(eregi(".\.zip$",$upfileFull))
+			{
+				copy($infile,$destfile);
+			}
+		}
+		else
+		{
+			HTML_dbadmin::showDbAdminMessage("Error! Backup path in your configuration file has not been configured.</p>","DB Admin - Restore",$option,$task);
+			return;
+		}
+	}
+	else
+	{
+
+		$upfileFull	= $uploadedFile['name'];
+		$infile	= $base_Dir . $uploadedFile['name']; 
+		
+	}
+
+	if (!eregi(".\.sql$",$upfileFull) && !eregi(".\.bz2$",$upfileFull) && !eregi(".\.gz$",$upfileFull) && !eregi(".\.zip$",$upfileFull))
+	{
+		HTML_dbadmin::showDbAdminMessage("Error! Invalid file extension in input file ($upfileFull).<br />Only *.sql, *.bz2, or *.gz files may be uploaded.</p>","DB Admin - Restore",$option,$task);
+		return;
+	}
+	
+	if (substr($upfileFull,-3)==".gz")
+	{
+		if (function_exists('gzinflate'))
+		{
+			$fp=fopen("$infile","rb");
+			if ((!$fp) || filesize("$infile")==0)
+			{
+				HTML_dbadmin::showDbAdminMessage("Error! Unable to open input file ($infile) for reading or file contains no records.</p>","DB Admin - Restore",$option,$task);
+				return;
+			}
+			else
+			{
+				$content = fread($fp,filesize("$infile"));
+				fclose($fp);
+				$content = gzinflate(substr($content,10));
+			}
+		}
+		else
+		{
+			HTML_dbadmin::showDbAdminMessage("Error! Unable to process gzip file as gzinflate function is unavailable.</p>","DB Admin - Restore",$option,$task);
+			return;
+		}
+	}
+	elseif (substr($upfileFull,-4)==".bz2")
+	{
+		if (function_exists('bzdecompress'))
+		{
+			$fp=fopen("$infile","rb");
+			if ((!$fp) || filesize("$infile")==0)
+			{
+				HTML_dbadmin::showDbAdminMessage("Error! Unable to open input file ($infile) for reading or file contains no records.</p>","DB Admin - Restore",$option,$task);
+				return;
+			}
+			else
+			{
+				$content=fread($fp,filesize("$infile"));
+				fclose($fp);
+				$content=bzdecompress($content);
+			}
+		}
+		else
+		{
+			HTML_dbadmin::showDbAdminMessage("Error! Unable to process bzip file as bzdecompress function is unavailable.</p>","DB Admin - Restore",$option,$task);
+			return;
+		}
+	}
+	elseif (substr($upfileFull,-4)==".sql")
+	{
+echo "trying to access $infile";
+		$fp=fopen("$infile","r");
+		if ((!$fp) || filesize("$infile")==0)
+		{
+			HTML_dbadmin::showDbAdminMessage("Error! Unable to open input file ($infile) for reading or file contains no records.</p>","DB Admin - Restore",$option,$task);
+			return;
+		}
+		else
+		{
+			$content=fread($fp,filesize("$infile"));
+			fclose($fp);
+		}
+	}
+	elseif (substr($upfileFull,-4)==".zip")
+	{
+		// unzip the file
+		$base_Dir		= $mosConfig_absolute_path . "/uploadfiles/";
+		$archivename	= $base_Dir . $upfileFull;
+		$tmpdir			= uniqid("dbrestore_");
+
+		$isWindows = (substr(PHP_OS, 0, 3) == 'WIN' && stristr ( $_SERVER["SERVER_SOFTWARE"], "microsoft"));
+		if($isWindows)
+		{
+			$extractdir	= str_replace('/','\\',$base_Dir . "$tmpdir/");
+			$archivename = str_replace('/','\\',$archivename);
+		}
+		else
+		{
+			$extractdir	= str_replace('\\','/',$base_Dir . "$tmpdir/");
+			$archivename = str_replace('\\','/',$archivename);
+		}
+
+		$zipfile	= new PclZip($archivename);
+		if($isWindows)
+			define('OS_WINDOWS',1);
+
+		$ret = $zipfile->extract(PCLZIP_OPT_PATH,$extractdir);
+		if($ret == 0)
+		{
+			HTML_dbadmin::showDbAdminMessage("Unrecoverable error '".$zipfile->errorName(true)."'","DB Admin - Restore",$option,$task);
+			return false;
+		}
+		$filesinzip = $zipfile->listContent();
+		if(is_array($filesinzip) && count($filesinzip) > 0)
+		{
+			$fp			= fopen($extractdir . $filesinzip[0]["filename"],"r");
+			$content	= fread($fp,filesize($extractdir . $filesinzip[0]["filename"]));
+			fclose($fp);
+
+			// Cleanup
+			deldir($extractdir);
+			unlink($mosConfig_absolute_path . "/uploadfiles/$file");
+
+		}
+		else
+		{
+			HTML_dbadmin::showDbAdminMessage("No SQL file found in $upfileFull","DB Admin - Restore",$option,$task);
+			return;
+		}
+	}
+	else
+	{
+		HTML_dbadmin::showDbAdminMessage("Error! Unrecognized input file type. ($infile : $upfileFull)</p>","DB Admin - Restore",$option,$task);
+		return;
+	}
+
+
+	$decodedIn	= explode(chr(10),$content);
+	$decodedOut	= "";
+	$queries	= 0;
+
+	foreach ($decodedIn as $rawdata)
+	{
+		$rawdata=trim($rawdata);
+		if (($rawdata!="") && ($rawdata{0}!="#"))
+		{
+			$decodedOut .= $rawdata;
+			if (substr($rawdata,-1)==";")
+			{
+				if  ((substr($rawdata,-2)==");") || (strtoupper(substr($decodedOut,0,6))!="INSERT"))
+				{
+					if (eregi('^(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(DATABASE)[[:space:]]+(.+)', $decodedOut))
+					{
+						HTML_dbadmin::showDbAdminMessage("Error! Your input file contains a DROP or CREATE DATABASE statement. Please delete these statements before trying to restore the file.</p>","DB Admin - Restore",$option,$task);
+						return;
+					}
+					$database->setQuery($decodedOut);
+					$database->query();
+					$decodedOut="";
+					$queries++;
+				}
+			}
+		}
+	}
+	HTML_dbadmin::showDbAdminMessage("Success! Database has been restored to the backup you requested ($queries SQL queries processed).</p>","DB Admin - Restore",$option,$task);
+	return;
+}
+
+function deldir($dir)
+{
+	$current_dir = opendir($dir);
+	while($entryname = readdir($current_dir))
+	{
+    	if(is_dir("$dir/$entryname") and ($entryname != "." and $entryname!=".."))
+    	{
+			deldir("${dir}/${entryname}");
+		}
+		elseif($entryname != "." and $entryname!="..")
+		{
+			unlink("${dir}/${entryname}");
+		}
+	}
+	closedir($current_dir);
+	rmdir($dir);
+}
+
+function xquery( $option ) {
+	global $database;
+
+	$rows = null;
+	$msg = '';
+	$sql = trim( mosGetParam( $_POST, 'sql', '' ) );
+	$batch = intval( mosGetParam( $_POST, 'batch', 0 ) );
+
+	$allowed = array( "CREATE", "SELECT", "INSERT", "UPDATE", "DROP", "ALTER" );
+	$words = preg_split( "/\s+/", $sql );
+	$cmd = strtoupper( $words[0] );
+
+	if ($sql == "") {
+		$msg = "The query was empty.";
+	} else if (!in_array( $cmd, $allowed)) {
+		$msg = "You are not permitted to execute a <strong>$cmd</strong> query";
+	} else {
+		$database->setQuery( $sql );
+		if ($batch) {
+			// run batch, don't abort on error
+			$r = $database->query_batch( false );
+		} else {
+			$r = $database->query();
+		}
+		if ($r) {
+			$msg = "The query executed successfully.";
+			$msg .= "<br />" . intval( $database->getNumRows() ). " rows where affected.";
+
+			if ($cmd == "SELECT") {
+				$rows = $database->loadObjectList();
+			}
+		} else {
+			$msg = "The query was unsuccessful.  It return the error code " . $database->getErrorNum();
+			$msg .= "<br />" . $database->getErrorMsg() . "";
+		}
+	}
+
+	HTML_dbadmin::xquery( $sql, $msg, $rows, $option );
+}
+?>
diff -ruN 4.5.4/administrator/components/com_mostlydbadmin/index.html 4.6rc2/administrator/components/com_mostlydbadmin/index.html
--- 4.5.4/administrator/components/com_mostlydbadmin/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlydbadmin/index.html	2006-04-02 18:33:27.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_mostlydbadmin/mostlydbadmin.xml 4.6rc2/administrator/components/com_mostlydbadmin/mostlydbadmin.xml
--- 4.5.4/administrator/components/com_mostlydbadmin/mostlydbadmin.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlydbadmin/mostlydbadmin.xml	2006-05-14 15:48:05.000000000 -0500
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<mosinstall type="component">
+	<name>MOStlyDBAdmin</name>
+	<creationDate>April 2006</creationDate>
+	<author>Mambo Project</author>
+	<copyright>This component if released under the GNU/GPL License</copyright>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
+	<version>1.0</version>
+	<description>
+	<![CDATA[
+    <p>MOStlyDBAdmin is used for easy back up/restore of your database.</p><p>  It is a revival 
+	of the dbadmin component for use in the Mambo 4.6+ core.  The dbadmin 
+	component stopped working with Mambo 4.5.3h and development appears to have ceased.</p>
+    ]]></description>
+	<administration>
+		<menu>MOStlyDBAdmin DB Tools</menu>
+			<submenu>
+				<menu act='option=com_mostlydbadmin&task=dbBackup'>Backup Database</menu>
+				<menu act='option=com_mostlydbadmin&task=dbRestore'>Restore Database</menu>
+				<menu act='option=com_mostlydbadmin&task=xquery'>Query Database</menu>
+			</submenu>
+		<files>
+			<filename>admin.mostlydbadmin.html.php</filename>
+			<filename>admin.mostlydbadmin.php</filename>
+                        <filename>read_me.txt</filename>
+			<filename>index.html</filename>
+		</files>
+	</administration>
+</mosinstall>
diff -ruN 4.5.4/administrator/components/com_mostlydbadmin/read_me.txt 4.6rc2/administrator/components/com_mostlydbadmin/read_me.txt
--- 4.5.4/administrator/components/com_mostlydbadmin/read_me.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/components/com_mostlydbadmin/read_me.txt	2006-05-14 15:48:05.000000000 -0500
@@ -0,0 +1,26 @@
+// ----------------------------------------------------------------------
+// MOStlyDBAdmin
+// Copyright (C) 2006 The Mambo Foundation (core@mambo-foundation.org)
+// http://mambo-foundation.org
+// ----------------------------------------------------------------------
+//
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program 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.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html or
+// take a look in the Doc directory
+//
+// ----------------------------------------------------------------------
+// MOStlyDBAdmin is based on the old dbadmin component
+// Written by: Nathan Maxfield - info@gimweb.com (www.gimweb.com)
+// dbadmin was also licensed under the GNU/GPL License
+// ----------------------------------------------------------------------
diff -ruN 4.5.4/administrator/components/com_newsfeeds/admin.newsfeeds.html.php 4.6rc2/administrator/components/com_newsfeeds/admin.newsfeeds.html.php
--- 4.5.4/administrator/components/com_newsfeeds/admin.newsfeeds.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_newsfeeds/admin.newsfeeds.html.php	2006-05-14 16:46:22.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.newsfeeds.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Newsfeeds
-*/
 class HTML_newsfeeds {
 
 	function showNewsFeeds( &$rows, &$lists, $pageNav, $option ) {
@@ -26,7 +24,7 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Newsfeed Manager
+			<?php echo T_('News Feed Manager') ?>
 			</th>
 			<td width="right">
 			<?php echo $lists['category'];?>
@@ -43,22 +41,22 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th class="title">
-			News Feed
+			<?php echo T_('News Feed') ?>
 			</th>
 			<th width="5%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th colspan="2" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th class="title" width="20%">
-			Category
+			<?php echo T_('Category') ?>
 			</th>
 			<th width="5%" nowrap="nowrap">
-			# Articles
+			<?php echo T_('# Articles') ?>
 			</th>
 			<th width="10%">
-			Cache time
+			<?php echo T_('Cache time') ?>
 			</th>
 		</tr>
 		<?php
@@ -88,11 +86,11 @@
 				if ( $row->checked_out && ( $row->checked_out != $my->id ) ) {
 					?>
 					<?php echo $row->name; ?>
-					&nbsp;[ <i>Checked Out</i> ]
+					&nbsp;[ <i><?php echo T_('Checked Out') ?></i> ]
 					<?php
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Newsfeed">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit News Feed') ?>">
 					<?php echo $row->name; ?>
 					</a>
 					<?php
@@ -111,7 +109,7 @@
 				<?php echo $pageNav->orderDownIcon( $i, $n ); ?>
 				</td>
 				<td>
-				<a href="<?php echo $row->cat_link; ?>" title="Edit Category">
+				<a href="<?php echo $row->cat_link; ?>" title="<?php echo T_('Edit Category') ?>">
 				<?php echo $row->catname;?>
 				</a>
 				</td>
@@ -151,17 +149,17 @@
 
 			// do field validation
 			if (form.name.value == '') {
-				alert( "Please fill in the newsfeed name." );
+				alert( "<?php echo T_('Please fill in the news feed name.') ?>" );
 			} else if (form.catid.value == 0) {
-				alert( "Please select a Category." );
+				alert( "<?php echo T_('Please select a Category.') ?>" );
 			} else if (form.link.value == '') {
-				alert( "Please fill in the newsfeed link." );
+				alert( "<?php echo T_('Please fill in the news feed link.') ?>" );
 			} else if (getSelectedValue('adminForm','catid') < 0) {
-				alert( "Please select a category." );
+				alert( "<?php echo T_('Please select a category.') ?>" );
 			} else if (form.numarticles.value == "" || form.numarticles.value == 0) {
-				alert( "Please fill in the number of articles to display." );
+				alert( "<?php echo T_('Please fill in the number of articles to display.') ?>" );
 			} else if (form.cache_time.value == "" || form.cache_time.value == 0) {
-				alert( "Please fill in the cache refresh time." );
+				alert( "<?php echo T_('Please fill in the cache refresh time.') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -172,7 +170,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="edit">
-			Newsfeed: <small><?php echo $row->id ? 'Edit' : 'New';?></small> <small><small>[ <?php echo $row->name;?> ]</small></small>
+			<?php echo T_('News Feed:') ?> <small><?php echo $row->id ? T_('Edit') : T_('New');?></small> <small><small>[ <?php echo $row->name;?> ]</small></small>
 			</th>
 		</tr>
 		</table>
@@ -180,12 +178,12 @@
 		<table class="adminform">
 		<tr>
 			<th colspan="2">
-			Details
+			<?php echo T_('Details') ?>
 			</th>
 		</tr>
 		<tr>
 			<td>
-			Name
+			<?php echo T_('Name') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" size="40" name="name" value="<?php echo $row->name; ?>">
@@ -193,7 +191,7 @@
 		</tr>
 		<tr>
 			<td>
-			Category
+			<?php echo T_('Category') ?>
 			</td>
 			<td>
 			<?php echo $lists['category']; ?>
@@ -201,7 +199,7 @@
 		</tr>
 		<tr>
 			<td>
-			Link
+			<?php echo T_('Link') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" size="60" name="link" value="<?php echo $row->link; ?>">
@@ -209,7 +207,7 @@
 		</tr>
 		<tr>
 			<td>
-			Number of Articles
+			<?php echo T_('Number of Articles') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" size="2" name="numarticles" value="<?php echo $row->numarticles; ?>">
@@ -217,7 +215,7 @@
 		</tr>
 		<tr>
 			<td>
-			Cache time (in seconds)
+			<?php echo T_('Cache time (in seconds)') ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" size="4" name="cache_time" value="<?php echo $row->cache_time; ?>">
@@ -225,7 +223,7 @@
 		</tr>
 		<tr>
 			<td>
-			Ordering
+			<?php echo T_('Ordering') ?>
 			</td>
 			<td>
 			<?php echo $lists['ordering']; ?>
@@ -233,7 +231,7 @@
 		</tr>
 		<tr>
 			<td valign="top" align="right">
-			Published:
+			<?php echo T_('Published:') ?>
 			</td>
 			<td>
 			<?php echo $lists['published']; ?>
diff -ruN 4.5.4/administrator/components/com_newsfeeds/admin.newsfeeds.php 4.6rc2/administrator/components/com_newsfeeds/admin.newsfeeds.php
--- 4.5.4/administrator/components/com_newsfeeds/admin.newsfeeds.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_newsfeeds/admin.newsfeeds.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.newsfeeds.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,7 +16,7 @@
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
 		| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_newsfeeds' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -199,8 +201,8 @@
 	global $database;
 
 	if (count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select a module to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select a module to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -233,7 +235,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 	if (count( $cid )) {
diff -ruN 4.5.4/administrator/components/com_newsfeeds/newsfeeds.class.php 4.6rc2/administrator/components/com_newsfeeds/newsfeeds.class.php
--- 4.5.4/administrator/components/com_newsfeeds/newsfeeds.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_newsfeeds/newsfeeds.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: newsfeeds.class.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Newsfeeds
-*/
 class mosNewsFeed extends mosDBTable {
 /** @var int Primary key */
 	var $id=null;
diff -ruN 4.5.4/administrator/components/com_newsfeeds/newsfeeds.xml 4.6rc2/administrator/components/com_newsfeeds/newsfeeds.xml
--- 4.5.4/administrator/components/com_newsfeeds/newsfeeds.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_newsfeeds/newsfeeds.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Newsfeeds</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component manages RSS/RDF newsfeeds</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php 4.6rc2/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php
--- 4.5.4/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.newsfeeds.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Newsfeeds
-*/
 class TOOLBAR_newsfeeds  {
 	function _DEFAULT() {
 		mosMenuBar::startTable();
@@ -28,7 +26,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.newsfeeds.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 
@@ -38,7 +36,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.newsfeeds.edit' );
+		mosMenuBar::help( 'new' );
 		mosMenuBar::endTable();
 	}
 
@@ -50,12 +48,12 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.newsfeeds.edit' );
+		mosMenuBar::help( 'edit' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_newsfeeds/toolbar.newsfeeds.php 4.6rc2/administrator/components/com_newsfeeds/toolbar.newsfeeds.php
--- 4.5.4/administrator/components/com_newsfeeds/toolbar.newsfeeds.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_newsfeeds/toolbar.newsfeeds.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.newsfeeds.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_poll/admin.poll.html.php 4.6rc2/administrator/components/com_poll/admin.poll.html.php
--- 4.5.4/administrator/components/com_poll/admin.poll.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_poll/admin.poll.html.php	2006-04-03 13:37:56.000000000 -0500
@@ -1,215 +1,213 @@
-<?php
-/**
-* @version $Id: admin.poll.html.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
-* @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* @package Mambo
-* @subpackage Polls
-*/
-class HTML_poll {
-
-	function showPolls( &$rows, &$pageNav, $option ) {
-		global $my;
-
-		mosCommonHTML::loadOverlib();
-		?>
-		<form action="index2.php" method="post" name="adminForm">
-		<table class="adminheading">
-		<tr>
-			<th>Poll Manager</th>
-		</tr>
-		</table>
-
-		<table class="adminlist">
-		<tr>
-			<th width="5">
-			#
-			</th>
-			<th width="20">
-			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
-			</th>
-			<th align="left">
-			Poll Title
-			</th>
-			<th width="10%" align="center">
-			Published
-			</th>
-			<th width="10%" align="center">
-			Options
-			</th>
-			<th width="10%" align="center">
-			Lag
-			</th>
-		</tr>
-		<?php
-		$k = 0;
-		for ($i=0, $n=count( $rows ); $i < $n; $i++) {
-			$row = &$rows[$i];
-
-			$link 	= 'index2.php?option=com_poll&task=editA&hidemainmenu=1&id='. $row->id;
-
-			$task 	= $row->published ? 'unpublish' : 'publish';
-			$img 	= $row->published ? 'publish_g.png' : 'publish_x.png';
-			$alt 	= $row->published ? 'Published' : 'Unpublished';
-
-			$checked 	= mosCommonHTML::CheckedOutProcessing( $row, $i );
-			?>
-			<tr class="<?php echo "row$k"; ?>">
-				<td>
-				<?php echo $pageNav->rowNumber( $i ); ?>
-				</td>
-				<td>
-				<?php echo $checked; ?>
-				</td>
-				<td>
-				<a href="<?php echo $link; ?>" title="Edit Poll">
-				<?php echo $row->title; ?>
-				</a>
-				</td>
-				<td align="center">
-				<a href="javascript: void(0);" onclick="return listItemTask('cb<?php echo $i;?>','<?php echo $task;?>')">
-				<img src="images/<?php echo $img;?>" width="12" height="12" border="0" alt="<?php echo $alt; ?>" />
-				</a>
-				</td>
-				<td align="center">
-				<?php echo $row->numoptions; ?>
-				</td>
-				<td align="center">
-				<?php echo $row->lag; ?>
-				</td>
-			</tr>
-			<?php
-			$k = 1 - $k;
-		}
-		?>
-		</table>
-		<?php echo $pageNav->getListFooter(); ?>
-
-		<input type="hidden" name="option" value="<?php echo $option;?>" />
-		<input type="hidden" name="task" value="" />
-		<input type="hidden" name="boxchecked" value="0" />
-		<input type="hidden" name="hidemainmenu" value="0">
-		</form>
-		<?php
-	}
-
-
-	function editPoll( &$row, &$options, &$lists ) {
-		mosMakeHtmlSafe( $row, ENT_QUOTES );
-		?>
-		<script language="javascript" type="text/javascript">
-		function submitbutton(pressbutton) {
-			var form = document.adminForm;
-			if (pressbutton == 'cancel') {
-				submitform( pressbutton );
-				return;
-			}
-			// do field validation
-			if (form.title.value == "") {
-				alert( "Poll must have a title" );
-			} else if( isNaN( parseInt( form.lag.value ) ) ) {
-				alert( "Poll must have a non-zero lag time" );
-			//} else if (form.menu.options.value == ""){
-			//	alert( "Poll must have pages." );
-			//} else if (form.adminForm.textfieldcheck.value == 0){
-			//	alert( "Poll must have options." );
-			} else {
-				submitform( pressbutton );
-			}
-		}
-		</script>
-		<form action="index2.php" method="post" name="adminForm">
-		<table class="adminheading">
-		<tr>
-			<th>
-			Poll:
-			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
-			</small>
-			</th>
-		</tr>
-		</table>
-
-		<table class="adminform">
-		<tr>
-			<th colspan="4">
-			Details
-			</th>
-		</tr>
-		<tr>
-			<td width="10%">
-			Title:
-			</td>
-			<td>
-			<input class="inputbox" type="text" name="title" size="60" value="<?php echo $row->title; ?>" />
-			</td>
-   			<td width="20px">&nbsp;
-
-			</td>
-			<td width="100%" rowspan="20" valign="top">
-			Show on menu items:
-			<br />
-			<?php echo $lists['select']; ?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			Lag:
-			</td>
-			<td>
-			<input class="inputbox" type="text" name="lag" size="10" value="<?php echo $row->lag; ?>" /> (seconds between votes)
-			</td>
-		</tr>
-		<tr>
-			<td colspan="3">
-			<br /><br />
-			Options:
-			</td>
-		</tr>
-		<?php
-		for ($i=0, $n=count( $options ); $i < $n; $i++ ) {
-			?>
-			<tr>
-				<td>
-				<?php echo ($i+1); ?>
-				</td>
-				<td>
-				<input class="inputbox" type="text" name="polloption[<?php echo $options[$i]->id; ?>]" value="<?php echo htmlspecialchars( $options[$i]->text, ENT_QUOTES ); ?>" size="60" />
-				</td>
-			</tr>
-			<?php
-		}
-		for (; $i < 12; $i++) {
-			?>
-			<tr>
-				<td>
-				<?php echo ($i+1); ?>
-				</td>
-				<td>
-				<input class="inputbox" type="text" name="polloption[]" value="" size="60"/>
-				</td>
-			</tr>
-			<?php
-		}
-		?>
-		</table>
-
-		<input type="hidden" name="task" value="">
-		<input type="hidden" name="option" value="com_poll" />
-		<input type="hidden" name="id" value="<?php echo $row->id; ?>" />
-		<input type="hidden" name="textfieldcheck" value="<?php echo $n; ?>" />
-		</form>
-		<?php
-	}
-
-}
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Polls
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+class HTML_poll {
+
+	function showPolls( &$rows, &$pageNav, $option ) {
+		global $my;
+
+		mosCommonHTML::loadOverlib();
+		?>
+		<form action="index2.php" method="post" name="adminForm">
+		<table class="adminheading">
+		<tr>
+			<th><?php echo T_('Poll Manager') ?></th>
+		</tr>
+		</table>
+
+		<table class="adminlist">
+		<tr>
+			<th width="5">
+			#
+			</th>
+			<th width="20">
+			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
+			</th>
+			<th align="left">
+			<?php echo T_('Poll Question') ?>
+			</th>
+			<th width="10%" align="center">
+			<?php echo T_('Published') ?>
+			</th>
+			<th width="10%" align="center">
+			<?php echo T_('Options') ?>
+			</th>
+			<th width="10%" align="center">
+			<?php echo T_('Lag') ?>
+			</th>
+		</tr>
+		<?php
+		$k = 0;
+		for ($i=0, $n=count( $rows ); $i < $n; $i++) {
+			$row = &$rows[$i];
+
+			$link 	= 'index2.php?option=com_poll&task=editA&hidemainmenu=1&id='. $row->id;
+
+			$task 	= $row->published ? 'unpublish' : 'publish';
+			$img 	= $row->published ? 'publish_g.png' : 'publish_x.png';
+			$alt 	= $row->published ? T_('Published') : T_('Unpublished');
+
+			$checked 	= mosCommonHTML::CheckedOutProcessing( $row, $i );
+			?>
+			<tr class="<?php echo "row$k"; ?>">
+				<td>
+				<?php echo $pageNav->rowNumber( $i ); ?>
+				</td>
+				<td>
+				<?php echo $checked; ?>
+				</td>
+				<td>
+				<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Poll') ?>">
+				<?php echo $row->title; ?>
+				</a>
+				</td>
+				<td align="center">
+				<a href="javascript: void(0);" onclick="return listItemTask('cb<?php echo $i;?>','<?php echo $task;?>')">
+				<img src="images/<?php echo $img;?>" width="12" height="12" border="0" alt="<?php echo $alt; ?>" />
+				</a>
+				</td>
+				<td align="center">
+				<?php echo $row->numoptions; ?>
+				</td>
+				<td align="center">
+				<?php echo $row->lag; ?>
+				</td>
+			</tr>
+			<?php
+			$k = 1 - $k;
+		}
+		?>
+		</table>
+		<?php echo $pageNav->getListFooter(); ?>
+
+		<input type="hidden" name="option" value="<?php echo $option;?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="hidemainmenu" value="0">
+		</form>
+		<?php
+	}
+
+
+	function editPoll( &$row, &$options, &$lists ) {
+		mosMakeHtmlSafe( $row, ENT_QUOTES );
+		?>
+		<script language="javascript" type="text/javascript">
+		function submitbutton(pressbutton) {
+			var form = document.adminForm;
+			if (pressbutton == 'cancel') {
+				submitform( pressbutton );
+				return;
+			}
+			// do field validation
+			if (form.title.value == "") {
+				alert( "<?php echo T_('Poll must have a title') ?>" );
+			} else if( isNaN( parseInt( form.lag.value ) ) ) {
+				alert( "<?php echo T_('Poll must have a non-zero lag time') ?>" );
+			//} else if (form.menu.options.value == ""){
+			//	alert( "Poll must have pages." );
+			//} else if (form.adminForm.textfieldcheck.value == 0){
+			//	alert( "Poll must have options." );
+			} else {
+				submitform( pressbutton );
+			}
+		}
+		</script>
+		<form action="index2.php" method="post" name="adminForm">
+		<table class="adminheading">
+		<tr>
+			<th>
+			<?php echo T_('Poll:') ?>
+			<small>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
+			</small>
+			</th>
+		</tr>
+		</table>
+
+		<table class="adminform">
+		<tr>
+			<th colspan="4">
+			<?php echo T_('Details') ?>
+			</th>
+		</tr>
+		<tr>
+			<td width="10%">
+			<?php echo T_('Question:') ?>
+			</td>
+			<td>
+			<input class="inputbox" type="text" name="title" size="60" value="<?php echo $row->title; ?>" />
+			</td>
+   			<td width="20px">&nbsp;
+
+			</td>
+			<td width="100%" rowspan="20" valign="top">
+			<?php echo T_('Show on menu items:') ?>
+			<br />
+			<?php echo $lists['select']; ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<?php echo T_('Lag:') ?>
+			</td>
+			<td>
+			<input class="inputbox" type="text" name="lag" size="10" value="<?php echo $row->lag; ?>" /> (seconds between votes)
+			</td>
+		</tr>
+		<tr>
+			<td colspan="3">
+			<br /><br />
+			<?php echo T_('Options:') ?>
+			</td>
+		</tr>
+		<?php
+		for ($i=0, $n=count( $options ); $i < $n; $i++ ) {
+			?>
+			<tr>
+				<td>
+				<?php echo ($i+1); ?>
+				</td>
+				<td>
+				<input class="inputbox" type="text" name="polloption[<?php echo $options[$i]->id; ?>]" value="<?php echo htmlspecialchars( $options[$i]->text, ENT_QUOTES ); ?>" size="60" />
+				</td>
+			</tr>
+			<?php
+		}
+		for (; $i < 12; $i++) {
+			?>
+			<tr>
+				<td>
+				<?php echo ($i+1); ?>
+				</td>
+				<td>
+				<input class="inputbox" type="text" name="polloption[]" value="" size="60"/>
+				</td>
+			</tr>
+			<?php
+		}
+		?>
+		</table>
+
+		<input type="hidden" name="task" value="">
+		<input type="hidden" name="option" value="com_poll" />
+		<input type="hidden" name="id" value="<?php echo $row->id; ?>" />
+		<input type="hidden" name="textfieldcheck" value="<?php echo $n; ?>" />
+		</form>
+		<?php
+	}
+
+}
 ?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/components/com_poll/admin.poll.php 4.6rc2/administrator/components/com_poll/admin.poll.php
--- 4.5.4/administrator/components/com_poll/admin.poll.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_poll/admin.poll.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.poll.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,7 +16,7 @@
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
 		| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_poll' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -103,7 +105,8 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		mosRedirect( 'index2.php?option='. $option, 'The poll '. $row->title .' is currently being edited by another administrator.' );
+	    $msg = sprintf(T_('The poll %s is currently being edited by another administrator.'),$row->title);
+		mosRedirect( 'index2.php?option='. $option,  $msg);
 	}
 
 	$options = array();
@@ -211,8 +214,8 @@
 	$catid = mosGetParam( $_POST, 'catid', array(0) );
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select an item to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
diff -ruN 4.5.4/administrator/components/com_poll/poll.class.php 4.6rc2/administrator/components/com_poll/poll.class.php
--- 4.5.4/administrator/components/com_poll/poll.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_poll/poll.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: poll.class.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 //** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Polls
-*/
 class mosPoll extends mosDBTable {
 	/** @var int Primary key */
 	var $id=null;
@@ -41,13 +39,13 @@
 	function check() {
 		// check for valid name
 		if (trim( $this->title ) == '') {
-			$this->_error = "Your Poll must contain a title.";
+			$this->_error = T_('Your Poll must contain a title.');
 			return false;
 		}
 		// check for valid lag
 		$this->lag = intval( $this->lag );
 		if ($this->lag == 0) {
-			$this->_error = "Your Poll must have a non-zero lag time.";
+			$this->_error = T_("Your Poll must have a non-zero lag time.");
 			return false;
 		}
 		// check for existing title
@@ -56,7 +54,7 @@
 
 		$xid = intval( $this->_db->loadResult() );
 		if ($xid && $xid != intval( $this->id )) {
-			$this->_error = "There is a module already with that name, please try again.";
+			$this->_error = T_("There is a module already with that name, please try again.");
 			return false;
 		}
 
diff -ruN 4.5.4/administrator/components/com_poll/poll.xml 4.6rc2/administrator/components/com_poll/poll.xml
--- 4.5.4/administrator/components/com_poll/poll.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_poll/poll.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Poll</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component shows Polls/Surveys</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_poll/toolbar.poll.html.php 4.6rc2/administrator/components/com_poll/toolbar.poll.html.php
--- 4.5.4/administrator/components/com_poll/toolbar.poll.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_poll/toolbar.poll.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.poll.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Polls
-*/
 class TOOLBAR_poll {
 	/**
 	* Draws the menu for a New category
@@ -25,7 +23,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.polls.edit' );
+		mosMenuBar::help( 'new' );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -41,19 +39,19 @@
 		mosMenuBar::startTable();
 		$popup='pollwindow';
     	?>
-		<td><a class="toolbar" href="#" onclick="window.open('popups/<?php echo $popup;?>.php?pollid=<?php echo $pollid; ?>&t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('preview','','images/preview_f2.png',1);"><img src="images/preview.png" alt="Preview" border="0" name="preview" align="middle" />&nbsp;Preview</a></td>
+		<td><a class="toolbar" href="#" onclick="window.open('popups/<?php echo $popup;?>.php?pollid=<?php echo $pollid; ?>&t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('preview','','images/preview_f2.png',1);"><img src="images/preview.png" alt="<?php echo T_('Preview') ?>" border="0" name="preview" align="middle" />&nbsp;<?php echo T_('Preview') ?></a></td>
 	    <?php
 		mosMenuBar::spacer();
 	    mosMenuBar::save();
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-	    mosMenuBar::help( '453.screen.polls.edit' );
+	    mosMenuBar::help( 'edit' );
 	    mosMenuBar::endTable();
 	}
 	function _DEFAULT() {
@@ -68,7 +66,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.polls.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_poll/toolbar.poll.php 4.6rc2/administrator/components/com_poll/toolbar.poll.php
--- 4.5.4/administrator/components/com_poll/toolbar.poll.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_poll/toolbar.poll.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.poll.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_search/search.xml 4.6rc2/administrator/components/com_search/search.xml
--- 4.5.4/administrator/components/com_search/search.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_search/search.xml	2006-03-01 13:18:50.000000000 -0600
@@ -2,10 +2,10 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Search</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component manages the Search functionality.</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_sections/admin.sections.html.php 4.6rc2/administrator/components/com_sections/admin.sections.html.php
--- 4.5.4/administrator/components/com_sections/admin.sections.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_sections/admin.sections.html.php	2006-05-01 12:55:35.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.sections.html.php,v 1.4 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Sections
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Sections
-*/
 class sections_html {
 	/**
 	* Writes a list of the categories for a section
@@ -30,7 +28,7 @@
 		<table class="adminheading">
 		<tr>
 			 <th class="sections">
-			Section Manager
+			<?php echo T_('Section Manager') ?>
 			</th>
 		</tr>
 		</table>
@@ -44,34 +42,34 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows );?>);" />
 			</th>
 			<th class="title">
-			Section Name
+			<?php echo T_('Section Name') ?>
 			</th>
 			<th width="10%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th colspan="2" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th width="8%">
-			Access
+			<?php echo T_('Access') ?>
 			</th>
 			<th width="12%" nowrap>
-			Section ID
+			<?php echo T_('Section ID') ?>
 			</th>
 			<th width="12%" nowrap>
-			# Categories
+			<?php echo T_('# Categories') ?>
 			</th>
 			<th width="12%" nowrap>
-			# Active
+			<?php echo T_('# Active') ?>
 			</th>
 			<th width="12%" nowrap>
-			# Trash
+			<?php echo T_('# Trash') ?>
 			</th>
 
 		</tr>
@@ -172,7 +170,7 @@
 		if ( $row->name != '' ) {
 			$name = $row->name;
 		} else {
-			$name = "New Section";
+			$name = T_("New Section");
 		}
 		if ($row->image == "") {
 			$row->image = 'blank.png';
@@ -188,21 +186,21 @@
 
 			if ( pressbutton == 'menulink' ) {
 				if ( form.menuselect.value == "" ) {
-					alert( "Please select a Menu" );
+					alert( "<?php echo T_('Please select a Menu') ?>" );
 					return;
 				} else if ( form.link_type.value == "" ) {
-					alert( "Please select a menu type" );
+					alert( "<?php echo T_('Please select a menu type') ?>" );
 					return;
 				} else if ( form.link_name.value == "" ) {
-					alert( "Please enter a Name for this menu item" );
+					alert( "<?php echo T_('Please enter a Name for this menu item') ?>" );
 					return;
 				}
 			}
 
 			if (form.name.value == ""){
-				alert("Section must have a name");
+				alert("<?php echo T_('Section must have a name') ?>");
 			} else if (form.title.value ==""){
-				alert("Section must have a title");
+				alert("<?php echo T_('Section must have a title') ?>");
 			} else {
 				<?php getEditorContents( 'editor1', 'description' ) ; ?>
 				submitform(pressbutton);
@@ -211,22 +209,22 @@
 		// show / hide publishing information
 			function displayParameterInfo()
 			{
-				
+
 				if(document.getElementById('simpleediting').style.display == 'block')
 				{
-					document.getElementById('simpleediting').style.display = 'none';	
-					document.getElementById('show').style.display = 'block';	
+					document.getElementById('simpleediting').style.display = 'none';
+					document.getElementById('show').style.display = 'block';
 					document.getElementById('hide').style.display = 'none';
 					document.adminForm.simple_editing.value ='on';
 				}
 				else
 				{
 					document.getElementById('simpleediting').style.display = 'block';
-					document.getElementById('show').style.display = 'none';	
+					document.getElementById('show').style.display = 'none';
 					document.getElementById('hide').style.display = 'block';
 					document.adminForm.simple_editing.value ='off';
 				}
-				
+
 			}
 		</script>
 		<?php
@@ -238,21 +236,21 @@
 		}
 		else
 		{
-			
+
 			$advanced = 'block';
 			$simple = 'none';
 			$simpleediting ='block';
 		}
-		
+
 		?>
 		<form action="index2.php" method="post" name="adminForm">
 		<input type ="hidden" name="simple_editing" value=''>
 		<table class="adminheading">
 		<tr>
 			<th class="sections">
-			Section:
+			<?php echo T_('Section:') ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			<small><small>
 			[ <?php echo $name ; ?> ]
@@ -264,10 +262,10 @@
 			<tr>
 				<td valign="top" align="right">
 				<div id = "show" style="display:<?php echo $simple;?>">
-				<a href="javascript:displayParameterInfo();">Show Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Show Advanced Details') ?></a>
 				</div>
 				<div id = "hide" style="display:<?php echo $advanced;?>">
-				<a href="javascript:displayParameterInfo();">Hide Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Hide Advanced Details') ?></a>
 				</div>
 				</td>
 			</tr>
@@ -278,12 +276,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Section Details
+					<?php echo T_('Section Details') ?>
 					</th>
 				<tr>
 				<tr>
 					<td width="150">
-					Scope:
+					<?php echo T_('Scope:') ?>
 					</td>
 					<td width="85%" colspan="2">
 					<strong>
@@ -293,23 +291,23 @@
 				</tr>
 				<tr>
 					<td>
-					Title:
+					<?php echo T_('Title:') ?>
 					</td>
 					<td colspan="2">
-					<input class="text_area" type="text" name="title" value="<?php echo $row->title; ?>" size="50" maxlength="50" title="A short name to appear in menus" />
+					<input class="text_area" type="text" name="title" value="<?php echo $row->title; ?>" size="50" maxlength="50" title="<?php echo T_('A short name to appear in menus') ?>" />
 					</td>
 				</tr>
 				<tr>
 					<td>
-					<?php echo (isset($row->section) ? "Category" : "Section");?> Name:
+					<?php echo (isset($row->section) ? T_("Category") : T_("Section"));?> <?php echo T_('Name:') ?>
 					</td>
 					<td colspan="2">
-					<input class="text_area" type="text" name="name" value="<?php echo $row->name; ?>" size="50" maxlength="255" title="A long name to be displayed in headings" />
+					<input class="text_area" type="text" name="name" value="<?php echo $row->name; ?>" size="50" maxlength="255" title="<?php echo T_('A long name to be displayed in headings') ?>" />
 					</td>
 				</tr>
 				<tr>
 					<td>
-					Image:
+					<?php echo T_('Image:') ?>
 					</td>
 					<td>
 					<?php echo $lists['image']; ?>
@@ -321,12 +319,12 @@
 							$path.= "stories/";
 						}
 					?>
-					<img src="<?php echo $path;?><?php echo $row->image;?>" name="imagelib" width="80" height="80" border="2" alt="Preview" />
+					<img src="<?php echo $path;?><?php echo $row->image;?>" name="imagelib" width="80" height="80" border="2" alt="<?php echo T_('Preview') ?>" />
 					</td>
 				</tr>
 				<tr>
 					<td>
-					Image Position:
+					<?php echo T_('Image Position:') ?>
 					</td>
 					<td>
 					<?php echo $lists['image_position']; ?>
@@ -334,7 +332,7 @@
 				</tr>
 				<tr>
 					<td>
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -342,7 +340,7 @@
 				</tr>
 				<tr>
 					<td>
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -350,7 +348,7 @@
 				</tr>
 				<tr>
 					<td>
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -358,7 +356,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Description:
+					<?php echo T_('Description:') ?>
 					</td>
 					<td colspan="2">
 					<?php
@@ -379,18 +377,18 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Link to Menu
+					<?php echo T_('Link to Menu') ?>
 					</th>
 				<tr>
 				<tr>
 					<td colspan="2">
-					This will create a new menu item in the menu you select
+					<?php echo T_('This will create a new menu item in the menu you select') ?>
 					<br /><br />
 					</td>
 				<tr>
 				<tr>
 					<td valign="top" width="100px">
-					Select a Menu
+					<?php echo T_('Select a Menu') ?>
 					</td>
 					<td>
 					<?php echo $lists['menuselect']; ?>
@@ -398,7 +396,7 @@
 				<tr>
 				<tr>
 					<td valign="top" width="100px">
-					Select Menu Type
+					<?php echo T_('Select Menu Type') ?>
 					</td>
 					<td>
 					<?php echo $lists['link_type']; ?>
@@ -406,7 +404,7 @@
 				<tr>
 				<tr>
 					<td valign="top" width="100px">
-					Menu Item Name
+					<?php echo T_('Menu Item Name') ?>
 					</td>
 					<td>
 					<input type="text" name="link_name" class="inputbox" value="" size="25" />
@@ -416,12 +414,12 @@
 					<td>
 					</td>
 					<td>
-					<input name="menu_link" type="button" class="button" value="Link to Menu" onClick="submitbutton('menulink');" />
+					<input name="menu_link" type="button" class="button" value="<?php echo T_('Link to Menu') ?>" onClick="submitbutton('menulink');" />
 					</td>
 				<tr>
 				<tr>
 					<th colspan="2">
-					Existing Menu Links
+					<?php echo T_('Existing Menu Links') ?>
 					</th>
 				</tr>
 				<?php
@@ -429,7 +427,7 @@
 					?>
 					<tr>
 						<td colspan="2">
-						None
+						<?php echo T_('None') ?>
 						</td>
 					</tr>
 					<?php
@@ -445,10 +443,10 @@
 			<?php
 			} else {
 			?>
-			
+
 			<table class="adminform" width="40%">
 				<tr><th>&nbsp;</th></tr>
-				<tr><td>Menu links available when saved</td></tr>
+				<tr><td><?php echo T_('Menu links available when saved') ?></td></tr>
 			</table>
 			<?php
 			}
@@ -461,7 +459,7 @@
 					</table>
 					</div>
 					</td>
-					
+
 				</tr>
 			</table>
 
@@ -486,7 +484,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="sections">
-			Copy Section
+			<?php echo T_('Copy Section') ?>
 			</th>
 		</tr>
 		</table>
@@ -496,41 +494,49 @@
 		<tr>
 			<td width="3%"></td>
 			<td align="left" valign="top" width="30%">
-			<strong>Copy to Section:</strong>
+			<strong><?php echo T_('Copy to Section:') ?></strong>
 			<br />
-			<input class="text_area" type="text" name="title" value="" size="35" maxlength="50" title="The new Section name" />
+			<input class="text_area" type="text" name="title" value="" size="35" maxlength="50" title="<?php echo T_('The new Section name') ?>" />
 			<br /><br />
 			</td>
 			<td align="left" valign="top" width="20%">
-			<strong>Categories being copied:</strong>
+			<strong><?php echo T_('Categories being copied:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
-			foreach ( $categories as $category ) {
-				echo "<li>". $category->name ."</li>";
-				echo "\n <input type=\"hidden\" name=\"category[]\" value=\"$category->id\" />";
+			if ($categories) {
+				foreach ( $categories as $category ) {
+					echo "<li>". $category->name ."</li>";
+					echo "\n <input type=\"hidden\" name=\"category[]\" value=\"$category->id\" />";
+				}
+			} else {
+				echo 'none';
 			}
 			echo "</ol>";
 			?>
 			</td>
 			<td valign="top" width="20%">
-			<strong>Content Items being copied:</strong>
+			<strong><?php echo T_('Content Items being copied:') ?></strong>
 			<br />
 			<?php
 			echo "<ol>";
-			foreach ( $contents as $content ) {
-				echo "<li>". $content->title ."</li>";
-				echo "\n <input type=\"hidden\" name=\"content[]\" value=\"$content->id\" />";
+			if ($contents) {
+				foreach ( $contents as $content ) {
+					echo "<li>". $content->title ."</li>";
+					echo "\n <input type=\"hidden\" name=\"content[]\" value=\"$content->id\" />";
+				}
+			} else {
+				echo 'none';
 			}
 			echo "</ol>";
 			?>
 			</td>
 			<td valign="top">
-			This will copy the Categories listed
+			<?php echo T_('This will copy the Categories listed
 			<br />
 			and all the items within the category (also listed)
 			<br />
-			to the new Section created.
+			to the new Section created.') ?>
 			</td>.
 		</tr>
 		</table>
diff -ruN 4.5.4/administrator/components/com_sections/admin.sections.php 4.6rc2/administrator/components/com_sections/admin.sections.php
--- 4.5.4/administrator/components/com_sections/admin.sections.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_sections/admin.sections.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,17 +1,20 @@
 <?php
 /**
-* @version $Id: admin.sections.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Sections
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 require_once( $mainframe->getPath( 'admin_html' ) );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
 
 // get parameters from the URL or submitted form
 $scope 		= mosGetParam( $_REQUEST, 'scope', '' );
@@ -185,7 +188,7 @@
 
 	// fail if checked out not by 'me'
 	if ( $row->checked_out && $row->checked_out <> $my->id ) {
-		$msg = 'The section '. $row->title .' is currently being edited by another administrator';
+		$msg = sprintf(T_('The section %s is currently being edited by another administrator'), $row->title);
 		mosRedirect( 'index2.php?option='. $option .'&scope='. $row->scope .'&mosmsg='. $msg );
 	}
 
@@ -203,15 +206,15 @@
 			for( $i = 0; $i < $count; $i++ ) {
 				switch ( $menus[$i]->type ) {
 					case 'content_section':
-						$menus[$i]->type = 'Section Table';
+						$menus[$i]->type = T_('Section Table');
 						break;
 
 					case 'content_blog_section':
-						$menus[$i]->type = 'Section Blog';
+						$menus[$i]->type = T_('Section Blog');
 						break;
 
 					case 'content_archive_section':
-						$menus[$i]->type = 'Section Blog Archive';
+						$menus[$i]->type = T_('Section Blog Archive');
 						break;
 				}
 			}
@@ -225,10 +228,10 @@
 	}
 
 	// build the html select list for section types
-	$types[] = mosHTML::makeOption( '', 'Select Type' );
-	$types[] = mosHTML::makeOption( 'content_section', 'Section List' );
-	$types[] = mosHTML::makeOption( 'content_blog_section', 'Section Blog' );
-	$types[] = mosHTML::makeOption( 'content_archive_section', 'Section Archive Blog' );
+	$types[] = mosHTML::makeOption( '', T_('Select Type') );
+	$types[] = mosHTML::makeOption( 'content_section', T_('Section List') );
+	$types[] = mosHTML::makeOption( 'content_blog_section', T_('Section Blog') );
+	$types[] = mosHTML::makeOption( 'content_archive_section', T_('Section Archive Blog') );
 	$lists['link_type'] 		= mosHTML::selectList( $types, 'link_type', 'class="inputbox" size="1"', 'value', 'text' );;
 
 	// build the html select list for ordering
@@ -302,13 +305,13 @@
 			break;
 
 		case 'apply':
-			$msg = 'Changes to Section saved';
+			$msg = T_('Changes to Section saved');
 			mosRedirect( 'index2.php?option='. $option .'&scope='. $scope .'&task=editA&hidemainmenu=1&id='. $row->id, $msg );
 			break;
 
 			case 'save':
 		default:
-			$msg = 'Section saved';
+			$msg = T_('Section saved');
 			mosRedirect( 'index2.php?option='. $option .'&scope='. $scope, $msg );
 			break;
 	}
@@ -323,7 +326,7 @@
 	global $database;
 
 	if (count( $cid ) < 1) {
-		echo "<script> alert('Select a section to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select a section to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -361,12 +364,12 @@
 
 	if (count( $err )) {
 		$cids = implode( ', ', $err );
-		$msg = 'Sections(s): '. $cids .' cannot be removed as they contain categories';
+		$msg = sprintf(T_('Sections(s): %s cannot be removed as they contain categories'), $cids);
 		mosRedirect( 'index2.php?option='. $option .'&scope='. $scope, $msg );
 	}
 
 	$names = implode( ', ', $name );
-	$msg = 'Section(s): '. $names .' successfully deleted';
+	$msg = sprintf(T_('Section(s): %s successfully deleted'), $names);
 	mosRedirect( 'index2.php?option='. $option .'&scope='. $scope, $msg );
 }
 
@@ -383,8 +386,8 @@
 	global $database, $my;
 
 	if ( !is_array( $cid ) || count( $cid ) < 1 ) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select a section to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select a section to '), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -392,7 +395,7 @@
 	$count = count( $cid );
 	if ( $publish ) {
 		if ( !$count ){
-			echo "<script> alert('Cannot Publish an Empty Section $count'); window.history.go(-1);</script>\n";
+			echo "<script> alert('".T_('Cannot Publish an Empty Section')."'); window.history.go(-1);</script>\n";
 			return;
 		}
 	}
@@ -463,7 +466,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to move'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to move')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -581,7 +584,7 @@
 	$sectionOld = new mosSection ( $database );
 	$sectionOld->load( $sectionMove );
 
-	$msg = 'Section '. $sectionOld-> name .' and all its Categories and Items have been copied as '. $title;
+	$msg = sprintf(T_('Section %s and all its Categories and Items have been copied as %s'), $sectionOld-> name, $title);
 	mosRedirect( 'index2.php?option=com_sections&scope=content&mosmsg='. $msg );
 }
 
@@ -620,17 +623,17 @@
 	switch ( $type ) {
 		case 'content_section':
 			$link 		= 'index.php?option=com_content&task=section&id='. $id;
-			$menutype	= 'Section Table';
+			$menutype	= T_('Section Table');
 			break;
 
 		case 'content_blog_section':
 			$link 		= 'index.php?option=com_content&task=blogsection&id='. $id;
-			$menutype	= 'Section Blog';
+			$menutype	= T_('Section Blog');
 			break;
 
 		case 'content_archive_section':
 			$link 		= 'index.php?option=com_content&task=archivesection&id='. $id;
-			$menutype	= 'Section Blog Archive';
+			$menutype	= T_('Section Blog Archive');
 			break;
 	}
 
@@ -654,46 +657,34 @@
 	$row->checkin();
 	$row->updateOrder( 'scope="'. $row->scope .'"' );
 
-	$msg = $name .' ( '. $menutype .' ) in menu: '. $menu .' successfully created';
+	$msg = sprintf(T_('%s ( %s ) in menu: %s successfully created'), $name, $menutype, $menu);
 	mosRedirect( 'index2.php?option=com_sections&scope=content&task=editA&hidemainmenu=1&id='. $id,  $msg );
 }
 
 function saveOrder( &$cid ) {
 	global $database;
-
-	$total		= count( $cid );
 	$order 		= mosGetParam( $_POST, 'order', array(0) );
-	$row 		= new mosSection( $database );
-	$conditions = array();
-
+	$row		= new mosMenu( $database );
+	$scopes = array();
     // update ordering values
-	for( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
 		if ($row->ordering != $order[$i]) {
 			$row->ordering = $order[$i];
 	        if (!$row->store()) {
 	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
 	            exit();
-	        } // if
+	        }
 	        // remember to updateOrder this group
-	        $condition = "scope='$row->scope'";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // if
-	} // for
-
+	        $scopes[$row->scope] = $row->id;
+	    }
+	}
 	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
+	foreach ($scopes as $scope=>$rowid) {
+		$row->updateOrder("scope = '$scope'");
 	} // foreach
 
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_sections&scope=content', $msg );
 } // saveOrder
 ?>
diff -ruN 4.5.4/administrator/components/com_sections/toolbar.sections.html.php 4.6rc2/administrator/components/com_sections/toolbar.sections.html.php
--- 4.5.4/administrator/components/com_sections/toolbar.sections.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_sections/toolbar.sections.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,25 +1,23 @@
 <?php
 /**
-* @version $Id: toolbar.sections.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Sections
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Sections
-*/
 class TOOLBAR_sections {
 	/**
 	* Draws the menu for Editing an existing category
 	*/
-	function _EDIT() {
+	function _EDIT($task) {
 		global $id;
 		
 		mosMenuBar::startTable();
@@ -31,12 +29,13 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.sections.edit' );
+		$ref = $task == 'new' ? 'new' : 'edit';
+		mosMenuBar::help( $ref );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -49,7 +48,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.sections.copy' );
+		mosMenuBar::help( 'copy' );
 		mosMenuBar::endTable();
 	}
 	/**
@@ -63,13 +62,13 @@
 		mosMenuBar::spacer();
 		mosMenuBar::addNewX();
 		mosMenuBar::spacer();
-		mosMenuBar::customX( 'copyselect', 'copy.png', 'copy_f2.png', 'Copy', true );
+		mosMenuBar::customX( 'copyselect', 'copy.png', 'copy_f2.png', T_('Copy'), true );
 		mosMenuBar::spacer();
 		mosMenuBar::editListX();
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.sections.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_sections/toolbar.sections.php 4.6rc2/administrator/components/com_sections/toolbar.sections.php
--- 4.5.4/administrator/components/com_sections/toolbar.sections.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_sections/toolbar.sections.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.sections.php,v 1.1 2005/07/22 01:53:21 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Sections
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -17,7 +19,7 @@
 	case 'new':
 	case 'edit':
 	case 'editA':
-		TOOLBAR_sections::_EDIT();
+		TOOLBAR_sections::_EDIT($task);
 		break;
 
 	case 'copyselect':
diff -ruN 4.5.4/administrator/components/com_statistics/admin.statistics.html.php 4.6rc2/administrator/components/com_statistics/admin.statistics.html.php
--- 4.5.4/administrator/components/com_statistics/admin.statistics.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_statistics/admin.statistics.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.statistics.html.php,v 1.1 2005/07/22 01:53:22 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Statistics
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Statistics
-*/
 class HTML_statistics {
 	function show( &$browsers, &$platforms, $tldomains, $bstats, $pstats, $dstats, $sorts, $option ) {
 	    global $mosConfig_live_site;
@@ -32,17 +30,17 @@
 		</style>
 		<table class="adminheading">
 		<tr>
-			<th class="browser">Browser, OS, Domain Statistics</th>
+			<th class="browser"><?php echo T_('Browser, OS, Domain Statistics') ?></th>
 		</tr>
 		</table>
 		<form action="index2.php" method="post" name="adminForm">
 		<?php
 		$tabs->startPane("statsPane");
-		$tabs->startTab("Browsers","browsers-page");
+		$tabs->startTab(T_("Browsers"),"browsers-page");
 		?>
 		<table class="adminlist">
 		<tr>
-			<th align="left">&nbsp;Browser <?php echo $sorts['b_agent'];?></th>
+			<th align="left">&nbsp;<?php echo T_('Browser') ?> <?php echo $sorts['b_agent'];?></th>
 			<th>&nbsp;</th>
 			<th width="100" align="left">% <?php echo $sorts['b_hits'];?></th>
 			<th width="100" align="left">#</th>
@@ -81,11 +79,11 @@
 		</table>
 		<?php
 		$tabs->endTab();
-		$tabs->startTab("OS Stats","os-page");
+		$tabs->startTab(T_("OS Stats"),"os-page");
 		?>
 		<table class="adminlist">
 		<tr>
-			<th align="left">&nbsp;Operating System <?php echo $sorts['o_agent'];?></th>
+			<th align="left">&nbsp;<?php echo T_('Operating System') ?> <?php echo $sorts['o_agent'];?></th>
 			<th>&nbsp;</th>
 			<th width="100" align="left">% <?php echo $sorts['o_hits'];?></th>
 			<th width="100" align="left">#</th>
@@ -124,11 +122,11 @@
 		</table>
 		<?php
 		$tabs->endTab();
-		$tabs->startTab("Domain Stats","domain-page");
+		$tabs->startTab(T_("Domain Stats"),"domain-page");
 		?>
 		<table class="adminlist">
 		<tr>
-			<th align="left">&nbsp;Domain <?php echo $sorts['d_agent'];?></th>
+			<th align="left">&nbsp;<?php echo T_('Domain') ?> <?php echo $sorts['d_agent'];?></th>
 			<th>&nbsp;</th>
 			<th width="100" align="left">% <?php echo $sorts['d_hits'];?></th>
 			<th width="100" align="left">#</th>
@@ -179,7 +177,7 @@
 		?>
 		<table cellpadding="4" cellspacing="0" border="0" width="100%" class="adminheading">
 		<tr>
-			<th width="100%" class="impressions">Page Impression Statistics</th>
+			<th width="100%" class="impressions"><?php echo T_('Page Impression Statistics') ?></th>
 		</tr>
 		</table>
 		
@@ -187,8 +185,8 @@
 		<table class="adminlist">
 		<tr>
 			<th style="text-align:right">#</th>
-			<th class="title">Title</th>
-			<th align="center" nowrap="nowrap">Page Impressions</th>
+			<th class="title"><?php echo T_('Title') ?></th>
+			<th align="center" nowrap="nowrap"><?php echo T_('Page Impressions') ?></th>
 		</tr>
 		<?php
 		$i = $pageNav->limitstart;
@@ -225,9 +223,9 @@
 		<table cellpadding="4" cellspacing="0" border="0" width="100%" class="adminheading">
 			<tr>
 				<th width="100%" class="searchtext">
-				Search Engine Text :
-				<span class="componentheading">logging is :
-				<?php echo $mainframe->getCfg( 'enable_log_searches' ) ? '<b><font color="green">Enabled</font></b>' : '<b><font color="red">Disabled</font></b>' ?>
+				<?php echo T_('Search Engine Text :') ?>
+				<span class="componentheading"><?php echo T_('logging is :') ?>
+				<?php echo $mainframe->getCfg( 'enable_log_searches' ) ? '<b><font color="green">'.T_('Enabled').'</font></b>' : '<b><font color="red">'.T_('Disabled').'</font></b>' ?>
 				</span>
 				</th>
 			</tr>
@@ -236,9 +234,9 @@
 		<table class="adminlist">
 		<tr>
 			<th style="text-align:right">#</th>
-			<th class="title">Search Text</th>
-			<th nowrap="nowrap">Times Requested</th>
-			<th nowrap="nowrap">Results Returned</th>
+			<th class="title"><?php echo T_('Search Text') ?></th>
+			<th nowrap="nowrap"><?php echo T_('Times Requested') ?></th>
+			<th nowrap="nowrap"><?php echo T_('Results Returned') ?></th>
 		</tr>
 		<?php
 		$k = 0;
diff -ruN 4.5.4/administrator/components/com_statistics/admin.statistics.php 4.6rc2/administrator/components/com_statistics/admin.statistics.php
--- 4.5.4/administrator/components/com_statistics/admin.statistics.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_statistics/admin.statistics.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.statistics.php,v 1.1 2005/07/22 01:53:22 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Statistics
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_statistics/toolbar.statistics.html.php 4.6rc2/administrator/components/com_statistics/toolbar.statistics.html.php
--- 4.5.4/administrator/components/com_statistics/toolbar.statistics.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_statistics/toolbar.statistics.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,24 +1,22 @@
 <?php
 /**
-* @version $Id: toolbar.statistics.html.php,v 1.1 2005/07/22 01:53:22 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Statistics
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Statistics
-*/
 class TOOLBAR_statistics {
 	function _SEARCHES() {
 		mosMenuBar::startTable();
-		mosMenuBar::help( '453.screen.stats.searches' );
+		mosMenuBar::help( 'searches' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_statistics/toolbar.statistics.php 4.6rc2/administrator/components/com_statistics/toolbar.statistics.php
--- 4.5.4/administrator/components/com_statistics/toolbar.statistics.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_statistics/toolbar.statistics.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.statistics.php,v 1.1 2005/07/22 01:53:22 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Statistics
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_syndicate/admin.syndicate.html.php 4.6rc2/administrator/components/com_syndicate/admin.syndicate.html.php
--- 4.5.4/administrator/components/com_syndicate/admin.syndicate.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_syndicate/admin.syndicate.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.syndicate.html.php,v 1.1 2005/07/22 01:53:28 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Syndicate
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Syndicate
-*/
 class HTML_syndicate {
 	
 	function settings( $option, &$params, $id ) {
@@ -25,7 +23,7 @@
 		<table class="adminheading">
 		<tr> 
 			<th>
-			Syndication Settings
+			<?php echo T_('Syndication Settings') ?>
 			</th>
 		</tr>
 		</table>
@@ -33,7 +31,7 @@
 		<table class="adminform">
 		<tr>
 			<th>
-			Parameters
+			<?php echo T_('Parameters') ?>
 			</th>
 		</tr>
 		<tr>
@@ -48,7 +46,7 @@
 		<input type="hidden" name="id" value="<?php echo $id; ?>" />
 		<input type="hidden" name="name" value="Syndicate" />
 		<input type="hidden" name="admin_menu_link" value="option=com_syndicate" />
-		<input type="hidden" name="admin_menu_alt" value="Manage Syndication Settings" />
+		<input type="hidden" name="admin_menu_alt" value="<?php echo T_('Manage Syndication Settings') ?>" />
 		<input type="hidden" name="option" value="com_syndicate" />
 		<input type="hidden" name="admin_menu_img" value="js/ThemeOffice/component.png" />
 		<input type="hidden" name="option" value="<?php echo $option; ?>" />
diff -ruN 4.5.4/administrator/components/com_syndicate/admin.syndicate.php 4.6rc2/administrator/components/com_syndicate/admin.syndicate.php
--- 4.5.4/administrator/components/com_syndicate/admin.syndicate.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_syndicate/admin.syndicate.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,19 +1,21 @@
 <?php
 /**
-* @version $Id: admin.syndicate.php,v 1.1 2005/07/22 01:53:28 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Syndicate
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' ) | $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_contact' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -53,7 +55,7 @@
 	$row->load( $id );
 
 	// get params definitions
-	$params =& new mosParameters( $row->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
+	$params =& new mosAdminParameters( $row->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
 
 	HTML_syndicate::settings( $option, $params, $id );
 }
@@ -92,7 +94,7 @@
 		exit();
 	}
 
-	$msg = 'Settings successfully Saved';
+	$msg = T_('Settings successfully Saved');
 	mosRedirect( 'index2.php?option='. $option, $msg );
 }
 
diff -ruN 4.5.4/administrator/components/com_syndicate/syndicate.xml 4.6rc2/administrator/components/com_syndicate/syndicate.xml
--- 4.5.4/administrator/components/com_syndicate/syndicate.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_syndicate/syndicate.xml	2006-04-13 04:52:39.000000000 -0500
@@ -2,10 +2,10 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Syndicate</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component controls the Syndication settings</description>
 	<params>
@@ -16,11 +16,11 @@
 		<param name="cache_time" type="text" size="8" default="3600" label="Cache Time" description="Cache file will refresh every x seconds" />
 		<param name="@spacer" type="spacer" default="" label="" description="" />
 		<param name="count" type="text" size="4" default="5" label="# Items" description="Number of Items to syndicate" />
-		<param name="title" type="text" size="40" default="Powered by Mambo 4.5.2" label="Title" description="Syndication Title" />
+		<param name="title" type="text" size="40" default="Powered by Mambo" label="Title" description="Syndication Title" />
 		<param name="description" type="textarea" rows="5" cols="30" default="Mambo site syndication" label="Description" description="Syndication Description" />
 		<param name="@spacer" type="spacer" default="" label="" description="" />
 		<param name="image_file" type="imagelist" directory="/images/M_images" default="" label="Image" description="Image to be included in feed" />
-		<param name="image_alt" type="text" size="30" default="Powered by Mambo 4.5.2" label="Image Alt" description="Alt text for image" />
+		<param name="image_alt" type="text" size="30" default="Powered by Mambo" label="Image Alt" description="Alt text for image" />
 		<param name="@spacer" type="spacer" default="" label="" description="" />
 		<param name="limit_text" type="radio" default="1" label="Limit Text" description="Limit the article text to the value indicated below">
 			<option value="0">No</option>
@@ -46,7 +46,7 @@
 			<option value="rss091.xml">RSS 0.91</option>
 			<option value="rss10.xml">RSS 1.0</option>
 			<option value="rss20.xml">RSS 2.0</option>
-			<option value="atom03.xml">ATOM 0.3</option>
+			<option value="atom10.xml">ATOM 1.0</option>
 		</param>
 		<param name="bookmark_file" type="text" size="40" default="" label="Bookmark file" description="Special file name, if empty the default will be used." />
 	</params>
diff -ruN 4.5.4/administrator/components/com_syndicate/toolbar.syndicate.html.php 4.6rc2/administrator/components/com_syndicate/toolbar.syndicate.html.php
--- 4.5.4/administrator/components/com_syndicate/toolbar.syndicate.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_syndicate/toolbar.syndicate.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: toolbar.syndicate.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Syndicate
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Syndicate
-*/
 class TOOLBAR_syndicate {
 
 	function _DEFAULT() {
@@ -23,7 +21,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.syndicate' );
+		mosMenuBar::help( 'settings' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_syndicate/toolbar.syndicate.php 4.6rc2/administrator/components/com_syndicate/toolbar.syndicate.php
--- 4.5.4/administrator/components/com_syndicate/toolbar.syndicate.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_syndicate/toolbar.syndicate.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.syndicate.php,v 1.1 2005/07/22 01:53:28 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Syndicate
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_templates/admin.templates.class.php 4.6rc2/administrator/components/com_templates/admin.templates.class.php
--- 4.5.4/administrator/components/com_templates/admin.templates.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_templates/admin.templates.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.templates.class.php,v 1.1 2005/07/22 01:53:29 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Templates
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Templates
-*/
 class mosTemplatePosition extends mosDBTable {
 	var $id=null;
 	var $position=null;
diff -ruN 4.5.4/administrator/components/com_templates/admin.templates.html.php 4.6rc2/administrator/components/com_templates/admin.templates.html.php
--- 4.5.4/administrator/components/com_templates/admin.templates.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_templates/admin.templates.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.templates.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Templates
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Templates
-*/
 class HTML_templates {
 	/**
 	* @param array An array of data objects
@@ -39,7 +37,7 @@
 			if (document.adminForm.doPreview.checked) {
 				var src = '<?php echo $mosConfig_live_site . ($client == 'admin' ? '/administrator' : '');?>/templates/'+name+'/template_thumbnail.png';
 				var html=name;
-				html = '<br /><img border="1" src="'+src+'" name="imagelib" alt="No preview available" width="206" height="145" />';
+				html = '<br /><img border="1" src="'+src+'" name="imagelib" alt="<?php echo T_('No preview available') ?>" width="206" height="145" />';
 				return overlib(html, CAPTION, name)
 			} else {
 				return false;
@@ -52,10 +50,10 @@
 		<table class="adminheading">
 		<tr>
 			<th class="templates">
-			Template Manager <small><small>[ <?php echo $client == 'admin' ? 'Administrator' : 'Site';?> ]</small></small>
+			<?php echo T_('Template Manager') ?> <small><small>[ <?php echo $client == 'admin' ? T_('Administrator') : T_('Site');?> ]</small></small>
 			</th>
 			<td align="right" nowrap="true">
-			Preview Template
+			<?php echo T_('Preview Template') ?>
 			</td>
 			<td align="right">
 			<input type="checkbox" name="doPreview" checked="checked"/>
@@ -67,37 +65,37 @@
 			<th width="5%">#</th>
 			<th width="5%">&nbsp;</th>
 			<th width="25%" class="title">
-			Name
+			<?php echo T_('Name') ?>
 			</th>
 			<?php
 			if ( $client == 'admin' ) {
 				?>
 				<th width="10%">
-				Default
+				<?php echo T_('Default') ?>
 				</th>
 				<?php
 			} else {
 				?>
 				<th width="5%">
-				Default
+				<?php echo T_('Default') ?>
 				</th>
 				<th width="5%">
-				Assigned
+				<?php echo T_('Assigned') ?>
 				</th>
 				<?php
 			}
 			?>
 			<th width="20%" align="left">
-			Author
+			<?php echo T_('Author') ?>
 			</th>
 			<th width="5%" align="center">
-			Version
+			<?php echo T_('Version') ?>
 			</th>
 			<th width="10%" align="center">
-			Date
+			<?php echo T_('Date') ?>
 			</th>
 			<th width="20%" align="left">
-			Author URL
+			<?php echo T_('Author URL') ?>
 			</th>
 		</tr>
 		<?php
@@ -134,7 +132,7 @@
 					<?php
 					if ( $row->published == 1 ) {
 						?>
-					<img src="images/tick.png" alt="Published">
+					<img src="images/tick.png" alt="<?php echo T_('Published') ?>">
 						<?php
 					} else {
 						?>
@@ -150,7 +148,7 @@
 					<?php
 					if ( $row->published == 1 ) {
 						?>
-						<img src="images/tick.png" alt="Default">
+						<img src="images/tick.png" alt="<?php echo T_('Default') ?>">
 						<?php
 					} else {
 						?>
@@ -163,7 +161,7 @@
 					<?php
 					if ( $row->assigned == 1 ) {
 						?>
-						<img src="images/tick.png" alt="Assigned" />
+						<img src="images/tick.png" alt="<?php echo T_('Assigned') ?>" />
 						<?php
 					} else {
 						?>
@@ -220,10 +218,10 @@
 		<form action="index2.php" method="post" name="adminForm">
 	    <table cellpadding="1" cellspacing="1" border="0" width="100%">
 		<tr>
-	        <td width="290"><table class="adminheading"><tr><th class="templates">Template HTML Editor</th></tr></table></td>
+	        <td width="290"><table class="adminheading"><tr><th class="templates"><?php echo T_('Template HTML Editor') ?></th></tr></table></td>
 	        <td width="220">
 	            <span class="componentheading">index.php is :
-	            <b><?php echo is_writable($template_path) ? '<font color="green"> Writeable</font>' : '<font color="red"> Unwriteable</font>' ?></b>
+	            <b><?php echo is_writable($template_path) ? '<span class="green">'.T_('Writeable').'</span>' : '<span class="red">'.T_('Unwriteable').'</span>' ?></b>
 	            </span>
 	        </td>
 <?php
@@ -232,14 +230,14 @@
 ?>
 	        <td>
 	            <input type="checkbox" id="disable_write" name="disable_write" value="1"/>
-	            <label for="disable_write">Make unwriteable after saving</label>
+	            <label for="disable_write"><?php echo T_('Make unwriteable after saving') ?></label>
 	        </td>
 <?php
 	            } else {
 ?>
 	        <td>
 	            <input type="checkbox" id="enable_write" name="enable_write" value="1"/>
-	            <label for="enable_write">Override write protection while saving</label>
+	            <label for="enable_write"><?php echo T_('Override write protection while saving') ?></label>
 	        </td>
 <?php
 	            } // if
@@ -274,10 +272,10 @@
 		<form action="index2.php" method="post" name="adminForm">
 	    <table cellpadding="1" cellspacing="1" border="0" width="100%">
 		<tr>
-	        <td width="280"><table class="adminheading"><tr><th class="templates">Template CSS Editor</th></tr></table></td>
+	        <td width="280"><table class="adminheading"><tr><th class="templates"><?php echo T_('Template CSS Editor') ?></th></tr></table></td>
 	        <td width="260">
 	            <span class="componentheading">template_css.css is :
-	            <b><?php echo is_writable($css_path) ? '<font color="green"> Writeable</font>' : '<font color="red"> Unwriteable</font>' ?></b>
+	            <b><?php echo is_writable($css_path) ? '<span class="green">'.T_('Writeable').'</span>' : '<span class="red">'.T_('Unwriteable').'</span>' ?></b>
 	            </span>
 	        </td>
 <?php
@@ -286,14 +284,14 @@
 ?>
 	        <td>
 	            <input type="checkbox" id="disable_write" name="disable_write" value="1"/>
-	            <label for="disable_write">Make unwriteable after saving</label>
+	            <label for="disable_write"><?php echo T_('Make unwriteable after saving') ?></label>
 	        </td>
 <?php
 	            } else {
 ?>
 	        <td>
 	            <input type="checkbox" id="enable_write" name="enable_write" value="1"/>
-	            <label for="enable_write">Override write protection while saving</label>
+	            <label for="enable_write"><?php echo T_('Override write protection while saving') ?></label>
 	        </td>
 <?php
 	            } // if
@@ -325,12 +323,12 @@
 		<table class="adminform">
 		<tr>
 			<th class="left" colspan="2">
-			Assign template <?php echo $template; ?> to menu items
+			<?php printf(T_('Assign template %s to menu items'), $template)?>
 			</th>
 		</tr>
 		<tr>
 			<td valign="top" align="left">
-			Page(s):
+			<?php echo T_('Page(s):') ?>
 			</td>
 			<td width="90%">
 			<?php echo $menulist; ?>
@@ -358,7 +356,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="templates">
-			Module Positions
+			<?php echo T_('Module Positions') ?>
 			</th>
 		</tr>
 		</table>
@@ -372,10 +370,10 @@
 			#
 			</th>
 			<th align="left">
-			Position
+			<?php echo T_('Position') ?>
 			</th>
 			<th align="left">
-			Description
+			<?php echo T_('Description') ?>
 			</th>
 			<?php
 		}
diff -ruN 4.5.4/administrator/components/com_templates/admin.templates.php 4.6rc2/administrator/components/com_templates/admin.templates.php
--- 4.5.4/administrator/components/com_templates/admin.templates.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_templates/admin.templates.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,25 +1,25 @@
 <?php
 /**
-* @version $Id: admin.templates.php,v 1.1 2005/07/22 01:53:31 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Templates
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 // ensure user has access to this function
 if (!$acl->acl_check( 'administration', 'manage', 'users', $GLOBALS['my']->usertype, 'components', 'com_templates' )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
 require_once( $mosConfig_absolute_path .'/administrator/components/com_templates/admin.templates.class.php' );
-// XML library
-require_once( $mosConfig_absolute_path .'/includes/domit/xml_domit_lite_include.php' );
 
 $task = trim( strtolower( mosGetParam( $_REQUEST, "task", "" ) ) );
 $cid = mosGetParam( $_REQUEST, "cid", array(0) );
@@ -128,24 +128,20 @@
 
 		foreach($xmlFilesInDir as $xmlfile) {
 			// Read the file to see if it's a valid template XML file
-			$xmlDoc =& new DOMIT_Lite_Document();
-			$xmlDoc->resolveErrors( true );
-			if (!$xmlDoc->loadXML( $dirName . $xmlfile, false, true )) {
-				continue;
-			}
-
-			$element = &$xmlDoc->documentElement;
-
-			if ($element->getTagName() != 'mosinstall') {
-				continue;
-			}
-			if ($element->getAttribute( 'type' ) != 'template') {
-				continue;
-			}
-
+			$parser =& new mosXMLDescription($dirName.$xmlfile);
+			if ($parser->getType() != 'template') continue;
 			$row = new StdClass();
 			$row->id = $rowid;
 			$row->directory = $templateDir;
+
+			$row->creationdate = $parser->getCreationDate('template');
+			$row->name = $parser->getName('template');
+			$row->author = $parser->getAuthor('template');
+			$row->copyright = $parser->getCopyright('template');
+			$row->authorEmail = $parser->getAuthorEmail('template');
+			$row->authorUrl = $parser->getAuthorUrl('template');
+			$row->version = $parser->getVersion('template');
+/*
 			$element = &$xmlDoc->getElementsByPath('name', 1 );
 			$row->name = $element->getText();
 
@@ -166,7 +162,7 @@
 
 			$element = &$xmlDoc->getElementsByPath('version', 1);
 			$row->version = $element ? $element->getText() : '';
-
+*/
 			// Get info from db
 			if ($cur_template == $templateDir) {
 				$row->published	= 1;
@@ -232,7 +228,7 @@
 	$cur_template = $database->loadResult();
 
 	if ($cur_template == $cid) {
-		echo "<script>alert(\"You can not delete template in use.\"); window.history.go(-1); </script>\n";
+		echo "<script>alert('".T_('You can not delete template in use.')."'); window.history.go(-1); </script>\n";
 		exit();
 	}
 
@@ -259,7 +255,7 @@
 
 		HTML_templates::editTemplateSource( $p_tname, $content, $option, $client );
 	} else {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation Failed: Could not open'. $file );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, sprintf(T_('Operation Failed: Could not open %s' ), $file) );
 	}
 }
 
@@ -271,10 +267,10 @@
 	$filecontent = mosGetParam( $_POST, 'filecontent', '', _MOS_ALLOWHTML );
 
 	if ( !$template ) {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: No template specified.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: No template specified.') );
 	}
 	if ( !$filecontent ) {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: Content empty.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: Content empty.') );
 	}
 
 	if ( $client == 'admin' ) {
@@ -289,7 +285,7 @@
 
 	clearstatcache();
 	if ( is_writable( $file ) == false ) {
-		mosRedirect( 'index2.php?option='. $option , 'Operation failed: '. $file .' is not writable.' );
+		mosRedirect( 'index2.php?option='. $option , sprintf(T_('Operation failed: %s is not writable.'), $file) );
 	}
 
 	if ( $fp = fopen ($file, 'w' ) ) {
@@ -304,7 +300,7 @@
 		mosRedirect( 'index2.php?option='. $option .'&client='. $client );
 	} else {
 		if ($enable_write) @chmod($file, $oldperms);
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: Failed to open file for writing.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: Failed to open file for writing.') );
 	}
 
 }
@@ -324,7 +320,7 @@
 
 		HTML_templates::editCSSSource( $p_tname, $content, $option, $client );
 	} else {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation Failed: Could not open'. $file );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, sprintf(T_('Operation Failed: Could not open %s' ), $file) );
 	}
 }
 
@@ -335,11 +331,11 @@
 	$filecontent = mosGetParam( $_POST, 'filecontent', '', _MOS_ALLOWHTML );
 
 	if ( !$template ) {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: No template specified.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: No template specified.') );
 	}
 
 	if ( !$filecontent ) {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: Content empty.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: Content empty.') );
 	}
 
 	if ( $client == 'admin' ) {
@@ -354,7 +350,7 @@
 
 	clearstatcache();
 	if ( is_writable( $file ) == false ) {
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: The file is not writable.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: The file is not writable.') );
 	}
 
 	if ($fp = fopen ($file, 'w')) {
@@ -369,7 +365,7 @@
 		mosRedirect( 'index2.php?option='. $option );
 	} else {
 		if ($enable_write) @chmod($file, $oldperms);
-		mosRedirect( 'index2.php?option='. $option .'&client='. $client, 'Operation failed: Failed to open file for writing.' );
+		mosRedirect( 'index2.php?option='. $option .'&client='. $client, T_('Operation failed: Failed to open file for writing.') );
 	}
 
 }
@@ -451,6 +447,6 @@
 			$database->query();
 		}
 	}
-	mosRedirect( 'index2.php?option='. $option .'&task=positions', 'Positions saved' );
+	mosRedirect( 'index2.php?option='. $option .'&task=positions', T_('Positions saved') );
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_templates/toolbar.templates.html.php 4.6rc2/administrator/components/com_templates/toolbar.templates.html.php
--- 4.5.4/administrator/components/com_templates/toolbar.templates.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_templates/toolbar.templates.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,32 +1,32 @@
 <?php
 /**
-* @version $Id: toolbar.templates.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Templates
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Templates
-*/
 class TOOLBAR_templates {
 	function _DEFAULT($client) {
 		mosMenuBar::startTable();
 		if ($client=="admin") {
-			mosMenuBar::custom('publish', 'publish.png', 'publish_f2.png', 'Default', true);
+			mosMenuBar::custom('publish', 'publish.png', 'publish_f2.png', T_('Default'), true);
 			mosMenuBar::spacer();
+			$client = '.'.$client;
 		} else {
 			mosMenuBar::makeDefault();
 			mosMenuBar::spacer();
 			mosMenuBar::assign();
 			mosMenuBar::spacer();
 		}
+		
 		mosMenuBar::addNew();
 		mosMenuBar::spacer();
 		mosMenuBar::editHtmlX( 'edit_source' );
@@ -35,7 +35,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.templates.main' );
+		mosMenuBar::help( 'manager' . $client );
 		mosMenuBar::endTable();
 	}
  	function _VIEW(){
@@ -50,7 +50,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.templates.edithtml' );
+		mosMenuBar::help( 'edit-html' );
 		mosMenuBar::endTable();
 	}
 
@@ -60,17 +60,17 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.templates.editcss' );
+		mosMenuBar::help( 'edit-css' );
 		mosMenuBar::endTable();
 	}
 
 	function _ASSIGN(){
 		mosMenuBar::startTable();
-		mosMenuBar::save( 'save_assign', 'Save' );
+		mosMenuBar::save( 'save_assign', T_('Save') );
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.templates.assign' );
+		mosMenuBar::help( 'assign' );
 		mosMenuBar::endTable();
 	}
 
@@ -80,7 +80,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.templates.modules' );
+		mosMenuBar::help( 'module-positions' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_templates/toolbar.templates.php 4.6rc2/administrator/components/com_templates/toolbar.templates.php
--- 4.5.4/administrator/components/com_templates/toolbar.templates.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_templates/toolbar.templates.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.templates.php,v 1.1 2005/07/22 01:53:31 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Templates
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_trash/admin.trash.html.php 4.6rc2/administrator/components/com_trash/admin.trash.html.php
--- 4.5.4/administrator/components/com_trash/admin.trash.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_trash/admin.trash.html.php	2006-03-06 08:02:33.000000000 -0600
@@ -1,345 +1,369 @@
-<?php
-/**
-* @version $Id: admin.trash.html.php,v 1.1 2005/07/22 01:53:32 eddieajau Exp $
-* @package Mambo
-* @subpackage Trash
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* HTML class for all trash component output
-* @package Mambo
-* @subpackage Trash
-*/
-class HTML_trash {
-	/**
-	* Writes a list of the Trash items
-	*/
-	function showList( $option, $contents, $menus, $pageNav_content, $pageNav_menu ) {
-		global $my;
-		$tabs = new mosTabs(1);
-		?>
-		<script language="javascript" type="text/javascript">
-		/**
-		* Toggles the check state of a group of boxes
-		*
-		* Checkboxes must have an id attribute in the form cb0, cb1...
-		* @param The number of box to 'check'
-		*/
-		function checkAll_xtd ( n ) {
-			var f = document.adminForm;
-			var c = f.toggle1.checked;
-			var n2 = 0;
-			for ( i=0; i < n; i++ ) {
-				cb = eval( 'f.cb1' + i );
-				if (cb) {
-					cb.checked = c;
-					n2++;
-				}
-			}
-			if (c) {
-				document.adminForm.boxchecked.value = n2;
-			} else {
-				document.adminForm.boxchecked.value = 0;
-			}
-		}
-		</script>	
-		<form action="index2.php" method="post" name="adminForm">
-		<table class="adminheading">
-		<tr>
-			<th class="trash">Trash Manager</th>
-		</tr>
-		</table>
-	
-		<?php
-		$tabs->startPane("content-pane");
-		$tabs->startTab("Content Items","content_items");
-		?>
-		<table class="adminheading" width="90%">
-		<tr>
-			<th><small>Content Items</small></th>
-		</tr>
-		</table>
-	
-		<table class="adminlist" width="90%">
-		<tr>
-			<th width="20">#</th>
-			<th width="20">
-			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $contents );?>);" />
-			</th>
-			<th width="20px">&nbsp;</th>
-			<th class="title">
-			Title
-			</th>
-			<th>
-			Section
-			</th>
-			<th>
-			Category
-			</th>
-			<th width="70px">
-			ID
-			</th>
-		</tr>
-		<?php
-		$k = 0;
-		$i = 0;
-		$n = count( $contents );
-		foreach ( $contents as $row ) {
-			?>
-			<tr class="<?php echo "row". $k; ?>">
-				<td align="center" width="30px">
-				<?php echo $i + 1 + $pageNav_content->limitstart;?>
-				</td>
-				<td width="20px" align="center"><?php echo mosHTML::idBox( $i, $row->id ); ?></td>
-				<td width="20px"></td>
-				<td nowrap>
-				<?php
-				echo $row->title;
-				?>
-				</td>
-				<td align="center" width="20%">
-				<?php
-				echo $row->sectname;
-				?>
-				</td>
-				<td align="center" width="20%">
-				<?php
-				echo $row->catname;
-				?>
-				</td>
-				<td align="center">
-				<?php
-				echo $row->id;
-				?>
-				</td>
-			</tr>
-			<?php
-			$k = 1 - $k;
-			$i++;
-		}
-		?>
-		</table>
-		<?php echo $pageNav_content->getListFooter(); ?>
-		<?php
-		$tabs->endTab();
-		$tabs->startTab("Menu Items","menu_items");
-		?>
-		<table class="adminheading" width="90%">
-		<tr>
-			<th><small>Menu Items</small></th>
-		</tr>
-		</table>
-	
-		<table class="adminlist" width="90%">
-		<tr>
-			<th width="20">#</th>
-			<th width="20">
-			<input type="checkbox" name="toggle1" value="" onClick="checkAll_xtd(<?php echo count( $menus );?>);" />
-			</th>
-			<th width="20px">&nbsp;</th>
-			<th class="title">
-			Title
-			</th>
-			<th>
-			Menu
-			</th>
-			<th>
-			Type
-			</th>
-			<th width="70px">
-			ID
-			</th>
-		</tr>
-		<?php
-		$k = 0;
-		$i = 0;
-		$n = count( $menus );
-		foreach ( $menus as $row ) {
-			?>
-			<tr class="<?php echo "row". $k; ?>">
-				<td align="center" width="30px">
-				<?php echo $i + 1 + $pageNav_menu->limitstart;?>
-				</td>
-				<td width="30px" align="center">
-				<input type="checkbox" id="cb1<?php echo $i;?>" name="mid[]" value="<?php echo $row->id; ?>" onclick="isChecked(this.checked);" />
-				</td>
-				<td width="20px"></td>
-				<td nowrap>
-				<?php
-				echo $row->name;
-				?>
-				</td>
-				<td align="center" width="20%">
-				<?php
-				echo $row->menutype;
-				?>
-				</td>
-				<td align="center" width="20%">
-				<?php
-				echo $row->type;
-				?>
-				</td>
-				<td align="center">
-				<?php
-				echo $row->id;
-				?>
-				</td>
-			</tr>
-			<?php
-			$k = 1 - $k;
-			$i++;
-		}
-		?>
-		</table>
-		<?php echo $pageNav_menu->getListFooter(); ?>
-		<?php
-		$tabs->endTab();
-		$tabs->endPane();
-		?>    
-	
-		<input type="hidden" name="option" value="<?php echo $option;?>" />
-		<input type="hidden" name="task" value="" />
-		<input type="hidden" name="boxchecked" value="0" />
-		</form>
-		<?php
-	}
-
-
-	/**
-	* A delete confirmation page
-	* Writes list of the items that have been selected for deletion
-	*/
-	function showDelete( $option, $cid, $items, $type ) {
-	?>
-		<form action="index2.php" method="post" name="adminForm">
-		<table class="adminheading">
-		<tr>
-			<th>Delete Items</th>
-		</tr>
-		</table>
-	
-		<br />
-		<table class="adminform">
-		<tr>
-			<td width="3%"></td>
-			<td align="left" valign="top" width="20%">
-			<strong>Number of Items:</strong>
-			<br />
-			<font color="#000066"><strong><?php echo count( $cid ); ?></strong></font>
-			<br /><br />
-			</td>
-			<td align="left" valign="top" width="25%">
-			<strong>Items being Deleted:</strong>
-			<br />
-			<?php
-			echo "<ol>";
-			foreach ( $items as $item ) {
-				echo "<li>". $item->name ."</li>";
-			}
-			echo "</ol>";
-			?>
-			</td>
-			 <td valign="top">
-			* This will <strong><font color="#FF0000">Permanently Delete</font></strong> <br />these Items from the Database *
-			<br /><br /><br />
-			<div style="border: 1px dotted gray; width: 70px; padding: 10px; margin-left: 50px;">
-			<a class="toolbar" href="javascript:if (confirm('Are you sure you want to Deleted the listed items? \nThis will Permanently Delete them from the database.')){ submitbutton('delete');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('remove','','images/delete_f2.png',1);">
-			<img name="remove" src="images/delete.png" alt="Delete" border="0" align="middle" />
-			&nbsp;Delete
-			</a>
-			</div>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-		<br /><br />
-	
-		<input type="hidden" name="option" value="<?php echo $option;?>" />
-		<input type="hidden" name="task" value="" />
-		<input type="hidden" name="boxchecked" value="1" />
-		<input type="hidden" name="type" value="<?php echo $type; ?>" />
-		<?php
-		foreach ($cid as $id) {
-			echo "\n<input type=\"hidden\" name=\"cid[]\" value=\"$id\" />";
-		}
-		?>
-		</form>
-		<?php
-	}
-
-
-	/**
-	* A restore confirmation page
-	* Writes list of the items that have been selected for restore
-	*/
-	function showRestore( $option, $cid, $items, $type ) {
-	?>
-		<form action="index2.php" method="post" name="adminForm">
-		<table class="adminheading">
-		<tr>
-			<th>Restore Items</th>
-		</tr>
-		</table>
-	
-		<br />
-		<table class="adminform">
-		<tr>
-			<td width="3%"></td>
-			<td align="left" valign="top" width="20%">
-			<strong>Number of Items:</strong>
-			<br />
-			<font color="#000066"><strong><?php echo count( $cid ); ?></strong></font>
-			<br /><br />
-			</td>
-			<td align="left" valign="top" width="25%">
-			<strong>Items being Restored:</strong>
-			<br />
-			<?php
-			echo "<ol>";
-			foreach ( $items as $item ) {
-				echo "<li>". $item->name ."</li>";
-			}
-			echo "</ol>";
-			?>
-			</td>
-			 <td valign="top">
-			* This will <strong><font color="#FF0000">Restore</font></strong> these Items,<br />they will be returned to their orignial places as Unpublished items *
-			<br /><br /><br />
-			<div style="border: 1px dotted gray; width: 80px; padding: 10px; margin-left: 50px;">
-			<a class="toolbar" href="javascript:if (confirm('Are you sure you want to Restore the listed items?.')){ submitbutton('restore');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('restore','','images/restore_f2.png',1);">
-			<img name="restore" src="images/restore.png" alt="Restore" border="0" align="middle" />
-			&nbsp;Restore
-			</a>
-			</div>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-		<br /><br />
-	
-		<input type="hidden" name="option" value="<?php echo $option;?>" />
-		<input type="hidden" name="sectionid" value="<?php echo $sectionid; ?>" />
-		<input type="hidden" name="task" value="" />
-		<input type="hidden" name="boxchecked" value="1" />
-		<input type="hidden" name="type" value="<?php echo $type; ?>" />
-		<?php
-		foreach ($cid as $id) {
-			echo "\n<input type=\"hidden\" name=\"cid[]\" value=\"$id\" />";
-		}
-		?>
-		</form>
-		<?php
-	}
-
-}
-?>
\ No newline at end of file
+<?php
+/**
+* @version $Id: admin.trash.html.php,v 1.1 2005/07/22 01:53:32 eddieajau Exp $
+* @package Mambo
+* @subpackage Trash
+* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+/**
+* HTML class for all trash component output
+* @package Mambo
+* @subpackage Trash
+*/
+class HTML_trash {
+	/**
+	* Writes a list of the Trash items
+	*/
+	function showList( $option, $contents, $menus, $pageNav_content, $pageNav_menu ) {
+		global $my;
+		$tabs = new mosTabs(1);
+		?>
+		<script language="javascript" type="text/javascript">
+		/**
+		* Toggles the check state of a group of boxes
+		*
+		* Checkboxes must have an id attribute in the form cb0, cb1...
+		* @param The number of box to 'check'
+		*/
+		function checkAll_xtd ( n ) {
+			//var f = document.adminForm;
+			var f=document.getElementById("adminForm1");			
+			var d=document.getElementById("adminForm");
+			var c = f.toggle1.checked;
+			var n2 = 0;
+			for ( i=0; i < n; i++ ) {
+				cb = eval ( 'f.cb1' + i );
+				dcb = eval ('d.dcb' + i );
+				if (cb) {
+					cb.checked = c;
+					dcb.checked = c;
+					n2++;
+				}
+			}
+			if (c) {
+				f.boxchecked.value = n2;
+				d.boxchecked.value = n2;
+			} else {
+				f.boxchecked.value = 0;
+				d.boxchecked.value = 0;
+			}
+		}
+		</script>	
+		<form action="index2.php" method="post" name="adminForm" id="adminForm">
+		<table class="adminheading">
+		<tr>
+			<th class="trash"><?php echo T_('Trash Manager') ?></th>
+		</tr>
+		</table>
+	
+		<?php
+		$tabs->startPane("content-pane");
+		$tabs->startTab(T_("Content Items"),"content_items");
+		?>
+		<table class="adminheading" width="90%">
+		<tr>
+			<th><small><?php echo T_('Content Items') ?></small></th>
+		</tr>
+		</table>
+	
+		<table class="adminlist" width="90%">
+		<tr>
+			<th width="20">#</th>
+			<th width="20">
+			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $contents );?>);" />
+			</th>
+			<th width="20px">&nbsp;</th>
+			<th class="title">
+			<?php echo T_('Title') ?>
+			</th>
+			<th>
+			<?php echo T_('Section') ?>
+			</th>
+			<th>
+			<?php echo T_('Category') ?>
+			</th>
+			<th width="70px">
+			<?php echo T_('ID') ?>
+			</th>
+		</tr>
+		<?php
+		$k = 0;
+		$i = 0;
+		$n = count( $contents );
+		foreach ( $contents as $row ) {
+			?>
+			<tr class="<?php echo "row". $k; ?>">
+				<td align="center" width="30px">
+				<?php echo $i + 1 + $pageNav_content->limitstart;?>
+				</td>
+				<td width="20px" align="center"><?php echo mosHTML::idBox( $i, $row->id ); ?></td>
+				<td width="20px"></td>
+				<td nowrap>
+				<?php
+				echo $row->title;
+				?>
+				</td>
+				<td align="center" width="20%">
+				<?php
+				echo $row->sectname;
+				?>
+				</td>
+				<td align="center" width="20%">
+				<?php
+				echo $row->catname;
+				?>
+				</td>
+				<td align="center">
+				<?php
+				echo $row->id;
+				?>
+				</td>
+			</tr>
+			<?php
+			$k = 1 - $k;
+			$i++;
+		}
+		?>
+		</table>
+		<?php echo $pageNav_content->getListFooter(); ?>
+		<?php
+		$tabs->endTab();
+		?>
+		<input type="hidden" name="option" value="<?php echo $option;?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		
+		<?php
+		$i=0;
+		foreach ( $menus as $row ) {
+			?>
+			<input type="checkbox" style="visibility:hidden;" id="dcb<?php echo $i;?>" name="mid[]" value="<?php echo $row->id; ?>">
+			<?php
+			$i++;
+			}
+			?>
+		</form>
+		
+		<form action="index2.php" method="post" name="" id="adminform1">
+		<?php
+		$tabs->startTab(T_("Menu Items"),"menu_items");
+		?>
+		<table class="adminheading" width="90%">
+		<tr>
+			<th><small><?php echo T_('Menu Items') ?></small></th>
+		</tr>
+		</table>
+	
+		<table class="adminlist" width="90%">
+		<tr>
+			<th width="20">#</th>
+			<th width="20">
+			<input type="checkbox" name="toggle1" value="" onClick="checkAll_xtd(<?php echo count( $menus );?>);" />
+			</th>
+			<th width="20px">&nbsp;</th>
+			<th class="title">
+			<?php echo T_('Title') ?>
+			</th>
+			<th>
+			<?php echo T_('Menu') ?>
+			</th>
+			<th>
+			<?php echo T_('Type') ?>
+			</th>
+			<th width="70px">
+			<?php echo T_('ID') ?>
+			</th>
+		</tr>
+		<?php
+		$k = 0;
+		$i = 0;
+		$n = count( $menus );
+		foreach ( $menus as $row ) {
+			?>
+			<tr class="<?php echo "row". $k; ?>">
+				<td align="center" width="30px">
+				<?php echo $i + 1 + $pageNav_menu->limitstart;?>
+				</td>
+				<td width="30px" align="center">
+				<input type="checkbox" id="cb1<?php echo $i;?>" name="mid[]" value="<?php echo $row->id; ?>" onclick="isChecked(this.checked);document.getElementById('dcb<?php echo $i;?>').checked=this.checked;" />
+				</td>
+				<td width="20px"></td>
+				<td nowrap>
+				<?php
+				echo $row->name;
+				?>
+				</td>
+				<td align="center" width="20%">
+				<?php
+				echo $row->menutype;
+				?>
+				</td>
+				<td align="center" width="20%">
+				<?php
+				echo $row->type;
+				?>
+				</td>
+				<td align="center">
+				<?php
+				echo $row->id;
+				?>
+				</td>
+			</tr>
+			<?php
+			$k = 1 - $k;
+			$i++;
+		}
+		?>
+		</table>
+		<?php echo $pageNav_menu->getListFooter(); ?>
+		<?php
+		$tabs->endTab();
+		$tabs->endPane();
+		?>    
+	
+		<input type="hidden" name="option" value="<?php echo $option;?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		</form>
+		<?php
+	}
+
+
+	/**
+	* A delete confirmation page
+	* Writes list of the items that have been selected for deletion
+	*/
+	function showDelete( $option, $cid, $items, $type ) {
+	?>
+		<form action="index2.php" method="post" name="adminForm">
+		<table class="adminheading">
+		<tr>
+			<th><?php echo T_('Delete Items') ?></th>
+		</tr>
+		</table>
+	
+		<br />
+		<table class="adminform">
+		<tr>
+			<td width="3%"></td>
+			<td align="left" valign="top" width="20%">
+			<strong><?php echo T_('Number of Items:') ?></strong>
+			<br />
+			<font color="#000066"><strong><?php echo count( $cid ); ?></strong></font>
+			<br /><br />
+			</td>
+			<td align="left" valign="top" width="25%">
+			<strong><?php echo T_('Items being Deleted:') ?></strong>
+			<br />
+			<?php
+			echo "<ol>";
+			foreach ( $items as $item ) {
+				echo "<li>". $item->name ."</li>";
+			}
+			echo "</ol>";
+			?>
+			</td>
+			 <td valign="top">
+			* <?php echo T_('This will <strong><font color="#FF0000">Permanently Delete</font></strong> <br />these Items from the Database') ?> *
+			<br /><br /><br />
+			<div style="border: 1px dotted gray; width: 70px; padding: 10px; margin-left: 50px;">
+			<a class="toolbar" href="javascript:if (confirm('<?php echo T_('Are you sure you want to Deleted the listed items? \nThis will Permanently Delete them from the database.') ?>')){ submitbutton('delete');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('remove','','images/delete_f2.png',1);">
+			<img name="remove" src="images/delete.png" alt="<?php echo T_('Delete') ?>" border="0" align="middle" />
+			&nbsp;<?php echo T_('Delete') ?>
+			</a>
+			</div>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+		<br /><br />
+	
+		<input type="hidden" name="option" value="<?php echo $option;?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="1" />
+		<input type="hidden" name="type" value="<?php echo $type; ?>" />
+		<?php
+		foreach ($cid as $id) {
+			echo "\n<input type=\"hidden\" name=\"cid[]\" value=\"$id\" />";
+		}
+		?>
+		</form>
+		<?php
+	}
+
+
+	/**
+	* A restore confirmation page
+	* Writes list of the items that have been selected for restore
+	*/
+	function showRestore( $option, $cid, $items, $type ) {
+	?>
+		<form action="index2.php" method="post" name="adminForm">
+		<table class="adminheading">
+		<tr>
+			<th><?php echo T_('Restore Items') ?></th>
+		</tr>
+		</table>
+	
+		<br />
+		<table class="adminform">
+		<tr>
+			<td width="3%"></td>
+			<td align="left" valign="top" width="20%">
+			<strong><?php echo T_('Number of Items:') ?></strong>
+			<br />
+			<font color="#000066"><strong><?php echo count( $cid ); ?></strong></font>
+			<br /><br />
+			</td>
+			<td align="left" valign="top" width="25%">
+			<strong><?php echo T_('Items being Restored:') ?></strong>
+			<br />
+			<?php
+			echo "<ol>";
+			foreach ( $items as $item ) {
+				echo "<li>". $item->name ."</li>";
+			}
+			echo "</ol>";
+			?>
+			</td>
+			 <td valign="top">
+			* <?php echo T_('This will <strong><font color="#FF0000">Restore</font></strong> these Items,<br />they will be returned to their orignial places as Unpublished items') ?> *
+			<br /><br /><br />
+			<div style="border: 1px dotted gray; width: 80px; padding: 10px; margin-left: 50px;">
+			<a class="toolbar" href="javascript:if (confirm('<?php echo T_('Are you sure you want to Restore the listed items?.') ?>')){ submitbutton('restore');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('restore','','images/restore_f2.png',1);">
+			<img name="restore" src="images/restore.png" alt="<?php echo T_('Restore') ?>" border="0" align="middle" />
+			&nbsp;<?php echo T_('Restore') ?>
+			</a>
+			</div>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+		<br /><br />
+	
+		<input type="hidden" name="option" value="<?php echo $option;?>" />
+		<input type="hidden" name="sectionid" value="<?php echo $sectionid; ?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="1" />
+		<input type="hidden" name="type" value="<?php echo $type; ?>" />
+		<?php
+		foreach ($cid as $id) {
+			echo "\n<input type=\"hidden\" name=\"cid[]\" value=\"$id\" />";
+		}
+		?>
+		</form>
+		<?php
+	}
+
+}
+?>
diff -ruN 4.5.4/administrator/components/com_trash/admin.trash.php 4.6rc2/administrator/components/com_trash/admin.trash.php
--- 4.5.4/administrator/components/com_trash/admin.trash.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_trash/admin.trash.php	2006-03-06 08:02:33.000000000 -0600
@@ -1,261 +1,261 @@
-<?php
-/**
-* @version $Id: admin.trash.php,v 1.1 2005/07/22 01:53:32 eddieajau Exp $
-* @package Mambo
-* @subpackage Trash
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-// ensure user has access to this function
-if (!($acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_trash' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
-}
-
-require_once( $mainframe->getPath( 'admin_html' ) );
-require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
-
-$task = mosGetParam( $_REQUEST, 'task', array(0) );
-$cid = mosGetParam( $_POST, 'cid', array(0) );
-$mid = mosGetParam( $_POST, 'mid', array(0) );
-if ( !is_array( $cid ) ) {
-	$cid = array(0);
-}
-
-switch ($task) {
-	case "deleteconfirm":
-	viewdeleteTrash( $cid, $mid, $option );
-	break;
-
-	case "delete":
-	deleteTrash( $cid, $option );
-	break;
-
-	case "restoreconfirm":
-	viewrestoreTrash( $cid, $mid, $option );
-	break;
-
-	case "restore":
-	restoreTrash( $cid, $option );
-	break;
-
-	default:
-	viewTrash( $option );
-	break;
-}
-
-
-/**
-* Compiles a list of trash items
-*/
-function viewTrash( $option ) {
-	global $database, $mainframe, $mosConfig_list_limit;
-	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
-
-	$limit = $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
-	$limitstart = $mainframe->getUserStateFromRequest( "view{". $option ."}limitstart", 'limitstart', 0 );
-
-	// get the total number of content
-	$query = "SELECT count(*)"
-	. "\n FROM #__content AS c"
-	. "\n LEFT JOIN #__categories AS cc ON cc.id = c.catid"
-	. "\n LEFT JOIN #__sections AS s ON s.id = cc.section AND s.scope='content'"
-	. "\n WHERE c.state = '-2'"
-	;
-	$database->setQuery( $query );
-	$total_content = $database->loadResult();
-	$pageNav_content = new mosPageNav( $total_content, $limitstart, $limit );
-
-	// Query content items
-	$query = 	"SELECT c.*, g.name AS groupname, cc.name AS catname, s.name AS sectname"
-	. "\n FROM #__content AS c"
-	. "\n LEFT JOIN #__categories AS cc ON cc.id = c.catid"
-	. "\n LEFT JOIN #__sections AS s ON s.id = cc.section AND s.scope='content'"
-	. "\n INNER JOIN #__groups AS g ON g.id = c.access"
-	. "\n LEFT JOIN #__users AS u ON u.id = c.checked_out"
-	. "\n WHERE c.state = '-2'"
-	. "\n ORDER BY s.name, cc.name, c.title"
-	. "\n LIMIT ". $pageNav_content->limitstart .", ".$pageNav_content->limit .""
-	;
-	$database->setQuery( $query );
-	$contents = $database->loadObjectList();
-
-
-	$query = "SELECT count(*)"
-	. "\n FROM #__menu AS m"
-	. "\n LEFT JOIN #__users AS u ON u.id = m.checked_out"
-	. "\n WHERE m.published = -2"
-	;
-	$database->setQuery( $query );
-	$total_menu = $database->loadResult();
-	//$total_menu = count( $total_menu );
-	$pageNav_menu = new mosPageNav( $total_menu, $limitstart, $limit );
-
-	// Query menu items
-	$query = 	"SELECT m.*"
-	. "\n FROM #__menu AS m"
-	. "\n LEFT JOIN #__users AS u ON u.id = m.checked_out"
-	. "\n WHERE m.published = -2"
-	. "\n ORDER BY m.menutype, m.ordering, m.ordering, m.name"
-	. "\n LIMIT ". $pageNav_menu->limitstart .", ".$pageNav_menu->limit .""
-	;
-	$database->setQuery( $query );
-	$menus = $database->loadObjectList();
-
-	for ( $i = 0; $i < $total_content; $i++ ) {
-		if ( ( $contents[$i]->sectionid == 0 ) && ( $contents[$i]->catid == 0 ) ) {
-			$contents[$i]->sectname = 'Typed Content';
-		}
-	}
-
-	HTML_trash::showList( $option, $contents, $menus, $pageNav_content, $pageNav_menu );
-}
-
-
-/**
-* Compiles a list of the items you have selected to permanently delte
-*/
-function viewdeleteTrash( $cid, $mid, $option ) {
-	global $database, $mainframe;
-
-	// seperate contentids
-	$cids = implode( ',', $cid );
-	$mids = implode( ',', $mid );
-
-	if ( $cids ) {
-		// Content Items query
-		$query = 	"SELECT a.title AS name"
-		. "\n FROM #__content AS a"
-		. "\n WHERE ( a.id IN (". $cids .") )"
-		. "\n ORDER BY a.title"
-		;
-		$database->setQuery( $query );
-		$items = $database->loadObjectList();
-		$id = $cid;
-		$type = "content";
-	} else if ( $mids ) {
-		// Content Items query
-		$query = 	"SELECT a.name"
-		. "\n FROM #__menu AS a"
-		. "\n WHERE ( a.id IN (". $mids .") )"
-		. "\n ORDER BY a.name"
-		;
-		$database->setQuery( $query );
-		$items = $database->loadObjectList();
-		$id = $mid;
-		$type = "menu";
-	}
-
-	HTML_trash::showDelete( $option, $id, $items, $type );
-}
-
-
-/**
-* Permanently deletes the selected list of trash items
-*/
-function deleteTrash( $cid, $option ) {
-	global $database, $mainframe;
-	$type = mosGetParam( $_POST, 'type', array(0) );
-
-	$total = count( $cid );
-
-	if ( $type == "content" ) {
-		$obj = new mosContent( $database );
-		$fp = new mosFrontPage( $database );
-		foreach ( $cid as $id ) {
-			$id = intval( $id );
-			$obj->delete( $id );
-			$fp->delete( $id );
-		}
-	} else if ( $type == "menu" ) {
-		$obj = new mosMenu( $database );
-		foreach ( $cid as $id ) {
-			$id = intval( $id );
-			$obj->delete( $id );
-		}
-	}
-
-	$msg = $total. " Item(s) successfully Deleted";
-	mosRedirect( "index2.php?option=$option&mosmsg=". $msg ."" );
-}
-
-
-/**
-* Compiles a list of the items you have selected to permanently delte
-*/
-function viewrestoreTrash( $cid, $mid, $option ) {
-	global $database, $mainframe;
-
-	// seperate contentids
-	$cids = implode( ',', $cid );
-	$mids = implode( ',', $mid );
-
-	if ( $cids ) {
-		// Content Items query
-		$query = 	"SELECT a.title AS name"
-		. "\n FROM #__content AS a"
-		. "\n WHERE ( a.id IN (". $cids .") )"
-		. "\n ORDER BY a.title"
-		;
-		$database->setQuery( $query );
-		$items = $database->loadObjectList();
-		$id = $cid;
-		$type = "content";
-	} else if ( $mids ) {
-		// Content Items query
-		$query = 	"SELECT a.name"
-		. "\n FROM #__menu AS a"
-		. "\n WHERE ( a.id IN (". $mids .") )"
-		. "\n ORDER BY a.name"
-		;
-		$database->setQuery( $query );
-		$items = $database->loadObjectList();
-		$id = $mid;
-		$type = "menu";
-	}
-
-	HTML_trash::showRestore( $option, $id, $items, $type );
-}
-
-
-/**
-* Restores items selected to normal - restores to an unpublished state
-*/
-function restoreTrash( $cid, $option ) {
-	global $database;
-	$type = mosGetParam( $_POST, 'type', array(0) );
-
-	$total = count( $cid );
-
-	// restores to an unpublished state
-	$state = "0";
-	$ordering = '9999';
-	//seperate contentids
-	$cids = implode( ',', $cid );
-
-	if ( $type == "content" ) {
-		$query = 	"UPDATE #__content SET state = '". $state ."', ordering = '". $ordering ."'"
-		. "\n WHERE id IN ( ". $cids ." )"
-		;
-	} else if ( $type == "menu" ) {
-		$query = 	"UPDATE #__menu SET published = '". $state ."', ordering = '9999'"
-		. "\n WHERE id IN ( ". $cids ." )"
-		;
-	}
-
-	$database->setQuery( $query );
-	if ( !$database->query() ) {
-		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	$msg = $total. " Item(s) successfully Restored";
-	mosRedirect( "index2.php?option=$option&mosmsg=". $msg ."" );
-}
-
-
-?>
+<?php
+/**
+* @version $Id: admin.trash.php,v 1.1 2005/07/22 01:53:32 eddieajau Exp $
+* @package Mambo
+* @subpackage Trash
+* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+// ensure user has access to this function
+if (!($acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_trash' ))) {
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
+}
+
+require_once( $mainframe->getPath( 'admin_html' ) );
+require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
+
+$task = mosGetParam( $_REQUEST, 'task', array(0) );
+$cid = mosGetParam( $_POST, 'cid', array(0) );
+$mid = mosGetParam( $_POST, 'mid', array(0) );
+if ( !is_array( $cid ) ) {
+	$cid = array(0);
+}
+
+switch ($task) {
+	case "deleteconfirm":
+	viewdeleteTrash( $cid, $mid, $option );
+	break;
+
+	case "delete":
+	deleteTrash( $cid, $option );
+	break;
+
+	case "restoreconfirm":
+	viewrestoreTrash( $cid, $mid, $option );
+	break;
+
+	case "restore":
+	restoreTrash( $cid, $option );
+	break;
+
+	default:
+	viewTrash( $option );
+	break;
+}
+
+
+/**
+* Compiles a list of trash items
+*/
+function viewTrash( $option ) {
+	global $database, $mainframe, $mosConfig_list_limit;
+	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
+
+	$limit = $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
+	$limitstart = $mainframe->getUserStateFromRequest( "view{". $option ."}limitstart", 'limitstart', 0 );
+	// get the total number of content
+	$query = "SELECT count(*)"
+	. "\n FROM #__content AS c"
+	. "\n LEFT JOIN #__categories AS cc ON cc.id = c.catid"
+	. "\n LEFT JOIN #__sections AS s ON s.id = cc.section AND s.scope='content'"
+	. "\n WHERE c.state = '-2'"
+	;
+	$database->setQuery( $query );
+	$total_content = $database->loadResult();
+	$pageNav_content = new mosPageNav( $total_content, $limitstart, $limit );
+
+	// Query content items
+	$query = 	"SELECT c.*, g.name AS groupname, cc.name AS catname, s.name AS sectname"
+	. "\n FROM #__content AS c"
+	. "\n LEFT JOIN #__categories AS cc ON cc.id = c.catid"
+	. "\n LEFT JOIN #__sections AS s ON s.id = cc.section AND s.scope='content'"
+	. "\n INNER JOIN #__groups AS g ON g.id = c.access"
+	. "\n LEFT JOIN #__users AS u ON u.id = c.checked_out"
+	. "\n WHERE c.state = '-2'"
+	. "\n ORDER BY s.name, cc.name, c.title"
+	. "\n LIMIT ". $pageNav_content->limitstart .", ".$pageNav_content->limit .""
+	;
+	$database->setQuery( $query );
+	$contents = $database->loadObjectList();
+	if (!$contents) $contents = array();
+
+	$query = "SELECT count(*)"
+	. "\n FROM #__menu AS m"
+	. "\n LEFT JOIN #__users AS u ON u.id = m.checked_out"
+	. "\n WHERE m.published = -2"
+	;
+	$database->setQuery( $query );
+	$total_menu = $database->loadResult();
+	//$total_menu = count( $total_menu );
+	$pageNav_menu = new mosPageNav( $total_menu, $limitstart, $limit );
+
+	// Query menu items
+	$query = 	"SELECT m.*"
+	. "\n FROM #__menu AS m"
+	. "\n LEFT JOIN #__users AS u ON u.id = m.checked_out"
+	. "\n WHERE m.published = -2"
+	. "\n ORDER BY m.menutype, m.ordering, m.ordering, m.name"
+	. "\n LIMIT ". $pageNav_menu->limitstart .", ".$pageNav_menu->limit .""
+	;
+	$database->setQuery( $query );
+	$menus = $database->loadObjectList();
+	if (!$menus) $menus = array();
+
+	foreach ( $contents as $i=>$content) {
+	    if ( ( $content->sectionid == 0 ) AND ( $content->catid == 0 ) ) {
+	        $contents[$i]->sectname = 'Typed Content';
+	    }
+	}
+	HTML_trash::showList( $option, $contents, $menus, $pageNav_content, $pageNav_menu );
+}
+
+
+/**
+* Compiles a list of the items you have selected to permanently delte
+*/
+function viewdeleteTrash( $cid, $mid, $option ) {
+	global $database, $mainframe;
+
+	// seperate contentids
+	$cids = implode( ',', $cid );
+	$mids = implode( ',', $mid );
+
+	if ( $cids ) {
+		// Content Items query
+		$query = 	"SELECT a.title AS name"
+		. "\n FROM #__content AS a"
+		. "\n WHERE ( a.id IN (". $cids .") )"
+		. "\n ORDER BY a.title"
+		;
+		$database->setQuery( $query );
+		$items = $database->loadObjectList();
+		$id = $cid;
+		$type = "content";
+	} else if ( $mids ) {
+		// Content Items query
+		$query = 	"SELECT a.name"
+		. "\n FROM #__menu AS a"
+		. "\n WHERE ( a.id IN (". $mids .") )"
+		. "\n ORDER BY a.name"
+		;
+		$database->setQuery( $query );
+		$items = $database->loadObjectList();
+		$id = $mid;
+		$type = "menu";
+	}
+
+	HTML_trash::showDelete( $option, $id, $items, $type );
+}
+
+
+/**
+* Permanently deletes the selected list of trash items
+*/
+function deleteTrash( $cid, $option ) {
+	global $database, $mainframe;
+	$type = mosGetParam( $_POST, 'type', array(0) );
+
+	$total = count( $cid );
+
+	if ( $type == "content" ) {
+		$obj = new mosContent( $database );
+		$fp = new mosFrontPage( $database );
+		foreach ( $cid as $id ) {
+			$id = intval( $id );
+			$obj->delete( $id );
+			$fp->delete( $id );
+		}
+	} else if ( $type == "menu" ) {
+		$obj = new mosMenu( $database );
+		foreach ( $cid as $id ) {
+			$id = intval( $id );
+			$obj->delete( $id );
+		}
+	}
+
+	$msg = sprintf(Tn_('%s Item successfully Deleted','%s Items successfully Deleted',$total), $total);
+	mosRedirect( "index2.php?option=$option&mosmsg=". $msg ."" );
+}
+
+
+/**
+* Compiles a list of the items you have selected to permanently delte
+*/
+function viewrestoreTrash( $cid, $mid, $option ) {
+	global $database, $mainframe;
+
+	// seperate contentids
+	$cids = implode( ',', $cid );
+	$mids = implode( ',', $mid );
+
+	if ( $cids ) {
+		// Content Items query
+		$query = 	"SELECT a.title AS name"
+		. "\n FROM #__content AS a"
+		. "\n WHERE ( a.id IN (". $cids .") )"
+		. "\n ORDER BY a.title"
+		;
+		$database->setQuery( $query );
+		$items = $database->loadObjectList();
+		$id = $cid;
+		$type = "content";
+	} else if ( $mids ) {
+		// Content Items query
+		$query = 	"SELECT a.name"
+		. "\n FROM #__menu AS a"
+		. "\n WHERE ( a.id IN (". $mids .") )"
+		. "\n ORDER BY a.name"
+		;
+		$database->setQuery( $query );
+		$items = $database->loadObjectList();
+		$id = $mid;
+		$type = "menu";
+	}
+
+	HTML_trash::showRestore( $option, $id, $items, $type );
+}
+
+
+/**
+* Restores items selected to normal - restores to an unpublished state
+*/
+function restoreTrash( $cid, $option ) {
+	global $database;
+	$type = mosGetParam( $_POST, 'type', array(0) );
+
+	$total = count( $cid );
+
+	// restores to an unpublished state
+	$state = "0";
+	$ordering = '9999';
+	//seperate contentids
+	$cids = implode( ',', $cid );
+
+	if ( $type == "content" ) {
+		$query = 	"UPDATE #__content SET state = '". $state ."', ordering = '". $ordering ."'"
+		. "\n WHERE id IN ( ". $cids ." )"
+		;
+	} else if ( $type == "menu" ) {
+		$query = 	"UPDATE #__menu SET published = '". $state ."', ordering = '9999'"
+		. "\n WHERE id IN ( ". $cids ." )"
+		;
+	}
+
+	$database->setQuery( $query );
+	if ( !$database->query() ) {
+		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	$msg = sprintf(Tn_('%s Item successfully Restored','%s Items successfully Restored',$total),$total);
+	mosRedirect( "index2.php?option=$option&mosmsg=". $msg ."" );
+}
+
+
+?>
diff -ruN 4.5.4/administrator/components/com_trash/toolbar.trash.html.php 4.6rc2/administrator/components/com_trash/toolbar.trash.html.php
--- 4.5.4/administrator/components/com_trash/toolbar.trash.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_trash/toolbar.trash.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,28 +1,26 @@
 <?php
 /**
-* @version $Id: toolbar.trash.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Trash
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Trash
-*/
 class TOOLBAR_Trash {
 	function _DEFAULT() {
 		mosMenuBar::startTable();
-		mosMenuBar::custom('restoreconfirm','restore.png','restore_f2.png','Restore', true);
+		mosMenuBar::custom('restoreconfirm','restore.png','restore_f2.png',T_('Restore'), true);
 		mosMenuBar::spacer();
-		mosMenuBar::custom('deleteconfirm','delete.png','delete_f2.png','Delete', true);
+		mosMenuBar::custom('deleteconfirm','delete.png','delete_f2.png',T_('Delete'), true);
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.trashmanager' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 
diff -ruN 4.5.4/administrator/components/com_trash/toolbar.trash.php 4.6rc2/administrator/components/com_trash/toolbar.trash.php
--- 4.5.4/administrator/components/com_trash/toolbar.trash.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_trash/toolbar.trash.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.trash.php,v 1.1 2005/07/22 01:53:32 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Trash
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_trash/trash.xml 4.6rc2/administrator/components/com_trash/trash.xml
--- 4.5.4/administrator/components/com_trash/trash.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_trash/trash.xml	2006-03-01 13:18:50.000000000 -0600
@@ -2,10 +2,10 @@
 <mosinstall type="component" version="4.5.2">
 	<name>Trash</name>
 	<author>Mambo Project</author>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component manages the Trash functionality.</description>
 	<params/>
diff -ruN 4.5.4/administrator/components/com_typedcontent/admin.typedcontent.html.php 4.6rc2/administrator/components/com_typedcontent/admin.typedcontent.html.php
--- 4.5.4/administrator/components/com_typedcontent/admin.typedcontent.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_typedcontent/admin.typedcontent.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.typedcontent.html.php,v 1.4 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
 class HTML_typedcontent {
 
 	/**
@@ -31,10 +29,10 @@
 		<table class="adminheading">
 		<tr>
 			<th class="edit">
-			Static Content Manager
+			<?php echo T_('Static Content Manager') ?>
 			</th>
 			<td>
-			Filter:&nbsp;
+			<?php echo T_('Filter:') ?>&nbsp;
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -60,31 +58,31 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th class="title">
-			Title
+			<?php echo T_('Title') ?>
 			</th>
 			<th width="5%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th width="2%">
-			Order
+			<?php echo T_('Order') ?>
 			</th>
 			<th width="1%">
-			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="Save Order" /></a>
+			<a href="javascript: saveorder( <?php echo count( $rows )-1; ?> )"><img src="images/filesave.png" border="0" width="16" height="16" alt="<?php echo T_('Save Order') ?>" /></a>
 			</th>
 			<th width="10%">
-			Access
+			<?php echo T_('Access') ?>
 			</th>
 			<th width="5%">
-			ID
+			<?php echo T_('ID') ?>
 			</th>
 			<th width="1%" align="left">
-			Links
+			<?php echo T_('Links') ?>
 			</th>
 			<th width="20%" align="left">
-			Author
+			<?php echo T_('Author') ?>
 			</th>
 			<th align="center" width="10">
-			Date
+			<?php echo T_('Date') ?>
 			</th>
 		</tr>
 		<?php
@@ -95,30 +93,30 @@
 			$now = date( "Y-m-d H:i:s" );
 			if ( $now <= $row->publish_up && $row->state == "1" ) {
 				$img = 'publish_y.png';
-				$alt = 'Published';
+				$alt = T_('Published');
 			} else if ( ( $now <= $row->publish_down || $row->publish_down == "0000-00-00 00:00:00" ) && $row->state == "1" ) {
 				$img = 'publish_g.png';
-				$alt = 'Published';
+				$alt = T_('Published');
 			} else if ( $now > $row->publish_down && $row->state == "1" ) {
 				$img = 'publish_r.png';
-				$alt = 'Expired';
+				$alt = T_('Expired');
 			} elseif ( $row->state == "0" ) {
 				$img = "publish_x.png";
-				$alt = 'Unpublished';
+				$alt = T_('Unpublished');
 			}
 			$times = '';
 			if (isset($row->publish_up)) {
 				if ($row->publish_up == '0000-00-00 00:00:00') {
-					$times .= "<tr><td>Start: Always</td></tr>";
+					$times .= "<tr><td>".T_('Start:')." ".T_('Always')."</td></tr>";
 				} else {
-					$times .= "<tr><td>Start: $row->publish_up</td></tr>";
+					$times .= "<tr><td>".T_('Start:')." $row->publish_up</td></tr>";
 				}
 			}
 			if (isset($row->publish_down)) {
 				if ($row->publish_down == '0000-00-00 00:00:00') {
-					$times .= "<tr><td>Finish: No Expiry</td></tr>";
+					$times .= "<tr><td>".T_('Finish:')." ".T_('No Expiry')."</td></tr>";
 				} else {
-					$times .= "<tr><td>Finish: $row->publish_down</td></tr>";
+					$times .= "<tr><td>".T_('Finish:')." $row->publish_down</td></tr>";
 				}
 			}
 
@@ -146,7 +144,7 @@
 					$author = $row->created_by_alias;
 				} else {
 					$linkA 	= 'index2.php?option=com_users&task=editA&hidemainmenu=1&id='. $row->created_by;
-					$author = '<a href="'. $linkA .'" title="Edit User">'. $row->creator .'</a>';
+					$author = '<a href="'. $linkA .'" title="'.T_('Edit User').'">'. $row->creator .'</a>';
 				}
 			} else {
 				if ( $row->created_by_alias ) {
@@ -174,7 +172,7 @@
 					}
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Static Content">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Static Content') ?>">
 					<?php
 					echo $row->title;
 					if ( $row->title_alias ) {
@@ -190,7 +188,7 @@
 				if ( $times ) {
 					?>
 					<td align="center">
-					<a href="javascript: void(0);" onMouseOver="return overlib('<table><?php echo $times; ?></table>', CAPTION, 'Publish Information', BELOW, RIGHT);" onMouseOut="return nd();" onClick="return listItemTask('cb<?php echo $i;?>','<?php echo $row->state ? "unpublish" : "publish";?>')">
+					<a href="javascript: void(0);" onMouseOver="return overlib('<table><?php echo $times; ?></table>', CAPTION, '<?php echo T_('Publish Information') ?>', BELOW, RIGHT);" onMouseOut="return nd();" onClick="return listItemTask('cb<?php echo $i;?>','<?php echo $row->state ? "unpublish" : "publish";?>')">
 					<img src="images/<?php echo $img;?>" width="12" height="12" border="0" alt="<?php echo $alt; ?>" />
 					</a>
 					</td>
@@ -268,7 +266,7 @@
 			}
 
 			if ( pressbutton ==' resethits' ) {
-				if (confirm('Are you sure you want to reset the Hits to Zero? \nAny unsaved changes to this content will be lost.')){
+				if (confirm('<?php echo T_('Are you sure you want to reset the Hits to Zero? \nAny unsaved changes to this content will be lost.') ?>')){
 					submitform( pressbutton );
 					return;
 				} else {
@@ -278,10 +276,10 @@
 
 			if ( pressbutton == 'menulink' ) {
 				if ( form.menuselect.value == "" ) {
-					alert( "Please select a Menu" );
+					alert( "<?php echo T_('Please select a Menu') ?>" );
 					return;
 				} else if ( form.link_name.value == "" ) {
-					alert( "Please enter a Name for this menu item" );
+					alert( "<?php echo T_('Please enter a Name for this menu item') ?>" );
 					return;
 				}
 			}
@@ -297,9 +295,9 @@
 			}
 			catch(e){}
 			if (trim(form.title.value) == ""){
-				alert( "Content item must have a title" );
+				alert( "<?php echo T_('Content item must have a title') ?>" );
 			} else if (trim(form.name.value) == ""){
-				alert( "Content item must have a name" );
+				alert( "<?php echo T_('Content item must have a name') ?>" );
 			} else {
 				if ( form.reset_hits.checked ) {
 					form.hits.value = 0;
@@ -350,9 +348,9 @@
 		<table class="adminheading">
 		<tr>
 			<th class="edit">
-			Static Content Item:
+			<?php echo T_('Static Content Item:') ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			</th>
 		</tr>
@@ -361,10 +359,10 @@
 			<tr>
 				<td valign="top" align="right">
 				<div id = "show" style="display:<?php echo $simple;?>">
-				<a href="javascript:displayParameterInfo();">Show Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Show Advanced Details') ?></a>
 				</div>
 				<div id = "hide" style="display:<?php echo $advanced;?>">
-				<a href="javascript:displayParameterInfo();">Hide Advanced Details</a>
+				<a href="javascript:displayParameterInfo();"><?php echo T_('Hide Advanced Details') ?></a>
 				</div>
 				</td>
 			</tr>
@@ -378,12 +376,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="3">
-					Item Details
+					<?php echo T_('Item Details') ?>
 					</th>
 				<tr>
 				<tr>
 					<td align="left">
-					Title:
+					<?php echo T_('Title:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="title" size="30" maxlength="100" value="<?php echo $row->title; ?>" />
@@ -391,7 +389,7 @@
 				</tr>
 				<tr>
 					<td align="left">
-					Title Alias:
+					<?php echo T_('Title Alias:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="title_alias" size="30" maxlength="100" value="<?php echo $row->title_alias; ?>" />
@@ -399,7 +397,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="left" colspan="2">
-					Text: (required)<br />
+					<?php echo T_('Text: (required)') ?><br />
 					<?php
 					// parameters : areaname, content, hidden field, width, height, rows, cols
 					editorArea( 'editor1',  $row->introtext, 'introtext', '100%;', '400', '65', '50' );
@@ -420,17 +418,17 @@
 							<td >
 				<?php
 				$tabs->startPane("content-pane");
-				$tabs->startTab("Publishing","publish-page");
+				$tabs->startTab(T_("Publishing"),"publish-page");
 				?>
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Publishing Info
+					<?php echo T_('Publishing Info') ?>
 					</th>
 				<tr>
 				<tr>
 					<td valign="top" align="right">
-					State:
+					<?php echo T_('State:') ?>
 					</td>
 					<td>
 					<?php echo $row->state > 0 ? 'Published' : 'Draft Unpublished'; ?>
@@ -438,7 +436,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td>
 					<input type="checkbox" name="published" value="1" <?php echo $row->state ? 'checked="checked"' : ''; ?> />
@@ -446,7 +444,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Access Level:
+					<?php echo T_('Access Level:') ?>
 					</td>
 					<td>
 					<?php echo $lists['access']; ?>
@@ -454,7 +452,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Author Alias:
+					<?php echo T_('Author Alias:') ?>
 					</td>
 					<td>
 					<input type="text" name="created_by_alias" size="30" maxlength="100" value="<?php echo $row->created_by_alias; ?>" class="inputbox" />
@@ -462,7 +460,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Change Creator:
+					<?php echo T_('Change Creator:') ?>
 					</td>
 					<td>
 					<?php echo $lists['created_by']; ?>
@@ -470,7 +468,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Override Created Date
+					<?php echo T_('Override Created Date') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="created" id="created" size="25" maxlength="19" value="<?php echo $row->created; ?>" />
@@ -479,7 +477,7 @@
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Start Publishing:
+					<?php echo T_('Start Publishing:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="publish_up" id="publish_up" size="25" maxlength="19" value="<?php echo $row->publish_up; ?>" />
@@ -488,7 +486,7 @@
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Finish Publishing:
+					<?php echo T_('Finish Publishing:') ?>
 					</td>
 					<td width="80%">
 					<input class="inputbox" type="text" name="publish_down" id="publish_down" size="25" maxlength="19" value="<?php echo $row->publish_down; ?>" />
@@ -517,12 +515,12 @@
 					<strong>State</strong>
 					</td>
 					<td>
-					<?php echo $row->state > 0 ? 'Published' : ($row->state < 0 ? 'Archived' : 'Draft Unpublished');?>
+					<?php echo $row->state > 0 ? T_('Published') : ($row->state < 0 ? T_('Archived') : T_('Draft Unpublished'));?>
 					</td>
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					<strong>Hits</strong>
+					<strong><?php echo T_('Hits') ?></strong>
 					</td>
 					<td>
 					<?php echo $row->hits;?>
@@ -533,7 +531,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					<strong>Version</strong>
+					<strong><?php echo T_('Version') ?></strong>
 					</td>
 					<td>
 					<?php echo "$row->version";?>
@@ -541,23 +539,23 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					<strong>Created</strong>
+					<strong><?php echo T_('Created') ?></strong>
 					</td>
 					<td>
-					<?php echo $row->created ? "$row->created</td></tr><tr><td valign='top' align='right'><strong>By</strong></td><td>$row->creator" : "New document";?>
+					<?php echo $row->created ? "$row->created</td></tr><tr><td valign='top' align='right'><strong>By</strong></td><td>$row->creator" : T_("New document");?>
 					</td>
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					<strong>Last Modified</strong>
+					<strong><?php echo T_('Last Modified') ?></strong>
 					</td>
 					<td>
-					<?php echo $row->modified ? "$row->modified</td></tr><tr><td valign='top' align='right'><strong>By</strong></td><td>$row->modifier" : "Not modified";?>
+					<?php echo $row->modified ? "$row->modified</td></tr><tr><td valign='top' align='right'><strong>By</strong></td><td>$row->modifier" : T_("Not modified");?>
 					</td>
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					<strong>Expires</strong>
+					<strong><?php echo T_('Expires') ?></strong>
 					</td>
 					<td>
 					<?php echo "$row->publish_down";?>
@@ -566,22 +564,22 @@
 				</table>
 				<?php
 				$tabs->endTab();
-				$tabs->startTab("Images","images-page");
+				$tabs->startTab(T_("Images"),"images-page");
 				?>
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					MOSImage Control
+					<?php echo T_('MOSImage Control') ?>
 					</th>
 				<tr>
 				<tr>
 					<td colspan="6">
-					Sub-folder: <?php echo $lists['folders'];?>
+					<?php echo T_('Sub-folder:') ?> <?php echo $lists['folders'];?>
 					</td>
 				</tr>
 				<tr>
 					<td>
-					Gallery Images
+					<?php echo T_('Gallery Images') ?>
 					<br />
 					<?php echo $lists['imagefiles'];?>
 					<br />
@@ -593,7 +591,7 @@
 				</tr>
 				<tr>
 					<td>
-					Content Images:
+					<?php echo T_('Content Images:') ?>
 					<br />
 					<?php echo $lists['imagelist'];?>
 					<br />
@@ -607,11 +605,11 @@
 				</tr>
 				<tr>
 					<td>
-					Edit the image selected:
+					<?php echo T_('Edit the image selected:') ?>
 						<table>
 						<tr>
 							<td align="right">
-							Source
+							<?php echo T_('Source') ?>
 							</td>
 							<td>
 							<input type="text" name= "_source" value="" />
@@ -619,7 +617,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Align
+							<?php echo T_('Align') ?>
 							</td>
 							<td>
 							<?php echo $lists['_align']; ?>
@@ -627,7 +625,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Alt Text
+							<?php echo T_('Alt Text') ?>
 							</td>
 							<td>
 							<input type="text" name="_alt" value="" />
@@ -635,7 +633,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Border
+							<?php echo T_('Border') ?>
 							</td>
 							<td>
 							<input type="text" name="_border" value="" size="3" maxlength="1" />
@@ -643,7 +641,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Caption:
+							<?php echo T_('Caption:') ?>
 							</td>
 							<td>
 							<input class="text_area" type="text" name="_caption" value="" size="30" />
@@ -651,7 +649,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Caption Position:
+							<?php echo T_('Caption Position:') ?>
 							</td>
 							<td>
 							<?php echo $lists['_caption_position']; ?>
@@ -659,7 +657,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Caption Align:
+							<?php echo T_('Caption Align:') ?>
 							</td>
 							<td>
 							<?php echo $lists['_caption_align']; ?>
@@ -667,7 +665,7 @@
 						</tr>
 						<tr>
 							<td align="right">
-							Width:
+							<?php echo T_('Width:') ?>
 							</td>
 							<td>
 							<input class="text_area" type="text" name="_width" value="" size="5" maxlength="5" />
@@ -684,12 +682,12 @@
 				</table>
 				<?php
 				$tabs->endTab();
-				$tabs->startTab("Parameters","params-page");
+				$tabs->startTab(T_("Parameters"),"params-page");
 				?>
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Parameter Control
+					<?php echo T_('Parameter Control') ?>
 					</th>
 				<tr>
 				<tr>
@@ -700,46 +698,46 @@
 				</table>
 				<?php
 				$tabs->endTab();
-				$tabs->startTab("Meta Info","metadata-page");
+				$tabs->startTab(T_("Meta Info"),"metadata-page");
 				?>
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Meta Data
+					<?php echo T_('Meta Data') ?>
 					</th>
 				<tr>
 				<tr>
 					<td align="left">
-					Description:<br />
+					<?php echo T_('Description:') ?><br />
 					<textarea class="inputbox" cols="40" rows="5" name="metadesc" style="width:300px"><?php echo str_replace('&','&amp;',$row->metadesc); ?></textarea>
 					</td>
 				</tr>
 				<tr>
 					<td align="left">
-					Keywords:<br />
+					<?php echo T_('Keywords:') ?><br />
 					<textarea class="inputbox" cols="40" rows="5" name="metakey" style="width:300px"><?php echo str_replace('&','&amp;',$row->metakey); ?></textarea>
 					</td>
 				</tr>
 				</table>
 				<?php
 				$tabs->endTab();
-				$tabs->startTab("Link to Menu","link-page");
+				$tabs->startTab(T_("Link to Menu"),"link-page");
 				?>
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Link to Menu
+					<?php echo T_('Link to Menu') ?>
 					</th>
 				<tr>
 				<tr>
 					<td colspan="2">
-					This will create a 'Link - Static Content' in the menu you select
+					<?php echo T_('This will create a "Link - Static Content" in the menu you select') ?>
 					<br /><br />
 					</td>
 				<tr>
 				<tr>
 					<td valign="top" width="90px">
-					Select a Menu
+					<?php echo T_('Select a Menu') ?>
 					</td>
 					<td>
 					<?php echo $lists['menuselect']; ?>
@@ -747,7 +745,7 @@
 				<tr>
 				<tr>
 					<td valign="top" width="90px">
-					Menu Item Name
+					<?php echo T_('Menu Item Name') ?>
 					</td>
 					<td>
 					<input type="text" name="link_name" class="inputbox" value="" size="30" />
@@ -757,12 +755,12 @@
 					<td>
 					</td>
 					<td>
-					<input name="menu_link" type="button" class="button" value="Link to Menu" onClick="submitbutton('menulink');" />
+					<input name="menu_link" type="button" class="button" value="<?php echo T_('Link to Menu') ?>" onClick="submitbutton('menulink');" />
 					</td>
 				<tr>
 				<tr>
 					<th colspan="2">
-					Existing Menu Links
+					<?php echo T_('Existing Menu Links') ?>
 					</th>
 				</tr>
 				<?php
@@ -770,7 +768,7 @@
 					?>
 					<tr>
 						<td colspan="2">
-						None
+						<?php echo T_('None') ?>
 						</td>
 					</tr>
 					<?php
diff -ruN 4.5.4/administrator/components/com_typedcontent/admin.typedcontent.php 4.6rc2/administrator/components/com_typedcontent/admin.typedcontent.php
--- 4.5.4/administrator/components/com_typedcontent/admin.typedcontent.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_typedcontent/admin.typedcontent.php	2006-02-22 07:31:46.000000000 -0600
@@ -1,17 +1,20 @@
 <?php
 /**
-* @version $Id: admin.typedcontent.php,v 1.2 2005/07/22 03:30:09 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 require_once( $mainframe->getPath( 'admin_html' ) );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
 
 $id 	= mosGetParam( $_REQUEST, 'id', '' );
 $cid 	= mosGetParam( $_POST, 'cid', array(0) );
@@ -151,20 +154,20 @@
 		$rows[$i]->links = $database->loadResult();
 	}
 
-	$ordering[] = mosHTML::makeOption( 'c.ordering ASC', 'Ordering asc' );
-	$ordering[] = mosHTML::makeOption( 'c.ordering DESC', 'Ordering desc' );
-	$ordering[] = mosHTML::makeOption( 'c.id ASC', 'ID asc' );
-	$ordering[] = mosHTML::makeOption( 'c.id DESC', 'ID desc' );
-	$ordering[] = mosHTML::makeOption( 'c.title ASC', 'Title asc' );
-	$ordering[] = mosHTML::makeOption( 'c.title DESC', 'Title desc' );
-	$ordering[] = mosHTML::makeOption( 'c.created ASC', 'Date asc' );
-	$ordering[] = mosHTML::makeOption( 'c.created DESC', 'Date desc' );
-	$ordering[] = mosHTML::makeOption( 'z.name ASC', 'Author asc' );
-	$ordering[] = mosHTML::makeOption( 'z.name DESC', 'Author desc' );
-	$ordering[] = mosHTML::makeOption( 'c.state ASC', 'Published asc' );
-	$ordering[] = mosHTML::makeOption( 'c.state DESC', 'Published desc' );
-	$ordering[] = mosHTML::makeOption( 'c.access ASC', 'Access asc' );
-	$ordering[] = mosHTML::makeOption( 'c.access DESC', 'Access desc' );
+	$ordering[] = mosHTML::makeOption( 'c.ordering ASC', T_('Ordering asc') );
+	$ordering[] = mosHTML::makeOption( 'c.ordering DESC', T_('Ordering desc') );
+	$ordering[] = mosHTML::makeOption( 'c.id ASC', T_('ID asc') );
+	$ordering[] = mosHTML::makeOption( 'c.id DESC', T_('ID desc') );
+	$ordering[] = mosHTML::makeOption( 'c.title ASC', T_('Title asc') );
+	$ordering[] = mosHTML::makeOption( 'c.title DESC', T_('Title desc') );
+	$ordering[] = mosHTML::makeOption( 'c.created ASC', T_('Date asc') );
+	$ordering[] = mosHTML::makeOption( 'c.created DESC', T_('Date desc') );
+	$ordering[] = mosHTML::makeOption( 'z.name ASC', T_('Author asc') );
+	$ordering[] = mosHTML::makeOption( 'z.name DESC', T_('Author desc') );
+	$ordering[] = mosHTML::makeOption( 'c.state ASC', T_('Published asc') );
+	$ordering[] = mosHTML::makeOption( 'c.state DESC', T_('Published desc') );
+	$ordering[] = mosHTML::makeOption( 'c.access ASC', T_('Access asc') );
+	$ordering[] = mosHTML::makeOption( 'c.access DESC', T_('Access desc') );
 	$javascript = 'onchange="document.adminForm.submit();"';
 	$lists['order'] = mosHTML::selectList( $ordering, 'zorder', 'class="inputbox" size="1"'. $javascript, 'value', 'text', $order );
 
@@ -176,7 +179,7 @@
 	. "\n GROUP BY u.name"
 	. "\n ORDER BY u.name"
 	;
-	$authors[] = mosHTML::makeOption( '0', _SEL_AUTHOR );
+	$authors[] = mosHTML::makeOption( '0', T_('- All Authors -') );
 	$database->setQuery( $query );
 	$authors = array_merge( $authors, $database->loadObjectList() );
 	$lists['authorid']	= mosHTML::selectList( $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $filter_authorid );
@@ -198,7 +201,7 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		echo "<script>alert('The module $row->title is currently being edited by another administrator'); document.location.href='index2.php?option=$option'</script>\n";
+		echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $row->title)."'); document.location.href='index2.php?option=$option'</script>\n";
 		exit(0);
 	}
 
@@ -230,8 +233,8 @@
 		$row->modifier = $database->loadResult();
 
 		// get list of links to this item
-		$and 	= "\n AND componentid = ". $row->id;
-		$menus 	= mosAdminMenus::Links2Menu( 'content_typed', $and );
+		$_and 	= "\n AND componentid = ". $row->id;
+		$menus 	= mosAdminMenus::Links2Menu( 'content_typed', $_and );
 	} else {
 		// initialise values for a new item
 		$row->version = 0;
@@ -273,12 +276,12 @@
 	// build the select list for the image caption alignment
 	$lists['_caption_align'] 	= mosAdminMenus::Positions( '_caption_align' );
 	// build the select list for the image caption position
-	$pos[] = mosHTML::makeOption( 'bottom', _CMN_BOTTOM );
-	$pos[] = mosHTML::makeOption( 'top', _CMN_TOP );
+	$pos[] = mosHTML::makeOption( 'bottom', T_('Bottom') );
+	$pos[] = mosHTML::makeOption( 'top', T_('Top') );
 	$lists['_caption_position'] = mosHTML::selectList( $pos, '_caption_position', 'class="inputbox" size="1"', 'value', 'text' );
 
 	// get params definitions
-	$params =& new mosParameters( $row->attribs, $mainframe->getPath( 'com_xml', 'com_typedcontent' ), 'component' );
+	$params =& new mosAdminParameters( $row->attribs, $mainframe->getPath( 'com_xml', 'com_typedcontent' ), 'component' );
 
 	HTML_typedcontent::edit( $row, $images, $lists, $params, $option, $menus );
 }
@@ -352,13 +355,13 @@
 			break;
 
 		case 'save':
-			$msg = 'Typed Content Item saved';
+			$msg = T_('Typed Content Item saved');
 			mosRedirect( 'index2.php?option='. $option, $msg );
 			break;
 
 		case 'apply':
 		default:
-			$msg = 'Changes to Typed Content Item saved';
+			$msg = T_('Changes to Typed Content Item saved');
 			mosRedirect( 'index2.php?option='. $option .'&task=edit&hidemainmenu=1&id='. $row->id, $msg );
 			break;
 	}
@@ -372,7 +375,7 @@
 
 	$total = count( $cid );
 	if ( $total < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -389,7 +392,7 @@
 		exit();
 	}
 
-	$msg = $total ." Item(s) sent to the Trash";
+	$msg = sprintf(Tn_('%d Item sent to the Trash', '%d Items sent to the Trash', $total), $total) ."";
 	mosRedirect( 'index2.php?option='. $option, $msg );
 }
 
@@ -405,8 +408,8 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		$action = $state == 1 ? 'publish' : ($state == -1 ? 'archive' : 'unpublish');
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
+		$action = $state == 1 ? T_('publish') : ($state == -1 ? T_('archive') : T_('unpublish'));
+		echo "<script> alert('".sprintf(T_('Select an item to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -427,9 +430,10 @@
 	}
 
 	if ( $state == "1" ) {
-		$msg = $total ." Item(s) successfully Published";
+		$msg = $total ."";
+		$msg = sprintf(Tn_('%d Item successfully Published', '%d Items successfully Published', $total), $total);
 	} else if ( $state == "0" ) {
-		$msg = $total ." Item(s) successfully Unpublished";
+	    $msg = sprintf(Tn_('%d Item successfully Unpublished', '%d Items successfully Unpublished', $total), $total);
 	}
 	mosRedirect( 'index2.php?option='. $option .'&msg='. $msg );
 }
@@ -468,7 +472,7 @@
 	$row->store();
 	$row->checkin();
 
-	$msg = 'Successfully Reset Hit';
+	$msg = T_('Successfully Reset Hit');
 	mosRedirect( 'index2.php?option='. $option .'&task=edit&hidemainmenu=1&id='. $row->id, $msg );
 }
 
@@ -511,7 +515,7 @@
 	$row->checkin();
 	$row->updateOrder( "menutype='$row->menutype' AND parent='$row->parent'" );
 
-	$msg = $link .' (Link - Static Content) in menu: '. $menu .' successfully created';
+	$msg =sprintf(T_('%s (Link - Static Content) in menu: %s successfully created'),$link , $menu);
 	mosRedirect( 'index2.php?option='. $option .'&task=edit&hidemainmenu=1&id='. $id, $msg );
 }
 
@@ -544,40 +548,28 @@
 
 function saveOrder( &$cid ) {
 	global $database;
-
-	$total		= count( $cid );
 	$order 		= mosGetParam( $_POST, 'order', array(0) );
-	$row 		= new mosContent( $database );
-	$conditions = array();
-
+	$row		= new mosMenu( $database );
+	$categories = array();
     // update ordering values
-	for ( $i=0; $i < $total; $i++ ) {
-		$row->load( $cid[$i] );
+    foreach ($cid as $i=>$ciditem) {
+		$row->load( $ciditem );
 		if ($row->ordering != $order[$i]) {
 			$row->ordering = $order[$i];
 	        if (!$row->store()) {
 	            echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
 	            exit();
-	        } // if
+	        }
 	        // remember to updateOrder this group
-	        $condition = "catid='$row->catid' AND state >= 0";
-	        $found = false;
-	        foreach ( $conditions as $cond )
-	            if ($cond[1]==$condition) {
-	                $found = true;
-	                break;
-	            } // if
-	        if (!$found) $conditions[] = array($row->id, $condition);
-		} // if
-	} // for
-
+	        $categories[$row->catid] = $row->id;
+	    }
+	}
 	// execute updateOrder for each group
-	foreach ( $conditions as $cond ) {
-		$row->load( $cond[0] );
-		$row->updateOrder( $cond[1] );
+	foreach ($categories as $catid=>$rowid) {
+		$row->updateOrder("catid = $catid AND state >= 0");
 	} // foreach
 
-	$msg 	= 'New ordering saved';
+	$msg 	= T_('New ordering saved');
 	mosRedirect( 'index2.php?option=com_typedcontent', $msg );
 } // saveOrder
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_typedcontent/toolbar.typedcontent.html.php 4.6rc2/administrator/components/com_typedcontent/toolbar.typedcontent.html.php
--- 4.5.4/administrator/components/com_typedcontent/toolbar.typedcontent.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_typedcontent/toolbar.typedcontent.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,17 +1,15 @@
 <?php
 /**
-* @version $Id: toolbar.typedcontent.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
 class TOOLBAR_typedcontent {
 	function _EDIT( ) {
 		mosMenuBar::startTable();
@@ -25,7 +23,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::cancel();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.staticcontent.edit' );
+		mosMenuBar::help( 'edit' );
 		mosMenuBar::endTable();
 	}
 
@@ -41,7 +39,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::trash();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.staticcontent.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_typedcontent/toolbar.typedcontent.php 4.6rc2/administrator/components/com_typedcontent/toolbar.typedcontent.php
--- 4.5.4/administrator/components/com_typedcontent/toolbar.typedcontent.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_typedcontent/toolbar.typedcontent.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.typedcontent.php,v 1.1 2005/07/22 01:53:37 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/components/com_typedcontent/typedcontent.xml 4.6rc2/administrator/components/com_typedcontent/typedcontent.xml
--- 4.5.4/administrator/components/com_typedcontent/typedcontent.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_typedcontent/typedcontent.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Typed Content Page</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This shows a single content page</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_users/admin.users.html.php 4.6rc2/administrator/components/com_users/admin.users.html.php
--- 4.5.4/administrator/components/com_users/admin.users.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_users/admin.users.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.users.html.php,v 1.1 2005/07/22 01:53:37 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Users
-*/
 class HTML_users {
 
 	function showUsers( &$rows, $pageNav, $search, $option, $lists ) {
@@ -25,10 +23,10 @@
 		<table class="adminheading">
 		<tr>
 			<th class="user">
-			User Manager
+			<?php echo T_('User Manager') ?>
 			</th>
 			<td>
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="inputbox" onChange="document.adminForm.submit();" />
@@ -51,25 +49,25 @@
 			<input type="checkbox" name="toggle" value="" onClick="checkAll(<?php echo count($rows); ?>);" />
 			</th>
 			<th class="title">
-			Name
+			<?php echo T_('Name') ?>
 			</th>
 			<th width="5%" class="title" nowrap="nowrap">
-			Logged In
+			<?php echo T_('Logged In') ?>
 			</th>
 			<th width="5%" class="title">
-			Enabled
+			<?php echo T_('Enabled') ?>
 			</th>
 			<th width="15%" class="title" >
-			UserID
+			<?php echo T_('UserID') ?>
 			</th>
 			<th width="15%" class="title">
-			Group
+			<?php echo T_('Group') ?>
 			</th>
 			<th width="15%" class="title">
-			E-Mail
+			<?php echo T_('E-Mail') ?>
 			</th>
 			<th width="10%" class="title">
-			Last Visit
+			<?php echo T_('Last Visit') ?>
 			</th>
 		</tr>
 		<?php
@@ -151,21 +149,21 @@
 
 			// do field validation
 			if (trim(form.name.value) == "") {
-				alert( "You must provide a name." );
+				alert( "<?php echo T_('You must provide a name.') ?>" );
 			} else if (form.username.value == "") {
-				alert( "You must provide a user login name." );
+				alert( "<?php echo T_('You must provide a user login name.') ?>" );
 			} else if (r.exec(form.username.value) || form.username.value.length < 3) {
-				alert( "You login name contains invalid characters or is too short." );
+				alert( "<?php echo T_('Your login name contains invalid characters or is too short.') ?>" );
 			} else if (trim(form.email.value) == "") {
-				alert( "You must provide an email address." );
+				alert( "<?php echo T_('You must provide an email address.') ?>" );
 			} else if (form.gid.value == "") {
-				alert( "You must assign user to a group." );
+				alert( "<?php echo T_('You must assign user to a group.') ?>" );
 			} else if (trim(form.password.value) != "" && form.password.value != form.password2.value){
-				alert( "Password do not match." );
+				alert( "<?php echo T_('Passwords do not match.') ?>" );
 			} else if (form.gid.value == "29") {
-				alert( "Please Select another group as `Public Frontend` is not a selectable option" );
+				alert( "<?php echo T_('Please Select another group as `Public Frontend` is not a selectable option') ?>" );
 			} else if (form.gid.value == "30") {
-				alert( "Please Select another group as `Public Backend` is not a selectable option" );
+				alert( "<?php echo T_('Please Select another group as `Public Backend` is not a selectable option') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -182,7 +180,7 @@
 		<table class="adminheading">
 		<tr>
 			<th class="user">
-			User: <small><?php echo $row->id ? 'Edit' : 'Add';?></small>
+			<?php echo T_('User:') ?> <small><?php echo $row->id ? T_('Edit') : T_('Add');?></small>
 			</th>
 		</tr>
 		</table>
@@ -193,12 +191,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					User Details
+					<?php echo T_('User Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="100">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="85%">
 					<input type="text" name="name" class="inputbox" size="40" value="<?php echo $row->name; ?>" />
@@ -206,14 +204,14 @@
 				</tr>
 				<tr>
 					<td>
-					Username:
+					<?php echo T_('Username:') ?>
 					</td>
 					<td>
 					<input type="text" name="username" class="inputbox" size="40" value="<?php echo $row->username; ?>" />
 					</td>
 				<tr>
 					<td>
-					Email:
+					<?php echo T_('Email:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="email" size="40" value="<?php echo $row->email; ?>" />
@@ -221,7 +219,7 @@
 				</tr>
 				<tr>
 					<td>
-					New Password:
+					<?php echo T_('New Password:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="password" name="password" size="40" value="" />
@@ -229,7 +227,7 @@
 				</tr>
 				<tr>
 					<td>
-					Verify Password:
+					<?php echo T_('Verify Password:') ?>
 					</td>
 					<td>
 					<input class="inputbox" type="password" name="password2" size="40" value="" />
@@ -237,7 +235,7 @@
 				</tr>
 				<tr>
 					<td valign="top">
-					Group:
+					<?php echo T_('Group:') ?>
 					</td>
 					<td>
 					<?php echo $lists['gid']; ?>
@@ -248,7 +246,7 @@
 					?>
 					<tr>
 						<td>
-						Block User
+						<?php echo T_('Block User') ?>
 						</td>
 						<td>
 						<?php echo $lists['block']; ?>
@@ -260,7 +258,7 @@
 					?>
 					<tr>
 						<td>
-						Receive Submission Emails
+						<?php echo T_('Receive Submission Emails') ?>
 						</td>
 						<td>
 						<?php echo $lists['sendEmail']; ?>
@@ -272,7 +270,7 @@
 					?>
 					<tr>
 						<td>
-						Register Date
+						<?php echo T_('Register Date') ?>
 						</td>
 						<td>
 						<?php echo $row->registerDate;?>
@@ -280,7 +278,7 @@
 					</tr>
 				<tr>
 					<td>
-					Last Visit Date
+					<?php echo T_('Last Visit Date') ?>
 					</td>
 					<td>
 					<?php echo $row->lastvisitDate;?>
@@ -303,15 +301,15 @@
 				<table class="adminform">
 				<tr>
 					<th>
-					Contact Information
+					<?php echo T_('Contact Information') ?>
 					</th>
 				</tr>
 				<tr>
 					<td>
 					<br />
-					No Contact details linked to this User:
+					<?php echo T_('No Contact details linked to this User:') ?>
 					<br />
-					See 'Components -> Contact -> Manage Contacts' for details.
+					<?php echo T_('See "Components -> Contact -> Manage Contacts" for details.') ?>
 					<br /><br />
 					</td>
 				</tr>
@@ -322,12 +320,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Contact Information
+					<?php echo T_('Contact Information') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="15%">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td>
 					<strong>
@@ -337,7 +335,7 @@
 				</tr>
 				<tr>
 					<td>
-					Position:
+					<?php echo T_('Position:') ?>
 					</td>
 					<td >
 					<strong>
@@ -347,7 +345,7 @@
 				</tr>
 				<tr>
 					<td>
-					Telephone:
+					<?php echo T_('Telephone:') ?>
 					</td>
 					<td >
 					<strong>
@@ -357,7 +355,7 @@
 				</tr>
 				<tr>
 					<td>
-					Fax:
+					<?php echo T_('Fax:') ?>
 					</td>
 					<td >
 					<strong>
@@ -379,7 +377,7 @@
 					<tr>
 						<td></td>
 						<td valign="top">
-						<img src="<?php echo $mosConfig_live_site;?>/images/stories/<?php echo $contact[0]->image; ?>" align="middle" alt="Contact" />
+						<img src="<?php echo $mosConfig_live_site;?>/images/stories/<?php echo $contact[0]->image; ?>" align="middle" alt="<?php echo T_('Contact') ?>" />
 						</td>
 					</tr>
 					<?php
@@ -388,10 +386,10 @@
 				<tr>
 					<td colspan="2">
 					<br /><br />
-					<input class="button" type="button" value="change Contact Details" onclick="javascript: gotocontact( '<?php echo $contact[0]->id; ?>' )">
+					<input class="button" type="button" value="<?php echo T_('Change Contact Details') ?>" onclick="javascript: gotocontact( '<?php echo $contact[0]->id; ?>' )">
 					<i>
 					<br />
-					'Components -> Contact -> Manage Contacts'.
+					'<?php echo T_('Components -> Contact -> Manage Contacts') ?>'.
 					</i>
 					</td>
 				</tr>
diff -ruN 4.5.4/administrator/components/com_users/admin.users.php 4.6rc2/administrator/components/com_users/admin.users.php
--- 4.5.4/administrator/components/com_users/admin.users.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_users/admin.users.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,18 +1,20 @@
 <?php
 /**
-* @version $Id: admin.users.php,v 1.2 2005/08/07 23:23:03 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 if (!$acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_users' )) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -91,7 +93,7 @@
 	}
 	if ( $filter_type ) {
 		if ( $filter_type == 'Public Frontend' ) {
-			$where[] = "a.usertype = 'Registered' OR a.usertype = 'Author' OR a.usertype = 'Editor'OR a.usertype = 'Publisher'";
+			$where[] = "a.usertype = 'Registered' OR a.usertype = 'Author' OR a.usertype = 'Editor' OR a.usertype = 'Publisher'";
 		} else if ( $filter_type == 'Public Backend' ) {
 			$where[] = "a.usertype = 'Manager' OR a.usertype = 'Administrator' OR a.usertype = 'Super Administrator'";
 		} else {
@@ -112,14 +114,10 @@
 		$where[] = "(a.gid NOT IN (" . implode( ',', $pgids ) . "))";
 	}
 
-	$query = "SELECT COUNT(a.id)"
-	. "\n FROM #__users AS a";
-
-	if ($filter_logged == 1 || $filter_logged == 2) {
-		$query .= "\n INNER JOIN #__session AS s ON s.userid = a.id";
-	}
-
-	$query .= ( count( $where ) ? "\n WHERE " . implode( ' AND ', $where ) : '' )
+	$query = "SELECT COUNT(*)"
+	. "\n FROM #__users AS a"
+	. "\n LEFT JOIN #__session AS s ON s.userid = a.id"
+	. ( count( $where ) ? "\n WHERE " . implode( ' AND ', $where ) : '' )
 	;
 	$database->setQuery( $query );
 	$total = $database->loadResult();
@@ -127,17 +125,13 @@
 	require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
 	$pageNav = new mosPageNav( $total, $limitstart, $limit  );
 
-	$query = "SELECT a.*, g.name AS groupname"
+	$query = "SELECT a.*, g.name AS groupname, s.userid AS loggedin"
 	. "\n FROM #__users AS a"
 	. "\n INNER JOIN #__core_acl_aro AS aro ON aro.value = a.id"	// map user to aro
 	. "\n INNER JOIN #__core_acl_groups_aro_map AS gm ON gm.aro_id = aro.aro_id"	// map aro to group
-	. "\n INNER JOIN #__core_acl_aro_groups AS g ON g.group_id = gm.group_id";
-
-	if ($filter_logged == 1 || $filter_logged == 2) {
-		$query .= "\n INNER JOIN #__session AS s ON s.userid = a.id";
-	}
-
-	$query .= (count( $where ) ? "\n WHERE " . implode( ' AND ', $where ) : "")
+	. "\n INNER JOIN #__core_acl_aro_groups AS g ON g.group_id = gm.group_id"
+	. "\n LEFT JOIN #__session AS s ON s.userid = a.id"
+	. (count( $where ) ? "\n WHERE " . implode( ' AND ', $where ) : "")
 	. "\n GROUP BY a.id"
 	. "\n LIMIT $pageNav->limitstart, $pageNav->limit"
 	;
@@ -149,29 +143,21 @@
 		return false;
 	}
 
-	$template = 'SELECT COUNT(s.userid) FROM #__session AS s WHERE s.userid = %d';
-	$n = count( $rows );
-	for ($i = 0; $i < $n; $i++) {
-		$row = &$rows[$i];
-		$query = sprintf( $template, intval( $row->id ) );
-		$database->setQuery( $query );
-		$row->loggedin = $database->loadResult();
-	}
-
 	// get list of Groups for dropdown filter
 	$query = "SELECT name AS value, name AS text"
 	. "\n FROM #__core_acl_aro_groups"
 	. "\n WHERE name != 'ROOT'"
 	. "\n AND name != 'USERS'"
 	;
-	$types[] = mosHTML::makeOption( '0', '- Select Group -' );
+	$types[] = mosHTML::makeOption( '0', T_('- Select Group -') );
 	$database->setQuery( $query );
 	$types = array_merge( $types, $database->loadObjectList() );
 	$lists['type'] = mosHTML::selectList( $types, 'filter_type', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', "$filter_type" );
 
 	// get list of Log Status for dropdown filter
-	$logged[] = mosHTML::makeOption( 0, '- Select Log Status - ');
-	$logged[] = mosHTML::makeOption( 1, 'Logged In');
+	$logged[] = mosHTML::makeOption( 0, T_('- Select Log Status - '));
+	$logged[] = mosHTML::makeOption( 1, T_('Logged In'));
+	$logged[] = mosHTML::makeOption( 2, T_('Not Logged In'));
 	$lists['logged'] = mosHTML::selectList( $logged, 'filter_logged', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', "$filter_logged" );
 
 	HTML_users::showUsers( $rows, $pageNav, $search, $option, $lists );
@@ -183,7 +169,6 @@
 	$row = new mosUser( $database );
 	// load the row from the db table
 	$row->load( $uid );
-
 	if ( $uid ) {
 		$query = "SELECT * FROM #__contact_details WHERE user_id='". $row->id ."'";
 		$database->setQuery( $query );
@@ -195,19 +180,20 @@
 
 	// check to ensure only super admins can edit super admin info
 	if ( ( $my->gid < 25 ) && ( $row->gid == 25 ) ) {
-		mosRedirect( 'index2.php?option=com_users', _NOT_AUTH );
+		mosRedirect( 'index2.php?option=com_users', T_('You are not authorized to view this resource.') );
 	}
 
 	$my_group = strtolower( $acl->get_group_name( $row->gid, 'ARO' ) );
 	if ( $my_group == 'super administrator' ) {
-		$lists['gid'] = '<input type="hidden" name="gid" value="'. $my->gid .'" /><strong>Super Administrator</strong>';
+		$lists['gid'] = '<input type="hidden" name="gid" value="'. $my->gid .'" /><strong>'.T_('Super Administrator').'</strong>';
 	} else if ( $my->gid == 24 && $row->gid == 24 ) {
-		$lists['gid'] = '<input type="hidden" name="gid" value="'. $my->gid .'" /><strong>Administrator</strong>';
+		$lists['gid'] = '<input type="hidden" name="gid" value="'. $my->gid .'" /><strong>'.T_('Administrator').'</strong>';
 	} else {
 		// ensure user can't add group higher than themselves
 		$my_groups = $acl->get_object_groups( 'users', $my->id, 'ARO' );
 		if (is_array( $my_groups ) && count( $my_groups ) > 0) {
 			$ex_groups = $acl->get_group_children( $my_groups[0], 'ARO', 'RECURSE' );
+			if (!$ex_groups) $ex_groups = array();
 		} else {
 			$ex_groups = array();
 		}
@@ -265,7 +251,8 @@
 			// password set to null if empty
 			$row->password = null;
 		} else {
-			$row->password = md5( $row->password );
+			$pwd = $row->password;
+			$row->password = md5( $pwd );
 		}
 	}
 
@@ -289,8 +276,14 @@
 	}
 	$row->checkin();
 
+	$loginfo = new mosLoginDetails($row->username, $pwd);
+	$mambothandler =& mosMambotHandler::getInstance();
+	$mambothandler->loadBotGroup('authenticator');
 	// update the ACL
 	if ( !$isNew ) {
+		if ($pwd) $mambothandler->trigger('userChange', array($loginfo));
+		if ($row->block) $mambothandler->trigger('userBlock', array($loginfo));
+		else $mambothandler->trigger('userUnblock', array($loginfo));
 		$query = "SELECT aro_id FROM #__core_acl_aro WHERE value='$row->id'";
 		$database->setQuery( $query );
 		$aro_id = $database->loadResult();
@@ -305,12 +298,26 @@
 
 	// for new users, email username and password
 	if ($isNew) {
+		$mambothandler->trigger('userRegister', array($loginfo));
+		$mambothandler->trigger('userActivate', array($loginfo));
+		if ($row->block) $mambothandler->trigger('userBlock', array($loginfo));
 		$query = "SELECT email FROM #__users WHERE id=$my->id";
 		$database->setQuery( $query );
 		$adminEmail = $database->loadResult();
 
-		$subject = _NEW_USER_MESSAGE_SUBJECT;
-		$message = sprintf ( _NEW_USER_MESSAGE, $row->name, $mosConfig_sitename, $mosConfig_live_site, $row->username, $pwd );
+		$subject = T_('New User Details');
+		$message = sprintf ( T_('Hello %s,
+
+
+You have been added as a user to %s by an Administrator.
+
+This email contains your username and password to log into the %s
+
+Username - %s
+Password - %s
+
+
+Please do not respond to this message as it is automatically generated and is for information purposes only'), $row->name, $mosConfig_sitename, $mosConfig_live_site, $row->username, $pwd );
 
 		if ($mosConfig_mailfrom != "" && $mosConfig_fromname != "") {
 			$adminName = $mosConfig_fromname;
@@ -328,12 +335,12 @@
 
 	switch ( $task ) {
 		case 'apply':
-			$msg = 'Successfully Saved changes to User: '. $row->name;
+			$msg = sprintf(T_('Successfully Saved changes to User: %s'), $row->name);
 			mosRedirect( 'index2.php?option=com_users&task=editA&hidemainmenu=1&id='. $row->id, $msg );
 
 		case 'save':
 		default:
-			$msg = 'Successfully Saved User: '. $row->name;
+			$msg = sprintf(T_('Successfully Saved User: %s'), $row->name);
 			mosRedirect( 'index2.php?option=com_users', $msg );
 
 			break;
@@ -352,27 +359,41 @@
 	global $database, $acl, $my;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
 	if ( count( $cid ) ) {
 		$obj = new mosUser( $database );
+		$deleted = array();
 		foreach ($cid as $id) {
 			// check for a super admin ... can't delete them
 			$groups 	= $acl->get_object_groups( 'users', $id, 'ARO' );
 			$this_group = strtolower( $acl->get_group_name( $groups[0], 'ARO' ) );
 			if ( $this_group == 'super administrator' ) {
-				$msg = "You cannot delete a Super Administrator";
+				$msg = T_("You cannot delete a Super Administrator");
  			} else if ( $id == $my->id ){
- 				$msg = "You cannot delete Yourself!";
+ 				$msg = T_("You cannot delete Yourself!");
  			} else if ( ( $this_group == 'administrator' ) && ( $my->gid == 24 ) ){
- 				$msg = "You cannot delete another `Administrator` only `Super Administrators` have this power";
+ 				$msg = T_("You cannot delete another `Administrator` only `Super Administrators` have this power");
 			} else {
 				$obj->delete( $id );
+				$deleted[] = $id;
 				$msg = $obj->getError();
 			}
 		}
+		if (count($deleted)) {
+			$mambothandler =& mosMambotHandler::getInstance();
+			$mambothandler->loadBotGroup('authenticator');
+			$cids = implode(',', $deleted);
+			$query = "SELECT username FROM #__users WHERE id IN ($cids)";
+			$database->setQuery($query);
+			$results = $database->loadResultArray();
+			if ($results) foreach ($results as $result) {
+				$loginfo = new mosLoginDetails($result->username);
+				$mambothandler->trigger('userDelete', array($loginfo));
+			}
+		}
 	}
 
 	mosRedirect( 'index2.php?option='. $option, $msg );
@@ -388,8 +409,8 @@
 	global $database, $my;
 
 	if (count( $cid ) < 1) {
-		$action = $block ? 'block' : 'unblock';
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
+		$action = $block ? T_('block') : T_('unblock');
+		echo "<script> alert('".sprintf(T_('Select an item to %s'),$action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -401,7 +422,16 @@
 		echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
 		exit();
 	}
-
+	$mambothandler =& mosMambotHandler::getInstance();
+	$mambothandler->loadBotGroup('authenticator');
+	$query = "SELECT username FROM #__users WHERE id IN ($cids)";
+	$database->setQuery($query);
+	$results = $database->loadResultArray();
+	if ($results) foreach ($results as $result) {
+		$loginfo = new mosLoginDetails($result->username);
+		if ($block) $mambothandler->trigger('userBlock', array($loginfo));
+		else $mambothandler->trigger('userUnblock', array($loginfo));
+	}
 	mosRedirect( 'index2.php?option='. $option );
 }
 
@@ -415,7 +445,7 @@
 	$cids = $cid;
 	if ( is_array( $cid ) ) {
 		if (count( $cid ) < 1) {
-			mosRedirect( 'index2.php?option='. $option, 'Please select a user' );
+			mosRedirect( 'index2.php?option='. $option, T_('Please select a user') );
 		}
 		$cids = implode( ',', $cid );
 	}
@@ -444,4 +474,4 @@
 	return $rBool;
 }
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_users/toolbar.users.html.php 4.6rc2/administrator/components/com_users/toolbar.users.html.php
--- 4.5.4/administrator/components/com_users/toolbar.users.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_users/toolbar.users.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,25 +1,23 @@
 <?php
 /**
-* @version $Id: toolbar.users.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Users
-*/
 class TOOLBAR_users {
 	/**
 	* Draws the menu to edit a user
 	*/
-	function _EDIT() {
+	function _EDIT($task) {
 		global $id;
 		
 		mosMenuBar::startTable();
@@ -29,12 +27,13 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.users.edit' );
+		if ($task == 'new' ) mosMenuBar::help( 'new' );
+		else mosMenuBar::help( 'edit' );
 		mosMenuBar::endTable();
 	}
 
@@ -46,9 +45,9 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::custom( 'logout', 'cancel.png', 'cancel_f2.png', '&nbsp;Force Logout' );
+		mosMenuBar::custom( 'logout', 'cancel.png', 'cancel_f2.png', T_('Force Logout') );
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.users.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_users/toolbar.users.php 4.6rc2/administrator/components/com_users/toolbar.users.php
--- 4.5.4/administrator/components/com_users/toolbar.users.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_users/toolbar.users.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.users.php,v 1.1 2005/07/22 01:53:37 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -17,7 +19,7 @@
 	case 'new':
 	case 'edit':
 	case 'editA':
-		TOOLBAR_users::_EDIT();
+		TOOLBAR_users::_EDIT($task);
 		break;
 
 	default:
diff -ruN 4.5.4/administrator/components/com_weblinks/admin.weblinks.html.php 4.6rc2/administrator/components/com_weblinks/admin.weblinks.html.php
--- 4.5.4/administrator/components/com_weblinks/admin.weblinks.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_weblinks/admin.weblinks.html.php	2006-05-14 17:22:54.000000000 -0500
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: admin.weblinks.html.php,v 1.3 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Weblinks
-*/
 class HTML_weblinks {
 
 	function showWeblinks( $option, &$rows, &$lists, &$search, &$pageNav ) {
@@ -26,10 +24,10 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Weblink Manager
+			<?php echo T_('Web Link Manager') ?>
 			</th>
 			<td>
-			Filter:
+			<?php echo T_('Filter:') ?>
 			</td>
 			<td>
 			<input type="text" name="search" value="<?php echo $search;?>" class="text_area" onChange="document.adminForm.submit();" />
@@ -49,22 +47,22 @@
 			<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count( $rows ); ?>);" />
 			</th>
 			<th class="title">
-			Title
+			<?php echo T_('Title') ?>
 			</th>
 			<th width="5%">
-			Published
+			<?php echo T_('Published') ?>
 			</th>
 			<th width="5%">
-			Approved
+			<?php echo T_('Approved') ?>
 			</th>
 			<th colspan="2" width="5%">
-			Reorder
+			<?php echo T_('Reorder') ?>
 			</th>
 			<th width="25%" align="left">
-			Category
+			<?php echo T_('Category') ?>
 			</th>
 			<th width="5%">
-			Hits
+			<?php echo T_('Hits') ?>
 			</th>
 		</tr>
 		<?php
@@ -95,7 +93,7 @@
 					echo $row->title;
 				} else {
 					?>
-					<a href="<?php echo $link; ?>" title="Edit Weblinks">
+					<a href="<?php echo $link; ?>" title="<?php echo T_('Edit Weblinks') ?>">
 					<?php echo $row->title; ?>
 					</a>
 					<?php
@@ -128,7 +126,7 @@
 				<?php echo $pageNav->orderDownIcon( $i, $n, ($row->catid == @$rows[$i+1]->catid) ); ?>
 				</td>
 				<td>
-				<a href="<?php echo $row->cat_link; ?>" title="Edit Category">
+				<a href="<?php echo $row->cat_link; ?>" title="<?php echo T_('Edit Category') ?>">
 				<?php echo $row->category; ?>
 				</a>
 				</td>
@@ -173,11 +171,11 @@
 
 			// do field validation
 			if (form.title.value == ""){
-				alert( "Weblink item must have a title" );
+				alert( "<?php echo T_('Weblink item must have a title') ?>" );
 			} else if (form.catid.value == "0"){
-				alert( "You must select a category." );
+				alert( "<?php echo T_('You must select a category.') ?>" );
 			} else if (form.url.value == ""){
-				alert( "You must have a url." );
+				alert( "<?php echo T_('You must have a url.') ?>" );
 			} else {
 				submitform( pressbutton );
 			}
@@ -187,9 +185,9 @@
 		<table class="adminheading">
 		<tr>
 			<th>
-			Weblink:
+			<?php echo T_('Web Link:') ?>
 			<small>
-			<?php echo $row->id ? 'Edit' : 'New';?>
+			<?php echo $row->id ? T_('Edit') : T_('New');?>
 			</small>
 			</th>
 		</tr>
@@ -201,12 +199,12 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="2">
-					Details
+					<?php echo T_('Details') ?>
 					</th>
 				</tr>
 				<tr>
 					<td width="20%" align="right">
-					Name:
+					<?php echo T_('Name:') ?>
 					</td>
 					<td width="80%">
 					<input class="text_area" type="text" name="title" size="50" maxlength="250" value="<?php echo $row->title;?>" />
@@ -214,7 +212,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Category:
+					<?php echo T_('Category:') ?>
 					</td>
 					<td>
 					<?php echo $lists['catid']; ?>
@@ -222,7 +220,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					URL:
+					<?php echo T_('URL:') ?>
 					</td>
 					<td>
 					<input class="text_area" type="text" name="url" value="<?php echo $row->url; ?>" size="50" maxlength="250" />
@@ -230,7 +228,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Description:
+					<?php echo T_('Description:') ?>
 					</td>
 					<td>
 					<textarea class="text_area" cols="50" rows="5" name="description" style="width:500px" width="500"><?php echo $row->description; ?></textarea>
@@ -239,7 +237,7 @@
 
 				<tr>
 					<td valign="top" align="right">
-					Ordering:
+					<?php echo T_('Ordering:') ?>
 					</td>
 					<td>
 					<?php echo $lists['ordering']; ?>
@@ -247,7 +245,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Approved:
+					<?php echo T_('Approved:') ?>
 					</td>
 					<td>
 					<?php echo $lists['approved']; ?>
@@ -255,7 +253,7 @@
 				</tr>
 				<tr>
 					<td valign="top" align="right">
-					Published:
+					<?php echo T_('Published:') ?>
 					</td>
 					<td>
 					<?php echo $lists['published']; ?>
@@ -267,7 +265,7 @@
 				<table class="adminform">
 				<tr>
 					<th colspan="1">
-					Parameters
+					<?php echo T_('Parameters') ?>
 					</th>
 				</tr>
 				<tr>
diff -ruN 4.5.4/administrator/components/com_weblinks/admin.weblinks.php 4.6rc2/administrator/components/com_weblinks/admin.weblinks.php
--- 4.5.4/administrator/components/com_weblinks/admin.weblinks.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_weblinks/admin.weblinks.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: admin.weblinks.php,v 1.1 2005/07/22 01:53:38 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,7 +16,7 @@
 // ensure user has access to this function
 if (!($acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' )
 		| $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'com_weblinks' ))) {
-	mosRedirect( 'index2.php', _NOT_AUTH );
+	mosRedirect( 'index2.php', T_('You are not authorized to view this resource.') );
 }
 
 require_once( $mainframe->getPath( 'admin_html' ) );
@@ -120,7 +122,7 @@
 
 	// build list of categories
 	$javascript = 'onchange="document.adminForm.submit();"';
-	$lists['catid'] 			= mosAdminMenus::ComponentCategory( 'catid', $option, intval( $catid ), $javascript );
+	$lists['catid'] = mosAdminMenus::ComponentCategory( 'catid', $option, intval( $catid ), $javascript );
 
 	HTML_weblinks::showWeblinks( $option, $rows, $lists, $search, $pageNav );
 }
@@ -140,7 +142,7 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		mosRedirect( 'index2.php?option='. $option, 'The module $row->title is currently being edited by another administrator.' );
+		mosRedirect( 'index2.php?option='. $option, sprintf(T_('The module %s is currently being edited by another administrator.'), $row->title) );
 	}
 
 	if ($id) {
@@ -169,7 +171,7 @@
 	$lists['published'] 		= mosHTML::yesnoRadioList( 'published', 'class="inputbox"', $row->published );
 
 	$file = $mosConfig_absolute_path .'/administrator/components/com_weblinks/weblinks_item.xml';
-	$params =& new mosParameters( $row->params, $file, 'component' );
+	$params =& new mosAdminParameters( $row->params, $file, 'component' );
 
 	HTML_weblinks::editWeblink( $row, $lists, $params, $option );
 }
@@ -220,7 +222,7 @@
 	global $database;
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		echo "<script> alert('Select an item to delete'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('Select an item to delete')."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 	if (count( $cid )) {
@@ -246,8 +248,8 @@
 	$catid = mosGetParam( $_POST, 'catid', array(0) );
 
 	if (!is_array( $cid ) || count( $cid ) < 1) {
-		$action = $publish ? 'publish' : 'unpublish';
-		echo "<script> alert('Select an item to $action'); window.history.go(-1);</script>\n";
+		$action = $publish ? T_('publish') : T_('unpublish');
+		echo "<script> alert('".sprintf(T_('Select an item to %s'), $action)."'); window.history.go(-1);</script>\n";
 		exit;
 	}
 
@@ -291,4 +293,4 @@
 	$row->checkin();
 	mosRedirect( "index2.php?option=$option" );
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/components/com_weblinks/toolbar.weblinks.html.php 4.6rc2/administrator/components/com_weblinks/toolbar.weblinks.html.php
--- 4.5.4/administrator/components/com_weblinks/toolbar.weblinks.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_weblinks/toolbar.weblinks.html.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,22 +1,20 @@
 <?php
 /**
-* @version $Id: toolbar.weblinks.html.php,v 1.2 2005/11/08 10:26:19 eliasan Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Weblinks
-*/
 class TOOLBAR_weblinks {
-	function _EDIT() {
+	function _EDIT($task) {
 		global $id;
 		
 		mosMenuBar::startTable();
@@ -24,12 +22,13 @@
 		mosMenuBar::spacer();
 		if ( $id ) {
 			// for existing content items the button is renamed `close`
-			mosMenuBar::cancel( 'cancel', 'Close' );
+			mosMenuBar::cancel( 'cancel', T_('Close') );
 		} else {
 			mosMenuBar::cancel();
 		}
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.weblink.edit' );
+		if ($task == 'new' ) mosMenuBar::help( 'new' );
+		else mosMenuBar::help( 'edit' );
 		mosMenuBar::endTable();
 	}
 	function _DEFAULT() {
@@ -45,7 +44,7 @@
 		mosMenuBar::spacer();
 		mosMenuBar::deleteList();
 		mosMenuBar::spacer();
-		mosMenuBar::help( '453.screen.weblink.main' );
+		mosMenuBar::help( 'manager' );
 		mosMenuBar::endTable();
 	}
 }
diff -ruN 4.5.4/administrator/components/com_weblinks/toolbar.weblinks.php 4.6rc2/administrator/components/com_weblinks/toolbar.weblinks.php
--- 4.5.4/administrator/components/com_weblinks/toolbar.weblinks.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_weblinks/toolbar.weblinks.php	2006-05-30 18:35:27.000000000 -0500
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.weblinks.php,v 1.1 2005/07/22 01:53:38 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -17,7 +19,7 @@
 	case 'new':
 	case 'edit':
 	case 'editA':
-		TOOLBAR_weblinks::_EDIT();
+		TOOLBAR_weblinks::_EDIT($task);
 		break;
 
 	default:
diff -ruN 4.5.4/administrator/components/com_weblinks/weblinks.xml 4.6rc2/administrator/components/com_weblinks/weblinks.xml
--- 4.5.4/administrator/components/com_weblinks/weblinks.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_weblinks/weblinks.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Weblinks</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component shows a listing of Weblinks</description>
 	<params>
diff -ruN 4.5.4/administrator/components/com_weblinks/weblinks_item.xml 4.6rc2/administrator/components/com_weblinks/weblinks_item.xml
--- 4.5.4/administrator/components/com_weblinks/weblinks_item.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/components/com_weblinks/weblinks_item.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Weblinks</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This component shows a listing of Weblinks</description>
 	<params>
diff -ruN 4.5.4/administrator/includes/admin.php 4.6rc2/administrator/includes/admin.php
--- 4.5.4/administrator/includes/admin.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/admin.php	2006-04-16 10:24:52.000000000 -0500
@@ -1,275 +1,717 @@
-<?php
-/**
-* @version $Id: admin.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* @param string THe template position
-*/
-function mosCountAdminModules(  $position='left' ) {
-	global $database, $my, $Itemid;
-
-	$query = "SELECT COUNT(m.id)"
-	. "\nFROM #__modules AS m"
-	. "\nWHERE m.published='1' AND m.position='$position' AND m.client_id='1'";
-
-	$database->setQuery( $query );
-	return $database->loadResult();
-}
-/**
-* Loads admin modules via module position
-* @param string The position
-* @param int 0 = no style, 1 = tabbed
-*/
-function mosLoadAdminModules( $position='left', $style=0 ) {
-	global $database, $acl, $my;
-
-	$cache =& mosCache::getCache( 'com_content' );
-
-	$query = "SELECT id, title, module, position, content, showtitle, params"
-	. "\n FROM #__modules AS m"
-	. "\n WHERE m.published = '1'"
-	. "\n AND m.position='$position'"
-	. "\n AND (m.client_id = 1)"
-	. "\n ORDER BY m.ordering";
-
-	$database->setQuery( $query );
-	$modules = $database->loadObjectList();
-	if($database->getErrorNum()) {
-		echo "MA ".$database->stderr(true);
-		return;
-	}
-
-	switch ($style) {
-	    case 0:
-	    default:
-			foreach ($modules as $module) {
-				$params =& new mosParameters( $module->params );
-				if ( $module->module == '' ) {
-					mosLoadCustomModule( $module, $params );
-				} else {
-					mosLoadAdminModule( substr( $module->module, 4 ), $params );
-				}
-			}
-			break;
-
-		case 1:
-		    // Tabs
-			$tabs = new mosTabs(1);
-			$tabs->startPane( 'modules-' . $position );
-			foreach ($modules as $module) {
-				$params =& new mosParameters( $module->params );
-				$editAllComponents 	= $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' );
-				// special handling for components module
-				if ( $module->module != 'mod_components' || ( $module->module == 'mod_components' && $editAllComponents ) ) {
-					$tabs->startTab( $module->title, 'module' . $module->id );
-					if ( $module->module == '' ) {
-						mosLoadCustomModule( $module, $params );
-					} else {
-						mosLoadAdminModule( substr( $module->module, 4 ), $params );
-					}
-					$tabs->endTab();
-				}
-			}
-			$tabs->endPane();
-			break;
-
-		case 2:
-		    // Div'd
-			foreach ($modules as $module) {
-				$params =& new mosParameters( $module->params );
-				echo '<div>';
-				if ( $module->module == '' ) {
-					mosLoadCustomModule( $module, $params );
-				} else {
-					mosLoadAdminModule( substr( $module->module, 4 ), $params );
-				}
-				echo '</div>';
-			}
-			break;
-	}
-}
-/**
-* Loads an admin module
-*/
-function mosLoadAdminModule( $name, $params=NULL ) {
-	global $mosConfig_absolute_path, $mosConfig_live_site;
-	global $database, $acl, $my, $mainframe, $option;
-
-	$task = mosGetParam( $_REQUEST, 'task', '' );
-	// legacy support for $act
-	$act = mosGetParam( $_REQUEST, 'act', '' );
-
-	$name = str_replace( '/', '', $name );
-	$name = str_replace( '\\', '', $name );
-	$path = "$mosConfig_absolute_path/administrator/modules/mod_$name.php";
-	if (file_exists( $path )) {
-	    require $path;
-	}
-}
-
-function mosLoadCustomModule( &$module, &$params ) {
-	global $mosConfig_absolute_path;
-
-	$rssurl = $params->get( 'rssurl', '' );
-	$rssitems = $params->get( 'rssitems', '' );
-	$rssdesc = $params->get( 'rssdesc', '' );
-	$moduleclass_sfx = $params->get( 'moduleclass_sfx', '' );
-
-	echo '<table cellpadding="0" cellspacing="0" class="moduletable' . $moduleclass_sfx . '">';
-
-	if ($module->content) {
-		echo '<tr>';
-		echo '<td>' . $module->content . '</td>';
-		echo '</tr>';
-	}
-
-	// feed output
-	if ( $rssurl ) {
-		$cacheDir = $mosConfig_absolute_path .'/cache/';
-		if (!is_writable( $cacheDir )) {
-			echo '<tr>';
-			echo '<td>Please make cache directory writable.</td>';
-			echo '</tr>';
-		} else {
-			$LitePath = $mosConfig_absolute_path .'/includes/Cache/Lite.php';
-			require_once( $mosConfig_absolute_path .'/includes/domit/xml_domit_rss_lite.php');
-			$rssDoc =& new xml_domit_rss_document_lite();
-			$rssDoc->useCacheLite(true, $LitePath, $cacheDir, 3600);
-			$rssDoc->loadRSS( $rssurl );
-			$totalChannels = $rssDoc->getChannelCount();
-
-			for ($i = 0; $i < $totalChannels; $i++) {
-				$currChannel =& $rssDoc->getChannel($i);
-				echo '<tr>';
-				echo '<td><strong><a href="'. $currChannel->getLink() .'" target="_child">';
-				echo $currChannel->getTitle() .'</a></strong></td>';
-				echo '</tr>';
-				if ($rssdesc) {
-					echo '<tr>';
-					echo '<td>'. $currChannel->getDescription() .'</td>';
-					echo '</tr>';
-				}
-
-				$actualItems = $currChannel->getItemCount();
-				$setItems = $rssitems;
-
-				if ($setItems > $actualItems) {
-					$totalItems = $actualItems;
-				} else {
-					$totalItems = $setItems;
-				}
-
-				for ($j = 0; $j < $totalItems; $j++) {
-					$currItem =& $currChannel->getItem($j);
-
-					echo '<tr>';
-					echo '<td><strong><a href="'. $currItem->getLink() .'" target="_child">';
-					echo $currItem->getTitle() .'</a></strong> - '. $currItem->getDescription() .'</td>';
-					echo '</tr>';
-				}
-			}
-		}
-	}
-	echo '</table>';
-}
-
-function mosShowSource( $filename, $withLineNums=false ) {
-	ini_set('highlight.html', '000000');
-	ini_set('highlight.default', '#800000');
-	ini_set('highlight.keyword','#0000ff');
-	ini_set('highlight.string', '#ff00ff');
-	ini_set('highlight.comment','#008000');
-
-	if (!($source = @highlight_file( $filename, true ))) {
-		return 'Operation Failed';
-	}
-	$source = explode("<br />", $source);
-
-	$ln = 1;
-
-	$txt = '';
-	foreach( $source as $line ) {
-		$txt .= "<code>";
-		if ($withLineNums) {
-			$txt .= "<font color=\"#aaaaaa\">";
-			$txt .= str_replace( ' ', '&nbsp;', sprintf( "%4d:", $ln ) );
-			$txt .= "</font>";
-		}
-		$txt .= "$line<br /><code>";
-		$ln++;
-	}
-	return $txt;
-}
-
-function mosIsChmodable($file)
-{
-	$perms = fileperms($file);
-	if ($perms !== FALSE)
-		if (@chmod($file, $perms ^ 0001)) {
-			@chmod($file, $perms);
-			return TRUE;
-		} // if
-	return FALSE;
-} // mosIsChmodable
-
-/**
-* @param string An existing base path
-* @param string A path to create from the base path
-* @param int Directory permissions
-* @return boolean True if successful
-*/
-function mosMakePath($base, $path='', $mode = NULL)
-{
-	global $mosConfig_dirperms;
-
-	// convert windows paths
-	$path = str_replace( '\\', '/', $path );
-	$path = str_replace( '//', '/', $path );
-
-	// check if dir exists
-	if (file_exists( $base . $path )) return true;
-
-	// set mode
-	$origmask = NULL;
-	if (isset($mode)) {
-		$origmask = @umask(0);
-	} else {
-		if ($mosConfig_dirperms=='') {
-			// rely on umask
-			$mode = 0777;
-		} else {
-			$origmask = @umask(0);
-			$mode = octdec($mosConfig_dirperms);
-		} // if
-	} // if
-
-	$parts = explode( '/', $path );
-	$n = count( $parts );
-	$ret = true;
-	if ($n < 1) {
-	    $ret = @mkdir($base, $mode);
-	} else {
-		$path = $base;
-		for ($i = 0; $i < $n; $i++) {
-		    $path .= $parts[$i] . '/';
-		    if (!file_exists( $path )) {
-		        if (!@mkdir( $path, $mode )) {
-					$ret = false;
-					break;
-				}
-			}
-		}
-	}
-	if (isset($origmask)) @umask($origmask);
-	return $ret;
-}
-
-?>
\ No newline at end of file
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+/**
+* Basic XML parsing of installation files
+***/
+
+class mosBasicXML {
+	var $xmlfile = '';
+	var $opentags = array();
+	var $accept = array();
+	var $mosinstall = false;
+	var $chardata = '';
+	var $type;
+	var $errors = '';
+	var $mosParameter = null;
+	var $name = '';
+
+	function mosBasicXML ($file, $mosParameter=null, $name='params') {
+		$this->xmlfile = $file;
+		$this->mosParameter = $mosParameter;
+		$this->name = $name;
+		$this->errors = new mosErrorSet();
+		$this->setTree();
+		$parser = xml_parser_create();
+		$startfunc = array (&$this, 'start_element');
+		$endfunc = array (&$this, 'end_element');
+		$charfunc = array (&$this, 'character_data');
+		xml_set_element_handler ($parser, $startfunc, $endfunc);
+		xml_set_character_data_handler ($parser, $charfunc);
+		if ($fp = fopen($this->xmlfile, 'rb')) {
+			while ($data = fread($fp, 4096) AND $this->errors->getMaxLevel() < _MOS_ERROR_FATAL) {
+				$data = str_replace('&', ' ampersand ', $data);
+				$ret = xml_parse($parser, $data, feof($fp)) or $this->errors->addErrorDetails(sprintf(T_('XML ERROR in %s: %s at line %d'),
+				$this->xmlfile,
+				xml_error_string(xml_get_error_code($parser)),
+				xml_get_current_line_number($parser)), _MOS_ERROR_FATAL);
+			}
+		}
+		else $this->errors->addErrorDetails(sprintf(T_('Unable to open XML file %s'),$this->xmlfile), _MOS_ERROR_FATAL);
+		if (count($this->opentags) != 0) {
+			$tags = implode (', ', $this->opentags);
+			$this->errors->addErrorDetails(sprintf(T_('XML error in %s - unclosed tag(s) (%s) at end of file'),$this->xmlfile, $tags), _MOS_ERROR_SEVERE);
+		}
+		xml_parser_free($parser);
+	}
+
+	function setTree () {
+		$this->accept['MOSINSTALL'] = array ('NAME', 'CREATIONDATE', 'AUTHOR', 'COPYRIGHT',
+		'LICENSE', 'AUTHOREMAIL', 'AUTHORURL', 'VERSION', 'DESCRIPTION', 'FILES', 'MEDIA',
+		'PARAMS', 'INSTALL', 'UNINSTALL', 'INSTALLFILE', 'UNINSTALLFILE', 'ADMINISTRATION',
+		'IMAGES', 'CSS', 'GROUP', 'LOCALE', 'REMOVE_FILES');
+		$this->accept['PARAMS'] = array ('PARAM');
+		$this->accept['PARAM'] = array ('OPTION');
+		$this->accept['FILES'] = array ('FILENAME');
+		$this->accept['REMOVE_FILES'] = array ('FILENAME');
+		$this->accept['INSTALL'] = array ('QUERIES');
+		$this->accept['UNINSTALL'] = array ('QUERIES');
+		$this->accept['QUERIES'] = array ('QUERY');
+		$this->accept['ADMINISTRATION'] = array ('FILES', 'IMAGES', 'MENU', 'SUBMENU');
+		$this->accept['IMAGES'] = array ('FILENAME');
+		$this->accept['SUBMENU'] = array('MENU');
+		$this->accept['MEDIA'] = array('FILENAME');
+		$this->accept['CSS'] = array('FILENAME');
+		$this->accept['LOCALE'] = array('PLURAL_FORM', 'DATE_FORMAT', 'CODESETS', 'DAYS', 'MONTHS');
+		$this->accept['CODESETS'] = array('CHARSET');
+	}
+
+	function start_element ($parser, $element_name, $element_attrs) {
+		if ($this->errors->getMaxLevel() >= _MOS_ERROR_FATAL) return;
+		if ($this->mosinstall) {
+			$container = $this->opentags[0];
+			if (!isset($this->accept[$container]) OR !is_array($this->accept[$container])) $this->errors->addErrorDetails(sprintf(T_('XML error in %s: %s is not a valid containing element'), $this->xmlfile, $container), _MOS_ERROR_WARN);
+			elseif (!in_array($element_name, $this->accept[$container])) $this->errors->addErrorDetails(sprintf(T_('XML error in %s: %s not permitted within %s'), $this->xmlfile, $element_name, $container), _MOS_ERROR_WARN);
+		}
+		if ($this->mosinstall OR $element_name == 'MOSINSTALL') {
+			$this->opencount = array_unshift ($this->opentags, $element_name);
+			$this->mosinstall = true;
+			$method = 'element_'.$element_name;
+			$specific = array (&$this, $method);
+			foreach ($element_attrs as $key=>$attr) $element_attrs[$key] = str_replace(' ampersand ', '&', $attr);
+			if (is_callable($specific)) $this->$method($element_attrs);
+		}
+		else $this->errors->addErrorDetails(sprintf(T_('XML error in %s: expected MOSINSTALL but found %s'), $this->xmlfile, $element_name), _MOS_ERROR_SEVERE);
+	}
+
+	function end_element ($parser, $element_name) {
+		if ($this->errors->getMaxLevel() >= _MOS_ERROR_FATAL) return;
+		if ($this->opentags[0] != $element_name) {
+			$this->errors->addErrorDetails(sprintf(T_('XML error in %s: last open tag was %s, but found end of %s'), $this->xmlfile, $check, $element_name), _MOS_ERROR_SEVERE);
+			return;
+		}
+		$this->chardata = str_replace(' ampersand ', '&', $this->chardata);
+		if (isset($this->opentags[1]) AND $this->opentags[1] == 'MOSINSTALL') $this->values[$this->opentags[0]] = $this->chardata;
+		$method = 'end_element_'.$element_name;
+		$specific = array (&$this, $method);
+		if (is_callable($specific)) $this->$method();
+		array_shift ($this->opentags);
+		$this->opencount--;
+		$this->chardata = '';
+	}
+
+	function character_data ($parser, $data) {
+		if ($this->errors->getMaxLevel() >= _MOS_ERROR_FATAL) return;
+		$this->chardata .= trim($data);
+	}
+
+	function element_mosinstall ($attrs) {
+		if (isset($attrs['TYPE'])) $this->type = $attrs['TYPE'];
+		else $this->errors->addErrorDetails(sprintf(T_('XML error in %s: mosinstall does not have type attribute'), $this->xmlfile), _MOS_ERROR_FATAL);
+	}
+
+	function getType () {
+		return $this->type;
+	}
+	
+	function &getErrors () {
+		$errors =& $this->errors->getErrors();
+		return $errors;
+	}
+
+}
+
+/**
+* Extend basic parser to extract the description for a type of install file
+**/
+
+class mosXMLDescription extends mosBasicXML {
+	var $values = array();
+
+	function getDescription ($type) {
+		if ($type == $this->type AND isset($this->values['DESCRIPTION'])) return $this->values['DESCRIPTION'];
+		else return '';
+	}
+
+	function getName ($type) {
+		if ($type == $this->type AND isset($this->values['NAME'])) return $this->values['NAME'];
+		else return '';
+	}
+
+	function getGroup ($type) {
+		if ($type == $this->type AND isset($this->values['GROUP'])) return $this->values['GROUP'];
+		else return '';
+	}
+
+	function getCreationDate ($type) {
+		if ($type == $this->type AND isset($this->values['CREATIONDATE'])) return $this->values['CREATIONDATE'];
+		else return '';
+	}
+
+	function getAuthor ($type) {
+		if ($type == $this->type AND isset($this->values['AUTHOR'])) return $this->values['AUTHOR'];
+		else return '';
+	}
+
+	function getCopyright ($type) {
+		if ($type == $this->type AND isset($this->values['COPYRIGHT'])) return $this->values['COPYRIGHT'];
+		else return '';
+	}
+
+	function getAuthorEmail ($type) {
+		if ($type == $this->type AND isset($this->values['AUTHOREMAIL'])) return $this->values['AUTHOREMAIL'];
+		else return '';
+	}
+
+	function getAuthorUrl ($type) {
+		if ($type == $this->type AND isset($this->values['AUTHORURL'])) return $this->values['AUTHORURL'];
+		else return '';
+	}
+
+	function getVersion ($type) {
+		if ($type == $this->type AND isset($this->values['VERSION'])) return $this->values['VERSION'];
+		else return '';
+	}
+
+}
+
+class mosXMLParams extends mosXMLDescription {
+	var $options = array();
+	var $optvalue = '';
+	var $paramattrs = array();
+	var $paramcount = 0;
+	var $html = array();
+	
+	function element_params ($attrs) {
+		$this->html[] = '<table class="paramlist">';
+		if (isset($attrs['NAME'])) {
+		    $pname = $attrs['NAME'];
+			$this->html[] = "<tr><td colspan='3'>$pname</td></tr>";
+		}
+	}
+
+	function element_param ($attrs) {
+		$this->paramattrs = $attrs;
+	}
+	
+	function element_option ($attrs) {
+		if (isset($attrs['VALUE'])) $this->optvalue = $attrs['VALUE'];
+	}
+	
+	function end_element_option () {
+		$this->options[] = mosHTML::makeOption($this->optvalue, $this->chardata);
+		$this->optvalue = '';
+	}
+
+	function end_element_param () {
+		$type = mosGetParam ($this->paramattrs, 'TYPE', '');
+		$name = mosGetParam ($this->paramattrs, 'NAME', '');
+		$label = mosGetParam ($this->paramattrs, 'LABEL', $name);
+		$default = mosGetParam ($this->paramattrs, 'DEFAULT', '');
+		if ($description = mosGetParam ($this->paramattrs, 'DESCRIPTION', '')) $tooltip = mosToolTip($description, $name);
+		else $tooltip = '';
+		if (is_object($this->mosParameter)) {
+			$mp = $this->mosParameter;
+			$value = $mp->get($name, $default);
+		}
+		else $value = $default;
+		$this->html[] = '<tr>';
+		if ($label == '@spacer') $label = '<hr />';
+		elseif ($label) $label .= ':';
+		$this->html[] = '<td width="35%" align="right" valign="top">'.$label.'</td>';
+	    $controlname = $this->name;
+		switch ($type) {
+			case 'text':
+			    $size = mosGetParam ($this->paramattrs, 'SIZE', 0);
+			    $controlstring = '<input type="text" name="'.$this->name.'['.$name.']" value="'.$value.'" class="text_area" size="'.$size.'" />';
+				break;
+			case 'list':
+			    $controlstring = mosHTML::selectList($this->options, $controlname.'['.$name.']', 'class="inputbox"', 'value', 'text', $value);
+				break;
+			case 'radio':
+			    $controlstring = mosHTML::radioList($this->options, $controlname.'['.$name.']', '', $value);
+				break;
+			case 'imagelist':
+			    $directory = new mosDirectory (mamboCore::get('mosConfig_absolute_path').mosGetParam($this->paramattrs, 'DIRECTORY', ''));
+			    $files = $directory->listFiles ('\.png$|\.gif$|\.jpg$|\.bmp$|\.ico$');
+			    $options = array();
+			    foreach ($files as $file) $options[] = mosHTML::makeOption($file, $file);
+			    if (!isset($this->paramattrs['HIDE_NONE'])) array_unshift($options, mosHTML::makeOption('-1', '- Do not use an image -' ));
+			    if (!isset($this->paramattrs['HIDE_DEFAULT'])) array_unshift($options, mosHTML::makeOption('', '- Use Default image -'));
+			    $controlstring = mosHTML::selectList ($options, $controlname.'['.$name.']', 'class="inputbox"', 'value', 'text', $value);
+				break;
+			case 'textarea':
+		        $rows = mosGetParam ($this->paramattrs, 'ROWS', 0);
+		        $cols = mosGetParam ($this->paramattrs, 'COLS', 0);
+		        $value = str_replace ('<br /', "\n", $value);
+		        $controlstring = "<textarea name='params[$name]' cols='$cols' rows='$rows' class='text_area'>$value</textarea>";
+				break;
+		    case 'spacer':
+				$controlstring = $value ? $value : '<hr />';
+				break;
+			case 'mos_section':
+				$controlstring = $this->_form_mos_section($name, $value, $controlname);
+				break;
+			case 'mos_category':
+				$controlstring = $this->_form_mos_category($name, $value, $controlname);
+				break;
+			case 'mos_menu':
+			    $controlstring = $this->_form_mos_menu($name, $value, $controlname);
+			    break;
+			default:
+				$controlstring = T_('Handler not defined for type').'='.$type;
+		}
+//		$this->html[] = "<td>$type</td>";
+		$this->html[] = "<td>$controlstring</td>";
+		$this->html[] = "<td width='10%' align='left' valign='top'>$tooltip</td>";
+		$this->html[] = '</tr>';
+		$this->options = array();
+		$this->paramattrs = array();
+		$this->paramcount++;
+	}
+	
+	function end_element_params () {
+		$this->html[] = '</table>';
+		if ($this->paramcount == 0) $this->html[] = '<tr><td colspan="2"><i>'.T_('There are no Parameters for this item').'</i></td></tr>';
+		$this->paramcount = 0;
+	}
+	/**
+	* @param string The name of the form element
+	* @param string The value of the element
+	* @param object The xml element for the parameter
+	* @param string The control name
+	* @return string The html for the element
+	*/
+	function _form_mos_section( $name, $value, $control_name ) {
+		$database =& mamboDatabase::getInstance();
+		$query = "SELECT id AS value, title AS text"
+		. "\n FROM #__sections"
+		. "\n WHERE published='1' AND scope='content'"
+		. "\n ORDER BY title"
+		;
+		$database->setQuery( $query );
+		$options = $database->loadObjectList();
+		array_unshift($options, mosHTML::makeOption( '0', '- Select Content Section -' ));
+		return mosHTML::selectList( $options, $control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value );
+	}
+	/**
+	* @param string The name of the form element
+	* @param string The value of the element
+	* @param object The xml element for the parameter
+	* @param string The control name
+	* @return string The html for the element
+	*/
+	function _form_mos_category( $name, $value, $control_name ) {
+		$database =& mamboDatabase::getInstance();
+		$query 	= "SELECT c.id AS value, CONCAT_WS( '/',s.title, c.title ) AS text"
+		. "\n FROM #__categories AS c"
+		. "\n LEFT JOIN #__sections AS s ON s.id=c.section"
+		. "\n WHERE c.published='1' AND s.scope='content'"
+		. "\n ORDER BY c.title"
+		;
+		$database->setQuery( $query );
+		$options = $database->loadObjectList();
+		array_unshift($options, mosHTML::makeOption('0', '- Select Content Category -'));
+		return mosHTML::selectList( $options, $control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value );
+	}
+	/**
+	* @param string The name of the form element
+	* @param string The value of the element
+	* @param object The xml element for the parameter
+	* @param string The control name
+	* @return string The html for the element
+	*/
+	function _form_mos_menu( $name, $value, $control_name ) {
+		$menuTypes = mosAdminMenus::menutypes();
+		foreach($menuTypes as $menutype ) $options[] = mosHTML::makeOption( $menutype, $menutype );
+		array_unshift( $options, mosHTML::makeOption( '', '- Select Menu -' ) );
+		return mosHTML::selectList( $options, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value );
+	}
+}
+
+/**
+* Parameters handler
+* @package Mambo
+*/
+class mosAdminParameters extends mosParameters {
+	/** @var string Path to the xml setup file */
+	var $_path = null;
+	/** @var string The type of setup file */
+	var $_type = null;
+	/** @var object The xml params element */
+	var $_xmlElem = null;
+/**
+* Constructor
+* @param string The raw parms text
+* @param string Path to the xml setup file
+* @var string The type of setup file
+*/
+	function mosAdminParameters( $text, $path='', $type='component' ) {
+	    $this->_params = $this->parse( $text );
+	    $this->_raw = $text;
+	    $this->_path = $path;
+	    $this->_type = $type;
+	}
+	
+}
+/**
+* Generally available parameter object
+* @package Mambo
+*/
+class mosSpecialAdminParameters extends mosAdminParameters {
+
+	function mosSpecialAdminParameters ($name, $version='') {
+	    $database =& mamboDatabase::getInstance();
+	    $sql = "SELECT * FROM #__parameters WHERE param_name='$name'";
+	    if ($version) $sql .= " AND param_version='$version'";
+	    $database->setQuery($sql);
+	    $parameters = $database->loadObjectList();
+	    if ($parameters) $parameters = $parameters[0];
+	    parent::mosAdminParameters($parameters->params, mamboCore::get('mosConfig_absolute_path').'/parameters/'.$parameters->param_file);
+	}
+}
+
+/**
+* Useful HTML class for admin side components
+* @package Mambo
+*/
+class basicAdminHTML {
+	var $pageNav = '';
+	var $option = '';
+	var $act = '';
+	var $limit = 10;
+
+	function basicAdminHTML (&$controller, $limit) {
+		$this->act = $controller->admin->act;
+		$this->limit = $limit;
+		$this->pageNav = $controller->pageNav;
+		$this->option = strtolower(mosGetParam($_REQUEST,'option','com_admin'));
+	}
+
+	function tickBox ($object, $property) {
+		if (is_object($object) AND $object->$property) $checked = "checked='checked'";
+		else $checked = '';
+		echo "<td><input type='checkbox' name='$property' value='1' $checked /></td>";
+	}
+
+	function yesNoList ($object, $property) {
+		$yesno[] = mosHTML::makeOption( 0, _NO );
+		$yesno[] = mosHTML::makeOption( 1, _YES );
+		if ($object) $default = $object->$property;
+		else $default = 0;
+		echo '<td valign="top">';
+		echo mosHTML::selectList($yesno, $property, 'class="inputbox" size="1"', 'value', 'text', $default);;
+		echo '</td></tr>';
+	}
+
+	function inputTop ($title, $redstar=false, $maxsize=0) {
+		?>
+		<tr>
+		  	<td width="30%" valign="top" align="right">
+				<b><?php if ($redstar) echo '<font color="red">*</font>'; echo $title; if ($maxsize) echo "</b>&nbsp;<br /><i>$maxsize</i>&nbsp;"; ?></b>&nbsp;
+			</td>
+		<?php
+	}
+
+	function blankRow () {
+		?>
+			<tr><td>&nbsp;</td></tr>
+		<?php
+	}
+
+	function fileInputBox ($title, $name, $value, $width, $tooltip=null) {
+		$this->inputTop($title);
+		?>
+			<td align="left" valign="top">
+				<input class="inputbox" type="text" name="<?php echo $name; ?>" size="<?php echo $width; ?>" value="<?php echo $value; ?>" />
+				<?php if ($tooltip) echo tooltip($tooltip); ?>
+			</td>
+		</tr>
+		<?php
+	}
+
+	function fileInputArea ($title, $maxsize, $name, $value, $rows, $cols, $editor=false, $tooltip=null) {
+		$this->inputTop ($title, false, $maxsize);
+		echo '<td valign="top">';
+		if ($editor) {
+			$box = "editorArea( 'description', '$value', '$name', 500, 200, $rows, $cols );";
+			eval($box);
+		}
+		else echo "<textarea class='inputbox' name='$name' rows='$rows' cols='$cols'>$value</textarea>";
+		if ($tooltip) echo tooltip($tooltip);
+		echo '</td></tr>';
+	}
+
+	function tickBoxField ($object, $property, $title) {
+		?>
+		<tr>
+			<td width="30%" valign="top" align="right">
+				<b><?php echo $title; ?></b>&nbsp;
+			</td>
+		<?php
+		$this->tickBox($object,$property);
+		echo '</tr>';
+	}
+
+	function simpleTickBox ($title, $name, $checked=false) {
+		$this->inputTop($title);
+		if ($checked) $check = 'checked="checked"';
+		else $check = '';
+		?>
+			<td>
+				<input type="checkbox" name="<?php echo $name; ?>" value="1" <?php echo $check; ?> />
+			</td>
+		</tr>
+		<?php
+	}
+	function formStart ($title, $imagepath) {
+		?>
+		<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
+		<script language="Javascript" src="../includes/js/overlib_mini.js"></script>
+		<form action="index2.php" method="post" name="adminForm">
+		<table cellpadding="4" cellspacing="0" border="0" width="100%">
+   		<tr>
+			<td width="100%" colspan="4">
+			<div class="title">
+			<img src="<?php echo $imagepath; ?>" alt="<?php echo $title; ?>" />
+			<span class="sectionname">&nbsp;<?php echo $title; ?></span>
+			</div>
+			</td>
+    	</tr>
+		<?php
+	}
+
+	function listHeadingStart ($count) {
+		?>
+		<table cellpadding="4" cellspacing="0" border="0" width="100%" class="adminlist">
+			<tr>
+				<th width="5" align="left">
+					<input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo $count; ?>);" />
+				</th>
+		<?php
+	}
+
+	function headingItem ($width, $title, $colspan=1) {
+		if ($colspan > 1) $colcode = " colspan=\"$colspan\"";
+		else $colcode = '';
+		echo "<th width=\"$width\" align=\"left\"$colcode>$title</th>";
+	}
+
+	function commonScripts ($edit_fields) {
+		?>
+		<script type="text/javascript">
+        function submitbutton(pressbutton) {
+                <?php
+				if (is_array($edit_fields)) foreach ($edit_fields as $field) getEditorContents( $field, $field );
+				else getEditorContents ($edit_fields, $edit_fields);
+				?>
+                submitform( pressbutton );
+        }
+        </script>
+        <?php
+	}
+
+	function listFormEnd ($pagecontrol=true) {
+		if ($pagecontrol) {
+			?>
+			<tr>
+	    		<th align="center" colspan="10"> <?php echo $this->pageNav->writePagesLinks(); ?></th>
+			</tr>
+			<tr>
+				<td align="center" colspan="10"> <?php echo $this->pageNav->writePagesCounter(); ?></td>
+			</tr>
+			<?php
+		}
+		?>
+		<input type="hidden" name="option" value="<?php echo $this->option; ?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="act" value="<?php echo $this->act; ?>" />
+		<input type="hidden" name="boxchecked" value="0" />
+		</table>
+		</form>
+		<?php
+	}
+
+	function editFormEnd ($id) {
+		?>
+		<input type="hidden" name="cfid" value="<?php echo $id; ?>" />
+		<input type="hidden" name="limit" value="<?php echo $this->limit; ?>" />
+		<input type="hidden" name="option" value="<?php echo $this->option; ?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="act" value="<?php echo $this->act; ?>" />
+		</table>
+		</form>
+		<?php
+	}
+
+	function multiOptionList ($name, $title, $options, $current, $tooltip=null) {
+		$alternatives = explode(',',$options);
+		$already = explode(',', $current);
+		?>
+		<tr>
+	    <td width="30%" valign="top" align="right">
+	  	<b><?php echo $title; ?></b>&nbsp;
+	    </td>
+	    <td valign="top">
+		<?php
+		foreach ($alternatives as $one) {
+			if (in_array($one,$already)) $mark = 'checked="checked"';
+			else $mark = '';
+			$value = $name.'_'.$one;
+			echo "<input type=\"checkbox\" name=\"$value\" $mark />$one";
+		}
+		if ($tooltip) echo '&nbsp;'.tooltip($tooltip);
+		echo '</td></tr>';
+	}
+
+	function tooltip ($text) {
+		return '<a href="javascript:void(0)"  onmouseover="return escape('."'".$text."'".')">'.mamboCore::get('mosConfig_live_site').'/includes/js/ThemeOffice/tooltip.png</a>';
+	}
+
+}
+
+/**
+* @param string THe template position
+*/
+function mosCountAdminModules(  $position='left' ) {
+	$handler =& mosModuleHandler::getInstance();
+	return $handler->mosCountModules($position, true);
+}
+/**
+* Loads admin modules via module position
+* @param string The position
+* @param int 0 = no style, 1 = tabbed
+*/
+function mosLoadAdminModules( $position='left', $style=0 ) {
+	$handler =& mosModuleHandler::getInstance();
+	return $handler->mosLoadAdminModules($position, $style);
+}
+/**
+* Loads an admin module
+*/
+function mosLoadAdminModule( $name, $params=NULL ) {
+	global $mosConfig_absolute_path, $mosConfig_live_site;
+	global $database, $acl, $my, $mainframe, $option;
+	global $task, $act;
+	
+	$name = str_replace( '/', '', $name );
+	$name = str_replace( '\\', '', $name );
+	$path = mamboCore::get('mosConfig_absolute_path')."/administrator/modules/mod_$name.php";
+	if (file_exists($path)) require $path;
+}
+
+function mosLoadCustomModule( &$module, &$params ) {
+	if ($module->content) {
+		$moduleclass_sfx = $params->get( 'moduleclass_sfx', '' );
+		echo '<table cellpadding="0" cellspacing="0" class="moduletable' . $moduleclass_sfx . '">';
+		echo '<tr>';
+		echo '<td>' . $module->content . '</td>';
+		echo '</tr>';
+		echo '</table>';
+	}
+
+}
+
+function mosShowSource( $filename, $withLineNums=false ) {
+	ini_set('highlight.html', '000000');
+	ini_set('highlight.default', '#800000');
+	ini_set('highlight.keyword','#0000ff');
+	ini_set('highlight.string', '#ff00ff');
+	ini_set('highlight.comment','#008000');
+
+	if (!($source = @highlight_file( $filename, true ))) {
+		return 'Operation Failed';
+	}
+	$source = explode("<br />", $source);
+
+	$ln = 1;
+
+	$txt = '';
+	foreach( $source as $line ) {
+		$txt .= "<code>";
+		if ($withLineNums) {
+			$txt .= "<font color=\"#aaaaaa\">";
+			$txt .= str_replace( ' ', '&nbsp;', sprintf( "%4d:", $ln ) );
+			$txt .= "</font>";
+		}
+		$txt .= "$line<br /><code>";
+		$ln++;
+	}
+	return $txt;
+}
+
+function mosIsChmodable($file)
+{
+	$perms = fileperms($file);
+	if ($perms !== FALSE)
+		if (@chmod($file, $perms ^ 0001)) {
+			@chmod($file, $perms);
+			return TRUE;
+		} // if
+	return FALSE;
+} // mosIsChmodable
+
+/**
+* @param string An existing base path
+* @param string A path to create from the base path
+* @param int Directory permissions
+* @return boolean True if successful
+*/
+function mosMakePath($base, $path='', $mode = NULL)
+{
+	global $mosConfig_dirperms;
+
+	// convert windows paths
+	$path = str_replace( '\\', '/', $path );
+	$path = str_replace( '//', '/', $path );
+
+	// check if dir exists
+	if (file_exists( $base . $path )) return true;
+
+	// set mode
+	$origmask = NULL;
+	if (isset($mode)) {
+		$origmask = @umask(0);
+	} else {
+		if ($mosConfig_dirperms=='') {
+			// rely on umask
+			$mode = 0777;
+		} else {
+			$origmask = @umask(0);
+			$mode = octdec($mosConfig_dirperms);
+		} // if
+	} // if
+
+	$parts = explode( '/', $path );
+	$n = count( $parts );
+	$ret = true;
+	if ($n < 1) {
+	    $ret = @mkdir($base, $mode);
+	} else {
+		$path = $base;
+		for ($i = 0; $i < $n; $i++) {
+		    $path .= $parts[$i] . '/';
+		    if (!file_exists( $path )) {
+		        if (!@mkdir( $path, $mode )) {
+					$ret = false;
+					break;
+				}
+			}
+		}
+	}
+	if (isset($origmask)) @umask($origmask);
+	return $ret;
+}
+
+?>
diff -ruN 4.5.4/administrator/includes/auth.php 4.6rc2/administrator/includes/auth.php
--- 4.5.4/administrator/includes/auth.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/auth.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,41 +0,0 @@
-<?php
-/**
-* @version $Id: auth.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$basePath = dirname( __FILE__ );
-$path = $basePath . '/../../configuration.php';
-require( $path );
-
-if (!defined( '_MOS_MAMBO_INCLUDED' )) {
-	$path = $basePath . '/../../includes/mambo.php';
-	require( $path );
-}
-
-session_name( md5( $mosConfig_live_site ) );
-session_start();
-// restore some session variables
-if (!isset( $my )) {
-	$my = new mosUser( $database );
-}
-
-$my->id = mosGetParam( $_SESSION, 'session_user_id', '' );
-$my->username = mosGetParam( $_SESSION, 'session_username', '' );
-$my->usertype = mosGetParam( $_SESSION, 'session_usertype', '' );
-$my->gid = mosGetParam( $_SESSION, 'session_gid', '' );
-
-$session_id = mosGetParam( $_SESSION, 'session_id', '' );
-$logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
-
-if ($session_id != md5( $my->id.$my->username.$my->usertype.$logintime )) {
-	mosRedirect( "../index.php" );
-	die;
-}
-?>
diff -ruN 4.5.4/administrator/includes/menubar.html.php 4.6rc2/administrator/includes/menubar.html.php
--- 4.5.4/administrator/includes/menubar.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/menubar.html.php	2006-06-07 03:15:51.000000000 -0500
@@ -1,36 +1,37 @@
 <?php
 /**
-* @version $Id: menubar.html.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /**
 * Utility class for the button bar
-* @package Mambo
 */
 class mosMenuBar {
 
-	/**
+    /**
 	* Writes the start of the button bar table
 	*/
-	function startTable() {
+    function startTable() {
 		?>
 		<script language="JavaScript" type="text/JavaScript">
 		<!--
 		function MM_swapImgRestore() { //v3.0
-		var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+		    var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
 		}
 		//-->
 		</script>
 		<table cellpadding="3" cellspacing="0" border="0">
 		<tr>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a custom option and task button for the button bar
 	* @param string The task to perform (picked up by the switch($task) blocks
 	* @param string The image to display
@@ -38,33 +39,32 @@
 	* @param string The alt text for the icon image
 	* @param boolean True if required to check that a standard list item is checked
 	*/
-	function custom( $task='', $icon='', $iconOver='', $alt='', $listSelect=true ) {
-		if ($listSelect) {
-			$href = "javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to $alt');}else{submitbutton('$task')}";
-		} else {
-			$href = "javascript:submitbutton('$task')";
-		}
-		if ($icon && $iconOver) {
+    function custom( $task='', $icon='', $iconOver='', $alt='', $listSelect=true, $prefix='' ) {
+        if ($listSelect) {
+            $href = "javascript:if (document.adminForm.boxchecked.value == 0){ alert('".sprintf(T_('Please make a selection from the list to %s'),$alt)."');}else{".$prefix."submitbutton('$task')}";
+        } else {
+            $href = "javascript:".$prefix."submitbutton('$task')";
+        }
+        if ($icon && $iconOver) {
 		?>
 		<td>
 		<a class="toolbar" href="<?php echo $href;?>" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','images/<?php echo $iconOver;?>',1);">
-		<img name="<?php echo $task;?>" src="images/<?php echo $icon;?>" alt="<?php echo $alt;?>" border="0" align="middle" />
-		&nbsp;
+		<img name="<?php echo $task;?>" src="images/<?php echo $icon;?>" alt="<?php echo $alt;?>" border="0" align="middle" /><br>
 		<?php echo $alt; ?></a>
 		</td>
 		<?php
-		} else {
+        } else {
 		?>
 		<td>
 		<a class="toolbar" href="<?php echo $href;?>">
-		&nbsp;
+		<br>
 		<?php echo $alt; ?></a>
 		</td>
 		<?php
-		}
-	}
+        }
+    }
 
-	/**
+    /**
 	* Writes a custom option and task button for the button bar.
 	* Extended version of custom() calling hideMainMenu() before submitbutton().
 	* @param string The task to perform (picked up by the switch($task) blocks
@@ -73,402 +73,260 @@
 	* @param string The alt text for the icon image
 	* @param boolean True if required to check that a standard list item is checked
 	*/
-	function customX( $task='', $icon='', $iconOver='', $alt='', $listSelect=true ) {
-		if ($listSelect) {
-			$href = "javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to $alt');}else{hideMainMenu();submitbutton('$task')}";
-		} else {
-			$href = "javascript:hideMainMenu();submitbutton('$task')";
-		}
-		if ($icon && $iconOver) {
+    function customX( $task='', $icon='', $iconOver='', $alt='', $listSelect=true ) {
+        mosMenuBar::custom ($task, $icon, $iconOver, $alt, $listSelect, 'hideMainMenu();');
+    }
+
+    /**
+	* Standard routine for displaying toolbar icon
+	* @param string An override for the task
+	* @param string An override for the alt text
+	* @param string The name to be used as a legend and as the image name
+	* @param
+	*/
+    function addToToolBar ($task, $alt, $name, $imagename, $extended=false, $listprompt='') {
+        if (is_null($alt)) $alt = T_($name);
+        $image = mosAdminMenus::ImageCheckAdmin( $imagename.'.png', '/administrator/images/', NULL, NULL, $alt, $task );
+        $image2 = mosAdminMenus::ImageCheckAdmin( $imagename.'_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td>
-		<a class="toolbar" href="<?php echo $href;?>" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','images/<?php echo $iconOver;?>',1);">
-		<img name="<?php echo $task;?>" src="images/<?php echo $icon;?>" alt="<?php echo $alt;?>" border="0" align="middle" />
-		&nbsp;
-		<?php echo $alt; ?></a>
-		</td>
+		<a class="toolbar" href="javascript:<?php echo mosMenuBar::makeJavaScript ($task, $extended, $listprompt); ?>" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php
-		} else {
+		echo $image;
+		echo '<br>';
+		echo $alt;
 		?>
-		<td>
-		<a class="toolbar" href="<?php echo $href;?>">
-		&nbsp;
-		<?php echo $alt; ?></a>
+		</a>
 		</td>
 		<?php
-		}
-	}
+    }
+
+    function makeJavaScript ($task, $extended, $listprompt='') {
+        $script = '';
+        if ($listprompt) $script .= "if (document.adminForm.boxchecked.value == 0){ alert('$listprompt'); } else";
+        $script .= '{';
+        if ($extended) $script .= 'hideMainMenu();';
+        $script .= "submitbutton('$task')}";
+        return $script;
+    }
+
+    function getTemplate () {
+        global $database;
+        $sql = "SELECT template FROM #__templates_menu WHERE client_id='1' AND menuid='0'";
+        $database->setQuery( $sql );
+        return $database->loadResult();
+    }
 
-	/**
+    /**
 	* Writes the common 'new' icon for the button bar
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function addNew( $task='new', $alt='New' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'new.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'new_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function addNew( $task='new', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, 'New', 'new');
+    }
 
-	/**
+    /**
 	* Writes the common 'new' icon for the button bar.
 	* Extended version of addNew() calling hideMainMenu() before submitbutton().
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function addNewX( $task='new', $alt='New' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'new.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'new_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:hideMainMenu();submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function addNewX( $task='new', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, 'New', 'new', true);
+    }
 
-	/**
+    /**
 	* Writes a common 'publish' button
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function publish( $task='publish', $alt='Publish' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'publish.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'publish_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function publish( $task='publish', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, 'Publish', 'publish');
+    }
 
-	/**
+    /**
 	* Writes a common 'publish' button for a list of records
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function publishList( $task='publish', $alt='Publish' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'publish.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'publish_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-     	<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to publish'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-     	<?php
-	}
+    function publishList( $task='publish', $alt=null ) {
+        $listprompt = T_('Please make a selection from the list to publish');
+        mosMenuBar::addToToolBar ($task, $alt, 'Publish', 'publish', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'default' button for a record
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function makeDefault( $task='default', $alt='Default' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'publish.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'publish_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item to make default'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function makeDefault( $task='default', $alt=null ) {
+        $listprompt = T_('Please select an item to make default');
+        mosMenuBar::addToToolBar ($task, $alt, 'Default', 'publish', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'assign' button for a record
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function assign( $task='assign', $alt='Assign' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'publish.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'publish_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item to assign'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function assign( $task='assign', $alt=null ) {
+        $listprompt = T_('Please select an item to assign');
+        mosMenuBar::addToToolBar ($task, $alt, 'Assign', 'publish', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'unpublish' button
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function unpublish( $task='unpublish', $alt='Unpublish' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'unpublish.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'unpublish_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);" >
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function unpublish( $task='unpublish', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, 'Unpublish', 'unpublish');
+    }
 
-	/**
+    /**
 	* Writes a common 'unpublish' button for a list of records
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function unpublishList( $task='unpublish', $alt='Unpublish' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'unpublish.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'unpublish_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to unpublish'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);" >
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function unpublishList( $task='unpublish', $alt=null ) {
+        $listprompt = T_('Please make a selection from the list to unpublish');
+        mosMenuBar::addToToolBar ($task, $alt, 'Unpublish', 'unpublish', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'archive' button for a list of records
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function archiveList( $task='archive', $alt='Archive' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'archive.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'archive_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to archive'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function archiveList( $task='archive', $alt=null ) {
+        $listprompt = T_('Please make a selection from the list to archive');
+        mosMenuBar::addToToolBar ($task, $alt, 'Archive', 'archive', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes an unarchive button for a list of records
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function unarchiveList( $task='unarchive', $alt='Unarchive' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'unarchive.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'unarchive_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select a news story to unarchive'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function unarchiveList( $task='unarchive', $alt=null ) {
+        $listprompt = T_('Please select a news story to unarchive');
+        mosMenuBar::addToToolBar ($task, $alt, 'Unarchive', 'unarchive', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'edit' button for a list of records
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editList( $task='edit', $alt='Edit' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'edit.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'edit_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function editList( $task='edit', $alt=null ) {
+        $listprompt = T_('Please select an item from the list to edit');
+        mosMenuBar::addToToolBar ($task, $alt, 'Edit', 'edit', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'edit' button for a list of records.
 	* Extended version of editList() calling hideMainMenu() before submitbutton().
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editListX( $task='edit', $alt='Edit' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'edit.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'edit_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {hideMainMenu();submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function editListX( $task='edit', $alt=null ) {
+        $listprompt = T_('Please select an item from the list to edit');
+        mosMenuBar::addToToolBar ($task, $alt, 'Edit', 'edit', true, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'edit' button for a template html
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editHtml( $task='edit_source', $alt='Edit&nbsp;HTML' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'html.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'html_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function editHtml( $task='edit_source', $alt=null ) {
+        $listprompt = T_('Please select an item from the list to edit');
+        mosMenuBar::addToToolBar ($task, $alt, 'Edit HTML', 'html', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'edit' button for a template html.
 	* Extended version of editHtml() calling hideMainMenu() before submitbutton().
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editHtmlX( $task='edit_source', $alt='Edit&nbsp;HTML' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'html.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'html_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {hideMainMenu();submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function editHtmlX( $task='edit_source', $alt=null ) {
+        $listprompt = T_('Please select an item from the list to edit');
+        mosMenuBar::addToToolBar ($task, $alt, 'Edit HTML', 'html', true, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'edit' button for a template css
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editCss( $task='edit_css', $alt='Edit&nbsp;CSS' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'css.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'css_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function editCss( $task='edit_css', $alt=null ) {
+        $listprompt = T_('Please select an item from the list to edit');
+        mosMenuBar::addToToolBar ($task, $alt, 'Edit CSS', 'css', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'edit' button for a template css.
 	* Extended version of editCss() calling hideMainMenu() before submitbutton().
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editCssX( $task='edit_css', $alt='Edit&nbsp;CSS' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'css.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'css_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {hideMainMenu();submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function editCssX( $task='edit_css', $alt=null ) {
+        $listprompt = T_('Please select an item from the list to edit');
+        mosMenuBar::addToToolBar ($task, $alt, 'Edit CSS', 'css', true, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'delete' button for a list of records
 	* @param string  Postscript for the 'are you sure' message
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function deleteList( $msg='', $task='remove', $alt='Delete' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'delete.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'delete_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to delete'); } else if (confirm('Are you sure you want to delete selected items? <?php echo $msg;?>')){ submitbutton('<?php echo $task;?>');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function deleteList( $msg='', $task='remove', $alt=null ) {
+        $listprompt = T_('Please make a selection from the list to delete');
+        mosMenuBar::addToToolBar ($task, $alt, 'Delete', 'delete', false, $listprompt);
+    }
 
-	/**
+    /**
 	* Writes a common 'delete' button for a list of records.
 	* Extended version of deleteList() calling hideMainMenu() before submitbutton().
 	* @param string  Postscript for the 'are you sure' message
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function deleteListX( $msg='', $task='remove', $alt='Delete' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'delete.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'delete_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to delete'); } else if (confirm('Are you sure you want to delete selected items? <?php echo $msg;?>')){ hideMainMenu();submitbutton('<?php echo $task;?>');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function deleteListX( $msg='', $task='remove', $alt=null ) {
+        $listprompt = T_('Please make a selection from the list to delete');
+        mosMenuBar::addToToolBar ($task, $alt, 'Delete', 'delete', true, $listprompt);
+    }
 
-	/**
+    /**
 	* Write a trash button that will move items to Trash Manager
 	*/
-	function trash( $task='remove', $alt='Trash' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'delete.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'delete_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		 <td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt; ?>
-		</a>
-		</td>
-		<?php
-	}
+    function trash( $task='remove', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, 'Trash', 'delete');
+    }
 
-	/**
+    /**
 	* Writes a preview button for a given option (opens a popup window)
 	* @param string The name of the popup file (excluding the file extension)
 	*/
-	function preview( $popup='', $updateEditors=false ) {
-		global $database;
-		$image = mosAdminMenus::ImageCheckAdmin( 'preview.png', '/administrator/images/', NULL, NULL, 'Preview', 'preview' );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'preview_f2.png', '/administrator/images/', NULL, NULL, 'Preview', 'preview', 0 );
-
-		$sql = "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'";
-		$database->setQuery( $sql );
-		$cur_template = $database->loadResult();
+    function preview( $popup='', $updateEditors=false ) {
+        $image = mosAdminMenus::ImageCheckAdmin( 'preview.png', '/administrator/images/', NULL, NULL, T_('Preview'), 'preview' );
+        $image2 = mosAdminMenus::ImageCheckAdmin( 'preview_f2.png', '/administrator/images/', NULL, NULL, T_('Preview'), 'preview', 0 );
+        $cur_template = mosMenuBar::getTemplate();
 		?>
 		<td>
 		<script language="javascript">
 		function popup() {
-			<?php
-			if ($updateEditors) {
-				getEditorContents( 'editor1', 'introtext' );
-				getEditorContents( 'editor2', 'fulltext' );
-			}
-			?>
-			window.open('popups/<?php echo $popup;?>.php?t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');
+		    <?php
+		    if ($popup == 'contentwindow') {
+		        getEditorContents( 'editor1', 'introtext' );
+		        getEditorContents( 'editor2', 'fulltext' );
+		    }
+		    elseif ($popup == 'modulewindow') getEditorContents( 'editor1', 'content' );
+		    ?>
+		    window.open('index3.php?pop=/<?php echo $popup;?>.php&t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');
 		}
 		</script>
 	 	<a class="toolbar" href="#" onclick="popup();" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('preview','','<?php echo $image2; ?>',1);">
@@ -477,84 +335,71 @@
 		</a>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a preview button for a given option (opens a popup window)
 	* @param string The name of the popup file (excluding the file extension for an xml file)
 	* @param boolean Use the help file in the component directory
 	*/
-	function help( $ref, $com=false ) {
-		global $mosConfig_live_site;
-		$image = mosAdminMenus::ImageCheckAdmin( 'help.png', '/administrator/images/', NULL, NULL, 'Help', 'help' );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'help_f2.png', '/administrator/images/', NULL, NULL, 'Help', 'help', 0 );
-		$helpUrl = mosGetParam( $GLOBALS, 'mosConfig_helpurl', '' );
-		if ($helpUrl) {
-			$url = $helpUrl . '/index2.php?option=com_content&amp;task=findkey&pop=1&keyref=' . urlencode( $ref );
-		} else {
-			$url = $mosConfig_live_site . '/help/';
-			if ($com) {
-				$url = $mosConfig_live_site . '/administrator/components/' . $GLOBALS['option'] . '/help/';
-			}
-			if (!eregi( '\.html$', $ref )) {
-				$ref = $ref . '.xml';
-			}
-			$url .= $ref;
-		}
+    function help( $ref, $com=false ) {
+        $image = mosAdminMenus::ImageCheckAdmin( 'help.png', '/administrator/images/', NULL, NULL, T_('Help'), 'help' );
+        $image2 = mosAdminMenus::ImageCheckAdmin( 'help_f2.png', '/administrator/images/', NULL, NULL, T_('Help'), 'help', 0 );
+        $mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+        $rootpath = mamboCore::get('rootPath');
+        /*$helpUrl = mosGetParam( $GLOBALS, 'mosConfig_helpurl', '' );
+        if ($helpUrl) {
+        $url = $helpUrl . '/index2.php?option=com_content&amp;task=findkey&pop=1&keyref=' . urlencode( $ref );
+        } else {*/
+        $url = $mosConfig_live_site . '/help/';
+        $option = $GLOBALS['option'];
+        if (substr($option,0,4) != 'com_') $option = "com_$option";
+        $component = substr($option, 4);
+        if ($com) {
+            $url = $mosConfig_live_site . '/administrator/components/' . $option . '/help/';
+        }
+        $ref = $component.'.'.$ref . '.html';
+        $url .= $ref;
+
+        #if (!file_exists($rootpath.'/help/'.$ref)) return false;
+        
+        /*}*/
+
 		?>
 		<td>
 		<a class="toolbar" href="#" onclick="window.open('<?php echo $url;?>', 'mambo_help_win', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('help','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		Help
+		<?php echo $image . '<br>' . T_('Help'); ?>
 		</a>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a save button for a given option
 	* Apply operation leads to a save action only (does not leave edit mode)
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function apply( $task='apply', $alt='Apply' ) {
-		$image 	= mosAdminMenus::ImageCheckAdmin( 'apply.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'apply_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt;?>
-		</a>
-		</td>
-		<?php
-	}
+    function apply( $task='apply', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, T_('Apply'), 'apply');
+    }
 
-	/**
+    /**
 	* Writes a save button for a given option
 	* Save operation leads to a save and then close action
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function save( $task='save', $alt='Save' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'save.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'save_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt;?>
-		</a>
-		</td>
-		<?php
-	}
+    function save( $task='save', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, T_('Save'), 'save');
+    }
 
-	/**
+    /**
 	* Writes a save button for a given option (NOTE this is being deprecated)
 	*/
-	function savenew() {
-		$image = mosAdminMenus::ImageCheckAdmin( 'save.png', '/administrator/images/', NULL, NULL, 'save', 'save' );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'save_f2.png', '/administrator/images/', NULL, NULL, 'save', 'save', 0 );
+    function savenew() {
+        $image = mosAdminMenus::ImageCheckAdmin( 'save.png', '/administrator/images/', NULL, NULL, 'save', 'save' );
+        $image2 = mosAdminMenus::ImageCheckAdmin( 'save_f2.png', '/administrator/images/', NULL, NULL, 'save', 'save', 0 );
 		?>
 		<td>
 		<a class="toolbar" href="javascript:submitbutton('savenew');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('save','','<?php echo $image2; ?>',1);">
@@ -563,14 +408,14 @@
 		</a>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a save button for a given option (NOTE this is being deprecated)
 	*/
-	function saveedit() {
-		$image = mosAdminMenus::ImageCheckAdmin( 'save.png', '/administrator/images/', NULL, NULL, 'save', 'save' );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'save_f2.png', '/administrator/images/', NULL, NULL, 'save', 'save', 0 );
+    function saveedit() {
+        $image = mosAdminMenus::ImageCheckAdmin( 'save.png', '/administrator/images/', NULL, NULL, 'save', 'save' );
+        $image2 = mosAdminMenus::ImageCheckAdmin( 'save_f2.png', '/administrator/images/', NULL, NULL, 'save', 'save', 0 );
 		?>
 		<td>
 		<a class="toolbar" href="javascript:submitbutton('saveedit');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('save','','<?php echo $image2; ?>',1);">
@@ -579,38 +424,30 @@
 		</a>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a cancel button and invokes a cancel operation (eg a checkin)
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function cancel( $task='cancel', $alt='Cancel' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'cancel.png', '/administrator/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'cancel_f2.png', '/administrator/images/', NULL, NULL, $alt, $task, 0 );
-		?>
-		<td>
-		<a class="toolbar" href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
-		<?php echo $image; ?>
-		<?php echo $alt;?>
-		</a>
-		</td>
-		<?php
-	}
+    function cancel( $task='cancel', $alt=null ) {
+        mosMenuBar::addToToolBar ($task, $alt, 'Cancel', 'cancel');
+    }
 
-	/**
+    /**
 	* Writes a cancel button that will go back to the previous page without doing
 	* any other operation
 	*/
-	function back( $alt='Back', $href='' ) {
-		$image = mosAdminMenus::ImageCheckAdmin( 'back.png', '/administrator/images/', NULL, NULL, 'back', 'cancel' );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'back_f2.png', '/administrator/images/', NULL, NULL, 'back', 'cancel', 0 );
-		if ( $href ) {
-			$link = $href;
-		} else {
-			$link = 'javascript:window.history.back();';
-		}
+    function back( $alt=null, $href='' ) {
+        if (is_null($alt)) $alt = T_('Back');
+        $image = mosAdminMenus::ImageCheckAdmin( 'back.png', '/administrator/images/', NULL, NULL, 'back', 'cancel' );
+        $image2 = mosAdminMenus::ImageCheckAdmin( 'back_f2.png', '/administrator/images/', NULL, NULL, 'back', 'cancel', 0 );
+        if ( $href ) {
+            $link = $href;
+        } else {
+            $link = 'javascript:window.history.back();';
+        }
 		?>
 		<td>
 		<a class="toolbar" href="<?php echo $link; ?>" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('cancel','','<?php echo $image2; ?>',1);">
@@ -619,66 +456,64 @@
 		</a>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Write a divider between menu buttons
 	*/
-	function divider() {
-		$image = mosAdminMenus::ImageCheckAdmin( 'menu_divider.png', '/administrator/images/' );
+    function divider() {
+        $image = mosAdminMenus::ImageCheckAdmin( 'menu_divider.png', '/administrator/images/' );
 		?>
 		<td>
 		<?php echo $image; ?>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a media_manager button
 	* @param string The sub-drectory to upload the media to
 	*/
-	function media_manager( $directory = '', $alt='Upload' ) {
-		global $database;
-		$sql = "SELECT template FROM #__templates_menu WHERE client_id='1' AND menuid='0'";
-		$database->setQuery( $sql );
-		$cur_template = $database->loadResult();
-		$image = mosAdminMenus::ImageCheckAdmin( 'upload.png', '/administrator/images/', NULL, NULL, 'Upload Image', 'uploadPic' );
-		$image2 = mosAdminMenus::ImageCheckAdmin( 'upload_f2.png', '/administrator/images/', NULL, NULL, 'Upload Image', 'uploadPic', 0 );
+    function media_manager( $directory = '', $alt=null ) {
+        if (is_null($alt)) $alt = T_('Upload');
+        $cur_template = mosMenuBar::getTemplate();
+        $image = mosAdminMenus::ImageCheckAdmin( 'upload.png', '/administrator/images/', NULL, NULL, T_('Upload Image'), 'uploadPic' );
+        $image2 = mosAdminMenus::ImageCheckAdmin( 'upload_f2.png', '/administrator/images/', NULL, NULL, T_('Upload Image'), 'uploadPic', 0 );
 		?>
 		<td>
-		<a class="toolbar" href="#" onclick="popupWindow('popups/uploadimage.php?directory=<?php echo $directory; ?>&t=<?php echo $cur_template; ?>','win1',250,100,'no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('uploadPic','','<?php echo $image2; ?>',1);">
+		<a class="toolbar" href="#" onclick="popupWindow('index3.php?pop=uploadimage.php&directory=<?php echo $directory; ?>&t=<?php echo $cur_template; ?>','win1',250,100,'no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('uploadPic','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		<?php echo $alt;?>
 		</a>
 		</td>
 		<?php
-	}
+    }
 
-	/**
+    /**
 	* Writes a spacer cell
 	* @param string The width for the cell
 	*/
-	function spacer( $width='' )
-	{
-		if ($width != '') {
+    function spacer( $width='' )
+    {
+        if ($width != '') {
 ?>
 		<td width="<?php echo $width;?>">&nbsp;</td>
 <?php
-		} else {
+        } else {
 ?>
 		<td>&nbsp;</td>
 <?php
-		}
-	}
+        }
+    }
 
-	/**
+    /**
 	* Writes the end of the menu bar table
 	*/
-	function endTable() {
+    function endTable() {
 		?>
 		</tr>
 		</table>
 		<?php
-	}
+    }
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/includes/mosAdminMenus.php 4.6rc2/administrator/includes/mosAdminMenus.php
--- 4.5.4/administrator/includes/mosAdminMenus.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/includes/mosAdminMenus.php	2006-04-11 09:36:50.000000000 -0500
@@ -0,0 +1,645 @@
+<?php
+
+function mosTreeRecurse( $id, $indent, $list, &$children, $maxlevel=9999, $level=0, $type=1 ) {
+	if (@$children[$id] AND $level <= $maxlevel) {
+		$newindent = $indent.($type ? '.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;&nbsp;');
+		$pre = $type ? '<sup>L</sup>&nbsp;' : '- ';
+		foreach ($children[$id] as $v) {
+			$id = $v->id;
+			$list[$id] = $v;
+			$list[$id]->treename = $indent.($v->parent == 0 ? '' : $pre).$v->name;
+			$list[$id]->children = count( @$children[$id] );
+			$list = mosTreeRecurse( $id, $newindent, $list, $children, $maxlevel, $level+1, $type );
+		}
+	}
+	return $list;
+}
+
+/**
+* @param string SQL with ordering As value and 'name field' AS text
+* @param integer The length of the truncated headline
+*/
+function mosGetOrderingList( $sql, $chop='30' ) {
+	$database = mamboDatabase::getInstance();
+	$database->setQuery( $sql );
+	if (!($orders = $database->loadObjectList())) {
+		if ($database->getErrorNum()) {
+			echo $database->stderr();
+			return false;
+		} else {
+			$order[] = mosHTML::makeOption( 1, 'first' );
+			return $order;
+		}
+	}
+	$order[] = mosHTML::makeOption( 0, '0 first' );
+	foreach ($orders as $ord) {
+		$text = strlen($ord->text) > $chop ? substr($ord->text,0,$chop)."..." : $ord->text;
+		$order[] = mosHTML::makeOption( $ord->value, $ord->value.' ('.$text.')' );
+	}
+	$order[] = mosHTML::makeOption( $ord->value+1, ($ord->value+1).' last' );
+	return $order;
+}
+
+/**
+* Common HTML Output Files
+* @package Mambo
+*/
+class mosAdminMenus {
+	/**
+	* build the select list for Menu Ordering
+	*/
+	function Ordering( &$row, $id ) {
+		global $database;
+
+		if ( $id ) {
+			$order = mosGetOrderingList( "SELECT ordering AS value, name AS text"
+			. "\n FROM #__menu"
+			. "\n WHERE menutype='". $row->menutype ."'"
+			. "\n AND parent='". $row->parent ."'"
+			. "\n AND published != '-2'"
+			. "\n ORDER BY ordering"
+			);
+			$ordering = mosHTML::selectList( $order, 'ordering', 'class="inputbox" size="1"', 'value', 'text', intval( $row->ordering ) );
+		}
+		else {
+			$ordering = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />'. T_('New items default to the last place. Ordering can be changed after this item is saved.');
+		}
+		return $ordering;
+	}
+
+	/**
+	* build the select list for access level
+	*/
+	function Access( &$row ) {
+		global $database;
+
+		$query = 'SELECT id AS value, name AS text FROM #__groups ORDER BY id';
+		$database->setQuery( $query );
+		$groups = $database->loadObjectList();
+		$access = mosHTML::selectList( $groups, 'access', 'class="inputbox" size="3"', 'value', 'text', intval( $row->access ) );
+		return $access;
+	}
+
+	/**
+	* build the select list for parent item
+	*/
+	function Parent( &$row ) {
+		global $database;
+
+		// get a list of the menu items
+		$query = "SELECT m.*"
+		. "\n FROM #__menu m"
+		. "\n WHERE menutype='$row->menutype'"
+		. "\n AND published <> -2"
+		. "\n ORDER BY ordering"
+		;
+		$database->setQuery( $query );
+		$mitems = $database->loadObjectList();
+
+		// establish the hierarchy of the menu
+		$children = array();
+		// first pass - collect children
+		if (is_array($mitems)) {
+			foreach ( $mitems as $v ) {
+				$pt = $v->parent;
+				$list = @$children[$pt] ? $children[$pt] : array();
+				array_push( $list, $v );
+				$children[$pt] = $list;
+			}
+		}
+		// second pass - get an indent list of the items
+		$list = mosTreeRecurse( 0, '', array(), $children, 9999, 0, 0 );
+
+		// assemble menu items to the array
+		$mitems = array();
+		$mitems[] = mosHTML::makeOption( '0', 'Top' );
+		$this_treename = '';
+		foreach ( $list as $item ) {
+			if ( $this_treename ) {
+				if ( $item->id != $row->id && strpos( $item->treename, $this_treename ) === false) {
+					$mitems[] = mosHTML::makeOption( $item->id, $item->treename );
+				}
+			} else {
+				if ( $item->id != $row->id ) {
+					$mitems[] = mosHTML::makeOption( $item->id, $item->treename );
+				} else {
+					$this_treename = "$item->treename/";
+				}
+			}
+		}
+		$parent = mosHTML::selectList( $mitems, 'parent', 'class="inputbox" size="1"', 'value', 'text', $row->parent );
+		return $parent;
+	}
+
+	/**
+	* build a radio button option for published state
+	*/
+	function Published( &$row ) {
+		$published = mosHTML::yesnoRadioList( 'published', 'class="inputbox"', $row->published );
+		return $published;
+	}
+
+	/**
+	* build the link/url of a menu item
+	*/
+	function Link( &$row, $id, $link=NULL ) {
+		if ( $id ) {
+			if ( $link ) {
+				$link = $row->link;
+			} else {
+				$link = $row->link .'&amp;Itemid='. $row->id;
+			}
+		} else {
+			$link = NULL;
+		}
+		return $link;
+	}
+
+	/**
+	* build the select list for target window
+	*/
+	function Target( &$row ) {
+		$click[] = mosHTML::makeOption( '0',  T_('Parent Window With Browser Navigation'));
+		$click[] = mosHTML::makeOption( '1',  T_('New Window With Browser Navigation'));
+		$click[] = mosHTML::makeOption( '2', T_('New Window Without Browser Navigation'));
+		$target = mosHTML::selectList( $click, 'browserNav', 'class="inputbox" size="4"', 'value', 'text', intval( $row->browserNav ) );
+		return $target;
+	}
+
+	/**
+	* build the multiple select list for Menu Links/Pages
+	*/
+	function MenuLinks( &$lookup, $all=NULL, $none=NULL ) {
+		global $database;
+
+		// get a list of the menu items
+		$database->setQuery( "SELECT m.*"
+		. "\n FROM #__menu m"
+		. "\n WHERE type != 'separator'"
+		. "\n AND link NOT LIKE '%tp:/%'"
+		. "\n AND published = '1'"
+		. "\n ORDER BY menutype, parent, ordering"
+		);
+		$mitems = $database->loadObjectList();
+		$mitems_temp = $mitems;
+
+		// establish the hierarchy of the menu
+		$children = array();
+		// first pass - collect children
+		foreach ( $mitems as $v ) {
+			$id = $v->id;
+			$pt = $v->parent;
+			$list = @$children[$pt] ? $children[$pt] : array();
+			array_push( $list, $v );
+			$children[$pt] = $list;
+		}
+		// second pass - get an indent list of the items
+		$list = mosTreeRecurse( intval( $mitems[0]->parent ), '', array(), $children, 9999, 0, 0 );
+
+		// Code that adds menu name to Display of Page(s)
+		$text_count = "0";
+		$mitems_spacer = $mitems_temp[0]->menutype;
+		foreach ($list as $list_a) {
+			foreach ($mitems_temp as $mitems_a) {
+				if ($mitems_a->id == $list_a->id) {
+					// Code that inserts the blank line that seperates different menus
+					if ($mitems_a->menutype <> $mitems_spacer) {
+						$list_temp[] = mosHTML::makeOption( -999, '----' );
+						$mitems_spacer = $mitems_a->menutype;
+					}
+					$text = $mitems_a->menutype." | ".$list_a->treename;
+					$list_temp[] = mosHTML::makeOption( $list_a->id, $text );
+					if ( strlen($text) > $text_count) {
+						$text_count = strlen($text);
+					}
+				}
+			}
+		}
+		$list = $list_temp;
+
+		$mitems = array();
+		if ( $all ) {
+			// prepare an array with 'all' as the first item
+			$mitems[] = mosHTML::makeOption( 0, T_('All') );
+			// adds space, in select box which is not saved
+			$mitems[] = mosHTML::makeOption( -999, '----' );
+		}
+		if ( $none ) {
+			// prepare an array with 'all' as the first item
+			$mitems[] = mosHTML::makeOption( -999, T_('None') );
+			// adds space, in select box which is not saved
+			$mitems[] = mosHTML::makeOption( -999, '----' );
+		}
+		// append the rest of the menu items to the array
+		foreach ($list as $item) {
+			$mitems[] = mosHTML::makeOption( $item->value, $item->text );
+		}
+		$pages = mosHTML::selectList( $mitems, 'selections[]', 'class="inputbox" size="26" multiple="multiple"', 'value', 'text', $lookup );
+		return $pages;
+	}
+
+
+	/**
+	* build the select list to choose a category
+	*/
+	function Category( &$menu, $id, $javascript='' ) {
+		global $database;
+
+		$query = "SELECT c.id AS `value`, c.section AS `id`, CONCAT_WS( ' / ', s.title, c.title) AS `text`"
+		. "\n FROM #__sections AS s"
+		. "\n INNER JOIN #__categories AS c ON c.section = s.id"
+		. "\n WHERE s.scope = 'content'"
+		. "\n ORDER BY s.name,c.name"
+		;
+		$database->setQuery( $query );
+		$rows = $database->loadObjectList();
+		$category = '';
+		if ( $id ) {
+			foreach ( $rows as $row ) {
+				if ( $row->value == $menu->componentid ) {
+					$category = $row->text;
+				}
+			}
+			$category .= '<input type="hidden" name="componentid" value="'. $menu->componentid .'" />';
+			$category .= '<input type="hidden" name="link" value="'. $menu->link .'" />';
+		} else {
+			$category = mosHTML::selectList( $rows, 'componentid', 'class="inputbox" size="10"'. $javascript, 'value', 'text' );
+			$category .= '<input type="hidden" name="link" value="" />';
+		}
+		return $category;
+	}
+
+	/**
+	* build the select list to choose a section
+	*/
+	function Section( &$menu, $id, $all=0 ) {
+		global $database;
+
+		$query = "SELECT s.id AS `value`, s.id AS `id`, s.title AS `text`"
+		. "\n FROM #__sections AS s"
+		. "\n WHERE s.scope = 'content'"
+		. "\n ORDER BY s.name"
+		;
+		$database->setQuery( $query );
+		if ( $all ) {
+			$rows[] = mosHTML::makeOption( 0, T_('- All Sections -') );
+			$rows = array_merge( $rows, $database->loadObjectList() );
+		} else {
+			$rows = $database->loadObjectList();
+		}
+
+		if ( $id ) {
+			foreach ( $rows as $row ) {
+				if ( $row->value == $menu->componentid ) {
+					$section = $row->text;
+				}
+			}
+			$section .= '<input type="hidden" name="componentid" value="'. $menu->componentid .'" />';
+			$section .= '<input type="hidden" name="link" value="'. $menu->link .'" />';
+		} else {
+			$section = mosHTML::selectList( $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text' );
+			$section .= '<input type="hidden" name="link" value="" />';
+		}
+		return $section;
+	}
+
+	/**
+	* build the select list to choose a component
+	*/
+	function Component( &$menu, $id ) {
+		global $database;
+
+		$query = "SELECT c.id AS value, c.name AS text, c.link"
+		. "\n FROM #__components AS c"
+		. "\n WHERE c.link <> ''"
+		. "\n ORDER BY c.name"
+		;
+		$database->setQuery( $query );
+		$rows = $database->loadObjectList( );
+		if ( $id ) {
+			// existing component, just show name
+			foreach ( $rows as $row ) {
+				if ( $row->value == $menu->componentid ) {
+					$component = $row->text;
+				}
+			}
+			$component .= '<input type="hidden" name="componentid" value="'. $menu->componentid .'" />';
+		} else {
+			$component = mosHTML::selectList( $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text' );
+		}
+		return $component;
+	}
+
+	/**
+	* build the select list to choose a component
+	*/
+	function ComponentName( &$menu, $id ) {
+		global $database;
+
+		$query = "SELECT c.id AS value, c.name AS text, c.link"
+		. "\n FROM #__components AS c"
+		. "\n WHERE c.link <> ''"
+		. "\n ORDER BY c.name"
+		;
+		$database->setQuery( $query );
+		$rows = $database->loadObjectList( );
+
+		$component = 'Component';
+		foreach ( $rows as $row ) {
+			if ( $row->value == $menu->componentid ) {
+				$component = $row->text;
+			}
+		}
+
+		return $component;
+	}
+
+	/**
+	* build the select list to choose an image
+	*/
+	function Images( $name, &$active, $javascript=NULL, $directory=NULL ) {
+		global $mosConfig_absolute_path;
+
+		if ( !$javascript ) {
+			$javascript = "onchange=\"javascript:if (document.forms[0].image.options[selectedIndex].value!='') {document.imagelib.src='../images/stories/' + document.forms[0].image.options[selectedIndex].value} else {document.imagelib.src='../images/blank.png'}\"";
+		}
+		if ( !$directory ) {
+			$directory = '/images/stories';
+		}
+
+		$imageFiles = mosReadDirectory( $mosConfig_absolute_path . $directory );
+		$images = array(  mosHTML::makeOption( '', T_('- Select Image -') ) );
+		foreach ( $imageFiles as $file ) {
+			if ( eregi( "bmp|gif|jpg|png", $file ) ) {
+				$images[] = mosHTML::makeOption( $file );
+			}
+		}
+		$images = mosHTML::selectList( $images, $name, 'class="inputbox" size="1" '. $javascript, 'value', 'text', $active );
+
+		return $images;
+	}
+
+	/**
+	* build the select list for Ordering of a specified Table
+	*/
+	function SpecificOrdering( &$row, $id, $query, $neworder=0 ) {
+		global $database;
+
+		if ( $neworder ) {
+			$text = T_('New items default to the first place. Ordering can be changed after this item is saved.');
+		} else {
+			$text = T_('New items default to the last place. Ordering can be changed after this item is saved.');
+		}
+
+		if ( $id ) {
+			$order = mosGetOrderingList( $query );
+			$ordering = mosHTML::selectList( $order, 'ordering', 'class="inputbox" size="1"', 'value', 'text', intval( $row->ordering ) );
+		} else {
+			$ordering = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />'. $text;
+		}
+		return $ordering;
+	}
+
+	/**
+	* Select list of active users
+	*/
+	function UserSelect( $name, $active, $nouser=0, $javascript=NULL, $order='name' ) {
+		global $database, $my;
+
+		$query = "SELECT id AS value, CONCAT(name,' (',username,')') AS text"
+		. "\n FROM #__users"
+		. "\n WHERE block = '0'"
+		. "\n ORDER BY ". $order
+		;
+		$database->setQuery( $query );
+		if ( $nouser ) {
+			$users[] = mosHTML::makeOption( '0', T_('- No User -') );
+			$users = array_merge( $users, $database->loadObjectList() );
+		} else {
+			$users = $database->loadObjectList();
+		}
+
+		$users = mosHTML::selectList( $users, $name, 'class="inputbox" size="1" '. $javascript, 'value', 'text', $active );
+
+		return $users;
+	}
+
+	/**
+	* Select list of positions - generally used for location of images
+	*/
+	function Positions( $name, $active=NULL, $javascript=NULL, $none=1, $center=1, $left=1, $right=1 ) {
+		if ( $none ) {
+			$pos[] = mosHTML::makeOption( '', T_('None') );
+		}
+		if ( $center ) {
+			$pos[] = mosHTML::makeOption( 'center', T_('Center') );
+		}
+		if ( $left ) {
+			$pos[] = mosHTML::makeOption( 'left', T_('Left') );
+		}
+		if ( $right ) {
+			$pos[] = mosHTML::makeOption( 'right', T_('Right') );
+		}
+
+		$positions = mosHTML::selectList( $pos, $name, 'class="inputbox" size="1"'. $javascript, 'value', 'text', $active );
+
+		return $positions;
+	}
+
+	/**
+	* Select list of active categories for components
+	*/
+	function ComponentCategory( $name, $section, $active=NULL, $javascript=NULL, $order='ordering', $size=1, $sel_cat=1 ) {
+		global $database;
+
+		$query = "SELECT id AS value, name AS text"
+		. "\n FROM #__categories"
+		. "\n WHERE section = '". $section ."'"
+		. "\n AND published = '1'"
+		. "\n ORDER BY ". $order
+		;
+		$database->setQuery( $query );
+		$categories = $database->loadObjectList();
+		if (!$categories) $categories = array();
+		if ( $sel_cat ) array_unshift($categories, mosHTML::makeOption('0', T_('- All Categories -')));
+		if ( count( $categories ) < 1 ) mosRedirect( 'index2.php?option=com_categories&section='. $section, T_('You must create a category first.') );
+		$categorylist = mosHTML::selectList( $categories, $name, 'class="inputbox" size="'. $size .'" '. $javascript, 'value', 'text', $active );
+		return $categorylist;
+	}
+
+	/**
+	* Select list of active sections
+	*/
+	function SelectSection( $name, $active=NULL, $javascript=NULL, $order='ordering' ) {
+		global $database;
+
+		$categories[] = mosHTML::makeOption( '0', T_('- All Sections -') );
+		$query = "SELECT id AS value, title AS text"
+		. "\n FROM #__sections"
+		. "\n WHERE published = '1'"
+		. "\n ORDER BY ". $order
+		;
+		$database->setQuery( $query );
+		$sections = array_merge( $categories, $database->loadObjectList() );
+
+		$category = mosHTML::selectList( $sections, $name, 'class="inputbox" size="1" '. $javascript, 'value', 'text', $active );
+
+		return $category;
+	}
+
+	/**
+	* Select list of menu items for a specific menu
+	*/
+	function Links2Menu( $type, $_and ) {
+		global $database;
+
+		$query = "SELECT *"
+		. "\n FROM #__menu"
+		. "\n WHERE type = '". $type ."'"
+		. "\n AND published = '1'"
+		. $_and
+		;
+		$database->setQuery( $query );
+		$menus = $database->loadObjectList();
+
+		return $menus;
+	}
+
+	/**
+	* Select list of menus
+	*/
+	function MenuSelect( $name='menuselect', $javascript=NULL ) {
+		global $database;
+
+		$query = "SELECT params"
+		. "\n FROM #__modules"
+		. "\n WHERE module = 'mod_mainmenu'"
+		;
+		$database->setQuery( $query );
+		$menus = $database->loadObjectList();
+		$total = count( $menus );
+		for( $i = 0; $i < $total; $i++ ) {
+			$params = mosParseParams( $menus[$i]->params );
+			$menuselect[$i]->value 	= $params->menutype;
+			$menuselect[$i]->text 	= $params->menutype;
+		}
+		// sort array of objects
+		SortArrayObjects( $menuselect, 'text', 1 );
+
+		$menus = mosHTML::selectList( $menuselect, $name, 'class="inputbox" size="10" '. $javascript, 'value', 'text' );
+
+		return $menus;
+	}
+
+	/**
+	* Checks to see if an image exists in the current templates image directory
+ 	* if it does it loads this image.  Otherwise the default image is loaded.
+	* Also can be used in conjunction with the menulist param to create the chosen image
+	* load the default or use no image
+	*/
+	function ImageCheckAdmin( $file, $directory='/administrator/images/', $param=NULL, $param_directory='/administrator/images/', $alt=NULL, $name=NULL, $type=1, $align='middle' ) {
+		$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+		$mainframe = mosMainFrame::getInstance();
+		$cur_template = $mainframe->getTemplate();
+		if ($param) $image = $mosConfig_live_site. $param_directory . $param;
+		else {
+			if ( file_exists(mamboCore::get('mosConfig_absolute_path').'/administrator/templates/'. $cur_template .'/images/'. $file ) ) {
+				$image = $mosConfig_live_site .'/administrator/templates/'. $cur_template .'/images/'. $file;
+			}
+			else $image = $mosConfig_live_site. $directory . $file;
+		}
+		// outputs actual html <img> tag
+		if ( $type ) $image = '<img src="'. $image .'" alt="'. $alt .'" align="'. $align .'" name="'. $name .'" border="0" />';
+		return $image;
+	}
+
+	/**
+	* Internal function to recursive scan the media manager directories
+	* @param string Path to scan
+	* @param string root path of this folder
+	* @param array  Value array of all existing folders
+	* @param array  Value array of all existing images
+	*/
+	function ReadImages( $imagePath, $folderPath, &$folders, &$images ) {
+		$imgDir =& new mosDirectory($imagePath);
+		$imgFiles =& $imgDir->listFiles ('.', 'both');
+
+		foreach ($imgFiles as $file) {
+			$ff_ = $folderPath . $file .'/';
+			$ff = $folderPath . $file;
+			$i_f = $imagePath .'/'. $file;
+
+			if ( is_dir( $i_f ) AND $file <> 'CVS' ) {
+				$folders[] = mosHTML::makeOption( $ff_ );
+				mosAdminMenus::ReadImages( $i_f, $ff_, $folders, $images );
+			} else if ( eregi( "bmp|gif|jpg|png", $file ) AND is_file( $i_f ) ) {
+				// leading / we don't need
+				$imageFile = substr( $ff, 1 );
+				$images[$folderPath][] = mosHTML::makeOption( $imageFile, $file );
+			}
+		}
+	}
+
+	function GetImageFolders( &$folders, $path ) {
+		$javascript 	= "onchange=\"changeDynaList( 'imagefiles', folderimages, document.adminForm.folders.options[document.adminForm.folders.selectedIndex].value, 0, 0);  previewImage( 'imagefiles', 'view_imagefiles', '$path/' );\"";
+		$getfolders 	= mosHTML::selectList( $folders, 'folders', 'class="inputbox" size="1" '. $javascript, 'value', 'text', '/' );
+		return $getfolders;
+	}
+
+	function GetImages( &$images, $path ) {
+		if ( !isset($images['/'] ) ) $images['/'][] = mosHTML::makeOption( '' );
+		//$javascript	= "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\" onfocus=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
+		$javascript	= "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
+		$getimages	= mosHTML::selectList( $images['/'], 'imagefiles', 'class="inputbox" size="10" multiple="multiple" '. $javascript , 'value', 'text', null );
+
+		return $getimages;
+	}
+
+	function GetSavedImages( &$row, $path ) {
+		$images2 = array();
+		foreach( $row->images as $file ) {
+			$temp = explode( '|', $file );
+			$filename = strrchr($temp[0], '/') ? substr( strrchr($temp[0], '/' ), 1 ) : $temp[0];
+			$images2[] = mosHTML::makeOption( $file, $filename );
+		}
+		//$javascript	= "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \" onfocus=\"previewImage( 'imagelist', 'view_imagelist', '$path/' )\"";
+		$javascript	= "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \"";
+		$imagelist 	= mosHTML::selectList( $images2, 'imagelist', 'class="inputbox" size="10" '. $javascript, 'value', 'text' );
+
+		return $imagelist;
+	}
+
+	function menutypes() {
+		$modulehandler =& mosModuleHandler::getInstance();
+		$modMenus =& $modulehandler->getByName('mod_mainmenu', false, true);
+
+		$menuhandler =& mosMenuHandler::getInstance();
+		$mtypes =& $menuhandler->getMenuTypes();
+		$menuTypes = array();
+		foreach ($mtypes as $type=>$count) $menuTypes[] = $type;
+		foreach ($modMenus as $modMenu) {
+			mosMakeHtmlSafe($modMenu) ;
+			$modParams 	= mosParseParams( $modMenu->params );
+			$menuType 	= @$modParams->menutype ? $modParams->menutype : 'mainmenu';
+			if (!in_array($menuType, $menuTypes)) $menuTypes[] = $menuType;
+		}
+
+		// sorts menutypes
+		asort( $menuTypes );
+
+		return $menuTypes;
+	}
+
+	/*
+	* loads files required for menu items
+	*/
+	function menuItem( $item ) {
+		global $mosConfig_absolute_path;
+
+		$path = $mosConfig_absolute_path .'/administrator/components/com_menus/'. $item .'/';
+		include_once( $path . $item .'.class.php' );
+		include_once( $path . $item .'.menu.html.php' );
+	}
+}
+
+?>
diff -ruN 4.5.4/administrator/includes/pageNavigation.php 4.6rc2/administrator/includes/pageNavigation.php
--- 4.5.4/administrator/includes/pageNavigation.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/pageNavigation.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,18 +1,19 @@
 <?php
 /**
-* @version $Id: pageNavigation.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Page navigation support class
-* @package Mambo
 */
 class mosPageNav {
 	/** @var int The record number to start dislpaying from */
@@ -70,9 +71,9 @@
 			$to_result = $this->total;
 		}
 		if ($this->total > 0) {
-			$html .= "\nResults " . $from_result . " - " . $to_result . " of " . $this->total;
+			$html .= sprintf(T_("Results %d to %d of %d"), $from_result, $to_result, $this->total);
 		} else {
-			$html .= "\nNo records found.";
+			$html .= T_('No records found.');
 		}
 		return $html;
 	}
@@ -99,11 +100,11 @@
 
 		if ($this_page > 1) {
 			$page = ($this_page - 2) * $this->limit;
-			$html .= "\n<a href=\"#beg\" class=\"pagenav\" title=\"first page\" onclick=\"javascript: document.adminForm.limitstart.value=0; document.adminForm.submit();return false;\"><< Start</a>";
-			$html .= "\n<a href=\"#prev\" class=\"pagenav\" title=\"previous page\" onclick=\"javascript: document.adminForm.limitstart.value=$page; document.adminForm.submit();return false;\">< Previous</a>";
+			$html .= "\n<a href=\"#beg\" class=\"pagenav\" title=\"".T_('first page')."\" onclick=\"javascript: document.adminForm.limitstart.value=0; document.adminForm.submit();return false;\"><< ".T_('Start')."</a>";
+			$html .= "\n<a href=\"#prev\" class=\"pagenav\" title=\"".T_('previous page')."\" onclick=\"javascript: document.adminForm.limitstart.value=$page; document.adminForm.submit();return false;\">< ".T_('Previous')."</a>";
 		} else {
-			$html .= "\n<span class=\"pagenav\"><< Start</span>";
-			$html .= "\n<span class=\"pagenav\">< Previous</span>";
+			$html .= "\n<span class=\"pagenav\"><< ".T_('Start')."</span>";
+			$html .= "\n<span class=\"pagenav\">< ".T_('Previous')."</span>";
 		}
 
 		for ($i=$start_loop; $i <= $stop_loop; $i++) {
@@ -118,11 +119,11 @@
 		if ($this_page < $total_pages) {
 			$page = $this_page * $this->limit;
 			$end_page = ($total_pages-1) * $this->limit;
-			$html .= "\n<a href=\"#next\" class=\"pagenav\" title=\"next page\" onclick=\"javascript: document.adminForm.limitstart.value=$page; document.adminForm.submit();return false;\"> Next ></a>";
-			$html .= "\n<a href=\"#end\" class=\"pagenav\" title=\"end page\" onclick=\"javascript: document.adminForm.limitstart.value=$end_page; document.adminForm.submit();return false;\"> End >></a>";
+			$html .= "\n<a href=\"#next\" class=\"pagenav\" title=\"".T_('next page')."\" onclick=\"javascript: document.adminForm.limitstart.value=$page; document.adminForm.submit();return false;\"> ".T_('Next')." ></a>";
+			$html .= "\n<a href=\"#end\" class=\"pagenav\" title=\"".T_('end page')."\" onclick=\"javascript: document.adminForm.limitstart.value=$end_page; document.adminForm.submit();return false;\"> ".T_('End')." >></a>";
 		} else {
-			$html .= "\n<span class=\"pagenav\">Next ></span>";
-			$html .= "\n<span class=\"pagenav\">End >></span>";
+			$html .= "\n<span class=\"pagenav\">".T_('Next')." ></span>";
+			$html .= "\n<span class=\"pagenav\">".T_('End')." >></span>";
 		}
 		return $html;
 	}
diff -ruN 4.5.4/administrator/includes/pcl/pclerror.lib.php 4.6rc2/administrator/includes/pcl/pclerror.lib.php
--- 4.5.4/administrator/includes/pcl/pclerror.lib.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/pcl/pclerror.lib.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,6 +1,5 @@
 <?php
 /**
-* @version $Id: pclerror.lib.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
 * @package Mambo
 */
 
diff -ruN 4.5.4/administrator/includes/pcl/pcltar.lib.php 4.6rc2/administrator/includes/pcl/pcltar.lib.php
--- 4.5.4/administrator/includes/pcl/pcltar.lib.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/pcl/pcltar.lib.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,7 +1,6 @@
 <?php
 /**
-* @version $Id: pcltar.lib.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 */
 
 /** ensure this file is being included by a parent file */
diff -ruN 4.5.4/administrator/includes/pcl/pcltrace.lib.php 4.6rc2/administrator/includes/pcl/pcltrace.lib.php
--- 4.5.4/administrator/includes/pcl/pcltrace.lib.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/pcl/pcltrace.lib.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,8 +1,7 @@
 <?php
 /**
-* @version $Id: pcltrace.lib.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-*/
+* @package Mambo Open Source
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/includes/pcl/pclzip.lib.php 4.6rc2/administrator/includes/pcl/pclzip.lib.php
--- 4.5.4/administrator/includes/pcl/pclzip.lib.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/pcl/pclzip.lib.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,8 +1,7 @@
 <?php
 /**
-* @version $Id: pclzip.lib.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-*/
+* @package Mambo Open Source
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/includes/pcl/zip.lib.php 4.6rc2/administrator/includes/pcl/zip.lib.php
--- 4.5.4/administrator/includes/pcl/zip.lib.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/pcl/zip.lib.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,8 +1,7 @@
 <?php
 /**
-* @version $Id: zip.lib.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-*/
+* @package Mambo Open Source
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/includes/toolbar.html.php 4.6rc2/administrator/includes/toolbar.html.php
--- 4.5.4/administrator/includes/toolbar.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/includes/toolbar.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,15 +1,14 @@
 <?php
 /**
-* @version $Id: toolbar.html.php,v 1.1 2005/07/22 01:53:54 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/**
-* @package Mambo
-*/
 class MENU_Default {
 	/**
 	* Draws a default set of menu icons
diff -ruN 4.5.4/administrator/index.php 4.6rc2/administrator/index.php
--- 4.5.4/administrator/index.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/index.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,119 +1,16 @@
-<?php
-/**
-* @version $Id: index.php,v 1.6 2005/11/21 11:57:50 csouza Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-// fix to address the globals overwrite problem in php versions < 4.4.1
-$protect_globals = array('_REQUEST', '_GET', '_POST', '_COOKIE', '_FILES', '_SERVER', '_ENV', 'GLOBALS', '_SESSION');
-foreach ($protect_globals as $global) {
-    if ( in_array($global , array_keys($_REQUEST)) ||
-         in_array($global , array_keys($_GET))     ||
-         in_array($global , array_keys($_POST))    ||
-         in_array($global , array_keys($_COOKIE))  ||
-         in_array($global , array_keys($_FILES))) {
-        die("Invalid Request.");
-    }
-}
-
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-
-if (!file_exists( '../configuration.php' )) {
-	header( 'Location: ../installation/index.php' );
-	exit();
-}
-
-require_once( '../configuration.php' );
-require_once( '../includes/mambo.php' );
-include_once ( $mosConfig_absolute_path .'/language/'. $mosConfig_lang .'.php' );
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
-$acl = new gacl_api();
-
-$option = mosGetParam( $_REQUEST, 'option', NULL );
-
-// mainframe is an API workhorse, lots of 'core' interaction routines
-$mainframe = new mosMainFrame( $database, $option, '..', true );
-
-if (isset( $_POST['submit'] )) {
-	/** escape and trim to minimise injection of malicious sql */
-	$usrname 	= $database->getEscaped( trim( mosGetParam( $_POST, 'usrname', '' ) ) );
-	$pass 		= $database->getEscaped( trim( mosGetParam( $_POST, 'pass', '' ) ) );
-
-	if (!$pass) {
-		echo "<script>alert('Please enter a password'); document.location.href='index.php';</script>\n";
-	} else {
-		$pass = md5( $pass );
-	}
-
-	$query = "SELECT COUNT(*)"
-	. "\n FROM #__users"
-	. "\n WHERE ( LOWER( usertype ) = 'administrator'"
-	. "\n OR LOWER( usertype ) = 'superadministrator'"
-	. "\n OR LOWER( usertype ) = 'super administrator' )"
-	;
-	$database->setQuery( $query );
-	$count = intval( $database->loadResult() );
-	if ($count < 1) {
-		echo "<script>alert(\""._LOGIN_NOADMINS."\"); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	$query = "SELECT * FROM #__users WHERE username='$usrname' AND block='0'";
-	$database->setQuery( $query );
-	$my = null;
-	$database->loadObject( $my );
-
-	/** find the user group (or groups in the future) */
-	if (@$my->id) {
-		$grp 			= $acl->getAroGroup( $my->id );
-		$my->gid 		= $grp->group_id;
-		$my->usertype 	= $grp->name;
-
-		if (strcmp( $my->password, $pass )
-		|| !$acl->acl_check( 'administration', 'login', 'users', $my->usertype )) {
-			echo "<script>alert('Incorrect Username, Password, or Access Level.  Please try again'); document.location.href='index.php';</script>\n";
-			exit();
-		}
-
-		session_name( md5( $mosConfig_live_site ) );
-		session_start();
-
-		$logintime 	= time();
-		$session_id = md5( "$my->id$my->username$my->usertype$logintime" );
-		$query = "INSERT INTO #__session"
-		. "\nSET time='$logintime', session_id='$session_id', "
-		. "userid='$my->id', usertype='$my->usertype', username='$my->username'"
-		;
-		$database->setQuery( $query );
-		if (!$database->query()) {
-			echo $database->stderr();
-		}
-
-		$_SESSION['session_id'] 		= $session_id;
-		$_SESSION['session_user_id'] 	= $my->id;
-		$_SESSION['session_username'] 	= $my->username;
-		$_SESSION['session_usertype'] 	= $my->usertype;
-		$_SESSION['session_gid'] 		= $my->gid;
-		$_SESSION['session_logintime'] 	= $logintime;
-		$_SESSION['session_userstate'] 	= array();
-
-		session_write_close();
-		/** cannot using mosredirect as this stuffs up the cookie in IIS */
-		echo "<script>document.location.href='index2.php';</script>\n";
-		exit();
-	} else {
-		echo "<script>alert('Incorrect Username and Password, please try again'); document.location.href='index.php';</script>\n";
-		exit();
-	}
-} else {
-	initGzip();
-	$path = $mosConfig_absolute_path . '/administrator/templates/' . $mainframe->getTemplate() . '/login.php';
-	require_once( $path );
-	doGzip();
-}
-?>
\ No newline at end of file
+<?php
+
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+$adminside = 1;
+include ('../index.php');
+
+?>
diff -ruN 4.5.4/administrator/index2.php 4.6rc2/administrator/index2.php
--- 4.5.4/administrator/index2.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/index2.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,136 +1,17 @@
-<?php
-/**
-* @version $Id: index2.php,v 1.8 2005/11/24 23:44:14 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-// fix to address the globals overwrite problem in php versions < 4.4.1
-$protect_globals = array('_REQUEST', '_GET', '_POST', '_COOKIE', '_FILES', '_SERVER', '_ENV', 'GLOBALS', '_SESSION');
-foreach ($protect_globals as $global) {
-    if ( in_array($global , array_keys($_REQUEST)) ||
-         in_array($global , array_keys($_GET))     ||
-         in_array($global , array_keys($_POST))    ||
-         in_array($global , array_keys($_COOKIE))  ||
-         in_array($global , array_keys($_FILES))) {
-        die("Invalid Request.");
-    }
-}
-
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-
-if (!file_exists( "../configuration.php" )) {
-	header( "Location: ../installation/index.php" );
-	exit();
-}
-
-require_once( "../globals.php" );
-require_once( "../configuration.php" );
-require_once( $mosConfig_absolute_path . "/includes/mambo.php" );
-include_once( $mosConfig_absolute_path . "/language/".$mosConfig_lang.".php" );
-require_once( $mosConfig_absolute_path . "/administrator/includes/admin.php" );
-
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
-$acl = new gacl_api();
-
-$option = strtolower( mosGetParam( $_REQUEST, 'option', '' ) );
-if ($option == '') {
-	$option = 'com_admin';
-}
-// must start the session before we create the mainframe object
-session_name( md5( $mosConfig_live_site ) );
-session_start();
-
-if ($option == 'simple_mode') {
-	
-	$_SESSION['simple_editing'] = 'on';
-}
-if ($option == 'advanced_mode') {
-
-	$_SESSION['simple_editing'] = 'off';
-}
-
-// mainframe is an API workhorse, lots of 'core' interaction routines
-$mainframe = new mosMainFrame( $database, $option, '..', true );
-
-// initialise some common request directives
-$task = mosGetParam( $_REQUEST, 'task', '' );
-$act = strtolower( mosGetParam( $_REQUEST, 'act', '' ) );
-$section = mosGetParam( $_REQUEST, 'section', '' );
-$no_html = strtolower( mosGetParam( $_REQUEST, 'no_html', '' ) );
-
-if ($option == 'logout') {
-	require 'logout.php';
-	exit();
-}
-
-// restore some session variables
-$my = new mosUser( $database );
-$my->id = mosGetParam( $_SESSION, 'session_user_id', '' );
-$my->username = mosGetParam( $_SESSION, 'session_username', '' );
-$my->usertype = mosGetParam( $_SESSION, 'session_usertype', '' );
-$my->gid = mosGetParam( $_SESSION, 'session_gid', '' );
-
-$session_id = mosGetParam( $_SESSION, 'session_id', '' );
-$logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
-
-
-if(!isset($_SESSION['simple_editing'])){
-	$_SESSION['simple_editing'] ='off';
-}
-
-if(isset($_POST['simple_editing']) && ($_POST['simple_editing'] != ''))
-{
-	$_SESSION['simple_editing'] = $_POST['simple_editing'];
-}
-
-// check against db record of session
-if ($session_id == md5( $my->id.$my->username.$my->usertype.$logintime )) {
-	$database->setQuery( "SELECT * FROM #__session"
-	. "\nWHERE session_id='$session_id'"
-	. " AND username = '" . $database->getEscaped( $my->username ) . "'"
-	. " AND userid = " . intval( $my->id )
-	);
-	if (!$result = $database->query()) {
-		echo $database->stderr();
-	}
-	if ($database->getNumRows( $result ) <> 1) {
-		echo "<script>document.location.href='index.php'</script>\n";
-		exit();
-	}
-} else {
-	echo "<script>document.location.href='$mosConfig_live_site/administrator/index.php'</script>\n";
-	exit();
-}
-
-// update session timestamp
-$current_time = time();
-$database->setQuery( "UPDATE #__session SET time='$current_time'"
-. "\nWHERE session_id='$session_id'"
-);
-$database->query();
-
-// timeout old sessions
-$past = time()-1800;
-$database->setQuery( "DELETE FROM #__session WHERE time < '$past'" );
-$database->query();
-
-// start the html output
-if ($no_html) {
-	if ($path = $mainframe->getPath( "admin" )) {
-		require $path;
-	}
-	exit;
-}
-
-initGzip();
-
-$path = $mosConfig_absolute_path . "/administrator/templates/" . $mainframe->getTemplate() . "/index.php";
-require_once( $path );
-
-doGzip();
-?>
\ No newline at end of file
+<?php
+
+
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+$adminside = 2;
+include ('../index.php');
+
+?>
diff -ruN 4.5.4/administrator/index3.php 4.6rc2/administrator/index3.php
--- 4.5.4/administrator/index3.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/index3.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,150 +1,15 @@
-<?php
-/**
-* @version $Id: index3.php,v 1.5 2005/11/21 11:57:50 csouza Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-
-// fix to address the globals overwrite problem in php versions < 4.4.1
-$protect_globals = array('_REQUEST', '_GET', '_POST', '_COOKIE', '_FILES', '_SERVER', '_ENV', 'GLOBALS', '_SESSION');
-foreach ($protect_globals as $global) {
-    if ( in_array($global , array_keys($_REQUEST)) ||
-         in_array($global , array_keys($_GET))     ||
-         in_array($global , array_keys($_POST))    ||
-         in_array($global , array_keys($_COOKIE))  ||
-         in_array($global , array_keys($_FILES))) {
-        die("Invalid Request.");
-    }
-}
-
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-
-if (!file_exists( "../configuration.php" )) {
-	header( "Location: ../installation/index.php" );
-	exit();
-}
-
-require_once( "../globals.php" );
-require_once( "../configuration.php" );
-require_once( $mosConfig_absolute_path . "/includes/mambo.php" );
-include_once( $mosConfig_absolute_path . "/language/".$mosConfig_lang.".php" );
-require_once( $mosConfig_absolute_path . "/administrator/includes/admin.php" );
-
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
-$acl = new gacl_api();
-
-$option = trim( strtolower( mosGetParam( $_REQUEST, 'option', '' ) ) );
-
-// must start the session before we create the mainframe object
-session_name( md5( $mosConfig_live_site ) );
-session_start();
-
-// mainframe is an API workhorse, lots of 'core' interaction routines
-$mainframe = new mosMainFrame( $database, $option, '..', true );
-
-// initialise some common request directives
-$task = trim( mosGetParam( $_REQUEST, 'task', '' ) );
-$act = trim( strtolower( mosGetParam( $_REQUEST, 'act', '' ) ) );
-$section = trim( mosGetParam( $_REQUEST, 'section', '' ) );
-$mosmsg = trim( strip_tags( mosGetParam( $_REQUEST, 'mosmsg', '' ) ) );
-$no_html = strtolower( trim( mosGetParam( $_REQUEST, 'no_html', '' ) ) );
-
-
-if ($option == 'logout') {
-	require 'logout.php';
-	exit();
-}
-
-// restore some session variables
-$my = new mosUser( $database );
-$my->id = mosGetParam( $_SESSION, 'session_user_id', '' );
-$my->username = mosGetParam( $_SESSION, 'session_username', '' );
-$my->usertype = mosGetParam( $_SESSION, 'session_usertype', '' );
-$my->gid = mosGetParam( $_SESSION, 'session_gid', '' );
-
-$session_id = mosGetParam( $_SESSION, 'session_id', '' );
-$logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
-
-// check against db record of session
-if ($session_id == md5( $my->id.$my->username.$my->usertype.$logintime )) {
-	$database->setQuery( "SELECT * FROM #__session"
-	. "\nWHERE session_id='$session_id'"
-	. " AND username = '" . $database->getEscaped( $my->username ) . "'"
-	. " AND userid = " . intval( $my->id )
-	);
-	if (!$result = $database->query()) {
-		echo $database->stderr();
-	}
-	if ($database->getNumRows( $result ) <> 1) {
-		echo "<script>document.location.href='index.php'</script>\n";
-		exit();
-	}
-} else {
-	echo "<script>document.location.href='index.php'</script>\n";
-	exit();
-}
-
-// update session timestamp
-$current_time = time();
-$database->setQuery( "UPDATE #__session SET time='$current_time'"
-. "\nWHERE session_id='$session_id'"
-);
-$database->query();
-
-// timeout old sessions
-$past = time()-1800;
-$database->setQuery( "DELETE FROM #__session WHERE time < '$past'" );
-$database->query();
-
-// start the html output
-if ($no_html) {
-	if ($path = $mainframe->getPath( "admin" )) {
-		require $path;
-	}
-	exit;
-}
-
-initGzip();
-
-?>
-<?php echo "<?xml version=\"1.0\"?>"; ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php echo $mosConfig_sitename; ?> - Administration [Mambo]</title>
-<link rel="stylesheet" href="templates/<?php echo $mainframe->getTemplate(); ?>/css/template_css.css" type="text/css">
-<link rel="stylesheet" href="templates/<?php echo $mainframe->getTemplate(); ?>/css/theme.css" type="text/css">
-<script language="JavaScript" src="../includes/js/JSCookMenu.js" type="text/javascript"></script>
-<script language="JavaScript" src="includes/js/ThemeOffice/theme.js" type="text/javascript"></script>
-<script language="JavaScript" src="../includes/js/mambojavascript.js" type="text/javascript"></script>
-<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
-</head>
-<body>
-<?php
-if ($mosmsg) {
-	if (!get_magic_quotes_gpc()) {
-		$mosmsg = addslashes( $mosmsg );
-	}
-	echo "\n<script language=\"javascript\" type=\"text/javascript\">alert('$mosmsg');</script>";
-}
-
-// Show list of items to edit or delete or create new
-if ($path = $mainframe->getPath( 'admin' )) {
-	require $path;
-} else {
-	?>
-      <img src="images/logo.png" border="0" alt="Mambo Logo" />&nbsp; <br />
-      <?php
-}
-?>
-
-</body>
-</html>
-<?php
-doGzip();
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+$adminside = 3;
+include ('../index.php');
+
+?>
diff -ruN 4.5.4/administrator/logout.php 4.6rc2/administrator/logout.php
--- 4.5.4/administrator/logout.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/logout.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: logout.php,v 1.1 2005/07/22 01:53:55 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -54,5 +56,6 @@
 if (session_is_registered( "session_logintime" )) {
 	session_destroy();
 }
-mosRedirect( "../index.php" );
-?>
\ No newline at end of file
+$configuration =& mamboCore::getMamboCore();
+$configuration->redirect( "../index.php" );
+?>
diff -ruN 4.5.4/administrator/modules/mod_components.php 4.6rc2/administrator/modules/mod_components.php
--- 4.5.4/administrator/modules/mod_components.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_components.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_components.php,v 1.1 2005/07/22 01:53:55 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/modules/mod_fullmenu.php 4.6rc2/administrator/modules/mod_fullmenu.php
--- 4.5.4/administrator/modules/mod_fullmenu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_fullmenu.php	2006-02-28 22:33:11.000000000 -0600
@@ -1,18 +1,19 @@
 <?php
 /**
-* @version $Id: mod_fullmenu.php,v 1.1 2005/07/22 01:53:57 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Full DHTML Admnistrator Menus
-* @package Mambo
 */
 class mosFullAdminMenu {
 	/**
@@ -51,7 +52,7 @@
         $database->setQuery( $query );
         $sections = $database->loadObjectList();
 		$nonemptySections = 0;
-		foreach ($sections as $section)
+		if ($sections) foreach ($sections as $section)
 			if ($section->numcat > 0)
 				$nonemptySections++;
 		$menuTypes = mosAdminMenus::menutypes();
@@ -62,67 +63,60 @@
 		[
 <?php
 	// Home Sub-Menu
-?>			[null,'Home','index2.php',null,'Control Panel'],
+?>			[null,'<?php echo T_('Home') ?>','index2.php',null,'<?php echo T_('Control Panel') ?>'],
 			_cmSplit,
 <?php
 	// Site Sub-Menu
-?>			[null,'Site',null,null,'Site Management',
+?>			[null,'<?php echo T_('Site') ?>',null,null,'<?php echo T_('Site Management') ?>',
 <?php
 			if ($canConfig) {
-?>				['<img src="../includes/js/ThemeOffice/config.png" />','Global Configuration','index2.php?option=com_config&hidemainmenu=1',null,'Configuration'],
+?>				['<img src="../includes/js/ThemeOffice/config.png" />','<?php echo T_('Global Configuration') ?>','index2.php?option=com_config&hidemainmenu=1',null,'<?php echo T_('Configuration') ?>'],
 <?php
 			}
 			if ($manageLanguages) {
-?>				['<img src="../includes/js/ThemeOffice/language.png" />','Language Manager',null,null,'Manage languages',
-  					['<img src="../includes/js/ThemeOffice/language.png" />','Site Languages','index2.php?option=com_languages',null,'Manage Languages'],
-  					['<img src="../includes/js/ThemeOffice/install.png" />','Install','index2.php?option=com_installer&element=language',null,'Install Languages'],
-  				],
+?>				['<img src="../includes/js/ThemeOffice/language.png" />','<?php echo T_('Language Manager') ?>','index2.php?option=com_languages',null,'<?php echo T_('Manage languages') ?>'],
 <?php
 			}
-?>				['<img src="../includes/js/ThemeOffice/media.png" />','Media Manager','index2.php?option=com_media',null,'Manage Media Files'],
-					['<img src="../includes/js/ThemeOffice/preview.png" />', 'Preview', null, null, 'Preview',
-					['<img src="../includes/js/ThemeOffice/preview.png" />','In New Window','<?php echo $mosConfig_live_site; ?>/index.php','_blank','<?php echo $mosConfig_live_site; ?>'],
-					['<img src="../includes/js/ThemeOffice/preview.png" />','Inline','index2.php?option=com_admin&task=preview',null,'<?php echo $mosConfig_live_site; ?>'],
-					['<img src="../includes/js/ThemeOffice/preview.png" />','Inline with Positions','index2.php?option=com_admin&task=preview2',null,'<?php echo $mosConfig_live_site; ?>'],
+?>				['<img src="../includes/js/ThemeOffice/media.png" />','<?php echo T_('Media Manager') ?>','index2.php?option=com_media',null,'<?php echo T_('Manage Media Files') ?>'],
+					['<img src="../includes/js/ThemeOffice/preview.png" />', '<?php echo T_('Preview') ?>', null, null, '<?php echo T_('Preview') ?>',
+					['<img src="../includes/js/ThemeOffice/preview.png" />','<?php echo T_('In New Window') ?>','<?php echo $mosConfig_live_site; ?>/index.php','_blank','<?php echo $mosConfig_live_site; ?>'],
+					['<img src="../includes/js/ThemeOffice/preview.png" />','<?php echo T_('Inline') ?>','index2.php?option=com_admin&task=preview',null,'<?php echo $mosConfig_live_site; ?>'],
+					['<img src="../includes/js/ThemeOffice/preview.png" />','<?php echo T_('Inline with Positions') ?>','index2.php?option=com_admin&task=preview2',null,'<?php echo $mosConfig_live_site; ?>'],
 				],
-				['<img src="../includes/js/ThemeOffice/globe1.png" />', 'Statistics', null, null, 'Site Statistics',
+				['<img src="../includes/js/ThemeOffice/globe1.png" />', '<?php echo T_('Statistics') ?>', null, null, '<?php echo T_('Site Statistics') ?>',
 <?php
 			if ($mosConfig_enable_stats == 1) {
-?>					['<img src="../includes/js/ThemeOffice/globe4.png" />', 'Browser, OS, Domain', 'index2.php?option=com_statistics', null, 'Browser, OS, Domain'],
-  					['<img src="../includes/js/ThemeOffice/globe3.png" />', 'Page Impressions', 'index2.php?option=com_statistics&task=pageimp', null, 'Page Impressions'],
+?>					['<img src="../includes/js/ThemeOffice/globe4.png" />', '<?php echo T_('Browser, OS, Domain') ?>', 'index2.php?option=com_statistics', null, '<?php echo T_('Browser, OS, Domain') ?>'],
+  					['<img src="../includes/js/ThemeOffice/globe3.png" />', '<?php echo T_('Page Impressions') ?>', 'index2.php?option=com_statistics&task=pageimp', null, '<?php echo T_('Page Impressions') ?>'],
 <?php
 			}
-?>					['<img src="../includes/js/ThemeOffice/search_text.png" />', 'Search Text', 'index2.php?option=com_statistics&task=searches', null, 'Search Text']
+?>					['<img src="../includes/js/ThemeOffice/search_text.png" />', '<?php echo T_('Search Text') ?>', 'index2.php?option=com_statistics&task=searches', null, '<?php echo T_('Search Text') ?>']
 				],
 <?php
 			if ($manageTemplates) {
-?>				['<img src="../includes/js/ThemeOffice/template.png" />','Template Manager',null,null,'Change site template',
-  					['<img src="../includes/js/ThemeOffice/template.png" />','Site Templates','index2.php?option=com_templates',null,'Change site template'],
-  					['<img src="../includes/js/ThemeOffice/install.png" />','Install','index2.php?option=com_installer&element=template&client=',null,'Install Site Templates'],
-  					_cmSplit,
-  					['<img src="../includes/js/ThemeOffice/template.png" />','Administrator Templates','index2.php?option=com_templates&client=admin',null,'Change admin template'],
-  					['<img src="../includes/js/ThemeOffice/install.png" />','Install','index2.php?option=com_installer&element=template&client=admin',null,'Install Administrator Templates'],
-  					_cmSplit,
-  					['<img src="../includes/js/ThemeOffice/template.png" />','Module Positions','index2.php?option=com_templates&task=positions',null,'Template positions']
+?>				['<img src="../includes/js/ThemeOffice/template.png" />','<?php echo T_('Template Manager') ?>',null,null,'<?php echo T_('Change site template') ?>',
+  					['<img src="../includes/js/ThemeOffice/template.png" />','<?php echo T_('Site Templates') ?>','index2.php?option=com_templates',null,'<?php echo T_('Change site template') ?>'],
+  					['<img src="../includes/js/ThemeOffice/template.png" />','<?php echo T_('Administrator Templates') ?>','index2.php?option=com_templates&client=admin',null,'<?php echo T_('Change admin template') ?>'],
+  					['<img src="../includes/js/ThemeOffice/template.png" />','<?php echo T_('Module Positions') ?>','index2.php?option=com_templates&task=positions',null,'<?php echo T_('Template positions') ?>']
   				],
 <?php
 			}
 			if ($manageTrash) {
-?>				['<img src="../includes/js/ThemeOffice/trash.png" />','Trash Manager','index2.php?option=com_trash',null,'Manage Trash'],
+?>				['<img src="../includes/js/ThemeOffice/trash.png" />','<?php echo T_('Trash Manager') ?>','index2.php?option=com_trash',null,'<?php echo T_('Manage Trash') ?>'],
 <?php
 			}
 			if ($canManageUsers || $canMassMail) {
-?>				['<img src="../includes/js/ThemeOffice/users.png" />','User Manager','index2.php?option=com_users&task=view',null,'Manage users'],
+?>				['<img src="../includes/js/ThemeOffice/users.png" />','<?php echo T_('User Manager') ?>','index2.php?option=com_users&task=view',null,'<?php echo T_('Manage users') ?>'],
 <?php
 				}
 ?>			],
 <?php
 	// Menu Sub-Menu
 ?>			_cmSplit,
-			[null,'Menu',null,null,'Menu Management',
+			[null,'<?php echo T_('Menu') ?>',null,null,'<?php echo T_('Menu Management') ?>',
 <?php
 			if ($manageMenuMan) {
-?>				['<img src="../includes/js/ThemeOffice/menus.png" />','Menu Manager','index2.php?option=com_menumanager',null,'Menu Manager'],
+?>				['<img src="../includes/js/ThemeOffice/menus.png" />','<?php echo T_('Menu Manager') ?>','index2.php?option=com_menumanager',null,'<?php echo T_('Menu Manager') ?>'],
 				_cmSplit,
 <?php
 			}
@@ -134,23 +128,23 @@
 			_cmSplit,
 <?php
 	// Content Sub-Menu
-?>			[null,'Content',null,null,'Content Management',
+?>			[null,'<?php echo T_('Content') ?>',null,null,'<?php echo T_('Content Management') ?>',
 <?php
 			if (count($sections) > 0) {
-?>				['<img src="../includes/js/ThemeOffice/edit.png" />','Content by Section',null,null,'Content Managers',
+?>				['<img src="../includes/js/ThemeOffice/edit.png" />','<?php echo T_('Content by Section') ?>',null,null,'<?php echo T_('Content Managers') ?>',
 <?php
 				foreach ($sections as $section) {
 					$txt = addslashes( $section->title ? $section->title : $section->name );
 ?>					['<img src="../includes/js/ThemeOffice/document.png" />','<?php echo $txt;?>', null, null,'<?php echo $txt;?>',
 <?php
 					if ($section->numcat) {
-?>						['<img src="../includes/js/ThemeOffice/edit.png" />', '<?php echo $txt;?> Items', 'index2.php?option=com_content&sectionid=<?php echo $section->id;?>',null,null],
+?>						['<img src="../includes/js/ThemeOffice/edit.png" />', '<?php echo $txt;?> <?php echo T_('Items') ?>', 'index2.php?option=com_content&sectionid=<?php echo $section->id;?>',null,null],
 <?php
 					}
-?>						['<img src="../includes/js/ThemeOffice/add_section.png" />', 'Add/Edit <?php echo $txt;?> Categories', 'index2.php?option=com_categories&section=<?php echo $section->id;?>',null, null],
+?>						['<img src="../includes/js/ThemeOffice/add_section.png" />', '<?php echo T_('Add/Edit') ?> <?php echo $txt;?> <?php echo T_('Categories') ?>', 'index2.php?option=com_categories&section=<?php echo $section->id;?>',null, null],
 <?php
 					if ($section->numarc) {
-?>						['<img src="../includes/js/ThemeOffice/backup.png" />', '<?php echo $txt;?> Archive', 'index2.php?option=com_content&task=showarchive&sectionid=<?php echo $section->id;?>',null,null],
+?>						['<img src="../includes/js/ThemeOffice/backup.png" />', '<?php echo $txt;?> <?php echo T_('Archive') ?>', 'index2.php?option=com_content&task=showarchive&sectionid=<?php echo $section->id;?>',null,null],
 <?php
 					}
 ?>					],
@@ -161,25 +155,25 @@
 <?php
 			}
 ?>
-				['<img src="../includes/js/ThemeOffice/edit.png" />','All Content Items','index2.php?option=com_content&sectionid=0',null,'Manage Content Items'],
-  				['<img src="../includes/js/ThemeOffice/edit.png" />','Static Content Manager','index2.php?option=com_typedcontent',null,'Manage Typed Content Items'],
+				['<img src="../includes/js/ThemeOffice/edit.png" />','<?php echo T_('All Content Items') ?>','index2.php?option=com_content&sectionid=0',null,'<?php echo T_('Manage Content Items') ?>'],
+  				['<img src="../includes/js/ThemeOffice/edit.png" />','<?php echo T_('Static Content Manager') ?>','index2.php?option=com_typedcontent',null,'<?php echo T_('Manage Typed Content Items') ?>'],
   				_cmSplit,
-  				['<img src="../includes/js/ThemeOffice/add_section.png" />','Section Manager','index2.php?option=com_sections&scope=content',null,'Manage Content Sections'],
+  				['<img src="../includes/js/ThemeOffice/add_section.png" />','<?php echo T_('Section Manager') ?>','index2.php?option=com_sections&scope=content',null,'<?php echo T_('Manage Content Sections') ?>'],
 <?php
 			if (count($sections) > 0) {
-?>				['<img src="../includes/js/ThemeOffice/add_section.png" />','Category Manager','index2.php?option=com_categories&section=content',null,'Manage Content Categories'],
+?>				['<img src="../includes/js/ThemeOffice/add_section.png" />','<?php echo T_('Category Manager') ?>','index2.php?option=com_categories&section=content',null,'<?php echo T_('Manage Content Categories') ?>'],
 <?php
 			}
 ?>				_cmSplit,
-  				['<img src="../includes/js/ThemeOffice/home.png" />','Frontpage Manager','index2.php?option=com_frontpage',null,'Manage Frontpage Items'],
-  				['<img src="../includes/js/ThemeOffice/edit.png" />','Archive Manager','index2.php?option=com_content&task=showarchive&sectionid=0',null,'Manage Archive Items'],
+  				['<img src="../includes/js/ThemeOffice/home.png" />','<?php echo T_('Frontpage Manager') ?>','index2.php?option=com_frontpage',null,'<?php echo T_('Manage Frontpage Items') ?>'],
+  				['<img src="../includes/js/ThemeOffice/edit.png" />','<?php echo T_('Archive Manager') ?>','index2.php?option=com_content&task=showarchive&sectionid=0',null,'<?php echo T_('Manage Archive Items') ?>'],
 			],
 <?php
 	// Components Sub-Menu
 	if ($installComponents) {
 ?>			_cmSplit,
-			[null,'Components',null,null,'Component Management',
-				['<img src="../includes/js/ThemeOffice/install.png" />','Install/Uninstall','index2.php?option=com_installer&element=component',null,'Install/Uninstall components'],
+			[null,'<?php echo T_('Components') ?>',null,null,'<?php echo T_('Component Management') ?>',
+				['<img src="../includes/js/ThemeOffice/install.png" />','<?php echo T_('Review/Uninstall') ?>','index2.php?option=com_installer&element=component',null,'<?php echo T_('Install/Uninstall components') ?>'],
   				_cmSplit,
 <?php
         $query = "SELECT * FROM #__components WHERE name <> 'frontpage' and name <> 'media manager' ORDER BY ordering,name"
@@ -223,7 +217,7 @@
             }
         }
         if ($topLevelLimit < $topLevelCount) {
-            echo "\t\t\t\t['<img src=\"../includes/js/ThemeOffice/sections.png\" />','More Components...','index2.php?option=com_admin&task=listcomponents',null,'More Components'],\n";
+            echo "\t\t\t\t['<img src=\"../includes/js/ThemeOffice/sections.png\" />','".T_('More Components...')."','index2.php?option=com_admin&task=listcomponents',null,'".T_('More Components')."'],\n";
         }
 ?>
 			],
@@ -231,16 +225,16 @@
 	// Modules Sub-Menu
 		if ($installModules | $editAllModules) {
 ?>			_cmSplit,
-			[null,'Modules',null,null,'Module Management',
+			[null,'<?php echo T_('Modules') ?>',null,null,'<?php echo T_('Module Management') ?>',
 <?php
 			if ($installModules) {
-?>				['<img src="../includes/js/ThemeOffice/install.png" />', 'Install/Uninstall', 'index2.php?option=com_installer&element=module', null, 'Install custom modules'],
+?>				['<img src="../includes/js/ThemeOffice/install.png" />', '<?php echo T_('Review/Uninstall') ?>', 'index2.php?option=com_installer&element=module', null, '<?php echo T_('Install custom modules') ?>'],
 				_cmSplit,
 <?php
 			}
 			if ($editAllModules) {
-?>				['<img src="../includes/js/ThemeOffice/module.png" />', 'Site Modules', "index2.php?option=com_modules", null, 'Manage Site modules'],
-				['<img src="../includes/js/ThemeOffice/module.png" />', 'Administrator Modules', "index2.php?option=com_modules&client=admin", null, 'Manage Administrator modules'],
+?>				['<img src="../includes/js/ThemeOffice/module.png" />', '<?php echo T_('Site Modules') ?>', "index2.php?option=com_modules", null, '<?php echo T_('Manage Site modules') ?>'],
+				['<img src="../includes/js/ThemeOffice/module.png" />', '<?php echo T_('Administrator Modules') ?>', "index2.php?option=com_modules&client=admin", null, '<?php echo T_('Manage Administrator modules') ?>'],
 <?php
 			}
 ?>			],
@@ -250,15 +244,15 @@
 	// Mambots Sub-Menu
 	if ($installMambots | $editAllMambots) {
 ?>			_cmSplit,
-			[null,'Mambots',null,null,'Mambot Management',
+			[null,'<?php echo T_('Mambots') ?>',null,null,'<?php echo T_('Mambot Management') ?>',
 <?php
 		if ($installMambots) {
-?>				['<img src="../includes/js/ThemeOffice/install.png" />', 'Install/Uninstall', 'index2.php?option=com_installer&element=mambot', null, 'Install custom mambot'],
+?>				['<img src="../includes/js/ThemeOffice/install.png" />', '<?php echo T_('Review/Uninstall') ?>', 'index2.php?option=com_installer&element=mambot', null, '<?php echo T_('Install custom mambot') ?>'],
 				_cmSplit,
 <?php
 		}
 		if ($editAllMambots) {
-?>				['<img src="../includes/js/ThemeOffice/module.png" />', 'Site Mambots', "index2.php?option=com_mambots", null, 'Manage Site Mambots'],
+?>				['<img src="../includes/js/ThemeOffice/module.png" />', '<?php echo T_('Site Mambots') ?>', "index2.php?option=com_mambots", null, '<?php echo T_('Manage Site Mambots') ?>'],
 <?php
 		}
 ?>			],
@@ -269,42 +263,32 @@
 	// Installer Sub-Menu
 	if ($installModules) {
 ?>			_cmSplit,
-			[null,'Installers',null,null,'Installer List',
-<?php
-		if ($manageTemplates) {
-?>				['<img src="../includes/js/ThemeOffice/install.png" />','Templates - Site','index2.php?option=com_installer&element=template&client=',null,'Install Site Templates'],
-				['<img src="../includes/js/ThemeOffice/install.png" />','Templates - Admin','index2.php?option=com_installer&element=template&client=admin',null,'Install Administrator Templates'],
-<?php
-		}
-		if ($manageLanguages) {
-?>				['<img src="../includes/js/ThemeOffice/install.png" />','Languages','index2.php?option=com_installer&element=language',null,'Install Languages'],
-				_cmSplit,
-<?php
-		}
-?>				['<img src="../includes/js/ThemeOffice/install.png" />', 'Components','index2.php?option=com_installer&element=component',null,'Install/Uninstall Components'],
-				['<img src="../includes/js/ThemeOffice/install.png" />', 'Modules', 'index2.php?option=com_installer&element=module', null, 'Install/Uninstall Modules'],
-				['<img src="../includes/js/ThemeOffice/install.png" />', 'Mambots', 'index2.php?option=com_installer&element=mambot', null, 'Install/Uninstall Mambots'],
+			[null,'<?php echo T_('Installers') ?>',null,null,'<?php echo T_('Installer List') ?>',
+				['<img src="../includes/js/ThemeOffice/install.png" />','<?php echo T_('Universal') ?>','index2.php?option=com_installer&element=universal&client=admin',null,'<?php echo T_('Install Any Plugin') ?>'],
+				<?php if (ini_get('allow_url_fopen')) { ?>
+				['<img src="../includes/js/ThemeOffice/install.png" />','<?php echo T_('The Source') ?>','index2.php?option=com_installer&task=thesource&element=universal&client=admin',null,'<?php echo T_('Install from The Source') ?>'],
+				<?php } ?>
 			],
 <?php
 	} // if ($installModules)
 	// Messages Sub-Menu
 	if ($canConfig) {
 ?>			_cmSplit,
-  			[null,'Messages',null,null,'Messaging Management',
-  				['<img src="../includes/js/ThemeOffice/messaging_inbox.png" />','Inbox','index2.php?option=com_messages',null,'Private Messages'],
-  				['<img src="../includes/js/ThemeOffice/messaging_config.png" />','Configuration','index2.php?option=com_messages&task=config&hidemainmenu=1',null,'Configuration']
+  			[null,'<?php echo T_('Messages') ?>',null,null,'<?php echo T_('Messaging Management') ?>',
+  				['<img src="../includes/js/ThemeOffice/messaging_inbox.png" />','<?php echo T_('Inbox') ?>','index2.php?option=com_messages',null,'<?php echo T_('Private Messages') ?>'],
+  				['<img src="../includes/js/ThemeOffice/messaging_config.png" />','<?php echo T_('Configuration') ?>','index2.php?option=com_messages&task=config&hidemainmenu=1',null,'<?php echo T_('Configuration') ?>']
   			],
 <?php
 	// System Sub-Menu
 ?>			_cmSplit,
-  			[null,'System',null,null,'System Management',
+  			[null,'<?php echo T_('System') ?>',null,null,'<?php echo T_('System Management') ?>',
 <?php
   		if ($canConfig) {
-?>				['<img src="../includes/js/ThemeOffice/checkin.png" />', 'Global Checkin', 'index2.php?option=com_checkin', null,'Check-in all checked-out items'],
-				['<img src="../includes/js/ThemeOffice/sysinfo.png" />', 'System Information', 'index2.php?option=com_admin&task=sysinfo', null, 'View System Information'],
+?>				['<img src="../includes/js/ThemeOffice/checkin.png" />', '<?php echo T_('Global Checkin') ?>', 'index2.php?option=com_checkin', null,'<?php echo T_('Check-in all checked-out items') ?>'],
+				['<img src="../includes/js/ThemeOffice/sysinfo.png" />', '<?php echo T_('System Information') ?>', 'index2.php?option=com_admin&task=sysinfo', null, '<?php echo T_('View System Information') ?>'],
 <?php
 			if ($mosConfig_caching) {
-?>				['<img src="../includes/js/ThemeOffice/config.png" />','Clean Cache','index2.php?option=com_content&task=clean_cache',null,'Clean the content items cache'],
+?>				['<img src="../includes/js/ThemeOffice/config.png" />','<?php echo T_('Clean Cache') ?>','index2.php?option=com_content&task=clean_cache',null,'<?php echo T_('Clean the content items cache') ?>'],
 <?php
 			}
 		}
@@ -314,7 +298,7 @@
 ?>			_cmSplit,
 <?php
 	// Help Sub-Menu
-?>			[null,'Help','index2.php?option=com_admin&task=help',null,null]
+?>			[null,'<?php echo T_('Help') ?>','index2.php?option=com_admin&task=help',null,null]
 		];
 		cmDraw ('myMenuID', myMenu, 'hbr', cmThemeOffice, 'ThemeOffice');
 		</script>
@@ -325,4 +309,4 @@
 
 mosFullAdminMenu::show( $my->usertype );
 //$cache->call( 'mosFullAdminMenu::show', $my->usertype );
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/administrator/modules/mod_latest.php 4.6rc2/administrator/modules/mod_latest.php
--- 4.5.4/administrator/modules/mod_latest.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_latest.php	2006-04-26 16:31:58.000000000 -0500
@@ -1,69 +1,80 @@
-<?php
-/**
-* @version $Id: mod_latest.php,v 1.1 2005/07/22 01:53:57 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$query = "SELECT a.id, a.sectionid, a.title, a.created, u.name, a.created_by_alias, a.created_by"
-. "\n FROM #__content AS a"
-. "\n LEFT JOIN #__users AS u ON u.id=a.created_by"
-. "\n WHERE a.state <> '-2'"
-. "\n ORDER BY created DESC"
-. "\n LIMIT 10"
-;
-$database->setQuery( $query );
-$rows = $database->loadObjectList();
-?>
-
-<table class="adminlist">
-<tr>
-    <th colspan="3">
-	Most Recently Added Content
-	</th>
-</tr>
-<?php
-foreach ($rows as $row) {
-	if ( $row->sectionid == 0 ) {
-		$link = 'index2.php?option=com_typedcontent&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
-	} else {
-		$link = 'index2.php?option=com_content&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
-	}
-
-	if ( $acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_users' ) ) {
-		if ( $row->created_by_alias ) {
-			$author = $row->created_by_alias;
-		} else {
-			$linkA 	= 'index2.php?option=com_users&task=editA&amp;hidemainmenu=1&id='. $row->created_by;
-			$author = '<a href="'. $linkA .'" title="Edit User">'. htmlspecialchars( $row->name, ENT_QUOTES ) .'</a>';
-		}
-	} else {
-		if ( $row->created_by_alias ) {
-			$author = $row->created_by_alias;
-		} else {
-			$author = htmlspecialchars( $row->name, ENT_QUOTES );
-		}
-	}
-	?>
-	<tr>
-		<td>
-		<a href="<?php echo $link; ?>"">
-		<?php echo htmlspecialchars($row->title, ENT_QUOTES);?>
-		</a>
-		</td>
-		<td>
-		<?php echo $row->created;?>
-		</td>
-		<td>
-		<?php echo $author;?>
-		</td>
-	</tr>
-	<?php
-}
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$query = "SELECT a.id, a.sectionid, a.title, a.created, u.name, a.created_by_alias, a.created_by"
+. "\n FROM #__content AS a"
+. "\n LEFT JOIN #__users AS u ON u.id=a.created_by"
+. "\n WHERE a.state <> '-2'"
+. "\n ORDER BY created DESC"
+. "\n LIMIT 10"
+;
+$database->setQuery( $query );
+$rows = $database->loadObjectList();
+?>
+
+<table class="adminlist">
+<tr>
+    <th colspan="3">
+	<?php echo T_('Most Recently Added Content'); ?>
+	</th>
+</tr>
+<?php
+
+if ($rows) {
+	foreach ($rows as $row) {
+		if ( $row->sectionid == 0 ) {
+			$link = 'index2.php?option=com_typedcontent&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
+		} else {
+			$link = 'index2.php?option=com_content&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
+		}
+
+		if ( $acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_users' ) ) {
+			if ( $row->created_by_alias ) {
+				$author = $row->created_by_alias;
+			} else {
+				$linkA 	= 'index2.php?option=com_users&task=editA&amp;hidemainmenu=1&id='. $row->created_by;
+				$author = '<a href="'. $linkA .'" title="'.T_('Edit User') .'">'. htmlspecialchars( $row->name, ENT_QUOTES ) .'</a>';
+			}
+		} else {
+			if ( $row->created_by_alias ) {
+				$author = $row->created_by_alias;
+			} else {
+				$author = htmlspecialchars( $row->name, ENT_QUOTES );
+			}
+		}
+		?>
+		<tr>
+			<td>
+			<a href="<?php echo $link; ?>">
+			<?php echo htmlspecialchars($row->title, ENT_QUOTES);?>
+			</a>
+			</td>
+			<td>
+			<?php echo $row->created;?>
+			</td>
+			<td>
+			<?php echo $author;?>
+			</td>
+		</tr>
+		<?php
+	}	
+} else {
+	?>
+	<tr>
+		<td colspan="3">Nothing to show</td>
+	</tr>
+	<?php
+}
+?>
 </table>
\ No newline at end of file
diff -ruN 4.5.4/administrator/modules/mod_latest.xml 4.6rc2/administrator/modules/mod_latest.xml
--- 4.5.4/administrator/modules/mod_latest.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_latest.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Latest News</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows a list of the most recently published Items that are still current (some may have expired even though they are the most recent). Items that are displayed on the Front Page Component are not included in the list.</description>
 	<files>
diff -ruN 4.5.4/administrator/modules/mod_logged.php 4.6rc2/administrator/modules/mod_logged.php
--- 4.5.4/administrator/modules/mod_logged.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_logged.php	2006-02-22 07:31:46.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_logged.php,v 1.2 2005/07/22 03:30:09 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -18,20 +20,20 @@
 $limitstart 	= $mainframe->getUserStateFromRequest( "view{$option}", 'limitstart', 0 );
 
 // hides Administrator or Super Administrator from list depending on usertype
-$and = '';
+$_and = '';
 if ( $my->gid == 24 ) {
-	$and = "\n AND userid != '25'";
+	$_and = "\n AND userid != '25'";
 }
 if ( $my->gid == 23 ) {
-	$and = "\n AND userid != '25'";
-	$and .= "\n AND userid != '24'";
+	$_and = "\n AND userid != '25'";
+	$_and .= "\n AND userid != '24'";
 }
 
 // get the total number of records
 $query = "SELECT COUNT(*)"
 . "\n FROM #__session"
 . "\n WHERE userid != 0"
-. $and
+. $_and
 . "\n ORDER BY usertype, username"
 ;
 $database->setQuery( $query );
@@ -43,7 +45,7 @@
 $query = "SELECT *"
 . "\n FROM #__session"
 . "\n WHERE userid != 0"
-. $and
+. $_and
 . "\n ORDER BY usertype, username"
 . "\n LIMIT $pageNav->limitstart, $pageNav->limit"
 ;
@@ -53,7 +55,7 @@
 <table class="adminlist">
 <tr>
     <th colspan="4">
-	Currently Logged in Users
+	<?php echo T_('Currently Logged in Users') ?>
 	</th>
 </tr>
 <?php
@@ -61,7 +63,7 @@
 foreach ( $rows as $row ) {
 	if ( $acl->acl_check( 'administration', 'manage', 'users', $my->usertype, 'components', 'com_users' ) ) {
 		$link 	= 'index2.php?option=com_users&task=editA&hidemainmenu=1&id='. $row->userid;
-		$name 	= '<a href="'. $link .'" title="Edit User">'. $row->username .'</a>';
+		$name 	= '<a href="'. $link .'" title="'._('Edit User').'">'. $row->username .'</a>';
 	} else {
 		$name 	= $row->username;
 	}
@@ -81,7 +83,7 @@
 			?>
 			<td>
 			<a href="index2.php?option=com_users&task=flogout&id=<?php echo $row->userid; ?>">
-			<img src="images/publish_x.png" width="12" height="12" border="0" alt="Logout" Title="Force Logout User" />
+			<img src="images/publish_x.png" width="12" height="12" border="0" alt="<?php echo T_('Logout') ?>" Title="<?php echo T_('Force Logout User') ?>" />
 			</a>		
 			</td>
 			<?php
diff -ruN 4.5.4/administrator/modules/mod_logged.xml 4.6rc2/administrator/modules/mod_logged.xml
--- 4.5.4/administrator/modules/mod_logged.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_logged.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Logged in Users</name>
 	<author>Mambo Project</author>
 	<creationDate>January 2005</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows a list of the currently logged in users</description>
 	<files>
diff -ruN 4.5.4/administrator/modules/mod_mosmsg.php 4.6rc2/administrator/modules/mod_mosmsg.php
--- 4.5.4/administrator/modules/mod_mosmsg.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_mosmsg.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_mosmsg.php,v 1.1 2005/07/22 01:53:59 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/modules/mod_online.php 4.6rc2/administrator/modules/mod_online.php
--- 4.5.4/administrator/modules/mod_online.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_online.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_online.php,v 1.1 2005/07/22 01:53:59 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -19,5 +21,5 @@
 $database->setQuery($query);
 $online_num = intval( $database->loadResult() );
 
-echo $online_num . " <img src=\"images/users.png\" align=\"middle\" alt=\"Users Online\" />";
+echo $online_num . " <img src=\"images/users.png\" align=\"middle\" alt=\"".T_('Users Online') ."\" />";
 ?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/modules/mod_pathway.php 4.6rc2/administrator/modules/mod_pathway.php
--- 4.5.4/administrator/modules/mod_pathway.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_pathway.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_pathway.php,v 1.1 2005/07/22 01:53:59 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/modules/mod_popular.php 4.6rc2/administrator/modules/mod_popular.php
--- 4.5.4/administrator/modules/mod_popular.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_popular.php	2006-04-26 16:31:58.000000000 -0500
@@ -1,60 +1,70 @@
-<?php
-/**
-* @version $Id: mod_popular.php,v 1.1 2005/07/22 01:53:59 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$query = "SELECT a.hits, a.id, a.sectionid, a.title, a.created, u.name"
-. "\n FROM #__content AS a"
-. "\n LEFT JOIN #__users AS u ON u.id=a.created_by"
-. "\n WHERE a.state <> '-2'"
-. "\n ORDER BY hits DESC"
-. "\n LIMIT 10"
-;
-$database->setQuery( $query );
-$rows = $database->loadObjectList();
-?>
-
-<table class="adminlist">
-<tr>
-	<th class="title">
-	Most Popular Items
-	</th>
-	<th class="title">
-	Created
-	</th>
-	<th class="title">
-	Hits
-	</th>
-</tr>
-<?php
-foreach ($rows as $row) {
-	if ( $row->sectionid == 0 ) {
-		$link = 'index2.php?option=com_typedcontent&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
-	} else {
-		$link = 'index2.php?option=com_content&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
-	}
-	?>
-	<tr>
-		<td>
-		<a href="<?php echo $link; ?>"">
-		<?php echo htmlspecialchars($row->title, ENT_QUOTES);?>
-		</a>
-		</td>
-		<td>
-		<?php echo $row->created;?>
-		</td>
-		<td>
-		<?php echo $row->hits;?>
-		</td>
-	</tr>
-	<?php
-}
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$query = "SELECT a.hits, a.id, a.sectionid, a.title, a.created, u.name"
+. "\n FROM #__content AS a"
+. "\n LEFT JOIN #__users AS u ON u.id=a.created_by"
+. "\n WHERE a.state <> '-2'"
+. "\n ORDER BY hits DESC"
+. "\n LIMIT 10"
+;
+$database->setQuery( $query );
+$rows = $database->loadObjectList();
+?>
+
+<table class="adminlist">
+<tr>
+	<th class="title">
+	<?php echo T_('Most Popular Items'); ?>
+	</th>
+	<th class="title">
+	<?php echo T_('Created'); ?>
+	</th>
+	<th class="title">
+	<?php echo T_('Hits'); ?>
+	</th>
+</tr>
+<?php
+if ($rows) {
+	foreach ($rows as $row) {
+		if ( $row->sectionid == 0 ) {
+			$link = 'index2.php?option=com_typedcontent&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
+		} else {
+			$link = 'index2.php?option=com_content&amp;task=edit&amp;hidemainmenu=1&amp;id='. $row->id;
+		}
+		?>
+		<tr>
+			<td>
+			<a href="<?php echo $link; ?>">
+			<?php echo htmlspecialchars($row->title, ENT_QUOTES);?>
+			</a>
+			</td>
+			<td>
+			<?php echo $row->created;?>
+			</td>
+			<td>
+			<?php echo $row->hits;?>
+			</td>
+		</tr>
+		<?php
+	}	
+} else {
+	?>
+	<tr>
+		<td colspan="3">Nothing to show</td>
+	</tr>
+	<?php
+}
+?>
 </table>
\ No newline at end of file
diff -ruN 4.5.4/administrator/modules/mod_popular.xml 4.6rc2/administrator/modules/mod_popular.xml
--- 4.5.4/administrator/modules/mod_popular.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_popular.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Popular Items</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows a list of the popular published Items that are still current (some may have expired even though they are the most recent). Items that are displayed on the Front Page Component are not included in the list.</description>
 	<files>
diff -ruN 4.5.4/administrator/modules/mod_quickicon.php 4.6rc2/administrator/modules/mod_quickicon.php
--- 4.5.4/administrator/modules/mod_quickicon.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_quickicon.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_quickicon.php,v 1.2 2005/10/20 01:08:31 cfraser Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -18,28 +20,28 @@
 	<a href="index2.php?option=com_admin&amp;task=help" style="text-decoration:none;">
 	<img src="images/support.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Help
+	<?php echo T_('Help') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
 	<a href="index2.php?option=com_content&amp;sectionid=0" style="text-decoration:none;">
 	<img src="images/addedit.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	All Content Items
+	<?php echo T_('All Content Items') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
 	<a href="index2.php?option=com_typedcontent" style="text-decoration:none;">
 	<img src="images/addedit.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Static Content
+	<?php echo T_('Static Content') ?>
 	</a>
 	</td>
 	<td>
 	<a href="index2.php?option=com_frontpage" style="text-decoration:none;">
 	<img src="images/frontpage.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Frontpage
+	<?php echo T_('Frontpage') ?>
 	</a>
 	</td>
 </tr>
@@ -48,21 +50,21 @@
 	<a href="index2.php?option=com_sections&amp;scope=content" style="text-decoration:none;">
 	<img src="images/sections.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Sections
+	<?php echo T_('Sections') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
 	<a href="index2.php?option=com_categories&amp;section=content" style="text-decoration:none;">
 	<img src="images/categories.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Categories
+	<?php echo T_('Categories') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
 	<a href="index2.php?option=com_media" style="text-decoration:none;">
 	<img src="images/mediamanager.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Media
+	<?php echo T_('Media') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
@@ -76,7 +78,7 @@
 	<a href="index2.php?option=com_trash" style="text-decoration:none;">
 	<img src="images/trash.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Trash
+	<?php echo T_('Trash') ?>
 	</a>
 	</td>
 	<td>
@@ -86,7 +88,7 @@
 		<a href="index2.php?option=com_menumanager" style="text-decoration:none;">
 		<img src="images/menu.png" width="48" height="48" align="middle" border="0"/>
 		<br />
-		Menus
+		<?php echo T_('Menus') ?>
 		</a>
 		<?php
 	}
@@ -99,7 +101,7 @@
 		<a href="index2.php?option=com_users" style="text-decoration:none;">
 		<img src="images/user.png" width="48" height="48" align="middle" border="0"/>
 		<br />
-		Users
+		<?php echo T_('Users') ?>
 		</a>
 		<?php
 	}
@@ -112,7 +114,7 @@
 		<a href="index2.php?option=com_config&amp;hidemainmenu=1" style="text-decoration:none;">
 		<img src="images/config.png" width="48" height="48" align="middle" border="0"/>
 		<br />
-		Global Configuration
+		<?php echo T_('Global Configuration') ?>
 		</a>
 		<?php
 	}
@@ -127,21 +129,21 @@
 	<a href="index2.php?option=com_admin&amp;task=help" style="text-decoration:none;">
 	<img src="images/support.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Help
+	<?php echo T_('Help') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
 	<a href="index2.php?option=com_content&amp;sectionid=0" style="text-decoration:none;">
 	<img src="images/addedit.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	All Content Items
+	<?php echo T_('All Content Items') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
 	<a href="index2.php?option=com_typedcontent" style="text-decoration:none;">
 	<img src="images/addedit.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Static Content
+	<?php echo T_('Static Content') ?>
 	</a>
 	</td>
 	
@@ -149,7 +151,7 @@
 	<a href="index2.php?option=com_frontpage" style="text-decoration:none;">
 	<img src="images/frontpage.png" width="48" height="48" align="middle" border="0"/>
 	<br />
-	Frontpage
+	<?php echo T_('Frontpage') ?>
 	</a>
 	</td>
 	<td align="center" style="height:100px">
diff -ruN 4.5.4/administrator/modules/mod_stats.php 4.6rc2/administrator/modules/mod_stats.php
--- 4.5.4/administrator/modules/mod_stats.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_stats.php	2006-03-22 12:41:29.000000000 -0600
@@ -1,47 +1,45 @@
 <?php
 /**
-* @version $Id: mod_stats.php,v 1.1 2005/07/22 01:53:59 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-$query = "SELECT menutype, COUNT(id) AS numitems"
-. "\n FROM #__menu"
-. "\n WHERE published = 1"
-. "\n GROUP BY menutype"
-;
-$database->setQuery( $query );
-$rows = $database->loadObjectList();
+$menuhandler = mosMenuHandler::getInstance();
+$menutypes = $menuhandler->getMenuTypes();
+
 ?>
 <table class="adminlist">
 	<tr>
 		<th class="title">
-		Menu
+		<?php echo T_('Menu') ?>
 		</th>
 		<th class="title">
-		# Items
+		<?php echo T_('# Items') ?>
 		</th>
 	</tr>
 <?php
-foreach ($rows as $row) {
-	$link = 'index2.php?option=com_menus&amp;menutype='. $row->menutype;
+foreach ($menutypes as $type=>$count) {
+	$link = 'index2.php?option=com_menus&amp;menutype='. $type;
 	?>
 	<tr>
 		<td>
 		<a href="<?php echo $link; ?>">
-		<?php echo $row->menutype;?>
+		<?php echo $type;?>
 		</a>
 		</td>
 		<td>
-		<?php echo $row->numitems;?>
+		<?php echo $count;?>
 		</td>
 	</tr>
 <?php
 }
 ?>
-</table>
\ No newline at end of file
+</table>
diff -ruN 4.5.4/administrator/modules/mod_stats.xml 4.6rc2/administrator/modules/mod_stats.xml
--- 4.5.4/administrator/modules/mod_stats.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_stats.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Popular Items</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows stats of Items that are still current (some may have expired even though they are the most recent). Items that are displayed on the Front Page Component are not included in the list.</description>
 	<files>
diff -ruN 4.5.4/administrator/modules/mod_toolbar.php 4.6rc2/administrator/modules/mod_toolbar.php
--- 4.5.4/administrator/modules/mod_toolbar.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_toolbar.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_toolbar.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/modules/mod_unread.php 4.6rc2/administrator/modules/mod_unread.php
--- 4.5.4/administrator/modules/mod_unread.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/modules/mod_unread.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_unread.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,8 +16,8 @@
 $unread = $database->loadResult();
 
 if ($unread) {
-	echo "<a href=\"index2.php?option=com_messages\" style=\"color: red; text-decoration: none;  font-weight: bold\">$unread <img src=\"images/mail.png\" align=\"middle\" border=\"0\" alt=\"Mail\" /></a>";
+	echo "<a href=\"index2.php?option=com_messages\" style=\"color: red; text-decoration: none;  font-weight: bold\">$unread <img src=\"images/mail.png\" align=\"middle\" border=\"0\" alt=\"".T_('Mail')."\" /></a>";
 } else {
-    echo "<a href=\"index2.php?option=com_messages\" style=\"color: black; text-decoration: none;\">$unread <img src=\"images/nomail.png\" align=\"middle\" border=\"0\" alt=\"Mail\" /></a>";
+    echo "<a href=\"index2.php?option=com_messages\" style=\"color: black; text-decoration: none;\">$unread <img src=\"images/nomail.png\" align=\"middle\" border=\"0\" alt=\"".T_('Mail')."\" /></a>";
 }
 ?>
\ No newline at end of file
diff -ruN 4.5.4/administrator/popups/contentwindow.php 4.6rc2/administrator/popups/contentwindow.php
--- 4.5.4/administrator/popups/contentwindow.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/popups/contentwindow.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,17 +1,16 @@
 <?php
 /**
-* @version $Id: contentwindow.php,v 1.1 2005/07/22 03:19:43 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-
-require_once( '../includes/auth.php' );
-include_once ( $mosConfig_absolute_path . '/language/' . $mosConfig_lang . '.php' );
+//$adminside = 3;
+//require_once('../../index.php');
 
 $css = mosGetParam( $_REQUEST, 't', '' );
 
@@ -22,7 +21,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Content Preview</title>
+<title><?php echo T_('Content Preview') ?></title>
 <link rel="stylesheet" href="../../templates/<?php echo $css;?>/css/template_css.css" type="text/css" />
 	<script>
 		var form = window.opener.document.adminForm
@@ -60,8 +59,8 @@
 		<script>document.write("<td valign=\"top\" height=\"90%\" colspan=\"2\">" + alltext + "</td>");</script>
 	</tr>
 	<tr>
-		<td align="right"><a href="#" onClick="window.close()">Close</a></td>
-		<td align="left"><a href="javascript:;" onClick="window.print(); return false">Print</a></td>
+		<td align="right"><a href="#" onClick="window.close()"><?php echo T_('Close') ?></a></td>
+		<td align="left"><a href="javascript:;" onClick="window.print(); return false"><?php echo T_('Print') ?></a></td>
 	</tr>
 </table>
 </body>
diff -ruN 4.5.4/administrator/popups/index3pop.php 4.6rc2/administrator/popups/index3pop.php
--- 4.5.4/administrator/popups/index3pop.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/administrator/popups/index3pop.php	2006-01-26 05:51:01.000000000 -0600
@@ -0,0 +1,34 @@
+<?php echo "<?xml version=\"1.0\"?>"; ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php echo $mosConfig_sitename; ?> - Administration [Mambo]</title>
+<link rel="stylesheet" href="templates/<?php echo $mainframe->getTemplate(); ?>/css/template_css.css" type="text/css">
+<link rel="stylesheet" href="templates/<?php echo $mainframe->getTemplate(); ?>/css/theme.css" type="text/css">
+<script language="JavaScript" src="../includes/js/JSCookMenu.js" type="text/javascript"></script>
+<script language="JavaScript" src="includes/js/ThemeOffice/theme.js" type="text/javascript"></script>
+<script language="JavaScript" src="../includes/js/mambojavascript.js" type="text/javascript"></script>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+</head>
+<body>
+<?php
+$mosmsg = strip_tags(mosGetParam($_REQUEST, 'mosmsg', ''));
+if ($mosmsg) {
+	if (!get_magic_quotes_gpc()) {
+		$mosmsg = addslashes( $mosmsg );
+	}
+	echo "\n<script language=\"javascript\" type=\"text/javascript\">alert('$mosmsg');</script>";
+}
+
+// Show list of items to edit or delete or create new
+if ($path = $mainframe->getPath( 'admin' )) {
+	require $path;
+} else {
+	?>
+      <img src="images/logo.png" border="0" alt="Mambo Logo" />&nbsp; <br />
+      <?php
+}
+?>
+
+</body>
+</html>
diff -ruN 4.5.4/administrator/popups/modulewindow.php 4.6rc2/administrator/popups/modulewindow.php
--- 4.5.4/administrator/popups/modulewindow.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/popups/modulewindow.php	2006-03-19 04:22:44.000000000 -0600
@@ -1,35 +1,18 @@
 <?php
 /**
-* @version $Id: modulewindow.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
+//$adminside = 3;
+//require_once('../../index.php');
 
-require_once( '../includes/auth.php' );
-include_once ( $mosConfig_absolute_path . '/language/' . $mosConfig_lang . '.php' );
-
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
-
-$title = mosGetParam( $_REQUEST, 'title', 0 );
 $css = mosGetParam( $_REQUEST, 't', '');
-$database->setQuery( "SELECT * FROM #__modules WHERE title='$title'" );
-$row = null;
-$database->loadObject( $row );
-
-$pat= "src=images";
-$replace= "src=../../images";
-$pat2="\\\\'";
-$replace2="'";
-$content=eregi_replace($pat, $replace, $row->content);
-$content=eregi_replace($pat2, $replace2, $row->content);
-$title=eregi_replace($pat2, $replace2, $row->title);
-
 $iso = split( '=', _ISO );
 // xml prolog
 echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
@@ -37,7 +20,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Module Preview</title>
+	<title><?php echo T_('Module Preview') ?></title>
 	<link rel="stylesheet" href="../../templates/<?php echo $css; ?>/css/template_css.css" type="text/css">
 	<script>
 		var content = window.opener.document.adminForm.content.value;
@@ -65,7 +48,7 @@
 	    <td valign="top" height="90%"><script>document.write(content);</script></td>
 	</tr>
 	<tr>
-	    <td align="center"><a href="#" onClick="window.close()">Close</a></td>
+	    <td align="center"><a href="#" onClick="window.close()"><?php echo T_('Close') ?></a></td>
 	</tr>
 </table>
 </body>
diff -ruN 4.5.4/administrator/popups/pollwindow.php 4.6rc2/administrator/popups/pollwindow.php
--- 4.5.4/administrator/popups/pollwindow.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/popups/pollwindow.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,19 +1,16 @@
 <?php
 /**
-* @version $Id: pollwindow.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-
-require_once("../includes/auth.php");
-
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
+//$adminside = 3;
+//require_once('../../index.php');
 
 $pollid = mosGetParam( $_REQUEST, 'pollid', 0 );
 $css = mosGetParam( $_REQUEST, 't', '' );
@@ -27,7 +24,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-	<title>Poll Preview</title>
+	<title><?php echo T_('Poll Preview') ?></title>
 	<link rel="stylesheet" href="../../templates/<?php echo $css; ?>/css/template_css.css" type="text/css">
 </head>
 
@@ -48,10 +45,10 @@
 		<?php }
 	} ?>
 	<tr>
-	    <td valign="middle" height="50" colspan="2" align="center"><input type="button" name="submit" value="Vote">&nbsp;&nbsp;<input type="button" name="result" value="Results"></td>
+	    <td valign="middle" height="50" colspan="2" align="center"><input type="button" name="submit" value="<?php echo T_('Vote') ?>">&nbsp;&nbsp;<input type="button" name="result" value="<?php echo T_('Results') ?>"></td>
 	</tr>
 	<tr>
-	    <td align="center" colspan="2"><a href="#" onClick="window.close()">Close</a></td>
+	    <td align="center" colspan="2"><a href="#" onClick="window.close()"><?php echo T_('Close') ?></a></td>
 	</tr>
 </table>
 </form>
diff -ruN 4.5.4/administrator/popups/uploadimage.php 4.6rc2/administrator/popups/uploadimage.php
--- 4.5.4/administrator/popups/uploadimage.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/popups/uploadimage.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,17 +1,16 @@
 <?php
 /**
-* @version $Id: uploadimage.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-/** security check */
-require( "../includes/auth.php" );
-include_once ( $mosConfig_absolute_path . '/language/' . $mosConfig_lang . '.php' );
+//$adminside = 3;
+//require_once('../../index.php');
 
 $directory = mosGetParam( $_REQUEST, 'directory', '');
 
@@ -20,47 +19,47 @@
 
 if (isset($_FILES['userfile'])) {
 	if ($directory!="banners") {
-		$base_Dir = "../../images/stories/";
+		$base_Dir = "../images/stories/";
 	} else {
-		$base_Dir = "../../images/banners/";
+		$base_Dir = "../images/banners/";
 	}
 	if (empty($userfile_name)) {
-		echo "<script>alert('Please select an image to upload'); document.location.href='uploadimage.php';</script>";
+		echo "<script>alert('".T_('Please select an image to upload') ."'); document.location.href='uploadimage.php';</script>";
 	}
 
 	$filename = split("\.", $userfile_name);
 
 	if (eregi("[^0-9a-zA-Z_]", $filename[0])) {
-		echo "<script> alert('File must only contain alphanumeric characters and no spaces please.'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".T_('File must only contain alphanumeric characters and no spaces please.') ."'); window.history.go(-1);</script>\n";
 		exit();
 	}
 
 	if (file_exists($base_Dir.$userfile_name)) {
-		echo "<script> alert('Image $userfile_name already exists.'); window.history.go(-1);</script>\n";
+		echo "<script> alert('".sprintf(T_('Image %s already exists.'),$userfile_name) ."'); window.history.go(-1);</script>\n";
 		exit();
 	}
 
 	if ((strcasecmp(substr($userfile_name,-4),".gif")) && (strcasecmp(substr($userfile_name,-4),".jpg")) && (strcasecmp(substr($userfile_name,-4),".png")) && (strcasecmp(substr($userfile_name,-4),".bmp")) &&(strcasecmp(substr($userfile_name,-4),".doc")) && (strcasecmp(substr($userfile_name,-4),".xls")) && (strcasecmp(substr($userfile_name,-4),".ppt")) && (strcasecmp(substr($userfile_name,-4),".swf")) && (strcasecmp(substr($userfile_name,-4),".pdf"))) {
-		echo "<script>alert('The file must be gif, png, jpg, bmp, swf, doc, xls or ppt'); window.history.go(-1);</script>\n";
+		echo "<script>alert('".T_('The file must be gif, png, jpg, bmp, swf, doc, xls or ppt') ."'); window.history.go(-1);</script>\n";
 		exit();
 	}
 
 
 	if (eregi(".pdf", $userfile_name) || eregi(".doc", $userfile_name) || eregi(".xls", $userfile_name) || eregi(".ppt", $userfile_name)) {
 		if (!move_uploaded_file ($_FILES['userfile']['tmp_name'],$media_path.$_FILES['userfile']['name']) || !mosChmod($media_path.$_FILES['userfile']['name'])) {
-			echo "<script>alert('Upload of $userfile_name failed'); window.history.go(-1);</script>\n";
+			echo "<script>alert('".sprintf(T_('Upload of %s failed'), $userfile_name) ."'); window.history.go(-1);</script>\n";
 			exit();
 		}
 		else {
-			echo "<script>alert('Upload of $userfile_name to $media_path successful'); window.history.go(-1);</script>\n";
+			echo "<script>alert('".sprintf(T_('Upload of %s to %s successful'), $userfile_name, $media_path) ."'); window.history.go(-1);</script>\n";
 			exit();
 		}
 	} elseif (!move_uploaded_file ($_FILES['userfile']['tmp_name'],$base_Dir.$_FILES['userfile']['name']) || !mosChmod($base_Dir.$_FILES['userfile']['name'])) {
-		echo "<script>alert('Upload of $userfile_name failed'); window.history.go(-1);</script>\n";
+		echo "<script>alert('".sprintf(T_('Upload of %s failed'), $userfile_name) ."'); window.history.go(-1);</script>\n";
 		exit();
 	}
 	else {
-		echo "<script>alert('Upload of $userfile_name to $base_Dir successful'); window.history.go(-1);</script>\n";
+		echo "<script>alert('".sprintf(T_('Upload of %s to %s successful'), $userfile_name, $base_Dir) ."'); window.history.go(-1);</script>\n";
 		exit();
 	}
 
@@ -82,9 +81,9 @@
 ?>
 <link rel="stylesheet" href="../templates/<?php echo $css; ?>/css/template_css.css" type="text/css" />
 <table class="adminform">
-  <form method="post" action="uploadimage.php" enctype="multipart/form-data" name="filename">
+  <form method="post" action="index3.php?pop=uploadimage.php" enctype="multipart/form-data" name="filename">
     <tr>
-      <th class="title"> File Upload : <?php echo $directory; ?></th>
+      <th class="title"> <?php echo T_('File Upload :') ?> <?php echo $directory; ?></th>
     </tr>
     <tr>
       <td align="center">
@@ -94,7 +93,7 @@
     <tr>
       <td>
         <input class="button" type="submit" value="Upload" name="fileupload" />
-        Max size = <?php echo ini_get( 'post_max_size' );?>
+        <?php echo T_('Max size') ?> = <?php echo ini_get( 'post_max_size' );?>
       </td>
     <tr>
       <td>
diff -ruN 4.5.4/administrator/templates/mambo_admin/cpanel.php 4.6rc2/administrator/templates/mambo_admin/cpanel.php
--- 4.5.4/administrator/templates/mambo_admin/cpanel.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin/cpanel.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: cpanel.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/administrator/templates/mambo_admin/css/admin_login.css 4.6rc2/administrator/templates/mambo_admin/css/admin_login.css
--- 4.5.4/administrator/templates/mambo_admin/css/admin_login.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin/css/admin_login.css	2006-02-16 15:43:38.000000000 -0600
@@ -1,10 +1,12 @@
 /**
-* @version $Id: admin_login.css,v 1.1 2005/07/22 01:54:08 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 body {
 	margin: 0px;
diff -ruN 4.5.4/administrator/templates/mambo_admin/css/template_css.css 4.6rc2/administrator/templates/mambo_admin/css/template_css.css
--- 4.5.4/administrator/templates/mambo_admin/css/template_css.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin/css/template_css.css	2006-02-27 22:48:46.000000000 -0600
@@ -1,10 +1,23 @@
 /**
-* @version $Id: template_css.css,v 1.1 2005/07/22 01:54:09 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
+
+#mambover {
+	position:absolute;
+	top:0;
+	right:0;
+	text-align:right;
+	color:#FFFFFF;
+	z-index:100;
+	padding:5px;
+	font-size : 11px;
+}
 
 BODY {
 	margin: 0px 0px 0px 0px;
diff -ruN 4.5.4/administrator/templates/mambo_admin/index.php 4.6rc2/administrator/templates/mambo_admin/index.php
--- 4.5.4/administrator/templates/mambo_admin/index.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin/index.php	2006-02-27 22:48:46.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: index.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -38,16 +40,19 @@
 *	OF THE GNU GENERAL PUBLIC LICENSE - http://www.gnu.org/copyleft/gpl.html
 -->
 <?php
-echo "<meta name=\"Generator\" content=\"Mambo (C) 2000 - 2005 Miro International Pty Ltd.  All rights reserved.\" />\r\n";
+echo "<meta name=\"Generator\" content=\"copyright (C) 2005 - 2006 Mambo Foundation Inc. All rights reserved.\" />\r\n";
 ?>
 <!--
 *	END OF COPYRIGHT
 -->
 </head>
 <body onload="MM_preloadImages('images/help_f2.png','images/archive_f2.png','images/back_f2.png','images/cancel_f2.png','images/delete_f2.png','images/edit_f2.png','images/new_f2.png','images/preview_f2.png','images/publish_f2.png','images/save_f2.png','images/unarchive_f2.png','images/unpublish_f2.png','images/upload_f2.png')">
+<div id="mambover">
+<?php echo 'Mambo version: '.$_VERSION->RELEASE.'.'. $_VERSION->DEV_LEVEL; ?>
+</div>
 <div id="wrapper">
     <div id="header">
-           <div id="mambo"><img src="templates/mambo_admin/images/mambo.gif" alt="Mambo Logo" /></div>
+           <div id="mambo"><img src="templates/mambo_admin/images/mambo.gif" alt="<?php echo T_('Mambo Logo') ?>" /></div>
     </div>
 </div>
 <?php if (!mosGetParam( $_REQUEST, 'hidemainmenu', 0 )) { ?>
diff -ruN 4.5.4/administrator/templates/mambo_admin/login.php 4.6rc2/administrator/templates/mambo_admin/login.php
--- 4.5.4/administrator/templates/mambo_admin/login.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin/login.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,70 +1,74 @@
-<?php
-/**
-* @version $Id: login.php,v 1.1 2005/07/22 01:54:00 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$tstart = mosProfiler::getmicrotime();
-?>
-<?php echo "<?xml version=\"1.0\"?>\r\n"; ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php echo $mosConfig_sitename; ?> - Administration [Mambo]</title>
-<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
-<style type="text/css">
-@import url(templates/mambo_admin/css/admin_login.css);
-</style>
-<script language="javascript" type="text/javascript">
-	function setFocus() {
-		document.loginForm.usrname.select();
-		document.loginForm.usrname.focus();
-	}
-</script>
-</head>
-<body onload="setFocus();">
-<div id="wrapper">
-    <div id="header">
-           <div id="mambo"><img src="templates/mambo_admin/images/mambo.gif" alt="Mambo Logo" /></div>
-    </div>
-</div>
-<div id="ctr" align="center">
-	<div class="login">
-		<div class="login-form">
-			<img src="templates/mambo_admin/images/login.gif" alt="Login" />
-        	<form action="index.php" method="post" name="loginForm" id="loginForm">
-			<div class="form-block">
-	        	<div class="inputlabel">Username</div>
-		    	<div><input name="usrname" type="text" class="inputbox" size="15" /></div>
-	        	<div class="inputlabel">Password</div>
-		    	<div><input name="pass" type="password" class="inputbox" size="15" /></div>
-	        	<div align="left"><input type="submit" name="submit" class="button" value="Login" /></div>
-        	</div>
-			</form>
-    	</div>
-		<div class="login-text">
-			<div class="ctr"><img src="templates/mambo_admin/images/security.png" width="64" height="64" alt="security" /></div>
-        	<p>Welcome to Mambo!</p>
-			<p>Use a valid username and password to gain access to the administration console.</p>
-    	</div>
-		<div class="clr"></div>
-	</div>
-	
-</div>
-<div id="break"></div>
-<noscript>
-!Warning! Javascript must be enabled for proper operation of the Administrator
-</noscript>
-<div class="footer" align="center">
-<?php
-	include ($mosConfig_absolute_path . "/includes/footer.php");
-?>
-</div>
-</body>
-</html>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$tstart = mosProfiler::getmicrotime();
+?>
+<?php echo "<?xml version=\"1.0\"?>\r\n"; ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php echo $mosConfig_sitename; ?> - <?php echo T_('Administration') ?> [Mambo]</title>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<style type="text/css">
+@import url(templates/mambo_admin/css/admin_login.css);
+</style>
+<script language="javascript" type="text/javascript">
+	function setFocus() {
+		document.loginForm.usrname.select();
+		document.loginForm.usrname.focus();
+	}
+</script>
+</head>
+<body onload="setFocus();">
+<div id="wrapper">
+    <div id="header">
+           <div id="mambo"><img src="templates/mambo_admin/images/mambo.gif" alt="<?php echo T_('Mambo Logo') ?>" /></div>
+    </div>
+</div>
+<div id="ctr" align="center">
+	<div class="login">
+		<div class="login-form">
+			<img src="templates/mambo_admin/images/login.gif" alt="<?php echo T_('Login') ?>" />
+        	<form action="index.php" method="post" name="loginForm" id="loginForm">
+			<div class="form-block">
+	        	<div class="inputlabel"><?php echo T_('Username') ?></div>
+		    	<div><input name="usrname" type="text" class="inputbox" size="15" /></div>
+	        	<div class="inputlabel"><?php echo T_('Password') ?></div>
+		    	<div><input name="pass" type="password" class="inputbox" size="15" /></div>
+		    	<input type="hidden" name="adminside" value="1" />
+		    	<input type="hidden" name="option" value="login" />
+	        	<div align="left"><input type="submit" name="submit" class="button" value="<?php echo T_('Login') ?>" /></div>
+        	</div>
+			</form>
+    	</div>
+		<div class="login-text">
+			<div class="ctr"><img src="templates/mambo_admin/images/security.png" width="64" height="64" alt="security" /></div>
+        	<p><?php echo T_('Welcome to Mambo!') ?></p>
+			<p><?php echo T_('Use a valid username and password to gain access to the administration console.') ?></p>
+    	</div>
+		<div class="clr"></div>
+	</div>
+	
+</div>
+<div id="break"></div>
+<noscript>
+!Warning! Javascript must be enabled for proper operation of the Administrator
+</noscript>
+<div class="footer" align="center">
+<?php
+	include ($mosConfig_absolute_path . "/includes/footer.php");
+?>
+</div>
+</body>
+</html>
diff -ruN 4.5.4/administrator/templates/mambo_admin/templateDetails.xml 4.6rc2/administrator/templates/mambo_admin/templateDetails.xml
--- 4.5.4/administrator/templates/mambo_admin/templateDetails.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin/templateDetails.xml	2006-03-01 13:18:50.000000000 -0600
@@ -4,8 +4,8 @@
 	<creationDate>07/27/04</creationDate>
 	<author>Robert Castley</author>
 	<copyright>GNU/GPL</copyright>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>http://www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>http://www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description></description>
 	<files>
diff -ruN 4.5.4/administrator/templates/mambo_admin_blue/cpanel.php 4.6rc2/administrator/templates/mambo_admin_blue/cpanel.php
--- 4.5.4/administrator/templates/mambo_admin_blue/cpanel.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin_blue/cpanel.php	2006-06-07 03:15:51.000000000 -0500
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: cpanel.php,v 1.1 2005/07/22 01:54:20 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -18,7 +20,9 @@
 	<td width="50%" valign="top">
 	<div style="width=100%;">
 	<form action="index2.php" method="post" name="adminForm">
-	<?php mosLoadAdminModules( 'cpanel', 1 ); ?>
+	<?php 
+	mosLoadAdminModules( 'cpanel', 1 ); 
+	?>
 	</form>
 	</div>
 	</td>
diff -ruN 4.5.4/administrator/templates/mambo_admin_blue/css/admin_login.css 4.6rc2/administrator/templates/mambo_admin_blue/css/admin_login.css
--- 4.5.4/administrator/templates/mambo_admin_blue/css/admin_login.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin_blue/css/admin_login.css	2006-02-16 15:43:38.000000000 -0600
@@ -1,10 +1,12 @@
 /**
-* @version $Id: admin_login.css,v 1.1 2005/07/22 01:54:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 body {
 	margin: 0px;
diff -ruN 4.5.4/administrator/templates/mambo_admin_blue/css/template_css.css 4.6rc2/administrator/templates/mambo_admin_blue/css/template_css.css
--- 4.5.4/administrator/templates/mambo_admin_blue/css/template_css.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin_blue/css/template_css.css	2006-02-27 22:48:46.000000000 -0600
@@ -1,10 +1,23 @@
 /**
-* @version $Id: template_css.css,v 1.1 2005/07/22 01:54:31 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
+
+#mambover {
+	position:absolute;
+	top:0;
+	right:0;
+	text-align:right;
+	color:#FFFFFF;
+	z-index:100;
+	padding:5px;
+	font-size : 11px;
+}
 
 #wrapper {
         border: 0px;
diff -ruN 4.5.4/administrator/templates/mambo_admin_blue/css/theme.css 4.6rc2/administrator/templates/mambo_admin_blue/css/theme.css
--- 4.5.4/administrator/templates/mambo_admin_blue/css/theme.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin_blue/css/theme.css	2006-01-19 14:55:40.000000000 -0600
@@ -1,3 +1,7 @@
+/* */
+.green {color:green}
+.red {color:red}
+
 /* ThemeOfficeMenu Style Sheet */
 
 .ThemeOfficeMenu,.ThemeOfficeSubMenuTable
diff -ruN 4.5.4/administrator/templates/mambo_admin_blue/index.php 4.6rc2/administrator/templates/mambo_admin_blue/index.php
--- 4.5.4/administrator/templates/mambo_admin_blue/index.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin_blue/index.php	2006-06-07 03:15:51.000000000 -0500
@@ -1,109 +1,114 @@
-<?php
-/**
-* @version $Id: index.php,v 1.1 2005/07/22 01:54:20 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$tstart = mosProfiler::getmicrotime();
-// needed to seperate the ISO number from the language file constant _ISO
-$iso = explode( '=', _ISO );
-// xml prolog
-echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php echo $mosConfig_sitename; ?> - Administration [Mambo]</title>
-<link rel="stylesheet" href="templates/mambo_admin_blue/css/template_css.css" type="text/css" />
-<link rel="stylesheet" href="templates/mambo_admin_blue/css/theme.css" type="text/css" />
-<script language="JavaScript" src="<?php echo $mosConfig_live_site; ?>/includes/js/JSCookMenu.js" type="text/javascript"></script>
-<script language="JavaScript" src="<?php echo $mosConfig_live_site; ?>/administrator/includes/js/ThemeOffice/theme.js" type="text/javascript"></script>
-<script language="JavaScript" src="<?php echo $mosConfig_live_site; ?>/includes/js/mambojavascript.js" type="text/javascript"></script>
-<?php
-// if(@$_REQUEST["task"] == "edit" || @$_REQUEST["task"] == "new") {
-// MUST be included ALWAYS for custom components to work
-	include_once( $mosConfig_absolute_path . "/editor/editor.php" );
-	initEditor();
-//}
-?>
-<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
-<!--
-*	DO NOT REMOVE THE FOLLOWING - FAILURE TO COMPLY IS A DIRECT VIOLATION
-*	OF THE GNU GENERAL PUBLIC LICENSE - http://www.gnu.org/copyleft/gpl.html
--->
-<?php
-echo "<meta name=\"Generator\" content=\"Mambo (C) 2000 - 2005 Miro International Pty Ltd.  All rights reserved.\" />\r\n";
-?>
-<!--
-*	END OF COPYRIGHT
--->
-</head>
-<body onload="MM_preloadImages('images/help_f2.png','images/archive_f2.png','images/back_f2.png','images/cancel_f2.png','images/delete_f2.png','images/edit_f2.png','images/new_f2.png','images/preview_f2.png','images/publish_f2.png','images/save_f2.png','images/unarchive_f2.png','images/unpublish_f2.png','images/upload_f2.png')">
-<div id="wrapper">
-    <div id="header">
-           <div id="mambo"><img src="templates/mambo_admin_blue/images/header_text.png" alt="Mambo Logo" /></div>
-    </div>
-</div>
-<?php if (!mosGetParam( $_REQUEST, 'hidemainmenu', 0 )) { ?>
-<table width="100%" class="menubar" cellpadding="0" cellspacing="0" border="0">
-  <tr>
-    <td class="menubackgr"><?php mosLoadAdminModule( 'fullmenu' );?></td>
-    <td class="menubackgr" align="right">
-        <div id="wrapper1">
-			<?php mosLoadAdminModules( 'header', 2 );?>
-		</div>
-	</td>
-    <td class="menubackgr" align="right"><a href="index2.php?option=logout" style="color: #333333; font-weight: bold">Logout</a> <strong><?php echo $my->username;?></strong>&nbsp;</td>
-    </tr>
-</table>
-<?php } ?>
-<table width="100%" class="menubar" cellpadding="0" cellspacing="0" border="0">
-  <tr>
-    <td class="menudottedline" width="40%">
-    	<?php mosLoadAdminModule( 'pathway' );?>
-    </td>
-    <td class="menudottedline" align="right">
-  		<?php mosLoadAdminModule( 'toolbar' );?>
-    </td>
-  </tr>
-</table>
-<br />
-<?php mosLoadAdminModule( 'mosmsg' );?>
-<div align="center">
-<div class="main">
-<table width="100%" border="0">
-  <tr>
-    <td valign="middle" align="center">
-	<?php
-	// Show list of items to edit or delete or create new
-	if ($path = $mainframe->getPath( 'admin' )) {
-		require $path;
-	} else {
-		echo "<img src=\"images/logo.png\" border=\"0\" alt=\"Mambo Logo\" />\r\n<br />\r\n";
-	}
-	?>
-   </td>
-  </tr>
-</table>
-</div>
-</div>
-<table width="99%" border="0">
-<tr>
-<td align="center"><?php
-include ($mosConfig_absolute_path . "/includes/footer.php");
-echo ("<div class=\"smallgrey\">");
-$tend = mosProfiler::getmicrotime();
-$totaltime = ($tend - $tstart);
-printf ("Page was generated in %f seconds", $totaltime);
-echo ("</div>");
-?>
-</td></tr></table>
-<?php mosLoadAdminModules( 'debug' );?>
-</body>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$tstart = mosProfiler::getmicrotime();
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php echo $mosConfig_sitename; ?> - <?php echo T_('Administration') ?> [Mambo]</title>
+<link rel="stylesheet" href="templates/mambo_admin_blue/css/template_css.css" type="text/css" />
+<link rel="stylesheet" href="templates/mambo_admin_blue/css/theme.css" type="text/css" />
+<script language="JavaScript" src="<?php echo $mosConfig_live_site; ?>/includes/js/JSCookMenu.js" type="text/javascript"></script>
+<script language="JavaScript" src="<?php echo $mosConfig_live_site; ?>/includes/js/ThemeOffice/theme.js" type="text/javascript"></script>
+<script language="JavaScript" src="<?php echo $mosConfig_live_site; ?>/includes/js/mambojavascript.js" type="text/javascript"></script>
+<?php
+// if(@$_REQUEST["task"] == "edit" || @$_REQUEST["task"] == "new") {
+// MUST be included ALWAYS for custom components to work
+	include_once( $mosConfig_absolute_path . "/editor/editor.php" );
+	initEditor();
+//}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<!--
+*	DO NOT REMOVE THE FOLLOWING - FAILURE TO COMPLY IS A DIRECT VIOLATION
+*	OF THE GNU GENERAL PUBLIC LICENSE - http://www.gnu.org/copyleft/gpl.html
+-->
+<?php
+echo "<meta name=\"Generator\" content=\"copyright (C) 2005 - 2006 Mambo Foundation Inc.  All rights reserved.\" />\r\n";
+?>
+<!--
+*	END OF COPYRIGHT
+-->
+</head>
+<body onload="MM_preloadImages('images/help_f2.png','images/archive_f2.png','images/back_f2.png','images/cancel_f2.png','images/delete_f2.png','images/edit_f2.png','images/new_f2.png','images/preview_f2.png','images/publish_f2.png','images/save_f2.png','images/unarchive_f2.png','images/unpublish_f2.png','images/upload_f2.png')">
+<div id="mambover">
+<?php echo 'Mambo version: '.$_VERSION->RELEASE.'.'. $_VERSION->DEV_LEVEL; ?>
+</div>
+<div id="wrapper">
+    <div id="header">
+           <div id="mambo"><img src="templates/mambo_admin_blue/images/header_text.png" alt="<?php echo T_('Mambo Logo') ?>" /></div>
+    </div>
+</div>
+<?php if (!mosGetParam( $_REQUEST, 'hidemainmenu', 0 )) { ?>
+<table width="100%" class="menubar" cellpadding="0" cellspacing="0" border="0">
+  <tr>
+    <td class="menubackgr"><?php mosLoadAdminModule( 'fullmenu' );?></td>
+    <td class="menubackgr" align="right">
+        <div id="wrapper1">
+			<?php mosLoadAdminModules( 'header', 2 );?>
+		</div>
+	</td>
+    <td class="menubackgr" align="right"><a href="index2.php?option=logout" style="color: #333333; font-weight: bold"><?php echo T_('Logout') ?></a> <strong><?php echo $my->username;?></strong>&nbsp;</td>
+    </tr>
+</table>
+<?php } ?>
+<table width="100%" class="menubar" cellpadding="0" cellspacing="0" border="0">
+  <tr>
+    <td class="menudottedline" width="40%">
+    	<?php mosLoadAdminModule( 'pathway' );?>
+    </td>
+    <td class="menudottedline" align="right">
+  		<?php mosLoadAdminModule( 'toolbar' );?>
+    </td>
+  </tr>
+</table>
+<br />
+<?php mosLoadAdminModule( 'mosmsg' );?>
+<div align="center">
+<div class="main">
+<table width="100%" border="0">
+  <tr>
+    <td valign="middle" align="center">
+	<?php
+	// Show list of items to edit or delete or create new
+	if ($path = $mainframe->getPath( 'admin' )) {
+		require $path;
+	} else {
+		echo "<img src=\"images/logo.png\" border=\"0\" alt=\"".T_('Mambo Logo')."\" />\r\n<br />\r\n";
+	}
+	?>
+   </td>
+  </tr>
+</table>
+</div>
+</div>
+<table width="99%" border="0">
+<tr>
+<td align="center"><?php
+include ($mosConfig_absolute_path . "/includes/footer.php");
+echo ("<div class=\"smallgrey\">");
+$tend = mosProfiler::getmicrotime();
+$totaltime = ($tend - $tstart);
+printf ("Page was generated in %f seconds", $totaltime);
+echo ("</div>");
+?>
+</td></tr></table>
+<?php mosLoadAdminModules( 'debug' );?>
+</body>
 </html>
\ No newline at end of file
diff -ruN 4.5.4/administrator/templates/mambo_admin_blue/login.php 4.6rc2/administrator/templates/mambo_admin_blue/login.php
--- 4.5.4/administrator/templates/mambo_admin_blue/login.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/administrator/templates/mambo_admin_blue/login.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,69 +1,73 @@
-<?php
-/**
-* @version $Id: login.php,v 1.1 2005/07/22 01:54:20 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$tstart = mosProfiler::getmicrotime();
-?>
-<?php echo "<?xml version=\"1.0\"?>\r\n"; ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php echo $mosConfig_sitename; ?> - Administration [Mambo]</title>
-<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
-<style type="text/css">
-@import url(templates/mambo_admin_blue/css/admin_login.css);
-</style>
-<script language="javascript" type="text/javascript">
-	function setFocus() {
-		document.loginForm.usrname.select();
-		document.loginForm.usrname.focus();
-	}
-</script>
-</head>
-<body onload="setFocus();">
-<div id="wrapper">
-    <div id="header">
-           <div id="mambo"><img src="templates/mambo_admin_blue/images/header_text.png" alt="Mambo Logo" /></div>
-    </div>
-</div>
-<div id="ctr" align="center">
-	<div class="login">
-		<div class="login-form">
-			<img src="templates/mambo_admin_blue/images/login.gif" alt="Login" />
-        	<form action="index.php" method="post" name="loginForm" id="loginForm">
-			<div class="form-block">
-	        	<div class="inputlabel">Username</div>
-		    	<div><input name="usrname" type="text" class="inputbox" size="15" /></div>
-	        	<div class="inputlabel">Password</div>
-		    	<div><input name="pass" type="password" class="inputbox" size="15" /></div>
-	        	<div align="left"><input type="submit" name="submit" class="button" value="Login" /></div>
-        	</div>
-			</form>
-    	</div>
-		<div class="login-text">
-			<div class="ctr"><img src="templates/mambo_admin_blue/images/security.png" width="64" height="64" alt="security" /></div>
-        	<p>Welcome to Mambo!</p>
-			<p>Use a valid username and password to gain access to the administration console.</p>
-    	</div>
-		<div class="clr"></div>
-	</div>
-</div>
-<div id="break"></div>
-<noscript>
-!Warning! Javascript must be enabled for proper operation of the Administrator
-</noscript>
-<div class="footer" align="center">
-<?php
-	include ($mosConfig_absolute_path . "/includes/footer.php");
-?>
-</div>
-</body>
-</html>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$tstart = mosProfiler::getmicrotime();
+?>
+<?php echo "<?xml version=\"1.0\"?>\r\n"; ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php echo $mosConfig_sitename; ?> - Administration [Mambo]</title>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<style type="text/css">
+@import url(templates/mambo_admin_blue/css/admin_login.css);
+</style>
+<script language="javascript" type="text/javascript">
+	function setFocus() {
+		document.loginForm.usrname.select();
+		document.loginForm.usrname.focus();
+	}
+</script>
+</head>
+<body onload="setFocus();">
+<div id="wrapper">
+    <div id="header">
+           <div id="mambo"><img src="templates/mambo_admin_blue/images/header_text.png" alt="Mambo Logo" /></div>
+    </div>
+</div>
+<div id="ctr" align="center">
+	<div class="login">
+		<div class="login-form">
+			<img src="templates/mambo_admin_blue/images/login.gif" alt="<?php echo T_('Login') ?>" />
+        	<form action="index.php" method="post" name="loginForm" id="loginForm">
+			<div class="form-block">
+	        	<div class="inputlabel">Username</div>
+		    	<div><input name="usrname" type="text" class="inputbox" size="15" /></div>
+	        	<div class="inputlabel">Password</div>
+		    	<div><input name="pass" type="password" class="inputbox" size="15" /></div>
+		    	<input type="hidden" name="adminside" value="1" />
+		    	<input type="hidden" name="option" value="login" />
+	        	<div align="left"><input type="submit" name="submit" class="button" value="Login" /></div>
+        	</div>
+			</form>
+    	</div>
+		<div class="login-text">
+			<div class="ctr"><img src="templates/mambo_admin_blue/images/security.png" width="64" height="64" alt="security" /></div>
+        	<p>Welcome to Mambo!</p>
+			<p>Use a valid username and password to gain access to the administration console.</p>
+    	</div>
+		<div class="clr"></div>
+	</div>
+</div>
+<div id="break"></div>
+<noscript>
+!Warning! Javascript must be enabled for proper operation of the Administrator
+</noscript>
+<div class="footer" align="center">
+<?php
+	include ($mosConfig_absolute_path . "/includes/footer.php");
+?>
+</div>
+</body>
+</html>
diff -ruN 4.5.4/components/com_banners/banners.class.php 4.6rc2/components/com_banners/banners.class.php
--- 4.5.4/components/com_banners/banners.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_banners/banners.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: banners.class.php,v 1.1 2005/07/22 01:54:40 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Banners
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Banners
-*/
 class mosBannerClient extends mosDBTable {
 	var	$cid = null;
 	var $name = "";
@@ -32,19 +30,19 @@
 	function check() {
 		// check for valid client name
 		if (trim($this->name == "")) {
-			$this->_error = _BNR_CLIENT_NAME;
+			$this->_error = T_('You must select a name for the client.');
 			return false;
 		}
 		
 		// check for valid client contact
 		if (trim($this->contact == "")) {
-			$this->_error = _BNR_CONTACT;
+			$this->_error = T_('You must select a contact for the client.');
 			return false;
 		}
 		
 		// check for valid client email
 		if ((trim($this->email == "")) || (preg_match("/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $this->email )==false)) {
-			$this->_error = _BNR_VALID_EMAIL;
+			$this->_error = T_('You must select a valid email for the client.');
 			return false;
 		}
 		return true;
@@ -99,21 +97,21 @@
 	function check() {
 		// check for valid client id
 		if (is_null($this->cid) || $this->cid == 0) {
-			$this->_error = _BNR_CLIENT;
+			$this->_error = T_('You must select a client.');
 			return false;
 		}
 		
 		if(trim($this->name) == "") {
-			$this->_error = _BNR_NAME;
+			$this->_error = T_('You must select a name for the banner.');
 			return false;
 		}
 		
 		if(trim($this->imageurl) == "") {
-			$this->_error = _BNR_IMAGE;
+			$this->_error = T_('You must select a image for the banner.');
 			return false;
 		}
 		if(trim($this->clickurl) == "" && trim($this->custombannercode) == "") {
-			$this->_error = _BNR_URL;
+			$this->_error = T_('You must select a URL/Custom banner code for the banner.');
 			return false;
 		}
 		
diff -ruN 4.5.4/components/com_banners/banners.php 4.6rc2/components/com_banners/banners.php
--- 4.5.4/components/com_banners/banners.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_banners/banners.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: banners.php,v 1.1 2005/07/22 01:54:41 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Banners
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/components/com_contact/contact.class.php 4.6rc2/components/com_contact/contact.class.php
--- 4.5.4/components/com_contact/contact.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_contact/contact.class.php	2006-03-22 02:29:54.000000000 -0600
@@ -1,22 +1,20 @@
 <?php
 /**
-* @version $Id: contact.class.php,v 1.1 2005/07/22 01:54:41 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 include_once( $mosConfig_absolute_path .'/includes/vcard.class.php' );
 	
-/**
-* @package Mambo
-* @subpackage Contact
-*/
 class mosContact extends mosDBTable {
 	/** @var int Primary key */
 	var $id=null;
@@ -69,7 +67,7 @@
 	* @param database A database connector object
 	*/
 	function mosContact() {
-	    global $database;
+	    $database = mamboDatabase::getInstance();
 		$this->mosDBTable( '#__contact_details', 'id', $database );
 	}
 
@@ -77,6 +75,42 @@
 		$this->default_con = intval( $this->default_con );
 		return true;
 	}
+	
+	function &getCategories ($user) {
+		static $contact_cats = '';
+		if (!is_array($contact_cats)) {
+			$database = mamboDatabase::getInstance();
+			/* Query to retrieve all categories that belong under the contacts section and that are published. */
+			$query = "SELECT *, COUNT(a.id) AS numlinks, MIN(a.id) as minimum"
+			. "\n FROM #__categories AS cc"
+			. "\n LEFT JOIN #__contact_details AS a ON a.catid = cc.id"
+			. "\n WHERE a.published='1'"
+			. "\n AND cc.section='com_contact_details'"
+			. "\n AND cc.published='1'"
+			. "\n AND a.access <= '". $user->gid ."'"
+			. "\n AND cc.access <= '". $user->gid ."'"
+			. "\n GROUP BY cc.id"
+			. "\n ORDER BY cc.ordering"
+			;
+			$database->setQuery( $query );
+			$contact_cats = $database->loadObjectList();
+			if (!$contact_cats) $contact_cats = array();
+		}
+		return $contact_cats;
+	}
+	
+	function &getContacts ($catid, $user) {
+		$database = mamboDatabase::getInstance();
+		$query = "SELECT *"
+		. "\n FROM #__contact_details"
+		. "\n WHERE catid = '". $catid."'"
+		 . "\n AND published='1'"
+		 . "\n AND access <= '". $user->gid ."'"
+		. "\n ORDER BY ordering"
+		;
+		$contacts = $database->doSQLget($query, 'mosContact');
+		return $contacts;
+	}
 }
 
 /**
@@ -126,11 +160,11 @@
 			$text	.= "$key:$value\r\n";
 		}
 		$text	.= "REV:" .date("Y-m-d") ."T". date("H:i:s"). "Z\r\n";
-		$text	.= "MAILER: Mambo vCard for ". $sitename ."\r\n";
+		$text	.= "MAILER: ".sprintf(T_('Mambo vCard for %s'),$sitename) ."\r\n";
 		$text	.= "END:VCARD\r\n";
 		return $text;
 	}
 	
 }
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_contact/contact.html.php 4.6rc2/components/com_contact/contact.html.php
--- 4.5.4/components/com_contact/contact.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_contact/contact.html.php	2006-04-18 11:54:46.000000000 -0500
@@ -1,21 +1,18 @@
 <?php
 /**
-* @version $Id: contact.html.php,v 1.1 2005/07/22 01:54:41 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-
-/**
-* @package Mambo
-* @subpackage Contact
-*/
 class HTML_contact {
 
 
@@ -39,7 +36,7 @@
 			// show image
 			if ( $currentcat->img ) {
 				?>
-				<img src="<?php echo $currentcat->img; ?>" align="<?php echo $currentcat->align; ?>" hspace="6" alt="<?php echo _WEBLINKS_TITLE; ?>" />
+				<img src="<?php echo $currentcat->img; ?>" align="<?php echo $currentcat->align; ?>" hspace="6" alt="<?php echo T_('Category'); ?>" />
 				<?php
 			}
 			echo $currentcat->descrip;
@@ -91,13 +88,13 @@
 			?>
 			<tr>
 				<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-				<?php echo _CONTACT_HEADER_NAME; ?>
+				<?php echo T_('Name'); ?>
 				</td>
 				<?php
 				if ( $params->get( 'position' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo _CONTACT_HEADER_POS; ?>
+					<?php echo T_('Position'); ?>
 					</td>
 					<?php
 				}
@@ -106,7 +103,7 @@
 				if ( $params->get( 'email' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo _CONTACT_HEADER_EMAIL; ?>
+					<?php echo T_('Email'); ?>
 					</td>
 					<?php
 				}
@@ -115,7 +112,7 @@
 				if ( $params->get( 'telephone' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo _CONTACT_HEADER_PHONE; ?>
+					<?php echo T_('Phone'); ?>
 					</td>
 					<?php
 				}
@@ -124,7 +121,7 @@
 				if ( $params->get( 'fax' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo _CONTACT_HEADER_FAX; ?>
+					<?php echo T_('Fax'); ?>
 					</td>
 					<?php
 				}
@@ -201,7 +198,7 @@
 		?>
 		<ul>
 		<?php
-		foreach ( $categories as $cat ) {
+		if ($categories) foreach ( $categories as $cat ) {
 			if ( $catid == $cat->catid ) {
 				?>
 				<li>
@@ -260,7 +257,7 @@
 		<!--
 		function validate(){
 			if ( ( document.emailForm.text.value == "" ) || ( document.emailForm.email.value.search("@") == -1 ) || ( document.emailForm.email.value.search("[.*]" ) == -1 ) ) {
-				alert( "<?php echo _CONTACT_FORM_NC; ?>" );
+				alert( "<?php echo T_('Please make sure the form is complete and valid.'); ?>" );
 			} else {
 			document.emailForm.action = "<?php echo sefRelToAbs("index.php?option=com_contact&Itemid=$Itemid"); ?>"
 			document.emailForm.submit();
@@ -387,7 +384,7 @@
 				<td colspan="2" align="center">
 				<br />
 				<form action="<?php echo sefRelToAbs( 'index.php?option=com_contact&amp;Itemid='. $Itemid ); ?>" method="post" name="selectForm" target="_top" id="selectForm">
-				<?php echo (_CONTACT_SEL); ?>
+				<?php echo T_('Select Contact:'); ?>
 				<br />
 				<?php echo $contact->select; ?>
 				</form>
@@ -443,7 +440,7 @@
 		if ( $contact->image && $params->get( 'image' ) ) {
 			?>
 			<div style="float: right;">
-			<img src="<?php echo $mosConfig_live_site;?>/images/stories/<?php echo $contact->image; ?>" align="middle" alt="Contact" />
+			<img src="<?php echo $mosConfig_live_site;?>/images/stories/<?php echo $contact->image; ?>" align="middle" alt="<?php echo T_('Contact') ?>" />
 			</div>
 			<?php
 		}
@@ -631,9 +628,9 @@
 			?>
 			<tr>
 				<td colspan="2">
-				<?php echo(_CONTACT_DOWNLOAD_AS);?>
+				<?php echo T_('Download information as a');?>
 				<a href="index2.php?option=com_contact&task=vcard&contact_id=<?php echo $contact->id; ?>&no_html=1">
-				<?php echo(_VCARD);?>
+				<?php echo T_('VCard');?>
 				</a>
 				</td>
 			</tr>
@@ -654,19 +651,19 @@
 				<br /><br />
 				<form action="<?php echo sefRelToAbs( 'index.php?option=com_contact&amp;Itemid='. $contact->id ); ?>" method="post" name="emailForm" target="_top" id="emailForm">
 				<div class="contact_email<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo(_NAME_PROMPT);?>
+					<?php echo T_('Enter your name:');?>
 					<br />
 					<input type="text" name="name" size="30" class="inputbox" value="" />
 					<br />
-					<?php echo(_EMAIL_PROMPT);?>
+					<?php echo T_('E-mail address:');?>
 					<br />
 					<input type="text" name="email" size="30" class="inputbox" value="" />
 					<br />
-					<?php echo(_SUBJECT_PROMPT);?>
+					<?php echo T_('Message subject:');?>
 					<br />
 					<input type="text" name="subject" size="30" class="inputbox" value="" />
 					<br /><br />
-					<?php echo(_MESSAGE_PROMPT);?>
+					<?php echo T_('Enter your message:');?>
 					<br />
 					<textarea cols="50" rows="10" name="text" class="inputbox"></textarea>
 					<?php
@@ -674,11 +671,11 @@
 						?>
 						<br />
 						<input type="checkbox" name="email_copy"  value="1"  />
-						<?php		echo(_EMAIL_A_COPY);
+						<?php		echo T_('Email a copy of this message to your own address');
 					}
 					?>
 					<br /><br />
-					<input type="button" name="send" value="<?php echo(_SEND_BUTTON); ?>" class="button" onclick="validate()" />
+					<input type="button" name="send" value="<?php echo T_('Send'); ?>" class="button" onclick="validate()" />
 				</div>
 				<input type="hidden" name="option" value="com_contact" />
 				<input type="hidden" name="con_id" value="<?php echo $contact->id; ?>" />
@@ -695,11 +692,11 @@
 	function nocontact( &$params ) {
 		?>
 		<br /><br />
-		<?php echo _CONTACT_NONE;?>
+		<?php echo T_('There are no Contact Details listed.');?>
 		<br /><br />
 		<?php
 		// displays back button
 		mosHTML::BackButton ( $params );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_contact/contact.php 4.6rc2/components/com_contact/contact.php
--- 4.5.4/components/com_contact/contact.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_contact/contact.php	2006-04-27 12:43:45.000000000 -0500
@@ -1,10 +1,12 @@
 <?php
 /**
-* @version $Id: contact.php,v 1.1 2005/07/22 01:54:41 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Contact
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -15,100 +17,153 @@
 require_once( $mainframe->getPath( 'front_html' ) );
 require_once( $mainframe->getPath( 'class' ) );
 
-$mainframe->setPageTitle( _CONTACT_TITLE );
+class contactUserControllers {
+	var $manager = '';
+	var $user = '';
+	var $op = '';
+	var $con_id = 0;
+	var $contact_id = 0;
+	var $catid = 0;
+	var $Itemid = 0;
+
+	function contactUserControllers ($manager) {
+		$this->manager = $manager;
+		$this->user =& mamboCore::get('currentUser');
+		$this->op = mosGetParam($_REQUEST, 'op', '');
+		$this->con_id = mosGetParam( $_REQUEST ,'con_id', 0 );
+		$this->contact_id = mosGetParam( $_REQUEST ,'contact_id', 0 );
+		$this->catid = mosGetParam( $_REQUEST ,'catid', 0 );
+		$this->Itemid = mamboCore::get('Itemid');
+	}
 
-if ( !isset( $op ) ) {
-	$op = '';
-}
+	function sendmail () {
+		$contact = new mosContact();
+		$contact->load($this->con_id);
+
+		$default = mamboCore::get('mosConfig_sitename').' '.T_('Enquiry');
+		$email = mosGetParam( $_POST, 'email', '' );
+		$text = mosGetParam( $_POST, 'text', '' );
+		$name = mosGetParam( $_POST, 'name', '' );
+		$subject = mosGetParam( $_POST, 'subject', $default );
+		$email_copy = mosGetParam( $_POST, 'email_copy', 0 );
+
+		if (!$email OR !$text OR !is_email($email) OR $this->has_emailheaders($text) OR $this->has_newlines($email) OR $this->has_newlines($name) OR $this->has_newlines($subject) OR !isset($_SERVER['HTTP_USER_AGENT']) OR $_SERVER['REQUEST_METHOD'] != 'POST') {
+			echo "<script>alert (\"".T_('Please make sure the form is complete and valid.')."\"); window.history.go(-1);</script>";
+			exit(0);
+		}
+		$prefix = sprintf( T_('This is an enquiry e-mail via %s from:'), mamboCore::get('mosConfig_live_site') );
+		$text = $prefix ."\n". $name. ' <'. $email .'>' ."\n\n". $text;
+
+		mosMail( $email, $name , $contact->email_to, mamboCore::get('mosConfig_fromname') .': '. $subject, $text );
+
+		if ( $email_copy ) {
+			$copy_text = sprintf( T_('The following is a copy of the message you sent to %s via %s '), $contact->name, mamboCore::get('mosConfig_sitename') );
+			$copy_text = $copy_text ."\n\n". $text .'';
+			$copy_subject = sprintf(T_('Copy of: %s'),$subject);
+			mosMail( mamboCore::get('mosConfig_mailfrom'), mamboCore::get('mosConfig_fromname'), $email, $copy_subject, $copy_text );
+		}
+		?>
+		<script>
+		alert( "<?php echo T_('Thank you for your e-mail'); ?>" );
+		document.location.href='<?php echo sefRelToAbs( 'index.php?option='. $this->manager->option .'&Itemid='. $this->Itemid ); ?>';
+		</script>
+		<?php
+	}
 
-//Load Vars
-$con_id 	= intval( mosGetParam( $_REQUEST ,'con_id', 0 ) );
-$contact_id = intval( mosGetParam( $_REQUEST ,'contact_id', 0 ) );
-$catid 		= intval( mosGetParam( $_REQUEST ,'catid', 0 ) );
-
-switch( $task ) {
-	case 'view':
-		contactpage( $contact_id );
-		break;
-
-	case 'vcard':
-		vCard( $contact_id );
-		break;
-
-	default:
-		listContacts( $option, $catid );
-		break;
-}
+	/**
+	* Check field contains an email address:
+	* Returns false if text is not an email address
+	*/
+	function is_email($email){
+		return preg_match("/^[A-Z0-9._%-]+@[A-Z0-9.-]+.[A-Z]{2,4}$/i", $email );
+	}
+
+	/**
+	* Check single-line inputs:
+	* Returns true if text contains newline character
+	*/
+	function has_newlines($text) {
+	   return preg_match("/(%0A|%0D|\n+|\r+)/i", $text);
+	}
 
-switch( $op ) {
-	case 'sendmail':
-		sendmail( $con_id, $option );
-		break;
+	/**
+	* Check multi-line inputs:
+	* Returns true if text contains newline followed by
+	* email-header specific string
+	*/
+	function has_emailheaders($text) {
+	   return preg_match("/(%0A|%0D|\n+|\r+)(content-type:|to:|cc:|bcc:)/i", $text);
+	}
 
 }
 
+class contact_lister_Controller extends contactUserControllers {
 
-function listContacts( $option, $catid ) {
-	global $mainframe, $database, $my;
-	global $mosConfig_live_site;
-	global $Itemid;
-
-	/* Query to retrieve all categories that belong under the contacts section and that are published. */
-	$query = "SELECT *, COUNT(a.id) AS numlinks"
-	. "\n FROM #__categories AS cc"
-	. "\n LEFT JOIN #__contact_details AS a ON a.catid = cc.id"
-	. "\n WHERE a.published='1'"
-	. "\n AND cc.section='com_contact_details'"
-	. "\n AND cc.published='1'"
-	. "\n AND a.access <= '". $my->gid ."'"
-	. "\n AND cc.access <= '". $my->gid ."'"
-	. "\n GROUP BY cc.id"
-	. "\n ORDER BY cc.ordering"
-	;
-	$database->setQuery( $query );
-	$categories = $database->loadObjectList();
-
-	$count = count( $categories );
-	if ( ( $count < 2 ) && ( @$categories[0]->numlinks == 1 ) ) {
-		// if only one record exists loads that record, instead of displying category list
-		contactpage( $option, 0 );
-	} else {
+	function lister () {
+		$categories = &mosContact::getCategories($this->user);
+		$count = count($categories);
+		if ($count == 0 OR ($count == 1 AND $categories[0]->numlinks == 1)) {
+			// No or one category that qualifies
+			$this->contact_id = $count == 1 ? $categories[0]->minimum : 0;
+			$controller = new contact_view_Controller ($this->manager);
+			$controller->view();
+			return;
+		}
 		$rows = array();
-		$currentcat = NULL;
-		if ( $catid ) {
+		$currentcat =& new stdClass();
+		// Parameters
+		$menuhandler = mosMenuHandler::getInstance();
+		$menu =& $menuhandler->getMenuByID($this->Itemid);
+		$params =& $this->makeParams ($menu->params, $menu->name);
+		// page header
+		$currentcat->header = $params->get( 'header' );
+		// Path to images
+		$path = mamboCore::get('mosConfig_live_site').'/images/stories/';
+		$currentcat->descrip = '';
+		$currentcat->img = '';
+		if ( $this->catid ) {
+			$params->set( 'type', 'category' );
 			// url links info for category
-			$query = "SELECT *"
-			. "\n FROM #__contact_details"
-			. "\n WHERE catid = '". $catid."'"
-			 . "\n AND published='1'"
-			 . "\n AND access <= '". $my->gid ."'"
-			. "\n ORDER BY ordering"
-			;
-			$database->setQuery( $query );
-			$rows = $database->loadObjectList();
-
+			$rows = mosContact::getContacts($this->catid, $this->user);
 			// current category info
-			$query = "SELECT name, description, image, image_position"
-			. "\n FROM #__categories"
-			. "\n WHERE id = '". $catid ."'"
-			. "\n AND published = '1'"
-			. "\n AND access <= '". $my->gid ."'"
-			;
-			$database->setQuery( $query );
-			$database->loadObject( $currentcat );
+			foreach ($categories as $category) {
+				if ($category->id == $this->catid) {
+					$currentcat =& $category;
+					// show description
+					$currentcat->descrip = $currentcat->description;
+					// page image
+					$currentcat->img = $path . $currentcat->image;
+					$currentcat->align = $currentcat->image_position;
+					// page header
+					if ( @$currentcat->name <> '' ) $currentcat->header .= ' - '.$currentcat->name;
+					break;
+				}
+			}
 		}
+		else {
+			$params->set( 'type', 'section' );
+			// show description
+			if ( $params->get( 'description' ) ) $currentcat->descrip = $params->get( 'description_text' );
+			// page image
+			if ( $params->get( 'image' ) <> -1 ) {
+				$currentcat->img = $path . $params->get( 'image' );
+				$currentcat->align = $params->get( 'image_align' );
+			}
+		}
+		// used to show table rows in alternating colours
+		$tabclass = array( 'sectiontableentry1', 'sectiontableentry2' );
+		HTML_contact::displaylist( $categories, $rows, $this->catid, $currentcat, $params, $tabclass );
+		if ($this->op == 'sendmail') $this->sendmail();
+	}
 
-		// Parameters
-		$menu =& new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-
+	function &makeParams ($rawparams, $name) {
+		$params =& new mosParameters( $rawparams );
 		$params->def( 'page_title', 1 );
-		$params->def( 'header', $menu->name );
+		$params->def( 'header', $name );
 		$params->def( 'pageclass_sfx', '' );
 		$params->def( 'headings', 1 );
-		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-		$params->def( 'description_text', _CONTACTS_DESC );
+		$params->def( 'back_button', mamboCore::get('mosConfig_back_button') );
+		$params->def( 'description_text', T_('The Contact list for this Website.') );
 		$params->def( 'image', -1 );
 		$params->def( 'image_align', 'right' );
 		$params->def( 'other_cat_section', 1 );
@@ -123,100 +178,90 @@
 		$params->def( 'phone', '1' );
 		$params->def( 'fax', '1' );
 		$params->def( 'telephone', '1' );
+		return $params;
+	}
 
-		if ( $catid ) {
-			$params->set( 'type', 'category' );
-		} else {
-			$params->set( 'type', 'section' );
+}
+
+class contact_view_Controller extends contactUserControllers {
+
+	function view () {
+		$database = mamboDatabase::getInstance();
+		$query = "SELECT a.*, a.id AS value, CONCAT_WS( ' - ', a.name, a.con_position ) AS text"
+		. "\n FROM #__contact_details AS a"
+		. "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
+		. "\n WHERE a.published = '1'"
+		. "\n AND cc.published = '1'"
+		. "\n AND a.access <=". $this->user->gid
+		. "\n AND cc.access <=". $this->user->gid
+		. "\n ORDER BY a.default_con DESC, a.ordering ASC"
+		;
+		$database->setQuery( $query );
+		$list = $database->loadObjectList();
+		$count = count($list);
+		if ($count == 0) {
+			$params =& new mosParameters();
+			$params->def( 'back_button', mamboCore::get( 'mosConfig_back_button' ) );
+			HTML_contact::nocontact( $params );
+			return;
 		}
-		
-		// page description
-		$currentcat->descrip = '';
-		if( ( @$currentcat->description ) <> '' ) {
-			$currentcat->descrip = $currentcat->description;
-		} else if ( !$catid ) {
-			// show description
-			if ( $params->get( 'description' ) ) {
-				$currentcat->descrip = $params->get( 'description_text' );
+		if ( $this->contact_id == 0 ) $this->contact_id = $list[0]->id;
+		foreach ($list as $cont) {
+			if ($cont->id == $this->contact_id) {
+				$contact =& $cont;
+				break;
 			}
 		}
-
-		// page image
-		$currentcat->img = '';
-		$path = $mosConfig_live_site .'/images/stories/';
-		if ( ( @$currentcat->image ) <> '' ) {
-			$currentcat->img = $path . $currentcat->image;
-			$currentcat->align = $currentcat->image_position;
-		} else if ( !$catid ) {
-			if ( $params->get( 'image' ) <> -1 ) {
-				$currentcat->img = $path . $params->get( 'image' );
-				$currentcat->align = $params->get( 'image_align' );
-			}
+		if (!isset($contact)) {
+			echo T_('You are not authorized to view this resource.');
+			return;
 		}
-
-		// page header
-		$currentcat->header = '';
-		if ( @$currentcat->name <> '' ) {
-			$currentcat->header = $params->get( 'header' ) .' - '. $currentcat->name;
-		} else {
-			$currentcat->header = $params->get( 'header' );
+		// creates dropdown select list
+		$contact->select = mosHTML::selectList( $list, 'contact_id', 'class="inputbox" onchange="ViewCrossReference(this);"', 'value', 'text', $this->contact_id );
+		// Adds parameter handling
+		$params =& $this->makeParams ( $contact->params );
+		if ( $contact->email_to AND $params->get( 'email' )) {
+			// email cloacking
+			$contact->email = mosHTML::emailCloaking( $contact->email_to );
 		}
+		// loads current template for the pop-up window
+		$pop = mosGetParam( $_REQUEST, 'pop', 0 );
+		if ( $pop ) {
+			$params->set( 'popup', 1 );
+			$params->set( 'back_button', 0 );
+		}
+		if ( $params->get( 'email_description' ) ) $params->set( 'email_description', $params->get( 'email_description_text' ) );
+		else $params->set( 'email_description', '' );
 
-		// used to show table rows in alternating colours
-		$tabclass = array( 'sectiontableentry1', 'sectiontableentry2' );
-
-		HTML_contact::displaylist( $categories, $rows, $catid, $currentcat, $params, $tabclass );
-	}
-}
-
-
-function contactpage( $contact_id ) {
-	global $mainframe, $database, $my, $Itemid;
+		// needed to control the display of the Address marker
+		$temp = $params->get( 'street_address' )
+		. $params->get( 'suburb' )
+		. $params->get( 'state' )
+		. $params->get( 'country' )
+		. $params->get( 'postcode' )
+		;
+		$params->set( 'address_check', $temp );
 
-	$query = "SELECT a.id AS value, CONCAT_WS( ' - ', a.name, a.con_position ) AS text"
-	. "\n FROM #__contact_details AS a"
-	. "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
-	. "\n WHERE a.published = '1'"
-	. "\n AND cc.published = '1'"
-	. "\n AND a.access <=". $my->gid
-	. "\n AND cc.access <=". $my->gid
-	. "\n ORDER BY a.default_con DESC, a.ordering ASC"
-	;
-
-
-	$database->setQuery( $query );
-	$list = $database->loadObjectList();
-	$count = count( $list );
-
-	if ( $count ) {
-
-		if ( $contact_id < 1 ) {
-		    $contact_id = $list[0]->value;
-		}
-
-		$query = "SELECT *"
-		. "\n FROM #__contact_details"
-		. "\n WHERE published = '1'"
-		. "\n AND id = ".$contact_id
-		. "\n AND access <=". $my->gid;
-		$database->SetQuery($query);
-		$contacts = $database->LoadObjectList();
+		// determines whether to use Text, Images or nothing to highlight the different info groups
+		$this->groupMarking($params);
+		// params from menu item
+		$menuhandler = mosMenuHandler::getInstance();
+		$menu =& $menuhandler->getMenuByID($this->Itemid);
+		$menu_params =& new mosParameters( $menu->params );
 
-		if (!$contacts){
-			echo _NOT_AUTH;
-			return;
-		}
-		$contact = $contacts[0];
-		// creates dropdown select list
-		$contact->select = mosHTML::selectList( $list, 'contact_id', 'class="inputbox" onchange="ViewCrossReference(this);"', 'value', 'text', $contact_id );
+		$menu_params->def( 'page_title', 1 );
+		$menu_params->def( 'header', $menu->name );
+		$menu_params->def( 'pageclass_sfx', '' );
 
-		// Adds parameter handling
-		$params =& new mosParameters( $contact->params );
+		HTML_contact::viewcontact( $contact, $params, $count, $list, $menu_params );
+	}
 
+	function &makeParams ($rawparams) {
+		$params =& new mosParameters( $rawparams );
 		$params->set( 'page_title', 0 );
 		$params->def( 'pageclass_sfx', '' );
-		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-		$params->def( 'print', !$mainframe->getCfg( 'hidePrint' ) );
+		$params->def( 'back_button', mamboCore::get( 'mosConfig_back_button' ) );
+		$params->def( 'print', !mamboCore::get( 'mosConfig_hidePrint' ) );
 		$params->def( 'name', '1' );
 		$params->def( 'email', '0' );
 		$params->def( 'street_address', '1' );
@@ -229,11 +274,11 @@
 		$params->def( 'misc', '1' );
 		$params->def( 'image', '1' );
 		$params->def( 'email_description', '1' );
-		$params->def( 'email_description_text', _EMAIL_DESCRIPTION );
+		$params->def( 'email_description_text', T_('Send an Email to this Contact:') );
 		$params->def( 'email_form', '1' );
 		$params->def( 'email_copy', '1' );
 		// global pront|pdf|email
-		$params->def( 'icons', $mainframe->getCfg( 'icons' ) );
+		$params->def( 'icons', mamboCore::get( 'mosConfig_icons' ) );
 		// contact only icons
 		$params->def( 'contact_icons', 0 );
 		$params->def( 'icon_address', '' );
@@ -243,44 +288,18 @@
 		$params->def( 'icon_misc', '' );
 		$params->def( 'drop_down', '0' );
 		$params->def( 'vcard', '1' );
+		return $params;
+	}
 
-
-		if ( $contact->email_to && $params->get( 'email' )) {
-			// email cloacking
-			$contact->email = mosHTML::emailCloaking( $contact->email_to );
-		}
-
-		// loads current template for the pop-up window
-		$pop = mosGetParam( $_REQUEST, 'pop', 0 );
-		if ( $pop ) {
-			$params->set( 'popup', 1 );
-			$params->set( 'back_button', 0 );
-		}
-
-		if ( $params->get( 'email_description' ) ) {
-			$params->set( 'email_description', $params->get( 'email_description_text' ) );
-		} else {
-			$params->set( 'email_description', '' );
-		}
-
-		// needed to control the display of the Address marker
-		$temp = $params->get( 'street_address' )
-		. $params->get( 'suburb' )
-		. $params->get( 'state' )
-		. $params->get( 'country' )
-		. $params->get( 'postcode' )
-		;
-		$params->set( 'address_check', $temp );
-
-		// determines whether to use Text, Images or nothing to highlight the different info groups
+	function groupMarking ($params) {
 		switch ( $params->get( 'contact_icons' ) ) {
 			case 1:
 			// text
-				$params->set( 'marker_address', _CONTACT_ADDRESS );
-				$params->set( 'marker_email', _CONTACT_EMAIL );
-				$params->set( 'marker_telephone', _CONTACT_TELEPHONE );
-				$params->set( 'marker_fax', _CONTACT_FAX );
-				$params->set( 'marker_misc', _CONTACT_MISC );
+				$params->set( 'marker_address', T_('Address: ') );
+				$params->set( 'marker_email', T_('Email: ') );
+				$params->set( 'marker_telephone', T_('Telephone: ') );
+				$params->set( 'marker_fax', T_('Fax: ') );
+				$params->set( 'marker_misc', T_('Information: ') );
 				$params->set( 'column_width', '100px' );
 				break;
 			case 2:
@@ -294,11 +313,12 @@
 				break;
 			default:
 			// icons
-				$image1 = mosAdminMenus::ImageCheck( 'con_address.png', '/images/M_images/', $params->get( 'icon_address' ) );
-				$image2 = mosAdminMenus::ImageCheck( 'emailButton.png', '/images/M_images/', $params->get( 'icon_email' ) );
-				$image3 = mosAdminMenus::ImageCheck( 'con_tel.png', '/images/M_images/', $params->get( 'icon_telephone' ) );
-				$image4 = mosAdminMenus::ImageCheck( 'con_fax.png', '/images/M_images/', $params->get( 'icon_fax' ) );
-				$image5 = mosAdminMenus::ImageCheck( 'con_info.png', '/images/M_images/', $params->get( 'icon_misc' ) );
+				$mainframe = mosMainFrame::getInstance();
+				$image1 = $mainframe->ImageCheck( 'con_address.png', '/images/M_images/', $params->get( 'icon_address' ) );
+				$image2 = $mainframe->ImageCheck( 'emailButton.png', '/images/M_images/', $params->get( 'icon_email' ) );
+				$image3 = $mainframe->ImageCheck( 'con_tel.png', '/images/M_images/', $params->get( 'icon_telephone' ) );
+				$image4 = $mainframe->ImageCheck( 'con_fax.png', '/images/M_images/', $params->get( 'icon_fax' ) );
+				$image5 = $mainframe->ImageCheck( 'con_info.png', '/images/M_images/', $params->get( 'icon_misc' ) );
 				$params->set( 'marker_address', $image1 );
 				$params->set( 'marker_email', $image2 );
 				$params->set( 'marker_telephone', $image3 );
@@ -307,130 +327,58 @@
 				$params->set( 'column_width', '40px' );
 				break;
 		}
-
-		// params from menu item
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );	
-		$menu_params =& new mosParameters( $menu->params );		
-		
-		$menu_params->def( 'page_title', 1 );
-		$menu_params->def( 'header', $menu->name );
-		$menu_params->def( 'pageclass_sfx', '' );
-		
-		HTML_contact::viewcontact( $contact, $params, $count, $list, $menu_params );
-	} else {
-		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-		HTML_contact::nocontact( $params );
 	}
-}
 
-
-function sendmail( $con_id, $option ) {
-	global $database, $Itemid;
-	global $mosConfig_sitename, $mosConfig_live_site, $mosConfig_mailfrom, $mosConfig_fromname;
-
-	$query = "SELECT * FROM #__contact_details WHERE id='$con_id'";
-	$database->setQuery( $query );
-	$contact 	= $database->loadObjectList();
-
-	$default 	= $mosConfig_sitename.' '. _ENQUIRY;
-	$email 		= trim( mosGetParam( $_POST, 'email', '' ) );
-	$text 		= trim( mosGetParam( $_POST, 'text', '' ) );
-	$name 		= trim( mosGetParam( $_POST, 'name', '' ) );
-	$subject 	= trim( mosGetParam( $_POST, 'subject', $default ) );
-	$email_copy = mosGetParam( $_POST, 'email_copy', 0 );
-
-	if ( !$email || !$text || ( is_email( $email )==false ) ) {
-		echo "<script>alert (\""._CONTACT_FORM_NC."\"); window.history.go(-1);</script>";
-		exit(0);
-	}
-	$prefix = sprintf( _ENQUIRY_TEXT, $mosConfig_live_site );
-	$text 	= $prefix ."\n". $name. ' <'. $email .'>' ."\n\n". stripslashes( $text );
-
-	mosMail( $email, $name , $contact[0]->email_to, $mosConfig_fromname .': '. $subject, $text );
-
-	if ( $email_copy ) {
-		$copy_text = sprintf( _COPY_TEXT, $contact[0]->name, $mosConfig_sitename );
-		$copy_text = $copy_text ."\n\n". $text .'';
-		$copy_subject = _COPY_SUBJECT . $subject;
-		mosMail( $mosConfig_mailfrom, $mosConfig_fromname, $email, $copy_subject, $copy_text );
-	}
-	?>
-	<script>
-	alert( "<?php echo _THANK_MESSAGE; ?>" );
-	document.location.href='<?php echo sefRelToAbs( 'index.php?option='. $option .'&Itemid='. $Itemid ); ?>';
-	</script>
-	<?php
 }
 
+class contact_vcard_Controller extends contactUserControllers {
 
-function is_email($email){
-	$rBool=false;
+	function vcard () {
+		$contact = new mosContact();
+		$contact->load($this->contact_id);
+		$params = new mosParameters($contact->params);
+		if (!$params->get('vcard')) return;
+		$name = explode(' ', $contact->name);
+		$firstname = $name[0];
+		unset($name[0]);
+		$last = count($name);
+		if (isset($name[$last])) {
+			$surname = $name[$last];
+			unset($name[$last]);
+		}
+		else $surname = '';
+		$middlename = trim (implode(' ', $name));
+
+		$v 	= new MambovCard();
+		$v->setPhoneNumber( $contact->telephone, 'PREF;WORK;VOICE' );
+		$v->setPhoneNumber( $contact->fax, 'WORK;FAX' );
+		$v->setName( $surname, $firstname, $middlename, '' );
+		$v->setAddress( '', '', $contact->address, $contact->suburb, $contact->state, $contact->postcode, $contact->country, 'WORK;POSTAL' );
+		$v->setEmail( $contact->email_to );
+		$v->setNote( $contact->misc );
+		$v->setURL( mamboCore::get('mosConfig_live_site'), 'WORK' );
+		$v->setTitle( $contact->con_position );
+		$v->setOrg( mamboCore::get('mosConfig_sitename') );
+
+		$filename	= str_replace( ' ', '_', $contact->name );
+		$v->setFilename( $filename );
+
+		$output 	= $v->getVCard( mamboCore::get('mosConfig_sitename') );
+		$filename = $v->getFileName();
+
+		// header info for page
+		header( 'Content-Disposition: attachment; filename='. $filename );
+		header( 'Content-Length: '. strlen( $output ) );
+		header( 'Connection: close' );
+		header( 'Content-Type: text/x-vCard; name='. $filename );
 
-	if  ( preg_match( "/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/" , $email ) ){
-		$rBool=true;
+		print $output;
+		mosRedirect('index.php');
 	}
-	return $rBool;
-}
 
-function vCard( $id ) {
-	global $database;
-	global $mosConfig_sitename, $mosConfig_absolute_path, $mosConfig_live_site;
-	
-	$contact 	= new mosContact( $database );
-	$contact->load( $id );
-	$name 	= explode( ' ', $contact->name );
-	$count 	= count( $name );
-
-	// handles conversion of name entry into firstname, surname, middlename distinction
-	$surname	= '';
-	$middlename	= '';
-	
-	switch( $count ) {
-		case 1:
-			$firstname		= $name[0];
-			break;
-			
-		case 2:
-			$firstname 		= $name[0];
-			$surname		= $name[1];
-			break;
-			
-		default:
-			$firstname 		= $name[0];
-			$surname		= $name[$count-1];
-			for ( $i = 1; $i < $count - 1 ; $i++ ) {
-				$middlename	.= $name[$i] .' ';
-			}		
-			break;
-	}
-	$middlename	= trim( $middlename );
-
-	$v 	= new MambovCard();
-	
-	$v->setPhoneNumber( $contact->telephone, 'PREF;WORK;VOICE' );
-	$v->setPhoneNumber( $contact->fax, 'WORK;FAX' );
-	$v->setName( $surname, $firstname, $middlename, '' );
-	$v->setAddress( '', '', $contact->address, $contact->suburb, $contact->state, $contact->postcode, $contact->country, 'WORK;POSTAL' );
-	$v->setEmail( $contact->email_to );
-	$v->setNote( $contact->misc );
-	$v->setURL( $mosConfig_live_site, 'WORK' );
-	$v->setTitle( $contact->con_position );
-	$v->setOrg( $mosConfig_sitename );
-
-	$filename	= str_replace( ' ', '_', $contact->name );
-	$v->setFilename( $filename );
-	
-	$output 	= $v->getVCard( $mosConfig_sitename );
-	$filename = $v->getFileName();
-
-	// header info for page
-	header( 'Content-Disposition: attachment; filename='. $filename );
-	header( 'Content-Length: '. strlen( $output ) );
-	header( 'Connection: close' );
-	header( 'Content-Type: text/x-vCard; name='. $filename );
-	
-	print $output;
 }
 
+$alternatives = array ();
+$admin =& new mosComponentUserManager ('contact', 'task', $alternatives, 'lister', T_('Contact Us'), $version);
+
 ?>
diff -ruN 4.5.4/components/com_containers/containers.class.php 4.6rc2/components/com_containers/containers.class.php
--- 4.5.4/components/com_containers/containers.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/components/com_containers/containers.class.php	2006-04-11 09:36:50.000000000 -0500
@@ -0,0 +1,282 @@
+<?php
+
+class mosContainer extends mosTableEntry {
+	/** @var int ID for container record in database */
+	public $id = 0;
+	/** @var int Ordering */
+	public $ordering = 0;
+	/** @var string Window title */
+	public $windowtitle = '';
+	/** @var string Key words */
+	public $keywords = '';
+	/** @var int ID of parent container in database if a folder */
+	public $parentid = 0;
+	/** @var string Name of container */
+	public $name = '';
+	/** @var string Container description */
+	public $description='';
+	/** @var bool Is the container published? */
+	public $published=false;
+	/** @var string Icon - not sure how this is used */
+	public $icon='';
+	/** @var bool Has all the data been loaded (rather than just the basics) */
+	protected $loaded = 0;
+	/** @var array Child containers */
+	protected $children = array();
+	/** @var bool When true, the item is marked as trash */
+	protected $isTrash = false;
+
+	function tableName () {
+		return '#__containers';
+	}
+
+	function notSQL () {
+		return array ('id', 'loaded', 'children', 'database');
+	}
+
+	function load () {
+		$database = mamboDatabase::getInstance();
+		if ($this->loaded == 0 AND $this->id) {
+			$database->setQuery("SELECT * FROM #__containers WHERE id=$this->id");
+			$database->loadObject($this);
+			$this->loaded = 1;
+		}
+	}
+
+	function saveValues () {
+		$database = mamboDatabase::getInstance();
+		$this->prepareValues();
+		if ($this->id == 0) $database->doSQL($this->insertSQL());
+		else $database->doSQL($this->updateSQL());
+	}
+
+	function trash () {
+		$this->isTrash = true;
+	}
+
+	function isTrash () {
+		return $this->isTrash;
+	}
+
+	function addChild ($id) {
+		$this->children[] = $id;
+	}
+
+	function deleteAll () {
+		$folders = $this->getChildren(false);
+		foreach ($folders as $folder) $folder->deleteAll ();
+//      Need to delete things that are registered with this
+		$this->trash();
+	}
+
+	function setMetaData () {
+		$mainframe = mosMainFrame::getInstance();
+		$mainframe->prependMetaTag('description', strip_tags($this->name));
+		if ($this->keywords) $mainframe->prependMetaTag('keywords', $this->keywords);
+		else $mainframe->prependMetaTag('keywords', $this->name);
+	}
+
+	function isCategory () {
+		if ($this->parentid == 0) return true;
+		else return false;
+	}
+
+	function getCategoryName ($showself=false) {
+		$category = $this->getCategory();
+		if ($this->parentid OR $showself) return $category->name;
+		return '*';
+    }
+
+    function getCategory () {
+		$container =& $this;
+		while ($container->parentid) $container =& $container->getParent();
+		return $container;
+	}
+
+    function getFamilyNames ($include=false) {
+    	$names = $include ? '/'.$this->name : '';
+    	$generation = 1;
+    	$ancestor =& $this;
+    	while ($ancestor->parentid AND $generation < 3) {
+    		$ancestor =& $ancestor->getParent();
+    		$generation++;
+    		$names = '/'.$ancestor->name.$names;
+    	}
+    	if ($ancestor->parentid) $names = '..'.$names;
+    	if ($names) return $names;
+    	return '-';
+    }
+
+	function &addChildren (&$descendants, $published=true, $search='', $recurse=false) {
+		$children = array();
+		$handler = mosContainerHandler::getInstance();
+		foreach ($this->children as $i) {
+			$container =& $handler->getBasicContainer($i);
+			if ($published AND $container->published == 0) continue;
+			if ($search AND strpos(strtolower($container->name), strtolower($search)) === false) continue;
+			$children[] =& $container;
+			$descendants[] =& $container;
+		}
+		if ($recurse) foreach ($children as $child) $child->addChildren ($descendants, $published, $search, $recurse);
+		return $children;
+	}
+
+	function &getChildren ($published=true, $search='') {
+		$children = array();
+		$this->addChildren($children, $published, $search);
+		return $children;
+	}
+
+	function &getDescendants ($search='') {
+		$descendants = array();
+		$this->addChildren ($descendants, false, $search, true);
+		return $descendants;
+	}
+
+	function &getParent () {
+		$handler = mosContainerHandler::getInstance();
+		$parent =& $handler->getBasicContainer($this->parentid);
+		return $parent;
+	}
+
+	function getSelectList ($type, $parm, $published, $notThis=0) {
+		$selector[] = mosHTML::makeOption(0,T_('No parent'));
+		$handler = mosContainerHandler::getInstance();
+		foreach ($handler->getCategories() as $category) $category->addSelectList('',$selector,$notThis,$published);
+		return mosHTML::selectList( $selector, $type, $parm, 'value', 'text', $this->id );
+	}
+
+	function addSelectList ($prefix, &$selector, $notThis, $published) {
+		if (($notThis == 0) OR ($this->id != $notThis)) $selector[] = mosHTML::makeOption($this->id, $prefix.htmlspecialchars($this->name));
+		foreach ($this->getChildren($published) as $container) $container->addSelectList($prefix.$this->name.'/',$selector,$notThis,$published);
+	}
+
+	function getURL () {
+	}
+
+	function setPathway () {
+	}
+
+	function &getIcons () {
+		$iconList = '';
+		$live_site = mamboCore::get('mosConfig_live_site');
+		$iconDir = new mosDirectory (mamboCore::get('mosConfig_absolute_path').'/administrator/components/com_containers/images/folder_icons');
+		$files = $iconDir->listAll();
+		$ss = 0;
+		foreach ($files as $file) {
+			$iconList.="\n<a href=\"JavaScript:paste_strinL('{$file}')\" onmouseover=\"window.status='{$file}'; return true\"><img src=\"{$live_site}/administrator/components/com_containers/images/folder_icons/{$file}\" width=\"32\" height=\"32\" border=\"0\" alt=\"{$file}\" /></a>&nbsp;&nbsp;";
+	        $ss++;
+			if ($ss % 10 == 0) $iconList.="<br/>\n";
+		}
+		return $iconList;
+	}
+
+
+	function togglePublished ($idlist, $value) {
+		$cids = implode( ',', $idlist );
+		$sql = "UPDATE #__downloads_containers SET published=$value". "\nWHERE id IN ($cids)";
+		remositoryRepository::doSQL ($sql);
+	}
+
+	function mosImageURL($imageName, $width=32, $height=32) {
+		$live_site = mamboCore::get('mosConfig_live_site');
+		$element = '<img src="';
+		$element .= $live_site.'/administrator/components/com_containers/images/'.$imageName;
+		$element .= '" width="';
+		$element .= $width;
+		$element .= '" height="';
+		$element .= $height;
+		$element .= '" border="0" align="middle" alt="';
+		$element .= $imageName;
+		$element .= '"/>';
+		return $element;
+	}
+
+}
+
+class mosContainerHandler {
+	var $rows = array();
+	var $links = array();
+	var $anchor = '';
+
+	function mosContainerHandler () {
+		$this->resetData();
+	}
+
+	static function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) $instance = new mosContainerHandler();
+		return $instance;
+	}
+	
+	function resetData () {
+		unset ($this->rows, $this->links, $this->anchor);
+		$database = mamboDatabase::getInstance();
+		$this->anchor =& new mosContainer();
+		$sql = 'SELECT id, parentid, name, published, ordering FROM #__containers ORDER BY ordering, name';
+		$this->rows =& $database->doSQLget($sql, 'mosContainer');
+		foreach ($this->rows as $i=>$row) $this->links[$row->id] = $i;
+		foreach ($this->rows as $row) if ($row->parentid) {
+			$parent =& $this->rows[$this->links[$row->parentid]];
+			$parent->addChild($row->id);
+		}
+		else $this->anchor->addChild($row->id);
+	}
+
+	function &getBasicContainer ($id) {
+		if ($id == 0) return $this->anchor;
+		return $this->rows[$this->links[$id]];
+	}
+
+	function &getContainer ($id) {
+		global $database;
+		$result =& $this->getBasicContainer($id);
+		$result->load();
+		return $result;
+	}
+
+	function &getCategories ($published = false, $search = null) {
+		$categories = array();
+		foreach ($this->anchor->getChildren() as $category) {
+			if ($published AND $category->published == 0) continue;
+			if ($search AND strpos(strtolower($category->name), strtolower($search)) === false) continue;
+			$categories[] = $category;
+		}
+		return $categories;
+	}
+
+	function getDescendantIDList ($id, $search='') {
+		$top = $this->getBasicContainer ($id);
+		$descendants =& $top->getDescendants ($search);
+		$list = $id;
+		foreach ($descendants as $descendant) $list .= ','.$descendant->id;
+		return $list;
+	}
+
+	function getSelectList ($allowTop, $default, $type, $parm, &$user) {
+		if ($allowTop) $selector[] = mosHTML::makeOption(0,_DOWN_NO_PARENT);
+		foreach ($this->getCategories() as $category) $category->addSelectList('', $selector, null, $user);
+		if (isset($selector)) return mosHTML::selectList( $selector, $type, $parm, 'value', 'text', $default );
+		else return '';
+	}
+
+	// Only needed for testing
+	function displayChildren (&$container) {
+		echo '<br />'.$container->name.' has children:<br />';
+		foreach ($container->children as $child) echo $child->name.' whose parent is '.$child->parent->name.'<br />';
+		foreach ($container->children as $child) displayChildren ($child);
+	}
+
+	function markTrash () {
+		$database = mamboDatabase::getInstance();
+		foreach ($this->rows as $row) if ($row->isTrash()) $trash[] = $row->id;
+		if (isset($trash)) {
+			$trashlist = implode (',', $trash);
+			$sql = "DELETE FROM #__containers WHERE id IN ($trashlist)";
+			$database->doSQL($sql);
+		}
+	}
+
+}
+
+?>
diff -ruN 4.5.4/components/com_content/content.class.php 4.6rc2/components/com_content/content.class.php
--- 4.5.4/components/com_content/content.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/components/com_content/content.class.php	2006-03-30 13:19:21.000000000 -0600
@@ -0,0 +1,449 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/**
+* Category database table class
+*/
+class mosCategory extends mosDBTable {
+	/** @var int Primary key */
+	var $id=null;
+	/** @var string The menu title for the Category (a short name)*/
+	var $title=null;
+	/** @var string The full name for the Category*/
+	var $name=null;
+	/** @var string */
+	var $image=null;
+	/** @var string */
+	var $section=null;
+	/** @var int */
+	var $image_position=null;
+	/** @var string */
+	var $description=null;
+	/** @var boolean */
+	var $published=null;
+	/** @var boolean */
+	var $checked_out=null;
+	/** @var time */
+	var $checked_out_time=null;
+	/** @var int */
+	var $ordering=null;
+	/** @var int */
+	var $access=null;
+	/** @var string */
+	var $params=null;
+
+	/**
+	* @param database A database connector object
+	*/
+	function mosCategory( &$db ) {
+		$this->mosDBTable( '#__categories', 'id', $db );
+	}
+	// overloaded check function
+	function check() {
+		// check for valid name
+		if (trim( $this->title ) == '') {
+			$this->_error = "Your Category must contain a title.";
+			return false;
+		}
+		if (trim( $this->name ) == '') {
+			$this->_error = "Your Category must have a name.";
+			return false;
+		}
+		// check for existing name
+		$this->_db->setQuery( "SELECT id FROM #__categories "
+		. "\nWHERE name='".$this->name."' AND section='".$this->section."'"
+		);
+
+		$xid = intval( $this->_db->loadResult() );
+		if ($xid && $xid != intval( $this->id )) {
+			$this->_error = "There is a category already with that name, please try again.";
+			return false;
+		}
+		return true;
+	}
+}
+
+/**
+* Section database table class
+* @package Mambo
+*/
+class mosSection extends mosDBTable {
+	/** @var int Primary key */
+	var $id=null;
+	/** @var string The menu title for the Section (a short name)*/
+	var $title=null;
+	/** @var string The full name for the Section*/
+	var $name=null;
+	/** @var string */
+	var $image=null;
+	/** @var string */
+	var $scope=null;
+	/** @var int */
+	var $image_position=null;
+	/** @var string */
+	var $description=null;
+	/** @var boolean */
+	var $published=null;
+	/** @var boolean */
+	var $checked_out=null;
+	/** @var time */
+	var $checked_out_time=null;
+	/** @var int */
+	var $ordering=null;
+	/** @var int */
+	var $access=null;
+	/** @var string */
+	var $params='';
+
+	/**
+	* @param database A database connector object
+	*/
+	function mosSection( &$db ) {
+		$this->mosDBTable( '#__sections', 'id', $db );
+	}
+	// overloaded check function
+	function check() {
+		// check for valid name
+		if (trim( $this->title ) == '') {
+			$this->_error = "Your Section must contain a title.";
+			return false;
+		}
+		if (trim( $this->name ) == '') {
+			$this->_error = "Your Section must have a name.";
+			return false;
+		}
+		// check for existing name
+		$this->_db->setQuery( "SELECT id FROM #__sections "
+		. "\nWHERE name='$this->name' AND scope='$this->scope'"
+		);
+
+		$xid = intval( $this->_db->loadResult() );
+		if ($xid && $xid != intval( $this->id )) {
+			$this->_error = "There is a section already with that name, please try again.";
+			return false;
+		}
+		return true;
+	}
+}
+
+/**
+* Module database table class
+* @package Mambo
+*/
+class mosContent extends mosDBTable {
+	/** @var int Primary key */
+	var $id=null;
+	/** @var string */
+	var $title=null;
+	/** @var string */
+	var $title_alias=null;
+	/** @var string */
+	var $introtext=null;
+	/** @var string */
+	var $fulltext=null;
+	/** @var int */
+	var $state=null;
+	/** @var int The id of the category section*/
+	var $sectionid=null;
+	/** @var int DEPRECATED */
+	var $mask=null;
+	/** @var int */
+	var $catid=null;
+	/** @var datetime */
+	var $created=null;
+	/** @var int User id*/
+	var $created_by=null;
+	/** @var string An alias for the author*/
+	var $created_by_alias=null;
+	/** @var datetime */
+	var $modified=null;
+	/** @var int User id*/
+	var $modified_by=null;
+	/** @var boolean */
+	var $checked_out=null;
+	/** @var time */
+	var $checked_out_time=null;
+	/** @var datetime */
+	var $frontpage_up=null;
+	/** @var datetime */
+	var $frontpage_down=null;
+	/** @var datetime */
+	var $publish_up=null;
+	/** @var datetime */
+	var $publish_down=null;
+	/** @var string */
+	var $images=null;
+	/** @var string */
+	var $urls=null;
+	/** @var string */
+	var $attribs=null;
+	/** @var int */
+	var $version=null;
+	/** @var int */
+	var $parentid=null;
+	/** @var int */
+	var $ordering=null;
+	/** @var string */
+	var $metakey=null;
+	/** @var string */
+	var $metadesc=null;
+	/** @var int */
+	var $access=null;
+	/** @var int */
+	var $hits=null;
+
+	/**
+	* @param database A database connector object
+	*/
+	function mosContent() {
+		$db =& mamboDatabase::getInstance();
+		$this->mosDBTable( '#__content', 'id', $db );
+	}
+
+	/**
+	 * Validation and filtering
+	 */
+	function check() {
+		// filter malicious code
+		$ignoreList = array( 'introtext', 'fulltext' );
+		$this->filter( $ignoreList );
+
+		/*
+		TODO: This filter is too rigorous,
+		need to implement more configurable solution
+		// specific filters
+		$iFilter = new InputFilter( null, null, 1, 1 );
+		$this->introtext = trim( $iFilter->process( $this->introtext ) );
+		$this->fulltext =  trim( $iFilter->process( $this->fulltext ) );
+		*/
+
+		if (trim( str_replace( '&nbsp;', '', $this->fulltext ) ) == '') {
+			$this->fulltext = '';
+		}
+
+		return true;
+	}
+
+	/**
+	* Converts record to XML
+	* @param boolean Map foreign keys to text values
+	*/
+	function toXML( $mapKeysToText=false ) {
+		global $database;
+
+		if ($mapKeysToText) {
+			$query = 'SELECT name FROM #__sections WHERE id=' . $this->sectionid;
+			$database->setQuery( $query );
+			$this->sectionid = $database->loadResult();
+
+			$query = 'SELECT name FROM #__categories WHERE id=' . $this->catid;
+			$database->setQuery( $query );
+			$this->catid = $database->loadResult();
+
+			$query = 'SELECT name FROM #__users WHERE id=' . $this->created_by;
+			$database->setQuery( $query );
+			$this->created_by = $database->loadResult();
+		}
+
+		return parent::toXML( $mapKeysToText );
+	}
+}
+
+class mosExtendedContent extends mosContent {
+	/** @var numeric */
+	var $rating = null;
+	/** @var int */
+	var $rating_count = null;
+	/** @var string */
+	var $author = null;
+	/** @var string */
+	var $usertype = null;
+	/** @var string */
+	var $section = null;
+	/** @var string */
+	var $category = null;
+	/** @var string */
+	var $groups = null;
+	/** @var string */
+	var $text = null;
+
+	function getText () {
+		return $this->text;
+	}
+
+	function saveText ($text) {
+		$this->text = $text;
+	}
+
+	function getImages () {
+		return $this->images;
+	}
+
+	function saveImages ($images) {
+		$this->images = $images;
+	}
+
+	function getId () {
+		return $this->id;
+	}
+
+	function getRating () {
+		return $this->rating;
+	}
+
+	function getRatingCount () {
+		return $this->rating_count;
+	}
+
+}
+
+class contentHandler {
+	var $_section_limit = 250;
+	var $_section_status = 0;
+	var $_sections;
+
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) $instance = new contentHandler();
+		return $instance;
+	}
+	/**
+	* @return number of Published Blog Sections
+	*/
+	function getBlogSectionCount( ) {
+		$menuhandler =& mosMenuHandler::getInstance();
+		if (count($menuhandler->getMenusByType('content_blog_section'))) {
+			$query = "SELECT COUNT( m.id )"
+			."\n FROM #__content AS i"
+			."\n LEFT JOIN #__sections AS s ON i.sectionid=s.id"
+			."\n LEFT JOIN #__menu AS m ON m.componentid=s.id "
+			."\n WHERE m.type='content_blog_section'"
+			."\n AND m.published='1'"
+			;
+			$database =& mamboDatabase::getInstance();
+			$database->setQuery( $query );
+			$count = $database->loadResult();
+		} else {
+			$count = 0;
+		}
+		return $count;
+	}
+
+	/**
+	* @return number of Published Blog Categories
+	*/
+	function getBlogCategoryCount( ) {
+		$menuhandler =& mosMenuHandler::getInstance();
+		if (count($menuhandler->getMenusByType('content_blog_category'))) {
+			$query = "SELECT COUNT( m.id )"
+			. "\n FROM #__content AS i"
+			. "\n LEFT JOIN #__categories AS c ON i.catid=c.id"
+			. "\n LEFT JOIN #__menu AS m ON m.componentid=c.id "
+			. "\n WHERE m.type='content_blog_category'"
+			. "\n  AND m.published='1'"
+			;
+			$database =& mamboDatabase::getInstance();
+			$database->setQuery( $query );
+			$count = $database->loadResult();
+		}
+		else $count = 0;
+		return $count;
+	}
+
+	/**
+	* @return number of Published Global Blog Sections
+	*/
+	function getGlobalBlogSectionCount( ) {
+		$menuhandler =& mosMenuHandler::getInstance();
+		return $menuhandler->getGlobalBlogSectionCount();
+	}
+
+	/**
+	* @return number of Static Content
+	*/
+	function getStaticContentCount( ) {
+		$menuhandler =& mosMenuHandler::getInstance();
+		return $menuhandler->getMenuCount ('content_typed', 1);
+	}
+
+	/**
+	* @return number of Content Item Links
+	*/
+	function getContentItemLinkCount( ) {
+		$menuhandler =& mosMenuHandler::getInstance();
+		return $menuhandler->getMenuCount ('content_item_link', 1);
+	}
+
+	function getItemid ($id, $typed=1, $link=1, $bs=1, $bc=1, $gbs=1) {
+		$_Itemid = null;
+		$menuhandler =& mosMenuHandler::getInstance();
+		if ($typed) {
+			// Search for typed link
+			$_Itemid = $menuhandler->getIDByTypeLink('content_typed', "index.php?option=com_content&task=view&id=$id");
+		}
+
+		if ($_Itemid == null AND $link) {
+			// Search for item link
+			$_Itemid = $menuhandler->getIDByTypeLink('content_item_link', "index.php?option=com_content&task=view&id=$id");
+		}
+		$sectionid = $this->getSection($id);
+		if ($_Itemid == null) {
+			// Search in sections
+			$_Itemid = $menuhandler->getIDByTypeCid ('content_section', $sectionid);
+		}
+		if ($_Itemid == null) {
+			// Search in sections
+			$_Itemid = $menuhandler->getIDByTypeCid ('content_blog_section', $sectionid);
+		}
+		if ($_Itemid == null) {
+			// Search in sections
+			$_Itemid = $menuhandler->getIDByTypeCid ('content_blog_category', $sectionid);
+		}
+		if ($_Itemid == null AND $gbs) {
+			// Search in global blog section
+			$_Itemid = $menuhandler->getIDByTypeCid('content_blog_section', 0);
+		}
+/*
+		if ($_Itemid == '') {
+			// Search in global blog category
+			$this->_db->setQuery( "SELECT id "
+			."\nFROM #__menu "
+			."\nWHERE type='content_blog_category' AND published='1' AND componentid=0" );
+			$_Itemid = $this->_db->loadResult();
+		}
+*/
+		if ($_Itemid) return $_Itemid;
+		else return mamboCore::get('Itemid');
+	}
+
+	function getSection ($id) {
+		$database =& mamboDatabase::getInstance();
+		$limit = $this->_section_limit;
+		if (!$this->_section_status) {
+			$database->setQuery("SELECT i.id, i.sectionid FROM #__content AS i, #__sections AS s WHERE i.sectionid=s.id ORDER BY i.id DESC LIMIT $limit");
+			$sections = $database->loadObjectList();
+			if ($sections) {
+				foreach ($sections as $section) $this->_sections[$section->id] = $section->sectionid;
+				$this->_section_status = count($sections);
+			}
+		}
+		if ($this->_section_status) {
+			if (isset($this->_sections[$id])) return $this->_sections[$id];
+			if (count($this->_sections) < $limit) return 0;
+			$database->setQuery("SELECT i.sectionid FROM #__content AS i, #__sections AS s WHERE i.sectionid=s.id AND i.id=$id");
+			return $database->loadResult();
+		}
+		else return 0;
+	}
+
+}
+
+?>
diff -ruN 4.5.4/components/com_content/content.html.php 4.6rc2/components/com_content/content.html.php
--- 4.5.4/components/com_content/content.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_content/content.html.php	2006-03-23 10:32:52.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: content.html.php,v 1.4 2005/10/26 10:40:00 csouza Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -15,8 +17,6 @@
 
 /**
 * Utility class for writing the HTML for content
-* @package Mambo
-* @subpackage Content
 */
 class HTML_content {
 	/**
@@ -67,7 +67,7 @@
 			} else if ( $catid ) {
 				?>
 				<br />
-				<?php echo _EMPTY_CATEGORY; ?>
+				<?php echo T_('This Category is currently empty'); ?>
 				<br /><br />
 				<?php
 			}
@@ -78,11 +78,9 @@
 			<td colspan="2">
 			<?php
 			// Displays listing of Categories
-			if ( ( ( count( $other_categories ) > 1 ) || ( count( $other_categories ) < 2 && count( $items ) < 1 ) ) ) {
-				if ( ( $params->get( 'type' ) == 'category' ) && $params->get( 'other_cat' ) ) {
-					HTML_content::showCategories( $params, $items, $gid, $other_categories, $catid, $id, $Itemid );
-				}
-				if ( ( $params->get( 'type' ) == 'section' ) && $params->get( 'other_cat_section' ) ) {
+			if (is_array($other_categories) AND (count($other_categories) > 1 OR count($items) < 1)) {
+				$paramtype = $params->get('type');
+				if (($paramtype == 'category' AND $params->get('other_cat')) OR ($paramtype == 'section' AND $params->get('other_cat_section'))) {
 					HTML_content::showCategories( $params, $items, $gid, $other_categories, $catid, $id, $Itemid );
 				}
 			}
@@ -115,7 +113,7 @@
 					<?php
 					if ( $params->get( 'cat_items' ) ) {
 						?>
-						&nbsp;<i>( <?php echo $row->numitems; echo _CHECKED_IN_ITEMS;?> )</i>
+						&nbsp;<i>( <?php printf(Tn_('%d item','%d items', $row->numitems), $row->numitems)?> )</i>
 						<?php
 					}
 					// Writes Category Description
@@ -131,7 +129,7 @@
 					<li>
 					<?php echo $row->name; ?>
 					<a href="<?php echo sefRelToAbs( 'index.php?option=com_registration&amp;task=register' ); ?>">
-					( <?php echo _E_REGISTERED; ?> )
+					( <?php echo T_('Registered Users Only'); ?> )
 					</a>
 					<?php
 				}
@@ -161,7 +159,7 @@
 						?>
 						<td align="right" width="100%" nowrap="nowrap">
 						<?php
-						echo _FILTER .'&nbsp;';
+						echo T_('Filter') .'&nbsp;';
 						?>
 						<input type="text" name="filter" value="<?php echo $lists['filter'];?>" class="inputbox" onchange="document.adminForm.submit();" />
 						</td>
@@ -172,7 +170,7 @@
 						?>
 						<td align="right" width="100%" nowrap="nowrap">
 						<?php
-						echo '&nbsp;&nbsp;&nbsp;'. _ORDER_DROPDOWN .'&nbsp;';
+						echo '&nbsp;&nbsp;&nbsp;'. T_('Order') .'&nbsp;';
 						echo $lists['order'];
 						?>
 						</td>
@@ -183,7 +181,7 @@
 						?>
 						<td align="right" width="100%" nowrap="nowrap">
 						<?php
-						echo '&nbsp;&nbsp;&nbsp;'. _PN_DISPLAY_NR .'&nbsp;';
+						echo '&nbsp;&nbsp;&nbsp;'. T_('Display #') .'&nbsp;';
 						$link = 'index.php?option=com_content&amp;task=category&amp;sectionid='. $sectionid .'&amp;id='. $catid .'&amp;Itemid='. $Itemid;
 						echo $pageNav->getLimitBox( $link );
 						?>
@@ -203,28 +201,28 @@
 				if ( $params->get( 'date' ) ) {
 					?>
 					<td class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" width="35%">
-					&nbsp;<?php echo _DATE; ?>
+					&nbsp;<?php echo T_('Date'); ?>
 					</td>
 					<?php
 				}
 				if ( $params->get( 'title' ) ) {
 					?>
 					<td class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" width="45%">
-					<?php echo _HEADER_TITLE; ?>
+					<?php echo T_('Item Title'); ?>
 					</td>
 					<?php
 				}
 				if ( $params->get( 'author' ) ) {
 					?>
 					<td class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" align="left" width="25%">
-					<?php echo _HEADER_AUTHOR; ?>
+					<?php echo T_('Author'); ?>
 					</td>
 					<?php
 				}
 				if ( $params->get( 'hits' ) ) {
 					?>
 					<td align="center" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" width="5%">
-					<?php echo _HEADER_HITS; ?>
+					<?php echo T_('Hits'); ?>
 					</td>
 					<?php
 				}
@@ -267,7 +265,7 @@
 						$link = sefRelToAbs( 'index.php?option=com_registration&amp;task=register' );
 						?>
 						<a href="<?php echo $link; ?>">
-						<?php echo _READ_MORE_REGISTER; ?>
+						<?php echo T_('Register to read more...'); ?>
 						</a>
 						</td>
 						<?php
@@ -319,8 +317,8 @@
 			<tr>
 				<td colspan="4">
 				<a href="<?php echo $link; ?>">
-				<img src="<?php echo $mosConfig_live_site;?>/images/M_images/new.png" width="13" height="14" align="middle" border="0" alt="<?php echo _CMN_NEW;?>" />
-				&nbsp;<?php echo _CMN_NEW;?>...
+				<img src="<?php echo $mosConfig_live_site;?>/images/M_images/new.png" width="13" height="14" align="middle" border="0" alt="<?php echo T_('New');?>" />
+				&nbsp;<?php echo T_('New');?>
 				</a>
 				</td>
 			</tr>
@@ -347,7 +345,7 @@
 			?>
 			<div>
 			<strong>
-			<?php echo _MORE; ?>
+			<?php echo T_('More...'); ?>
 			</strong>
 			</div>
 			<ul>
@@ -386,8 +384,10 @@
 		global $mosConfig_sitename, $Itemid, $mosConfig_live_site, $task;
 		global $_MAMBOTS;
 
-		$mainframe->appendMetaTag( 'description', $row->metadesc );
-		$mainframe->appendMetaTag( 'keywords', $row->metakey );
+		if (!$ItemidCount) {
+			$mainframe->appendMetaTag( 'description', $row->metadesc );
+			$mainframe->appendMetaTag( 'keywords', $row->metakey );
+		}
 
 		$gid 		= $my->gid;
 		$_Itemid 	= $Itemid;
@@ -412,12 +412,12 @@
 				}
 				$link_on = sefRelToAbs("index.php?option=com_content&amp;task=view&amp;id=".$row->id."&amp;Itemid=".$_Itemid);
 				if ( strlen( trim( $row->fulltext ) )) {
-					$link_text = _READ_MORE;
+					$link_text = T_('Read more...');
 				}
 			} else {
 				$link_on = sefRelToAbs("index.php?option=com_registration&amp;task=register");
 				if (strlen( trim( $row->fulltext ) )) {
-					$link_text = _READ_MORE_REGISTER;
+					$link_text = T_('Register to read more...');
 				}
 			}
 		}
@@ -582,15 +582,16 @@
 		if ( !$access->canEdit && !( $access->canEditOwn && $row->created_by == $my->id ) ) {
 			return;
 		}
-		$link = 'index.php?option=com_content&amp;task=edit&amp;id='. $row->id .'&amp;Itemid='. $Itemid .'&amp;Returnid='. $Itemid;
-		$image = mosAdminMenus::ImageCheck( 'edit.png', '/images/M_images/', NULL, NULL, _E_EDIT );
+		$link = 'index.php?option=com_content&amp;task=edit&amp;id='. $row->id;
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'edit.png', '/images/M_images/', NULL, NULL, T_('Edit') );
 		?>
-		<a href="<?php echo sefRelToAbs( $link ); ?>" title="<?php echo _E_EDIT;?>">
+		<a href="<?php echo sefRelToAbs( $link ); ?>" title="<?php echo T_('Edit');?>">
 		<?php echo $image; ?>
 		</a>
 		<?php
 		if ( $row->state == 0 ) {
-			echo '( '. _CMN_UNPUBLISHED .' )';
+			echo '( '. T_('Unpublished') .' )';
 		}
 		echo '  ( '. $row->groups .' )';
 	}
@@ -605,13 +606,14 @@
 			$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
 			$link = $mosConfig_live_site. '/index2.php?option=com_content&amp;do_pdf=1&amp;id='. $row->id;
 			if ( $params->get( 'icons' ) ) {
-				$image = mosAdminMenus::ImageCheck( 'pdf_button.png', '/images/M_images/', NULL, NULL, _CMN_PDF );
+				$mainframe =& mosMainFrame::getInstance();
+				$image = $mainframe->ImageCheck( 'pdf_button.png', '/images/M_images/', NULL, NULL, T_('PDF') );
 			} else {
-				$image = _CMN_PDF .'&nbsp;';
+				$image = T_('PDF') .'&nbsp;';
 			}
 			?>
-			<td align="right" width="100%" class="buttonheading">
-			<a href="javascript:void window.open('<?php echo $link; ?>', 'win2', '<?php echo $status; ?>');" title="<?php echo _CMN_PDF;?>">
+			<td align="right" class="buttonheading">
+			<a href="javascript:void window.open('<?php echo $link; ?>', 'win2', '<?php echo $status; ?>');" title="<?php echo T_('PDF');?>">
 			<?php echo $image; ?>
 			</a>
 			</td>
@@ -629,13 +631,14 @@
 			$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=400,height=250,directories=no,location=no';
 			$link = $mosConfig_live_site .'/index2.php?option=com_content&amp;task=emailform&amp;id='. $row->id;
 			if ( $params->get( 'icons' ) ) {
-				$image = mosAdminMenus::ImageCheck( 'emailButton.png', '/images/M_images/', NULL, NULL, _CMN_EMAIL );
+			    $mainframe =& mosMainFrame::getInstance();
+				$image = $mainframe->ImageCheck( 'emailButton.png', '/images/M_images/', NULL, NULL, T_('E-mail') );
 			} else {
-				$image = '&nbsp;'. _CMN_EMAIL;
+				$image = '&nbsp;'. T_('E-mail');
 			}
 			?>
-			<td align="right" width="100%" class="buttonheading">
-			<a href="javascript:void window.open('<?php echo $link; ?>', 'win2', '<?php echo $status; ?>');" title="<?php echo _CMN_EMAIL;?>">
+			<td align="right" class="buttonheading">
+			<a href="javascript:void window.open('<?php echo $link; ?>', 'win2', '<?php echo $status; ?>');" title="<?php echo T_('E-mail');?>">
 			<?php echo $image; ?>
 			</a>
 			</td>
@@ -710,7 +713,7 @@
 		if ( ( $params->get( 'author' ) ) && ( $row->author != "" ) ) {
 			$grp = $acl->getAroGroup( $row->created_by );
 			$is_frontend_user = $acl->is_group_child_of( intval( $grp->group_id ), 'Public Frontend', 'ARO' );
-			$by = $is_frontend_user ? _AUTHOR_BY : _WRITTEN_BY;
+			$by = $is_frontend_user ? T_('Contributed by') : T_('Written by');
 		?>
 		<tr>
 			<td width="70%" align="left" valign="top" colspan="2">
@@ -782,7 +785,7 @@
 			?>
 			<tr>
 				<td colspan="2" align="left" class="modifydate">
-				<?php echo _LAST_UPDATED; ?> ( <?php echo $mod_date; ?> )
+				<?php echo T_('Last Updated'); ?> ( <?php echo $mod_date; ?> )
 				</td>
 			</tr>
 			<?php
@@ -822,7 +825,7 @@
 				?>
 				<th class="pagenav_prev">
 				<a href="<?php echo $row->prev; ?>">
-				<?php echo _ITEM_PREVIOUS; ?>
+				&lt;<?php echo T_('Previous'); ?>
 				</a>
 				</th>
 				<?php
@@ -838,7 +841,7 @@
 				?>
 				<th class="pagenav_next">
 				<a href="<?php echo $row->next; ?>">
-				<?php echo _ITEM_NEXT; ?>
+				<?php echo T_('Next'); ?>&gt;
 				</a>
 				</th>
 				<?php
@@ -902,13 +905,13 @@
 			catch(e){}
 			// do field validation
 			if (form.title.value == "") {
-				alert ( "<?php echo _E_WARNTITLE; ?>" );
+				alert ( "<?php echo T_('Content item must have a title'); ?>" );
 			} else if (parseInt('<?php echo $row->sectionid;?>')) {
 				// for content items
 				if (getSelectedValue('adminForm','catid') < 1) {
-					alert ( "<?php echo _E_WARNCAT; ?>" );
+					alert ( "<?php echo T_('Please select a category'); ?>" );
 				//} else if (form.introtext.value == "") {
-				//	alert ( "<?php echo _E_WARNTEXT; ?>" );
+				//	alert ( "<?php echo T_('Content item must have intro text'); ?>" );
 				} else {
 					<?php
 					getEditorContents( 'editor1', 'introtext' );
@@ -917,7 +920,7 @@
 					submitform(pressbutton);
 				}
 			//} else if (form.introtext.value == "") {
-			//	alert ( "<?php echo _E_WARNTEXT; ?>" );
+			//	alert ( "<?php echo T_('Content item must have intro text'); ?>" );
 			} else {
 				// for static content
 				<?php
@@ -933,33 +936,33 @@
 
 		function WarnUser(){
 			if (document.adminForm.goodexit.value==0) {
-				alert('<?php echo _E_WARNUSER;?>');
+				alert('<?php echo T_('Please either Cancel or Save the current change');?>');
 				window.location="<?php echo sefRelToAbs("index.php?option=com_content&task=".$task."&sectionid=".$sectionid."&id=".$row->id."&Itemid=".$Itemid); ?>"
 			}
 		}
 		</script>
 
 		<?php
-		//$docinfo = "<strong>"._E_SUBJECT."</strong> ";
+		//$docinfo = "<strong>".T_('Subject:')."</strong> ";
 		//$docinfo .= $row->title."<br />";
-		$docinfo = "<strong>"._E_EXPIRES."</strong> ";
+		$docinfo = "<strong>".T_('Expiry Date:')."</strong> ";
 		$docinfo .= $row->publish_down."<br />";
-		$docinfo .= "<strong>"._E_VERSION."</strong> ";
+		$docinfo .= "<strong>".T_('Version:')."</strong> ";
 		$docinfo .= $row->version."<br />";
-		$docinfo .= "<strong>"._E_CREATED."</strong> ";
+		$docinfo .= "<strong>".T_('Created:')."</strong> ";
 		$docinfo .= $row->created."<br />";
-		$docinfo .= "<strong>"._E_LAST_MOD."</strong> ";
+		$docinfo .= "<strong>".T_('Last Modified:')."</strong> ";
 		$docinfo .= $row->modified."<br />";
-		$docinfo .= "<strong>"._E_HITS."</strong> ";
+		$docinfo .= "<strong>".T_('Hits:')."</strong> ";
 		$docinfo .= $row->hits."<br />";
 		?>
 		<table cellspacing="0" cellpadding="0" border="0" width="100%">
 		<tr>
 			<td class="contentheading" >
-			<?php echo $section;?> / <?php echo $row->id ? _E_EDIT : _E_ADD;?>&nbsp;
-			<?php echo _E_CONTENT;?> &nbsp;&nbsp;&nbsp;
-			<a href="javascript: void(0);" onMouseOver="return overlib('<table><?php echo $docinfo; ?></table>', CAPTION, '<?php echo _E_ITEM_INFO;?>', BELOW, RIGHT);" onMouseOut="return nd();">
-			<strong>[Info]</strong>
+			<?php echo $section;?> / <?php echo $row->id ? T_('Edit') : T_('Add');?>&nbsp;
+			<?php echo T_('Content');?> &nbsp;&nbsp;&nbsp;
+			<a href="javascript: void(0);" onMouseOver="return overlib('<table><?php echo $docinfo; ?></table>', CAPTION, '<?php echo T_('Item Information');?>', BELOW, RIGHT);" onMouseOut="return nd();">
+			<strong>[<?php echo T_('Info')?>]</strong>
 			</a>
 			</td>
 			<td width="10%">
@@ -980,7 +983,7 @@
 		<table class="adminform">
 		<tr>
 			<td>
-			<?php echo _E_TITLE; ?>
+			<?php echo T_('Title:'); ?>
 			</td>
 		</tr>
 		<tr>
@@ -993,7 +996,7 @@
 			?>
 			<tr>
 				<td>
-				<?php echo _E_CATEGORY; ?>
+				<?php echo T_('Category:'); ?>
 				</td>
 			</tr>
 			<tr>
@@ -1009,13 +1012,13 @@
 			if (intval( $row->sectionid ) > 0) {
 				?>
 				<td>
-				<?php echo _E_INTRO.' ('._CMN_REQUIRED.')'; ?>:
+				<?php echo T_('Intro Text').' ('.T_('Required').')'; ?>:
 				</td>
 				<?php
 			} else {
 				?>
 				<td>
-				<?php echo _E_MAIN.' ('._CMN_REQUIRED.')'; ?>:
+				<?php echo T_('Main Text').' ('.T_('Required').')'; ?>:
 				</td>
 			<?php
 			} ?>
@@ -1033,7 +1036,7 @@
 			?>
 			<tr>
 				<td>
-				<?php echo _E_MAIN.' ('._CMN_OPTIONAL.')'; ?>:
+				<?php echo T_('Main Text').' ('.T_('Optional').')'; ?>:
 				</td>
 			</tr>
 			<tr>
@@ -1050,42 +1053,42 @@
 		</table>
      	<?php
 		$tabs->startPane( 'content-pane' );
-		$tabs->startTab( _E_IMAGES, 'images-page' );
+		$tabs->startTab( T_('Images'), 'images-page' );
 		?>
 		<table class="adminform">
 		<tr>
 			<td colspan="6">
-			<?php echo _CMN_SUBFOLDER; ?> :: <?php echo $lists['folders'];?>
+			<?php echo T_('Sub-folder'); ?> :: <?php echo $lists['folders'];?>
 			</td>
 		</tr>
 		<tr>
 			<td align="top">
-			<?php echo _E_GALLERY_IMAGES; ?>
+			<?php echo T_('Gallery Images'); ?>
 			</td>
 			<td align="top">
-			<?php echo _E_CONTENT_IMAGES; ?>
+			<?php echo T_('Content Images'); ?>
 			</td>
 			<td align="top">
-			<?php echo _E_EDIT_IMAGE; ?>
+			<?php echo T_('Edit Image'); ?>
 			</td>
 		<tr>
 			<td valign="top">
 			<?php echo $lists['imagefiles'];?>
 			<br />
-			<input class="button" type="button" value="<?php echo _E_INSERT; ?>" onclick="addSelectedToList('adminForm','imagefiles','imagelist')" />
+			<input class="button" type="button" value="<?php echo T_('Insert'); ?>" onclick="addSelectedToList('adminForm','imagefiles','imagelist')" />
 			</td>
 			<td valign="top">
 			<?php echo $lists['imagelist'];?>
 			<br />
-			<input class="button" type="button" value="<?php echo _E_UP; ?>" onclick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,-1)" />
-			<input class="button" type="button" value="<?php echo _E_DOWN; ?>" onclick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,+1)" />
-			<input class="button" type="button" value="<?php echo _E_REMOVE; ?>" onclick="delSelectedFromList('adminForm','imagelist')" />
+			<input class="button" type="button" value="<?php echo T_('Up'); ?>" onclick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,-1)" />
+			<input class="button" type="button" value="<?php echo T_('Down'); ?>" onclick="moveInList('adminForm','imagelist',adminForm.imagelist.selectedIndex,+1)" />
+			<input class="button" type="button" value="<?php echo T_('Remove'); ?>" onclick="delSelectedFromList('adminForm','imagelist')" />
 			</td>
 			<td valign="top">
 				<table>
 				<tr>
 					<td align="right">
-					<?php echo _E_SOURCE; ?>
+					<?php echo T_('Source:'); ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name= "_source" value="" size="15" />
@@ -1093,7 +1096,7 @@
 				</tr>
 				<tr>
 					<td align="right" valign="top">
-					<?php echo _E_ALIGN; ?>
+					<?php echo T_('Align:'); ?>
 					</td>
 					<td>
 					<?php echo $lists['_align']; ?>
@@ -1101,7 +1104,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					<?php echo _E_ALT; ?>
+					<?php echo T_('Alt Text:'); ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="_alt" value="" size="15" />
@@ -1109,7 +1112,7 @@
 				</tr>
 				<tr>
 					<td align="right">
-					<?php echo _E_BORDER; ?>
+					<?php echo T_('Border:'); ?>
 					</td>
 					<td>
 					<input class="inputbox" type="text" name="_border" value="" size="3" maxlength="1" />
@@ -1118,7 +1121,7 @@
 				<tr>
 					<td align="right"></td>
 					<td>
-					<input class="button" type="button" value="<?php echo _E_APPLY; ?>" onclick="applyImageProps()" />
+					<input class="button" type="button" value="<?php echo T_('Apply'); ?>" onclick="applyImageProps()" />
 					</td>
 				</tr>
 				</table>
@@ -1126,16 +1129,16 @@
 		</tr>
 		<tr>
 			<td>
-			<img name="view_imagefiles" src="<?php echo $mosConfig_live_site;?>/images/M_images/blank.png" width="50" alt="No Image" />
+			<img name="view_imagefiles" src="<?php echo $mosConfig_live_site;?>/images/M_images/blank.png" width="50" alt="<?php echo T_('No Image') ?>" />
 			</td>
 			<td>
-			<img name="view_imagelist" src="<?php echo $mosConfig_live_site;?>/images/M_images/blank.png" width="50" alt="No Image" />
+			<img name="view_imagelist" src="<?php echo $mosConfig_live_site;?>/images/M_images/blank.png" width="50" alt="<?php echo T_('No Image') ?>" />
 			</td>
 		</tr>
 		</table>
 		<?php
 		$tabs->endTab();
-		$tabs->startTab( _E_PUBLISHING, 'publish-page' );
+		$tabs->startTab( T_('Publishing'), 'publish-page' );
 		?>
 		<table class="adminform">
 		<?php
@@ -1143,7 +1146,7 @@
 			?>
 			<tr>
 				<td align="left">
-				<?php echo _E_STATE; ?>
+				<?php echo T_('State:'); ?>
 				</td>
 				<td>
 				<?php echo $lists['state']; ?>
@@ -1153,7 +1156,7 @@
 		} ?>
 		<tr>
 			<td align="left">
-			<?php echo _E_ACCESS_LEVEL; ?>
+			<?php echo T_('Access Level:'); ?>
 			</td>
 			<td>
 			<?php echo $lists['access']; ?>
@@ -1161,7 +1164,7 @@
 		</tr>
 		<tr>
 			<td align="left">
-			<?php echo _E_AUTHOR_ALIAS; ?>
+			<?php echo T_('Author Alias:'); ?>
 			</td>
 			<td>
 			<input type="text" name="created_by_alias" size="50" maxlength="100" value="<?php echo $row->created_by_alias; ?>" class="inputbox" />
@@ -1169,7 +1172,7 @@
 		</tr>
 		<tr>
 			<td align="left">
-			<?php echo _E_ORDERING; ?>
+			<?php echo T_('Ordering:'); ?>
 			</td>
 			<td>
 			<?php echo $lists['ordering']; ?>
@@ -1177,7 +1180,7 @@
 		</tr>
 		<tr>
 			<td align="left">
-			<?php echo _E_START_PUB; ?>
+			<?php echo T_('Start Publishing:'); ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="publish_up" id="publish_up" size="25" maxlength="19" value="<?php echo $row->publish_up; ?>" />
@@ -1186,7 +1189,7 @@
 		</tr>
 		<tr>
 			<td align="left">
-			<?php echo _E_FINISH_PUB; ?>
+			<?php echo T_('Finish Publishing:'); ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="publish_down" id="publish_down" size="25" maxlength="19" value="<?php echo $row->publish_down; ?>" />
@@ -1195,7 +1198,7 @@
 		</tr>
 		<tr>
 			<td align="left">
-			<?php echo _E_SHOW_FP; ?>
+			<?php echo T_('Show on Front Page:'); ?>
 			</td>
 			<td>
 			<input type="checkbox" name="frontpage" value="1" <?php echo $row->frontpage ? 'checked="checked"' : ''; ?> />
@@ -1204,12 +1207,12 @@
 		</table>
 		<?php
 		$tabs->endTab();
-		$tabs->startTab( _E_METADATA, 'meta-page' );
+		$tabs->startTab( T_('Metadata'), 'meta-page' );
 		?>
 		<table class="adminform">
 		<tr>
 			<td align="left" valign="top">
-			<?php echo _E_M_DESC; ?>
+			<?php echo T_('Description:'); ?>
 			</td>
 			<td>
 			<textarea class="inputbox" cols="45" rows="3" name="metadesc"><?php echo str_replace('&','&amp;',$row->metadesc); ?></textarea>
@@ -1217,7 +1220,7 @@
 		</tr>
 		<tr>
 			<td align="left" valign="top">
-			<?php echo _E_M_KEY; ?>
+			<?php echo T_('Keywords:'); ?>
 			</td>
 			<td>
 			<textarea class="inputbox" cols="45" rows="3" name="metakey"><?php echo str_replace('&','&amp;',$row->metakey); ?></textarea>
@@ -1254,7 +1257,7 @@
 			var form = document.frontendForm;
 			// do field validation
 			if (form.email.value == "" || form.youremail.value == "") {
-				alert( '<?php echo addslashes( _EMAIL_ERR_NOINFO ); ?>' );
+				alert( '<?php echo addslashes( T_('You must enter valid e-mail addresses for both yourself and your recipient.') ); ?>' );
 				return false;
 			}
 			return true;
@@ -1268,7 +1271,7 @@
 		<table cellspacing="0" cellpadding="0" border="0">
 		<tr>
 			<td colspan="2">
-			<?php echo _EMAIL_FRIEND; ?>
+			<?php echo T_('E-mail this to a friend.'); ?>
 			</td>
 		</tr>
 		<tr>
@@ -1276,7 +1279,7 @@
 		</tr>
 		<tr>
 			<td width="130">
-			<?php echo _EMAIL_FRIEND_ADDR; ?>
+			<?php echo T_("Your friend's E-mail:"); ?>
 			</td>
 			<td>
 			<input type="text" name="email" class="inputbox" size="25">
@@ -1284,7 +1287,7 @@
 		</tr>
 		<tr>
 			<td height="27">
-			<?php echo _EMAIL_YOUR_NAME; ?>
+			<?php echo T_('Your Name:'); ?>
 			</td>
 			<td>
 			<input type="text" name="yourname" class="inputbox" size="25">
@@ -1292,7 +1295,7 @@
 		</tr>
 		<tr>
 			<td>
-			<?php echo _EMAIL_YOUR_MAIL; ?>
+			<?php echo T_('Your E-mail:'); ?>
 			</td>
 			<td>
 			<input type="text" name="youremail" class="inputbox" size="25">
@@ -1300,7 +1303,7 @@
 		</tr>
 		<tr>
 			<td>
-			<?php echo _SUBJECT_PROMPT; ?>
+			<?php echo T_('Message subject:'); ?>
 			</td>
 			<td>
 			<input type="text" name="subject" class="inputbox" maxlength="100" size="40">
@@ -1311,8 +1314,8 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-			<input type="submit" name="submit" class="button" value="<?php echo _BUTTON_SUBMIT_MAIL; ?>">
-			&nbsp;&nbsp; <input type="button" name="cancel" value="<?php echo _BUTTON_CANCEL; ?>" class="button" onclick="window.close();">
+			<input type="submit" name="submit" class="button" value="<?php echo T_('Send e-mail'); ?>">
+			&nbsp;&nbsp; <input type="button" name="cancel" value="<?php echo T_('Cancel'); ?>" class="button" onclick="window.close();">
 			</td>
 		</tr>
 		</table>
@@ -1332,13 +1335,13 @@
 		?>
 		<title><?php echo $mosConfig_sitename; ?></title>
 		<link rel="stylesheet" href="templates/<?php echo $template; ?>/css/template_css.css" type="text/css" />
-		<span class="contentheading"><?php echo _EMAIL_SENT." $to";?></span> <br />
+		<span class="contentheading"><?php printf(T_('This item has been sent to %s'), $to);?></span> <br />
 		<br />
 		<br />
 		<a href='javascript:window.close();'>
-		<span class="small"><?php echo _PROMPT_CLOSE;?></span>
+		<span class="small"><?php echo T_('Close Window');?></span>
 		</a>
 		<?php
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_content/content.php 4.6rc2/components/com_content/content.php
--- 4.5.4/components/com_content/content.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_content/content.php	2006-02-22 07:31:46.000000000 -0600
@@ -1,1609 +1,1635 @@
-<?php
-/**
-* @version $Id: content.php,v 1.7 2005/11/24 04:28:51 csouza Exp $
-* @package Mambo
-* @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-require_once( $mainframe->getPath( 'front_html', 'com_content' ) );
-
-$id			= intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-$sectionid 	= intval( mosGetParam( $_REQUEST, 'sectionid', 0 ) );
-$pop 		= intval( mosGetParam( $_REQUEST, 'pop', 0 ) );
-$task 		= trim( mosGetParam( $_REQUEST, 'task', '' ) );
-$limit 		= intval( mosGetParam( $_REQUEST, 'limit', '' ) );
-$limitstart = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
-
-$now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
-
-// Editor usertype check
-$access = new stdClass();
-$access->canEdit 	= $acl->acl_check( 'action', 'edit', 'users', $my->usertype, 'content', 'all' );
-$access->canEditOwn = $acl->acl_check( 'action', 'edit', 'users', $my->usertype, 'content', 'own' );
-$access->canPublish = $acl->acl_check( 'action', 'publish', 'users', $my->usertype, 'content', 'all' );
-
-// cache activation
-$cache =& mosCache::getCache( 'com_content' );
-
-// loads function for frontpage component
-if ( $option == 'com_frontpage' ) {
-	//frontpage( $option, $gid, $pop, $now );
-	$cache->call( 'frontpage', $gid, $access, $pop, $now );
-	return;
-}
-
-switch ( strtolower( $task ) ) {
-	case 'findkey':
-		findKeyItem( $gid, $access, $pop, $option, $now );
-		break;
-
-	case 'view':
-		showItem( $id, $gid, $access, $pop, $option, $now );
-		break;
-
-	case 'section':
-		$cache->call( 'showSection', $id, $gid, $access, $now );
-		break;
-
-	case 'category':
-		$cache->call( 'showCategory', $id, $gid, $access, $sectionid, $limit, $limitstart, $now );
-		break;
-
-	case 'blogsection':
-		$cache->call('showBlogSection', $id, $gid, $access, $pop, $now );
-		break;
-
-	case 'blogcategorymulti':
-	case 'blogcategory':
-		$cache->call( 'showBlogCategory', $id, $gid, $access, $pop, $now );
-		break;
-
-	case 'archivesection':
-		showArchiveSection( $id, $gid, $access, $pop, $option );
-		break;
-
-	case 'archivecategory':
-		showArchiveCategory( $id, $gid, $access, $pop, $option, $now );
-		break;
-
-	case 'edit':
-		editItem( $id, $gid, $access, 0, $task, $Itemid );
-		break;
-
-	case 'new':
-		editItem( 0, $gid, $access, $sectionid, $task, $Itemid );
-		break;
-
-	case 'save':
-		mosCache::cleanCache( 'com_content' );
-		saveContent( $access );
-		break;
-
-	case 'cancel':
-		cancelContent( $access );
-		break;
-
-	case 'emailform':
-		emailContentForm( $id );
-		break;
-
-	case 'emailsend':
-		emailContentSend( $id );
-		break;
-
-	case 'vote':
-		recordVote ( $url , $user_rating , $cid , $database);
-		break;
-
-	default:
-		$cache->call('showBlogSection', 0, $gid, $access, $pop, $now );
-		break;
-}
-
-/**
- * Searches for an item by a key parameter
- * @param int The user access level
- * @param object Actions this user can perform
- * @param int
- * @param string The url option
- * @param string A timestamp
- */
-function findKeyItem( $gid, $access, $pop, $option, $now ) {
-	global $database;
-	$keyref = mosGetParam( $_REQUEST, 'keyref', '' );
-	$keyref = $database->getEscaped( $keyref );
-
-	$query = 'SELECT id
-		FROM #__content
-		WHERE attribs LIKE \'%keyref=' . $keyref . '%\'
-		';
-	$database->setQuery( $query );
-	$id = $database->loadResult();
-	if ($id > 0) {
-		showItem( $id, $gid, $access, $pop, $option, $now );
-	} else {
-		echo 'Key not found '. $keyref;
-	}
-}
-
-function frontpage( $gid, &$access, $pop, $now ) {
-	global $database, $mainframe, $my, $Itemid;
-	global $mosConfig_offset;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-
-	// Parameters
-	$menu =& new mosMenu( $database );
-	$menu->load( $Itemid );
-	$params =& new mosParameters( $menu->params );
-	$orderby_sec = $params->def( 'orderby_sec', '' );
-	$orderby_pri = $params->def( 'orderby_pri', '' );
-
-	// Ordering control
-	$order_sec = _orderby_sec( $orderby_sec );
-	$order_pri = _orderby_pri( $orderby_pri );
-
-	$now = date( "Y-m-d H:i:s", time()+$mosConfig_offset*60*60 );
-
-	// query records
-	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, cc.name AS category, g.name AS groups"
-	. "\n FROM #__content AS a"
-	. "\n INNER JOIN #__content_frontpage AS f ON f.content_id = a.id"
-	. "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
-	. "\n INNER JOIN #__sections AS s ON s.id = a.sectionid"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. "\n WHERE a.state = '1'"
-	. ( $noauth ? "\n AND a.access <= '". $my->gid ."'" : '' )
-	. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now'  )"
-	. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now' )"
-	. "\n ORDER BY ". $order_pri . $order_sec
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
-	// Dynamic Page Title
-	$mainframe->SetPageTitle( $menu->name );
-
-	BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
-}
-
-
-function showSection( $id, $gid, &$access, $now ) {
-	global $database, $mainframe, $mosConfig_offset, $Itemid;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-
-	// Paramters
-	$params = new stdClass();
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-	} else {
-		$menu = "";
-		$params =& new mosEmpty();
-
-	}
-	$orderby = $params->get( 'orderby', '' );
-
-	$params->set( 'type', 'section' );
-
-	$params->def( 'page_title', 1 );
-	$params->def( 'pageclass_sfx', '' );
-	$params->def( 'other_cat_section', 1 );
-	$params->def( 'other_cat', 1 );
-	$params->def( 'empty_cat', 0 );
-	$params->def( 'cat_items', 1 );
-	$params->def( 'cat_description', 1 );
-	$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-	$params->def( 'pageclass_sfx', '' );
-
-	// Ordering control
-	$orderby = _orderby_sec( $orderby );
-
-	$section = new mosSection( $database );
-	$section->load( $id );
-
-	if ( $access->canEdit ) {
-		$xwhere = '';
-		$xwhere2 = "\n AND b.state >= '0'";
-	} else {
-		$xwhere = "\n AND a.published = '1'";
-		$xwhere2 = "\n AND b.state = '1'"
-		. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '". $now ."' )"
-		. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '". $now ."' )"
-		;
-	}
-
-	// show/hide empty categories
-	if ( $params->get( 'empty_cat' ) ) {
-		$empty = '';
-	} else {
-		$empty = "\n HAVING COUNT( b.id ) > 0";
-	}
-
-	// Main Query
-	$query = '
-		SELECT a.*, COUNT( b.id ) AS numitems
-		FROM #__categories AS a
-		LEFT JOIN #__content AS b ON b.catid = a.id '. $xwhere2 .'
-		WHERE a.section = \'' . $section->id .'\' '. $xwhere;
-	if ($noauth) {
-		$query .= '
-		AND a.access <= '. $gid;
-	}
-	$query .= '
-		GROUP BY a.id
-		' . $empty . '
-		ORDER BY ' . $orderby;
-
-	$database->setQuery( $query );
-	$other_categories = $database->loadObjectList();
-
-	// Dynamic Page Title
-	$mainframe->SetPageTitle( $menu->name );
-
-	HTML_content::showContentList( $section, NULL, $access, $id, NULL,  $gid, $params, NULL, $other_categories, NULL );
-}
-
-
-/**
-* @param int The category id
-* @param int The group id of the user
-* @param int The access level of the user
-* @param int The section id
-* @param int The number of items to dislpay
-* @param int The offset for pagination
-*/
-function showCategory( $id, $gid, &$access, $sectionid, $limit, $limitstart, $now  ) {
-	global $database, $mainframe, $Itemid, $mosConfig_offset, $mosConfig_list_limit;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-	$selected = mosGetParam( $_POST, 'order', '' );
-
-	// Paramters
-	$params = new stdClass();
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-	} else {
-		$menu = "";
-		$params =& new mosParameters( '' );
-	}
-
-	if ( $selected ) {
-		$orderby = $selected;
-	} else {
-		$orderby = $params->get( 'orderby', 'rdate' );
-		$selected = $orderby;
-	}
-
-	$params->set( 'type', 'category' );
-
-	$params->def( 'page_title', 1 );
-	$params->def( 'title', 1 );
-	$params->def( 'hits', $mainframe->getCfg( 'hits' ) );
-	$params->def( 'author', !$mainframe->getCfg( 'hideAuthor' ) );
-	$params->def( 'date', !$mainframe->getCfg( 'hideCreateDate' ) );
-	$params->def( 'date_format', _DATE_FORMAT_LC );
-	$params->def( 'navigation', 2 );
-	$params->def( 'display', 1 );
-	$params->def( 'display_num', $mosConfig_list_limit );
-	$params->def( 'other_cat', 1 );
-	$params->def( 'empty_cat', 0 );
-	$params->def( 'cat_items', 1 );
-	$params->def( 'cat_description', 0 );
-	$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-	$params->def( 'pageclass_sfx', '' );
-	$params->def( 'headings', 1 );
-	$params->def( 'order_select', 1 );
-	$params->def( 'filter', 1 );
-	$params->def( 'filter_type', 'title' );
-
-	// Ordering control
-	$orderby = _orderby_sec( $orderby );
-
-	$category = new mosCategory( $database );
-	$category->load( $id );
-
-	if ( $sectionid == 0 ) {
-		$sectionid = $category->section;
-	}
-
-	if ( $access->canEdit ) {
-		$xwhere = '';
-		$xwhere2 = "\n AND b.state >= '0'";
-	} else {
-		$xwhere = "\n AND c.published='1'";
-		$xwhere2 = "\n AND b.state='1'"
-		. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '". $now ."' )"
-		. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '". $now ."' )"
-		;
-	}
-
-	$pagetitle = '';
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$pagetitle = $menu->name;
-	} // if
-
-	// show/hide empty categories
-	$empty = '';
-	if ( !$params->get( 'empty_cat' ) )
-		$empty = "\n HAVING COUNT( b.id ) > 0";
-
-	// get the list of other categories
-	$query = "SELECT c.*, COUNT( b.id ) AS numitems"
-	. "\n FROM #__categories AS c"
-	. "\n LEFT JOIN #__content AS b ON b.catid = c.id "
-	. $xwhere2
-	. ( $noauth ? "\n AND b.access <= '". $gid ."'" : '' )
-	. "\n WHERE c.section = '". $category->section. "'"
-	. $xwhere
-	. ( $noauth ? "\n AND c.access <= '". $gid ."'" : '' )
-	. "\n GROUP BY c.id"
-	. $empty
-	. "\n ORDER BY c.ordering"
-	;
-	$database->setQuery( $query );
-	$other_categories = $database->loadObjectList();
-
-	// get the total number of published items in the category
-	// filter functionality
-	$and = '';
-	if ($filter = mosGetParam( $_POST, 'filter', '' )) {
-		$filter = strtolower( $filter );
-		$filter = $database->getEscaped($filter);
-		if ( $params->get( 'filter' ) ) {
-			switch ( $params->get( 'filter_type' ) ) {
-				case 'title':
-					$and = "\n AND LOWER( a.title ) LIKE '%". $filter ."%'";
-					break;
-				case 'author':
-					$and = "\n AND ( ( LOWER( u.name ) LIKE '%". $filter ."%' ) OR ( LOWER( a.created_by_alias ) LIKE '%". $filter ."%' ) )";
-					break;
-				case 'hits':
-					$and = "\n AND a.hits LIKE '%". $filter ."%'";
-					break;
-			}
-		}
-
-	}
-
-	if ( $access->canEdit ) {
-		$xwhere = "\n AND a.state >= '0'";
-	} else {
-		$xwhere = "\n AND a.state='1'"
-		. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now' )"
-		. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now' )"
-		;
-	}
-
-	$query = "SELECT COUNT(a.id) as numitems"
-	. "\n FROM #__content AS a"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. "\n WHERE a.catid='". $category->id ."' ". $xwhere
-	. ( $noauth ? "\n AND a.access<='". $gid ."'" : '' )
-	. "\n AND '". $category->access ."'<='". $gid ."'"
-	. $and
-	. "\n ORDER BY ". $orderby .""
-	;
-	$database->setQuery( $query );
-	$counter = $database->loadObjectList();
-	$total = $counter[0]->numitems;
-	$limit = $limit ? $limit : $params->get( 'display_num' ) ;
-	if ( $total <= $limit ) $limitstart = 0;
-
-	require_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/pageNavigation.php' );
-	$pageNav = new mosPageNav( $total, $limitstart, $limit );
-
-	// get the list of items for this category
-	$query = "SELECT a.id, a.title, a.hits, a.created_by, a.created_by_alias, a.created AS created, a.access, u.name AS author, a.state, g.name AS groups"
-	. "\n FROM #__content AS a"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. "\n WHERE a.catid='". $category->id ."' ". $xwhere
-	. ( $noauth ? "\n AND a.access<='". $gid ."'" : '' )
-	. "\n AND '". $category->access ."'<='". $gid ."'"
-	. $and
-	. "\n ORDER BY ". $orderby .""
-	. "\n LIMIT ". $limitstart .", ". $limit
-	;
-	$database->setQuery( $query );
-	$items = $database->loadObjectList();
-
-	$check = 0;
-	if ( $params->get( 'date' ) ) {
-		$order[] = mosHTML::makeOption( 'date', _ORDER_DROPDOWN_DA );
-		$order[] = mosHTML::makeOption( 'rdate', _ORDER_DROPDOWN_DD );
-		$check .= 1;
-	}
-	if ( $params->get( 'title' ) ) {
-		$order[] = mosHTML::makeOption( 'alpha', _ORDER_DROPDOWN_TA );
-		$order[] = mosHTML::makeOption( 'ralpha', _ORDER_DROPDOWN_TD );
-		$check .= 1;
-	}
-	if ( $params->get( 'hits' ) ) {
-		$order[] = mosHTML::makeOption( 'hits', _ORDER_DROPDOWN_HA );
-		$order[] = mosHTML::makeOption( 'rhits', _ORDER_DROPDOWN_HD );
-		$check .= 1;
-	}
-	if ( $params->get( 'author' ) ) {
-		$order[] = mosHTML::makeOption( 'author', _ORDER_DROPDOWN_AUA );
-		$order[] = mosHTML::makeOption( 'rauthor', _ORDER_DROPDOWN_AUD );
-		$check .= 1;
-	}
-	$order[] = mosHTML::makeOption( 'order', _ORDER_DROPDOWN_O );
-	$lists['order'] = mosHTML::selectList( $order, 'order', 'class="inputbox" size="1"  onchange="document.adminForm.submit();"', 'value', 'text', $selected );
-	if ( $check < 1 ) {
-		$lists['order'] = '';
-		$params->set( 'order_select', 0 );
-	}
-
-	$lists['task'] = 'category';
-	$lists['filter'] = $filter;
-
-	// Dynamic Page Title
-	$mainframe->SetPageTitle( $pagetitle );
-
-	HTML_content::showContentList( $category, $items, $access, $id, $sectionid, $gid, $params, $pageNav, $other_categories, $lists );
-} // showCategory
-
-
-function showBlogSection( $id=0, $gid, &$access, $pop, $now=NULL ) {
-	global $database, $mainframe, $mosConfig_offset, $Itemid;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-
-	// Parameters
-	$params = new stdClass();
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-	} else {
-		$menu = "";
-		$params =& new mosParameters( '' );
-	}
-
-	// new blog multiple section handling
-	if ( !$id ) {
-		$id		= $params->def( 'sectionid', 0 );
-	}
-
-	$where 		= _where( 1, $access, $noauth, $gid, $id, $now );
-
-	// Ordering control
-	$orderby_sec 	= $params->def( 'orderby_sec', 'rdate' );
-	$orderby_pri 	= $params->def( 'orderby_pri', '' );
-	$order_sec 	= _orderby_sec( $orderby_sec );
-	$order_pri 	= _orderby_pri( $orderby_pri );
-
-	// Main data query
-	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, g.name AS groups"
-	. "\n FROM #__content AS a"
-	. "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
-	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. ( count( $where ) ? "\n WHERE ".implode( "\n AND ", $where ) : '' )
-	. "\n AND s.access<=$gid"
-	. "\n ORDER BY ". $order_pri . $order_sec
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
-	// Dynamic Page Title
-	if ($menu) {
-		$mainframe->setPageTitle( $menu->name );
-	}
-
-	BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
-}
-
-function showBlogCategory( $id=0, $gid, &$access, $pop, $now ) {
-	global $database, $mainframe, $mosConfig_offset, $Itemid;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-
-	// Paramters
-	$params = new stdClass();
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-	} else {
-		$menu = "";
-		$params =& new mosParameters( '' );
-	}
-
-	// new blog multiple section handling
-	if ( !$id ) {
-		$id 		= $params->def( 'categoryid', 0 );
-	}
-
-	$where		= _where( 2, $access, $noauth, $gid, $id, $now );
-
-	// Ordering control
-	$orderby_sec 	= $params->def( 'orderby_sec', 'rdate' );
-	$orderby_pri 	= $params->def( 'orderby_pri', '' );
-	$order_sec 	= _orderby_sec( $orderby_sec );
-	$order_pri 	= _orderby_pri( $orderby_pri );
-
-	// Main data query
-	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, g.name AS groups, cc.name AS category"
-	. "\n FROM #__content AS a"
-	. "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
-	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. ( count( $where ) ? "\n WHERE ".implode( "\n AND ", $where ) : '' )
-	. "\n AND s.access <= ". $gid
-	. "\n ORDER BY ". $order_pri . $order_sec;
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
-	// Dynamic Page Title
-	$mainframe->SetPageTitle( $menu->name );
-
-	BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
-}
-
-function showArchiveSection( $id=NULL, $gid, &$access, $pop, $option ) {
-	global $database, $mainframe, $mosConfig_offset;
-	global $Itemid;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-
-	// Paramters
-	$year 	= mosGetParam( $_REQUEST, 'year', date( 'Y' ) );
-	$month 	= mosGetParam( $_REQUEST, 'month', date( 'm' ) );
-
-	$params = new stdClass();
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-	} else {
-		$menu = "";
-		$params =& new mosParameters( '' );
-	}
-
-	$params->set( 'intro_only', 1 );
-	$params->set( 'year', $year );
-	$params->set( 'month', $month );
-
-	// Ordering control
-	$orderby_sec = $params->def( 'orderby_sec', 'rdate' );
-	$orderby_pri = $params->def( 'orderby_pri', '' );
-	$order_sec = _orderby_sec( $orderby_sec );
-	$order_pri = _orderby_pri( $orderby_pri );
-
-	// used in query
-	$where = _where( -1, $access, $noauth, $gid, $id, NULL, $year, $month );
-
-	// checks to see if 'All Sections' options used
-	if ( $id == 0 ) {
-		$check = '';
-	} else {
-		$check = 'AND a.sectionid = '. $id ;
-	}
-	// query to determine if there are any archived entries for the section
-	$query = 	"SELECT a.id"
-	. "\n FROM #__content as a"
-	. "\n WHERE a.state = '-1'"
-	. $check
-	;
-	$database->setQuery( $query );
-	$items = $database->loadObjectList();
-	$archives = count( $items );
-
-	// Main Query
-	$query = "SELECT a.*, ROUND(v.rating_sum/v.rating_count) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, g.name AS groups"
-	. "\n FROM #__content AS a"
-	. "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
-	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. ( count( $where ) ? "\n WHERE ". implode( "\n AND ", $where ) : '')
-	. "\n AND s.access <= ". $gid
-	. "\n ORDER BY ". $order_pri . $order_sec
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
-	// initiate form
- 	echo '<form action="'.sefRelToAbs( 'index.php').'" method="post">';
-
-	// Dynamic Page Title
-	$mainframe->SetPageTitle( $menu->name );
-
-	if ( !$archives ) {
-		// if no archives for category, hides search and outputs empty message
-		echo '<br /><div align="center">'. _CATEGORY_ARCHIVE_EMPTY .'</div>';
-	} else {
-		BlogOutput( $rows, $params, $gid, $access, $pop, $menu, 1 );
-	}
-
- 	echo '<input type="hidden" name="id" value="'. $id .'" />';
-	echo '<input type="hidden" name="Itemid" value="'. $Itemid .'" />';
- 	echo '<input type="hidden" name="task" value="archivesection" />';
- 	echo '<input type="hidden" name="option" value="com_content" />';
- 	echo '</form>';
-}
-
-
-function showArchiveCategory( $id=0, $gid, &$access, $pop, $option, $now ) {
-	global $database, $mainframe, $mosConfig_offset;
-	global $Itemid;
-
-	// Parameters
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-	$year 	= mosGetParam( $_REQUEST, 'year', date( 'Y' ) );
-	$month 	= mosGetParam( $_REQUEST, 'month', date( 'm' ) );
-	$module = trim( mosGetParam( $_REQUEST, 'module', '' ) );
-
-	// used by archive module
-	if ( $module ) {
-		$check = '';
-	} else {
-		$check = 'AND a.catid = '. $id;
-	}
-
-	if ( $Itemid ) {
-		$menu = new mosMenu( $database );
-		$menu->load( $Itemid );
-		$params =& new mosParameters( $menu->params );
-	} else {
-		$menu = "";
-		$params =& new mosParameters( '' );
-	}
-
-	$params->set( 'year', $year );
-	$params->set( 'month', $month );
-
-	// Ordering control
-	$orderby_sec = $params->def( 'orderby', 'rdate' );
-	$order_sec = _orderby_sec( $orderby_sec );
-
-	// used in query
-	$where = _where( -2, $access, $noauth, $gid, $id, NULL, $year, $month );
-
-	// query to determine if there are any archived entries for the category
-	$query = 	"SELECT a.id"
-	. "\n FROM #__content as a"
-	. "\n WHERE a.state = '-1'"
-	. "\n ". $check
-	;
-	$database->setQuery( $query );
-	$items = $database->loadObjectList();
-	$archives = count( $items );
-
-	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, g.name AS groups"
-	. "\n FROM #__content AS a"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
-	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. ( count( $where ) ? "\n WHERE ". implode( "\n AND ", $where ) : '' )
-	. "\n AND s.access <= ". $gid
-	. "\n ORDER BY ". $order_sec
-	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
-	// initiate form
- 	echo '<form action="'.sefRelToAbs( 'index.php').'" method="post">';
-
-	// Page Title
-	$mainframe->SetPageTitle( $menu->name );
-
-	if ( !$archives ) {
-		// if no archives for category, hides search and outputs empty message
-		echo '<br /><div align="center">'. _CATEGORY_ARCHIVE_EMPTY .'</div>';
-	} else {
-		BlogOutput( $rows, $params, $gid, $access, $pop, $menu, 1 );
-	}
-
- 	echo '<input type="hidden" name="id" value="'. $id .'" />';
-	echo '<input type="hidden" name="Itemid" value="'. $Itemid .'" />';
- 	echo '<input type="hidden" name="task" value="archivecategory" />';
- 	echo '<input type="hidden" name="option" value="com_content" />';
- 	echo '</form>';
-}
-
-
-function BlogOutput ( &$rows, &$params, $gid, &$access, $pop, &$menu, $archive=NULL ) {
-	global $mainframe, $Itemid, $task, $id, $option, $database, $mosConfig_live_site;
-
-	// parameters
-	if ( $params->get( 'page_title', 1 ) && $menu) {
-		$header = $params->def( 'header', $menu->name );
-	} else {
-		$header = '';
-	}
-	$columns = $params->def( 'columns', 2 );
-	if ( $columns == 0 ) {
-		$columns = 1;
-	}
-	$intro 				= $params->def( 'intro', 4 );
-	$leading 				= $params->def( 'leading', 1 );
-	$links 				= $params->def( 'link', 4 );
-	$pagination 			= $params->def( 'pagination', 2 );
-	$pagination_results 	= $params->def( 'pagination_results', 1 );
-	$pagination_results 	= $params->def( 'pagination_results', 1 );
-	$descrip		 		= $params->def( 'description', 1 );
-	$descrip_image	 		= $params->def( 'description_image', 1 );
-	// needed for back button for page
-	$back 				= $params->get( 'back_button', $mainframe->getCfg( 'back_button' ) );
-	// needed to disable back button for item
-	$params->set( 'back_button', 0 );
-	$params->def( 'pageclass_sfx', '' );
-	$params->set( 'intro_only', 1 );
-
-	$total = count( $rows );
-
-	// pagination support
-	$limitstart = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
-	$limit = $intro + $leading + $links;
-	if ( $total <= $limit ) {
-		$limitstart = 0;
-	}
-	$i = $limitstart;
-
-	// needed to reduce queries used by getItemid
-	$ItemidCount['bs'] 		= $mainframe->getBlogSectionCount();
-	$ItemidCount['bc'] 		= $mainframe->getBlogCategoryCount();
-	$ItemidCount['gbs'] 	= $mainframe->getGlobalBlogSectionCount();
-
-	// used to display section/catagory description text and images
-	// currently not supported in Archives
-	if ( $menu && $menu->componentid && ( $descrip || $descrip_image ) ) {
-		switch ( $menu->type ) {
-			case 'content_blog_section':
-				$description = new mosSection( $database );
-				$description->load( $menu->componentid );
-				break;
-
-			case 'content_blog_category':
-				$description = new mosCategory( $database );
-				$description->load( $menu->componentid );
-				break;
-
-			default:
-				$menu->componentid = 0;
-				break;
-		}
-	}
-
-	// Page Output
-	// page header
-	if ( $header ) {
-		echo '<div class="componentheading'. $params->get( 'pageclass_sfx' ) .'">'. $header .'</div>';
-	}
-
-	if ( $archive ) {
-		echo '<br />';
-		echo mosHTML::monthSelectList( 'month', 'size="1" class="inputbox"', $params->get( 'month' ) );
-		echo mosHTML::integerSelectList( 2000, 2010, 1, 'year', 'size="1" class="inputbox"', $params->get( 'year' ), "%04d" );
-		echo '<input type="submit" class="button" />';
-	}
-
-	// checks to see if there are there any items to display
-	if ( $total ) {
-		$col_with = 100 / $columns;			// width of each column
-		$width = 'width="'. $col_with .'%"';
-
-		if ( $archive ) {
-			// Search Success message
-			$msg = sprintf( _ARCHIVE_SEARCH_SUCCESS, $params->get( 'month' ), $params->get( 'year' ) );
-			echo "<br /><br /><div align='center'>". $msg ."</div><br /><br />";
-		}
-		echo '<table class="blog' . $params->get( 'pageclass_sfx' ) . '" cellpadding="0" cellspacing="0">';
-
-		// Secrion/Category Description & Image
-		if ( $menu && $menu->componentid && ( $descrip || $descrip_image ) ) {
-			$link = $mosConfig_live_site .'/images/stories/'. $description->image;
-			echo '<tr>';
-			echo '<td valign="top">';
-			if ( $descrip_image && $description->image ) {
-				echo '<img src="'. $link .'" align="'. $description->image_position .'" hspace="6" alt="" />';
-			}
-			if ( $descrip && $description->description ) {
-				echo $description->description;
-			}
-			echo '<br/><br/>';
-			echo '</td>';
-			echo '</tr>';
-		}
-
-		// Leading story output
-		if ( $leading ) {
-			echo '<tr>';
-			echo '<td valign="top">';
-			for ( $z = 0; $z < $leading; $z++ ) {
-				if ( $i >= $total ) {
-					// stops loop if total number of items is less than the number set to display as leading
-					break;
-				}
-				echo '<div>';
-				show( $rows[$i], $params, $gid, $access, $pop, $option, $ItemidCount );
-				echo '</div>';
-				$i++;
-			}
-			echo '</td>';
-			echo '</tr>';
-		}
-
-		if ( $intro && ( $i < $total ) ) {
-			echo '<tr>';
-			echo '<td valign="top">';
-			echo '<table width="100%"  cellpadding="0" cellspacing="0">';
-			// intro story output
-			for ( $z = 0; $z < $intro; $z++ ) {
-				if ( $i >= $total ) {
-					// stops loop if total number of items is less than the number set to display as intro + leading
-					break;
-				}
-
-				if ( !( $z % $columns ) || $columns == 1 ) {
-					echo '<tr>';
-				}
-
-				echo '<td valign="top" '. $width .'>';
-
-				// outputs either intro or only a link
-				if ( $z < $intro ) {
-					show( $rows[$i], $params, $gid, $access, $pop, $option, $ItemidCount );
-				} else {
-					echo '</td>';
-					echo '</tr>';
-					break;
-				}
-
-				echo '</td>';
-
-				if ( !( ( $z + 1 ) % $columns ) || $columns == 1 ) {
-					echo '</tr>';
-				}
-
-				$i++;
-			}
-
-			// this is required to output a final closing </tr> tag when the number of items does not fully
-			// fill the last row of output - a blank column is left
-			if ( $intro % $columns ) {
-				echo '</tr>';
-			}
-
-			echo '</table>';
-			echo '</td>';
-			echo '</tr>';
-		}
-
-		// Links output
-		if ( $links && ( $i < $total )  ) {
-			echo '<tr>';
-			echo '<td valign="top">';
-			echo '<div class="blog_more'. $params->get( 'pageclass_sfx' ) .'">';
-			HTML_content::showLinks( $rows, $links, $total, $i, 1, $ItemidCount );
-			echo '</div>';
-			echo '</td>';
-			echo '</tr>';
-		}
-
-		// Pagination output
-		if ( $pagination ) {
-			if ( ( $pagination == 2 ) && ( $total <= $limit ) ) {
-				// not visible when they is no 'other' pages to display
-			} else {
-				// get the total number of records
-				$limitstart = $limitstart ? $limitstart : 0;
-				require_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/pageNavigation.php' );
-				$pageNav = new mosPageNav( $total, $limitstart, $limit );
-				if ( $option == 'com_frontpage' ) {
-					$link = 'index.php?option=com_frontpage&amp;Itemid='. $Itemid;
-				} else if ( $archive ) {
-					$year = $params->get( 'year' );
-					$month = $params->get( 'month' );
-					$link = 'index.php?option=com_content&amp;task='. $task .'&amp;id='. $id .'&amp;Itemid='. $Itemid.'&amp;year='. $year .'&amp;month='. $month;
-				} else {
-					$link = 'index.php?option=com_content&amp;task='. $task .'&amp;id='. $id .'&amp;Itemid='. $Itemid;
-				}
-				echo '<tr>';
-				echo '<td valign="top" align="center">';
-				echo $pageNav->writePagesLinks( $link );
-				echo '<br /><br />';
-				echo '</td>';
-				echo '</tr>';
-				if ( $pagination_results ) {
-					echo '<tr>';
-					echo '<td valign="top" align="center">';
-					echo $pageNav->writePagesCounter();
-					echo '</td>';
-					echo '</tr>';
-				}
-			}
-		}
-
-		echo '</table>';
-
-	} else if ( $archive && !$total ) {
-		// Search Failure message for Archives
-		$msg = sprintf( _ARCHIVE_SEARCH_FAILURE, $params->get( 'month' ), $params->get( 'year' ) );
-		echo '<br /><br /><div align="center">'. $msg .'</div><br />';
-	} else {
-		// Generic blog empty display
-		echo _EMPTY_BLOG;
-	}
-
-	// Back Button
-	$params->set( 'back_button', $back );
-	mosHTML::BackButton ( $params );
-}
-
-
-function showItem( $uid, $gid, &$access, $pop, $option, $now ) {
-	global $database, $mainframe;
-	global $mosConfig_offset, $mosConfig_live_site, $mosConfig_MetaTitle, $mosConfig_MetaAuthor;
-
-	if ( $access->canEdit ) {
-		$xwhere='';
-	} else {
-		$xwhere = "AND (a.state = '1' OR a.state = '-1')"
-		. "\n	AND (publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now')"
-		. "\n	AND (publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now')"
-		;
-	}
-
-	$query = "SELECT a.*, ROUND(v.rating_sum/v.rating_count) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, s.name AS section, g.name AS groups"
-	. "\n FROM #__content AS a"
-	. "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
-	. "\n LEFT JOIN #__sections AS s ON s.id = cc.section AND s.scope='content'"
-	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
-	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-	. "\n WHERE a.id='". $uid ."' ". $xwhere
-	. "\n AND a.access <= ". $gid
-	;
-	$database->setQuery( $query );
-	$row = NULL;
-
-	if ( $database->loadObject( $row ) ) {
-		$params =& new mosParameters( $row->attribs );
-		$params->set( 'intro_only', 0 );
-		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-		if ( $row->sectionid == 0) {
-			$params->set( 'item_navigation', 0 );
-		} else {
-			$params->set( 'item_navigation', $mainframe->getCfg( 'item_navigation' ) );
-		}
-		// loads the links for Next & Previous Button
-		if ( $params->get( 'item_navigation' ) ) {
-			$query = "SELECT a.id"
-			. "\n FROM #__content AS a"
-			. "\n WHERE a.catid = ". $row->catid.""
-			. "\n AND a.state = $row->state AND ordering < $row->ordering"
-			. ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
-			. "\n ORDER BY a.ordering DESC"
-			. "\n LIMIT 1"
-			;
-			$database->setQuery( $query );
-			$row->prev = $database->loadResult();
-
-			$query = "SELECT a.id"
-			. "\n FROM #__content AS a"
-			. "\n WHERE a.catid = ". $row->catid.""
-			. "\n AND a.state = $row->state AND ordering > $row->ordering"
-			. ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
-			. "\n ORDER BY a.ordering"
-			. "\n LIMIT 1"
-			;
-			$database->setQuery( $query );
-			$row->next = $database->loadResult();
-		}
-		// page title
-		$mainframe->setPageTitle( $row->title );
-		if ($mosConfig_MetaTitle=='1') {
-			$mainframe->addMetaTag( 'title' , $row->title );
-		}
-		if ($mosConfig_MetaAuthor=='1') {
-			$mainframe->addMetaTag( 'author' , $row->author );
-		}
-
-		show( $row, $params, $gid, $access, $pop, $option );
-	} else {
-		mosNotAuth();
-		return;
-	}
-}
-
-
-function show( $row, $params, $gid, &$access, $pop, $option, $ItemidCount=NULL ) {
-	global $database, $mainframe, $Itemid;
-	global $mosConfig_live_site, $mosConfig_absolute_path;
-	global $options, $cache;
-
-	$noauth = !$mainframe->getCfg( 'shownoauth' );
-
-	if ( $access->canEdit ) {
-		if ( $row->id === null || $row->access > $gid ) {
-			mosNotAuth();
-			return;
-		}
-	} else {
-		if ( $row->id === null || $row->state == 0 ) {
-			mosNotAuth();
-			return;
-		}
-		if ( $row->access > $gid ) {
-			if ( $noauth ) {
-				mosNotAuth();
-				return;
-			} else {
-				if ( !( $params->get( 'intro_only' ) ) ) {
-					mosNotAuth();
-					return;
-				}
-			}
-		}
-	}
-
-	// GC Parameters
-	$params->def( 'link_titles', $mainframe->getCfg( 'link_titles' ) );
-	$params->def( 'author', !$mainframe->getCfg( 'hideAuthor' ) );
-	$params->def( 'createdate', !$mainframe->getCfg( 'hideCreateDate' ) );
-	$params->def( 'modifydate', !$mainframe->getCfg( 'hideModifyDate' ) );
-	$params->def( 'print', !$mainframe->getCfg( 'hidePrint' ) );
-	$params->def( 'pdf', !$mainframe->getCfg( 'hidePdf' ) );
-	$params->def( 'email', !$mainframe->getCfg( 'hideEmail' ) );
-	$params->def( 'rating', $mainframe->getCfg( 'vote' ) );
-	$params->def( 'icons', $mainframe->getCfg( 'icons' ) );
-	$params->def( 'readmore', $mainframe->getCfg( 'readmore' ) );
-	// Other Params
-	$params->def( 'image', 1 );
-	$params->def( 'section', 0 );
-	$params->def( 'section_link', 0 );
-	$params->def( 'category', 0 );
-	$params->def( 'category_link', 0 );
-	$params->def( 'introtext', 1 );
-	$params->def( 'pageclass_sfx', '' );
-	$params->def( 'item_title', 1 );
-	$params->def( 'url', 1 );
-
-	// loads the link for Section name
-	if ( $params->get( 'section_link' ) ) {
-		$query = 	"SELECT a.id"
-		. "\n FROM #__menu AS a"
-		. "\n WHERE a.componentid = ". $row->sectionid.""
-		;
-		$database->setQuery( $query );
-		$_Itemid = $database->loadResult();
-		$link = sefRelToAbs( 'index.php?option=com_content&amp;task=section&amp;id='. $row->sectionid .'&amp;Itemid='.$_Itemid );
-		$row->section = '<a href="'. $link .'">'. $row->section .'</a>';
-	}
-
-	// loads the link for Category name
-	if ( $params->get( 'category_link' ) ) {
-		$query = 	"SELECT a.id"
-		. "\n FROM #__menu AS a"
-		. "\n WHERE a.componentid = ". $row->catid.""
-		;
-		$database->setQuery( $query );
-		$_Itemid = $database->loadResult();
-		$link = sefRelToAbs( 'index.php?option=com_content&amp;task=category&amp;sectionid='. $row->sectionid .'&amp;id='. $row->catid .'&amp;Itemid='.$_Itemid );
-		$row->category = '<a href="'. $link .'">'. $row->category .'</a>';
-	}
-
-	// loads current template for the pop-up window
-	$template = '';
-	if ( $pop ) {
-		$params->set( 'popup', 1 );
-		$database->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'" );
-		$template = $database->loadResult();
-	}
-
-	// show/hides the intro text
-	if ( $params->get( 'introtext'  ) ) {
-		$row->text = $row->introtext. ( $params->get( 'intro_only' ) ? '' : chr(13) . chr(13) . $row->fulltext);
-	} else {
-		$row->text = $row->fulltext;
-	}
-
-	// deal with the {mospagebreak} mambots
-	// only permitted in the full text area
-	$page = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
-
-	// record the hit
-	if ( !$params->get( 'intro_only' ) ) {
-		$obj = new mosContent( $database );
-		$obj->hit( $row->id );
-	}
-
-	$cache->call( 'HTML_content::show', $row, $params, $access, $page, $option, $ItemidCount );
-}
-
-
-function editItem( $uid, $gid, &$access, $sectionid=0, $task, $Itemid ){
-	global $database, $mainframe, $my;
-	global $mosConfig_absolute_path, $mosConfig_live_site;
-
-	$row = new mosContent( $database );
-	// load the row from the db table
-	$row->load( $uid );
-
-	// fail if checked out not by 'me'
-	if ( $row->checked_out && $row->checked_out <> $my->id ) {
-		echo"<script>alert('The module [ ".$row->title." ] is currently being edited by another person.'); window.history.go(-1); </script>";
-		exit;
-	}
-
-	if ( $uid ) {
-		// existing record
-		if ( !( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) ) {
-			mosNotAuth();
-			return;
-		}
-	} else {
-		// new record
-		if (!($access->canEdit || $access->canEditOwn)) {
-			mosNotAuth();
-			return;
-		}
-	}
-
-	if ( $uid ) {
-		$sectionid = $row->sectionid;
-	}
-
-	$lists = array();
-
-	// get the type name - which is a special category
-	$query = "SELECT name FROM #__sections WHERE id='$sectionid'";
-	$database->setQuery( $query );
-	$section = $database->loadResult();
-
-	if ( $uid == 0 ) {
-		$row->catid = 0;
-	}
-
-	if ( $uid ) {
-		$row->checkout( $my->id );
-		if (trim( $row->publish_down ) == "0000-00-00 00:00:00") {
-			$row->publish_down = 'Never';
-		}
-		if (trim( $row->images )) {
-			$row->images = explode( "\n", $row->images );
-		} else {
-			$row->images = array();
-		}
-		$query = "SELECT name from #__users"
-		. "\n WHERE id = ". $row->created_by
-		;
-		$database->setQuery( $query	);
-		$row->creator = $database->loadResult();
-
-		$query = "SELECT name from #__users"
-		. "\n WHERE id = ". $row->modified_by
-		;
-		$database->setQuery( $query );
-		$row->modifier = $database->loadResult();
-
-		$query = "SELECT content_id from #__content_frontpage"
-		."\n WHERE content_id = ". $row->id
-		;
-		$database->setQuery( $query );
-		$row->frontpage = $database->loadResult();
-	} else {
-		$row->sectionid 	= $sectionid;
-		$row->version 		= 0;
-		$row->state 		= 0;
-		$row->ordering 		= 0;
-		$row->images 		= array();
-		$row->publish_up 	= date( 'Y-m-d', time() );
-		$row->publish_down 	= 'Never';
-		$row->creator 		= 0;
-		$row->modifier 		= 0;
-		$row->frontpage 	= 0;
-	}
-
-
-	// calls function to read image from directory
-	$pathA 		= $mosConfig_absolute_path .'/images/stories';
-	$pathL 		= $mosConfig_live_site .'/images/stories';
-	$images 	= array();
-	$folders 	= array();
-	$folders[] 	= mosHTML::makeOption( '/' );
-	mosAdminMenus::ReadImages( $pathA, '/', $folders, $images );
-	// list of folders in images/stories/
-	$lists['folders'] 		= mosAdminMenus::GetImageFolders( $folders, $pathL );
-	// list of images in specfic folder in images/stories/
-	$lists['imagefiles']	= mosAdminMenus::GetImages( $images, $pathL );
-	// list of saved images
-	$lists['imagelist'] 	= mosAdminMenus::GetSavedImages( $row, $pathL );
-
-	// make the select list for the states
-	$states[] = mosHTML::makeOption( 0, _CMN_UNPUBLISHED );
-	$states[] = mosHTML::makeOption( 1, _CMN_PUBLISHED );
-	$lists['state'] 		= mosHTML::selectList( $states, 'state', 'class="inputbox" size="1"', 'value', 'text', intval( $row->state ) );
-
-	// build the html select list for ordering
-	$query = "SELECT ordering AS value, title AS text"
-	. "\n FROM #__content"
-	. "\n WHERE catid = '$row->catid'"
-	. "\n ORDER BY ordering"
-	;
-	$lists['ordering'] 		= mosAdminMenus::SpecificOrdering( $row, $uid, $query, 1 );
-
-	// build list of categories
-	$lists['catid'] 		= mosAdminMenus::ComponentCategory( 'catid', $sectionid, intval( $row->catid ) );
-	// build the select list for the image positions
-	$lists['_align'] 		= mosAdminMenus::Positions( '_align' );
-	// build the html select list for the group access
-	$lists['access'] 		= mosAdminMenus::Access( $row );
-
-	HTML_content::editContent( $row, $section, $lists, $images, $access, $my->id, $sectionid, $task, $Itemid );
-}
-
-
-/**
-* Saves the content item an edit form submit
-*/
-function saveContent( &$access ) {
-	global $database, $mainframe, $my;
-	global $mosConfig_absolute_path;
-
-	$row = new mosContent( $database );
-	if ( !$row->bind( $_POST ) ) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-	$isNew = $row->id < 1;
-	if ( $isNew ) {
-		// new record
-		if ( !( $access->canEdit || $access->canEditOwn ) ) {
-			mosNotAuth();
-			return;
-		}
-		$row->created = date( 'Y-m-d H:i:s' );
-		$row->created_by = $my->id;
-	} else {
-		// existing record
-		if ( !( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) ) {
-			mosNotAuth();
-			return;
-		}
-		$row->modified = date( 'Y-m-d H:i:s' );
-		$row->modified_by = $my->id;
-	}
-	if ( trim( $row->publish_down ) == 'Never' ) {
-		$row->publish_down = '0000-00-00 00:00:00';
-	}
-
-	if (!$row->check()) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-	$row->version++;
-	if (!$row->store()) {
-		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
-		exit();
-	}
-
-	// manage frontpage items
-	require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
-	$fp = new mosFrontPage( $database );
-
-	if ( mosGetParam( $_REQUEST, 'frontpage', 0 ) ) {
-
-		// toggles go to first place
-		if (!$fp->load( $row->id )) {
-			// new entry
-			$database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$row->id','1')" );
-			if (!$database->query()) {
-				echo "<script> alert('".$database->stderr()."');</script>\n";
-				exit();
-			}
-			$fp->ordering = 1;
-		}
-	} else {
-		// no frontpage mask
-		if ( !$fp->delete( $row->id ) ) {
-			$msg .= $fp->stderr();
-		}
-		$fp->ordering = 0;
-	}
-	$fp->updateOrder();
-
-	$row->checkin();
-	$row->updateOrder( "catid='$row->catid'" );
-
-	// gets section name of item
-	$database->setQuery( "SELECT s.title"
-	. "\n FROM #__sections AS s"
-	. "\n WHERE s.scope = 'content'"
-	. "\n AND s.id = '". $row->sectionid ."'"
-	);
-	// gets category name of item
-	$section = $database->loadResult();
-	$database->setQuery( "SELECT c.title"
-	. "\n FROM #__categories AS c"
-	. "\n WHERE c.id = '". $row->catid ."'"
-	);
-	$category = $database->loadResult();
-
-	if ( $isNew ) {
-		// messaging for new items
-		require_once( $mosConfig_absolute_path .'/components/com_messages/messages.class.php' );
-
-		$database->setQuery( "SELECT id FROM #__users WHERE sendEmail = '1'" );
-		$users = $database->loadResultArray();
-		foreach ($users as $user_id) {
-			$msg = new mosMessage( $database );
-			$msg->send( $my->id, $user_id, "New Item", sprintf( _ON_NEW_CONTENT, $my->username, $row->title, $section, $category ) );
-		}
-	}
-
- 	$Itemid 	= mosGetParam( $_POST, 'Returnid', '0' );
- 	$msg 	= $isNew ? _THANK_SUB : _E_ITEM_SAVED;
-	mosRedirect( 'index.php', $msg );
-}
-
-
-/**
-* Cancels an edit operation
-* @param database A database connector object
-*/
-function cancelContent( &$access ) {
-	global $database, $mainframe, $my;
-
-	$row = new mosContent( $database );
-	$row->bind( $_POST );
-
-	if ( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) {
-		$row->checkin();
-	}
-
-	$Itemid = mosGetParam( $_POST, 'Returnid', '0' );
-
-	if ( $Itemid ) {
-		mosRedirect( 'index.php?option=com_content&task=view&id='. $row->id .'&Itemid='. $Itemid );
-	} else {
-		mosRedirect( 'index.php' );
-	}
-}
-
-/**
-* Shows the email form for a given content item.
-*/
-function emailContentForm( $uid ) {
-	global $database, $mainframe, $my;
-	$row = new mosContent( $database );
-	$row->load( $uid );
-
-	if ( $row->id === null || $row->access > $my->gid ) {
-		mosNotAuth();
-		return;
-	} else {
-		$template='';
-		$database->setQuery( "SELECT template FROM #__templates_menu WHERE client_id = '0' AND menuid = '0'" );
-		$template = $database->loadResult();
-		HTML_content::emailForm( $row->id, $row->title, $template );		
-	}
-
-}
-
-
-/**
-* Shows the email form for a given content item.
-*/
-function emailContentSend( $uid ) {
-	global $database, $mainframe;
-	global $mosConfig_live_site, $mosConfig_sitename;
-	global $mosConfig_mailfrom, $mosConfig_fromname;
-
-	$_Itemid = $mainframe->getItemid( $uid, 0, 0  );
-
-	$email = trim( mosGetParam( $_POST, 'email', '' ) );
-	$yourname = trim( mosGetParam( $_POST, 'yourname', '' ) );
-	$youremail = trim( mosGetParam( $_POST, 'youremail', '' ) );
-	$subject_default = _EMAIL_INFO ." $yourname";
-	$subject = trim( mosGetParam( $_POST, 'subject', $subject_default ) );
-
-	$form_check = mosGetParam( $_POST, 'form_check', '' );    
-    if (empty($_SESSION['_form_check_']['com_content']) || $form_check != $_SESSION['_form_check_']['com_content']) {
-      // the form hasn't been generated by the server on this session 	
-       exit;
-    }  
-	if ( !$email || !$youremail || ( is_email( $email ) == false ) || ( is_email( $youremail ) == false ) ) {
-		echo "<script>alert (\""._EMAIL_ERR_NOINFO."\"); window.history.go(-1);</script>";
-		exit(0);
-	}
-
-	$template='';
-	$database->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'" );
-	$template = $database->loadResult();
-
-	// link sent in email
-	$link = sefRelToAbs( $mosConfig_live_site .'/index.php?option=com_content&task=view&id='. $uid .'&Itemid='. $_Itemid );
-	// message text
-	$msg = sprintf( _EMAIL_MSG, $mosConfig_sitename, $yourname, $youremail, $link );
-
-	// mail function
-	mosMail( $mosConfig_mailfrom, $mosConfig_fromname, $email, $subject, $msg );
-
-	HTML_content::emailSent( $email, $template );
-}
-
-function is_email( $email ){
-	$rBool = false;
-
-	if ( preg_match( "/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $email ) ) {
-		$rBool = true;
-	}
-	return $rBool;
-}
-
-function recordVote() {
-	global $database;
-
-	$user_rating = mosGetParam( $_REQUEST, 'user_rating', 0 );
-	$url = mosGetParam( $_REQUEST, 'url', '' );
-	$cid = mosGetParam( $_REQUEST, 'cid', 0 );
-	$cid = intval( $cid );
-	$user_rating = intval( $user_rating );
-
-	if ( ( $user_rating >= 1 ) and ( $user_rating <= 5 ) ) {
-		$currip = getenv( 'REMOTE_ADDR' );
-
-		$query = "SELECT * FROM #__content_rating WHERE content_id = $cid";
-		$database->setQuery( $query );
-		$votesdb = NULL;
-		if ( !( $database->loadObject( $votesdb ) ) ) {
-			$query = "INSERT INTO #__content_rating ( content_id, lastip, rating_sum, rating_count )"
-			. "\n VALUES ( '$cid', '$currip', '$user_rating', '1' )";
-			$database->setQuery( $query );
-			$database->query() or die( $database->stderr() );;
-		} else {
-			if ($currip <> ($votesdb->lastip)) {
-				$query = "UPDATE #__content_rating"
-				. "\n SET rating_count = rating_count + 1,"
-				. "\n rating_sum = rating_sum + $user_rating,"
-				. "\n lastip = '$currip'"
-				. "\n WHERE content_id = ". $cid
-				;
-				$database->setQuery( $query );
-				$database->query() or die( $database->stderr() );
-			} else {
-				mosRedirect ( $url, _ALREADY_VOTE );
-			}
-		}
-		mosRedirect ( $url, _THANKS );
-	}
-}
-
-
-function _orderby_pri( $orderby ) {
-	switch ( $orderby ) {
-		case 'alpha':
-			$orderby = 'cc.title, ';
-			break;
-		case 'ralpha':
-			$orderby = 'cc.title DESC, ';
-			break;
-		case 'order':
-			$orderby = 'cc.ordering, ';
-			break;
-		default:
-			$orderby = '';
-			break;
-	}
-
-	return $orderby;
-}
-
-
-function _orderby_sec( $orderby ) {
-	switch ( $orderby ) {
-		case 'date':
-			$orderby = 'a.created';
-			break;
-		case 'rdate':
-			$orderby = 'a.created DESC';
-			break;
-		case 'alpha':
-			$orderby = 'a.title';
-			break;
-		case 'ralpha':
-			$orderby = 'a.title DESC';
-			break;
-		case 'hits':
-			$orderby = 'a.hits DESC';
-			break;
-		case 'rhits':
-			$orderby = 'a.hits ASC';
-			break;
-		case 'order':
-			$orderby = 'a.ordering';
-			break;
-		case 'author':
-			$orderby = 'a.created_by, u.name';
-			break;
-		case 'rauthor':
-			$orderby = 'a.created_by DESC, u.name DESC';
-			break;
-		case 'front':
-			$orderby = 'f.ordering';
-			break;
-		default:
-			$orderby = 'a.ordering';
-			break;
-	}
-
-	return $orderby;
-}
-
-/*
-* @param int 0 = Archives, 1 = Section, 2 = Category
-*/
-function _where( $type=1, &$access, &$noauth, $gid, $id, $now=NULL, $year=NULL, $month=NULL ) {
-	$where = array();
-
-	// normal
-	if ( $type > 0) {
-		$where[] = "a.state = '1'";
-		if ( !$access->canEdit ) {
-			$where[] = "( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )";
-			$where[] = "( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )";
-		}
-		if ( $noauth ) {
-			$where[] = "a.access <= '". $gid ."'";
-		}
-		if ( $id > 0 ) {
-			if ( $type == 1 ) {
-				$where[] = "a.sectionid IN ( ". $id ." ) ";
-			} else if ( $type == 2 ) {
-				$where[] = "a.catid IN ( ". $id ." ) ";
-			}
-		}
-	}
-
-	// archive
-	if ( $type < 0 ) {
-		$where[] = "a.state='-1'";
-		if ( $year ) {
-			$where[] = "YEAR( a.created ) = '". $year ."'";
-		}
-		if ( $month ) {
-			$where[] = "MONTH( a.created ) = '". $month ."'";
-		}
-		if ( $noauth ) {
-			$where[] = "a.access <= '". $gid ."'";
-		}
-		if ( $id > 0 ) {
-			if ( $type == -1 ) {
-				$where[] = "a.sectionid = '". $id ."'";
-			} else if ( $type == -2) {
-				$where[] = "a.catid = '". $id ."'";
-			}
-		}
-	}
-
-	return $where;
-}
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Content
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+require_once( $mainframe->getPath( 'front_html', 'com_content' ) );
+require_once($mainframe->getPath('class'));
+
+$id			= intval( mosGetParam( $_REQUEST, 'id', 0 ) );
+$sectionid 	= intval( mosGetParam( $_REQUEST, 'sectionid', 0 ) );
+$pop 		= intval( mosGetParam( $_REQUEST, 'pop', 0 ) );
+$task 		= trim( mosGetParam( $_REQUEST, 'task', '' ) );
+$limit 		= intval( mosGetParam( $_REQUEST, 'limit', '' ) );
+$limitstart = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
+
+$now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
+
+// Editor usertype check
+$access = new stdClass();
+$access->canEdit 	= $acl->acl_check( 'action', 'edit', 'users', $my->usertype, 'content', 'all' );
+$access->canEditOwn = $acl->acl_check( 'action', 'edit', 'users', $my->usertype, 'content', 'own' );
+$access->canPublish = $acl->acl_check( 'action', 'publish', 'users', $my->usertype, 'content', 'all' );
+
+// cache activation
+$cache =& mosCache::getCache( 'com_content' );
+
+// loads function for frontpage component
+if ( $option == 'com_frontpage' ) {
+	//frontpage( $option, $gid, $pop, $now );
+	$cache->call( 'frontpage', $gid, $access, $pop, $now );
+	return;
+}
+
+switch ( strtolower( $task ) ) {
+	case 'findkey':
+		findKeyItem( $gid, $access, $pop, $option, $now );
+		break;
+
+	case 'view':
+		showItem( $id, $gid, $access, $pop, $option, $now );
+		break;
+
+	case 'section':
+		$cache->call( 'showSection', $id, $gid, $access, $now );
+		break;
+
+	case 'category':
+		$cache->call( 'showCategory', $id, $gid, $access, $sectionid, $limit, $limitstart, $now );
+		break;
+
+	case 'blogsection':
+		$cache->call('showBlogSection', $id, $gid, $access, $pop, $now );
+		break;
+
+	case 'blogcategorymulti':
+	case 'blogcategory':
+		$cache->call( 'showBlogCategory', $id, $gid, $access, $pop, $now );
+		break;
+
+	case 'archivesection':
+		showArchiveSection( $id, $gid, $access, $pop, $option );
+		break;
+
+	case 'archivecategory':
+		showArchiveCategory( $id, $gid, $access, $pop, $option, $now );
+		break;
+
+	case 'edit':
+		editItem( $id, $gid, $access, 0, $task, $Itemid );
+		break;
+
+	case 'new':
+		editItem( 0, $gid, $access, $sectionid, $task, $Itemid );
+		break;
+
+	case 'save':
+		mosCache::cleanCache( 'com_content' );
+		saveContent( $access );
+		break;
+
+	case 'cancel':
+		cancelContent( $access );
+		break;
+
+	case 'emailform':
+		emailContentForm( $id );
+		break;
+
+	case 'emailsend':
+		emailContentSend( $id );
+		break;
+
+	case 'vote':
+		recordVote ( $url , $user_rating , $cid , $database);
+		break;
+
+	default:
+		$cache->call('showBlogSection', 0, $gid, $access, $pop, $now );
+		break;
+}
+
+/**
+ * Searches for an item by a key parameter
+ * @param int The user access level
+ * @param object Actions this user can perform
+ * @param int
+ * @param string The url option
+ * @param string A timestamp
+ */
+function findKeyItem( $gid, $access, $pop, $option, $now ) {
+	global $database;
+	$keyref = mosGetParam( $_REQUEST, 'keyref', '' );
+	$keyref = $database->getEscaped( $keyref );
+
+	$query = 'SELECT id
+		FROM #__content
+		WHERE attribs LIKE \'%keyref=' . $keyref . '%\'
+		';
+	$database->setQuery( $query );
+	$id = $database->loadResult();
+	if ($id > 0) {
+		showItem( $id, $gid, $access, $pop, $option, $now );
+	} else {
+		echo 'Key not found '. $keyref;
+	}
+}
+
+function frontpage( $gid, &$access, $pop, $now ) {
+	global $database, $mainframe, $my, $Itemid;
+	global $mosConfig_offset;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+
+	// Parameters
+	$menu =& new mosMenu( $database );
+	$menu->load( $Itemid );
+	$params =& new mosParameters( $menu->params );
+	$orderby_sec = $params->def( 'orderby_sec', '' );
+	$orderby_pri = $params->def( 'orderby_pri', '' );
+
+	// Ordering control
+	$order_sec = _orderby_sec( $orderby_sec );
+	$order_pri = _orderby_pri( $orderby_pri );
+
+	$now = date( "Y-m-d H:i:s", time()+$mosConfig_offset*60*60 );
+
+	// query records
+	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, cc.name AS category, g.name AS groups"
+	. "\n FROM #__content AS a"
+	. "\n INNER JOIN #__content_frontpage AS f ON f.content_id = a.id"
+	. "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
+	. "\n INNER JOIN #__sections AS s ON s.id = a.sectionid"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. "\n WHERE a.state = '1'"
+	. ( $noauth ? "\n AND a.access <= '". $my->gid ."'" : '' )
+	. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now'  )"
+	. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now' )"
+	. "\n ORDER BY ". $order_pri . $order_sec
+	;
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
+
+	// Dynamic Page Title
+	$mainframe->SetPageTitle( $menu->name );
+
+	BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
+}
+
+
+function showSection( $id, $gid, &$access, $now ) {
+	global $database, $mainframe, $mosConfig_offset, $Itemid;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+
+	// Paramters
+	$params = new stdClass();
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$params =& new mosParameters( $menu->params );
+	} else {
+		$menu = "";
+		$params =& new mosEmpty();
+
+	}
+	$orderby = $params->get( 'orderby', '' );
+
+	$params->set( 'type', 'section' );
+
+	$params->def( 'page_title', 1 );
+	$params->def( 'pageclass_sfx', '' );
+	$params->def( 'other_cat_section', 1 );
+	$params->def( 'other_cat', 1 );
+	$params->def( 'empty_cat', 0 );
+	$params->def( 'cat_items', 1 );
+	$params->def( 'cat_description', 1 );
+	$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
+	$params->def( 'pageclass_sfx', '' );
+
+	// Ordering control
+	$orderby = _orderby_sec( $orderby );
+
+	$section = new mosSection( $database );
+	$section->load( $id );
+
+	if ( $access->canEdit ) {
+		$xwhere = '';
+		$xwhere2 = "\n AND b.state >= '0'";
+	} else {
+		$xwhere = "\n AND a.published = '1'";
+		$xwhere2 = "\n AND b.state = '1'"
+		. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '". $now ."' )"
+		. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '". $now ."' )"
+		;
+	}
+
+	// show/hide empty categories
+	if ( $params->get( 'empty_cat' ) ) {
+		$empty = '';
+	} else {
+		$empty = "\n HAVING COUNT( b.id ) > 0";
+	}
+
+	// Main Query
+	$query = '
+		SELECT a.*, COUNT( b.id ) AS numitems
+		FROM #__categories AS a
+		LEFT JOIN #__content AS b ON b.catid = a.id '. $xwhere2 .'
+		WHERE a.section = \'' . $section->id .'\' '. $xwhere;
+	if ($noauth) {
+		$query .= '
+		AND a.access <= '. $gid;
+	}
+	$query .= '
+		GROUP BY a.id
+		' . $empty . '
+		ORDER BY ' . $orderby;
+
+	$database->setQuery( $query );
+	$other_categories = $database->loadObjectList();
+
+	// Dynamic Page Title
+	$mainframe->SetPageTitle( $menu->name );
+
+	HTML_content::showContentList( $section, NULL, $access, $id, NULL,  $gid, $params, NULL, $other_categories, NULL );
+}
+
+
+/**
+* @param int The category id
+* @param int The group id of the user
+* @param int The access level of the user
+* @param int The section id
+* @param int The number of items to dislpay
+* @param int The offset for pagination
+*/
+function showCategory( $id, $gid, &$access, $sectionid, $limit, $limitstart, $now  ) {
+	global $database, $mainframe, $Itemid, $mosConfig_offset, $mosConfig_list_limit;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+	$selected = mosGetParam( $_POST, 'order', '' );
+
+	// Paramters
+	$params = new stdClass();
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$params =& new mosParameters( $menu->params );
+	} else {
+		$menu = "";
+		$params =& new mosParameters( '' );
+	}
+
+	if ( $selected ) {
+		$orderby = $selected;
+	} else {
+		$orderby = $params->get( 'orderby', 'rdate' );
+		$selected = $orderby;
+	}
+
+	$params->set( 'type', 'category' );
+
+	$params->def( 'page_title', 1 );
+	$params->def( 'title', 1 );
+	$params->def( 'hits', $mainframe->getCfg( 'hits' ) );
+	$params->def( 'author', !$mainframe->getCfg( 'hideAuthor' ) );
+	$params->def( 'date', !$mainframe->getCfg( 'hideCreateDate' ) );
+	$params->def( 'date_format', _DATE_FORMAT_LC );
+	$params->def( 'navigation', 2 );
+	$params->def( 'display', 1 );
+	$params->def( 'display_num', $mosConfig_list_limit );
+	$params->def( 'other_cat', 1 );
+	$params->def( 'empty_cat', 0 );
+	$params->def( 'cat_items', 1 );
+	$params->def( 'cat_description', 0 );
+	$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
+	$params->def( 'pageclass_sfx', '' );
+	$params->def( 'headings', 1 );
+	$params->def( 'order_select', 1 );
+	$params->def( 'filter', 1 );
+	$params->def( 'filter_type', 'title' );
+
+	// Ordering control
+	$orderby = _orderby_sec( $orderby );
+
+	$category = new mosCategory( $database );
+	$category->load( $id );
+
+	if ( $sectionid == 0 ) {
+		$sectionid = $category->section;
+	}
+
+	$pathway =& mosPathway::getInstance();
+	$pathway->addItem($category->title, categoryURL($sectionid, $id));
+
+	if ( $access->canEdit ) {
+		$xwhere = '';
+		$xwhere2 = "\n AND b.state >= '0'";
+	} else {
+		$xwhere = "\n AND c.published='1'";
+		$xwhere2 = "\n AND b.state='1'"
+		. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '". $now ."' )"
+		. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '". $now ."' )"
+		;
+	}
+
+	$pagetitle = '';
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$pagetitle = $menu->name;
+	} // if
+
+	// show/hide empty categories
+	$empty = '';
+	if ( !$params->get( 'empty_cat' ) )
+		$empty = "\n HAVING COUNT( b.id ) > 0";
+
+	// get the list of other categories
+	$query = "SELECT c.*, COUNT( b.id ) AS numitems"
+	. "\n FROM #__categories AS c"
+	. "\n LEFT JOIN #__content AS b ON b.catid = c.id "
+	. $xwhere2
+	. ( $noauth ? "\n AND b.access <= '". $gid ."'" : '' )
+	. "\n WHERE c.section = '". $category->section. "'"
+	. $xwhere
+	. ( $noauth ? "\n AND c.access <= '". $gid ."'" : '' )
+	. "\n GROUP BY c.id"
+	. $empty
+	. "\n ORDER BY c.ordering"
+	;
+	$database->setQuery( $query );
+	$other_categories = $database->loadObjectList();
+
+	// get the total number of published items in the category
+	// filter functionality
+	$_and = '';
+	if ($filter = mosGetParam($_POST, 'filter', '')) {
+		$filter = strtolower( $filter );
+		$filter = $database->getEscaped($filter);
+		if ( $params->get( 'filter' ) ) {
+			switch ( $params->get( 'filter_type' ) ) {
+				case 'title':
+					$_and = "\n AND LOWER( a.title ) LIKE '%". $filter ."%'";
+					break;
+				case 'author':
+					$_and = "\n AND ( ( LOWER( u.name ) LIKE '%". $filter ."%' ) OR ( LOWER( a.created_by_alias ) LIKE '%". $filter ."%' ) )";
+					break;
+				case 'hits':
+					$_and = "\n AND a.hits LIKE '%". $filter ."%'";
+					break;
+			}
+		}
+
+	}
+
+	if ( $access->canEdit ) {
+		$xwhere = "\n AND a.state >= '0'";
+	} else {
+		$xwhere = "\n AND a.state='1'"
+		. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now' )"
+		. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now' )"
+		;
+	}
+
+	$query = "SELECT COUNT(a.id) as numitems"
+	. "\n FROM #__content AS a"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. "\n WHERE a.catid='". $category->id ."' ". $xwhere
+	. ( $noauth ? "\n AND a.access<='". $gid ."'" : '' )
+	. "\n AND '". $category->access ."'<='". $gid ."'"
+	. $_and
+	. "\n ORDER BY ". $orderby .""
+	;
+	$database->setQuery( $query );
+	$counter = $database->loadObjectList();
+	$total = $counter[0]->numitems;
+	$limit = $limit ? $limit : $params->get( 'display_num' ) ;
+	if ( $total <= $limit ) $limitstart = 0;
+
+	require_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/pageNavigation.php' );
+	$pageNav = new mosPageNav( $total, $limitstart, $limit );
+
+	// get the list of items for this category
+	$query = "SELECT a.id, a.title, a.hits, a.created_by, a.created_by_alias, a.created AS created, a.access, u.name AS author, a.state, g.name AS groups"
+	. "\n FROM #__content AS a"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. "\n WHERE a.catid='". $category->id ."' ". $xwhere
+	. ( $noauth ? "\n AND a.access<='". $gid ."'" : '' )
+	. "\n AND '". $category->access ."'<='". $gid ."'"
+	. $_and
+	. "\n ORDER BY ". $orderby .""
+	. "\n LIMIT ". $limitstart .", ". $limit
+	;
+	$database->setQuery( $query );
+	$items = $database->loadObjectList();
+
+	$check = 0;
+	if ( $params->get( 'date' ) ) {
+		$order[] = mosHTML::makeOption( 'date', T_('Date Asc') );
+		$order[] = mosHTML::makeOption( 'rdate', T_('Date Desc'));
+		$check .= 1;
+	}
+	if ( $params->get( 'title' ) ) {
+		$order[] = mosHTML::makeOption( 'alpha', T_('Title Asc') );
+		$order[] = mosHTML::makeOption( 'ralpha', T_('Title Desc') );
+		$check .= 1;
+	}
+	if ( $params->get( 'hits' ) ) {
+		$order[] = mosHTML::makeOption( 'hits', T_('Hits Asc') );
+		$order[] = mosHTML::makeOption( 'rhits', T_('Hits Desc') );
+		$check .= 1;
+	}
+	if ( $params->get( 'author' ) ) {
+		$order[] = mosHTML::makeOption( 'author', T_('Author Asc') );
+		$order[] = mosHTML::makeOption( 'rauthor', T_('Author Desc') );
+		$check .= 1;
+	}
+	$order[] = mosHTML::makeOption( 'order', T_('Ordering') );
+	$lists['order'] = mosHTML::selectList( $order, 'order', 'class="inputbox" size="1"  onchange="document.adminForm.submit();"', 'value', 'text', $selected );
+	if ( $check < 1 ) {
+		$lists['order'] = '';
+		$params->set( 'order_select', 0 );
+	}
+
+	$lists['task'] = 'category';
+	$lists['filter'] = $filter;
+
+	// Dynamic Page Title
+	$mainframe->SetPageTitle( $pagetitle );
+
+	HTML_content::showContentList( $category, $items, $access, $id, $sectionid, $gid, $params, $pageNav, $other_categories, $lists );
+} // showCategory
+
+
+function showBlogSection( $id=0, $gid, &$access, $pop, $now=NULL ) {
+	global $database, $mainframe, $mosConfig_offset, $Itemid;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+
+	// Parameters
+	$params = new stdClass();
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$params =& new mosParameters( $menu->params );
+	} else {
+		$menu = "";
+		$params =& new mosParameters( '' );
+	}
+
+	// new blog multiple section handling
+	if ( !$id ) {
+		$id		= $params->def( 'sectionid', 0 );
+	}
+
+	$where 		= _where( 1, $access, $noauth, $gid, $id, $now );
+
+	// Ordering control
+	$orderby_sec 	= $params->def( 'orderby_sec', 'rdate' );
+	$orderby_pri 	= $params->def( 'orderby_pri', '' );
+	$order_sec 	= _orderby_sec( $orderby_sec );
+	$order_pri 	= _orderby_pri( $orderby_pri );
+
+	// Main data query
+	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, g.name AS groups"
+	. "\n FROM #__content AS a"
+	. "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
+	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. ( count( $where ) ? "\n WHERE ".implode( "\n AND ", $where ) : '' )
+	. "\n AND s.access<=$gid"
+	. "\n ORDER BY ". $order_pri . $order_sec
+	;
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
+	
+	// Dynamic Page Title
+	if ($menu) {
+		$mainframe->setPageTitle( $menu->name );
+	}
+
+	BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
+}
+
+function showBlogCategory( $id=0, $gid, &$access, $pop, $now ) {
+	global $database, $mainframe, $mosConfig_offset, $Itemid;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+
+	// Paramters
+	$params = new stdClass();
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$params =& new mosParameters( $menu->params );
+	} else {
+		$menu = "";
+		$params =& new mosParameters( '' );
+	}
+
+	// new blog multiple section handling
+	if ( !$id ) {
+		$id 		= $params->def( 'categoryid', 0 );
+	}
+
+	$where		= _where( 2, $access, $noauth, $gid, $id, $now );
+
+	// Ordering control
+	$orderby_sec 	= $params->def( 'orderby_sec', 'rdate' );
+	$orderby_pri 	= $params->def( 'orderby_pri', '' );
+	$order_sec 	= _orderby_sec( $orderby_sec );
+	$order_pri 	= _orderby_pri( $orderby_pri );
+
+	// Main data query
+	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, g.name AS groups, cc.name AS category"
+	. "\n FROM #__content AS a"
+	. "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
+	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. ( count( $where ) ? "\n WHERE ".implode( "\n AND ", $where ) : '' )
+	. "\n AND s.access <= ". $gid
+	. "\n ORDER BY ". $order_pri . $order_sec;
+	;
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
+
+	// Dynamic Page Title
+	$mainframe->SetPageTitle( $menu->name );
+
+	BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
+}
+
+function showArchiveSection( $id=NULL, $gid, &$access, $pop, $option ) {
+	global $database, $mainframe, $mosConfig_offset;
+	global $Itemid;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+
+	// Paramters
+	$year 	= mosGetParam( $_REQUEST, 'year', date( 'Y' ) );
+	$month 	= mosGetParam( $_REQUEST, 'month', date( 'm' ) );
+
+	$params = new stdClass();
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$params =& new mosParameters( $menu->params );
+	} else {
+		$menu = "";
+		$params =& new mosParameters( '' );
+	}
+
+	$params->set( 'intro_only', 1 );
+	$params->set( 'year', $year );
+	$params->set( 'month', $month );
+
+	// Ordering control
+	$orderby_sec = $params->def( 'orderby_sec', 'rdate' );
+	$orderby_pri = $params->def( 'orderby_pri', '' );
+	$order_sec = _orderby_sec( $orderby_sec );
+	$order_pri = _orderby_pri( $orderby_pri );
+
+	// used in query
+	$where = _where( -1, $access, $noauth, $gid, $id, NULL, $year, $month );
+
+	// checks to see if 'All Sections' options used
+	if ( $id == 0 ) {
+		$check = '';
+	} else {
+		$check = 'AND a.sectionid = '. $id ;
+	}
+	// query to determine if there are any archived entries for the section
+	$query = 	"SELECT a.id"
+	. "\n FROM #__content as a"
+	. "\n WHERE a.state = '-1'"
+	. $check
+	;
+	$database->setQuery( $query );
+	$items = $database->loadObjectList();
+	$archives = count( $items );
+
+	// Main Query
+	$query = "SELECT a.*, ROUND(v.rating_sum/v.rating_count) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, g.name AS groups"
+	. "\n FROM #__content AS a"
+	. "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
+	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. ( count( $where ) ? "\n WHERE ". implode( "\n AND ", $where ) : '')
+	. "\n AND s.access <= ". $gid
+	. "\n ORDER BY ". $order_pri . $order_sec
+	;
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
+
+	// initiate form
+ 	echo '<form action="'.sefRelToAbs( 'index.php').'" method="post">';
+
+	// Dynamic Page Title
+	$mainframe->SetPageTitle( $menu->name );
+
+	if ( !$archives ) {
+		// if no archives for category, hides search and outputs empty message
+		echo '<br /><div align="center">'. T_('There are currently no Archived Entries for this Category') .'</div>';
+	} else {
+		BlogOutput( $rows, $params, $gid, $access, $pop, $menu, 1 );
+	}
+
+ 	echo '<input type="hidden" name="id" value="'. $id .'" />';
+	echo '<input type="hidden" name="Itemid" value="'. $Itemid .'" />';
+ 	echo '<input type="hidden" name="task" value="archivesection" />';
+ 	echo '<input type="hidden" name="option" value="com_content" />';
+ 	echo '</form>';
+}
+
+
+function showArchiveCategory( $id=0, $gid, &$access, $pop, $option, $now ) {
+	global $database, $mainframe, $mosConfig_offset;
+	global $Itemid;
+
+	// Parameters
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+	$year 	= mosGetParam( $_REQUEST, 'year', date( 'Y' ) );
+	$month 	= mosGetParam( $_REQUEST, 'month', date( 'm' ) );
+	$module = trim( mosGetParam( $_REQUEST, 'module', '' ) );
+
+	// used by archive module
+	if ( $module ) {
+		$check = '';
+	} else {
+		$check = 'AND a.catid = '. $id;
+	}
+
+	if ( $Itemid ) {
+		$menu = new mosMenu( $database );
+		$menu->load( $Itemid );
+		$params =& new mosParameters( $menu->params );
+	} else {
+		$menu = "";
+		$params =& new mosParameters( '' );
+	}
+
+	$params->set( 'year', $year );
+	$params->set( 'month', $month );
+
+	// Ordering control
+	$orderby_sec = $params->def( 'orderby', 'rdate' );
+	$order_sec = _orderby_sec( $orderby_sec );
+
+	// used in query
+	$where = _where( -2, $access, $noauth, $gid, $id, NULL, $year, $month );
+
+	// query to determine if there are any archived entries for the category
+	$query = 	"SELECT a.id"
+	. "\n FROM #__content as a"
+	. "\n WHERE a.state = '-1'"
+	. "\n ". $check
+	;
+	$database->setQuery( $query );
+	$items = $database->loadObjectList();
+	$archives = count( $items );
+
+	$query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, g.name AS groups"
+	. "\n FROM #__content AS a"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
+	. "\n LEFT JOIN #__sections AS s ON a.sectionid = s.id"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. ( count( $where ) ? "\n WHERE ". implode( "\n AND ", $where ) : '' )
+	. "\n AND s.access <= ". $gid
+	. "\n ORDER BY ". $order_sec
+	;
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
+
+	// initiate form
+ 	echo '<form action="'.sefRelToAbs( 'index.php').'" method="post">';
+
+	// Page Title
+	$mainframe->SetPageTitle( $menu->name );
+
+	if ( !$archives ) {
+		// if no archives for category, hides search and outputs empty message
+		echo '<br /><div align="center">'. T_('There are currently no Archived Entries for this Category') .'</div>';
+	} else {
+		BlogOutput( $rows, $params, $gid, $access, $pop, $menu, 1 );
+	}
+
+ 	echo '<input type="hidden" name="id" value="'. $id .'" />';
+	echo '<input type="hidden" name="Itemid" value="'. $Itemid .'" />';
+ 	echo '<input type="hidden" name="task" value="archivecategory" />';
+ 	echo '<input type="hidden" name="option" value="com_content" />';
+ 	echo '</form>';
+}
+
+
+function BlogOutput ( &$rows, &$params, $gid, &$access, $pop, &$menu, $archive=NULL ) {
+	global $mainframe, $Itemid, $task, $id, $option, $database, $mosConfig_live_site;
+
+	// parameters
+	if ( $params->get( 'page_title', 1 ) && $menu) {
+		$header = $params->def( 'header', $menu->name );
+	} else {
+		$header = '';
+	}
+	$columns = $params->def( 'columns', 2 );
+	if ( $columns == 0 ) {
+		$columns = 1;
+	}
+	$intro 				= $params->def( 'intro', 4 );
+	$leading 				= $params->def( 'leading', 1 );
+	$links 				= $params->def( 'link', 4 );
+	$pagination 			= $params->def( 'pagination', 2 );
+	$pagination_results 	= $params->def( 'pagination_results', 1 );
+	$pagination_results 	= $params->def( 'pagination_results', 1 );
+	$descrip		 		= $params->def( 'description', 1 );
+	$descrip_image	 		= $params->def( 'description_image', 1 );
+	// needed for back button for page
+	$back 				= $params->get( 'back_button', $mainframe->getCfg( 'back_button' ) );
+	// needed to disable back button for item
+	$params->set( 'back_button', 0 );
+	$params->def( 'pageclass_sfx', '' );
+	$params->set( 'intro_only', 1 );
+
+	$total = count( $rows );
+
+	// pagination support
+	$limitstart = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
+	$limit = $intro + $leading + $links;
+	if ( $total <= $limit ) {
+		$limitstart = 0;
+	}
+	$i = $limitstart;
+
+	// needed to reduce queries used by getItemid
+	require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+	$handler =& new contentHandler();
+	$ItemidCount['bs'] 		= $handler->getBlogSectionCount();
+	$ItemidCount['bc'] 		= $handler->getBlogCategoryCount();
+	$ItemidCount['gbs'] 	= $handler->getGlobalBlogSectionCount();
+
+	// used to display section/catagory description text and images
+	// currently not supported in Archives
+	if ( $menu && $menu->componentid && ( $descrip || $descrip_image ) ) {
+		switch ( $menu->type ) {
+			case 'content_blog_section':
+				$description = new mosSection( $database );
+				$description->load( $menu->componentid );
+				break;
+
+			case 'content_blog_category':
+				$description = new mosCategory( $database );
+				$description->load( $menu->componentid );
+				break;
+
+			default:
+				$menu->componentid = 0;
+				break;
+		}
+	}
+
+	// Page Output
+	// page header
+	if ( $header ) {
+		echo '<div class="componentheading'. $params->get( 'pageclass_sfx' ) .'">'. $header .'</div>';
+	}
+
+	if ( $archive ) {
+		echo '<br />';
+		echo mosHTML::monthSelectList( 'month', 'size="1" class="inputbox"', $params->get( 'month' ) );
+		echo mosHTML::integerSelectList( 2000, 2010, 1, 'year', 'size="1" class="inputbox"', $params->get( 'year' ), "%04d" );
+		echo '<input type="submit" class="button" />';
+	}
+
+	// checks to see if there are there any items to display
+	if ( $total ) {
+		$col_with = 100 / $columns;			// width of each column
+		$width = 'width="'. $col_with .'%"';
+
+		if ( $archive ) {
+			// Search Success message
+			$msg = sprintf( T_('Here are the Archived entries for %s %s'), $params->get( 'month' ), $params->get( 'year' ) );
+			echo "<br /><br /><div align='center'>". $msg ."</div><br /><br />";
+		}
+		echo '<table class="blog' . $params->get( 'pageclass_sfx' ) . '" cellpadding="0" cellspacing="0">';
+
+		// Secrion/Category Description & Image
+		if ( $menu && $menu->componentid && ( $descrip || $descrip_image ) ) {
+			$link = $mosConfig_live_site .'/images/stories/'. $description->image;
+			echo '<tr>';
+			echo '<td valign="top">';
+			if ( $descrip_image && $description->image ) {
+				echo '<img src="'. $link .'" align="'. $description->image_position .'" hspace="6" alt="" />';
+			}
+			if ( $descrip && $description->description ) {
+				echo $description->description;
+			}
+			echo '<br/><br/>';
+			echo '</td>';
+			echo '</tr>';
+		}
+
+		// Leading story output
+		if ( $leading ) {
+			echo '<tr>';
+			echo '<td valign="top">';
+			for ( $z = 0; $z < $leading; $z++ ) {
+				if ( $i >= $total ) {
+					// stops loop if total number of items is less than the number set to display as leading
+					break;
+				}
+				echo '<div>';
+				show( $rows[$i], $params, $gid, $access, $pop, $option, $ItemidCount );
+				echo '</div>';
+				$i++;
+			}
+			echo '</td>';
+			echo '</tr>';
+		}
+
+		if ( $intro && ( $i < $total ) ) {
+			echo '<tr>';
+			echo '<td valign="top">';
+			echo '<table width="100%"  cellpadding="0" cellspacing="0">';
+			// intro story output
+			for ( $z = 0; $z < $intro; $z++ ) {
+				if ( $i >= $total ) {
+					// stops loop if total number of items is less than the number set to display as intro + leading
+					break;
+				}
+
+				if ( !( $z % $columns ) || $columns == 1 ) {
+					echo '<tr>';
+				}
+
+				echo '<td valign="top" '. $width .'>';
+
+				// outputs either intro or only a link
+				if ( $z < $intro ) {
+					show( $rows[$i], $params, $gid, $access, $pop, $option, $ItemidCount );
+				} else {
+					echo '</td>';
+					echo '</tr>';
+					break;
+				}
+
+				echo '</td>';
+
+				if ( !( ( $z + 1 ) % $columns ) || $columns == 1 ) {
+					echo '</tr>';
+				}
+
+				$i++;
+			}
+
+			// this is required to output a final closing </tr> tag when the number of items does not fully
+			// fill the last row of output - a blank column is left
+			if ( $intro % $columns ) {
+				echo '</tr>';
+			}
+
+			echo '</table>';
+			echo '</td>';
+			echo '</tr>';
+		}
+
+		// Links output
+		if ( $links && ( $i < $total )  ) {
+			echo '<tr>';
+			echo '<td valign="top">';
+			echo '<div class="blog_more'. $params->get( 'pageclass_sfx' ) .'">';
+			HTML_content::showLinks( $rows, $links, $total, $i, 1, $ItemidCount );
+			echo '</div>';
+			echo '</td>';
+			echo '</tr>';
+		}
+
+		// Pagination output
+		if ( $pagination ) {
+			if ( ( $pagination == 2 ) && ( $total <= $limit ) ) {
+				// not visible when they is no 'other' pages to display
+			} else {
+				// get the total number of records
+				$limitstart = $limitstart ? $limitstart : 0;
+				require_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/pageNavigation.php' );
+				$pageNav = new mosPageNav( $total, $limitstart, $limit );
+				if ( $option == 'com_frontpage' ) {
+					$link = 'index.php?option=com_frontpage&amp;Itemid='. $Itemid;
+				} else if ( $archive ) {
+					$year = $params->get( 'year' );
+					$month = $params->get( 'month' );
+					$link = 'index.php?option=com_content&amp;task='. $task .'&amp;id='. $id .'&amp;Itemid='. $Itemid.'&amp;year='. $year .'&amp;month='. $month;
+				} else {
+					$link = 'index.php?option=com_content&amp;task='. $task .'&amp;id='. $id .'&amp;Itemid='. $Itemid;
+				}
+				echo '<tr>';
+				echo '<td valign="top" align="center">';
+				echo $pageNav->writePagesLinks( $link );
+				echo '<br /><br />';
+				echo '</td>';
+				echo '</tr>';
+				if ( $pagination_results ) {
+					echo '<tr>';
+					echo '<td valign="top" align="center">';
+					echo $pageNav->writePagesCounter();
+					echo '</td>';
+					echo '</tr>';
+				}
+			}
+		}
+
+		echo '</table>';
+
+	} else if ( $archive && !$total ) {
+		// Search Failure message for Archives
+		$msg = sprintf( T_('There are no Archived entries for %s %s'), $params->get( 'month' ), $params->get( 'year' ) );
+		echo '<br /><br /><div align="center">'. $msg .'</div><br />';
+	} else {
+		// Generic blog empty display
+		echo T_('There are no items to display');
+	}
+
+	// Back Button
+	$params->set( 'back_button', $back );
+	mosHTML::BackButton ( $params );
+}
+
+
+function showItem( $uid, $gid, &$access, $pop, $option, $now ) {
+	global $database, $mainframe;
+	global $mosConfig_offset, $mosConfig_live_site, $mosConfig_MetaTitle, $mosConfig_MetaAuthor;
+
+	if ( $access->canEdit ) {
+		$xwhere='';
+	} else {
+		$xwhere = "AND (a.state = '1' OR a.state = '-1')"
+		. "\n	AND (publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now')"
+		. "\n	AND (publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now')"
+		;
+	}
+
+	$query = "SELECT a.*, ROUND(v.rating_sum/v.rating_count) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, s.name AS section, g.name AS groups"
+	. "\n FROM #__content AS a"
+	. "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
+	. "\n LEFT JOIN #__sections AS s ON s.id = cc.section AND s.scope='content'"
+	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
+	. "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
+	. "\n LEFT JOIN #__groups AS g ON a.access = g.id"
+	. "\n WHERE a.id='". $uid ."' ". $xwhere
+	. "\n AND a.access <= ". $gid
+	;
+	$database->setQuery( $query );
+//	$row = NULL;
+	$row = new mosExtendedContent();
+
+	if ( $database->loadObject( $row ) ) {
+		$pathway =& mosPathway::getInstance();
+		$pathway->addItem($row->category, categoryURL($row->sectionid, $row->catid));
+		$pathway->addItem($row->title, '');
+		$params =& new mosParameters( $row->attribs );
+		$params->set( 'intro_only', 0 );
+		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
+		if ( $row->sectionid == 0) {
+			$params->set( 'item_navigation', 0 );
+		} else {
+			$params->set( 'item_navigation', $mainframe->getCfg( 'item_navigation' ) );
+		}
+		// loads the links for Next & Previous Button
+		if ( $params->get( 'item_navigation' ) ) {
+			$query = "SELECT a.id"
+			. "\n FROM #__content AS a"
+			. "\n WHERE a.catid = ". $row->catid.""
+			. "\n AND a.state = $row->state AND ordering < $row->ordering"
+			. ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
+			. "\n ORDER BY a.ordering DESC"
+			. "\n LIMIT 1"
+			;
+			$database->setQuery( $query );
+			$row->prev = $database->loadResult();
+
+			$query = "SELECT a.id"
+			. "\n FROM #__content AS a"
+			. "\n WHERE a.catid = ". $row->catid.""
+			. "\n AND a.state = $row->state AND ordering > $row->ordering"
+			. ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
+			. "\n ORDER BY a.ordering"
+			. "\n LIMIT 1"
+			;
+			$database->setQuery( $query );
+			$row->next = $database->loadResult();
+		}
+		// page title
+		$mainframe->setPageTitle( $row->title );
+		if ($mosConfig_MetaTitle=='1') {
+			$mainframe->addMetaTag( 'title' , $row->title );
+		}
+		if ($mosConfig_MetaAuthor=='1') {
+			$mainframe->addMetaTag( 'author' , $row->author );
+		}
+
+		show( $row, $params, $gid, $access, $pop, $option );
+	} else {
+		mosNotAuth();
+		return;
+	}
+}
+
+
+function show( $row, $params, $gid, &$access, $pop, $option, $ItemidCount=NULL ) {
+	global $database, $mainframe, $Itemid;
+	global $mosConfig_live_site, $mosConfig_absolute_path;
+	global $options, $cache;
+
+	$noauth = !$mainframe->getCfg( 'shownoauth' );
+
+	if ( $access->canEdit ) {
+		if ( $row->id === null || $row->access > $gid ) {
+			mosNotAuth();
+			return;
+		}
+	} else {
+		if ( $row->id === null || $row->state == 0 ) {
+			mosNotAuth();
+			return;
+		}
+		if ( $row->access > $gid ) {
+			if ( $noauth ) {
+				mosNotAuth();
+				return;
+			} else {
+				if ( !( $params->get( 'intro_only' ) ) ) {
+					mosNotAuth();
+					return;
+				}
+			}
+		}
+	}
+
+	// GC Parameters
+	$params->def( 'link_titles', $mainframe->getCfg( 'link_titles' ) );
+	$params->def( 'author', !$mainframe->getCfg( 'hideAuthor' ) );
+	$params->def( 'createdate', !$mainframe->getCfg( 'hideCreateDate' ) );
+	$params->def( 'modifydate', !$mainframe->getCfg( 'hideModifyDate' ) );
+	$params->def( 'print', !$mainframe->getCfg( 'hidePrint' ) );
+	$params->def( 'pdf', !$mainframe->getCfg( 'hidePdf' ) );
+	$params->def( 'email', !$mainframe->getCfg( 'hideEmail' ) );
+	$params->def( 'rating', $mainframe->getCfg( 'vote' ) );
+	$params->def( 'icons', $mainframe->getCfg( 'icons' ) );
+	$params->def( 'readmore', $mainframe->getCfg( 'readmore' ) );
+	// Other Params
+	$params->def( 'image', 1 );
+	$params->def( 'section', 0 );
+	$params->def( 'section_link', 0 );
+	$params->def( 'category', 0 );
+	$params->def( 'category_link', 0 );
+	$params->def( 'introtext', 1 );
+	$params->def( 'pageclass_sfx', '' );
+	$params->def( 'item_title', 1 );
+	$params->def( 'url', 1 );
+
+	// loads the link for Section name
+	if ( $params->get( 'section_link' ) ) {
+		$query = 	"SELECT a.id"
+		. "\n FROM #__menu AS a"
+		. "\n WHERE a.componentid = ". $row->sectionid.""
+		;
+		$database->setQuery( $query );
+		$_Itemid = $database->loadResult();
+		$link = sefRelToAbs( 'index.php?option=com_content&amp;task=section&amp;id='. $row->sectionid .'&amp;Itemid='.$_Itemid );
+		$row->section = '<a href="'. $link .'">'. $row->section .'</a>';
+	}
+
+	// loads the link for Category name
+	if ( $params->get( 'category_link' ) ) {
+		$query = 	"SELECT a.id"
+		. "\n FROM #__menu AS a"
+		. "\n WHERE a.componentid = ". $row->catid.""
+		;
+		$database->setQuery( $query );
+		$_Itemid = $database->loadResult();
+		$link = sefRelToAbs( 'index.php?option=com_content&amp;task=category&amp;sectionid='. $row->sectionid .'&amp;id='. $row->catid .'&amp;Itemid='.$_Itemid );
+		$row->category = '<a href="'. $link .'">'. $row->category .'</a>';
+	}
+
+	// loads current template for the pop-up window
+	$template = '';
+	if ( $pop ) {
+		$params->set( 'popup', 1 );
+		$database->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'" );
+		$template = $database->loadResult();
+	}
+
+	// show/hides the intro text
+	if ( $params->get( 'introtext'  ) ) {
+		$row->text = $row->introtext. ( $params->get( 'intro_only' ) ? '' : chr(13) . chr(13) . $row->fulltext);
+	} else {
+		$row->text = $row->fulltext;
+	}
+
+	// deal with the {mospagebreak} mambots
+	// only permitted in the full text area
+	$page = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
+
+	// record the hit
+	if ( !$params->get( 'intro_only' ) ) {
+		$obj = new mosContent( $database );
+		$obj->hit( $row->id );
+	}
+
+	$cache->call( 'HTML_content::show', $row, $params, $access, $page, $option, $ItemidCount );
+}
+
+
+function editItem( $uid, $gid, &$access, $sectionid=0, $task, $Itemid ){
+	global $database, $mainframe, $my;
+	global $mosConfig_absolute_path, $mosConfig_live_site;
+
+	$row = new mosContent( $database );
+	// load the row from the db table
+	$row->load( $uid );
+
+	// fail if checked out not by 'me'
+	if ( $row->checked_out && $row->checked_out <> $my->id ) {
+		echo"<script>alert('".sprintf(T_('The module [ %s ] is currently being edited by another person.'), $row->title)."'); window.history.go(-1); </script>";
+		exit;
+	}
+
+	if ( $uid ) {
+		// existing record
+		if ( !( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) ) {
+			mosNotAuth();
+			return;
+		}
+	} else {
+		// new record
+		if (!($access->canEdit || $access->canEditOwn)) {
+			mosNotAuth();
+			return;
+		}
+	}
+
+	if ( $uid ) {
+		$sectionid = $row->sectionid;
+	}
+
+	$lists = array();
+
+	// get the type name - which is a special category
+	$query = "SELECT name FROM #__sections WHERE id='$sectionid'";
+	$database->setQuery( $query );
+	$section = $database->loadResult();
+
+	if ( $uid == 0 ) {
+		$row->catid = 0;
+	}
+
+	if ( $uid ) {
+		$row->checkout( $my->id );
+		if (trim( $row->publish_down ) == "0000-00-00 00:00:00") {
+			$row->publish_down = 'Never';
+		}
+		if (trim( $row->images )) {
+			$row->images = explode( "\n", $row->images );
+		} else {
+			$row->images = array();
+		}
+		$query = "SELECT name from #__users"
+		. "\n WHERE id = ". $row->created_by
+		;
+		$database->setQuery( $query	);
+		$row->creator = $database->loadResult();
+
+		$query = "SELECT name from #__users"
+		. "\n WHERE id = ". $row->modified_by
+		;
+		$database->setQuery( $query );
+		$row->modifier = $database->loadResult();
+
+		$query = "SELECT content_id from #__content_frontpage"
+		."\n WHERE content_id = ". $row->id
+		;
+		$database->setQuery( $query );
+		$row->frontpage = $database->loadResult();
+	} else {
+		$row->sectionid 	= $sectionid;
+		$row->version 		= 0;
+		$row->state 		= 0;
+		$row->ordering 		= 0;
+		$row->images 		= array();
+		$row->publish_up 	= date( 'Y-m-d', time() );
+		$row->publish_down 	= 'Never';
+		$row->creator 		= 0;
+		$row->modifier 		= 0;
+		$row->frontpage 	= 0;
+	}
+
+	// calls function to read image from directory
+	$pathA 		= $mosConfig_absolute_path .'/images/stories';
+	$pathL 		= $mosConfig_live_site .'/images/stories';
+	$images 	= array();
+	$folders 	= array();
+	$folders[] 	= mosHTML::makeOption( '/' );
+	require_once($mosConfig_absolute_path.'/administrator/includes/mosAdminMenus.php');
+	mosAdminMenus::ReadImages( $pathA, '/', $folders, $images );
+	// list of folders in images/stories/
+	$lists['folders'] 		= mosAdminMenus::GetImageFolders( $folders, $pathL );
+	// list of images in specfic folder in images/stories/
+	$lists['imagefiles']	= mosAdminMenus::GetImages( $images, $pathL );
+	// list of saved images
+	$lists['imagelist'] 	= mosAdminMenus::GetSavedImages( $row, $pathL );
+
+	// make the select list for the states
+	$states[] = mosHTML::makeOption( 0, T_('Unpublished') );
+	$states[] = mosHTML::makeOption( 1, T_('Published') );
+	$lists['state'] = mosHTML::selectList( $states, 'state', 'class="inputbox" size="1"', 'value', 'text', intval( $row->state ) );
+
+	// build the html select list for ordering
+	$query = "SELECT ordering AS value, title AS text"
+	. "\n FROM #__content"
+	. "\n WHERE catid = '$row->catid'"
+	. "\n ORDER BY ordering"
+	;
+	$lists['ordering'] 		= mosAdminMenus::SpecificOrdering( $row, $uid, $query, 1 );
+	// build list of categories
+	$lists['catid'] 		= mosAdminMenus::ComponentCategory( 'catid', $sectionid, intval( $row->catid ) );
+	// build the select list for the image positions
+	$lists['_align'] 		= mosAdminMenus::Positions( '_align' );
+	// build the html select list for the group access
+	$lists['access'] 		= mosAdminMenus::Access( $row );
+
+	HTML_content::editContent( $row, $section, $lists, $images, $access, $my->id, $sectionid, $task, $Itemid );
+}
+
+
+/**
+* Saves the content item an edit form submit
+*/
+function saveContent( &$access ) {
+	global $database, $mainframe, $my;
+	global $mosConfig_absolute_path;
+
+	$row = new mosContent( $database );
+	if ( !$row->bind( $_POST ) ) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+	$isNew = $row->id < 1;
+	if ( $isNew ) {
+		// new record
+		if ( !( $access->canEdit || $access->canEditOwn ) ) {
+			mosNotAuth();
+			return;
+		}
+		$row->created = date( 'Y-m-d H:i:s' );
+		$row->created_by = $my->id;
+	} else {
+		// existing record
+		if ( !( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) ) {
+			mosNotAuth();
+			return;
+		}
+		$row->modified = date( 'Y-m-d H:i:s' );
+		$row->modified_by = $my->id;
+	}
+	if ( trim( $row->publish_down ) == 'Never' ) {
+		$row->publish_down = '0000-00-00 00:00:00';
+	}
+
+	if (!$row->check()) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+	$row->version++;
+	if (!$row->store()) {
+		echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
+		exit();
+	}
+
+	// manage frontpage items
+	require_once( $mainframe->getPath( 'class', 'com_frontpage' ) );
+	$fp = new mosFrontPage( $database );
+
+	if ( mosGetParam( $_REQUEST, 'frontpage', 0 ) ) {
+
+		// toggles go to first place
+		if (!$fp->load( $row->id )) {
+			// new entry
+			$database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$row->id','1')" );
+			if (!$database->query()) {
+				echo "<script> alert('".$database->stderr()."');</script>\n";
+				exit();
+			}
+			$fp->ordering = 1;
+		}
+	} else {
+		// no frontpage mask
+		if ( !$fp->delete( $row->id ) ) {
+			$msg .= $fp->stderr();
+		}
+		$fp->ordering = 0;
+	}
+	$fp->updateOrder();
+
+	$row->checkin();
+	$row->updateOrder( "catid='$row->catid'" );
+
+	// gets section name of item
+	$database->setQuery( "SELECT s.title"
+	. "\n FROM #__sections AS s"
+	. "\n WHERE s.scope = 'content'"
+	. "\n AND s.id = '". $row->sectionid ."'"
+	);
+	// gets category name of item
+	$section = $database->loadResult();
+	$database->setQuery( "SELECT c.title"
+	. "\n FROM #__categories AS c"
+	. "\n WHERE c.id = '". $row->catid ."'"
+	);
+	$category = $database->loadResult();
+
+	if ( $isNew ) {
+		// messaging for new items
+		require_once( $mosConfig_absolute_path .'/components/com_messages/messages.class.php' );
+
+		$database->setQuery( "SELECT id FROM #__users WHERE sendEmail = '1'" );
+		$users = $database->loadResultArray();
+		foreach ($users as $user_id) {
+			$msg = new mosMessage( $database );
+			$msg->send( $my->id, $user_id, T_("New Item"), sprintf( T_('A new content item has been submitted by [ %s ]  titled [ %s ]  from section [ %s ]  and category  [ %s ]'), $my->username, $row->title, $section, $category ) );
+		}
+	}
+
+ 	$Itemid 	= mosGetParam( $_POST, 'Returnid', '0' );
+ 	$msg 	= $isNew ? T_('Thanks for your submission; it will be reviewed before being posted to the site.') : T_('Item saved successfully.');
+	mosRedirect( 'index.php', $msg );
+}
+
+
+/**
+* Cancels an edit operation
+* @param database A database connector object
+*/
+function cancelContent( &$access ) {
+	global $database, $mainframe, $my;
+
+	$row = new mosContent( $database );
+	$row->bind( $_POST );
+
+	if ( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) {
+		$row->checkin();
+	}
+
+	$Itemid = mosGetParam( $_POST, 'Returnid', '0' );
+	
+	mosRedirect( 'index.php' );
+}
+
+/**
+* Shows the email form for a given content item.
+*/
+function emailContentForm( $uid ) {
+	global $database, $mainframe, $my;
+	$row = new mosContent( $database );
+	$row->load( $uid );
+
+	if ( $row->id === null || $row->access > $my->gid ) {
+		mosNotAuth();
+		return;
+	} else {
+		$template='';
+		$database->setQuery( "SELECT template FROM #__templates_menu WHERE client_id = '0' AND menuid = '0'" );
+		$template = $database->loadResult();
+		HTML_content::emailForm( $row->id, $row->title, $template );		
+	}
+
+}
+
+
+/**
+* Shows the email form for a given content item.
+*/
+function emailContentSend( $uid ) {
+	global $database, $mainframe;
+	global $mosConfig_live_site, $mosConfig_sitename;
+	global $mosConfig_mailfrom, $mosConfig_fromname;
+
+	$_Itemid = $mainframe->getItemid( $uid, 0, 0  );
+
+	$email = trim( mosGetParam( $_POST, 'email', '' ) );
+	$yourname = trim( mosGetParam( $_POST, 'yourname', '' ) );
+	$youremail = trim( mosGetParam( $_POST, 'youremail', '' ) );
+	$subject_default = sprintf(T_('Item sent by %s'), $yourname);
+	$subject = trim( mosGetParam( $_POST, 'subject', $subject_default ) );
+
+	$form_check = mosGetParam( $_POST, 'form_check', '' );    
+    if (empty($_SESSION['_form_check_']['com_content']) || $form_check != $_SESSION['_form_check_']['com_content']) {
+      // the form hasn't been generated by the server on this session 	
+       exit;
+    }  
+	if ( !$email || !$youremail || ( is_email( $email ) == false ) || ( is_email( $youremail ) == false ) ) {
+		echo "<script>alert (\"".T_('You must enter valid e-mail addresses for both yourself and your recipient.')."\"); window.history.go(-1);</script>";
+		exit(0);
+	}
+
+	$template='';
+	$database->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'" );
+	$template = $database->loadResult();
+
+	// link sent in email
+	$link = sefRelToAbs( $mosConfig_live_site .'/index.php?option=com_content&task=view&id='. $uid .'&Itemid='. $_Itemid );
+	// message text
+	$msg = sprintf( T_(' The following page from the "%s" website has been sent to you by %s ( %s ).
+
+You can access it at the following url:
+%s'), $mosConfig_sitename, $yourname, $youremail, $link );
+
+	// mail function
+	mosMail( $mosConfig_mailfrom, $mosConfig_fromname, $email, $subject, $msg );
+
+	HTML_content::emailSent( $email, $template );
+}
+
+function is_email( $email ){
+	$rBool = false;
+
+	if ( preg_match( "/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $email ) ) {
+		$rBool = true;
+	}
+	return $rBool;
+}
+
+function recordVote() {
+	global $database;
+
+	$user_rating = mosGetParam( $_REQUEST, 'user_rating', 0 );
+	$url = mosGetParam( $_REQUEST, 'url', '' );
+	$cid = mosGetParam( $_REQUEST, 'cid', 0 );
+	$cid = intval( $cid );
+	$user_rating = intval( $user_rating );
+
+	if ( ( $user_rating >= 1 ) and ( $user_rating <= 5 ) ) {
+		$currip = getenv( 'REMOTE_ADDR' );
+
+		$query = "SELECT * FROM #__content_rating WHERE content_id = $cid";
+		$database->setQuery( $query );
+		$votesdb = NULL;
+		if ( !( $database->loadObject( $votesdb ) ) ) {
+			$query = "INSERT INTO #__content_rating ( content_id, lastip, rating_sum, rating_count )"
+			. "\n VALUES ( '$cid', '$currip', '$user_rating', '1' )";
+			$database->setQuery( $query );
+			$database->query() or die( $database->stderr() );;
+		} else {
+			if ($currip <> ($votesdb->lastip)) {
+				$query = "UPDATE #__content_rating"
+				. "\n SET rating_count = rating_count + 1,"
+				. "\n rating_sum = rating_sum + $user_rating,"
+				. "\n lastip = '$currip'"
+				. "\n WHERE content_id = ". $cid
+				;
+				$database->setQuery( $query );
+				$database->query() or die( $database->stderr() );
+			} else {
+				mosRedirect ( $url, T_('You already voted for this poll today!') );
+			}
+		}
+		mosRedirect ( $url, T_('Thanks for your vote!') );
+	}
+}
+
+
+function _orderby_pri( $orderby ) {
+	switch ( $orderby ) {
+		case 'alpha':
+			$orderby = 'cc.title, ';
+			break;
+		case 'ralpha':
+			$orderby = 'cc.title DESC, ';
+			break;
+		case 'order':
+			$orderby = 'cc.ordering, ';
+			break;
+		default:
+			$orderby = '';
+			break;
+	}
+
+	return $orderby;
+}
+
+
+function _orderby_sec( $orderby ) {
+	switch ( $orderby ) {
+		case 'date':
+			$orderby = 'a.created';
+			break;
+		case 'rdate':
+			$orderby = 'a.created DESC';
+			break;
+		case 'alpha':
+			$orderby = 'a.title';
+			break;
+		case 'ralpha':
+			$orderby = 'a.title DESC';
+			break;
+		case 'hits':
+			$orderby = 'a.hits DESC';
+			break;
+		case 'rhits':
+			$orderby = 'a.hits ASC';
+			break;
+		case 'order':
+			$orderby = 'a.ordering';
+			break;
+		case 'author':
+			$orderby = 'a.created_by, u.name';
+			break;
+		case 'rauthor':
+			$orderby = 'a.created_by DESC, u.name DESC';
+			break;
+		case 'front':
+			$orderby = 'f.ordering';
+			break;
+		default:
+			$orderby = 'a.ordering';
+			break;
+	}
+
+	return $orderby;
+}
+
+/*
+* @param int 0 = Archives, 1 = Section, 2 = Category
+*/
+function _where( $type=1, &$access, &$noauth, $gid, $id, $now=NULL, $year=NULL, $month=NULL ) {
+	$where = array();
+
+	// normal
+	if ( $type > 0) {
+		$where[] = "a.state = '1'";
+		if ( !$access->canEdit ) {
+			$where[] = "( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )";
+			$where[] = "( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )";
+		}
+		if ( $noauth ) {
+			$where[] = "a.access <= '". $gid ."'";
+		}
+		if ( $id > 0 ) {
+			if ( $type == 1 ) {
+				$where[] = "a.sectionid IN ( ". $id ." ) ";
+			} else if ( $type == 2 ) {
+				$where[] = "a.catid IN ( ". $id ." ) ";
+			}
+		}
+	}
+
+	// archive
+	if ( $type < 0 ) {
+		$where[] = "a.state='-1'";
+		if ( $year ) {
+			$where[] = "YEAR( a.created ) = '". $year ."'";
+		}
+		if ( $month ) {
+			$where[] = "MONTH( a.created ) = '". $month ."'";
+		}
+		if ( $noauth ) {
+			$where[] = "a.access <= '". $gid ."'";
+		}
+		if ( $id > 0 ) {
+			if ( $type == -1 ) {
+				$where[] = "a.sectionid = '". $id ."'";
+			} else if ( $type == -2) {
+				$where[] = "a.catid = '". $id ."'";
+			}
+		}
+	}
+
+	return $where;
+}
+
+function sectionURL ($sectionid) {
+	global $Itemid;
+	return "index.php?option=com_content&task=section&id=$sectionid&Itemid=$Itemid";
+}
+
+function categoryURL ($sectionid, $catid) {
+	global $Itemid;
+	return "index.php?option=com_content&task=category&sectionid=$sectionid&id=$catid&Itemid=$Itemid";
+}
+
+?>
diff -ruN 4.5.4/components/com_frontpage/frontpage.class.php 4.6rc2/components/com_frontpage/frontpage.class.php
--- 4.5.4/components/com_frontpage/frontpage.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_frontpage/frontpage.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: frontpage.class.php,v 1.1 2005/07/22 01:54:45 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Content
-*/
+require_once (mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+
 class mosFrontPage extends mosDBTable {
 	/** @var int Primary key */
 	var $content_id=null;
@@ -28,4 +28,4 @@
 		$this->mosDBTable( '#__content_frontpage', 'content_id', $db );
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_frontpage/frontpage.php 4.6rc2/components/com_frontpage/frontpage.php
--- 4.5.4/components/com_frontpage/frontpage.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_frontpage/frontpage.php	2006-06-07 03:15:51.000000000 -0500
@@ -1,17 +1,19 @@
 <?php
 /**
-* @version $Id: frontpage.php,v 1.1 2005/07/22 01:54:46 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Content
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
+$lang_path = mamboCore::get('rootPath').'/language';
 // code handling has been shifted into content.php
 require_once( $mosConfig_absolute_path .'/components/com_content/content.php' );
-
 ?>
\ No newline at end of file
diff -ruN 4.5.4/components/com_login/login.html.php 4.6rc2/components/com_login/login.html.php
--- 4.5.4/components/com_login/login.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_login/login.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: login.html.php,v 1.1 2005/07/22 01:54:49 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Users
-*/
 class loginHTML {
 
 	function loginpage ( &$params, $image ) {
@@ -55,11 +53,11 @@
 				<table>
 				<tr>
 					<td align="center">
-					<?php echo _USERNAME; ?>
+					<?php echo T_('Username'); ?>
 					<br /> 
 					</td>
 					<td align="center">
-					<?php echo _PASSWORD; ?>
+					<?php echo T_('Password'); ?>
 					<br /> 
 					</td>
 				</tr>
@@ -74,19 +72,19 @@
 				<tr>
 					<td align="center" colspan="2">
 					<br/>				
-					<?php echo _REMEMBER_ME; ?>
+					<?php echo T_('Remember me'); ?>
 					<input type="checkbox" name="remember" class="inputbox" value="yes" /> 
 					<br/>
 					<a href="<?php echo sefRelToAbs( 'index.php?option=com_registration&amp;task=lostPassword' ); ?>">
-					<?php echo _LOST_PASSWORD; ?>
+					<?php echo T_('Password Reminder'); ?>
 					</a>
 					<?php
 					if ( $params->get( 'registration' ) ) {
 						?>
 						<br/>
-						<?php echo _NO_ACCOUNT; ?>
+						<?php echo T_('No account yet?'); ?>
 						<a href="<?php echo sefRelToAbs( 'index.php?option=com_registration&amp;task=register' ); ?>">
-						<?php echo _CREATE_ACCOUNT;?>
+						<?php echo T_('Create one');?>
 						</a>
 						<?php
 					}
@@ -98,7 +96,7 @@
 			</td>
 			<td>
 			<div align="center">
-			<input type="submit" name="submit" class="button" value="<?php echo _BUTTON_LOGIN; ?>" />
+			<input type="submit" name="submit" class="button" value="<?php echo T_('Login'); ?>" />
 			</div>
 
 			</td>			
@@ -106,7 +104,7 @@
 		<tr>
 			<td colspan="2"> 
 			<noscript>
-			<?php echo _CMN_JAVASCRIPT; ?>
+			<?php echo T_('!Warning! Javascript must be enabled for proper operation.'); ?>
 			</noscript>
 			</td>
 		</tr>
@@ -159,7 +157,7 @@
 		<tr>
 			<td align="center">
 			<div align="center">
-			<input type="submit" name="Submit" class="button" value="<?php echo _BUTTON_LOGOUT; ?>" />
+			<input type="submit" name="Submit" class="button" value="<?php echo T_('Logout'); ?>" />
 			</div>
 			</td>
 		</tr>
diff -ruN 4.5.4/components/com_login/login.php 4.6rc2/components/com_login/login.php
--- 4.5.4/components/com_login/login.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_login/login.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,14 @@
 <?php
 /**
-* @version $Id: login.php,v 1.1 2005/07/22 01:54:49 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -20,8 +22,8 @@
 $return = mosGetParam( $_SERVER, 'REQUEST_URI', null );
 $return = ampReplace( $return );
 
-$menu = new mosMenu( $database );
-$menu->load( $Itemid );
+$menuhandler =& mosMenuHandler::getInstance();
+$menu =& $menuhandler->getMenuByID($Itemid);
 $params =& new mosParameters( $menu->params );
 
 $params->def( 'page_title', 1 );
@@ -35,8 +37,8 @@
 $params->def( 'logout_message', 0 );
 $params->def( 'description_login', 1 );
 $params->def( 'description_logout', 1 );
-$params->def( 'description_login_text', _LOGIN_DESCRIPTION );
-$params->def( 'description_logout_text', _LOGOUT_DESCRIPTION );
+$params->def( 'description_login_text', T_('To access the Private areas of this site please Login') );
+$params->def( 'description_logout_text', T_('You are now Logged in to a private area of this site') );
 $params->def( 'image_login', 'key.jpg' );
 $params->def( 'image_logout', 'key.jpg' );
 $params->def( 'image_login_align', 'right' );
@@ -60,4 +62,4 @@
 	loginHTML::loginpage( $params, $image_login );
 }
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_messages/messages.class.php 4.6rc2/components/com_messages/messages.class.php
--- 4.5.4/components/com_messages/messages.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_messages/messages.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: messages.class.php,v 1.2 2005/10/21 17:33:55 lang3 Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Messages
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Messages
-*/
 class mosMessage extends mosDBTable {
 	/** @var int Primary key */
 	var $message_id=null;
@@ -73,15 +71,15 @@
 				if ($domail) {
 					$database->setQuery( "SELECT email FROM #__users WHERE id='$to_id'" );
 					$recipient = $database->loadResult();
-					$subject = _NEW_MESSAGE;
-					$msg = _NEW_MESSAGE;
+					$subject = T_('A new private message has arrived');
+					$msg = T_('A new private message has arrived');
 					mosMail($mosConfig_mailfrom, $mosConfig_fromname, $recipient, $subject, $msg);
 				}
 				return true;
 			}
 		} else {
 			if (is_object( $this )) {
-				$this->_error = _MESSAGE_FAILED;
+				$this->_error = T_('The user has locked their mailbox. Message failed.');
 			}
 		}
 		return false;
diff -ruN 4.5.4/components/com_newsfeeds/newsfeeds.html.php 4.6rc2/components/com_newsfeeds/newsfeeds.html.php
--- 4.5.4/components/com_newsfeeds/newsfeeds.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_newsfeeds/newsfeeds.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,21 +1,18 @@
 <?php
-/** 
-* version $Id: newsfeeds.html.php,v 1.1 2005/07/22 01:54:50 eddieajau Exp $
-* @package Mambo
+/**
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* 
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Newsfeeds
-*/
 class HTML_newsfeed {
 
 	function displaylist( &$categories, &$rows, $catid, $currentcat=NULL, &$params, $tabclass ) {
@@ -37,7 +34,7 @@
 			// show image
 			if ( $currentcat->img ) {
 				?>
-				<img src="<?php echo $currentcat->img; ?>" align="<?php echo $currentcat->align; ?>" hspace="6" alt="<?php echo _WEBLINKS_TITLE; ?>" />
+				<img src="<?php echo $currentcat->img; ?>" align="<?php echo $currentcat->align; ?>" hspace="6" alt="<?php echo T_('Web Links'); ?>" />
 				<?php 
 			}
 			echo $currentcat->descrip;
@@ -83,7 +80,8 @@
 	function showTable( &$params, &$rows, $catid, $tabclass ) {
 		global $mosConfig_live_site, $Itemid;
 		// icon in table display
-		$img = mosAdminMenus::ImageCheck( 'con_info.png', '/images/M_images/', $params->get( 'icon' ) );
+		$mainframe =& mosMainFrame::getInstance();
+		$img = $mainframe->ImageCheck( 'con_info.png', '/images/M_images/', $params->get( 'icon' ) );
 		?>
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
 		<?php
@@ -94,7 +92,7 @@
 				if ( $params->get( 'name' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo _FEED_NAME; ?>
+					<?php echo T_('Feed Name'); ?>
 					</td>
 					<?php 
 				}
@@ -103,7 +101,7 @@
 				if ( $params->get( 'articles' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" align="center">
-					<?php echo _FEED_ARTICLES; ?>
+					<?php echo T_('# Articles'); ?>
 					</td>
 					<?php 
 				}
@@ -112,7 +110,7 @@
 				if ( $params->get( 'link' ) ) {
 					?>
 					<td height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<?php echo _FEED_LINK; ?>
+					<?php echo T_('Feed Link'); ?>
 					</td>
 					<?php 
 				}
@@ -221,7 +219,7 @@
 	}
 
 
-	function showNewsfeeds( &$newsfeeds, $LitePath, $cacheDir, &$params ) {
+	function showNewsfeeds( &$newsfeeds, &$params ) {
 		global $mosConfig_live_site, $mosConfig_absolute_path;
 		?>
 		<table width="100%" class="contentpane<?php echo $params->get( 'pageclass_sfx' ); ?>">	
@@ -237,54 +235,37 @@
 		}
 
 		foreach ( $newsfeeds as $newsfeed ) {
-			// full RSS parser used to access image information
-			$rssDoc =& new xml_domit_rss_document();
-			$rssDoc->useCacheLite( true, $LitePath, $cacheDir, $newsfeed->cache_time );
-			$rssDoc->loadRSS( $newsfeed->link );
-			$totalChannels = $rssDoc->getChannelCount();
-
-			for ( $i = 0; $i < $totalChannels; $i++ ) {
-				$currChannel	=& $rssDoc->getChannel($i);
-				$elements 		= $currChannel->getElementList();
-				$descrip 		= 0;
-				$iUrl			= 0;
-				foreach ( $elements as $element ) {
-					//image handling				
-					if ( $element == 'image' ) {
-						$image =& $currChannel->getElement( DOMIT_RSS_ELEMENT_IMAGE );
-						$iUrl	= $image->getUrl();
-						$iTitle	= $image->getTitle();
-					}
-					if ( $element == 'description' ) {
-						$descrip = 1;
-						// hide com_rss descrip in 4.5.0 feeds
-						if ( $currChannel->getDescription() == 'com_rss' ) {
-							$descrip = 0;
-						}						
-					}
-				}
+			if (!defined('MAGPIE_CACHE_DIR')) define ('MAGPIE_CACHE_DIR', mamboCore::get('mosConfig_absolute_path').'/includes/magpie_cache');
+			require_once (mamboCore::get('mosConfig_absolute_path').'/includes/magpierss/rss_fetch.php');
+			$rss = fetch_rss($newsfeed->link);
+			if (!is_object($rss)) {
+				echo '<tr><td><span>RSS feed failed</span></td></tr>';
+				break;
+			}
+			if (isset($rss->image['title'])) $iTitle = $rss->image['title'];
+			if (isset($rss->image['url'])) $iUrl = $rss->image['url'];
 				?>
 				<tr>
 					<td class="contentheading<?php echo $params->get( 'pageclass_sfx' ); ?>">
-					<a href="<?php echo $currChannel->getLink(); ?>" target="_child">
-					<?php echo $currChannel->getTitle(); ?>
+					<a href="<?php echo $rss->channel['link']; ?>" target="_child">
+					<?php echo $rss->channel['title']; ?>
 					</a>
 					</td>
 				</tr>
 				<?php 
 				// feed description
-				if ( $descrip && $params->get( 'feed_descr' ) ) {
+				if ( $params->get( 'feed_descr' ) ) {
 					?>
 					<tr>
 						<td>
-						<?php echo $currChannel->getDescription(); ?>
+						<?php if (isset($rss->channel['description'])) echo $rss->channel['description']; ?>
 						<br /><br />
 						</td>
 					</tr>
 					<?php
 				}
 				// feed image
-				if ( $iUrl && $params->get( 'feed_image' ) ) {
+				if ( isset($iUrl) && $params->get( 'feed_image' ) ) {
 					?>
 					<tr>
 						<td>
@@ -293,29 +274,24 @@
 					</tr>
 					<?php
 				}
-				$actualItems 	= $currChannel->getItemCount();
-				$setItems 		= $newsfeed->numarticles;
-				if ( $setItems > $actualItems ) {
-					$totalItems = $actualItems;
-				} else {
-					$totalItems = $setItems;
-				}
 				?>
 				<tr>
 					<td>
 					<ul>
 					<?php
-					for ( $j = 0; $j < $totalItems; $j++ ) {
-						$currItem =& $currChannel->getItem($j);
+					$itemnumber = 1;
+			foreach ($rss->items as $item) {
+				if ($itemnumber > $newsfeed->numarticles) break;
+				$itemnumber++;
 						?>
 							<li>
-							<a href="<?php echo $currItem->getLink(); ?>" target="_child">
-							<?php echo $currItem->getTitle(); ?>			
+							<a href="<?php echo $item['link']; ?>" target="_child">
+							<?php echo $item['title']; ?>
 							</a> 
 							<?php 
 							// item description
 							if ( $params->get( 'item_descr' ) ) {
-								$text 	= html_entity_decode( $currItem->getDescription() );
+								$text 	= html_entity_decode( $item['description'] );
 								$num 	= $params->get( 'word_count' );
 								
 								// word limit check
@@ -350,7 +326,6 @@
 					</td>
 				</tr>
 				<?php
-			}
 		}
 		?>
 		</table>
@@ -360,4 +335,4 @@
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_newsfeeds/newsfeeds.php 4.6rc2/components/com_newsfeeds/newsfeeds.php
--- 4.5.4/components/com_newsfeeds/newsfeeds.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_newsfeeds/newsfeeds.php	2006-02-22 07:31:46.000000000 -0600
@@ -1,13 +1,14 @@
 <?php
-/** module to display newsfeeds
-* version $Id: newsfeeds.php,v 1.1 2005/07/22 01:54:50 eddieajau Exp $
-* @package Mambo
+/**
+* @package Mambo Open Source
 * @subpackage Newsfeeds
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* modified by brian & rob
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -129,10 +130,11 @@
 	$currentcat->header = '';
 	if ( @$currentcat->name <> '' ) {
 		$currentcat->header = $currentcat->name;
+		$pathway =& mosPathway::getInstance();
+		$pathway->addItem($currentcat->header, '');
 	} else {
 		$currentcat->header = $params->get( 'header' );
 	}
-
 	// used to show table rows in alternating colours
 	$tabclass = array( 'sectiontableentry1', 'sectiontableentry2' );
 
@@ -145,11 +147,6 @@
 function showFeed( $option, $feedid ) {
 	global $database, $mainframe, $mosConfig_absolute_path, $Itemid;
 
-	// full RSS parser used to access image information
-	require_once( $mosConfig_absolute_path . "/includes/domit/xml_domit_rss.php");
-	$cacheDir = $mosConfig_absolute_path . "/cache/";
-	$LitePath = $mosConfig_absolute_path . "/includes/Cache/Lite.php";
-	
 	// Adds parameter handling
 	$menu =& new mosMenu( $database );
 	$menu->load( $Itemid );
@@ -168,16 +165,16 @@
 		$params->set( 'header', '' );
 	}
 
-	$and = '';
+	$_and = '';
 	if ( $feedid ) {
-		$and = "\n AND id='". $feedid ."'";
+		$_and = "\n AND id='". $feedid ."'";
 	}
 
 	$query = "SELECT name, link, numarticles, cache_time"
 	. "\n FROM #__newsfeeds"
 	. "\n WHERE published='1'"
 	. "\n AND checked_out='0'"
-	. $and
+	. $_and
 	. "\n ORDER BY ordering"
 	;
 	$database->setQuery( $query );
@@ -185,7 +182,7 @@
 
 	$mainframe->SetPageTitle($menu->name);
 
-	HTML_newsfeed::showNewsfeeds( $newsfeeds, $LitePath, $cacheDir, $params );
+	HTML_newsfeed::showNewsfeeds( $newsfeeds, $params );
 }
 
 ?>
diff -ruN 4.5.4/components/com_poll/poll.html.php 4.6rc2/components/com_poll/poll.html.php
--- 4.5.4/components/com_poll/poll.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_poll/poll.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,21 +1,19 @@
 <?php
 /**
-* @version $Id: poll.html.php,v 1.1 2005/07/22 01:54:53 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 
-/**
-* @package Mambo
-* @subpackage Polls
-*/
 class poll_html {
 
 
@@ -48,7 +46,7 @@
 				<table class="contentpane<?php echo $params->get( 'pageclass_sfx' ); ?>"> 
 				<tr> 
 					<td align="left">
-					<?php echo _SEL_POLL; ?>&nbsp;
+					<?php echo T_('Select Poll:'); ?>&nbsp;
 					</td> 
 					<td align="left">
 					<?php echo $pollist; ?>
@@ -80,7 +78,7 @@
 					?>
 					<tr> 
 						<td valign="bottom">
-						<?php echo _NO_RESULTS; ?>
+						<?php echo T_('There are no results for this poll.'); ?>
 						</td> 
 					</tr> 
 					<?php
@@ -190,7 +188,7 @@
 		<table cellspacing="0" cellpadding="0" border="0"> 
 		<tr> 
 			<td class='smalldark'> 
-			<?php echo _NUM_VOTERS; ?> 
+			<?php echo T_('Number of Voters'); ?> 
 			</td> 
 			<td class='smalldark'> 
 			&nbsp;:&nbsp;
@@ -199,7 +197,7 @@
 		</tr> 
 		<tr> 
 			<td class='smalldark'> 
-			<?php echo _FIRST_VOTE; ?> 
+			<?php echo T_('First Vote'); ?> 
 			</td> 
 			<td class='smalldark'> 
 			&nbsp;:&nbsp;
@@ -208,7 +206,7 @@
 		</tr> 
 		<tr> 
 			<td class='smalldark'> 
-			<?php echo _LAST_VOTE; ?> 
+			<?php echo T_('Last Vote'); ?> 
 			</td> 
 			<td class='smalldark'> 
 			&nbsp;:&nbsp;
diff -ruN 4.5.4/components/com_poll/poll.php 4.6rc2/components/com_poll/poll.php
--- 4.5.4/components/com_poll/poll.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_poll/poll.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,13 @@
 <?php
 /**
-* @version $Id: poll.php,v 1.3 2005/08/17 05:55:46 eddieajau Exp $
-* @package Mambo
-* @subpackage Polls
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -45,15 +46,15 @@
 	$sessioncookie = mosGetParam( $_REQUEST, $sessionCookieName, '' );
 
 	if (!$sessioncookie) {
-		echo '<h3>'. _ALERT_ENABLED .'"</h3>';
-		echo '<input class="button" type="button" value="'. _CMN_CONTINUE .'" onClick="window.history.go(-1);">';
+		echo '<h3>'. T_('Cookies must be enabled!') .'"</h3>';
+		echo '<input class="button" type="button" value="'. T_('Continue') .'" onClick="window.history.go(-1);">';
 		return;
 	}
 
 	$poll = new mosPoll( $database );
 	if (!$poll->load( $uid )) {
-		echo '<h3>'. _NOT_AUTH .'</h3>';
-		echo '<input class="button" type="button" value="'. _CMN_CONTINUE .'" onClick="window.history.go(-1);">';
+		echo '<h3>'. T_('You are not authorized to view this resource.') .'</h3>';
+		echo '<input class="button" type="button" value="'. T_('Continue') .'" onClick="window.history.go(-1);">';
 		return;
 	}
 
@@ -61,15 +62,15 @@
 	$voted = mosGetParam( $_COOKIE, $cookiename, '0' );
 
 	if ($voted) {
-		echo "<h3>"._ALREADY_VOTE."</h3>";
-		echo "<input class=\"button\" type=\"button\" value=\""._CMN_CONTINUE."\" onClick=\"window.history.go(-1);\">";
+		echo "<h3>".T_('You already voted for this poll today!')."</h3>";
+		echo "<input class=\"button\" type=\"button\" value=\"".T_('Continue')."\" onClick=\"window.history.go(-1);\">";
 		return;
 	}
 
 	$voteid = mosGetParam( $_POST, 'voteid', 0 );
 	if (!$voteid) {
-		echo "<h3>"._NO_SELECTION."</h3>";
-		echo '<input class="button" type="button" value="'. _CMN_CONTINUE .'" onClick="window.history.go(-1);">';
+		echo "<h3>".T_('No selection has been made, please try again')."</h3>";
+		echo '<input class="button" type="button" value="'. T_('Continue') .'" onClick="window.history.go(-1);">';
 		return;
 	}
 
@@ -90,11 +91,11 @@
 
 	$database->query();
 	if ( $redirect ) {
-		mosRedirect( sefRelToAbs( 'index.php?option=com_poll&task=results&id='. $uid ), _THANKS );
+		mosRedirect( sefRelToAbs( 'index.php?option=com_poll&task=results&id='. $uid ), T_('Thanks for your vote!'));
 	} else {
-		echo '<h3>'. _THANKS .'</h3>';
+		echo '<h3>'. T_('Thanks for your vote!') .'</h3>';
 		echo '<form action="" method="GET">';
-		echo '<input class="button" type="button" value="'. _BUTTON_RESULTS .'" onClick="window.location=\''. sefRelToAbs( 'index.php?option=com_poll&task=results&id='. $uid ) .'\'">';
+		echo '<input class="button" type="button" value="'. T_('Results') .'" onClick="window.location=\''. sefRelToAbs( 'index.php?option=com_poll&task=results&id='. $uid ) .'\'">';
 		echo '</form>';
 	}
 }
@@ -109,7 +110,7 @@
 
 	if (empty($poll->title)) {
 		$poll->id = '';
-		$poll->title = _SELECT_POLL;
+		$poll->title = T_('Select Poll from the list');
 	}
 
 	$first_vote = '';
@@ -151,7 +152,7 @@
 	reset( $polls );
 	$link = sefRelToAbs( 'index.php?option=com_poll&amp;task=results&amp;id=\' + this.options[selectedIndex].value + \'&amp;Itemid='. $Itemid .'\' + \'' );
 	$pollist = '<select name="id" class="inputbox" size="1" style="width:200px" onchange="if (this.options[selectedIndex].value != \'\') {document.location.href=\''. $link .'\'}">';
-	$pollist .= '<option value="">'. _SELECT_POLL .'</option>';
+	$pollist .= '<option value="">'. T_('Select Poll from the list') .'</option>';
 	for ($i=0, $n=count( $polls ); $i < $n; $i++ ) {
 		$k = $polls[$i]->id;
 		$t = $polls[$i]->title;
diff -ruN 4.5.4/components/com_registration/registration.html.php 4.6rc2/components/com_registration/registration.html.php
--- 4.5.4/components/com_registration/registration.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_registration/registration.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,43 +1,41 @@
 <?php
 /**
-* @version $Id: registration.html.php,v 1.2 2005/10/16 22:49:57 cauld Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Users
-*/
 class HTML_registration {
 	function lostPassForm($option) {
 		?>
 
 <div class="componentheading">
-	<?php echo _PROMPT_PASSWORD; ?>
+	<?php echo T_('Lost your Password?'); ?>
 </div>
 <table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane">
   <form action="index.php" method="post">
     <tr>
-      <td colspan="2"><?php echo _NEW_PASS_DESC; ?></td>
+      <td colspan="2"><?php printf(T_('Please enter your Username and e-mail address then click on the Send Password button.%s You will receive a new password shortly.  Use the new password to access the site.'), '<br />') ?></td>
     </tr>
     <tr>
-      <td><?php echo _PROMPT_UNAME; ?></td>
+      <td><?php echo T_('Username:'); ?></td>
       <td><input type="text" name="checkusername" class="inputbox" size="40" maxlength="25" /></td>
     </tr>
     <tr>
-      <td><?php echo _PROMPT_EMAIL; ?></td>
+      <td><?php echo T_('E-mail Address:'); ?></td>
       <td><input type="text" name="confirmEmail" class="inputbox" size="40" /></td>
     </tr>
     <tr>
       <td colspan="2"> <input type="hidden" name="option" value="<?php echo $option;?>" />
-        <input type="hidden" name="task" value="sendNewPass" /> <input type="submit" class="button" value="<?php echo _BUTTON_SEND_PASS; ?>" /></td>
+        <input type="hidden" name="task" value="sendNewPass" /> <input type="submit" class="button" value="<?php echo T_('Send Password'); ?>" /></td>
     </tr>
   </form>
 </table>
@@ -55,21 +53,21 @@
 
 			// do field validation
 			if (form.name.value == "") {
-				alert( "<?php echo html_entity_decode(_REGWARN_NAME);?>" );
+				alert( "<?php echo html_entity_decode(T_('Please enter your name.'));?>" );
 			} else if (form.username.value == "") {
-				alert( "<?php echo html_entity_decode(_REGWARN_UNAME);?>" );
+				alert( "<?php echo html_entity_decode(T_('Please enter a user name.'));?>" );
 			} else if (r.exec(form.username.value) || form.username.value.length < 3) {
-				alert( "<?php printf( html_entity_decode(_VALID_AZ09), html_entity_decode(_PROMPT_UNAME), 2 );?>" );
+				alert( "<?php printf( html_entity_decode(T_("Please enter a valid %s.  No spaces, more than %d characters and containing only the characters 0-9,a-z, or A-Z")), html_entity_decode(T_('Please enter a user name.')), 2 );?>" );
 			} else if (form.email.value == "" ) {
-				alert( "<?php echo html_entity_decode(_REGWARN_MAIL);?>" );
+				alert( "<?php echo html_entity_decode(T_('Please enter a valid e-mail address.'));?>" );
 			} else if (form.password.value.length < 6) {
-				alert( "<?php echo html_entity_decode(_REGWARN_PASS);?>" );
+				alert( "<?php echo html_entity_decode(T_('Please enter a valid password -- more than 6 characters with no spaces and containing only the characters 0-9, a-z, or A-Z'));?>" );
 			} else if (form.password2.value == "") {
-				alert( "<?php echo html_entity_decode(_REGWARN_VPASS1);?>" );
+				alert( "<?php echo html_entity_decode(T_('Please verify the password.'));?>" );
 			} else if ((form.password.value != "") && (form.password.value != form.password2.value)){
-				alert( "<?php echo html_entity_decode(_REGWARN_VPASS2);?>" );
+				alert( "<?php echo html_entity_decode(T_('Password and verification do not match, please try again.'));?>" );
 			} else if (r.exec(form.password.value)) {
-				alert( "<?php printf( html_entity_decode(_VALID_AZ09), html_entity_decode(_REGISTER_PASS), 6 );?>" );
+				alert( "<?php printf( html_entity_decode(T_("Please enter a valid %s.  No spaces, more than %d characters and containing only the characters 0-9,a-z, or A-Z")), html_entity_decode(T_('Password:')), 6 );?>" );
 			} else {
 				form.submit();
 			}
@@ -77,35 +75,35 @@
 	</script>
 
 <div class="componentheading">
-	<?php echo _REGISTER_TITLE; ?>
+	<?php echo T_('Registration'); ?>
 </div>
 <form action="index.php" method="post" name="mosForm">
 <table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane">
 <tr>
-<td colspan="2"><?php echo _REGISTER_REQUIRED; ?></td>
+<td colspan="2"><?php echo T_('Fields marked with an asterisk (*) are required.'); ?></td>
 </tr>
     <tr>
-      <td width="30%"><?php echo _REGISTER_NAME; ?> *</td>
+      <td width="30%"><?php echo T_('Name:'); ?> *</td>
       <td><input type="text" name="name" size="40" value="" class="inputbox" /></td>
     </tr>
 
     <tr>
 
-      <td><?php echo _REGISTER_UNAME; ?> *</td>
+      <td><?php echo T_('Username:'); ?> *</td>
       <td><input type="text" name="username" size="40" value="" class="inputbox" /></td>
     <tr>
 
-      <td><?php echo _REGISTER_EMAIL; ?> *</td>
+      <td><?php echo T_('E-mail:'); ?> *</td>
       <td><input type="text" name="email" size="40" value="" class="inputbox" /></td>
     </tr>
 
     <tr>
-      <td><?php echo _REGISTER_PASS; ?> *</td>
+      <td><?php echo T_('Password:'); ?> *</td>
       <td><input class="inputbox" type="password" name="password" size="40" value="" /></td>
     </tr>
 
     <tr>
-      <td><?php echo _REGISTER_VPASS; ?> *</td>
+      <td><?php echo T_('Verify Password:'); ?> *</td>
       <td><input class="inputbox" type="password" name="password2" size="40" value="" /></td>
     </tr>
 
@@ -123,7 +121,7 @@
 <input type="hidden" name="useractivation" value="<?php echo $useractivation;?>" />
 <input type="hidden" name="option" value="<?php echo $option; ?>" />
 <input type="hidden" name="task" value="saveRegistration" />
-<input type="button" value="<?php echo _BUTTON_SEND_REG; ?>" class="button" onclick="submitbutton()" />
+<input type="button" value="<?php echo T_('Send Registration'); ?>" class="button" onclick="submitbutton()" />
 </form>
 <?php
 	}
diff -ruN 4.5.4/components/com_registration/registration.php 4.6rc2/components/com_registration/registration.php
--- 4.5.4/components/com_registration/registration.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_registration/registration.php	2006-03-01 08:35:46.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: registration.php,v 1.2 2005/08/08 00:40:48 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -37,7 +39,7 @@
 
 function lostPassForm( $option ) {
 	global $mainframe;
-	$mainframe->SetPageTitle(_PROMPT_PASSWORD);
+	$mainframe->SetPageTitle(T_('Lost your Password?'));
 	HTML_registration::lostPassForm($option);
 }
 
@@ -59,7 +61,7 @@
 	);
 
 	if (!($user_id = $database->loadResult()) || !$checkusername || !$confirmEmail) {
-		mosRedirect( "index.php?option=$option&task=lostPassword&mosmsg="._ERROR_PASS );
+		mosRedirect( "index.php?option=$option&task=lostPassword&mosmsg=".T_('Sorry, no corresponding user was found.  Please make sure you entered a valid username and a valid email address.  Both are required.') );
 	}
 
 	$database->setQuery( "SELECT name, email FROM #__users"
@@ -70,22 +72,31 @@
 		$adminEmail = $row->email;
 	}
 
-	$newpass = mosMakePassword();
-	$message = _NEWPASS_MSG;
-	eval ("\$message = \"$message\";");
-	$subject = _NEWPASS_SUB;
-	eval ("\$subject = \"$subject\";");
+	$rawpass = mosMakePassword();
+	$message = sprintf(T_("The user account %s has this email associated with it.\n
+A web user from %s has just requested that a new password be sent.\n\n
+Your New Password is: %s\n\n
+If you didn't ask for this, don't worry. You are seeing this message, not them. 
+If this was an error just login with your new password and then change your password to what you would like it to be."),
+	           $checkusername, $mosConfig_live_site, $rawpass);
+	#eval ("\$message = \"$message\";");
+	$subject = sprintf(T_('%s :: New password for - %s'),$_sitename, $checkusername);
+	#eval ("\$subject = \"$subject\";");
 
 	mosMail($mosConfig_mailfrom, $mosConfig_fromname, $confirmEmail, $subject, $message);
 
-	$newpass = md5( $newpass );
+	$newpass = md5( $rawpass );
 	$sql = "UPDATE #__users SET password='$newpass' WHERE id='$user_id'";
 	$database->setQuery( $sql );
 	if (!$database->query()) {
 		die("SQL error" . $database->stderr(true));
 	}
+	$loginfo = new mosLoginDetails($checkusername, $rawpass);
+	$mambothandler =& mosMambotHandler::getInstance();
+	$mambothandler->loadBotGroup('authenticator');
+	$mambothandler->trigger('userChange', array($loginfo));
 
-	mosRedirect( "index.php?Itemid=$Itemid&mosmsg="._NEWPASS_SENT );
+	mosRedirect( "index.php?Itemid=$Itemid&mosmsg=".T_('New User Password created and sent!') );
 }
 
 function registerForm( $option, $useractivation ) {
@@ -97,7 +108,7 @@
 	}
 
 
-  $mainframe->SetPageTitle(_REGISTER_TITLE);
+  $mainframe->SetPageTitle(T_('Registration'));
 	HTML_registration::registerForm($option, $useractivation);
 }
 
@@ -148,12 +159,35 @@
 	$email = $row->email;
 	$username = $row->username;
 
-	$subject = sprintf (_SEND_SUB, $name, $mosConfig_sitename);
+	$subject = sprintf (T_('Account details for %s at %s'), $name, $mosConfig_sitename);
 	$subject = html_entity_decode($subject, ENT_QUOTES);
+	$mambothandler =& mosMambotHandler::getInstance();
+	$mambothandler->loadBotGroup('authenticator');
 	if ($mosConfig_useractivation=="1"){
-		$message = sprintf (_USEND_MSG_ACTIVATE, $name, $mosConfig_sitename, $mosConfig_live_site."/index.php?option=com_registration&task=activate&activation=".$row->activation, $mosConfig_live_site, $username, $pwd);
-	} else {
-		$message = sprintf (_USEND_MSG, $name, $mosConfig_sitename, $mosConfig_live_site);
+		$message = sprintf (T_('Hello %s,
+
+Thank you for registering at %s. Your account has been created but, as a precaution, it must be activated by you before you can use it.
+To activate the account click on the following link or copy and paste it in your browser:
+%s
+
+After activation you may login to %s using the following username and password:
+
+Username - %s
+Password - %s'), 
+		          $name, $mosConfig_sitename, $mosConfig_live_site."/index.php?option=com_registration&task=activate&activation=".$row->activation, $mosConfig_live_site, $username, $pwd);
+		$loginfo = new mosLoginDetails($username, $pwd);
+		$mambothandler->trigger('userRegister', array($loginfo));
+	}
+	else {
+		$message = sprintf (T_("Hello %s,
+
+Thank you for registering at %s.
+
+You may now login to %s using the username and password you registered with."),
+		          $name, $mosConfig_sitename, $mosConfig_live_site);
+		$loginfo = new mosLoginDetails($username, $pwd);
+		$mambothandler->trigger('userRegister', array($loginfo));
+		$mambothandler->trigger('userActivate', array($loginfo));
 	}
 
 	$message = html_entity_decode($message, ENT_QUOTES);
@@ -173,8 +207,18 @@
 	mosMail($adminEmail2, $adminName2, $email, $subject, $message);
 
 	// Send notification to all administrators
-	$subject2 = sprintf (_SEND_SUB, $name, $mosConfig_sitename);
-	$message2 = sprintf (_ASEND_MSG, $adminName2, $mosConfig_sitename, $row->name, $email, $username);
+	$subject2 = sprintf (T_('Account details for %s at %s'), $name, $mosConfig_sitename);
+	$message2 = sprintf (T_('Hello %s,
+
+A new user has registered at %s.
+This email contains their details:
+
+Name - %s
+e-mail - %s
+Username - %s
+
+Please do not respond to this message as it is automatically generated and is for information purposes only'), 
+	            $adminName2, $mosConfig_sitename, $row->name, $email, $username);
 	$subject2 = html_entity_decode($subject2, ENT_QUOTES);
 	$message2 = html_entity_decode($message2, ENT_QUOTES);
 
@@ -194,9 +238,11 @@
 	}
 
 	if ( $mosConfig_useractivation == "1" ){
-		echo _REG_COMPLETE_ACTIVATE;
+	    echo '<div class="componentheading">'.T_('Registration Complete').'</div><br />';
+		echo T_('Your account has been created and an activation link has been sent to the e-mail address you entered. Note that you must activate the account by clicking on the activation link before you can login.');
 	} else {
-		echo _REG_COMPLETE;
+	    echo '<div class="componentheading">'.T_('Registration Complete').'</div><br />';		
+		echo T_('You may now login.');
 	}
 
 }
@@ -214,22 +260,29 @@
 	$activation = $database->getEscaped( $activation );
 
 	if (empty( $activation )) {
-		echo _REG_ACTIVATE_NOT_FOUND;
+        echo '<div class="componentheading">'.T_('Invalid Activation Link!').'</div><br />';
+		echo T_('There is no such account in our database or the account has already been activated.');
 		return;
 	}
 
-	$database->setQuery( "SELECT id FROM #__users"
+	$database->setQuery( "SELECT username FROM #__users"
 	."\n WHERE activation='$activation' AND block='1'" );
-	$result = $database->loadResult();
+	$username = $database->loadResult();
 
-	if ($result) {
+	if ($username) {
 		$database->setQuery( "UPDATE #__users SET block='0', activation='' WHERE activation='$activation' AND block='1'" );
 		if (!$database->query()) {
 			echo "SQL error" . $database->stderr(true);
 		}
-		echo _REG_ACTIVATE_COMPLETE;
+		echo '<div class="componentheading">'.T_('Activation Complete!').'</div><br />';
+		echo T_('Your account has been activated successfully. You can now login using the username and password you chose during registration.');
+		$loginfo = new mosLoginDetails($username);
+		$mambothandler =& mosMambotHandler::getInstance();
+		$mambothandler->loadBotGroup('authenticator');
+		$mambothandler->trigger('userActivate', array($loginfo));
 	} else {
-		echo _REG_ACTIVATE_NOT_FOUND;
+	    echo '<div class="componentheading">'.T_('Invalid Activation Link!').'</div><br />';
+		echo T_('There is no such account in our database or the account has already been activated.');
 	}
 }
 
diff -ruN 4.5.4/components/com_rss/rss.php 4.6rc2/components/com_rss/rss.php
--- 4.5.4/components/com_rss/rss.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_rss/rss.php	2006-04-13 08:29:26.000000000 -0500
@@ -1,10 +1,11 @@
 <?php
 /**
-* @version $Id: rss.php,v 1.1 2005/07/22 01:54:56 eddieajau Exp $
-* @package Mambo
-* @subpackage Syndicate
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -21,7 +22,7 @@
 	case 'live_bookmark':
 		feedFrontpage( false );
 		break;
-		
+
 	default:
 		feedFrontpage( true );
 		break;
@@ -32,24 +33,30 @@
 */
 function feedFrontpage( $showFeed ) {
 	global $database, $mainframe;
-	global $mosConfig_live_site, $mosConfig_offset, $mosConfig_sef, $mosConfig_absolute_path;
-	
+	global $mosConfig_live_site, $mosConfig_offset, $mosConfig_absolute_path;
+
 	// pull id of syndication component
 	$query = "SELECT a.id"
 	. "\n FROM #__components AS a"
 	. "\n WHERE a.name = 'Syndicate'"
 	;
-	$database->setQuery( $query );
-	$id = $database->loadResult();
-	
+	$components = $database->doSQLget( $query, 'mosComponent' );
+	if (isset($components[0])) $component = $components[0];
+	else return;
+
 	// load syndication parameters
-	$component = new mosComponent( $database );
-	$component->load( $id );
 	$params =& new mosParameters( $component->params );
-	
+
+	$query = "SELECT id FROM #__modules WHERE published=1 AND module='mod_rssfeed'";
+	$database->setQuery($query);
+	if (!$database->loadResult()) {
+		mosNotAuth();
+		return;
+	}
+
 	$now 	= date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
 	$iso 	= split( '=', _ISO );
-	
+
 	// parameter intilization
 	$info[ 'date' ] 		= date( 'r' );
 	$info[ 'year' ] 		= date( 'Y' );
@@ -59,7 +66,7 @@
 	$info[ 'cache_time' ] 	= $params->def( 'cache_time', 3600 );
 	$info[ 'count' ]		= $params->def( 'count', 5 );
 	$info[ 'orderby' ] 		= $params->def( 'orderby', '' );
-	$info[ 'title' ] 		= $params->def( 'title', 'Powered by Mambo 4.5.3' );
+	$info[ 'title' ] 		= $params->def( 'title', 'Powered by Mambo' );
 	$info[ 'description' ] 	= $params->def( 'description', 'Mambo site syndication' );
 	$info[ 'image_file' ]	= $params->def( 'image_file', 'mambo_rss.png' );
 	if ( $info[ 'image_file' ] == -1 ) {
@@ -67,7 +74,7 @@
 	} else{
 		$info[ 'image' ]	= $mosConfig_live_site .'/images/M_images/'. $info[ 'image_file' ];
 	}
-	$info[ 'image_alt' ] 	= $params->def( 'image_alt', 'Powered by Mambo 4.5.3' );
+	$info[ 'image_alt' ] 	= $params->def( 'image_alt', 'Powered by Mambo' );
 	$info[ 'limit_text' ] 	= $params->def( 'limit_text', 1 );
 	$info[ 'text_length' ] 	= $params->def( 'text_length', 20 );
 	// get feed type from url
@@ -77,13 +84,7 @@
 	$info[ 'bookmark_file' ]	= $params->def( 'bookmark_file', '' );
 	// content to syndicate
 //	$info[ 'content' ]		= $params->def( 'content', -1 );
-	// validate the feed type
-    $validFeedTypes = array('RSS2.0', '2.0', 'RSS1.0', '1.0', 'RSS0.91',
-                            '0.91', 'PIE0.1', 'MBOX', 'OPML', 'ATOM',
-                            'ATOM0.3', 'HTML', 'JAVASCRIPT', 'JS');
-    if (!in_array(strtoupper($info[ 'feed' ]), $validFeedTypes)) {
-        $info[ 'feed' ] = $validFeedTypes[0];
-    } 
+
 	// set filename for live bookmarks feed
 	if ( !$showFeed & $info[ 'live_bookmark' ] ) {
 		if ( $info[ 'bookmark_file' ] ) {
@@ -92,30 +93,30 @@
 		} else {
 		// standard bookmark filename
 			$info[ 'file' ] = $mosConfig_absolute_path .'/cache/'. $info[ 'live_bookmark' ];
-		}		
+		}
 	} else {
 	// set filename for rss feeds
-		$info[ 'file' ] = strtolower( str_replace( '.', '', $info[ 'feed' ] ) );
-		$info[ 'file' ] = $mosConfig_absolute_path .'/cache/'. $info[ 'file' ] .'.xml';
+		$info[ 'file' ] = getFeedType( $info[ 'feed' ] );
+		if (!$info['file']) return;
 	}
-	
+
 	// load feed creator class
 	$rss 	= new UniversalFeedCreator();
 	// load image creator class
 	$image 	= new FeedImage();
-	
+
 	// loads cache file
 	if ( $showFeed && $info[ 'cache' ] ) {
 		$rss->useCached( $info[ 'feed' ], $info[ 'file' ], $info[ 'cache_time' ] );
 	}
-	
+
 	$rss->title 			= $info[ 'title' ];
 	$rss->description 		= $info[ 'description' ];
 	$rss->link 				= $info[ 'link' ];
 	$rss->syndicationURL 	= $info[ 'link' ];
 	$rss->cssStyleSheet 	= NULL;
 	$rss->encoding 			= $info[ 'encoding' ];
-	
+
 	if ( $info[ 'image' ] ) {
 		$image->url 		= $info[ 'image' ];
 		$image->link 		= $info[ 'link' ];
@@ -124,75 +125,52 @@
 		// loads image info into rss array
 		$rss->image 		= $image;
 	}
-	
-/*	
-testing to extend Syndication capabilities
-	$join 		= '';
-	$and 		= '';
-	$content	= $info['content'];
-	switch ( $info['content' ] ) {
-		case 0:			
-			$and 		= "\n AND a.sectionid != '0'";
-			$orderby 	= 'a.sectionid, a.ordering';		
-			break;
-	
-		case -1:
-			$join 		= "\n INNER JOIN #__content_frontpage AS f ON f.content_id = a.id";
-			$orderby 	= 'f.ordering';		
-			break;
 
-		default:
-			$and 		= "\n AND a.sectionid = '$content'";
-			$and 		.= "\n AND a.sectionid != '0'";
-			$orderby 	= 'a.ordering';		
-			break;	
-	}
-*/	
 	// Determine ordering for sql
 	switch ( strtolower( $info[ 'orderby' ] ) ) {
 		case 'date':
 			$orderby = 'a.created';
 			break;
-	
+
 		case 'rdate':
 			$orderby = 'a.created DESC';
 			break;
-	
+
 		case 'alpha':
 			$orderby = 'a.title';
 			break;
-	
+
 		case 'ralpha':
 			$orderby = 'a.title DESC';
 			break;
-	
+
 		case 'hits':
 			$orderby = 'a.hits DESC';
 			break;
-	
+
 		case 'rhits':
 			$orderby = 'a.hits ASC';
 			break;
-	
+
 		case 'front':
 			$orderby = 'f.ordering';
 			break;
-	
+
 		default:
 			$orderby = 'f.ordering';
 			break;
 	}
 
 	$join 		= "\n INNER JOIN #__content_frontpage AS f ON f.content_id = a.id";
-	$and 		= '';
-	
+	$_and 		= '';
+
 	// query of frontpage content items
 	$query = "SELECT a.*, u.name AS author, u.usertype"
 	. "\n FROM #__content AS a"
 	. $join
 	. "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
 	. "\n WHERE a.state = '1'"
-	. $and
+	. $_and
 	. "\n AND a.access = 0"
 	. "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '". $now ."' )"
 	. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '". $now ."' )"
@@ -201,17 +179,20 @@
 	;
 	$database->setQuery( $query );
 	$rows = $database->loadObjectList();
-	
+
 	foreach ( $rows as $row ) {
 		// title for particular item
 		$item_title = htmlspecialchars( $row->title );
 		$item_title = html_entity_decode( $item_title );
-	
+
+		// article author
+		$item_author		= $row->author;
+
 		// url link to article
 		// & used instead of &amp; as this is converted by feed creator
 		$item_link = $mosConfig_live_site .'/index.php?option=com_content&task=view&id='. $row->id .'&Itemid='. $mainframe->getItemid( $row->id );
   		$item_link = sefRelToAbs( $item_link );
-	
+
 		// removes all formating from the intro text for the description text
 		$item_description = $row->introtext;
 		$item_description = mosHTML::cleanText( $item_description );
@@ -234,7 +215,7 @@
 				$item_description = NULL;
 			}
 		}
-	
+
 		// load individual item creator class
 		$item = new FeedItem();
 		// item info
@@ -242,12 +223,26 @@
 		$item->link 		= $item_link;
 		$item->description 	= $item_description;
 		$item->source 		= $info[ 'link' ];
-	 
+		$item->author		= $item_author;
+
 		// loads item info into rss array
 		$rss->addItem( $item );
 	}
 
 	// save feed file
-	$rss->saveFeed( $info[ 'feed' ], $info[ 'file' ], $showFeed );		
-}	
+	$rss->saveFeed( $info[ 'feed' ], $info[ 'file' ], $showFeed );
+}
+
+function getFeedType ($rawfeed) {
+	global $mosConfig_absolute_path;
+	$feed = mosGetParam ($_GET, 'feed', 'RSS2.0');
+	$feed = strtolower(str_replace('.', '', $feed));
+	$legal = array ('rss20', 'rss10', 'rss091', 'atom10', 'opml');
+	if (in_array($feed, $legal)) return $mosConfig_absolute_path.'/cache/'.$feed.'.xml';
+	else {
+		mosNotAuth();
+		return '';
+	}
+}
+
 ?>
diff -ruN 4.5.4/components/com_search/search.html.php 4.6rc2/components/com_search/search.html.php
--- 4.5.4/components/com_search/search.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_search/search.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: search.html.php,v 1.1 2005/07/22 01:54:56 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Search
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Search
-*/
 class search_html {
 	
 	function openhtml( $params ) {
@@ -34,13 +32,13 @@
 		<table class="contentpaneopen<?php echo $params->get( 'pageclass_sfx' ); ?>">
 			<tr>
 				<td nowrap="nowrap">
-				<?php echo _PROMPT_KEYWORD; ?>:
+				<?php echo T_('Search Keyword'); ?>:
 				</td>
 				<td nowrap="nowrap">
 				<input type="text" name="searchword"size="15" value="<?php echo stripslashes($searchword);?>" class="inputbox" />
 				</td>
 				<td width="100%" nowrap="nowrap">
-				<input type="submit" name="submit" value="<?php echo _SEARCH_TITLE;?>" class="button" />
+				<input type="submit" name="submit" value="<?php echo T_('Search');?>" class="button" />
 				</td>
 			</tr>
 			<tr>
@@ -49,7 +47,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td colspan="3"><?php echo _CMN_ORDERING;?>: <?php echo $lists['ordering'];?></td>
+				<td colspan="3"><?php echo T_('Ordering');?>: <?php echo $lists['ordering'];?></td>
 			</tr>
 		</table>
 		
@@ -64,7 +62,7 @@
 		<table class="searchintro<?php echo $params->get( 'pageclass_sfx' ); ?>">
 		<tr>
 			<td colspan="3" align="left">
-			<?php echo _PROMPT_KEYWORD . ' <b>' . stripslashes($searchword) . '</b>'; ?>	
+			<?php echo T_('Search Keyword') . ' <b>' . stripslashes($searchword) . '</b>'; ?>	
 		<?php
 	}
 
@@ -95,7 +93,7 @@
 		$k 			= 0;
 				
 		// number of matches found
-		printf( _SEARCH_MATCHES, $c );
+		printf( Tn_('returned %d match', 'returned %d matches',$c), $c );
 		?>
 			</td>
 		</tr>
@@ -161,7 +159,7 @@
 		<tr>
 			<td colspan="3">
 			<?php
-			eval ('echo "'._CONCLUSION.'";');
+			printf('Total %d results found.  Search for %s with', $totalRows, "<b>$searchword</b>");
 			?>
 			<a href="http://www.google.com/search?q=<?php echo stripslashes($searchword);?>" target="_blank">
 			<img src="<?php echo $mosConfig_live_site;?>/images/M_images/google.png" border="0" align="texttop" />
diff -ruN 4.5.4/components/com_search/search.php 4.6rc2/components/com_search/search.php
--- 4.5.4/components/com_search/search.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_search/search.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,13 @@
 <?php
 /**
-* @version $Id: search.php,v 1.2 2005/10/20 02:56:04 cauld Exp $
-* @package Mambo
-* @subpackage Search
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -32,13 +33,13 @@
 		$params =& new mosParameters( $menu->params );
 		$params->def( 'page_title', 1 );
 		$params->def( 'pageclass_sfx', '' );
-		$params->def( 'header', $menu->name, _SEARCH_TITLE );
+		$params->def( 'header', $menu->name, T_('Search') );
 		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
 	} else {
 		$params =& new mosParameters('');
 		$params->def( 'page_title', 1 );
 		$params->def( 'pageclass_sfx', '' );
-		$params->def( 'header', _SEARCH_TITLE );
+		$params->def( 'header', T_('Search') );
 		$params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
 	}
 	
@@ -52,11 +53,11 @@
 	@include "$mosConfig_absolute_path/language/$mosConfig_lang.ignore.php";
 	
 	$orders = array();
-	$orders[] = mosHTML::makeOption( 'newest', _SEARCH_NEWEST );
-	$orders[] = mosHTML::makeOption( 'oldest', _SEARCH_OLDEST );
-	$orders[] = mosHTML::makeOption( 'popular', _SEARCH_POPULAR );
-	$orders[] = mosHTML::makeOption( 'alpha', _SEARCH_ALPHABETICAL );
-	$orders[] = mosHTML::makeOption( 'category', _SEARCH_CATEGORY );
+	$orders[] = mosHTML::makeOption( 'newest', T_('Newest first') );
+	$orders[] = mosHTML::makeOption( 'oldest', T_('Oldest first') );
+	$orders[] = mosHTML::makeOption( 'popular', T_('Most popular') );
+	$orders[] = mosHTML::makeOption( 'alpha', T_('Alphabetical') );
+	$orders[] = mosHTML::makeOption( 'category', T_('Section/Category') );
 	$ordering = mosGetParam( $_REQUEST, 'ordering', 'newest');
 	$lists = array();
 	$lists['ordering'] = mosHTML::selectList( $orders, 'ordering', 'class="inputbox"', 'value', 'text', $ordering );
@@ -66,17 +67,17 @@
 	
 	$phrase = new stdClass();
 	$phrase->value = 'any';
-	$phrase->text = _SEARCH_ANYWORDS;
+	$phrase->text = T_('Any words');
 	$searchphrases[] = $phrase;
 	
 	$phrase = new stdClass();
 	$phrase->value = 'all';
-	$phrase->text = _SEARCH_ALLWORDS;
+	$phrase->text = T_('All words');
 	$searchphrases[] = $phrase;
 	
 	$phrase = new stdClass();
 	$phrase->value = 'exact';
-	$phrase->text = _SEARCH_PHRASE;
+	$phrase->text = T_('Exact phrase');
 	$searchphrases[] = $phrase;	
 
 	$lists['searchphrase']= mosHTML::radioList( $searchphrases, 'searchphrase', '', $searchphrase );
@@ -88,12 +89,14 @@
 		if ( count( $_POST ) ) {
 			// html output
 			// no matches found
-			search_html::message( _NOKEYWORD, $params );
+			search_html::message( T_('No results were found'), $params );
 		}
-	} else if ( in_array( $searchword, $search_ignore ) ) {
-		// html output
-		search_html::message( _IGNOREKEYWORD, $params );
 	} else {
+		foreach ($search_ignore as $ignore_word) $searchword = preg_replace("/(^|\W)$ignore_word($|\W)/i", '$1$2', $searchword);
+		$searchword = trim($searchword);
+		if (!$searchword) search_html::message( T_('One or more common words were ignored in the search'), $params );
+	}
+	if ($searchword) {
 		// html output
 		search_html::searchintro( htmlspecialchars( $searchword ), $params );
 	
@@ -138,7 +141,7 @@
 			}
 		}
 
-		$mainframe->setPageTitle( _SEARCH_TITLE );
+		$mainframe->setPageTitle( T_('Search') );
 		
 		if ( $totalRows ) {
 		// html output
@@ -180,4 +183,37 @@
 		}
 	}
 }
+
+/**
+* Prepares results from search for display
+* @param string The source string
+* @param int Number of chars to trim
+* @param string The searchword to select around
+* @return string
+*/
+function mosPrepareSearchContent( $text, $length=200, $searchword ) {
+	// strips tags won't remove the actual jscript
+	$text = preg_replace( "'<script[^>]*>.*?</script>'si", "", $text );
+	$text = preg_replace( '/{.+?}/', '', $text);
+	//$text = preg_replace( '/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is','\2', $text );
+	return mosSmartSubstr( strip_tags( $text ), $length, $searchword );
+}
+
+/**
+* returns substring of characters around a searchword
+* @param string The source string
+* @param int Number of chars to return
+* @param string The searchword to select around
+* @return string
+*/
+function mosSmartSubstr($text, $length=200, $searchword) {
+  $wordpos = strpos(strtolower($text), strtolower($searchword));
+  $halfside = intval($wordpos - $length/2 - strlen($searchword));
+  if ($wordpos && $halfside > 0) {
+      return '...' . substr($text, $halfside, $length);
+  } else {
+    return substr( $text, 0, $length);
+  }
+}
+
 ?>
diff -ruN 4.5.4/components/com_user/user.html.php 4.6rc2/components/com_user/user.html.php
--- 4.5.4/components/com_user/user.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_user/user.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,30 +1,28 @@
 <?php
 /**
-* @version $Id: user.html.php,v 1.1 2005/07/22 01:54:57 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Users
-*/
 class HTML_user {
 	function frontpage() {
 ?>
 <div class="componentheading">
-	<?php echo _WELCOME; ?>
+	<?php echo T_('Welcome!'); ?>
 </div>
 
 	<table cellpadding="0" cellspacing="0" border="0" width="100%">
 		<tr>
-			<td><?php echo _WELCOME_DESC; ?></td>
+			<td><?php echo T_('Welcome to the user section of our site'); ?></td>
 		</tr>
 	</table>
 <?php
@@ -40,17 +38,17 @@
 
 			// do field validation
 			if (form.name.value == "") {
-				alert( "<?php echo _REGWARN_NAME;?>" );
+				alert( "<?php echo T_('Please enter your name.');?>" );
 			} else if (form.username.value == "") {
-				alert( "<?php echo _REGWARN_UNAME;?>" );
+				alert( "<?php echo T_('Please enter a user name.');?>" );
 			} else if (r.exec(form.username.value) || form.username.value.length < 3) {
-				alert( "<?php printf( _VALID_AZ09, _PROMPT_UNAME, 4 );?>" );
+				alert( "<?php printf( T_("Please enter a valid %s.  No spaces, more than %d characters and containing only the characters 0-9,a-z, or A-Z"), T_('Username:'), 4 );?>" );
 			} else if (form.email.value == "") {
-				alert( "<?php echo _REGWARN_MAIL;?>" );
+				alert( "<?php echo T_('Please enter a valid e-mail address.');?>" );
 			} else if ((form.password.value != "") && (form.password.value != form.verifyPass.value)){
-				alert( "<?php echo _REGWARN_VPASS2;?>" );
+				alert( "<?php echo T_('Password and verification do not match, please try again.');?>" );
 			} else if (r.exec(form.password.value)) {
-				alert( "<?php printf( _VALID_AZ09, _REGISTER_PASS, 4 );?>" );
+				alert( "<?php printf( T_("Please enter a valid %s.  No spaces, more than %d characters and containing only the characters 0-9,a-z, or A-Z"), T_('Password:'), 4 );?>" );
 			} else {
 				form.submit();
 			}
@@ -58,26 +56,26 @@
 	</script>
 <form action="index.php" method="post" name="mosUserForm">
 		<div class="componentheading">
-			<?php echo _EDIT_TITLE; ?>
+			<?php echo T_('Edit Your Details'); ?>
 		</div>
 		<table cellpadding="5" cellspacing="0" border="0" width="100%">
     <tr>
-      <td width=85><?php echo _YOUR_NAME; ?></td>
+      <td width=85><?php echo T_('Your Name:'); ?></td>
       <td><input class="inputbox" type="text" name="name" value="<?php echo $row->name;?>" size="40" /></td>
     </tr>
     <tr>
-      <td><?php echo _EMAIL; ?></td>
+      <td><?php echo T_('e-mail:'); ?></td>
       <td><input class="inputbox" type="text" name="email" value="<?php echo $row->email;?>" size="40" /></td>
     <tr>
-      <td><?php echo _UNAME; ?></td>
+      <td><?php echo T_('User Name:'); ?></td>
       <td><input class="inputbox" type="text" name="username" value="<?php echo $row->username;?>" size="40" /></td>
     </tr>
     <tr>
-      <td><?php echo _PASS; ?></td>
+      <td><?php echo T_('Password:'); ?></td>
       <td><input class="inputbox" type="password" name="password" value="" size="40" /></td>
     </tr>
     <tr>
-      <td><?php echo _VPASS; ?></td>
+      <td><?php echo T_('Verify Password:'); ?></td>
       <td><input class="inputbox" type="password" name="verifyPass" size="40" /></td>
     </tr>
     <tr>
@@ -96,11 +94,11 @@
 	function confirmation() {
 		?>
 	<div class="componentheading">
-		<?php echo _SUBMIT_SUCCESS; ?>
+		<?php echo T_('Submission Success!'); ?>
 	</div>
 	<table>
 		<tr>
-			<td><?php echo _SUBMIT_SUCCESS_DESC; ?></td>
+			<td><?php echo T_('Your item has been submitted to the site administrators. It will be reviewed before being published on the site.'); ?></td>
 		</tr>
 	</table>
 <?php
diff -ruN 4.5.4/components/com_user/user.php 4.6rc2/components/com_user/user.php
--- 4.5.4/components/com_user/user.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_user/user.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,13 @@
 <?php
 /**
-* @version $Id: user.php,v 1.1 2005/07/22 01:54:57 eddieajau Exp $
-* @package Mambo
-* @subpackage Users
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -26,7 +27,7 @@
 	break;
 
 	case "UserDetails":
-	userEdit( $option, $my->id, _UPDATE );
+	userEdit( $option, $my->id, T_('Update') );
 	break;
 
 	case "saveUserEdit":
@@ -53,17 +54,16 @@
 	$base_Dir = "images/stories/";
 	$checksize=filesize($userfile);
 	if ($checksize > 50000) {
-		echo "<script> alert(\""._UP_SIZE."\"); window.history.go(-1); </script>\n";
+		echo "<script> alert(\"".T_('You cannot upload files greater than 15kb in size.')."\"); window.history.go(-1); </script>\n";
 	} else {
 		if (file_exists($base_Dir.$userfile_name)) {
-			$message=_UP_EXISTS;
-			eval ("\$message = \"$message\";");
+			$message = sprintf(T_('Image %s already exists. Please rename the file and try again.'),$userfile_name);
 			print "<script> alert('$message'); window.history.go(-1);</script>\n";
 		} else {
 			if ((!strcasecmp(substr($userfile_name,-4),".gif")) || (!strcasecmp(substr($userfile_name,-4),".jpg"))) {
 				if (!move_uploaded_file($userfile, $base_Dir.$userfile_name))
 				{
-					echo _UP_COPY_FAIL." $userfile_name";
+					printf(T_('Failed to copy %s'), $userfile_name);
 				} else {
 					echo "<script>window.opener.focus;</script>";
 					if ($type=="news") {
@@ -85,7 +85,7 @@
 					echo "<script>window.close(); </script>";
 				}
 			} else {
-				echo "<script> alert(\""._UP_TYPE_WARN."\"); window.history.go(-1); </script>\n";
+				echo "<script> alert(\"".T_('You may only upload a gif or jpg image.')."\"); window.history.go(-1); </script>\n";
 			}
 		}
 	}
@@ -127,7 +127,7 @@
 		if(isset($_POST["verifyPass"]) && ($_POST["verifyPass"] == $_POST["password"])) {
 			$row->password = md5($_POST["password"]);
 		} else {
-			echo "<script> alert(\""._PASS_MATCH."\"); window.history.go(-1); </script>\n";
+			echo "<script> alert(\"".T_('Passwords do not match')."\"); window.history.go(-1); </script>\n";
 			exit();
 		}
 	} else {
@@ -146,7 +146,11 @@
 		exit();
 	}
 
-	mosRedirect ("index.php?option=$option", _USER_DETAILS_SAVE);
+	$loginfo = new mosLoginDetails($row->username, $_POST['password']);
+	$mambothandler =& mosMambotHandler::getInstance();
+	$mambothandler->loadBotGroup('authenticator');
+	$mambothandler->trigger('userChange', array($loginfo));
+	mosRedirect ("index.php?option=$option", T_('Your settings have been saved.'));
 }
 
 function CheckIn( $userid, $access, $option ){
@@ -202,12 +206,11 @@
 				if ($num > 0) {
 					echo "\n<tr class=\"row$k\">";
 					echo "\n	<td width=\"250\">";
-					echo _CHECK_TABLE;
+					echo T_('Checking table');
 					echo " - $tn</td>";
 					echo "\n	<td>";
-					echo _CHECKED_IN;
-					echo "<b>$num</b>";
-					echo _CHECKED_IN_ITEMS;
+					printf(Tn_('Checked in %d item', 'Checked in %d items', $num), $num);
+					echo T_();
 					echo "</td>";
 					echo "\n</tr>";
 				}
@@ -217,7 +220,7 @@
 	}
 ?>
 <tr>
-	<td colspan="2"><b><?php echo _CONF_CHECKED_IN; ?></b></td>
+	<td colspan="2"><b><?php echo T_('All items checked out have now been checked in'); ?></b></td>
 </tr>
 </table>
 <?php
diff -ruN 4.5.4/components/com_weblinks/weblinks.class.php 4.6rc2/components/com_weblinks/weblinks.class.php
--- 4.5.4/components/com_weblinks/weblinks.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_weblinks/weblinks.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,20 @@
 <?php
 /**
-* @version $Id: weblinks.class.php,v 1.2 2005/07/22 03:30:09 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Category database table class
-* @package Mambo
-* @subpackage Weblinks
 */
 class mosWeblink extends mosDBTable {
 	/** @var int Primary key */
@@ -61,16 +61,19 @@
 		$this->filter( $ignoreList );
 
 		// specific filters		
-		$iFilter = new InputFilter();
+		$callcheck = array('InputFilter', 'process');
+		if (!is_callable($callcheck)) require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpInputFilter/class.inputfilter.php');
+		// specific filters
+		$iFilter =& new InputFilter();
 		
 		if ($iFilter->badAttributeValue( array( 'href', $this->url ))) {
-			$this->_error = 'Please provide a valid URL';
+			$this->_error = T_('Please provide a valid URL');
 			return false;
 		}
 
 		/** check for valid name */
 		if (trim( $this->title ) == '') {
-			$this->_error = _WEBLINK_TITLE;
+			$this->_error = T_('Your web link must be given a title.');
 			return false;
 		}
 
@@ -85,10 +88,10 @@
 
 		$xid = intval( $this->_db->loadResult() );
 		if ($xid && $xid != intval( $this->id )) {
-			$this->_error = _WEBLINK_EXIST;
+			$this->_error = T_('There is already a web link that name, please try again.');
 			return false;
 		}
 		return true;
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_weblinks/weblinks.html.php 4.6rc2/components/com_weblinks/weblinks.html.php
--- 4.5.4/components/com_weblinks/weblinks.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_weblinks/weblinks.html.php	2006-05-19 07:18:36.000000000 -0500
@@ -1,22 +1,20 @@
 <?php
 /**
-* @version $Id: weblinks.html.php,v 1.1 2005/07/22 01:54:57 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 require_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/HTML_toolbar.php' );
 
-/**
-* @package Mambo
-* @subpackage Weblinks
-*/
 class HTML_weblinks {
 
 	function displaylist( &$categories, &$rows, $catid, $currentcat=NULL, &$params, $tabclass ) {
@@ -38,7 +36,7 @@
 			// show image
 			if ( $currentcat->img ) {
 				?>
-				<img src="<?php echo $currentcat->img; ?>" align="<?php echo $currentcat->align; ?>" hspace="6" alt="<?php echo _WEBLINKS_TITLE; ?>" />
+				<img src="<?php echo $currentcat->img; ?>" align="<?php echo $currentcat->align; ?>" hspace="6" alt="<?php echo T_('Web Links'); ?>" />
 				<?php
 			}
 			echo $currentcat->descrip;
@@ -85,7 +83,8 @@
 		global $mosConfig_live_site;
 		// icon in table display
 		if ( $params->get( 'weblink_icons' ) <> -1 ) {
-			$img = mosAdminMenus::ImageCheck( 'weblink.png', '/images/M_images/', $params->get( 'weblink_icons' ) );
+		    $mainframe =& mosMainFrame::getInstance();
+			$img = $mainframe->ImageCheck( 'weblink.png', '/images/M_images/', $params->get( 'weblink_icons' ) );
 		} else {
 			$img = NULL;
 		}
@@ -105,13 +104,13 @@
 				}
 				?>
 				<td width="90%" height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>">
-				<?php echo _HEADER_TITLE_WEBLINKS; ?>
+				<?php echo T_('Web Link'); ?>
 				</td>
 				<?php
 				if ( $params->get( 'hits' ) ) {
 					?>
 					<td width="30px" height="20" class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" align="right">
-					<?php echo _HEADER_HITS; ?>
+					<?php echo T_('Hits'); ?>
 					</td>
 					<?php
 				}
@@ -245,11 +244,11 @@
 
 			// do field validation
 			if (form.title.value == ""){
-				alert( "Weblink item must have a title" );
+				alert( '<?php echo T_("Web Link item must have a title"); ?>' );
 			} else if (getSelectedValue('adminForm','catid') < 1) {
-				alert( "You must select a category." );
+				alert( '<?php echo T_("You must select a category."); ?>' );
 			} else if (form.url.value == ""){
-				alert( "You must have a url." );
+				alert( '<?php echo T_("You must have a url."); ?>' );
 			} else {
 				submitform( pressbutton );
 			}
@@ -260,7 +259,7 @@
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
 		<tr>
 			<td class="contentheading">
-			<?php echo _SUBMIT_LINK;?>
+			<?php echo T_('Submit A Web Link'); ?>
 			</td>
 			<td width="10%">
 			<?php
@@ -277,7 +276,7 @@
 		<table cellpadding="4" cellspacing="1" border="0" width="100%">
 		<tr>
 			<td width="20%" align="right">
-			<?php echo _NAME; ?>
+			<?php echo T_('Name:'); ?>
 			</td>
 			<td width="80%">
 			<input class="inputbox" type="text" name="title" size="50" maxlength="250" value="<?php echo htmlspecialchars( $row->title, ENT_QUOTES );?>" />
@@ -285,7 +284,7 @@
 		</tr>
 		<tr>
 			<td valign="top" align="right">
-			<?php echo _SECTION; ?>
+			<?php echo T_('Section:'); ?>
 			</td>
 			<td>
 			<?php echo $lists['catid']; ?>
@@ -293,7 +292,7 @@
 		</tr>
 		<tr>
 			<td valign="top" align="right">
-			<?php echo _URL; ?>
+			<?php echo T_('URL:'); ?>
 			</td>
 			<td>
 			<input class="inputbox" type="text" name="url" value="<?php echo $row->url; ?>" size="50" maxlength="250" />
@@ -301,7 +300,7 @@
 		</tr>
 		<tr>
 			<td valign="top" align="right">
-			<?php echo _URL_DESC; ?>
+			<?php echo T_('Description:'); ?>
 			</td>
 			<td>
 			<textarea class="inputbox" cols="30" rows="6" name="description" style="width:300px" width="300"><?php echo htmlspecialchars( $row->description, ENT_QUOTES );?></textarea>
@@ -320,4 +319,4 @@
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/components/com_weblinks/weblinks.php 4.6rc2/components/com_weblinks/weblinks.php
--- 4.5.4/components/com_weblinks/weblinks.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_weblinks/weblinks.php	2006-06-20 00:17:39.000000000 -0500
@@ -1,12 +1,13 @@
 <?php
 /**
-* @version $Id: weblinks.php,v 1.1 2005/07/22 01:54:57 eddieajau Exp $
-* @package Mambo
-* @subpackage Weblinks
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,7 +15,7 @@
 /** load the html drawing class */
 require_once( $mainframe->getPath( 'front_html' ) );
 require_once( $mainframe->getPath( 'class' ) );
-$mainframe->setPageTitle( _WEBLINKS_TITLE );
+$mainframe->setPageTitle( T_('Web Links') );
 
 $task = trim( mosGetParam( $_REQUEST, 'task', "" ) );
 $id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
@@ -95,7 +96,7 @@
 	$params->def( 'other_cat_section', 1 );
 	$params->def( 'other_cat', 1 );
 	$params->def( 'description', 1 );
-	$params->def( 'description_text', _WEBLINKS_DESC );
+	$params->def( 'description_text', T_('From the list below choose one of our web link categories, then select a URL to visit the site.') );
 	$params->def( 'image', '-1' );
 	$params->def( 'weblink_icons', '' );
 	$params->def( 'image_align', 'right' );
@@ -135,6 +136,8 @@
 	$currentcat->header = '';
 	if ( @$currentcat->name <> '' ) {
 		$currentcat->header = $currentcat->name;
+		$pathway =& mosPathway::getInstance();
+		$pathway->addItem($currentcat->name, '');
 	} else {
 		$currentcat->header = $params->get( 'header' );
 	}
@@ -178,8 +181,7 @@
 
 	// fail if checked out not by 'me'
 	if ($row->checked_out && $row->checked_out <> $my->id) {
-		mosRedirect( "index2.php?option=$option",
-		'The module $row->title is currently being edited by another administrator.' );
+		mosRedirect( "index2.php?option=$option",sprintf(T_('The module %s is currently being edited by another administrator.'), $row->title) );
 	}
 
 	if ($id) {
@@ -206,6 +208,7 @@
 */
 
 	// build list of categories
+	require_once($mosConfig_absolute_path.'/administrator/includes/mosAdminMenus.php');
 	$lists['catid'] 			= mosAdminMenus::ComponentCategory( 'catid', $option, intval( $row->catid ) );
 
 	HTML_weblinks::editWeblink( $option, $row, $lists );
@@ -245,9 +248,9 @@
 	}
 	$isNew = $row->id < 1;
 
-	$row->date = date( "Y-m-d H:i:s" );	
-	
-	$row->title = $database->getEscaped($row->title);
+	$row->date = date( "Y-m-d H:i:s" );
+
+        $row->title = $database->getEscaped($row->title);
         $row->catid = $database->getEscaped($row->catid);
 
 	if (!$row->check()) {
@@ -274,11 +277,29 @@
 
 	$adminRows = $database->loadObjectList();
 	foreach( $adminRows as $adminRow) {
-		mosSendAdminMail($adminRow->name, $adminRow->email, "", "Weblink", $row->title, $my->username );
+		sendAdminMail($adminRow->name, $adminRow->email, 'Web Link', $row->title, $my->username );
 	}
 
-	$msg 	= $isNew ? _THANK_SUB : '';
+	$msg 	= $isNew ? T_('Thanks for your submission; it will be reviewed before being posted to the site.') : '';
 	$Itemid = mosGetParam( $_POST, 'Returnid', '' );
 	mosRedirect( 'index.php?Itemid='. $Itemid, $msg );
 }
+
+/**
+* Sends mail to admin
+*/
+function sendAdminMail( $adminName, $adminEmail, $type, $title, $author ) {
+	$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+	$from = mamboCore::get('mosConfig_mailfrom');
+	$fromname = mamboCore::get('mosConfig_fromname');
+	$subject = sprintf(T_("User Submitted '%'"),$type);
+	$message = sprintf(T_('Hello %s,\n\n\nA user submitted %s:\n [ %s ]\n has been just been submitted by user:\n [ %s ]\n'
+.' for %s.\n\n\n\n'
+.'Please go to %s/administrator to view and approve this %s.\n\n'
+.'Please do not respond to this message as it is automatically generated and is for information purposes only\n'), $adminName, $type, $title, $author, $mosConfig_live_site, $mosConfig_live_site, $type);
+	require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpmailer/class.phpmailer.php');
+	$mail =& new mosMailer ($from, $fromname, $subject, $message);
+	return $mail->mosMail($adminEmail);
+}
+
 ?>
diff -ruN 4.5.4/components/com_wrapper/wrapper.html.php 4.6rc2/components/com_wrapper/wrapper.html.php
--- 4.5.4/components/com_wrapper/wrapper.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_wrapper/wrapper.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,20 +1,18 @@
 <?php
 /**
-* @version $Id: wrapper.html.php,v 1.1 2005/07/22 01:54:59 eddieajau Exp $
-* @package Mambo
+* @package Mambo Open Source
 * @subpackage Wrapper
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-* @subpackage Wrapper
-*/
 class HTML_wrapper {
 
 	function displayWrap( &$row, &$params, &$menu ) {
@@ -52,7 +50,7 @@
 		align="top"
 		frameborder="0"
 		class="wrapper<?php echo $params->get( 'pageclass_sfx' ); ?>">
-		<?php echo _CMN_IFRAMES; ?>
+		<?php echo T_('This option will not work correctly.  Unfortunately, your browser does not support Inline Frames'); ?>
 		</iframe>
 
 		</div>
diff -ruN 4.5.4/components/com_wrapper/wrapper.php 4.6rc2/components/com_wrapper/wrapper.php
--- 4.5.4/components/com_wrapper/wrapper.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/components/com_wrapper/wrapper.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,13 @@
 <?php
 /**
-* @version $Id: wrapper.php,v 1.1 2005/07/22 01:55:01 eddieajau Exp $
-* @package Mambo
-* @subpackage Wrapper
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/configuration.php 4.6rc2/configuration.php
--- 4.5.4/configuration.php	2006-08-02 17:43:38.000000000 -0500
+++ 4.6rc2/configuration.php	2006-08-16 16:44:10.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: configuration.php-dist,v 1.4 2005/11/25 04:46:26 csouza Exp $
-* package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 *
 * -------------------------------------------------------------------------
@@ -33,7 +35,6 @@
 * Site specific configuration
 * -------------------------------------------------------------------------
 */
-$mosConfig_lang = 'english';				// Site language
 $mosConfig_absolute_path = '[% installdir %]';	// No trailing slash
 $mosConfig_live_site = '[% url_to_install_without_trailing_slash %]';	// No trailing slash
 $mosConfig_sitename = 'Mambo';		// Name of Mambo site
@@ -47,8 +48,11 @@
 $mosConfig_MetaTitle = '1';
 $mosConfig_MetaAuthor = '1';
 $mosConfig_debug = '0';
+$mosConfig_lang = 'english';				// Site language
 $mosConfig_locale = 'en_GB';
 $mosConfig_offset = '0';				// Local time offset
+$mosConfig_locale_debug = 0;
+$mosConfig_locale_use_gettext = 0;
 $mosConfig_hideAuthor = '0';
 $mosConfig_hideCreateDate = '0';
 $mosConfig_hideModifyDate = '0';
diff -ruN 4.5.4/editor/editor.htmlarea2.php 4.6rc2/editor/editor.htmlarea2.php
--- 4.5.4/editor/editor.htmlarea2.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/editor/editor.htmlarea2.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: editor.htmlarea2.php,v 1.1 2005/07/22 01:55:01 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/editor/editor.htmlarea3.php 4.6rc2/editor/editor.htmlarea3.php
--- 4.5.4/editor/editor.htmlarea3.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/editor/editor.htmlarea3.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: editor.htmlarea3.php,v 1.1 2005/07/22 01:55:01 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/editor/editor.php 4.6rc2/editor/editor.php
--- 4.5.4/editor/editor.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/editor/editor.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: editor.php,v 1.1 2005/07/22 01:55:01 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/editor/editor.wysiwygpro.php 4.6rc2/editor/editor.wysiwygpro.php
--- 4.5.4/editor/editor.wysiwygpro.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/editor/editor.wysiwygpro.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: editor.wysiwygpro.php,v 1.1 2005/07/22 01:55:01 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/editor/editor.xstandard.php 4.6rc2/editor/editor.xstandard.php
--- 4.5.4/editor/editor.xstandard.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/editor/editor.xstandard.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: editor.xstandard.php,v 1.1 2005/07/22 01:55:01 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/files/index.html 4.6rc2/files/index.html
--- 4.5.4/files/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/files/index.html	2006-02-28 09:07:52.000000000 -0600
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/globals.php 4.6rc2/globals.php
--- 4.5.4/globals.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/globals.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,43 +0,0 @@
-<?php
-/**
-* @version $Id: globals.php,v 1.6 2005/11/26 00:43:58 csouza Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-
-// reads configuration.php for mosConfig_register_globals
-function config_register_globals() {
-    static $register_globals;
-    if (is_null($register_globals)) {
-        $config = implode(",", file(dirname(__FILE__).DIRECTORY_SEPARATOR.'configuration.php'));
-        preg_match('/\$mosConfig_register_globals\s*=\s*\'([0-1]?)\'/', $config, $matches);
-        $register_globals = isset($matches[1]) ? (int) $matches[1] : 1;
-    }
-    return $register_globals;
-}
-
-// get mosConfig_register_globals
-$config_register_globals = config_register_globals();
-
-// superglobals array
-$superglobals = array($_SERVER, $_ENV, $_FILES, $_COOKIE, $_POST, $_GET);
-if (isset($_SESSION)) array_unshift ($superglobals , $_SESSION); 
-
-// Emulate register_globals on
-if (!ini_get('register_globals') && $config_register_globals) {
-   foreach ($superglobals as $superglobal) {
-       extract($superglobal, EXTR_SKIP);
-   }
-}
-// Emulate register_globals off
-elseif (ini_get('register_globals') && !$config_register_globals) {
-   foreach ($superglobals as $superglobal) {
-       foreach ($superglobal as $key => $value) {
-           unset($GLOBALS[$key]);
-       }
-   }
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/help/454.mambo.credits.html 4.6rc2/help/454.mambo.credits.html
--- 4.5.4/help/454.mambo.credits.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.mambo.credits.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,291 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-
-<head>
-
-<title>Credits</title>
-
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-
-<meta name="copyright" content="(C) 2000 - 2006 The Mambo Foundation" />
-
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-
-</head>
-
-<body>
-
-<h1>Credits</h1>
-
-<h1>Contributions</h1>
-  <ul>
-  <h2>The Mambo Steering Committee (the 'MSC')</h2>
-		<li>
-			<strong>Chad Cauld</strong>: Core Development Team Leader
-		</li>
-		<li>
-		<strong>Alain Schmalz</strong>: 3rd Party Development Team Leader 
-  	</li>
-		<li>
-			<strong>Ric Shreves</strong>: Advocacy & PR Team Leader 
-		</li>
-		<li>
-			<strong>Carlos Souza</strong>: Translation Team Leader 
-		</li>
-		<li>
-			<strong>David Geller</strong>: Moderation Team Leader 
-		</li>
-		<li>
-			<strong>Richard Ong</strong>: Documentation Team Leader 
-		</li>
-		<li>
-			<strong>James Puro</strong>: QA Team Leader 
-		</li>
-<h2>Core & Maintenance Development </h2>
-		<li>
-			 Adi Setiawan 
-		</li>
-		<li>
-			 Akarawuth Tamrareang 
-		</li>
-		<li>
-		Carlos Souza
-		</li>
-		<li>
-Chad Auld
-		</li>
-		<li>
-Chanh Ong
-		</li>
-		<li>
-Giorgio Nordo
-		</li>
-		<li>
-Nalisa Sitabut
-		</li>
-		<li>
-Neil Thompson
-		</li>
-		<li>
-Richard Peter Ong
-		</li>
-		<li>
-Shaoying Su
-		</li>
-		
-		<h2>Past Contributions</h2>
-		<li>
-			Andrew Eddie, Rey Gigataras, Emir Sakic, Alex Kempkens, Andy Miller, Mitch Pirtle, Tim Broeker, Nick Designer, Brian Teeman, Andy Stewart, Peter Koch, Levis Bisson, Robert Castley, Phil Taylor, Ron Bakker, Steen Rabol, James Logan, Wee Keat, Ilias Antonopoulos, Martin Brampton, Dean Elzey, Despina Stamkou, John Kalantzis 
-		</li>
-  </ul>
-
-	<h1>Third Party Tools</h1>
-
-  <ul>
-
-		<li>
-
-
-
-				<a href="http://www.cs.ucla.edu/%7Eheng/JSCookMenu/index.html">JSCookMenu</a>
-
-				1.25
-
-				(<a href="http://www.cs.ucla.edu/%7Eheng/JSCookMenu/copyright.html">License</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://tinymce.moxiecode.com/">TinyMCE Editor</a>
-
-				2.0.6.1
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://www.engageinteractive.com/">DOMIT!</a>
-
-				1.0
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://www.phpconcept.net">PCLZip/PCLTar</a>
-
-				2.0-rc1
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://phpgacl.sf.net">phpGACL</a>
-
-				3.2.2
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://dynarch.com/mishoo/calendar.epl">Calendar</a>
-
-				0.9.2
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://www.bosrup.com/web/overlib">overLIB</a>
-
-				4.21
-
-				(<a href="http://www.bosrup.com/web/overlib/?License">License</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://www.foood.net">Foood.net Icons</a>
-
-				N/A
-
-				(<a href="http://www.foood.net/agreement.htm">License</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://webfx.eae.net/">XP-Style Tabs</a>
-
-				1.0.2
-
-				(Public Domain)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://phpmailer.sourceforge.net/">phpMailer</a>
-
-				1.72
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://www.bitfolge.de/rsscreator-en.html">Feedcreator</a>
-
-				1.71
-
-				(<a href="http://www.gnu.org/licenses/gpl.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://pear.php.net">Cache_Lite</a>
-
-				1.3.1 (CVS)
-
-				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://qbnz.com/highlighter/">GeSHi</a>
-
-				1.0.4
-
-				(<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>)
-
-
-
-		</li>
-
-		<li>
-
-
-
-				<a href="http://www.bitfolge.de/phpvcard-en.html">PHP VCard</a>
-
-				2.0
-
-				(<a href="http://www.gnu.org/licenses/gpl.html">LGPL</a>)
-
-
-
-		</li>
-
-	</ul>
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.mambo.glossary.html 4.6rc2/help/454.mambo.glossary.html
--- 4.5.4/help/454.mambo.glossary.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.mambo.glossary.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-
-<head>
-
-<title>Glossary</title>
-
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-
-</head>
-
-<body>
-
-<h1>Glossary</h1>
-
-
-
-<p><strong>Admin Templates:</strong> Administrator Templates define the lay-out of your Mambo Web site's Backend.</p><p><strong>Alt&nbsp;Tag:</strong> The&nbsp;'alt' attribute, often called the&nbsp;'alt tag' is&nbsp;a text attribute added to&nbsp;the image tag&nbsp;to&nbsp;describe the&nbsp;image contained in&nbsp;the tag. This text is&nbsp;viewable (inside a text box) when one hovers their&nbsp;mouse over an image in the Frontend of&nbsp;a&nbsp;Web&nbsp;site. </p><p><strong>Archive:</strong> Content items can be archived and managed trough the Backend. The Archive Module provides a way of displaying archived items on your Web site.</p><p><strong>Backend:</strong> The 'Backend' is the Mambo Administrator where the site administrator manages the site and it's content.</p><p><strong>Blog:</strong> A Blog style within Mambo is the listing of records in a summary form. Example: It could be by link only, or showing just the introductory text with a link to the complete text. Often the &quot;News&quot; page is written in Blog style.</p><p><strong>Category:</strong>&nbsp; A Category is the name for a collection of items that are related in some way. Example: The category 'Fish' may contain the records 'Herring', 'Haddock' and 'Stickleback'.<br /><br /><span style="font-weight: bold;">Check Out (an item):</span> When a user edits a file they 'Check it Out'. This prevents other users from being able to edit the item at the same time, thus preventing loss of data upon saving.<br /></p><p><span style="font-weight: bold;">CMT:</span> CMT is an acromyme for Components, Modules and Templates.<br /><br /><span style="font-weight: bold;">CMTM:</span> CMTM is an acromyme for Components, Modules, Templates and Mambots.<br /></p><p><strong>Components:</strong> &nbsp;Components are Mambo's content elements or applications that usually appear in the center of a three column Mambo layout, or on the right of a two column Mambo layout. Components are core elements of Mambo functionality. Mambo core components include: Banners, Contact, News Feeds, Polls and Weblinks. Members of the Mambo Community are producing third party Mambo components on a continuous basis. They are available on <a href="http://mamboforge.net/">mamboforge.net</a> for free download.</p><p><strong>Content item:</strong> Please see 'Item'<strong>.<br /><br />Content Management System (CMS):</strong> &nbsp;A CMS is a software for managing content on a Web site directly on the server.<br /><br /><span style="font-weight: bold;">Core:</span> The Mambo core is the zip-file containing the official standard Mambo installation, which can be found on Mamboforge.net and various other sites. It contains some built-in CMTM's, but can be extended with 3rd party developer's addons.<br /></p><p><strong>Database:</strong> &nbsp;A database is an organized collection of information. It contains a collection of records that you can search, sort and analyze rapidly.</p><p><strong>Elements: </strong>&nbsp;Elements are plug-ins like components, modules, templates, mambots or languages that extend your Mambo installation. These elements can already be bundled into the core or they can be third party elements.</p><p><strong>Frontend:</strong> The Frontend is the Web site that your visitors (or members) will see.</p><p><strong>Frontpage:</strong> &nbsp;The Frontpage is a built-in Component which shows all the published content items from your site marked with the parameter 'Show on Frontpage'. You may configure the display of the Frontpage by editing the menu item associated with it, usually 'Home'.<br /><br /><span style="font-weight: bold;">Global Checkin:</span> When an item is 'Checked Out' and it is not saved or cancelled correctly (e.g. in case of a connection error), it will remain 'Checked Out', and thus uneditable for all other users. Performing a 'Global Checkin' will make those items available again.<br /><br /><span style="font-weight: bold;">Intro Text:</span> When creating or editing a Content Item, the Intro Text should contain a brief introduction. This introduction will be appended by the content in the Main Text box if you have entered content there. When the Content Item is set to show on the Front Page, a 'read on' link will be shown, pointing to the full Content Item.<br /></p><p><strong></strong><span style="font-weight: bold;">Item: </span>An Item is a discrete piece of content within the Mambo hierarchy. An item can be an article, a content category, a menu item or a link.<br /><br style="font-weight: bold;" /><span style="font-weight: bold;">Main Text:</span> When creating or editing a Content Item, the Main Text box contains the text you don't want to show on the Front Page.&nbsp; It shows up after clicking the 'Read On' link in the Frontend of your site.<br /><br /><span style="font-weight: bold;">Mamber: </span>A Mamber is a general term for someone who is part of the Mambo community.<br /></p><p><strong>Mambo:</strong> &nbsp;Mambo is one of the finest Open Source Web Content Management Systems.</p><p><strong>Mambo Administrator:</strong> The Mambo Administrator is an application for administering your Mambo Web site directly on the server. It is sometimes also referred to as any of the <span style="font-weight: bold;">Administrator, Backend</span>, <span style="font-weight: bold;">Admin Section</span>, <span style="font-weight: bold;">Administration Section</span>, or the <span style="font-weight: bold;">Control Panel</span>.</p><p><strong>Mambo User (or/and User Group):</strong> &nbsp;Mambo Users can be arranged in several groups with different levels of access control. User groups with access to the Frontend include Anonymous, Registered, Author, Editor and Publisher. There are also three groups with access to the Backend: Mamager, Administrator and Super Administrator.</p><p><strong>Mambot:</strong> &nbsp;A Mambot is a small, task-oriented function that intercepts content before it is displayed and manipulates it in some way. Mambo provides a number of Mambots in the core distribution.<br /><br style="font-weight: bold;" /><span style="font-weight: bold;">Media Files:</span> Media files such as .gif, .jpg, .png or .bmp files can be used in Content Items and are organised via the Media Manager.<br /></p><p><strong>Modules:</strong> Modules extend the capabilities of Mambo giving the software new functionality.Modules are small content items that can be displayed anywhere that your template allows it to be displayed. Modules are very easy to install in the Admin Section. Mambo modules may include: Main Menu, Top menu, Template Chooser, Polls, Newsflash, Hit Counter, etc. Members of the Mambo Community are producing third party Mambo modules on a continuous basis. They are available on <a href="http://mamboforge.net/">mamboforge.net</a> for free download.<br /><br /><span style="font-weight: bold;">Newsfeeds: </span>Newsfeeds are a way of sharing content between different sites. This sharing method is meant for creating a news introduction in the way the provider wants it and it normally has a link to the provider's web site. Mambo offers you the posibility to both offer and display Newsfeeds.<br /></p><p><strong>Open Source (OS):</strong> &nbsp;Open Source is a general term describing several parts of the Free Software Licence movement.</p><p><strong>Parameters:</strong> &nbsp;Parameters can be used to alter the presentation of specific items, menu's or modules.<br /><br /><span style="font-weight: bold;">Preview: </span>The 'Preview' icon enables you to see from the Backend what your content item would look like in the Frontend of your site.<br /><br /><span style="font-weight: bold;">Projects:</span> Projects&nbsp; can be compoents, modules, templates, mambots and scripts that are freely set up and managed by their authors at http:projects.mamboserver.com.<br /></p><p><strong>Publish(ed):</strong> &nbsp;This defines the state of various parts of your Mambo installation. For example, installed Elements will only display on your Web site if they're published. Content items can be managed with a start- and end date of publishing.</p><p><strong>Record:</strong> &nbsp;A Record is a generic term for a 'row' in the database, just like a card. A record very often represents a 'piece' of content. The dynamic functionality and much of the content of Mambo relies on a database in order to function.</p><p><strong>Section:</strong> &nbsp;A Section is a collection of Categories that are related in some way. Think of it this way. A section might be called 'News', categories in this section might be 'Today's News', 'Yesterdays News' and 'Other News'.</p><p><strong>Site:</strong> &nbsp;The Mambo Site is the Web site displayed to your visitors or users, containing all the content added in the Admin Section. It is sometime referred to as the 'Frontend'.</p><p><strong>Templates:</strong> Templates define the lay-out of your Mambo Web site. You can assign different templates to various pages of your Web site.&nbsp; Templates can be created for the Frontend of your site called Site Template as well as the Backend called Administrator Templates.<br /><br /><span style="font-weight: bold;">Title:</span> This is the name which is displayed above a Content Item.<br /><br /><span style="font-weight: bold;">Title Alias: </span>This is an alternative title for Content Items. This field is not used by the Mambo core itself, but SEF scripts and dynamic title/meta scripts use it and it may have a future use.<br /></p><p><strong>Workspace:</strong> &nbsp;The Workspace is the section of the Mambo Admin Section where the business of configuration and content publishing takes place. The workspace dynamically updates as you select tools and menu options. The workspace can include: HTML editor, article and link management and several other features.</p><p><span style="font-weight: bold;">Wrapper: </span>A Wrapper is a built-in Mambo component which can display any URL in your website. This can be used to wrap an application like a forum or a gallery, individual pages as well as an entire website. An alternative name is an <span style="font-weight: bold;">Iframe</span>. <br />&nbsp;</p>
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.mambo.support.html 4.6rc2/help/454.mambo.support.html
--- 4.5.4/help/454.mambo.support.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.mambo.support.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Support</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2006 The Mambo Foundation" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Support</h1>
-<h2>Official Sites</h2><ul><li><a href="http://source.mambo-foundation.org">The Source</a> - the official Mambo website</li><li><a href="http://mamboxchange.com/tracker/?atid=101&group_id=5&func=browse">Bug reporting</a> - use the bug tracker on mamboxchange.org to log bugs that you find</li><li><a href="http://forum.mamboserver.com">forum.mamboserver.com</a> - The official support forum for Mambo</li><li><a href="http://source.mambo-foundation.org/Remository/">Downloads and Patches</a> - Get the Mambo source here as well as any updates</li><li><a href="http://help.mamboserver.com">help.mamboserver.com</a> - Manual, tutorials and reference material for Mambo<br /></li></ul><br /><h2>Addons for Mambo</h2><ul><li><a href="http://mamboxchange.com">mamboxchange.com</a> - - The object of Mamboxchange.com is to provide a free project management and download environment for Mambo related projects. It is one of largest central repositories on the web for everything that is to do with Mambo.<br /></li></ul><br /><br /><br />
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.mambo.whatsnew.html 4.6rc2/help/454.mambo.whatsnew.html
--- 4.5.4/help/454.mambo.whatsnew.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.mambo.whatsnew.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-
-<head>
-
-<title>What's New in Version 4.5.4</title>
-
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-
-<meta name="copyright" content="(C) 2000 - 2006 The Mambo Foundation" />
-
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-
-</head>
-
-<body>
-
-<h1>What's New in Version 4.5.4</h1>
-The development team is focused on the next minor release of Mambo, v4.6.  However, we do realize that many users will continue to use the 4.5.x branch for some time to come.  Therefore, we have decided to updated / stabilize this branch a bit further while we work on the 4.6 branch.  Enjoy!
-
-<h1>High-Level Updates:</h1>
-1) Updated TinyMCE from v2.0.2 to 2.0.6.1<BR>
-2) Updated overLIB from 4.06 to 4.21<BR>
-3) Added 453h security patch 1 to default install.  No extra download needed.<BR>
-4) Fixed a Trash Manager issue<BR>
-5) Patched a low risk RSS vulnerability<BR>
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.banners.client.edit.html 4.6rc2/help/454.screen.banners.client.edit.html
--- 4.5.4/help/454.screen.banners.client.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.banners.client.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Banner: Client Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Banner: Client Manager : New / Edit</h1>
-<p>This page allow you to create or edit a banner's details.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3>
-<p><strong>Upload</strong>: Opens a new window which lets you upload an image from your computer to the images/banners folder.<br /><br /><strong>Save</strong>: Saves the content and returns to Manager.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened to edit, the banner remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Details</span></h3><p><strong>Banner Name</strong>: Type here the name for the Banner.<br /><br /><strong>Client Name</strong>: Select from the list of configured clients.<br />&nbsp;<br /><strong>Impressions Purchased</strong>: Enter the number of times to display to banner into the input field, or tick the &quot;Unlimited&quot; checkbox for unlimited display.<br />&nbsp;<br /><strong>Banner URL</strong>: Select the banner image to be displayed from the list of available banners. Images need to be stored in the &quot;images/banners&quot; folder to be available for selection here. The selected image will be displayed at the bottom of the screen.<br />&nbsp;<br /><strong>Show Banner</strong>: Select Yes or No.<br />&nbsp;<br /><strong>Click URL</strong>: Enter here the full URL to the page which should open when the banner is clicked on.<br />&nbsp;<br /><strong>Custom banner code</strong>:&nbsp; You may enter here some code (See Developper Manual for more information).<br />&nbsp;<br /><strong>Clicks</strong>: &quot;Reset Clicks&quot; button: clicking this button will reset the click count shown on the right for the banner to 0.<br /><br /><strong>Banner Image</strong>: Image selected under &quot;Banner URL&quot; is displayed here for your convenience.<br /><br /></p>
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.banners.client.html 4.6rc2/help/454.screen.banners.client.html
--- 4.5.4/help/454.screen.banners.client.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.banners.client.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Banner: Client Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Banner: Client Manager</h1>
-<p>This page shows the list of Clients whose banners may be displayed on your site.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p>You &quot;select&quot; clients by clicking the checkbox at the start of each row.</p><p><strong>New</strong>:&nbsp; Click this icon to add a new client.<br /><br /><strong>Edit</strong>:&nbsp; Click this icon to edit the client's details.<br /><br /><strong>Delete</strong>: Click this icon to delete a client. You will be asked to confirm the delete operation. Select &quot;Yes&quot; to delete the client or &quot;No&quot; to cancel.</p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p><strong>Client Name</strong>: This is the name of the client.</p><p>C<strong>ontact</strong>: Displays who is in charge for this client.<br /><br /><strong>No of active banners</strong>: displays the number of published banners for this client.<br /></p>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.banners.edit.html 4.6rc2/help/454.screen.banners.edit.html
--- 4.5.4/help/454.screen.banners.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.banners.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,19 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Banner Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Banner Manager : New / Edit</h1>
-<p>This page allow you to create or edit a banner's details.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Upload</strong>: Opens a new window which lets you upload an image from your computer to the images/banners folder.<br /><br /><strong>Save</strong>: Saves the content and returns to Manager.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened to edit, the banner remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Details</span></h3><p><strong>Banner Name</strong>: Type here the name for the Banner.<br /><br /><strong>Client Name</strong>: Select from the list of configured clients.<br />&nbsp;<br /><strong>Impressions Purchased</strong>: Enter the number of times to display to banner into the input field, or tick the &quot;Unlimited&quot; checkbox for unlimited display.<br />&nbsp;<br /><strong>Banner URL</strong>: Select the banner image to be displayed from the list of available banners. Images need to be stored in the &quot;images/banners&quot; folder to be available for selection here. The selected image will be displayed at the bottom of the screen.<br />&nbsp;<br /><strong>Show Banner</strong>: Select Yes or No.<br />&nbsp;<br /><strong>Click URL</strong>: Enter here the full URL to the page which should open when the banner is clicked on.<br />&nbsp;<br /><strong>Custom banner code</strong>:&nbsp; You may enter here some code (See Developper Manual for more information).<br />&nbsp;<br /><strong>Clicks</strong>: &quot;Reset Clicks&quot; button: clicking this button will reset the click count shown on the right for the banner to 0.<br /><br /><strong>Banner Image</strong>: Image selected under &quot;Banner URL&quot; is displayed here for your convenience.<br /><br /></p>
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.banners.html 4.6rc2/help/454.screen.banners.html
--- 4.5.4/help/454.screen.banners.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.banners.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Banner Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Banner Manager</h1>
-<p>This page shows the list of the banners you may display on your site.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p>You &quot;select&quot; banners by clicking the checkbox at the start of each row.<br /><br /><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icon to publish or unpublish any number of selected banners.<br /><br /><strong>Upload</strong>: Opens a new window which lets you upload a file or an image from your computer to the images/stories folder.<br /><br /><strong>New</strong>: Click this icon to add a new banner.<br /><br /><strong>Edit</strong>: Click this icon to edit the banner's details.<br /><br /><strong>Delete</strong>: Click this icon to delete the banner.</p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p><strong>Banner Name</strong>: This is the name of the banner. <span style="COLOR: rgb(51,51,51)">If you click on this name, you may edit the related parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit ,</span><br /><br /><strong>Published</strong>: This displays whether the banner is currently Published or not for Frontend display. Click the column icon to toggle state.<br /><br /><span style="FONT-WEIGHT: bold"></span><strong>Impressions Made</strong>: This is the number of times the banner has been shown on your site.<br />&nbsp;<br /><strong>Impressions Left</strong>: This is the number of impressions left to display if a limit has been set while creating or editing a banner.<br />&nbsp;<br /><strong>Clicks</strong>: This is the number of times that particular banner has been clicked on by a user of the site.<br />&nbsp;<br /><strong>% Clicks</strong>: This is the number of clicks as a percentage ratio to the number of impressions that have been made. 1% would mean for example, that 1 in every 100 people had clicked on the banner.<br />nbsp;<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.categories.edit.html 4.6rc2/help/454.screen.categories.edit.html
--- 4.5.4/help/454.screen.categories.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.categories.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-
-<head>
-<title>Category Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Category Manager : New / Edit</h1>
-<p>This page lets you create or edit a Category.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Upload</strong>: Opens a new window which lets you upload a file or an image from your computer to the images/stories folder.<br /><br /><strong>Save</strong>: Saves the category and returns to Manager.<br /><br /><strong>Apply</strong>: Saves the category and keep the page displayed to edit.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened for edit, the Category remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Category Details</span></h3><p><strong>Category Title</strong>: Type here the name of the category as you want it to display on your site.<br /><br /><strong>Category Name</strong>: Type here the name of the category as you want it to appear in the database and the back-end.<br /><br /><strong>Section</strong>: Select here the Section you want the category to belong to. This choice will not be available once the category is Applied or Saved. Instead it will show the Section the category belongs to.<br /><br /><strong>Image</strong>: Select here an image to display next to the Category Description text. The dropdown list an image choice from the images/stories folder.<br /><br /><strong>Image position</strong>: Select here the position of the image relative to the description text. Left or right.<br /><br /><strong>Ordering</strong>: Select here the order of the category among other categories in the same section. This will reflect in the Category Manager.<br /><br /><strong>Access</strong>: This is the user access level for the category. Public, Registered or Special.<br /><br /><strong>Published</strong>: Check the box to let the item show on your site.<br /><br /><strong>Description</strong>:&nbsp; Type here a description of the Category. This text will show if decided so when the category is displayed as a table, blog or other categories.</p><h3><span style="FONT-WEIGHT: bold">Formatting content</span></h3><p>The formatting options interface depend on the Editor you are using.<br />Many editors are available as Open Source (through MamboForge) or commercial products.<br /><br />Mambo comes with 2 default editors:<br /></p><ul style="MARGIN-LEFT: 40px"><li><strong>NO WYSIWYG</strong>: This editor lets you enter text and/or HTML code directly.</li><li><strong>TinyMCE</strong>: This editor lets edit in WYSIWYG or HTML mode (See specific Help).</li></ul><p><strong>NOTE</strong>: It is advised to publish only one editor at a time in Mambot Manager and to save also that choice in Global Configuration.<br /><br /><strong>NOTE</strong>: It is not advised to use the Mambot tag { mospagebreak } in this description field.<br /><br /><br /><strong><span style="FONT-STYLE: italic">The following parameters will only show once the category is applied or saved.</span></strong></p><h3><span style="FONT-WEIGHT: bold">Link to Menu</span></h3><p>This will create a new menu Item in the menu you select.<br /><br /><strong>Select a Menu</strong>: Highlight here one the menus defined for your site.<br /><br /><strong>Select Menu Type</strong>: Select here 'Content Category Table', 'Content Category Blog' or 'Content Category Archive Blog' Menu Item types.<br /><br /><strong>Menu Item Name</strong>: The name of the Menu as it will appear on your site.<br /><br /><strong>Link to Menu</strong>: Click on this button to create the Menu Item.<br /><br /><br /><span style="FONT-WEIGHT: bold">Existing Menu Links<br /><br /></span>This displays a list of all Menu Items referencing this category.<br /><br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.categories.html 4.6rc2/help/454.screen.categories.html
--- 4.5.4/help/454.screen.categories.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.categories.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Category Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Category Manager</h1>
-<p align="left">This page shows show a list of the Categories defined on your site. They are ordered by the section they belong to. The Select Section drop-down lets you display the categories belonging to one specific section at a time.</p>
-<p align="left">You may filter the categories by the section they belong to.<br /></p><p align="left"></p>
-<h3 align="left"><span style="FONT-WEIGHT: bold">Toolbar</span></h3>
-<p align="left">Click the icons after checking the box next to a specific Category. <br /><br /><strong>Publish and Unpublish</strong>: Same function as "Published" in the headings. You may check multiple checkboxes.<br /><br /><strong>New</strong>: Create a new Category.<br /><br /><strong>Edit</strong>: Edit an existing category parameters.<br /><br /><strong>Move</strong>: Opens a new "Move Category" window where you can choose to move the specific Category and *all its Content Items* to another existing Section. You may click multiple checkboxes here.<br /><br /><strong>Copy</strong>: Opens a new "Copy Category" window where you can choose to copy the specific Category and *all its Content Items* to another existing Section. You may click multiple checkboxes here. (The content items copied will keep the same name)<br /><br /><strong>Delete</strong>: Lets you delete the category chosen. An Alert will pop to let you confirm this choice. This action can't be performed if the category contains Content Items. In this last case, you would have to delete the Content Items first.</p>
-<h3 align="left"><span style="FONT-WEIGHT: bold">Columns</span></h3>
-<p align="left"><strong>Category Name</strong>: This is the name of a category. Click the name to edit the category parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit ,<br /><br /><strong>Published</strong>: Whether a category is published or not. Click the icon to change the state.<br /><br /><strong>Order</strong>: Order of the categories on the list (this has no effect on site display). You may change it by editing 2 # conjointly and clicking on the Save Order icon in the heading. </p><p align="left"><strong>Access</strong>: This is the User access level. Oublic, Registered or Special.<br /><br /><strong>Section</strong>: The name of the Section de category belongs to. Clicking on this name lets you edit the category's section's parameters.<br /><br /><strong>Category ID</strong>: There is the ID for each category as defined in the database.<br /><br /><strong># Active</strong>: This is the number of published content items in the category.<br /><br /><strong>#Trash</strong>: Number of Content Items belonging to this category and currently in the Trash.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.checkin.html 4.6rc2/help/454.screen.checkin.html
--- 4.5.4/help/454.screen.checkin.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.checkin.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Global Check-in</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Global Check-in</h1>
-<h3 align="left">Global Checkin</h3><p align="left">When a User edits a file, Mambo changes its status to, &quot;Checked Out&quot;. In effect, the file is locked and only the User who has &quot;checked it out&quot; has permission to work with it. This is a security feature that prevents two Users from editing a document at the same time, thus preventing loss of data upon saving.<br /><br />A Content Item remains 'Checked Out' until the User clicks 'Save' or 'Cancel' while editing the Content Item, at which time the Content Item is &quot;Checked In&quot;. However, if there's a connection error, the user presses the 'Back' icon in his/her browser, or the User chooses another menu item without saving or canceling the work in progress, the Content Item remains 'Checked Out'. This means no one can edit it. This is usually reported or experienced as Users being unable to edit or access items, and can be verified by looking&nbsp;at the column labeled &quot;Checked Out&quot; in the Section, Category, or Item file list .<br /><br />Mambo has a protocol, called &quot;Global Checkin&quot; that allows an administrator to unlock all Content Items that are currently &quot;Checked Out&quot;.<br /><br />To perform the &quot;Global Check In&quot;, select System -> Global Check In from the Administrator Menubar.&nbsp; After performing the &quot;Global Check In&quot;, Mambo returns a list showing how many items, and from which tables, were Checked back in.<br /><br /><strong><font color="#cc0000">WARNING:</font></strong> Be very careful in doing this as anyone who is editing a document at that very moment can have his or her work lost.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.config.html 4.6rc2/help/454.screen.config.html
--- 4.5.4/help/454.screen.config.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.config.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Global Configurations</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<p><span style="FONT-WEIGHT: bold">Global Configuration</span> controls Mambo's operational settings. Changes made on this screen will update the <strong>configuration.php</strong> file. This file must be normally unwritable. Change it to writable in order for you to be able to edit your configuration. Then remember to change it back to unwritable.<br /><br />
-To the right of the write status of configuration.php is a check box labeled &quot;Make unwritable after saving.&quot; Checking this box will change the file permissions of configuration.php to unwritable once you have applied your changes. When your site is configured, it is a good idea to make configuration.php unwritable for security reasons. </p>
-<h3>Site Tab</h3>
-<p><strong>Site <span>Offline</span></strong> - With this you can effectively switch on and off your web site 'Front-end'. Use this option if you are updating modules or data, and do not wish to have your visitors view the site until you are finished. Remember to reset the &quot;Site offline&quot; option to &quot;No&quot; once you're done.</p>
-
-<p><strong><span>Offline</span> Message</strong> - When the Site <span>Offline</span> switch is in the �Yes� position, this default message will display on the 'Front-end' for your visitors to see.&nbsp; &quot;This site is down for maintenance. Please check back again soon.&quot;<br />You can change this text to whatever message you would like.</p>
-
-<p><strong>System Error Message</strong> - This message will display if the initial database connection fails.&nbsp; You can type anything you like in this box. We suggest something friendly and apologetic, stating that your site will be available again as soon as possible. You can use standard HTML code in this box also, for instance, &lt;<span>br</span> /&gt; to return a line. You might also consider adding an email address, so that your visitors can contact your System Administrator or the Webmaster.</p><p><strong>Site Name</strong> - This option allows you to set the content of the title bar for your site. It can also be displayed in your template by inserting the following code statement into your template file [Mambo_root/templates/template name/index.php] where you wish your Site Name to appear:</p><p>&lt;?php echo $_CONFIG-&gt;<span>SITENAME</span>; ?&gt;</p><p><strong>Show <span>Unauthorised</span> Links</strong> -&nbsp;With this option turned on, all visitors&nbsp;will see content to which they would not otherwise have access, (that is,<span></span> content given an Access Level of 'Registered' or 'Special'). With this option off, they will only see content with an Access Level of 'Public'.&nbsp; The access level for Content is selected under the Publishing tab in the Edit Content screen.</p>
-
-<p><strong>Allow User Registration</strong> - This option allows you to globally set whether visitors to your site can register for a user account. If the &quot;Yes&quot; radio button is chosen, the Login Form will include the prompt �No account yet? Create one�. If the &quot;No&quot; radio button is chosen, they will not be presented with an option to register.</p>
-
-<p><strong>Use New Account Activation</strong> - If the &quot;Yes&quot; radio button is chosen, an activation link will be sent to user's e-mail address. Users can not login until he has clicked on the activation link.&nbsp; If the &quot;No&quot; radio button is chosen, Users will be able to login right away without activation.</p><p><strong>Email New User Password</strong> - With this option set to 'Yes', the new user will receive an email with a password generated by Mambo. If it is set to 'No', new Users will select their own password.<br /></p>
-
-<p><strong>Require Unique Email</strong> - Select whether you want to prevent registration with duplicate e-mail addresses. In combination with user activation this option prevents users to sign up several times using the same e-mail address.</p>
-
-<p><strong>Debug Site</strong> - This option allows you to view the error messages that are  created by your site's php installation. It can be a handy tool for debugging if you are having problems and for reporting errors to your System Administrator or Web host. The levels of error reporting can be set under the Global Configuration-&gt;Server tab, and are as follows:<br />System Default, None, Simple and Maximum.</p>
-
-<p><strong>WYSIWYG Editor</strong> - Choose which of the installed Text Editors you want to use to edit Content Items. Remember that editors are installed as Mambots.<br /><br /><strong>List Length</strong> - Choose a default length for lists in the Administrator (Back-end).&nbsp;<br /><strong>NOTE</strong> that if you have previously visited a page with a list, changing this setting in Global Configuration will not be immediately visible. However, the setting you specify will be <span>honoured</span> as a default upon your next login.<br /><br /><strong><span>Favorites</span> Site Icon</strong> - This sets the icon that appears in some browsers next to the name and/or address of your site.&nbsp; By default this is the Mambo flower.&nbsp; If you want another icon to show up, you must upload another icon to replace the Mambo flower.&nbsp; Then type in the address of the image in this field.</p>
-
-<h3>Locale Tab</h3>
-
-<p><strong>Language</strong>:&nbsp; Choose the default language used on your site.&nbsp; If it is another language other than English, you must install the language files first using the Installer menu in the Back-end.<br /></p>
-
-<p><strong>Time Offset</strong>: This option sets the time offset in hours between your server location and GMT (Greenwich Mean Time - UK). Select the offset time from the dropdown menu.&nbsp; <br /></p>
-
-<p><strong>Country Locale</strong>: Type the location of your Web site.&nbsp; For instance en_GB would be the setting for the UK, el_GR for Greece.</p>
-
-<h3>Content Tab</h3><p />
-
-<p><strong>Linked Titles</strong>: Select 'Yes', if you want the title of a content item to be hyper-linked.&nbsp; Select 'No', and a 'Read On...' link will appear below the introduction text.<br /><br /><strong>Read More Link</strong>: Select &quot;Show&quot; to display the text &quot;Read more&quot; at the end of your &quot;Intro Text&quot; of your content items.<br /><br /><strong>Item Rating / Voting</strong>:&nbsp;This option allows the rating of content items.&nbsp; Choose 'Yes', and a 'Star Bar' will be shown on each content item, as well as a form for submitting your rating. <span style="FONT-WEIGHT: bold">NOTE:</span> The rating form is not shown for articles in 'Blog' lists, and the Star Bar is only shown for those items with Intro text.</p><p><strong>Author Names</strong>: Choose the radio button &quot;Show&quot;, to allow the Author's name to be shown when a Content Item is displayed. </p>
-
-<p><strong>Created Date and Time</strong>:&nbsp;Choose the radio button &quot;Show&quot;, to allow the creation date and time to be shown when a content item is displayed.</p>
-
-<p><strong>Modified Date and Time</strong>: Choose the radio button &quot;Show&quot;, to allow the last modified date and time to be shown&nbsp; when a content item is displayed.<br /><br /><strong>Hits</strong>: Choose the radio button &quot;Show&quot;, to display the number of hits an article/content has had. <br /><br /><strong>PDF Icon</strong>: Choose the radio button &quot;Show&quot;, to show the PDF maker icon on Content Items while viewing in the Front-end. <span style="FONT-WEIGHT: bold">NOTE: &nbsp;</span>This will not display at all if your media directory is not writable.</p>
-
-<p><strong>Print Icon</strong>:&nbsp; Choose the radio button &quot;Show&quot;, to show the Printer Friendly Version icon on Content Items while viewing in the Front-end.</p><p><strong>Email Icon</strong>:&nbsp; Choose the radio button &quot;Show&quot;, to show the Email Page to Friend icon on Content Items while viewing in the Front-end.<br /><br /><strong>Icons</strong>: Choose the radio button &quot;Show&quot;, when you want the hidden links to Email/Print/PDF to be icons rather than text.</p>
-
-<p><strong>Table of Contents on multi-page items</strong>: Choose the radio button &quot;Show&quot;, to show the Table of Content navigation index boxes&nbsp; for multi-page Content Items. To create page breaks in your Content Item, you must insert a page break Mambot, {<span>mospagebreak</span>} using the editor where ever you want the page breakes to occur. </p>
-
-<p><strong>Back Button</strong>:&nbsp; Choose the radio button &quot;Show&quot;,&nbsp; to allow you to show navigational back buttons on each page to make it easier for users to navigate your site.</p>
-
-<p><strong>Content Item Navigation</strong>: Choose the radio button &quot;Show&quot;, to publish&nbsp; 'Next' and 'Previous' links when viewing Content Items in a category or&nbsp; to change pages within the same article.</p>
-
-<h3>Database Tab</h3>
-
-<p><font color="#cc0000"><strong>Warning</strong></font>&nbsp;&nbsp;These are very important settings. If your Mambo web site has been installed on your behalf do not alter these settings.</p>
-
-<p><span><strong>Hostname</strong>:</span> Type '<span>localhost</span>', as this is the typical Host name</p>
-
-<p><strong>My<span>SQL</span> Username</strong>: Edit, if needed, the <span>username</span> to access your Mambo database.</p>
-
-<p><strong>My<span>SQL</span> Password</strong>:&nbsp; Edit, if needed, the password to access your Mambo database.</p><p><strong>My<span>SQL</span> Database</strong>: Edit, if needed, the name of the database your Mambo installation uses.</p>
-
-<p><strong>My<span>SQL</span> Database Prefix</strong>: Edit, if needed, the prefix used for records in your Mambo database. Typically �mos_&quot; by default. <strong>Very Important!</strong> DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE PREFIX YOU ARE SETTING!!</p>
-
-<h3>Server Tab</h3>
-
-<p>The following three items are predefined during the installation and are not configurable through this tab. The only way to change them is by manually editing the configuration.php file.</p>
-
-<p><strong>Absolute Path</strong>:&nbsp;This is the directory information used by Mambo on the server that orientates it to it's surrounding system.</p>
-
-<p><strong>Live Site</strong>:&nbsp;This is the absolute URL (web address) for your installation of Mambo. Typical value is http://www.mysite.com. <strong>Please note</strong> that the 'www.', should be there, otherwise&nbsp;you may face problems with editors. Typical Mambos, installed using cPanel, miss the 'www.', so you have to add it, by manually editing the configuration.php file.</p><p><strong>Secret Word</strong>: This is the unique word for every Mambo installation. It is used for security functions.</p>
-
-<p><strong><span>GZIP</span> Page Compression</strong>: Choose the radio button &quot;Yes&quot;, to allow your web server to send compressed data, if supported by the server, to the client web browser. This could significantly decrease the load time of your site for your visitors.</p>
-
-<p><strong>Login Session Lifetime</strong>: Type the number of seconds the Administration session should be allowed to stay live before automatic logout occurs. After automatic logout, the Administrator will be required to login again using the correct <span>username</span> and password.&nbsp; <br /><br /><span style="FONT-WEIGHT: bold">Warning: </span>If you are editing a Content Item, but have not saved your work, within the number of seconds choosen,&nbsp; you will be logged out automatically .&nbsp; <br /></p>
-
-<p><strong>Error Reporting</strong>:&nbsp;If this option is enabled under the Site tab, then using the drop down box, select the level or reporting required. Options are System Default, None, Simple and Maximum.</p>
-
-<ul><li>System Default - &nbsp;This turns Error reporting to the system default according to php.<span>ini</span> on the server.</li><li>None -&nbsp;This turns off error reporting.</li><li>Simple - &nbsp;This turns error reporting to simple options using the following options: error_reporting (E_ERROR|E_WARNING|E_PARSE)</li><li>&nbsp;Maximum - &nbsp;This turns error reporting to the Maximum level using the <span>following options</span>: error_reporting (E_ALL) <br /></li></ul>
-
-<p><strong>Register Globals</strong>: This option allows you to turn register_globals emulation on or off. The tooltip indicates the current php.ini register_globals setting for your domain. Please be advised that the recommended setting is <b>Off</b> but this may cause some 3rd party components to stop working correctly. 
-If you are experiencing problems with undefined variables within some components or modules, try setting this option to <b>On</b>.
-
-<p><strong>File Creation</strong>: By default, files created by the installation of components, modules and <span>mambots</span> inherit the server default permissions. By choosing &quot;CHMOD new files&quot;, you can over-ride the server <span>permissions</span>.
-<br /><br /><strong>Directory Creation</strong>: As with files, new directories will by default inherit the server default permissions. Choose &quot;CHMOD new directories&quot; to over- ride the server permissions.</p>
-
-<h3><span>Metadata</span> Tab</h3>
-
-<p>These settings, affect the way search engines view your site.</p>
-
-<p><strong>Global Site Meta Description</strong>:&nbsp;Type a description of your web site used to assist Search Engines. You may want to limit your description to maybe twenty words or so, depending on the Search Engine you are targeting. Make it concise and pertinent to your site's contents. You can include some of your keywords and key phrases here too. As some search engines read more than 20 words you can add one or two sentences. Make sure that the most important part of your description is in the first 20 words. </p>
-
-<p><strong>Global Site Meta Keywords</strong>: The optimal number of characters for a keyword description is said to be between 300 and 500. Do not repeat words too often and either separate your keywords with a comma or a space, or group two or three words together. 'Mambo Open Source' would be an example of this. <br /><br /><strong>Show Title Meta Tag</strong>: Shows the Title meta tag in the source code when viewing content.<br /><br /><strong>Show Author Meta Tag</strong>: Shows the Authors meta tag in the source code when viewing content.</p>
-
-<p><span style="FONT-WEIGHT: bold">NOTE: </span>The Description and Keyword Meta tags will have a bearing on how Search Engines will index your site. Some Search Engines completely ignore <span>Metadata</span> altogether. You should do some research on Search Engine Optimization if high rankings and Search Engine traffic are important to you.</p>
-
-<h3>Mail Tab</h3><p><strong>Mailer</strong>: Choose which mailer you wish to use: PHP mail function, <span>Sendmail</span> or SMTP Server.</p>
-
-<p><strong>Mail From</strong>: Choose which email address will show as the sender.</p>
-
-<p><strong>From Name</strong>: Choose what name will show as the sender.</p>
-
-<p><strong>Sendmail Path</strong>: This is the directory of the Mail server. Under Linux installations is normally /usr/sbin/sendmail. Not applicable on Windows installations.</p>
-
-<p>If you have chosen the SMTP Server as the Mailer, then you have to set the following settings. Ignore otherwise.&nbsp;</p>
-
-<p><strong>SMTP </strong><span><strong>Auth</strong>:</span> Choose &quot;Yes&quot; if SMTP Authentication is required by your host.</p><p><strong>SMTP User</strong>: If authentication is required and set above, type your <span>username</span>.</p>
-
-<p><strong>SMTP Pass</strong>:&nbsp;If authentication is required and set above, type your password.</p>
-
-<p><strong>SMTP Host</strong>: This is usually set as <span>localhost</span>, but you may need to check this with your host.</p>
-
-<h3>Cache Tab</h3>
-
-<p><strong>Caching</strong>: Choose &quot;Yes&quot; to allow for caching of certain elements within Mambo. This will generally improve the performance of your site.</p>
-
-<p><strong>Cache Folder</strong>:&nbsp;This is the folder or directory to store the cache files. This must be writable for this caching to be successfully implemented. Contact your Web Master if you have any difficulties.</p>
-
-<p><strong>Cache Time</strong>: Edit the maximum length of time, in seconds, for a cache file to be stored before it is refreshed.</p>
-
-<h3>Statistics Tab</h3>
-
-<p><strong>Statistics</strong>: Choose 'Yes', to allow the browser and visitor domain statistics to be collected on the basis of settings in&nbsp; the Content Tab. You can then access the statistics, from&nbsp;Site -&gt; Statistics.&nbsp;If this is set to 'No', the browser and visitor statistics will not be collected. If your site experiences a slight 'delay' the first time a user visits the site you should set this to 'No'.</p>
-
-<p><strong>Log Content Hits by Date</strong>: Choose &quot;Yes&quot; to enable logging of the hits on Content Items, on a daily basis. There are currently no in-built analysis routines, to complement this logging feature. <br /><span style="FONT-WEIGHT: bold">Warning: T</span>his will tend to collect masses of data over time. Be sure that your server space has the space to to store this information.&nbsp; </p>
-
-<p><strong>Log Search Strings</strong>: Choose &quot;Yes&quot; to enable logging of the search text, entered by a user. Such logging facilitates the 'tuning' of your web site, giving you an insight into how your visitors are trying to find the information they seek. Analysis reporting is provided under Site-&gt;Statistics-&gt;Search Text.</p>
-
-<h3><span>SEO</span> Tab</h3>
-
-<p><strong>Search Engine Friendly <span>URLs</span></strong>:&nbsp; This changes the way site links are presented and <span>optimises</span> them so that search engines can access more of your site. This option is ONLY available to sites hosted on Apache servers.&nbsp; Choose 'Yes' to enable Mambo to output friendly <span>URLs</span> rather than normal database generated <span>URLs</span>. If you use this option you must rename your <span>htaccess</span>.<span>txt</span> <span>file</span> to .<span>htaccess</span>.</p>
-
-<p><strong>Dynamic Page Titles</strong>: Choose &quot;Yes&quot; to set the page titles (that appear at the top of a viewers browser) to be the same as the page title they are viewing. Again this helps search engines.</p>
-
-<p><span style="FONT-WEIGHT: bold">NOTE: &nbsp;</span><strong>You must 'Save' your changes once you have finished, using the 'Save' icon in the tool bar.</strong></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.contactmanager.edit.html 4.6rc2/help/454.screen.contactmanager.edit.html
--- 4.5.4/help/454.screen.contactmanager.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.contactmanager.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Contact Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Contact Manager : New / Edit</h1>
-<p>This page lets you create or edit contacts on your site.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar</span></h3><p><strong>Save</strong>: Click this icon to 'Save' your new or edited Contact Details.<br /><br /><strong>Cancel</strong>: Click this icon to exit the screen without saving. This takes you back to Contact Manager. The contact remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Contact Details</span></h3><p><strong>Any field left blank is not displayed. <br />Any field filled out will be included into the downloadable vCard for this Contact.</strong><br /><br /><strong>Category</strong>: Drop-down select of all published Contact categories<br /><br /><strong>Linked to User</strong>: Drop-down select of all registered users of the web site. Can be set to &quot; - No User - &quot; for independent setup of a site contact.<br /><br /><strong>Name</strong>: Type here the name of the contact as it will display on the site. Can be either a person's name, or a departement, a product, or whatever you wish.<br /><br /><strong>Contact's Position</strong>: Best used with a Name, as the title is displayed if this field is used. Example would be &quot;CEO&quot;.<br /><br /><strong>E-mail</strong>: E-mail adress for this Contact.<br /><br />The following 5 fields can be used to provide geographical access information if desired.<br /></p><ul style="MARGIN-LEFT: 40px"><li>Street Address </li><li>Town/Suburb&nbsp;</li><li>State/County</li><li>Country&nbsp;</li><li>Postal Code/ZIP </li></ul><br />The following two fields can be used to provide Phone and Fax Contact information if desired.<br /><ul style="MARGIN-LEFT: 40px"><li>Telephone &nbsp;</li><li>Fax</li></ul><p><strong>Miscellaneous Info</strong>:&nbsp; Type here any other information you wish to provide about this Contact.</p><h3><span style="FONT-WEIGHT: bold">Publishing Tab</span></h3><p><strong>Site Default</strong>: Select Yes or No to make this Contact the default for your site.<br /><br /><strong>Published</strong>: Select Yes or No to show this Contact to your visitors.<br /><br /><strong>Ordering</strong>: Contact needs to be saved first to display a drop-down select here to order this Contact in the list of published Contacts for the site. Select the Contact after which you wish to display the current Contact.<br /><br /><strong>Access</strong>: Who can view this Contact on the frontend if published. Public, Registered or Special</p><h3><span style="FONT-WEIGHT: bold">Images Tab</span></h3><p>You may select here an image (from folder images/stories) to display next to this Contact, or select &quot;- Select Image -&quot; to not display any image.<br /><br />If an image is chosen, it will show in the Preview block.</p><h3><span style="FONT-WEIGHT: bold">ParametersTab</span></h3><p>Here are various settings for what is displayed when the user clicks to view a Contact item.<br /><br /><strong>Menu Image</strong>: Allows you to set an image that would appear to the left or right of the menu item. The image must be placed in the /images/stories directory.<br /><strong>Note</strong>: This field is useless in 4.5.2.1 as this page does not concern a Menu Item. <br /><br /><strong>Page Class Suffix</strong>: Allows you to set customized styles for this page. The suffix you type here is automatically added to the CSS classes for this page.<br /><br /><strong>Print Icon</strong>: Hides or shows the icon and link to the printer-friendly format of items. The pull down lets select 'Use Global' to use the parameter as defined globally through the Site-&gt;Global Configuration, 'Hide' or 'Show'.<br /><br /><strong>Back Button</strong>: Controls whether to show or hide a &quot;Back&quot; text link that would appear on the bottom of the page and return the user to the previously viewed page. The pull down lets select 'Use Global' to use the parameter as defined globally through the Site-&gt;Global Configuration, 'Hide' or 'Show'.<br /><br />The following 12 fields defined above may be hidden or shown by checking the radio buttons:<br /></p><ul style="MARGIN-LEFT: 40px"><li>Name</li><li>Position</li><li>E-mail<br /></li><li>Street Address </li><li>Town/Suburb&nbsp;</li><li>State/County</li><li>Country&nbsp;</li><li>Postal Code/ZIP</li><li>Telephone</li><li>Fax</li><li>Misc. Info</li><li>Image</li></ul><p><strong>E-mail description</strong>: Show/Hide the description text below.<br /><br /><strong>Description text</strong>: Type here the description text for the Email form. If left blank, it will use the _EMAIL_DESCRIPTION language definition.<br /><br /><strong>E-mail Form</strong>: Show/Hide the e-mail to form.<br /><br /><strong>E-mail copy</strong>: Show/Hide the checkbox to e-mail a copy to the sender's adress.<br /><br /><strong>Drop-down</strong>: Hide or Show the drop-down select list when in full view. Whatever the contact link accessed, this will let the user choose another contact to display.<br /><br /><strong>Icons/Text</strong>: This lets you decide if the fields listed below should be introduced by an icon, the default text for the fields in the Contact Details or nothing.<br /><br />You may choose, if decided so above, a specific icon to introduce the following fields:<br /></p><ul style="MARGIN-LEFT: 40px"><li>Address</li><li>E-mail</li><li>Telephone</li><li>Fax</li><li>Misc Info</li></ul>If you choose a custom image, this image should be uploaded to the&nbsp; images/stories directory in the Media Manager<br />
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.contactmanager.html 4.6rc2/help/454.screen.contactmanager.html
--- 4.5.4/help/454.screen.contactmanager.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.contactmanager.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Contact Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Contact Manager</h1>
-<p><span>The Contact Manager allows you to manage a list of contacts for your site. This allows visitors to find contact information for different people or departments. <br /><br />
-The list may be filtered by name and/or category.</span></p>
-<h3><span><span style="FONT-WEIGHT: bold">Toolbar Icons</span></span></h3><p><span>You &quot;select&quot; contacts by clicking the checkbox at the start of each row.</span><br /><span><br /><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icon to publish or unpublish any number of selected Contacts.</span><br /><br /><span><strong>New</strong>: Click the 'New' icon to create a new Contact.</span><br /><br /><span><strong>Edit</strong>: Click the 'Edit' icon to edit the Contact.</span><br /><br /><span><strong>Delete</strong>: Click the 'Delete' icon to delete the contact from the database.</span></p><h3><span><span style="FONT-WEIGHT: bold">Columns</span></span></h3><p><span><strong>Name</strong>: This is the name of the contact, this can be a person, department or whatever you wish. This is what shows up on the Frontend of the site. You can click the name to edit that contact. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit, You will not be able to edit an item if it is checked-out by another user. It must be checked-in by an administrator by going to Systems in the Menu bar--&gt;Global Checkin. It can also be checked-in by the User who has checked the item out by clicking the 'Edit' icon of the Contact item and then clicking the 'Save' or 'Close' icon in the New/Edit page.</span><br /><span></span><br /><span><strong>Published</strong>: Click on the icon to toggle Publish/Unpublish to decide whether&nbsp; the contact will be available or not on your site.</span><br /><br /><span><strong>Reorder</strong>: Click the icons to move the record up or down in the list. The order is used in both the contact manager and on the contact page the Visitor will see.</span><br /><br /><span><strong>Category</strong>: You can assign contacts to different categories. This column displays which category the contact belongs too. Click to edit the Category.</span><br /><br /><span><strong>Linked to User</strong>: If the contact is linked to a registered user of the site, the users name will appear here. Click to edit user.<br /></span></p><br />
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.content.archive.html 4.6rc2/help/454.screen.content.archive.html
--- 4.5.4/help/454.screen.content.archive.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.content.archive.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Archive Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Archive Manager</h1>
-<p>This page shows a list of all archived Content Items.<br /><br />
-You may filter the display by Section, Category and/or Author</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p>You &quot;select&quot; items by clicking the checkbox at the start of each row.<br /><br /><strong>Unarchive</strong>: return the Item to its original location.<br /><br /><strong>Trash</strong>: Click the 'Trash' icon to put Content items in the trash bin. They are not completely removed but can't be displayed on your site. You can restore this Content Items by the Trash Manager.</p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p><strong>Title</strong>: This is the title of the Content Item.<br /><br /><strong>Order</strong>: This shows the order of the Content Items (the &quot;Default&quot; &quot;Primary Order&quot; parameter editable through the specific Archive Menu Item). Click the arrow icons to move the item up or down in the list.<br /><br /><strong>Category</strong>: This id the Category the Item belongs to. Click to edit the Category.<br /><br /><strong>Author</strong>: THis is the name of the Author of this content. Click to edit Author.<br /><br /><strong>Date</strong>: This is the date the Item was created.<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.content.edit.html 4.6rc2/help/454.screen.content.edit.html
--- 4.5.4/help/454.screen.content.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.content.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Content Items : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Content Items : New / Edit</h1>
-<p>This page allows to create or edit a Content Item. On the left side there are the two editors where you can add content for the intro and main text areas. On the right are the parameteres tabs. You can hide/unhide the parameteres tabs, by clicking the 'Hide/Unhide Advanced Details' link.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Preview</strong>: Opens a new window to preview the content as you would in the Frontend of your site.<br /><br /><strong>Upload</strong>: Opens a new window which lets you upload a file or an image from your computer to the images/stories folder.<br /><br /><strong>Save</strong>: Saves the content and returns to Manager.<br /><br /><strong>Apply</strong>: Saves the content and keep the content displayed to edit.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened to edit, the Content Item remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Item Details</span></h3><p><strong>Title</strong>: Type here is the title of the content. This is the title as it will appear on the page or table listing this content.<br /><br /><strong>Title</strong> Alias: This field is not used by core.&nbsp; SEF scripts and dynamic title/meta scripts use it and it may have a future use.<br /><br /><strong>Section</strong>: Choose here the Section you want the item to belong to.<br /><br /><strong>Category</strong>: Choose here the category you want the item to belong to. The dropdown list will display the available Categories for the Secton chosen above.<br /><br /><strong>Intro Text (required)</strong>: Type here the introductory portion of the content. <strong>This is the part displayed in Blog Lists</strong> for both Categories and Sections. It can also be configured to be hidden when you view the content.<br /><br /><strong>Main Text (optional)</strong>: This is the body of your content. It is only shown when viewing that content in full view, and is not shown in Blog Lists.&nbsp; </p><h3><span style="FONT-WEIGHT: bold">Content Mambots</span></h3><p>Content Mambots are special tags you place in your content that Mambo parses to perform a particular action or function. These Mambots will be available (if published) even if you choose NO WYSIWYG editor in the Global Configuration. They may be published or edited through the Mambot Manager (Mambots-&gt;Site Mambots, Filter set to content).<br /><br />The two default Mambots specifically used when editing content are: <br /></p><ul style="MARGIN-LEFT: 40px"><li><strong>{ mosimage } (mosimage Mambot)</strong>: Used to tell Mambo where to place graphics in your content.</li><li><strong>{ mospagebreak } (mospaging Mambo)</strong>: Instructs Mambo to create a page break in your content. You can break your content into several pages if you like. If you do, a table of content will display to let you navigate between the different pages created.</li></ul><p><br />Buttons to insert these codes may be published or not through (Mambots-&gt;Site Mambots, Filter set to editor.xtd). You may also manually type them into your content. Remember that in order for your images to show in the content, you must insert the {mosimage} code snippet where you would like your image to be placed in your content. <br /><br /><strong>NOTE</strong>: The images in the Intro Text can be hidden for Blog Lists. This is a configurable setting for these Menu Items. Also, this is a global setting that will affect your entire web site as a default in Global Configurations. If you are having trouble getting images to display within the Intro Text and the problem keeps cropping up in Blog Lists, then make sure that the Parameters for MOSImages is set to Show for that menu entry.</p><h3><span style="FONT-WEIGHT: bold">Formatting content</span></h3><p>The formatting options interface depend on the Editor you are using.<br />Many editors are available as Open Source (through MamboForge) or commercial products.<br /><br />Mambo comes with 2 default editors:<br /></p><ul style="MARGIN-LEFT: 40px"><li><strong>NO WYSIWYG</strong>: This editor lets you enter text and/or HTML code directly.</li><li><strong>TinyMCE</strong>: This editor lets edit in WYSIWYG or HTML mode (See specific Help).</li></ul><p><strong>NOTE</strong>: It is advised to publish only one editor at a time in Mambot Manager and to save also that choice in Global Configuration.</p><h3>Parameters Tabs</h3><p><span style="FONT-WEIGHT: bold">The Attributes Area for content consists of five tabs: </span><br />Publishing, Images, Parameters, Meta Info and Link to Menu.<br /><br /><span style="FONT-WEIGHT: bold">Publishing</span><br /><span style="FONT-STYLE: italic">Publishing Info</span><br /><br /><strong>Show on Frontpage</strong>: Check the box if you want this content to be assigned to the FrontPage Component.<br /><br /><strong>Published</strong>: Check the box to let the item show on your site.<br /><br /><strong>Access Level</strong>: Choose who will be able to view this content. Public, registered or special.<br /><br /><strong>Author Alias</strong>: You can publish the author's name for a piece of content. You can choose a Registered user as displayed through the dropdown or type any name there (an author that does not have an account or content created by many authors as a group).<br /><br /><strong>Change Creator</strong>: This allows you to assign ownership of this content to another registered user.<br /><br /><strong>Ordering</strong>: Select the order in which this content is listed relative to others in this Category. The choices available in the dropdown will show once changes to the item are saved or applied.<br /><br /><strong>Override Created Date</strong>: This shows the created date for the content. You can change the date if necessary.<br /><br /><strong>Start Publishing</strong>: Select the date when this document is to be published on the web site.<br /><br /><strong>Finish Publishing</strong>: If desired, you can set the date when your content is to be expired.<br /><br /><strong>Content ID</strong>: This is the ID of the content in the database.<br /><br /><strong>State</strong>: This shows the current state of the document. It is not editable.<br /><br /><strong>Hits</strong>: This gives the number of times this content was viewed. The Reset Hits Value button allows you to reset the counter to zero.<br /><br /><strong>Revised</strong>: This shows the number of edits this content has undergone.<br /><br /><strong>Created</strong>: This is the date this content item was created.<br /><br /><strong>By</strong>: This is the name of the user that created the content item.<br /><br /><strong>Last Modified</strong>: This is the date when this content item was last modified, if ever.<br /><br /><strong>By</strong>: This is the name of the user that last modified this content, if ever. <br /><br /><br /><span style="FONT-WEIGHT: bold">Images</span><br /><span style="FONT-STYLE: italic">MOSImage Control</span><br /><br /><strong>Sub-folder</strong>: Choose here the sub-folder you want to get the images from. These are in images/stories/.<br /><br /><strong>Gallery Images</strong>: This dropdown lists the images available in the specific sub-folder. <br />Highlight one or multiple image name(s) and click on the 'Add' button.<br />The name(s) will display in the Content Images dropdown.<br /><br /><strong>Content Images</strong>: The 'up' and 'down' buttons determine the order of images if there are more than one on this page. The images will display relative to the instances of {mosimage} tags in your content.<br /><br /><strong>Edit the image selected</strong></p><p>Select an image in 'Content Images'.<br /><strong>Source</strong>: Displays the default name of the image highlighted. You may edit that name.<br /><strong>Image Align</strong>: Lets you choose between None, center, left or right.<br /><strong>Alt Text</strong>: Lets you choose an Alt Text for the image.<br /><strong>Border</strong>: Type here the number of pixels you want the border to be around the image.<br /><strong>Caption</strong>: Type here a caption for the image.<br /><strong>Caption Align</strong>: Lets you choose between None, center, left or right.<br /><strong>Width</strong>: Type here a number in pixels to override the width of the image<br /><strong>Apply</strong>: Click on this button to apply all the parameters defined for this image<br /><br /><span style="FONT-WEIGHT: bold">Parameters</span><br /><span style="FONT-STYLE: italic">Parameter Control<br /><br /></span>These parameters control what you see when you view a Content Item in full view.<br /><br /><strong>Page Class Suffix</strong>: Allows you to set customized styles for this page. The suffix you type here is automatically added to the CSS classes for this page, and will have to be defined in your template's CSS stylesheet for usage.<br /><br /><strong>Back Button</strong>: Controls whether to show or hide a &quot;Back&quot; text link that would appear on the bottom of the page and return the user to the previously viewed page. The pull down lets select 'Use Global' to use the parameter as defined globally through the Site-&gt;Global Configuration, 'Hide' or 'Show'.<br /><br /><strong>Page Title</strong>: Text to display at the top of the page.<br /><br /><strong>Show/Hide Page Title</strong>: Hides or shows the Page Title text (defined in the field described above).<br /><br /><strong>Section Name</strong>: Hides or shows the name of the section to which each item belongs. If this option is turned on, each item's section name will be shown under the item's title on the home page.<br /><br /><strong>Section Name Linkable</strong>: Enables you to make each item's section name linkable. Applies only when the Section Name option (described above) is set to 'Show.'<br /><br /><strong>Category Name</strong>: Hides or shows the name of the category to which each item belongs. If this option is turned on, each item's category name will be shown under the item's title on the home page.<br /><br /><strong>Category Name Linkable</strong>: Enables you to make each item's category name linkable. Applies only when the Category Name option (described above) is set to 'Show.'<br /><br />For each of the following eight items listed below, you can use the option selected in the Global Configuration settings (Site -&gt; Global Configuration) by selecting 'Use Global' or you can override the Global Configuration setting by selecting 'Show' or 'Hide.' Overriding the settings here for items will not affect the Global Configuration settings and will not affect the settings on the rest of the site.<br /><br /><strong>Linked Titles</strong>: Enables you to make item titles linked. The link will go to the item page.<br /><br /><strong>Item Rating</strong>: Hides or shows ratings given to home page items by your site's users.<br /><br /><strong>Author Names</strong>: Hides or shows the names of authors of items.<br /><br /><strong>Created Date and Time</strong>: Hides or shows the date and time that items were created.<br /><br /><strong>Modified Date and Time</strong>: Hides or shows the date and time that items were last modified.<br /><br /><strong>PDF Icon</strong>: Hides or shows the icon and link to the PDF version of items.<br /><br /><strong>Print Icon</strong>: Hides or shows the icon and link to the printer-friendly format of items.<br /><br /><strong>Email Icon</strong>: Hides or shows the icon and link to the page that enables users to email items to others.<br /><br /><strong>Key Reference</strong>: A text key that the item may be referenced by (like a help reference).<br /><br /><strong>Docbook Type</strong>: Experimental, do not use in production work. Associates a type of DocBook document to this item.<br /><br /><span style="FONT-WEIGHT: bold">Meta Info</span><br /><span style="FONT-STYLE: italic">Meta Data</span><br /><br /><strong>Description</strong>: This information is inserted in the headers of your content. It is commonly used by search engines.<br /><br /><strong>Keywords</strong>: These keywords are related to the header information provided for search engines, but they also provide another important function. These keywords drive the What's Related Module that provides automatic links to other content items that shares a similar keyword. <br /><br /><strong>Add Sect/Cat/Title</strong>:&nbsp; Clicking on this button is a convenient way to insert the content's information into the keywords field, including the content's title, section name, and category name. <br /><br /><span style="FONT-WEIGHT: bold">Link to Menu<br /><br /></span>This will create a 'Link - Content Item' in the menu you select.<br /><br /><strong>Select a Menu</strong>: Highlight here once the menus defined for your site.<br /><br /><strong>Menu Item Name</strong>: The name of the Menu as it will appear on your site.<br /><br /><strong>Link to Menu</strong>: Click on this button to create the Menu Item.<br /><br /><br /><span style="FONT-WEIGHT: bold">Existing Menu Items<br /><br /></span>This displays a list of all 'Link - Content Item' Menu Items referencing this content.<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.content.html 4.6rc2/help/454.screen.content.html
--- 4.5.4/help/454.screen.content.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.content.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Content Items Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Content Items Manager</h1>
-<p align="left">The Content Items Manager&nbsp;shows a list of the Content items on your site for a particular Content Section <span style="COLOR: rgb(255,0,0)"><span style="COLOR: rgb(0,0,0)">or for All Content Items Manager.</span></span></p>
-You may enter text in the &quot;<strong>Filter</strong>&quot; box to refine the list based on whether the text is found in the title of any item. Type in any text and press Enter. Using the Select Section, Select Category, Select Author combo boxes, you can limit the list. You can use all filter utility at once and in combination.</p><h3 align="left"><span style="FONT-WEIGHT: bold">Toolbar</span></h3><p align="left">You &quot;<strong>select</strong>&quot; items by clicking the checkbox at the start of each row.<br />&nbsp;<br /><strong>New</strong>: Click the 'New' icon to create a new Content item.<br />&nbsp;<br /><strong>Edit</strong>: Click the 'Edit' icon to edit the Content item.<br /><br /><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icon to publish or unpublish any number of selected Content items.<br />&nbsp;<br /><strong>Move</strong>: Click the 'Move' icon to move Content items to another Content Section or Category.<br />&nbsp;<br /><strong>Copy</strong>: Click the 'Copy' icon to copy Content items into a Content Section or Content Category.<br />&nbsp;<br /><strong>Archive</strong>: Click the 'Archive' icon to put Content items into an archived state. They are still accessible to the Frontend of your site if in published mode.<br />&nbsp;<br /><strong>Trash</strong>: Click the 'Trash' icon to put Content items in the trash bin. They are not completely removed but can't be displayed on your site. You can restore this Content items in the Trash Manager.</p><h3 align="left"><span style="FONT-WEIGHT: bold">Columns</span></h3><p align="left"><strong>Title</strong>: This is the title of the Content item. Click here to edit content. <span style="COLOR: rgb(51,51,51)">A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit. Then you have to Save or Close the item.</span><br /><br /><strong>Published</strong>: This shows whether the item is published. Hover over this icon to see a summary of the publishing information. Click to change state.<br /><br /><strong>Frontpage</strong>: This is whether this item is to be published or is published through the FrontPage Component.<br /><br /><strong>Reorder</strong>: This shows the order of Menu Items in the menu. Click the arrow icons to move the item up or down in the list.<br /><br /><strong>Order</strong>: Shows the order of Menu Items in the menu. You may change it by editing 2 # conjointly and clicking on the <strong>"Save Order" icon</strong> in the heading. <br /><br /><strong>Access</strong>: This is the user access level for the content item. Click on the Access level to switch it to another value.<br /><br /><strong>Section</strong>: This is the Section that the Content item belongs to (this shows when 'All Content Items' page is open). Click to edit the Section page.<br /><br /><strong>Category</strong>: This is the Category that the Content Item belongs to. Click to edit the category page.<br />&nbsp;<br /><strong>Author</strong>: This shows the name of the author of the Content. Click to edit the author information. </p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.cpanel.html 4.6rc2/help/454.screen.cpanel.html
--- 4.5.4/help/454.screen.cpanel.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.cpanel.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Control Panel</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Control Panel</h1>
-<p align="left">The control panel is the first page you see when you log into the Administrators area. You can return to it by clicking Home menu item in the top menu bar.&nbsp; From the Control Panel are 9 shortcut icons to easy access the frequently used parts of the Administrator site.<br /><br />
-<b>Menu Manager</b> - Click this shortcut icon access the Menu Manager.&nbsp; You will be able&nbsp; to&nbsp; edit any of your menus.&nbsp; <br /><br />
-<b>Front Page Manager</b> -&nbsp; Click this shortcut icon to access the Front Page Manager.&nbsp; You will be able to edit which Content items appear on your Frontpage.</p>
-<p><b>Static Content Manager</b> - Click&nbsp; the shortcut icon to access the Static Content Manager.&nbsp; You will be able to edit these type of&nbsp; items.</p>
-<p><b>Section Manager</b> - Click the shortcut icon to access the Section Manager.&nbsp; You will be able to edit your Sections.</p>
-<p><b>Category Manager</b> -Click the shortcut icon to access the Category Manager. You will be able to edit your Categories.</p>
-<p><b>All Content Items</b> - Click the shortcut icon to access the All Content Items.&nbsp; All Content Items&nbsp; lists all of your Content Items.&nbsp; You will be able to edit any of your Content Items.</p>
-<p><b>Trash Manager</b> - Click this shortcut icon access the Trash manager.&nbsp; You will be able to delete permanently or to restore any items in the Trash Manager.</p>
-<p><b>Global Configuration</b> - Click this shortcut icon to access Global configuration.&nbsp; You will be able to edit any of your Web site configurations.</p>
-<p><b>Help</b> - Click this shortcut icon to view the Index of any of the Help Screens.</p><p><br />On the right side of the screen there are four tabs:<br />
-<br /><b>Logged</b> - Displays a list of users currently logged on (both in admin and the frontend). Click on a users name to go to the User Edit page for that user.<br /></p>
-<p><b>Components</b> - Click on this shortcut tab to access any of the components and component links that you wish to edit.<br /></p>
-<p><b>Popular</b> - Click on this shortcut tab to access the screen which lists in order, the most popular Content items on your site.&nbsp; This includes the date the Content item was created and the number of&nbsp; hits. Click the Content Item name to edit that item.<br /></p>
-<p><b>Latest Content</b> - Click on this shortcut tab to access the screen which lists the most recently added Content items.&nbsp; This includes the creation date and the author. Click the Content item name to edit that item.</p>
-<p><b>Menu Stats</b> - Click on this shortcut tab to access the screen which lists all menus and the number of item links in each menu.&nbsp; The number of links is the total created, not the total published. Click the name of a menu to access the screen which lists the items for that menu.</p>
-<br />
-
-</body>
-
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.frontpage.html 4.6rc2/help/454.screen.frontpage.html
--- 4.5.4/help/454.screen.frontpage.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.frontpage.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Frontpage Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Frontpage Manager</h1>
-<p>This page shows a list of the Content items assigned to the FrontPage Component.
-</p>
-<h3>Toolbar Icons</h3><p>You may enter text in the &quot;Filter&quot; box to refine the list based on whether the text is found in the title of any Content item. Type in any text and press Enter. You may also filter per category and/or section.<br />&nbsp;<br />You &quot;Select&quot; Content items by clicking the checkbox at the start of each row.<br />&nbsp;<br /><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icons to publish or unpublish the selected Content items on the Frontpage.<br />&nbsp;<br /><strong>Archive</strong>: Click the 'Archive' icon to put the Content items into an archived state. They are still accessible to your Frontpage.<br />&nbsp;<br /><strong>Remove</strong>: Click the 'Remove' icon to remove Content Items from the Frontpage Component.</p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p><strong>Title</strong>: This is the title of the Content item. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit. You will not be able to edit a Content item if it is checked out by another user. <br /><br />It must be checked back by an administrator. The administrator navigates to the menu item Systems-&gt;Global Checkin in the Menu bar. It can also be checked back in by the User who has checked the item out by clicking the 'Edit' icon of the Content item and then clicking either the 'Save' or 'Cancel' icon.<br />&nbsp;<br /><strong>Published</strong>: This shows whether the Content item is published. Hover over this icon to see a summary of the publishing information.</p><p><strong>Reorder</strong>: This shows the order of Items in the list. Click the arrow icons to move the item up or down.<br /><br /><strong>Order</strong>: Shows the order of items in the list. You may change it by editing 2 # conjointly and clicking on the "Save Order" icon next to the Column Heading "Order".<br />Note: The new ordering has an effect when&nbsp; the FrontPage Component is displayed.</p><p><strong>Access</strong>: This is the user access level. Public, Registered or Special.<br /></p><p><strong>Section</strong>: This is the section the Item belongs to. Click to edit section.<br /></p><p><strong>Category</strong>: This is the category the item belongs to. Click to edit category.<br /></p><p><strong>Author</strong>: This is the name of the author of the content item. Click to edit author.<br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.installer.cmm.html 4.6rc2/help/454.screen.installer.cmm.html
--- 4.5.4/help/454.screen.installer.cmm.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.installer.cmm.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Install/Uninstall Components, Modules and Mambots</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Install/Uninstall Components, Modules and Mambots</h1>
-
-<p align="right">-- Draft version</p><p /><p>This page will show options for Installing / Uninstalling: <br />A Component<br />A Module<br />A Mambot</p><p /><p>There are two ways to install one of these elements.</p><p /><p>Upload Package File:<br />Providing you have GZip support with PHP, you will be able to upload a zipped package file that will be automatically installed to your server. 'Browse' to the location of the&nbsp;element on your computer. Then click the 'Upload File &amp; Install' icon.</p><p /><p>To install from directory:<br />If you don't have GZip support then you may upload an unpacked archive to your host's server. Type the location of this file (it must be the absolute location) then click the 'Install' icon.</p><p /><p>To uninstall one of these elements:<br />Tick the box&nbsp;next to the Element (or multiple elements) you want to uninstall, then click the 'Delete' top menu icon.<br />A javascript alert will show: «Are you sure you want to delete selected items?<br />Click 'OK'. The page will reload displaying the word 'Success'.</p><p /><p>NOTE: The elements are totally deleted from the database.&nbsp;They cannot be recovered from the Trash Manager. In the case of a module type, ALL its instances/copies -&nbsp;are also totally deleted from the database. </p>
-
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.installer.html 4.6rc2/help/454.screen.installer.html
--- 4.5.4/help/454.screen.installer.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.installer.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Install/Uninstall a Language File or Template</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Install/Uninstall a Language File or Template</h1>
-
-<p align="right"><br />-- Draft version</p>There are two ways to install a Language file or a Template using the Mambo administration system.<p>To Upload a Language file or Template:<br />Providing you have GZip support with PHP, you will be able to upload a zipped package file that will be automatically installed to your server. &quot;Browse&quot; to the location of the element on your computer. Then click the &quot;Upload File &amp; Install&quot; icon.<br /><br />To Install From a Directory:<br />If you don't have GZip support then you may upload an unpacked archive to your host's server. Type the location of this file (it must be the absolute location) then click the 'Install' icon. <br /><br />To Uninstall:<br />If you want to delete any language go to the menu item Site-&gt; Language Manager-&gt; Site Languages and use the &quot;Delete&quot; icon.&nbsp; <br /><br />If you want to delete any template go to menu item SIte-&gt;Template Manager-&gt; Site Templates or -&gt;Administrator Templates and use the &quot;Delete&quot; icon. </p><p />
-<br />
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.installer.lang.html 4.6rc2/help/454.screen.installer.lang.html
--- 4.5.4/help/454.screen.installer.lang.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.installer.lang.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Install/Uninstall a Language File or Template</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Install/Uninstall a Language File or Template</h1>
-
-<p align="right"><br />-- Draft version</p>There are two ways to install a Language file or a Template using the Mambo administration system.<p>To Upload a Language file or Template:<br />Providing you have GZip support with PHP, you will be able to upload a zipped package file that will be automatically installed to your server. &quot;Browse&quot; to the location of the element on your computer. Then click the &quot;Upload File &amp; Install&quot; icon.<br /><br />To Install From a Directory:<br />If you don't have GZip support then you may upload an unpacked archive to your host's server. Type the location of this file (it must be the absolute location) then click the 'Install' icon. <br /><br />To Uninstall:<br />If you want to delete any language go to the menu item Site-&gt; Language Manager-&gt; Site Languages and use the &quot;Delete&quot; icon.&nbsp; <br /><br />If you want to delete any template go to menu item SIte-&gt;Template Manager-&gt; Site Templates or -&gt;Administrator Templates and use the &quot;Delete&quot; icon. </p><p />
-<br />
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.installer2.html 4.6rc2/help/454.screen.installer2.html
--- 4.5.4/help/454.screen.installer2.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.installer2.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Install/Uninstall Components, Modules and Mambots</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Install/Uninstall Components, Modules and Mambots</h1>
-
-<p align="right">-- Draft version</p><p /><p>This page will show options for Installing / Uninstalling: <br />A Component<br />A Module<br />A Mambot</p><p /><p>There are two ways to install one of these elements.</p><p /><p>Upload Package File:<br />Providing you have GZip support with PHP, you will be able to upload a zipped package file that will be automatically installed to your server. 'Browse' to the location of the&nbsp;element on your computer. Then click the 'Upload File &amp; Install' icon.</p><p /><p>To install from directory:<br />If you don't have GZip support then you may upload an unpacked archive to your host's server. Type the location of this file (it must be the absolute location) then click the 'Install' icon.</p><p /><p>To uninstall one of these elements:<br />Tick the box&nbsp;next to the Element (or multiple elements) you want to uninstall, then click the 'Delete' top menu icon.<br />A javascript alert will show: «Are you sure you want to delete selected items?<br />Click 'OK'. The page will reload displaying the word 'Success'.</p><p /><p>NOTE: The elements are totally deleted from the database.&nbsp;They cannot be recovered from the Trash Manager. In the case of a module type, ALL its instances/copies -&nbsp;are also totally deleted from the database. </p>
-
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.languages.html 4.6rc2/help/454.screen.languages.html
--- 4.5.4/help/454.screen.languages.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.languages.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Language Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Language Manager</h1>
-<p align="left">This page shows a list of the Languages for the core text on the Frontend of your site.</p><h3 align="left">Toolbar</h3><p align="left"><strong>Publish</strong>:&nbsp;To Publish a language, select the radio button next to the name of the language and click the &quot;Publish&quot; icon. </p><p><strong>New</strong>: Click the &quot;New&quot; icon to upload/install a new language to your site. You will be then taken to the Install/Uninstall screen.</p><p><strong>Edit</strong>: Click the name of the category to Edit the details, or select the radio button next to the name and click the &quot;Edit&quot; icon. Here is where you edit the Frontend language file.</p><p><strong>Delete</strong>: To delete a language, select the radio button next to the name and click the &quot;Delete&quot; icon. You will be asked to confirm the delete operation. Select the &quot;Yes&quot; icon to delete the client or the &quot;No&quot; icon to cancel. The language file will be deleted from the server.</p><p><strong>Help</strong>:&nbsp; Click the &quot;Help&quot; icon to view the Help Screen to get explanations of this screen.</p><h3>Columns</h3><p><strong>Language</strong>: This column shows the name of the languages installed.<br />&nbsp;&nbsp;&nbsp;<br /><strong>Published</strong>: This column shows the active language that is published.<br />&nbsp;&nbsp;&nbsp;<br /><strong>Version</strong>: This column shows the version of the language file.<br />&nbsp;&nbsp;&nbsp;<br /><strong>Date</strong>: This column shows the date of the language file.</p><p><strong>Author</strong>: This column shows the author of the language file.<br />&nbsp;&nbsp;&nbsp;<br /><strong>Author Email</strong>: This column shows author's email address, if available.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.mambots.edit.html 4.6rc2/help/454.screen.mambots.edit.html
--- 4.5.4/help/454.screen.mambots.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.mambots.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Mambots: New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Mambots: New / Edit</h1>
-<p><span >The <span style="FONT-WEIGHT: bold">Mambots: New/Edit</span> page lets you edit the Site Mambots.</span><br  /><span >Detailed functions for each default Mambot is provided below.</span></p>
-<h3><span ></span><span style="FONT-WEIGHT: bold; ">Toolbar Icons</span></h3><p><span ><strong>Save</strong>: Click to save the parameters entered and return to the Mambot Manager.</span><br  /><br  /><span ><strong>Apply</strong>: Click to save the parameters entered AND keep the same window open for editing.</span><br  /><br  /><span ><strong>Cancel</strong>: Click to cancel any modification just made and to close the window.&nbsp; Any modification is lost. The Mambot remains checked-in.</span></p><h3><span ></span><span style="FONT-WEIGHT: bold; ">Mambot Details</span></h3><p><span ><strong>Name</strong>: Type the name of the Mambot as it will appear on the Site Mambots listing. This has no impact on your site.</span><br  /><br  /><span ><strong>Folder</strong>: This shows into which category the Mambot is placed.</span><br  /><br  /><span ><strong>Mambot file</strong>: This is the name of the Mambot file as it appears in the folder.</span><br  /><br  /><span ><strong>Mambot Order</strong>: Choose the order of the Mambot as listed in the Folder when filtering by category.</span><br  /><br  /><span ><strong>Access Level</strong>: Choose who will be able to view this content. Public, Registered or Special.</span><br  /><br  /><span ><strong>Published</strong>: Check the box to let the Mambot show on your site or provide the function it is designed to do.</span><br  /><br  /><span ><strong>Description</strong>: This is a short description on the Mambot's function.</span></p><h3><span ></span><span style="FONT-WEIGHT: bold; ">Parameters</span></h3><p><span >If available, they will be displayed here.</span></p><h3><span ></span><span style="FONT-WEIGHT: bold; ">Site Mambots provided in a default installation of Mambo</span></h3><h4><span style="FONT-WEIGHT: bold; "></span><span style="FONT-WEIGHT: bold; ">MOS Image</span></h4><p><span >Usage: </span><span style="FONT-WEIGHT: bold; ">{ mosimage }</span></p><p><span style="FONT-WEIGHT: bold; "></span>This mambot replaces <strong></strong>tag in content with specified images.&nbsp; You can insert as many of these tags as needed in your articles.&nbsp; To do this while creating or editing a content item,&nbsp; select the images on the &quot;Image&quot; tab under &quot;MOSImage Control&quot;.&nbsp; The replacement of the tags will follow the order of the images in the &quot;Content Images&quot; box.<br /><span ><span style="FONT-WEIGHT: bold">NOTE: </span>The tag described above should have no space after&nbsp; &quot;{&quot; and before &quot;}&quot;. It has been displayed with spaces here not to implement the function in this screen.</span></p><h4><span ></span><span style="FONT-WEIGHT: bold; ">GeSHi</span></h4><p><span >This displays formatted code in content items based on the GeSHi highlighting engine.</span></p><p >This is to be considered as an enhanced version of mosCode, allowing the rendering of many different programming languages with color-highlighted code by specifying the to-be-used language.</p><p ><strong>Usage</strong>: Use the &quot;pre&quot; tag and add the programming language you want to use for highlighting purposes as a parameter. Example:</p><p ><span style="FONT-WEIGHT: bold">&lt; pre lang=&quot;xml&quot; &gt;</span>your code here ... <span style="FONT-WEIGHT: bold">&lt; /pre &gt;</span></p><p >The mambot version of the GeSHi highlight code comes with the following highlighters for the most common renders installed, ready&nbsp;to be&nbsp;used:</p><ul ><li>CSS =&gt; use lang=&quot;css&quot;</li><li>Html4 Strict =&gt; use lang=&quot;html4strict&quot;</li><li>JavaScript =&gt; use lang=&quot;javascript&quot;</li><li>PHP =&gt; use lang=&quot;php&quot;</li><li>PHP Brief =&gt; use lang=&quot;php-brief&quot;</li><li>SQL =&gt; use lang=&quot;sql&quot;</li><li>XML =&gt; use lang=&quot;xml&quot;</li></ul><p >Should you need additonal languages, you may download the full package from the developer site: <a href="http://qbnz.com/highlighter/">http://qbnz.com/highlighter/</a>&nbsp;which includes over 30 languages. You should then upload the required &quot;newLanguage.php&quot; from the package into your &quot;<em>\mambots\content\geshi\geshi</em>&quot; folder.</p><p ><strong>NOTE:</strong>&nbsp; As of 4.5.2.1, this bot seems to have an incompatibility with the Email cloaking mambot.</p><h4 ><span style="FONT-WEIGHT: bold; ">Legacy Mambot Includer</span></h4><p ><span >This is support for outdated Mambo 4.5 mambots.<br /></span>This Mambot is unpublished by default; should you experience disfunctions with a particular, older mambot, try to publish it.<span style="FONT-WEIGHT: bold; ">&nbsp;</span></p><h4 ><span style="FONT-WEIGHT: bold; "></span><span style="FONT-WEIGHT: bold; ">Code Support</span></h4><p ><span >This displays formatted code in content items. No syntax highlighting. Code presented in Courier.</span></p><p ><strong>Usage:</strong> <span style="FONT-WEIGHT: bold">{ moscode }... { /moscode }</span></p><p ><span style="FONT-WEIGHT: bold"></span><strong style="FONT-WEIGHT: normal">Example</strong>: <br />{ moscode }&lt;body onload=&quot;winManage(850,700,true);&quot;&gt;&lt;a name=&quot;top&quot;&gt;&lt;/a&gt;&lt;div&gt;&lt;div id=&quot;wrapper&quot;&gt;&lt;/div&gt;&lt;/div&gt;{ /moscode }<br /><span ><span style="FONT-WEIGHT: bold">NOTE:&nbsp; </span>The tag described above should have no space after&nbsp; &quot;{&quot; and before &quot;}&quot;. It has been displayed with spaces here not to implement the function in this screen.</span></p><h4 ><span ></span><span style="FONT-WEIGHT: bold; ">MOS Rating</span></h4><p ><span >This will add the Voting functionality to Content Items.</span></p><p ><strong>NOTE:</strong> For this mambot's output to be visible, you must set &quot;<em>Item Rating/Voting</em>:&quot; to &quot;<em>Show</em>&quot; <br />through Site- &gt; Global Configuration- &gt; Content.<br /><br />Users will then be presented with a rating system from 1 to 5 at the top of a full content item.&nbsp; They will be able to cast their vote (once).</p><h4 ><span style="FONT-WEIGHT: bold; ">Email Cloaking</span></h4><p ><span >This h</span>ides all e-mails in content from spambots using javascript. It does not function for Link - URL Menu Items. By editing the mambot, you may select between 2 settings under Parameters&nbsp; -&gt; Mode:</p><ul ><li><em style="FONT-WEIGHT: bold">Nonlinkable Text</em><span style="FONT-WEIGHT: bold">&nbsp;</span>will display an email typed by the user as simple text (not linked)</li><li><em>As <span style="FONT-WEIGHT: bold">linkable mailto </span>address</em> will display the email address as a link to send an email, using the specified address.</li></ul><p>As of 4.5.2.1 these are the ways the address should be written:<br /></p><div style="MARGIN-LEFT: 40px">1. In plain text: mail@mail.com<br /></div><div style="MARGIN-LEFT: 40px">2. As a mailto: &lt;a href=&quot;mailto:mail@mail.com&quot;&gt;mail@mail.com&lt;/a&gt;<br /></div><p>Otherwise the cloaking prevents the address from being decrypted when calling the mailer.</p><h4><span style="FONT-WEIGHT: bold; ">Load Module Positions</span></h4><p><span >This loads module positions within Content.</span><br  /><span ><strong>Usage:</strong></span><span style="FONT-WEIGHT: bold; "> {mosloadposition user1} </span><span >where 'user1' is one of the positions defined for your site through Site-&gt;Templates-&gt;Modules Positions.</span><br  /><br  /><span >This means <strong>you may load any module assigned to this position at this specific place into your Content</strong> without defining the position into the Template index.php file.</span><br  /><br  /><span >Parameters lets you choose a style of HTML code to insert the module:</span></p><ul style="MARGIN-LEFT: 40px; "><li>Wrapped by Table - Column</li><li>Wrapped by Table - Horizontal</li><li>Wrapped by Divs</li><li>No wrapping, raw output</li></ul><h4><span style="FONT-WEIGHT: bold; ">MOS Pagination</span></h4><p><span >This will&nbsp;add a Table of Contents functionality to a paginated item.</span><br  /><span ><strong>Usage: { mospagebreak } or { mospagebreak title=The page title } or { mospagebreak heading=The first page } or { mospagebreak title=The page title&amp;heading=The first page } or { mospagebreak heading=The first page&amp;title=The page title }<br /></strong><br  /></span><span >A new 'contenttoc' CSS class is used to display this Table of Contents.<br /><br  /></span><span ><span style="FONT-WEIGHT: bold">NOTE:</span> The tags described above should have no space after&nbsp; &quot;{&quot; and before &quot;}&quot;. They have been displayed with spaces here not to implement the function in this screen.</span></p><h5><span ></span><span style="FONT-WEIGHT: bold; ">Parameters</span></h5><p><span style="FONT-WEIGHT: bold; "></span><span ><strong>Site Title</strong>: This lets you add or not the mambot title and heading attributes to the Site Title Tag.</span></p><h4><span ></span><span style="FONT-WEIGHT: bold; ">No WYSIWYG Editor</span></h4><p><span >This loads a basic text entry field wherever you may edit content.</span></p><h4><span style="FONT-WEIGHT: bold; ">TinyMCE Editor</span></h4><p><span >This loads this default WYSIWYG Editor wherever you may edit content.</span></p><h4><span ></span><span style="FONT-WEIGHT: bold; ">MOS Image Editor Button</span></h4><p><span >This provides the button to insert the MOS Image tag into content edit box.</span></p><h4><span style="FONT-WEIGHT: bold; ">MOS Pagebreak Editor Button</span></h4><p><span >This provides the button to insert the { mospagebreak }&nbsp; tag into content edit box.</span></p><h4><span style="FONT-WEIGHT: bold; ">Search Content</span><br style="FONT-WEIGHT: bold; " /><span style="FONT-WEIGHT: bold; ">Search Weblinks</span><br style="FONT-WEIGHT: bold; " /><span style="FONT-WEIGHT: bold; ">Search Contacts</span><br style="FONT-WEIGHT: bold; " /><span style="FONT-WEIGHT: bold; ">Search Categories</span><br style="FONT-WEIGHT: bold; " /><span style="FONT-WEIGHT: bold; ">Search Sections</span></h4><p><span >These Mambots allows searches among these items, if they are published (default).</span> </p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.mambots.html 4.6rc2/help/454.screen.mambots.html
--- 4.5.4/help/454.screen.mambots.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.mambots.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Mambot Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Mambot Manager</h1>
-<p><span>Mambots are essentially code snippets which when called via various parameters either activate a program, script or perform a specific function. They can be as simple as a function which replaces typed text with code (such as typing to display an image in a content item) to full fledged third party libraries (such as WYSIWYG editors or other programs).<br /><br />
-<p align="left"><span>Mambots are divided into 4 types/categories that may be displayed by filtering in the filter field: <br /></span></p><ul><li>content</li><li><span>editors</span></li><li><span>editors-xtd</span></li><li><span>search</span><span></span></li></ul><h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p>Select a Mambot by clicking on the checkbox next to its name.</p><p><strong>Publish/ Unpublish</strong>: Click the icon to Publish or Unpublish the Mambot.</p><p><strong>New</strong>:&nbsp; Click the &quot;New&quot; icon to create a new Mambot. Then fill in the fields listed.</p><p><strong>Edit</strong>: Click the &quot;Edit&quot; icon to change the settings as desired.</p><p><strong>Delete</strong>: Click the &quot;Delete&quot; icon. This will uninstall it.<br /></p><p><strong>WARNING</strong>: This cannot be undone. Deleted Mambots cannot be restored as a &quot;Menu Item&quot; or &quot;Content Item&quot; can. If you have deleted a Mambot and you wish to use that Mambot again, you must re-Install the Mambot.<br /><strong>NOTE</strong>: Mambots essential to core operations cannot be deleted.</p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p><strong>Mambot Name</strong>: This lists the names of the Mambots currently installed. Click the name to edit any of the mambots.<br /><br /><strong>Published</strong>: This shows whether the Mambot is published or unpublished. Click on the icon if you wish to toggle its state.<br /><br /><strong>Reorder</strong>:&nbsp; Click the arrow icons to move the item up or down in the list. This has no effect on the Front-end of your site.&nbsp; You only reorder to help you organize your list of mambots in the Back-end.<br /><br /><strong>Orde</strong>r: This shows the order of Mambots in relation to other Mambots of the same type. Type&nbsp; the new numbers in the order that you wish your mambots to appear in the Back-end. You can change the order any two or more mambots at the same time.&nbsp; Click the Save Order icon next to the Column Heading Order. This has no effect on the Front-end of your site.<br /><br /><strong>Access</strong>: This shows who can see or use the Mambots on the Frontend of a Web page. Choose the level of access by clicking the link to toggle through Public, Registered and Special access. <br /><br /><strong>Type</strong>: This displays the type of mambot. Types include editors, content, editors-xtd and search.<br /><br /><strong>File</strong>: This displays the mambots filename.</p><p /><p><br /></p><p /></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.mediamanager.html 4.6rc2/help/454.screen.mediamanager.html
--- 4.5.4/help/454.screen.mediamanager.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.mediamanager.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Media Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Media Manager</h1>
-<p>The Media Manager enables you upload, delete and organise your media files within Mambo for use in various articles on your Web site. Media Manager, views only files under the /images/stories directory. If you need to upload media files in other location you have to do it through FTP.</p>
-<p><strong>Directory</strong>: The drop down box displayes the folder you are in. A forward slash (/) denotes you are in the root or top of the Media Manager directory structure. As root is considered the /images/stories directory. You can use to navigate. Alternatively you can click on any folder icon, displayed bellow as&nbsp;thumbnail.</p><p><strong>Upload</strong>: Enter the files location or click the 'Browse' button and select the file that you want to upload from your PC or workstation. Next, in the 'Directory' drop down box, select the directory that you wish to upload the file to and click the '<strong>Upload</strong>' icon. A message confirming the success of the upload will display and the file will appear in the Media Manager gallery window.</p><p><strong>Code</strong>: Clicking the thumbnail image or the pencil icon under it in the Media Manager window will enter the hyperlink code in the 'Code' text field. This can copied for pasting, for example, into a News item or other item appearing on the Frontend of your Web site.</p><p><strong>Create Directory</strong>: Enter a name for the new directory in the 'Create Directory' text box and click the '<strong>Create</strong>' icon on the toolbar. The new directory will be created and will be available for storing files.</p><p><strong>Delete</strong>: To delete a file or a directory, click the 'Trash Can' icon under the image of the file in the Media Manager window. A directory must be empty before it can be deleted.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menumanager.copy.html 4.6rc2/help/454.screen.menumanager.copy.html
--- 4.5.4/help/454.screen.menumanager.copy.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menumanager.copy.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menu Manager: Copy</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menu Manager: Copy</h1>
-<p>This page lets you <strong>copy a Menu</strong> and all its Menu Items. A list displays the name of the Menu and Menu Items copied.</p>
-
-<h3><span style="FONT-WEIGHT: bold">Toolbar</span></h3><p><strong>Copy:<span style="FONT-WEIGHT: bold">&nbsp;</span></strong>A new Menu Name will be created&nbsp; in the Menu Manager list where it may be edited.<br />A new mod_mainmenu module, with the Name you have entered above, will also be created. Parameters for the created module&nbsp;can&nbsp;be edited through the 'Modules Manager [site]': Modules -&gt; Site Modules.</p><p><strong>Cancel:</strong> Click on this icon if you wish to stop the copying and cancel any action.<br /></p></span>Type here to create a new Menu Name. <br /><br />This is the identification name used by Mambo to identify this menu within the code&nbsp;so it must be unique.&nbsp; It is recommended to use no spaces within this name. For example, in the core Mambo the User Menus Menu Name is usermenu and the Main Menus Menu Name is mainmenu. <br /><span style="FONT-WEIGHT: bold"></span><br /><span style="FONT-WEIGHT: bold">New Module Name: </span>Type here a name for the Module that handles your new menu.<br /><br />This is the name given to the new mod_mainmenu module which is automatically created when you save this menu. It is also the Name of the menu as it will appear on the page if you choose to show it (this may be changed when editing the module). In the example described above these are "User Menu" and "Main Menu". </body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menumanager.html 4.6rc2/help/454.screen.menumanager.html
--- 4.5.4/help/454.screen.menumanager.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menumanager.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menu Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menu Manager</h1>
-<p>&quot;Menus&quot; in Mambo are groups of navigational links to sections, categories, content items, components or external pages. These links are called 'Menu Items'.<br /><br />Each menu must have an identification name which is only used internally by Mambo. A menu only becomes visible on a site if it has a published mod_mainmenu module which references it.&nbsp;A menu may have multiple mod_mainmmenu modules referencing it.</p><h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>New:</strong> Click this icon to create a new Menu. You will access the &quot;Menu Details&quot; window.&nbsp; Type a Menu Name. This is the identification name used by Mambo to identify this menu within the code.&nbsp; It must be unique.&nbsp; It is recommended to use no spaces within this name. For example, in the core Mambo the User Menu's Menu Name is "usermenu" and the Main Menu's Menu Name is "mainmenu".&nbsp; <br /><br /><strong>Next:</strong> Type the Module Title. This is the name given to the new mod_mainmenu module which is automatically created when you save this menu. It is also the Name of the menu as it will appear on the page if you choose to publish it. This may be changed in the future when editing the module.&nbsp; In the example described above, these are "User Menu" and "Main Menu". Click on the 'Save" icon. Your new menu appears in the Menu Manager list.<br /><br /><strong>Edit:</strong> &nbsp;Click the radio button next to the Menu Name you want to edit.&nbsp; Then, click on the &quot;Edit&quot; icon which will take you to the Editing page.<br /><br /><strong>Copy:</strong> Click the radio button next to the Menu Name you want to copy. Then, click the "Copy" icon in the toolbar. This will duplicate the menu. You may copy any of your menus. Copying will create a new Menu Name, containing the same Menu Items as the menu copied, associated to a new Menu Module. <br /><br />A "Copy Page" will display, with the same choices as in Create New Menu. It will also state the name of the Menu being copied and a list of the Menu Items associated to the menu being copied. Fill in the fields as in the &quot;Create New Menu&quot; screen.<br /><br /><strong>Delete:</strong> Click the radio button next to the Menu Name you want to delete. Then, click the "Delete" icon in the toolbar. This will delete the Menu. A &quot;Delete Menu : Name-of-the-menu&quot; screen will display. It shows the Module(s) to be deleted (the mod_mainmenu modules associated to this Menu) and the Menu Items to be deleted. Click the Delete Icon surrounded by a dotted line. This will delete this Menu, ALL its Menu Items and ALL the Modules associated with it. A Javascript alert popup box gives you the choice to &quot;OK&quot; or to &quot;Cancel&quot; this action. <br /><br /><strong>NOTE: Deleted Menus cannot be recovered from the Trash Manager!</strong></p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p>The headings give information on the following functions :<br /><br /><strong>Menu Name:</strong> Click on the name to edit it. This name may be the one that is given to the menu by default or the name you gave to that menu. <br /><br /><strong>Menu Items:</strong> Click on the "Edit" icon in this column to add or edit Menu Items associated with a menu. Or alternatively go to &quot;Menu-&gt;the-menu-you-choose-to-edit&quot;. A &quot;Menu Manager [the-menu-you-choose-to-edit]&quot; window will&nbsp;appear with a list of all Menu Items associated to this Menu.<br /><br /><strong>#Published:</strong> This is the number of Menu Items published.<br /><br /><strong>#Unpublished</strong>: This is the number of Menu Items unpublished.<br /><br /><strong>#Trash:</strong> This is the number of Menu Items in the Trash Manager.<br /><br /><strong>#Modules:</strong> This is the number of menu modules associated to the Menu Name.<br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menumanager.new.html 4.6rc2/help/454.screen.menumanager.new.html
--- 4.5.4/help/454.screen.menumanager.new.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menumanager.new.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menu Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menu Manager : New / Edit</h1>
-<p>Menu items have many different types depending from their role. When we create a <strong>New Menu Item</strong> we must choose his type.<br />The Menu Items are presented&nbsp;in 4 groups in this screen. &nbsp;Each group lists a specific kind of menu items.&nbsp; Some of them may be presented in more than one group.<p /></td></tr></tbody></table></p><h3><span style="FONT-WEIGHT: bold">Toolbar&nbsp;Icons</span></h3><p><strong>Next:</strong>&nbsp; After selecting&nbsp;the radio button for the type of menu item you wish to create, click the "Next" icon in the Toolbar.&nbsp;A new window will open with the name "Add Menu Item :: The-type-of-link-chosen".<br /><br /><strong>Cancel:</strong> Click on the &quot;Cancel&quot; Icon if you do not wish to create a Menu Item.<br /><br /><strong>Help:</strong> Click on the &quot;Help&quot; Icon to learn more about the New Menu Item page.</p><p>The Menu Items are presented as 4 groups in this screen. &nbsp;Each group lists a specific kind of menu items.&nbsp; Some of them may be presented in more than one group.<br /><br /><strong>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menus.copy.html 4.6rc2/help/454.screen.menus.copy.html
--- 4.5.4/help/454.screen.menus.copy.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menus.copy.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menus: Copy</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menus: Copy</h1>
-<p>This page lets you <strong>copy a Menu</strong> and all its Menu Items. A list displays the name of the Menu and Menu Items copied.</p><h3><span style="FONT-WEIGHT: bold">Toolbar</span></h3><p><strong>Copy:<span style="FONT-WEIGHT: bold">&nbsp;</span></strong>A new Menu Name will be created&nbsp; in the Menu Manager list where it may be edited.<br />A new mod_mainmenu module, with the Name you have entered above, will also be created. Parameters for the created module&nbsp;can&nbsp;be edited through the 'Modules Manager [site]': Modules -&gt; Site Modules.</p><p><strong>Cancel:</strong> Click on this icon if you wish to stop the copying and cancel any action.<br /></p></span>Type here to create a new Menu Name. <br /><br />This is the identification name used by Mambo to identify this menu within the code&nbsp;so it must be unique.&nbsp; It is recommended to use no spaces within this name. For example, in the core Mambo the User Menus Menu Name is usermenu and the Main Menus Menu Name is mainmenu. <br /><span style="FONT-WEIGHT: bold"></span><br /><span style="FONT-WEIGHT: bold">New Module Name: </span>Type here a name for the Module that handles your new menu.<br /><br />This is the name given to the new mod_mainmenu module which is automatically created when you save this menu. It is also the Name of the menu as it will appear on the page if you choose to show it (this may be changed when editing the module). In the example described above these are User Menu and Main Menu. 
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menus.edit.html 4.6rc2/help/454.screen.menus.edit.html
--- 4.5.4/help/454.screen.menus.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menus.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menus: Edit Menu Item</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menus: Edit Menu Item</h1>
-<p>By clicking on a menu item, you have access to the <strong>Edit Menu Item</strong> screen where you can edit his details and parameters. Every Menu Item has different parameters. Some of them though are common at all.</p>
-<h3>Toolbar Icons</h3><p><strong>Save :</strong> Click on this icon to save the parameters chosen and return&nbsp;to the Menu Manager..</p><p><strong>Apply :</strong> Click on this icon to save the parameters chosen AND keep the same&nbsp;screen open for editing.</p><p><strong>Close :</strong> Click on this icon to cancel any action in this screen.&nbsp; You will return&nbsp;to the previous screen.<br /><br /><span style="FONT-WEIGHT: bold">This&nbsp;screen is divided into 2 main parts : "Details" and "Parameters".</span> <br />These vary in function, depending from the type of Menu Item chosen. Some "Details" can also be edited through the list in the Menu Manager. Some parameters may appear&nbsp;only after clicking on the "Apply" or "Save" icon. </p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menus.html 4.6rc2/help/454.screen.menus.html
--- 4.5.4/help/454.screen.menus.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menus.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menu Manager / Main Menu</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menu Manager / Main Menu</h1>
-<p>This page shows a list of the Menu Items associated to the menu you have just chosen.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>New :</strong> Click this icon to create a new Menu Item<span style="COLOR: rgb(255,0,0)"><br /></span><br /><strong>Edit :</strong> Click this icon to edit an existing Menu Item.<br /><br /><strong>Publish and Unpublish :</strong> These icons have the same function as the 'Published' column icon.&nbsp; Click either of these icons to publish or unpublish any items.&nbsp; You may use these icons with multiple items checked.<br /><br /><strong>Move :</strong> Click on this icon to open a new 'Move Menu Items' window where you can choose to move the specific Menu Item(s) -and children if desired- to another existing Menu. You may check multiple items to be moved at once.<br /><br /><strong>Copy :</strong> Click on this icon to open a new 'Copy Menu Items' window where you can choose to copy the specific Menu Item(s) -and children if desired- to another existing Menu. You may check multiple items to be copied at once.<br /><br /><strong>Trash :</strong> Click on this icon to send the Menu Item to the Trash Manager. You may check multiple items to be sent to the Trash Manager at once.&nbsp; The menu items may be recovered through the Admin Menu: Site-&gt;Trash Manager.&nbsp; Then, choose the Menu Items tab. <br /><br /><strong>Cancel :</strong> Click on this icon to cancel any change made in the 'Order' column if the 'Save Order' icon has not been clicked.&nbsp; You will return to the previous page.</p><h3><span style="FONT-WEIGHT: bold">Columns</span></h3><p><strong>Menu Item :</strong> This is the name of the link as it appears&nbsp;at your site.&nbsp; Click this name so that&nbsp; you can edit parameters related to this Item. <span style="COLOR: rgb(51,51,51)">A padlock icon next to it shows that it is checked-out. To check-in, click the name if it is you that has last edited the page. Then click the 'Save' or 'Cancel' icon to check back in the item.&nbsp; If another user has checked out the item, please contact him/her or the administrator of your site.</span><br /><br /><strong>Published:</strong> This shows whether the Menu Item is published or unpublished. Click&nbsp; the icon to switch its state.<br /><br /><strong>Reorder :</strong> This shows the order of Menu Items in the menu. Click the arrow icons to move the item up or down in the list.<br /><br /><strong>Order :</strong> This shows the order of Menu Items in the menu. To change the order, type in the order number&nbsp; you wish to have.&nbsp; You can change the order of any two items or more this way.&nbsp; Then click the 'Save Order' icon next to the Column Heading 'Order'. <br /><br /><strong>NOTE: The Order and Reorder&nbsp; columns show the relative positions of Parent and Children Menu Items. Moving a parent moves the children too. The order numbers are shown relatively to the Parent Item.</strong><br /><br /><strong>Access :</strong> Click the 'Access' level to toggle to another User access level for this menu item.<br /><br /><strong>Itemid:</strong> This shows the 'id' for this specific Menu Item in the database.<br /><br /><strong>Type:</strong> This is the type of link used for this Menu Item. If it is a 'Link  Content Item' or a Link  Static Content, you may directly edit the content by clicking the type of menu item.<br /><br /><strong>CID:</strong> This shows the 'componentid' for this specific Menu Item in the database.<br /><br style="FONT-WEIGHT: bold" /><span style="FONT-WEIGHT: bold">Other functions available above and below of the list: </span><br /><br /><strong>Max Levels:</strong> Select the maximum number of levels deep that the menu tree is displayed on this admin page.<br /><br /><strong>Filter:</strong> Type in the keyword to search for text in&nbsp; the Menu Item titles.<br /><br /><strong>Display #:</strong> Choose the number of menu items you wish to be displayed in the list.<br /><br /><strong>NOTE:</strong> This setting will be preserved for all lists on all screens while you are in the Administator back-end. A default value for the list length is also configurable in Global Configuration. <br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menus.move.html 4.6rc2/help/454.screen.menus.move.html
--- 4.5.4/help/454.screen.menus.move.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menus.move.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menus: Move</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menus: Move</h1>
-<table class="contentpaneopen"><tbody><tr><td valign="top" colspan="2"><p>This page lets you <strong>move</strong> one or more Menu Items to another existing Menu. If you choose to move a Parent Menu Item, &nbsp;its sub-level menus will be moved too, keeping their Parent-child relationship.&nbsp;</p><p>Check the menu item that you want to move and click on the <strong>Move</strong> icon. A new screen appears, in which you can choose the target Menu.</p><br /><span style="FONT-WEIGHT: bold">Move to Menu: <br /></span>This list&nbsp;displays all&nbsp;your existing Menus the way they look through&nbsp;the Menu Manager. You may choose to which of them&nbsp;the Menu Item(s)&nbsp;will be moved.<br /><br /><span style="FONT-WEIGHT: bold">Menu Items being moved: <br /></span>This shows a list of the Menu Items being moved.</p><h3><span style="FONT-WEIGHT: bold">Toolbar</span></h3><p><strong>Move:</strong> Click this icon to move the Menu Items.</p><p><strong>Cancel:</strong> Click this icon to abort the moving process.</p></td></tr><tr><td class="modifydate" align="left" colspan="2"></td></tr></tbody></table>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.menus.new.html 4.6rc2/help/454.screen.menus.new.html
--- 4.5.4/help/454.screen.menus.new.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.menus.new.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Menus: New Menu Item</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Menus: New Menu Item</h1>
-<p><br />Menu items have many different types depending from their role. When we create a <strong>New Menu Item</strong> we must choose his type.<br />The Menu Items are presented&nbsp;in 4 groups in this screen. &nbsp;Each group lists a specific kind of menu items.&nbsp; Some of them may be presented in more than one group.</p><p /><p /></td></tr></tbody></table></p><h3><span style="FONT-WEIGHT: bold">Toolbar&nbsp;Icons</span></h3><p><strong>Next:</strong>&nbsp; After selecting&nbsp;the radio button for the type of menu item you wish to create, click the 'Next' icon in the Toolbar.&nbsp;A new window will open with the name 'Add Menu Item :: The-type-of-link-chosen'.<br /><br /><strong>Cancel:</strong> Click on the &quot;Cancel&quot; Icon if you do not wish to create a Menu Item.<br /><br /><strong>Help:</strong> Click on the &quot;Help&quot; Icon to learn more about the New Menu Item page.</p><p>The Menu Items are presented as 4 groups in this screen. &nbsp;Each group lists a specific kind of menu items.&nbsp; Some of them may be presented in more than one group.<br /><br /><strong>The groups are :</strong>&nbsp; Content, Components, Links and&nbsp;<!--StartFragment --> Miscellaneous.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.messages.conf.html 4.6rc2/help/454.screen.messages.conf.html
--- 4.5.4/help/454.screen.messages.conf.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.messages.conf.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Messages Configuration</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Messages Configuration</h1>
-<p>There are two configuration options available to your Administrator. Use the select box to choose your option: 'YES AND NO'</p><p><strong>Lock Inbox</strong>:&nbsp;This option allows you to prevent Administrators or System processes from sending you messages. If you are the only administrator or work with a small group of admins you may choose not to use this feature at all. It is a good idea to leave the box open while you are adding new components as it will help you be aware of system processes.<br />&nbsp;<br /><strong>Mail me on new Message</strong>:&nbsp;This option will result in an email being sent to you each time you receive a new message. </p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.messages.inbox.html 4.6rc2/help/454.screen.messages.inbox.html
--- 4.5.4/help/454.screen.messages.inbox.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.messages.inbox.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-
-<head>
-
-<title>Messages Inbox</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Messages Inbox</h1>
-<div style="TEXT-ALIGN: left">This menu option displays your current Inbox.</div><div style="TEXT-ALIGN: left"></div><div style="TEXT-ALIGN: left"></div><div style="TEXT-ALIGN: left"></div><div style="TEXT-ALIGN: left"></div><div style="TEXT-ALIGN: left"></div><div style="TEXT-ALIGN: left">To <strong>View a message</strong>, click the hyperlinked 'Subject' of the desired message. Details of the message will be shown. Click the 'Back' icon in the toolbar to return to your Inbox.<br />&nbsp;<br />To <strong>Create a new message</strong>, click the 'New' icon in the toolbar. Select the Recipient from the list and enter the desired subject and Message. Click the 'Save' icon to send the message. Click the 'Cancel' icon to abort the operation.<br />&nbsp;<br />To <strong>delete a message</strong>, select the checkbox next to the Subject of the message, (or multiple messages), that you want to delete. Click the 'Delete' icon in the toolbar. An alert box will ask you to confirm the operation.<br />&nbsp;<br /><strong>Private messaging is only supported to or between Users in a group that has access to the Admin Section</strong>.<br />&nbsp; </div></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.modules.edit.html 4.6rc2/help/454.screen.modules.edit.html
--- 4.5.4/help/454.screen.modules.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.modules.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Modules: Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Modules: Edit</h1>
-<p><span >This page displays the editable parameters for Modules in Mambo. <br /></span></p><p><span ><span style="FONT-WEIGHT: bold"></span></span></p><h3><span ><span style="FONT-WEIGHT: bold"></span></span><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><span ><strong>Preview</strong>: Click on the &quot;Preview&quot; icon to preview only typed modules.</span></p><p style="TEXT-ALIGN: left"><span ></span><span ><strong>Save</strong>: Click on the &quot;Save&quot; icon to save the parameters you have chosen and to go back to the 'Menu Manager [the-menu-you-chose-to-edit]'.<br /><br  /></span><span ><strong>Apply</strong>: Click on the &quot;Apply&quot; icon to save the parameters you have chosen and to keep the same window open for editing.<br /><br  /></span><span ><strong>Close</strong>: Click on the &quot;Close&quot; icon to cancel the action and to close the &quot;Modules: Edit&quot; window.</span></p><h3 style="TEXT-ALIGN: left"><span ></span><span style="FONT-WEIGHT: bold">Details</span></h3><p><span >(same for all modules)<br /><br /></span><strong>Title</strong>: Type or Edit the title of the module that you wish to display on the Front-end or Back-end of your site.</p><p ><strong>Show title</strong>: Choose if you wish for the &quot;Title&quot; to display or not on the Front-end or Back-end of your site.</p><p ><strong>Position</strong>: Choose which position, on the Front-end or Back-end of your site, the module will display in.</p><p ><strong>Module order</strong>: Choose the order the module will appear among modules assigned to the Front-end or Back-end of your site.</p><p ><strong>Access Level</strong>: Choose who can view this module. Public (everyone can view it), Registered (only registered users can view it), or Special (only special users can view it, as defined under the User Manager in Site -&gt; User Manager -&gt; Add/Edit Users).</p><p ><strong>Published</strong>: Choose &quot;Yes&quot; to publish the module on the Frontend of your Web site (if chosen Position is available in the template) or &quot;No&quot;&nbsp; to unpublish the module.<br /></p><p ><strong>ID</strong>: This is the ID number for the module item. This is allocated by the Mambo site system when the module is saved. </p><p ><strong>Description</strong>: This is a short description of the functions provided by the Module Type.</p><h3><span >Pages / Items: </span></h3><p><span >(same for any module) Choose which pages</span><span > you want the module to be displayed on.</span></p><h3><span ></span><span style="FONT-WEIGHT: bold">Parameters</span></h3><p><span ><strong>Count:</strong> The number of items to display (the default is 10)</span></p><p><span ><strong>Module Class Suffix (available for all module)</strong>: Type (if needed) the suffix to be aplied to the CSS class of the module (table.moduletable) to allow individual module styling.</span></p></span></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.modules.html 4.6rc2/help/454.screen.modules.html
--- 4.5.4/help/454.screen.modules.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.modules.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Module Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Module Manager</h1>
-<p align="left">Modules are modular elements used to display information items or interactive features throughout a Mambo Site. The main characteristic is to be positioned off content in pre-established positions ruled by the corresponding template (Front-end or Back-end templates for Site and Administrator areas respectively). </p><p align="left">Examples of modules are Menus, Login and Search forms. Simple HTML Modules can be created directly from the Module Manager. In more complicated cases, they will have to be installed. There are hundreds of modules already programmed for Mambo, written by various Mambo community members.&nbsp; You will find them on the Mambo projects site, <a href="http://mamboforge.net/"><font color="#77689d" size="1">mamboforge.net</font></a>. They are free and available for download.</p><p align="left">The <strong>Module Manager</strong> displays the installed modules.&nbsp; You can manage them by clicking on the appropriate icon in the Tool Bar.</p><h3 align="left"><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p align="left"><span ><strong>Publish:</strong> Click on the 'Publish' icon to publish your modules on the Front-end of your Web site.</span><br  /><br  /><span ><strong>Unpublish:</strong> Click on the 'Unpublish' icon to unpublish your modules on the Front-end of your Web site.</span></p><p  align="left"><strong>Copy:</strong> Click on the 'Copy' icon to make a copy of the selected module. This enables it to be displayed in more than one place on the Front-end of your Web site. A new version is created with the name 'Copy of (the name of the module you copied)'. You can rename it.<br /><br /><strong>New:</strong> Click on the &quot;New&quot; icon to create a custom module with a &quot;User&quot; type.&nbsp; This is a very useful module which may be used to display Content (this content is not related to Sections, Categories or Static Content Items) or an&nbsp; RSS Feed. It can be used as a text box, image module or even to include&nbsp;customized code.</p><p  align="left"><strong>Edit:</strong> Click on the 'Edit' icon to edit or modify the module. Clicking the linked name will also perform this function. This enables you to change the attributes of a module like it's title, it's position, the order in which it appears on the page, access level and whether it is published or not. From this page you will also be able to change the location the module appears on the Front-end of your site and any parameters that apply to the module.</p><p  align="left"><span ><strong>Delete:</strong>&nbsp;Click on the 'Delete' icon to delete/uninstall a module from your system.</span><br  /><span ><strong>NOTE:</strong> You cannot delete the 'last' module of a particular 'type' on this screen. If you want to delete a specific type of module, go to the Install/Uninstall screen as explained above.</span><br  /><br  /><span ><strong>Help:</strong> Click on the 'Help' icon to view the help screen&nbsp;for this page.</span></p><h3  align="left"><span ></span><span style="FONT-WEIGHT: bold">Column Descriptions</span></h3><p  align="left"><span style="FONT-WEIGHT: bold"></span><span ><strong>Check Box/Padlock:</strong> Click this to select the module. A padlock icon will replace the Check Box if&nbsp;the item is&nbsp;checked-out. This means the module is unavailable to other managers. If you have checked-out the item, click the name to go to the Edit screen.&nbsp; You can either click the Save or the Cancel icon to check back in the module.&nbsp; If this module has been checked out by another manager/administrator, please contact the administrator of your site for him/her to Check-in the&nbsp;module.&nbsp;</span></p><p  align="left"><span ><strong>Module Name:</strong> This is the title of the module. It is editable and&nbsp;will be displayed on the Front-end of your Web site if you choose so.&nbsp; </span></p><p  align="left"><span ><strong>Published:</strong> This tells you if the module contents will show on the Front-end of your Web site. Click the 'blue' arrow icon or 'red' cross to toggle the status.</span><br  /><br  /><span ><strong>Reorder:</strong> This column allows you to change the relevant order that the modules display on the Front-end of your Web page(s). Click the 'up' or 'down' arrows to increase or decrease the module order by one position.</span></p><p  align="left"><strong>Order :</strong> This shows the order of the modules as displayed in the Front-end of your site.<br />To modify this order, type in the number that you would like to have them presented.&nbsp; Then, click on the Save Order icon next to the Column Heading Order.</p><p  align="left"><strong>Access:</strong> This shows who can see the modules on the Front-end of a Web page. Clicking the link will toggle through Public/Registered/Special.<br /><br /><strong>Position:</strong> This shows which template positions the module will display in. Some common Template positions are - User1, Left, Right, and Top. <br /><strong>NOTE:</strong> You can only assign the module position to one that is already coded into your template<br /><br /><strong>Pages:</strong> This shows which pages the module will display on. Options include All, Varies or None.<br /><strong>NOTE:</strong> This is not applicable to Administrator modules. Click on the Edit icon in the Toolbar to edit this.<br /><br /><strong>ID:</strong> This is the ID number for the module item. This is allocated by the Mambo site system when the module instance is saved.<br /><br /><strong>Type:</strong> This is the type of module. An example is mod_mainmenu which is the 'type' of module used for the User Menu and the Main Menu module instances.&nbsp;<br /><br />At the bottom of the list you may see a pagination feature, which will allow you to navigate to the next set of modules in the list. You can also set the number of modules displayed on a page by selecting the number in the drop down box at the bottom of the screen.<br /><br />Filtering functions are available at the top-right of the list. To filter the displayed modules by Position and module type, select from the Select Position and/or Select Type drop down menu. You can refine your filter by typing in the keyword that you wish to filter in the field box. </body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.modules.new.html 4.6rc2/help/454.screen.modules.new.html
--- 4.5.4/help/454.screen.modules.new.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.modules.new.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Modules: New</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Modules: New</h1>
-<p>The <strong>User module</strong> is a custom module&nbsp;created when clicking the 'New' icon in the Module Manager.<br />You may use this module to display Content (this content is not related to Sections, Categories or Static Content Items) or an RSS Feed.<br /><br /><strong>Type: mod_user</strong></p><h3><span style="FONT-WEIGHT: bold">Details</span></h3><p><strong>Title</strong>: Type or edit the title of the module to display on the Front-end or Back-end of your site.<br /><br /><strong>Show title</strong>: Choose if you want the Title to display or not on on the Front-end or Back-end of your site.<br /><br /><strong>Position</strong>: Choose which position that you want this module to display in. This is determined the positions available in your templates.<br /><br /><strong>Module order</strong>: Choose the order this module will appear among modules assigned to the same position in your templates.<br /><br /><strong>Access Level</strong>: Choose who can view this module. Public, Registered or Special.<br /><br /><strong>Published</strong>: Choose if the module contents will show on the Front-end of your Web site (if the chosen Position is available in the template).<br /><br /><strong>ID</strong>: This is the ID number for the module item. This is auto-allocated by the Mambo system when the module is saved.</p><p><font color="#000000"><strong>Description:</strong> This is a short description of the functions provided by the Module Type.</font></p><h3>Pages / Items: </h3><p>Choose which pages the module should be displayed on.</p><h3><span style="FONT-WEIGHT: bold">Parameters</span></h3><p><span style="FONT-WEIGHT: bold"></span><strong>Module Class Suffix</strong>: Add a suffix if needed to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.<br /><br /><strong>This information concerns RSS Feeds:<br /><br />RSS URL</strong>: Enter here the URL of the RSSfeed you want to display on your site.<br /><br /><strong>Feed description</strong>: Choose to show or not the description text for the whole Feed.<br /><br /><strong>Feed Image</strong>: Choose to show or not the image associated with the whole feed.<br /><br /><strong>Items</strong>: Enter the number of RSS Items to display. If this number is higher than the number fixed by the Syndicating site, the latter one will be used.<br /><br /><strong>Item description</strong>: Type the description or intro text for individual News Items.<br /><br /><strong>Word Count</strong>: Choose the the maximum number of visible words available from the description of the New Item. 0 means all text will be displayed.</p><p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt"><span lang="EN-GB" style="FONT-SIZE: 8.5pt; FONT-FAMILY: Arial; mso-ansi-language: EN-GB"><font color="#000000"><strong>Enable Cache:</strong> Select to cache or not the content of this module.<br style="mso-special-character: line-break" /><br style="mso-special-character: line-break" /></font></span></p><p /><p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt"><strong><font color="#000000">This information does not concern RSS Feeds:</font></strong><b><br /></span></b><br /><font color="#000000"><strong>Custom Output:</strong> Here you may enter any text&nbsp; or code you like that you wish to display it's output&nbsp; in this module anywhere on the pages of your site. <br /><b>NOTE: </b>This content may not be accessed through a Menu Item.</font></p><p /><p><br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.newsfeeds.edit.html 4.6rc2/help/454.screen.newsfeeds.edit.html
--- 4.5.4/help/454.screen.newsfeeds.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.newsfeeds.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>News Feeds Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>News Feeds Manager : New / Edit</h1>
-<p>This page lets you create or edit a News Feed Item.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Save</strong>: Click this icon to save the created or modified News Feed.<br /><br /><strong>Cancel</strong>: Cancels any change or creation. When clicking while editing, the item will remain checked-in.</p><h3><span style="FONT-WEIGHT: bold">Details</span></h3><p><strong>Name</strong>: Type here the name of the News Feed as it will appear on your site.<br /><br /><strong>Category</strong>: Select here the News Feed Category you want this News Feed to belong to.<br /><br /><strong>Link</strong>: Enter here the link to the feed as provided by the source. This is generally obtained by mouseover and copy the link through the RSS Feed icons on the site concerned.<br /><br /><strong>Number of Articles</strong>: Type here the maximum number of Articles to display. If the provider has decided of a lower number, the lower number will be used.<br /><br /><strong>Cache Time (in seconds)</strong>: Type here the time between refreshes, in seconds.<br /><br /><strong>Ordering</strong>: This is the order the Item will display in the News Feed Manager. Defaults to last when created, may be changed when editing.<br /><br /><strong>Published</strong>: Click the radio button to decide whether this News Feed will display or not on your site.<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.newsfeeds.html 4.6rc2/help/454.screen.newsfeeds.html
--- 4.5.4/help/454.screen.newsfeeds.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.newsfeeds.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>News Feeds Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>News Feeds Manager</h1>
-<p align="center" width="550" border="0" hspace="0" vspace="0" height="299"><table class="hs_table"><tbody><tr><td class="hs_header01"><p><strong>News Feeds Manager</strong></p></td></tr><tr><td class="hs_header02"></td></tr></tbody></table></p><p><span >This page displays a list of the News Feeds you may provide to the users of your site.</span><br  /><span >These Newsfeeds may be displayed through a Menu Item link.</span><br /><br />Alternatively, you may also display News Feeds individually through the Custom/User Module.<br /></p><h3><span >Toolbar Icons</span></h3><p><span >You &quot;select&quot; News Feeds by clicking the checkbox at the start of each row.</span><br  /><span >&nbsp;</span><br  /><span ><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icon to publish or unpublish any number of selected News Feeds.</span><br  /><br  /><span ><strong>New</strong>: Click the 'New' icon to create a new News Feed.</span><br  /><span >&nbsp;</span><br  /><span ><strong>Edit</strong>: Click the 'Edit' icon to edit the News Feed.</span><br  /><span >&nbsp;</span><br  /><span ><strong>Delete</strong>: Click the 'Delete' icon to delete one or multiple Newfeeds.</span></p><h3><span ></span><span >Columns</span></h3><p><span ><strong>News Feed</strong>:&nbsp; Name of the News Feed as it appears on your site. If you click on this name, you may edit the related parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit ,</span><br  /><br  /><span ><strong>Published</strong>: This shows whether the News Feed is published or unpublished. By clicking on the icon, you may switch its state.</span><br  /><br  /><span ><strong>Reorder</strong>: This shows the order of News Feeds in the list. Click the arrow icons to move the item up or down in the list. This ordering may be changed by editing the related Menu Item parameters.</span><br  /><br  /><span ><strong>Category</strong>: This is the category the News Feed belongs to. Click to edit.</span><br  /><br  /><span ><strong>#Articles</strong>: This shows the number of Articles to display on your site as defined in the parameters for the News Feed.</span><br  /><br  /><span ><strong>Cache time</strong>: This is the time between refreshes as defined in the parameters for the News Feed.</span><br /></p><br />
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.polls.edit.html 4.6rc2/help/454.screen.polls.edit.html
--- 4.5.4/help/454.screen.polls.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.polls.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Poll Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Poll Manager : New / Edit</h1>
-<p>This page lets you create or edit a poll for your site.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Preview</strong>: Clicking this icon will open a pop-up window with a preview of the poll as it will appear on your site: title, options, and vote/results buttons.<br /><br /><strong>Save</strong>: Saves the new / edited poll and returns to Manager.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened to edit, the poll remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Details</span></h3><p><strong>Title</strong>: Type here the title question of the poll as it will appear on your site (100 characters max).<br /><br /><strong>Lag</strong>: Enter here the number of seconds users have to wait before being able to vote in the same poll again. This interval is&nbsp;expressed in seconds. The default value is 86400 (24 hours).&nbsp; <br /></p><ul style="MARGIN-LEFT: 40px"><li>For 24 hours use: 86400.</li><li>For 12 hours use: 43200.&nbsp; </li><li>For 6 hours use: 21600.</li><li>For 1 hour use: 3600.</li></ul><p><strong>Options</strong>: (input fields 1 to 12) Fill in here the various options the user can select from to cast his vote. Empty items will not be displayed. Users may select only one of the possible answers.<br /><br /><span style="FONT-WEIGHT: bold">NOTE:</span> You may add additional options after the poll has commenced. Deleting options will corrupt the data, so you should create a new poll.<br /><br /><span style="COLOR: rgb(255,0,0)"><strong>Warning</strong>: </span>As of 03/02/05 this is bugged because you are allowed to save a poll without items, which will generate a mysql error. <span style="FONT-WEIGHT: bold">You should at least have two options filled out.</span><br /><br /><strong>Show on menu items</strong>: Select here which page(s) the poll should be displayed on. Allows to link the poll to specific menu items only. Works together with the &quot;Polls&quot; Module (mod_poll) which will display the configured polls. You may select multiple Menu Item Links.<br /><br /><span style="FONT-WEIGHT: bold">NOTE:</span> This means that polls assigned to specific Menu Items must have the 'Polls' module assigned to the same Menu Items to be displayed (Modules-&gt; Site Modules).<br /><br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.polls.html 4.6rc2/help/454.screen.polls.html
--- 4.5.4/help/454.screen.polls.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.polls.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Poll Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Poll Manager</h1>
-<p style="TEXT-ALIGN: left">This page shows show a list of the Polls you may display on your site.</p><p style="TEXT-ALIGN: left" />
-<h3 style="TEXT-ALIGN: left"><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p style="TEXT-ALIGN: left">You &quot;select&quot; Polls by clicking the checkbox at the start of each row.<br /><br /><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icon to publish or unpublish any number of selected polls.<br /><br /><strong>New</strong>: Click this icon to add a new poll.<br /><br /><strong>Edit</strong>: Click this icon to edit the poll's details.<br /><br /><strong>Delete</strong>: Click this icon to delete the poll.</p><h3 style="TEXT-ALIGN: left"><span style="FONT-WEIGHT: bold">Columns</span></h3><p style="TEXT-ALIGN: left"><strong>Poll Title</strong>: This is the name of the poll. If you click on this name, you may edit the related parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit ,<br />&nbsp;<br /><strong>Published</strong>: This shows whether the poll is published. Click the icon to toggle the state of the poll.<br />&nbsp;<br /><strong>Options</strong>: This is the number of options in the poll.<br /><br /><strong>Lag</strong>: Time in seconds between votes of the same user for the same poll. <br />&nbsp; </p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.sections.edit.html 4.6rc2/help/454.screen.sections.edit.html
--- 4.5.4/help/454.screen.sections.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.sections.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Sections Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Sections Manager : New / Edit</h1>
-<p>This page lets you create or edit a Section.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Upload</strong>: Opens a new window which lets you upload a file or an image from your computer to the images/stories folder.<br /><br /><strong>Save</strong>: Saves the section and returns to Manager.<br /><br /><strong>Apply</strong>: Saves the section and keep the page displayed to edit.<br /><br /><strong>Cancel</strong>: Cancels the action. Any modification is lost. If opened for edit, the Section remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Section Details</span></h3><p><strong>Section Title</strong>: Type here the name of the section as you want it to display on your site.<br /><br /><strong>Section Name</strong>: Type here the name of the section as you want it to appear in the database and the back-end.<br /><br /><strong>Image</strong>: Select here an image to display next to the Section Description text. The dropdown lists an image choice from the images/stories folder.<br /><br /><strong>Image position</strong>: Select here the position of the image relative to the description text. Left or right.<br /><br /><strong>Ordering</strong>: Select here the order of the section among other sections. This will reflect in the Section Manager. New sections default to the last place. Ordering can be changed after applied or saved.<br /><br /><strong>Access</strong>: This is the user access level for the category. Public, Registered or Special.<br /><br /><strong>Published</strong>: Check the box to let the item show on your site.<br /><br /><strong>Description</strong>:&nbsp; Type here a description of the Section. This text will show if decided so when the section is displayed as a table, blog or other sections.</p><h3><span style="FONT-WEIGHT: bold">Formatting content</span></h3><p>The formatting options interface depend on the Editor you are using.<br />Many editors are available as Open Source (through MamboForge) or commercial products.<br /><br />Mambo comes with 2 default editors:<br /></p><ul style="MARGIN-LEFT: 40px"><li><strong>NO WYSIWYG</strong>: This editor lets you enter text and/or HTML code directly.</li><li><strong>TinyMCE</strong>: This editor lets edit in WYSIWYG or HTML mode (See specific Help).</li></ul><p><strong>NOTE</strong>: It is advised to publish only one editor at a time in Mambot Manager and to save also that choice in Global Configuration.<br /><br /><strong>NOTE</strong>: It is not advised to use the Mambot tag { mospagebreak } in this description field.<br /><br /><strong><span style="FONT-STYLE: italic">The following parameters will only show once the section is applied or saved.</span><br /></strong><br /><span style="FONT-WEIGHT: bold">Link to Menu<br /><br /></span>This will create a new menu Item in the menu you select.<br /><br /><strong>Select a Menu</strong>: Highlight here one the menus defined for your site.<br /><br /><strong>Select Menu Type</strong>: Select here 'SEction List', 'Section Blog' or 'Section Archive Blog' Menu Item types.<br /><br /><strong>Menu Item Name</strong>: The name of the Menu as it will appear on your site.<br /><br /><strong>Link to Menu</strong>: Click on this button to create the Menu Item.<br /><br /><br /><span style="FONT-WEIGHT: bold">Existing Menu Links<br /><br /></span>This displays a list of all Menu Items referencing this section.<br /><br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.sections.html 4.6rc2/help/454.screen.sections.html
--- 4.5.4/help/454.screen.sections.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.sections.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Section Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Section Manager</h1>
-<p align="center" width="550" border="0" hspace="0" vspace="0" height="299"><table class="hs_table"><tbody><tr><td class="hs_header01"><p><strong>Sections Manager</strong></p></td></tr><tr><td class="hs_header02"></td></tr></tbody></table></p><p  align="left">This page shows show a list of the Sections defined on your site. </p><h3  align="left"><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p  align="left">Click the icons after checking the box next to a specific Section. <br /><br /><strong>Publish and Unpublish</strong>: Same function as 'Published' in the headings. You may check multiple checkboxes.<br /><br /><strong>New</strong>: Create a new Section.<br /><br /><strong>Edit</strong>: Edit an existing section parameters.<br /><br /><strong>Copy</strong>: Opens a new 'Copy Section' window where you can choose to copy the specific Section and *all its Content Items* to a new Section. This will copy the Categories listed and all the items within the categories (also listed) to the new Section created.<br /><br /><strong>Delete</strong>: Lets you delete the section chosen. An Alert will pop to let you confirm this choice. This action can't be performed if the section contains Content Items. In this last case, you would have to delete the Content Items and Categories first.</p><h3  align="left"><span style="FONT-WEIGHT: bold">Columns</span></h3><p  align="left"><strong>Section Name</strong>: This is the name of a section. Click the name to edit the section parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit ,<br /><br /><strong>Published</strong>: Whether a section is published or not. Click the icon to change the state.<br /><br /><strong>Reorder</strong>: This shows the order of Sections in the list. Click the arrow icons to move the item up or down.<br /><br /><strong>Order</strong>: Shows the order of Sections in the list. You may change it by editing 2 # conjointly and clicking on the 'Save Order' icon next to the Column Heading 'Order'.<br />Note: the new ordering has an effect when Sections lists are provided in the Frontend of your site.</p><p  align="left"><strong>Access</strong>: This is the User access level.<br /><br /><strong>Section ID</strong>: This is the ID for each section as defined in the database.</p><p  align="left"><strong># Categories</strong>: This is the number of categories defined for the specific section.<br /></p><p  align="left"><strong># Active</strong>: This is the number of published content items in the section.<br /><br /><strong>#Trash</strong>: Number of Content Items belonging to this section and currently in the Trash.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.staticcontent.edit.html 4.6rc2/help/454.screen.staticcontent.edit.html
--- 4.5.4/help/454.screen.staticcontent.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.staticcontent.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Static Content Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Static Content Manager : New / Edit</h1>
-<p>This page allows to create or edit a Content Item. On the left side there are the two editors where you can add content for the intro and main text areas. On the right are the parameteres tabs. You can hide/unhide the parameteres tabs, by clicking the 'Hide/Unhide Advanced Details' link.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Preview</strong>: Opens a new window to preview the content as you would in the Frontend of your site.<br /><br /><strong>Upload</strong>: Opens a new window which lets you upload a file or an image from your computer to the images/stories folder.<br /><br /><strong>Save</strong>: Saves the content and returns to Manager.<br /><br /><strong>Apply</strong>: Saves the content and keep the content displayed to edit.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened to edit, the Content Item remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Item Details</span></h3><p><strong>Title</strong>: Type here is the title of the content. This is the title as it will appear on the page or table listing this content.<br /><br /><strong>Title</strong> Alias: This field is not used by core.&nbsp; SEF scripts and dynamic title/meta scripts use it and it may have a future use.<br /><br /><strong>Section</strong>: Choose here the Section you want the item to belong to.<br /><br /><strong>Category</strong>: Choose here the category you want the item to belong to. The dropdown list will display the available Categories for the Secton chosen above.<br /><br /><strong>Intro Text (required)</strong>: Type here the introductory portion of the content. <strong>This is the part displayed in Blog Lists</strong> for both Categories and Sections. It can also be configured to be hidden when you view the content.<br /><br /><strong>Main Text (optional)</strong>: This is the body of your content. It is only shown when viewing that content in full view, and is not shown in Blog Lists.&nbsp; </p><h3><span style="FONT-WEIGHT: bold">Content Mambots</span></h3><p>Content Mambots are special tags you place in your content that Mambo parses to perform a particular action or function. These Mambots will be available (if published) even if you choose NO WYSIWYG editor in the Global Configuration. They may be published or edited through the Mambot Manager (Mambots-&gt;Site Mambots, Filter set to content).<br /><br />The two default Mambots specifically used when editing content are: <br /></p><ul style="MARGIN-LEFT: 40px"><li><strong>{ mosimage } (mosimage Mambot)</strong>: Used to tell Mambo where to place graphics in your content.</li><li><strong>{ mospagebreak } (mospaging Mambo)</strong>: Instructs Mambo to create a page break in your content. You can break your content into several pages if you like. If you do, a table of content will display to let you navigate between the different pages created.</li></ul><p><br />Buttons to insert these codes may be published or not through (Mambots-&gt;Site Mambots, Filter set to editor.xtd). You may also manually type them into your content. Remember that in order for your images to show in the content, you must insert the {mosimage} code snippet where you would like your image to be placed in your content. <br /><br /><strong>NOTE</strong>: The images in the Intro Text can be hidden for Blog Lists. This is a configurable setting for these Menu Items. Also, this is a global setting that will affect your entire web site as a default in Global Configurations. If you are having trouble getting images to display within the Intro Text and the problem keeps cropping up in Blog Lists, then make sure that the Parameters for MOSImages is set to Show for that menu entry.</p><h3><span style="FONT-WEIGHT: bold">Formatting content</span></h3><p>The formatting options interface depend on the Editor you are using.<br />Many editors are available as Open Source (through MamboForge) or commercial products.<br /><br />Mambo comes with 2 default editors:<br /></p><ul style="MARGIN-LEFT: 40px"><li><strong>NO WYSIWYG</strong>: This editor lets you enter text and/or HTML code directly.</li><li><strong>TinyMCE</strong>: This editor lets edit in WYSIWYG or HTML mode (See specific Help).</li></ul><p><strong>NOTE</strong>: It is advised to publish only one editor at a time in Mambot Manager and to save also that choice in Global Configuration.</p><h3>Parameters Tabs</h3><p><span style="FONT-WEIGHT: bold">The Attributes Area for content consists of five tabs: </span><br />Publishing, Images, Parameters, Meta Info and Link to Menu.<br /><br /><span style="FONT-WEIGHT: bold">Publishing</span><br /><span style="FONT-STYLE: italic">Publishing Info</span><br /><br /><strong>Show on Frontpage</strong>: Check the box if you want this content to be assigned to the FrontPage Component.<br /><br /><strong>Published</strong>: Check the box to let the item show on your site.<br /><br /><strong>Access Level</strong>: Choose who will be able to view this content. Public, registered or special.<br /><br /><strong>Author Alias</strong>: You can publish the author's name for a piece of content. You can choose a Registered user as displayed through the dropdown or type any name there (an author that does not have an account or content created by many authors as a group).<br /><br /><strong>Change Creator</strong>: This allows you to assign ownership of this content to another registered user.<br /><br /><strong>Ordering</strong>: Select the order in which this content is listed relative to others in this Category. The choices available in the dropdown will show once changes to the item are saved or applied.<br /><br /><strong>Override Created Date</strong>: This shows the created date for the content. You can change the date if necessary.<br /><br /><strong>Start Publishing</strong>: Select the date when this document is to be published on the web site.<br /><br /><strong>Finish Publishing</strong>: If desired, you can set the date when your content is to be expired.<br /><br /><strong>Content ID</strong>: This is the ID of the content in the database.<br /><br /><strong>State</strong>: This shows the current state of the document. It is not editable.<br /><br /><strong>Hits</strong>: This gives the number of times this content was viewed. The Reset Hits Value button allows you to reset the counter to zero.<br /><br /><strong>Revised</strong>: This shows the number of edits this content has undergone.<br /><br /><strong>Created</strong>: This is the date this content item was created.<br /><br /><strong>By</strong>: This is the name of the user that created the content item.<br /><br /><strong>Last Modified</strong>: This is the date when this content item was last modified, if ever.<br /><br /><strong>By</strong>: This is the name of the user that last modified this content, if ever. <br /><br /><br /><span style="FONT-WEIGHT: bold">Images</span><br /><span style="FONT-STYLE: italic">MOSImage Control</span><br /><br /><strong>Sub-folder</strong>: Choose here the sub-folder you want to get the images from. These are in images/stories/.<br /><br /><strong>Gallery Images</strong>: This dropdown lists the images available in the specific sub-folder. <br />Highlight one or multiple image name(s) and click on the 'Add' button.<br />The name(s) will display in the Content Images dropdown.<br /><br /><strong>Content Images</strong>: The 'up' and 'down' buttons determine the order of images if there are more than one on this page. The images will display relative to the instances of {mosimage} tags in your content.<br /><br /><strong>Edit the image selected</strong></p><p>Select an image in 'Content Images'.<br /><strong>Source</strong>: Displays the default name of the image highlighted. You may edit that name.<br /><strong>Image Align</strong>: Lets you choose between None, center, left or right.<br /><strong>Alt Text</strong>: Lets you choose an Alt Text for the image.<br /><strong>Border</strong>: Type here the number of pixels you want the border to be around the image.<br /><strong>Caption</strong>: Type here a caption for the image.<br /><strong>Caption Align</strong>: Lets you choose between None, center, left or right.<br /><strong>Width</strong>: Type here a number in pixels to override the width of the image<br /><strong>Apply</strong>: Click on this button to apply all the parameters defined for this image<br /><br /><span style="FONT-WEIGHT: bold">Parameters</span><br /><span style="FONT-STYLE: italic">Parameter Control<br /><br /></span>These parameters control what you see when you view a Content Item in full view.<br /><br /><strong>Page Class Suffix</strong>: Allows you to set customized styles for this page. The suffix you type here is automatically added to the CSS classes for this page, and will have to be defined in your template's CSS stylesheet for usage.<br /><br /><strong>Back Button</strong>: Controls whether to show or hide a &quot;Back&quot; text link that would appear on the bottom of the page and return the user to the previously viewed page. The pull down lets select 'Use Global' to use the parameter as defined globally through the Site-&gt;Global Configuration, 'Hide' or 'Show'.<br /><br /><strong>Page Title</strong>: Text to display at the top of the page.<br /><br /><strong>Show/Hide Page Title</strong>: Hides or shows the Page Title text (defined in the field described above).<br /><br /><strong>Section Name</strong>: Hides or shows the name of the section to which each item belongs. If this option is turned on, each item's section name will be shown under the item's title on the home page.<br /><br /><strong>Section Name Linkable</strong>: Enables you to make each item's section name linkable. Applies only when the Section Name option (described above) is set to 'Show.'<br /><br /><strong>Category Name</strong>: Hides or shows the name of the category to which each item belongs. If this option is turned on, each item's category name will be shown under the item's title on the home page.<br /><br /><strong>Category Name Linkable</strong>: Enables you to make each item's category name linkable. Applies only when the Category Name option (described above) is set to 'Show.'<br /><br />For each of the following eight items listed below, you can use the option selected in the Global Configuration settings (Site -&gt; Global Configuration) by selecting 'Use Global' or you can override the Global Configuration setting by selecting 'Show' or 'Hide.' Overriding the settings here for items will not affect the Global Configuration settings and will not affect the settings on the rest of the site.<br /><br /><strong>Linked Titles</strong>: Enables you to make item titles linked. The link will go to the item page.<br /><br /><strong>Item Rating</strong>: Hides or shows ratings given to home page items by your site's users.<br /><br /><strong>Author Names</strong>: Hides or shows the names of authors of items.<br /><br /><strong>Created Date and Time</strong>: Hides or shows the date and time that items were created.<br /><br /><strong>Modified Date and Time</strong>: Hides or shows the date and time that items were last modified.<br /><br /><strong>PDF Icon</strong>: Hides or shows the icon and link to the PDF version of items.<br /><br /><strong>Print Icon</strong>: Hides or shows the icon and link to the printer-friendly format of items.<br /><br /><strong>Email Icon</strong>: Hides or shows the icon and link to the page that enables users to email items to others.<br /><br /><strong>Key Reference</strong>: A text key that the item may be referenced by (like a help reference).<br /><br /><strong>Docbook Type</strong>: Experimental, do not use in production work. Associates a type of DocBook document to this item.<br /><br /><span style="FONT-WEIGHT: bold">Meta Info</span><br /><span style="FONT-STYLE: italic">Meta Data</span><br /><br /><strong>Description</strong>: This information is inserted in the headers of your content. It is commonly used by search engines.<br /><br /><strong>Keywords</strong>: These keywords are related to the header information provided for search engines, but they also provide another important function. These keywords drive the What's Related Module that provides automatic links to other content items that shares a similar keyword. <br /><br /><strong>Add Sect/Cat/Title</strong>:&nbsp; Clicking on this button is a convenient way to insert the content's information into the keywords field, including the content's title, section name, and category name. <br /><br /><span style="FONT-WEIGHT: bold">Link to Menu<br /><br /></span>This will create a 'Link - Content Item' in the menu you select.<br /><br /><strong>Select a Menu</strong>: Highlight here once the menus defined for your site.<br /><br /><strong>Menu Item Name</strong>: The name of the Menu as it will appear on your site.<br /><br /><strong>Link to Menu</strong>: Click on this button to create the Menu Item.<br /><br /><br /><span style="FONT-WEIGHT: bold">Existing Menu Items<br /><br /></span>This displays a list of all 'Link - Content Item' Menu Items referencing this content.<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.staticcontent.html 4.6rc2/help/454.screen.staticcontent.html
--- 4.5.4/help/454.screen.staticcontent.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.staticcontent.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Static Content Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Static Content Manager</h1>
-<p >The Static Content Manager&nbsp;shows a list of the Static Content items on your site.<br />Static Content Items are not part of a section or category. They cannot be added to a blog, category or section page. The only way to display them on your site is through a Menu.</p><p >You may enter text in the &quot;<strong>Filter</strong>&quot; box to refine the list based on whether the text is found in the title of any item. Type in any text and press Enter. You may also &quot;<strong>Order</strong>&quot; the list by a specific ordering and/or Author.</p>
-<h3 ><span style="FONT-WEIGHT: bold">Toolbar Actions</span></h3><p >You &quot;select&quot; items by clicking the checkbox at the start of each row.<br />&nbsp;<br /><strong>New</strong>: Click the 'New' icon to create a new Static Content item.<br />&nbsp;<br /><strong>Edit</strong>: Click the 'Edit' icon to edit the Static Content item.<br /><br /><strong>Publish and Unpublish</strong>: Click the 'Publish' or 'Unpublish' icon to publish or unpublish any number of selected Static Content items.<br />&nbsp;<br /><strong>Trash</strong>: Click the 'Trash' icon to put the Static Content items in the trash bin. They are not completely removed but can't be displayed on your site. You can restore this Static Content items in the Trash Manager.</p><h3 ><span style="FONT-WEIGHT: bold">Columns</span></h3><p ><strong>Title</strong>: This is the title of the Content item. Click here to edit content. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit ,<br /><br /><strong>Published</strong>: This shows whether the item is published. Hover over this icon to see a summary of the publishing information. Click to change state.<br /><br /><strong>Order</strong>: Shows the order of Static Content Items in list. You may change it by editing 2 # conjointly and clicking on the 'Save Order' icon next to the Column Heading 'Order'.<br /><br /><strong>Access</strong>: This is the user access level for the menu item. Click on the Access level to switch it to another value.</p><p ><strong>ID</strong>: This is the ID of the item in the database.</p><p ><strong>Links</strong>: This is the # of Link - Static Content Items for this item in your menus.<br />&nbsp;<br /><strong>Author</strong>: This shows the name of the author of the Static Content. Click to edit the author information.<br /><br /><strong>Date</strong>: This is the date the item was created.<br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.stats.searches.html 4.6rc2/help/454.screen.stats.searches.html
--- 4.5.4/help/454.screen.stats.searches.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.stats.searches.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Search Engine Text</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Search Engine Text</h1>
-This page lists the logged search text that visitors have used on your site. <p><strong><font color="#ff0000">You must enable the &quot;Log Search Strings&quot; option in the &quot;Statistics&quot; tab of Global Configuration for this data to be collected.</font></strong></p><p>The list shows:</p><p><strong>Search Text</strong>: This is the string or phrase the site visitor entered. <br />&nbsp;<br /><strong>Times Requested</strong>: This is the number of times this text has been entered.<br />&nbsp;<br /><strong>Results Returned</strong>: This is the number of search items that would appear if you performed the search now.<br />&nbsp;<br />Some results to look at are words or phrases that are commonly searched for, but return no results. You should assess whether you have content that is applicable. If necessary, add keywords using the Meta Info tab for that content item.</p><p>Other results to look for are misspelt words or related words. For example, if a common search word is 'dark' but it is commonly misspelt as 'drak' then you may consider putting 'drak' in the keywords section. You may also have content about a waste facility where you might add common alternative terms in the meta keywords such as 'trash' or 'dump'.</p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.syndicate.html 4.6rc2/help/454.screen.syndicate.html
--- 4.5.4/help/454.screen.syndicate.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.syndicate.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Syndication Settings</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Syndication Settings</h1>
-<p align="center" width="550" border="0" hspace="0" vspace="0" height="299"><table class="hs_table"><tbody><tr><td class="hs_header01"><p><strong>Syndication Settings</strong></p></td></tr><tr><td class="hs_header02"></td></tr></tbody></table></p><p class="auto"  align="left">To&nbsp;syndicate your site is&nbsp;to make the Content Items from your Web&nbsp;site assigned to the FrontPage Component&nbsp; available for&nbsp;syndication via&nbsp;a&nbsp;distributable file. Other site owners can display this information in their web sites.</p><p class="auto"  align="left"><strong>Cache:</strong> Yes&nbsp;or&nbsp;No? Choose the&nbsp;'Yes' radio button to&nbsp;create and&nbsp;display a&nbsp;new News Feed dependant on&nbsp;the value set&nbsp;in&nbsp;the Cache Time field. Choose the&nbsp;'No' radio button to&nbsp;display a&nbsp;new News Feed each time an&nbsp;item is&nbsp;added to&nbsp;the FrontPage Component and&nbsp;each time the&nbsp;News Feed is&nbsp;accessed by&nbsp;another server. <br /><strong><br /><span style="COLOR: rgb(255,0,0)">Warning:</span></strong> Setting Cache to&nbsp;'No' will cause your News Feed to&nbsp;be checked every time someone visits any&nbsp;site where your News Feed is&nbsp;syndicated. This can&nbsp;potentially cause excessive bandwidth usage as&nbsp;well as&nbsp;extreme draw on&nbsp;your server resources.<br /><br /><strong>Cache Time</strong>: This is&nbsp;the number of&nbsp;seconds before your site's database is&nbsp;checked for&nbsp;updates. The&nbsp;default in&nbsp;Mambo is&nbsp;3600 seconds, or&nbsp;60 minutes. After this time has&nbsp;elapsed, the&nbsp;News Feed will refresh itself from your database thus displaying any&nbsp;new items you&nbsp;have published&nbsp; through the FrontPage Component to&nbsp;your News Feed.</p><a  name="p310-5"></a><p class="auto"  align="left"><strong>#Items:</strong> Type the&nbsp;number of&nbsp;items you&nbsp;would like to&nbsp;syndicate and&nbsp;display in&nbsp;your News Feed. <strong></strong><br /><br /><strong>Title:</strong> Type the&nbsp;title you&nbsp;wish to&nbsp;display above your articles within your syndicated News Feed when it&nbsp;is displayed on&nbsp;those sites and&nbsp;pages which syndicate your News Feed. The title will appear as a link to your site.<br /><br /><strong>Description:</strong> Type a&nbsp;brief statement to&nbsp;describe your News Feed. If none is entered, it will default to &quot;Mambo site syndication&quot;.<br /><br /><strong>Image:</strong> Select an&nbsp;image from the&nbsp;<span class="nobr">drop-down</span> menu to&nbsp;be included in&nbsp;your News Feed.&nbsp; If you do not have an image, you can upload one via the Media Manager.<br /><br /><strong>Image Alt:</strong> Type the&nbsp;text for&nbsp;the alt tag&nbsp;to&nbsp;compliment the&nbsp;image you've selected for&nbsp;inclusion in&nbsp;the News Feed via&nbsp;the Image <span class="nobr">drop-down</span> menu.<br /><br /><strong>Limit Text:</strong> Yes&nbsp;or&nbsp;No? Choose the&nbsp;'Yes' radio button if&nbsp;you wish to&nbsp;limit the&nbsp;Text Length field. Choose the&nbsp;'No' radio button to&nbsp;force the&nbsp;value in&nbsp;the Text Length field to&nbsp;be ignored, thus displaying the&nbsp;entire contents of&nbsp;each item.<a name="p310-11"></a></p><p class="auto"  align="left"><strong>Text Length:</strong> Type the&nbsp;number of&nbsp;words to&nbsp;display per&nbsp;News Feed item. <br /><strong>NOTE:</strong> The&nbsp;Limit Text radio button must be&nbsp;set to&nbsp;'YES' to&nbsp;activate this function.<br /></p><p class="auto"  align="left"><strong>Order</strong>: Order that the items -as listed in the FrontPage Manager- will be displayed. <br /></p><ul><li><span >'Default': Arranges items according to the order set in the FrontPage Manager.</span></li><li><span >'FrontPage Ordering': Same as above.</span></li><li><span >'Oldest first': Arranges items in chronological order, with the oldest items first.</span></li><li><span >'Most recent first': Arranges items in chronological order, with the newest items first.</span></li><li><span >'Title Alphabetical': Arranges items by title in alphabetical order.</span></li><li><span >'Title Reverse-Alphabetical': Arranges items in reverse-alphabetical order.</span></li><li><span >'Author Alphabetical': Arranges items by author in alphabetical order.</span></li><li><span >'Author Reverse-Alphabetical': Arranges items by author in reverse alphabetical order.</span></li><li><span >'Most Hits': Arranges items according to the number of hits, with the items with the most hits first.</span></li><li><span >'Least Hits': Arranges items according to the number of hits, with the items with the least hits first.</span></li></ul><span ><br /><strong>Live Bookmarks</strong>: Activate support for Firefox Live Bookmark functionality.<br />Bookmark File: Special file name. If none is entered, will use the default file.</span> </body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.system.info.html 4.6rc2/help/454.screen.system.info.html
--- 4.5.4/help/454.screen.system.info.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.system.info.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>System Information</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>System Information</h1>
-<p>The information is displayed in a tabbed format with three main sections of content.</p><p><strong>System Info Tab</strong>: This a broad snapshot of the server and versions of the current installation components of your Mambo site. Here you will find your PHP build and version, your MySQL database version along with the Mambo version and relevant settings that your server has set that might interfere with your current site installation. Here, you will also find the contents of your Mambo Configuration file. This file is produced when you perform the installation of Mambo on your server, and is changed when you make changes to in the global configuration section of the Administration of Mambo. This file defines many of the global variables that Mambo uses to execute. You can not edit the file from here, but it does allow you to look at your current settings to find problems or to copy the information for a support post on the forum on <a href="http://www.mamboserver.com/">www.mamboserver.com</a>.<br />&nbsp;<br /><strong>PHP Info Tab</strong>: PHP is the server side scripting language that Mambo runs on. This language is installed and executes on the server, and therefore all the settings are made on that server. Everything you ever wanted to know about the PHP installation on your Mambo server is listed here. How much control you have over changing this information depends on whether you own the server or if your server host is willing to work with you on needed changes. The PHP tab will allow you to look at all the settings and variables that define your PHP installation. It is a good practice to insure that you know what requirements are needed for any 'Third Party' Components that you plan to use with Mambo. You can then check for those requirements here.&nbsp;<br />&nbsp;<br /><strong>Permissions Tab</strong>:&nbsp;Displays a list of all critical Mambo directories that should be writable in order for Mambo to function correctly.&nbsp;If you find a directory that is not writable, you should change it to writable. You cannot do it from here. You have to do it using your FTP&nbsp;client, or asking your hoster to do it for you.<br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.templates.assign.html 4.6rc2/help/454.screen.templates.assign.html
--- 4.5.4/help/454.screen.templates.assign.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.templates.assign.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Templates: Assign</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Templates: Assign</h1>
-<p>This page lets you assign the template chosen to specific Menu Items/pages.<br /><br />The&nbsp;list displays all your Menu Items grouped per menu.</p><p>You can select multiple Menu Items, by holding the CTRL key while clicking.</p><p>This will override de default template for the pages chosen. <br /><br />If you choose '<strong>None</strong>', the Default template will be used for all&nbsp; Menu Items/pages. </p><h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Save</strong>: Saves your choice and returns to the Template Manager.<br /><br /><strong>Cancel</strong>: Cancels the action and returns to the Template Manager.</p><p><strong>Help</strong>: This Help Screen.<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.templates.html 4.6rc2/help/454.screen.templates.html
--- 4.5.4/help/454.screen.templates.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.templates.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Template Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Template Manager</h1>
-<p>Using Template Manager you can&nbsp;view all the installed templates. You can also assign and edit Templates. Templates affect the way your site looks. You have to set one as the default. You can assign other templates to Menu Items/pages you choose. That way, you can change if you wish, the way your site looks, based on the context.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar</span></h3><p>Select a template by checking the radio button next to its name.<br /><br /><strong>Default</strong>: Assigns this default template to all Menu Items/pages. That will be the main template. It will be used, unless it is overridden by an assigned template.<br /><br /><strong>Assign</strong>: Opens a page where you can assign this template to specific Menu Items/pages. This will override the default template for the pages chosen. If you choose 'None', it will act the same way as the 'Default' parameter. <br />This function is not available for Administrator templates.<br /><br /><strong>NOTE</strong>: Both the assigned and the default template will get overridden by the Template Chooser module in the Frontend, if used. Any template displayed on this list will show in the Template Chooser module.<br />&nbsp;<br /><strong>New</strong>: Lets upload/install a new template to your site.<br />&nbsp;<br /><strong>Edit HTML</strong>: Lets edit the templates/the-template-chosen/index.php file. This is the file loaded in the FrontEnd when a user opens your site.<br /><br /><strong>Edit CSS</strong>: Lets edit the templates/the-template-chosen/css/template_css.css file which contains the CSS classes definitions for this specific template<br />&nbsp;<br /><strong>Delete</strong>: Lets you delete a template. You will be asked to confirm the delete operation. Select 'Yes' to delete or 'No' to cancel. The template will be&nbsp;permanently deleted from the database.</p><p><strong>Help</strong>: Shows this Help Screen.<br />&nbsp;<br />The Administrator Templates can be choosen by clicking the &quot;Default&quot; icon. Administrator Templates are not assignable to any pages.</p><h3><span style="FONT-WEIGHT: bold">Table Columns</span></h3><p><strong>Name</strong>: This is the name of the template. If you mouseover this name -and the 'Preview template' on top right of the list is checked-, a preview of the template is displayed.<br />&nbsp;<br /><strong>Default</strong>: This is the template that is currently published as the site template (only one can be published at a time).<br />&nbsp;<br /><strong>Assigned</strong>: This tells us whether the template is dynamically assigned to one of the pages on the site.<br />&nbsp;<br /><strong>Version</strong>: This is the template version.<br />&nbsp;<br /><strong>Date</strong>: This is the creation date of the template.<br />&nbsp;<br /><strong>Author URL</strong>: A URL provided by the author.<br />&nbsp;<br /><br /></p></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.templates.modules.html 4.6rc2/help/454.screen.templates.modules.html
--- 4.5.4/help/454.screen.templates.modules.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.templates.modules.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Module Positions</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Module Positions</h1>
-<p align="left">The Module Positions page allows you to enter details of the module positions you have used in your template. All the default module positions are already entered and in general it is unlikely you would need to change this.<br /><br />Should you want to use positions that do not pre-exist in the default Mambo setup you can simply add a name for a module position and a description. The description is optional.</p><p align="left"><br /><br />To create a new module position in your template, you insert this basic code into your template to be able to assign modules to a specific position.<br /></p><p><strong>&lt;?php mosLoadModules ( 'position' ); ?&gt;</strong></p><p align="left">The word 'position' is to be changed to whichever position you define on this page. The name of the positin must&nbsp;not has any spaces.</p><p align="left">Each module position you define in your template, must have an entry in module positions screen. Otherwise it wan't function.<br /><br />When you click on <strong>Site -&gt; Preview -&gt; Inline with Position</strong>, you may visualize your Home page with blocks displaying the Positions used in the template assigned to the Home page. </p><p align="left" /></body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.trashmanager.html 4.6rc2/help/454.screen.trashmanager.html
--- 4.5.4/help/454.screen.trashmanager.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.trashmanager.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Trash Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Trash Manager</h1>
-<p>This screen shows&nbsp;a list of the Content Items that is in the 'Trash bin'. Trash bin is the equivelant of the 'Recycle bin' on Windows. There are two tabs. <strong>Content Items tab</strong>, displays all the content items that have been trashed. <strong>Menu Items tab</strong>, displays all the Menu Items that have been trashed.</p>
-<h3>Toolbar</h3><p><strong>Restore</strong>: Select an item from the table and click the Restore icon to undelet it. The item will be returned to its original position, and by default, it will be unpublished.</p><p><strong>Delete</strong>: Select an item from the table and click the delete icon, to<strong> permanently delete</strong> it.</p><p><strong>Help</strong>: You see this help screen</p><h3>Table</h3><p><strong>Title</strong>: This is the title of the trashed item<br />&nbsp;&nbsp;&nbsp; <br /><strong>Section</strong>: This is the section of the trashed item.<br />&nbsp;&nbsp;&nbsp; <br /><strong>Category</strong>: This is the category of the trashed item.<br />&nbsp;&nbsp;&nbsp; <br /><strong>ID</strong>: This is the ID of the trashed item.<br />&nbsp;&nbsp;&nbsp; <br /><strong>Menu</strong>: The menu this menu item belongs</p><p><strong>Type</strong>: The type of menu item</p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.users.edit.html 4.6rc2/help/454.screen.users.edit.html
--- 4.5.4/help/454.screen.users.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.users.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>User Manager - Add or Edit Users</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>User Manager - Add or Edit Users</h1>
-<p>This screen is used to either add a new user or edit an existing one.</p>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><strong>Save</strong>: Lets save the creation/modification and return to User Manager.</p><p><strong>Apply</strong>: Saves the creation/modification and keeps the screen open for editing.<br /></p><p><strong>Cancel</strong>: Cancels the action and lets the User checked-in.</p><h3><span style="FONT-WEIGHT: bold">User Details</span></h3><p><strong>Name</strong>: Type here the name of the user as it will be listed in the User Manager.</p><p><strong>Username</strong>: Type here The Username as it has to be entered for login.</p><p><strong>Email</strong>: Type here the user's e-mail adress.</p><p><strong>New Password</strong>: Type here the user's password. If you want to change a user's password you can enter here the new one, and retype it on the next field.</p><p><strong>Verify Password</strong>: Type here the user's password.<br /></p><p><strong>Group</strong>: Choose here a type of user. Please see below for detailed information.</p><br /></p><p><span style="TEXT-DECORATION: underline"></span><strong>Block User</strong>: Prevents or lets user login.</p><p><strong>Receive Submission Emails</strong>: Enable or not an e-mail be sent to the administrator when the user has submitted some content.<br /></p><p><strong>Register Date</strong>: Displays the date the user has been registered.<br /></p><p><strong>Last Visit Date</strong>: Displays the date on which this user has last logged in.</p><h3><span style="FONT-WEIGHT: bold">Contact Information</span></h3><p>These informations are only present when editing a user and only if the contact has been created in the Contacts Component and linked to the user (Components -&gt; Contact -&gt; Manage Contacts). If this has been done the information will be displayed and a link at the bottom of the box provides a direct access to the Edit Contact page for that contact.</p><p />
-<h1>Access Control Levels</h1> 
-<p>Registered users of a Mambo site belong to several groups. These groups are divided into two main gategories: Frontend and Backend. Users belonging to Frontend groups have only access to the Front end. Users belonging to&nbsp;Backend&nbsp;groups have only access both&nbsp;to the Front end and to the Back end.</p><p>Groups, are the way Mambo uses to set priviliges and access rights to users. Based on them, users, can view, have access to info for registered users, or edit/add/delete content&nbsp;using the frontend or backend interface.&nbsp;</p><h3>Frontend groups</h3><p><strong>Registered - </strong>This group allows the user to login to the Frontend interface.</p><p><strong>Author -</strong> This group allows a user to post content, usually via a link in the User Menu.</p><p><strong>Editor - </strong>This group allows a user to post and edit any content item from the Frontend.</p><p><strong>Publisher -</strong> This group allows a user to post, edit and publish any content item from the Frontend.</p><h3>Backend groups or Administration section groups</h3><p><span style="FONT-WEIGHT: bold">Manager</span>- This group allows access to content creation and system information.<br />Administration Menus accessed:</p><ul><li>Help (general), including System Info.<br /></li><li>Site: Media Manager, Preview.</li><li>Menu: Edit existing Menus, including creating Menu Items. All related functions.</li><li>Content: Content Managers, Static Content Manager, Section Manager, Category Manager, FrontPage Manager and Archives Manager. All related functions.</li></ul><p><strong>Administrator -</strong> This group allows access to most administration functions.<br />All functions accessed by <span style="FONT-WEIGHT: bold">Manager</span>, plus:</p><ul><li>Site: Statistics, Trash Manager, User Manager (may create/edit/delete any type of user except SuperAdministrator; Note: as of 4.5.2.1, may also delete an other administrator bug corrected in 4.5.3.)</li><li>Menu: Menu Manager</li><li>Modules, Components, Mambots: Install/Uninstall, Create, Edit. Except Mass mail Component.<br /></li></ul><p><strong>Super Administrator - </strong>This group allows access to all administration functions.<br />All functions accessed by <span style="FONT-WEIGHT: bold">Manager </span>and <span style="FONT-WEIGHT: bold">Administrator</span>, plus:<br /><br /></p><ul><li>Site: Global Configuration, Language Manager, Template Manager, User Manager (may create/edit any type of user, may delete any user except SuperAdministrator; Note 1: SuperAdministrator may be deleted through the database; Note 2: as of 4.5.2.1, details for SuperAdministrator may be changed by another SuperAdministrator bug).</li><li>Components: Mass Mail.<br /></li><li>Messages: Inbox, Configuration.</li><li>System: Clear Cache (if Cache has been enabled in Global Configuration), Global Checkin.</li></ul> 
- </body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.users.massmail.html 4.6rc2/help/454.screen.users.massmail.html
--- 4.5.4/help/454.screen.users.massmail.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.users.massmail.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Mass Mail Users</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Mass Mail Users</h1>
-<p>This page allow you to send a mail a message to one or more groups of Users.</p>
-<h3>Details</h3><p><strong>Group</strong>: Make a selection from the list. Select &quot;All User Groups&quot; to mail the message to all users. Only one selection can be made from this list.<br />&nbsp;<br /><strong>Mail to Child Groups</strong>: Check this box to automatically include all of the child groups of the selected group. For example, if you select the &quot;Editor&quot; group and check this box, all users in the Publisher group will also be included in the mass mail.<br />&nbsp;<br /><strong>Subject</strong>: Type a subject for the message.<br />&nbsp;<br /><strong>Message</strong>: Type the body of the message<br />&nbsp;<br />When you are finished, click the&nbsp;<strong>Send Mail&nbsp;icon</strong> to mail the message or <strong>Cancel </strong>to abort the mail.<br />&nbsp;<br /><strong>NOTE</strong>: Only a user in the Super Administrator group is permitted to use this feature.<br />&nbsp;</p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.weblink.edit.html 4.6rc2/help/454.screen.weblink.edit.html
--- 4.5.4/help/454.screen.weblink.edit.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.weblink.edit.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Web Link Manager : New / Edit</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Web Link Manager : New / Edit</h1>
-<div align="left">This page allow you to add or edit the details for a Web Link.</div>
-<h3><span style="FONT-WEIGHT: bold">Toolbar Icons</span></h3><p><span style="FONT-WEIGHT: bold"></span><strong>Save</strong>: Saves the Web Link and returns to Manager.<br /><br /><strong>Close</strong>: Cancels the action. Any modification is lost. If opened for edit, the Web Link remains checked-in.</p><h3><span style="FONT-WEIGHT: bold">Details</span></h3><p><strong>Name</strong>: Type here the name of the Weblink as it will appear on your site.<br />&nbsp;<br /><strong>Category</strong>: Select the desired category.<br />&nbsp;<br /><strong>URL</strong>: Type here the URL address of the Web Link.<br />&nbsp;<br /><strong>Description</strong>: Add a text description for the Web Link.<br />&nbsp;<br /><strong>Ordering</strong>: Choose here the order of the Web Link in the specific category as it will appear on the site when displayed through the Table - Weblink Category Menu Item.<br />&nbsp;<br /><strong>Approved</strong>: Decides here if a proposed Web Linl is approved by the Administrator and able to be published.<br />&nbsp;<br /><strong>Published</strong>: This is whether the Web Link is published or not.</p><h3><span style="FONT-WEIGHT: bold">Parameters</span></h3><p><strong>Target</strong>: Decides whether clicking on the link will open it in the same Window (Parent Window with Browser Navigation), in a New Window with Browser Navigation or in a New Window without Browser Navigation.<br /></p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/454.screen.weblink.html 4.6rc2/help/454.screen.weblink.html
--- 4.5.4/help/454.screen.weblink.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/454.screen.weblink.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
-<head>
-<title>Web Link Manager</title>
-<link href="css/help.css" rel="stylesheet" type="text/css" />
-<meta name="copyright" content="(C) 2000 - 2005 Miro International Pty Ltd" />
-<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
-</head>
-<body>
-<h1>Web Link Manager</h1>
-<p align="left">Weblink Manager is the place from where you can add or administer the Web Links you&nbsp;present on your site. You can create new Web Links, publish, unpublish or&nbsp;delete them.&nbsp;&nbsp;</p><p>This page shows a list of the Web Links.<br />&nbsp;<br /><strong>Title</strong>: This is the name of the Web Link. Click the name to edit the Web Link.<br />&nbsp;<br /><strong>Category</strong>: This is the category that the Web Link is assigned to.<br />&nbsp;<br /><strong>Hits</strong>: This is the number of hits that the Web Link has received.<br />&nbsp;<br /><strong>Checked Out</strong>: This shows the name of a user if this Web Link item is 'Checked Out'. You will not be able to edit an item if it is checked out by another user. It must be checked&nbsp;back in by an administrator by going to Systems in the Menu bar -&gt; Global Checkin. It can also be checked back in by the User who has checked the item out by clicking the 'Edit' icon of the Web Link item and then clicking the the 'Save' or 'Cancel' icon.<br />&nbsp;<br /><strong>Approved</strong>: This is whether the Web Link has been approved for publication. Remeber that user submitted links are not automatically approved.<br />&nbsp;<br /><strong>Reorder</strong>: Click the icons to move the record up or down in the list.<br />&nbsp;<br />To <strong>Publish</strong> or <strong>Unpublish</strong> one or more Web Links, select the checkbox(es) next to the name of the Web Link(s) and click either the 'Publish' or 'Unpublish' icon.<br />&nbsp;<br />Click the 'New' icon to <strong>add a new category</strong>.<br />&nbsp;<br />Click the name of the Web Link to <strong>edit the details</strong>, or select the check box next to the name and <strong>click the 'Edit' icon</strong>.<br />&nbsp;<br />To <strong>delete a Web Link</strong>, select the check box next to the name and click the 'Delete' icon. You will be asked to confirm the delete operation. Select 'Yes' to delete the Web Link or 'No' to cancel.<br />&nbsp; </p>
-</body>
-</html>
\ No newline at end of file
diff -ruN 4.5.4/help/admin.cpanel.html 4.6rc2/help/admin.cpanel.html
--- 4.5.4/help/admin.cpanel.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/admin.cpanel.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Control Panel</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Control Panel </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Control
+                         Panel is the first page you see when you log into the
+                         Administrators area. At anytime, you can return to it
+                         by clicking the &quot;Home&quot; menu
+                         item in the top menu bar.&nbsp; </p>
+               <p>Control Panel. has two
+                         states: <strong>Simple</strong> and <strong>Advanced</strong>. In
+                         Simple state, displays only 4 shortcut icons; Advanced
+                         state, displays 11 shortcut icons</p>
+               <p>From the
+                         Control Panel&nbsp;you can have&nbsp;easy access to
+                         the frequently used parts of the Administrator area.</p>               
+               <p><strong>Control Panel
+                         Icons:</strong></p>               <ul>
+                              <li><strong>Help</strong>: Click this icon to view&nbsp;an
+                              index of&nbsp;the locally available Help Screens. You can
+                              also have access to special help screens&nbsp;by pressing
+                              the help icon, found on the right top corner of each screen.All
+                              Content Items: Click this icon to access the All
+                              Content Items screen.&nbsp; All Content Items,&nbsp;lists
+                              all of your Content Items.&nbsp;Clicking on a Content Item,
+                              you can edit it.Static Content Manager:
+                              Click this icon to access the Static Content Manager.&nbsp;You
+                              will be able to edit these type of&nbsp; items.</li>
+                              <li><strong>Frontpage</strong>: Click this icon to
+                                   access the Front Page Manager.&nbsp;You will be able to edit&nbsp;Content
+                              items that appear on your Frontpage.</li>
+                              <li><strong>Sections</strong>: Click this icon to
+                                   access the Section Manager.&nbsp;You will be able
+                              to edit your Sections.</li>
+                              <li><strong>Categories</strong>:
+                                                  Click this icon to access the Category
+                                                  Manager. You will be able to edit
+                                             your Categories.</li>
+                              <li><strong>Media</strong>:
+                                                  Click this icon to access the Media
+                                                  Manager. Tou will be able to administer
+                              your media files.</li>
+                              <li><strong>Trash</strong>:&nbsp;Click this icon to
+                                   access the Trash manager.&nbsp;You will be able
+                                   to delete permanently or to restore any items in
+                              the Trash Manager.</li>
+                              <li><strong>Menus</strong>: Click this
+                                   icon to access the Menu Manager.&nbsp;You will be able&nbsp; to&nbsp; edit
+                         any of your menus.&nbsp;</li>
+                              <li><strong>Users</strong>: Click this icon to access
+                              the&nbsp;Users Manager.&nbsp;You will be able&nbsp; to&nbsp;add,
+                              remove, administer users of your site.&nbsp;&nbsp;Global
+                              Configuration: Click this icon to access the Global
+                              configuration.&nbsp;You will be able to edit any of your
+                              web site configurations.</li>
+                         </ul>
+                         <p><strong>On
+                                   the right side of the screen there are&nbsp;five
+                                   tabs: </strong></p>
+               <ul>
+                    <li><strong>Logged</strong>:
+                                                       This displays a list of users currently
+                                                  logged on (both in the Admin and the
+                                                       Frontend sections). Click a users&#39; name to go to the User
+                    Edit page for that user. </li>
+                    <li><strong>Components</strong>:
+                                                       Click this shortcut tab to
+                                                       access any of the components
+                                                                 and component links
+                    that you wish to edit.</li>
+                    <li><strong>Popular</strong>:
+                                                                      Click this tab
+                                                       to access the screen which
+                                                       lists in order, the most popular
+                                                            Content Items on your
+                                                       site.&nbsp;This includes the date the
+                                                            Content Item was created and the number of&nbsp;hits. Click
+                    the Content Item name to edit that item.</li>
+                    <li><strong>Latest&nbsp;Items</strong>:
+                                                                 Click this tab to access the screen which lists the
+                                                                 most recently added Content Items.&nbsp;This includes
+                                                                 the creation date and the author. Click the Content
+                         item name to edit that item.</li>
+                    <li><strong>Menu
+                                                       Stats</strong>: Click this tab to access
+                                                       the screen which lists all
+                                                       menus and the number of item
+                                                       links in each menu.&nbsp; The number
+                                                                      of links is the total created, not the total
+                                                                      published. Click the name of a menu to access
+                                                                      the screen which lists the items for that
+                         menu.</li>
+                         </ul>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr></table>
+</body>
+</html>
\ No newline at end of file
diff -ruN 4.5.4/help/admin.system.info.html 4.6rc2/help/admin.system.info.html
--- 4.5.4/help/admin.system.info.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/admin.system.info.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>System Information</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">System Information</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The information
+                    is displayed in a tabbed format with three main sections
+                    of content.</p>
+               <ul>
+                    <li><strong>System Info Tab</strong>: This a
+                         broad snapshot of the server and versions of the current
+                         installation components of your Mambo site. Here you
+                         will find your PHP build and version, your MySQL database
+                         version along with the Mambo version and relevant settings
+                         that your server has set that might interfere with your
+                         current site installation. Here, you will also find
+                         the contents of your Mambo Configuration file. This
+                         file is produced when you perform the installation of
+                         Mambo on your server, and is changed when you make changes
+                              to in the global configuration section of the Administration
+                              of Mambo. This file defines many of the global
+                         variables that Mambo uses to execute. You can not edit
+                         the file from here, but it does allow you to look at
+                         your current settings to find problems or to copy the
+                         information.&nbsp;</li>
+                    <li><strong>PHP
+                         Info Tab</strong>: PHP is the server side scripting
+                         language that Mambo runs on. This language is installed
+                         and executes on the server, and therefore all the settings
+                         are made on that server. Everything you ever wanted
+                         to know about the PHP installation on your Mambo server
+                         is listed here. How much control you have over changing
+                         this information depends on whether you own the server
+                         or if your server host is willing to work with you on
+                         needed changes. The PHP tab will allow you to look at
+                         all the settings and variables that define your PHP
+                         installation. It is a good practice to insure that you
+                         know what requirements are needed for any &#39;Third
+                         Party&#39; Components that you plan to use with Mambo. You
+                    can then check for those requirements here.&nbsp;&nbsp;</li>
+                    <li><strong>Permissions
+                         Tab</strong>:&nbsp;Displays a list of all critical Mambo
+                         directories that should be writable in order for Mambo to
+                         function correctly.&nbsp;If you find a directory that is
+                         not writable, you should change it to writable. You cannot
+                         do it from here. You have to do it using your FTP&nbsp;client,
+               or asking your hoster to do it for you.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/banners.client.edit.html 4.6rc2/help/banners.client.edit.html
--- 4.5.4/help/banners.client.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/banners.client.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Banner Client - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Banner Client Manager : Edit</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page displays information
+                    about a client when you edit it.</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Client Name</strong>: Type here the name of the business which buys banner display from your site.</li>
+               <li><strong>Contact Name</strong>: Type here the name of whom to contact about matters related to this client.</li>
+               <li><strong>Contact Email</strong>: The e-mail of the person to contact. Will only be visible here.</li>
+               <li><strong>Extra Info</strong>: Any other information about the client you wish to store. Only visible here. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click here to save your new or edited client&#39;s details.</li>
+               <li><strong>Close</strong>: Cancels the action. Any modification is lost. If opened to edit, the client remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/banners.client.html 4.6rc2/help/banners.client.html
--- 4.5.4/help/banners.client.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/banners.client.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Banner Client Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Banner Client Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows the list of Clients whose banners may be displayed on your site.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Client Name</strong>: This is the name of the client.</li>
+               <li><strong>Client ID</strong>: System-generated ID number unique
+                    to each client. </li>
+               <li><strong>Contact</strong>: Displays the contact for the Client.</li>
+               <li><strong>No of active banners</strong>: Displays the number
+                    of banners published for this client. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New</strong>:&nbsp; Click this icon to add a new client.</li>
+               <li><strong>Edit</strong>:&nbsp; Click this icon to edit an existing
+                    client&#39;s
+                    details.</li>
+               <li><strong>Delete</strong>: Click this icon to delete one or
+                    more clients.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/banners.client.new.html 4.6rc2/help/banners.client.new.html
--- 4.5.4/help/banners.client.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/banners.client.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Banner Client - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Banner Client Manager : Create a New Banner Client </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows you to
+                    create a new banner client.</p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Client Name</strong>: Type here the name for the Client.</li>
+               <li><strong>Contact Name</strong>: Add a contact for this client.</li>
+               <li><strong>Contact Email</strong>: Add the Contact's e-mail address.</li>
+               <li><strong>Extra Info</strong>: Any other information about the
+                    client you wish to store.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click here to save.</li>
+               <li><strong>Close</strong>: Cancels without saving.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/banners.manager.edit.html 4.6rc2/help/banners.manager.edit.html
--- 4.5.4/help/banners.manager.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/banners.manager.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Banner - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Banner Manager : Edit Banner</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    edit a banner&#39;s details.</p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Banner Name</strong>: Enter a name for the Banner.</li>
+               <li><strong>Client Name</strong>: Select from the list of Banner
+                    clients.&nbsp;</li>
+               <li><strong>Impressions Purchased</strong>: Enter the number of times to display to banner into the input field, or tick the &quot;Unlimited&quot; checkbox for unlimited display.&nbsp;</li>
+               <li><strong>Banner URL</strong>: Select the banner image to be displayed from the list of available banners. Images need to be stored in the &quot;images/banners&quot; folder to be available for selection here. The selected image will be displayed at the bottom of the screen.&nbsp;</li>
+               <li><strong>Show Banner</strong>: Select Yes or No to display
+                    / hide the banner.</li>
+               <li><strong>Click URL</strong>: Enter here the full URL to the page which should open when the banner is clicked on.&nbsp;</li>
+               <li><strong>Custom banner code</strong>:&nbsp; You may enter here some code (See Developper Manual for more information).&nbsp;</li>
+               <li><strong>Clicks: &quot;Reset Clicks&quot;</strong>: Reset the
+                    click count shown on the right for the banner to 0.</li>
+               <li><strong>Banner Image</strong>: Image selected under &quot;Banner URL&quot; is displayed here for your convenience. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Opens a new window which lets you upload an image from your computer to the images/banners folder.</li>
+               <li><strong>Save</strong>: Saves and returns you to Banner
+                    Manager.</li>
+               <li><strong>Close</strong>:
+                         Cancels without saving and returns you to Banner Manager.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/banners.manager.html 4.6rc2/help/banners.manager.html
--- 4.5.4/help/banners.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/banners.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Banner Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Banner Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows the list of the banners you may display on your site.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Banner Name</strong>: This is the name of the banner. If you click on this name, you may edit the related parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit.</li>
+               <li><strong>Published</strong>: This displays whether the banner is currently Published or not for Frontend display. Click the column icon to toggle state.</li>
+               <li><strong>Impressions Made</strong>: This is the number of times the banner has been shown on your site.</li>
+               <li><strong>Impressions Left</strong>: This is the number of impressions left to display if a limit has been set while creating or editing a banner.&nbsp;</li>
+               <li><strong>Clicks</strong>: This is the number of times that particular banner has been clicked on by a user of the site.&nbsp;</li>
+               <li><strong>% Clicks</strong>: This is the number of clicks as a percentage ratio to the number of impressions that have been made. 1% would mean for example, that 1 in every 100 people had clicked on the banner.&nbsp; </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>  <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any
+                    number of selected banners</li>
+               <li><strong>Unpublish</strong>: Click to unpublish
+                    any number of selected banners.</li>
+               <li><strong>Upload</strong>: Opens a new window which lets you upload a file or an image from your computer to the images/stories folder.</li>
+               <li><strong>New</strong>: Click this icon to add a new banner.</li>
+               <li><strong>Edit</strong>: Click this icon to edit the banner&#39;s details.</li>
+               <li><strong>Delete</strong>: Click this icon to delete the banner.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/banners.manager.new.html 4.6rc2/help/banners.manager.new.html
--- 4.5.4/help/banners.manager.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/banners.manager.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Banner Manager - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Banner Manager : New Banner </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    add to the system a new banner.</p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Banner Name</strong>: Enter a name for the Banner.</li>
+               <li><strong>Client Name</strong>: Select from the list of Banner
+                    Clients.&nbsp;</li>
+               <li><strong>Impressions Purchased</strong>: Enter the number of
+                    times to display to banner into the input field, or tick
+                    the &quot;Unlimited&quot; checkbox for unlimited display.&nbsp;</li>
+               <li><strong>Banner URL</strong>: Select the banner image to be
+                    displayed from the list of available banners. Images need
+                    to be stored in the &quot;images/banners&quot; folder to
+                    be available for selection here. The selected image will
+                    be displayed at the bottom of the screen.&nbsp;</li>
+               <li><strong>Show Banner</strong>: Select Yes or No to display
+                    / hide the Banner.</li>
+               <li><strong>Click URL</strong>: Enter here the full URL to the
+                    page which should open when the banner is clicked on.&nbsp;</li>
+               <li><strong>Custom banner code</strong>:&nbsp; Allows for entry
+                    of parameters for the Banner. </li>
+               <li><strong>Clicks: &quot;Reset
+                         Clicks&quot;</strong>: clicking this button will reset
+                         the click count shown on the right for the banner to
+                         0.</li>
+               <li><strong>Banner Image</strong>: Image selected under &quot;Banner
+                    URL&quot; is displayed here for your convenience. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Opens a new window which lets you upload an image from your computer to the images/banners folder.</li>
+               <li><strong>Save</strong>: Saves and returns to Banner
+                    Manager.</li>
+               <li><strong>Close</strong>:
+                    Cancels without saving and returns you to Banner Manager.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.contact.edit.html 4.6rc2/help/categories.contact.edit.html
--- 4.5.4/help/categories.contact.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.contact.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Contact Category - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Contact Category: Edit a Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows you to
+                    edit a Contact Categories.</p>               
+               <strong>Details</strong>               <ul>
+                    <li><strong>Category Title </strong>: Enter a name for the
+                         Category.</li>
+                    <li><strong>Category Name</strong>: A redundant field for
+                         entering a Category name. </li>
+                    <li><strong>Section</strong>: Unused field -- n/a.</li>
+                    <li><strong>Image</strong>: Select an image to be associated
+                         with this Contact Category.</li>
+                    <li><strong>Image Position:</strong> Controls position of
+                         the image, above, relative to the text on the page. </li>
+                    <li><strong>Ordering</strong>: Will not be active until you
+                         save Category. Once active,you can reorder the Category
+                         relative to others with this dropdown menu.</li>
+                    <li><strong>Access</strong>: This is the User access level.</li>
+                    <li><strong>Published</strong>: Publish or unpublish the
+                         Category.</li>
+                    <li><strong>Description</strong>: Free text field supported
+                         by WYSIWYG editor (where enabled in the Global Configuration
+                         Settings) where you can enter text and images to appear
+                         with this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Link to Menu</strong>: Allows you to create
+                    a new Menu Item linking to this Category. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Upload an image (or other) file for
+                    use with this Category. </li>
+               <li><strong>Save</strong>: Save your changes and return to Category
+                    Manager. </li>
+               <li><strong>Apply</strong>: Save changes without leaving this
+                    page. </li>
+               <li><strong>Cancel</strong> Cancel without saving changes and
+                    return to Category Manager. </li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.contact.manager.html 4.6rc2/help/categories.contact.manager.html
--- 4.5.4/help/categories.contact.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.contact.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Contact Category Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Contact Category Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows show a list of the Newsfeeds or Contact categories defined on your site.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Category Name</strong>: This is the name of a category. Click the name to edit the category parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit.</li>
+               <li><strong>Published</strong>: Whether a category is published or not. Click the icon to change the state.</li>
+               <li><strong>Reorder</strong>: This shows the order of categories in the list. Click the arrow icons to move the item up or down in the list.</li>
+               <li><strong>Order</strong>: Order of the categories on the list
+                    (this has no effect on site display).</li>
+               <li><strong>Access</strong>: This is the User access level.</li>
+               <li><strong>Category ID</strong>: There is the ID for each category as defined in the database.</li>
+          </ul>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected Categories.</li>
+               <li><strong>Unpublish</strong>: Click to unpublish any number
+                    of selected Categories.</li>
+               <span style=
+"COLOR: rgb(51,51,51)">
+               <li><strong>New</strong>: Click the &#39;New&#39; icon to create a new category.</li>
+               <li><strong>Edit</strong>: Click the &#39;Edit&#39; icon to edit the category.</li>
+               <li><strong>Delete</strong>: Click the &#39;Delete&#39; icon to delete one or multiple categories. An Alert will pop to let you confirm this choice. This action can&#39;t be performed if the category contains Newsfeeds or Contacts. In this last case, you would have to delete the Newsfeeds or Contacts first.</li>
+          </span></ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.contact.new.html 4.6rc2/help/categories.contact.new.html
--- 4.5.4/help/categories.contact.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.contact.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Contact Category - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Contact Category: Create a New Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows you to
+                    create a new Contact Category.</p>               
+               <strong>Details</strong>
+               <ul>
+               <li><strong>Category Title </strong>: Enter a name for the Category.</li>
+               <li><strong>Category Name</strong>: A redundant field for entering
+                    a Category name. </li>
+               <li><strong>Section</strong>: Unused field -- n/a.</li>
+               <li><strong>Image</strong>: Select an image to be associated with
+                    this Contact Category.</li>
+               <li><strong>Image Position:</strong> Controls position of the
+                    image, above, relative to the text on the page.   </li>
+               <li><strong>Ordering</strong>: Will not be active until you save
+                    Category. Once active,you can reorder the Category relative
+                    to others with this dropdown menu.</li>
+               <li><strong>Access</strong>: This is the User access level.</li>
+               <li><strong>Published</strong>: Publish or unpublish the Category.</li>
+               <li><strong>Description</strong>: Free text field supported by
+                    WYSIWYG editor (where enabled in the Global Configuration
+                    Settings) where you can enter text and images to appear with
+                    this Category. </li>
+               </ul>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Link to Menu</strong>: This parameter will not appear
+                    until you click Save or Apply. Allows you to create a new
+                    Menu Item linking to this Category. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Upload an image (or other) file for
+                    use with this Category. </li>
+               <li><strong>Save</strong>: Save your changes and return to Category
+                    Manager. </li>
+               <li><strong>Apply</strong>: Save changes without leaving this
+                    page. </li>
+               <li><strong>Cancel</strong> Cancel without saving changes and
+                    return to Category Manager. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.copy.html 4.6rc2/help/categories.copy.html
--- 4.5.4/help/categories.copy.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.copy.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Category - Copy</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Category Manager
+: Copy a Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>You
+                    can Copy a&nbsp;Category and its contents between Sections.
+                    When you Copy a Category, you create an exact duplicate of it
+                     along with its Content Items.</p>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li></li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click this icon to save the changes<strong>.</strong></li>
+               <li><strong>Cancel</strong>:
+                         Cancel the action and return to previous screen<strong>.</strong></li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.edit.html 4.6rc2/help/categories.edit.html
--- 4.5.4/help/categories.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Category - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Category Manager : 
+      Edit a Category</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you edit a Category.</p>
+               <strong>Details </strong>
+               <ul>
+                    <li><strong>Category Title</strong>: Type here the name of
+                         the category as you want it to display on your site.</li>
+                    <li><strong>Category Name</strong>:
+                         Type here the name of the category as you want it to
+                         appear in the database and the back-end.</li>
+                    <li><strong>Section</strong>:
+                         Select here the Section you want the category to belong
+                         to. This choice will not be available once the category
+                         is Applied or Saved. Instead it will show the Section
+                         the category belongs to.</li>
+                    <li><strong>Image</strong>:
+                         Select here an image to display next to the Category
+                         Description text. The dropdown list an image choice
+                         from the images/stories folder.</li>
+                    <li><strong>Image position</strong>:
+                         Select here the position of the image relative to the
+                         description text. Left or right.</li>
+                    <li><strong>Ordering</strong>:
+                         Select here the order of the category among other categories
+                         in the same section. This will reflect in the Category
+                         Manager.</li>
+                    <li><strong>Access</strong>:
+                         This is the user access level for the category. Public,
+                         Registered or Special.</li>
+                    <li><strong>Published</strong>: Check
+                         the box to let the item show on your site.</li>
+                    <li><strong>Description</strong>:&nbsp; Type
+                         here a description of the Category. This text will show
+                         if decided so when the category is displayed as a table,
+                         blog or other categories.</li>
+          </ul>               </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p><strong>The following parameters will only show once
+                                   the category is applied or saved.</strong>               </p>
+               <ul>
+                    <li><strong>Link
+                                        to Menu:
+                    </strong>This will create a new Menu Item in the menu you
+                    select.
+                    </li>
+                         <li><strong>Select
+                                             a Menu</strong>: Highlight here
+                                             one the menus defined for your site.</li>
+                         <li><strong>Select Menu
+                                             Type</strong>:
+                                             Select here &#39;Content Category
+                                             Table&#39;, &#39;Content
+                                             Category Blog&#39; or &#39;Content
+                                             Category Archive Blog&#39; Menu
+                                             Item types.</li>
+                         <li><strong>Menu
+                                                  Item Name</strong>:
+                                                  The name of the Menu as it
+                                                  will appear on your site.</li>
+                         <li><strong>Link to Menu</strong>:
+                                                       Click on this button to
+                              create the Menu Item.Existing Menu
+                                                       LinksThis displays a list
+                              of all Menu Items referencing
+                                                       this category.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Opens a new
+                         window which lets you upload a file or an image from your computer
+                    to the images/stories folder.</li>
+               <li><strong>Save</strong>: Saves the
+                              category and returns to Manager.</li>
+               <li><strong>Apply</strong>:
+                                   Saves the category and keep the page displayed
+                                   to edit.</li>
+               <li><strong>Close</strong>:
+                              Cancels the action. Any modification is lost. If
+                    opened for edit, the Category remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+
+<p>&nbsp;</p>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.manager.html 4.6rc2/help/categories.manager.html
--- 4.5.4/help/categories.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,92 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Category Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Category Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows show a
+                    list of the Categories defined on your site. They are ordered
+                    by the section they belong to. The Select Section drop-down
+                    lets you display the categories belonging to one specific
+                    section at a time. You may filter the categories by the section
+          they belong to.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Category Name</strong>: This is the name of a category.
+                         Click the name to edit the category parameters. A padlock
+                    icon next to it shows that it is checked-out. To check-in,
+                    click the name to edit ,</li>
+               <li><strong>Published</strong>: Whether a category is
+                              published or not. Click the icon to change the
+                    state.</li>
+               <li><strong>Order</strong>:
+                                   Order of the categories on the list (this
+                    has no effect on site display). You may change it by editing
+                    2 # conjointly and clicking on the Save Order icon in the
+                    heading.</li>
+               <li><strong>Access</strong>: This is the User access level. Oublic,
+                         Registered or Special.</li>
+               <li><strong>Section</strong>: The
+                         name of the Section de category belongs to. Clicking
+                         on this name lets you edit the category&#39;s section&#39;s
+                         parameters.</li>
+               <li><strong>Category
+                              ID</strong>: There is the ID for each category
+                              as defined in the database.</li>
+               <li><strong># Active</strong>:
+                                   This is the number of published Content Items
+                    in the category.</li>
+               <li><strong>#Trash</strong>:
+                                        Number of Content Items belonging to
+                    this category and currently in the Trash.</li>
+          </ul>          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish and Unpublish</strong>:
+                         Same function as Published in the headings. You may check multiple
+                         checkboxes.</li>
+               <li><strong>New</strong>: Create a new Category.</li>
+               <li><strong>Edit</strong>:
+                              Edit an existing category parameters.</li>
+               <li><strong>Move</strong>: Opens
+                              a new Move Category window where you can choose
+                    to move the specific Category and *all its Content Items*
+                    to another existing Section. You may click multiple checkboxes
+                    here.</li>
+               <li><strong>Copy</strong>:
+                              Opens a new Copy Category window where you can
+                    choose to copy the specific Category and *all its Content
+                    Items* to another existing Section. You may click multiple
+                    checkboxes here. (The Content Items copied will keep the
+                    same name)</li>
+               <li><strong>Delete</strong>:
+                         Lets you delete the category chosen. An Alert will pop
+                         to let you confirm this choice. This action can&#39;t
+                         be performed if the category contains Content Items.
+                         In this last case, you would have to delete the Content
+                         Items first.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.move.html 4.6rc2/help/categories.move.html
--- 4.5.4/help/categories.move.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.move.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Category - Move</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Category Manager
+: Move a Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>You
+                    can Move a&nbsp;Category and its contents between Sections. When you Move a Category,
+                    it is deleted from its original&nbsp;Section and it is recreated
+          under the new Section, along with its items.</p>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li></li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click this icon to save the changes<strong>.</strong></li>
+               <li><strong>Cancel</strong>:
+                         Cancel the action and return to previous screen<strong>.</strong></li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.new.html 4.6rc2/help/categories.new.html
--- 4.5.4/help/categories.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Category - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Category Manager : Create a New Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you create
+                    a Category.</p>
+               <strong>Details </strong>
+               <ul>
+                    <li><strong>Category Title</strong>: Type here the name of
+                         the category as you want it to display on your site.</li>
+                    <li><strong>Category Name</strong>:
+                         Type here the name of the category as you want it to
+                         appear in the database and the back-end.</li>
+                    <li><strong>Section</strong>:
+                         Select here the Section you want the category to belong
+                         to. This choice will not be available once the category
+                         is Applied or Saved. Instead it will show the Section
+                         the category belongs to.</li>
+                    <li><strong>Image</strong>:
+                         Select here an image to display next to the Category
+                         Description text. The dropdown list an image choice
+                         from the images/stories folder.</li>
+                    <li><strong>Image position</strong>:
+                         Select here the position of the image relative to the
+                         description text. Left or right.</li>
+                    <li><strong>Ordering</strong>:
+                         Select here the order of the category among other categories
+                         in the same section. This will reflect in the Category
+                         Manager.</li>
+                    <li><strong>Access</strong>:
+                         This is the user access level for the category. Public,
+                         Registered or Special.</li>
+                    <li><strong>Published</strong>: Check
+                         the box to let the item show on your site.</li>
+                    <li><strong>Description</strong>:&nbsp; Type
+                         here a description of the Category. This text will show
+                         if decided so when the category is displayed as a table,
+                         blog or other categories.</li>
+          </ul>               </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p><strong>The following parameters will only show once
+                                   the category is applied or saved.</strong>               </p>
+               <ul>
+                    <li><strong>Link
+                                        to Menu:
+                    </strong>This will create a new Menu Item in the menu you select.                    </li>
+                    <li><strong>Select
+                                                  a Menu</strong>: Highlight
+                                                  here one the menus defined
+                                                  for your site.</li>
+                    <li><strong>Select Menu
+                                             Type</strong>:
+                                             Select here &#39;Content Category
+                                             Table&#39;, &#39;Content
+                                             Category Blog&#39; or &#39;Content
+                                             Category Archive Blog&#39; Menu
+                                             Item types.</li>
+                    <li><strong>Menu
+                                                       Item Name</strong>:
+                                                       The name of the Menu as
+                                                       it will appear on your
+                                                       site.</li>
+                    <li><strong>Link to Menu</strong>:
+                                                            Click on this button
+                         to create the Menu Item.Existing Menu
+                                                            LinksThis displays
+                         a list of all Menu Items referencing
+                                                            this category.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Opens a new
+                         window which lets you upload a file or an image from your computer
+                    to the images/stories folder.</li>
+               <li><strong>Save</strong>: Saves the
+                              category and returns to Manager.</li>
+               <li><strong>Apply</strong>:
+                                   Saves the category and keep the page displayed
+                                   to edit.</li>
+               <li><strong>Close</strong>:
+                              Cancels the action. Any modification is lost. If
+                    opened for edit, the Category remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+
+<p>&nbsp;</p>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.newsfeeds.edit.html 4.6rc2/help/categories.newsfeeds.edit.html
--- 4.5.4/help/categories.newsfeeds.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.newsfeeds.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Newsfeed Category - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Newsfeeds: Edit A Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows you to
+                    edit Newsfeed Categories.</p>               
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Category Title </strong>: Enter a name for the
+                         Category.</li>
+                    <li><strong>Category Name</strong>: A redundant field for
+                         entering a Category name. </li>
+                    <li><strong>Section</strong>: Unused field -- n/a.</li>
+                    <li><strong>Image</strong>: Select an image to be associated
+                         with this Contact Category.</li>
+                    <li><strong>Image Position:</strong> Controls position of
+                         the image, above, relative to the text on the page. </li>
+                    <li><strong>Ordering</strong>: Will not be active until you
+                         save Category. Once active,you can reorder the Category
+                         relative to others with this dropdown menu.</li>
+                    <li><strong>Access</strong>: This is the User access level.</li>
+                    <li><strong>Published</strong>: Publish or unpublish the
+                         Category.</li>
+                    <li><strong>Description</strong>: Free text field supported
+                         by WYSIWYG editor (where enabled in the Global Configuration
+                         Settings) where you can enter text and images to appear
+                         with this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          <blockquote>&nbsp;	</blockquote>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Link to Menu</strong>: Allows you to create a new
+                    Menu Item linking to this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Upload an image (or other) file for
+                    use with this Category. </li>
+               <li><strong>Save</strong>: Save your changes and return to Category
+                    Manager. </li>
+               <li><strong>Apply</strong>: Save changes without leaving this
+                    page. </li>
+               <li><strong>Cancel</strong> Cancel without saving changes and
+                    return to Category Manager. </li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.newsfeeds.manager.html 4.6rc2/help/categories.newsfeeds.manager.html
--- 4.5.4/help/categories.newsfeeds.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.newsfeeds.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Newsfeed Category Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Newsfeeds: Categories </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows show a
+                    list of the Newsfeeds categories defined on your site.</p>               
+          <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Category </strong><strong>Name</strong>: This is the
+                    name of a category. Click the name to edit the category parameters.
+                    A padlock icon next to it shows that it is checked-out. To
+                    check-in, click the name to edit.</li>
+               <li><strong>Published</strong>: Whether a category is published
+                    or not. Click the icon to change the state.</li>
+               <li><strong>Reorder</strong>: This shows the order of categories
+                    in the list. Click the arrow icons to move the item up or
+                    down in the list.</li>
+               <li><strong>Order</strong>: Order of the categories on the list
+                    (this has no effect on site display). </li>
+               <li><strong>Access</strong>: This is the User access level. Public,
+                    Registered or Special.</li>
+               <li><strong>Category ID</strong>: There is the ID for each category
+                    as defined in the database.</li>
+               </ul>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          <blockquote>&nbsp;	</blockquote>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected
+                    Categories.</li>
+               <li><strong>Unpublish</strong>: Click to unpublish any number
+                    of selected Categories.</li>
+               <li><span style="COLOR: rgb(51,51,51)"><strong>New</strong>: Click
+                         the &#39;New&#39; icon to create a new category.</span></li>
+               <li><span style="COLOR: rgb(51,51,51)"><strong>Edit</strong>:
+                         Click the &#39;Edit&#39; icon to edit the category.</span></li>
+               <li><span style="COLOR: rgb(51,51,51)"><strong>Delete</strong>:
+                         Click the &#39;Delete&#39; icon to delete one or multiple
+                         categories. An Alert will pop to let you confirm this
+                         choice. This action can&#39;t be performed if the category
+                         contains Newsfeeds or Contacts. In this last case, you
+                         would have to delete the Newsfeeds or Contacts first.</span></li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.newsfeeds.new.html 4.6rc2/help/categories.newsfeeds.new.html
--- 4.5.4/help/categories.newsfeeds.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.newsfeeds.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Newsfeed Category - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Newsfeeds: Create a New Category </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows you to
+                    create a new Newsfeeds category for your site.</p>               
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Category Title </strong>: Enter a name for the
+                         Category.</li>
+                    <li><strong>Category Name</strong>: A redundant field for
+                         entering a Category name. </li>
+                    <li><strong>Section</strong>: Unused field -- n/a.</li>
+                    <li><strong>Image</strong>: Select an image to be associated
+                         with this Contact Category.</li>
+                    <li><strong>Image Position:</strong> Controls position of
+                         the image, above, relative to the text on the page. </li>
+                    <li><strong>Ordering</strong>: Will not be active until you
+                         save Category. Once active,you can reorder the Category
+                         relative to others with this dropdown menu.</li>
+                    <li><strong>Access</strong>: This is the User access level.</li>
+                    <li><strong>Published</strong>: Publish or unpublish the
+                         Category.</li>
+                    <li><strong>Description</strong>: Free text field supported
+                         by WYSIWYG editor (where enabled in the Global Configuration
+                         Settings) where you can enter text and images to appear
+                         with this Category. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Link to Menu</strong>: This parameter will not appear
+                    until you click Save or Apply. Allows you to create a new
+                    Menu Item linking to this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Upload an image (or other) file for
+                    use with this Category. </li>
+               <li><strong>Save</strong>: Save your changes and return to Category
+                    Manager. </li>
+               <li><strong>Apply</strong>: Save changes without leaving this
+                    page. </li>
+               <li><strong>Cancel</strong> Cancel without saving changes and
+                    return to Category Manager. </li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.weblinks.edit.html 4.6rc2/help/categories.weblinks.edit.html
--- 4.5.4/help/categories.weblinks.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.weblinks.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Web Link Category - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title"><span class="hs_header01"><strong>Web Link Manager : Edit
+Category</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    edit the details for a Web Link Category. </p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Category Title </strong>: Enter a name for the
+                         Category.</li>
+                    <li><strong>Category Name</strong>: A redundant field for
+                         entering a Category name. </li>
+                    <li><strong>Section</strong>: Unused field -- n/a.</li>
+                    <li><strong>Image</strong>: Select an image to be associated
+                         with this Contact Category.</li>
+                    <li><strong>Image Position:</strong> Controls position of
+                         the image, above, relative to the text on the page. </li>
+                    <li><strong>Ordering</strong>: Will not be active until you
+                         save Category. Once active,you can reorder the Category
+                         relative to others with this dropdown menu.</li>
+                    <li><strong>Access</strong>: This is the User access level.</li>
+                    <li><strong>Published</strong>: Publish or unpublish the
+                         Category.</li>
+                    <li><strong>Description</strong>: Free text field supported
+                         by WYSIWYG editor (where enabled in the Global Configuration
+                         Settings) where you can enter text and images to appear
+                         with this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+       
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Link to Menu</strong>: Allows you to create a new
+                    Menu Item linking to this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Upload an image (or other) file for
+                    use with this Category. </li>
+               <li><strong>Save</strong>: Save your changes and return to Category
+                    Manager. </li>
+               <li><strong>Apply</strong>: Save changes without leaving this
+                    page. </li>
+               <li><strong>Cancel</strong> Cancel without saving changes and
+                    return to Category Manager.</li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.weblinks.manager.html 4.6rc2/help/categories.weblinks.manager.html
--- 4.5.4/help/categories.weblinks.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.weblinks.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Web Link Category Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title"><span class="hs_header01"><strong>Web Link Manager : Categories </strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    manage Web Link Categories. </p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Category Name</strong>: The name of the
+                    Categories.&nbsp;</li>
+               <li><strong>Published</strong>: Whether the Category is published;
+                    click icon to toggle state.&nbsp;</li>
+               <li><strong>Reorder</strong>: Click arrows to reorder Categories.&nbsp;</li>
+               <li><strong>Order</strong>: Reorder the list in whole or in part
+                    by setting the numerical rankings.&nbsp;</li>
+               <li><strong>Access</strong>: Which class of users can access the
+                    Category; click icon to toggle state.</li>
+               <li><strong>Category ID </strong>: System generated unique ID
+                    for the Category. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected
+                    Categories.</li>
+               <li><strong>Unpublish</strong>: Click to unpublish any number
+                    of selected Categories.</li>
+               <li><strong>New</strong>: Click to create a new Category.</li>
+               <li><strong>Edit</strong>: Select a Category and click to edit
+                    the Category.</li>
+               <li><strong>Delete</strong>: Click to delete one or more Categories.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/categories.weblinks.new.html 4.6rc2/help/categories.weblinks.new.html
--- 4.5.4/help/categories.weblinks.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/categories.weblinks.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Web Link Category - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title"><span class="hs_header01"><strong>Web Link Manager : Create
+a New Category</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    add a new Web Link category. </p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Category Title </strong>: Enter a name for the
+                         Category.</li>
+                    <li><strong>Category Name</strong>: A redundant field for
+                         entering a Category name. </li>
+                    <li><strong>Section</strong>: Unused field -- n/a.</li>
+                    <li><strong>Image</strong>: Select an image to be associated
+                         with this Contact Category.</li>
+                    <li><strong>Image Position:</strong> Controls position of
+                         the image, above, relative to the text on the page. </li>
+                    <li><strong>Ordering</strong>: Will not be active until you
+                         save Category. Once active,you can reorder the Category
+                         relative to others with this dropdown menu.</li>
+                    <li><strong>Access</strong>: This is the User access level.</li>
+                    <li><strong>Published</strong>: Publish or unpublish the
+                         Category.</li>
+                    <li><strong>Description</strong>: Free text field supported
+                         by WYSIWYG editor (where enabled in the Global Configuration
+                         Settings) where you can enter text and images to appear
+                         with this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Link to Menu</strong>: This parameter will not be
+                    available until you click Save or Apply. Allows you to create
+                    a new Menu Item linking to this Category. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Upload an image (or other) file for
+                    use with this Category. </li>
+               <li><strong>Save</strong>: Save your changes and return to Category
+                    Manager. </li>
+               <li><strong>Apply</strong>: Save changes without leaving this
+                    page. </li>
+               <li><strong>Cancel</strong> Cancel without saving changes and
+                    return to Category Manager. </li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/checkin.main.html 4.6rc2/help/checkin.main.html
--- 4.5.4/help/checkin.main.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/checkin.main.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Global Checkin</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Global Checkin</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">When a User edits a file,
+               Mambo changes its status to, &quot;Checked Out&quot;. In effect,
+               the file is locked and only the User who has &quot;checked it
+               out&quot; has permission to work with it. This is a security feature
+               that prevents two Users from editing a document at the same time,
+               thus preventing loss of data upon saving.A Content Item remains &#39;Checked
+               Out&#39; until the User clicks &#39;Save&#39; or &#39;Cancel&#39; while
+               editing the Content Item, at which time the Content Item is &quot;Checked
+               In&quot;. However, if there&#39;s a connection error, the user
+               presses the &#39;Back&#39; icon in his/her browser, or the User
+               chooses another Menu Item without saving or canceling the work
+               in progress, the Content Item remains &#39;Checked Out&#39;. This
+               means no one can edit it. This is usually reported or experienced
+               as Users being unable to edit or access items, and can be verified
+               by looking&nbsp;at the column labeled &quot;Checked Out&quot; in
+               the Section, Category, or Item file list .Mambo has a protocol,
+               called &quot;Global Checkin&quot; that allows an administrator
+               to unlock all Content Items that are currently &quot;Checked Out&quot;.To
+               perform the &quot;Global Check In&quot;, select System &gt; Global
+               Check In from the Administrator Menubar.&nbsp; After performing
+               the &quot;Global Check In&quot;, Mambo returns a list showing
+               how many items, and from which tables, were Checked back in.<strong><font color="#CC0000">WARNING:</font></strong><font color="#CC0000"> Be
+               very careful in doing this as anyone who is editing a document
+          at that very moment can have his or her work lost.</font></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/config.main.html 4.6rc2/help/config.main.html
--- 4.5.4/help/config.main.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/config.main.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,374 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Global Configuration Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Global Configuration Manager </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Global Configuration
+                    Manager allows you to control a number of variables that
+                    affect your site as a whole. Changes made on this screen
+                    will update the configuration.php file; accordingly, this
+                    file must be writable. When your site is configured,
+                    it is a good idea to make configuration.php unwritable for
+                    security reasons. </p>
+               <p ><strong>Site Tab</strong></p>
+               <ul>
+                    <li><strong>Site Offline</strong> -
+                         Takes the front end of your website on or offline. Use
+                         this option if you are updating the site and
+                         do not wish to have your visitors view the site until
+                         you are finished.</li>
+                    <li><strong>Offline
+                         Message</strong> - When the Site Offline switch is in
+                         the Yes position, this field sets the default message
+                         that displays for
+                         your site visitors.</li>
+                    <li><strong>System Error Message</strong> -
+                         This message will display if the initial database connection
+                         fails.&nbsp; You can type anything you like in this
+                         box.</li>
+                    <li><strong>Site Name</strong> -
+                         Sets the name of the site. This will display in the
+                         Title Bar of the visitors' browsers and will also show
+                         in system-generated emails. </li>
+                    <li><strong>ShowUnauthorised Links</strong> -&nbsp;With
+                         this option turned on, visitors&nbsp;will see all links,
+                         including those to Content Items to which the visitor
+                         may not have access, (that is, content given an Access
+                         Level of &#39;Registered&#39; or &#39;Special&#39;).
+                         With this option off, they will only see links to content
+                         with an Access Level of &#39;Public&#39;.</li>
+                    <li><strong>Allow User Registration</strong> -
+                         This option allows you to set whether visitors can register
+                         for a user account. If the &quot;Yes&quot; radio
+                         button is chosen, the Login Form will include the prompt &ldquo;No
+                         account yet? Create one&quot;. If the &quot;No&quot; radio
+                         button is chosen, they will not be presented with an option
+                         to register.</li>
+                    <li><strong>Use New Account Activation</strong> -
+                         If the &quot;Yes&quot; radio button is chosen, an activation
+                         link will be sent to user&#39;s e-mail address. A new
+                         user can not login until he has clicked on the activation
+                         link.&nbsp; If
+                         the &quot;No&quot; radio button is chosen, Users will
+                         be able to login right away without activation.</li>
+                    <li><strong>Email
+                         New User Password</strong> - With this option set to &#39;Yes&#39;,
+                         the new user will receive an email with a password generated
+                         by Mambo. If it is set to &#39;No&#39;, new Users will select
+                         their own password.</li>
+                    <li><strong>Require Unique Email</strong> -
+                         Select whether you want to prevent registration with
+                         duplicate e-mail addresses. In combination with user
+                         activation this option prevents users from signing up
+                         more than once using the same e-mail address.</li>
+                    <li><strong>Debug Site</strong> - This option
+                         allows you to view the error messages that are created by
+                         your site&#39;s php installation. It can be a handy
+                         tool for debugging if you are having problems and for
+                         reporting errors to your System Administrator or Web
+                         host.</li>
+                    <li><strong>WYSIWYG Editor</strong> - Choose which of
+                         the installed Text Editors you want to use to edit Content
+                         Items.</li>
+                    <li><strong>List
+                         Length</strong> - Choose a default length for lists
+                         in the Admin system.</li>
+                    <li><strong>Favourites Site
+                         Icon</strong> - This sets the icon that appears in some browsers
+                         next to the name and/or address of your site.&nbsp; By default
+                         this is the Mambo flower.&nbsp; If you want another icon
+                         to show up, you must upload another icon to replace the Mambo
+                         flower.&nbsp;</li>
+               </ul>               
+               <p><strong>Locale Tab</strong> </p>
+               <ul>
+                    <li><strong>Language</strong>:&nbsp; Choose
+                         the default language used on your site. Note that you
+                         may have to install a language pack if you wish to use
+                         a language other than that deployed with the system.</li>
+                    <li><strong>Time
+                         Offset</strong>: This option sets the time offset in
+                         hours between your server location and GMT (Greenwich
+                         Mean Time - UK).</li>
+                    <li><strong>Debugging</strong>: </li>
+                    <li><strong>Use gettext</strong>: </li>
+                    <li><strong>Country
+                         Locale</strong>: Type the location of your Web site.&nbsp; For
+                         instance en_GB would be the setting for the UK.</li>
+               </ul>               
+               <p><strong>Content Tab</strong> </p>
+               <ul>
+                    <li><strong>Linked Titles</strong>:
+                         Select &#39;Yes&#39;, if you want the title of a Content
+                         Item to function as a hyper-link leading to the Content
+                         Item.</li>
+                    <li><strong>Read
+                         More Link</strong>: Hide / display the
+                         text &quot;Read more&quot; at the end of your &quot;Intro
+                         Text&quot; of your Content Items.</li>
+                    <li><strong>Item Rating / Voting</strong>:&nbsp;This
+                         option allows users to vote on / rate  Content Items.&nbsp; Choose &#39;Yes&#39;,
+                         and a &#39;Star Bar&#39; will be shown on each Content
+                         Item, as well as a form for submitting ratings. </li>
+                    <li><strong>Author
+                         Names</strong>: Show /Hide the Author&#39;s name when
+                         a Content Item is displayed.</li>
+                    <li> <strong>Created Date and Time</strong>:&nbsp;Show /Hide the
+                         creation date and time when a Content Item
+                         is displayed</li>
+                    <li>.<strong>Modified
+                         Date and Time</strong>: Show /Hide the last modified
+                         date and time when
+                         a Content Item is displayed.</li>
+                    <li><strong>Hits</strong>: Show /Hide the number
+                         of times an article/content has been viewed.</li>
+                    <li> <strong>PDF Icon</strong>:
+                         Show /Hide the PDF
+                         maker icon on Content Items.</li>
+                    <li><strong>Print Icon</strong>:&nbsp; Show /Hide the Printer
+                         Friendly Version icon on Content Items.</li>
+                    <li><strong>Email
+                         Icon</strong>:&nbsp;Show /Hide the Email Page to Friend
+                         icon on Content Items.</li>
+                    <li><strong>Icons</strong>: Choose the
+                         radio button &quot;Show&quot;, when you want the hidden links
+                         to Email/Print/PDF to be icons rather than text.</li>
+                    <li><strong>Table
+                         of Contents on multi-page items</strong>: Choose the radio
+                         button &quot;Show&quot;, to show the Table of Content navigation
+                         index boxes&nbsp; for multi-page Content Items.</li>
+                    <li><strong>Back Button</strong>:&nbsp;Show /Hide navigational
+                         back buttons on each page to make it easier for users
+                         to navigate your site.</li>
+                    <li><strong>Content Item Navigation</strong>:
+                         Choose the radio button &quot;Show&quot;, to publish&nbsp; &#39;Next&#39; and &#39;Previous&#39; links
+                         when viewing Content Items in a category or&nbsp; to change
+                         pages within the same article.</li>
+               </ul>               
+               <p><strong>Database Tab</strong> </p>
+               <p ><strong>Warning</strong>&nbsp;&nbsp;These
+                    are very important settings. If your Mambo web site has been
+                    installed on your behalf do not alter these settings.</p>
+               <ul>
+                    <li><strong>Hostname</strong>:
+                         Your Host name - typically &quot;localhost.&quot; </li>
+                    <li><strong>MySQL
+                         Username</strong>: The username to access
+                         your Mambo database.</li>
+                    <li><strong>MySQL Password</strong>:&nbsp; The password to
+                         access your Mambo database.</li>
+                    <li><strong>MySQL
+                         Database</strong>: The name of the database
+                         your Mambo installation uses.</li>
+                    <li><strong>MySQL Database Prefix</strong>:
+                         The prefix used for records in your Mambo
+                         database. Typically &ldquo;mos_&quot; by default. <strong>Very
+                         Important!</strong> DO NOT CHANGE UNLESS YOU HAVE A
+                         DATABASE BUILT USING TABLES WITH THE PREFIX YOU ARE
+                         SETTING!!</li>
+               </ul>               
+               <p><strong>Server Tab</strong> </p>
+               <p >The following two items are predefined
+                    during the installation and are not configurable through
+                    this tab. The only way to change them is by manually editing
+                    the configuration.php file.</p>
+               <ul>
+                    <li><strong>Absolute Path</strong>:&nbsp;This
+                         is the directory information used by Mambo on the server
+                         that orientates it to it&#39;s surrounding system.</li>
+                    <li><strong>Live
+                         Site</strong>:&nbsp;This is the absolute URL (web address)
+                         for your installation of Mambo. Typical value is http://www.mysite.com.</li>
+               </ul>               
+               <p>The following items are editable on the screen. </p>
+               <ul>
+                    <li><strong>GZIP Page Compression</strong>:
+                              Choose the radio button &quot;Yes&quot;, to allow
+                              your web server to send compressed data, if supported
+                         by the server, to the client web browser.</li>
+                    <li><strong>Login
+                              Session Lifetime</strong>: Type the number of seconds
+                              the Administration session should be allowed to stay
+                              live before automatic logout occurs. After automatic
+                              logout, the Administrator will be required to login
+                         again using the correct username and password.&nbsp; </li>
+                    <li><strong>Error
+                              Reporting</strong>:&nbsp;If this option
+                              is enabled under the Site tab, then using the drop down
+                              box, select the level or reporting required. Options
+                         are System Default, None, Simple and Maximum.</li>
+               </ul>               <div >
+                    <ul>
+                         <ul>
+                              <li>System Default - &nbsp;This turns Error reporting
+                                        to the system default according to php.ini on the
+                                        server.</li>
+                              <li>None -&nbsp;This turns off error reporting.</li>
+                              <li>Simple - &nbsp;This turns error reporting to
+                                   simple options.</li>
+                              <li>&nbsp;Maximum - &nbsp;This turns error reporting
+                                   to the Maximum level.</li>
+                         </ul>
+                         <li><strong>Register Globals Emulation</strong>: By
+                              default set to &quot;ON.&quot; Setting this to &quot;OFF&quot; may
+                              cause problems with some components. </li>
+                         <li><strong>Help Server</strong>: Set the URL for the
+                              system to use to access the live help site data.
+                              Leave blank to disable this feature. </li>
+                         <li> <strong>File Creation</strong>:
+                              By default, files created by the installation of
+                              components, modules and mambots inherit the server
+                              default permissions. By choosing &quot;CHMOD new
+                              files&quot;, you can override
+                              the server permissions.</li>
+                         <li><strong>Directory Creation</strong>:
+                              As with files, new directories will by default
+                              inherit the server default permissions. Choose &quot;CHMOD
+                              new directories&quot; to
+                              override the server permissions.</li>
+                    </ul>
+                    <p><strong>Metadata Tab</strong> </p>
+                    <p >These settings, affect the way
+                    search engines index your site.</p>
+                    <ul>
+                         <li><strong>Global Site Meta Description</strong>:&nbsp;Type
+                              a description of your web site used to assist Search
+                              Engines. Make sure that the most important
+                              part of your description is in the first 20 words. </li>
+                         <li><strong>Global
+                              Site Meta Keywords</strong>: Appears in the keywords
+                              field of your site's metadata. Can append metadata
+                              to this list for individual Content Items, but
+                              the appended text will always come after what is
+                              input here. </li>
+                         <li><strong>Show
+                                   Title Meta Tag</strong>: Includes the item
+                                   / component title name in the Title meta tag
+                                   field in the source code.</li>
+                         <li><strong>Show Author Meta
+                                        Tag</strong>: Includes the Author meta
+                                        tag field in the source code when viewing
+                                        content.</li>
+                    </ul>
+                    <p><strong>Mail Tab</strong> </p>
+                    <ul>
+                         <li><strong>Mailer</strong>: Choose
+                              which mailer you wish to use: PHP mail function, Sendmail
+                              or SMTP Server.</li>
+                         <li><strong>Mail From</strong>: Choose which email
+                              address will show as the sender of system-generated
+                              emails.</li>
+                         <li><strong>From Name</strong>:
+                              Choose what name will show as the sender of system-generated
+                              emails.</li>
+                         <li><strong>Sendmail
+                              Path</strong>: This is the directory of the Mail server.
+                              Under Linux installations is normally /usr/sbin/sendmail.
+                              Not applicable on Windows installations.If you have chosen
+                              the SMTP Server as the Mailer, then you have to set the following
+                              settings. Ignore otherwise.&nbsp;</li>
+                         <li><strong>SMTP</strong> <strong>Auth</strong>:
+                              Choose &quot;Yes&quot; if SMTP Authentication is required
+                              by your host.</li>
+                         <li><strong>SMTP User</strong>: If authentication
+                              is required and set above, type your username.</li>
+                         <li><strong>SMTP
+                              Pass</strong>:&nbsp;If authentication is required and set
+                              above, type your password.</li>
+                         <li><strong>SMTP Host</strong>: This
+                                   is usually set as &quot;localhost,&quot; but you may
+                              need to check this with your host.</li>
+                    </ul>
+                    <p><strong>Cache Tab</strong> </p>
+                    <ul>
+                         <li><strong>Caching</strong>: Choose &quot;Yes&quot; to
+                              allow for caching of certain elements within Mambo. This
+                              will generally improve the performance of your site.</li>
+                         <li><strong>Cache
+                              Folder</strong>:&nbsp;This is the folder or directory to
+                              store the cache files. This must be writable for this caching
+                              to be successfully implemented. Contact your Web Master if
+                              you have any difficulties.</li>
+                         <li><strong>Cache Time</strong>: Edit
+                                   the maximum length of time, in seconds, for a cache file
+                                   to be stored before it is refreshed.</li>
+                    </ul>
+                    <p><strong>Statistics Tab</strong> </p>
+                    <ul>
+                         <li><strong>Statistics</strong>: Choose &#39;Yes&#39;,
+                              to allow the browser and visitor domain statistics to be
+                              collected on the basis of settings in&nbsp; the Content Tab.
+                              You can then access the statistics, from&nbsp;Site -&gt; Statistics.</li>
+                         <li><strong>Log
+                              Content Hits by Date</strong>: Choose &quot;Yes&quot; to
+                              enable logging of the hits on Content Items, on
+                              a daily basis. Warning: This will tend to collect
+                              masses of data over time. Be sure that your server
+                              space has the space to to store this information.&nbsp;</li>
+                         <li> <strong>Log
+                              Search Strings</strong>: Choose &quot;Yes&quot; to enable
+                              logging of the search text, entered by a user. Such logging
+                              facilitates the &#39;tuning&#39; of your web site, giving
+                              you an insight into how your visitors are trying to find
+                              the information they seek. Analysis reporting is provided
+                              under Site-&gt;Statistics-&gt;Search Text.</li>
+                    </ul>
+                    <p><strong>SEO Tab</strong> </p>
+                    <ul>
+                         <li><span ><strong>Search Engine Friendly
+                                        URLs</strong>:&nbsp; This changes the way site
+                                        links are presented and optimises them so that
+                                        search engines can access more of your site. This
+                                        option is ONLY available to sites hosted on Apache
+                                        servers.&nbsp; Choose &#39;Yes&#39; to enable Mambo
+                                        to output friendly URLs rather than normal database
+                                        generated URLs. If you use this option you must
+                         rename your htaccess.txt file to .htaccess.</span></li>
+                         <li><span ><strong>Dynamic
+                                             Page Titles</strong>: Choose &quot;Yes&quot; to
+                                             set the page titles (that appear at the top of
+                                             a viewers browser) to be the same as the page title
+                         they are viewing. Again this helps search engines.NOTE: &nbsp;</span></li>
+                    </ul>
+          </div></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Make unwritable
+                         after saving</strong> Checking
+                    this box will change the file permissions of configuration.php
+               to unwritable once you have applied your changes. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Save your changes. </li>
+               <li><strong>Apply</strong>: Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel</strong>: Cancel the present operation without
+                    saving. </li>
+          </ul></td>
+     </tr></table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/contact.edit.html 4.6rc2/help/contact.edit.html
--- 4.5.4/help/contact.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/contact.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,154 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Contact - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Contact Manager : Edit a Contact Item </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you edit
+                    a Contact Item for your site.</p>
+               <strong>Details</strong>: <strong>Note: </strong>Any field left
+               blank is not displayed. Any field filled out will be included
+               into the downloadable vCard for this Contact.
+               <ul>
+                    <li><strong>Category</strong>: Drop-down select of all published
+                         Contact categories</li>
+                    <li><strong>Linked to User</strong>: Drop-down select of
+                         all registered users of the web site. Can be set to &quot; -
+                         No User - &quot; for independent setup of a site contact.</li>
+                    <li><strong>Name</strong>: Type here the name of the contact
+                         as it will display on the site. Can be either a person&#39;s
+                         name, or a departement, a product, or whatever you wish.</li>
+                    <li><strong>Contact&#39;s Position</strong>: Best used with
+                         a Name, as the title is displayed if this field is used.
+                         Example would be &quot;Webmaster&quot;.</li>
+                    <li><strong>E-mail</strong>: Add an e-mail adress for this
+                         Contact.</li>
+                    <li>The following 5 fields can be used to provide geographical
+                         access information if desired.
+                              <ul>
+                                   <li><strong>Street Address</strong></li>
+                                   <li><strong>Town/Suburb&nbsp;</strong></li>
+                                   <li><strong>State/County</strong></li>
+                                   <li><strong>Country&nbsp;</strong></li>
+                                   <li><strong>Postal Code/ZIP</strong></li>
+                              </ul>
+                    </li>
+                    <li>The following two fields can be used to provide Phone
+                         and Fax Contact information if desired.
+                              <ul>
+                                   <li><strong>Telephone &nbsp;</strong></li>
+                                   <li><strong>Fax</strong></li>
+                              </ul>
+                    </li>
+                    <li><strong>Miscellaneous Info</strong>:&nbsp; Type here
+                         any other information you wish to provide about this
+                         Contact.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>The Parameters for this screen include
+                    the following 3 categories of options: <strong>Publishing</strong>, <strong>Images</strong>,
+                    and <strong>Parameters</strong>.</p>
+               <strong>(1) Publishing Tab</strong>
+               <ul>
+                    <li><strong>Site Default</strong>: Select Yes or No to make
+                         this the default Contact for your site.</li>
+                    <li><strong>Published</strong>: Select Yes or No to show
+                         this Contact to your visitors.</li>
+                    <li><strong>Ordering</strong>: Select the Contact after which
+                         you wish to display the current Contact. Contact needs
+                         to be saved first to display a drop-down select here
+                         to order this Contact in the list of published Contacts
+                         for the site. </li>
+                    <li><strong>Access</strong>: Who can view this Contact on
+                         the frontend if published.</li>
+               </ul>
+               <br />
+               <strong>(2) Images Tab</strong>
+               <ul>
+                    <li>You may select here an image to display next to this
+                         Contact, or select &quot;- Select Image -&quot; to not
+                         display any image.If an image is chosen, it will show
+                         in the Preview block.</li>
+               </ul>
+               <strong><br />
+(3) ParametersTab: </strong>Here are various settings for what is displayed when
+the user clicks to view a Contact item.
+<ul>
+     <li><strong>Page Class Suffix</strong>: Allows you to set customized styles
+          for this page. The suffix you type here is automatically added to the
+          CSS classes for this page.</li>
+     <li><strong>Print Icon</strong>: Hides or shows the icon that allows for
+          printing of the Item.</li>
+     <li><strong>Back Button</strong>: Controls whether to show or hide a &quot;Back&quot; link
+          on the bottom of the page.</li>
+     <li> <strong>&#39;Hide&#39; or &#39;Show&#39;</strong>: The following 12
+          fields defined above may be hidden or shown by checking the radio buttons:</li>
+     <ul>
+          <li>Name</li>
+          <li>Position</li>
+          <li>E-mail</li>
+          <li>Street Address</li>
+          <li>Town/Suburb&nbsp;</li>
+          <li>State/County</li>
+          <li>Country&nbsp;</li>
+          <li>Postal Code/ZIP</li>
+          <li>Telephone</li>
+          <li>Fax</li>
+          <li>Misc. Info</li>
+          <li>Vcard</li>
+          <li>Image</li>
+     </ul>
+     <li><strong>E-mail description</strong>: Show/Hide the description text
+          below.</li>
+     <li><strong>Description text</strong>: Type here the description text for
+          the Email form. If left blank, it will use the default system definition
+          in the language file.</li>
+     <li><strong>E-mail Form</strong>: Show/Hide the e-mail form.</li>
+     <li><strong>E-mail copy</strong>: Show/Hide the checkbox to e-mail a copy
+          to the sender&#39;s adress.</li>
+     <li><strong>Drop-down</strong>: Hide or Show the drop-down select list when
+          in full view. Whatever the contact link accessed, this will let the
+          user choose another contact to display.</li>
+     <li><strong>Icons/Text</strong>: This lets you decide if the fields listed
+          below should be introduced by an icon, the default text for the fields
+          in the Contact Details or nothing.You may choose, if decided so above,
+          a specific icon to introduce the following fields: </li>
+     <ul>
+          <li>Address</li>
+          <li>E-mail</li>
+          <li>Telephone</li>
+          <li>Fax</li>
+          <li>Misc Info</li>
+     </ul>
+     If you choose a custom image, this image should be uploaded to the&nbsp; images/stories
+     directory in the Media Manager.
+</ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves and returns you to Contact Manager.</li>
+               <li><strong>Close</strong>: Cancels without saving and returns
+                    you to Contact Manager.</li>
+               </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/contact.manager.html 4.6rc2/help/contact.manager.html
--- 4.5.4/help/contact.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/contact.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Contact Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Contact Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Contact Manager allows
+                    you to manage the Contacts Items for your site. The list
+                    may be filtered by name and/or category.</p>               
+               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Name</strong>: This is the name of the contact. You
+                    can click the name to edit that contact.</li>
+               <li><strong>Published</strong>: Click on the icon to toggle Publish/Unpublish.</li>
+               <li><strong>Reorder</strong>: Click the icons to move the record up or down in the list. The order is used in both the contact manager and on the contact page the Visitor will see.</li>
+               <li><strong>Category</strong>: You can assign contacts to different categories. This column displays which category the contact belongs too. Click to edit the Category.</li>
+               <li><strong>Linked to User</strong>: If the contact is linked to a registered user of the site, the users name will appear here. Click to edit user. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected
+                    Contacts.<strong></strong></li>
+               <li><strong>Unpublish</strong>: Click to unpublish
+                    any number of selected Contacts.</li>
+               <li><strong>New</strong>:
+                         Click the &#39;New&#39; icon to create a new Contact
+                         Item.</li>
+               <li><strong>Edit</strong>:
+                         Select an Item then click the &#39;Edit&#39; icon to
+                         edit a Contact.</li>
+               <li><strong>Delete</strong>:
+                         Click the &#39;Delete&#39; icon to delete one or more
+                         Contacts from the database.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/contact.new.html 4.6rc2/help/contact.new.html
--- 4.5.4/help/contact.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/contact.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Contact - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Contact Manager : New Item </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you create
+                    a new Contact Item for your site.</p>
+               <strong>Details</strong>:
+<strong>Note: </strong>Any field left blank is not displayed. Any field filled
+out will be included into the downloadable vCard for this Contact.
+<ul>
+               <li><strong>Category</strong>: Drop-down select of all published Contact categories</li>
+               <li><strong>Linked to User</strong>: Drop-down select of all registered users of the web site. Can be set to &quot; - No User - &quot; for independent setup of a site contact.</li>
+               <li><strong>Name</strong>: Type here the name of the contact as it will display on the site. Can be either a person&#39;s name, or a departement, a product, or whatever you wish.</li>
+               <li><strong>Contact&#39;s Position</strong>: Best used with a
+                    Name, as the title is displayed if this field is used. Example
+                    would be &quot;Webmaster&quot;.</li>
+               <li><strong>E-mail</strong>: Add an e-mail adress for this Contact.</li>
+               <li>The following 5 fields can be used to provide geographical access information if desired.
+                    <ul>
+                         <li><strong>Street Address</strong></li>
+                         <li><strong>Town/Suburb&nbsp;</strong></li>
+                         <li><strong>State/County</strong></li>
+                         <li><strong>Country&nbsp;</strong></li>
+                         <li><strong>Postal Code/ZIP</strong></li>
+                    </ul>
+               </li>
+               <li>The following two fields can be used to provide Phone and Fax Contact information if desired.
+                    <ul>
+                         <li><strong>Telephone &nbsp;</strong></li>
+                         <li><strong>Fax</strong></li>
+                    </ul>
+                    </li>
+               <li><strong>Miscellaneous Info</strong>:&nbsp; Type here any other information you wish to provide about this Contact.</li>
+          </ul>          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>The Parameters for this screen include the following 3 categories of options: <strong>Publishing</strong>, <strong>Images</strong>, and <strong>Parameters</strong>.</p>
+               <strong>(1) Publishing Tab</strong>
+               <ul>
+                    <li><strong>Site Default</strong>: Select Yes or No to make
+                    this the default Contact for your site.</li>
+                    <li><strong>Published</strong>: Select Yes or No to show this Contact to your visitors.</li>
+                    <li><strong>Ordering</strong>: Select the Contact after which
+                         you wish to display the current Contact. Contact needs
+                         to be saved first to display a drop-down select here
+                         to order this Contact in the list of published Contacts
+                    for the site. </li>
+                    <li><strong>Access</strong>: Who can view this Contact on
+                         the frontend if published.</li>
+               </ul>               
+               <br /><strong>(2) Images Tab</strong>               <ul>
+                    <li>You may select here an image to display next to this
+                    Contact, or select &quot;- Select Image -&quot; to not display any image.If an image is chosen, it will show in the Preview block.</li>
+               </ul>               
+               <strong><br />
+               (3) ParametersTab: </strong>Here are various settings for what is displayed when the user clicks to view a Contact item.
+               <ul>
+                    <li><strong>Page Class Suffix</strong>: Allows you to set customized styles for this page. The suffix you type here is automatically added to the CSS classes for this page.</li>
+                    <li><strong>Print Icon</strong>: Hides or shows the icon
+                         that allows for printing of the Item.</li>
+                    <li><strong>Back Button</strong>: Controls whether to show
+                         or hide a &quot;Back&quot; link
+                    on the bottom of the page.</li>
+                    <li> <strong>&#39;Hide&#39; or &#39;Show&#39;</strong>: The following 12 fields defined above may be hidden or shown by checking the radio buttons:</li>
+                    <ul>
+                         <li>Name</li>
+                         <li>Position</li>
+                         <li>E-mail</li>
+                         <li>Street Address</li>
+                         <li>Town/Suburb&nbsp;</li>
+                         <li>State/County</li>
+                         <li>Country&nbsp;</li>
+                         <li>Postal Code/ZIP</li>
+                         <li>Telephone</li>
+                         <li>Fax</li>
+                         <li>Misc. Info</li>
+                         <li>Vcard</li>
+                         <li>Image</li>
+                    </ul>
+                    <li><strong>E-mail description</strong>: Show/Hide the description text below.</li>
+                    <li><strong>Description text</strong>: Type here the description
+                         text for the Email form. If left blank, it will use
+                         the default system definition in the language file.</li>
+                    <li><strong>E-mail Form</strong>: Show/Hide the e-mail form.</li>
+                    <li><strong>E-mail copy</strong>: Show/Hide the checkbox to e-mail a copy to the sender&#39;s adress.</li>
+                    <li><strong>Drop-down</strong>: Hide or Show the drop-down select list when in full view. Whatever the contact link accessed, this will let the user choose another contact to display.</li>
+                    <li><strong>Icons/Text</strong>: This lets you decide if the fields listed below should be introduced by an icon, the default text for the fields in the Contact Details or nothing.You may choose, if decided so above, a specific icon to introduce the following fields: </li>
+                    <ul>
+                         <li>Address</li>
+                         <li>E-mail</li>
+                         <li>Telephone</li>
+                         <li>Fax</li>
+                         <li>Misc Info</li>
+                    </ul>
+               If you choose a custom image, this image should be uploaded to the&nbsp; images/stories directory in the Media Manager.
+               </ul>               
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves and returns you to Contact Manager.</li>
+               <li><strong>Close</strong>: Cancels without saving and returns you to Contact Manager.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/content.archive.html 4.6rc2/help/content.archive.html
--- 4.5.4/help/content.archive.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/content.archive.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Archive Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Archive Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows a list of
+                    all archived Content Items.You may filter the display by Section,
+          Category and/or Author</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Title</strong>: This is the title of the Content Item.</li>
+               <li><strong>Order</strong>:
+                         This shows the order of the Content Items. Click the
+                    arrow icons to move the item up or down in the list.</li>
+               <li><strong>Category</strong>:
+                              the Category to which the Item belongs. Click
+                    to edit the Category.</li>
+               <li><strong>Author</strong>:
+                                   The Author of this Item.
+                         Click to edit Author.</li>
+               <li><strong>Date</strong>: This is
+                              the date the Item was created. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+<tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Unarchive</strong>: return the
+                         Item to its original location.</li>
+               <li><strong>Trash</strong>:
+                         Click the &#39;Trash&#39; icon
+                         to put Content Items in the Trash Manager. Items are held in the Trash Manager until Deleted or Restored.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/content.copy.html 4.6rc2/help/content.copy.html
--- 4.5.4/help/content.copy.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/content.copy.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Content Item - Copy</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Content Items
+: Copy an Item </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Using these screens, you
+                    can Copy a Content Item between Section-&gt;Categories.
+                    When you Copy an item, you create an exact dublicate of it
+                    in another Category. </p>
+               <strong>Controls</strong>
+               <ul>
+               <li><strong>Copy to Section</strong>:&nbsp;Select
+                    from the list, the Section you want to Copy
+                    the item</li>
+               <li><strong>Items
+                              being copied</strong>: Displays a list of the items
+                              you are going to move or copy.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click this icon
+                         to save the changes<strong>.</strong></li>
+               <li><strong>Cancel</strong>: Cancel
+                         the action and return to previous screen.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/content.edit.html 4.6rc2/help/content.edit.html
--- 4.5.4/help/content.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/content.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,299 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Content Item - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Content Items : 
+Edit</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows to  edit a Content Item. On the left side there are the two
+                    editors where you can add content for the intro and main
+                    text areas. On the right are the parameteres tabs. You can
+          hide/unhide the parameteres tabs, by clicking the &#39;Hide/Unhide Advanced Details&#39; link.</p>
+               <strong>Details</strong>               
+               <ul>
+                    <li><strong>Title</strong>: Type here is the title of the content. This
+                         is the title as it will appear on the page or table listing this
+                         content.</li>
+                    <li><strong>Title Alias</strong>: This field is
+                         not used by core.&nbsp; SEF scripts and dynamic title/meta
+                         scripts use it and it may have a future use.</li>
+                    <li><strong>Section</strong>:
+                         Choose here the Section you want the item to belong
+                         to.</li>
+                    <li><strong>Category</strong>:
+                         Choose here the category you want the item to belong
+                         to. The dropdown list will display the available Categories
+                         for the Secton chosen above.</li>
+                    <li><strong>Intro Text (required)</strong>:
+                         Type here the introductory portion of the content. <strong>This is the part displayed in
+                         Blog Lists</strong> for both Categories and Sections.
+                         It can also be configured to be hidden when you view
+                         the content.</li>
+                    <li><strong>Main
+                         Text (optional)</strong>: This is the body of your content.
+                         It is only shown when viewing that content in full view,
+                         and is not shown in Blog Lists.&nbsp;</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>The Attributes Area for content consists of five tabs: <strong>Publishing</strong>,
+                    <strong>Images</strong>, <strong>Parameters</strong>, <strong>Meta
+                    Info</strong> and <strong>Link to Menu</strong>.</p>
+               <p><strong>(1) Publishing - Publishing Info</strong></p>
+               <ul>
+                    <li><strong>Show on Frontpage</strong>: Check
+                         the box if you want this content to be assigned to the FrontPage
+                         Component.</li>
+                    <li><strong>Published</strong>: Check the box to let
+                         the item show on your site.</li>
+                    <li><strong>Access Level</strong>:
+                         Choose who will be able to view this content. Public,
+                         registered or special.</li>
+                    <li><strong>Author Alias</strong>:
+                         You can publish the author&#39;s name for a piece of content. You can
+                         choose a Registered user as displayed through the dropdown
+                         or type any name there (an author that does not have
+                         an account or content created by many authors as a group).</li>
+                    <li><strong>Change
+                         Creator</strong>: This allows you to assign ownership
+                         of this content to another registered user.</li>
+                    <li><strong>Ordering</strong>:
+                         Select the order in which this content is listed relative
+                         to others in this Category. The choices available in
+                         the dropdown will show once changes to the item are
+                         saved or applied.</li>
+                    <li><strong>Override Created Date</strong>:
+                         This shows the created date for the content. You can
+                         change the date if necessary.</li>
+                    <li><strong>Start Publishing</strong>:
+                         Select the date when this document is to be published
+                         on the web site.</li>
+                    <li><strong>Finish
+                         Publishing</strong>: If desired, you can set the date
+                         when your content is to be expired.</li>
+                    <li><strong>Content ID</strong>:
+                         This is the ID of the content in the database.</li>
+                    <li><strong>State</strong>:
+                         This shows the current state of the document. It is
+                         not editable.</li>
+                    <li><strong>Hits</strong>:
+                         This gives the number of times this content was viewed.
+                         The Reset Hits Value button allows you to reset the
+                         counter to zero.</li>
+                    <li><strong>Revised</strong>: This shows
+                         the number of edits this content has undergone.</li>
+                    <li><strong>Created</strong>:
+                         This is the date this Content Item was created.</li>
+                    <li><strong>By</strong>:
+                         This is the name of the user that created the content
+                         item.</li>
+                    <li><strong>Last
+                         Modified</strong>: This is the date when this content
+                         item was last modified, if ever.</li>
+                    <li><strong>By</strong>:
+                         This is the name of the user that last modified this
+                         content, if ever. </li>
+               </ul>
+               <p><strong>(2) Images - MOSImage Control</strong></p>
+               <ul>
+                    <li><strong>Sub-folder</strong>:
+                              Choose here the sub-folder you want to get the images
+                    from. These are in images/stories/.</li>
+                    <li><strong>Gallery Images</strong>:
+                              This dropdown lists the images available in the
+                              specific sub-folder. Highlight one or multiple
+                              image name(s) and click on the &#39;Add&#39; button.The
+                              name(s) will display in the Content Images dropdown.</li>
+                    <li><strong>Content
+                              Images</strong>: The &#39;up&#39; and &#39;down&#39; buttons
+                              determine the order of images if there are more
+                              than one on this page. The images will display
+                              relative to the instances of {mosimage} tags in
+                              your content.</li>
+                    <li><strong>Edit
+                              the image selected</strong>Select an image in &#39;Content
+                              Images&#39;.</li>
+                    <li><strong>Source</strong>:
+                                   Displays the default name of the image highlighted.
+                                   You may edit that name.</li>
+                    <li><strong>Image Align</strong>:
+                                        Lets you choose between None, center,
+                         left or right.</li>
+                    <li><strong>Alt
+                                             Text</strong>:
+                                             Lets you choose an Alt Text for
+                                             the image.</li>
+                    <li><strong>Border</strong>:
+                                                  Type here the number of pixels
+                         you want the border to be around the
+                                                  image.</li>
+                    <li><strong>Caption</strong>:
+                                                       Type here a caption for
+                         the image.</li>
+                    <li><strong>Caption Align</strong>:
+                                                            Lets you choose between
+                              None, center, left or right.</li>
+                    <li><strong>Width</strong>:
+                                                                 Type here a
+                         number in pixels to override the width of the
+                                                                 image<strong>.</strong></li>
+                    <li><strong>Apply</strong>:
+                                                                 Click on this
+                                                                 button to apply
+                                                                 all the parameters
+                                                                 defined for
+                                                                 this image </li>
+               </ul>               <p><strong>(3) Parameters
+                         -- Parameter Control</strong>: These parameters control
+                         what you see when you view a Content Item in full view.</p>
+               <ul>
+                    <li><strong>Page
+                              Class Suffix</strong>:
+                              Allows you to set customized styles for this page.
+                              The suffix you type here is automatically added
+                              to the CSS classes for this page, and will have
+                              to be defined in your template&#39;s
+                    CSS stylesheet for usage.</li>
+                    <li><strong>Back Button</strong>:
+                              Controls whether to show or hide a &quot;Back&quot; text
+                              link that would appear on the bottom of the page and
+                              return the user to the previously viewed page. The pull
+                              down lets select &#39;Use
+                              Global&#39; to use the parameter as defined globally
+                              through the Site-&gt;Global Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+                    <li><strong>Page
+                              Title</strong>: Text to display at the top of the
+                              page.</li>
+                    <li><strong>Show/Hide
+                              Page Title</strong>: Hides or shows the Page Title
+                              text (defined in the field described above).</li>
+                    <li><strong>Section
+                              Name</strong>:
+                              Hides or shows the name of the section to which
+                              each item belongs. If this option is turned on,
+                              each item&#39;s
+                              section name will be shown under the item&#39;s
+                              title on the home page.</li>
+                    <li><strong>Section Name Linkable</strong>:
+                              Enables you to make each item&#39;s section name linkable.
+                              Applies only when the Section Name option (described
+                              above) is set to &#39;Show.&#39;</li>
+                    <li><strong>Category
+                              Name</strong>: Hides or shows the name of the category
+                              to which each item belongs. If this option is turned
+                              on, each item&#39;s category name will be shown under
+                              the item&#39;s
+                              title on the home page.</li>
+                    <li><strong>Category Name Linkable</strong>:
+                              Enables you to make each item&#39;s category name linkable.
+                              Applies only when the Category Name option (described
+                              above) is set to &#39;Show.&#39;For each of the following
+                              eight items listed below, you can use the option selected
+                              in the Global Configuration settings (Site -&gt; Global
+                              Configuration) by selecting &#39;Use Global&#39; or
+                              you can override the Global Configuration setting by
+                              selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                              the settings here for items will not affect the
+                              Global Configuration settings and will not affect
+                              the settings on the rest of the site.</li>
+                    <li><strong>Linked Titles</strong>:
+                              Enables you to make item titles linked. The link
+                              will go to the item page.</li>
+                    <li><strong>Item
+                              Rating</strong>: Hides or shows ratings given to
+                              home page items by your site&#39;s users.</li>
+                    <li><strong>Author Names</strong>:
+                                   Hides or shows the names of authors of items.</li>
+                    <li><strong>Created
+                                        Date and Time</strong>: Hides or shows
+                                        the date and time that items were created.</li>
+                    <li><strong>Modified Date and
+                                             Time</strong>:
+                                             Hides or shows the date and time
+                                             that items were last modified.</li>
+                    <li><strong>PDF
+                                                  Icon</strong>: Hides or shows
+                                                  the icon and link to the PDF
+                                                  version of items.</li>
+                    <li><strong>Print Icon</strong>:
+                                                       Hides or shows the icon
+                         and link to the printer-friendly
+                                                       format of items.</li>
+                    <li><strong>Email
+                                                            Icon</strong>: Hides
+                                                            or shows the icon
+                                                            and link to the page
+                                                            that enables users
+                                                            to email items to
+                                                            others.</li>
+               </ul>               <p><strong>(4) Meta Info -- Meta Data</strong></p>
+               <ul>
+                    <li><strong>Description</strong>:
+                              This information is inserted in the headers of your
+                    content. It is commonly used by search engines.</li>
+                    <li><strong>Keywords</strong>:
+                              These keywords are related to the header information
+                              provided for search engines, but they also provide
+                              another important function. These keywords drive
+                              the What&#39;s
+                              Related Module that provides automatic links to
+                    other Content Items that shares a similar keyword. </li>
+                    <li><strong>Add
+                              Sect/Cat/Title</strong>:&nbsp; Clicking
+                              on this button is a convenient way to insert the content&#39;s
+                              information into the keywords field, including the content&#39;s
+                    title, section name, and category name. </li>
+               </ul>               <p><strong>(5) Link to Menu: </strong>This
+                         will create a &#39;Link - Content Item&#39; in the menu
+               you select.</p>
+               <ul>
+                    <li><strong>Select a Menu</strong>: Highlight
+                    here once the menus defined for your site.</li>
+                    <li><strong>Menu
+                              Item Name</strong>:
+                              The name of the Menu as it will appear on your
+                    site.</li>
+                    <li><strong>Link
+                              to Menu</strong>: Click on this button to create
+                              the Menu Item.Existing Menu ItemsThis displays
+                              a list of all &#39;Link
+                    - Content Item&#39; Menu Items referencing this content.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Opens a new window to preview
+                    the content as you would in the Frontend of your site.</li>
+               <li><strong>Upload</strong>:
+                              Opens a new window which lets you upload a file
+                    or an image from your computer to the images/stories folder.</li>
+               <li><strong>Save</strong>:
+                         Saves the content and returns to Manager.</li>
+               <li><strong>Apply</strong>:
+                              Saves the content and keep the content displayed
+                    to edit.</li>
+               <li><strong>Close</strong>: Cancels the action. Any
+                                   modification is lost. If opened to edit, the
+                    Content Item remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/content.manager.html 4.6rc2/help/content.manager.html
--- 4.5.4/help/content.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/content.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,101 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Content Item Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Content Items
+Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Content Items Manager&nbsp;shows
+                    a list of the Content Items on your site for a particular
+                    Content Section or for All Content Items Manager.</p>
+               <p>You may enter text in the &quot;<strong>Filter</strong>&quot; box
+                    to refine the list based on whether the text is found in
+                    the title of any item. Type in any text and press Enter.
+                    Using the Select Section, Select Category, Select Author
+                    combo boxes, you can limit the list. You can use all filter
+          utility at once and in combination.</p>
+               <strong>Display Columns</strong>               <ul>
+               <li><strong>Title</strong>: This is the title of the Content Item. Click
+                         here to edit content. A padlock icon next to it shows that it
+                         is checked-out. To check-in, click the name to edit. Then you
+                    have to Save or Close the item.</li>
+               <li><strong>Published</strong>: This
+                         shows whether the item is published. Hover over this
+                    icon to see a summary of the publishing information. Click
+                    to change state.</li>
+               <li><strong>Frontpage</strong>:
+                         This is whether this item is to be published or is published
+                    through the FrontPage Component.</li>
+               <li><strong>Reorder</strong>:
+                         This shows the order of Menu Items in the menu. Click
+                    the arrow icons to move the item up or down in the list.</li>
+               <li><strong>Order</strong>:
+                         Shows the order of Menu Items in the menu. You may change
+                         it by editing 2 # conjointly and clicking on the </li>
+               <li><strong>Save Order icon</strong> in
+                              the heading. </li>
+               <li><strong>Access</strong>: This is the
+                              user access level for the Content Item. Click on
+                              the Access level to switch it to another value.</li>
+               <li><strong>Section</strong>:
+                              This is the Section that the Content Item belongs
+                              to (this shows when &#39;All Content
+                              Items&#39; page is open). Click to edit the Section
+                              page.</li>
+               <li><strong>Category</strong>:
+                              This is the Category that the Content Item belongs
+                              to. Click to edit the category page.&nbsp;</li>
+               <li><strong>Author</strong>:
+                                   This shows the name of the author of the Content.
+                                   Click to edit the author information. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New</strong>: Click the &#39;New&#39; icon
+                         to create a new Content Item.&nbsp;</li>
+               <li><strong>Edit</strong>:
+                         Click the &#39;Edit&#39; icon to edit the Content Item.</li>
+               <li><strong>Publish
+                         and Unpublish</strong>: Click the &#39;Publish&#39; or &#39;Unpublish&#39; icon
+                         to publish or unpublish any number of selected Content
+                         items.&nbsp;</li>
+               <li><strong>Move</strong>:
+                         Click the &#39;Move&#39; icon to move Content Items
+                         to another Content Section or Category.&nbsp;</li>
+               <li><strong>Copy</strong>:
+                         Click the &#39;Copy&#39; icon to copy Content Items
+                         into a Content Section or Content Category.&nbsp;</li>
+               <li><strong>Archive</strong>:
+                         Click the &#39;Archive&#39; icon
+                         to put Content Items into an archived state. They are
+                         still accessible to the Frontend of your site if in
+                         published mode.&nbsp;</li>
+               <li><strong>Trash</strong>:
+                         Click the &#39;Trash&#39; icon to put Content Items in the trash
+                         bin. They are not completely removed but can&#39;t be
+                         displayed on your site. You can restore this Content
+                         items in the Trash Manager.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/content.move.html 4.6rc2/help/content.move.html
--- 4.5.4/help/content.move.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/content.move.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Content Item - Move</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Content Items
+: Move an Item </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Using this screen, you
+                    can Move a Content Item between Categories.
+                    When you Move an item, it is deleted
+                    from its original Category and it is recreated under the
+          new Category.</p>
+               <strong>Controls</strong>
+               <ul>
+               <li><strong>Move to Section/Category</strong>:&nbsp;Select
+                    from the list, the Section/Category you want to Move
+                    the item</li>
+               <li><strong>Items
+                              being moved</strong>: Displays a list of the items
+                              you are going to move or copy.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click this icon
+                         to save the changes<strong>.</strong></li>
+               <li><strong>Cancel</strong>: Cancel
+                         the action and return to previous screen.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/content.new.html 4.6rc2/help/content.new.html
--- 4.5.4/help/content.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/content.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,298 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Content item - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Content Items : Create a New  Item </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allows to create a new Content Item. On the left side there are the two
+                    editors where you can add content for the intro and main
+                    text areas. On the right are the parameters tabs. You can
+          hide/unhide the parameteres tabs, by clicking the &#39;Hide/Unhide Advanced Details&#39; link.</p>
+               <strong>Details</strong>               
+               <ul>
+                    <li><strong>Title</strong>: Type here is the title of the content. This
+                         is the title as it will appear on the page or table listing this
+                         content.</li>
+                    <li><strong>Title Alias</strong>: This field is
+                         not used by core.&nbsp; SEF scripts and dynamic title/meta
+                         scripts use it and it may have a future use.</li>
+                    <li><strong>Section</strong>:
+                         Choose here the Section you want the item to belong
+                         to.</li>
+                    <li><strong>Category</strong>:
+                         Choose here the category you want the item to belong
+                         to. The dropdown list will display the available Categories
+                         for the Secton chosen above.</li>
+                    <li><strong>Intro Text (required)</strong>:
+                         Type here the introductory portion of the content. This is the part displayed in
+                         Blog Lists for both Categories and Sections.
+                         It can also be configured to be hidden when you view
+                         the content.</li>
+                    <li><strong>Main
+                         Text (optional)</strong>: This is the body of your content.
+                         It is only shown when viewing that content in full view,
+                         and is not shown in Blog Lists.&nbsp;</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>The Attributes Area for content consists of five tabs: <strong>Publishing</strong>,
+                    <strong>Images</strong>, <strong>Parameters</strong>, <strong>Meta
+                    Info</strong> and <strong>Link to Menu</strong>.</p>
+               <p><strong>(1) Publishing - Publishing Info</strong></p>
+               <ul>
+                    <li><strong>Show on Frontpage</strong>: Check
+                         the box if you want this content to be assigned to the FrontPage
+                         Component.</li>
+                    <li><strong>Published</strong>: Check the box to let
+                         the item show on your site.</li>
+                    <li><strong>Access Level</strong>:
+                         Choose who will be able to view this content. Public,
+                         registered or special.</li>
+                    <li><strong>Author Alias</strong>:
+                         You can publish the author&#39;s name for a piece of content. You can
+                         choose a Registered user as displayed through the dropdown
+                         or type any name there (an author that does not have
+                         an account or content created by many authors as a group).</li>
+                    <li><strong>Change
+                         Creator</strong>: This allows you to assign ownership
+                         of this content to another registered user.</li>
+                    <li><strong>Ordering</strong>:
+                         Select the order in which this content is listed relative
+                         to others in this Category. The choices available in
+                         the dropdown will show once changes to the item are
+                         saved or applied.</li>
+                    <li><strong>Override Created Date</strong>:
+                         This shows the created date for the content. You can
+                         change the date if necessary.</li>
+                    <li><strong>Start Publishing</strong>:
+                         Select the date when this document is to be published
+                         on the web site.</li>
+                    <li><strong>Finish
+                         Publishing</strong>: If desired, you can set the date
+                         when your content is to be expired.</li>
+                    <li><strong>Content ID</strong>:
+                         This is the ID of the content in the database.</li>
+                    <li><strong>State</strong>:
+                         This shows the current state of the document. It is
+                         not editable.</li>
+                    <li><strong>Hits</strong>:
+                         This gives the number of times this content was viewed.
+                         The Reset Hits Value button allows you to reset the
+                         counter to zero.</li>
+                    <li><strong>Revised</strong>: This shows
+                         the number of edits this content has undergone.</li>
+                    <li><strong>Created</strong>:
+                         This is the date this Content Item was created.</li>
+                    <li><strong>By</strong>:
+                         This is the name of the user that created the content
+                         item.</li>
+                    <li><strong>Last
+                         Modified</strong>: This is the date when this content
+                         item was last modified, if ever.</li>
+                    <li><strong>By</strong>:
+                         This is the name of the user that last modified this
+                         content, if ever. </li>
+               </ul>
+               <p><strong>(2) Images - MOSImage Control</strong></p>
+               <ul>
+                    <li><strong>Sub-folder</strong>:
+                              Choose here the sub-folder you want to get the images
+                    from. These are in images/stories/.</li>
+                    <li><strong>Gallery Images</strong>:
+                              This dropdown lists the images available in the
+                              specific sub-folder. Highlight one or multiple
+                              image name(s) and click on the &#39;Add&#39; button.The
+                              name(s) will display in the Content Images dropdown.</li>
+                    <li><strong>Content
+                              Images</strong>: The &#39;up&#39; and &#39;down&#39; buttons
+                              determine the order of images if there are more
+                              than one on this page. The images will display
+                              relative to the instances of {mosimage} tags in
+                              your content.</li>
+                    <li><strong>Edit
+                              the image selected</strong>Select an image in &#39;Content
+                              Images&#39;.</li>
+                    <li><strong>Source</strong>:
+                                   Displays the default name of the image highlighted.
+                                   You may edit that name.</li>
+                    <li><strong>Image Align</strong>:
+                                        Lets you choose between None, center,
+                         left or right.</li>
+                    <li><strong>Alt
+                                             Text</strong>:
+                                             Lets you choose an Alt Text for
+                                             the image.</li>
+                    <li><strong>Border</strong>:
+                                                  Type here the number of pixels
+                         you want the border to be around the
+                                                  image.</li>
+                    <li><strong>Caption</strong>:
+                                                       Type here a caption for
+                         the image.</li>
+                    <li><strong>Caption Align</strong>:
+                                                            Lets you choose between
+                              None, center, left or right.</li>
+                    <li><strong>Width</strong>:
+                                                                 Type here a
+                         number in pixels to override the width of the
+                                                                 image<strong>.</strong></li>
+                    <li><strong>Apply</strong>:
+                                                                 Click on this
+                                                                 button to apply
+                                                                 all the parameters
+                                                                 defined for
+                                                                 this image </li>
+               </ul>               <p><strong>(3) Parameters
+                         -- Parameter Control</strong>: These parameters control
+                         what you see when you view a Content Item in full view.</p>
+               <ul>
+                    <li><strong>Page
+                              Class Suffix</strong>:
+                              Allows you to set customized styles for this page.
+                              The suffix you type here is automatically added
+                              to the CSS classes for this page, and will have
+                              to be defined in your template&#39;s
+                    CSS stylesheet for usage.</li>
+                    <li><strong>Back Button</strong>:
+                              Controls whether to show or hide a &quot;Back&quot; text
+                              link that would appear on the bottom of the page and
+                              return the user to the previously viewed page. The pull
+                              down lets select &#39;Use
+                              Global&#39; to use the parameter as defined globally
+                              through the Site-&gt;Global Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+                    <li><strong>Page
+                              Title</strong>: Text to display at the top of the
+                              page.</li>
+                    <li><strong>Show/Hide
+                              Page Title</strong>: Hides or shows the Page Title
+                              text (defined in the field described above).</li>
+                    <li><strong>Section
+                              Name</strong>:
+                              Hides or shows the name of the section to which
+                              each item belongs. If this option is turned on,
+                              each item&#39;s
+                              section name will be shown under the item&#39;s
+                              title on the home page.</li>
+                    <li><strong>Section Name Linkable</strong>:
+                              Enables you to make each item&#39;s section name linkable.
+                              Applies only when the Section Name option (described
+                              above) is set to &#39;Show.&#39;</li>
+                    <li><strong>Category
+                              Name</strong>: Hides or shows the name of the category
+                              to which each item belongs. If this option is turned
+                              on, each item&#39;s category name will be shown under
+                              the item&#39;s
+                              title on the home page.</li>
+                    <li><strong>Category Name Linkable</strong>:
+                              Enables you to make each item&#39;s category name linkable.
+                              Applies only when the Category Name option (described
+                              above) is set to &#39;Show.&#39;For each of the following
+                              eight items listed below, you can use the option selected
+                              in the Global Configuration settings (Site -&gt; Global
+                              Configuration) by selecting &#39;Use Global&#39; or
+                              you can override the Global Configuration setting by
+                              selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                              the settings here for items will not affect the
+                              Global Configuration settings and will not affect
+                              the settings on the rest of the site.</li>
+                    <li><strong>Linked Titles</strong>:
+                              Enables you to make item titles linked. The link
+                              will go to the item page.</li>
+                    <li><strong>Item
+                              Rating</strong>: Hides or shows ratings given to
+                              home page items by your site&#39;s users.</li>
+                    <li><strong>Author Names</strong>:
+                                   Hides or shows the names of authors of items.</li>
+                    <li><strong>Created
+                                        Date and Time</strong>: Hides or shows
+                                        the date and time that items were created.</li>
+                    <li><strong>Modified Date and
+                                             Time</strong>:
+                                             Hides or shows the date and time
+                                             that items were last modified.</li>
+                    <li><strong>PDF
+                                                  Icon</strong>: Hides or shows
+                                                  the icon and link to the PDF
+                                                  version of items.</li>
+                    <li><strong>Print Icon</strong>:
+                                                       Hides or shows the icon
+                         and link to the printer-friendly
+                                                       format of items.</li>
+                    <li><strong>Email
+                                                            Icon</strong>: Hides
+                                                            or shows the icon
+                                                            and link to the page
+                                                            that enables users
+                                                            to email items to
+                                                            others.</li>
+               </ul>               <p><strong>(4) Meta Info -- Meta Data</strong></p>
+               <ul>
+                    <li><strong>Description</strong>:
+                              This information is inserted in the headers of your
+                    content. It is commonly used by search engines.</li>
+                    <li><strong>Keywords</strong>:
+                              These keywords are related to the header information
+                              provided for search engines, but they also provide
+                              another important function. These keywords drive
+                              the What&#39;s
+                              Related Module that provides automatic links to
+                    other Content Items that shares a similar keyword. </li>
+                    <li><strong>Add
+                              Sect/Cat/Title</strong>:&nbsp; Clicking
+                              on this button is a convenient way to insert the content&#39;s
+                              information into the keywords field, including the content&#39;s
+                    title, section name, and category name. </li>
+               </ul>               <p><strong>(5) Link to Menu: </strong>This
+                         will create a &#39;Link - Content Item&#39; in the menu
+               you select.</p>
+               <ul>
+                    <li><strong>Select a Menu</strong>: Highlight
+                    here once the menus defined for your site.</li>
+                    <li><strong>Menu
+                              Item Name</strong>:
+                              The name of the Menu as it will appear on your
+                    site.</li>
+                    <li><strong>Link
+                              to Menu</strong>: Click on this button to create
+                              the Menu Item.Existing Menu ItemsThis displays
+                              a list of all &#39;Link
+                    - Content Item&#39; Menu Items referencing this content.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Opens a new window to preview
+                    the content as you would in the Frontend of your site.</li>
+               <li><strong>Upload</strong>:
+                              Opens a new window which lets you upload a file
+                    or an image from your computer to the images/stories folder.</li>
+               <li><strong>Save</strong>:
+                         Saves the content and returns to Manager.</li>
+               <li><strong>Apply</strong>:
+                              Saves the content and keep the content displayed
+                    to edit.</li>
+               <li><strong>Close</strong>: Cancels the action. Any
+                                   modification is lost. If opened to edit, the
+                    Content Item remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/css/help.css 4.6rc2/help/css/help.css
--- 4.5.4/help/css/help.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/css/help.css	2006-05-31 11:49:28.000000000 -0500
@@ -1,34 +1,87 @@
-body {
-	font-family: verdana, arial, sans-serif;
-	font-size: 9pt;
-}
-
-h1 { 
-	color: #990000;
-	font-size: 1.5em;
-  border-left: 25px solid #cc0000;
-	border-bottom: 2px solid #cc0000;
-	padding: 0 0 2px 5px;
-}
-
-h2 { 
-	color: #990000;    
-	font-size: 1.3em;
-	margin: 1ex 0; 
-}
-
-h3 { 
-	color: #006699;    
-	font-size: 1.2em;
-	margin: 1ex 0; 
-  border-left: 10px solid #fea540;
-	padding: 0 0 2px 5px;
-}
-
-
-pre {
-	text-align: left;
-	background-color: #fff;
-	border-left: 1px solid #aaa;
-	padding: 5px;
-}
+body {
+	font-family: verdana, arial, sans-serif;
+	font-size: 9pt;
+}
+
+h1 { 
+	
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-color: #FF6600;
+	display: block;
+	border: 1px solid #000000;
+	padding: 5px;
+}
+
+h2 { 
+	color: #990000;    
+	font-size: 1.3em;
+	margin: 1ex 0; 
+}
+
+h3 { 
+	color: #006699;    
+	font-size: 1.2em;
+	margin: 1ex 0; 
+  border-left: 10px solid #fea540;
+	padding: 0 0 2px 5px;
+}
+
+
+pre {
+	text-align: left;
+	background-color: #fff;
+	border-left: 1px solid #aaa;
+	padding: 5px;
+}
+.title {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-color: #FF6600;
+	display: block;
+	border: 1px solid #000000;
+	padding: 5px;
+}
+.datalabel {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+}
+.data {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+}
+code {
+	font-family: "Courier New", Courier, mono;
+	font-size: 11px;
+}
+ul {
+	margin-top: 0px;
+	margin-bottom: 0px;
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+
+.red { color: red }
+
+
+.helpIndex {
+	border: 0px;
+	width: 95%;
+	height: 100%;
+	padding: 0px 5px 0px 10px;
+	overflow: auto;
+}
+.helpFrame {
+	border-left: 0px solid #222;
+	border-right: none;
+	border-top: none;
+	border-bottom: none;
+	width: 100%;
+	height: 700px;
+	padding: 0px 5px 0px 10px;
+}
\ No newline at end of file
diff -ruN 4.5.4/help/css/index.html 4.6rc2/help/css/index.html
--- 4.5.4/help/css/index.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/css/index.html	2006-05-31 11:49:28.000000000 -0500
@@ -1 +1,5 @@
-<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US"><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/frontpage.manager.html 4.6rc2/help/frontpage.manager.html
--- 4.5.4/help/frontpage.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/frontpage.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Frontpage Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Frontpage Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows a list
+                    of the Content Items assigned to the FrontPage Component.
+                    You may enter text in the &quot;Filter&quot; box to refine
+                    the list based on whether the text is found in the title
+                    of any Content Item. Type in any text and press Enter. You
+          may also filter per category and/or section.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Title</strong>: This is the title of the Content Item.
+                    A padlock icon next to it shows that it is checked-out. To
+                    check-in, click the name to edit. You will not be able to
+                    edit a Content Item if it is checked out by another user.
+                    It must be checked back by an administrator. The administrator
+                    navigates to the Menu Item Systems-&gt;Global Checkin in
+                    the Menu bar. It can also be checked back in by the User
+                    who has checked the item out by clicking the &#39;Edit&#39; icon
+                    of the Content Item and then clicking either the &#39;Save&#39; or &#39;Cancel&#39; icon.&nbsp;</li>
+               <li><strong>Published</strong>:
+                              This shows whether the Content Item is published.
+                    Hover over this icon to see a summary of the publishing information.</li>
+               <li><strong>Reorder</strong>:
+                                   This shows the order of Items in the list.
+                    Click the arrow icons to move the item up or down.</li>
+               <li><strong>Order</strong>:
+                         Shows the order of items in the list. You may change
+                         it by editing 2 # conjointly and clicking on the Save
+                         Order icon next to the Column Heading Order.Note: The
+                         new ordering has an effect when&nbsp; the FrontPage
+                    Component is displayed.</li>
+               <li><strong>Access</strong>: This is the user
+                         access level. Public, Registered or Special.</li>
+               <li><strong>Section</strong>:
+                              This is the section the Item belongs to. Click
+                    to edit section.</li>
+               <li><strong>Category</strong>:
+                              This is the category the item belongs to. Click
+                    to edit category.</li>
+               <li><strong>Author</strong>:
+                              This is the name of the author of the Content Item.
+                    Click to edit author.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish and Unpublish</strong>:
+                         Click the &#39;Publish&#39; or &#39;Unpublish&#39; icons
+                         to publish or unpublish the selected Content Items on
+                         the Frontpage.</li>
+               <li>&nbsp;<strong>Archive</strong>:
+                         Click the &#39;Archive&#39; icon to put the Content
+                         items into an archived state. They are still accessible
+                         to your Frontpage.&nbsp;</li>
+               <li><strong>Remove</strong>:
+                         Click the &#39;Remove&#39; icon to remove Content Items
+                         from the Frontpage Component.</li>
+          </ul></td>
+     </tr></table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/index.html 4.6rc2/help/index.html
--- 4.5.4/help/index.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/help/index.html	2006-05-31 11:49:28.000000000 -0500
@@ -1 +1,5 @@
-<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US"><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/installer.mambot.html 4.6rc2/help/installer.mambot.html
--- 4.5.4/help/installer.mambot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/installer.mambot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambots - Review and Uninstall</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambots: Review and Uninstall </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This page lists the &quot;Site
+               Mambots&quot; currently installed which can be uninstalled. (Certain
+               Core Mambots cannot be uninstalled and hence are not listed on
+               this page.) Users can use the uninstall command to completely
+               remove the listed Mambots from the system. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Uninstall</strong>: Select a Mambot then click this
+                    icon to uninstall the Mambot. Removes all the Mambot files
+                    from the system. </li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/installer.module.html 4.6rc2/help/installer.module.html
--- 4.5.4/help/installer.module.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/installer.module.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Modules - Review and Uninstall</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Modules: Review and Uninstall </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This page lists the Modules
+               currently installed which can be uninstalled. (Certain Core Modules
+               cannot be uninstalled and hence are not listed on this page.)
+               Users can use the uninstall command to completely remove the listed
+               Modules from the system.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Uninstall</strong>: Select a
+                         Module then click this icon to uninstall the Module.
+                    Removes all the Module files from the system. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/installer.source.html 4.6rc2/help/installer.source.html
--- 4.5.4/help/installer.source.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/installer.source.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Installer - The Source</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">The Source  Installer </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">&nbsp;</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">&nbsp;</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">&nbsp;</td>
+     </tr></table>
+
+<p>&nbsp;</p>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/installer.universal.html 4.6rc2/help/installer.universal.html
--- 4.5.4/help/installer.universal.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/installer.universal.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Installer - Universal</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Universal Installer </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Installs packages of Modules,
+               Components, Mambots and/or Templates. Packages come in .ZIP format
+               and can be uploaded. System automatically detects the type of
+               extension you wish to install and acts accordingly. Can handle
+               packages containing more than one type of extension. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload Package File</strong>Providing
+                         you have GZip support with PHP, you will be able to
+                    upload a zipped package file that will be automatically installed
+                         to your server. &#39;Browse&#39; to
+                         the location of the&nbsp;element on your computer. Then click
+                         the &#39;Upload File &amp; Install&#39; icon.</li>
+               <li><strong>Install
+                         from directory</strong>If you don&#39;t have GZip support then
+                         you may upload an unpacked archive to your host&#39;s server.
+                         Type the location of this file (it must be the absolute location)
+               then click the &#39;Install&#39; icon.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">&nbsp;</td>
+     </tr></table>
+
+<p>&nbsp;</p>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambo.credits.html 4.6rc2/help/mambo.credits.html
--- 4.5.4/help/mambo.credits.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambo.credits.html	2006-05-26 22:42:35.000000000 -0500
@@ -0,0 +1,291 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+
+<head>
+
+<title>Credits</title>
+
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+
+<meta name="copyright" content="(C) 2000 - 2006 The Mambo Foundation" />
+
+<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
+
+</head>
+
+<body>
+
+
+<h1>Credits & Contributions</h1>
+
+  <ul>
+  <h2>The Mambo Steering Committee (the 'MSC')</h2>
+		<li>
+			<strong>Chad Cauld</strong>: Core Development Team Leader
+		</li>
+		<li>
+		<strong>Alain Schmalz</strong>: 3rd Party Development Team Leader 
+  	</li>
+		<li>
+			<strong>Ric Shreves</strong>: Advocacy & PR Team Leader 
+		</li>
+		<li>
+			<strong>Carlos Souza</strong>: Translation Team Leader 
+		</li>
+		<li>
+			<strong>David Geller</strong>: Moderation Team Leader 
+		</li>
+		<li>
+			<strong>Richard Ong</strong>: Documentation Team Leader 
+		</li>
+		<li>
+			<strong>James Puro</strong>: QA Team Leader 
+		</li>
+<h2>Core & Maintenance Development </h2>
+		<li>
+			 Adi Setiawan 
+		</li>
+		<li>
+			 Akarawuth Tamrareang 
+		</li>
+		<li>
+		Carlos Souza
+		</li>
+		<li>
+Chad Auld
+		</li>
+		<li>
+Chanh Ong
+		</li>
+		<li>
+Giorgio Nordo
+		</li>
+		<li>
+Nalisa Sitabut
+		</li>
+		<li>
+Neil Thompson
+		</li>
+		<li>
+Richard Peter Ong
+		</li>
+		<li>
+Shaoying Su
+		</li>
+		
+		<h2>Past Contributions</h2>
+		<li>
+			Andrew Eddie, Rey Gigataras, Emir Sakic, Alex Kempkens, Andy Miller, Mitch Pirtle, Tim Broeker, Nick Designer, Brian Teeman, Andy Stewart, Peter Koch, Levis Bisson, Robert Castley, Phil Taylor, Ron Bakker, Steen Rabol, James Logan, Wee Keat, Ilias Antonopoulos, Martin Brampton, Dean Elzey, Despina Stamkou, John Kalantzis 
+		</li>
+  </ul>
+
+	<h1>Third Party Tools</h1>
+
+  <ul>
+
+		<li>
+
+
+
+				<a href="http://www.cs.ucla.edu/%7Eheng/JSCookMenu/index.html">JSCookMenu</a>
+
+				1.25
+
+				(<a href="http://www.cs.ucla.edu/%7Eheng/JSCookMenu/copyright.html">License</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://tinymce.moxiecode.com/">TinyMCE Editor</a>
+
+				2.0.5.1 & 2.0.6.1
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://www.engageinteractive.com/">DOMIT!</a>
+
+				1.0
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://www.phpconcept.net">PCLZip/PCLTar</a>
+
+				2.0-rc1
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://phpgacl.sf.net">phpGACL</a>
+
+				3.2.2
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://dynarch.com/mishoo/calendar.epl">Calendar</a>
+
+				0.9.2
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://www.bosrup.com/web/overlib">overLIB</a>
+
+				4.21
+
+				(<a href="http://www.bosrup.com/web/overlib/?License">License</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://www.foood.net">Foood.net Icons</a>
+
+				N/A
+
+				(<a href="http://www.foood.net/agreement.htm">License</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://webfx.eae.net/">XP-Style Tabs</a>
+
+				1.0.2
+
+				(Public Domain)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://phpmailer.sourceforge.net/">phpMailer</a>
+
+				1.72
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://www.bitfolge.de/rsscreator-en.html">Feedcreator</a>
+
+				1.71
+
+				(<a href="http://www.gnu.org/licenses/gpl.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://pear.php.net">Cache_Lite</a>
+
+				1.3.1 (CVS)
+
+				(<a href="http://www.gnu.org/copyleft/lesser.html">LGPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://qbnz.com/highlighter/">GeSHi</a>
+
+				1.0.4
+
+				(<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>)
+
+
+
+		</li>
+
+		<li>
+
+
+
+				<a href="http://www.bitfolge.de/phpvcard-en.html">PHP VCard</a>
+
+				2.0
+
+				(<a href="http://www.gnu.org/licenses/gpl.html">LGPL</a>)
+
+
+
+		</li>
+
+	</ul>
+
+
+
+</body>
+
+</html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambo.glossary.html 4.6rc2/help/mambo.glossary.html
--- 4.5.4/help/mambo.glossary.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambo.glossary.html	2006-05-31 22:26:19.000000000 -0500
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+
+<head>
+
+<title>Glossary</title>
+
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+
+<meta name="copyright" content="copyright (C) 2005 - 2006 Mambo Foundation Inc." />
+
+<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
+
+</head>
+
+<body>
+
+<h1>Glossary</h1>
+
+
+
+<p><strong>Admin Templates:</strong> Administrator Templates define the lay-out of your Mambo Web site's Backend.</p><p><strong>Alt&nbsp;Tag:</strong> The&nbsp;'alt' attribute, often called the&nbsp;'alt tag' is&nbsp;a text attribute added to&nbsp;the image tag&nbsp;to&nbsp;describe the&nbsp;image contained in&nbsp;the tag. This text is&nbsp;viewable (inside a text box) when one hovers their&nbsp;mouse over an image in the Frontend of&nbsp;a&nbsp;Web&nbsp;site. </p><p><strong>Archive:</strong> Content items can be archived and managed trough the Backend. The Archive Module provides a way of displaying archived items on your Web site.</p><p><strong>Backend:</strong> The 'Backend' is the Mambo Administrator where the site administrator manages the site and it's content.</p><p><strong>Blog:</strong> A Blog style within Mambo is the listing of records in a summary form. Example: It could be by link only, or showing just the introductory text with a link to the complete text. Often the &quot;News&quot; page is written in Blog style.</p><p><strong>Category:</strong>&nbsp; A Category is the name for a collection of items that are related in some way. Example: The category 'Fish' may contain the records 'Herring', 'Haddock' and 'Stickleback'.<br /><br /><span style="font-weight: bold;">Check Out (an item):</span> When a user edits a file they 'Check it Out'. This prevents other users from being able to edit the item at the same time, thus preventing loss of data upon saving.<br /></p><p><span style="font-weight: bold;">CMT:</span> CMT is an acromyme for Components, Modules and Templates.<br /><br /><span style="font-weight: bold;">CMTM:</span> CMTM is an acromyme for Components, Modules, Templates and Mambots.<br /></p><p><strong>Components:</strong> &nbsp;Components are Mambo's content elements or applications that usually appear in the center of a three column Mambo layout, or on the right of a two column Mambo layout. Components are core elements of Mambo functionality. Mambo core components include: Banners, Contact, News Feeds, Polls and Web Links. Members of the Mambo Community are producing third party Mambo components on a continuous basis. They are available on <a href="http://mamboxchange.com/">mamboxchange.com</a> for free download.</p><p><strong>Content item:</strong> Please see 'Item'<strong>.<br /><br />Content Management System (CMS):</strong> &nbsp;A CMS is a software for managing content on a Web site directly on the server.<br /><br /><span style="font-weight: bold;">Core:</span> The Mambo core is the zip-file containing the official standard Mambo installation, which can be found on mamboxchange.com and various other sites. It contains some built-in CMTM's, but can be extended with 3rd party developer's addons.<br /></p><p><strong>Database:</strong> &nbsp;A database is an organized collection of information. It contains a collection of records that you can search, sort and analyze rapidly.</p><p><strong>Elements: </strong>&nbsp;Elements are plug-ins like components, modules, templates, mambots or languages that extend your Mambo installation. These elements can already be bundled into the core or they can be third party elements.</p><p><strong>Frontend:</strong> The Frontend is the Web site that your visitors (or members) will see.</p><p><strong>Frontpage:</strong> &nbsp;The Frontpage is a built-in Component which shows all the published content items from your site marked with the parameter 'Show on Frontpage'. You may configure the display of the Frontpage by editing the menu item associated with it, usually 'Home'.<br /><br /><span style="font-weight: bold;">Global Checkin:</span> When an item is 'Checked Out' and it is not saved or cancelled correctly (e.g. in case of a connection error), it will remain 'Checked Out', and thus uneditable for all other users. Performing a 'Global Checkin' will make those items available again.<br /><br /><span style="font-weight: bold;">Intro Text:</span> When creating or editing a Content Item, the Intro Text should contain a brief introduction. This introduction will be appended by the content in the Main Text box if you have entered content there. When the Content Item is set to show on the Front Page, a 'read on' link will be shown, pointing to the full Content Item.<br /></p><p><strong></strong><span style="font-weight: bold;">Item: </span>An Item is a discrete piece of content within the Mambo hierarchy. An item can be an article, a content category, a menu item or a link.<br /><br style="font-weight: bold;" /><span style="font-weight: bold;">Main Text:</span> When creating or editing a Content Item, the Main Text box contains the text you don't want to show on the Front Page.&nbsp; It shows up after clicking the 'Read On' link in the Frontend of your site.<br /><br /><span style="font-weight: bold;">Mamber: </span>A Mamber is a general term for someone who is part of the Mambo community.<br /></p><p><strong>Mambo:</strong> &nbsp;Mambo is one of the finest Open Source Web Content Management Systems.</p><p><strong>Mambo Administrator:</strong> The Mambo Administrator is an application for administering your Mambo Web site directly on the server. It is sometimes also referred to as any of the <span style="font-weight: bold;">Administrator, Backend</span>, <span style="font-weight: bold;">Admin Section</span>, <span style="font-weight: bold;">Administration Section</span>, or the <span style="font-weight: bold;">Control Panel</span>.</p><p><strong>Mambo User (or/and User Group):</strong> &nbsp;Mambo Users can be arranged in several groups with different levels of access control. User groups with access to the Frontend include Anonymous, Registered, Author, Editor and Publisher. There are also three groups with access to the Backend: Mamager, Administrator and Super Administrator.</p><p><strong>Mambot:</strong> &nbsp;A Mambot is a small, task-oriented function that intercepts content before it is displayed and manipulates it in some way. Mambo provides a number of Mambots in the core distribution.<br /><br style="font-weight: bold;" /><span style="font-weight: bold;">Media Files:</span> Media files such as .gif, .jpg, .png or .bmp files can be used in Content Items and are organised via the Media Manager.<br /></p><p><strong>Modules:</strong> Modules extend the capabilities of Mambo giving the software new functionality.Modules are small content items that can be displayed anywhere that your template allows it to be displayed. Modules are very easy to install in the Admin Section. Mambo modules may include: Main Menu, Top menu, Template Chooser, Polls, Newsflash, Hit Counter, etc. Members of the Mambo Community are producing third party Mambo modules on a continuous basis. They are available on <a href="http://mamboxchange.com/">mamboxchange.com</a> for free download.<br /><br /><span style="font-weight: bold;">News Feeds: </span>News Feeds are a way of sharing content between different sites. This sharing method is meant for creating a news introduction in the way the provider wants it and it normally has a link to the provider's web site. Mambo offers you the posibility to both offer and display News Feeds.<br /></p><p><strong>Open Source (OS):</strong> &nbsp;Open Source is a general term describing several parts of the Free Software Licence movement.</p><p><strong>Parameters:</strong> &nbsp;Parameters can be used to alter the presentation of specific items, menu's or modules.<br /><br /><span style="font-weight: bold;">Preview: </span>The 'Preview' icon enables you to see from the Backend what your content item would look like in the Frontend of your site.<br /><br /><span style="font-weight: bold;">Projects:</span> Projects&nbsp; can be compoents, modules, templates, mambots and scripts that are freely set up and managed by their authors at http:projects.mamboserver.com.<br /></p><p><strong>Publish(ed):</strong> &nbsp;This defines the state of various parts of your Mambo installation. For example, installed Elements will only display on your Web site if they're published. Content items can be managed with a start- and end date of publishing.</p><p><strong>Record:</strong> &nbsp;A Record is a generic term for a 'row' in the database, just like a card. A record very often represents a 'piece' of content. The dynamic functionality and much of the content of Mambo relies on a database in order to function.</p><p><strong>Section:</strong> &nbsp;A Section is a collection of Categories that are related in some way. Think of it this way. A section might be called 'News', categories in this section might be 'Today's News', 'Yesterdays News' and 'Other News'.</p><p><strong>Site:</strong> &nbsp;The Mambo Site is the Web site displayed to your visitors or users, containing all the content added in the Admin Section. It is sometime referred to as the 'Frontend'.</p><p><strong>Templates:</strong> Templates define the lay-out of your Mambo Web site. You can assign different templates to various pages of your Web site.&nbsp; Templates can be created for the Frontend of your site called Site Template as well as the Backend called Administrator Templates.<br /><br /><span style="font-weight: bold;">Title:</span> This is the name which is displayed above a Content Item.<br /><br /><span style="font-weight: bold;">Title Alias: </span>This is an alternative title for Content Items. This field is not used by the Mambo core itself, but SEF scripts and dynamic title/meta scripts use it and it may have a future use.<br /></p><p><strong>Workspace:</strong> &nbsp;The Workspace is the section of the Mambo Admin Section where the business of configuration and content publishing takes place. The workspace dynamically updates as you select tools and menu options. The workspace can include: HTML editor, article and link management and several other features.</p><p><span style="font-weight: bold;">Wrapper: </span>A Wrapper is a built-in Mambo component which can display any URL in your website. This can be used to wrap an application like a forum or a gallery, individual pages as well as an entire website. An alternative name is an <span style="font-weight: bold;">Iframe</span>. <br />&nbsp;</p>
+
+
+
+</body>
+
+</html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambo.support.html 4.6rc2/help/mambo.support.html
--- 4.5.4/help/mambo.support.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambo.support.html	2006-05-31 22:26:19.000000000 -0500
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Support</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<meta name="copyright" content="copyright (C) 2005 - 2006 Mambo Foundation Inc." />
+<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
+</head>
+<body>
+<h1>Support</h1>
+<h2>Official Sites</h2>
+<ul><li><a href="http://source.mambo-foundation.org/Remository/Download/Mambo_Core_Files/">Downloads and Patches</a> - (The Source) Get the Mambo source code, patches, and security updates here.  Also has interviews, blogs, etc with the Mambo team.</li>
+<li><a href="http://forum.mamboserver.com">forum.mamboserver.com</a> - The Mambo support forum</li>
+<li><a href="http://mamboxchange.com/tracker/?atid=101&group_id=5&func=browse">Bug tracker</a> - Log potential bugs here for tracking.  For help please use the forums.</li>
+<li><a href="http://help.mamboserver.com">help.mamboserver.com</a> - Manual, tutorials and reference material for Mambo<br /></li></ul><br />
+
+<h2>Addons for Mambo</h2><ul><li><a href="http://mamboxchange.com">MamboXchange.com</a> - The object of MamboXChange is to provide a free project management and download environment for Mambo related projects. It is one of largest central repositories on the web for everything that is to do with Mambo.<br /></li></ul><br /><br /><br />
+</body>
+</html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambo.whatsnew.html 4.6rc2/help/mambo.whatsnew.html
--- 4.5.4/help/mambo.whatsnew.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambo.whatsnew.html	2006-05-26 22:42:35.000000000 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+
+<head>
+
+<title>What's New in Version 4.6</title>
+
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+
+<meta name="copyright" content="copyright (C) 2005 - 2006 Mambo Foundation Inc." />
+
+<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
+
+</head>
+
+<body>
+
+<h1>What's New in Version 4.6</h1>
+Version 4.6 represents another milestone for the Mambo open source CMS project.  In 4.6 much of the underlying code has been rewritten and optimized.  Mambo now uses significantly fewer database calls during its normal operation.  A large number of bugs have been corrected.  A new feature rich default editor and user friendly database backup utility have been added.  Plus more...
+
+<h1>Templates</h1>
+New templates have been added to this release.  Special thanks to Water & Stone for donating these!  The new templates really show off what's possible with Mambo's flexible templating system.
+
+<h1>Help System Changes</h1>
+New help screens have been added and the help system has been expanded to help decrease inaccuracies in the delivery of help content.  New and updated screenshots have been added.  A lot work has gone into the contextual help screens as well. 
+
+<h1>Components</h1>
+<h2>MOStlyCE</h2>
+MOStlyCE is the new default editor for Mambo.  MOStlyCE is based on the latest version of TinyMCE and the old mosCE project.  MOStlyCE offers some great new enhancements like editor compression for faster load times and reduced traffic, a customizable interface, and ability to enable / disable plugins as needed.  There are also a number of great new plugins like a spellchecker, layer support, etc.  Enjoy!
+
+<h2>MOStlyDBAdmin</h2>
+MOStlyDBAdmin is a new component based on the old dbadmin component.  Some minor tweaks and security fixes have been applied.  This component offers users an easy way to backup and restore Mambo's database.
+
+<h1>Bug Fixes</h1>
+For details on other additions and bug fixes not listed here, please check the changelog.php file that is included with the distribution.
+</body>
+
+</html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.categories.searchbot.html 4.6rc2/help/mambots.categories.searchbot.html
--- 4.5.4/help/mambots.categories.searchbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.categories.searchbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Search Categories</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Search
+Categories</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Search&nbsp;Categories mambot,
+               belongs to the search bots family of mambots. These mambots have
+               no visual output. When they are enabled, search is also performed
+               inside the content denoted by their names. When this Mambot is
+               enabled, a search returns results also from the&nbsp;Categories
+          section.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.contacts.searchbot.html 4.6rc2/help/mambots.contacts.searchbot.html
--- 4.5.4/help/mambots.contacts.searchbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.contacts.searchbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Search Contacts</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Search
+Contacts</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Search&nbsp;Contacts mambot,
+               belongs to the search bots family of mambots. These mambots have
+               no visual output. When they are enabled, search is also performed
+               inside the content denoted by their names. When this Mambot is
+               enabled, a search returns results also from the&nbsp;Contacts
+          data.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.content.searchbot.html 4.6rc2/help/mambots.content.searchbot.html
--- 4.5.4/help/mambots.content.searchbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.content.searchbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Search Content</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Search
+Content</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Content mambot, belongs to
+               the search bots family of mambots. These mambots have no visual
+               output. When they are enabled, search is also performed inside
+               the content denoted by their names. When this Mambot is enabled,
+               a search returns results also from Content. Note: It is adviced
+               to keep this mambot published, otherwise your search results will
+          be limited.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.geshi.html 4.6rc2/help/mambots.geshi.html
--- 4.5.4/help/mambots.geshi.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.geshi.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - GeSHi</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: GeSHi</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This displays formatted
+                    code in Content Items based on the GeSHi highlighting engine.
+                    This is an enhanced version of Code Support,
+                    allowing the rendering of many different programming languages
+                    with color-highlighted code by specifying the to-be-used
+                    language.</p>
+               <p>NOTE:&nbsp;In some versions of Mambo , this bot has an incompatibility
+                    with the Email Cloaking Mambot.</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">Use the &quot;pre&quot; tag and add the
+               programming language you want to use for highlighting purposes
+               as a parameter. <br />
+               Example: 
+          <code>&lt; pre lang=&quot;xml&quot; &gt;your code here ... &lt; /pre &gt;</code></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">The mambot version of the GeSHi highlight
+               code comes with the following highlighters for the most common
+               renders installed, ready&nbsp;to be&nbsp;used:
+
+<ul >
+     <li>CSS =&gt; use lang=&quot;css&quot;</li>
+     <li>Html4 Strict =&gt; use lang=&quot;html4strict&quot;</li>
+     <li>JavaScript =&gt; use lang=&quot;javascript&quot;</li>
+     <li>PHP =&gt; use lang=&quot;php&quot;</li>
+     <li>PHP Brief =&gt; use lang=&quot;php-brief&quot;</li>
+     <li>SQL =&gt; use lang=&quot;sql&quot;</li>
+     <li>XML =&gt; use lang=&quot;xml&quot;</li>
+</ul>
+Should you need additonal languages, you may download the full package from
+     the developer site: <a href=
+"http://qbnz.com/highlighter/">http://qbnz.com/highlighter/</a>&nbsp;which includes
+     over 30 languages. You should then upload the required &quot;newLanguage.php&quot; from
+     the package into your &quot;<em>\mambots\content\geshi\geshi</em>&quot; folder.</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save:</strong> Save your changes. </li>
+               <li><strong>Apply:</strong> Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Close:</strong> Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.legacybots.html 4.6rc2/help/mambots.legacybots.html
--- 4.5.4/help/mambots.legacybots.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.legacybots.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Legacy Includer</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Legacy Mambot
+Includer</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This is support for outdated
+               Mambo 4.5 mambots. Note: This Mambot is unpublished by default;
+               should you experience disfunctions with a particular, older mambot,
+          try to publish it.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save:</strong> Save your changes. </li>
+               <li><strong>Apply:</strong> Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Close:</strong> Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.manager.html 4.6rc2/help/mambots.manager.html
--- 4.5.4/help/mambots.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Mambots are essentially code snippets which when called via various parameters either activate a program, script or perform a specific function. They can be as simple as a function which replaces typed text with code (such as typing to display an image in a Content Item) to full fledged third party libraries (such as WYSIWYG editors or other programs). Mambots are divided into 5 types/categories that may be displayed by filtering in the filter field:
+          <ul>
+               <li>authentication</li>
+               <li>content</li>
+               <li>editors</li>
+               <li>editors-xtd</li>
+               <li>search</li>
+               </ul>          <br />
+<strong>Display Columns: </strong>
+          <ul><li></li><strong>Mambot Name: </strong>This lists the names of
+               the Mambots currently installed. Click the name to edit any of
+               the mambots.
+          
+                    <li><strong>Published: </strong>This shows whether the Mambot
+                         is published or unpublished. Click on the icon if you
+                         wish to toggle its state.</li>
+                    <li><strong>Reorder:</strong>&nbsp; Click
+                         the arrow icons to move the item up or down in the list.
+                         This has no effect on the Front-end of your site.&nbsp; You
+                         only reorder to help you organize your list of mambots
+                         in the Back-end.</li>
+                    <li><strong>Order: </strong>This shows the order of Mambots
+                         in relation to other Mambots of the same type. Type&nbsp; the
+                         new numbers in the order that you wish your mambots
+                         to appear in the Back-end. You can change the order
+                         any two or more mambots at the same time.&nbsp; Click
+                         the &quot;Save Order&quot; icon
+                         next to the Column Heading &quot;Order.&quot; This has
+                         no effect on the Front-end of your site.</li>
+                    <li><strong>Access: </strong>This shows who can see or use
+                         the Mambots on the Frontend of a Web page. Choose the
+                         level of access by clicking the link to toggle through
+                         Public, Registered and Special access. </li>
+                    <li><strong>Type: </strong>This displays the type of mambot.
+                         Types include editors, content, editors-xtd and search.</li>
+                    <li><strong>File: </strong>This
+                    displays the mambots filename</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish/ Unpublish: </strong>Click the icon to Publish
+                    or Unpublish the Mambot.</li>
+               <li><strong>New:</strong>&nbsp; Click the &quot;New&quot; icon
+                    to create a new Mambot. Then fill in the fields listed.</li>
+               <li><strong>Edit: </strong>Click the &quot;Edit&quot; icon to
+                    change the settings as desired.</li>
+               <li><strong>Delete: </strong>Click the &quot;Delete&quot; icon.
+                    This will uninstall it. WARNING: This cannot be undone. Deleted
+                    Mambots cannot be restored as a &quot;Menu Item&quot; or &quot;Content
+                    Item&quot; can. If you have deleted a Mambot and you wish
+                    to use that Mambot again, you must re-Install the Mambot.
+                    NOTE: Mambots essential to core operations cannot be deleted.</li>
+          </ul></td>
+     </tr>
+</table>
+<br />
+<br />
+<br />
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.moscode.html 4.6rc2/help/mambots.moscode.html
--- 4.5.4/help/mambots.moscode.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.moscode.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Code Support</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Code
+Support</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This displays formatted code
+          in Content Items. The code will appear in
+               the Courier font face and with no syntax highlighting.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><code>{ moscode }... { /moscode }</code> <br />
+Example: <code>{ moscode }&lt;body onload=&quot;winManage(850,700,true);&quot;&gt;&lt;a
+name=&quot;top&quot;&gt;&lt;/a&gt;&lt;div&gt;&lt;div id=&quot;wrapper&quot;&gt;&lt;/div&gt;&lt;/div&gt;{
+/moscode }</code><br />
+NOTE:&nbsp; The tag described above should have no space after&nbsp; &quot;{&quot; and
+before &quot;}&quot;. It has been displayed with spaces here not to implement
+the function in this screen.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save:</strong> Save your changes. </li>
+               <li><strong>Apply:</strong> Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Close:</strong> Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mosemailcloak.html 4.6rc2/help/mambots.mosemailcloak.html
--- 4.5.4/help/mambots.mosemailcloak.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mosemailcloak.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Email Cloaking</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Email
+Cloaking</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Publishing this mambot cloaks
+          all e-mails in content from spambots, using javascript .</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">These are the ways the
+               address should be written:<br/>
+               1. In plain text: <code>mail@mail.com<br/>2</code>. As
+               a mail to: <code>&lt;a href=&quot;mailto:mail@mail.com&quot;&gt;mail@mail.com&lt;/a&gt;</code> <br/>
+               Otherwise
+               the cloaking prevents the address from being decrypted when calling
+          the mailer.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save:</strong> Save your changes. </li>
+               <li><strong>Apply:</strong> Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Close:</strong> Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mosimage.btn.html 4.6rc2/help/mambots.mosimage.btn.html
--- 4.5.4/help/mambots.mosimage.btn.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mosimage.btn.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - MOSimage Button</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: MOS Image Editor
+Button</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This provides the button
+          to insert the MOS Image tag into content edit box. This
+mambot replaces tag in content with specified images.&nbsp; You can insert as
+many of these tags as needed in your articles.&nbsp; To do this while creating
+or editing a Content Item,&nbsp; select the images on the &quot;Image&quot; tab
+under &quot;MOSImage Control&quot;.&nbsp; The replacement of the tags will follow
+the order of the images in the &quot;Content Images&quot; box.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><code> { mosimage }</code><br />
+NOTE:
+The tag described above should have no space after&nbsp; &quot;{&quot;
+and before &quot;}&quot;. It has been displayed with spaces here not to
+implement the function in this screen.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">&nbsp;</td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mosimage.html 4.6rc2/help/mambots.mosimage.html
--- 4.5.4/help/mambots.mosimage.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mosimage.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - MOSimage</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: MOS Image</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This Mambot replaces tag
+               in content with specified images.&nbsp; You can insert as many
+               of these tags as needed in your articles.&nbsp; To do this while
+               creating or editing a Content Item,&nbsp; select the images on
+               the &quot;Image&quot; tab under &quot;MOSImage Control&quot;.&nbsp; The
+               replacement of the tags will follow the order of the images in
+          the &quot;Content Images&quot; box. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><p><code>{ mosimage }</code><br />
+    NOTE: The tag described above should have no space after&nbsp; &quot;{&quot; and
+               before &quot;}&quot;. It has been displayed with spaces here not
+          to implement the function in this screen</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+<p>&nbsp;</p>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mosloadposition.html 4.6rc2/help/mambots.mosloadposition.html
--- 4.5.4/help/mambots.mosloadposition.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mosloadposition.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Load Positions</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Load Module
+      Positions</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This loads module positions
+               within the content area of a Content Item. This means you may
+               load any module assigned to this position at this specific place
+               in a Content Item without defining the position in the Template
+               file.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><code>{mosloadposition user1}</code>
+               <ul>
+                    <li>where &#39;user1&#39; is one of the positions defined for your site
+                    through Site-&gt;Templates-&gt;Modules Positions</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default
+               State </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">Lets you choose a style of HTML code
+                    to insert the module:
+               <ul >
+                    <li>Wrapped by Table - Column</li>
+                    <li>Wrapped by Table - Horizontal</li>
+                    <li>Wrapped by Divs</li>
+                    <li>No wrapping, raw output</li>
+          </ul></td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save:</strong> Save your changes. </li>
+               <li><strong>Apply:</strong> Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Close:</strong> Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mospage.btn.html 4.6rc2/help/mambots.mospage.btn.html
--- 4.5.4/help/mambots.mospage.btn.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mospage.btn.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - MOSPagebreak Button</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: MOSPagebreak Editor
+Button</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This provides the button
+          to insert the { mospagebreak }&nbsp; tag into content edit box.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mospaging.html 4.6rc2/help/mambots.mospaging.html
--- 4.5.4/help/mambots.mospaging.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mospaging.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Pagination</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: MOS
+Pagination</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This provides the button
+               to insert the { mospagebreak }&nbsp; tag into content edit box.
+               This will&nbsp;add a Table of Contents functionality to a paginated
+          item.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><code>{ mospagebreak }</code> or<br />
+               <code>{ mospagebreak title=The page title }</code> or <br />
+               <code>{ mospagebreak heading=The first page }</code> or <br />
+               <code>{ mospagebreak title=The page title&amp;heading=The first
+               page }</code> or <br />
+               <code>{ mospagebreak heading=The first page&amp;title=The page
+               title }</code><br />
+NOTE: The tags described above should have no space after&nbsp; &quot;{&quot; and
+before &quot;}&quot;. They have been displayed with spaces here not to implement
+the function in this screen.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">The &#39;contenttoc&#39; CSS class is
+          used to control the display this Table of Contents.</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mossef.html 4.6rc2/help/mambots.mossef.html
--- 4.5.4/help/mambots.mossef.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mossef.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - SEF</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: SEF </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Powers the Search Engine
+               Friendly URL re-writing function. Though this Mambot is published
+               by default, to enable the functionality you must access the Global
+               Configuration Manager and activate the function and you must rename
+               the file &quot;htaccess.txt&quot; to &quot;.htaccess&quot; -- located in the Mambo
+               root directory. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mostlyce.html 4.6rc2/help/mambots.mostlyce.html
--- 4.5.4/help/mambots.mostlyce.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mostlyce.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - MOStlyCE</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Mambot: MOStlyCE</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This Mambot powers the MOStlyCE
+               WYSIWYG content editor. To use the editor, it must be selected
+               in the Global Configuration Manager. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mosvaliduserbot.html 4.6rc2/help/mambots.mosvaliduserbot.html
--- 4.5.4/help/mambots.mosvaliduserbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mosvaliduserbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - User Authenticator</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: User Authenticator </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Mambo user credential management. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.mosvote.html 4.6rc2/help/mambots.mosvote.html
--- 4.5.4/help/mambots.mosvote.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.mosvote.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - MOS Rating</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: MOS Rating</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This will add the Voting
+          functionality to Content Items. NOTE: For this
+mambot&#39;s output to be visible, you must set &quot;<em>Item Rating/Voting</em>:&quot; to &quot;<em>Show</em>&quot; through
+Site- &gt; Global Configuration- &gt; Content.Users will then be presented with
+a rating system from 1 to 5 at the top of a full Content Item.&nbsp; They will
+be able to cast their vote (once).</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+	
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.new.html 4.6rc2/help/mambots.new.html
--- 4.5.4/help/mambots.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: New</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Lets you create a new
+                    Site Mambot. </p>
+               <strong>Principal Fields:</strong>
+               <ul>
+                    <li><strong>Name:</strong> Type the name of the Mambot as
+                                   it will appear on the Site Mambots listing. This
+                    has no impact on your site. </li>
+                    <li><strong>Folder:</strong> This shows into which
+                         category the Mambot is placed. </li>
+                    <li><strong>Mambot
+                              file:</strong> This is the name of the Mambot file as it
+                         appears in the folder. </li>
+                    <li><strong>Mambot Order:</strong> Choose the order
+                              of the Mambot as listed in the Folder when filtering
+                         by category. </li>
+                    <li><strong>Access Level:</strong> Choose who will be
+                                        able to view this content. Public, Registered
+                         or Special. </li>
+                    <li><strong>Published:</strong> Check the box to let
+                                             the Mambot show on your site or
+                         provide the function it is designed to do. </li>
+          </ul><br />For an explanation of the function of each Mambot and a list of the available parameters, click the Help icon that appears on each individual Mambot's page.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>There is an open Parameters field
+                    on this page which will appear once you save the new Mambot. </p>
+          </td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save:</strong> Click to save the information you have
+                    entered and return to the Mambot Manager. </li>
+               <li><strong>Apply:</strong> Click to save the information entered
+                    AND keep the same window open for editing. </li>
+               <li><strong>Close:</strong> Click to cancel any modification
+                    just made and to close the window.&nbsp; Any modification
+                    is lost.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.newsfeeds.searchbot.html 4.6rc2/help/mambots.newsfeeds.searchbot.html
--- 4.5.4/help/mambots.newsfeeds.searchbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.newsfeeds.searchbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Search Newsfeeds</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Search
+Newsfeeds</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Search Newsfeeds mambot,
+               belongs to the search bots family of mambots. These mambots have
+               no visual output. When they are enabled, search is also performed
+               inside the content denoted by their names.When this Mambot is
+          enabled, a search returns results also from the Newsfeeds section.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.none.html 4.6rc2/help/mambots.none.html
--- 4.5.4/help/mambots.none.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.none.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - No WYSIWYG Editor</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: No WYSIWYG
+      Editor</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Powers the plain text editor
+               for Content Items. To use the plain text editor you must select
+               &quot;No WYSIWYG Editor&quot; on the Global Configuration Manager screen.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.sections.searchbot.html 4.6rc2/help/mambots.sections.searchbot.html
--- 4.5.4/help/mambots.sections.searchbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.sections.searchbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Search Sections</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot: Search
+Sections</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Search&nbsp;Sections mambot,
+               belongs to the search bots family of mambots. These mambots have
+               no visual output. When they are enabled, search is also performed
+               inside the content denoted by their names. When this Mambot is
+          enabled, a search returns results also from the Sections content.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.tinymce.html 4.6rc2/help/mambots.tinymce.html
--- 4.5.4/help/mambots.tinymce.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.tinymce.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - TinyMCE</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mambot:TinyMCE WYSIWYG
+Editor </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This Mambot powers the TinyMCE
+               WYSIWYG content editor. To enable the use of TinyMCE, you must
+               select it in the Global Configuration Manager and publish this
+               Mambot. </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Functionality</strong>: Specify advanced or simple interface. </li>
+               <li><strong>Text Direction</strong>: Will text read left to right or right to left? </li>
+               <li><strong>Prohibited Elements</strong>: Block usage of certain elements from
+                    the content area (for security). </li>
+               <li><strong>Template CSS Classes</strong>: Use template CSS or custom CSS. </li>
+               <li><strong>Custom CSS Classes</strong>: Can specify custom CSS file to be used
+                    for your Content Items. </li>
+               <li><strong>Newlines</strong>: Determined whether new lines are executed with a
+                    &lt; br / &gt; or a &lt; p &gt; tag.</li>
+               <li><strong>Toolbar</strong>: Controls placement of the toolbar relative to the
+                    content window. </li>
+               <li><strong>Popup Height</strong>: Sets height of HTML editing popup.</li>
+               <li><strong>Popup Width</strong>: Sets width of HTML editing popup. </li>
+          </ul></td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/mambots.weblinks.searchbot.html 4.6rc2/help/mambots.weblinks.searchbot.html
--- 4.5.4/help/mambots.weblinks.searchbot.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/mambots.weblinks.searchbot.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mambot - Search Web Links</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Mambot: Search Web Links </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">Search&nbsp;Web Links  Mambot,
+               belongs to the search bots family of Mambots. These Mambots have
+               no visual output. When they are enabled, search is also performed
+               inside the content denoted by their names. When this Mambot is
+          enabled, a search returns results also from the Web Links.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr> <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Save:</strong> Save your changes. </li>
+
+<li><strong>Apply:</strong> Apply your changes to the site without saving. </li>
+
+<li><strong>Close:</strong> Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/massmail.main.html 4.6rc2/help/massmail.main.html
--- 4.5.4/help/massmail.main.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/massmail.main.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Mass Mail</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Mass Mail Users</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    send mail to one or more groups of Users.</p>               
+          <strong>Details</strong>
+               <ul>
+               <li><strong>Group</strong>: Make a selection from the list. Select &quot;All User Groups&quot; to mail the message to all users. Only one selection can be made from this list.&nbsp;</li>
+               <li><strong>Mail to Child Groups</strong>: Check this box to automatically include all of the child groups of the selected group. For example, if you select the &quot;Editor&quot; group and check this box, all users in the Publisher group will also be included in the mass mail.&nbsp;</li>
+               <li><strong>Subject</strong>: Type a subject for the message.&nbsp;</li>
+               <li><strong>Message</strong>: Type the body of the message.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Send Mail</strong>: Click to send message. </li>
+               <li><strong>Cancel</strong>: Click to cancel without saving or sending message. </li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/media.manager.html 4.6rc2/help/media.manager.html
--- 4.5.4/help/media.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/media.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Media Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Media&nbsp;Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Media Manager enables
+                    you upload, delete and organise your media files within Mambo
+                    for use in various articles on your Web site - it serves
+                    essentially, as a replacement for FTP transfer of media files.
+                    The Media Manager only works under the /images/stories
+                    directory. If you need to upload media files in other location
+                    you have to do it through FTP.Note also that batch uploading
+                    is not possible with the Media Manager. </p>
+               <strong>Details </strong>
+               <ul>
+                    <li><strong>Directory</strong>: The drop
+                         down box displayes the folder you are in. A forward
+                         slash (/) denotes you are in the root or top of the
+                         Media Manager directory structure. As root is considered
+                         the /images/stories directory. You can use to navigate.
+                         Alternatively you can click on any folder icon, displayed
+                    bellow as&nbsp;thumbnail.</li>
+                    <li><strong>Upload</strong>:
+                         Enter the files location or click the &#39;Browse&#39; button
+                         and select the file that you want to upload from your
+                    PC or workstation. </li>
+                    <li><strong>Pencil Icon </strong>:
+                         Clicking the thumbnail image or the pencil icon under
+                         it in the Media Manager window will enter the hyperlink
+                         code in the &#39;Code&#39; text field. This can copied
+                         for pasting, for example, into a News item or other
+                    item appearing on the Frontend of your Web site.</li>
+                    <li><strong>Create Directory</strong>:
+                         Enter a name for the new directory in the &#39;Create
+                         Directory&#39; text
+                         box and click the <strong>&#39;Create</strong>&#39; icon
+                         on the toolbar. The new directory will be created and
+                    will be available for storing files.</li>
+                    <li><strong>Trash Can Icon </strong>:
+                         To delete a file or a directory, click the &#39;Trash
+                         Can&#39; icon
+                         under the image of the file in the Media Manager window.
+               A directory must be empty before it can be deleted.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Click to initiate the uploading
+                    of a file entered in the Upload field at the bottom of the
+                    page.</li>
+               <li><strong>Create</strong>: Click to initiate the creation of
+                    a new directory, as specified at the bottom of the page. </li>
+          </ul></td>
+     </tr></table>
+
+<p>&nbsp;</p>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menumanager.copy.html 4.6rc2/help/menumanager.copy.html
--- 4.5.4/help/menumanager.copy.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menumanager.copy.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - Copy</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Manager : Copy Menu </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you <strong>copy
+                         a Menu</strong> and all its Menu Items. A list displays
+                         the name of the Menu and Menu Items copied.</p>
+               <strong>Primary Fields</strong>
+               <ul>
+                    <li><strong>New Menu Name</strong>:Type here to create a
+                         new Menu Name. This is the identification name used
+                         by Mambo to identify this menu within the code&nbsp;so
+                         it must be unique.&nbsp; It is recommended to use no
+                         spaces within this name. For example, in the core Mambo
+                         the User Menus Menu Name is usermenu and the Main Menus
+                    Menu Name is mainmenu. </li>
+                    <li><strong>New Module Name</strong>: Type here a name for
+                         the Module that handles your new menu.This is the name
+                         given to the new mod_mainmenu module which is automatically
+                         created when you save this menu. It is also the Name
+                         of the menu as it will appear on the page if you choose
+                         to show it (this may be changed when editing the module).
+                         In the example described above these are User Menu and
+                    Main Menu.  </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Copy:</strong> A new Menu Name will be created&nbsp; in
+                              the Menu Manager list where it may be edited.A
+                    new mod_mainmenu module, with the Name you have entered above,
+                    will also be created. Parameters for the created module&nbsp;can&nbsp;be
+                              edited through the &#39;Modules Manager [site]&#39;:
+                              Modules -&gt; Site Modules.</li>
+               <li><strong>Cancel:</strong>Click on this
+                                   icon if you wish to stop the copying and cancel
+                         any action.</li>
+               </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menumanager.edit.html 4.6rc2/help/menumanager.edit.html
--- 4.5.4/help/menumanager.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menumanager.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Manager:
+Edit Menu</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page
+                    lets you edit an existing
+                    menu.</p>
+               <strong>Details </strong>
+               <ul>
+                    <li><strong>Menu Name</strong>:&nbsp; Type here to create
+                         or edit a Menu Name. This is the identification name
+                         used by Mambo to identify this menu within the code
+                         so&nbsp;it must be
+                         unique.&nbsp; It is recommended to use no space within
+                         this name. For example, in the core Mambo the User Menus
+                         Menu Name is usermenu and the Main Menus Menu Name is
+                    mainmenu. </li>
+                    <li><span style=
+"FONT-WEIGHT: bold">Module Title</span><span style=
+"">: Type here a Module Name.This is the name given
+                              to the new mod_mainmenu module which is automatically
+                              created when you save this menu. It is also the
+                              Name of the menu as it will appear on the page
+                              if you choose to show it (this may be changed when
+                              editing the module). In the example described above
+                    these are User Menu and Main Menu.</span></li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>:&nbsp; A new mod_mainmenu module, with
+                              the Name you have entered above will automatically be created.Parameters
+                              for the module created are to be edited through the &#39;Modules
+                    Manager [site]&#39;: Modules -&gt; Site Modules.</li>
+               <li><strong>Cancel</strong>: Click
+                         on this icon if you wish to stop any action.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menumanager.main.html 4.6rc2/help/menumanager.main.html
--- 4.5.4/help/menumanager.main.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menumanager.main.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>&quot;Menus&quot; in Mambo
+                    are groups of navigational links to sections, categories,
+                    Content Items, components or external pages. These links
+                    are called &#39;Menu Items&#39;.Each menu must have an identification
+                    name which is only used internally by Mambo. A menu only
+                    becomes visible on a site if it has a published mod_mainmenu
+                    module which references it.&nbsp;A menu may have multiple
+                    mod_mainmmenu modules referencing it.</p>               <span style="font-weight: bold;"><span style="font-weight: bold;">Display
+                         Headings :</span></span>
+               <ul>
+               <li><span style=""><span style=""><strong>Menu Name</strong>: Click
+                                        on the name to edit it. This name may be the one that
+                                        is given to the menu by default or the name you gave
+                    to that menu. </span></span></li>
+               <li><span style=""><span style=""><strong>Menu
+                                             Items</strong>: Click on the Edit icon in this column
+                                             to add or edit Menu Items associated with a menu. Or
+                                             alternatively go to &quot;Menu-&gt;the-menu-you-choose-to-edit&quot;.
+                                             A &quot;Menu Manager [the-menu-you-choose-to-edit]&quot; window
+                                             will&nbsp;appear with a list of all Menu Items associated
+                         to this Menu.</span></span></li>
+               <li><span style=""><span style=""><strong>#Published</strong>: This is the
+                              number of Menu Items published.</span></span></li>
+               <li><span style=""><span style=""><strong>#Unpublished</strong>:
+                                   This is the number of Menu Items unpublished.</span></span></li>
+               <li><span style=""><span style=""><strong>#Trash</strong>: This
+                                   is the number of Menu Items in the Trash Manager.</span></span></li>
+               <li><span style=""><span style=""><strong>#Modules</strong>: This
+                                                            is the number of menu modules associated to the Menu
+                                        Name.</span></span></li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New:</strong> Click this icon
+                         to create a new Menu. You will access the &quot;Menu Details&quot; window.&nbsp; Type
+                         a Menu Name. This is the identification name used by Mambo
+                         to identify this menu within the code.&nbsp; It must be unique.&nbsp; It
+                         is recommended to use no spaces within this name. For
+                         example, in the core Mambo the User Menus Menu Name
+                         is usermenu and the Main Menus Menu Name is mainmenu.&nbsp; <strong>Next:</strong> Type
+                         the Module Title. This is the name given to the new
+                         mod_mainmenu module which is automatically created when
+                         you save this menu. It is also the Name of the menu
+                         as it will appear on the page if you choose to publish
+                         it. This may be changed in the future when editing the
+                         module.&nbsp; In the example
+                         described above, these are User Menu and Main Menu.
+                         Click on the Save icon. Your new menu appears in the
+                         Menu Manager list.</li>
+               <li><strong>Edit:</strong> &nbsp;Click the radio button next to
+                         the Menu Name you want to edit.&nbsp; Then, click on the &quot;Edit&quot; icon
+                         which will take you to the Editing page.</li>
+               <li><strong>Copy:</strong> Click
+                         the radio button next to the Menu Name you want to copy.
+                         Then, click the Copy icon in the toolbar. This will
+                         duplicate the menu. You may copy any of your menus.
+                         Copying will create a new Menu Name, containing the
+                         same Menu Items as the menu copied, associated to a
+                         new Menu Module. A Copy Page will display, with the
+                         same choices as in Create New Menu. It will also state
+                         the name of the Menu being copied and a list of the
+                         Menu Items associated to the menu being copied. Fill
+                         in the fields as in the &quot;Create New Menu&quot; screen.</li>
+               <li><strong>Delete:</strong> Click the radio button next to the
+                         Menu Name you want to delete. Then, click the Delete
+                    icon in the toolbar. This will delete the Menu. A &quot;Delete
+                         Menu : Name-of-the-menu&quot; screen will display. It shows
+                         the Module(s) to be deleted (the mod_mainmenu modules associated
+                         to this Menu) and the Menu Items to be deleted. Click the
+                         Delete Icon surrounded by a dotted line. This will delete
+                         this Menu, ALL its Menu Items and ALL the Modules associated
+                         with it. A Javascript alert popup box gives you the choice
+                         to &quot;OK&quot; or to &quot;Cancel&quot; this action.
+                         NOTE: Deleted Menus cannot be recovered from the Trash
+                    Manager!</li>
+               </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menumanager.new.html 4.6rc2/help/menumanager.new.html
--- 4.5.4/help/menumanager.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menumanager.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Manager:
+New Menu</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page
+                    lets you create a new menu.</p>
+               <strong>Details </strong>
+               <ul>
+                    <li><strong>Menu Name</strong>:&nbsp; Type here to create or edit a
+                         Menu Name. This is the identification name used by Mambo
+                         to identify this menu within the code so&nbsp;it must be
+                         unique.&nbsp; It is recommended to use no space within
+                         this name. For example, in the core Mambo the User Menus
+                         Menu Name is usermenu and the Main Menus Menu Name is
+                    mainmenu. </li>
+                    <li><span style=
+"FONT-WEIGHT: bold">Module Title</span><span style=
+"">: Type here a Module Name.This is the name given
+                              to the new mod_mainmenu module which is automatically
+                              created when you save this menu. It is also the
+                              Name of the menu as it will appear on the page
+                              if you choose to show it (this may be changed when
+                              editing the module). In the example described above
+                    these are User Menu and Main Menu.</span></li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>:&nbsp; A new mod_mainmenu module, with
+                              the Name you have entered above will automatically be created.Parameters
+                              for the module created are to be edited through the &#39;Modules
+                    Manager [site]&#39;: Modules -&gt; Site Modules.</li>
+               <li><strong>Cancel</strong>: Click
+                         on this icon if you wish to stop any action.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.component_item_link.html 4.6rc2/help/menus.component_item_link.html
--- 4.5.4/help/menus.component_item_link.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.component_item_link.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,93 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Link Component Item</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Link
+- Component Item</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Link - Component
+                    Item</strong> Menu Item adds a link to a component that automatically
+                    reflects the parameters of the original component as defined
+                    in the &quot;Component&quot; Menu Item. The &quot;Link -
+                    Component Item&quot; is useful if you want a component to
+                    appear in more than one menus and just want to change the &#39;Details&#39; parameters
+                    for that component while keeping the general parameters as
+                    defined in the Component Menu Item. One aspect is added to
+                    the &#39;Details&#39; function : the possibility of opening
+          the link in a certain type of window.</p>
+                    <strong>Details</strong>
+                    <ul>
+                         <li>                              <strong>Name:</strong> Enter
+                              the name of the Menu Item as you want it to appear
+                              on the menu of your site.</li>
+                         <li><strong>Component:</strong> Here you may select
+                              one specific component. The list shows the &#39;Component
+                              Menu Item&#39; names as defined in the &#39;Component&#39; Menu
+                              Item.</li>
+                         <li><strong>URL:</strong> (The URL for this item will
+                              show after Apply/Save.)</li>
+                         <li><strong>On Click, Open in:</strong>
+                                   <ul>
+                                        <li>&#39;Parent Window With Browser Navigation&#39; is
+                                             the same window you call the link
+                                             from, </li>
+                                        <li>&#39;New Window with Browser Navigation&#39; is
+                                             a full featured new window, </li>
+                                        <li>&#39;New Window Without Browser Navigation&#39; is
+                                             a new pop-up window with just scroll
+                                             bars which may be resized.</li>
+                                   </ul>
+                         </li>
+                         <li><strong>Parent Item:</strong> Select &#39;Top&#39; if
+                              you want the Menu Item to appear at the same level
+                              as your primary navigation. You can also put the
+                              Menu Item under an existing Menu Item by selecting
+                              that existing Menu Item as parent.</li>
+                         <li><strong>Ordering:</strong> By default, Mambo adds
+                              new items to the end of the Menu Items list. After
+                              saving or applying the new item, you can change
+                              its order when editing, using a pull-down menu
+                              to select the item after which the item will appear.</li>
+                         <li><strong>Access Level:</strong> Sets who can view
+                              this item. </li>
+                         <li><strong>Published:</strong> Sets whether the Menu
+                              Item is published or not. By default, new Menu
+                              Items are set to be published.</li>
+                         </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.components.html 4.6rc2/help/menus.components.html
--- 4.5.4/help/menus.components.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.components.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Component</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Component</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Component</strong> Menu
+                    Item adds a link to a page produced by a&nbsp;component.</p>          
+               <strong>Details</strong>               <ul>
+                    <li><strong>Name :</strong>Enter the name of the Menu Item
+                    as you want it to appear on the menu of your site.</li>
+                    <li><strong>Component
+                         :</strong> Select one specific component.</li>
+                    <li><strong>URL :</strong> (The
+                         URL for this item will appear after Apply/Save.)</li>
+                    <li><strong>Parent Item</strong> :
+                         Select &#39;Top&#39; if
+                         you want the Menu Item to appear at the same level as
+                         your primary navigation. You can also put the Menu Item
+                         as a sublevel of an existing Menu Item by selecting
+                         that existing Menu Item as parent.</li>
+                    <li><strong>Ordering:</strong> By
+                              default, Mambo adds new items to the end of the
+                         existing Menu Items list. After saving or applying the
+                         new item, you can change its order when editing, using
+                         a pull-down menu to select the item after which the
+                         item will appear.</li>
+                    <li><strong>Access Level:</strong> Sets
+                                   who can view this item. </li>
+                    <li><strong>Published:</strong> Sets
+                                        whether the Menu Item is published or
+                         not. By default, new Menu Items are set to be published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li>The settings that can be edited under the Parameters tab vary
+                    according to the selected component and will appear only
+                    after you click &quot;Apply&quot; or&quot;Save.&quot;</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.contact_category_table.html 4.6rc2/help/menus.contact_category_table.html
--- 4.5.4/help/menus.contact_category_table.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.contact_category_table.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Table Contact Category</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Table
+- Contact Category</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Table - Contact
+                    Category</strong> Menu Item adds a link to an existing category
+                    of contacts, displaying the category as a table listing all
+                    published Contacts in&nbsp;it, as clickable Names. If there
+                    is only one Contact published, the Table will behave as&nbsp;in &#39;Link
+          - Contact Item&#39;, displaying only that contact.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Name&nbsp;:</strong> Enter the name of the Menu
+                         Item as you want it to appear on the menu of your site.
+                         If you leave this blank, the Category name will automatically
+                         be used.</li>
+                    <li><strong>Category :</strong> Select one published Category.</li>
+                    <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                         after Apply/Save.)</li>
+                    <li><strong>Parent Item :</strong> Select *Top* if you want
+                         the Menu Item to appear at the same level as your primary
+                         navigation. You can also put the Menu Item under an
+                         existing Menu Item by selecting that existing menu item
+                         as parent.</li>
+                    <li><strong>Ordering:</strong> By default, Mambo adds new
+                         items to the end of the Menu Items list. After saving
+                         or applying the new item, you can change its order when
+                         editing, using a pull-down menu to select the item after
+                         which the item will appear.</li>
+                    <li><strong>Access Level:</strong> Sets who can view this
+                         item</li>
+                    <li><strong>Published:</strong> Sets whether the Menu Item
+                         is published or not. By default, new menu items are
+                         set to be published.</li>
+                    </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Show or hide a &quot;Back&quot; button
+                    on the bottom of the page to allow the user to return to
+                    the previously viewed page.</li>
+               <li><strong>Page Title:</strong> Show/Hide the page(s) title.</li>
+               <li><strong>Page Title:</strong> Text
+                         to display at the top of the page. If left blank, the
+                         menu name will display instead.</li>
+               <li><strong>Other Categories:</strong> Show/Hide other categories
+                    when viewing a specific category. When set to show,
+                    the displayed category titles will act as clickable links.</li>
+               <li><strong>#
+                         Category Items</strong> : Show/Hide the number of items
+                         for each category displayed.</li>
+               <li><strong>Table Headings</strong>:
+                         Show/Hide the Table headings (&#39;Name,&#39; &#39;Position,&#39; &#39;Email,&#39; &#39;Phone,&#39; and &#39;Fax&#39;).Position
+                         Column: Show/Hide the column displaying the contacts&#39; &#39;Position&#39;.</li>
+               <li><strong>Position Column:</strong> Show/Hide the column displaying
+                    the contacts&#39; &#39;Position&#39;.</li>
+               <li> <strong>Email
+                         Column:</strong> Show/Hide the column displaying the
+                         contacts&#39; &#39;Email&#39;.                         </li>
+               <li><strong>Telephone
+                         Column:</strong> Show/Hide Show/Hide the column displaying
+                         the contacts&#39; &#39;Telephone&#39; number.</li>
+               <li><strong>Fax
+                         Column:</strong> Hides or shows Show/Hide the column
+                         displaying the contacts&#39; &#39;Fax&#39; number.</li>
+          </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.contact_item_link.html 4.6rc2/help/menus.contact_item_link.html
--- 4.5.4/help/menus.contact_item_link.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.contact_item_link.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Link Contact Item</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Link
+- Contact Item</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Link - Contact
+                    Item</strong> Menu Item adds a link to an existing published
+                    contact. Displays information about this contact and&nbsp;displays
+          a form to fill and mail to this contact.</p>
+                    <strong>Details</strong>
+                    <ul>
+                         <li>                              <strong>Name:</strong> Enter
+                              the name of the Menu Item as you want it to appear
+                              on the menu of your site.</li>
+                         <li><strong>Contact to Link:</strong> Select
+                              a specific contact.</li>
+                         <li><strong>URL:</strong> (The URL for this item will
+                              show after Apply/Save.)</li>
+                         <li><strong>On Click, Open in:</strong>
+                                   <ul>
+                                        <li>&#39;Parent Window With Browser Navigation&#39; is
+                                             the same window you call the link
+                                             from, </li>
+                                        <li>&#39;New Window with Browser Navigation&#39; is
+                                             a full featured new window, </li>
+                                        <li>&#39;New Window Without Browser Navigation&#39; is
+                                             a new pop-up window with just scroll
+                                             bars which may be resized.</li>
+                                   </ul>
+                         </li>
+                         <li><strong>Parent Item:</strong> Select &#39;Top&#39; if
+                              you want the Menu Item to appear at the same level
+                              as your primary navigation. You can also put the
+                              Menu Item under an existing Menu Item by selecting
+                              that existing Menu Item as parent.</li>
+                         <li><strong>Ordering:</strong> By default, Mambo adds
+                              new items to the end of the Menu Items list. After
+                              saving or applying the new item, you can change
+                              its order when editing, using a pull-down menu
+                              to select the item after which the item will appear.</li>
+                         <li><strong>Access Level:</strong> Sets who can view
+                              this item. </li>
+                         <li><strong>Published:</strong> Sets whether the Menu
+                              Item is published or not. By default, new Menu
+                              Items are set to be published.</li>
+                         </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows
+                              you to set customized styles for this page. The
+                    suffix you type here is automatically added to the CSS classes
+                    for this page. </li>
+               <li><strong>Page Title :</strong> Show/Hide the page
+                         title.</li>
+               <li><strong>Page
+                                   Title:</strong> Text to display at the top
+                                   of the page. If left blank the Menu Name will
+                                   be used instead.</li>
+          </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_archive_category.html 4.6rc2/help/menus.content_archive_category.html
--- 4.5.4/help/menus.content_archive_category.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_archive_category.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,182 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Blog Content Category Archive</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong>Blog
+- Content Category Archive</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Blog
+                         - Content Category Archive</strong> Menu Item adds a link that lists in a &quot;blog&quot; format
+                    the archived items in a particular Content Category within
+                    a Section. The list of Archived Items can be accessed through
+          Content -&gt; Archives Manager.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Name :</strong> Enter the name of the Menu
+                         Item as you want it to appear on the menu of your
+                         site.</li>
+                    <li><strong>Category :</strong> Here you may select all,
+                         one or multiple categories.</li>
+                    <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                         after Apply/Save.)</li>
+                    <li><strong>Parent Item :</strong> Select &quot;Top&quot; if
+                         you want the Menu Item to appear at the same level as
+                         your primary navigation. You can also put the Menu Item
+                         under an existing Menu Item by selecting that existing
+                         Menu Item as parent.</li>
+                    <li><strong>Ordering:</strong> By default, Mambo adds new
+                         items to the end of the existing Menu Items list. After
+                         saving or applying the new item, you can change its
+                         order when editing, using a pull-down menu to select
+                         the item after which the item will appear.</li>
+                    <li><strong>Access Level:</strong> Sets who can view this
+                         item.</li>
+                    <li><strong>Published:</strong> Sets whether the Menu Item
+                         is published or not. By default, new Menu Items are
+                         set to be published.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Controls whether to show or
+                    hide a &quot;Back&quot; text link that would appear on the
+                    bottom of the page and return the user to the previously
+                    viewed page. The pull down lets select &#39;Use Global&#39; to
+                    use the parameter as defined globally through the Site-&gt;Global
+                    Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+               <li><strong>Page Title:</strong> Text to display at the top of
+                    the page.</li>
+               <li><strong>Page Title:</strong> Hides or shows the
+                    Page Title text (defined in the field described above).</li>
+               <li><strong># Leading:</strong> Number of items to display as
+                    leading (running the width of the display area on the page).
+                    These items will display with the introductory text shown
+                    as defined in a content item&#39;s Intro Text field.</li>
+               <li><strong># Intro:</strong> Number of items to display with
+                    the introductory text shown (as defined in a Content Item&#39;s
+                    Intro Text field) in the columns as defined hereafter (if
+                    only one column is chosen, these items will display in the
+                    same way as the #Leading Items).</li>
+               <li><strong>Columns:</strong> Number of columns used to display
+                    items whose introductory text is displayed.</li>
+               <li><strong># Links:</strong> Number of items to display as linked
+                    titles, with no introductory text. These items will appear
+                    under the leading items and items with the Intro Text showing.</li>
+               <li><strong>Order by:</strong> This controls the order that
+                    the items will be displayed in. The setting in the Category
+                    Order field (described above) takes precedence. In this drop-down
+                    menu, one of the following options can be selected:</li>
+               <ul>
+                         <li> &#39;Default&#39;: Arranges items according to
+                              the order set for the specific category in the
+                              Content Items </li>
+                         <li> &#39;Oldest first&#39;: Arranges items in chronological
+                              order, with the oldest items first. </li>
+                         <li> &#39;Most recent first&#39;: Arranges items in
+                              chronological order, with the newest items first. </li>
+                         <li> &#39;Title Alphabetical&#39;: Arranges items by
+                              title in alphabetical order. </li>
+                         <li> &#39;Title Reverse-Alphabetical&#39;: Arranges
+                              items by title in reverse alphabetical order. </li>
+                         <li>&#39;Author Alphabetical&#39;: Arranges items by
+                         author in alphabetical order. </li>
+                         <li> &#39;Author Reverse-Alphabetical&#39;: Arranges
+                              items by author in reverse alphabetical order. </li>
+                         <li> &#39;Most Hits&#39;: Arranges items according to
+                              the number of hits, with the items with the most
+                              hits first. </li>
+                         <li> &#39;Least Hits&#39;: Arranges items according
+                              to the number of hits, with the items with the
+                              least hits first.</li>
+                         <li>'Ordering': Manual ordering. </li>
+               </ul>
+               <li><strong>Pagination:</strong> Hides, shows or sets to &#39;auto&#39; the
+                    pagination of page items. The Pagination shows links to other
+                    pages on the list of items (such as &lt;&lt; Start &lt; Prev
+                    1 2 Next &gt; End &gt;&gt;).</li>
+               <li><strong>Pagination Results:</strong> Hides or shows the Pagination
+                    Results information (the number of items to be displayed
+                    on the page, such as &#39;Results 1-6 of 6&#39;).</li>
+               <li><strong>MOSImages:</strong> Hides or shows images displayed
+                    by the tag. These images are defined within each Content
+                    Item.</li>
+               <li><strong>Section Name:</strong> Hides or shows the name of
+                    the section to which each item belongs. If this option is
+                    turned on, each item&#39;s section name will be shown under
+                    the item&#39;s title on the home page.</li>
+               <li><strong>Section Name Linkable:</strong> Enables you to make
+                    each item&#39;s section name linkable. Applies only when
+                    the Section Name option (described above) is set to &#39;Show.&#39;</li>
+               <li><strong>Item Title:</strong> Hides or shows the titles for
+                    items on the page.</li>
+          </ul>
+               <p>For each of the following nine items listed below, you can
+                    use the option selected in the Global Configuration settings
+                    (Site -&gt; Global Configuration) by selecting &#39;Use Global&#39; or
+                    you can override the Global Configuration setting by selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                    the settings here for items will not affect the Global Configuration
+                    settings and will not affect the settings on the rest of
+                    the site.Linked Titles: Enables you to make item titles linked.
+                    The link will go to the item page.</p>
+               <ul>
+                    <li><strong>Linked Titles</strong>: Enable the Content Items'
+                         titles to be hyperlinks to the Content Item.  </li>
+                    <li><strong>Read More:</strong> Hides or shows
+                         the &#39;Read
+                         more&#39; link that appears after the introductory text
+                         of Content Items. The link will go to the Content Item
+                         in full.</li>
+                    <li><strong>Item Rating:</strong> Hides or shows ratings
+                         given to home page items by your site&#39;s users.</li>
+                    <li><strong>Author Names:</strong> Hides or shows the names
+                         of authors of items.</li>
+                    <li><strong>Created Date and Time:</strong> Hides or shows
+                         the date and time the items were created.</li>
+                    <li><strong>Modified Date and Time:</strong> Hides or shows
+                         the date and time the items were last modified.</li>
+                    <li><strong>PDF Icon:</strong> Hides or shows the icon and
+                         link to the PDF version of the items.</li>
+                    <li><strong>Print Icon:</strong> Hides or shows the icon
+                         and link to the printer-friendly format of the items.</li>
+                    <li><strong>Email Icon:</strong> Hides or shows the icon
+                         and link to the page that enables users to email items
+                         to others.</li>
+               </ul>
+          </td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_archive_section.html 4.6rc2/help/menus.content_archive_section.html
--- 4.5.4/help/menus.content_archive_section.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_archive_section.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,198 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Blog Content Section Archive</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: Blog
+- Content Section Archive</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Blog - Content Section
+                    Archive Menu Item adds a link that lists in a &quot;blog&quot; format
+                    the archived items in a whole Content Section, as listed in the
+          Archive Manager (Content -&gt; Archive Manager).</p>
+          <strong>Details</strong>
+          <ul>
+               <li> <strong>Name :</strong> Enter the name of the Menu Item as
+                    you want it to appear on the menu of your site. </li>
+               <li> <strong>Section :</strong> Here you may select all, one or
+                    multiple sections. </li>
+               <li> <strong>URL :</strong> (The URL for this item will appear
+                    after you Apply/Save.) </li>
+               <li> <strong>Parent Item :</strong> Select *Top* if you want the
+                    Menu Item to appear at the same level as your primary navigation.
+                    You can also put the menu item under an existing Menu Item
+                    by selecting that existing menu item as parent.</li>
+               <li><strong>Ordering:</strong> By default, Mambo adds new items
+                    to the end of the Menu Items list. After saving or applying
+                    the new item, you can change its order when editing, using
+                    a pull-down menu to select the item after which the item
+                    will appear.</li>
+               <li><strong>Access Level:</strong> Sets who can view this item. </li>
+               <li> <strong>Published:</strong> Sets whether the Menu Item is
+                    published or not. By default, new Menu Items are set to be
+                    published. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Controls whether to show or
+                    hide a &quot;Back&quot; text link that would appear on the
+                    bottom of the page and return the user to the previously
+                    viewed page. The pull down lets select &#39;Use Global&#39; to
+                    use the parameter as defined globally through the Site-&gt;Global
+                    Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+               <li><strong>Page Title:</strong> Text to display at the top of
+                    the page.</li>
+               <li><strong>Page Title:</strong> Hides or shows the Page Title
+                    text (defined in the field described above).</li>
+               <li><strong># Leading:</strong> Number of items to display as
+                    leading (running the width of the display area on the page).
+                    These items will display with the introductory text shown
+                    as defined in a content item&#39;s Intro Text field.</li>
+               <li><strong># Intro:</strong> Number of items to display with
+                    the introductory text shown (as defined in a Content Item&#39;s
+                    Intro Text field) in the columns as defined hereafter (if
+                    only one column is chosen, these items will display in the
+                    same way as the #Leading Items).</li>
+               <li><strong>Columns:</strong> Number of columns used to display
+                    items whose introductory text is displayed.</li>
+               <li><strong># Links:</strong> Number of items to display as linked
+                    titles, with no introductory text. These items will appear
+                    under the leading items and items with the Intro Text showing.</li>
+               <li><strong>Category Order:</strong> If the page displays items
+                    from several categories, the items can be grouped by category,
+                    then by primary order (as specified in the Primary Order
+                    field, described below). In this drop-down menu, one of the
+                    following options can be selected:
+                         <ul>
+                              <li> &#39;No, order by primary ordering only&#39;:
+                                   Arranges items only by primary order (as specified
+                                   in the Primary Order field, described below),
+                                   regardless of category. </li>
+                              <li> &#39;Title Alphabetical&#39;: Arranges items
+                                   first by category in alphabetical order, then
+                                   by the primary order (as specified in the
+                                   Primary Order field). </li>
+                              <li> &#39;Title Reverse-Alphabetical&#39;: Arranges
+                                   items first by category in reverse alphabetical
+                                   order, then by the primary order (as specified
+                                   in the Primary Order field). </li>
+                              <li> &#39;Ordering&#39;: Arranges items first by
+                                   category order as set in the Category Manager
+                                   (Content -&gt;Category Manager), then by the
+                                   primary order (as specified in the Primary
+                                   Order field). </li>
+                         </ul>
+               </li>
+               <li><strong>Primary Order:</strong> This controls the order that
+                    the items will be displayed in. The setting in the Category
+                    Order field (described above) takes precedence. In this drop-down
+                    menu, one of the following options can be selected:</li>
+               <ul>
+                    <li> &#39;Default&#39;: Arranges items according to the order
+                         set for the specific category in the Content Items </li>
+                    <li> Manager [section: Name-of-section] (Content -&gt;Content
+                         by Section). </li>
+                    <li> &#39;Oldest first&#39;: Arranges items in chronological
+                         order, with the oldest items first. </li>
+                    <li> &#39;Most recent first&#39;: Arranges items in chronological
+                         order, with the newest items first. </li>
+                    <li> &#39;Title Alphabetical&#39;: Arranges items by title
+                         in alphabetical order. </li>
+                    <li> &#39;Title Reverse-Alphabetical&#39;: Arranges items
+                         by title in reverse alphabetical order. </li>
+                    <li> &#39;Author Alphabetical&#39;: Arranges items by author
+                         in alphabetical order. </li>
+                    <li> &#39;Author Reverse-Alphabetical&#39;: Arranges items
+                         by author in reverse alphabetical order. </li>
+                    <li> &#39;Most Hits&#39;: Arranges items according to the
+                         number of hits, with the items with the most hits first. </li>
+                    <li> &#39;Least Hits&#39;: Arranges items according to the
+                         number of hits, with the items with the least hits first. </li>
+               </ul>
+               <li><strong>Pagination:</strong> Hides, shows or sets to &#39;auto&#39; the
+                    pagination of page items. The Pagination shows links to other
+                    pages on the list of items (such as &lt;&lt; Start &lt; Prev
+                    1 2 Next &gt; End &gt;&gt;).</li>
+               <li><strong>Pagination Results:</strong> Hides or shows the Pagination
+                    Results information (the number of items to be displayed
+                    on the page, such as &#39;Results 1-6 of 6&#39;).</li>
+               <li><strong>MOSImages:</strong> Hides or shows images displayed
+                    by the tag. These images are defined within each Content
+                    Item.</li>
+               <li><strong>Category Name:</strong> Hides or shows the name of
+                    the category to which each item belongs. If this option is
+                    turned on, each item&#39;s category name will be shown under
+                    the item&#39;s title on the home page.</li>
+               <li><strong>Category Name Linkable:</strong> Enables you to make
+                    each item&#39;s category name linkable. Applies only when
+                    the Category Name option (described above) is set to &#39;Show.&#39;</li>
+               <li><strong>Item Title:</strong> Hides or shows the titles for
+                    items on the page.</li>
+          </ul>
+               <p>For each of the following nine items listed below, you can
+                    use the option selected in the Global Configuration settings
+                    (Site -&gt; Global Configuration) by selecting &#39;Use Global&#39; or
+                    you can override the Global Configuration setting by selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                    the settings here for items will not affect the Global Configuration
+                    settings and will not affect the settings on the rest of
+                    the site.Linked Titles: Enables you to make item titles linked.
+                    The link will go to the item page.</p>
+               <ul>
+                    <li><strong>Linked Titles</strong>: Enable the Content Items'
+                         titles to be hyperlinks to the Content Item. </li>
+                    <li><strong>Read More:</strong> Hides or shows the &#39;Read
+                         more&#39; link that appears after the introductory text
+                         of Content Items. The link will go to the Content Item
+                         in full.</li>
+                    <li><strong>Item Rating:</strong> Hides or shows ratings
+                         given to home page items by your site&#39;s users.</li>
+                    <li><strong>Author Names:</strong> Hides or shows the names
+                         of authors of items.</li>
+                    <li><strong>Created Date and Time:</strong> Hides or shows
+                         the date and time the items were created.</li>
+                    <li><strong>Modified Date and Time:</strong> Hides or shows
+                         the date and time the items were last modified.</li>
+                    <li><strong>PDF Icon:</strong> Hides or shows the icon and
+                         link to the PDF version of the items.</li>
+                    <li><strong>Print Icon:</strong> Hides or shows the icon
+                         and link to the printer-friendly format of the items.</li>
+                    <li><strong>Email Icon:</strong> Hides or shows the icon
+                         and link to the page that enables users to email items
+                         to others</li>
+               </ul>
+               </td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+               </ul></td>
+     </tr>
+</table></body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_blog_category.html 4.6rc2/help/menus.content_blog_category.html
--- 4.5.4/help/menus.content_blog_category.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_blog_category.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,285 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Blog Content Category</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <strong>Blog
+- Content Category</strong></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Blog - Content
+                    Category</strong> Menu Item Format adds a link that lists
+                    published items from one or multiple Content Categories in
+                    a &quot;blog&quot; format.
+                    The blog format displays articles as a series of short summaries
+          of items on your site.</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Name :</strong> Enter the name of
+                    the Menu Item as you want it to appear on the menu of your
+                    site.</li>
+               <li><strong>Category :</strong> Here you may select
+                    all, one or multiple categories.</li>
+               <li><strong>URL :</strong> (The URL for this item
+                    will&nbsp;appear
+                         after Apply/Save.)</li>
+               <li><strong>Parent Item :</strong> Select &quot;Top&quot; if
+                         you want the Menu Item to appear at the same level as
+                    your primary navigation. You can also put the Menu Item under
+                    an existing Menu Item by selecting that existing Menu Item
+                    as parent.</li>
+               <li><strong>Ordering:</strong> By default, Mambo
+                    adds new items to the end of the existing Menu Items list.
+                    After saving or applying the new item, you can change its
+                    order when editing, using a pull-down menu to select the
+                    item after which the item will appear.</li>
+               <li><strong>Access Level:</strong> Sets who can view
+                    this item.</li>
+               <li><strong>Published:</strong> Sets whether the
+                    Menu Item is published or not. By default, new Menu Items
+                    are set to be published.</li>
+          </ul>          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows
+                         you to set customized styles for this page. The suffix
+                         you type here is automatically added to the CSS classes
+                         for this page, and will have to be defined in your template&#39;s
+                    CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Controls
+                         whether to show or hide a &quot;Back&quot; text link
+                         that would appear on the bottom of the page and return
+                         the user to the previously viewed page. The pull down
+                         lets select &#39;Use
+                              Global&#39; to use the parameter as defined globally
+                    through the Site-&gt;Global Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+               <li><strong>Page Title:</strong> Text to display
+                    at the top of the page.</li>
+               <li><strong>Page Title:</strong> Hides
+                                        or shows the Page Title text (defined
+                    in the field described above).</li>
+               <li><strong># Leading:</strong> Number
+                         of items to display as leading (running the width of
+                    the display area on the page). These items will display with
+                         the introductory text shown as defined in a content
+                    item&#39;s
+                    Intro Text field.</li>
+               <li><strong># Intro:</strong> Number
+                              of items to display with the introductory text
+                              shown (as defined in a Content Item&#39;s Intro
+                              Text field) in the columns as defined hereafter
+                              (if only one column is chosen, these items will
+                    display in the same way as the #Leading Items).</li>
+               <li><strong>Columns:</strong> Number of columns
+                              used to display items whose introductory text is
+                    displayed.</li>
+               <li><strong># Links:</strong> Number of items
+                                                       to display as linked titles,
+                    with no introductory text. These items will appear under
+                    the leading items and items with the Intro Text showing.</li>
+               <li><strong>Category Order:</strong> If the page
+                                                            displays items from
+                    several categories, the items can be grouped by category,
+                    then by primary order (as specified in the Primary Order
+                    field, described below). In this drop-down menu, one of the
+                    following options can be selected:
+                         <ul>
+                              <li>
+                                    &#39;No, order by primary ordering only&#39;:
+                                                                      Arranges
+                                        items only by primary order (as specified
+                                                                      in the
+                                        Primary Order field, described below),
+                                   regardless of category. 
+                              </li>
+                              <li>
+                                    &#39;Title Alphabetical&#39;: Arranges
+                                        items first by category in alphabetical
+                                        order, then by the primary order (as
+                                        specified in the Primary Order field). 
+                              </li>
+                              <li>
+                                    &#39;Title Reverse-Alphabetical&#39;:
+                                        Arranges items first by category in reverse
+                                        alphabetical order, then by the primary
+                                        order (as specified in the Primary Order
+                                        field). 
+                              </li>
+                              <li>
+                                    &#39;Ordering&#39;: Arranges items first
+                                                                      by category
+                                        order as set in the Category Manager
+                                        (Content -&gt;Category Manager), then
+                                        by the primary order (as specified in
+                                        the Primary Order field). 
+                              </li>
+                         </ul>
+                    </li>
+               <li><strong>Primary Order:</strong> This controls
+                                                            the order that the
+                    items will be displayed in. The setting in the Category Order
+                    field (described above) takes precedence. In this drop-down
+                    menu, one of the following options can be selected:</li>
+               <ul>
+                         <li>
+                               &#39;Default&#39;: Arranges
+                                                  items according to the order
+                                                  set for the specific category
+                                        in the Content Items 
+                         </li>
+                              <li>
+                                    Manager [section: Name-of-section]
+                                             (Content -&gt;Content by Section). 
+                              </li>
+                              <li>
+                                    &#39;Oldest first&#39;: Arranges
+                                                  items in chronological order,
+                                             with the oldest items first. 
+                              </li>
+                              <li>
+                                    &#39;Most recent first&#39;:
+                                                  Arranges items in chronological
+                                                  order, with the newest items
+                                        first. 
+                              </li>
+                              <li>
+                                    &#39;Title Alphabetical&#39;:
+                                                  Arranges items by title in
+                              alphabetical order. </li>
+                              <li> &#39;Title Reverse-Alphabetical&#39;: Arranges
+                                   items by title in reverse alphabetical order.</li>
+                              <li>
+                                    &#39;Author Alphabetical&#39;:
+                                                  Arranges items by author in
+                                             alphabetical order. 
+                              </li>
+                              <li>
+                                    &#39;Author Reverse-Alphabetical&#39;:
+                                                  Arranges items by author in
+                                             reverse alphabetical order. 
+                              </li>
+                              <li>
+                                    &#39;Most Hits&#39;: Arranges
+                                                  items according to the number
+                                                  of hits, with the items with
+                                        the most hits first. 
+                              </li>
+                              <li>
+                                    &#39;Least Hits&#39;: Arranges
+                                                  items according to the number
+                                                  of hits, with the items with
+                                   the least hits first.
+                              </li>
+                    </ul>
+               <li><strong>Pagination:</strong> Hides,
+                                        shows or sets to &#39;auto&#39; the pagination
+                                        of page items. The Pagination shows links
+                                        to other pages on the list of items (such
+                                        as &lt;&lt; Start &lt; Prev 1 2 Next &gt; End &gt;&gt;).</li>
+               <li><strong>Pagination Results:</strong> Hides
+                                                                 or shows the
+                         Pagination Results information (the number of items
+                         to be displayed on the page, such as &#39;Results
+                    1-6 of 6&#39;).</li>
+               <li><strong>MOSImages:</strong> Hides or shows
+                                                                      images
+                    displayed by the tag. These images are defined within each
+                    Content Item.</li>
+               <li><strong>Description:</strong> Show/Hide the
+                         Category description.</li>
+               <li><strong>Description image:</strong> Show/Hide
+                              the Category Description image.</li>
+               <li><strong>Category Name:</strong> Hides
+                                   or shows the name of the category to which
+                         each item belongs. If this option is turned on, each
+                                   item&#39;s category
+                                                                 name will be shown under the item&#39;s
+                                                                 title on the
+                              home page.</li>
+               <li><strong>Category Name Linkable:</strong> Enables
+                                                                 you to make
+                         each item&#39;s category name linkable.
+                                                                 Applies only when the Category Name option (described
+                              above) is set to &#39;Show.&#39;</li>
+               <li><strong>Item Title:</strong> Hides or shows
+                                   the titles for items on the page.</li>
+          </ul>
+               <p>For each of the following nine items
+                                   listed below, you can use the option selected
+                         in the Global Configuration settings (Site -&gt; Global Configuration)
+                                                                 by selecting &#39;Use Global&#39; or you can override
+                                                                 the Global Configuration setting by selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                                                                 the settings
+                                                                 here for items
+                                                                 will not affect
+                                                                 the Global Configuration
+                                                                 settings and
+                                                                 will not affect
+                                                                 the settings
+                                                                 on the rest
+                                                                 of the site.Linked
+                                                                 Titles: Enables
+                                                                 you to make
+                                                                 item titles
+                                                                 linked. The
+                                                                 link will go
+                                                                 to the item
+               page.</p>               
+               <ul>
+                    <li><strong>Linked Titles</strong>:  Enable the Content Items'
+                    titles to be hyperlinks to the Content Item. </li>
+                    <li><strong>Read More:</strong> Hides or shows
+                         the &#39;Read more&#39; link that appears after the
+                         introductory text of Content Items. The link will go
+                    to the Content Item in full.</li>
+                    <li><strong>Item Rating:</strong> Hides
+                                        or shows ratings given to home page items
+                         by your site&#39;s
+                    users.</li>
+                    <li><strong>Author Names:</strong> Hides or shows
+                         the names of authors of items.</li>
+                    <li><strong>Created Date and Time:</strong> Hides
+                              or shows the date and time the items were created.</li>
+                    <li><strong>Modified Date and Time:</strong> Hides
+                                   or shows the date and time the items were
+                         last modified.</li>
+                    <li><strong>PDF Icon:</strong> Hides or shows
+                              the icon and link to the PDF version of the items.</li>
+                    <li><strong>Print Icon:</strong> Hides or shows
+                                                                      the icon
+                         and link to the printer-friendly format of the items.</li>
+                    <li><strong>Email Icon:</strong> Hides or shows
+                                                                      the icon
+                         and link to the page that enables users to email items
+                         to others.</li>
+          </ul>               </td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul><li><strong>Back:</strong> Return to the previous page.</li>
+
+<li><strong>Save: </strong>Save your changes. </li>
+
+<li><strong>Apply: </strong>Apply your changes to the site without saving. </li>
+
+<li><strong>Cancel: </strong>Cancel the present operation without saving.</li></ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_blog_section.html 4.6rc2/help/menus.content_blog_section.html
--- 4.5.4/help/menus.content_blog_section.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_blog_section.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,235 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Blog Content Section</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: Blog
+- Content Section</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Blog - Content
+                    Section</strong> Menu Item adds a link that lists published
+          items in a whole Content Section.</p>
+                    <strong>Details</strong>
+                    <ul>
+                         <li>
+                              <strong>Name :</strong> Enter the name of
+                                   the Menu Item as you want it to appear on
+                              the menu of your site.                         </li>
+                         <li>
+                              <strong>Section :</strong> Here
+                                             you may select all, one or multiple
+                         sections.                         </li>
+                         <li>
+                                   <strong>URL :</strong> (The URL for this item
+                                   will appear after you Apply/Save.)
+                         </li>
+                         <li>
+                                        <strong>Parent
+                                                                      Item :</strong> Select
+                                                                      *Top* if you want
+                                                                      the Menu Item to
+                                                                      appear at the same
+                                                                      level as your primary
+                                                                      navigation. You can
+                                                                      also put the menu
+                                                                      item under an existing
+                                                                      Menu Item by selecting
+                                                                      that existing menu
+                         item as parent.</li>
+                         <li><strong>Ordering:</strong> By
+                                                                           default,
+                              Mambo adds new items to the
+                                                                           end
+                              of the Menu Items list. After saving
+                                                                           or
+                              applying the new item, you can change
+                                                                           its
+                              order when editing, using a pull-down
+                                                                           menu
+                              to select the item after which
+                                                                           the
+                              item will appear.</li>
+                         <li><strong>Access
+                                                                                Level:</strong> Sets
+                                                                            
+                                                                                 who can
+                                                                            
+                                                                                 view this
+                                   item. </li>
+                         <li>
+                              <strong>Published:</strong> Sets
+                                                                      whether the Menu Item
+                                                            is published or not. By default,
+                                                       new Menu Items are set to be published.
+                         </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Controls whether to show or
+                    hide a &quot;Back&quot; text link that would appear on the
+                    bottom of the page and return the user to the previously
+                    viewed page. The pull down lets select &#39;Use Global&#39; to
+                    use the parameter as defined globally through the Site-&gt;Global
+                    Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+               <li><strong>Page Title:</strong> Text to display at the top of
+                    the page.</li>
+               <li><strong>Page Title:</strong> Hides or shows the
+                    Page Title text (defined in the field described above).</li>
+               <li><strong># Leading:</strong> Number of items to display as
+                    leading (running the width of the display area on the page).
+                    These items will display with the introductory text shown
+                    as defined in a content item&#39;s Intro Text field.</li>
+               <li><strong># Intro:</strong> Number of items to display with
+                    the introductory text shown (as defined in a Content Item&#39;s
+                    Intro Text field) in the columns as defined hereafter (if
+                    only one column is chosen, these items will display in the
+                    same way as the #Leading Items).</li>
+               <li><strong>Columns:</strong> Number of columns used to display
+                    items whose introductory text is displayed.</li>
+               <li><strong># Links:</strong> Number of items to display as linked
+                    titles, with no introductory text. These items will appear
+                    under the leading items and items with the Intro Text showing.</li>
+               <li><strong>Category Order:</strong> If the page displays items
+                    from several categories, the items can be grouped by category,
+                    then by primary order (as specified in the Primary Order
+                    field, described below). In this drop-down menu, one of the
+                    following options can be selected:
+                         <ul>
+                              <li> &#39;No, order by primary ordering only&#39;:
+                                   Arranges items only by primary order (as specified
+                                   in the Primary Order field, described below),
+                                   regardless of category. </li>
+                              <li> &#39;Title Alphabetical&#39;: Arranges items
+                                   first by category in alphabetical order, then
+                                   by the primary order (as specified in the
+                                   Primary Order field). </li>
+                              <li> &#39;Title Reverse-Alphabetical&#39;: Arranges
+                                   items first by category in reverse alphabetical
+                                   order, then by the primary order (as specified
+                                   in the Primary Order field). </li>
+                              <li> &#39;Ordering&#39;: Arranges items first by
+                                   category order as set in the Category Manager
+                                   (Content -&gt;Category Manager), then by the
+                                   primary order (as specified in the Primary
+                                   Order field). </li>
+                         </ul>
+               </li>
+               <li><strong>Primary Order:</strong> This controls the order that
+                    the items will be displayed in. The setting in the Category
+                    Order field (described above) takes precedence. In this drop-down
+                    menu, one of the following options can be selected:</li>
+               <ul>
+                    <li> &#39;Default&#39;: Arranges items according to the order
+                         set for the specific category in the Content Items </li>
+                    <li> Manager [section: Name-of-section] (Content -&gt;Content
+                         by Section). </li>
+                    <li> &#39;Oldest first&#39;: Arranges items in chronological
+                         order, with the oldest items first. </li>
+                    <li> &#39;Most recent first&#39;: Arranges items in chronological
+                         order, with the newest items first. </li>
+                    <li> &#39;Title Alphabetical&#39;: Arranges items by title
+                         in alphabetical order. </li>
+                    <li> &#39;Title Reverse-Alphabetical&#39;: Arranges items
+                         by title in reverse alphabetical order. </li>
+                    <li> &#39;Author Alphabetical&#39;: Arranges items by author
+                         in alphabetical order. </li>
+                    <li> &#39;Author Reverse-Alphabetical&#39;: Arranges items
+                         by author in reverse alphabetical order. </li>
+                    <li> &#39;Most Hits&#39;: Arranges items according to the
+                         number of hits, with the items with the most hits first. </li>
+                    <li> &#39;Least Hits&#39;: Arranges items according to the
+                         number of hits, with the items with the least hits first. </li>
+               </ul>
+               <li><strong>Pagination:</strong> Hides, shows or sets to &#39;auto&#39; the
+                    pagination of page items. The Pagination shows links to other
+                    pages on the list of items (such as &lt;&lt; Start &lt; Prev
+                    1 2 Next &gt; End &gt;&gt;).</li>
+               <li><strong>Pagination Results:</strong> Hides or shows the Pagination
+                    Results information (the number of items to be displayed
+                    on the page, such as &#39;Results 1-6 of 6&#39;).</li>
+               <li><strong>MOSImages:</strong> Hides or shows images displayed
+                    by the tag. These images are defined within each Content
+                    Item.</li>
+               <li><strong>Description:</strong> Show/Hide the Category description.</li>
+               <li><strong>Description image:</strong> Show/Hide the Category
+                    Description image.</li>
+               <li><strong>Category Name:</strong> Hides or shows the name of
+                    the category to which each item belongs. If this option is
+                    turned on, each item&#39;s category name will be shown under
+                    the item&#39;s title on the home page.</li>
+               <li><strong>Category Name Linkable:</strong> Enables you to make
+                    each item&#39;s category name linkable. Applies only when
+                    the Category Name option (described above) is set to &#39;Show.&#39;</li>
+               <li><strong>Item Title:</strong> Hides or shows the titles for
+                    items on the page.</li>
+          </ul>
+               <p>For each of the following nine items listed below, you can
+                    use the option selected in the Global Configuration settings
+                    (Site -&gt; Global Configuration) by selecting &#39;Use Global&#39; or
+                    you can override the Global Configuration setting by selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                    the settings here for items will not affect the Global Configuration
+                    settings and will not affect the settings on the rest of
+                    the site.Linked Titles: Enables you to make item titles linked.
+                    The link will go to the item page.</p>
+               <ul>
+                    <li><strong>Linked Titles</strong>: Enable the Content Items'
+                         titles to be hyperlinks to the Content Item. </li>
+                    <li><strong>Read More:</strong> Hides or shows the &#39;Read
+                         more&#39; link that appears after the introductory text
+                         of Content Items. The link will go to the Content Item
+                         in full.</li>
+                    <li><strong>Item Rating:</strong> Hides or shows ratings
+                         given to home page items by your site&#39;s users.</li>
+                    <li><strong>Author Names:</strong> Hides or shows the names
+                         of authors of items.</li>
+                    <li><strong>Created Date and Time:</strong> Hides or shows
+                         the date and time the items were created.</li>
+                    <li><strong>Modified Date and Time:</strong> Hides or shows
+                         the date and time the items were last modified.</li>
+                    <li><strong>PDF Icon:</strong> Hides or shows the icon and
+                         link to the PDF version of the items.</li>
+                    <li><strong>Print Icon:</strong> Hides or shows the icon
+                         and link to the printer-friendly format of the items.</li>
+                    <li><strong>Email Icon:</strong> Hides or shows the icon
+                         and link to the page that enables users to email items
+                         to others.</li>
+               </ul>
+          </td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+               </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_category.html 4.6rc2/help/menus.content_category.html
--- 4.5.4/help/menus.content_category.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_category.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,179 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Table Content Category</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Table
+- Content Category</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Table - Content
+                    Category</strong> Menu Item adds a link to a Content Category,
+                    displaying the category as a table that lists all published
+          Content Items in this category as clickable titles.</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Name&nbsp;:</strong> Enter the name of the Menu
+                    Item as you want it to appear on the menu of your site.
+                    If you leave this blank, the Category name will automatically
+                    be used.</li>
+               <li><strong>Category
+                         :</strong> Select one published Category.</li>
+               <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                         after Apply/Save.)</li>
+               <li><strong>Parent Item :</strong> Select *Top*
+                         if you want the Menu Item to appear at the same level
+                    as your primary navigation. You can also put the Menu Item
+                    under an existing Menu Item by selecting that existing menu
+                    item as parent.</li>
+               <li><strong>Ordering:</strong> By default, Mambo adds
+                         new items to the end of the Menu Items list. After saving
+                         or applying the new item, you can change its order when
+                    editing, using a pull-down menu to select the item after
+                    which the item will appear.</li>
+               <li><strong>Access Level:</strong> Sets who
+                         can view this item</li>
+               <li><strong>Published:</strong> Sets whether
+                         the Menu Item is published or not. By default, new menu
+                    items are set to be published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li>                    <strong><strong>Menu Image:</strong></strong> Allows
+                    you to set an image to appear to the left or right of the
+                    Item on themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Title:</strong> Show/Hide
+                         the page(s) title.</li>
+               <li><strong>Page Class Suffix:</strong> Allows
+                                   you to set customized styles for this page.
+                                   The suffix you type here is automatically
+                                   added to the CSS classes for this page, and
+                                   will have to be defined in your template&#39;s
+                    CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Show or hide a &quot;Back&quot; button on
+                    the bottom of the page to allow the user to return to the
+                    previously viewed page.</li>
+               <li><strong>Order
+                                        by:</strong> Controls the order that
+                                        the Content Items will be displayed on
+                                        the category page. In this drop-down
+                                        menu, one of the following options can
+                                        be selected:
+                                   <ul>
+                                   <li><strong>Default</strong>: Arranges items according to the order shown
+                                                                           in the Content
+                                        Items Manager (Content -&gt; All
+                                                                 Content Items)</li>
+                                   <li><strong>Title Alphabetical</strong>: Arranges items in alphabetical
+                                                            order</li>
+                                   <li><strong>Title Reverse-Alphabetical</strong>: Arranges items in reverse
+                                                            alphabetical order</li>
+                                   <li><strong>Ordering</strong>: Arranges items according to the order
+                                                                           set in the Content
+                                        Items Manager (Content -&gt; All
+                                                                 Content Items)</li>
+                                   </ul>
+               </li>
+               <li><strong>Date Format:</strong> Set the format for the
+                              dates of items to be displayed in the category
+                    table. (See the Administration Manual for detailed information).</li>
+               <li><strong>Date
+                              Column</strong>: Show/Hide the date column on the
+                              category table. You can use the option set in the
+                              Global Configuration page (Site -&gt; Global Configuration) by setting this
+                              option to *Use Global*, or you can override the Global
+                              Configuration setting (for the category table page only)
+                    by setting this option to &quot;Show&quot; or &quot;Hide&quot;.</li>
+               <li><strong>Author
+                              Column</strong>: Show/Hide the author column on
+                              the category table. You can use the option set
+                              in the Global Configuration page (Site -&gt; Global Configuration)
+                              by setting this option to &quot;Use Global&quot;, or
+                              you can override the Global Configuration setting (for
+                              the category table page only) by setting this option
+                    to &quot;Show&quot; or &quot;Hide&quot;.</li>
+               <li><strong>Hits
+                              Column:</strong> Show/Hide the Hits column on the
+                              category page that shows the number of hits for
+                              each item. You can use the option set in the Global
+                              Configuration page (Site -&gt; Global Configuration)
+                              by setting this option to *Use Global* or you can
+                              override the Global Configuration setting (for
+                              the category pages only).</li>
+               <li><strong>Table Headings</strong>:
+                                   Show/Hide the headings (*Date,* *Item Title,*
+                    *Author,* and *Hits*) on the category page.</li>
+               <li><strong>Navigation
+                              Bar:</strong> Show/Hide the Navigation bar on the
+                              category page. The Navigation bar shows links to
+                              other pages,&nbsp; such
+                    as, &lt;&lt; Start &lt; Prev 1 2 Next &gt; End &gt;&gt;.</li>
+               <li><strong>Order
+                              Select:</strong> Show/Hide the Order Select dropdown
+                              on the category page. The Order Select dropdown
+                              provides several options for your site&#39;s users
+                              to change the order in which the items are displayed
+                              on the category page.
+                              Changes that users make in the Order Select don&#39;t
+                    affect the display for other users.</li>
+               <li><strong>Display Select</strong>:
+                                   Show/Hide the Display Number dropdown (detailed
+                    below) on the category page.</li>
+               <li><strong>Display Number:</strong> Sets
+                                   the default number of items to be displayed
+                    in the Display Number dropdown on the category page. The
+                    Display Number dropdown controls the number of items that
+                    users see at one time on the category page.</li>
+               <li><strong>Filter:</strong> Show/Hide
+                    the Filter text box on the category page. </li>
+               <li><strong>Filter
+                              Field:</strong> Controls which field the filter
+                              applies to. Options are *Author*  *Title*
+                               and *Hits* (number of hits that
+                    the item has had).</li>
+               <li><strong>Other Categories:</strong> Show/Hide
+                                   other categories when viewing a specific content
+                    category. When set to show, the displayed category titles
+                    will act as clickable links.</li>
+               <li><strong>Empty categories :</strong> Show/Hide
+                              empty categories (categories containing no Content
+                    Items).</li>
+               <li><strong># Category Items :</strong> Show/Hide the number of
+                    items for each category displayed.</li>
+               <li><strong>Category
+                              Description:</strong> Show/Hide the descriptions
+                              of other content categories. These category descriptions
+                              appear under the category name in the list of categories,
+                              which appears under the table of&nbsp; content
+                    items details.</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_item_link.html 4.6rc2/help/menus.content_item_link.html
--- 4.5.4/help/menus.content_item_link.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_item_link.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,84 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Link Content Item</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Link
+- Content Item</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Link - Content
+                    Item</strong>&nbsp;Menu Item creates a link to a published
+          Content Item in full view.</p>
+                    <strong>Details</strong>
+                    <ul>
+                         <li><strong>Name:</strong> Enter the name of the Menu Item as you want it to appear on the menu of your
+ site.</li>
+                         <li><strong>Content to Link:</strong> Select
+                              a Content Item.</li>
+                         <li><strong>URL:</strong> (The URL for this item will
+                              show after Apply/Save.)</li>
+                         <li><strong>On Click, Open in:</strong>                              <ul>
+                                   <li>&#39;Parent Window
+                                   With Browser Navigation&#39; is the same window
+                                   you call the link from, </li>
+                                   <li>&#39;New Window with Browser
+                                   Navigation&#39; is a full featured new window, </li>
+                                   <li>&#39;New
+                                   Window Without Browser Navigation&#39; is
+                                   a new pop-up window with just scroll bars
+                                   which may be resized.</li>
+                         </ul>
+                         </li>
+                         <li><strong>Parent Item:</strong> Select &#39;Top&#39; if
+                              you want the Menu Item to appear at the same level
+                              as your primary navigation. You can also put the
+                              Menu Item under an existing Menu Item by selecting
+                              that existing Menu Item as parent.</li>
+                         <li><strong>Ordering:</strong> By default, Mambo adds
+                              new items to the end of the Menu Items list. After
+                              saving or applying the new item, you can change
+                              its order when editing, using a pull-down menu
+                              to select the item after which the item will appear.</li>
+                         <li><strong>Access Level:</strong> Sets who can view
+                              this item. </li>
+                         <li><strong>Published:</strong> Sets whether the Menu
+                              Item is published or not. By default, new Menu
+                              Items are set to be published.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows
+                              you to set an image to appear to the left
+                              or right of the Item on themenu. The image must
+                    be placed in the /images/stories directory. Note:
+                    The &#39;Show
+                         Menu Items&#39; option located in the parameters at
+                         Modules -&gt; Site Modules -&gt; [name-of-menu] must
+                         be set to &#39;Yes&#39;.</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_section.html 4.6rc2/help/menus.content_section.html
--- 4.5.4/help/menus.content_section.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_section.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,172 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Table Content Section</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Table&nbsp;-
+Content Section</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The&nbsp;<strong>Table -
+                    Content Section</strong> Menu Item&nbsp;adds a link that
+                    will display a list of the categories in the selected section.
+                    The number of Content Items in the Category can be displayed
+                    beside the Category name. Selecting the link to the Category
+                    will present a tabular list of Content Items in a particular
+          Section Category.</p>
+                    <strong>Details</strong>
+                    <ul>
+                         <li><strong>Name&nbsp;:</strong> Enter the name of the
+                              Menu Item as you want it to appear on the menu
+                              of your site. If you leave this blank, the Category
+                         name will automatically be used.</li>
+                         <li><strong>Section:</strong> Select a
+                              specific section.</li>
+                         <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                         after Apply/Save.)</li>
+                         <li><strong>Parent Item :</strong> Select *Top* if you
+                              want the Menu Item to appear at the same level
+                              as your primary navigation. You can also put the
+                              Menu Item under an existing Menu Item by selecting
+                              that existing menu item as parent.</li>
+                         <li><strong>Ordering:</strong> By default, Mambo adds
+                              new items to the end of the Menu Items list. After
+                              saving or applying the new item, you can change
+                              its order when editing, using a pull-down menu
+                              to select the item after which the item will appear.</li>
+                         <li><strong>Access Level:</strong> Sets who can view
+                              this item</li>
+                         <li><strong>Published:</strong> Sets whether the Menu
+                              Item is published or not. By default, new menu
+                              items are set to be published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li> <strong><strong>Menu Image:</strong></strong> Allows you
+                    to set an image to appear to the left or right of the Item
+                    on themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Section Title:</strong> Show/Hide the section title.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Show or hide a &quot;Back&quot; button
+                    on the bottom of the page to allow the user to return to
+                    the previously viewed page.</li>
+               <li><strong>Order by:</strong> Controls the order that the Content
+                    Items will be displayed on the category page. In this drop-down
+                    menu, one of the following options can be selected:
+                                             <ul>
+                                                  <li><strong>Default</strong>:
+                                                       Arranges items according
+                                                       to the order shown in
+                                                       the Content Items Manager
+                                                       (Content -&gt; All Content
+                                                       Items)</li>
+                                                  <li><strong>Title Alphabetical</strong>:
+                                                       Arranges items in alphabetical
+                                                       order</li>
+                                                  <li><strong>Title Reverse-Alphabetical</strong>:
+                                                       Arranges items in reverse
+                                                       alphabetical order</li>
+                                                  <li><strong>Ordering</strong>:
+                                                       Arranges items according
+                                                       to the order set in the
+                                                       Content Items Manager
+                                                       (Content -&gt; All Content
+                                                       Items)</li>
+                                             </ul>
+               </li>
+               <li><strong>Category List - Section:</strong> Show/Hide the list
+                    of categories in List View page.</li>
+               <li><strong>Description:</strong> Show/Hide the descriptions for
+                    each category. The descriptions appear under the category
+                    name.</li>
+               <li><strong>Description Image:</strong> Show/Hide the images contained
+                    in category descriptions.</li>
+               <li><strong>Category List - Category:</strong> Show/Hide the list
+                    of categories in Table view page.</li>
+               <li><strong>Empty Categories:</strong> Show/Hide the categories
+                    with no items published.</li>
+               <li><strong># Category Items:</strong> Show/Hide the number of
+                    items in each category.</li>
+               <li><strong>Category Description</strong>: Hides or shows the
+                    description of each category. The category descriptions are
+                    defined on the category pages, which are accessible in the
+                    Category Manager (Content -&gt; Category Manager).</li>
+               <li><strong>Date Format:</strong> Set
+                         the format for the dates of items to be displayed in
+                    the category table. (See the Administration Manual for detailed
+                         information).</li>
+               <li><strong>Date Column</strong>: Show/Hide the date column on
+                    the category table. You can use the option set in the Global
+                    Configuration page (Site -&gt; Global Configuration) by setting
+                    this option to *Use Global*, or you can override the Global
+                    Configuration setting (for the category table page only)
+                    by setting this option to &quot;Show&quot; or &quot;Hide&quot;.</li>
+               <li><strong>Author Column</strong>: Show/Hide the author column
+                    on the category table. You can use the option set in the
+                    Global Configuration page (Site -&gt; Global Configuration)
+                    by setting this option to &quot;Use Global&quot;, or you
+                    can override the Global Configuration setting (for the category
+                    table page only) by setting this option to &quot;Show&quot; or &quot;Hide&quot;.</li>
+               <li><strong>Hits Column:</strong> Show/Hide the Hits column on
+                    the category page that shows the number of hits for each
+                    item. You can use the option set in the Global Configuration
+                    page (Site -&gt; Global Configuration) by setting this option
+                    to *Use Global* or you can override the Global Configuration
+                    setting (for the category pages only).</li>
+               <li><strong>Table Headings</strong>: Show/Hide the headings (*Date,*
+                    *Item Title,* *Author,* and *Hits*) on the category page.</li>
+               <li><strong>Navigation Bar:</strong> Show/Hide the Navigation
+                    bar on the category page. The Navigation bar shows links
+                    to other pages,&nbsp; such as, &lt;&lt; Start &lt; Prev 1
+                    2 Next &gt; End &gt;&gt;.</li>
+               <li><strong>Order Select:</strong> Show/Hide the Order Select
+                    dropdown on the category page. The Order Select dropdown
+                    provides several options for your site&#39;s users to change
+                    the order in which the items are displayed on the category
+                    page. Changes that users make in the Order Select don&#39;t
+                    affect the display for other users.</li>
+               <li><strong>Display Select</strong>: Show/Hide the Display Number
+                    dropdown (detailed below) on the category page.</li>
+               <li><strong>Display Number:</strong> Sets the default number of
+                    items to be displayed in the Display Number dropdown on the
+                    category page. The Display Number dropdown controls the number
+                    of items that users see at one time on the category page.</li>
+               <li><strong>Filter:</strong> Show/Hide the Filter text box on
+                    the category page. </li>
+               <li><strong>Filter Field:</strong> Controls which field the filter
+                    applies to. Options are *Author* *Title* and *Hits* (number
+                    of hits that the item has had).</li>
+               </ul>          </td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.content_typed.html 4.6rc2/help/menus.content_typed.html
--- 4.5.4/help/menus.content_typed.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.content_typed.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Link Static Content</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Link
+- Static Content</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Link - Static
+                    Content</strong> Menu Item adds a link to a Static Content
+                    Item&nbsp;(this type of content is not part of a section
+                    or category). Static Content Items are very useful but they
+          cannot be added to a blog, category or section page.</p>
+                    <strong>Details</strong>
+                    <ul>
+                         <li>                              <strong>Name:</strong> Eter
+                              the name of the Menu Item as you want it to appear
+                              on the menu of your site.</li>
+                         <li><strong>Static Content:</strong> Select one specific
+                         Static Content Item.</li>
+                         <li><strong>URL:</strong> ((The URL for this item will show after Apply/Save.))</li>
+                         <li><strong>On Click, Open in:</strong>
+                              <ul>
+                                   <li>&#39;Parent Window With Browser Navigation&#39; is
+                                        the same window you call the link from, </li>
+                                   <li>&#39;New Window with Browser Navigation&#39; is
+                                        a full featured new window, </li>
+                                   <li>&#39;New Window Without Browser Navigation&#39; is
+                                        a new pop-up window with just scroll
+                                        bars which may be resized.</li>
+                              </ul>
+                         </li>
+                         <li><strong>Parent
+                                        Item:</strong> Select *Top* if you want
+                                        the Menu Item to appear at the same level
+                                        as your primary navigation. You can also
+                                        put the Menu Item under an existing menu
+                                        item by selecting that existing menu
+                                        item as parent.</li>
+                         <li><strong>Ordering:</strong> By
+                                        default, Mambo adds new items to the
+                              end of the Menu Items list. After saving or applying
+                                        the new item, you can change its order
+                              when editing, using a pull-down menu to select
+                              the item after which the item will appear.</li>
+                         <li><strong>Access
+                                        Level:</strong> Sets who can view this
+                                        item. </li>
+                         <li><strong>Published:</strong> Sets
+                                             whether the Menu Item is published
+                              or not. By default, new Menu Items are set
+                                             to be published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.copy.html 4.6rc2/help/menus.copy.html
--- 4.5.4/help/menus.copy.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.copy.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - Copy Items</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menus: Copy Menu
+Items</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page
+                    lets you <strong>copy</strong> one or more &nbsp;Menu Items
+                    to another existing Menu.&nbsp; If you choose to copy a Parent
+                    Menu Item, &nbsp;its sub-level menus will be copied too,
+                    keeping their Parent-child relationship. Check the Menu Item
+                         that you want to <strong>copy</strong> and
+                         click on the copy icon. A new screen appears, in which
+                         you can choose the target Menu.</p>
+               <strong>Displayed</strong>
+               <ul>
+                    <li><strong>Copy to Menu</strong>: This list&nbsp;displays all&nbsp;your
+                         existing Menus the way they look through&nbsp;the Menu Manager.
+                         You may choose to which of them the&nbsp;Menu Item(s)
+                         will be copied.</li>
+                    <li><strong>Menu Items being copied</strong>:  This shows a list of the Menu Items
+                    being copied.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Copy</strong>: Click this icon to copy the Menu Items.</li>
+               <li><strong>Cancel</strong>: Click
+                         this icon to abort the copying process.</li>
+          </ul></td>
+     </tr>
+</table></body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.edit.html 4.6rc2/help/menus.edit.html
--- 4.5.4/help/menus.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - Edit Items</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menus: Edit Menu
+Item</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>By clicking on a menu
+                    item, you have access to the <strong>Edit Menu Item</strong> screen
+                    where you can edit his details and parameters. Every Menu
+                    Item has different parameters. Some of them though are common
+                    at all.  This&nbsp;screen is divided into 2 main parts : Details and
+                    Parameters. These vary in function, depending from the type
+                    of Menu Item chosen. Some Details can also be edited through
+                    the list in the Menu Manager. Some parameters may appear&nbsp;only
+                    after clicking on the Apply or Save icon.</p>          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">These vary in function, depending from the type of Menu Item
+                    chosen. Some parameters may appear&nbsp;only
+          after clicking on the Apply or Save icon.</td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save :</strong> Click on this
+                         icon to save the parameters chosen and return&nbsp;to
+                    the Menu Manager.</li>
+               <li><strong>Apply :</strong> Click on
+                         this icon to save the parameters chosen AND keep the
+                    same&nbsp;screen open for editing.</li>
+               <li><strong>Close
+                         :</strong> Click on this icon to cancel any action in
+                         this screen.&nbsp; You
+                    will return&nbsp;to the previous screen.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.main.html 4.6rc2/help/menus.main.html
--- 4.5.4/help/menus.main.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.main.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Manager - Individual Menus</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>&quot;Menus&quot; in Mambo
+                    are groups of navigational links to sections, categories,
+                    Content Items, components or external pages. These links
+                    are called &#39;Menu Items&#39;.Each menu must have an identification
+                    name which is only used internally by Mambo. A menu only
+                    becomes visible on a site if it has a published mod_mainmenu
+                    module which references it.&nbsp;A menu may have multiple
+                    mod_mainmmenu modules referencing it.</p>               <span style="font-weight: bold;"><span style="font-weight: bold;">Display
+                         Headings</span></span>
+               <ul>
+               <li><span style=""><span style=""><strong>Menu Name</strong>:
+                              Click on the name to edit it. This name may be
+                              the one that is given to the menu by default or
+                              the name you gave to that menu. </span></span></li>
+               <li><span style=""><span style=""><strong>Menu
+                                             Items</strong>: Click on the Edit
+                                             icon in this column to add or edit
+                                             Menu Items associated with a menu.
+                                             Or alternatively go to &quot;Menu-&gt;the-menu-you-choose-to-edit&quot;.
+                                             A &quot;Menu Manager [the-menu-you-choose-to-edit]&quot; window
+                                             will&nbsp;appear with a list of
+                                             all Menu Items associated to this
+                                             Menu.</span></span></li>
+               <li><span style=""><span style=""><strong>#Published</strong>:
+                              This is the number of Menu Items published.</span></span></li>
+               <li><span style=""><span style=""><strong>#Unpublished</strong>:
+                                   This is the number of Menu Items unpublished.</span></span></li>
+               <li><span style=""><span style=""><strong>#Trash</strong>: This
+                                   is the number of Menu Items in the Trash Manager.</span></span></li>
+               <li><span style=""><span style=""><strong>#Modules</strong>: This
+                                                            is the number of
+                              menu modules associated to the Menu Name.</span></span></li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New:</strong> Click this icon
+                         to create a new Menu. You will access the &quot;Menu Details&quot; window.&nbsp; Type
+                         a Menu Name. This is the identification name used by Mambo
+                         to identify this menu within the code.&nbsp; It must be unique.&nbsp; It
+                         is recommended to use no spaces within this name. For
+                         example, in the core Mambo the User Menus Menu Name
+                         is usermenu and the Main Menus Menu Name is mainmenu.&nbsp; <strong>Next:</strong> Type
+                         the Module Title. This is the name given to the new
+                         mod_mainmenu module which is automatically created when
+                         you save this menu. It is also the Name of the menu
+                         as it will appear on the page if you choose to publish
+                         it. This may be changed in the future when editing the
+                         module.&nbsp; In the example
+                         described above, these are User Menu and Main Menu.
+                         Click on the Save icon. Your new menu appears in the
+                         Menu Manager list.</li>
+               <li><strong>Edit:</strong> &nbsp;Click the radio button next to
+                         the Menu Name you want to edit.&nbsp; Then, click on the &quot;Edit&quot; icon
+                         which will take you to the Editing page.</li>
+               <li><strong>Copy:</strong> Click
+                         the radio button next to the Menu Name you want to copy.
+                         Then, click the Copy icon in the toolbar. This will
+                         duplicate the menu. You may copy any of your menus.
+                         Copying will create a new Menu Name, containing the
+                         same Menu Items as the menu copied, associated to a
+                         new Menu Module. A Copy Page will display, with the
+                         same choices as in Create New Menu. It will also state
+                         the name of the Menu being copied and a list of the
+                         Menu Items associated to the menu being copied. Fill
+                         in the fields as in the &quot;Create New Menu&quot; screen.</li>
+               <li><strong>Delete:</strong> Click the radio button next to the
+                         Menu Name you want to delete. Then, click the Delete
+                    icon in the toolbar. This will delete the Menu. A &quot;Delete
+                         Menu : Name-of-the-menu&quot; screen will display. It shows
+                         the Module(s) to be deleted (the mod_mainmenu modules associated
+                         to this Menu) and the Menu Items to be deleted. Click the
+                         Delete Icon surrounded by a dotted line. This will delete
+                         this Menu, ALL its Menu Items and ALL the Modules associated
+                         with it. A Javascript alert popup box gives you the choice
+                         to &quot;OK&quot; or to &quot;Cancel&quot; this action.
+                         NOTE: Deleted Menus cannot be recovered from the Trash
+                    Manager!</li>
+               </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.move.html 4.6rc2/help/menus.move.html
--- 4.5.4/help/menus.move.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.move.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - Move Items</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menus: Move Menu
+Items</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">This page
+                    lets you <strong>move</strong> one or more Menu Items to
+                    another existing Menu. If you choose to move a Parent Menu
+                    Item, &nbsp;its sub-level menus will be moved too, keeping
+                    their Parent-child relationship.&nbsp; 
+               <p>Check the Menu Item that you want to move and
+                    click on the <strong>Move</strong> icon. A new screen appears,
+                    in which you can choose the target Menu.Move to Menu: This
+                    list&nbsp;displays all&nbsp;your existing Menus the way they
+                    look through&nbsp;the Menu Manager. You may choose to which
+                    of them&nbsp;the Menu Item(s)&nbsp;will be moved.Menu Items
+          being moved: This shows a list of the Menu Items being moved.</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Move</strong>: Click this icon to move the
+                    Menu Items.</li>
+               <li><strong>Cancel</strong>: Click this icon to abort
+                         the moving process. </li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.new.html 4.6rc2/help/menus.new.html
--- 4.5.4/help/menus.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu - New Item</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menus: New Menu
+Item</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Create a new Menu Item
+                    to add a link to your site navigation. During the proces
+                    of creating the Menu Item you will have to choose the Menu
+                    Item Format, designate the content or component or URL that
+                    the Item will display, name the Item and select from the
+                    various parameters vailable for the Item. The first step
+                    -- selecting a Menu Item Type is shown on this page. The
+                    choice you make here will determine much about the formatting
+                    and display of the Item. After you select the Format and
+                    click the Next icon, you will have a chance to learn mroe
+                    by clicking the Help icon. If you wish to change the Format,
+                    you will have the option to return to this page. </p>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Next:</strong>&nbsp; After selecting&nbsp;the
+                         radio button for the format of Menu Item you wish to
+                    create, click the Next icon in the Toolbar.</li>
+               <li><strong>Cancel:</strong> Click
+                         on the &quot;Cancel&quot; Icon to quit without saving
+                         the changes.</li>
+               </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.newsfeed_category_table.html 4.6rc2/help/menus.newsfeed_category_table.html
--- 4.5.4/help/menus.newsfeed_category_table.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.newsfeed_category_table.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Table Newsfeed Category</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Table
+- Newsfeed Category</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Table - Newsfeed
+                    Category</strong> Menu Item adds a link&nbsp;to a category
+                    of Newsfeeds.&nbsp;The category is displayed as a table listing
+          all published Newsfeeds&#39; in the category with clickable titles.</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Name&nbsp;:</strong> Enter the name of the Menu Item
+                    as you want it to appear on the menu of your site. If you
+                    leave this blank, the Category name will automatically be
+                    used.</li>
+               <li><strong>Category :</strong> Select one published Category.</li>
+               <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                    after Apply/Save.)</li>
+               <li><strong>Parent Item :</strong> Select *Top* if you want the
+                    Menu Item to appear at the same level as your primary navigation.
+                    You can also put the Menu Item under an existing Menu Item
+                    by selecting that existing menu item as parent.</li>
+               <li><strong>Ordering:</strong> By default, Mambo adds new items
+                    to the end of the Menu Items list. After saving or applying
+                    the new item, you can change its order when editing, using
+                    a pull-down menu to select the item after which the item
+                    will appear.</li>
+               <li><strong>Access Level:</strong> Sets who can view this item</li>
+               <li><strong>Published:</strong> Sets whether the Menu Item is
+                    published or not. By default, new menu items are set to be
+                    published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Menu Image:</strong> Allows you to set an image that
+                    would appear to the left or right of the Menu Item. The image
+                    must be placed in the /images/stories directory. Furthermore,
+                    for the image to show, in Modules -&gt; Site Modules -&gt; [name-of-menu],
+                    the &#39;Show Menu Items&#39; option in the parameters must
+                    be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows
+                         you to set customized styles for this page. The suffix
+                    you type here is automatically added to the CSS classes for
+                    this page, and will have to be defined in your template&#39;s
+                         CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Controls
+                         whether to show or hide a &quot;Back&quot; text link that
+                         would appear on the bottom of the page and return the user
+                         to the previously viewed page. The pull down lets select &#39;Use
+                         Global&#39; to use the parameter as defined globally through
+                         the Site-&gt;Global Configuration, &#39;Hide&#39; or &#39;Show&#39;.</li>
+               <li><strong>Page
+                         Title :</strong> Show/Hide the page title.</li>
+               <li><strong>Page Title:</strong> Text
+                              to display at the top of the page. If left blank,
+                    the menu name will display instead.</li>
+               <li><strong>Table Headings:</strong> Show/Hide
+                         the Table headings (&#39;Name&#39; , &#39;Articles&#39;, &#39;Link&#39;)</li>
+               <li><strong>Name
+                         Column :</strong> Show/Hide the column displaying the
+                         Feed name of the Newsfeed<strong>.</strong></li>
+               <li><strong>Articles Column :</strong> Show/Hide
+                         the column displaying the # of Articles column.</li>
+               <li><strong>Link
+                         Column :</strong> Show/Hide the column displaying the
+                         Feed Link of the Newsfeed.</li>
+               <li><strong>Other Categories:</strong> Show/Hide
+                         other published Newsfeed categories when viewing a specific
+                         Newsfeed category. When set to show, the category is
+                    clickable.</li>
+               <li><strong>Category
+                         Description:</strong> Show/Hide the descriptions of
+                         other published Newsfeed categories set to Show above.
+                         These category descriptions appear under the category
+                         name in the list of categories, which appears under
+                         the table of&nbsp; Newsfeeds
+                         items details.</li>
+               <li><strong># Category Items :</strong> Show/Hide
+                         the number of items for each category displayed.</li>
+          </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.newsfeed_link.html 4.6rc2/help/menus.newsfeed_link.html
--- 4.5.4/help/menus.newsfeed_link.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.newsfeed_link.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Link Newsfeed</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Link
+- Newsfeed</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Link - Newsfeeds</strong> Menu
+               Item adds a link to an existing newsfeed. Newsfeeds are obtained
+               from any site syndicating news using an RSS format. Mambo is shipping
+               with an integrated newsfeed reader. Newsfeeds may also be displayed
+               on your site through the creation of a custom module accessed
+          in the Module Manager [site] (Modules -&gt; Site Modules -&gt; New).</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Name:</strong> Enter the name of the Menu Item as
+                    you want it to appear on the menu of your site.</li>
+               <li><strong>Newsfeed to Link:</strong> Select one
+                    specific Newsfeed.</li>
+               <li><strong>URL:</strong> (The URL for this item will show after
+                    Apply/Save.)</li>
+               <li><strong>On Click, Open in:</strong>
+                         <ul>
+                              <li>&#39;Parent Window With Browser Navigation&#39; is
+                                   the same window you call the link from, </li>
+                              <li>&#39;New Window with Browser Navigation&#39; is
+                                   a full featured new window, </li>
+                              <li>&#39;New Window Without Browser Navigation&#39; is
+                                   a new pop-up window with just scroll bars
+                                   which may be resized.</li>
+                         </ul>
+               </li>
+               <li><strong>Parent Item:</strong> Select &#39;Top&#39; if you
+                    want the Menu Item to appear at the same level as your primary
+                    navigation. You can also put the Menu Item under an existing
+                    Menu Item by selecting that existing Menu Item as parent.</li>
+               <li><strong>Ordering:</strong> By default, Mambo adds new items
+                    to the end of the Menu Items list. After saving or applying
+                    the new item, you can change its order when editing, using
+                    a pull-down menu to select the item after which the item
+                    will appear.</li>
+               <li><strong>Access Level:</strong> Sets who can view this item. </li>
+               <li><strong>Published:</strong> Sets whether the Menu Item is
+                    published or not. By default, new Menu Items are set to be
+                    published.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows
+                         you to set customized styles for this page. The suffix
+                    you type here is automatically added to the CSS classes for
+                    this page, and will have to be defined in your template&#39;s
+                         CSS stylesheet for usage. </li>
+               <li><strong>Back Button:</strong> Show or hide a &quot;Back&quot; button at
+                    the bottom of the page to allow the user to return to the
+                    previously viewed page.</li>
+               <li><strong>Page
+                         Title:</strong> Text to display at the top of the page.</li>
+               <li><strong>Page
+                         Title:</strong> Show/Hide the page title.</li>
+               <li><strong>Feed Image:</strong> Show/Hide
+                         the image of the feed, as defined by the syndicating
+                         site.</li>
+               <li><strong>Feed
+                         Description:</strong> Show/Hide the description text
+                         of the feed, as defined by the syndicating site.</li>
+               <li><strong>Item Description:</strong> Show/Hide
+                         the description or intro text of an item. If &#39;Hide&#39; selected,&nbsp;the
+                         Title of the Item will be displayed.</li>
+               <li><strong>Word Count:</strong> Allows
+                         you to limit the amount of visible item description
+                    text. 0 will show all text. The amount shown also depends
+                    on the parameters defined by the syndicated site.</li>
+          </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.separator.html 4.6rc2/help/menus.separator.html
--- 4.5.4/help/menus.separator.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.separator.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Separator, Placeholder</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong>Separator
+/ Placeholder</strong></span><span class="hs_header01"><strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Separator / Placeholder</strong> Menu
+                    item adds a plain-text Separator or Placeholder to the menu.When
+                    used as a Placeholder, it serves as a Parent Menu Item for Children
+          Menu Items placed down in the hierarchy thus defined.</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Pattern/Name</strong>: Type
+                         here the pattern you want to display when the Menu Item
+                         is used as a Separator, or type the name of the Menu
+                         item as it will appear on the site menu if you want
+                    to use it as a Placeholder Menu Item .</li>
+               <li><strong>Parent
+                         Item</strong>: Select &#39;Top&#39; if you want the
+                         Menu Item to appear at the same level as your primary
+                         navigation. You can also put the Menu Item under an
+                         existing Menu Item by selecting that existing Menu Item
+                    as parent.</li>
+               <li><strong>Ordering</strong>: By default, Mambo
+                         adds new items to the end of the Menu Items list. After
+                         saving or applying the new item, you can change its
+                         order when editing, using a pull-down menu to select
+                    the item after which the item will appear. </li>
+               <li><strong>Access
+                    Level</strong>: Sets who can view this item.</li>
+               <li><strong>Published</strong>: Sets
+                         whether the Menu Item is published or not. By default,
+                    new Menu Items are set to be published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Menu
+                                   Image</strong>:Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.url.html 4.6rc2/help/menus.url.html
--- 4.5.4/help/menus.url.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.url.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Link URL</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: <span class="hs_header01"><strong><strong>Link
+- Url</strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Link - Url</strong> Menu
+               Item adds a link to a Web page. It can be either another page
+               within your site or a web page on another web site.The default &#39;usermenu&#39; is
+               mostly based on this type of link. See the administrator manual
+          for details.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li>                         <strong>Name:</strong> Enter the name of the Menu Item
+                         as you want it to appear on the menu of your site.</li>
+                    <li><strong>Link:</strong> Type or paste here the URL desired
+                         (full URL including &quot;http://&quot; for
+                         external weblinks!)<strong>.</strong></li>
+                    <li><strong>URL:</strong> (The URL for this item will show
+                    after Apply/Save.)</li>
+                    <li><strong>On Click, Open in:</strong>
+                              <ul>
+                                   <li>&#39;Parent Window With Browser Navigation&#39; is
+                                        the same window you call the link from, </li>
+                                   <li>&#39;New Window with Browser Navigation&#39; is
+                                        a full featured new window, </li>
+                                   <li>&#39;New Window Without Browser Navigation&#39; is
+                                        a new pop-up window with just scroll
+                                        bars which may be resized.</li>
+                              </ul>
+                    </li>
+                    <li><strong>Parent Item:</strong> Select &#39;Top&#39; if
+                         you want the Menu Item to appear at the same level as
+                         your primary navigation. You can also put the Menu Item
+                         under an existing Menu Item by selecting that existing
+                         Menu Item as parent.</li>
+                    <li><strong>Ordering:</strong> By default, Mambo adds new
+                         items to the end of the Menu Items list. After saving
+                         or applying the new item, you can change its order when
+                         editing, using a pull-down menu to select the item after
+                         which the item will appear.</li>
+                    <li><strong>Access Level:</strong> Sets who can view this
+                         item. </li>
+                    <li><strong>Published:</strong> Sets whether the Menu Item
+                         is published or not. By default, new Menu Items are
+                         set to be published.</li>
+                    </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.weblink_category_table.html 4.6rc2/help/menus.weblink_category_table.html
--- 4.5.4/help/menus.weblink_category_table.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.weblink_category_table.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Table Web Link Category</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Menu Item Format: <span class="hs_header01"><strong>Table
+- Web Link Category</strong></span><span class="hs_header01"><strong></strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Table - Web
+                         Link Category</strong> Menu Item adds a link to a category
+                         of Web links. </p>
+                    <strong>Details</strong>
+          <ul>
+               <li><strong>Name&nbsp;:</strong> Enter the name of the Menu Item
+                    as you want it to appear on the menu of your site. If you
+                    leave this blank, the Category name will automatically be
+                    used.</li>
+               <li><strong>Category :</strong> Select one published Category.</li>
+               <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                    after Apply/Save.)</li>
+               <li><strong>Parent Item :</strong> Select *Top* if you want the
+                    Menu Item to appear at the same level as your primary navigation.
+                    You can also put the Menu Item under an existing Menu Item
+                    by selecting that existing menu item as parent.</li>
+               <li><strong>Ordering:</strong> By default, Mambo adds new items
+                    to the end of the Menu Items list. After saving or applying
+                    the new item, you can change its order when editing, using
+                    a pull-down menu to select the item after which the item
+                    will appear.</li>
+               <li><strong>Access Level:</strong> Sets who can view this item</li>
+               <li><strong>Published:</strong> Sets whether the Menu Item is
+                    published or not. By default, new menu items are set to be
+                    published.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Menu Image:</strong>  Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Show or hide a &quot;Back&quot; button
+                    on the bottom of the page to allow the user to return to
+                    the previously viewed page.</li>
+               <li><strong>Page Title:</strong> Show/Hide the page(s) title.</li>
+               <li><strong>Page Title:</strong> Text to display at the top of
+                    the page. If left blank, the menu name will display instead.</li>
+               <li><strong>Table
+                         Headings:</strong> Show/Hide the Table headings (&#39;Hits&#39; , &#39;Link
+                         Descriptions&#39;)</li>
+               <li><strong>Hits :</strong> Show/Hide the number of hits the Weblinks
+                    items have received.</li>
+               <li><strong>Link
+                         Descriptions :</strong> Show/Hide the links descriptions.</li>
+               <li><strong>Other
+                         Categories :</strong> Show/Hide other Weblinks Categories.</li>
+          </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/menus.wrapper.html 4.6rc2/help/menus.wrapper.html
--- 4.5.4/help/menus.wrapper.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/menus.wrapper.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Menu Format - Wrapper</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Menu Item Format: Wrapper</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Wrapper</strong> Menu
+                    Item creates a page that wraps an external Web page into
+                    your site. The external Web page is inserted as an &#39;inline frame&#39; (also
+                    called an Iframe) into your template. </p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Name :</strong>Enter the name of the Menu Item as
+                         you want it to appear on the menu of your site.
+               </li>
+               <li><strong>Wrapper Link :</strong> Enter the URL
+                    of the page you wish to wrap.</li>
+               <li><strong>URL :</strong> (The URL for this item will&nbsp;appear
+                    after Apply/Save.)</li>
+               <li><strong>Parent Item :</strong> Select &#39;Top&#39; if you
+                    want the Menu Item to appear at the same level as your primary
+                    navigation. You can also put the Menu Item under an existing
+                    Menu Item by selecting that existing Menu Item as parent.</li>
+               <li><strong>Ordering:</strong> A pull-down menu will&nbsp;appear here
+                         after using the &quot;Save&quot; or &quot;Apply&quot; button,
+                         to select the item after which the item will appear.
+                         By default, Mambo adds new items to the end of the list.
+                         After creating an item, you can change its order here
+                         when editing.</li>
+               <li><strong>Access Level:</strong> Sets who can view this item.</li>
+               <li><strong>Published:</strong> Sets whether the Menu Item is
+                    published or not. By default, new Menu Items are set to be
+                    published.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong><strong>Menu Image:</strong></strong> Allows you to
+                    set an image to appear to the left or right of the Item on
+                    themenu. The image must be placed in the /images/stories
+                    directory. Note: The &#39;Show Menu Items&#39; option located
+                    in the parameters at Modules -&gt; Site Modules -&gt; [name-of-menu]
+                    must be set to &#39;Yes&#39;.</li>
+               <li><strong>Page Class Suffix:</strong> Allows you to set customized
+                    styles for this page. The suffix you type here is automatically
+                    added to the CSS classes for this page, and will have to
+                    be defined in your template&#39;s CSS stylesheet for usage.</li>
+               <li><strong>Back Button:</strong> Show or hide a &quot;Back&quot; button
+                    on the bottom of the page to allow the user to return to
+                    the previously viewed page.</li>
+               <li><strong>Page Title:</strong> Show/Hide the page(s) title.</li>
+               <li><strong>Page Title:</strong> Text to display at the top of
+                    the page. If left blank, the menu name will display instead.</li>
+               <li><strong>Scroll Bars:</strong> Determines whether horizontal
+                              and vertical scroll bars are added. 
+                    <ul>
+                         <li>&#39;No&#39; means
+                                   scroll bars are never shown even when content extends
+                                   beyond the inline frame, </li>
+                         <li>&#39;Yes&#39; means scroll
+                                   bars are always used even when content does
+                              not extend beyond the inline frame,</li>
+                         <li>&#39;Auto&#39; means
+                                   scrolls bars are shown only when necessary.</li>
+                    </ul>
+               </li>
+               <li><strong>Width:</strong> Type in a value for the width
+                              of the Iframe window, either in pixels or in percentage.</li>
+               <li><strong>Height:</strong> Type in a value for the height
+                                   of the Iframe window, either in pixels or
+                    in percentage.</li>
+               <li><strong>Auto Height:</strong> Sets whether or not the
+                                   height of the Wrapper page is set to the size
+                    of the external Web page.</li>
+               <li><strong>Auto Add:</strong> Determines whether or not &#39;http://&#39; is
+                              added to the URL that you type in the Wrapper Link field
+                              in the Details tab. If set to &#39;No,&#39; then you
+                              can must type &#39;http://&#39; or &#39;https://&#39; at
+                              the beginning of the URL in the Wrapper Link field,
+                              or else the link in the Wrapper Link field will
+                              be treated as a link relative to the URL of your
+                              site.</li>
+          </ul></td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Back:</strong> Return to the previous page.</li>
+               <li><strong>Save: </strong>Save your changes. </li>
+               <li><strong>Apply: </strong>Apply your changes to the site without
+                    saving. </li>
+               <li><strong>Cancel: </strong>Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr>
+</table>
+
+
+<h3>&nbsp;</h3>
+
+<h3>&nbsp;</h3>
+
+<p>&nbsp;</p>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/messages.configuration.html 4.6rc2/help/messages.configuration.html
--- 4.5.4/help/messages.configuration.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/messages.configuration.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Messages Configuration</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Messages Configuration</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>There are
+                    two configuration options available to your Administrator.
+                    Use the select box to choose your option: &#39;YES AND NO&#39;</p>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+                    <li><strong>Lock Inbox</strong>:&nbsp;This option allows
+                         you to prevent Administrators or System processes from
+                         sending you messages. If you are the only administrator
+                         or work with a small group of admins you may choose
+                         not to use this feature at all. It is a good idea to
+                         leave the box open while you are adding new components
+                         as it will help you be aware of system processes.&nbsp;</li>
+                    <li><strong>Mail me on new Message</strong>:&nbsp;This option
+                         will result in an email being sent to you each time
+                         you receive a new message.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Save and apply your changes.</li>
+               <li><strong>Cancel</strong>: Cancel operation and retuen to previous
+                    screen<strong>.</strong></li>
+          </ul></td>
+     </tr></table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/messages.inbox.html 4.6rc2/help/messages.inbox.html
--- 4.5.4/help/messages.inbox.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/messages.inbox.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Messages Inbox</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Messages Inbox</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The private
+                         messaging function is for sending messages to other
+               system administrators. This
+                    menu option displays your current Inbox.  </p>
+               <strong>Display Columns</strong>:
+               <ul>
+                    <li><strong>Subject</strong>: displays the message's subject line. Click to
+                         view the message.</li>
+                    <li><strong>From</strong>: The sender of the message.</li>
+                    <li><strong>Date</strong>: When the message was created.</li>
+                    <li><strong>Read</strong>: Indicates whether you have read the message.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New</strong>: Click this icon to open the window
+                              for creating a new message. </li>
+               <li><strong>Delete</strong>: Select a message and click this icon to delete the
+                    message. </li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/messages.new.html 4.6rc2/help/messages.new.html
--- 4.5.4/help/messages.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/messages.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Messages - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Messages: New</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Using this screen you
+                    can write and send private messages to other system administrators.</p>
+               <ul>
+                    <li><strong>To</strong>: Select from
+                         the drop-down list the administrator you want to send message
+                    to.</li>
+                    <li><strong>Subject</strong>:
+                         Type the subject of your message<strong>.</strong></li>
+                    <li><strong>Message</strong>: Type the body
+                    of your message.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Send</strong>: Click this icon
+                         to send your message.</li>
+               <li><strong>Cancel</strong>: Cancel operation
+                    and retuen to previous screen<strong>.</strong></li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.components.html 4.6rc2/help/modules.admin.components.html
--- 4.5.4/help/modules.admin.components.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.components.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Components</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Components </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Components</strong> administrator module shows all the Components installed in your Mambo site. This enables you to access their option and parameter pages right from the frontpage of your Mambo Administration Page. This is accessible by clicking the <strong>Components</strong>&nbsp;tab in your Control Panel.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.latest.html 4.6rc2/help/modules.admin.latest.html
--- 4.5.4/help/modules.admin.latest.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.latest.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Latest Items</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Latest Items </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Latest Items</strong> administrator module shows a list of the recently added and published content in your Mambo site and is accessible by clicking the <strong>Latest Items</strong>&nbsp;tab in the frontpage of your Mambo Administration Control Panel.&nbsp;<strong>NOTE:</strong>&nbsp;Items that are displayed on the Front Page Component are not included in the list.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.logged.html 4.6rc2/help/modules.admin.logged.html
--- 4.5.4/help/modules.admin.logged.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.logged.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Logged</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Logged </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Logged</strong> administrator module shows a list of currently logged in users (those that have registered) in your Mambo site. This enables you to directly edit their account information or log them out. This is accessible by clicking the <strong>Logged</strong>&nbsp;tab in your Mambo Administration Control Panel.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; - this
+                         cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.manager.html 4.6rc2/help/modules.admin.manager.html
--- 4.5.4/help/modules.admin.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module Manager </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Admin Module Manager</strong> shows a table of the all the administrator modules installed in your Mambo site. This enables you to control each of the admin modules' settings and parameters.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Module Name</strong>: The name of the module.</li>
+                    <li><strong>Published</strong>: Specifies whether a module is published or not. You may click the corresponding iconlet which toggles a modules' published/unpublished state.</li>
+                    <li><strong>Reorder</strong>: Enables you to reorder the modules by clicking the up/down arrow iconlets.</li>
+                    <li><strong>Order</strong>: Specifies the numbered ordering of the modules. You can also edit the number sequence of the modules through this column, clicking the Save iconlet next to the Column Heading &quot;Order&quot; stores the new sequence you supplied.</li>
+                    <li><strong>Position</strong>: Specifies the position where the module item is displayed or set active.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Type</strong>: The type of the module item.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish:</strong> Click on the &#39;Publish&#39; icon to publish your modules on the Mambo Admininistration Site.</li>
+               <li><span><strong>Unpublish:</strong> Click on the &#39;Unpublish&#39; icon to unpublish your modules from your Mambo Admininistration Site. </span></li><span>
+               <li><span><strong>Copy:</strong> Click on the &#39;Copy&#39; icon to make a copy of the selected module. This enables it to be displayed in more than one place on the Mambo Administration Site. A new version is created with the name &#39;Copy of (the name of the module you copied)&#39;. You can rename it.</span></li><span>
+               <li><span><strong>New:</strong> Click on the &quot;New&quot; icon to create a custom module. This is a very useful module which may be used to output customized code for your Mambo Administration Site.</span></li><span>
+               <li><span><strong>Edit:</strong> Click on the &#39;Edit&#39; icon to edit or modify the module. Clicking the linked name will also perform this function. This enables you to change the attributes of a module like it&#39;s title, it&#39;s position, the order in which it appears on the Mambo Administration Site, and whether it is published or not. From this page you will also be able to change the location the module appears on edit any parameters that apply to the module. </span></li><span>
+               </span></span></span></span>
+               <li><span><strong>Delete:</strong>&nbsp;Click on the &#39;Delete&#39; icon
+                              to delete/uninstall a module from your system. NOTE: You
+                              cannot delete the &#39;last&#39; module of a particular &#39;type&#39; on
+                              this screen. If you want to delete a specific type
+                              of module, go to the Install/Uninstall screen as
+                         explained above.</span></li>
+               </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.mosmsg.html 4.6rc2/help/modules.admin.mosmsg.html
--- 4.5.4/help/modules.admin.mosmsg.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.mosmsg.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - System Messages</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: System Messages</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>System Messages</strong> administrator module displays a confirmation message after a function has successfully taken place i.e. saving an edited content or deleting a module. This is visible under the &#039;Toolbar&#039;.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.new.html 4.6rc2/help/modules.admin.new.html
--- 4.5.4/help/modules.admin.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: New</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>New</strong> administrator module enables you to write your own modules for your Mambo Administration Site. This is useful if you would like to output custom content as to your preference for administering a Mambo site. This is accessible by clicking the 'New' icon on your toolbar in the <strong>Administration Module Manager</strong>.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.online.html 4.6rc2/help/modules.admin.online.html
--- 4.5.4/help/modules.admin.online.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.online.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Online Users</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Online Users</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Online Users</strong> administrator module displays the number of users connected to your Mambo site (guests and registered users). You can see this with a small icon of 'people' and by default located on the upper right corner next to the 'Unread Messages' icon.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.pathway.html 4.6rc2/help/modules.admin.pathway.html
--- 4.5.4/help/modules.admin.pathway.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.pathway.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Pathway</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">	Admin Module: Pathway </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Pathway</strong> administrator module by default appears  under the 'Home' menu item in the upper-left corner of the Admin Screen. This module displays a link to the frontpage of your Mambo Administration Site plus the location you are currently viewing from the back-end. For ex. if you are editing a content item, the 'Pathway' should display something like <span class=code><i>'Mambo Site/com_content/edit'</i></span>.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.popular.html 4.6rc2/help/modules.admin.popular.html
--- 4.5.4/help/modules.admin.popular.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.popular.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Popular</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Popular </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Popular</strong> administrator module shows a table list of content items which received the most number of hits in your Mambo site - denoting the frequently visited ones. This is accessible by clicking the <strong>Popular</strong>&nbsp;tab on your Mambo Administration Control Panel.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.quickicon.html 4.6rc2/help/modules.admin.quickicon.html
--- 4.5.4/help/modules.admin.quickicon.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.quickicon.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Quick Icons</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Quick Icons</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Quick Icons</strong> administrator module shows the icon shortcuts to some basic 'Managers' of Mambo. It provides quick access to locations that you most likely go to in defining your Mambo site and can be found on the frontpage of the Administration Site.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.stats.html 4.6rc2/help/modules.admin.stats.html
--- 4.5.4/help/modules.admin.stats.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.stats.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Menu Stats</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Menu Stats </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Menu Stats</strong> administrator module shows a list of all the 'Menus' and the number of 'Menu Items' in your Mambo Site.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.toolbar.html 4.6rc2/help/modules.admin.toolbar.html
--- 4.5.4/help/modules.admin.toolbar.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.toolbar.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Toolbar</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Toolbar </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Toolbar</strong> administrator module displays the provided functional icons for your Mambo Administration Site. Such clickable icons include the ones you see in your 'Content Manager' (New, Edit, Copy...).</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table></body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.admin.unread.html 4.6rc2/help/modules.admin.unread.html
--- 4.5.4/help/modules.admin.unread.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.admin.unread.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Module - Unread Messages</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Admin Module: Unread Messages </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Unread Messages</strong> administrator module displays the number of messages received by your account that has not been read. You can see this with a small Mail icon and by default located in the upper right corner before the 'Online users' icon.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: The title of the module.</li>
+                    <li><strong>Show Title</strong>: &quot;N/A&quot; - this cannot
+                         be changed. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: &quot;Administrator&quot; -
+                         this cannot be changed. </li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>open</strong></li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.archive.html 4.6rc2/help/modules.archive.html
--- 4.5.4/help/modules.archive.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.archive.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,80 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Archive</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Archive</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Archive module</strong> shows
+                    a linked list of the calendar months which contain Archived
+                    items. After you have changed the status of a Content Item
+                    to &quot;Archived&quot;,
+                    this list will be automatically generated. A click on the
+                    month link will activate the Archive content overview in
+          a Blog form. All site archived Items are displayed.</p>
+               <p align="center"></p>
+               <strong>Details</strong>               <ul>
+                    <li><strong>Title</strong>: Title of the module to display on the
+                         page.</li>
+                    <li><strong>Show title</strong>: Sets if the Title will
+                                   display or not on the page.</li>
+                    <li><strong>Position</strong>:
+                                        Sets which of the positions available
+                         the module will display in.</li>
+                    <li><strong>Module order</strong>: The order
+                                             the module will appear among modules
+                         assigned to the same page, in the same position. </li><li><strong>Access
+                         Level</strong>: Sets who can view this module. Public, Registered
+                         or Special.</li>
+                    <li><strong>Published</strong>:
+                                                  Sets if the module contents
+                         will show on the Frontend of your Web site (if chosen
+                         Position is available in the template).</li>
+                    <li><strong>ID</strong>:
+                                                       This is the ID number
+                         for the module item. This is auto-allocated by
+                              the Mambo system when the module is saved.</li>
+                    <li><strong>Description:</strong> This is
+                                                            a short description of the functions provided by the Module
+                                                            Type.</li>
+                    <li><strong>Pages / Items: </strong>Sets on which pages the module should be displayed.
+                    </li></ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Count</strong>: The number of items to display (the
+                    default is 10). </li>
+               <li><strong>Enable Cache</strong>: Select to
+                         cache or not the content of this module.</li>
+               <li><strong>Module Class
+                         Suffix</strong>: A suffix to be applied to the CSS class
+                         of the module (table.moduletable) to allow individual
+                         module styling.</li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. <strong>NOTE:</strong> You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.banners.html 4.6rc2/help/modules.banners.html
--- 4.5.4/help/modules.banners.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.banners.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Banners</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Banners</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Banners
+                         Module</strong> controls the display of banners on your
+                         site, as defined by the Banner Manager Component.</p>
+               <strong>Details </strong>&nbsp;               <ul>
+                    <li><strong>Title</strong>:
+                                   Title of the module to display on the page.</li>
+                    <li><strong>Show Title</strong>:
+                              Show/Hide the Title (above) of the Module on the
+                         page. </li>
+                    <li><strong>Position</strong>:
+                              Assign the Module to a position on the template.</li>
+                    <li><strong>Module order</strong>:
+                                   The order the module will appear among modules
+                         assigned to the same page, in the same position.</li>
+                    <li><strong>Access Level</strong>:
+                                   Determines who (which class of user) can view
+                         the Module.</li>
+                    <li><strong>Published</strong>:
+                              Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This
+                              is the ID number for the module item. This is auto-allocated
+                         by the Mambo system when the module is saved.</li>
+                    <li><strong>Description:</strong> A  short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages
+                              / Items</strong>: Sets on which pages the Module
+                    will appear.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><span><strong>Banner Client</strong>:
+                         Type here a reference to the client as listed in the
+                    Clients Manager (Components-&gt;Banners-&gt;Manage Clients).</span></li><span>
+               <li><span><strong>Module
+                              Class Suffix</strong>: A suffix
+     to be applied to the CSS class of the module (table.moduletable) to allow
+                              individual module styling.
+               </span></li>
+          </span></ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.edit.html 4.6rc2/help/modules.edit.html
--- 4.5.4/help/modules.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Modules: Edit</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page displays the editable parameters for Modules in Mambo. See the individual Modules for specific help.</p>
+               <p><strong>Details </strong>&nbsp;</p>
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display on the page.</li>
+                    <li><strong>Show title</strong>: Decides if the Title will display or not on the page. It is not usual to display this title for banners.</li>
+                    <li><strong>Position</strong>: Sets which of the positions available the module will display in.</li>
+                    <li><strong>Module order</strong>: The order the module will appear among modules assigned to the same page, in the same position.</li>
+                    <li><strong>Access Level</strong>: Sets who can view this module. Public, Registered or Special.</li>
+                    <li><strong>Published</strong>: Sets if the module contents will show on the Frontend of your Web site (if chosen Position is available in the template).</li>
+                    <li><strong>ID</strong>: This is the ID number for the module item. This is auto-allocated by the Mambo system when the module is saved.</li>
+                    <li><strong>Description:</strong> This is a short description of the functions provided by the Module Type</li>
+                    <li>Pages / Items: Sets on which pages the module should be displayed.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">&nbsp;</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">&nbsp;</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Count:</strong> The number of items to display (the default is 10)</li>
+               <li><strong>Module Class Suffix (available for all module)</strong>: Type (if needed) the suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Click on the &quot;Preview&quot; icon to preview only typed modules.</li>
+               <li><strong>Save</strong>: Click on the &quot;Save&quot; icon to save the parameters you have chosen and to go back to the Menu Manager [the-menu-you-chose-to-edit].</li>
+               <li><strong>Apply</strong>: Click on the &quot;Apply&quot; icon to save the parameters you have chosen and to keep the same window open for editing.</li>
+               <li><strong>Close</strong>: Click on the &quot;Close&quot; icon to cancel the action and to close the &quot;Modules: Edit&quot; window.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.latestcontent.html 4.6rc2/help/modules.latestcontent.html
--- 4.5.4/help/modules.latestcontent.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.latestcontent.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,93 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Latest Content</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Latest Content
+</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Latest Content</strong> module&nbsp;displays the
+                    most recently published Item.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above)
+                         of the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied
+                    to the CSS class of the module (table.moduletable) to allow
+                    individual module styling.</li>
+               <li><strong>Enable Cache</strong>:
+                         Cache the contents of the Module..</li>
+               <li><strong>Module
+                         Mode</strong>: Allows choice between display of Content
+                         Items, Static Content Items or both.</li>
+               <li><strong>Frontpage Items</strong>:
+                         Show/Hide items designated for the Frontpage Component
+                         (this works only for Content Items).</li>
+               <li><strong>Read More</strong>: Show/Hide the Read More... link if needed.</li>
+               <li><strong>Item Title</strong>: Show/Hide the title of the Item.</li>
+               <li><strong>Show Images</strong>: Show/Hide images included in
+                    the Item.</li>
+               <li><strong>Style</strong>: If more than one Item is displayed,
+                    how are they laid out relative to each other?  </li>
+               <li><strong>Count</strong>:
+                         The number of items to display. The default is 5.</li>
+               <li><strong>Category
+                         ID</strong>: Select to display items from a specific
+                         category or set of Categories (to specify more than
+                         one category, separate with commas). Categories IDs
+                         may be found in the list accessed through Content -&gt;Category Manager.</li>
+               <li><strong>Section
+                         ID</strong>: Select to display items from a specific
+                         Section or set of Sections (to specify more than one
+                         Section, separate with commas). Sections IDs may be
+                         found in the list accessed through Content -&gt;&nbsp;Section Manager. </li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.latestnews.html 4.6rc2/help/modules.latestnews.html
--- 4.5.4/help/modules.latestnews.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.latestnews.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,90 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Latest News</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Latest
+News</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Latest News</strong> module&nbsp;shows
+                    a list of the most recently published Items that are still
+                    current (some may have expired even though they are the most
+                    recent). Items that are displayed on the Front Page Component
+          are not included in the list.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type.</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied
+                    to the CSS class of the module (table.moduletable) to allow
+                    individual module styling.</li>
+               <li><strong>Enable Cache</strong>:
+                         Cache the contents of the Module..</li>
+               <li><strong>Module
+                         Mode</strong>: Allows choice between display of Content
+                         Items, Static Content Items or both.</li>
+               <li><strong>Frontpage Items</strong>:
+                         Show/Hide items designated for the Frontpage Component
+                         (this works only for Content Items).</li>
+               <li><strong>Count</strong>:
+                         The number of items to display. The default is 5.</li>
+               <li><strong>Category
+                         ID</strong>: Select to display items from a specific
+                         category or set of Categories (to specify more than
+                         one category, separate with commas). Categories IDs
+                         may be found in the list accessed through Content -&gt;Category Manager.</li>
+               <li><strong>Section
+                         ID</strong>: Select to display items from a specific
+                         Section or set of Sections (to specify more than one
+                         Section, separate with commas). Sections IDs may be
+                         found in the list accessed through Content -&gt;&nbsp;Section Manager. </li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.login.html 4.6rc2/help/modules.login.html
--- 4.5.4/help/modules.login.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.login.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Login Form</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Login
+Form</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Login Form</strong> module
+                    displays a Username and Password login form. It also displays
+                    a link to retrieve a forgotten password. If user registration
+                    is enabled, (refer to the Global Configuration settings),
+                    then another link will be shown to invite users to self-register.
+                    If the user is logged in, the module displays a &quot;Logout&quot; link.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above)
+                         of the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied
+                    to the CSS class of the module (table.moduletable) to allow
+                    individual module styling.</li>
+               <li><strong>Pre-text</strong>: This
+                         allows to display text or HTML above the login form.</li>
+               <li><strong>Post-text</strong>:
+                         This allows to display text or HTML below the login
+                         form.</li>
+               <li><strong>Login
+                         Redirection URL</strong>:You may enter here the URL
+                         of a page you want the logout to redirect to. If left
+                         blank, it will load the Home Page. </li>
+               <li><strong>Logout Redirection URL</strong>:
+                         You may enter here the URL of a page you want the logout
+                         to redirect to. If left blank, it will load the Home
+                         Page. </li>
+               <li><strong>Login
+                         Message</strong>: Show/Hide the javascript Alert indicating
+                         Login success or failure.</li>
+               <li><strong>Logout Message</strong>:
+                         Show/Hide the javascript Alert indicating Logout success.</li>
+               <li><strong>Greeting</strong>:
+                         Show/Hide the simple greeting text.</li>
+               <li><strong>Name/Username</strong>:
+                         Choose whether to display Name or Username in the greeting.
+                         The Name is defined for each registered user in the
+                         list accessed through Site -&gt; User Manager -&gt; Add/Edit
+                         users under the heading Name, the Username in the same
+                         list under the heading UserID</li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.mainmenu.html 4.6rc2/help/modules.mainmenu.html
--- 4.5.4/help/modules.mainmenu.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.mainmenu.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Menus</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Main
+Menu and other Menus</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Each Menu in the system
+                    has a corresponding Module. The settings in each individual
+                    Module apply to the specific Menu tied to that Module. </p>
+               <strong>Details </strong>&nbsp; 
+          <ul>
+               <li><strong>Title</strong>: Title of the module to display on
+                    the page.</li>
+               <li><strong>Show Title</strong>: Show/Hide the Title (above) of the
+                    Module on the page. </li>
+               <li><strong>Position</strong>: Assign the Module to a position
+                    on the template.</li>
+               <li><strong>Module order</strong>: The order the module will appear
+                    among modules assigned to the same page, in the same position.</li>
+               <li><strong>Access Level</strong>: Determines who (which class
+                    of user) can view the Module.</li>
+               <li><strong>Published</strong>: Show/Hide the Module.</li>
+               <li><strong>ID</strong>: This is the ID number for the module
+                    item. This is auto-allocated by the Mambo system when the
+                    module is saved.</li>
+               <li><strong>Description:</strong> A short description of the functions
+                    provided by the Module Type</li>
+               <li><strong>Pages / Items</strong>: Sets on which pages the Module
+                    will appear.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Menu Class Suffix</strong>: Type
+                         (if needed) a suffix to be applied to the CSS class
+                    of the Menu Items (mainlevel and sublevel).</li>
+               <li><strong>Module Class Suffix</strong>:
+                         Type (if needed) a suffix to be applied to the CSS class
+                         of&nbsp; (table.moduletable).&nbsp; This allows individual
+                    module styling.</li>
+               <li><strong>Menu Name</strong>: Type the name
+                                   of the menu as defined in the Menu Manager.
+                    This menu contains the Menu Items that will display on your
+                    site. </li>
+               <li><strong>Menu
+                                        Style</strong>: Three styles of menu
+                                        are provided with Mambo. Vertical, Horizontal
+                                        and Flat List.
+                         <ul>
+                              <li>
+                                   The Vertical menu displays its Menu Items
+                                                  vertically in a table format.
+                                        It may display sublevels menus if desired.
+                                        These are presented in an indented form. 
+                              </li>
+                              <li>
+                                   The Horizontal Menu honors only the first
+                                                  level items and produces a
+                                        horizontal collection of Menu Items separated
+                                        (if desired) by a Spacer as defined below.
+                                        It is displayed in a table format. 
+                              </li>
+                              <li>The Flat List is a type of Menu displayed in a list
+                                             format (&lt;li&gt; tags). Depending on the CSS,
+                                             it may display horizontally or vertically. It does
+                              not display sublevels.</li>
+                         </ul>
+                    </li>
+               <li><strong>Enable Cache</strong>: Cache the contents of the Module..</li>
+               <li><strong>Show Menu Icons</strong>:
+                                        Show or Hide the menu icons
+                                        you have specified for your Menu Items.</li>
+               <li><strong>Menu Icon Alignment</strong>:
+                                        Choose which alignment to display these
+                                        icons if checked to show.</li>
+               <li><strong>Expand Menu</strong>:
+                                        Show or hide the sublevel menus for the
+                    chosen menu by default (only
+                                        for Vertical Menus).</li>
+               <li><strong>Indent Image</strong>:
+                                        Choose which indent system to use. It
+                                        could be None, provided by the template,
+                                        be the default Mambo system or customized
+                                        with the following parameters &quot;Indent Image 1 to 6&quot;.&nbsp; This
+                                        lets you choose a specific image for
+                                        each menu level (the images must be in
+                                        the images/M_images folder to be available
+                                        as a choice).</li>
+               <li><strong>Spacer</strong>:
+                                        Choose a character to act as spacer in
+                                        an Horizontal menu. It is often a &quot;|&quot; or a &quot;-&quot;.</li>
+               <li><strong>End
+                                             Spacer</strong>: Choose a character
+                                             to act as a spacer for the end of
+                                             the menu.</li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.manager.html 4.6rc2/help/modules.manager.html
--- 4.5.4/help/modules.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Site Module Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p><strong>Modules</strong> are used to display
+                    information items or interactive features on select pages
+                    of a Mambo Site. The main characteristic is to be assigned
+                    to pre-established positions by way of module position holders
+                    placed in the code of the template. Though Modules can be
+                    positioned anywhere, they are typically located in side columns
+                    or at the extreme top or bottom of pages. Examples of modules
+                    include: Menus, Login Forum, and the Mambo Search form.
+                    Simple HTML Modules can be created directly from the Module
+                    Manager; more Modules have to be
+                    installed.</p>
+               <p>The <strong>Module Manager</strong> displays the installed modules.&nbsp; You can manage them by clicking on the appropriate icon in the Tool Bar.</p>
+               <strong>Display Columns </strong>               <ul>
+                    <li><strong>Module Name: </strong>This lists the names of
+                         the Modules currently installed. Click the name to edit
+                         any of the Modules.                    </li>
+                    <li><strong>Published: </strong>This shows whether the Module is
+                         published or unpublished. Click on the icon if you wish
+                         to toggle its state.</li>
+                    <li><strong>Reorder:</strong>&nbsp; Click the arrow icons
+                         to move the item up or down in the list. This changes
+                         the order relative to other Modules in the same position. </li>
+                    <li><strong>Order: </strong>This shows the order of Modules in
+                         relation to other Modules in the same position. Type&nbsp; the
+                         new numbers in the order that you wish your Modules
+                         to appear. You can change the order any two or more
+                         Modules at the same time.&nbsp; Click
+                         the &quot;Save Order&quot; icon next to the Column Heading &quot;Order.&quot;</li>
+                    <li><strong>Access:</strong> Defines which classes of user
+                         have access to the Module.</li>
+                    <li><strong>Position: </strong>Assigns the Module to a particular
+                         Module position holder. </li>
+                    <li><strong>Pages: </strong>Assigns the Module to one or
+                         more pages. </li>
+                    <li><strong>ID: </strong>System generated ID number for the
+                    Module.</li>
+                    <li><strong>Type: </strong>The name of the Module's file
+                         in the Mambo Modules directory. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish:</strong> Click on the &#39;Publish&#39; icon to publish your modules on the Front-end of your Web site.</li>
+               <li><span><strong>Unpublish:</strong> Click on the &#39;Unpublish&#39; icon to unpublish your modules on the Front-end of your Web site. </span></li><span>
+               <li><span><strong>Copy:</strong> Click on the &#39;Copy&#39; icon to make a copy of the selected module. This enables it to be displayed in more than one place on the Front-end of your Web site. A new version is created with the name &#39;Copy of (the name of the module you copied)&#39;. You can rename it.</span></li><span>
+               <li><span><strong>New:</strong> Click on the &quot;New&quot; icon to create a custom module with a &quot;User&quot; type.&nbsp; This is a very useful module which may be used to display Content (this content is not related to Sections, Categories or Static Content Items) or an&nbsp; RSS Feed. It can be used as a text box, image module or even to include&nbsp;customized code. </span></li><span>
+               <li><span><strong>Edit:</strong> Click on the &#39;Edit&#39; icon to edit or modify the module. Clicking the linked name will also perform this function. This enables you to change the attributes of a module like it&#39;s title, it&#39;s position, the order in which it appears on the page, access level and whether it is published or not. From this page you will also be able to change the location the module appears on the Front-end of your site and any parameters that apply to the module. </span></li><span>
+               </span></span></span></span>
+               <li><span><strong>Delete:</strong>&nbsp;Click on the &#39;Delete&#39; icon
+                              to delete/uninstall a module from your system. NOTE: You
+                              cannot delete the &#39;last&#39; module of a particular &#39;type&#39; on
+                              this screen. If you want to delete a specific type
+                              of module, go to the Install/Uninstall screen as
+                         explained above.</span></li>
+               </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.mostread.html 4.6rc2/help/modules.mostread.html
--- 4.5.4/help/modules.mostread.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.mostread.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Popular</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Popular</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Popular</strong> module shows a list of the currently published Items that have been viewed the most - determined by the number of times the page has been viewed.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+               <li><strong>Enable Cache</strong>: Cache the contents of the Module..</li>
+               <li><strong>Module Mode</strong>: Allows choice between display of Content Items, Static Content Items or both.</li>
+               <li><strong>Frontpage Items</strong>: Show/Hide items designated for the Frontpage Component (this works only for Content Items).</li>
+               <li><strong>Count</strong>: The number of items to display (the default is 5)</li>
+               <li><strong>Category ID</strong>: Select to display items from a specific category or set of Categories (to specify more than one category, separate with commas). Categories IDs may be found in the list accessed through Content -&gt;Category Manager.</li>
+               <li><strong>Section ID</strong>: Select to display items from a specific Section or set of Sections (to specify more than one Section, separate with commas). Sections IDs may be found in the list accessed through Content -&gt;Section Manager.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.new.html 4.6rc2/help/modules.new.html
--- 4.5.4/help/modules.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Modules: New</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>User</strong> module is
+               a custom module&nbsp;created when clicking the &#39;New&#39; icon
+               in the Module Manager. You can use this module to display Content
+               (this content is not related to Sections, Categories or Static
+               Content Items) or an RSS Feed. </p><strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display on the page.</li>
+                    <li><strong>Show title</strong>: Decides if the Title will display or not on the page. It is not usual to display this title for banners.</li>
+                    <li><strong>Position</strong>: Sets which of the positions available the module will display in.</li>
+                    <li><strong>Module order</strong>: The order the module will appear among modules assigned to the same page, in the same position.</li>
+                    <li><strong>Access Level</strong>: Sets who can view this module. Public, Registered or Special.</li>
+                    <li><strong>Published</strong>: Sets if the module contents will show on the Frontend of your Web site (if chosen Position is available in the template).</li>
+                    <li><strong>ID</strong>: This is the ID number for the module item. This is auto-allocated by the Mambo system when the module is saved.</li>
+                    <li><strong>Description:</strong> This is a short description of the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items:</strong> Sets on which pages the module should be displayed.</li>
+          </ul></td></tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: Add a suffix if needed to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+               <li><font color=
+"#000000"><strong>Custom Output:</strong> Here you may enter any text&nbsp; or code you like that you wish to display it&#39;s output&nbsp; in
+                    this module anywhere on the pages of your site. NOTE: This content may not be accessed through a Menu Item.</font></li>
+          </ul><font color=
+"#000000">
+               <p><strong>The following Parameters are only relevant to the creation of a module who's express purpose is to to hold RSS feed output. </strong></p>
+               </font><ul>
+                    <li><font color="#000000"><strong>RSS URL</strong>: Enter
+                              here the URL of the RSS feed you want to display
+                         on your site.</font></li>
+                    <li><font color="#000000"><strong>Feed description</strong>:
+                              Choose to show or hide the description text for
+                              the whole Feed.</font></li>
+                    <li><font color="#000000"><strong>Feed Image</strong>: Choose
+                                        to show or not the image associated with
+                              the whole feed.</font></li>
+                    <li><font color="#000000"><strong>Items</strong>:
+                                   Enter the number of RSS Items to display.
+                              If this number is higher than the number fixed
+                              by the Syndicating site, the latter one will be
+                              used.</font></li>
+                    <li><font color="#000000"><strong>Item description</strong>:
+                                        Type the description or intro text for
+                              individual News Items.</font></li>
+                    <li><font color="#000000"><strong>Word Count</strong>:
+                                   Choose the the maximum number of visible words
+                                   available from the description of the New
+                              Item. 0 means all text will be displayed.</font></li>
+                    <li> <font color=
+"#000000"><strong>Enable Cache:</strong> Cache the contents of the Module..</font></li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the page. </li>
+               <li><strong>Cancel</strong>: Cancel without saving your changes. </li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.newsflash.html 4.6rc2/help/modules.newsflash.html
--- 4.5.4/help/modules.newsflash.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.newsflash.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,92 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Newsflash</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Newsflash</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Newsflash</strong> module
+                    randomly selects one of the published items from a category upon
+                    each page refresh. It may also display multiple items in horizontal
+          or vertical configurations.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Category:</strong> Use this drop-down to choose a content
+                    category among those published on your site.</li>
+               <li><strong>Style:</strong> The
+                         style to display the category. Note: The
+                         space allowed in the template for this module is quite
+                         important to define in order not to get unreadable content.</li>
+               <li><strong>Show
+                              images:</strong> Sets if content images should
+                              be displayed or not.</li>
+               <li><strong>Linked Titles:</strong> Make
+                                   the Items titles linkable or not. Choice in
+                    the drop-down is between Global (set in Global Configuration),
+                                   yes or no.</li>
+               <li><strong>Read More:</strong> Hide/Show
+                                        the Read more link.</li>
+               <li><strong>Item Title:</strong> Show/Hide
+                                             the Item Title.</li>
+               <li><strong>No.&nbsp;of Items:</strong> Number
+                                                  of items to display. </li>
+               <li><strong>Enable Cache</strong>:
+                                                       Select to cache or not
+                    the content of this module.</li>
+               <li><strong>Module
+                                                            Class Suffix</strong>:
+                                                            A suffix to be applied
+                                                            to the CSS class
+                                                            of the module (table.moduletable)
+                                                            to allow individual
+                                                            module styling.</li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. <strong>NOTE:</strong> You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.poll.html 4.6rc2/help/modules.poll.html
--- 4.5.4/help/modules.poll.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.poll.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Poll</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Polls</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Polls</strong> module
+                    compliments the Polls component. It is used to display the configured
+                    polls. The module differs from other modules in as much as the
+                    Component supports linking between Menu Items and Polls. This
+                    means that the module shows only those Polls which are configured
+          for a certain Menu Item.</p>
+               <strong>Details </strong>&nbsp;
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Enable Cache</strong>: Select to cache or not the
+                    content of this module.&nbsp;<strong>Module Class Suffix</strong>:
+                    A suffix to be applied to the CSS class of the module (table.moduletable)
+                    to allow individual module styling.</li>
+               </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.random_image.html 4.6rc2/help/modules.random_image.html
--- 4.5.4/help/modules.random_image.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.random_image.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Random Image</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Random
+Image</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Random Image</strong> module displays a randomly selected image from a designated folder/directory.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Image Type</strong>: Type of image (jpg, png, gif, etc.). Default is jpg.</li>
+               <li><strong>Image folder</strong>: Path to the images folder relative to the site URL (eg. images/stories).</li>
+               <li><strong>Link</strong>: URL to redirect to if image is clicked on (eg. http://www.mamboserver.com)</li>
+               <li><strong>Width (px)</strong>: Image&#39;s width in pixels. This forces all images to be displayed with this width. This may cause unwanted results if the original image has a different width.</li>
+               <li><strong>Height (px)</strong>: Image&#39;s height in pixels. This forces all images to be displayed with this height. This may cause unwanted results if the original image has a different height.</li>
+               <li> <strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.related_items.html 4.6rc2/help/modules.related_items.html
--- 4.5.4/help/modules.related_items.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.related_items.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Related Items</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Related
+Items</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Related Items</strong>&nbsp;module displays other Content Items that are related to the Item currently displayed. These are based on the keywords Metadata. All the keywords of the current Content Item are searched against all the Metadata keywords of all other published items. For example, you may have an Item on &#39;Breeding Parrots&#39; and you may have another on &#39;Hand Raising Black Cockatoos&#39;. If you include the keyword &#39;parrot&#39; in both Items, then the Related Items module will list the &#39;Breeding Parrots&#39; Item when viewing &#39;Hand Raising Black Cockatoos&#39; and vice-versa.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.&nbsp;<strong>Enable Cache</strong>: Cache the contents of the Module..</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.rssfeed.html 4.6rc2/help/modules.rssfeed.html
--- 4.5.4/help/modules.rssfeed.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.rssfeed.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Syndicate</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Module: Syndicate</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Syndicate</strong> module displays a syndication link for the content listed on the Frontpage Manager. <strong>NOTE</strong>: The
+                         parameters for the display may be entered through the
+                         Syndicating Component.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Text</strong>: Enter the text to be displayed on top of the RSS links.</li>
+               <li><strong>Enable Cache</strong>: Cache the contents of the Module..</li>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+               <li><strong>RSS 0.91 /RSS 1.0 / RSS 2.0 / ATOM / OPML</strong>: Hide/Show the type of RSS you want to provide.</li>
+               <li><strong>RSS 0.91 Image / RSS 1.9 Image /&nbsp; RSS 2.9 Image / ATOM&nbsp; Image / OPML Image</strong>: Lets you choose an image to be used to show the specific kind of Feed.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.search.html 4.6rc2/help/modules.search.html
--- 4.5.4/help/modules.search.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.search.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Search</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Search </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Search</strong> module shows
+                    a box into which users can enter query and then search your
+                    site for occurrences of that query.</p>
+               <strong>Details </strong>  <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class
+                         Suffix</strong>: A suffix to be applied to the CSS class
+                         of the module (table.moduletable) to allow individual
+                    module styling.</li>
+               <li><strong>Enable Cache</strong>: Select to cache the
+                    contents of this module.</li>
+               <li><strong>Box Width</strong>: Set the length of the box into which users can
+                    enter their search query.</li>
+               <li><strong>Text</strong>: Enter text to appear in the blank search box; if you
+                    leave this blank, the system default text will appear.</li>
+               <li><strong>Search Button</strong>: Show/Hide button for users to click to begin
+                    search. If you do not show button, user has to hit the enter
+                    key to begin the search.</li>
+               <li><strong>Button Position</strong>: Select where the button appears relative
+                    to the search box.</li>
+               <li><strong>Button Text</strong>: Specify text to appear on the button; if you
+                    leave this blank, the system default text will appear.</li>
+          </ul></td>
+     </tr>    <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.sections.html 4.6rc2/help/modules.sections.html
--- 4.5.4/help/modules.sections.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.sections.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Sections</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Sections</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Sections</strong>  module shows a list of all Sections configured in your database. The Sections refer here to the Published Item Sections in the order shown in the list displayed through Content&nbsp; -&gt; Section Manager. If the configuration &#39;Show Unauthorized Links&#39; is set to &#39;No&#39; in Global Configuration, the list will be limited to the sections the user is allowed to see.</p>
+              <strong>Details </strong>
+               <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Count</strong>: The number of Sections to display on the list (default is 5).</li>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.stats.html 4.6rc2/help/modules.stats.html
--- 4.5.4/help/modules.stats.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.stats.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Statistics</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Statistics</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Statistics</strong> module&nbsp;shows information about your server installation and statistics about the web site, members, number of contents in your database, and number of web links you provide.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+               <li><strong>Enable Cache</strong>: Cache the contents of the Module..</li>
+               <li><strong>Server Info</strong>: Displays or not Server Information.</li>
+               <li><strong>Site Info</strong>: Displays or not site information.</li>
+               <li><strong>Hit Counter</strong>: Displays or not the number of hits on your site.</li>
+               <li> <strong>Increase Counter</strong>: Amount to increase the number of hits in the counter.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+<p align="center"></p>
+
+<table class="hs_table">
+  <tbody>
+
+    <tr>
+      <td></td>
+    </tr>
+  </tbody>
+</table></body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.templatechooser.html 4.6rc2/help/modules.templatechooser.html
--- 4.5.4/help/modules.templatechooser.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.templatechooser.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Template Chooser</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Template
+Chooser</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Template Chooser</strong>&nbsp; module allows the user (visitor) to change the template on the fly from the Frontend via a drop down selection list. The list proposes a choice from all the templates installed in templates/.module allows the User (visitor) to change the template on the fly, from the Frontend, via a drop down selection list. <strong>NOTE</strong>: This may cause display problems if needed module positions are not provided for in certain templates.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Max. Name Length:</strong> This is the maximum length of the template name to display (default 20)</li>
+               <li><strong>Show preview:</strong>&nbsp;Show/Hide Template preview (the template_thumbnail.png file in the specific template folder)</li>
+               <li><strong>Width:</strong> The width of the preview image (default is 140 pixels). This may cause unwanted results if the original image has a different width.</li>
+               <li><strong>Height</strong>: The height of the template image (default is 90 pixels). This may cause unwanted results if the original image has a different width. </li>
+               <li><strong>Module Class Suffix</strong>:A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+<p>&nbsp;</p>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.whosonline.html 4.6rc2/help/modules.whosonline.html
--- 4.5.4/help/modules.whosonline.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.whosonline.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Who's Online</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Who&#39;s
+Online</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Who&#39;s Online</strong> module&nbsp;displays the number of anonymous users (guests) and Registered users (those that are logged in), that are currently accessing the web site.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Published</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>: A suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+               <li><strong>Enable Cache</strong>: Cache the contents of the Module..</li>
+               <li><strong>Show details</strong>: Display details of online users.</li>
+               <li><strong>Show users</strong>: Hide/Show online users.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/modules.wrapper.html 4.6rc2/help/modules.wrapper.html
--- 4.5.4/help/modules.wrapper.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/modules.wrapper.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Site Module - Wrapper</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Module: Wrapper</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The <strong>Wrapper Module</strong> wraps an external Web page into your site. The external Web page is inserted as an &#39;inline frame&#39; (also called an Iframe) into your template. This is not only useful to display other people&#39;s sites but also to include in your site pure dhtml pages you would have created with a specialized Web Editor, because they would be difficult/impossible to create through available Mambo editors. It also allows you to integrate independent applications and scripts (galleries, directories,..) into your Mambo site content.</p>
+               <strong>Details </strong>&nbsp; <ul>
+                    <li><strong>Title</strong>: Title of the module to display
+                         on the page.</li>
+                    <li><strong>Show Title</strong>: Show/Hide the Title (above) of
+                         the Module on the page. </li>
+                    <li><strong>Position</strong>: Assign the Module to a position
+                         on the template.</li>
+                    <li><strong>Module order</strong>: The order the module will
+                         appear among modules assigned to the same page, in the
+                         same position.</li>
+                    <li><strong>Access Level</strong>: Determines who (which
+                         class of user) can view the Module.</li>
+                    <li><strong>Published</strong>: Show/Hide the Module.</li>
+                    <li><strong>ID</strong>: This is the ID number for the module
+                         item. This is auto-allocated by the Mambo system when
+                         the module is saved.</li>
+                    <li><strong>Description:</strong> A short description of
+                         the functions provided by the Module Type</li>
+                    <li><strong>Pages / Items</strong>: Sets on which pages the
+                         Module will appear.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">Unpublished</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Module Class Suffix</strong>:&nbsp; Type, if needed, the suffix to be applied to the CSS class of the module (table.moduletable) to allow individual module styling.</li>
+               <li><strong>URL</strong>: Enter the URL for the site/file you wish to display within the IFrame.</li>
+               <li><strong>Scroll Bars</strong>: Choose whether horizontal and vertical scroll bars are added to your page. &#39;No&#39; means scroll bars are never shown even when content extends beyond the inline frame, &#39;Yes&#39; means scroll bars are always used even when content does not extend beyond the inline frame, and &#39;Auto&#39; means scrolls bars are shown only when necessary.</li>
+               <li><strong>Width</strong>: Type in a value for the width of the Iframe window, either in pixels or in percentage. Percentage is relative to the html element where the &lt;?php include_once(&quot;mainbody.php&quot;); ?&gt; tag is placed in the template.</li>
+               <li><strong>Height</strong>: Type in a value for the height of the Iframe window, either in pixels or in percentage (see above).</li>
+               <li><strong>Auto Height</strong>:&nbsp; Choose &quot;Yes&quot; if you desire the height of the Wrapper page to be set to the size of the external Web page.&nbsp;&nbsp; Choose &quot;No&quot; if you do not.</li>
+               <li><strong>Auto Add</strong>: Choose &quot;Yes&quot;&nbsp; if you wish&nbsp; &#39;http://&#39; is added automatically to the URL that you type in the Wrapper Link field in the Details tab.&nbsp; If you already have typed in the &quot;http://&quot;&nbsp; in the&nbsp; link field then Mambo will recognize this and not put a second &quot;http:&quot; in the link field.&nbsp; If set to &#39;No,&#39; then you must type &#39;http://&#39; or &#39;https://&#39; at the beginning of the URL in the URL field, or else the link in the URL field will be treated as a link relative to the URL of your site.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Preview Module. NOTE: You can only
+                    Preview typed modules. </li>
+               <li><strong>Save</strong>: Save changes and return to Module Manager. </li>
+               <li><strong>Apply</strong>: Apply changes without exiting the
+                    page. </li>
+               <li><strong>Close</strong>: Cancel without saving your changes
+                    and return to Module Manager. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/newsfeeds.edit.html 4.6rc2/help/newsfeeds.edit.html
--- 4.5.4/help/newsfeeds.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/newsfeeds.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Newsfeed - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Newsfeeds Manager : Edit a Newsfeed </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you 
+                    edit a Newsfeed Item.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Name</strong>: Enter the name of the Newsfeed
+                         as you want it to appear on your site.</li>
+                    <li><strong>Category</strong>: Select a Category for this
+                         Newsfeed Item.</li>
+                    <li><strong>Link</strong>: Enter here the link to the feed
+                         (as provided by the source).</li>
+                    <li><strong>Number of Articles</strong>: Enter the maximum
+                         number of Articles to display.</li>
+                    <li><strong>Cache Time (in seconds)</strong>: Enter the time
+                         between refreshes, in seconds.</li>
+                    <li><strong>Ordering</strong>: This is the order the Item
+                         will display in the Newsfeed Manager. Defaults to last
+                         when created, may be changed when editing.</li>
+                    <li><strong>Published</strong>: Click the radio button to
+                         decide whether this Newsfeed will display or not on
+                         your site. </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li></li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click this icon to save the created or modified Newsfeed.</li>
+               <li><strong>Cancel</strong>: Cancels any change or creation. When clicking while editing, the item will remain checked-in.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/newsfeeds.manager.html 4.6rc2/help/newsfeeds.manager.html
--- 4.5.4/help/newsfeeds.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/newsfeeds.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Newsfeed Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Newsfeed Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page displays a list of the Newsfeeds you may provide to the users of your site.These Newsfeeds may be displayed through a Menu Item link. <a href=
+"/index.php?option=com_content&amp;task=view&amp;id=890&amp;Itemid=126"></a>Alternatively, you may also display Newsfeeds individually through the Custom/User Module.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Newsfeed</strong>:&nbsp; Name of the Newsfeed as it appears on your site. If you click on this name, you may edit the related parameters. A padlock icon next to it shows that it is checked-out. To check-in, click the name to edit.</li>
+               <li><strong>Published</strong>: This shows whether the Newsfeed is published or unpublished. By clicking on the icon, you may switch its state.</li>
+               <li><strong>Reorder</strong>: This shows the order of Newsfeeds
+                    in the list. Click the arrow icons to move the item up or
+                    down in the list. This ordering may be changed by editing
+                    the related Menu Item parameters.</li>
+               <li><strong>Category</strong>: This is the category the Newsfeed belongs to. Click to edit.</li>
+               <li><strong>#Articles</strong>: This shows the number of Articles to display on your site as defined in the parameters for the Newsfeed.</li>
+               <li><strong>Cache time</strong>: This is the time between refreshes as defined in the parameters for the Newsfeed. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+      
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected items.</li>
+               <li><strong>Unpublish</strong>: Click to unpublish any number
+                    of selected items.</li>
+               <li><strong>New</strong>: Click the &#39;New&#39; icon to create a new Newsfeed.&nbsp;</li>
+               <li><strong>Edit</strong>: Select the feeds and click the &#39;Edit&#39; icon
+                    to edit the Newsfeed.</li>
+               <li><strong>Delete</strong>: Click the &#39;Delete&#39; icon to delete one or multiple Newfeeds.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/newsfeeds.new.html 4.6rc2/help/newsfeeds.new.html
--- 4.5.4/help/newsfeeds.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/newsfeeds.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Newsfeed - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Newsfeeds Manager : Create a New Newsfeed Items </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you create
+                    a Newsfeed Item.</p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Name</strong>: Enter the name of the Newsfeed as you
+                    want it to appear on your site.</li>
+               <li><strong>Category</strong>: Select a Category for this Newsfeed
+                    Item.</li>
+               <li><strong>Link</strong>: Enter here the link to the feed (as
+                    provided by the source).</li>
+               <li><strong>Number of Articles</strong>: Enter the maximum number
+                    of Articles to display.</li>
+               <li><strong>Cache Time (in seconds)</strong>: Enter the time between
+                    refreshes, in seconds.</li>
+               <li><strong>Ordering</strong>: This is the order the Item will display in the Newsfeed Manager. Defaults to last when created, may be changed when editing.</li>
+               <li><strong>Published</strong>: Click the radio button to decide whether this Newsfeed will display or not on your site. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves and returns you to Newsfeed Manager.</li>
+               <li><strong>Cancel</strong>: Cancels without saving and returns
+                    you to Newsfeed Manager.</li>
+               </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/poll.edit.html 4.6rc2/help/poll.edit.html
--- 4.5.4/help/poll.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/poll.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Poll - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Poll Manager : Edit </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you edit
+                    a poll for your site.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Question</strong>: Enter the question for the
+                         poll as it will appear on your site (100 characters
+                         max).</li>
+                    <li><strong>Lag</strong>: Enter here the number of seconds
+                         users have to wait before being able to vote in the
+                         same poll again. This interval is&nbsp;expressed in
+                         seconds. The default value is 86400 (24 hours).</li>
+                    <li><strong>Options</strong>: Enter the answer choices for
+                         you Poll, one on each line.</li>
+                    <li><strong>Show on menu items</strong>: Specify the page
+                         son which you want this Poll to appear. &nbsp; </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves the new poll and returns to Manager.</li>
+               <li><strong>Cancel</strong>: Cancels and close without saving
+                    changes.</li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/poll.manager.html 4.6rc2/help/poll.manager.html
--- 4.5.4/help/poll.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/poll.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Poll Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Poll Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows show a list of the Polls you may display on your site.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Poll Question</strong>: This is the question posed
+                    by the poll.</li>
+               <li><strong>Published</strong>: Shows whether the poll is published.
+                    Click the icon to toggle the state of the poll.&nbsp;</li>
+               <li><strong>Options</strong>: The number of options in the poll.</li>
+               <li><strong>Lag</strong>: Time in seconds between votes of the same user for the same poll. &nbsp; </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected
+                    Polls.</li>
+               <li><strong>Unpublish</strong>: Click to unpublish any number
+                    of selected Polls.</li>
+               <li><strong>New</strong>: Click this icon to add a new poll.</li>
+               <li><strong>Edit</strong>: Select a Poll and click this icon to
+                    edit the poll&#39;s
+                    details.</li>
+               <li><strong>Delete</strong>: Click this icon to delete one or
+                    more Polls.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/poll.new.html 4.6rc2/help/poll.new.html
--- 4.5.4/help/poll.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/poll.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Poll - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Poll Manager : Create a New Poll </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you create
+                    a new Poll for your site.</p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Question</strong>: Enter the question for
+                    the poll as it will appear on your site (100 characters max).</li>
+               <li><strong>Lag</strong>: Enter here the number of seconds users have to wait before being able to vote in the same poll again. This interval is&nbsp;expressed in seconds. The default value is 86400 (24 hours).</li>
+               <li><strong>Options</strong>: Enter the answer choices for you Poll, one on each
+                    line.</li>
+               <li><strong>Show on menu items</strong>: Specify the page son
+                    which you want this Poll to appear.   &nbsp; </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+         
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves the new poll and returns to Manager.</li>
+               <li><strong>Cancel</strong>: Cancels and close without saving
+                    changes.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/sections.copy.html 4.6rc2/help/sections.copy.html
--- 4.5.4/help/sections.copy.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/sections.copy.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Section - Copy</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Sections Manager
+: Copy a Section </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>From this screen, you can
+                    copy a Section and Categories it contains.
+          During the operation, you define the name of the new Section.</p>
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Click this icon
+                    to save the changes</li>
+               <li><strong>Cancel</strong>: Click this icon to
+                         cancel the action and return to previous screen</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/sections.edit.html 4.6rc2/help/sections.edit.html
--- 4.5.4/help/sections.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/sections.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Section - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Sections Manager
+: Edit a Section</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you edit a Section.</p>
+               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Section Title</strong>: Type here the name of the
+                    section as you want it to display on your site.</li>
+               <li><strong>Section Name</strong>:
+                              Type here the name of the section as you want it
+                    to appear in the database and the back-end.</li>
+               <li><strong>Image</strong>: Select here
+                              an image to display next to the Section Description
+                    text. The dropdown lists an image choice from the images/stories
+                    folder.</li>
+               <li><strong>Image
+                              position</strong>: Select here the position of
+                              the image relative to the description text. Left
+                              or right.</li>
+               <li><strong>Ordering</strong>:
+                                   Select here the order of the section among
+                    other sections. This will reflect in the Section Manager.
+                                   New sections default to the last place. Ordering
+                                   can be changed after applied or saved.</li>
+               <li><strong>Access</strong>:
+                              This is the user access level for the category.
+                    Public, Registered or Special.</li>
+               <li><strong>Published</strong>: Check the box to let the
+                         item show on your site.</li>
+               <li><strong>Description</strong>:&nbsp; Type
+                         here a description of the Section. This text will show
+                         decided so when the section is displayed as
+                    a table, blog or other sections.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Opens a new
+                         window which lets you upload a file or an image from your computer
+                    to the images/stories folder.</li>
+               <li><strong>Save</strong>: Saves the
+                              section and returns to Manager.</li>
+               <li><strong>Apply</strong>:
+                                   Saves the section and keep the page displayed
+                    to edit.</li>
+               <li><strong>Cancel</strong>:
+                              Cancels the action. Any modification is lost. If
+                    opened for edit, the Section remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/sections.manager.html 4.6rc2/help/sections.manager.html
--- 4.5.4/help/sections.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/sections.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Section Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Sections Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows show a list
+          of the Sections defined on your site.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Section Name</strong>: This is the name of a section.
+                    Click the name to edit the section parameters. A padlock
+                    icon next to it shows that it is checked-out. To check-in,
+                    click the name to edit ,</li>
+               <li><strong>Published</strong>: Whether a section is published
+                              or not. Click the icon to change the state.</li>
+               <li><strong>Reorder</strong>:
+                                   This shows the order of Sections in the list.
+                    Click the arrow icons to move the item up or down.</li>
+               <li><strong>Order</strong>:
+                                        Shows the order of Sections in the list.
+                    You may change it by editing 2 # conjointly and clicking
+                                        on the Save Order icon next to the Column
+                         Heading Order.Note: the new ordering has an effect when
+                                        Sections lists are provided in the Frontend
+                         of your site.</li>
+               <li><strong>Access</strong>: This is the User access level.<strong>Section
+                              ID</strong>: This is the ID for each section as
+                              defined in the database.</li>
+               <li><strong># Categories</strong>: This is the number of categories
+                         defined for the specific section.</li>
+               <li><strong># Active</strong>: This is the number of published
+                    Content Items in the section.</li>
+               <li><strong>#Trash</strong>: Number
+                         of Content Items belonging to this section and currently
+                         in the Trash.</li>
+               </ul>          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish and Unpublish</strong>:
+                         Same function as Published in the headings. You may
+                    check multiple checkboxes.</li>
+               <li><strong>New</strong>: Create a
+                         new Section.</li>
+               <li><strong>Edit</strong>:
+                              Edit an existing section parameters.</li>
+               <li><strong>Copy</strong>:
+                                   Opens a new Copy Section window where you
+                    can choose to copy the specific Section and *all its Content
+                                   Items* to a new Section. This will copy the
+                    Categories listed and all the items within the categories
+                                   (also listed) to the new Section created.</li>
+               <li><strong>Delete</strong>:
+                         Lets you delete the section chosen. An Alert will pop
+                         to let you confirm this choice. This action can&#39;t
+                         be performed if the section contains Content Items.
+                         In this last case, you would have to delete the Content
+                         Items and Categories first.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/sections.new.html 4.6rc2/help/sections.new.html
--- 4.5.4/help/sections.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/sections.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Section - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Sections Manager
+: Create a New Section </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets you create a Section.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Section Title</strong>: Type here the name of the
+                    section as you want it to display on your site.</li>
+               <li><strong>Section Name</strong>:
+                              Type here the name of the section as you want it
+                    to appear in the database and the back-end.</li>
+               <li><strong>Image</strong>: Select here
+                              an image to display next to the Section Description
+                    text. The dropdown lists an image choice from the images/stories
+                    folder.</li>
+               <li><strong>Image
+                              position</strong>: Select here the position of
+                              the image relative to the description text. Left
+                              or right.</li>
+               <li><strong>Ordering</strong>:
+                                   Select here the order of the section among
+                    other sections. This will reflect in the Section Manager.
+                                   New sections default to the last place. Ordering
+                                   can be changed after applied or saved.</li>
+               <li><strong>Access</strong>:
+                              This is the user access level for the category.
+                    Public, Registered or Special.</li>
+               <li><strong>Published</strong>: Check the box to let the
+                         item show on your site.</li>
+               <li><strong>Description</strong>:&nbsp; Type
+                         here a description of the Section. This text will show
+                         decided so when the section is displayed as
+                    a table, blog or other sections.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Upload</strong>: Opens a new
+                         window which lets you upload a file or an image from your computer
+                    to the images/stories folder.</li>
+               <li><strong>Save</strong>: Saves the
+                              section and returns to Manager.</li>
+               <li><strong>Apply</strong>:
+                                   Saves the section and keep the page displayed
+                    to edit.</li>
+               <li><strong>Cancel</strong>:
+                              Cancels the action. Any modification is lost. If
+                    opened for edit, the Section remains checked-in.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/statistics.searches.html 4.6rc2/help/statistics.searches.html
--- 4.5.4/help/statistics.searches.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/statistics.searches.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Statistics - Search Text</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<meta name="copyright" content="copyright (C) 2005 - 2006 Mambo Foundation Inc." />
+<meta name="license" content="http://www.gnu.org/copyleft/gpl.html GNU/GPL" />
+</head>
+<body><strong class="title">Statistics - Search Text</strong>
+
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">
+
+This page lists the logged search text that visitors have used on
+your site. 
+<p class="red"><strong>You must enable the "Log Search
+Strings" option in the "Statistics" tab of Global Configuration
+for this data to be collected.</strong></p>
+
+<strong>Display Columns</strong>
+
+<ul>
+<li><strong>Search Text</strong>: This is the string or phrase the
+site visitor entered.</li>
+<li><strong>Times Requested</strong>: This is the number of times
+this text has been entered.</li>
+<li><strong>Results Returned</strong>: This is the number of search
+items that would appear if you performed the search now.</li>
+</ul>
+<p>
+Some results to look at are words or phrases that are commonly
+searched for, but return no results. You should assess whether
+you have content that is applicable. If necessary, add keywords
+using the Meta Info tab for that content item.</p>
+
+<p>Other results to look for are misspelt words or related words.
+For example, if a common search word is 'dark' but it is commonly
+misspelt as 'drak' then you may consider putting 'drak' in the
+keywords section. You may also have content about a waste
+facility where you might add common alternative terms in the meta
+keywords such as 'trash' or 'dump'.</p>
+
+
+          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/syndicate.settings.html 4.6rc2/help/syndicate.settings.html
--- 4.5.4/help/syndicate.settings.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/syndicate.settings.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Syndication Settings</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Syndication Settings</strong><table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">
+          <p>The Syndicate Component controls the settings related to the Syndication
+               of your site's contents via RSS and related protocols (e.g., Atom).
+               To display the syndication links to your site visitors you must
+               publush the Syndicate Module.</p>           <strong>Details</strong>
+          <ul>
+               <li><strong>Cache:</strong> Choose the &#39;Yes&#39; radio button to create and display a new Newsfeed dependant on the value set in the Cache Time field. Choose the &#39;No&#39; radio
+                         button to display a new Newsfeed each time an item is
+                         added to the FrontPage Component and each time the Newsfeed
+                         is accessed by another server. <strong>Warning</strong>: Setting Cache
+                         to &#39;No&#39; will cause your Newsfeed to be checked
+                         every time someone visits any site where your Newsfeed
+                         is syndicated. This can potentially cause excessive
+                         bandwidth usage as well as extreme draw on your server
+                    resources. </li>
+               <li><strong>Cache Time</strong>: This is the number of seconds
+                    before your site&#39;s database is checked for updates. The
+                    default in Mambo is 3600 seconds, or 60 minutes. After this
+                    time has elapsed, the Newsfeed will refresh itself from your
+                    database thus displaying any new items you have published
+                    through the FrontPage Component to your Newsfeed. </li>
+               <li><strong>#Items:</strong> Enter the number of items you would
+                    like to syndicate and display in your Newsfeed. </li>
+               <li><strong>Title:</strong> Enter the title you wish to display
+                    above your articles within your syndicated Newsfeed when
+                    it is displayed on those sites and pages which syndicate
+                    your Newsfeed. The title will appear as a link to your site.</li>
+               <li><strong>Description:</strong> Enter a brief
+                    statement to describe your Newsfeed. If none is entered,
+                    it will default to &quot;Mambo site syndication&quot;.</li>
+               <li><strong>Image:</strong> Select an image from the drop-down menu to be included in your Newsfeed. If you do not have an image, you can upload one via the Media Manager.</li>
+               <li><strong>Image Alt:</strong> Enter the text for
+                    the &#8220;alt&quot; tag to compliment the image you&#39;ve
+                    selected for inclusion in the Newsfeed via the Image drop-down
+                    menu.</li>
+               <li><strong>Limit Text:</strong> Choose
+                    the &#39;Yes&#39; radio button if you wish to limit the Text Length field. Choose the &#39;No&#39; radio
+                    button to force the value in the Text Length field to be
+                    ignored, thus displaying the entire contents of each item.</li>
+               <li><strong>Text Length:</strong> Enter the number of words to
+                    display per Newsfeed item. <strong>NOTE:</strong> The
+                    Limit Text radio button must be set to &#39;YES&#39; to activate
+                    this function.</li>
+               <li><strong>Order</strong>: Set the order that items as listed
+                    in the FrontPage Manager will be displayed.
+                    <ul>
+                         <li>&#39;Default&#39;: Arranges items according
+                              to the order set in the FrontPage Manager.</li>
+                         <li>&#39;FrontPage Ordering&#39;: Same as above.</li>
+                         <li>&#39;Oldest first&#39;: Arranges items in chronological
+                              order, with the oldest items first.</li>
+                         <li>&#39;Most recent first&#39;: Arranges items
+                              in chronological order, with the newest items first.</li>
+                         <li>&#39;Title Alphabetical&#39;: Arranges items
+                              by title in alphabetical order.</li>
+                         <li>&#39;Title Reverse-Alphabetical&#39;: Arranges
+                              items in reverse-alphabetical order.</li>
+                         <li>&#39;Author Alphabetical&#39;: Arranges items
+                              by author in alphabetical order.</li>
+                         <li>&#39;Author Reverse-Alphabetical&#39;: Arranges
+                              items by author in reverse alphabetical order.</li>
+                         <li>&#39;Most Hits&#39;: Arranges items according
+                              to the number of hits, with the items with the
+                              most hits first.</li>
+                         <li>&#39;Least Hits&#39;: Arranges items according
+                              to the number of hits, with the items with the
+                              least hits first.</li>
+                         </ul>
+               </li>
+               <li><strong>Live Bookmarks</strong>: Activate support
+                              for Firefox Live Bookmark functionality.</li>
+               <li><strong>Bookmark
+                                   File</strong>: Special file name. If none is entered,
+                    will use the default file.</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves your changes.
+               </li>
+               <li><strong>Cancel</strong>: Cancels and exits without saving
+                    your changes.</li>
+          </ul></td>
+</tr>
+</table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/templates.assign.html 4.6rc2/help/templates.assign.html
--- 4.5.4/help/templates.assign.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/templates.assign.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Templates - Assign</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Templates: Assign</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page
+                    lets you assign the template chosen to specific Menu Items/pages.The&nbsp;list
+                    displays all your Menu Items grouped per menu.</p>
+               <p>You can select multiple Menu Items, by holding
+                    the CTRL key while clicking.This will override de default
+                    template for the pages chosen. If you choose &#39;<strong>None</strong>&#39;,
+          the Default template will be used for all&nbsp; Menu Items/pages.</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves your choice
+                         and returns to the Template Manager.</li>
+               <li><strong>Cancel</strong>: Cancels
+                    the action and returns to the Template Manager.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/templates.edit-css.html 4.6rc2/help/templates.edit-css.html
--- 4.5.4/help/templates.edit-css.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/templates.edit-css.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Templates - Edit CSS</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Templates: Edit
+CSS</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">From this screen, you can
+               edit the contents of the template_css.css file, for the selected
+               template. You can edit, add, or delete CSS classes. Please remember
+               that setting of this file, together with the index.php file, &nbsp;control
+               the appearance&nbsp;of your template.For changes to be saved,
+               template_css.css file must be writable. You can make it writable,
+               by changing its permissions using an FTP client.During saving,
+               you can set its permissions back to unwritable, by checking the &#39;Make
+               unwritable after saving&#39; option. Alternatively you can make
+               changes to this file, by downloading to your computer, editing
+               it with your favourite editor and uploading, replacing the old
+          file.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Save your changes. </li>
+               <li><strong>Cancel</strong>: Cancel the present operation without saving.</li>
+          </ul></td>
+     </tr></table>
+
+<p>&nbsp;</p>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/templates.edit-html.html 4.6rc2/help/templates.edit-html.html
--- 4.5.4/help/templates.edit-html.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/templates.edit-html.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Templates - Edit HTML</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Templates: Edit
+HTML</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data">From this screen, you can
+               edit the contents of the&nbsp;index.php file, for the selected
+               template.&nbsp;Please remember that setting of this file, together
+               with the&nbsp;template_css.css file, &nbsp;control the appearance&nbsp;of
+               your template.For changes to be saved,&nbsp;index.php file must
+               be writable. You can make it writable, by changing its permissions
+               using an FTP client.During saving, you can set its permissions
+               back to unwritable, by checking the &#39;Make unwritable after
+               saving&#39; option. Alternatively you can make changes to this
+               file, by downloading to your computer, editing it with your favourite
+          editor and uploading, replacing the old file.</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Save your changes. </li>
+               <li><strong>Cancel</strong>: Cancel the present operation without
+                    saving.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/templates.manager.admin.html 4.6rc2/help/templates.manager.admin.html
--- 4.5.4/help/templates.manager.admin.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/templates.manager.admin.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Admin Template Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Admin Template&nbsp;Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Using Template Manager
+                    you can&nbsp;view all the installed templates. You can also
+                    assign and edit Templates. Templates affect the way your
+                    site looks. You have to set one as the default. You can assign
+                    other templates to Menu Items/pages you choose. That way,
+                    you can change if you wish, the way your site looks, based
+                    on the context. Select a template by checking the radio button
+                    next to its name. </p>
+               <strong>Display
+               Columns</strong>
+               <ul>
+                    <li><strong>Name</strong>: This is the name of the template.
+                         If you mouseover this name -and the &#39;Preview template&#39; on
+                         top right of the list is checked-, a preview of the
+                    template is displayed.&nbsp;</li>
+                    <li><strong>Default</strong>:
+                         This is the template that is currently published as
+                    the site template (only one can be published at a time).&nbsp;</li>
+                    <li><strong>Version</strong>:
+                    This is the template version.&nbsp;</li>
+                    <li><strong>Date</strong>:
+                    This is the creation date of the template.&nbsp;</li>
+                    <li><strong>Author
+                    URL</strong>: A URL provided by the author.&nbsp;</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Default</strong>: Assigns this
+                         default template to all Menu Items/pages. That will
+                    be the main template. It will be used, unless it is overridden
+                    by an assigned template.</li>
+               <li><strong>New</strong>:
+                    Lets upload/install a new template to your site.&nbsp;</li>
+               <li><strong>Edit
+                              HTML</strong>: Lets edit the templates/the-template-chosen/index.php
+                              file. This is the file loaded in the FrontEnd when
+                              a user opens your site.</li>
+               <li><strong>Edit CSS</strong>: Lets edit the
+                              templates/the-template-chosen/css/template_css.css
+                    file which contains the CSS classes definitions for this
+                    specific template.&nbsp;</li>
+               <li><strong>Delete</strong>:
+                         Lets you delete a template. You will be asked to confirm
+                         the delete operation. Select &#39;Yes&#39; to
+                         delete or &#39;No&#39; to cancel. The template will
+                         be&nbsp;permanently
+                    deleted from the database.</li>
+          </ul>               
+          </td>
+     </tr></table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/templates.manager.html 4.6rc2/help/templates.manager.html
--- 4.5.4/help/templates.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/templates.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Template Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Template&nbsp;Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>Using Template Manager
+                    you can&nbsp;view and manage all the installed templates.
+                    Templates your site's appearance. You have to set one template
+                    as the default but you can assign other templates to Menu
+                    Items/pages you choose. Select a template
+                    by checking the radio button next to its name. </p>
+               <p><strong>Display
+                    Columns</strong>
+               </p>
+               <ul>
+                    <li><strong>Name</strong>: This is the name of the template.
+                         If you mouseover this name - and the &#39;Preview template&#39; on
+                         top right of the list is checked - a preview of the
+                    template pops up.&nbsp;</li>
+                    <li><strong>Default</strong>:
+                         Indicates which template is currently published
+                         as the default template (only one can be published at
+                         a time).&nbsp;</li>
+                    <li><strong>Assigned</strong>:
+                         This tells us whether the template is dynamically assigned
+                    to one of the pages on the site.&nbsp;</li>
+                    <li><strong>Author</strong>: The name of the template's author,
+                         as per the XML file. </li>
+                    <li><strong>Version</strong>:
+                         The template's version.&nbsp;</li>
+                    <li><strong>Date</strong>:
+                    The creation date of the template.&nbsp;</li>
+                    <li><strong>Author
+                    URL</strong>: A URL provided by the author.&nbsp;</li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview Template</strong>: Select to enable pop
+                         up previews of the templates on mouseover of the template's name. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Default</strong>: Assigns the template to the default
+                    role. The default template will be
+                    used for all pages unless it is overridden by an assigned
+                    template.</li>
+               <li><strong>Assign</strong>: Opens a page where you
+                         can assign a template to specific Menu Items/pages.
+                    This will override the default template for the pages chosen.</li>
+               <li><strong>New</strong>:
+                         Links to the Universal Installer. Lets upload/install
+                    a new template to your site.&nbsp;</li>
+               <li><strong>Edit
+                              HTML</strong>: Edit the template's index.php
+                              file in your browser window.</li>
+               <li><strong>Edit CSS</strong>: Edit the
+                              template's template_css.css
+                    file in your browser window.&nbsp;</li>
+               <li><strong>Delete</strong>:
+                         Delete a template. You will be asked to confirm
+                         the delete operation. Select &#39;Yes&#39; to
+                         delete or &#39;No&#39; to cancel. The template will
+                         be&nbsp;permanently
+                    deleted from the database.</li>
+          </ul>               </td>
+     </tr></table>
+
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/templates.module-positions.html 4.6rc2/help/templates.module-positions.html
--- 4.5.4/help/templates.module-positions.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/templates.module-positions.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Module Positions</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title">Module Positions</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Module
+                    Positions page allows you to enter details of the module
+                    positions you have used in your template. All the default
+                    module positions are already entered and in general it is
+                    unlikely you would need to change this.Should you want to
+                    use positions that do not pre-exist in the default Mambo
+                    setup you can simply add a name for a module position and
+                    a description. The description is optional.</p>
+               <p>Each module position you define in your template,
+                    must have an entry in module positions screen. Otherwise
+                    it wan&#39;t function.When you click on <strong>Site -&gt; Preview
+                    -&gt; Inline with Position</strong>, you may visualize your
+                    Home page with blocks displaying the Positions used in the
+                    template assigned to the Home page.</p>          </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data"><p>To create a new module
+                    position in your template, you insert this basic code into
+                    your template to be able to assign modules to a specific
+                    position.</p>
+               <p><code>&lt;?php mosLoadModules ( &#39;position&#39; );
+                         ?&gt;</code></p>               
+               <ul>
+                    <li>The word &#39;position&#39; is to be changed to
+                         whichever position you define on this page. The name
+                         of the positin must&nbsp;not has any spaces.</li>
+          </ul>               </td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+</table>
+
+
+<p>&nbsp;</p>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/trash.manager.html 4.6rc2/help/trash.manager.html
--- 4.5.4/help/trash.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/trash.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Trash Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Trash&nbsp;Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This screen shows&nbsp;a
+                    list of the Content Items that is in the &#39;Trash bin&#39;.
+                    Trash bin is the equivelant of the &#39;Recycle bin&#39; on
+                    Windows. There are two tabs. <strong>Content Items tab</strong>, displays
+                    all the Content Items that have been trashed. <strong>Menu Items
+          tab</strong>, displays all the Menu Items that have been trashed.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Title</strong>: This is the title of the trashed item</li>
+               <li><strong>Section</strong>:
+                         This is the section of the trashed item.</li>
+               <li><strong>Category</strong>:
+                         This is the category of the trashed item.</li>
+               <li><strong>ID</strong>:
+                         This is the ID of the trashed item.</li>
+               <li><strong>Menu</strong>:
+                              The menu this Menu Item belongs</li>
+               <li><strong>Type</strong>:
+                                   The type of Menu Item </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>n/a</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Restore</strong>: Select
+                         an item from the table and click the Restore icon to undelet
+                         it. The item will be returned to its original position, and
+                    by default, it will be unpublished.</li>
+               <li><strong>Delete</strong>:
+                              Select an item from the table and click the delete
+                    icon, to <strong>permanently delete</strong> it.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/typedcontent.edit.html 4.6rc2/help/typedcontent.edit.html
--- 4.5.4/help/typedcontent.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/typedcontent.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,239 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Static Content - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Static Content  : Edit a Static Content Item</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets 
+                    edit a Static Content Item.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li> <strong>Title</strong>: Type here is the title
+                         of the Static Content. This is the title as it will appear
+                    on the page when displayed.</li>
+                    <li><strong>Title Alias</strong>:
+                         This field is optional.</li>
+                    <li><strong>Text</strong>:
+                              Type here the content you want to display. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>The Attributes Area for Static Content consists of five tabs:
+                    Publishing, Images, Parameters, Meta Info and Link to Menu.
+                    </p>
+               <p><strong>(1) Publishing</strong></p>
+               <ul>
+                    <li><strong>Published</strong>: Check
+                         the box to let the item show on your site.</li>
+                    <li><strong>Access
+                         Level</strong>: Choose who will be able to view this
+                         content. Public, registered or special.</li>
+                    <li><strong>Author Alias</strong>:
+                         You can publish the author&#39;s name for a piece of
+                         content. You can choose a Registered user as displayed
+                         through the dropdown or type any name there (an author
+                         that does not have an account or content created by
+                         many authors as a group).</li>
+                    <li><strong>Change
+                         Creator</strong>: This allows you to assign ownership
+                         of this content to another registered user.</li>
+                    <li><strong>Ordering</strong>:
+                         Select the order in which this content is listed relative
+                         to others in this Category. The choices available in
+                         the dropdown will show once changes to the item are
+                         saved or applied.</li>
+                    <li><strong>Override Created Date</strong>:
+                         This shows the created date for the content. You can
+                         change the date if necessary.</li>
+                    <li><strong>Start Publishing</strong>:
+                         Select the date when this document is to be published
+                         on the web site.</li>
+                    <li><strong>Finish
+                         Publishing</strong>: If desired, you can set the date
+                         when your content is to be expired.</li>
+                    <li><strong>Content ID</strong>:
+                         This is the ID of the content in the database.</li>
+                    <li><strong>State</strong>:
+                         This shows the current state of the document. It is
+                         not editable.</li>
+                    <li><strong>Hits</strong>:
+                         This gives the number of times this content was viewed.
+                         The &#39;Reset
+                         Hit Count&#39; button allows you to reset the counter
+                         to zero.</li>
+                    <li><strong>Revised</strong>: This shows the number
+                              of edits this content has undergone.</li>
+                    <li><strong>Created</strong>:
+                                   This is the date this Content Item was created.</li>
+                    <li><strong>By</strong>:
+                                        This is the name of the user that created
+                                        the Content Item.</li>
+                    <li><strong>Last
+                                             Modified</strong>: This is the date
+                                             when this Content Item was last
+                                             modified, if ever.</li>
+                    <li><strong>By</strong>:
+                                                  This is the name of the user
+                         that last modified this content, if ever. </li>
+               </ul>               <p><strong>(2) Images</strong></p>
+               <ul>
+                    <li><strong>Sub-folder</strong>: Choose
+                         here the sub-folder you want to get the images from. These
+                    are in images/stories/.</li>
+                    <li><strong>Gallery Images</strong>:
+                         This dropdown lists the images available in the specific
+                         sub-folder. Highlight one or multiple image name(s)
+                         and click on the &#39;Add&#39; button.The
+                         name(s) will display in the Content Images dropdown.</li>
+                    <li><strong>Content
+                         Images</strong>:The &#39;up&#39; and &#39;down&#39; buttons
+                         determine the order of images if there are more than
+                         one on this page. The images will display relative to
+                         the instances of {mosimage} tags in your content.</li>
+                    <li><strong>Edit the image
+                         selected</strong>Select an image in &#39;Content Images&#39;.</li>
+                    <li><strong>Source</strong>:
+                              Displays the default name of the image highlighted.
+                              You may edit that name.</li>
+                    <li><strong>Image Align</strong>:
+                                   Lets you choose between None, center, left
+                         or right.</li>
+                    <li><strong>Alt Text</strong>:
+                                        Lets you choose an Alt Text for the image.</li>
+                    <li><strong>Border</strong>:
+                                             Type here the number of pixels you
+                         want the border to be around the image.</li>
+                    <li><strong>Caption</strong>:
+                                                  Type here a caption for the
+                         image.</li>
+                    <li><strong>Caption Align</strong>:
+                                                       Lets you choose between
+                         None, center, left or right.</li>
+                    <li><strong>Width</strong>:
+                                                            Type here a number
+                         in pixels to override the width of the image<strong>.</strong></li>
+                    <li><strong>Apply</strong>:
+                                                            Click on this button
+                         to apply all the parameters defined for this
+                                                            image</li>
+               </ul>               <p><strong>(3) Parameters</strong></p>
+               <ul>
+                    <li><strong>Menu Image</strong>: A small image to place
+                    to the right of your Menu Item. Images must be in images/stories.</li>
+                    <li><strong>Page
+                         Title</strong>: Hides or shows the Page Title as defined
+                         in &#39;Details&#39;<strong>.</strong></li>
+                    <li><strong>Page Class Suffix</strong>:
+                         Allows you to set customized styles for this page. The
+                         suffix you type here is automatically added to the CSS
+                         classes for this page, and will have to be defined in
+                         your template&#39;s
+                         CSS style sheet for usage.</li>
+                    <li><strong>Back Button</strong>:
+                         Controls whether to show or hide a &quot;Back&quot; text
+                         link that would appear on the bottom of the page and
+                         return the user to the previously viewed page. The pull
+                         down lets select &#39;Use
+                         Global&#39; to use the parameter as defined globally
+                         through the Site-&gt;Global Configuration, &#39;Hide&#39; or &#39;Show&#39;.For
+                         each of the following seven items listed below, you
+                         can use the option selected in the Global Configuration
+                         settings (Site -&gt; Global Configuration) by selecting &#39;Use
+                         Global&#39; or
+                         you can override the Global Configuration setting by
+                         selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                         the settings here for items will not affect the Global
+                         Configuration settings and will not affect the settings
+                         on the rest of the site.</li>
+                    <li><strong>Item Rating</strong>:
+                         Hides or shows ratings given to home page items by your
+                         site&#39;s users.</li>
+                    <li><strong>Author
+                              Names</strong>: Hides or shows the names of authors
+                              of items.</li>
+                    <li><strong>Created
+                                   Date and Time</strong>: Hides or shows the
+                                   date and time that items were created.</li>
+                    <li><strong>Modified Date and
+                                        Time</strong>:
+                                        Hides or shows the date and time that
+                                        items were last modified.</li>
+                    <li><strong>PDF
+                                             Icon</strong>: Hides or shows the
+                                             icon and link to the PDF version
+                                             of items.</li>
+                    <li><strong>Print Icon</strong>:
+                                                  Hides or shows the icon and
+                         link to the printer-friendly format of
+                                                  items.</li>
+                    <li><strong>Email
+                                                       Icon</strong>: Hides or
+                                                       shows the icon and link
+                                                       to the page that enables
+                                                       users to email items to
+                                                       others.</li>
+               </ul>               <p><strong>(4) Meta Info</strong></p>
+               <ul>
+                    <li><strong>Description</strong>:
+                         This information is inserted in the headers of your content.
+                    It is commonly used by search engines.</li>
+                    <li><strong>Keywords</strong>:
+                         These keywords are also related to the header information
+                         provided for search engines, but provide too a much
+                         more important function. These keywords drive the What&#39;s
+                         Related Module that provides automatic links to other
+                    Content Items that shares a similar keyword. </li>
+                    <li><strong>Add Sect/Cat/Title</strong>:&nbsp; Clicking
+                         on this button is a convenient way to insert the content&#39;s
+                         information into the keywords field, including the content&#39;s
+                    title, section name, and category name. </li>
+               </ul>               <p><strong>(5) Link to Menu</strong> -- This
+                    will create a &#39;Link - Static Content Item&#39; in the
+                    menu you select.NOTE: There is no other way to show this
+                    content on your site. The link may also be created through
+               the Menu Manager.</p>
+               <ul>
+                    <li><strong>Select a Menu</strong>: Highlight
+                         here one the menus defined for your site.</li>
+                    <li><strong>Menu Item
+                         Name</strong>: The name of the Menu as it will appear
+                         on your site.</li>
+                    <li><strong>Link to Menu</strong>: Click on
+                         this button to create the Menu Item.Existing Menu ItemsThis
+                         displays a list of all &#39;Link - Static Content Item&#39; Menu
+                         Items referencing this static content.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Opens a new
+                         window to preview the content as you would in the Front-end of
+                    your site.</li>
+               <li><strong>Upload</strong>: Opens a new window which lets
+                              you upload a file or an image from your computer
+                    to the images/stories folder.</li>
+               <li><strong>Save</strong>: Saves the content and returns to
+                         Manager.</li>
+               <li><strong>Apply</strong>: Saves the content and keep the
+                              content displayed to edit.</li>
+               <li><strong>Cancel</strong>:
+                                   Cancels the action. Any modification is lost.
+                    If opened to edit, the Static Content Item remains
+                                   checked-in.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/typedcontent.manager.html 4.6rc2/help/typedcontent.manager.html
--- 4.5.4/help/typedcontent.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/typedcontent.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Static Content Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Static Content
+Manager</strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>The Static Content Manager&nbsp;shows
+                    a list of the Static Content Items on your site. Static Content
+                    Items are not part of a section or category. They cannot
+                    be added to a blog, category or section page. The only way
+                    to display them on your site is through a Menu Item link.</p>
+               <strong>Display Columns</strong>
+               <ul>
+                    <li><strong>Title</strong>: This is the title of the Content
+                         item. Click here to edit content. A padlock icon next
+                         to it shows that it is checked-out. To check-in, click
+                         the name to edit.</li>
+                    <li><strong>Published</strong>: This
+                              shows whether the item is published. Hover over
+                         this icon to see a summary of the publishing information.
+                              Click to change state.</li>
+                    <li><strong>Order</strong>:
+                              Shows the order of Static Content Items in list.
+                         You may change it by editing 2 # conjointly and clicking
+                         on the Save Order icon next to the Column Heading Order.</li>
+                    <li><strong>Access</strong>:
+                              This is the user access level for the Menu Item.
+                         Click on the Access level to switch it to another value.</li>
+                    <li><strong>ID</strong>: This is the ID of the item in the
+                         database.</li>
+                    <li><strong>Links</strong>: This is the # of Link - Static
+                         Content Items for this item in your menus.&nbsp;</li>
+                    <li><strong>Author</strong>:
+                                   This shows the name of the author of the Static
+                              Content. Click to edit the author information.</li>
+                    <li><strong>Date</strong>:
+                                   This is the date the item was created.</li>
+               </ul>               
+               <p>You may enter text in the &quot;<strong>Filter</strong>&quot; box
+                    to refine the list based on whether the text is found in
+                    the title of any item. Type in any text and press Enter.
+                    You may also &quot;<strong>Order</strong>&quot; the list
+          by a specific ordering and/or Author.</p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New</strong>: Click the &#39;New&#39; icon
+                         to create a new Static Content Item.&nbsp;</li>
+               <li><strong>Edit</strong>:
+                         Click the &#39;Edit&#39; icon to edit the Static Content
+                         item.</li>
+               <li><strong>Publish and Unpublish</strong>: Click the &#39;Publish&#39; or &#39;Unpublish&#39; icon
+                         to publish or unpublish any number of selected Static
+                         Content Items.</li>
+               <li><strong>Trash</strong>: Click the &#39;Trash&#39; icon
+                         to put the Static Content Items in the trash bin. They
+                         are not completely removed but can&#39;t be displayed
+                         on your site. You can restore this Static Content Items
+                         in the Trash Manager.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/typedcontent.new.html 4.6rc2/help/typedcontent.new.html
--- 4.5.4/help/typedcontent.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/typedcontent.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,241 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Static Content - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title">Static Content  : Create a New Static Content Item </strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page lets createa Static Content Item.Static Content Items are not part
+                    of a section or category. They cannot be added to a blog, category
+                    or section page. The only way to display them on your site is
+               through a Menu Item link.</p>
+               <strong>Details</strong>
+               <ul>
+                    <li> <strong>Title</strong>: Type here is the title
+                         of the Static Content. This is the title as it will appear
+                    on the page when displayed.</li>
+                    <li><strong>Title Alias</strong>:
+                         This field is optional.</li>
+                    <li><strong>Text (required)</strong>:
+                              Type here the content you want to display. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><p>The Attributes Area for Static Content consists of five tabs:
+                    Publishing, Images, Parameters, Meta Info and Link to Menu.
+                    </p>
+               <p><strong>(1) Publishing</strong></p>
+               <ul>
+                    <li><strong>Published</strong>: Check
+                         the box to let the item show on your site.</li>
+                    <li><strong>Access
+                         Level</strong>: Choose who will be able to view this
+                         content. Public, registered or special.</li>
+                    <li><strong>Author Alias</strong>:
+                         You can publish the author&#39;s name for a piece of
+                         content. You can choose a Registered user as displayed
+                         through the dropdown or type any name there (an author
+                         that does not have an account or content created by
+                         many authors as a group).</li>
+                    <li><strong>Change
+                         Creator</strong>: This allows you to assign ownership
+                         of this content to another registered user.</li>
+                    <li><strong>Ordering</strong>:
+                         Select the order in which this content is listed relative
+                         to others in this Category. The choices available in
+                         the dropdown will show once changes to the item are
+                         saved or applied.</li>
+                    <li><strong>Override Created Date</strong>:
+                         This shows the created date for the content. You can
+                         change the date if necessary.</li>
+                    <li><strong>Start Publishing</strong>:
+                         Select the date when this document is to be published
+                         on the web site.</li>
+                    <li><strong>Finish
+                         Publishing</strong>: If desired, you can set the date
+                         when your content is to be expired.</li>
+                    <li><strong>Content ID</strong>:
+                         This is the ID of the content in the database.</li>
+                    <li><strong>State</strong>:
+                         This shows the current state of the document. It is
+                         not editable.</li>
+                    <li><strong>Hits</strong>:
+                         This gives the number of times this content was viewed.
+                         The &#39;Reset
+                         Hit Count&#39; button allows you to reset the counter
+                         to zero.</li>
+                    <li><strong>Revised</strong>: This shows the number
+                              of edits this content has undergone.</li>
+                    <li><strong>Created</strong>:
+                                   This is the date this Content Item was created.</li>
+                    <li><strong>By</strong>:
+                                        This is the name of the user that created
+                                        the Content Item.</li>
+                    <li><strong>Last
+                                             Modified</strong>: This is the date
+                                             when this Content Item was last
+                                             modified, if ever.</li>
+                    <li><strong>By</strong>:
+                                                  This is the name of the user
+                         that last modified this content, if ever. </li>
+               </ul>               <p><strong>(2) Images</strong></p>
+               <ul>
+                    <li><strong>Sub-folder</strong>: Choose
+                         here the sub-folder you want to get the images from. These
+                    are in images/stories/.</li>
+                    <li><strong>Gallery Images</strong>:
+                         This dropdown lists the images available in the specific
+                         sub-folder. Highlight one or multiple image name(s)
+                         and click on the &#39;Add&#39; button.The
+                         name(s) will display in the Content Images dropdown.</li>
+                    <li><strong>Content
+                         Images</strong>:The &#39;up&#39; and &#39;down&#39; buttons
+                         determine the order of images if there are more than
+                         one on this page. The images will display relative to
+                         the instances of {mosimage} tags in your content.</li>
+                    <li><strong>Edit the image
+                         selected</strong>Select an image in &#39;Content Images&#39;.</li>
+                    <li><strong>Source</strong>:
+                              Displays the default name of the image highlighted.
+                              You may edit that name.</li>
+                    <li><strong>Image Align</strong>:
+                                   Lets you choose between None, center, left
+                         or right.</li>
+                    <li><strong>Alt Text</strong>:
+                                        Lets you choose an Alt Text for the image.</li>
+                    <li><strong>Border</strong>:
+                                             Type here the number of pixels you
+                         want the border to be around the image.</li>
+                    <li><strong>Caption</strong>:
+                                                  Type here a caption for the
+                         image.</li>
+                    <li><strong>Caption Align</strong>:
+                                                       Lets you choose between
+                         None, center, left or right.</li>
+                    <li><strong>Width</strong>:
+                                                            Type here a number
+                         in pixels to override the width of the image<strong>.</strong></li>
+                    <li><strong>Apply</strong>:
+                                                            Click on this button
+                         to apply all the parameters defined for this
+                                                            image</li>
+               </ul>               <p><strong>(3) Parameters</strong></p>
+               <ul>
+                    <li><strong>Menu Image</strong>: A small image to place
+                    to the right of your Menu Item. Images must be in images/stories.</li>
+                    <li><strong>Page
+                         Title</strong>: Hides or shows the Page Title as defined
+                         in &#39;Details&#39;<strong>.</strong></li>
+                    <li><strong>Page Class Suffix</strong>:
+                         Allows you to set customized styles for this page. The
+                         suffix you type here is automatically added to the CSS
+                         classes for this page, and will have to be defined in
+                         your template&#39;s
+                         CSS style sheet for usage.</li>
+                    <li><strong>Back Button</strong>:
+                         Controls whether to show or hide a &quot;Back&quot; text
+                         link that would appear on the bottom of the page and
+                         return the user to the previously viewed page. The pull
+                         down lets select &#39;Use
+                         Global&#39; to use the parameter as defined globally
+                         through the Site-&gt;Global Configuration, &#39;Hide&#39; or &#39;Show&#39;.For
+                         each of the following seven items listed below, you
+                         can use the option selected in the Global Configuration
+                         settings (Site -&gt; Global Configuration) by selecting &#39;Use
+                         Global&#39; or
+                         you can override the Global Configuration setting by
+                         selecting &#39;Show&#39; or &#39;Hide.&#39; Overriding
+                         the settings here for items will not affect the Global
+                         Configuration settings and will not affect the settings
+                         on the rest of the site.</li>
+                    <li><strong>Item Rating</strong>:
+                         Hides or shows ratings given to home page items by your
+                         site&#39;s users.</li>
+                    <li><strong>Author
+                              Names</strong>: Hides or shows the names of authors
+                              of items.</li>
+                    <li><strong>Created
+                                   Date and Time</strong>: Hides or shows the
+                                   date and time that items were created.</li>
+                    <li><strong>Modified Date and
+                                        Time</strong>:
+                                        Hides or shows the date and time that
+                                        items were last modified.</li>
+                    <li><strong>PDF
+                                             Icon</strong>: Hides or shows the
+                                             icon and link to the PDF version
+                                             of items.</li>
+                    <li><strong>Print Icon</strong>:
+                                                  Hides or shows the icon and
+                         link to the printer-friendly format of
+                                                  items.</li>
+                    <li><strong>Email
+                                                       Icon</strong>: Hides or
+                                                       shows the icon and link
+                                                       to the page that enables
+                                                       users to email items to
+                                                       others.</li>
+               </ul>               <p><strong>(4) Meta Info</strong></p>
+               <ul>
+                    <li><strong>Description</strong>:
+                         This information is inserted in the headers of your content.
+                    It is commonly used by search engines.</li>
+                    <li><strong>Keywords</strong>:
+                         These keywords are also related to the header information
+                         provided for search engines, but provide too a much
+                         more important function. These keywords drive the What&#39;s
+                         Related Module that provides automatic links to other
+                    Content Items that shares a similar keyword. </li>
+                    <li><strong>Add Sect/Cat/Title</strong>:&nbsp; Clicking
+                         on this button is a convenient way to insert the content&#39;s
+                         information into the keywords field, including the content&#39;s
+                    title, section name, and category name. </li>
+               </ul>               <p><strong>(5) Link to Menu</strong> -- This
+                    will create a &#39;Link - Static Content Item&#39; in the
+                    menu you select.NOTE: There is no other way to show this
+                    content on your site. The link may also be created through
+               the Menu Manager.</p>
+               <ul>
+                    <li><strong>Select a Menu</strong>: Highlight
+                         here one the menus defined for your site.</li>
+                    <li><strong>Menu Item
+                         Name</strong>: The name of the Menu as it will appear
+                         on your site.</li>
+                    <li><strong>Link to Menu</strong>: Click on
+                         this button to create the Menu Item.Existing Menu ItemsThis
+                         displays a list of all &#39;Link - Static Content Item&#39; Menu
+                         Items referencing this static content.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Preview</strong>: Opens a new
+                         window to preview the content as you would in the Front-end of
+                    your site.</li>
+               <li><strong>Upload</strong>: Opens a new window which lets
+                              you upload a file or an image from your computer
+                    to the images/stories folder.</li>
+               <li><strong>Save</strong>: Saves the content and returns to
+                         Manager.</li>
+               <li><strong>Apply</strong>: Saves the content and keep the
+                              content displayed to edit.</li>
+               <li><strong>Cancel</strong>:
+                                   Cancels the action. Any modification is lost.
+                    If opened to edit, the Static Content Item remains
+                                   checked-in.</li>
+          </ul></td>
+     </tr></table>
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/users.edit.html 4.6rc2/help/users.edit.html
--- 4.5.4/help/users.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/users.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Users - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title"><span class="hs_header01"><strong>User Manager : Edit Users</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This screen is used to either add a new user or edit an existing one.</p>
+          <strong>Details</strong>
+          <ul>
+               <li><strong>Name</strong>: Enter the name of the user as it will
+                    be listed in the User Manager.</li>
+               <li><strong>Username</strong>: Enter the Username to be used for
+                    login.</li>
+               <li><strong>Email</strong>: Enter the user&#39;s e-mail adress.</li>
+               <li><strong>New Password</strong>: Enter the user&#39;s password.
+                    If you want to change a user&#39;s password you can enter
+                    here the new one, and retype it on the next field.</li>
+               <li><strong>Verify Password</strong>: Enter again the user&#39;s
+                    password.</li>
+               <li><strong>Group</strong>: Choose a type of user.</li>
+               <li><strong>Block User</strong>: Enable / disable the user's ability
+                    to login.</li>
+               <li><strong>Receive Submission Emails</strong>: Enable an e-mail
+                    to be sent to the administrator when the user has submitted
+                    some content.</li>
+               <li><strong>Register Date</strong>: The date the user
+                    was registered.</li>
+               <li><strong>Last Visit Date</strong>: The date on which this user
+                    has last logged in. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li>                    <strong>Contact Information</strong>:
+                    These information is only present when editing a user and
+                    only if the contact has been created in the Contacts Component
+                    and linked to the user (Components -&gt; Contact -&gt; Manage
+                    Contacts). If this has been done the information will be
+                    displayed and a link at the bottom of the box provides a
+                    direct access to the Edit Contact page for that contact.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Save the new user and return to User
+                    Manager.</li>
+               <li><strong>Apply</strong>: Saves the new user and keeps the screen
+                    open for editing.</li>
+               <li><strong>Cancel</strong>: Cancels the action without saving
+                    changes.</li>
+               </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/users.manager.html 4.6rc2/help/users.manager.html
--- 4.5.4/help/users.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/users.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>User Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title"><span class="hs_header01"><strong>User Manager</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page shows the Users
+                    registered for your site.&nbsp;From here, you can add or edit Users.</p>               <strong>Display Columns</strong>
+               <ul>
+               <li><strong>Name</strong>: This is the real or display name of user. Click the name to edit the User&#39;s information.</li>
+               <li><span style=
+"COLOR: rgb(51,51,51)"><strong>Logged In</strong>: This shows whether the user is logged in or not.</span></li>
+               <li><span style=
+"COLOR: rgb(51,51,51)"><strong>Enabled</strong>: This shows whether the user is allowed to log in to the site. Click the icon to toggle the state of the user.&nbsp;</span></li>
+               <li><span style=
+"COLOR: rgb(51,51,51)"><strong>User ID</strong>: This is the login name of the user.&nbsp;</span></li>
+               <li><span style=
+"COLOR: rgb(51,51,51)"><strong>Group</strong>: This is the group that the user is associated with.&nbsp;</span></li>
+               <li><span style=
+"COLOR: rgb(51,51,51)"><strong>Email</strong>: This is the User&#39;s e-mail address.</span></li>
+               <li><span style=
+"COLOR: rgb(51,51,51)"><strong>Last Visit</strong>: This is the date and time
+                    that the user last logged in to the site.</span> </li>
+               </ul>
+          <p><strong>Filters</strong>: Enable you to search the list of users. </p></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>New</strong>: Click the &#39;New&#39; icon to create a new User.</li>
+               <li><strong>Edit</strong>: Click the &#39;Edit&#39; icon to edit a User&#39;s information.</li>
+               <li><strong>Delete</strong>: Click the &#39;Delete&#39; icon to delete the user from the database. You can delete more than one user at a time.</li>
+               <li><strong>Force Logout</strong>: Click the &#39;Force Logout&#39; icon to log a user out.</li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/users.new.html 4.6rc2/help/users.new.html
--- 4.5.4/help/users.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/users.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Users - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<strong class="title"><span class="hs_header01"><strong>User Manager : Add User</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This screen is used to
+                    add a new user account to your site.</p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Name</strong>: Enter the name of the user as it
+                    will be listed in the User Manager.</li>
+               <li><strong>Username</strong>: Enter the Username which will be
+                    used for login.</li>
+               <li><strong>Email</strong>: Enter the user&#39;s e-mail adress.</li>
+               <li><strong>New Password</strong>: Enter the user&#39;s password.</li>
+               <li><strong>Verify Password</strong>: Enter again the user&#39;s
+                    password.</li>
+               <li><strong>Group</strong>: Choose  a type of user.</li>
+               <li><strong>Block User</strong>: Enable / disable the user's ability
+                    to login.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Save the new user and
+                    return to User Manager.</li>
+               <li><strong>Apply</strong>: Saves the new user and keeps the screen
+                    open for editing.</li>
+               <li><strong>Cancel</strong>: Cancels the action without saving
+                    changes.</li>
+          </ul></td>
+     </tr></table>
+
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/weblinks.edit.html 4.6rc2/help/weblinks.edit.html
--- 4.5.4/help/weblinks.edit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/weblinks.edit.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Web Links - Edit</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title"><span class="hs_header01"><strong>Web Link Manager : Edit</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    edit the details for a Web Link. </p>
+               <strong>Details</strong>
+               <ul>
+                    <li><strong>Name</strong>: Enter the name of the Weblink
+                         as it will appear on your site.&nbsp;</li>
+                    <li><strong>Category</strong>: Select the desired category.&nbsp;</li>
+                    <li><strong>URL</strong>: Enter the URL address of the Web
+                         Link.&nbsp;</li>
+                    <li><strong>Description</strong>: Add a text description
+                         for the Web Link.&nbsp;</li>
+                    <li><strong>Ordering</strong>: Choose here the order of the
+                         Web Link in the specific category as it will appear
+                         on the site when displayed.&nbsp;</li>
+                    <li><strong>Approved</strong>: Determines whether Web Link
+                         is approved for publication.</li>
+                    <li><strong>Published</strong>: Set whether the item is published
+                         and viewable. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Target</strong>: Determines whether clicking on the
+                    link will open the target in the same Window (Parent Window
+                    with Browser Navigation), in a New Window with Browser Navigation
+                    or in a New Window without Browser Navigation.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves the Web Link and returns to Manager.</li>
+               <li><strong>Close</strong>: Cancels and closes without saving
+                    changes. </li>
+               </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/weblinks.manager.html 4.6rc2/help/weblinks.manager.html
--- 4.5.4/help/weblinks.manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/weblinks.manager.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Web Links Manager</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title"><span class="hs_header01"><strong>Web Link Manager</strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p align="left">Weblink Manager
+                    is the place from where you can add or administer the Web
+                    LinkItems contained in the Weblinks Component. You can create
+                    new Web Links, publish, unpublish or&nbsp;delete
+                    them fromt his screen.&nbsp;&nbsp;</p>
+               <strong>Display Columns</strong>
+               <ul>
+                    <li> <strong>Title</strong>: This is the name of the Web
+                         Link. Click the name to edit the Web Link.&nbsp;</li>
+                    <li><strong>Published</strong>: Indicates whether the link
+                         item is published. Click the icon to toggle the state.</li>
+                    <li><strong>Approved</strong>: Indicates whether the link
+                    item has been approved for publication. Click the icon to
+                         toggle the state. </li>
+                    <li><strong>Reorder</strong>: Click the arrows to move the
+                         item up or down the list to reorder.</li>
+                    <li><strong>Category</strong>: Indicate to which Weblink
+                         Category the Item has been assigned.</li>
+                    <li><strong>Hits</strong>: How many times has the link been
+                    clicked on?  </li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Publish</strong>: Click to publish any number of selected
+                    Items.</li>
+               <li><strong>Unpublish</strong>: Click to unpublish any number
+                    of selected Items.</li>
+               <li><strong>New</strong>: Click to create a new item. </li>
+               <li><strong>Edit</strong>: Select an item, then click to edit
+                    the item. </li>
+               <li><strong>Delete</strong>: Click to delete one or more items. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/help/weblinks.new.html 4.6rc2/help/weblinks.new.html
--- 4.5.4/help/weblinks.new.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/help/weblinks.new.html	2006-05-31 11:49:28.000000000 -0500
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
+<head>
+<title>Web Links - New</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+</head>
+<body><strong class="title"><span class="hs_header01"><strong>Web Link Manager : Create
+a New Weblink Item </strong></span></strong>
+<table width="100%"  border="1" cellspacing="0" cellpadding="3">
+     <tr>
+          <td width="16%" align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Purpose:</td>
+          <td width="84%" valign="top" class="data"><p>This page allow you to
+                    add a Web Link. </p>
+               <strong>Details</strong>
+          <ul>
+               <li><strong>Name</strong>: Enter the name of the Weblink as it
+                    will appear on your site.&nbsp;</li>
+               <li><strong>Category</strong>: Select the desired category.&nbsp;</li>
+               <li><strong>URL</strong>: Enter the URL address of the Web Link.&nbsp;</li>
+               <li><strong>Description</strong>: Add a text description for the Web Link.&nbsp;</li>
+               <li><strong>Ordering</strong>: Choose here the order of the Web
+                    Link in the specific category as it will appear on the site
+                    when displayed.&nbsp;</li>
+               <li><strong>Approved</strong>: Determines whether Web Link is
+                    approved for publication.</li>
+               <li><strong>Published</strong>: Set whether the item is published
+                    and viewable. </li>
+          </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Usage:</td>
+          <td valign="top" class="data">n/a</td>
+          
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Default State: </td>
+          <td valign="top" class="data">n/a</td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Parameters:</td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Target</strong>: Determines whether clicking on the
+                    link will open the target in the same Window (Parent Window
+                    with Browser Navigation), in a New Window with Browser Navigation
+                    or in a New Window without Browser Navigation.</li>
+               </ul></td>
+     </tr>
+     <tr>
+          <td align="right" valign="top" bgcolor="#EFEFEF" class="datalabel">Toolbar Icons: </td>
+          <td valign="top" class="data"><ul>
+               <li><strong>Save</strong>: Saves the Web Link and returns to Manager.</li>
+               <li><strong>Close</strong>: Cancels and closes without saving
+                    changes. </li>
+          </ul></td>
+     </tr></table>
+
+</body></html>
\ No newline at end of file
diff -ruN 4.5.4/htaccess.txt 4.6rc2/htaccess.txt
--- 4.5.4/htaccess.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/htaccess.txt	2006-02-16 15:43:38.000000000 -0600
@@ -1,8 +1,10 @@
 ##
-# @version $Id: htaccess.txt,v 1.1 2005/07/22 01:51:57 eddieajau Exp $
-# @package Mambo
-# @copyright (C) 2000 - 2005 Miro International Pty Ltd
+# @package Mambo Open Source
+# @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 # @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+#
+# Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+# that Mambo remained free Open Source software owned and managed by the community.
 # Mambo is Free Software
 ##
 
@@ -24,4 +26,6 @@
 
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*) index.php
+RewriteRule ^content/(.*) index3.php
+RewriteRule ^component/(.*) index3.php
+RewriteRule ^mos/(.*) index3.php
Binary files 4.5.4/images/M_images/atom10.gif and 4.6rc2/images/M_images/atom10.gif differ
Binary files 4.5.4/images/M_images/donate.gif and 4.6rc2/images/M_images/donate.gif differ
diff -ruN 4.5.4/includes/HTML_toolbar.php 4.6rc2/includes/HTML_toolbar.php
--- 4.5.4/includes/HTML_toolbar.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/HTML_toolbar.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,15 +1,16 @@
 <?php
 /**
-* @version $Id: HTML_toolbar.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /**
 * Utility class for the button bar
-* @package Mambo
 */
 class mosToolBar {
 
@@ -33,7 +34,7 @@
 	*/
 	function custom( $task='', $icon='', $iconOver='', $alt='', $listSelect=true ) {
 		if ($listSelect) {
-			$href = "javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to $alt');}else{submitbutton('$task')}";
+			$href = "javascript:if (document.adminForm.boxchecked.value == 0){ alert('".T_('Please make a selection from the list to') ." $alt');}else{submitbutton('$task')}";
 		} else {
 			$href = "javascript:submitbutton('$task')";
 		}
@@ -51,9 +52,12 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function addNew( $task='new', $alt=_CMN_NEW ) {
-		$image = mosAdminMenus::ImageCheck( 'new.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'new_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function addNew( $task='new', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('New');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'new.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'new_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
@@ -68,9 +72,12 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function publish( $task='publish', $alt=_CMN_PUBLISHED ) {
-		$image = mosAdminMenus::ImageCheck( 'publish.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'publish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function publish( $task='publish', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Published');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'publish.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'publish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
@@ -85,12 +92,15 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function publishList( $task='publish', $alt=_CMN_PUBLISHED ) {
-		$image = mosAdminMenus::ImageCheck( 'publish.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'publish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function publishList( $task='publish', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Published');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'publish.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'publish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to publish'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php echo T_('Please make a selection from the list to publish')?> '); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -102,9 +112,12 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function unpublish( $task='unpublish', $alt=_CMN_UNPUBLISHED ) {
-		$image = mosAdminMenus::ImageCheck( 'unpublish.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'unpublish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function unpublish( $task='unpublish', $alt=null ) {
+		if (is_null($alt)) $alt = T_('Unpublished');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'unpublish.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'unpublish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);" >
@@ -119,12 +132,15 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function unpublishList( $task='unpublish', $alt=_CMN_UNPUBLISHED ) {
-		$image = mosAdminMenus::ImageCheck( 'unpublish.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'unpublish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function unpublishList( $task='unpublish', $alt=null ) {
+		if (is_null($alt)) $alt = T_('Unpublished');
+		
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'unpublish.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'unpublish_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to unpublish'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);" >
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please make a selection from the list to unpublish') ?>'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);" >
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -136,12 +152,15 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function archiveList( $task='archive', $alt=_CMN_ARCHIVE ) {
-		$image = mosAdminMenus::ImageCheck( 'archive.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'archive_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function archiveList( $task='archive', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Archive');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'archive.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'archive_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to archive'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please make a selection from the list to archive') ?>'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -153,12 +172,15 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function unarchiveList( $task='unarchive', $alt=_CMN_UNARCHIVE ) {
-		$image = mosAdminMenus::ImageCheck( 'unarchive.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'unarchive_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function unarchiveList( $task='unarchive', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Unarchive');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'unarchive.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'unarchive_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select a news story to unarchive'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please select a news story to unarchive') ?>'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -170,12 +192,15 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editList( $task='edit', $alt=_E_EDIT ) {
-		$image = mosAdminMenus::ImageCheck( 'html.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'html_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function editList( $task='edit', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Edit');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'html.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'html_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please select an item from the list to edit') ?>'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -187,12 +212,14 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editHtml( $task='edit_source', $alt=_CMN_EDIT_HTML ) {
-		$image = mosAdminMenus::ImageCheck( 'html.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'html_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function editHtml( $task='edit_source', $alt=null ) {
+	    if (is_null($alt)) $alt =  T_('Edit HTML');
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'html.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'html_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please select an item from the list to edit') ?>'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -204,12 +231,14 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function editCss( $task='edit_css', $alt=_CMN_EDIT_CSS ) {
-		$image = mosAdminMenus::ImageCheck( 'css.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'css_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function editCss( $task='edit_css', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Edit CSS');
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'css.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'css_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please select an item from the list to edit'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please select an item from the list to edit') ?>'); } else {submitbutton('<?php echo $task;?>', '');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -222,12 +251,15 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function deleteList( $msg='', $task='remove', $alt=_CMN_DELETE ) {
-		$image = mosAdminMenus::ImageCheck( 'delete.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'delete_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function deleteList( $msg='', $task='remove', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Delete');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'delete.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'delete_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
-		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('Please make a selection from the list to delete'); } else if (confirm('Are you sure you want to delete selected items. <?php echo $msg;?>')){ submitbutton('<?php echo $task;?>');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
+		<a href="javascript:if (document.adminForm.boxchecked.value == 0){ alert('<?php T_('Please make a selection from the list to delete') ?>'); } else if (confirm('<?php T_('Are you sure you want to delete selected items?') ?> <?php echo $msg;?>')){ submitbutton('<?php echo $task;?>');}" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2; ?>',1);">
 		<?php echo $image; ?>
 		</a>
 		</td>
@@ -243,8 +275,8 @@
 		$sql = "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'";
 		$database->setQuery( $sql );
 		$cur_template = $database->loadResult();
-		$image = mosAdminMenus::ImageCheck( 'preview.png', 'images/', NULL, NULL, 'Preview', 'preview' );
-		$image2 = mosAdminMenus::ImageCheck( 'preview_f2.png', 'images/', NULL, NULL, 'Preview', 'preview', 0 );
+		$image = mosAdminMenus::ImageCheck( 'preview.png', 'images/', NULL, NULL, T_('Preview'), 'preview' );
+		$image2 = mosAdminMenus::ImageCheck( 'preview_f2.png', 'images/', NULL, NULL, T_('Preview'), 'preview', 0 );
 		?>
 		<td width="25" align="center">
 		<a href="#" onclick="window.open('popups/<?php echo $popup;?>.php?t=<?php echo $cur_template; ?>', 'win1', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('preview','','<?php echo $image2; ?>',1);">
@@ -259,9 +291,12 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function save( $task='save', $alt=_CMN_SAVE ) {
-		$image = mosAdminMenus::ImageCheck( 'save.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'save_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function save( $task='save', $alt=null ) {
+	    if (is_null($alt)) $alt = T_('Save');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'save.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'save_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2;?>',1);">
@@ -275,8 +310,8 @@
 	* Writes a save button for a given option (NOTE this is being deprecated)
 	*/
 	function savenew() {
-		$image = mosAdminMenus::ImageCheck( 'save.png', '/images/', NULL, NULL, 'save', 'save' );
-		$image2 = mosAdminMenus::ImageCheck( 'save_f2.png', '/images/', NULL, NULL, 'save', 'save', 0 );
+		$image = mosAdminMenus::ImageCheck( 'save.png', '/images/', NULL, NULL, T_('save'), 'save' );
+		$image2 = mosAdminMenus::ImageCheck( 'save_f2.png', '/images/', NULL, NULL, T_('save'), 'save', 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('savenew');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('save','','<?php echo $image2;?>',1);">
@@ -290,8 +325,8 @@
 	* Writes a save button for a given option (NOTE this is being deprecated)
 	*/
 	function saveedit() {
-		$image = mosAdminMenus::ImageCheck( 'save.png', '/images/', NULL, NULL, 'save', 'save' );
-		$image2 = mosAdminMenus::ImageCheck( 'save_f2.png', '/images/', NULL, NULL, 'save', 'save', 0 );
+		$image = mosAdminMenus::ImageCheck( 'save.png', '/images/', NULL, NULL, T_('save'), 'save' );
+		$image2 = mosAdminMenus::ImageCheck( 'save_f2.png', '/images/', NULL, NULL, T_('save'), 'save', 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('saveedit');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('save','','<?php echo $image2;?>',1);">
@@ -306,9 +341,12 @@
 	* @param string An override for the task
 	* @param string An override for the alt text
 	*/
-	function cancel( $task='cancel', $alt=_CMN_CANCEL ) {
-		$image = mosAdminMenus::ImageCheck( 'cancel.png', '/images/', NULL, NULL, $alt, $task );
-		$image2 = mosAdminMenus::ImageCheck( 'cancel_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
+	function cancel( $task='cancel', $alt=null ) {
+		if (is_null($alt)) $alt = T_('Cancel');
+	    
+		$mainframe =& mosMainFrame::getInstance();
+		$image = $mainframe->ImageCheck( 'cancel.png', '/images/', NULL, NULL, $alt, $task );
+		$image2 = $mainframe->ImageCheck( 'cancel_f2.png', '/images/', NULL, NULL, $alt, $task, 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:submitbutton('<?php echo $task;?>');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('<?php echo $task;?>','','<?php echo $image2;?>',1);">
@@ -323,8 +361,8 @@
 	* any other operation
 	*/
 	function back() {
-		$image = mosAdminMenus::ImageCheck( 'back.png', '/images/', NULL, NULL, 'back', 'cancel' );
-		$image2 = mosAdminMenus::ImageCheck( 'back_f2.png', '/images/', NULL, NULL, 'back', 'cancel', 0 );
+		$image = mosAdminMenus::ImageCheck( 'back.png', '/images/', NULL, NULL, T_('back'), 'cancel' );
+		$image2 = mosAdminMenus::ImageCheck( 'back_f2.png', '/images/', NULL, NULL, T_('back'), 'cancel', 0 );
 		?>
 		<td width="25" align="center">
 		<a href="javascript:window.history.back();" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('cancel','','images/<?php echo $image2;?>',1);">
@@ -338,7 +376,7 @@
 	* Write a divider between menu buttons
 	*/
 	function divider() {
-		$image = mosAdminMenus::ImageCheck( 'menu_divider.png', '/images/' );
+		$image = $mainframe->ImageCheck( 'menu_divider.png', '/images/' );
 		?>
 		<td width="25" align="center">
 		<?php echo $image; ?>
@@ -351,8 +389,8 @@
 	* @param string The sub-drectory to upload the media to
 	*/
 	function media_manager( $directory = '' ) {
-		$image = mosAdminMenus::ImageCheck( 'upload.png', '/images/', NULL, NULL, 'Upload Image', 'uploadPic' );
-		$image2 = mosAdminMenus::ImageCheck( 'upload_f2.png', '/images/', NULL, NULL, 'Upload Image', 'uploadPic', 0 );
+		$image = mosAdminMenus::ImageCheck( 'upload.png', '/images/', NULL, NULL, T_('Upload Image'), 'uploadPic' );
+		$image2 = mosAdminMenus::ImageCheck( 'upload_f2.png', '/images/', NULL, NULL, T_('Upload Image'), 'uploadPic', 0 );
 		?>
 		<td width="25" align="center">
 		<a href="#" onclick="popupWindow('popups/uploadimage.php?directory=<?php echo $directory; ?>','win1',250,100,'no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('uploadPic','','<?php echo $image2; ?>',1);">
@@ -389,4 +427,4 @@
 		<?php
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/includes/PEAR/index.html 4.6rc2/includes/PEAR/index.html
--- 4.5.4/includes/PEAR/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/PEAR/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/includes/agent_browser.php 4.6rc2/includes/agent_browser.php
--- 4.5.4/includes/agent_browser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/agent_browser.php	2006-02-21 17:07:58.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: agent_browser.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -356,4 +358,5 @@
 // Netscape family
 // Gecko except Netscape (Mozilla, Firebird (was Phoenix), Galeon, AmiZilla, Dino, and few others)
 // Opera (Opera 6/7)
-// KHTML (Konqueror, Safari)
\ No newline at end of file
+// KHTML (Konqueror, Safari)
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/agent_os.php 4.6rc2/includes/agent_os.php
--- 4.5.4/includes/agent_os.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/agent_os.php	2006-02-21 17:08:14.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: agent_os.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -75,4 +77,5 @@
 "openbsd"=>"OpenBSD",
 "gnu"=>"GNU/Linux",
 "unix"=>"Unknown Unix system"
-);
\ No newline at end of file
+);
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/authenticator.php 4.6rc2/includes/authenticator.php
--- 4.5.4/includes/authenticator.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/authenticator.php	2006-03-22 12:41:29.000000000 -0600
@@ -0,0 +1,210 @@
+<?php
+
+class mamboAuthenticator {
+	
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) {
+			$instance =& new mamboAuthenticator();
+		}
+		return $instance;
+	}
+
+	/**
+	* Login management function
+	*
+	* The current session is passed.
+	* Username and encoded password is authenticated.
+	* A successful authentication updates the current session record with
+	* the users details.
+	*/
+	function loginUser ($username=null, $passwd=null, $remember=null) {
+		$mambothandler =& mosMambotHandler::getInstance();
+		$mambothandler->loadBotGroup('authenticator');
+		$session =& mosSession::getCurrent();
+		$database =& mamboDatabase::getInstance();
+		if (!$username OR !$passwd) {
+			$username = mosGetParam($_REQUEST, 'username', '');
+			$passwd = mosGetParam($_REQUEST, 'passwd', '' );
+			$bypost = 1;
+		}
+		else $bypost = 0;
+		if ($remember === null) $remember = mosGetParam($_REQUEST, 'remember', '');
+
+		if (!$username OR !$passwd) {
+			echo "<script> alert(\"".T_('Please complete the username and password fields.')."\"); window.history.go(-1); </script>\n";
+			exit();
+		} else {
+			$username = $database->getEscaped($username);
+			$loginfo =& new mosLoginDetails($username, $passwd, $remember);
+			$checkuser = true;
+			$logresults = $mambothandler->trigger('requiredLogin',array($loginfo));
+			if (count($logresults) == 0) $logresults[] = T_('Logins are not permitted.  There is no authentication check active.');
+			foreach ($logresults as $message) {
+				if ($message) $checkuser = false;
+				break;
+			}
+			if ($checkuser) {
+				$mambothandler->trigger('goodLogin', array($loginfo));
+				return;
+			}
+			$mambothandler->trigger('badLogin', array($loginfo));
+			if (isset($bypost)) echo "<script>alert(\"".$message."\"); window.history.go(-1); </script>\n";
+			@session_destroy();
+		}
+	}
+	
+	/**
+	* User authentication function
+	*
+	* Username and encoded password are checked against the database.
+	*/
+	function authenticateUser (&$message, $username, $passwd, $remember=null, $session=null) {
+		$message = '';
+		if ($session === null) $session =& mosSession::getCurrent();
+		$database =& mamboDatabase::getInstance();
+		$database->setQuery( "SELECT id, gid, block, usertype"
+		. "\nFROM #__users"
+		. "\nWHERE username='$username' AND password='$passwd'"
+		);
+		if ($database->loadObject($row)) {
+			if ($row->block) {
+				$message = T_('Your login has been blocked. Please contact the administrator.');
+				return false;
+			}
+			// fudge the group stuff
+//			$grp = $acl->getAroGroup( $row->id );
+//			if ($acl->is_group_child_of( $grp->name, 'Registered', 'ARO' ) ||
+//			$acl->is_group_child_of( $grp->name, 'Public Backend', 'ARO' )) {
+			// fudge Authors, Editors, Publishers and Super Administrators into the Special Group
+//			$row->usertype = $grp->name;
+			$session->guest = 0;
+			$session->username = $username;
+			$session->userid = $row->id;
+			$session->usertype = $row->usertype;
+			if ($row->usertype == 'Registered') $session->gid = 1;
+			else $session->gid = 2;
+			$session->gid = intval( $row->gid ); # what is going on here???
+			$session->update();
+			$currentDate = date("Y-m-d\TH:i:s");
+			$query = "UPDATE #__users SET lastvisitDate='$currentDate' where id='$session->userid'";
+			$database->setQuery($query);
+			if (!$database->query()) {
+				die($database->stderr(true));
+			}
+			if ($remember=="yes") {
+				$lifetime = time() + 365*24*60*60;
+				setcookie("usercookie[username]", $username, $lifetime, "/");
+				setcookie("usercookie[password]", $passwd, $lifetime, "/");
+			}
+			//mosCache::cleanCache('com_content');
+			mosCache::cleanCache();
+		} else {
+			$message = T_('Incorrect username or password. Please try again.');
+			$this->clearSession($session);
+			return false;
+		}
+		return true;
+	}
+
+	function clearSession ($session=null) {
+		if ($session === null) $session =& mosSession::getCurrent();
+		//mosCache::cleanCache('com_content');
+		mosCache::cleanCache();
+		$session->guest = 1;
+		$session->username = '';
+		$session->userid = '';
+		$session->usertype = '';
+		$session->gid = 0;
+		$session->update();
+		// this is daggy??
+		$lifetime = time() - 1800;
+		setcookie( "usercookie[username]", " ", $lifetime, "/" );
+		setcookie( "usercookie[password]", " ", $lifetime, "/" );
+		setcookie( "usercookie", " ", $lifetime, "/" );
+        @session_destroy();
+	}
+
+	/**
+	* User logout
+	*
+	* Reverts the current session record back to 'anonymous' parameters
+	*/
+	function logoutUser () {
+		$session =& mosSession::getCurrent();
+		if ($session) {
+			$mambothandler =& mosMambotHandler::getInstance();
+			$mambothandler->loadBotGroup('authenticator');
+			$loginfo = new mosLoginDetails($session->username);
+			$mambothandler->trigger('beforeLogout', array($loginfo));
+			$this->clearSession($session);
+		}
+	}
+
+	function &loginAdmin ($acl) {
+		$database =& mamboDatabase::getInstance();
+		/** escape and trim to minimise injection of malicious sql */
+		$usrname 	= $database->getEscaped(mosGetParam($_POST, 'usrname', ''));
+		$pass 		= $database->getEscaped(mosGetParam($_POST, 'pass', ''));
+
+		$my = null;
+		if (!$pass) echo "<script>alert('".T_('Please enter a password')."'); document.location.href='index.php';</script>\n";
+		else $pass = md5( $pass );
+
+		$admintypes = array ('administrator', 'superadministrator', 'super administrator');
+		$admins = 0;
+		$query = "SELECT u.*, a.lft as grp FROM #__users AS u, #__core_acl_aro_groups AS a"
+		. "\n WHERE ( LOWER( usertype ) = 'administrator'"
+		. "\n OR LOWER( usertype ) = 'superadministrator'"
+		. "\n OR LOWER( usertype ) = 'super administrator'"
+		. "\n OR (username='$usrname' AND block=0)) AND a.name = u.usertype"
+		;
+		$users = $database->doSQLget( $query, 'mosUser' );
+		foreach ($users as $key=>$oneuser) {
+			if (in_array(strtolower($oneuser->usertype),$admintypes)) $admins++;
+			if ($oneuser->username == $usrname) $my =& $users[$key];
+		}
+		if ($admins == 0) echo "<script>alert(\"".T_('You cannot login. There are no administrators set up.')."\"); window.history.go(-1); </script>\n";
+		/** find the user group (or groups in the future) */
+		elseif (isset($my)) {
+			if (strcmp( $my->password, $pass )
+			OR !$acl->acl_check( 'administration', 'login', 'users', $my->usertype )) {
+				echo "<script>alert('".T_('Incorrect Username, Password, or Access Level.  Please try again')."'); document.location.href='index.php';</script>\n";
+				return;
+			}
+			$logintime 	= time();
+			$session_id = md5( "$my->id$my->username$my->usertype$logintime" );
+			$query = "INSERT INTO #__session"
+			. "\nSET time='$logintime', session_id='$session_id', "
+			. "userid='$my->id', usertype='$my->usertype', username='$my->username', guest=-1"
+			;
+			$database->setQuery( $query );
+			if (!$database->query()) {
+				echo $database->stderr();
+			}
+			$_SESSION['session_id'] 		= $session_id;
+			$_SESSION['session_user_id'] 	= $my->id;
+			$_SESSION['session_username'] 	= $my->username;
+			$_SESSION['session_usertype'] 	= $my->usertype;
+			$_SESSION['session_gid'] 		= $my->gid;
+			$_SESSION['session_grp']        = $my->grp;
+			$_SESSION['session_logintime'] 	= $logintime;
+			$_SESSION['session_userstate'] 	= array();
+		}
+		return $my;
+	}
+	
+	/**
+	* Random password generator
+	* @return password
+	*/
+	function mosMakePassword() {
+		$salt = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+		$len = strlen($salt);
+		$makepass="";
+		mt_srand(10000000*(double)microtime());
+		for ($i = 0; $i < 8; $i++)
+		$makepass .= $salt[mt_rand(0,$len - 1)];
+		return $makepass;
+	}
+}
diff -ruN 4.5.4/includes/cmtclasses.php 4.6rc2/includes/cmtclasses.php
--- 4.5.4/includes/cmtclasses.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/cmtclasses.php	2006-04-11 09:36:50.000000000 -0500
@@ -0,0 +1,552 @@
+<?php
+/**
+* Component handler class
+* @package Mambo
+*/
+class mosComponentHandler {
+	var $_buffer = '';
+	
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) $instance = new mosComponentHandler();
+		return $instance;
+	}
+	
+	function &getParamsByName ($name) {
+		$params = null;
+		$row = new mosComponent();
+		$query = "SELECT a.params, a.option"
+		. "\n FROM #__components AS a"
+		. "\n WHERE a.name = '$name'"
+		;
+		$database =& mamboDatabase::getInstance();
+		$database->setQuery( $query );
+		// load the row from the db table
+		if ($database->loadObject($row)) {
+			// get params definitions
+			$mainframe =& mosMainFrame::getInstance();
+			$params =& new mosParameters( $row->params);
+		}
+		return $params;
+	}
+
+	function mosMainBody() {
+		// message passed via the url
+		$mosmsg = mosGetParam($_REQUEST, 'mosmsg', '');
+		if ($mosmsg) {
+			if (!get_magic_quotes_gpc()) $mosmsg = addslashes( $mosmsg );
+			echo "\n<div class=\"message\">$mosmsg</div>";
+		}
+		echo $this->_buffer;
+//      Alternative if "popmessages" - apparently never implemented
+//		echo "\n<script language=\"javascript\">alert('$mosmsg');</script>";
+	}
+	
+	function startBuffer () {
+		$this->_buffer = '';
+		ob_start();
+	}
+	
+	function endBuffer () {
+		$this->_buffer = ob_get_contents();
+		ob_end_clean();
+	}
+	
+}
+/**
+* Component database table class
+* @package Mambo
+*/
+class mosComponent extends mosDBTable {
+	/** @var int Primary key */
+	var $id=null;
+	/** @var string */
+	var $name=null;
+	/** @var string */
+	var $link=null;
+	/** @var int */
+	var $menuid=null;
+	/** @var int */
+	var $parent=null;
+	/** @var string */
+	var $admin_menu_link=null;
+	/** @var string */
+	var $admin_menu_alt=null;
+	/** @var string */
+	var $option=null;
+	/** @var string */
+	var $ordering=null;
+	/** @var string */
+	var $admin_menu_img=null;
+	/** @var int */
+	var $iscore=null;
+	/** @var string */
+	var $params=null;
+
+	/**
+	* @param database A database connector object
+	*/
+	function mosComponent() {
+		$db = mamboDatabase::getInstance();
+		$this->mosDBTable( '#__components', 'id', $db );
+	}
+}
+/**
+* Component common base class for both user and admin sides
+* @package Mambo
+*/
+class mosComponentManager {
+	var $plugin_name = '';
+	var $magic_quotes_value = 0;
+	var $plugin_version = '';
+	var $option = '';
+	
+	function mosComponentManager ($component_name, $version) {
+		$this->text_name = $component_name;
+		$this->plugin_name = strtolower(str_replace(' ', '', $component_name));
+		$this->plugin_version = $version;
+		$this->option = mamboCore::get('option');
+		$this->noMagicQuotes();
+		$cname = 'com_'.$this->plugin_name;
+		$mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+		if(file_exists($mosConfig_absolute_path."/components/$cname/language/".mamboCore::get('mosConfig_lang').'.php')) require_once($mosConfig_absolute_path."/components/$cname/language/".mamboCore::get('mosConfig_lang').'.php');
+		else if (file_exists($mosConfig_absolute_path."/components/$cname/language/english.php")) require_once($mosConfig_absolute_path."/components/$cname/language/english.php");
+
+	}
+
+	function noMagicQuotes () {
+		// Is magic quotes on?
+		if (get_magic_quotes_gpc()) {
+			// Yes? Strip the added slashes
+			$_REQUEST =& $this->remove_magic_quotes($_REQUEST);
+			$_GET =& $this->remove_magic_quotes($_GET);
+			$_POST =& $this->remove_magic_quotes($_POST);
+		}
+		$this->magic_quotes_value = set_magic_quotes_runtime(0);
+	}
+
+	function &remove_magic_quotes ($array) {
+		foreach ($array as $k => $v) {
+			if (is_array($v)) $array[$k] = $this->remove_magic_quotes($v);
+			else $array[$k] = stripslashes($v);
+		}
+		return $array;
+	}
+
+	function restore_magic_quotes () {
+		set_magic_quotes_runtime($this->magic_quotes_value);
+	}
+
+	function checkCallable (&$object, $method) {
+		if (is_callable(array(&$object, $method))) return true;
+		$name = get_class($object);
+		trigger_error (sprintf(T_('Component %s error: attempt to use non-existent class %s in %s'), $this->plugin_name, $method, $name));
+		return false;
+	}
+
+}
+/**
+* Component base logic for user side
+* @package Mambo
+*/
+class mosComponentUserManager extends mosComponentManager {
+
+	function mosComponentUserManager ($component_name, $control_name, $alternatives, $default, $title, $version) {
+		mosComponentManager::mosComponentManager($component_name, $version);
+		$mainframe =& mosMainFrame::getInstance();
+		$mainframe->SetPageTitle($title);
+		$func = mosGetParam ($_REQUEST, $control_name, $default);
+		if (isset($alternatives[$func])) $method = $alternatives[$func];
+		else $method = $func;
+		$classname = $this->plugin_name.'_'.$method.'_Controller';
+		if (class_exists($classname)) {
+			$controller =& new $classname($this);
+			if (is_callable(array(&$controller,$method))) $controller->$method($func);
+			else trigger_error (sprintf(T_('Component %s error: attempt to use non-existent method %s in %s'), $this->plugin_name, $method, $controller));
+		}
+		else trigger_error(sprintf(T_('Component %s error: attempt to use non-existent class %s'), $this->plugin_name, $classname));
+		$this->restore_magic_quotes();
+	}
+
+	function newHTMLClassCheck ($name, &$controller, $total_items, $clist) {
+		if (class_exists($name)) return new $name ($controller, $this->limit, $clist);
+		trigger_error(sprintf(T_('Component %s error: attempt to use non-existent class %s'), $this->plugin_name, $name));
+		return false;
+	}
+
+}
+/**
+* Component base logic for admin side
+* @package Mambo
+*/
+class mosComponentAdminManager extends mosComponentManager {
+	var $act = '';
+	var $task = '';
+	var $limitstart = 0;
+	var $limit = 0;
+	var $cfid = 0;
+	var $order = 0;
+	var $currid = 0;
+
+	function mosComponentAdminManager ($component_name, $version) {
+		mosComponentManager::mosComponentManager($component_name, $version);
+		$this->act = mosGetParam ($_REQUEST, 'act', $this->plugin_name);
+		$this->task = mosGetParam($_REQUEST, 'task', 'list');
+		$mainframe = mosMainFrame::getInstance();
+		$default_limit  = $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', 20 );
+		$this->limit = intval( mosGetParam( $_REQUEST, 'limit', $default_limit ) );
+		$this->limitstart = mosGetParam($_REQUEST, 'limitstart', 0 );
+		$this->cfid = mosGetParam($_REQUEST, 'cfid', array(0));
+		if (is_array($this->cfid)) foreach ($this->cfid as $i=>$id) $this->cfid[$i] = intval($id);
+		$this->order= mosGetParam($_REQUEST, 'order', array());
+		if (is_array( $this->cfid )) $this->currid=intval($this->cfid[0]);
+		else $this->currid=intval($this->cfid);
+		$name = $this->getAction();
+		if (class_exists($name)) {
+			$controller =& new $name($this);
+			$task = $this->task.'Task';
+			if (is_callable(array(&$controller, 'getRequestData'))) $controller->getRequestData();
+			if (is_callable(array(&$controller,$task))) $controller->$task();
+			else trigger_error(sprintf(T_('MOS error in %s: method %s not found in class %s'), $this->plugin_name, $task, $name));
+		}
+		else trigger_error(sprintf(T_('MOS error in %s: class not found %s'), $this->plugin_name, $name));
+		$this->restore_magic_quotes();
+	}
+
+	function check_selection ($text) {
+		if (!is_array($this->cfid) OR count( $this->cfid ) < 1) {
+			echo "<script> alert('".$text."'); window.history.go(-1);</script>\n";
+			exit;
+		}
+	}
+
+	function getAction () {
+		$actname = strtoupper(substr($this->act,0,1)).strtolower(substr($this->act,1));
+		return strtolower($this->plugin_name).'Admin'.$actname;
+	}
+
+	function newHTMLClassCheck ($name, &$controller, $total_items, $clist) {
+		$controller->makePageNav($this, $total_items);
+		if (class_exists($name)) return new $name ($controller, $this->limit, $clist);
+		trigger_error(sprintf(T_('Component %s error: attempt to use non-existent class %s'), $this->plugin_name, $name));
+		return false;
+	}
+
+}
+/**
+* Component base class for admin side component controller logic
+* @package Mambo
+*/
+class mosComponentAdminControllers {
+	var $admin = '';
+	var $user = '';
+	var $pageNav = '';
+	var $rootPath = '';
+	var $language = '';
+
+	function mosComponentAdminControllers ($admin) {
+		$this->admin = $admin;
+		$this->user = mamboCore::get('currentUser');
+		$this->rootPath = mamboCore::get('mosConfig_absolute_path');
+		$this->language = mamboCore::get('mosConfig_lang');
+	}
+
+	function makePageNav (&$admin, $total) {
+		require_once(mamboCore::get('mosConfig_absolute_path').'/administrator/includes/pageNavigation.php');
+		$this->pageNav =& new mosPageNav( $total, $admin->limitstart, $admin->limit );
+	}
+
+}
+
+/**
+* Template Table Class
+*
+* Provides access to the mos_templates table
+* @package Mambo
+*/
+class mosTemplate extends mosDBTable {
+	/** @var int */
+	var $id=null;
+	/** @var string */
+	var $cur_template=null;
+	/** @var int */
+	var $col_main=null;
+
+	/**
+	* @param database A database connector object
+	*/
+	function mosTemplate( &$database ) {
+		$this->mosDBTable( '#__templates', 'id', $database );
+	}
+}
+
+/**
+* Class mosMambot
+* @package Mambo
+*/
+class mosMambot extends mosDBTable {
+	/** @var int */
+	var $id=null;
+	/** @var varchar */
+	var $name=null;
+	/** @var varchar */
+	var $element=null;
+	/** @var varchar */
+	var $folder=null;
+	/** @var tinyint unsigned */
+	var $access=null;
+	/** @var int */
+	var $ordering=null;
+	/** @var tinyint */
+	var $published=null;
+	/** @var tinyint */
+	var $iscore=null;
+	/** @var tinyint */
+	var $client_id=null;
+	/** @var int unsigned */
+	var $checked_out=null;
+	/** @var datetime */
+	var $checked_out_time=null;
+	/** @var text */
+	var $params=null;
+
+	function mosMambot( &$db ) {
+		$this->mosDBTable( '#__mambots', 'id', $db );
+	}
+}
+
+class mosModuleHandler {
+	var $_db = null;
+	var $_modules = null;
+	var $_unpublished = null;
+	var $_isAdmin = null;
+
+	function mosModuleHandler () {
+		$this->_db =& mamboDatabase::getInstance();
+	}
+
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) $instance = new mosModuleHandler();
+		return $instance;
+	}
+
+	/**
+	* Cache some modules information
+	* @return array
+	*/
+	function initModules($isAdmin=false) {
+		if (!isset($this->_modules) OR $isAdmin != $this->_isAdmin) {
+			$this->_isAdmin = $isAdmin;
+			if ($isAdmin) {
+				$query = "SELECT id, title, module, position, content, showtitle, params, published"
+				. "\n FROM #__modules AS m"
+				. "\n WHERE m.published = '1'"
+				. "\n AND (m.client_id = 1)"
+				. "\n ORDER BY m.ordering";
+			}
+			else {
+				$my = mamboCore::get('currentUser');
+				$Itemid = mamboCore::get('Itemid');
+				$query = "SELECT id, title, module, position, content, showtitle, params, published"
+				."\nFROM #__modules AS m, #__modules_menu AS mm"
+				. "\nWHERE m.access <= '$my->gid' AND m.client_id='0'"
+				. "\nAND mm.moduleid=m.id"
+				. "\nAND (mm.menuid = '$Itemid' OR mm.menuid = '0')"
+				. "\nORDER BY ordering";
+			}
+			$this->_db->setQuery( $query );
+			$modules = $this->_db->loadObjectList();
+			foreach ($modules as $module) {
+				if ($module->published == 1) $this->_modules[$module->position][] = $module;
+				else $this->_unpublished[] = $module;
+			}
+		}
+	}
+	/**
+	* @param string THe template position
+	*/
+	function mosCountModules( $position='left', $isAdmin=false ) {
+		$this->initModules($isAdmin);
+		return isset($this->_modules[$position]) ? count($this->_modules[$position]) : 0;
+	}
+
+	/**
+	* @param string Name of module required
+	*/
+	function &getByName( $name, $isAdmin=false, $unpublished=false ) {
+		$this->initModules($isAdmin);
+		$modules = array();
+		foreach ($this->_modules as $position) {
+			foreach ($position as $module) if ($module->module == $name) $modules[] = $module;
+		}
+		if ($unpublished AND $this->_unpublished) foreach ($this->_unpublished as $module) if ($module->module == $name) $modules[] = $module;
+		return $modules;
+	}
+
+	/**
+	* @param string The position
+	* @param int The style.  0=normal, 1=horiz, -1=no wrapper
+	*/
+	function mosLoadModules( $position='left', $style=0, $isAdmin=false ) {
+		$Itemid = mamboCore::get('Itemid');
+		$tp = mosGetParam( $_GET, 'tp', 0 );
+		if ($tp) {
+		    echo '<div style="height:50px;background-color:#eee;margin:2px;padding:10px;border:1px solid #f00;color:#700;">';
+			echo $position;
+			echo '</div>';
+			return;
+		}
+		$style = intval($style);
+		$cache =& mosCache::getCache('com_content');
+		require_once( mamboCore::get('mosConfig_absolute_path').'/includes/frontend.html.php');
+		$this->initModules($isAdmin);
+		if (isset($this->_modules[$position] )) $modules = $this->_modules[$position];
+		else {
+			$modules = array();
+			$style = 0;
+		}
+		if ($style == 1) {
+			echo "<table cellspacing=\"1\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
+			echo "<tr>\n";
+		}
+		$prepend = ($style == 1) ? "<td valign=\"top\">\n" : '';
+		$postpend = ($style == 1) ? "</td>\n" : '';
+		$count = 1;
+		foreach ($modules as $module) {
+			$params =& new mosParameters($module->params);
+			echo $prepend;
+			if ((substr("$module->module",0,4))=="mod_") $modfunc = 'module2';
+			else $modfunc = 'module';
+			if ($params->get('cache') == 1 AND mamboCore::get('mosConfig_caching') == 1) {
+				$cache->call("modules_html::$modfunc", $module, $params, $Itemid, $style );
+			}
+			else modules_html::$modfunc($module, $params, $Itemid, $style, $count);
+			echo $postpend;
+			$count++;
+		}
+		if ($style == 1) echo "</tr>\n</table>\n";
+	}
+
+	/**
+	* Loads admin modules via module position
+	* @param string The position
+	* @param int 0 = no style, 1 = tabbed
+	*/
+	function mosLoadAdminModules( $position='left', $style=0 ) {
+		global $my, $acl;
+		$this->initModules(true);
+		$cache =& mosCache::getCache( 'com_content' );
+		if (isset($this->_modules[$position] )) $modules = $this->_modules[$position];
+		else $modules = array();
+
+		switch ($style) {
+		    case 0:
+		    default:
+				foreach ($modules as $module) {
+					$params =& new mosParameters( $module->params );
+					if ( $module->module == '' ) mosLoadCustomModule( $module, $params );
+					else mosLoadAdminModule( substr( $module->module, 4 ), $params );
+				}
+				break;
+			case 1:
+			    // Tabs
+				$tabs = new mosTabs(1);
+				$tabs->startPane( 'modules-' . $position );
+				foreach ($modules as $module) {
+					$params =& new mosParameters( $module->params );
+					$editAllComponents 	= $acl->acl_check( 'administration', 'edit', 'users', $my->usertype, 'components', 'all' );
+//				$authoriser = new mosAuthoriser($database);
+//				$editAllComponents = $authoriser->checkPermission('mosUser', $my->id, 'edit', 'editAllComponents', 0);
+				// special handling for components module
+					if ( $module->module != 'mod_components' || ( $module->module == 'mod_components' && $editAllComponents ) ) {
+						$tabs->startTab( T_($module->title), 'module' . $module->id );
+						if ( $module->module == '' ) mosLoadCustomModule( $module, $params );
+						else mosLoadAdminModule( substr( $module->module, 4 ), $params );
+						$tabs->endTab();
+					}
+				}
+				$tabs->endPane();
+				break;
+			case 2:
+			    // Div'd
+				foreach ($modules as $module) {
+					$params =& new mosParameters( $module->params );
+					echo '<div>';
+					if ( $module->module == '' ) mosLoadCustomModule( $module, $params );
+					else mosLoadAdminModule( substr( $module->module, 4 ), $params );
+					echo '</div>';
+				}
+				break;
+		}
+	}
+
+
+}
+
+/**
+* Module database table class
+* @package Mambo
+*/
+class mosModule extends mosDBTable {
+	/** @var int Primary key */
+	var $id=null;
+	/** @var string */
+	var $title=null;
+	/** @var string */
+	var $showtitle=null;
+	/** @var int */
+	var $content=null;
+	/** @var int */
+	var $ordering=null;
+	/** @var string */
+	var $position=null;
+	/** @var boolean */
+	var $checked_out=null;
+	/** @var time */
+	var $checked_out_time=null;
+	/** @var boolean */
+	var $published=null;
+	/** @var string */
+	var $module=null;
+	/** @var int */
+	var $numnews=null;
+	/** @var int */
+	var $access=null;
+	/** @var string */
+	var $params=null;
+	/** @var string */
+	var $iscore=null;
+	/** @var string */
+	var $client_id=null;
+
+	/**
+	* @param database A database connector object
+	*/
+	function mosModule( &$db ) {
+		$this->mosDBTable( '#__modules', 'id', $db );
+	}
+	// overloaded check function
+	function check() {
+		// check for valid name
+		if (trim( $this->title ) == '') {
+			$this->_error = T_('Your Module must contain a title.');
+			return false;
+		}
+
+		// limitation has been removed
+		// check for existing title
+		//$this->_db->setQuery( "SELECT id FROM #__modules"
+		//. "\nWHERE title='$this->title'"
+		//);
+		// check for module of same name
+		//$xid = intval( $this->_db->loadResult() );
+		//if ($xid && $xid != intval( $this->id )) {
+		//	$this->_error = "There is a module already with that name, please try again.";
+		//	return false;
+		//}
+		return true;
+	}
+}
+
+?>
diff -ruN 4.5.4/includes/compat.php41x.php 4.6rc2/includes/compat.php41x.php
--- 4.5.4/includes/compat.php41x.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/compat.php41x.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,12 +1,13 @@
 <?php
 /**
-* PHP 4.1.x Compatibility functions
-* @version $Id: compat.php41x.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/includes/core.classes.php 4.6rc2/includes/core.classes.php
--- 4.5.4/includes/core.classes.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/core.classes.php	2006-07-03 17:43:23.000000000 -0500
@@ -0,0 +1,2896 @@
+<?php 
+
+
+
+/**
+* Mambo basic error object
+*/
+define ('_MOS_ERROR_INFORM', 0);
+define ('_MOS_ERROR_WARN', 1);
+define ('_MOS_ERROR_SEVERE', 2);
+define ('_MOS_ERROR_FATAL', 3);
+
+/**
+ * Enter description here...
+ *
+ */
+class mosError {
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $text = '';
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $level = 0;
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $text
+     * @param unknown_type $level
+     * @return mosError
+     */
+    function mosError ($text='', $level=_MOS_ERROR_INFORM) {
+        $this->text = $text;
+        $this->level = $level;
+    }
+}
+
+/**
+* Mambo group of errors for some particular operation
+*/
+class mosErrorSet {
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $errors = array();
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $maxlevel = 0;
+
+    // Parameter is an error object
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $error
+     */
+    function addError ($error) {
+        $this->errors[] = $error;
+        if ($error->level > $this->maxlevel) $this->maxlevel = $error->level;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $text
+     * @param unknown_type $level
+     */
+    function addErrorDetails ($text='', $level=_MOS_ERROR_INFORM) {
+        $error = new mosError($text, $level);
+        $this->addError($error);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function &getErrors () {
+        return $this->errors;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function getMaxLevel () {
+        return $this->maxlevel;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function getCount () {
+        return count($this->errors);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $errorset
+     */
+    function mergeAnother ($errorset) {
+        $this->errors = array_merge($this->errors, $errorset->errors);
+    }
+
+}
+
+
+/* This is the new error handler to store errors in the database
+class mosErrorHandler {
+var $types = array (
+E_STRICT => 'Strict check',
+E_USER_WARNING => 'User Warning',
+E_USER_NOTICE => 'User Notice',
+E_WARNING => 'Warning',
+E_NOTICE => 'Notice',
+E_CORE_WARNING => 'Core Warning',
+E_COMPILE_WARNING => 'Compile Warning',
+E_USER_ERROR => 'User Error',
+E_ERROR => 'Error',
+E_PARSE => 'Parse error',
+E_CORE_ERROR => 'Core Error',
+E_COMPILE_ERROR => 'Compile Error'
+);
+
+function mosErrorHandler () {
+set_error_handler(array(&$this, 'handler'));
+}
+
+function handler ($errno, $errstr, $errfile, $errline, $errcontext) {
+if ($errno = E_STRICT) return;
+$string = $this->types[$errno].': '.$errstr.' in '.$errfile.' at '.$errline;
+$database =& mamboDatabase::getInstance();
+if (eregi('^(sql)$', $errstr)) {
+$extra = $database->getErrorMsg();
+}
+if (function_exists('debug_backtrace')) {
+foreach(debug_backtrace() as $back) {
+if (@$back['file']) {
+$extra .= "\n".$back['file'].':'.$back['line'];
+}
+}
+}
+$database->setQuery("DELETE FROM #__errors WHERE file=$errfile AND line=$errline AND number=$errno");
+$database->query();
+$database->setQuery("INSERT INTO #__errors VALUES (0, $errno, '$errfile', $errline, '$string', '$extra')");
+$database->query();
+}
+}
+*/
+
+/**
+ * Enter description here...
+ *
+ */
+class mamboCore {
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $rootPath = '';
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $Itemid = 0;
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $option = '';
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $subdirectory;
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $current_user = null;
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $do_gzip_compress = false;
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $init_errorlevel = 0;
+
+    /**
+     * Enter description here...
+     *
+     * @return mamboCore
+     */
+    function mamboCore () {
+        global $adminside;
+        $this->init_errorlevel = error_reporting(0);
+        //$this->rootPath = str_replace('\\', '/', realpath(str_replace('includes', '', dirname(__FILE__))));
+        $this->rootPath = str_replace('\\', '/',str_replace('includes', '', dirname(__FILE__)));
+        $this->checkConfig();
+        $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
+        $this->getConfig();
+        $this->fixLanguage();
+        @set_magic_quotes_runtime( 0 );
+        if (@$this->mosConfig_error_reporting > 0 OR @$this->mosConfig_error_reporting ===0) error_reporting($this->mosConfig_error_reporting);
+        else error_reporting($this->init_errorlevel);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function &getMamboCore () {
+        static $instance;
+        if (!is_object($instance)) $instance = new mamboCore();
+        return $instance;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function rootPath () {
+        //if (realpath($this->rootPath) === false) die ('Invalid program load path');
+        if (file_exists($this->rootPath) === false) die ('Invalid program load path');
+        return $this->rootPath;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $property
+     * @return unknown
+     */
+    function get ($property) {
+        $config =& mamboCore::getMamboCore();
+        if ($property == 'mosConfig_absolute_path') {
+            //if (realpath($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
+            if (file_exists($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
+            else return $config->rootPath;
+        }
+        if (isset($config->$property)) return $config->$property;
+        trigger_error("Invalid property ($property) requested from mamboCore");
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $property
+     * @return unknown
+     */
+    function is_set ($property) {
+        $config =& mamboCore::getMamboCore();
+        return isset($config->$property);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $property
+     * @param unknown_type $value
+     * @return unknown
+     */
+    function set ($property, $value) {
+        $config =& mamboCore::getMamboCore();
+        $config->$property = $value;
+        $GLOBALS[$property] = $value;
+        return $value;
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function checkConfig () {
+        // checks for configuration file, if none found loads installation page
+        if (!file_exists($this->rootPath.'/configuration.php') OR filesize($this->rootPath.'/configuration.php') < 10 ) {
+            header( 'Location: installation/index.php' );
+            exit();
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function getConfig () {
+        global $adminside;
+        $code = '';
+        $f = @fopen($this->rootPath.'/configuration.php','rb');
+        if ($f) {
+            while ($f AND !feof($f)) {
+                $line = fgets($f, 256);
+                $altered = str_replace('$', '$this->', $line);
+                if ($altered != $line) $code .= $altered;
+            }
+        }
+        else {
+            #header( 'Location: installation/index.php' );
+            exit();
+        }
+        fclose($f);
+        eval($code);
+
+
+        if (isset($_SERVER['DOCUMENT_ROOT']) AND strlen($_SERVER['DOCUMENT_ROOT'])) {
+            $docroot = str_replace('\\', '/', str_replace('\\\\', '\\', $_SERVER['DOCUMENT_ROOT']));
+        }
+        else {
+            // Find information about where execution started
+            $origin = array_pop(debug_backtrace());
+            // Find the PHP script at the start, with a fix for Windows slashes
+            $absolutepath = str_replace('\\', '/', $origin['file']);
+            $localpath = $_SERVER['PHP_SELF'];
+            $docroot = substr($absolutepath,0,strpos($absolutepath,$localpath));
+        }
+        $mamboroot = str_replace('\\', '/', rtrim($this->rootPath, '\/'));
+        $this->subdirectory = substr($mamboroot, strlen($docroot));
+
+        $scheme = isset($_SERVER['HTTP_SCHEME']) ? $_SERVER['HTTP_SCHEME'] : ((isset($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS'] != 'off')) ? 'https' : 'http');
+        if (isset($_SERVER['HTTP_HOST'])) {
+            $withport = explode(':', $_SERVER['HTTP_HOST']);
+            $servername = $withport[0];
+            if (isset($withport[1])) $port = ':'.$withport[1];
+        }
+        elseif (isset($_SERVER['SERVER_NAME'])) $servername = $_SERVER['SERVER_NAME'];
+        else trigger_error(T_('Impossible to determine the name of this server'), E_USER_ERROR);
+        if (!isset($port) AND !empty($_SERVER['SERVER_PORT'])) $port = ':'.$_SERVER['SERVER_PORT'];
+        if (isset($port)) {
+            if (($scheme == 'http' AND $port == ':80') OR ($scheme == 'https' AND $port == ':443')) $port = '';
+        }
+        else $port = '';
+        $afterscheme = '://'.$servername.$port.$this->subdirectory;
+        $this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
+        $this->mosConfig_unsecure_site = 'http'.$afterscheme;
+        $this->mosConfig_absolute_path = $this->rootPath;
+        preg_match_all('/\$this\-\>([A-Za-z_][A-Za-z0-9_]*)/', $code, $matches);
+        foreach ($matches[1] as $match) $GLOBALS[$match] = $this->$match;
+        if (!isset($this->mosConfig_register_globals)) {
+            $this->mosConfig_register_globals = 0;
+            $GLOBALS['mosConfig_register_globals'] = 0;
+        }
+
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function getFavIcon () {
+        // favourites icon
+        if (!isset($this->mosConfig_favicon)) $this->mosConfig_favicon = 'favicon.ico';
+        if (!file_exists($this->rootPath.'/images/'.$this->mosConfig_favicon)) $this->mosConfig_favicon = 'favicon.ico';
+        return $this->mosConfig_live_site.'/images/'.$this->mosConfig_favicon;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $user
+     * @param unknown_type $database
+     */
+    function offlineCheck (&$user, &$database) {
+        if ($this->mosConfig_offline OR file_exists($this->rootPath.'/installation/index.php')) {
+            require_once($this->rootPath().'/administrator/includes/admin.php');
+            session_name(md5($this->mosConfig_live_site));
+            session_start();
+            $session =& mosSession::getCurrent();
+            $my =& new mosUser();
+            $my->getSessionData();
+            if (mosSession::validate($my)) return;
+            include("$this->mosConfig_absolute_path/offline.php");
+            exit();
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function fixLanguage () {
+        require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
+        require_once($this->mosConfig_absolute_path.'/includes/phpgettext/error.php');
+        require_once($this->mosConfig_absolute_path.'/includes/mambofunc.php');
+        require_once($this->mosConfig_absolute_path.'/includes/mambolanguage.class.php');
+        #error_reporting(E_ALL)        ;
+        ##########  DEPRECATED ############
+        if (isset($this->mosConfig_lang) AND $this->mosConfig_lang);
+        else $this->set('mosConfig_lang', 'english');
+        $language_file = "$this->mosConfig_absolute_path/language/$this->mosConfig_lang.php";
+        if (file_exists($language_file)) require_once ($language_file);
+        ###################################
+
+
+        $this->mosConfig_lang = mosGetParam($_POST, 'user_lang', $this->mosConfig_lang);
+
+
+        $language =& new mamboLanguage($this->mosConfig_lang, $this->rootPath.'/language/');
+        $languages = $language->getLanguages();
+        $charset = $language->get('charset');
+        $dateformat = $language->get('dateformat');
+        $this->current_language = $language;
+        if (!defined('_ISO')) DEFINE('_ISO','charset='.$charset);
+        if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $dateformat); //Uses PHP's strftime Command Format
+        if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $dateformat);
+
+       
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function handleGlobals () {
+        $superglobals = array($_SERVER, $_ENV, $_FILES, $_COOKIE, $_POST, $_GET);
+        if (isset( $_SESSION )) array_unshift ( $superglobals , $_SESSION );
+
+        // Emulate register_globals on
+        if (!ini_get('register_globals') && $this->mosConfig_register_globals) {
+            while(list($key,$value)=each($_GET)) {
+                if (!isset($GLOBALS[$key])) $GLOBALS[$key]=$value;
+            }
+            while(list($key,$value)=each($_POST)) {
+                if (!isset($GLOBALS[$key])) $GLOBALS[$key]=$value;
+            }
+        }
+        // Emulate register_globals off
+        elseif (ini_get('register_globals') && !$this->mosConfig_register_globals) {
+            foreach ( $superglobals as $superglobal ) {
+                foreach ( $superglobal as $key => $value) {
+                    unset( $GLOBALS[$key]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function determineOptionAndItemid () {
+        $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
+        if ($option = strtolower(mosGetParam($_REQUEST, 'option')));
+        else {
+            $menuhandler =& mosMenuHandler::getInstance();
+            $menus =& $menuhandler->getByParentOrder($this->Itemid, 'mainmenu');
+            $this->Itemid = $menus[0]->id;
+            $_REQUEST['Itemid'] = $this->Itemid;
+            $link = $menus[0]->link;
+            $pos = strpos( $link, '?' );
+            if ($pos !== false) $link = substr( $link, $pos+1 ). '&Itemid='.$this->Itemid;
+            parse_str( $link, $temp );
+            /** this is a patch, need to rework when globals are handled better */
+            foreach ($temp as $k=>$v) $_GET[$k] = $v;
+            if (isset($temp['option'])) $option = $temp['option'];
+            else return '';
+        }
+        /** patch to lessen the impact on templates */
+        if ($option == 'search') $option = 'com_search';
+        // checking if we can find the Itemid thru the component
+        if ($this->Itemid === 0) {
+            if ( $option == 'com_content') {
+                require_once($this->rootPath().'/components/com_content/content.class.php');
+                $handler =& contentHandler::getInstance();
+                $this->Itemid = $handler->getItemid(mosGetParam($_REQUEST, 'id', 0 ));
+                $_REQUEST['Itemid'] = $this->Itemid;
+            }
+            else {
+                $menuhandler =& mosMenuHandler::getInstance();
+                $this->Itemid = $menuhandler->getIdLikeLink("index.php?option=$option");
+                if ($this->Itemid === 0) {
+                    $menuhandler =& mosMenuHandler::getInstance();
+                    $menus =& $menuhandler->getByParentOrder($this->Itemid, 'mainmenu');
+                }
+            }
+        }
+        return $option;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $url
+     * @param unknown_type $msg
+     */
+    function redirect ($url, $msg='') {
+        $callcheck = array('InputFilter', 'process');
+        if (!is_callable($callcheck)) require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpInputFilter/class.inputfilter.php');
+        // specific filters
+        $iFilter =& new InputFilter();
+        $url = $iFilter->process( $url );
+        $message = trim($iFilter->process($msg));
+        if ($iFilter->badAttributeValue(array('href', $url))) $url = mamboCore::get('mosConfig_live_site');
+        if ($message) {
+            if (strpos($url, '?')) $url .= '&mosmsg='.urlencode($message);
+            else $url .= '?mosmsg='.urlencode($message);
+        }
+        if (headers_sent()) echo "<script>document.location.href='$url';</script>\n";
+        else {
+            @ob_end_clean(); // clear output buffer
+            header( "Location: $url" );
+        }
+        exit();
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $text
+     */
+    function logMessage ($text) {
+        // JS Popup message
+        if (mosGetParam( $_POST, 'message', 0 )) {
+			?>
+			<script type="text/javascript">
+			<!--//
+			alert( "<?php echo $text; ?>" );
+			//-->
+			</script>
+			<?php
+        }
+        if ($return = mosGetParam( $_REQUEST, 'return', '' )) {
+            $this->redirect( $return );
+        }
+        else {
+            $this->redirect( $this->mosConfig_live_site.'/index.php' );
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function handleLogin () {
+        require_once($this->rootPath().'/includes/authenticator.php');
+        $authenticator =& mamboAuthenticator::getInstance();
+        $loggedin = $authenticator->loginUser();
+        if ($loggedin) $this->logMessage(_LOGIN_SUCCESS);
+        else mamboCore::redirect('index.php');
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function handleLogout () {
+        require_once($this->rootPath().'/includes/authenticator.php');
+        $authenticator =& mamboAuthenticator::getInstance();
+        $authenticator->logoutUser();
+        $this->logMessage(_LOGOUT_SUCCESS);
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function standardHeaders () {
+        header( 'Expires: Mon, 26 Jul 1997 05:00:00 GMT' );
+        header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
+        header( 'Cache-Control: no-store, no-cache, must-revalidate' );
+        header( 'Cache-Control: post-check=0, pre-check=0', false );
+        header( 'Pragma: no-cache' );
+        $mambothandler =& mosMambotHandler::getInstance();
+        $mambothandler->loadBotGroup('system');
+        $mambothandler->trigger('onHeaders', array($this));
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function initGzip() {
+        $this->do_gzip_compress = FALSE;
+        //zlib.output_compression and ob_gzhandler don't get along well so we'll check to make
+        //that zlib.output_compression is not enable in the php.ini before turning on ob_gzhandler
+        if ( $this->mosConfig_gzip == 1 AND (int)ini_get('zlib.output_compression') != 1 ) {
+            $phpver = phpversion();
+            $useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' );
+            $canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' );
+
+            if ( $phpver >= '4.0.4pl1' AND
+            ( strpos($useragent,'compatible') !== false ||
+            strpos($useragent,'Gecko')      !== false
+            )
+            ) {
+                if ( extension_loaded('zlib') ) {
+                    ob_start( 'ob_gzhandler' );
+                    return;
+                }
+            } else if ( $phpver > '4.0' ) {
+                if ( strpos($canZip,'gzip') !== false ) {
+                    if (extension_loaded( 'zlib' )) {
+                        $this->do_gzip_compress = TRUE;
+                        ob_start();
+                        ob_implicit_flush(0);
+
+                        header( 'Content-Encoding: gzip' );
+                        return;
+                    }
+                }
+            }
+        }
+        ob_start();
+    }
+
+    /**
+	* Perform GZIP
+	*/
+    function doGzip() {
+        if ( $this->do_gzip_compress ) {
+            /**
+			*Borrowed from php.net!
+			*/
+            $gzip_contents = ob_get_contents();
+            ob_end_clean();
+
+            $gzip_size = strlen($gzip_contents);
+            $gzip_crc = crc32($gzip_contents);
+
+            $gzip_contents = gzcompress($gzip_contents, 9);
+            $gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
+
+            echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
+            echo $gzip_contents;
+            echo pack('V', $gzip_crc);
+            echo pack('V', $gzip_size);
+        } else {
+            ob_end_flush();
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $separator
+     * @param unknown_type $field
+     * @return unknown
+     */
+    function getLastPart ($separator, $field) {
+        $parts = explode($separator, $field);
+        return $parts[count($parts)-1];
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $separator
+     * @param unknown_type $field
+     * @return unknown
+     */
+    function allButLast ($separator, $field) {
+        $lastSize = strlen(mamboCore::getLastPart($separator,$field));
+        return substr($field, 0, strlen($field)-$lastSize);
+    }
+
+}
+
+
+/**
+* Sorts an Array of objects
+*/
+class mosObjectSorter {
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $_keyname = '';
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $_direction = 0;
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $_object_array = array();
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $a
+     * @param unknown_type $k
+     * @param unknown_type $sort_direction
+     * @return mosObjectSorter
+     */
+    function mosObjectSorter (&$a, $k, $sort_direction=1) {
+        $this->_keyname = $k;
+        $this->_direction = $sort_direction;
+        $this->_object_array =& $a;
+        $this->sort();
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $a
+     * @param unknown_type $b
+     * @return unknown
+     */
+    function mosObjectCompare (&$a, &$b) {
+        $key = $this->_keyname;
+        if ($a->$key > $b->$key) return $this->_direction;
+        if ($a->$key < $b->$key) return -$this->_direction;
+        return 0;
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function sort () {
+        usort($this->_object_array, array($this,'mosObjectCompare'));
+    }
+
+}
+
+/**
+* Pathway handler
+* @package Mambo
+*/
+class mosPathway {
+    /** @var array Names for display in pathway */
+    var $_names = null;
+    /** @var array URLs for links from pathway */
+    var $_urls = null;
+
+    /**
+	* Constructor
+	*/
+    function mosPathway () {
+        $menuhandler =& mosMenuHandler::getInstance();
+        $menus =& $menuhandler->getByParentOrder(0,'mainmenu');
+        $home = $menus[0];
+        $this->_names[] = $home->name;
+        $this->_urls[] = sefRelToAbs($home->link."&Itemid=$home->id");
+    }
+
+    /**
+	* Singleton accessor
+	*/
+    function &getInstance () {
+        static $instance;
+        if (!is_object($instance)) $instance = new mosPathway();
+        return $instance;
+    }
+
+    /**
+	* Add an item to the pathway
+	*/
+    function addItem ($name, $givenurl) {
+        $last = count($this->_names) - 1;
+        if (!$name) return;
+        $url = sefRelToAbs($givenurl);
+        if ($name == $this->_names[$last] AND $url == $this->_urls[$last]) return;
+        $this->_names[$last+1] = $name;
+        $this->_urls[$last+1] = $url;
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function reduceToOne () {
+        for ($i = count($this->_names) - 1; $i > 0; $i--) {
+            unset($this->_names[$i]);
+            unset($this->_urls[$i]);
+        }
+    }
+
+    /**
+	* Make a pathway string for display
+	*/
+    function makePathway () {
+        $last = count($this->_names) - 1;
+        if ($last == 0) return '';
+        $mainframe =& mosMainFrame::getInstance();
+        $result = "<span class='pathway'>";
+        $config =& mamboCore::getMamboCore();
+        $rootpath = $config->rootPath();
+        $imgPath =  'templates/'.$mainframe->getTemplate().'/images/arrow.png';
+        if (file_exists( "$rootpath/$imgPath" )) $img = "<img src='$config->mosConfig_live_site/$imgPath' border='0' alt='arrow' />";
+        else {
+            $imgPath = '/images/M_images/arrow.png';
+            if (file_exists( "$rootpath/$imgPath" )) $img = "<img src='$config->mosConfig_live_site/images/M_images/arrow.png' alt='arrow' />";
+            else $img = '&gt;';
+        }
+        foreach ($this->_names as $i=>$name) {
+            if ($i === $last) $result .= "$name</span>";
+            else {
+                $sefurl = sefRelToAbs($this->_urls[$i]);
+                $result .= "<a href='$sefurl' class='pathway'>$name</a>";
+                $result .= "&nbsp;$img&nbsp;";
+            }
+        }
+        $customs = $mainframe->getCustomPathWay();
+        foreach ($customs as $custom) $result .= $custom;
+        $result .= '</span>';
+        return $result;
+    }
+
+}
+
+/**
+* Module database table class
+* @package Mambo
+*/
+class mosMenu extends mosDBTable {
+    /** @var int Primary key */
+    var $id=null;
+    /** @var string */
+    var $menutype=null;
+    /** @var string */
+    var $name=null;
+    /** @var string */
+    var $link=null;
+    /** @var int */
+    var $type=null;
+    /** @var int */
+    var $published=null;
+    /** @var int */
+    var $componentid=null;
+    /** @var int */
+    var $parent=null;
+    /** @var int */
+    var $sublevel=null;
+    /** @var int */
+    var $ordering=null;
+    /** @var boolean */
+    var $checked_out=null;
+    /** @var datetime */
+    var $checked_out_time=null;
+    /** @var boolean */
+    var $pollid=null;
+
+    /** @var string */
+    var $browserNav=null;
+    /** @var int */
+    var $access=null;
+    /** @var int */
+    var $utaccess=null;
+    /** @var string */
+    var $params=null;
+
+    /**
+	* @param database A database connector object
+	*/
+    function mosMenu() {
+        $db =& mamboDatabase::getInstance();
+        $this->mosDBTable( '#__menu', 'id', $db );
+    }
+    /**
+	*	binds an array/hash to this object
+	*	@param int $oid optional argument, if not specifed then the value of current key is used
+	*	@return any result from the database operation
+	*/
+    function load( $oid=null ) {
+        $k = $this->_tbl_key;
+        if ($oid !== null) $this->$k = $oid;
+        if ($this->$k === null) return false;
+        $menuhandler =& mosMenuHandler::getInstance();
+        $menu =& $menuhandler->getMenuById($this->$k);
+        if ($menu) {
+            foreach (get_object_vars($menu) as $key=>$data) $this->$key = $data;
+            return true;
+        }
+        else return false;
+    }
+
+}
+
+/**
+* File Manager including safe mode provision?
+* @package Mambo
+*/
+class mosFileManager {
+
+    /**
+	* Singleton accessor
+	*/
+    function &getInstance () {
+        static $instance;
+        if (!is_object($instance)) $instance = new mosFileManager();
+        return $instance;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $file
+     * @return unknown
+     */
+    function deleteFile ($file) {
+        if (file_exists($file)) {
+            @chmod($file, 0644);
+            return unlink($file);
+        }
+        return true;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $dir
+     * @return unknown
+     */
+    function deleteDirectory ($dir) {
+        if (file_exists($dir)) {
+            if (is_dir($dir)) {
+                @chmod($dir, 0755);
+                return rmdir($dir);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $fileSysObject
+     */
+    function setPermissions ($fileSysObject) {
+        if (file_exists($fileSysObject))  {
+            if (is_dir($fileSysObject)) $perms = mamboCore::get('mosConfig_dirperms');
+            else $perms = mamboCore::get('mosConfig_fileperms');
+            if ($perms) {
+                $origmask = @umask(0);
+                $mode = octdec($perms);
+                @chmod($fileSysObject, $mode);
+                @umask($origmask);
+            }
+        }
+    }
+
+    /**
+	 * Enter description here...
+	 *
+	 * @param unknown_type $dir
+	 * @return unknown
+	 */
+    function makeDirectory ($dir) {
+        $perms = mamboCore::get('mosConfig_dirperms');
+        $origmask = @umask(0);
+        if ($perms) $result = @mkdir($dir, octdec($perms));
+        else $result = @mkdir($dir, 0755);
+        if ($result) $this->setPermissions($dir);
+        @umask($origmask);
+        return $result;
+    }
+
+
+    /**
+	 * Enter description here...
+	 *
+	 * @param unknown_type $dir
+	 * @param unknown_type $onlyCheck
+	 * @return unknown
+	 */
+    function createDirectory ($dir, $onlyCheck=false) {
+        if (file_exists($dir)) {
+            if (is_dir($dir) AND is_writable($dir)) return true;
+            else return false;
+        }
+        list($upDirectory, $count) = $this->containingDirectory($dir);
+        if ($count > 1 AND !file_exists($upDirectory) AND !($result = $this->createDirectory($upDirectory, $onlyCheck))) return false;
+        if ($onlyCheck AND isset($result)) return true;
+        if (!is_dir($upDirectory) OR !is_writable($upDirectory)) return false;
+        if ($onlyCheck) return true;
+        else return $this->makeDirectory($dir);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $dir
+     * @return unknown
+     */
+    function containingDirectory ($dir) {
+        $dirs = preg_split('*[/|\\\]*', $dir);
+        for ($i = count($dirs)-1; $i >= 0; $i--) {
+            $text = trim($dirs[$i]);
+            unset($dirs[$i]);
+            if ($text) break;
+        }
+        $result2 = count($dirs);
+        $result1 = implode('/',$dirs).($result2 > 1 ? '' : '/');
+        return array($result1, $result2);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $from
+     * @param unknown_type $to
+     * @return unknown
+     */
+    function simpleCopy ($from, $to) {
+        if (@copy($from, $to)) {
+            $this->setPermissions($to);
+            return true;
+        }
+        else return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $from
+     * @param unknown_type $to
+     * @return unknown
+     */
+    function forceCopy ($from, $to) {
+        $todir = dirname($to);
+        if (!file_exists($todir)) $this->createDirectory($todir);
+        if (!file_exists($todir)) return false;
+        $name = basename($from);
+        $this->deleteFile($to.$name);
+        return $this->simpleCopy ($from, $to);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $from
+     * @param unknown_type $to
+     * @return unknown
+     */
+    function lightCopy ($from, $to) {
+        $name = basename($from);
+        if (file_exists($to.$name)) return false;
+        $todir = dirname($to);
+        if (!file_exists($todir)) $this->createDirectory($todir);
+        if (!file_exists($todir)) return false;
+        return $this->simpleCopy ($from, $to);
+    }
+
+    /**
+	 * Enter description here...
+	 *
+	 * @param unknown_type $to
+	 * @return unknown
+	 */
+    function acceptCopy ($to) {
+        $todir = dirname($to);
+        return $this->createDirectory($todir, true);
+    }
+
+
+    /**
+	* Function to strip additional / or \ in a path name
+	* @param string The path
+	* @param boolean Add trailing slash
+	*/
+    function mosPathName($p_path, $p_addtrailingslash=true) {
+        if (substr(PHP_OS, 0, 3) == 'WIN')	{
+            $retval = str_replace( '/', '\\', $p_path );
+            if ($p_addtrailingslash AND substr( $retval, -1 ) != '\\') $retval .= '\\';
+            // Remove double \\
+            $retval = str_replace( '\\\\', '\\', $retval );
+        }
+        else {
+            $retval = str_replace( '\\', '/', $p_path );
+            if ($p_addtrailingslash AND substr( $retval, -1 ) != '/') $retval .= '/';
+            // Remove double //
+            $retval = str_replace('//','/',$retval);
+        }
+        return $retval;
+    }
+
+    /**
+	* Chmods files and directories recursively to mos global permissions. Available from 4.5.2 up.
+	* @param path The starting file or directory (no trailing slash)
+	* @param filemode Integer value to chmod files. NULL = dont chmod files.
+	* @param dirmode Integer value to chmod directories. NULL = dont chmod directories.
+	* @return TRUE=all succeeded FALSE=one or more chmods failed
+	*/
+    function mosChmod($path)
+    {
+        $fileperms = mamboCore::get('mosConfig_fileperms');
+        if ($fileperms != '') $filemode = octdec($fileperms);
+        else $filemode = null;
+        $dirperms = mamboCore::get('mosConfig_dirperms');
+        if ($dirperms != '') $dirmode = octdec($dirperms);
+        else $dirmode = null;
+        if (isset($filemode) OR isset($dirmode))
+        return $this->mosChmodRecursive($path, $filemode, $dirmode);
+        return true;
+    } // mosChmod
+
+    /**
+	* Chmods files and directories recursively to given permissions. Available from 4.5.2 up.
+	* @param path The starting file or directory (no trailing slash)
+	* @param filemode Integer value to chmod files. NULL = dont chmod files.
+	* @param dirmode Integer value to chmod directories. NULL = dont chmod directories.
+	* @return TRUE=all succeeded FALSE=one or more chmods failed
+	*/
+    function mosChmodRecursive($path, $filemode=NULL, $dirmode=NULL) {
+        $ret = true;
+        if (is_dir($path)) {
+            $topdir =& new mosDirectory($path);
+            $files =& $topdir->listFiles ('', 'file', true, true);
+            $dirs =& $topdir->listFiles ('', 'dir', true, true);
+        }
+        else {
+            $files = array($path);
+            $dirs = array();
+        }
+        if (isset($filemode)) foreach ($files as $file) $ret = @chmod($file, $filemode) ? $ret : false;
+        if (isset($dirmode)) foreach ($dirs as $dir) $ret = @chmod($dir, $dirmode) ? $ret : false;
+        return $ret;
+    }
+
+}
+
+/**
+ * Enter description here...
+ *
+ */
+class mosDirectory {
+    /**
+     * Enter description here...
+     *
+     * @var unknown_type
+     */
+    var $path = '';
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $path
+     * @return mosDirectory
+     */
+    function mosDirectory ($path) {
+        $path = str_replace('\\', '/', $path);
+        if (substr($path,-1,1) == '/') $this->path = $path;
+        else $this->path = $path.'/';
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $type
+     * @param unknown_type $recurse
+     * @param unknown_type $fullpath
+     * @return unknown
+     */
+    function &listAll ($type='file', $recurse=false, $fullpath=false) {
+        $results = array();
+        if ($dir = @opendir($this->path)) {
+            while ($file = readdir($dir)) {
+                if ($file == '.' OR $file == '..') continue;
+                if (is_dir($this->path.$file)) {
+                    if ($recurse) {
+                        $subdir = new mosDirectory($this->path.$file);
+                        $results = array_merge($results, $subdir->listAll($type, $recurse, $fullpath));
+                        unset($subdir);
+                    }
+                    if ($type == 'file') continue;
+                }
+                elseif ($type == 'dir') continue;
+                if ($fullpath) $results[] = $this->path.$file;
+                else $results[] = $file;
+            }
+            closedir($dir);
+        }
+        return $results;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function soleDir () {
+        $found = '';
+        if ($dir = @opendir($this->path)) {
+            while ($file = readdir($dir)) {
+                if ($file == '.' OR $file == '..') continue;
+                if (is_dir($this->path.$file)) {
+                    if ($found) return '';
+                    else $found = $file;
+                }
+                else return '';
+            }
+            closedir($dir);
+        }
+        return $found;
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function deleteAll () {
+        if (!file_exists($this->path)) return;
+        $subdirs =& $this->listAll ('dir', false, true);
+        foreach ($subdirs as $subdir) {
+            $subdirectory = new mosDirectory($subdir);
+            $subdirectory->deleteAll();
+            unset($subdirectory);
+        }
+        $filemanager =& mosFileManager::getInstance();
+        $files =& $this->listAll ('file', false, true);
+        foreach ($files as $file) $filemanager->deleteFile($file);
+        $filemanager->deleteDirectory($this->path);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function createFresh () {
+        $this->deleteAll();
+        $filemanager =& mosFileManager::getInstance();
+        $filemanager->createDirectory($this->path);
+        return true;
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    function createIfNeeded () {
+        if (!file_exists($this->path)) {
+            $filemanager =& mosFileManager::getInstance();
+            $filemanager->createDirectory($this->path);
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $pattern
+     * @param unknown_type $type
+     * @param unknown_type $recurse
+     * @param unknown_type $fullpath
+     * @return unknown
+     */
+    function &listFiles ($pattern='', $type='file', $recurse=false, $fullpath=false) {
+        $results = array();
+        $all =& $this->listAll($type, $recurse, $fullpath);
+        foreach ($all as $file) {
+            $name = basename($file);
+            if ($pattern AND !preg_match( "/$pattern/", $name )) continue;
+            if (($name != 'index.html') AND ($name[0] != '.')) $results[] = $file;
+        }
+        return $results;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function getSize () {
+        $totalsize = 0;
+        $files =& $this->listFiles();
+        foreach ($files as $file) $totalsize += filesize($this->path.$file);
+        return $totalsize;
+    }
+
+}
+
+
+/**
+* Menu handler
+* @package Mambo
+*/
+class mosMenuHandler {
+    /** @var array Menu objects currently available */
+    var $_menus = null;
+    /** @var array Counts of menu items by type and published status */
+    var $_counts = null;
+    /** @var array Access to stored menu objects by ID */
+    var $_idlinks = null;
+    /** @var array Items that may be useful for setting Itemid */
+    var $_byParentOrder = null;
+
+    /**
+	* Constructor
+	*/
+    function mosMenuHandler() {
+        $database =& mamboDatabase::getInstance();
+        $sql = "SELECT * FROM #__menu ORDER BY name";
+        $this->_menus =& $database->doSQLget($sql, 'mosMenu');
+        if (!$this->_menus) $this->_menus = array();
+        foreach ($this->_menus as $key=>$menu) {
+            $this->_idlinks[$menu->id] = $key;
+            if ($menu->published == 1) $this->_byParentOrder[$menu->parent][$menu->ordering][$menu->menutype] = $key;
+            if (isset($this->_counts[$menu->menutype][$menu->published])) $this->_counts[$menu->menutype][$menu->published]++;
+            else $this->_counts[$menu->menutype][$menu->published] = 1;
+        }
+        if ($this->_byParentOrder) {
+            foreach ($this->_byParentOrder as $parent=>$outer) ksort($this->_byParentOrder[$parent]);
+            ksort($this->_byParentOrder);
+        }
+    }
+    /**
+	* Singleton accessor
+	*/
+    function &getInstance () {
+        static $instance;
+        if (!is_object($instance)) $instance = new mosMenuHandler();
+        return $instance;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $id
+     * @return unknown
+     */
+    function &getMenuByID ($id) {
+        if (isset($this->_idlinks[$id])) {
+            $key = $this->_idlinks[$id];
+            $result = $this->_menus[$key];
+        }
+        else $result = null;
+        return $result;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $type
+     * @param unknown_type $published
+     * @return unknown
+     */
+    function getMenuCount ($type, $published) {
+        if (isset($this->_counts[$type][$published])) return $this->_counts[$type][$published];
+        else return 0;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $types
+     * @return unknown
+     */
+    function &getMenusByType ($types) {
+        $checker = explode(',', $types);
+        $result = null;
+        foreach ($this->_menus as $menu) {
+            if (in_array($menu->menutype, $checker)) $result[] = $menu;
+        }
+        return $result;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function &getMenuTypes () {
+        $types = array();
+        foreach ($this->_menus as $menu) {
+            if (!isset($types[$menu->menutype])) $types[$menu->menutype] = 0;
+            $types[$menu->menutype]++;
+        }
+        return $types;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $type
+     * @param unknown_type $link
+     * @return unknown
+     */
+    function getIDByTypeLink ($type, $link) {
+        foreach ($this->_menus as $menu) {
+            if ($menu->published == 1 AND ($type == '*' OR $menu->type == $type) AND $menu->link == $link) return $menu->id;
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $link
+     * @return unknown
+     */
+    function getIDLikeLink ($link) {
+        $exact = $this->getIdByTypeLink('*', $link);
+        if ($exact !== null) return $exact;
+        foreach ($this->_menus as $menu) {
+            if ($menu->published == 1 AND strpos($menu->link,$link) === 0) return $menu->id;
+        }
+        return 0;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $type
+     * @param unknown_type $componentid
+     * @return unknown
+     */
+    function getIDByTypeCid ($type, $componentid) {
+        foreach ($this->_menus as $menu) {
+            if ($menu->published == 1 AND $menu->type == $type AND $menu->componentid == $componentid) return $menu->id;
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function getGlobalBlogSectionCount () {
+        $count = 0;
+        foreach ($this->_menus as $menu) {
+            if ($menu->type == 'content_blog_section' AND $menu->published == 1 AND $menu->componentid == 0) $count++;
+        }
+        return $count;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $Itemid
+     * @param unknown_type $type
+     * @param unknown_type $id
+     * @param unknown_type $catid
+     * @return unknown
+     */
+    function getContentItemid ($Itemid, $type, $id, $catid=0) {
+        if ($Itemid) return $Itemid;
+        foreach ($this->_menus as $menu) {
+            if (strpos($menu->link,'index.php?option=com_content') === false AND strpos($menu->link,'index.php?option=content') === false) continue;
+            if (strpos($menu->link, $type) === false) continue;
+            if ($catid) {
+                if (strpos($menu->link, "&id=$catid") === false) continue;
+                if (strpos($menu->link, "&sectionid=$id") === false) continue;
+            }
+            elseif (strpos($menu->link, "&id=$id") === false) continue;
+            return $menu->id;
+        }
+        return 0;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return unknown
+     */
+    function getBestQueryMatch () {
+        parse_str($_SERVER['QUERY_STRING'], $qitems);
+        if (!isset($qitems['option'])) return 0;
+        $failures = 999;
+        $best = 0;
+        foreach ($this->_menus as $menu) {
+            $split = explode('?', $menu->link);
+            if (isset($split[1])) parse_str($split[1], $mitems);
+            else continue;
+            if (!isset($mitems['option']) OR $mitems['option'] != $qitems['option']) continue;
+            $thisfail = 0;
+            foreach ($mitems as $key=>$mitem) if (!isset($qitems[$key]) OR $mitem != $qitems[$key]) $thisfail++;
+            if ($thisfail < $failures) {
+                $best = $menu->id;
+                $failures = $thisfail;
+            }
+        }
+        return $best;
+    }
+
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $link
+     * @return unknown
+     */
+    function &maxAccessLink ($link) {
+        $selected = null;
+        $access = 0;
+        foreach ($this->_menus as $key=>$menu) {
+            if (strpos($menu->link,$link) === 0 AND $menu->access > $access) {
+                $access = $menu->access;
+                $selected =& $this->_menus[$key];
+            }
+        }
+        return $selected;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $Itemid
+     * @param unknown_type $menutype
+     * @param unknown_type $maxaccess
+     * @param unknown_type $noparent
+     * @return unknown
+     */
+    function &getByParentOrder ($Itemid, $menutype, $maxaccess=0, $noparent=false) {
+        $result = array();
+        if ($this->_byParentOrder !== null) {
+            foreach ($this->_byParentOrder as $parent=>$outer) {
+                foreach ($outer as $ordering=>$inner) {
+                    foreach ($inner as $mtype=>$last) {
+                        $key = $this->_byParentOrder[$parent][$ordering][$mtype];
+                        $menu = $this->_menus[$key];
+                        if ($menutype AND $mtype != $menutype) continue;
+                        if ($Itemid AND $Itemid != $menu->id) continue;
+                        if ($menu->access > $maxaccess) continue;
+                        if ($noparent AND $parent != 0) continue;
+                        $result[] = $this->_menus[$key];
+                    }
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $Itemid
+     */
+    function setPathway ($Itemid) {
+        if ($Itemid) {
+            $menu =& $this->getMenuByID($Itemid);
+            if ($menu->parent) $this->setPathway($menu->parent);
+            $pathway =& mosPathway::getInstance();
+            $pathway->addItem($menu->name, $menu->link."&Itemid=$Itemid");
+        }
+    }
+
+    /**
+	* Checks whether a menu option is within the users access level
+	* @param int Item id number
+	* @param string The menu option
+	* @param int The users group ID number
+	* @param database A database connector object
+	* @return boolean True if the visitor's group at least equal to the menu access
+	*/
+    function menuCheck( $Itemid, $menu_option, $task, $gid ) {
+        // Construct a link to this component - if no menu for it, assume it is OK
+        $dblink="index.php?option=$menu_option";
+        if ($this->getIDLikeLink($dblink) == 0) return true;
+        if ($Itemid) {
+            $menu =& $this->getMenuByID($Itemid);
+            if (strpos($menu->link,$dblink) ===0) {
+                $access = $menu->access;
+            } elseif ($menu_option == 'com_content' AND $Itemid == 1) {
+                return true;
+            }
+        }
+        if (!isset($access)) {
+            if ($task!='') $dblink .= "&task=$task";
+            $menu =& $this->maxAccessLink($dblink);
+            if (isset($menu)) {
+                $access = $menu->access;
+                mamboCore::set('Itemid', $menu->id);
+            }
+        }
+        return isset($access) ? $access <= $gid : false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $mitem
+     * @param unknown_type $level
+     * @param unknown_type $params
+     * @param unknown_type $Itemid
+     * @return unknown
+     */
+    function mosGetMenuLink( &$mitem, $level=0, &$params, $Itemid ) {
+        $txt = '';
+
+        switch ($mitem->type) {
+            case 'separator':
+            case 'component_item_link':
+            break;
+            case 'content_item_link':
+            $temp = split("&task=view&id=", $mitem->link);
+            if (isset($temp[1])) {
+                require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                $handler =& contentHandler::getInstance();
+                $mitem->link .= '&Itemid='.$handler->getItemid($temp[1]);
+            }
+            break;
+            case 'url':
+            $link = strtolower($mitem->link);
+            if (substr($link,0,10) == 'index.php?' AND strpos($link,'itemid=') === false) $mitem->link .= '&Itemid='. $mitem->id;
+            break;
+            case 'content_typed':
+            default:
+            $mitem->link .= '&Itemid='.$mitem->id;
+            break;
+        }
+        // Active Menu highlighting
+        if ( $Itemid == $mitem->id ) $id = 'id="active_menu'.$params->get( 'class_sfx' ).'"';
+        else $id = '';
+        $mitem->link = ampReplace( $mitem->link );
+        if (strcasecmp(substr($mitem->link,0,4), 'http')) $mitem->link = sefRelToAbs( $mitem->link );
+        if ($level > 0) $menuclass = 'sublevel';
+        else $menuclass = 'mainlevel';
+        $menuclass .= $params->get( 'class_sfx');
+
+        switch ($mitem->browserNav) {
+            // cases are slightly different
+            case 1:
+            // open in a new window
+            $txt = '<a href="'. $mitem->link .'" target="_blank" class="'. $menuclass .'" '. $id .'>'. $mitem->name .'</a>';
+            break;
+
+            case 2:
+            // open in a popup window
+            $txt = "<a href=\"#\" onclick=\"javascript: window.open('". $mitem->link ."', '', 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550'); return false\" class=\"$menuclass\" ". $id .">". $mitem->name ."</a>\n";
+            break;
+
+            case 3:
+            // don't link it
+            $txt = '<span class="'. $menuclass .'" '. $id .'>'. $mitem->name .'</span>';
+            break;
+
+            default:	// formerly case 2
+            // open in parent window
+            $txt = '<a href="'. $mitem->link .'" class="'. $menuclass .'" '. $id .'>'. $mitem->name .'</a>';
+            break;
+        }
+
+        if ( $params->get( 'menu_images' ) ) {
+            $menu_params =& new mosParameters( $mitem->params );
+            $menu_image = $menu_params->def( 'menu_image', -1 );
+            if ($menu_image AND $menu_image <> '-1') {
+                $image = '<img src="'. mamboCore::get('mosConfig_live_site') .'/images/stories/'. $menu_image .'" border="0" alt="'. $mitem->name .'"/>';
+                if ( $params->get('menu_images_align')) $txt = $txt .' '. $image;
+                else $txt = $image .' '. $txt;
+            }
+        }
+        return $txt;
+    }
+
+    /**
+	* Vertically Indented Menu
+	*/
+    function mosShowVIMenu(  &$params ) {
+        global $my, $cur_template, $Itemid;
+        if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 0;
+        else $maxaccess = $my->gid;
+        $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess);
+        foreach ($rows as $i=>$row) $crosslink[$row->id] = $i;
+        // indent icons
+        $base = mamboCore::get('mosConfig_live_site');
+        switch ( $params->get( 'indent_image' ) ) {
+            case '1':
+            // Default images
+            for ( $i = 1; $i < 7; $i++ ) {
+                $img[$i] = "<img src=\"$base/images/M_images/indent$i.png\" alt=\"indent$i\" />";
+            }
+            break;
+            case '2':
+            // Use Params
+            for ( $i = 1; $i < 7; $i++ ) {
+                $parm = $params->get('indent_image'. $i);
+                if ($parm == '-1' ) $img[$i] = NULL;
+                else $img[$i] = "<img src=\"$base/images/M_images/$parm\" alt=\"indent$i\" />";
+            }
+            break;
+            case '3':
+            // None
+            for ( $i = 1; $i < 7; $i++ ) $img[$i] = NULL;
+            break;
+            default:
+            // Template
+            $imgpath = $base.'/templates/'. $cur_template .'/images';
+            for ( $i = 1; $i < 7; $i++ ) {
+                $img[$i] = "<img src=\"$base/templates/$cur_template/images/indent$i.png\" alt=\"indent$i\" />";
+            }
+            break;
+        }
+
+        $indents = array(
+        // block prefix / item prefix / item suffix / block suffix
+        array( '<table width="100%" border="0" cellpadding="0" cellspacing="0">', '<tr align="left"><td>' , '</td></tr>', '</table>' ),
+        array( '', '<div style="padding-left: 4px">'. $img[1] , '</div>', '' ),
+        array( '', '<div style="padding-left: 8px">'. $img[2] , '</div>', '' ),
+        array( '', '<div style="padding-left: 12px">'. $img[3] , '</div>', '' ),
+        array( '', '<div style="padding-left: 16px">'. $img[4] , '</div>', '' ),
+        array( '', '<div style="padding-left: 20px">'. $img[5] , '</div>', '' ),
+        array( '', '<div style="padding-left: 24px">'. $img[6] , '</div>', '' ),
+        );
+
+        // establish the hierarchy of the menu
+        $children = array();
+        // first pass - collect children
+        foreach ($rows as $v ) $children[$v->parent][] = $v;
+        // second pass - collect 'open' menus
+        $open = array( $Itemid );
+        for ($i = 0; $i < 20 AND isset($crosslink[$open[$i]]) AND isset($rows[$crosslink[$open[$i]]]); $i++) {
+            $next = $rows[$crosslink[$open[$i]]]->parent;
+            if ($next) $open[$i+1] = $next;
+            else break;
+        }
+
+        $this->mosRecurseVIMenu( 0, 0, $children, $open, $indents, $params );
+
+    }
+
+    /**
+	* Utility function to recursively work through a vertically indented
+	* hierarchial menu
+	*/
+    function mosRecurseVIMenu( $id, $level, &$children, &$open, &$indents, &$params ) {
+        global $Itemid;
+        if (@$children[$id]) {
+            $n = min( $level, count($indents )-1);
+            echo "\n".$indents[$n][0];
+            foreach ($children[$id] as $row) {
+                echo "\n".$indents[$n][1];
+                echo $this->mosGetMenuLink( $row, $level, $params, $Itemid );
+                // show menu with menu expanded - submenus visible
+                if ($params->get('expand_menu') OR in_array($row->id, $open)) $this->mosRecurseVIMenu( $row->id, $level+1, $children, $open, $indents, $params );
+                echo $indents[$n][2];
+            }
+            echo "\n".$indents[$n][3];
+        }
+    }
+
+    /**
+	* Draws a horizontal 'flat' style menu (very simple case)
+	*/
+    function mosShowHFMenu(  &$params, $style=0 ) {
+        global $my, $cur_template, $Itemid;
+
+        if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 0;
+        else $maxaccess = $my->gid;
+        $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess, true);
+
+        $links = array();
+        foreach ($rows as $row) $links[] = $this->mosGetMenuLink( $row, 0, $params, $Itemid );
+        $menuclass = 'mainlevel'. $params->get( 'class_sfx' );
+        if (count( $links )) {
+            if ($style == 1) {
+                echo '<ul id="'. $menuclass .'">';
+                foreach ($links as $link) echo '<li>' . $link . '</li>';
+                echo '</ul>';
+            }
+            else {
+                echo '<table width="100%" border="0" cellpadding="0" cellspacing="1">';
+                echo '<tr>';
+                echo '<td nowrap="nowrap">';
+                echo '<span class="'. $menuclass .'"> '. $params->get( 'end_spacer' ) .' </span>';
+                echo implode( '<span class="'. $menuclass .'"> '. $params->get( 'spacer' ) .' </span>', $links );
+                echo '<span class="'. $menuclass .'"> '. $params->get( 'end_spacer' ) .' </span>';
+                echo '</td></tr>';
+                echo '</table>';
+            }
+        }
+    }
+}
+
+/**
+* Plugin handler
+* @package Mambo
+*/
+class mosMambotHandler {
+    /** @var array An array of functions in event groups */
+    var $_events=null;
+    /** @var array An array of lists */
+    var $_lists=null;
+    /** @var array An array of mambots */
+    var $_bots=null;
+    /** @var array An array of bools showing if corresponding bot is registered */
+    var $_registered=array();
+    /** @var int Index of the mambot being loaded */
+    var $_loading=null;
+
+    /**
+	* Constructor
+	*/
+    function mosMambotHandler() {
+        $my = mamboCore::is_set('currentUser') ? mamboCore::get('currentUser') : null;
+        $gid = $my ? $my->gid : 0;
+        $this->_events = array();
+        $database =& mamboDatabase::getInstance();
+        $database->setQuery( "SELECT folder, element, published, params, CONCAT_WS('/',folder,element) AS lookup"
+        . "\nFROM #__mambots"
+        . "\nWHERE published >= 1 AND access <= $gid"
+        . "\nORDER BY ordering"
+        );
+        $this->_bots = $database->loadObjectList();
+        if (!$this->_bots) $this->_bots = array();
+    }
+    /**
+	* Singleton accessor
+	*/
+    function &getInstance () {
+        static $instance;
+        if (!is_object($instance)) $instance = new mosMambotHandler();
+        return $instance;
+    }
+    /**
+    * Register a class-type mambot, provided it has a perform method
+    * - can register for multiple events if desired
+    * @param object The mambot object
+    * @param mixed string or array of strings - the mambot events to be registered
+    * @param int the subscript for use in the main array of mambots
+    */
+    function _botRegister (&$botObject, &$selected, $i) {
+        $function = array(&$botObject, 'perform');
+        if (!is_callable($function)) return;
+        if (is_array($selected)) foreach ($selected as $select) $this->_botRegister($botObject, $select);
+        $this->_events[$selected][] = array ($function, $i);
+        $this->_registered[$i] = true;
+    }
+
+    /**
+	* Loads all the bot files for a particular group
+	* @param string The group name, relates to the sub-directory in the mambots directory
+	*/
+    function loadBotGroup( $group ) {
+        global $_MAMBOTS;
+        $group = trim( $group );
+        $total = 0;
+        $basepath = mamboCore::get('mosConfig_absolute_path');
+        foreach ($this->_bots as $i=>$bot) {
+            if ($bot->folder != $group OR isset($this->_registered[$i])) continue;
+            $path = "$basepath/mambots/$bot->folder/$bot->element.php";
+            if (file_exists( $path )) {
+                $this->_loading = $i;
+                require_once( $path );
+                if (!isset($this->_registered[$i])) {
+                    $botclass = str_replace('.','_',$bot->element);
+                    if (class_exists($botclass)) {
+                        $newbot = new $botclass();
+                        if (is_callable(array(&$newbot, 'register'))) {
+                            $selected = $newbot->register();
+                            $this->_botRegister($newbot, $selected, $i);
+                        }
+                    }
+                }
+                $total++;
+            }
+        }
+        $this->_loading = null;
+        if ($total) return true;
+        return false;
+    }
+    /**
+	* Registers a function to a particular event group
+	* @param string The event name
+	* @param string The function name
+	*/
+    function registerFunction( $event, $function ) {
+        $this->_events[$event][] = array( $function, $this->_loading );
+        $this->_registered[$this->_loading] = true;
+    }
+    /**
+	* Makes a option for a particular list in a group
+	* @param string The group name
+	* @param string The list name
+	* @param string The value for the list option
+	* @param string The text for the list option
+	*/
+    function addListOption( $group, $listName, $value, $text='' ) {
+        $this->_lists[$group][$listName][] = mosHTML::makeOption( $value, $text );
+    }
+    /**
+	* @param string The group name
+	* @param string The list name
+	* @return array
+	*/
+    function getList( $group, $listName ) {
+        return $this->_lists[$group][$listName];
+    }
+    /**
+	* Calls all functions according to passed parameters
+	* @param string The event name
+	* @param array An array of arguments
+	* @param boolean True is unpublished bots are to be processed
+	* @return array An array of results from each function call
+	*/
+    function &_runBots ($event, $args, $doUnpublished=false) {
+        $result = array();
+        if (isset( $this->_events[$event] )) {
+            foreach ($this->_events[$event] as $func) {
+                if (is_callable( $func[0] )) {
+                    $botparams = $this->_bots[$func[1]]->params;
+                    $args[] = new mosParameters($botparams);
+                    $args[] = $event;
+                    if ($doUnpublished) {
+                        $args[0] = $this->_bots[$func[1]]->published;
+                        $result[] = call_user_func_array( $func[0], $args );
+                    } else if ($this->_bots[$func[1]]->published) {
+                        $result[] = call_user_func_array( $func[0], $args );
+                    }
+                }
+            }
+        }
+        return $result;
+    }
+    /**
+	* Calls all functions associated with an event group
+	* @param string The event name
+	* @param array An array of arguments
+	* @param boolean True is unpublished bots are to be processed
+	* @return array An array of results from each function call
+	*/
+    function trigger( $event, $args=null, $doUnpublished=false ) {
+        if ($args === null) $args = array();
+        // prepend the published argument
+        if ($doUnpublished) array_unshift( $args, null );
+        $result =& $this->_runBots($event, $args, $doUnpublished);
+        return $result;
+    }
+    /**
+	* Same as trigger but only returns the first event and
+	* allows for a variable argument list
+	* @param string The event name
+	* @return array The result of the first function call
+	*/
+    function call( $event ) {
+        $args =& func_get_args();
+        array_shift( $args );
+        $result =& $this->_runBots($event, $args);
+        if (isset($result[0])) return $result[0];
+        return null;
+    }
+}
+
+/**
+* Users Table Class
+*
+* Provides access to the mos_templates table
+* @package Mambo
+*/
+class mosUser extends mosDBTable {
+    /** @var int Unique id*/
+    var $id=null;
+    /** @var string The users real name (or nickname)*/
+    var $name=null;
+    /** @var string The login name*/
+    var $username=null;
+    /** @var string email*/
+    var $email=null;
+    /** @var string MD5 encrypted password*/
+    var $password=null;
+    /** @var string */
+    var $usertype=null;
+    /** @var int */
+    var $block=null;
+    /** @var int */
+    var $sendEmail=null;
+    /** @var int The group id number */
+    var $gid=null;
+    /** @var int Group number from ACL */
+    var $grp=null;
+    /** @var datetime */
+    var $registerDate=null;
+    /** @var datetime */
+    var $lastvisitDate=null;
+    /** @var string activation hash*/
+    var $activation=null;
+    /** @var string */
+    var $params=null;
+
+    /**
+	* @param database A database connector object
+	*/
+    function mosUser() {
+        $database =& mamboDatabase::getInstance();
+        $this->mosDBTable( '#__users', 'id', $database );
+    }
+
+    /**
+	 * Return true if this user is an administrator, false otherwise
+	 */
+    function isAdmin() {
+        return ( strtolower( $this->usertype ) == 'superadministrator' OR strtolower( $this->usertype ) == 'super administrator' OR (isset($this->grp) AND $this->grp == 16) ) ? true : false;
+    }
+
+    /**
+	 * Fill a user object with information from the current session
+	 */
+    function getSessionData() {
+        $session =& mosSession::getCurrent();
+        $this->id = intval( $session->userid );
+        $this->username = $session->username;
+        $this->usertype = $session->usertype;
+        $this->gid = intval ($session->gid);
+    }
+
+    function getSession () {
+        $this->id = mosGetParam( $_SESSION, 'session_user_id', 0 );
+        $this->username = mosGetParam( $_SESSION, 'session_username', '' );
+        $this->usertype = mosGetParam( $_SESSION, 'session_usertype', '' );
+        $this->gid = mosGetParam( $_SESSION, 'session_gid', 0 );
+        $this->grp = mosGetParam( $_SESSION, 'session_grp', 0);
+    }
+    /**
+	 * Validation and filtering
+	 * @return boolean True is satisfactory
+	 */
+    function check() {
+        $this->_error = '';
+        if ($this->name == '') $this->_error = _REGWARN_NAME;
+        elseif ($this->username == '') $this->_error = _REGWARN_UNAME;
+        elseif (strlen($this->username) < 3 OR preg_match("/[\\<\\>\\\"\\'\\%\\;\\(\\)\\&\\+\\-]/", $this->username)) $this->_error = sprintf( _VALID_AZ09, _PROMPT_UNAME, 2 );
+        elseif (($this->email == '') OR preg_match("/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $this->email ) == 0) $this->_error = _REGWARN_MAIL;
+        else {
+            // check for existing username
+            $username = strtolower($this->username);
+            $this->_db->setQuery( "SELECT COUNT(id) FROM #__users "
+            . "\nWHERE LOWER(username)='$username' AND id!='$this->id'"
+            );
+            if ($this->_db->loadResult()) $this->_error = _REGWARN_INUSE;
+            elseif (mamboCore::get('mosConfig_uniquemail')) {
+                // check for existing email
+                $this->_db->setQuery( "SELECT COUNT(id) FROM #__users "
+                . "\nWHERE email='$this->email' AND id!='$this->id'"
+                );
+                if ($this->_db->loadResult()) $this->_error = _REGWARN_EMAIL_INUSE;
+            }
+        }
+        if ($this->_error) return false;
+        return true;
+    }
+
+    function store( $updateNulls=false ) {
+        global $acl, $migrate;
+        $section_value = 'users';
+        if( $this->id AND !$migrate) {
+            // update existing record
+            $ret = $this->_db->updateObject( $this->_tbl, $this, 'id', $updateNulls );
+            // syncronise ACL
+            // single group handled at the moment
+            // trivial to expand to multiple groups
+            $groups = $acl->get_object_groups( $section_value, $this->id, 'ARO' );
+            $acl->del_group_object( $groups[0], $section_value, $this->id, 'ARO' );
+            $acl->add_group_object( $this->gid, $section_value, $this->id, 'ARO' );
+            $object_id = $acl->get_object_id( $section_value, $this->id, 'ARO' );
+            $acl->edit_object( $object_id, $section_value, $this->_db->getEscaped( $this->name ), $this->id, 0, 0, 'ARO' );
+        }
+        else {
+            // new record
+            $ret = $this->_db->insertObject( $this->_tbl, $this, 'id' );
+            // syncronise ACL
+            $acl->add_object( $section_value, $this->_db->getEscaped( $this->name ), $this->id, null, null, 'ARO' );
+            $acl->add_group_object( $this->gid, $section_value, $this->id, 'ARO' );
+        }
+        if ($ret) return true;
+        $this->_error = "mosUser::store failed <br />" . $this->_db->getErrorMsg();
+        return false;
+    }
+
+    function delete($oid=null) {
+        global $acl;
+        $k = $this->_tbl_key;
+        if ($oid) $this->id = intval( $oid );
+        $aro_id = $acl->get_object_id( 'users', $this->$k, 'ARO' );
+        $acl->del_object( $aro_id, 'ARO', true );
+        //		$authoriser = mosAuthorisationAdmin::getInstance();
+        //		$authoriser->dropAccess('mosUser', $this->id);
+        $this->_error = '';
+        $this->_db->setQuery( "DELETE FROM $this->_tbl WHERE id = '".$this->id."'" );
+        if ($this->_db->query()) {
+            // cleanup related data
+
+            // :: private messaging
+            $this->_db->setQuery( "DELETE FROM #__messages_cfg WHERE user_id='".$this->id."'" );
+            if (!$this->_db->query()) $this->_error = $this->_db->getErrorMsg();
+            else {
+                $this->_db->setQuery( "DELETE FROM #__messages WHERE user_id_to='".$this->$k."'" );
+                if (!$this->_db->query()) $this->_error = $this->_db->getErrorMsg();
+            }
+        } else $this->_error = $this->_db->getErrorMsg();
+        if ($this->_error) return false;
+        return true;
+    }
+}
+
+/**
+* User login details class
+* @package Mambo
+*/
+class mosLoginDetails {
+    var $_user = '';
+    var $_password = '';
+    var $_remember = '';
+
+    function mosLoginDetails ($user, $password='', $remember='') {
+        $this->_user = $user;
+        $this->_password = $password;
+        $this->_remember = $remember;
+    }
+
+    function getUser () {
+        return $this->_user;
+    }
+
+    function getPassword () {
+        return $this->_password;
+    }
+
+    function getRemember () {
+        return $this->_remember;
+    }
+
+}
+/**
+* Mambo Mainframe class
+*
+* Provide many supporting API functions
+* @package Mambo
+*/
+class mosMainFrame {
+    /** @var database Internal database class pointer */
+    var $_db=null;
+    /** @var object A default option (e.g. component) */
+    var $_option=null;
+    /** @var string The current template */
+    var $_template=null;
+    /** @var array An array to hold global user state within a session */
+    var $_userstate=null;
+    /** @var array An array of page meta information */
+    var $_head=null;
+    /** @var string Custom html string to append to the pathway */
+    var $_custom_pathway=array();
+
+    /**
+	* Class constructor
+	* @param database A database connection object
+	* @param string The url option
+	* @param string The path of the mos directory
+	*/
+    function mosMainFrame( &$db, $option, $basePath, $isAdmin=false ) {
+        $this->_db =& $db;
+        // load the configuration values
+        //return( $this->loadConfig() );
+        $this->_setTemplate($isAdmin);
+        if (substr($option,0,4) != 'com_') $this->_option = "com_$option";
+        else $this->_option = $option;
+        if (isset( $_SESSION['session_userstate'] )) $this->_userstate =& $_SESSION['session_userstate'];
+        else $this->_userstate = null;
+        $this->_head['title'] = $GLOBALS['mosConfig_sitename'];
+        $this->_head['meta'] = array();
+        $this->_head['custom'] = array();
+        mosMainFrame::getInstance($this);
+    }
+
+    /**
+    * Get the current user - deprecated - use mamboCore instead
+    */
+    function getUser() {
+        return mamboCore::get('currentUser');
+    }
+    /**
+    * Logout the current user - deprecated - use the code here directly
+    */
+    function logout() {
+        require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
+        $authenticator =& mamboAuthenticator::getInstance();
+        $authenticator->logoutUser();
+    }
+    /**
+    * Login a user given name and password - deprecated - use the code here directly
+    */
+    function login ($username=null,$passwd=null) {
+        require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
+        $authenticator =& mamboAuthenticator::getInstance();
+        return $authenticator->loginUser($username, $passwd);
+    }
+
+    /**
+	* Singleton get instance
+	* @param object the mainframe instance (if called internally)
+	* Note that because of the need for creation parameters, this cannot
+	* be called successfully unless the mainframe object is already created
+	*/
+    function &getInstance () {
+        static $mainframe;
+        if (func_num_args()) {
+            $args = func_get_args();
+            $mainframe = $args[0];
+        }
+        if (isset($mainframe)) $result =& $mainframe;
+        else $result = null;
+        return $result;
+    }
+    /**
+	* @param string
+	*/
+    function setPageTitle( $title=null ) {
+        if (mamboCore::get('mosConfig_pagetitles')) {
+            $title = trim(htmlspecialchars($title));
+            $base = mamboCore::get('mosConfig_sitename');
+            $this->_head['title'] = $title ?  $title.' - '.$base : $base;
+        }
+    }
+    /**
+	* @return string
+	*/
+    function getPageTitle() {
+        return $this->_head['title'];
+    }
+
+    /**
+	* @param string The value of the name attibute
+	* @param string The value of the content attibute
+	* @param string Text to display before the tag
+	* @param string Text to display after the tag
+	*/
+    function addMetaTag( $name, $content, $prepend='', $append='' ) {
+        list($name, $content) = $this->_tidyMetaData($name, $content);
+        $prepend = trim($prepend);
+        $append = trim($append);
+        $this->_head['meta'][$name] = array($content, $prepend, $append);
+    }
+    /**
+	* @param string The value of the name attibute
+	*/
+    function _getMetaTag ($name) {
+        return isset($this->_head['meta'][$name]) ?  $this->_head['meta'][$name] : array('', '', '');
+    }
+    /**
+	* @param string The value of the name attibute
+	* @param string The value of the content attibute to append to the existing
+	*/
+    function _tidyMetaData($name, $content) {
+        $result[] = trim(htmlspecialchars($name));
+        $result[] = trim(htmlspecialchars($content));
+        return $result;
+    }
+    /**
+	* @param string The value of the name attibute
+	* @param string The value of the content attibute to append to the existing
+	* Tags ordered in with Site Keywords and Description first
+	*/
+    function appendMetaTag( $name, $content, $ifEmpty=false ) {
+        list($name, $content) = $this->_tidyMetaData($name, $content);
+        $tag = $this->_getMetaTag($name);
+        if ($tag[0] AND $ifEmpty) return;
+        if ($tag[0] AND $content) $content .= ', ';
+        $tag[0] = $content.$tag[0];
+        $this->_head['meta'][$name] =  $tag;
+    }
+
+    /**
+	* @param string The value of the name attibute
+	* @param string The value of the content attibute to append to the existing
+	*/
+    function prependMetaTag( $name, $content ) {
+        list($name, $content) = $this->_tidyMetaData($name, $content);
+        $tag = $this->_getMetaTag($name);
+        $tag[0] = $content.$tag[0];
+        $this->_head['meta'][$name] =  $tag;
+    }
+    /**
+	 * Adds a custom html string to the head block
+	 * @param string The html to add to the head
+	 */
+    function addCustomHeadTag( $html ) {
+        $this->_head['custom'][] = trim( $html );
+    }
+    /**
+	* @return string
+	*/
+    function getHead() {
+        $head[] = '<title>'.$this->_head['title'].'</title>';
+        foreach ($this->_head['meta'] as $name=>$meta) {
+            if ($meta[1]) $head[] = $meta[1];
+            $head[] = '<meta name="' . $name . '" content="' . $meta[0] . '" />';
+            if ($meta[2]) $head[] = $meta[2];
+        }
+        foreach ($this->_head['custom'] as $html) $head[] = $html;
+        return implode( "\n", $head )."\n";
+    }
+    /**
+	* @return string
+	*/
+    function getCustomPathWay() {
+        return $this->_custom_pathway;
+    }
+
+    function appendPathWay($html) {
+        $this->_custom_pathway[] = $html;
+    }
+
+    /**
+	* Gets the value of a user state variable
+	* @param string The name of the variable
+	*/
+    function getUserState( $var_name ) {
+        return is_array($this->_userstate) ? mosGetParam($this->_userstate, $var_name, null) : null;
+    }
+    /**
+	* Sets the value of a user state variable
+	* @param string The name of the variable
+	* @param string The value of the variable
+	*/
+    function setUserState( $var_name, $var_value ) {
+        if (is_array( $this->_userstate )) $this->_userstate[$var_name] = $var_value;
+    }
+    /**
+	* Gets the value of a user state variable
+	* @param string The name of the user state variable
+	* @param string The name of the variable passed in a request
+	* @param string The default value for the variable if not found
+	*/
+    function getUserStateFromRequest( $var_name, $req_name, $var_default=null ) {
+        if (isset($_REQUEST[$req_name])) $this->setUserState($var_name, $_REQUEST[$req_name]);
+        elseif (isset($var_default) AND !isset($this->userstate[$var_name])) $this->setUserState($var_name, $var_default);
+        return $this->getUserState($var_name);
+    }
+    /**
+	* Initialises the user session
+	*
+	* Old sessions are flushed based on the configuration value for the cookie
+	* lifetime. If an existing session, then the last access time is updated.
+	* If a new session, a session id is generated and a record is created in
+	* the mos_sessions table.
+	*/
+    function &initSession() {
+        $session =& mosSession::getCurrent();
+        return $session;
+    }
+
+    /**
+	* @param string The name of the variable (from configuration.php)
+	* @return mixed The value of the configuration variable or null if not found
+	*/
+    function getCfg( $varname ) {
+        return mamboCore::get('mosConfig_'.$varname);
+    }
+
+    function _setTemplate( $isAdmin=false ) {
+        global $Itemid;
+        $cur_template = '';
+        $sql = "SELECT template, client_id, menuid FROM #__templates_menu WHERE (client_id=0 or client_id=1)";
+        if (isset($Itemid) AND $Itemid) $sql .= " AND (menuid=0 OR menuid=$Itemid)";
+        else $sql .= " AND menuid=0";
+        $sql .= " ORDER BY client_id, menuid";
+        $this->_db->setQuery($sql);
+        $templates = $this->_db->loadObjectList();
+        foreach ($templates as $template) {
+            if ($template->client_id == 1) {
+                if ($isAdmin) $cur_template = $template->template;
+            }
+            else $cur_template = $template->template;
+        }
+        if ($isAdmin) {
+            $path = mamboCore::get('mosConfig_absolute_path')."/administrator/templates/$cur_template/index.php";
+            if (!file_exists( $path )) $cur_template = 'mambo_admin';
+        }
+        else {
+            // TemplateChooser Start
+            $mos_user_template = mosGetParam( $_COOKIE, 'mos_user_template', '' );
+            $mos_change_template = mosGetParam( $_REQUEST, 'mos_change_template', $mos_user_template );
+            if ($mos_change_template) {
+                // check that template exists in case it was deleted
+                $path = mamboCore::get('mosConfig_absolute_path')."/templates/$mos_change_template/index.php";
+                if (strpos($mos_change_template,'..') == false AND strpos($mos_change_template,':') == false AND file_exists($path)) {
+                    $lifetime = 60*10;
+                    $cur_template = $mos_change_template;
+                    setcookie( "mos_user_template", "$mos_change_template", time()+$lifetime);
+                } else 	setcookie( "mos_user_template", "", time()-3600 );
+            }
+            // TemplateChooser End
+        }
+        $this->_template = $cur_template;
+    }
+
+    function getTemplate() {
+        return $this->_template;
+    }
+
+    /**
+	* Checks to see if an image exists in the current templates image directory
+ 	* if it does it loads this image.  Otherwise the default image is loaded.
+	* Also can be used in conjunction with the menulist param to create the chosen image
+	* load the default or use no image
+	*/
+    function ImageCheck( $file, $directory='/images/M_images/', $param=NULL, $param_directory='/images/M_images/', $alt=NULL, $name='image', $type=1, $align='middle' ) {
+        $basepath = mamboCore::get('mosConfig_live_site');
+        if ($param) $image = $basepath.$param_directory.$param;
+        else {
+            $endpath = '/templates/'.$this->getTemplate().'/images/'.$file;
+            if (file_exists(mamboCore::get('mosConfig_absolute_path').$endpath)) $image = $basepath.$endpath;
+            else $image = $basepath.$directory.$file;  // outputs only path to image
+        }
+        // outputs actual html <img> tag
+        if ($type) $image = '<img src="'. $image .'" alt="'. $alt .'" align="'. $align .'" name="'. $name .'" border="0" />';
+        return $image;
+    }
+
+    /**
+	* Returns the first to be found of one or more files, or null
+	*
+	*/
+    function tryFiles ($first_choice, $second_choice=null, $third_choice=null) {
+        if (file_exists($first_choice)) return $first_choice;
+        elseif ($second_choice AND file_exists($second_choice)) return $second_choice;
+        elseif ($third_choice AND file_exists($third_choice)) return $third_choice;
+        else return null;
+    }
+
+    /**
+	* Returns a standard path variable
+	*
+	*/
+    function getPath( $varname, $option='' ) {
+        $base = mamboCore::get('mosConfig_absolute_path');
+        $origoption = $option;
+        if (!$option) $option = $this->_option;
+        $name = substr($option,4);
+        $bac_admin = "$base/administrator/components/com_admin/";
+        $baco = "$base/administrator/components/$option/";
+        $bttc = "$base/templates/$this->_template/components/";
+        $bco = "$base/components/$option/";
+        $bai = "$base/administrator/includes/";
+        $bi = "$base/includes/";
+
+        switch ($varname) {
+            case 'front': return $this->tryFiles ($bco."$name.php");
+            case 'front_html': return $this->tryFiles ($bttc."$name.html.php", $bco."$name.html.php");
+            case 'admin': return $this->tryFiles ($baco."admin.$name.php", $bac_admin.'admin.admin.php');
+            case 'admin_html': return $this->tryFiles ($baco."admin.$name.html.php", $bac_admin.'admin.admin.html.php');
+            case 'toolbar': return $this->tryFiles ($baco."toolbar.$name.php");
+            case 'toolbar_html': return $this->tryFiles ($baco."toolbar.$name.html.php");
+            case 'toolbar_default': return $this->tryFiles ($bai.'toolbar.html.php');
+            case 'class': return $this->tryFiles ($bco."$name.class.php", $baco."$name.class.php", $bi."$name.php");
+            case 'com_xml': return $this->tryFiles ($baco."$name.xml", $bco."$name.xml");
+            case 'mod0_xml':
+            if ($origoption) $path = $base."/modules/$option.xml";
+            else $path = $base.'/modules/custom.xml';
+            return $this->tryFiles ($path);
+            case 'mod1_xml':
+            if ($origoption) $path = $base."/administrator/modules/$option.xml";
+            else $path = $base.'/administrator/modules/custom.xml';
+            return $this->tryFiles ($path);
+            case 'bot_xml': return $this->tryFiles ($base."/mambots/$option.xml");
+            case 'menu_xml': return $this->tryFiles ($base."/administrator/components/com_menus/$option/$option.xml");
+            case 'installer_html': return $this->tryFiles($base."/administrator/components/com_installer/$option/$option.html.php");
+            case 'installer_class': return $this->tryFiles($base."/administrator/components/com_installer/$option/$option.class.php");
+        }
+    }
+
+    /**
+	* Detects a 'visit'
+	*
+	* This function updates the agent and domain table hits for a particular
+	* visitor.  The user agent is recorded/incremented if this is the first visit.
+	* A cookie is set to mark the first visit.
+	*/
+    function detect() {
+        if (mamboCore::get('mosConfig_enable_stats') == 1) {
+            if (mosGetParam( $_COOKIE, 'mosvisitor', 0 )) return;
+            setcookie( "mosvisitor", "1" );
+
+            $agent = $_SERVER['HTTP_USER_AGENT'];
+            $browser = mosGetBrowser( $agent );
+            $os = mosGetOS( $agent );
+            $domain = gethostbyaddr( $_SERVER['REMOTE_ADDR'] );
+            // tease out the last element of the domain
+            $tldomain = split( "\.", $domain );
+            $tldomain = $tldomain[count( $tldomain )-1];
+            if (is_numeric( $tldomain )) {
+                $tldomain = "Unknown";
+            }
+
+            $this->_db->setQuery( "SELECT count(*), type FROM #__stats_agents WHERE (agent='$browser' AND type=0) OR (agent='$os' AND type=1) OR (agent='$tldomain' AND type=2) GROUP BY type");
+            $stats = $this->_db->loadObjectList();
+            $sql['browser'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$browser',0)";
+            $sql['os'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$os',1)";
+            $sql['domain'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$tldomain',2)";
+            if ($stats) foreach ($stats as $stat) {
+                if ($stat->type == 0) $sql['agents'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$browser' AND type=0";
+                if ($stat->type == 1) $sql['os'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$os' AND type=1";
+                if ($stat->type == 2) $sql['domain'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$tldomain' AND type=2";
+            }
+            $this->_db->setQuery(implode('; ',$sql));
+            $this->_db->query_batch();
+        }
+    }
+
+    /**
+	* @return correct Itemid for Content Item
+	*/
+    function getItemid ($id, $typed=1, $link=1, $bs=1, $bc=1, $gbs=1) {
+        require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+        $handler =& contentHandler::getInstance();
+        return $handler->getItemid($id, $typed, $link, $bs, $bc, $gbs);
+    }
+
+    function liveBookMark () {
+        // support for Firefox Live Bookmarks ability for site syndication
+        $c_handler =& mosComponentHandler::getInstance();
+        $params = $c_handler->getParamsByName('Syndicate');
+        $live_bookmark = $params->get( 'live_bookmark', 0 );
+        if ($live_bookmark) {
+            // custom bookmark file name
+            $bookmark_file = $params->get( 'bookmark_file', $live_bookmark );
+            $link_file 	= mamboCore::get('mosConfig_live_site').'/cache/'. $bookmark_file;
+            $filename 	= mamboCore::get('mosConfig_absolute_path').'/cache/'. $bookmark_file;
+            $cache 		= $params->get( 'cache', 1 );
+            $cache_time = $params->get( 'cache_time', 3600 );
+            $title 		= $params->def( 'title', mamboCore::get('mosConfig_sitename') );
+            // checks to see if cache file exists, to determine whether to create a new one
+            if ( !file_exists( $filename ) || ( ( time() - filemtime( $filename ) ) > $cache_time ) ) {
+                $task		= 'live_bookmark';
+                // sets bookmark feed type
+                $_GET['feed'] = str_replace( '.xml', '', $live_bookmark );
+                // loads rss component to create bookmark file
+                require_once( mamboCore::get('mosConfig_absolute_path').'/components/com_rss/rss.php' );
+            }
+            // outputs link tag for page
+			?>
+			<link rel="alternate" type="application/rss+xml" title="<?php echo $title; ?>" href="<?php echo $link_file; ?>" />
+			<?php
+        }
+    }
+
+    function mosShowHead () {
+        global $_VERSION;
+        $mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+        $this->appendMetaTag( 'description', mamboCore::get('mosConfig_MetaDesc'), true );
+        $this->appendMetaTag( 'keywords', mamboCore::get('mosConfig_MetaKeys'), true );
+        echo $this->getHead();
+        if (mamboCore::get('mosConfig_sef')) {
+            echo "<base href=\"$mosConfig_live_site/\" />\r\n";
+        }
+        $my = mamboCore::get('currentUser');
+        if ( $my->id ) {
+			?>
+			<script language="JavaScript1.2" src="<?php echo $mosConfig_live_site;?>/includes/js/mambojavascript.js" type="text/javascript"></script>
+			<?php
+        }
+        $this->liveBookMark();
+        // outputs link tag for page
+        $configuration =& mamboCore::getMamboCore();
+		?>
+		<link rel="shortcut icon" href="<?php echo $configuration->getFavIcon();?>" />
+		<?php
+    }
+
+}
+
+/**
+* Class to support function caching
+* @package Mambo
+*/
+class mosCache {
+    /**
+	* @return object A function cache object
+	*/
+    function &getCache(  $group=''  ) {
+        $mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+        require_once($mosConfig_absolute_path.'/includes/Cache/Lite/Function.php');
+        $path = mamboCore::get('mosConfig_cachepath');
+        $caching = mamboCore::get('mosConfig_caching');
+        $time = mamboCore::get('mosConfig_cachetime');
+        $options = array(
+        'cacheDir' => "$path/",
+        'caching' => $caching,
+        'defaultGroup' => $group,
+        'lifeTime' => $time
+        );
+        $cache =& new Cache_Lite_Function( $options );
+        return $cache;
+    }
+    /**
+	* Cleans the cache
+	*/
+    function cleanCache ($group=false) {
+        if (mamboCore::get('mosConfig_caching')) {
+            $cache =& mosCache::getCache( $group );
+            $cache->clean( $group );
+        }
+    }
+}
+
+/**
+* Session database table class
+* @package Mambo
+*/
+class mosSession extends mosDBTable {
+    /** @var int Primary key */
+    var $session_id=null;
+    /** @var time */
+    var $time=null;
+    /** @var int User ID */
+    var $userid=0;
+    /** @var string */
+    var $usertype=null;
+    /** @var string */
+    var $username='';
+    /** @var int User group ID */
+    var $gid=0;
+    /** @var int */
+    var $guest=1;
+    /** @var string */
+    var $_session_cookie=null;
+
+    /**
+	* @param database A database connector object
+	*/
+    function mosSession() {
+        $database =& mamboDatabase::getInstance();
+        $this->mosDBTable( '#__session', 'session_id', $database );
+        $this->time = time();
+    }
+
+    function validate ($user) {
+        // check against db record of session
+        $session_id = mosGetParam( $_SESSION, 'session_id', '' );
+        $logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
+        if ($session_id == md5( $user->id.$user->username.$user->usertype.$logintime )) {
+            $current_time = time();
+            $database =& mamboDatabase::getInstance();
+            $database->setQuery ("UPDATE #__session"
+            . "\nSET time='$current_time', guest=-3-guest"
+            . "\nWHERE session_id='$session_id'"
+            . " AND username = '" . $database->getEscaped( $user->username ) . "'"
+            . " AND userid = " . intval( $user->id )
+            );
+            if (!$result = $database->query()) echo $database->stderr();
+            elseif ($database->getAffectedRows() == 1) return true;
+        }
+        return false;
+    }
+
+    function &getCurrent () {
+        static $currentSession;
+        if (!is_object($currentSession)) {
+            $currentSession = new mosSession();
+            mosSession::purge();
+            $sessionCookieName = md5('site'.mamboCore::get('mosConfig_live_site'));
+            $sessioncookie = mosGetParam($_COOKIE, $sessionCookieName, null);
+            $usercookie = mosGetParam($_COOKIE, 'usercookie', null);
+            if ($currentSession->load(md5($sessioncookie.$_SERVER['REMOTE_ADDR']))) {
+                // Session cookie exists, update time in session table
+                $currentSession->time = time();
+                $currentSession->update();
+            } else {
+                $currentSession->generateId();
+                if (!$currentSession->insert()) {
+                    die( $currentSession->getError() );
+                }
+                setcookie( $sessionCookieName, $currentSession->getCookie(), time() + 43200, '/' );
+                //$_COOKIE["sessioncookie"] = $session->getCookie();
+                if ($usercookie) {
+                    // Remember me cookie exists. Login with usercookie info.
+                    require_once (mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
+                    $authenticator =& mamboAuthenticator::getInstance();
+                    $authenticator->authenticateUser ($message, $usercookie['username'], $usercookie['password'], null, $currentSession);
+                }
+            }
+        }
+        return $currentSession;
+    }
+
+    function insert() {
+        $ret = $this->_db->insertObject( $this->_tbl, $this );
+
+        if( !$ret ) {
+            $this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->stderr();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function update( $updateNulls=false ) {
+        $ret = $this->_db->updateObject( $this->_tbl, $this, 'session_id', $updateNulls );
+
+        if( !$ret ) {
+            $this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->stderr();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function generateId() {
+        $failsafe = 20;
+        $randnum = 0;
+        while ($failsafe--) {
+            $randnum = md5( uniqid( microtime(), 1 ) );
+            if ($randnum != "") {
+                $cryptrandnum = md5( $randnum );
+                $this->_db->setQuery( "SELECT $this->_tbl_key FROM $this->_tbl WHERE $this->_tbl_key=MD5('$randnum')" );
+                if(!($result = $this->_db->query())) {
+                    die( $this->_db->stderr( true ));
+                    // todo: handle gracefully
+                }
+                if ($this->_db->getNumRows($result) == 0) {
+                    break;
+                }
+            }
+        }
+        $this->_session_cookie = $randnum;
+        $this->session_id = md5( $randnum . $_SERVER['REMOTE_ADDR'] );
+    }
+
+    function getCookie() {
+        return $this->_session_cookie;
+    }
+
+    function purge() {
+        $past = time() - intval(mamboCore::get('mosConfig_lifetime'));
+        $adminpast = time() - 3600;
+        $database =& mamboDatabase::getInstance();
+        $database->setQuery("DELETE FROM #__session WHERE (time<$past AND guest>=0) OR (time<$adminpast AND guest<0)");
+        return $database->query();
+    }
+
+}
+
+/**
+* Parameters handler
+* @package Mambo
+*/
+class mosParameters {
+    /** @var object */
+    var $_params = null;
+    /** @var string The raw params string */
+    var $_raw = null;
+    /**
+* Constructor
+* @param string The raw parms text
+* @param string Path to the xml setup file
+* @var string The type of setup file
+*/
+    function mosParameters( $text, $process_sections = false) {
+        $this->_params = $this->parse( $text, $process_sections );
+        $this->_raw = $text;
+    }
+    /**
+* Get the result of parsing the string provided on creation
+* @return string parsed result
+*/
+    function getParams () {
+        return $this->_params;
+    }
+    /**
+* @param string The name of the param
+* @param string The value of the parameter
+* @return string The set value
+*/
+    function set( $key, $value='' ) {
+        $this->_params->$key = $value;
+        return $value;
+    }
+    /**
+* Sets a default value if not alreay assigned
+* @param string The name of the param
+* @param string The value of the parameter
+* @return string The set value
+*/
+    function def( $key, $value='' ) {
+        return $this->set( $key, $this->get( $key, $value ) );
+    }
+    /**
+* @param string The name of the param
+* @param mixed The default value if not found
+* @return string
+*/
+    function get( $key, $default='' ) {
+        if (isset( $this->_params->$key )) return $this->_params->$key === '' ? $default : $this->_params->$key;
+        else return $default;
+    }
+    /**
+* Look to see if string is bracketed by opener and closer
+* If so, extract and trim the bracketed string
+* Otherwise, return a null string
+**/
+    function getBracketed ($text, $opener, $closer) {
+        if (strlen($text) > 1 AND ($text[0] != $opener OR substr($text,-1) != $closer)) return '';
+        else return trim(substr($text,1,-1));
+    }
+    /**
+* Parse an .ini string, based on phpDocumentor phpDocumentor_parse_ini_file function
+* @param mixed The ini string or array of lines
+* @param boolean add an associative index for each section [in brackets]
+* @return object
+*/
+    function parse( $txt, $process_sections = false ) {
+        $result = new stdClass();
+        if (is_string($txt)) $lines = explode( "\n", $txt );
+        elseif (is_array($txt)) $lines = $txt;
+        else return $result;
+
+        $sec_name = '';
+        $unparsed = 0;
+
+        foreach ($lines as $line) {
+            // ignore comments and null lines
+            $line = trim($line);
+            if (strlen($line) == 0 OR $line[0] == ';') continue;
+
+            if ($sec_name = $this->getBracketed($line, '[', ']')) {
+                if ($process_sections) $result->$sec_name = new stdClass();
+                continue;
+            }
+
+            if (count($propsetter = explode ('=', $line, 2)) == 2) {
+                $property = trim($propsetter[0]);
+                if ($pquoted = $this->getBracketed($property, '"', '"')) $property = stripcslashes($pquoted);
+                $value = trim($propsetter[1]);
+                if ($value == 'false') $value = false;
+                elseif ($value == 'true') $value = true;
+                else if ($vquoted = $this->getBracketed($value, '"', '"')) $value = stripcslashes($vquoted);
+                if ($process_sections AND $sec_name) $result->$sec_name->$property = $value;
+                else $result->$property = $value;
+            }
+            else {
+                $property = '__invalid' . $unparsed++ . '__';
+                if ($process_sections AND $sec_name) $result->$sec_name->$property = $line;
+                else $result->$property = $line;
+            }
+        }
+        return $result;
+    }
+    /**
+	* @param string The name of the control, or the default text area if a setup file is not found
+	* @return string HTML
+	*/
+    function render( $name='params' ) {
+        if (is_file($this->_path)) {
+            $parser = new mosXMLParams ($this->_path, $this, $name);
+            if (count($parser->html)) return implode("\n", $parser->html);
+        }
+        $raw = $this->_raw;
+        return "<textarea name='$name' cols='40' rows='10' class='text_area'>$raw</textarea>";
+    }
+
+    /**
+	* special handling for textarea param
+	*/
+    function textareaHandling( &$txt ) {
+        foreach ($txt as $key=>$value) $txt[$key] = str_replace("\n", '<br />', $value);
+        return implode( "\n", $txt );
+    }
+}
+
+/**
+* Page generation time
+* @package Mambo
+*/
+class mosProfiler {
+    var $start=0;
+    var $prefix='';
+
+    function mosProfiler( $prefix='' ) {
+        $this->start = $this->getmicrotime();
+        $this->prefix = $prefix;
+    }
+
+    function mark( $label ) {
+        return sprintf ( "\n<div class=\"profiler\">$this->prefix %.3f $label</div>", $this->getmicrotime() - $this->start );
+    }
+
+    function getmicrotime(){
+        list($usec, $sec) = explode(" ",microtime());
+        return ((float)$usec + (float)$sec);
+    }
+}
+?>
diff -ruN 4.5.4/includes/database.php 4.6rc2/includes/database.php
--- 4.5.4/includes/database.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/database.php	2006-04-03 12:51:53.000000000 -0500
@@ -1,1101 +1,1052 @@
-<?php
-/**
-* @version $Id: database.php,v 1.3 2005/07/22 03:36:09 eddieajau Exp $
-* @package Mambo
-* @subpackage Database
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* Database connector class
-* @subpackage Database
-* @package Mambo
-*/
-class database {
-	/** @var string Internal variable to hold the query sql */
-	var $_sql='';
-	/** @var int Internal variable to hold the database error number */
-	var $_errorNum=0;
-	/** @var string Internal variable to hold the database error message */
-	var $_errorMsg='';
-	/** @var string Internal variable to hold the prefix used on all database tables */
-	var $_table_prefix='';
-	/** @var Internal variable to hold the connector resource */
-	var $_resource='';
-	/** @var Internal variable to hold the last query cursor */
-	var $_cursor=null;
-	/** @var boolean Debug option */
-	var $_debug=0;
-	/** @var int A counter for the number of queries performed by the object instance */
-	var $_ticker=0;
-	/** @var array A log of queries */
-	var $_log=null;
-
-	/**
-	* Database object constructor
-	* @param string Database host
-	* @param string Database user name
-	* @param string Database user password
-	* @param string Database name
-	* @param string Common prefix for all tables
-	*/
-	function database( $host='localhost', $user, $pass, $db, $table_prefix ) {
-		// perform a number of fatality checks, then die gracefully
-		if (!function_exists( 'mysql_connect' )) {
-			//or die( 'FATAL ERROR: MySQL support not available.  Please check your configuration.' );
-			$mosSystemError = 1;
-			$basePath = dirname( __FILE__ );
-			include $basePath . '/../configuration.php';
-			include $basePath . '/../offline.php';
-			exit();
-		}
-		if (!($this->_resource = @mysql_connect( $host, $user, $pass ))) {
-			//or die( 'FATAL ERROR: Connection to database server failed.' );
-			$mosSystemError = 2;
-			$basePath = dirname( __FILE__ );
-			include $basePath . '/../configuration.php';
-			include $basePath . '/../offline.php';
-			exit();
-		}
-		if (!mysql_select_db($db)) {
-			//or die( "FATAL ERROR: Database not found. Operation failed with error: ".mysql_error());
-			$mosSystemError = 3;
-			$basePath = dirname( __FILE__ );
-			include $basePath . '/../configuration.php';
-			include $basePath . '/../offline.php';
-			exit();
-		}
-		$this->_table_prefix = $table_prefix;
-		$this->_ticker = 0;
-		$this->_log = array();
-	}
-	/**
-	* @param int
-	*/
-	function debug( $level ) {
-	    $this->_debug = intval( $level );
-	}
-	/**
-	* @return int The error number for the most recent query
-	*/
-	function getErrorNum() {
-		return $this->_errorNum;
-	}
-	/**
-	* @return string The error message for the most recent query
-	*/
-	function getErrorMsg() {
-		return str_replace( array( "\n", "'" ), array( '\n', "\'" ), $this->_errorMsg );
-	}
-	/**
-	* Get a database escaped string
-	* @return string
-	*/
-	function getEscaped( $text ) {
-		return mysql_escape_string( $text );
-	}
-	/**
-	* Get a quoted database escaped string
-	* @return string
-	*/
-	function Quote( $text ) {
-		return '\'' . mysql_escape_string( $text ) . '\'';
-	}
-	/**
-	* Sets the SQL query string for later execution.
-	*
-	* This function replaces a string identifier <var>$prefix</var> with the
-	* string held is the <var>_table_prefix</var> class variable.
-	*
-	* @param string The SQL query
-	* @param string The common table prefix
-	*/
-	function setQuery( $sql, $prefix='#__' ) {
-		$this->_sql = $this->replacePrefix($sql, $prefix);
-	}
-
-	/**
-	 * This function replaces a string identifier <var>$prefix</var> with the
-	 * string held is the <var>_table_prefix</var> class variable.
-	 *
-	 * @param string The SQL query
-	 * @param string The common table prefix
-	 * @author thede, David McKinnis
-	 */
-	function replacePrefix( $sql, $prefix='#__' ) {
-		$sql = trim( $sql );
-
-		$escaped = false;
-		$quoteChar = '';
-
-		$n = strlen( $sql );
-
-		$startPos = 0;
-		$literal = '';
-		while ($startPos < $n) {
-			$ip = strpos($sql, $prefix, $startPos);
-			if ($ip === false) {
-				break;
-			}
-
-			$j = strpos( $sql, "'", $startPos );
-			$k = strpos( $sql, '"', $startPos );
-			if (($k !== FALSE) && (($k < $j) || ($j === FALSE))) {
-				$quoteChar	= '"';
-				$j			= $k;
-			} else {
-				$quoteChar	= "'";
-			}
-
-			if ($j === false) {
-				$j = $n;
-			}
-
-			$literal .= str_replace( $prefix, $this->_table_prefix, substr( $sql, $startPos, $j - $startPos ) );
-			$startPos = $j;
-
-			$j = $startPos + 1;
-
-			if ($j >= $n) {
-				break;
-			}
-
-			// quote comes first, find end of quote
-			while (TRUE) {
-				$k = strpos( $sql, $quoteChar, $j );
-				$escaped = false;
-				if ($k === false) {
-					break;
-				}
-				$l = $k - 1;
-				while ($l >= 0 && $sql{$l} == '\\') {
-					$l--;
-					$escaped = !$escaped;
-				}
-				if ($escaped) {
-					$j	= $k+1;
-					continue;
-				}
-				break;
-			}
-			if ($k === FALSE) {
-				// error in the query - no end quote; ignore it
-				break;
-			}
-			$literal .= substr( $sql, $startPos, $k - $startPos + 1 );
-			$startPos = $k+1;
-		}
-		if ($startPos < $n) {
-			$literal .= substr( $sql, $startPos, $n - $startPos );
-		}
-		return $literal;
-	}
-	/**
-	* @return string The current value of the internal SQL vairable
-	*/
-	function getQuery() {
-		return "<pre>" . htmlspecialchars( $this->_sql ) . "</pre>";
-	}
-	/**
-	* Execute the query
-	* @return mixed A database resource if successful, FALSE if not.
-	*/
-	function query() {
-		global $mosConfig_debug;
-		if ($this->_debug) {
-			$this->_ticker++;
-	  		$this->_log[] = $this->_sql;
-		}
-		$this->_errorNum = 0;
-		$this->_errorMsg = '';
-		$this->_cursor = mysql_query( $this->_sql, $this->_resource );
-		if (!$this->_cursor) {
-			$this->_errorNum = mysql_errno( $this->_resource );
-			$this->_errorMsg = mysql_error( $this->_resource )." SQL=$this->_sql";
-			if ($this->_debug) {
-				trigger_error( mysql_error( $this->_resource ), E_USER_NOTICE );
-				//echo "<pre>" . $this->_sql . "</pre>\n";
-				if (function_exists( 'debug_backtrace' )) {
-					foreach( debug_backtrace() as $back) {
-					    if (@$back['file']) {
-						    echo '<br />'.$back['file'].':'.$back['line'];
-						}
-					}
-				}
-			}
-			return false;
-		}
-		return $this->_cursor;
-	}
-
-	function query_batch( $abort_on_error=true, $p_transaction_safe = false) {
-		$this->_errorNum = 0;
-		$this->_errorMsg = '';
-		if ($p_transaction_safe) {
-			$si = mysql_get_server_info();
-			preg_match_all( "/(\d+)\.(\d+)\.(\d+)/i", $si, $m );
-			if ($m[1] >= 4) {
-				$this->_sql = 'START TRANSACTION;' . $this->_sql . '; COMMIT;';
-			} else if ($m[2] >= 23 && $m[3] >= 19) {
-				$this->_sql = 'BEGIN WORK;' . $this->_sql . '; COMMIT;';
-			} else if ($m[2] >= 23 && $m[3] >= 17) {
-				$this->_sql = 'BEGIN;' . $this->_sql . '; COMMIT;';
-			}
-		}
-		$query_split = preg_split ("/[;]+/", $this->_sql);
-		$error = 0;
-		foreach ($query_split as $command_line) {
-			$command_line = trim( $command_line );
-			if ($command_line != '') {
-				$this->_cursor = mysql_query( $command_line, $this->_resource );
-				if (!$this->_cursor) {
-					$error = 1; echo 'xxx ';
-					$this->_errorNum .= mysql_errno( $this->_resource ) . ' ';
-					$this->_errorMsg .= mysql_error( $this->_resource )." SQL=$command_line <br />";
-					if ($abort_on_error) {
-						return $this->_cursor;
-					}
-				}
-			}
-		}
-		return $error ? false : true;
-	}
-
-	/**
-	* Diagnostic function
-	*/
-	function explain() {
-		$temp = $this->_sql;
-		$this->_sql = "EXPLAIN $this->_sql";
-		$this->query();
-
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$first = true;
-
-		$buf = "<table cellspacing=\"1\" cellpadding=\"2\" border=\"0\" bgcolor=\"#000000\" align=\"center\">";
-		$buf .= $this->getQuery();
-		while ($row = mysql_fetch_assoc( $cur )) {
-			if ($first) {
-				$buf .= "<tr>";
-				foreach ($row as $k=>$v) {
-					$buf .= "<th bgcolor=\"#ffffff\">$k</th>";
-				}
-				$buf .= "</tr>";
-				$first = false;
-			}
-			$buf .= "<tr>";
-			foreach ($row as $k=>$v) {
-				$buf .= "<td bgcolor=\"#ffffff\">$v</td>";
-			}
-			$buf .= "</tr>";
-		}
-		$buf .= "</table><br />&nbsp;";
-		mysql_free_result( $cur );
-
-		$this->_sql = $temp;
-
-		return "<div style=\"background-color:#FFFFCC\" align=\"left\">$buf</div>";
-	}
-	/**
-	* @return int The number of rows returned from the most recent query.
-	*/
-	function getNumRows( $cur=null ) {
-		return mysql_num_rows( $cur ? $cur : $this->_cursor );
-	}
-
-	/**
-	* This method loads the first field of the first row returned by the query.
-	*
-	* @return The value returned in the query or null if the query failed.
-	*/
-	function loadResult() {
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$ret = null;
-		if ($row = mysql_fetch_row( $cur )) {
-			$ret = $row[0];
-		}
-		mysql_free_result( $cur );
-		return $ret;
-	}
-	/**
-	* Load an array of single field results into an array
-	*/
-	function loadResultArray($numinarray = 0) {
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$array = array();
-		while ($row = mysql_fetch_row( $cur )) {
-			$array[] = $row[$numinarray];
-		}
-		mysql_free_result( $cur );
-		return $array;
-	}
-	/**
-	* Load a assoc list of database rows
-	* @param string The field name of a primary key
-	* @return array If <var>key</var> is empty as sequential list of returned records.
-	*/
-	function loadAssocList( $key='' ) {
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$array = array();
-		while ($row = mysql_fetch_assoc( $cur )) {
-			if ($key) {
-				$array[$row->$key] = $row;
-			} else {
-				$array[] = $row;
-			}
-		}
-		mysql_free_result( $cur );
-		return $array;
-	}
-	/**
-	* This global function loads the first row of a query into an object
-	*
-	* If an object is passed to this function, the returned row is bound to the existing elements of <var>object</var>.
-	* If <var>object</var> has a value of null, then all of the returned query fields returned in the object.
-	* @param string The SQL query
-	* @param object The address of variable
-	*/
-	function loadObject( &$object ) {
-		if ($object != null) {
-			if (!($cur = $this->query())) {
-				return false;
-			}
-			if ($array = mysql_fetch_assoc( $cur )) {
-				mysql_free_result( $cur );
-				mosBindArrayToObject( $array, $object, null, null, false );
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			if ($cur = $this->query()) {
-				if ($object = mysql_fetch_object( $cur )) {
-					mysql_free_result( $cur );
-					return true;
-				} else {
-					$object = null;
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-	}
-	/**
-	* Load a list of database objects
-	* @param string The field name of a primary key
-	* @return array If <var>key</var> is empty as sequential list of returned records.
-	* If <var>key</var> is not empty then the returned array is indexed by the value
-	* the database key.  Returns <var>null</var> if the query fails.
-	*/
-	function loadObjectList( $key='' ) {
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$array = array();
-		while ($row = mysql_fetch_object( $cur )) {
-			if ($key) {
-				$array[$row->$key] = $row;
-			} else {
-				$array[] = $row;
-			}
-		}
-		mysql_free_result( $cur );
-		return $array;
-	}
-	/**
-	* @return The first row of the query.
-	*/
-	function loadRow() {
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$ret = null;
-		if ($row = mysql_fetch_row( $cur )) {
-			$ret = $row;
-		}
-		mysql_free_result( $cur );
-		return $ret;
-	}
-	/**
-	* Load a list of database rows (numeric column indexing)
-	* @param string The field name of a primary key
-	* @return array If <var>key</var> is empty as sequential list of returned records.
-	* If <var>key</var> is not empty then the returned array is indexed by the value
-	* the database key.  Returns <var>null</var> if the query fails.
-	*/
-	function loadRowList( $key='' ) {
-		if (!($cur = $this->query())) {
-			return null;
-		}
-		$array = array();
-		while ($row = mysql_fetch_array( $cur )) {
-			if ($key) {
-				$array[$row[$key]] = $row;
-			} else {
-				$array[] = $row;
-			}
-		}
-		mysql_free_result( $cur );
-		return $array;
-	}
-	/**
-	* Document::db_insertObject()
-	*
-	* { Description }
-	*
-	* @param [type] $keyName
-	* @param [type] $verbose
-	*/
-	function insertObject( $table, &$object, $keyName = NULL, $verbose=false ) {
-		$fmtsql = "INSERT INTO $table ( %s ) VALUES ( %s ) ";
-		$fields = array();
-		foreach (get_object_vars( $object ) as $k => $v) {
-			if (is_array($v) or is_object($v) or $v === NULL) {
-				continue;
-			}
-			if ($k[0] == '_') { // internal field
-				continue;
-			}
-			$fields[] = "`$k`";
-			$values[] = "'" . $this->getEscaped( $v ) . "'";
-		}
-		$this->setQuery( sprintf( $fmtsql, implode( ",", $fields ) ,  implode( ",", $values ) ) );
-		($verbose) && print "$sql<br />\n";
-		if (!$this->query()) {
-			return false;
-		}
-		$id = mysql_insert_id();
-		($verbose) && print "id=[$id]<br />\n";
-		if ($keyName && $id) {
-			$object->$keyName = $id;
-		}
-		return true;
-	}
-
-	/**
-	* Document::db_updateObject()
-	*
-	* { Description }
-	*
-	* @param [type] $updateNulls
-	*/
-	function updateObject( $table, &$object, $keyName, $updateNulls=true ) {
-		$fmtsql = "UPDATE $table SET %s WHERE %s";
-		$tmp = array();
-		foreach (get_object_vars( $object ) as $k => $v) {
-			if( is_array($v) or is_object($v) or $k[0] == '_' ) { // internal or NA field
-				continue;
-			}
-			if( $k == $keyName ) { // PK not to be updated
-				$where = "$keyName='" . $this->getEscaped( $v ) . "'";
-				continue;
-			}
-			if ($v === NULL && !$updateNulls) {
-				continue;
-			}
-			if( $v == '' ) {
-				$val = "''";
-			} else {
-				$val = "'" . $this->getEscaped( $v ) . "'";
-			}
-			$tmp[] = "`$k`=$val";
-		}
-		$this->setQuery( sprintf( $fmtsql, implode( ",", $tmp ) , $where ) );
-		return $this->query();
-	}
-
-	/**
-	* @param boolean If TRUE, displays the last SQL statement sent to the database
-	* @return string A standised error message
-	*/
-	function stderr( $showSQL = false ) {
-		return "DB function failed with error number $this->_errorNum"
-		."<br /><font color=\"red\">$this->_errorMsg</font>"
-		.($showSQL ? "<br />SQL = <pre>$this->_sql</pre>" : '');
-	}
-
-	function insertid()
-	{
-		return mysql_insert_id();
-	}
-
-	function getVersion()
-	{
-		return mysql_get_server_info();
-	}
-
-	/**
-	* Fudge method for ADOdb compatibility
-	*/
-	function GenID( $foo1=null, $foo2=null ) {
-		return '0';
-	}
-	/**
-	* @return array A list of all the tables in the database
-	*/
-	function getTableList() {
-		$this->setQuery( 'SHOW tables' );
-		$this->query();
-		return $this->loadResultArray();
-	}
-	/**
-	* @param array A list of table names
-	* @return array A list the create SQL for the tables
-	*/
-	function getTableCreate( $tables ) {
-		$result = array();
-
-		foreach ($tables as $tblval) {
-			$this->setQuery( 'SHOW CREATE table ' . $tblval );
-			$this->query();
-			$result[$tblval] = $this->loadResultArray( 1 );
-		}
-
-		return $result;
-	}
-	/**
-	* @param array A list of table names
-	* @return array An array of fields by table
-	*/
-	function getTableFields( $tables ) {
-		$result = array();
-
-		foreach ($tables as $tblval) {
-			$this->setQuery( 'SHOW FIELDS FROM ' . $tblval );
-			$this->query();
-			$fields = $this->loadObjectList();
-			foreach ($fields as $field) {
-				$result[$tblval][$field->Field] = preg_replace("/[(0-9)]/",'', $field->Type );
-			}
-		}
-
-		return $result;
-	}
-}
-
-/**
-* mosDBTable Abstract Class.
-* @abstract
-* @package Mambo
-* @subpackage Database
-*
-* Parent classes to all database derived objects.  Customisation will generally
-* not involve tampering with this object.
-* @package Mambo
-* @author Andrew Eddie <eddieajau@users.sourceforge.net
-*/
-class mosDBTable {
-	/** @var string Name of the table in the db schema relating to child class */
-	var $_tbl = '';
-	/** @var string Name of the primary key field in the table */
-	var $_tbl_key = '';
-	/** @var string Error message */
-	var $_error = '';
-	/** @var mosDatabase Database connector */
-	var $_db = null;
-
-	/**
-	*	Object constructor to set table and key field
-	*
-	*	Can be overloaded/supplemented by the child class
-	*	@param string $table name of the table in the db schema relating to child class
-	*	@param string $key name of the primary key field in the table
-	*/
-	function mosDBTable( $table, $key, &$db ) {
-		$this->_tbl = $table;
-		$this->_tbl_key = $key;
-		$this->_db =& $db;
-	}
-	/**
-	 * Filters public properties
-	 * @access protected
-	 * @param array List of fields to ignore
-	 */
-	function filter( $ignoreList=null ) {
-		$ignore = is_array( $ignoreList );
-
-		$iFilter = new InputFilter();
-		foreach ($this->getPublicProperties() as $k) {
-			if ($ignore && in_array( $k, $ignoreList ) ) {
-				continue;
-			}
-			$this->$k = $iFilter->process( $this->$k );
-		}
-	}
-	/**
-	 *	@return string Returns the error message
-	 */
-	function getError() {
-		return $this->_error;
-	}
-	/**
-	* Gets the value of the class variable
-	* @param string The name of the class variable
-	* @return mixed The value of the class var (or null if no var of that name exists)
-	*/
-	function get( $_property ) {
-		if(isset( $this->$_property )) {
-			return $this->$_property;
-		} else {
-			return null;
-		}
-	}
-	/**
-	 * Returns an array of public properties
-	 * @return array
-	 */
-	function getPublicProperties() {
-		static $cache = null;
-		if (is_null( $cache )) {
-			$cache = array();
-			foreach (get_class_vars( get_class( $this ) ) as $key=>$val) {
-				if (substr( $key, 0, 1 ) != '_') {
-					$cache[] = $key;
-				}
-			}
-		}
-		return $cache;
-	}
-	/**
-	* Set the value of the class variable
-	* @param string The name of the class variable
-	* @param mixed The value to assign to the variable
-	*/
-	function set( $_property, $_value ) {
-		$this->$_property = $_value;
-	}
-	/**
-	*	binds a named array/hash to this object
-	*
-	*	can be overloaded/supplemented by the child class
-	*	@param array $hash named array
-	*	@return null|string	null is operation was satisfactory, otherwise returns an error
-	*/
-	function bind( $array, $ignore="" ) {
-		if (!is_array( $array )) {
-			$this->_error = strtolower(get_class( $this ))."::bind failed.";
-			return false;
-		} else {
-			return mosBindArrayToObject( $array, $this, $ignore );
-		}
-	}
-
-	/**
-	*	binds an array/hash to this object
-	*	@param int $oid optional argument, if not specifed then the value of current key is used
-	*	@return any result from the database operation
-	*/
-	function load( $oid=null ) {
-		$k = $this->_tbl_key;
-		if ($oid !== null) {
-			$this->$k = $oid;
-		}
-		$oid = $this->$k;
-		if ($oid === null) {
-			return false;
-		}
-		$this->_db->setQuery( "SELECT * FROM $this->_tbl WHERE $this->_tbl_key='$oid'" );
-		return $this->_db->loadObject( $this );
-	}
-
-	/**
-	*	generic check method
-	*
-	*	can be overloaded/supplemented by the child class
-	*	@return boolean True if the object is ok
-	*/
-	function check() {
-		return true;
-	}
-
-	/**
-	* Inserts a new row if id is zero or updates an existing row in the database table
-	*
-	* Can be overloaded/supplemented by the child class
-	* @param boolean If false, null object variables are not updated
-	* @return null|string null if successful otherwise returns and error message
-	*/
-	function store( $updateNulls=false ) {
-		$k = $this->_tbl_key;
-		global $migrate;
-		if( $this->$k && !$migrate) {
-			$ret = $this->_db->updateObject( $this->_tbl, $this, $this->_tbl_key, $updateNulls );
-		} else {
-			$ret = $this->_db->insertObject( $this->_tbl, $this, $this->_tbl_key );
-		}
-		if( !$ret ) {
-			$this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->getErrorMsg();
-			return false;
-		} else {
-			return true;
-		}
-	}
-	/**
-	*/
-	function move( $dirn, $where='' ) {
-		$k = $this->_tbl_key;
-
-		$sql = "SELECT $this->_tbl_key, ordering FROM $this->_tbl";
-
-		if ($dirn < 0) {
-			$sql .= "\nWHERE ordering < $this->ordering";
-			$sql .= ($where ? "\n	AND $where" : '');
-			$sql .= "\nORDER BY ordering DESC\nLIMIT 1";
-		} else if ($dirn > 0) {
-			$sql .= "\nWHERE ordering > $this->ordering";
-			$sql .= ($where ? "\n	AND $where" : '');
-			$sql .= "\nORDER BY ordering\nLIMIT 1";
-		} else {
-			$sql .= "\nWHERE ordering = $this->ordering";
-			$sql .= ($where ? "\n	AND $where" : '');
-			$sql .= "\nORDER BY ordering\nLIMIT 1";
-		}
-
-		$this->_db->setQuery( $sql );
-//echo 'A: ' . $this->_db->getQuery();
-
-
-		$row = null;
-		if ($this->_db->loadObject( $row )) {
-			$this->_db->setQuery( "UPDATE $this->_tbl SET ordering='$row->ordering'"
-			. "\nWHERE $this->_tbl_key='".$this->$k."'"
-			);
-
-			if (!$this->_db->query()) {
-			    $err = $this->_db->getErrorMsg();
-			    die( $err );
-			}
-//echo 'B: ' . $this->_db->getQuery();
-
-			$this->_db->setQuery( "UPDATE $this->_tbl SET ordering='$this->ordering'"
-			. "\nWHERE $this->_tbl_key='".$row->$k."'"
-			);
-//echo 'C: ' . $this->_db->getQuery();
-
-			if (!$this->_db->query()) {
-			    $err = $this->_db->getErrorMsg();
-			    die( $err );
-			}
-
-			$this->ordering = $row->ordering;
-		} else {
-			$this->_db->setQuery( "UPDATE $this->_tbl SET ordering='$this->ordering'"
-			. "\nWHERE $this->_tbl_key='".$this->$k."'"
-			);
-//echo 'D: ' . $this->_db->getQuery();
-
-
-			if (!$this->_db->query()) {
-			    $err = $this->_db->getErrorMsg();
-			    die( $err );
-			}
-		}
-	}
-	/**
-	* Compacts the ordering sequence of the selected records
-	* @param string Additional where query to limit ordering to a particular subset of records
-	*/
-	function updateOrder( $where='' ) {
-		$k = $this->_tbl_key;
-
-		if (!array_key_exists( 'ordering', get_class_vars( strtolower(get_class( $this )) ) )) {
-			$this->_error = "WARNING: ".strtolower(get_class( $this ))." does not support ordering.";
-			return false;
-		}
-
-		if ($this->_tbl == "#__content_frontpage") {
-			$order2 = ", content_id DESC";
-		} else {
-			$order2 = "";
-		}
-
-		$this->_db->setQuery( "SELECT $this->_tbl_key, ordering FROM $this->_tbl"
-		. ($where ? "\nWHERE $where" : '')
-		. "\nORDER BY ordering".$order2
-		);
-		if (!($orders = $this->_db->loadObjectList())) {
-			$this->_error = $this->_db->getErrorMsg();
-			return false;
-		}
-		// first pass, compact the ordering numbers
-		for ($i=0, $n=count( $orders ); $i < $n; $i++) {
-			if ($orders[$i]->ordering >= 0) {
-				$orders[$i]->ordering = $i+1;
-			}
-		}
-
-		$shift = 0;
-		$n=count( $orders );
-		for ($i=0; $i < $n; $i++) {
-			//echo "i=$i id=".$orders[$i]->$k." order=".$orders[$i]->ordering;
-			if ($orders[$i]->$k == $this->$k) {
-				// place 'this' record in the desired location
-				$orders[$i]->ordering = min( $this->ordering, $n );
-				$shift = 1;
-			} else if ($orders[$i]->ordering >= $this->ordering && $this->ordering > 0) {
-				$orders[$i]->ordering++;
-			}
-		}
-	//echo '<pre>';print_r($orders);echo '</pre>';
-		// compact once more until I can find a better algorithm
-		for ($i=0, $n=count( $orders ); $i < $n; $i++) {
-			if ($orders[$i]->ordering >= 0) {
-				$orders[$i]->ordering = $i+1;
-				$this->_db->setQuery( "UPDATE $this->_tbl"
-				. "\nSET ordering='".$orders[$i]->ordering."' WHERE $k='".$orders[$i]->$k."'"
-				);
-				$this->_db->query();
-	//echo '<br />'.$this->_db->getQuery();
-			}
-		}
-
-		// if we didn't reorder the current record, make it last
-		if ($shift == 0) {
-			$order = $n+1;
-			$this->_db->setQuery( "UPDATE $this->_tbl"
-			. "\nSET ordering='$order' WHERE $k='".$this->$k."'"
-			);
-			$this->_db->query();
-	//echo '<br />'.$this->_db->getQuery();
-		}
-		return true;
-	}
-	/**
-	*	Generic check for whether dependancies exist for this object in the db schema
-	*
-	*	can be overloaded/supplemented by the child class
-	*	@param string $msg Error message returned
-	*	@param int Optional key index
-	*	@param array Optional array to compiles standard joins: format [label=>'Label',name=>'table name',idfield=>'field',joinfield=>'field']
-	*	@return true|false
-	*/
-	function canDelete( $oid=null, $joins=null ) {
-		$k = $this->_tbl_key;
-		if ($oid) {
-			$this->$k = intval( $oid );
-		}
-		if (is_array( $joins )) {
-			$select = "$k";
-			$join = "";
-			foreach( $joins as $table ) {
-				$select .= ",\nCOUNT(DISTINCT {$table['idfield']}) AS {$table['idfield']}";
-				$join .= "\nLEFT JOIN {$table['name']} ON {$table['joinfield']} = $k";
-			}
-			$this->_db->setQuery( "SELECT $select\nFROM $this->_tbl\n$join\nWHERE $k = ".$this->$k." GROUP BY $k" );
-
-			if ($obj = $this->_db->loadObject()) {
-				$this->_error = $this->_db->getErrorMsg();
-				return false;
-			}
-			$msg = array();
-			foreach( $joins as $table ) {
-				$k = $table['idfield'];
-				if ($obj->$k) {
-					$msg[] = $AppUI->_( $table['label'] );
-				}
-			}
-
-			if (count( $msg )) {
-				$this->_error = "noDeleteRecord" . ": " . implode( ', ', $msg );
-				return false;
-			} else {
-				return true;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	*	Default delete method
-	*
-	*	can be overloaded/supplemented by the child class
-	*	@return true if successful otherwise returns and error message
-	*/
-	function delete( $oid=null ) {
-		//if (!$this->canDelete( $msg )) {
-		//	return $msg;
-		//}
-
-		$k = $this->_tbl_key;
-		if ($oid) {
-			$this->$k = intval( $oid );
-		}
-
-		$this->_db->setQuery( "DELETE FROM $this->_tbl WHERE $this->_tbl_key = '".$this->$k."'" );
-
-		if ($this->_db->query()) {
-			return true;
-		} else {
-			$this->_error = $this->_db->getErrorMsg();
-			return false;
-		}
-	}
-
-	function checkout( $who, $oid=null ) {
-		if (!array_key_exists( 'checked_out', get_class_vars( strtolower(get_class( $this )) ) )) {
-			$this->_error = "WARNING: ".strtolower(get_class( $this ))." does not support checkouts.";
-			return false;
-		}
-		$k = $this->_tbl_key;
-		if ($oid !== null) {
-			$this->$k = $oid;
-		}
-		$time = date( "%Y-%m-%d H:i:s" );
-		if (intval( $who )) {
-			// new way of storing editor, by id
-			$this->_db->setQuery( "UPDATE $this->_tbl"
-			. "\nSET checked_out='$who', checked_out_time='$time'"
-			. "\nWHERE $this->_tbl_key='".$this->$k."'"
-			);
-		} else {
-			// old way of storing editor, by name
-			$this->_db->setQuery( "UPDATE $this->_tbl"
-			. "\nSET checked_out='1', checked_out_time='$time', editor='".$who."' "
-			. "\nWHERE $this->_tbl_key='".$this->$k."'"
-			);
-		}
-		return $this->_db->query();
-	}
-
-	function checkin( $oid=null ) {
-		if (!array_key_exists( 'checked_out', get_class_vars( strtolower(get_class( $this )) ) )) {
-			$this->_error = "WARNING: ".strtolower(get_class( $this ))." does not support checkin.";
-			return false;
-		}
-		$k = $this->_tbl_key;
-		if ($oid !== null) {
-			$this->$k = $oid;
-		}
-		$time = date("H:i:s");
-		$this->_db->setQuery( "UPDATE $this->_tbl"
-		. "\nSET checked_out='0', checked_out_time='0000-00-00 00:00:00'"
-		. "\nWHERE $this->_tbl_key='".$this->$k."'"
-		);
-		return $this->_db->query();
-	}
-
-	function hit( $oid=null ) {
-		global $mosConfig_enable_log_items;
-
-		$k = $this->_tbl_key;
-		if ($oid !== null) {
-			$this->$k = intval( $oid );
-		}
-		$this->_db->setQuery( "UPDATE $this->_tbl SET hits=(hits+1) WHERE $this->_tbl_key='$this->id'" );
-		$this->_db->query();
-
-		if (@$mosConfig_enable_log_items) {
-			$now = date( "Y-m-d" );
-			$this->_db->setQuery( "SELECT hits"
-			. "\nFROM #__core_log_items"
-			. "\nWHERE time_stamp='$now' AND item_table='$this->_tbl' AND item_id='".$this->$k."'"
-			);
-			$hits = intval( $this->_db->loadResult() );
-			if ($hits) {
-				$this->_db->setQuery( "UPDATE #__core_log_items SET hits=(hits+1)"
-				. "\nWHERE time_stamp='$now' AND item_table='$this->_tbl' AND item_id='".$this->$k."'"
-				);
-				$this->_db->query();
-			} else {
-				$this->_db->setQuery( "INSERT INTO #__core_log_items VALUES"
-				. "\n('$now','$this->_tbl','".$this->$k."','1')"
-				);
-				$this->_db->query();
-			}
-		}
-	}
-
-	/**
-	* Generic save function
-	* @param array Source array for binding to class vars
-	* @param string Filter for the order updating
-	* @returns TRUE if completely successful, FALSE if partially or not succesful.
-	*/
-	function save( $source, $order_filter ) {
-		if (!$this->bind( $_POST )) {
-			return false;
-		}
-		if (!$this->check()) {
-			return false;
-		}
-		if (!$this->store()) {
-			return false;
-		}
-		if (!$this->checkin()) {
-			return false;
-		}
-		$filter_value = $this->$order_filter;
-		$this->updateOrder( $order_filter ? "`$order_filter`='$filter_value'" : "" );
-		$this->_error = '';
-		return true;
-	}
-
-	/**
-	* Generic Publish/Unpublish function
-	* @param array An array of id numbers
-	* @param integer 0 if unpublishing, 1 if publishing
-	* @param integer The id of the user performnig the operation
-	*/
-	function publish_array( $cid=null, $publish=1, $myid=0 ) {
-		if (!is_array( $cid ) || count( $cid ) < 1) {
-			$this->_error = "No items selected.";
-			return false;
-		}
-
-		$cids = implode( ',', $cid );
-
-		$this->_db->setQuery( "UPDATE $this->_tbl SET published='$publish'"
-		. "\nWHERE $this->_tbl_key IN ($cids) AND (checked_out=0 OR (checked_out='$myid'))"
-		);
-		if (!$this->_db->query()) {
-			$this->_error = $this->_db->getErrorMsg();
-			return false;
-		}
-
-		if (count( $cid ) == 1) {
-			$this->checkin( $cid[0] );
-		}
-		$this->_error = '';
-		return true;
-	}
-
-	/**
-	* Export item list to xml
-	* @param boolean Map foreign keys to text values
-	*/
-	function toXML( $mapKeysToText=false ) {
-		$xml = '<record table="' . $this->_tbl . '"';
-		if ($mapKeysToText) {
-			$xml .= ' mapkeystotext="true"';
-		}
-		$xml .= '>';
-		foreach (get_object_vars( $this ) as $k => $v) {
-			if (is_array($v) or is_object($v) or $v === NULL) {
-				continue;
-			}
-			if ($k[0] == '_') { // internal field
-				continue;
-			}
-			$xml .= '<' . $k . '><![CDATA[' . $v . ']]></' . $k . '>';
-		}
-		$xml .= '</record>';
-
-		return $xml;
-	}
-}
-?>
\ No newline at end of file
+<?php
+/**
+* @package Mambo Open Source
+* @subpackage Database
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/**
+* Database connector class
+*/
+class database {
+	/** @var string Internal variable to hold the query sql */
+	var $_sql='';
+	/** @var int Internal variable to hold the database error number */
+	var $_errorNum=0;
+	/** @var string Internal variable to hold the database error message */
+	var $_errorMsg='';
+	/** @var string Internal variable to hold the prefix used on all database tables */
+	var $_table_prefix='';
+	/** @var Internal variable to hold the connector resource */
+	var $_resource='';
+	/** @var Internal variable to hold the last query cursor */
+	var $_cursor=null;
+	/** @var boolean Debug option */
+	var $_debug=0;
+	/** @var array A log of queries */
+	var $_log=array();
+	/** @var string Null date */
+	var $_null_date='0000-00-00 00:00:00';
+
+	/**
+	* Database object constructor
+	* @param string Database host
+	* @param string Database user name
+	* @param string Database user password
+	* @param string Database name
+	* @param string Common prefix for all tables
+	*/
+	function database( $host='localhost', $user, $pass, $db, $table_prefix ) {
+		// perform a number of fatality checks, then die gracefully
+		if (!function_exists( 'mysql_connect' )) $this->forceOffline(1);
+		if (!($this->_resource = @mysql_connect( $host, $user, $pass ))) $this->forceOffline(2);
+		if (!mysql_select_db($db)) $this->forceOffline(3);
+		$this->_table_prefix = $table_prefix;
+	}
+
+	function forceOffline ($error_number) {
+			$mosSystemError = $error_number;
+			$basePath = dirname( __FILE__ );
+			include $basePath . '/../configuration.php';
+			include $basePath . '/../offline.php';
+			exit();
+	}
+	
+	function getNullDate () {
+	    return $this->_null_date;
+	}
+	/**
+	* @param int
+	*/
+	function debug( $level ) {
+	    $this->_debug = intval( $level );
+	}
+
+	function debug_trace () {
+		trigger_error( $this->_errorNum, E_USER_NOTICE );
+		//echo "<pre>" . $this->_sql . "</pre>\n";
+		if (function_exists('debug_backtrace')) {
+			foreach(debug_backtrace() as $back) {
+			    if (@$back['file']) {
+				    echo '<br />'.$back['file'].':'.$back['line'];
+				}
+			}
+		}
+	}
+	/**
+	* @return int The error number for the most recent query
+	*/
+	function getErrorNum() {
+		return $this->_errorNum;
+	}
+	/**
+	* @return string The error message for the most recent query
+	*/
+	function getErrorMsg() {
+		return str_replace( array( "\n", "'" ), array( '\n', "\'" ), $this->_errorMsg );
+	}
+	/**
+	* Get a database escaped string
+	* @return string
+	*/
+	function getEscaped( $text ) {
+		return mysql_escape_string( $text );
+	}
+	/**
+	* Get a quoted database escaped string
+	* @return string
+	*/
+	function Quote( $text ) {
+		return '\'' . mysql_escape_string( $text ) . '\'';
+	}
+	/**
+	* Sets the SQL query string for later execution.
+	*
+	* @param string The SQL query
+	*/
+	function setBareQuery ($sql) {
+		$this->_sql = $sql;
+	}
+	/**
+	* Sets the SQL query string for later execution.
+	*
+	* This function replaces a string identifier <var>$prefix</var> with the
+	* string held is the <var>_table_prefix</var> class variable.
+	*
+	* @param string The SQL query
+	* @param string The common table prefix
+	*/
+	function setQuery( $sql, $prefix='#__' ) {
+		$this->setBareQuery ($this->replacePrefix($sql, $prefix));
+//      This is maintenance code for catching particular SQL statements
+//		if (strpos($this->_sql,'SELECT menutype') === 0) debug_print_backtrace();
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the
+	 * string held is the <var>_table_prefix</var> class variable.
+	 *
+	 * @param string The SQL query
+	 * @param string The common table prefix
+	 * @author thede, David McKinnis
+	 */
+	function replacePrefix ($sql, $prefix='#__') {
+		$done = '';
+		while (strlen($sql)) {
+			$single = preg_match("/\'([^\\\']|\\.)*'/", $sql,$matches_single,PREG_OFFSET_CAPTURE);
+			if ($double = preg_match('/\"([^\\\"]|\\.)*"/', $sql,$matches_double,PREG_OFFSET_CAPTURE) OR $single) {
+				if ($single == 0 OR ($double AND $matches_double[0][1] < $matches_single[0][1])) {
+					$done .= str_replace($prefix, $this->_table_prefix, substr($sql,0,$matches_double[0][1])).$matches_double[0][0];
+					$sql = substr($sql,$matches_double[0][1]+strlen($matches_double[0][0]));
+				}
+				else {
+					$done .= str_replace($prefix, $this->_table_prefix, substr($sql,0,$matches_single[0][1])).$matches_single[0][0];
+					$sql = substr($sql,$matches_single[0][1]+strlen($matches_single[0][0]));
+				}
+			}
+			else return $done.str_replace($prefix, $this->_table_prefix,$sql);
+		}
+		return $done;
+	}
+	/**
+	* @return string The current value of the internal SQL vairable
+	*/
+	function getQuery($sql='') {
+		if ($sql == '') $sql = $this->_sql;
+		return "<pre>" . htmlspecialchars( $sql ) . "</pre>";
+	}
+	/**
+	* Execute the query
+	* @return mixed A database resource if successful, FALSE if not.
+	*/
+	function query($sql = '') {
+		global $mosConfig_debug;
+		if ($sql == '') $sql = $this->_sql;
+		if ($this->_debug) $this->_log[] = $sql;
+		if ($this->_cursor = mysql_query($sql, $this->_resource)) {
+			$this->_errorNum = 0;
+			$this->_errorMsg = '';
+			return $this->_cursor;
+		}
+		else {
+			$this->_errorNum = mysql_errno( $this->_resource );
+			$this->_errorMsg = mysql_error( $this->_resource )." SQL=$sql";
+			if ($this->_debug) $this->debug_trace();
+			return false;
+		}
+	}
+
+	function query_batch( $abort_on_error=true, $p_transaction_safe = false) {
+		$this->_errorNum = 0;
+		$this->_errorMsg = '';
+		if ($p_transaction_safe) {
+			$si = mysql_get_server_info();
+			preg_match_all( "/(\d+)\.(\d+)\.(\d+)/i", $si, $m );
+			$prefix = '';
+			if ($m[1] >= 4) $prefix = 'START TRANSACTION; ';
+			elseif ($m[2] >= 23) {
+				if ($m[3] >= 19) $prefix = 'BEGIN WORK; ';
+				elseif ($m[3] >= 17) $prefix = 'BEGIN; ';
+			}
+			if ($prefix) $this->_sql = $prefix.$this->_sql.'; COMMIT;';
+		}
+		$query_split = preg_split ("/[;]+/", $this->_sql);
+		$error = 0;
+		foreach ($query_split as $command_line) {
+			$command_line = trim( $command_line );
+			if ($command_line != '') {
+				if (!$this->query($command_line)) {
+					$error = 1; echo 'xxx ';
+					if ($abort_on_error) {
+						return $this->_cursor;
+					}
+				}
+			}
+		}
+		return $error ? false : true;
+	}
+
+	/**
+	* Diagnostic function
+	*/
+	function explain() {
+		if (!($cur = $this->query("EXPLAIN ".$this->_sql))) return null;
+		$headline = $header = $body = '';
+		$buf = '<table cellspacing="1" cellpadding="2" border="0" bgcolor="#000000" align="center">';
+		$buf .= $this->getQuery("EXPLAIN ".$this->_sql);
+		while ($row = mysql_fetch_assoc($cur)) {
+			$body .= "<tr>";
+			foreach ($row as $k=>$v) {
+				if ($headline == '') $header .= "<th bgcolor=\"#ffffff\">$k</th>";
+				$body .= "<td bgcolor=\"#ffffff\">$v</td>";
+			}
+			$headline = $header;
+			$body .= "</tr>";
+		}
+		$buf .= "<tr>$headline</tr>$body</table><br />&nbsp;";
+		mysql_free_result( $cur );
+		return "<div style=\"background-color:#FFFFCC\" align=\"left\">$buf</div>";
+	}
+	/**
+	* @return int The number of rows returned from the most recent query - SELECT only
+	*/
+	function getNumRows( $cur=null ) {
+		return mysql_num_rows( $cur ? $cur : $this->_cursor );
+	}
+
+	/**
+	* @return int The number of rows affected by the most recent query - INSERT, UPDATE, DELETE
+	*/
+	function getAffectedRows(  ) {
+		return mysql_affected_rows( $this->_resource );
+	}
+
+	/**
+	* Load an array of retrieved database objects or values
+	* @param int Database cursor
+	* @param string The field name of a primary key
+	* @return array If <var>key</var> is empty as sequential list of returned records.
+	* If <var>key</var> is not empty then the returned array is indexed by the value
+	* the database key.  Returns <var>null</var> if the query fails.
+	*/
+	function &retrieveResults ($key='', $max=0, $result_type='row') {
+		$results = array();
+		$sql_function = 'mysql_fetch_'.$result_type;
+		if ($cur = $this->query()) {
+			while ($row = $sql_function($cur)) {
+				if ($key != '') $results[$row->$key] = $row;
+				else $results[] = $row;
+				if ($max AND count($results) >= $max) break;
+			}
+			mysql_free_result($cur);
+		}
+		return $results;
+	}
+	/**
+	* This method loads the first field of the first row returned by the query.
+	*
+	* @return The value returned in the query or null if the query failed.
+	*/
+	function loadResult() {
+		$results =& $this->retrieveResults('', 1, 'row');
+		if (count($results)) return $results[0][0];
+		else return null;
+	}
+
+	/**
+	* Load an array of single field results into an array
+	*/
+	function loadResultArray($numinarray = 0) {
+		$results =& $this->retrieveResults('', 0, 'row');
+		$values = array();
+		foreach ($results as $result) $values[] = $result[$numinarray];
+		if (count($values)) return $values;
+		else return null;
+	}
+	/**
+	* Load a assoc list of database rows
+	* @param string The field name of a primary key
+	* @return array If <var>key</var> is empty as sequential list of returned records.
+	*/
+	function loadAssocList( $key='' ) {
+		$results =& $this->retrieveResults($key, 0, 'assoc');
+		if (count($results)) return $results[0][0];
+		else return null;
+	}
+	/**
+	* Copy the named array content into the object as properties
+	* only existing properties of object are filled. when undefined in hash, properties wont be deleted
+	* @param array the input array
+	* @param obj byref the object to fill of any class
+	* @param string
+	* @param boolean
+	*/
+	function mosBindArrayToObject( $array, &$obj, $ignore='', $prefix=NULL, $checkSlashes=true ) {
+		if (!is_array($array) OR !is_object($obj)) return false;
+		if ($prefix == null) $prefix = '';
+		foreach (get_object_vars($obj) as $k => $v) {
+			if( substr( $k, 0, 1 ) != '_' AND strpos($ignore, $k) === false) {
+				if (isset($array[$prefix.$k])) {
+					$obj->$k = ($checkSlashes AND get_magic_quotes_gpc()) ? $this->mosStripslashes( $array[$prefix.$k] ) : $array[$prefix.$k];
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	* Strip slashes from strings or arrays of strings
+	* @param value the input string or array
+	*/
+	function mosStripslashes(&$value) {
+	    if (is_string($value)) $ret = stripslashes($value);
+		else {
+		    if (is_array($value)) {
+		        $ret = array();
+		        while (list($key,$val) = each($value)) {
+		            $ret[$key] = $this->mosStripslashes($val);
+		        } // while
+		    } else $ret = $value;
+		} // if
+	    return $ret;
+	} // mosStripSlashes
+
+	/**
+	* This global function loads the first row of a query into an object
+	*
+	* If an object is passed to this function, the returned row is bound to the existing elements of <var>object</var>.
+	* If <var>object</var> has a value of null, then all of the returned query fields returned in the object.
+	* @param string The SQL query
+	* @param object The address of variable
+	*/
+	function loadObject( &$object ) {
+		if ($object != null) {
+			$results =& $this->retrieveResults('', 1, 'assoc');
+			if (count($results)) {
+				$this->mosBindArrayToObject($results[0], $object, null, null, false);
+				return true;
+			}
+		}
+		else {
+			$results =& $this->retrieveResults('', 1, 'object');
+			if (count($results)) {
+				$object = $results[0];
+				return true;
+			}
+			else $object = null;
+		}
+		return false;
+	}
+	/**
+	* Load a list of database objects
+	* @param string The field name of a primary key
+	* @return array If <var>key</var> is empty as sequential list of returned records.
+	* If <var>key</var> is not empty then the returned array is indexed by the value
+	* the database key.  Returns <var>null</var> if the query fails.
+	*/
+	function loadObjectList( $key='' ) {
+		$results =& $this->retrieveResults($key, 0, 'object');
+		if (count($results)) return $results;
+		else return null;
+	}
+	/**
+	* @return The first row of the query.
+	*/
+	function loadRow() {
+		$results =& $this->retrieveResults('', 1, 'row');
+		if (count($results)) return $results[0];
+		else return null;
+	}
+	/**
+	* Load a list of database rows (numeric column indexing)
+	* @param string The field name of a primary key
+	* @return array If <var>key</var> is empty as sequential list of returned records.
+	* If <var>key</var> is not empty then the returned array is indexed by the value
+	* the database key.  Returns <var>null</var> if the query fails.
+	*/
+	function loadRowList( $key='' ) {
+		$results =& $this->retrieveResults('', 0, 'row');
+		if (count($results)) return $results;
+		else return null;
+	}
+
+	/**
+	* Document::db_insertObject()
+	*
+	* { Description }
+	*
+	* @param [type] $keyName
+	* @param [type] $verbose
+	*/
+	function insertObject( $table, &$object, $keyName = NULL, $verbose=false ) {
+		$fmtsql = "INSERT INTO $table ( %s ) VALUES ( %s ) ";
+		$fmtsql = $this->replacePrefix($fmtsql);
+		$fields = array();
+		foreach (get_object_vars( $object ) as $k => $v) {
+			if (is_array($v) OR is_object($v) OR $v === NULL OR $k[0] == '_') continue;
+			$fields[] = "`$k`";
+			$values[] = "'" . $this->getEscaped( $v ) . "'";
+		}
+		if (!isset($fields)) die ('class database method insertObject - no fields');
+		$this->setBareQuery( sprintf( $fmtsql, implode( ",", $fields ), implode( ",", $values ) ) );
+		($verbose) && print "$sql<br />\n";
+		if (!$this->query()) return false;
+		$id = mysql_insert_id();
+		($verbose) && print "id=[$id]<br />\n";
+		if ($keyName && $id) $object->$keyName = $id;
+		return true;
+	}
+
+	/**
+	* Document::db_updateObject()
+	*
+	* { Description }
+	*
+	* @param [type] $updateNulls
+	*/
+	function updateObject( $table, &$object, $keyName, $updateNulls=true ) {
+		$fmtsql = "UPDATE $table SET %s WHERE %s";
+		$fmtsql = $this->replacePrefix($fmtsql);
+		$tmp = array();
+		foreach (get_object_vars( $object ) as $k => $v) {
+			if (is_array($v) OR is_object($v) OR $k[0] == '_' OR ($v === null AND !$updateNulls)) continue;
+			if( $k == $keyName ) { // PK not to be updated
+				$where = "$keyName='" . $this->getEscaped( $v ) . "'";
+				continue;
+			}
+			if ($v) $v = $this->getEscaped($v);
+			$tmp[] = "`$k`='$v'";
+		}
+		if (!isset($tmp)) return true;
+		if (!isset($where)) die ('database class updateObject method - no key value');
+		$this->setBareQuery( sprintf( $fmtsql, implode( ",", $tmp ) , $where ) );
+		return $this->query();
+	}
+
+	/**
+	* @param boolean If TRUE, displays the last SQL statement sent to the database
+	* @return string A standised error message
+	*/
+	function stderr( $showSQL = false ) {
+		return "DB function failed with error number $this->_errorNum"
+		."<br /><font color=\"red\">$this->_errorMsg</font>"
+		.($showSQL ? "<br />SQL = <pre>$this->_sql</pre>" : '');
+	}
+
+	function insertid()
+	{
+		return mysql_insert_id();
+	}
+
+	function getVersion()
+	{
+		return mysql_get_server_info();
+	}
+
+	/**
+	* Fudge method for ADOdb compatibility
+	*/
+	function GenID( $foo1=null, $foo2=null ) {
+		return '0';
+	}
+	/**
+	* @return array A list of all the tables in the database
+	*/
+	function getTableList() {
+		$this->setQuery( 'SHOW tables' );
+		$this->query();
+		return $this->loadResultArray();
+	}
+	/**
+	* @param array A list of table names
+	* @return array A list the create SQL for the tables
+	*/
+	function getTableCreate( $tables ) {
+		$result = array();
+
+		foreach ($tables as $tblval) {
+			$this->setQuery( 'SHOW CREATE table ' . $tblval );
+			$this->query();
+			$result[$tblval] = $this->loadResultArray( 1 );
+		}
+
+		return $result;
+	}
+	/**
+	* @param array A list of table names
+	* @return array An array of fields by table
+	*/
+	function getTableFields( $tables ) {
+		$result = array();
+
+		foreach ($tables as $tblval) {
+			$this->setQuery( 'SHOW FIELDS FROM ' . $tblval );
+			$this->query();
+			$fields = $this->loadObjectList();
+			foreach ($fields as $field) {
+				$result[$tblval][$field->Field] = preg_replace("/[(0-9)]/",'', $field->Type );
+			}
+		}
+
+		return $result;
+	}
+
+	function displayLogged () {
+		echo count($this->_log).' queries executed';
+		echo '<pre>';
+	 	foreach ($this->_log as $k=>$sql) {
+	 	    echo $k+1 . "\n" . $sql . '<hr />';
+		}
+	}
+
+	/* Helper method - maybe should go into database itself */
+	function doSQL ($sql) {
+		$this->setQuery($sql);
+		if (!$this->query()) {
+			echo "<script> alert('".$this->getErrorMsg()."'); window.history.go(-1); </script>\n";
+			exit();
+		}
+	}
+
+	/* Helper method - maybe could go into database itself */
+	function &doSQLget ($sql, $classname) {
+		$this->setQuery($sql);
+		$rows = $this->loadObjectList();
+		$target = get_class_vars($classname);
+		if ($rows) {
+			foreach ($rows as $row) {
+				$next = new $classname(0);
+				foreach ($target as $field=>$value) {
+					if (isset($row->$field)) $next->$field = $row->$field;
+				}
+				$result[] = $next;
+			}
+		}
+		else $result = array();
+		return $result;
+	}
+
+
+}
+
+class mamboDatabase extends database {
+
+	function mamboDatabase () {
+		$host = mamboCore::get('mosConfig_host');
+		$user = mamboCore::get('mosConfig_user');
+		$pw = mamboCore::get('mosConfig_password');
+		$db = mamboCore::get('mosConfig_db');
+		$prefix = mamboCore::get('mosConfig_dbprefix');
+		parent::database($host, $user, $pw, $db, $prefix);
+	}
+
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) $instance = new mamboDatabase();
+		return $instance;
+	}
+}
+
+/**
+* mosDBAbstractRow Abstract Class.
+* @abstract
+* @package Mambo
+* @subpackage Database
+*
+* Parent classes to all database derived objects.  Customisation will generally
+* not involve tampering with this object.
+* @package Mambo
+* @author Martin Brampton counterpoint@mambo-foundation.org
+*/
+class mosDBAbstractRow {
+	/** @var string Name of the table in the db schema relating to child class */
+	var $_tbl = '';
+	/** @var string Name of the primary key field in the table */
+	var $_tbl_key = '';
+	/** @var string Error message */
+	var $_error = '';
+
+	/**
+	*	Object constructor to set table and key field
+	*
+	*	Can be overloaded/supplemented by the child class
+	*	@param string $table name of the table in the db schema relating to child class
+	*	@param string $key name of the primary key field in the table
+	*/
+	function mosDBAbstractRow ($table='', $keyname='id', $db='') {
+		if ($table) $this->_tbl = $table;
+		else $this->_tbl = $this->tableName();
+		$this->_tbl_key = $keyname;
+		if (is_object($db)) $this->_db = $db;
+	}
+
+	/**
+	*	generic check method
+	*
+	*	can be overloaded/supplemented by the child class
+	*	@return boolean True if the object is ok
+	*/
+	function check() {
+		return true;
+	}
+
+	/**
+	* Checks if this object lacks the property given by the parameter
+	* @param string The name of the property
+	* @return bool
+	*/
+	function lacks( $property ) {
+		$thisclass = get_class($this);
+		if (array_key_exists( $property, get_class_vars($thisclass) )) return false;
+		$this->_error = T_(sprintf('WARNING: %s does not support %s.', $thisclass, $property));
+		return true;
+	}
+
+	/**
+	/* Move a database row object up or down through the ordering
+	/* @param int positive to move up, negative to move down
+	/* @param string Additional conditions on the WHERE clause to limit the effect
+	*/
+	function move( $direction, $where='' ) {
+		$compops = array (-1 => '<', 0 => '=', 1 => '>');
+		$relation = $compops[($direction>0)-($direction<0)];
+		$ordering = ($relation == '<' ? 'DESC' : 'ASC');
+		$k = $this->_tbl_key;
+		$o1 = $this->ordering;
+		$k1 = $this->$k;
+		$database = isset($this->_db) ? $this->_db : mamboDatabase::getInstance();
+		$sql = "SELECT $k, ordering FROM $this->_tbl WHERE ordering $relation $o1";
+		$sql .= ($where ? "\n AND $where" : '').' ORDER BY ordering '.$ordering.' LIMIT 1';
+		$database->setQuery( $sql );
+		if ($database->loadObject($row)) {
+			$o2 = $row->ordering;
+			$k2 = $row->$k;
+			$sql = "UPDATE $this->_tbl SET ordering = (ordering=$o1)*$o2 + (ordering=$o2)*$o1 WHERE $k = $k1 OR $k = $k2";
+			$database->doSQL($sql);
+		}
+	}
+	/**
+	* Compacts the ordering sequence of the selected records
+	* @param string Additional conditions on WHERE clause to limit ordering to a particular subset of records
+	*/
+	function updateOrder( $where='', $cfid=null, $order=null ) {
+		if ($this->lacks('ordering')) return false;
+		$k = $this->_tbl_key;
+		if ($this->_tbl == "#__content_frontpage") $order2 = ", content_id DESC";
+		else $order2 = "";
+
+		$database = isset($this->_db) ? $this->_db : mamboDatabase::getInstance();
+		
+		if (!is_null($cfid) AND !is_null($order)) {
+			foreach ($cfid as $i=>$id) {
+				$o = intval($order[$i]);
+				$set[] = "(id=$id)*$o";
+			}
+			$sql = "UPDATE $this->_tbl SET ordering = ".implode(' + ', $set).' WHERE id IN ('.implode(',', $cfid).')';
+			$database->doSQL($sql);
+		}
+		
+		$sql = "SELECT $k, ordering FROM $this->_tbl "
+		. ($where ? "\nWHERE $where" : '')
+		. "\nORDER BY ordering$order2";
+		$database->setQuery($sql);
+		if (!$rows = $database->loadObjectList()) {
+			$this->_error = $database->getErrorMsg();
+			return false;
+		}
+		$i = 1;
+		foreach ($rows as $row) {
+			$sql = "UPDATE $this->_tbl SET ordering=$i WHERE $k = ".$row->$k;
+			$database->doSQL($sql);
+			$i++;
+		}
+		return true;
+	}
+
+}
+	
+
+/**
+* mosDBTable Abstract Class.
+* @abstract
+* @package Mambo
+* @subpackage Database
+*
+* Parent classes to all database derived objects.  Customisation will generally
+* not involve tampering with this object.
+* @package Mambo
+* @author Andrew Eddie <eddieajau@users.sourceforge.net
+*/
+class mosDBTable extends mosDBAbstractRow {
+	/** @var mosDatabase Database connector */
+	var $_db = null;
+
+	/**
+	 *	@return bool True if DB query failed.  Sets the error message
+	 */
+	function queryTestFailure () {
+		if ($this->_db->query()) return false;
+		$this->_error = $this->_db->getErrorMsg();
+		return true;
+	}
+	/**
+	 * Filters public properties
+	 * @access protected
+	 * @param array List of fields to ignore
+	 */
+	function filter( $ignoreList=null ) {
+		$callcheck = array('InputFilter', 'process');
+		if (!is_callable($callcheck)) require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpInputFilter/class.inputfilter.php');
+		// specific filters
+		$iFilter =& new InputFilter();
+		if (is_array($ignoreList)) foreach ($this->getPublicProperties() as $k) {
+			if (!in_array($k, $ignoreList)) $this->$k = $iFilter->process($this->$k);
+		}
+		else foreach ($this->getPublicProperties() as $k) $this->$k = $iFilter->process($this->$k);
+	}
+	/**
+	 *	@return string Returns the error message
+	 */
+	function getError() {
+		return $this->_error;
+	}
+	/**
+	* Gets the value of the class variable
+	* @param string The name of the class variable
+	* @return mixed The value of the class var (or null if no var of that name exists)
+	*/
+	function get( $_property ) {
+		if(isset( $this->$_property )) return $this->$_property;
+		else return null;
+	}
+	/**
+	 * Returns an array of public properties
+	 * @return array
+	 */
+	function getPublicProperties() {
+		static $cache = null;
+		if (is_null( $cache )) {
+			$cache = array();
+			foreach (get_class_vars( get_class( $this ) ) as $key=>$val) {
+				if (substr( $key, 0, 1 ) != '_') {
+					$cache[] = $key;
+				}
+			}
+		}
+		return $cache;
+	}
+	/**
+	* Set the value of the class variable
+	* @param string The name of the class variable
+	* @param mixed The value to assign to the variable
+	*/
+	function set( $_property, $_value ) {
+		$this->$_property = $_value;
+	}
+	/**
+	*	binds a named array/hash to this object
+	*
+	*	can be overloaded/supplemented by the child class
+	*	@param array $hash named array
+	*	@return null|string	null is operation was satisfactory, otherwise returns an error
+	*/
+	function bind( $array, $ignore="" ) {
+		$database =& mamboDatabase::getInstance();
+		if (is_array($array)) return $database->mosBindArrayToObject($array, $this, $ignore);
+		$this->_error = strtolower(get_class( $this ))."::bind failed.";
+		return false;
+	}
+
+	/**
+	*	binds an array/hash to this object
+	*	@param int $oid optional argument, if not specifed then the value of current key is used
+	*	@return any result from the database operation
+	*/
+	function load( $oid=null ) {
+		$k = $this->_tbl_key;
+		if ($oid !== null) $this->$k = $oid;
+		if ($this->$k === null) return false;
+		$this->_db->setQuery("SELECT * FROM $this->_tbl WHERE $this->_tbl_key='".$this->$k."'" );
+		return $this->_db->loadObject($this);
+	}
+
+	/**
+	* Inserts a new row if id is zero or updates an existing row in the database table
+	*
+	* Can be overloaded/supplemented by the child class
+	* @param boolean If false, null object variables are not updated
+	* @return null|string null if successful otherwise returns and error message
+	*/
+	function store( $updateNulls=false ) {
+		$k = $this->_tbl_key;
+		global $migrate;
+		if( $this->$k && !$migrate) $ret = $this->_db->updateObject( $this->_tbl, $this, $this->_tbl_key, $updateNulls );
+		else $ret = $this->_db->insertObject( $this->_tbl, $this, $this->_tbl_key );
+		if( !$ret ) {
+			$this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->getErrorMsg();
+			return false;
+		} else return true;
+	}
+
+	/**
+	*	Default delete method
+	*
+	*	can be overloaded/supplemented by the child class
+	*	@return true if successful otherwise returns and error message
+	*/
+	function delete( $oid=null ) {
+		$k = $this->_tbl_key;
+		if ($oid) $this->$k = intval( $oid );
+		$this->_db->setQuery( "DELETE FROM $this->_tbl WHERE $this->_tbl_key = '".$this->$k."'" );
+		if ($this->queryTestFailure()) return false;
+		return true;
+	}
+
+	function checkout( $who, $oid=null ) {
+		if ($this->lacks('checked_out')) return false;
+		$k = $this->_tbl_key;
+		if ($oid !== null) $this->$k = $oid;
+		$time = date( "%Y-%m-%d H:i:s" );
+		if (intval( $who )) {
+			// new way of storing editor, by id
+			$this->_db->setQuery( "UPDATE $this->_tbl"
+			. "\nSET checked_out='$who', checked_out_time='$time'"
+			. "\nWHERE $this->_tbl_key='".$this->$k."'"
+			);
+		} else {
+			// old way of storing editor, by name
+			$this->_db->setQuery( "UPDATE $this->_tbl"
+			. "\nSET checked_out='1', checked_out_time='$time', editor='".$who."' "
+			. "\nWHERE $this->_tbl_key='".$this->$k."'"
+			);
+		}
+		return $this->_db->query();
+	}
+
+	function checkin( $oid=null ) {
+		if ($this->lacks('checked_out')) return false;
+		$k = $this->_tbl_key;
+		if ($oid !== null) $this->$k = $oid;
+		$time = date("H:i:s");
+		$this->_db->setQuery( "UPDATE $this->_tbl"
+		. "\nSET checked_out='0', checked_out_time='0000-00-00 00:00:00'"
+		. "\nWHERE $this->_tbl_key='".$this->$k."'"
+		);
+		return $this->_db->query();
+	}
+
+	function hit( $oid=null ) {
+		$k = $this->_tbl_key;
+		if ($oid !== null) $this->$k = intval( $oid );
+		$key = $this->$k;
+		$this->_db->setQuery( "UPDATE $this->_tbl SET hits=(hits+1) WHERE $this->_tbl_key='$key'" );
+		$this->_db->query();
+
+		if (mamboCore::get('mosConfig_enable_log_items')) {
+			$now = date( "Y-m-d" );
+			$this->_db->setQuery( "SELECT hits"
+			. "\nFROM #__core_log_items"
+			. "\nWHERE time_stamp='$now' AND item_table='$this->_tbl' AND item_id='$key'"
+			);
+			$hits = intval( $this->_db->loadResult() );
+			if ($hits) $this->_db->setQuery( "UPDATE #__core_log_items SET hits=(hits+1)"
+				. "\nWHERE time_stamp='$now' AND item_table='$this->_tbl' AND item_id='".$this->$k."'"
+				);
+			else $this->_db->setQuery( "INSERT INTO #__core_log_items VALUES"
+				. "\n('$now','$this->_tbl','".$this->$k."','1')"
+				);
+			$this->_db->query();
+		}
+	}
+
+	/**
+	* Generic save function
+	* @param array Source array for binding to class vars
+	* @param string Filter for the order updating
+	* @returns TRUE if completely successful, FALSE if partially or not succesful.
+	*/
+	function save( $source, $order_filter ) {
+		if (!$this->bind($_POST) OR !$this->check() OR !$this->store()OR !$this->checkin()) return false;
+		$filter_value = $this->$order_filter;
+		$this->updateOrder( $order_filter ? "`$order_filter`='$filter_value'" : "" );
+		$this->_error = '';
+		return true;
+	}
+
+	/**
+	* Generic Publish/Unpublish function
+	* @param array An array of id numbers
+	* @param integer 0 if unpublishing, 1 if publishing
+	* @param integer The id of the user performnig the operation
+	*/
+	function publish_array( $cid=null, $publish=1, $myid=0 ) {
+		if (!is_array( $cid ) OR count( $cid ) < 1) {
+			$this->_error = "No items selected.";
+			return false;
+		}
+		$cids = implode( ',', $cid );
+		$this->_db->setQuery( "UPDATE $this->_tbl SET published='$publish'"
+		. "\nWHERE $this->_tbl_key IN ($cids) AND (checked_out=0 OR checked_out='$myid')"
+		);
+		if ($this->queryTestFailure()) return false;
+		if (count( $cid ) == 1) $this->checkin( $cid[0] );
+		return true;
+	}
+
+	/**
+	* Export item list to xml
+	* @param boolean Map foreign keys to text values
+	*/
+	function toXML( $mapKeysToText=false ) {
+		$xml = '<record table="' . $this->_tbl . '"';
+		if ($mapKeysToText) $xml .= ' mapkeystotext="true"';
+		$xml .= '>';
+		foreach (get_object_vars($this) as $k => $v) {
+			if ($v === null OR is_array($v) OR is_object($v)) continue;
+			if ($k[0] == '_') continue; // internal field
+			$xml .= '<' . $k . '><![CDATA[' . $v . ']]></' . $k . '>';
+		}
+		$xml .= '</record>';
+		return $xml;
+	}
+}
+
+/**
+* Abstract class for classes where the objects of the class can be relatively easily
+*  stored in a single database table.  Can usually be adapted to more complex cases.
+* Requires child classes to implement: tableName(), notSQL().
+* tableName() must return the name of the database table, using #__ in the usual Mambo way
+* notSQL() must return an array of strings, where each string is the name of a
+*  variable that is NOT in the database table, or is not written explicitly,
+*  e.g. the auto-increment key.  If this is the ONLY non-SQL field, then the
+*  child class need not implement it, as that it is already in the abstract class.
+* Child classes may implement timeStampField, in which case it must return the name
+*  of a field that will have a timestamp placed in it whenever the DB is written.
+*/
+
+class mosTableEntry extends mosDBAbstractRow {
+
+	/* Stores all POST data where the name matches an object variable name */
+	function addPostData () {
+		foreach (get_class_vars(get_class($this)) as $field=>$value) {
+			if ($field!='id' AND $field[1] != '_' AND isset($_POST[$field])) {
+				$this->$field = trim($_POST[$field]);
+			}
+		}
+		$this->forceBools();
+  	}
+
+	/* Provided in case child class does not implement it.  Can force any values */
+	/* within some limited range.  In particular, can force bools to be 0 or 1 */
+	function forceBools () {
+		return;
+	}
+
+	/* Updates an existing DB entry with the object's current values */
+	function updateObjectDB () {
+		$this->prepareValues();
+		$database = mamboDatabase::getInstance();
+		$database->doSQL($this->updateSQL());
+	}
+
+	/* Deletes the current object from the DB */
+	function delete () {
+		$table = $this->tableName();
+		$sql = "DELETE FROM $table WHERE id=$this->id";
+		$database = mamboDatabase::getInstance();
+		$database->doSQL($sql);
+	}
+
+	/* Provided in case the child class does not provide a method for timeStampField */
+	function timeStampField () {
+		return '';
+	}
+
+	/* Provides SQL for updating the DB with the contents of the current object */
+	function updateSQL () {
+		$tabname = $this->tableName();
+		$sql = "UPDATE $tabname SET %s WHERE id=$this->id";
+		$exclude = $this->notSQL();
+		foreach (get_class_vars(get_class($this)) as $field=>$value) {
+			if (!in_array($field,$exclude) AND $field[0] != '_') $setter[] = $field."='".$this->$field."'";
+		}
+		$timestamp = $this->timeStampField();
+		if ($timestamp) $setter[] = $timestamp."='".date('Y-m-d H:i:s')."'";
+		return sprintf($sql,implode(',', $setter));
+	}
+
+	/* Default method for identifying fields not to be written to the DB */
+	/* The child classes may override this and return more items in the array */
+	function notSQL () {
+		return array ('id');
+	}
+
+	/* Provides SQL to insert the current object into the DB */
+	function insertSQL () {
+		$tabname = $this->tableName();
+		$sql = "INSERT INTO $tabname (%s) VALUES (%s)";
+		$exclude = $this->notSQL();
+		foreach (get_class_vars(get_class($this)) as $field=>$value) {
+			if (!in_array($field,$exclude) AND $field[0] != '_') {
+				$infields[] = $field;
+				$values[] = "'".$this->$field."'";
+			}
+		}
+		$timestamp = $this->timeStampField();
+		if ($timestamp) {
+			$infields[] = $timestamp;
+			$values[] = "'".date('Y-m-d H:i:s')."'";
+		}
+		return sprintf($sql, implode(',', $infields), implode(',', $values));
+	}
+
+	/* Copies any matching fields from some arbitrary object into the current object */
+	function setValues (&$anObject) {
+		foreach (get_class_vars(get_class($this)) as $field=>$value) {
+			if ($field != 'id' AND isset($anObject->$field)) $this->$field = $anObject->$field;
+		}
+	}
+
+	/* Ensures values can safely be written to DB; assumes magic quotes forced off */
+	function prepareValues () {
+		$database = mamboDatabase::getInstance();
+		foreach (get_class_vars(get_class($this)) as $field=>$value) {
+			if (!is_numeric($this->$field) AND is_string($this->$field)) $this->$field = $database->getEscaped($this->$field);
+		}
+	}
+
+	/* Takes some arbitrary SELECT type SQL and places the first or only result into the current object */
+	function readDataBase($sql) {
+		$database = mamboDatabase::getInstance();
+		$database->setQuery( $sql );
+		if (!$database->loadObject($this)) $this->id = 0;
+	}
+
+}
+
+?>
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_array_document.php 4.6rc2/includes/domit/dom_xmlrpc_array_document.php
--- 4.5.4/includes/domit/dom_xmlrpc_array_document.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_array_document.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,143 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_array_document wraps a PHP array with the DOM XML-RPC API
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* An array of XML-RPC data wrapped in the DOM XML-RPC API
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_array_document {
-	/** @var string The type of method - response or fault */
-	var $methodType;
-	/** @var string The name of the requested method */
-	var $methodName = "";
-	/** @var string An array containing the method response params */
-	var $params = array();
-	/** @var int The fault code, if one exists */
-	var $faultCode = null;
-	/** @var string A description of the fault code, if one exists */
-	var $faultString = null;
-	
-	/**
-	* dom_xmlrpc_array_document constructor
-	*/
-	function dom_xmlrpc_array_document() {
-		//do nothing
-	} //dom_xmlrpc_array_document
-	
-	/**
-	* Returns the method type
-	* @return string The method type
-	*/
-	function getMethodType() {
-		return $this->methodType;
-	} //getMethodType
-	
-	/**
-	* Returns the method name
-	* @return string The method name
-	*/
-	function getMethodName() {
-		return $this->methodName;
-		//if name is "", will be picked up by methodNotFoundHandler
-	} //getMethodName
-	
-	/**
-	* Returns a reference to the params array
-	* @return array A reference to the params array
-	*/
-	function &getParams() {
-		return $this->params; 
-	} //getParams
-	
-	/**
-	* Returns a reference to the specified param
-	* @param int The param index in the params array
-	* @return mixed A reference to the param
-	*/
-	function &getParam($index) {
-		return $this->params[$index]; 
-	} //getParam
-	
-	/**
-	* Returns the number of params in the params array
-	* @return int The number of params in the params array
-	*/
-	function getParamCount() {
-		return count($this->params);
-	} //getParamCount
-	
-	/**
-	* Determines whether the method response is a fault
-	* @return boolean True if the method response is a fault
-	*/
-	function isFault() {
-		return ($this->methodType == DOM_XMLRPC_TYPE_FAULT);
-	} //isFault
-	
-	/**
-	* Returns the current fault code
-	* @return int The current fault code
-	*/
-	function getFaultCode() {
-		return $this->faultCode;
-	} //getFaultCode
-	
-	/**
-	* Returns the current fault string
-	* @return string The current fault string
-	*/
-	function getFaultString() {
-		return $this->faultString;
-	} //getFaultString
-	
-	/**
-	* Returns the type of the specified param
-	* @param mixed The param to be tested
-	* @return string The type of the specified param
-	*/
-	function getParamType($param) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_utilities.php');
-		return (dom_xmlrpc_utilities::getTypeFromValue($param));
-	} //getParamType
-	
-	/**
-	* Returns a string representation of the parameters array
-	* @return string A string representation of the parameters array
-	*/
-	function toString() {
-		ob_start();		
-		print_r($this->params);
-		
-		$ob_contents = ob_get_contents();
-	    ob_end_clean();
-	       
-	    return $ob_contents;
-	} //toString
-	
-	/**
-	* Returns a formatted string representation of the parameters array
-	* @return string A formatted string representation of the parameters array
-	*/
-	function toNormalizedString() {
-		return $this->toString();
-	} //toNormalizedString
-} //dom_xmlrpc_array_document
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_array_parser.php 4.6rc2/includes/domit/dom_xmlrpc_array_parser.php
--- 4.5.4/includes/domit/dom_xmlrpc_array_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_array_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,145 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_array_parser handles SAX events to convert a DOM XML-RPC XML string into a PHP array
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_parser.php');
-
-/**
-* Handles SAX events to convert a DOM XML-RPC XML string into a PHP array
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_array_parser extends dom_xmlrpc_parser {
-	
-	/**
-	* Handles start element events
-	* @param object A reference to the SAX parser
-	* @param string The name of the start element tag
-	* @param array An array of attributes (never used by XML-RPC spec)
-	*/
-	function startElement($parser, $name, $attrs) {
-		switch($name) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-			case DOM_XMLRPC_TYPE_FAULT:
-				$this->arrayDocument->methodType = $name; //register methodType
-				break;
-			case DOM_XMLRPC_TYPE_ARRAY: 
-			case DOM_XMLRPC_TYPE_STRUCT:
-				$this->lastArrayType[] = $name; 
-				$this->lastArray[] = array(); 
-				break;
-		}
-	} //startElement
-	
-	/**
-	* Handles end element events
-	* @param object A reference to the SAX parser
-	* @param string The name of the end element tag
-	*/
-	function endElement($parser, $name) {
-		switch($name) {
-			case DOM_XMLRPC_TYPE_STRING:
-				//$this->addValue(html_entity_decode($this->charContainer, ENT_QUOTES));
-				$this->addValue($this->charContainer);
-				break;
-			case DOM_XMLRPC_TYPE_I4:
-			case DOM_XMLRPC_TYPE_INT:
-				$this->addValue((int)($this->charContainer));
-				break;
-			case DOM_XMLRPC_TYPE_DOUBLE:
-				$this->addValue(floatval($this->charContainer));
-				break;
-			case DOM_XMLRPC_TYPE_BOOLEAN:
-				$this->addValue((bool)(trim($this->charContainer)));
-				break;
-			case DOM_XMLRPC_TYPE_BASE64:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-				$base64 =& new dom_xmlrpc_base64();
-				$base64->fromString($this->charContainer);
-				$this->addValue($base64); //should I add object or string?
-				break;
-			case DOM_XMLRPC_TYPE_DATETIME:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_datetime_iso8601.php');
-				$dateTime =& new dom_xmlrpc_datetime_iso8601($this->charContainer);
-				$this->addValue($dateTime); //should I add object or string?
-				break;
-			case DOM_XMLRPC_TYPE_VALUE:
-				//if charContainer has anything in it,
-				//then there mustn't be a subnode, therefore a <string>
-				$myValue = trim($this->charContainer);
-				//if ($myValue != '') $this->addValue(html_entity_decode($myValue, ENT_QUOTES));
-				if ($myValue != '') $this->addValue($myValue);
-				break;
-			case DOM_XMLRPC_TYPE_ARRAY:
-			case DOM_XMLRPC_TYPE_STRUCT:
-				$value =& array_pop($this->lastArray);
-				$this->addValue($value);
-				array_pop($this->lastArrayType);
-				break;
-			case DOM_XMLRPC_TYPE_MEMBER:
-				array_pop($this->lastStructName);
-				break;
-			case DOM_XMLRPC_TYPE_NAME:
-				$this->lastStructName[] = trim($this->charContainer);
-				$this->charContainer = '';
-				break;
-			case DOM_XMLRPC_TYPE_METHODNAME:
-				$this->arrayDocument->methodName = trim($this->charContainer);
-				$this->charContainer = '';
-				break;
-		}
-	}    //endElement
-	
-	/**
-	* Adds an XML-RPC value to the results array
-	* @param mixed The value
-	*/
-	function addValue($value) {		
-		$upper = count($this->lastArray) - 1;
-		
-		if ($upper > -1) {
-			if ($this->lastArrayType[$upper] == DOM_XMLRPC_TYPE_STRUCT) {
-				$currentName = $this->lastStructName[(count($this->lastStructName) - 1)];
-
-				switch ($currentName) {
-					case DOM_XMLRPC_NODEVALUE_FAULTCODE:
-						$this->arrayDocument->faultCode = $value;
-						break;
-					
-					case DOM_XMLRPC_NODEVALUE_FAULTSTRING:
-						$this->arrayDocument->faultString = $value;
-						break;
-
-					default:	
-						//associative array item
-						$this->lastArray[$upper][$currentName] = $value; 
-						break;
-				}
-			} 
-			else {
-				//indexed array item
-				$this->lastArray[$upper][] = $value; 
-			} 
-		}
-		else {
-			array_push($this->arrayDocument->params, $value);
-		}
-		
-		$this->charContainer = '';		
-	} //addValue
-} //dom_xmlrpc_array_parser
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_base64.php 4.6rc2/includes/domit/dom_xmlrpc_base64.php
--- 4.5.4/includes/domit/dom_xmlrpc_base64.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_base64.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,102 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_base64 is a base64 encoding / decoding utility
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/**
-* A base64 encoding / decoding utility
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_base64 {
-	/** @var string A base64 encoded string representation of the original binary data */
-	var $stringData;
-	
-	/**
-	* Encodes binary data as a base64 encoded string and stores it in $stringData
-	* @param mixed The binary data
-	*/
-	function fromBinary($binaryData) {
-		//input binary data
-		$this->stringData = $this->encode($binaryData);
-	} //fromBinary
-	
-	/**
-	* Imports the specified file, encodes it as a base64 encoded string and stores it in $stringData
-	* @param string The file path
-	*/
-	function fromFile($fileName) {
-		//input file name
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'php_file_utilities.php');
-		$binaryData =& php_file_utilities::getDataFromFile($fileName, 'rb');
-		$this->stringData = $this->encode($binaryData);
-	} //fromFile
-	
-	/**
-	* Encodes the specified string as a base64 encoded string and stores it in $stringData
-	* @param string The string input
-	*/
-	function fromString($stringData) {
-		//input base64 string
-		//Note: this expects a RFC 2045 compliant string!
-		//Use convertToRFC2045 function to convert
-		$this->stringData = $stringData;
-	} //fromString
-	
-	/**
-	* Returns the specified string, chunked according to the RFC2045 specification (\r\n every 76 chars)
-	* @param mixed The string input
-	* @return mixed The RFC2045 chunked string
-	*/
-	function convertToRFC2045($stringData){
-		return chunk_split($stringData);
-	} //convertToRFC2045
-	
-	/**
-	* Returns base64 encoded binary data
-	* @param mixed The binary input
-	* @return mixed The base64 encoded data
-	*/
-	function &encode($binaryData) {
-		//static conversion function
-		return chunk_split(base64_encode($binaryData));
-	} //encode
-	
-	/**
-	* Returns decoded base64 binary data
-	* @param string The base64 encoded input
-	* @return mixed Base64 decoded data
-	*/
-	function &decode($stringData) {
-		//static conversion function
-		return base64_decode($stringData);
-	} //decode
-	
-	/**
-	* Returns a base64 decoded representation of $stringData
-	* @return mixed A base64 decoded representation of $stringData
-	*/
-	function &getBinary() {
-		return $this->decode($this->stringData);
-	} //getBinary 
-	
-    /**
-	* Returns the (base64 encoded) contents of $stringData
-	* @return string The (base64 encoded) contents of $stringData
-	*/
-	function getEncoded() {
-		return $this->stringData;
-	} //getEncoded    
-} //dom_xmlrpc_base64
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_builder.php 4.6rc2/includes/domit/dom_xmlrpc_builder.php
--- 4.5.4/includes/domit/dom_xmlrpc_builder.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_builder.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,399 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_builder is a utility for building string representations of XML-RPC documents
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* A utility for building string representations of XML-RPC documents
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_builder {
-	/** @var string The method type of the XML-RPC data, e.g., DOM_XMLRPC_TYPE_METHODRESPONSE */
-	var $methodType;
-	/** @var string The XML string representing the method params */
-	var $params = "";
-	/** @var string The type of object marshalling to be used, if this option is enabled */
-	var $objectMarshalling = DOM_XMLRPC_OBJECT_MARSHALLING_ANONYMOUS;
-	
-	/**
-	* Invokes the ability to pass PHP objects in addition to basic native types such as int and string
-	* @param string The type of object marshalling to be invoked: either anonymous, named, or serialized
-	*/
-	function setObjectMarshalling($type) {
-		$type = strtolower($type);
-		
-		switch ($type) {
-			case DOM_XMLRPC_OBJECT_MARSHALLING_ANONYMOUS: //default
-			case DOM_XMLRPC_OBJECT_MARSHALLING_NAMED:
-			case DOM_XMLRPC_OBJECT_MARSHALLING_SERIALIZED:
-				$this->objectMarshalling = $type;
-				break;
-			default:
-				XMLRPC_Client_Exception::raiseException(XMLRPC_CLIENT_RESPONSE_TYPE_ERR, 
-									('Invalid object marshalling type: ' . $type));
-		}
-	} //setObjectMarshalling
-	
-	/**
-	* Creates an XML-RPC representation of a scalar value (e.g. string, double, boolean) 
-	* @param mixed The value to be converted to XML-RPC notation
-	* @param string The type of the value (will be autodetected if omitted)
-	* @return string An XML-RPC representation of the value
-	*/
-	function createScalar($value, $type = '') {
-		if ($type == '') {
-			$type =  dom_xmlrpc_utilities::getScalarTypeFromValue($value);
-		}
-		
-		switch ($type) {
-			case DOM_XMLRPC_TYPE_STRING:
-				if ($this->methodType == DOM_XMLRPC_TYPE_METHODRESPONSE) {
-					//htmlencode the string, because 
-					//DOM XML-RPC server has decoded it
-					$value = htmlentities($value, ENT_QUOTES);
-				}
-				break;
-			case DOM_XMLRPC_TYPE_DOUBLE:
-				//ensure trailing .0 if it looks like an int
-				$value = '' . $value;
-				if (strpos($value, '.') === false) {
-					$value .= '.0';
-				}
-				break;
-			case DOM_XMLRPC_TYPE_BOOLEAN:
-				if (is_bool($value)) {
-					$value = ($value ? '1' : '0');
-				}
-				break;
-			case DOM_XMLRPC_TYPE_BASE64:
-				if (is_object($value)) {
-					$value = $value->getEncoded();
-				}
-				break;
-			case DOM_XMLRPC_TYPE_DATETIME:
-				if (is_object($value)) {
-					$value = $value->getDateTime_iso();
-				}
-				break;
-		}
-		
-		return ("<value><$type>$value</$type></value>");
-	} //createScalar
-	
-	/**
-	* Generates an XML-RPC param from the scalar and adds it to the method params
-	* @param mixed The value to be converted to XML-RPC notation
-	* @param string The type of the value (will be autodetected if omitted)
-	*/
-	function addScalar($value, $type = '') {
-		$this->params .= "\n\t\t<param>" . $this->createScalar($value, $type)  . '</param>';
-	} //addScalar	
-	
-	/**
-	* Creates an XML-RPC representation of a PHP array
-	* @param array The array to be converted to XML-RPC notation
-	* @return string An XML-RPC representation of the array
-	*/
-	function createArray(&$myArray) {
-		$data = '<value><array><data>';
-		
-		foreach ($myArray as $key => $value) {
-			$currDataItem =& $myArray[$key];
-			$currType = dom_xmlrpc_utilities::getTypeFromValue($currDataItem);
-			
-			$data .= $this->create($currDataItem, $currType);
-		}
-		
-		$data .= '</data></array></value>';
-		
-		return $data;
-	} //createArray
-	
-	/**
-	* Generates an XML-RPC param from the array and adds it to the method params
-	* @param array The array to be converted to XML-RPC notation
-	*/
-	function addArray($myArray) {
-		$this->addArrayByRef($myArray);
-	} //addArray
-	
-	/**
-	* Generates an XML-RPC param from the array reference and adds it to the method params
-	* @param array The array reference to be converted to XML-RPC notation
-	*/
-	function addArrayByRef(&$myArray) { //can call with reference if deep copy is required
-		$this->params .= "\n\t\t<param>" . $this->createArray($myArray)  . '</param>';
-	} //addArrayByRef
-	
-	/**
-	* Creates an XML-RPC representation of a PHP object
-	* @param object The object to be converted to XML-RPC notation
-	* @return string An XML-RPC representation of the object
-	*/
-	function createObject(&$myObject) {
-		require_once('dom_xmlrpc_object.php');
-		
-		if (get_class($myObject) == 'dom_xmlrpc_object') { //wrapper for xmlrpc object
-		    $myObject =& $myObject->getObject(); //grab embedded object
-		}
-		
-		switch($this->objectMarshalling){
-			case DOM_XMLRPC_OBJECT_MARSHALLING_ANONYMOUS: 
-				//generic struct, one member for each
-				//object property, object type is discarded
-				$data = '<value><struct>';
-				
-				foreach ($myObject as $key => $value) {
-					$currValue =& $myObject->$key;			
-					$currType = dom_xmlrpc_utilities::getTypeFromValue($currValue);
-					
-					$data .= $this->createMember($key, $currValue, $currType);
-				}
-				
-				$data .= '</struct></value>';				
-				break;
-				
-			case DOM_XMLRPC_OBJECT_MARSHALLING_NAMED: 
-				//struct with one member for each
-				//object property, object type is defined
-				//by an additional member (first in list) named
-				//"__phpobject__" whose value is a string
-				//containing the class type of the object
-				$data = '<value><struct>';				
-				$data .= $this->createMember(DOM_XMLRPC_PHPOBJECT, get_class($myObject), DOM_XMLRPC_TYPE_STRING);
-				
-				foreach ($myObject as $key => $value) {
-					$currValue =& $myObject->$key;			
-					$currType = dom_xmlrpc_utilities::getTypeFromValue($currValue);
-					
-					$data .= $this->createMember($key, $currValue, $currType);
-				}
-				
-				$data .= '</struct></value>';				
-				break;
-				
-			case DOM_XMLRPC_OBJECT_MARSHALLING_SERIALIZED:
-				//serialized object, one member of type base64
-				//which is the serialized object, base64 encoded
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-				$data = '<value><struct>';
-				$data .= $this->createMember(DOM_XMLRPC_PHPOBJECT, get_class($myObject), DOM_XMLRPC_TYPE_STRING);
-				
-				$serialized =& serialize($myObject);
-				$currValue =& $this->createBase64($serialized);
-				$data .= $this->createMember(DOM_XMLRPC_SERIALIZED, $currValue, DOM_XMLRPC_TYPE_BASE64);
-				
-				$data .= '</struct></value>';				
-				break;
-		} // switch
-		
-		return $data;
-	} //createObject
-	
-	/**
-	* Generates an XML-RPC param from the object and adds it to the method params
-	* @param object The object to be converted to XML-RPC notation
-	*/
-	function addObject($myObject) {
-		$this->addObjectByRef($myObject);
-	}//addObject
-	
-	/**
-	* Generates an XML-RPC param from the object reference and adds it to the method params
-	* @param object The object reference to be converted to XML-RPC notation
-	*/
-	function addObjectByRef(&$myObject) { //can call with reference if deep copy is required
-		$this->params .= "\n\t\t<param>" . $this->createObject($myObject)  . '</param>';
-	}//addObjectByRef
-	
-	/**
-	* Creates an XML-RPC representation of a struct
-	* @param mixed The struct to be converted to XML-RPC notation
-	* @return string An XML-RPC representation of the struct
-	*/
-	function createStruct(&$myStruct) {
-		require_once('dom_xmlrpc_object.php');
-		$className = get_class($myStruct);
-		
-		//if struct is explicitly cast as an xmlrpc object
-		if ($className == 'dom_xmlrpc_object') { 
-		    $myObject =& $myStruct->getObject(); //grab embedded object
-			return $this->createObject($myObject);
-		}
-		else {
-			//wrapper for numeric indexed structs 
-			//that are meant to be string indexed			
-			if ($className == 'dom_xmlrpc_struct') {
-				$myStruct =& $myStruct->getStruct(); //grab embedded array
-			}
-			
-			$isArrayNotObj = is_array($myStruct);
-			
-			//if struct is an object and isn't anonymous
-			if ($isArrayNotObj && ($this->objectMarshalling != DOM_XMLRPC_OBJECT_MARSHALLING_ANONYMOUS)) {
-			    return $this->createObject($myStruct);
-			}
-			else {
-				$data = '<value><struct>';
-				
-	 			foreach ($myStruct as $key => $value) {
-	 				$isArrayNotObj ? ($currValue =& $myStruct[$key]) : ($currValue =& $value);			
-	 				$currType = dom_xmlrpc_utilities::getTypeFromValue($currValue);
-	 				
-	 				$data .= $this->createMember($key, $currValue, $currType);
-	 			}
-	 			
-	 			$data .= '</struct></value>';
-	 			return $data;
-			}
-		}
-	} //createStruct	
-	
-	/**
-	* Generates an XML-RPC param from the struct and adds it to the method params
-	* @param mixed The struct to be converted to XML-RPC notation
-	*/
-	function addStruct($myStruct) {
-		$this->addStructByRef($myStruct);
-	} //addStruct
-	
-	/**
-	* Generates an XML-RPC param from the struct reference and adds it to the method params
-	* @param mixed The struct reference to be converted to XML-RPC notation
-	*/
-	function addStructByRef(&$myStruct) { //can call with reference if deep copy is required
-		$this->params .= "\n\t\t<param>" . $this->createStruct($myStruct)  . '</param>';
-	} //addStructRef
-	
-	/**
-	* Creates an XML-RPC representation of a member
-	* @param mixed The member to be converted to XML-RPC notation
-	* @return string An XML-RPC representation of the member
-	*/
-	function createMember($name, &$value, $type) {
-		$data = '<member><name>' . $name . '</name>';
-		
-		if ($type == '') {
-			$type =  dom_xmlrpc_utilities::getScalarTypeFromValue($value);
-		}
-	
-		$data .= $this->create($value, $type) . '</member>';
-
-		return $data;
-	} //createMember	
-	
-	/**
-	* Generates an XML-RPC param from the value and adds it to the method params
-	* @param mixed The value to be converted to XML-RPC notation
-	*/
-	function create(&$value, $type = '') {
-		$data = '';
-		
-		if ($type == '') {
-			require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_utilities.php');			
-			$type = dom_xmlrpc_utilities::getTypeFromValue($value);
-		}
-		
-		switch ($type) {
-			case DOM_XMLRPC_TYPE_STRING:
-			case DOM_XMLRPC_TYPE_INT:
-			case DOM_XMLRPC_TYPE_I4:
-			case DOM_XMLRPC_TYPE_DOUBLE:
-			case DOM_XMLRPC_TYPE_BOOLEAN:
-			case DOM_XMLRPC_TYPE_BASE64:
-			case DOM_XMLRPC_TYPE_DATETIME:
-				$data .= $this->createScalar($value, $type);
-				break;
-			case DOM_XMLRPC_TYPE_STRUCT:
-				$data .= $this->createStruct($value, $type);
-				break;
-			case DOM_XMLRPC_TYPE_ARRAY:
-				$data .= $this->createArray($value, $type);
-				break;
-		}
-		
-		return $data;
-	} //create
-	
-	/**
-	* Generates an XML-RPC param from the unspecified value
-	* @param mixed The value to be converted to XML-RPC notation
-	*/
-	function add($value, $type = '') {
-		$this->addByRef($value, $type);
-	} //add	
-	
-	/**
-	* Generates an XML-RPC param from the unspecified reference
-	* @param mixed The reference to be converted to XML-RPC notation
-	*/
-	function addByRef(&$value, $type = '') { //can call with reference if deep copy is required
-		$this->params .= "\n\t\t<param>" . $this->create($value, $type)  . '</param>';
-	} //addByRef
-	
-	/**
-	* Generates an XML-RPC param from list of values
-	*/
-	function addList() {
-		$total = func_num_args();
-		
-		for ($i = 0; $i < $total; $i++) {
-			$this->add(func_get_arg($i));
-		}
-	} //addList
-	
-	/**
-	* Creates a dom_xmlrpc_base64 object from the binary data 
-	* @param mixed The binary data
-	* @return object The base64 encoded data
-	*/
-	function &createBase64($binaryData) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-
-		$base64 =& new dom_xmlrpc_base64();
-		$base64->fromBinary($binaryData);
-		return $base64;
-	} //createBase64
-	
-	/**
-	* Creates a dom_xmlrpc_base64 object from the file
-	* @param string The file path
-	* @return object The base64 encoded data
-	*/
-	function &createBase64FromFile($fileName) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-		
-		$base64 =& new dom_xmlrpc_base64();
-		$base64->fromFile($fileName);
-		return $base64;
-	} //createBase64FromFile
-	
-	/**
-	* Creates a dom_xmlrpc_datetime_iso8601 object from the PHP time
-	* @param string The time
-	* @return object The dom_xmlrpc_datetime_iso8601 object
-	*/
-	function &createDateTimeISO($time) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_datetime_iso8601.php');
-				
-		$isoDateTime =& new dom_xmlrpc_datetime_iso8601($time);
-
-		return $isoDateTime;
-	} //createDateTimeISO
-	
-} //dom_xmlrpc_builder
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_client.php 4.6rc2/includes/domit/dom_xmlrpc_client.php
--- 4.5.4/includes/domit/dom_xmlrpc_client.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_client.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,272 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_client provides basic XML-RPC client functionality
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-//must change these to match the XML-RPC error spec
-/** invalid method response type error */
-define('XMLRPC_CLIENT_RESPONSE_TYPE_ERR', 1);
-/** malformed XML response error */
-define('XMLRPC_CLIENT_MALFORMED_XML_ERR', 2);
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_methodcall.php');
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'php_http_client_generic.php');
-
-/**
-* Provides basic XML-RPC client functionality
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_client extends php_http_client_generic {
-	/** @var string The method response type requested by the client */
-	var $responseType = DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT;
-	/** @var boolean True if multiple method calls are to be made in a single request */
-	var $isMultiCall = false;
-	
-	/**
-	* XML-RPC Client constructor
-	* @param string The client connection host name, with or without its protocol prefix
-	* @param string The client connection path, not including the host name
-	* @param int The port to establish the client connection on
-	* @param string A proxy connection host name, with or without its protocol prefix
-	* @param int The timeout value for the client connection
-	*/
-	function dom_xmlrpc_client ($host = '', $path = '/', $port = 80, $proxy = '', $timeout = 0) {
-		if ($proxy != '') {
-			$host = $proxy;	    
-		}
-		
-		$this->php_http_client_generic($host, $path, $port, $timeout);	
-		$this->setHeaders();
-	} //dom_xmlrpc_client	
-	
-	/**
-	* Sets the headers for the client connection
-	*/
-	function setHeaders() {
-		$this->setHeader('Content-Type', 'text/xml');
-		$this->setHeader('Host', $this->connection->host);
-		$this->setHeader('User-Agent', 'DOM XML-RPC Client/0.1');
-		$this->setHeader('Connection', 'close');
-	} //setHeaders
-
-	/**
-	* Determines whether message is multicall
-	* @param mixed The message
-	* @return mixed The evaluated message
-	*/
-	function evaluateMessage(&$message) {
-		if (!is_string($message)) {
-			if ($message->methodName == 'system.multicall') $this->isMultiCall = true;
-			return $message->toXML();
-		}
-		else {
-			if (strpos($message, 'system.multicall') !== false) $this->isMultiCall = true;
-		}
-		
-		return $message;
-	} //evaluateMessage
-	
-	/**
-	* Sends data through the client connection
-	* @param string The message to be sent
-	* @return string The http response
-	*/
-	function &send(&$message) {
-		if (!$this->isConnected()) {
-			$this->connect();
-		}
-	
-		$message = $this->evaluateMessage($message);
-		$this->setHeader('Content-Length', strlen($message));
-		
-		$response =& parent::send($message);
-		
-		return $this->formatResponse($response->getResponse());
-	} //send
-	
-	/**
-	* Sends data through the client connection and disconnects
-	* @param string The message to be sent
-	* @return string The http response
-	*/
-	function &sendAndDisconnect($message) {
-		$response =& $this->send($message);
-		$this->disconnect();
-		return $response;
-	} //send	
-	
-	/**
-	* Returns the message response, formatted according to the specified response type
-	* @param string The unformatted response
-	* @return string The formatted response
-	*/
-	function &formatResponse($response) {
-		switch ($this->responseType) {
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT:
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT_LITE:
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMXML:
-				return $this->returnAsXML($response);
-				break;
-			
-			case DOM_XMLRPC_RESPONSE_TYPE_ARRAY:
-				return $this->returnAsArray($response);
-				break;
-				
-			case DOM_XMLRPC_RESPONSE_TYPE_STRING:
-				return $response;
-				break;
-		}
-	} //formatResponse
-	
-	/**
-	* Returns the message response as an XML document of the specified type
-	* @param string The unformatted response
-	* @return string An XML document representing the method response
-	*/	
-	function &returnAsXML($response) {
-		switch ($this->responseType) {
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_domit_parser.php' );
-				$xmlrpcDoc =& new dom_xmlrpc_domit_document();
-				$success = $xmlrpcDoc->parseXML($response, false);
-				break;
-				
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT_LITE:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_domit_lite_parser.php' );
-				$xmlrpcDoc =& new dom_xmlrpc_domit_lite_document();
-				$success = $xmlrpcDoc->parseXML($response, false);
-				break;
-				
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_XML_DOMXML:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_domxml_parser.php' );
-				$xmlrpcDoc =& new dom_xmlrpc_domxml_document();
-				$success = $xmlrpcDoc->parseXML($response);
-				break;
-		}
-		
-		if ($success) {
-			return $xmlrpcDoc;
-		}
-		
-		XMLRPC_Client_Exception::raiseException(XMLRPC_CLIENT_MALFORMED_XML_ERR, 
-										("Malformed xml returned: \n $response"));
-	} //returnAsXML
-	
-	/**
-	* Returns the message response as a PHP array
-	* @param string The unformatted response
-	* @return string A PHP array representation of the method response
-	*/
-	function &returnAsArray($response) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_array_parser.php');		
-
-		$arrayParser =& new dom_xmlrpc_array_parser();
-		
-		if ($arrayParser->parseXML($response, false)) {		
-			return $arrayParser->getArrayDocument();
-		}
-		else {
-			XMLRPC_Client_Exception::raiseException(XMLRPC_CLIENT_MALFORMED_XML_ERR, 
-										("Malformed xml returned:  \n $response"));
-		}
-	} //returnAsArray
-	
-	/**
-	* Converts PHP arrays to stdclass objects
-	* @param array The PHP array
-	* @return object A stdclass object
-	*/
-	function &arraysToObjects(&$myArray) {
-		foreach ($myArray as $key => $value) {
-			$currItem =& $myArray[$key];
-			
-			if (is_array($currItem)) {
-				$currItem =& $this->arraysToObjects($currItem);	
-			}
-		}
-		
-		if (dom_xmlrpc_utilities::isAssociativeArray($myArray)) {
-			$obj =& new stdclass();
-			
-			foreach ($myArray as $key => $value) {
-				$obj->$key =& $myArray[$value];
-			}
-			
-			return $obj;
-		}
-		else {
-			return $myArray;
-		}
-	} //arraysToObjects
-	
-	/**
-	* Sets the method response type to the specified type
-	* @param array The requested method response type
-	*/
-	function setResponseType($type) {
-		$type = strtolower($type);
-		
-		switch ($type) {
-			case DOM_XMLRPC_RESPONSE_TYPE_ARRAY:
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT:
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT_LITE:
-			case DOM_XMLRPC_RESPONSE_TYPE_XML_DOMXML:
-			case DOM_XMLRPC_RESPONSE_TYPE_STRING:
-				$this->responseType = $type;
-				break;
-			default:
-				XMLRPC_Client_Exception::raiseException(XMLRPC_CLIENT_RESPONSE_TYPE_ERR, 
-								('Invalid response type: ' . $type));
-		}
-	} //setResponseType
-	
-	/**
-	* Returns the current method response type
-	* @return string The current method response type
-	*/		
-	function getResponseType() {
-		return $this->responseType;
-	} //getResponseType	
-} //dom_xmlrpc_client
-
-
-/**
-* An XML-RPC Client excpetion class
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class XMLRPC_Client_Exception {
-	
-	/**
-	* Raises the specified exception
-	* @param int The error number
-	* @param int The error string
-	*/
-	function raiseException($errorNum, $errorString) {
-		$errorMessage = $errorNum  .  "\n " . $errorString;
-		
-		if ((!isset($GLOBALS['DOMIT_XMLRPC_ERROR_FORMATTING_HTML'])) ||
-			($GLOBALS['DOMIT_XMLRPC_ERROR_FORMATTING_HTML'] == true)) {
-		        $errorMessage = "<p><pre>" . $errorMessage . "</pre></p>";
-		}
-
-		die($errorMessage);
-	} //raiseException
-} //XMLRPC_Client_Exception
-
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_constants.php 4.6rc2/includes/domit/dom_xmlrpc_constants.php
--- 4.5.4/includes/domit/dom_xmlrpc_constants.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_constants.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,81 +0,0 @@
-<?php
-/**
-* Constants for DOM XML-RPC
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-/** An XML-RPC item  tag*/
-define('DOM_XMLRPC_TYPE_ITEM', 'item');
-/** An XML-RPC int tag */
-define('DOM_XMLRPC_TYPE_INT', 'int');
-/** An  alternate XML-RPC int tag */
-define('DOM_XMLRPC_TYPE_I4', 'i4');
-/** An XML-RPC double tag */
-define('DOM_XMLRPC_TYPE_DOUBLE', 'double');
-/** An XML-RPC boolean tag */
-define('DOM_XMLRPC_TYPE_BOOLEAN', 'boolean');
-/** An XML-RPC string tag */
-define('DOM_XMLRPC_TYPE_STRING', 'string');
-/** An XML-RPC (iso8601) date-time tag */
-define('DOM_XMLRPC_TYPE_DATETIME', 'dateTime.iso8601');
-/** An XML-RPC base63 encoded value tag */
-define('DOM_XMLRPC_TYPE_BASE64', 'base64');
-/** An XML-RPC method call tag */
-define('DOM_XMLRPC_TYPE_METHODCALL', 'methodCall');
-/** An XML-RPC method name tag */
-define('DOM_XMLRPC_TYPE_METHODNAME', 'methodName');
-/** An XML-RPC params tag */
-define('DOM_XMLRPC_TYPE_PARAMS', 'params'); 
-/** An XML-RPC param tag */
-define('DOM_XMLRPC_TYPE_PARAM', 'param'); 
-/** An XML-RPC value tag */
-define('DOM_XMLRPC_TYPE_VALUE', 'value'); 
-/** An XML-RPC struct tag */
-define('DOM_XMLRPC_TYPE_STRUCT', 'struct'); 
-/** An XML-RPC member tag */
-define('DOM_XMLRPC_TYPE_MEMBER', 'member'); 
-/** An XML-RPC name tag */
-define('DOM_XMLRPC_TYPE_NAME', 'name'); 
-/** An XML-RPC array tag */
-define('DOM_XMLRPC_TYPE_ARRAY', 'array');
-/** An XML-RPC data tag */
-define('DOM_XMLRPC_TYPE_DATA', 'data');
-/** An XML-RPC method response tag */
-define('DOM_XMLRPC_TYPE_METHODRESPONSE', 'methodResponse');
-/** An XML-RPC fault tag */
-define('DOM_XMLRPC_TYPE_FAULT', 'fault');
-
-/** An XML-RPC scalar */
-define('DOM_XMLRPC_TYPE_SCALAR', 'scalar'); //not part of spec but used as a catch-all
-
-/** An XML-RPC faultCode identifier */
-define('DOM_XMLRPC_NODEVALUE_FAULTCODE', 'faultCode');
-/** An XML-RPC faultString identifier */
-define('DOM_XMLRPC_NODEVALUE_FAULTSTRING', 'faultString');
-/** An XML-RPC faultString identifier */
-define('DOM_XMLRPC_RESPONSE_TYPE_STRING', 'string');
-/** A DOM XML-RPC array identifier */
-define('DOM_XMLRPC_RESPONSE_TYPE_ARRAY', 'array');
-/** A DOM XML-RPC DOMIT! document */
-define('DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT', 'xml_domit');
-/** A DOM XML-RPC DOMIT! Lite document */
-define('DOM_XMLRPC_RESPONSE_TYPE_XML_DOMIT_LITE', 'xml_domit_lite');
-/** A DOM XML-RPC DOM-XML! document */
-define('DOM_XMLRPC_RESPONSE_TYPE_XML_DOMXML', 'xml_domxml');
-
-/** Anonymous object marshalling */
-define('DOM_XMLRPC_OBJECT_MARSHALLING_ANONYMOUS', 'anonymous');
-/** Named object marshalling */
-define('DOM_XMLRPC_OBJECT_MARSHALLING_NAMED', 'named');
-/** Serialized object marshalling */
-define('DOM_XMLRPC_OBJECT_MARSHALLING_SERIALIZED', 'serialized');
-/** Unserialized PHP Object marshalling */
-define('DOM_XMLRPC_PHPOBJECT', '__phpobject__');
-/** Sertialized PHP Object marshalling */
-define('DOM_XMLRPC_SERIALIZED', '__serialized__');
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_datetime_iso8601.php 4.6rc2/includes/domit/dom_xmlrpc_datetime_iso8601.php
--- 4.5.4/includes/domit/dom_xmlrpc_datetime_iso8601.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_datetime_iso8601.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,67 +0,0 @@
-<?php
-//*******************************************************************
-//iso8601 datetime class
-//*******************************************************************
-//by John Heinstein
-//johnkarl@nbnet.nb.ca
-//*******************************************************************
-//Version 0.1
-//copyright 2004 Engage Interactive
-//http://www.engageinteractive.com/dom_xmlrpc/
-//All rights reserved
-//*******************************************************************
-//Licensed under the GNU General Public License (GPL)
-//http://www.gnu.org/copyleft/gpl.html
-//*******************************************************************
-
-class dom_xmlrpc_datetime_iso8601 {
-	var $year;  var $month; var $day;
-	var $hour; var $minute; var $second;
-    
-	function dom_xmlrpc_datetime_iso8601($datetime) {
-		if (is_int($datetime)) {
-			$this->fromDateTime_php($datetime);
-		} 
-		else {
-			$this->fromDateTime_iso($datetime);
-		}
-	} //dom_xmlrpc_datetime_iso8601
-    
-	function phpToISO(&$phpDate) {
-		return (date('Y', $phpDate) . date('m', $phpDate) . date('d', $phpDate) . 
-					'T'. date('H', $phpDate). ':' . date('i', $phpDate) . ':' . date('s', $phpDate));
-	} //phpToISO
-    
-	function fromDateTime_php($phpdatetime) {
-		//input php date time
-		$this->year = date('Y', $phpdatetime);
-		$this->month = date('m', $phpdatetime);
-		$this->day = date('d', $phpdatetime);
-		$this->hour = date('H', $phpdatetime);
-		$this->minute = date('i', $phpdatetime);
-		$this->second = date('s', $phpdatetime);
-	} //fromDateTime_php    
-     
-	function fromDateTime_iso($isoFormattedString) {
-		//input iso date time
-		$this->year = substr($isoFormattedString, 0, 4);
-		$this->month = substr($isoFormattedString, 4, 2); 
-		$this->day = substr($isoFormattedString, 6, 2);
-		$this->hour = substr($isoFormattedString, 9, 2);
-		$this->minute = substr($isoFormattedString, 12, 2);
-		$this->second = substr($isoFormattedString, 15, 2);
-	} //fromDateTime_iso
-    
-	function getDateTime_iso() {
-		//return iso date time
-		return ($this->year . $this->month . $this->day . 
-			'T'. $this->hour . ':' . $this->minute . ':' . $this->second);
-	} //getDateTime_iso
-    
-	function getDateTime_php() {
-		//return php date time
-		return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-	} //getDateTime_php
-} //dom_xmlrpc_datetime_iso8601
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_domit_lite_parser.php 4.6rc2/includes/domit/dom_xmlrpc_domit_lite_parser.php
--- 4.5.4/includes/domit/dom_xmlrpc_domit_lite_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_domit_lite_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,157 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_domit_lite_document wraps a DOMIT! Lite DOM document in the DOM XML-RPC API
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'xml_domit_lite_parser.php');
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* Wraps a DOMIT_Lite DOM document in the DOM XML-RPC API
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_domit_lite_document extends DOMIT_Lite_Document {
-	
-	/**
-	* Constructor: instantiates the DOMIT! Lite superclass
-	*/
-	function dom_xmlrpc_domit_lite_document() {
-		$this->DOMIT_Lite_Document();
-	} //dom_xmlrpc_domit_lite_document
-	
-	/**
-	* Gets the method type
-	* @return string The method type
-	*/
-	function getMethodType() {
-		return $this->documentElement->nodeName;
-	} //getMethodType
-	
-	/**
-	* Gets the method name
-	* @return string The method name
-	*/
-	function getMethodName() {
-		if ($this->getMethodType() == DOM_XMLRPC_TYPE_METHODCALL) {
-			return $this->documentElement->childNodes[0]->firstChild->nodeValue;
-		}
-		//else throw exception
-	} //getMethodName
-	
-	/**
-	* Gets a reference to the method params node
-	* @return object A reference to the method params node
-	*/
-	function &getParams() {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				return $this->documentElement->childNodes[1];
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					return $this->documentElement->firstChild; 
-				}
-				break;
-		}			
-		//else throw exception 
-	} //getParams
-	
-	/**
-	* Gets a reference to the specified param
-	* @param int The index of the requested param
-	* @return object A reference to the specified param
-	*/
-	function &getParam($index) {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				return $this->documentElement->childNodes[1]->childNodes[$index];
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					return $this->documentElement->firstChild->childNodes[$index]; 
-				}
-				break;
-		}	
-		//else throw exception 
-	} //getParam
-	
-	/**
-	* Gets the number of existing params
-	* @return int The number of existing params
-	*/
-	function getParamCount() {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				return $this->documentElement->childNodes[1]->childCount;
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					return $this->documentElement->firstChild->childCount; //either 0 or 1
-				}
-				break;
-		}			
-		return -1; //maybe throw an exception?
-	} //getParamCount
-	
-	/**
-	* Determines whether the method response is a fault
-	* @return boolean True if the method response is a fault
-	*/
-	function isFault() {
-		return ($this->documentElement->firstChild->nodeName == DOM_XMLRPC_TYPE_FAULT);
-	} //isFault
-	
-	/**
-	* Returns the fault code, if a fault has occurred
-	* @return int The fault code, if a fault has occurred
-	*/
-	function getFaultCode() {
-		if ($this->isFault()) {
-			$faultStruct =& $this->documentElement->firstChild->firstChild->firstChild;
-			return ($faultStruct->childNodes[0]->childNodes[1]->firstChild->firstChild->nodeValue);
-		}
-	} //getFaultCode
-	
-	/**
-	* Returns the fault string, if a fault has occurred
-	* @return string The fault string, if a fault has occurred
-	*/
-	function getFaultString() {
-		if ($this->isFault()) {
-			$faultStruct =& $this->documentElement->firstChild->firstChild->firstChild;
-			return ($faultStruct->childNodes[1]->childNodes[1]->firstChild->firstChild->nodeValue);
-		}
-	} //getFaultString
-	
-	/**
-	* Returns the type of the specified param
-	* @param object A reference to the param to be tested for type
-	* @return string The type of the param
-	*/
-	function getParamType(&$node) {
-		switch ($node->nodeName) {
-			case DOM_XMLRPC_TYPE_PARAM:
-				return $node->firstChild->firstChild->nodeName;
-				break;
-				
-			default:
-				//throw exception
-		}		
-	} //getParamType
-} //dom_xmlrpc_domit_lite_document
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_domit_parser.php 4.6rc2/includes/domit/dom_xmlrpc_domit_parser.php
--- 4.5.4/includes/domit/dom_xmlrpc_domit_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_domit_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,159 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_domit_document wraps a DOMIT! DOM document in the DOM XML-RPC API
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'xml_domit_parser.php');
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* Wraps a DOMIT! DOM document in the DOM XML-RPC API
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_domit_document extends DOMIT_Document {
-	
-	/**
-	* Constructor: instantiates the DOMIT! superclass
-	*/
-	function dom_xmlrpc_domit_document() {
-		$this->DOMIT_Document();
-	} //dom_xmlrpc_domit_document
-	
-	/**
-	* Gets the method type
-	* @return string The method type
-	*/
-	function getMethodType() {
-		return $this->documentElement->nodeName;
-	} //getMethodType
-	
-	/**
-	* Gets the method name
-	* @return string The method name
-	*/
-	function getMethodName() {
-		if ($this->getMethodType() == DOM_XMLRPC_TYPE_METHODCALL) {
-			return $this->documentElement->childNodes[0]->firstChild->nodeValue;
-		}
-		//else throw exception
-	} //getMethodName
-	
-	/**
-	* Gets a reference to the method params node
-	* @return object A reference to the method params node
-	*/
-	function &getParams() {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				return $this->documentElement->childNodes[1];
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					return $this->documentElement->firstChild; 
-				}
-				break;
-		}
-		
-		//else throw exception 
-	} //getParams
-	
-	/**
-	* Gets a reference to the specified param
-	* @param int The index of the requested param
-	* @return object A reference to the specified param
-	*/
-	function &getParam($index) {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				return $this->documentElement->childNodes[1]->childNodes[$index];
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					return $this->documentElement->firstChild->childNodes[$index]; 
-				}
-				break;
-		}	
-		
-		//else throw exception
-	} //getParam
-	
-	/**
-	* Gets the number of existing params
-	* @return int The number of existing params
-	*/
-	function getParamCount() {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				return $this->documentElement->childNodes[1]->childCount;
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					return $this->documentElement->firstChild->childCount; //either 0 or 1
-				}
-				break;
-		}			
-		return -1; //maybe throw an exception?
-	} //getParamCount
-	
-	/**
-	* Determines whether the method response is a fault
-	* @return boolean True if the method response is a fault
-	*/
-	function isFault() {
-		return ($this->documentElement->firstChild->nodeName == DOM_XMLRPC_TYPE_FAULT);
-	} //isFault
-	
-	/**
-	* Returns the fault code, if a fault has occurred
-	* @return int The fault code, if a fault has occurred
-	*/
-	function getFaultCode() {
-		if ($this->isFault()) {
-			$faultStruct =& $this->documentElement->firstChild->firstChild->firstChild;
-			return ($faultStruct->childNodes[0]->childNodes[1]->firstChild->firstChild->nodeValue);
-		}
-	} //getFaultCode
-	
-	/**
-	* Returns the fault string, if a fault has occurred
-	* @return string The fault string, if a fault has occurred
-	*/
-	function getFaultString() {
-		if ($this->isFault()) {
-			$faultStruct =& $this->documentElement->firstChild->firstChild->firstChild;
-			return ($faultStruct->childNodes[1]->childNodes[1]->firstChild->firstChild->nodeValue);
-		}
-	} //getFaultString
-	
-	/**
-	* Returns the type of the specified param
-	* @param object A reference to the param to be tested for type
-	* @return string The type of the param
-	*/
-	function getParamType(&$node) {
-		switch ($node->nodeName) {
-			case DOM_XMLRPC_TYPE_PARAM:
-				return $node->firstChild->firstChild->nodeName;
-				break;
-				
-			default:
-				//throw exception
-		}		
-	} //getParamType
-} //dom_xmlrpc_domit_document
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_domxml_parser.php 4.6rc2/includes/domit/dom_xmlrpc_domxml_parser.php
--- 4.5.4/includes/domit/dom_xmlrpc_domxml_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_domxml_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,263 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_domxml_document wraps a DOM-XML DOM document in the DOM XML-RPC API
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* Wraps a DOM-XML DOM document in the DOM XML-RPC API
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_domxml_document {
-	/** @var object A reference to the DOM-XML document */
-	var $xmldoc = null;
-	
-	/**
-	* Instantiates a DOM-XML Document
-	* @param string The XML text to be parsed
-	* @return boolean True if parsing has been successful
-	*/
-	function parseXML($xmlText) {
-		//remove whitespace
-		$xmlText = eregi_replace('>' . "[[:space:]]+" . '<' , '><', $xmlText);
-		
-		//parse document
-		$this->xmldoc = domxml_open_mem($xmlText);
-
-		if (is_object($this->xmldoc)) $success = true;	
-		else $success = false;
-		
-		return $success;
-	} //parseXML
-	
-	/**
-	* Returns a reference to the DOM-XML Document
-	* @return object A reference to the DOM-XML Document
-	*/
-	function getDocument() {
-		return $this->xmldoc;
-	} //getDocument
-	
-	/**
-	* Gets the method type
-	* @return string The method type
-	*/
-	function getMethodType() {
-		$root = $this->xmldoc->document_element();
-		return $root->node_name();
-	} //getMethodType
-	
-	/**
-	* Gets the method name
-	* @return string The method name
-	*/
-	function getMethodName() {
-		if ($this->getMethodType() == DOM_XMLRPC_TYPE_METHODCALL) {
-			$node = $this->xmldoc->document_element();
-			$childNodes = $node->child_nodes();
-			$node = $childNodes[0];
-			$node = $node->first_child();
-			return $node->node_value();
-		}
-		//else throw exception
-	} //getMethodName
-	
-	/**
-	* Gets a reference to the method params node
-	* @return object A reference to the method params node
-	*/
-	function getParams() {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				$node = $this->xmldoc->document_element();
-				$childNodes = $node->child_nodes();
-				return $childNodes[1];
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					$node = $this->xmldoc->document_element();
-					return $node->first_child();
-				}
-				break;
-		}	
-		//else throw exception 
-	} //getParams
-	
-	/**
-	* Gets a reference to the specified param
-	* @param int The index of the requested param
-	* @return object A reference to the specified param
-	*/
-	function getParam($index) {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				$node = $this->xmldoc->document_element();
-				$childNodes = $node->child_nodes();
-				$node = $childNodes[1];
-				$childNodes = $node->child_nodes();
-				return $childNodes[$index];
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					$node = $this->xmldoc->document_element();
-					$node = $node->first_child();
-					$childNodes = $node->child_nodes();
-					return $childNodes[$index];
-				}
-				break;
-		}	
-		//else throw exception 
-	} //getParam
-	
-	/**
-	* Gets the number of existing params
-	* @return int The number of existing params
-	*/
-	function getParamCount() {
-		switch ($this->getMethodType()) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-				$node = $this->xmldoc->document_element();
-				$childNodes = $node->child_nodes();
-				$node = $childNodes[1];
-				$childNodes = $node->child_nodes();
-				return count($childNodes);
-				break;
-				
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-				if (!$this->isFault()) {
-					$node = $this->xmldoc->document_element();
-					$node = $node->first_child();
-					$childNodes = $node->child_nodes();
-					return count($childNodes);
-				}
-				break;
-		}			
-		return -1; //maybe throw an exception?
-	} //getParamCount
-	
-	/**
-	* Determines whether the method response is a fault
-	* @return boolean True if the method response is a fault
-	*/
-	function isFault() {
-		$node = $this->xmldoc->document_element();
-		$node = $node->first_child();
-		
-		return ($node->node_name() == DOM_XMLRPC_TYPE_FAULT);
-	} //isFault
-	
-	/**
-	* Returns the fault code, if a fault has occurred
-	* @return int The fault code, if a fault has occurred
-	*/
-	function getFaultCode() {
-		if ($this->isFault()) {
-			$node = $this->xmldoc->document_element();
-			$node = $node->first_child();
-			$node = $node->first_child();
-			$faultStruct = $node->first_child();
-			
-			$childNodes = $faultStruct->child_nodes();
-			$node = $childNodes[0];
-			$childNodes = $node->child_nodes();
-			$node = $childNodes[1];
-			$node = $node->first_child();
-			$node = $node->first_child();
-
-			return ($node->node_value());
-		}
-	} //getFaultCode
-	
-	/**
-	* Returns the fault string, if a fault has occurred
-	* @return string The fault string, if a fault has occurred
-	*/
-	function getFaultString() {
-		if ($this->isFault()) {
-			$node = $this->xmldoc->document_element();
-			$node = $node->first_child();
-			$node = $node->first_child();
-			$faultStruct = $node->first_child();
-			
-			$childNodes = $faultStruct->child_nodes();
-			$node = $childNodes[1];
-			$childNodes = $node->child_nodes();
-			$node = $childNodes[1];
-			$node = $node->first_child();
-			$node = $node->first_child();
-
-			return ($node->nodeValue);
-		}
-	} //getFaultString
-	
-	/**
-	* Returns the type of the specified param
-	* @param object A reference to the param to be tested for type
-	* @return string The type of the param
-	*/
-	function getParamType($node) {
-		switch ($node->node_name()) {
-			case DOM_XMLRPC_TYPE_PARAM:
-				$node = $node->first_child();
-				$node = $node->first_child();
-				return $node->node_name();
-				break;
-				
-			default:
-				//throw exception
-		}		
-	} //getParamType
-	
-	/**
-	* Returns an unformatted string representation of the document
-	* @return string An unformatted string representation of the document
-	*/
-	function toString() {
-		if (func_num_args() > 0) {
-			$node = func_get_arg(0);
-		}
-		else {
-			$node = $this->xmldoc->document_element();
-		}
-	
-		$str = '';
-		$str = @$this->xmldoc->dump_node($node);
-		
-		if ($str == '') {
-			$str = @$node->dump_node($node);
-		}
-
-		return $str;
-	} //toString
-	
-	/**
-	* Returns a string representation of the document, formatted for readability
-	* @return string A string representation of the document, formatted for readability
-	*/
-	function toNormalizedString() {
-		//this doesn't actually normalize the string
-		//but is here as a precaution, better
-		//that generating an error!
-		if (func_num_args() > 0) {
-			return $this->toString(func_get_arg(0));
-		}
-		return $this->toString();
-	} //toNormalizedString
-
-} //dom_xmlrpc_domit_document
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_fault.php 4.6rc2/includes/domit/dom_xmlrpc_fault.php
--- 4.5.4/includes/domit/dom_xmlrpc_fault.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_fault.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,51 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_fault is a representation of an XML-RPC fault
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-/**
-* A representation of an XML-RPC fault
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_fault {
-	/** @var int The fault code */
-	var $faultCode;
-	/** @var string A string description of the fault code */
-	var $faultString;
-	
-	/**
-	* Constructor: instantiates the fault object
-	* @param int The fault code
-	* @param string The fault string
-	*/
-	function dom_xmlrpc_fault($faultCode, $faultString) {
-		$this->faultCode = $faultCode;
-		$this->faultString = $faultString;
-	} //dom_xmlrpc_fault
-	
-	/**
-	* Returns the fault code
-	* @return int The fault code
-	*/
-	function getFaultCode() {
-		return $this->faultCode;
-	} //getFaultCode
-	
-	/**
-	* Returns the fault string
-	* @return int The fault string
-	*/
-	function getFaultString() {
-		return $this->faultString;
-	} //getFaultStringltCode
-} //dom_xmlrpc_fault
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_methodcall.php 4.6rc2/includes/domit/dom_xmlrpc_methodcall.php
--- 4.5.4/includes/domit/dom_xmlrpc_methodcall.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_methodcall.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,111 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_methodcall is a representation of an XML-RPC method call
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_builder.php');
-
-/**
-* A representation of an XML-RPC method call
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_methodcall extends dom_xmlrpc_builder {
-	/** @var string The method name */
-	var $methodName;
-	/** @var boolean True if multiple method calls are to be made in a single request */
-	var $multicall = array();
-	
-	/**
-	* Constructor: Instantiates a new method call
-	* @param string The method name
-	*/
-	function dom_xmlrpc_methodcall($methodName = '') {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_utilities.php');
-		
-		$this->methodType = DOM_XMLRPC_TYPE_METHODCALL;
-		$this->methodName = $methodName;
-		
-		$total = func_num_args();
-		
-		for ($i = 1; $i < $total; $i++) {
-			$this->add(func_get_arg($i));
-		}
-	} //dom_xmlrpc_methodcall
-	
-	/**
-	* Sets the method name
-	* @param string The method name
-	*/
-	function setMethodName($name = '') {
-		$this->methodName = $name;
-	} //setMethodName
-	
-	/**
-	* Appends multiple method calls to the request
-	* @param string The method name
-	*/
-	function addMultiCall($methodName) {
-		$total = func_num_args();
-		$paramsArray = array();
-
-		for ($i = 1; $i < $total; $i++) {
-			$paramsArray[] = func_get_arg($i);
-		}
-
-		$this->addMultiCallByRef($methodName, $paramsArray);
-	} //addMultiCall
-	
-	/**
-	* Appends multiple method calls to the request
-	* @param string The method name
-	* @param array A reference to an array of method parameters
-	*/
-	function addMultiCallByRef($methodName, &$paramsArray) {
-		$myCall = array(DOM_XMLRPC_TYPE_METHODNAME => $methodName,
-						DOM_XMLRPC_TYPE_PARAMS => $paramsArray);
-		$this->multicall[] =& $myCall;
-	} //addMultiCallByRef
-	
-	/**
-	* Returns a string representation of the method call
-	* @return string A string representation of the method call
-	*/
-	function toString() {
-		if ($this->methodName == "system.multicall") {
-			$this->addArrayByRef($this->multicall);
-		}
-		
-		$data = <<<METHODCALL
-<?xml version='1.0'?>
-<methodCall>
-	<methodName>$this->methodName</methodName>
-	<params>$this->params
-	</params>
-</methodCall>
-METHODCALL;
-
-		return $data;
-	} //toString
-	
-	/**
-	* Alias of toString
-	* @return string A string representation of the method call
-	*/
-	function toXML() {
-		return $this->toString();
-	} //toXML
-} //dom_xmlrpc_methodcall
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_methodresponse.php 4.6rc2/includes/domit/dom_xmlrpc_methodresponse.php
--- 4.5.4/includes/domit/dom_xmlrpc_methodresponse.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_methodresponse.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,66 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_methodresponse is a representation of a XML-RPC method response 
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_builder.php');
-
-/**
-* A representation of an XML-RPC method response
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_methodresponse extends dom_xmlrpc_builder {
-	
-	/**
-	* Constructor: Instantiates a new method response
-	* @param mixed The method response
-	*/
-	function dom_xmlrpc_methodresponse($response = null) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_utilities.php');
-		
-		$this->methodType = DOM_XMLRPC_TYPE_METHODRESPONSE;
-		
-		if ($response != null) {
-			$this->add($response);
-		}
-	} //dom_xmlrpc_methodresponse
-	
-	/**
-	* Returns a string representation of the method response
-	* @return string A string representation of the method response
-	*/
-	function toString() {
-		 $data = <<<METHODRESPONSE
-<?xml version='1.0'?>
-<methodResponse>
-	<params>$this->params
-	</params>
-</methodResponse>
-METHODRESPONSE;
-
-		return $data;
-	} //toString
-	
-	/**
-	* Alias of toString
-	* @return string A string representation of the method response
-	*/
-	function toXML() {
-		return $this->toString();
-	} //toXML
-} //dom_xmlrpc_methodresponse
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_methodresponse_fault.php 4.6rc2/includes/domit/dom_xmlrpc_methodresponse_fault.php
--- 4.5.4/includes/domit/dom_xmlrpc_methodresponse_fault.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_methodresponse_fault.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,115 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_methodresponse_fault encapsulates an XML-RPC fault
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
- 
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_builder.php');
-
-/**
-* Encapsulates an XML-RPC fault
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_methodresponse_fault extends dom_xmlrpc_builder {
-	/** @var int The fault code */
-	var $faultCode;
-	/** @var string A string description of the fault code */
-	var $faultString;
-	
-	/**
-	* Constructor: instantiates the fault object
-	* @param object A reference to the fault code
-	*/
-	function dom_xmlrpc_methodresponse_fault($fault = null) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_utilities.php');
-		
-		$this->methodType = DOM_XMLRPC_TYPE_METHODRESPONSE;
-		
-		if ($fault != null) {
-			$this->setFaultCode($fault->getFaultCode());
-			$this->setFaultString($fault->getFaultString());
-		}
-	} //dom_xmlrpc_methodresponse_fault
-	
-	/**
-	* Returns the fault code
-	* @return int The fault code
-	*/
-	function getFaultCode() {
-		return $this->faultCode;
-	} //getFaultCode
-	
-	/**
-	* Sets the fault code
-	* @param int The fault code
-	*/
-	function setFaultCode($faultCode) {
-		$this->faultCode = $faultCode;
-	} //setFaultCode
-	
-	/**
-	* Returns the fault string
-	* @return int The fault string
-	*/
-	function getFaultString() {
-		return $this->faultString;
-	} //getFaultString
-	
-	/**
-	* Sets the fault string
-	* @param string The fault string
-	*/
-	function setFaultString($faultString) {
-		$this->faultString = $faultString;
-	} //setFaultString
-	
-	/**
-	* Returns a string representation of the fault
-	* @return string A string representation of the fault
-	*/
-	function toString() {
-		 $data = <<<METHODRESPONSE_FAULT
-<?xml version='1.0'?>
-<methodResponse>
-	<fault>
-		<value>
-			<struct>
-				<member>
-					<name>faultCode</name>
-					<value><int>$this->faultCode</int></value>
-				</member>
-				<member>
-					<name>faultString</name>
-					<value><string>$this->faultString</string></value>
-				</member>
-			</struct>
-		</value>
-	</fault>
-</methodResponse>
-METHODRESPONSE_FAULT;
-
-		return $data;
-	} //toString
-	
-	/**
-	* Alias of toString
-	* @return string A string representation of the fault
-	*/
-	function toXML() {
-		return $this->toString();
-	} //toXML
-} //dom_xmlrpc_methodresponse_fault
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_object.php 4.6rc2/includes/domit/dom_xmlrpc_object.php
--- 4.5.4/includes/domit/dom_xmlrpc_object.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_object.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-<?php
-//*******************************************************************
-//dom_xmlrpc_object wraps a native PHP object 
-//*******************************************************************
-//by John Heinstein
-//johnkarl@nbnet.nb.ca
-//*******************************************************************
-//Version 0.1
-//copyright 2004 Engage Interactive
-//http://www.engageinteractive.com/dom_xmlrpc/
-//All rights reserved
-//*******************************************************************
-//Licensed under the GNU General Public License (GPL)
-//http://www.gnu.org/copyleft/gpl.html
-//*******************************************************************
-class dom_xmlrpc_object {
-	var $myObject;
-	
-	function dom_xmlrpc_object($myObject) {
-		$this->myObject =& $myObject;
-	} //dom_xmlrpc_object
-	
-	function &getObject() {
-		return $this->myObject;
-	} //getObject
-} //dom_xmlrpc_object
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_object_parser.php 4.6rc2/includes/domit/dom_xmlrpc_object_parser.php
--- 4.5.4/includes/domit/dom_xmlrpc_object_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_object_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,193 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_object_parser handles SAX events to convert a DOM XML-RPC XML string into a PHP array
-*
-* Will generate PHP objects instead of structs if directed
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_parser.php');
-
-/**
-* Handles SAX events to convert a DOM XML-RPC XML string into a PHP array
-*
-* Will generate PHP objects instead of structs if directed
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_object_parser extends dom_xmlrpc_parser {
-	/** @var boolean If true, objects will be tested for */
-	var $testingForObject = false; //when a struct is encountered, turn this on	
-	/** @var object Handler for PHP objects */
-	var $objectDefinitionHandler = null; //fired when a __phpobject__ definition is required
-	
-	/**
-	* Constructor
-	* @param object Reference to a handler for PHP objects
-	*/
-	function dom_xmlrpc_object_parser(&$objectDefinitionHandler) {
-		$this->objectDefinitionHandler =& $objectDefinitionHandler;
-	} //dom_xmlrpc_object_parser
-	
-	/**
-	* Handles start element events
-	* @param object A reference to the SAX parser
-	* @param string The name of the start element tag
-	* @param array An array of attributes (never used by XML-RPC spec)
-	*/
-	function startElement($parser, $name, $attrs) {
-		switch($name) {
-			case DOM_XMLRPC_TYPE_METHODCALL:
-			case DOM_XMLRPC_TYPE_METHODRESPONSE:
-			case DOM_XMLRPC_TYPE_FAULT:
-				$this->arrayDocument->methodType = $name; //register methodType
-				break;
-			case DOM_XMLRPC_TYPE_ARRAY: 
-			case DOM_XMLRPC_TYPE_STRUCT:
-				$this->lastArrayType[] = $name; 
-				$this->lastArray[] = array();
-				$this->testingForObject = true; 
-				break;
-		}
-	} //startElement
-	
-	/**
-	* Handles end element events
-	* @param object A reference to the SAX parser
-	* @param string The name of the end element tag
-	*/
-	function endElement($parser, $name) {
-		switch($name) {
-			case DOM_XMLRPC_TYPE_STRING:
-				//$this->addValue(html_entity_decode($this->charContainer, ENT_QUOTES));
-				$this->addValue($this->charContainer);
-				break;
-			case DOM_XMLRPC_TYPE_I4:
-			case DOM_XMLRPC_TYPE_INT:
-				$this->addValue((int)($this->charContainer));
-				break;
-			case DOM_XMLRPC_TYPE_DOUBLE:
-				$this->addValue(floatval($this->charContainer));
-				break;
-			case DOM_XMLRPC_TYPE_BOOLEAN:
-				$this->addValue((bool)(trim($this->charContainer)));
-				break;
-			case DOM_XMLRPC_TYPE_BASE64:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-				$base64 =& new dom_xmlrpc_base64();
-				$base64->fromString($this->charContainer);
-				$this->addValue($base64); //should I add object or string?
-				break;
-			case DOM_XMLRPC_TYPE_DATETIME:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_datetime_iso8601.php');
-				$dateTime =& new dom_xmlrpc_datetime_iso8601($this->charContainer);
-				$this->addValue($dateTime); //should I add object or string?
-				break;
-			case DOM_XMLRPC_TYPE_VALUE:
-				//if charContainer has anything in it,
-				//then there mustn't be a subnode, therefore a <string>
-				$myValue = trim($this->charContainer);
-				//if ($myValue != '') $this->addValue(html_entity_decode($myValue, ENT_QUOTES));
-				if ($myValue != '') $this->addValue($myValue);
-				break;
-			case DOM_XMLRPC_TYPE_ARRAY:
-			case DOM_XMLRPC_TYPE_STRUCT:
-				$value =& array_pop($this->lastArray);
-				$this->addValue($value);
-				array_pop($this->lastArrayType);
-				break;
-			case DOM_XMLRPC_TYPE_MEMBER:
-				array_pop($this->lastStructName);
-				break;
-			case DOM_XMLRPC_TYPE_NAME:
-				$cn = trim($this->charContainer);	
-				$this->lastStructName[] = $cn;
-				$this->charContainer = '';	
-							
-				if ($this->testingForObject && ($cn == DOM_XMLRPC_PHPOBJECT)) {
-			    	$this->lastArrayType[(count($this->lastArray) - 1)] = DOM_XMLRPC_PHPOBJECT;	
-				}	
-				
-				$this->testingForObject = false;	
-				break;
-			case DOM_XMLRPC_TYPE_METHODNAME:
-				$this->arrayDocument->methodName = trim($this->charContainer);
-				$this->charContainer = '';
-				break;
-		}
-	}    //endElement
-	
-	/**
-	* Adds an XML-RPC value to the results array
-	* @param mixed The value
-	*/
-	function addValue($value) {
-		$upper = count($this->lastArray) - 1;
-
-		if ($upper > -1) {
-			$lastArrayType = $this->lastArrayType[$upper];
-			
-			if ($lastArrayType == DOM_XMLRPC_TYPE_STRUCT) {
-				$currentName = $this->lastStructName[(count($this->lastStructName) - 1)];
-
-				switch ($currentName) {
-					case DOM_XMLRPC_NODEVALUE_FAULTCODE:
-						$this->arrayDocument->faultCode = $value;
-						break;
-						
-					case DOM_XMLRPC_NODEVALUE_FAULTSTRING:
-						$this->arrayDocument->faultString = $value;
-						break;
-						
-					default:	
-						//associative array item					
-						$this->lastArray[$upper][$currentName] = $value; 
-				}
-			} 
-			else if ($lastArrayType == DOM_XMLRPC_PHPOBJECT) {
-				$currentName = $this->lastStructName[(count($this->lastStructName) - 1)];
-				
-				if ($currentName == DOM_XMLRPC_PHPOBJECT) {
-					//import class and instantiate new object
-					call_user_func($this->objectDefinitionHandler, $value);
-			    	$this->lastArray[$upper] =& new $value;
-				}
-				else {
-					if ($currentName == DOM_XMLRPC_SERIALIZED) {
-						//could also check for this...
-						//if (is_object($value) && (get_class($value) == 'dom_xmlrpc_base64')) {
-						//unserialize object
-						$serialized =& $value->getBinary();
-					    $this->lastArray[$upper] =& unserialize($serialized);
-					}
-					else {
-						//add property to object
-						$myObj =& $this->lastArray[$upper];
-		    			$myObj->$currentName =& $value;
-					}
-				} 
-			}
-			else {
-				//indexed array item
-				$this->lastArray[$upper][] =& $value; 
-			} 
-		}
-		else {
-			//at root level, add value as a new param
-			array_push($this->arrayDocument->params,  $value); 
-		}
-		
-		$this->charContainer = '';
-	} //addValue   
-} //dom_xmlrpc_object_parser
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_parser.php 4.6rc2/includes/domit/dom_xmlrpc_parser.php
--- 4.5.4/includes/domit/dom_xmlrpc_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,151 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_parser is the base parsing class
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* The base parsing class
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_parser {
-	/** @var object A wrapper for methodCall and methodResponse arrays */
-	var $arrayDocument = null; 	
-	/** @var string A temporary container for parsed string data */
-	var $charContainer = '';
-	/** @var array A stack holding an hierarchical list of arraytypes (i.e., 'array' or 'struct' or '__phpobject__') */
-	var $lastArrayType = array();
-	/** @var array A stack holding an hierarchical sequence of array references */ 
-	var $lastArray = array(); 
-	/** @var array A stack holding an hierarchical sequence of struct names */
-	var $lastStructName = array(); 
-	
-	/**
-	* Parses the supplied XML text
-	* @param string The XML text
-	* @param boolean True if SAXY is to be used
-	* @return boolean True if the parsing was successful
-	*/
-	function parseXML($xmlText, $useSAXY = true) {
-		$xmlText = trim($xmlText);
-		
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_array_document.php');
-		$this->arrayDocument = new dom_xmlrpc_array_document();
-		
-		if ($xmlText != '') {
-			if ($useSAXY || (!function_exists('xml_parser_create'))) {
-				//use SAXY parser to generate array
-				return $this->parseSAXY($xmlText);
-			}
-			else {
-				//use Expat parser to generate array
-				return $this->parse($xmlText);
-			}
-		}
-
-		return false;
-	} //parseXML	
-	
-	/**
-	* Invokes Expat to parse the XML text
-	* @param string The XML text
-	* @return boolean True if the parsing was successful
-	*/
-	function parse($xmlText) {
-		//create instance of expat parser (should be included in php distro)
-		$parser = xml_parser_create();
-		
-		//set handlers for SAX events
-		xml_set_object($parser, $this);
-		xml_set_element_handler($parser, 'startElement', 'endElement'); 
-		xml_set_character_data_handler($parser, array(&$this, 'dataElement')); 
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); 	
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-		
-		//parse out whitespace -  (XML_OPTION_SKIP_WHITE = 1 does not 
-		//seem to work consistently across versions of PHP and Expat
-		$xmlText = eregi_replace('>' . "[[:space:]]+" . '<' , '><', $xmlText);
-		
-		$success = xml_parse($parser, $xmlText);
-		xml_parser_free($parser); 
-		
-		return $success;
-	} //parse
-	
-	/**
-	* Invokes SAXY to parse the XML text
-	* @param string The XML text
-	* @return boolean True if the parsing was successful
-	*/
-	function parseSAXY($xmlText) {
-		//create instance of SAXY parser 
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'xml_saxy_parser.php');
-		$parser =& new SAXY_Lite_Parser();
-		
-		$parser->xml_set_element_handler(array(&$this, 'startElement'), array(&$this, 'endElement'));
-		$parser->xml_set_character_data_handler(array(&$this, 'dataElement'));
-		
-		$success =  $parser->parse($xmlText);
-		
-		return $success;
-	} //parseSAXY	    
-	
-	/**
-	* Returns a reference to the array document
-	* @return array A reference to the array document
-	*/
-	function &getArrayDocument() {
-		return $this->arrayDocument;
-	} //getArrayDocument
-	
-	/**
-	* Abstract method for handling start element events
-	* @param object A reference to the SAX parser
-	* @param string The name of the start element tag
-	* @param array An array of attributes (never used by XML-RPC spec)
-	*/    
-	function startElement($parser, $name, $attrs) {
-		//must override
-	} //startElement
-	
-	/**
-	* Abstract method for handling end element events
-	* @param object A reference to the SAX parser
-	* @param string The name of the end element tag
-	*/
-	function endElement($parser, $name) {
-		//must override
-	} //endElement
-	
-	/**
-	* Abstract method for adding an XML-RPC value to the results array
-	* @param mixed The value
-	*/
-	function addValue($value) {
-		//must override
-	} //addValue
-    
-	/**
-	* Abstract method for handling character data events
-	* @param object A reference to the SAX parser
-	* @param string The character data
-	*/
-	function dataElement($parser, $data) {
-		$this->charContainer .= $data;
-	} //dataElement    
-} //dom_xmlrpc_parser
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_server.php 4.6rc2/includes/domit/dom_xmlrpc_server.php
--- 4.5.4/includes/domit/dom_xmlrpc_server.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_server.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,635 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_server provides basic XML-RPC server functionality
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-//XML-RPC Exceptions
-//From Specification for Fault Code Interoperability
-/** @var int XML not well formed error */
-define('DOM_XMLRPC_PARSE_ERROR_NOT_WELL_FORMED', -32700);
-/** @var int unsupported encoding error */
-define('DOM_XMLRPC_PARSE_ERROR_UNSUPPORTED_ENCODING', -32701);
-/** @var int invalid encoding error */
-define('DOM_XMLRPC_PARSE_ERROR_INVALID_CHARACTER_ENCODING', -32702);
-/** @var int nonconformat XML-RPC error */
-define('DOM_XMLRPC_SERVER_ERROR_INVALID_XMLRPC_NONCONFORMANT', -32600);
-/** @var int requested method not found error */
-define('DOM_XMLRPC_SERVER_ERROR_REQUESTED_METHOD_NOT_FOUND', -32601);
-/** @var int invalid method parameters error */
-define('DOM_XMLRPC_SERVER_ERROR_INVALID_METHOD_PARAMETERS', -32602);
-/** @var int internal server error */
-define('DOM_XMLRPC_SERVER_ERROR_INTERNAL_XMLRPC', -32603); 
-/** @var int application error */
-define('DOM_XMLRPC_APPLICATION_ERROR', -32500); 
-/** @var int system error */
-define('DOM_XMLRPC_SYSTEM_ERROR', -32400);
-/** @var int http transport error */ 
-define('DOM_XMLRPC_TRANSPORT_ERROR', -32300); 
-
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'php_http_server_generic.php');
-require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-
-/**
-* Provides basic XML-RPC server functionality
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_server extends php_http_server_generic {
-	/** @var object A reference to a method mapping class */
-	var $methodmapper;
-	/** @var boolean True if params array is to be tokenized */
-	var $tokenizeParamsArray = false;
-	/** @var int Server error code */
-	var $serverError = -1;
-	/** @var string Server error string */
-	var $serverErrorString = '';
-	/** @var object A reference to the handler for missing methods  */
-	var $methodNotFoundHandler = null;
-	/** @var boolean True if object awareness is enabled */
-	var $objectAwareness = false;
-	/** @var object A reference to the handler for PHP object values */
-	var $objectDefinitionHandler = null;
-	/** @var array Repository for multiple method responses */
-	var $multiresponse = array();
-	
-	/**
-	* Constructor
-	* @param object A reference to a mapping of custom method handlers
-	* @param boolean True if onPost is to be immediately called
-	*/
-	function dom_xmlrpc_server($customMethods = null, $postData = null) {
-		$this->php_http_server_generic();
-		$this->setHTTPEvents();
-		$this->setHeaders();
-		
-		$this->methodmapper = new dom_xmlrpc_methodmapper();
-		$this->addSystemMethods();
-
-		if ($customMethods != null) $this->addCustomMethods($customMethods);
-		if ($postData != null) $this->fireHTTPEvent('onPost'); //don't have to call receive() method in this case
-	} //dom_xmlrpc_server	
-	
-	/**
-	* Sets the headers for the client connection
-	*/
-	function setHeaders() {
-		$this->setHeader('Content-Type', 'text/xml');
-		$this->setHeader('Server', 'DOM XML-RPC Server/0.1');
-	} //setHeaders
-	
-	/**
-	* Sets the default HTTP event handling
-	*/
-	function setHTTPEvents() {
-		$this->setHTTPEvent('onPost', array(&$this, 'onPost'));
-		
-		$defaultHandler = array(&$this, 'onWrongRequestMethod');
-		$this->setHTTPEvent('onGet', $defaultHandler);
-		$this->setHTTPEvent('onHead', $defaultHandler);
-		$this->setHTTPEvent('onPut', $defaultHandler);
-	} //setHTTPEvents	
-	
-	/**
-	* Adds the default XML-RPC system methods to the method map
-	*/
-	function addSystemMethods() {		
-		$this->methodmapper->addMethod(new dom_xmlrpc_method(array(
-									'name' => 'system.listMethods', 
-									'method' => array(&$this, 'listMethods'),
-									'help' => 'Lists available server methods.', 
-									'signature' => array(DOM_XMLRPC_TYPE_ARRAY))));
-									
-		$this->methodmapper->addMethod(new dom_xmlrpc_method(array(
-									'name' => 'system.methodSignature', 
-									'method' => array(&$this, 'methodSignature'),
-									'help' => 'Returns signature of specified method.', 
-									'signature' => array(DOM_XMLRPC_TYPE_ARRAY,DOM_XMLRPC_TYPE_STRING))));
-									
-		$this->methodmapper->addMethod(new dom_xmlrpc_method(array(
-									'name' => 'system.methodHelp', 
-									'method' => array(&$this, 'methodHelp'),
-									'help' => 'Returns help for the specified method.', 
-									'signature' => array(DOM_XMLRPC_TYPE_STRING,DOM_XMLRPC_TYPE_STRING))));
-									
-		$this->methodmapper->addMethod(new dom_xmlrpc_method(array(
-									'name' => 'system.getCapabilities', 
-									'method' => array(&$this, 'getCapabilities'),
-									'help' => 'Returns an array of supported server specifications.', 
-									'signature' => array(DOM_XMLRPC_TYPE_ARRAY))));
-									
-		$this->methodmapper->addMethod(new dom_xmlrpc_method(array(
-									'name' => 'system.multicall', 
-									'method' => array(&$this, 'multicall'),
-									'help' => 'Handles multiple, asynchronous XML-RPC calls bundled into a single request.', 
-									'signature' => array(DOM_XMLRPC_TYPE_ARRAY,DOM_XMLRPC_TYPE_ARRAY))));
-	} //addSystemMethods
-	
-	/**
-	* Adds user defined methods to the method map
-	* @param object A map of custom methods
-	*/
-	function addCustomMethods($customMethods) {
-		foreach ($customMethods as $key => $value) {
-			$this->methodmapper->addMethod($customMethods[$key]);
-		}
-	} //addCustomMethods
-	
-	/**
-	* Adds user defined methods to the method map
-	* @param array An array of custom methods
-	*/
-	function addMethods($methodsArray) {
-		foreach ($methodsArray as $key => $value) {
-			$this->methodmapper->addMethod($methodsArray[$key]);
-		}
-	} //addMethods
-	
-	/**
-	* Adds a single user defined method to the method map
-	* @param array An array of custom methods
-	*/
-	function addMethod($method) {
-		//expects an associative array
-		$this->methodmapper->addMethod($method);
-	} //addMethod
-	
-	/**
-	* Adds a map of user defined method to the method map
-	* @param object A map of custom methods
-	* @param array A list of method names
-	*/
-	function addMappedMethods(&$methodmap, $methodNameList) {
-		$this->methodmapper->addMappedMethods($methodmap, $methodNameList);
-	} //addMethodMap
-	
-	/**
-	* Specifies whether params should be tokenized
-	* @param boolean True if params should be tokenized
-	*/
-	function tokenizeParams($truthVal) {
-		//if true, params array will be split 
-		//into individual parameters
-		$this->tokenizeParamsArray = $truthVal;
-	} //tokenizeParams
-	
-	
-	//************************************************************************
-	//****************************system methods******************************
-	
-	/**
-	* XML-RPC defined method: lists all available methods
-	* @return array A list of method names
-	*/
-	function listMethods() {
-		return $this->methodmapper->getMethodNames();
-	} //listMethods
-	
-	/**
-	* XML-RPC defined method: returns the signature of the specified method
-	* @param string The method name
-	* @return array The method signature
-	*/
-	function methodSignature($name) {
-		$myMethod =& $this->methodmapper->getMethod($name);
-		return $myMethod->signature;
-	} //methodSignature
-	
-	/**
-	* XML-RPC defined method: returns help on the specified method
-	* @param string The method name
-	* @return string Help on the method
-	*/
-	function methodHelp($name) {
-		$myMethod =& $this->methodmapper->getMethod($name);
-		return $myMethod->help;
-	} //methodHelp
-	
-	/**
-	* XML-RPC defined method: delineates what XML-RPC services are provided by the server
-	* @return array The XML-RPC services provided by the server
-	*/
-	function getCapabilities() {
-		$capabilities = array('xmlrpc' => array(
-									'specUrl' => 'http://www.xmlrpc.com/spec',
-									'specVersion' => 1),
-							 'introspect' => array(
-									'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
-									'specVersion' => 1),
-							 'system.multicall' => array(
-									'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
-									'specVersion' => 1),
-							 'faults_interop' => array(
-									'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
-									'specVersion' => 3));
-		return $capabilities;
-	} //getCapabilities	
-	
-	/**
-	* Handles multiple method calls in a single request
-	* @param array An array of method calls
-	* @return array An array of method responses
-	*/
-	function &multicall(&$myArray) {
-		//call each method and store each result 
-		//in $this->multiresponse
-		foreach ($myArray as $key => $value) { 
-			$currCall =& $myArray[$key];
-			$methodName = $currCall[DOM_XMLRPC_TYPE_METHODNAME];
-			$method =& $this->methodmapper->getMethod($methodName);
-			$params = $currCall[DOM_XMLRPC_TYPE_PARAMS];
-			
-			if (!($method == null)) {
-				if ($this->tokenizeParamsArray) {
-					$this->multiresponse[] =& call_user_func_array($method->method, $params); //should I worry about < PHP 4.04?
-				}
-				else {
-					if (count($params) == 1) { 
-						//if only one param, send $params[0]
-						//rather than than $params
-						$this->multiresponse[] =& call_user_func($method->method, $params[0]);
-					}
-					else {
-						//send the entire array
-						$this->multiresponse[] =& call_user_func($method->method, $params);
-					}
-				}
-			}
-			else { //method doesn't exist
-				////return $this->handleMethodNotFound($methodName, $params);
-			}
-		}
-		
-		return $this->multiresponse;
-	} //multicall
-	
-	//****************************system methods******************************
-	//************************************************************************
-	
-	/**
-	* Handles the POSTing of data to the server
-	* @param string The POST data
-	*/
-	function onPost($postData) {
-		global $HTTP_RAW_POST_DATA;
-		
-		if ($postData == null) $postData = $HTTP_RAW_POST_DATA;
-		$this->respond($this->invokeMethod($postData));
-	} //onPost
-	
-	/**
-	* Invokes the method(s) in the XML request 
-	* @param string The XML text of the request
-	* @return mixed The method response
-	*/
-	function &invokeMethod($xmlText) {
-		$xmlrpcdoc = $this->parseRequest($xmlText);
-		
-		if (!$this->isError()) {
-			$methodName = $xmlrpcdoc->getMethodName();
-			$method =& $this->methodmapper->getMethod($methodName);
-			$params =& $xmlrpcdoc->getParams();
-	
-			if (!($method == null)) {
-				if ($this->tokenizeParamsArray) {
-					$response =& call_user_func_array($method->method, $params); //should I worry about < PHP 4.04?
-				}
-				else {
-					if (count($params) == 1) { 
-						//if only one param, send $params[0]
-						//rather than than $params
-						$response =& call_user_func($method->method, $params[0]);
-					}
-					else {
-						//send the entire array
-						$response =& call_user_func($method->method, $params);
-					}
-				}
-				
-				return $this->buildResponse($response);
-			}
-			else { //method doesn't exist
-				return $this->handleMethodNotFound($methodName, $params);
-			}
-		}
-	} //invokeMethod	
-	
-	/**
-	* Default handler for a missing method
-	* @param string The method name
-	* @param mixed The method params
-	* @return mixed A fault or user defined data
-	*/
-	function &handleMethodNotFound($methodName, &$params) {
-		if ($this->methodNotFoundHandler == null) {
-		    //raise exception, method doesn't exist
-			$this->serverError = DOM_XMLRPC_SERVER_ERROR_REQUESTED_METHOD_NOT_FOUND;
-			$this->serverErrorString = 'DOM XML-RPC Server Error - Requested method not found.';
-			return $this->raiseFault();
-		}
-		else {
-			//fire the custom event; pass in a reference to the server
-			//so that a fault can be generated as with default handler above
-			return call_user_func($this->methodNotFoundHandler, $this, $methodName, $params);
-		}		
-	} //handleMethodNotFound
-	
-	/**
-	* Sets the handler for a missing method
-	* @param object A reference to the method not found handler
-	*/
-	function setMethodNotFoundHandler($method) {
-		$this->methodNotFoundHandler =& $method;
-	} //setMethodNotFoundHandler	
-	
-	/**
-	* Builds a method response or fault
-	* @param object A reference to the method response data
-	* @return mixed The method response or fault
-	*/
-	function &buildResponse(&$response) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_fault.php');
-
-		if (is_object($response) && (get_class($response) == 'dom_xmlrpc_fault')) {
-			return $this->buildFault($response);
-		}
-		else {
-			return $this->buildMethodResponse($response);
-		}
-	} //buildResponse
-	
-	/**
-	* Builds a method response
-	* @param object A reference to the method response data
-	* @return mixed The method response
-	*/
-	function buildMethodResponse($response) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_methodresponse.php');
-		$methodResponse = new dom_xmlrpc_methodresponse($response);
-
-		return $methodResponse->toXML();
-	} //buildMethodResponse	
-	
-	/**
-	* Determines whether an error has occurred
-	* @return boolean True if an error has occurred
-	*/
-	function isError() {
-		return ($this->serverError != -1);
-	} //isError
-	
-	/**
-	* Raises an XML-RPC fault
-	* @return object An XML-RPC fault
-	*/
-	function &raiseFault() {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_fault.php');
-		
-		$fault = new dom_xmlrpc_fault($this->serverError, $this->serverErrorString);
-		return $this->buildFault($fault);
-	} //raiseFault
-	
-	/**
-	* Builds an XML-RPC fault
-	* @param object A reference to the method response data
-	* @return mixed The XML-RPC fault
-	*/
-	function buildFault($response) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_methodresponse_fault.php');
-		$fault = new dom_xmlrpc_methodresponse_fault($response);
-		
-		return $fault->toXML();
-	} //buildFault
-	
-	/**
-	* Sets object awareness to the specified value
-	* @param boolean True if object awareness is to be enabled
-	*/
-	function setObjectAwareness($truthVal) {
-		$this->objectAwareness = $truthVal;
-	} //setObjectAwareness
-	
-	/**
-	* Sets the handler for object handling
-	* @param object The handler for object handling
-	*/
-	function setObjectDefinitionHandler($handler) {
-		$this->objectDefinitionHandler =& $handler;
-	} //setObjectDefinitionHandler
-	
-	/**
-	* Parses the method request
-	* @param string The text of the method request
-	* @return mixed The method response document
-	*/
-	function &parseRequest($xmlText) {
-		if ($this->objectAwareness) {
-		    require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_object_parser.php');
-			$parser =& new dom_xmlrpc_object_parser($this->objectDefinitionHandler);
-		}
-		else {
-			require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_array_parser.php');
-			$parser =& new dom_xmlrpc_array_parser();
-		}
-		
-		if ($parser->parseXML($xmlText, false)) {				
-			return $parser->getArrayDocument();
-		}
-		else {
-			//raise exception, parsing error
-			$this->serverError = DOM_XMLRPC_PARSE_ERROR_NOT_WELL_FORMED;
-			$this->serverErrorString = 'DOM XML-RPC Parse Error - XML document not well formed.';
-			return null;
-		}
-	} //parseRequest
-	
-	/**
-	* Raises fault if POST is not used for method request
-	*/
-	function onWrongRequestMethod() {
-		//raise exception, POST method not used
-		$this->serverError = DOM_XMLRPC_SERVER_ERROR_INTERNAL_XMLRPC;
-		$this->serverErrorString = 'DOM XML-RPC Server Error - ' . 
-				'Only POST method is allowed by the XML-RPC specification.';
-				
-		$this->respond($this->raiseFault());
-	} //onWrongRequestMethod
-} //dom_xmlrpc_server
-
-
-/**
-* Represents an XML-RPC server method
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_methods {
-	/** @var array A list of methods */
-	var $methods = array();
-	
-	/**
-	* Adds a method to the method array
-	* @param object The method to be added
-	*/
-	function addMethod(&$method) {
-		$this->methods[$method->name] =& $method;
-	} //addMethod
-	
-	/**
-	* Retrieves a method from the method array
-	* @param string The name of the method
-	* @return object A reference to the requested method
-	*/
-	function &getMethod($name) {
-		if (isset($this->methods[$name])) {
-			return $this->methods[$name];
-		}
-
-		return null;
-	} //getMethod
-	
-	/**
-	* Retrieves a list of methods in the method array
-	* @return array A list of methods in the method array
-	*/
-	function getMethodNames() {
-		return array_keys($this->methods);
-	} //getMethodNames
-} //dom_xmlrpc_methods
-
-/**
-* Represents a map of methods available to the server
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_methodmapper {
-	/** @var array The method map */
-	var $mappedmethods = array();
-	/** @var array A dom_xmlrpc_methods instance */
-	var $unmappedmethods;
-	
-	/**
-	* Constructor: Instantiates a new methodmapper
-	*/
-	function dom_xmlrpc_methodmapper() {
-		$this->unmappedmethods =& new dom_xmlrpc_methods();
-	} //dom_xmlrpc_methodmapper
-	
-	/**
-	* Adds a method to the method map
-	* @param object The method to be added
-	*/
-	function addMethod(&$method) {
-		$this->unmappedmethods->addMethod($method);
-		$this->mappedmethods[$method->name] =& $this->unmappedmethods;
-	} //addMethod
-	
-	/**
-	* Adds a method map to the method map
-	* @param object The method map to be added
-	*/
-	function addMappedMethods(&$methodmap, $methodNameList) {
-		$total = count($methodNameList);
-		
-		for ($i = 0; $i < $total; $i++) {
-			$this->mappedmethods[$methodNameList[$i]] =& $methodmap;
-		}
-	} //addMappedMethods
-	
-	/**
-	* Retrieves a method from the method map
-	* @param string The name of the method
-	* @return object A reference to the requested method
-	*/
-	function &getMethod($name) {
-		if (isset($this->mappedmethods[$name])) {
-			$methodmap =& $this->mappedmethods[$name];
-			return $methodmap->getMethod($name);
-		}
-
-		return null;
-	} //getMethod
-	
-	/**
-	* Retrieves a list of methods in the method array
-	* @return array A list of methods in the method array
-	*/
-	function getMethodNames() {
-		return array_keys($this->mappedmethods);
-	} //getMethodNames
-} //dom_xmlrpc_methodmapper
-
-/**
-* Represents a server method
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_method {
-	/** @var string The method name */
-	var $name;
-	/** @var object A reference to the metho */
-	var $method;
-	/** @var string Help for the method */
-	var $help = '';
-	/** @var array The method signature */
-	var $signature = '';
-	
-	/**
-	* Constructor: Instantiates a custom method
-	* @param array A method name, reference, signature, and help
-	*/
-	function dom_xmlrpc_method($paramArray) {
-		$this->name = $paramArray['name']; 
-		$this->method =& $paramArray['method']; 
-		
-		if (isset($paramArray['help'])) {
-			$this->help = $paramArray['help']; 
-		}
-		
-		if (isset($paramArray['signature'])) {
-			$this->signature = $paramArray['signature']; 
-		}
-	} //dom_xmlrpc_method
-} //dom_xmlrpc_method
-
-/**
-* Abstract class for a method map
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_methodmap {
-	/**
-	* Retrieves a method from the method array
-	* @param string The name of the method
-	* @return object A reference to the requested method
-	*/
-	function &getMethod($methodName) {
-		//override this method
-	} //getMethod
-} //dom_xmlrpc_methodmap
-
-
-/*
-//To invoke the server, do:
-$httpServer =& new dom_xmlrpc_server();
-$httpServer->addMethod($someMethod);
-$httpServer->receive(); //will grab $HTTP_RAW_POST_DATA
-
-//abbreviated format, will use $postData instead of $HTTP_RAW_POST_DATA
-$httpServer =& new dom_xmlrpc_server($methods, $postData); 
-*/ 
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_struct.php 4.6rc2/includes/domit/dom_xmlrpc_struct.php
--- 4.5.4/includes/domit/dom_xmlrpc_struct.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_struct.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_object wraps a PHP associative array as an XML-RPC struct
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-/**
-* Wraps a PHP associative array as an XML-RPC struct
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_struct {
-	/** @var object A numeric associative array holding the data */
-	var $numericAssociativeArray;
-	
-	/**
-	* Constructor
-	* @param object A reference to the associative array
-	*/
-	function dom_xmlrpc_struct($numericAssociativeArray) {
-		$this->numericAssociativeArray = $numericAssociativeArray;
-	} //dom_xmlrpc_struct
-	
-	/**
-	* Returns the wrapped associative array
-	* @return array A reference to the associative array
-	*/
-	function getStruct() {
-		return $this->numericAssociativeArray;
-	} //getStruct
-} //dom_xmlrpc_struct
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/dom_xmlrpc_utilities.php 4.6rc2/includes/domit/dom_xmlrpc_utilities.php
--- 4.5.4/includes/domit/dom_xmlrpc_utilities.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/dom_xmlrpc_utilities.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,184 +0,0 @@
-<?php
-/**
-* dom_xmlrpc_utilities are a set of static utilities for handling XML-RPC
-* @package dom-xmlrpc
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/dom_xmlrpc/ DOM XML-RPC Home Page
-* DOM XML-RPC is Free Software
-**/
-
-if (!defined('DOM_XMLRPC_INCLUDE_PATH')) {
-	define('DOM_XMLRPC_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/**
-* A set of static utilities for handling XML-RPC
-*
-* @package dom-xmlrpc
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class dom_xmlrpc_utilities {
-
-	/**
-	* Strips the HTTP headers from the method response
-	* @param string The method response, including headers
-	* @return string The method response with headers stripped
-	*/
-	function stripHeader($myResponse) {
-		$body = '';
-		$total = strlen($myResponse);
-		
-		for ($i = 0; $i < $total; $i++) {
-			if ($myResponse{$i} == '<') {
-				$body = substr($myResponse, $i);
-				break;
-			}
-		}
-
-		return $body;
-	} //stripHeader
-	
-	/**
-	* Determines the type of a scalar value
-	* @param mixed The scalar value
-	* @return string The type of the scalar value
-	*/
-	function getScalarTypeFromValue(&$value) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-		
-		if (is_string($value)) {
-			return DOM_XMLRPC_TYPE_STRING;
-		}
-		else if (is_int($value)) {
-			return DOM_XMLRPC_TYPE_INT;
-		}
-		else if (is_float($value)) {
-			return DOM_XMLRPC_TYPE_DOUBLE;
-		}
-		else if (is_bool($value)) {
-			return DOM_XMLRPC_TYPE_BOOLEAN;
-		}
-		else if (is_object($value)) {
-			require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_datetime_iso8601.php');
-			require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-				
-			if (get_class($value) == 'dom_xmlrpc_datetime_iso8601') {
-				return DOM_XMLRPC_TYPE_DATETIME;
-			}
-			else if (get_class($value) == 'dom_xmlrpc_base64') {
-				return DOM_XMLRPC_TYPE_BASE64;
-			}
-		}
-		
-		return '';
-	} //getScalarTypeFromValue
-	
-	/**
-	* Determines the type of any XML-RPC value
-	* @param mixed The XML-RPC value
-	* @return string The type of the XML-RPC value
-	*/
-	function getTypeFromValue(&$value) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-		$scalarType = dom_xmlrpc_utilities::getScalarTypeFromValue($value);
-
-		if ($scalarType == '') {
-			require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_struct.php');
-			
-			if (is_array($value)) {
-				if (dom_xmlrpc_utilities::isAssociativeArray($value)) {
-					return DOM_XMLRPC_TYPE_STRUCT;
-				}
-				else {
-					return DOM_XMLRPC_TYPE_ARRAY;
-				}
-			}
-			else if (get_class($value) == 'dom_xmlrpc_struct') {
-				return DOM_XMLRPC_TYPE_STRUCT;
-			}
-			else if(is_object($value)) {
-				return DOM_XMLRPC_TYPE_STRUCT;
-			}
-		}
-		else {
-			return $scalarType;
-		}
-	} //getTypeFromValue
-	
-	/**
-	* Converts the given scalar value to its XML-RPC equivalent
-	* @param mixed The scalar value
-	* @param string The type of the scalar value
-	* @return string The XML-RPC equivalent of the scalar value
-	*/
-	function getScalarValue(&$value, $type) {
-		require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_constants.php');
-	
-		switch($type) {
-			case DOM_XMLRPC_TYPE_BOOLEAN:
-				return (($value == true) ? '1' : '0');
-				break;
-				
-			case DOM_XMLRPC_TYPE_DATETIME:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_datetime_iso8601.php');
-
-				if (is_object($value) && (get_class($value) == 'dom_xmlrpc_datetime_iso8601')) { 
-					return ($value->getDateTime_iso());
-				}
-				break;
-				
-			case DOM_XMLRPC_TYPE_BASE64:
-				require_once(DOM_XMLRPC_INCLUDE_PATH . 'dom_xmlrpc_base64.php');
-
-				if (is_object($value) && (get_class($value) == 'dom_xmlrpc_base64')) { 					
-					return ($value->getEncoded());
-				}
-				break;
-				
-			default:
-				return ('' . $value);		
-		}
-		
-		return ('' . $value);	
-	} //getScalarValue
-	
-	/**
-	* Determines whether an array is associative or not
-	*
-	* Note: PHP converts string keys that look like integers
-	* to actual integer keys. This function will thus NOT trap 
-	* $myArray = array('1'=>'blah');
-	* DON'T use integer string keys,
-	* UNLESS you wrap them in a dom_xmlrpc_struct object
-	* The following IS considered associative, however:
-	* $myArray = array('1.2'=>'blah');
-	* @param array The array to be tested
-	* @return boolean True if the array is associative
-	*/
-	function isAssociativeArray(&$myArray) { 
-		reset($myArray);
-		$myKey = key($myArray);
-		
-		if (is_string($myKey)) {			
-			return true;
-		}
-		
-		return false;
-	} //isAssociativeArray
-	
-	/**
-	* Flips the html translation table
-	*
-	* @return array The flipped html translation table
-	*/
-	function getInverseTranslationTable() {
-		$trans = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
-		$trans = array_flip($trans);
-		$trans['&amp;'] = "'";
-		return $trans;
-	} //getInverseTranslationTable
-} //dom_xmlrpc_utilities
-
-?>
\ No newline at end of file
Binary files 4.5.4/includes/domit/domitBanner.gif and 4.6rc2/includes/domit/domitBanner.gif differ
diff -ruN 4.5.4/includes/domit/index.html 4.6rc2/includes/domit/index.html
--- 4.5.4/includes/domit/index.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/index.html	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/license.txt 4.6rc2/includes/domit/license.txt
--- 4.5.4/includes/domit/license.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/license.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1,480 +0,0 @@
-DOMIT! is a non-validating, but lightweight and fast DOM parser for PHP
-
-By John Heinstein 
-jheinstein@engageinteractive.com
-johnkarl@nbnet.nb.ca
-
-Copyright (C) 2004 John Heinstein
-http://www.engageinteractive.com/domit/
-All rights reserved.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-
-
-	GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
diff -ruN 4.5.4/includes/domit/php_file_utilities.php 4.6rc2/includes/domit/php_file_utilities.php
--- 4.5.4/includes/domit/php_file_utilities.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_file_utilities.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,49 +0,0 @@
-<?php
-
-if (!defined('PHP_TEXT_CACHE_INCLUDE_PATH')) {
-	define('PHP_TEXT_CACHE_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-class php_file_utilities {
-	/**
-	* Retrieves binary or text data from the specified file
-	* @param string The file path
-	* @param string The attributes for the read operation ('r' or 'rb')
-	* @return mixed he text or binary data contained in the file
-	*/
-	function &getDataFromFile($filename, $readAttributes, $readSize = 8192) {
-		$fileContents = null;
-		$fileHandle = @fopen($filename, $readAttributes);
-
-		if($fileHandle){
-			do {
-				$data = fread($fileHandle, $readSize);
-
-				if (strlen($data) == 0) {
-					break;
-				}
-
-				$fileContents .= $data;
-			} while (true);
-
-			fclose($fileHandle);
-		}
-
-		return $fileContents;
-	} //getDataFromFile
-	
-	/**
-	* Writes the specified binary or text data to a file
-	* @param string The file path
-	* @param mixed The data to be written
-	* @param string The attributes for the write operation ('w' or 'wb')
-	*/
-	function putDataToFile($fileName, &$data, $writeAttributes) {
-		$fileHandle = @fopen($fileName, $writeAttributes);
-		if ($fileHandle) {
-			fwrite($fileHandle, $data);	
-			fclose($fileHandle);
-		}
-	} //putDataToFile
-} //php_file_utilities
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_client_generic.php 4.6rc2/includes/domit/php_http_client_generic.php
--- 4.5.4/includes/domit/php_http_client_generic.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_client_generic.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,761 +0,0 @@
-<?php
-/**
-* PHP HTTP Tools is a library for working with the http protocol
-* php_http_client_generic represents a basic http client
-* @package php-http-tools
-* @version 0.2-pre
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/php_http_tools/ PHP HTTP Tools Home Page
-* PHP HTTP Tools are Free Software
-**/
-
-if (!defined('PHP_HTTP_TOOLS_INCLUDE_PATH')) {
-	define('PHP_HTTP_TOOLS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** end-of-line character sequence as defined in HTTP spec */
-define ('CRLF', "\r\n");
-/** carriage return character */
-define ('CR', "\r");
-/** line feed character */
-define ('LF', "\n");
-
-//http read states for client
-/** beginning read state */
-define('HTTP_READ_STATE_BEGIN', 1); 
-/** state when reading headers */
-define('HTTP_READ_STATE_HEADERS', 2); 
-/** state when reading body of message */
-define('HTTP_READ_STATE_BODY', 3); 
-
-require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_exceptions.php');
-
-/**
-
-* An HTTP Request class
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_http_request {
-	/** @var object A reference to the headers object */
-	var $headers = null;	
-	/** @var string The requested method, e.g. GET, POST, HEAD */
-	var $requestMethod = 'POST';
-	/** @var string The requested path */
-	var $requestPath = '';
-	/** @var string The requested protocol */
-	var $protocol = 'HTTP';
-	/** @var string The version of the requested protocol */
-	var $protocolVersion= '1.1';
-	
-	/**
-	* Returns the headers object
-	* @return object The headers object
-	*/
-	function &getHeaders() {
-		return $this->headers;
-	} //getHeaders
-	
-	/**
-	* Sets the header to the specified value
-	* @param string The header name
-	* @param string The header value
-	* @param boolean True if multiple headers with the same name are allowed
-	*/
-	function setHeader($name, $value, $allowMultipleHeaders = false) {
-		$this->headers->setHeader($name, $value, $allowMultipleHeaders);
-	} //setHeader
-	
-	/**
-	* Default method for setting headers; meant to be overridden in subclasses
-	*/
-	function setHeaders() {
-		//you will want to override this method
-		$this->setHeader('User-Agent', 'PHP-HTTP-Client(Generic)/0.1');
-		$this->setHeader('Connection', 'Close');
-	} //setHeaders
-	
-	/**
-	* Sets the request method, e.g., GET 
-	* @param string The name of the request method
-	* @return boolean True if the version number is valid
-	*/
-	function setRequestMethod($method) {
-		$method = strtoupper($method);
-		
-		switch ($method) {
-			case 'POST':	
-			case 'GET':
-			case 'HEAD':
-			case 'PUT':
-				$this->requestMethod = $method;
-				return true;
-				break;
-		}
-		
-		return false;
-	} //setRequestMethod
-	
-	/**
-	* Sets the request path, e.g., http://www.engageinteractive.com/domit/test.xml 
-	* @param string The request path
-	*/
-	function setRequestPath($path) {
-		$this->requestPath = $path;
-	} //setRequestPath
-	
-	/**
-	* Sets the version number of the protocol
-	* @param string The version number
-	* @return boolean True if the version number is valid
-	*/
-	function setProtocolVersion($version) {
-		if (($version == '1.0') || ($version == '1.1')) {
-			$this->protocolVersion = $version;
-			return true;
-		}
-		
-		return false;
-	} //setProtocolVersion
-	
-	/**
-	* Specifies a user name and password for basic authentication
-	* @param string The user name
-	* @param string The password
-	*/
-	function setAuthorization($user, $password) {
-		$encodedChallengeResponse = 'Basic ' . base64_encode($this->user . ':' . $this->password);
-		$this->setHeader('Authorization', $encodedChallengeResponse);
-	} //setAuthorization
-} //php_http_request
-
-
-class php_http_client_generic extends php_http_request {
-	/** @var object A reference to the connection object */
-	var $connection;
-	/** @var string True if response headers are to be generated as an object */
-	var $responseHeadersAsObject = false;
-	/** @var object The http response */
-	var $response = null;
-	/** @var string A list of event names that can be fired by the client */
-	var $events = array('onRequest' => null, 'onRead' => null, 
-						'onResponse' => null, 'onResponseHeaders' => null, 
-						'onResponseBody' => null);
-	
-	/**
-	* HTTP Client constructor
-	* @param string The client connection host name, with or without its protocol prefix
-	* @param string The client connection path, not including the host name
-	* @param int The port to establish the client connection on
-	* @param int The timeout value for the client connection
-	*/
-	function php_http_client_generic($host = '', $path = '/', $port = 80, $timeout = 0) {
-		$this->connection =& new php_http_connection($host, $path, $port, $timeout);
-		$this->headers =& new php_http_headers();
-		$this->requestPath = $path;
-		$this->response =& new php_http_response();
-		$this->setHeaders();
-	} //php_http_client_generic
-	
-	/**
-	* Specifies that the response headers array should be generated
-	* @param boolean True if the response headers array should be built
-	*/
-	function generateResponseHeadersAsObject($responseHeadersAsObject) {
-		$this->responseHeadersAsObject = $responseHeadersAsObject;
-		
-		if ($responseHeadersAsObject) {
-			$this->response->headers =& new php_http_headers();
-		}
-	} //generateResponseHeadersAsObject
-	
-	/**
-	* Fires an http event that has been registered
-	* @param string The name of the event, e.g., onRead
-	* @param string The data to be passed to the event
-	*/
-	function fireEvent($target, $data) {
-		if ($this->events[$target] != null) {
-			call_user_func($this->events[$target], $data);
-		}
-	} //fireEvent
-	
-	/**
-	* Sets which http events are to be fired
-	* @param string The http event option to be set
-	* @param string True if the event is to be fired
-	* @param object A reference to a custom handler for the http event data
-	*/
-	function setHTTPEvent($option, $truthVal, $customHandler = null) {
-		if ($customHandler != null) {
-			$handler =& $customHandler;
-		}
-		else {
-			$handler = array(&$this, 'defaultHTTPEventHandler');
-		}
-
-		switch($option) {
-			case 'onRequest':				
-			case 'onRead':
-			case 'onResponse':
-			case 'onResponseHeaders':
-			case 'onResponseBody':
-				$truthVal ? ($this->events[$option] =& $handler) : ($this->events[$option] = null);
-				break;
-		}
-	} //setHTTPEvent
-	
-	/**
-	* Evaluates whether the specified http event option is active
-	* @param string The http event option to evaluate
-	* @return boolean True if the specified option is active
-	*/
-	function getHTTPEvent($option) {
-		switch($option) {
-			case 'onRequest':
-			case 'onRead':
-			case 'onResponse':
-			case 'onResponseHeaders':
-			case 'onResponseBody':
-				return ($this->events[$option] != null);
-				break;
-		}
-	} //getHTTPEvent
-	
-	/**
-	* The default http event handler; fired if no custom handler has been registered 
-	* @param string The event data
-	*/
-	function defaultHTTPEventHandler($data) {
-		$this->printHTML($data);
-	} //defaultHTTPEventHandler
-	
-	/**
-	* Prints the data to the browser as preformatted, htmlentified output
-	* @param string The data to be printed
-	*/
-	function printHTML($html) {
-		print('<pre>' . htmlentities($html)  . '</pre>');
-	} //printHTML
-	
-	/**
-	* Establishes a client connection
-	*/
-	function connect() {
-		if (!$this->headers->headerExists('Host')) {
-			$this->setHeader('Host', $this->connection->host);	
-		}
-		
-		return $this->connection->connect();
-	} //connect
-	
-	/**
-	* Disconnects the current client connection if one exists
-	*/
-	function disconnect() {
-		return $this->connection->disconnect();
-	} //disconnect
-	
-	/**
-	* Evaluated whether the current client is connected
-	* @return boolean True if a connection exists
-	*/
-	function isConnected() {
-		return $this->connection->isOpen();
-	} //isConnected
-	
-	/**
-	* Performs an HTTP GET
-	* @param string The target url
-	* @return object An HTTP response object
-	*/
-	function &get($url) {
-		$this->setRequestMethod('GET');
-		$this->setRequestPath($url);
-				
-		$this->get_custom($url);
-		
-		$this->connect();
-		
-		$result = $this->send('');
-		
-		return $result;
-	} //get
-	
-	/**
-	* Handler for customizing the HTTP GET call
-	* @param string The target url
-	*/
-	function get_custom($url) {
-		//do nothing; meant to be overridden
-	} //get_custom	
-	
-	/**
-	* Performs an HTTP POST
-	* @param string The posted data
-	* @return object An HTTP response object
-	*/
-	function &post($data) {
-		$this->setRequestMethod('POST');
-		$this->setHeader('Content-Type', 'text/html');
-		$this->post_custom($data);
-		
-		$this->connect();
-		
-		return $this->send($data);
-	} //post
-	
-	/**
-	* Handler for customizing the HTTP POST call
-	* @param string The post data
-	*/
-	function post_custom($data) {
-		//do nothing; meant to be overridden
-	} //post_custom	
-	
-	/**
-	* Performs an HTTP HEAD
-	* @param string The target url
-	* @return object An HTTP response object
-	*/
-	function &head($url) {
-		$this->setRequestMethod('HEAD');
-		$this->head_custom($url);
-		
-		$this->connect();
-		
-		return $this->send('');
-	} //head
-	
-	/**
-	* Handler for customizing the HTTP HEAD call
-	* @param string The target url
-	*/
-	function head_custom($url) {
-		//do nothing; meant to be overridden
-	} //head_custom	
-	
-	/**
-	* Sends data through the client connection
-	* @param string The message to be sent
-	* @return string The http response
-	*/
-	function &send($message) {
-		$conn =& $this->connection;
-
-		if ($conn->isOpen()) {
-			//build header info
-			$request = $this->requestMethod  . ' '  . $this->requestPath . ' '  . $this->protocol . 
-							'/' . $this->protocolVersion . CRLF;
-			$request .= $this->headers->toString() . CRLF;
-			$request .= $message;
-			
-			//init variables
-			$response = $headers = $body = ''; 
-			$readState = HTTP_READ_STATE_BEGIN;
-
-			$this->fireEvent('onRequest', $request);
-			
-			//send request
-			$connResource =& $conn->connection;			
-			fputs ($connResource, $request);			
-
-			//read response
-			while (!feof($connResource)) {
-				$data = fgets($connResource, 4096);
-				$this->fireEvent('onRead', $data);
-				
-				switch ($readState) {
-					case HTTP_READ_STATE_BEGIN:
-						$this->response->statusLine = $data;
-						$readState = HTTP_READ_STATE_HEADERS;
-						break;
-						
-					case HTTP_READ_STATE_HEADERS:
-						if (trim($data) == '') { //end of headers is signalled by a blank line
-							$readState = HTTP_READ_STATE_BODY;
-						}
-						else {
-							if ($this->responseHeadersAsObject) {
-								$this->response->setUnformattedHeader($data);
-							}
-							else {
-								$this->response->headers .= $data;
-							}
-						}
-						break;
-					
-					case HTTP_READ_STATE_BODY:
-						$this->response->message .= $data;
-						break;
-				}
-			}
-			
-			$this->normalizeResponseIfChunked();
-			
-			$headerString = is_object($this->response->headers) ? 
-						$this->response->headers->toString() : $this->response->headers;
-			
-			$this->fireEvent('onResponseHeaders', $headerString);
-			$this->fireEvent('onResponseBody', $this->response->message);
-			
-			$this->fireEvent('onResponse', $this->response->headers . $this->response->message);
-			
-			return $this->response;
-		}
-		else {
-			HTTPExceptions::raiseException(HTTP_SOCKET_CONNECTION_ERR, ('HTTP Transport Error - Unable to establish connection to host ' . 
-						$conn->host));
-		}
-	} //send
-	
-	/**
-	* Determines if response data is transfer encoding chunked, then decodes
-	*/
-	function normalizeResponseIfChunked() {
-		if (($this->protocolVersion = '1.1') && (!$this->response->isResponseChunkDecoded)) {
-			if ($this->responseHeadersAsObject) {
-				if ($this->response->headers->headerExists('Transfer-Encoding') &&
-					($this->response->headers->getHeader('Transfer-Encoding') == 'chunked')) {
-					$this->response->message = $this->decodeChunkedData($this->response->getResponse());
-					$this->response->isResponseChunkDecoded = true;
-				}
-			}
-			else {
-				if ((strpos($this->response->headers, 'Transfer-Encoding') !== false) && 
-					(strpos($this->response->headers, 'chunked') !== false)){
-					$this->response->message = $this->decodeChunkedData($this->response->getResponse());
-					$this->response->isResponseChunkDecoded = true;
-				}
-			}
-		}
-	} //normalizeResponseIfChunked
-	
-	/**
-	* Decodes data if transfer encoding chunked
-	* @param string The encoded data
-	* @return string The decoded data
-	*/
-	function decodeChunkedData($data) {
-		$chunkStart = $chunkEnd = strpos($data, CRLF) + 2;
-		$chunkLengthInHex = substr($data, 0, $chunkEnd);
-		$chunkLength = hexdec(trim($chunkLengthInHex));
-		
-		$decodedData = '';
-		
-		while ($chunkLength > 0) {
-			$chunkEnd = strpos($data, CRLF, ($chunkStart + $chunkLength));
-			
-			if (!$chunkEnd) { 
-				//if the trailing CRLF is missing, return all the remaining data 
-				$decodedData .= substr($data, $chunkStart);
-				break;
-			}
-			
-			$decodedData .= substr($data, $chunkStart, ($chunkEnd - $chunkStart));
-			$chunkStart = $chunkEnd + 2;
-			$chunkEnd = strpos($data, CRLF, $chunkStart) + 2;
-			
-			if (!$chunkEnd) break;
-			
-			$chunkLengthInHex = substr($data, $chunkStart, ($chunkEnd - $chunkStart));
-			$chunkLength = hexdec(trim($chunkLengthInHex));
-			$chunkStart = $chunkEnd;
-		}
-		
-		return $decodedData;
-	} //decodeChunkedData
-} //php_http_client_generic
-
-
-/**
-* An HTTP Connection class
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_http_connection {
-	/** @var object A reference to the current connection */
-	var $connection = null;
-	/** @var string The host of the connection */
-	var $host;
-	/** @var string The path of the connection */
-	var $path;
-	/** @var int The port of the connection */
-	var $port;
-	/** @var int The timeout value for the connection */
-	var $timeout;
-	/** @var int The error number of the connection */
-	var $errorNumber = 0;
-	/** @var string The error string of the connection */
-	var $errorString = '';
-	
-	/**
-	* HTTP Connection constructor
-	* @param string The connection host name, with or without its protocol prefix
-	* @param string The connection path, not including the host name
-	* @param int The port to establish the client connection on
-	* @param int The timeout value for the client connection
-	*/
-	function php_http_connection($host = '', $path = '/', $port = 80, $timeout = 0) {
-		$this->host = $this->formatHost($host);
-		$this->path = $this->formatPath($path);
-		$this->port = $port;
-		$this->timeout = $timeout;
-	} //php_http_connection
-	
-	/**
-	* Formats a host string by stripping off the http:// prefix
-	* @param string The host name
-	* @return string The formatted host name
-	*/
-	function formatHost($hostString) {
-		$hasProtocol = (substr(strtoupper($hostString), 0, 7) == 'HTTP://');
-	
-		if ($hasProtocol) {
-			$hostString = substr($hostString, 7);
-		}
-		
-		return $hostString;
-	} //formatHost
-	
-	/**
-	* Formats a path string
-	* @param string The path
-	* @return string The formatted path
-	*/
-	function formatPath($pathString) {
-		if (($pathString == '') || ($pathString == null)) {
-			$pathString = '/';
-		}
-		
-		return $pathString;
-	} //formatPath
-	
-	/**
-	* Establishes a socket connection
-	* @return boolean True if the connection was successful
-	*/
-	function connect() {
-		if ($this->timeout == 0) {
-			$this->connection = @fsockopen($this->host, $this->port, $errorNumber, $errorString);
-		}
-		else {
-			$this->connection = @fsockopen($this->host, $this->port, $errorNumber, $errorString, $this->timeout);
-		}
-		
-		$this->errorNumber = $errorNumber;
-		$this->errorString = $errorString;
-		
-		return is_resource($this->connection);
-	} //connect
-	
-	/**
-	* Determines whether the connection is still open
-	* @return boolean True if the connection is still open
-	*/
-	function isOpen() {
-		return (is_resource($this->connection) && (!feof($this->connection)));
-	} //isOpen
-	
-	/**
-	* Disconnects the current connection
-	* @return boolean True if the connection has been disconnected
-	*/
-	function disconnect() {
-		fclose($this->connection);
-		$this->connection = null;
-		return true;
-	} //disconnect
-} //php_http_connection
-
-/**
-* An HTTP Headers class
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_http_headers {
-	/** @var object An array of headers */
-	var $headers;
-	
-	/**
-	* HTTP Headers constructor
-	*/
-	function php_http_headers() {
-		$this->headers = array();
-	} //php_http_headers
-	
-	/**
-	* Returns the specified header value
-	* @param string The header name
-	* @return mixed The header value, or an array of header values
-	*/
-	function &getHeader($name) {
-		if ($this->headerExists($name))	{	
-			return $this->headers[$name];
-		}
-		
-		return false;
-	} //getHeader
-	
-	/**
-	* Sets the named header to the specified value
-	* @param string The header name
-	* @param string The header value
-	* @param boolean True if multiple headers with the same name are allowed
-	*/
-	function setHeader($name, $value, $allowMultipleHeaders = false) {
-		if ($allowMultipleHeaders) {
-			if (isset($this->headers[$name])) {
-				if (is_array($this->headers[$name])) {
-					$this->headers[$name][count($this->headers)] = $value;
-				}
-				else {
-					$tempVal = $this->headers[$name];
-					$this->headers[$name] = array($tempVal, $value);
-				}
-			}
-			else {
-				$this->headers[$name] = array();
-				$this->headers[$name][0] = $value;
-			}
-		}
-		else {
-			$this->headers[$name] = $value;
-		}
-	} //setHeader
-	
-	/**
-	* Determines whether the specified header exists
-	* @param string The header name
-	* @return boolean True if the specified header exists
-	*/
-	function headerExists($name) {
-		return isset($this->headers[$name]);
-	} //headerExists
-	
-	/**
-	* Removes the specified header
-	* @param string The header name
-	* @return boolean True if the specified header has been removed
-	*/
-	function removeHeader($name) {
-		if ($this->headerExists($name))	{	
-			unset($this->headers[$name]);
-			return true;
-		}
-		
-		return false;
-	} //removeHeader
-	
-	/**
-	* Returns a reference to the headers array
-	* @return array The headers array
-	*/
-	function getHeaders() {
-		return $this->headers;
-	} //getHeaders
-	
-	/**
-	* Returns a list of existing headers names
-	* @return array A list of existing header names
-	*/
-	function getHeaderList() {
-		return array_keys($this->headers);
-	} //getHeaderList
-	
-	/**
-	* Returns a string representation of the headers array
-	* @return string A string representation of the headers array
-	*/
-	function toString() {
-		$retString = '';
-		
-		foreach ($this->headers as $key => $value) {
-			if (is_array($value)) {
-				foreach ($value as $key2 => $value2) {
-					$retString .= $key . ': ' . $value2 . CRLF;
-				}
-			}
-			else {
-				$retString .= $key . ': ' . $value . CRLF;
-			}
-		}
-		
-		return $retString;
-	} //toString
-} //php_http_headers
-
-/**
-* An HTTP Response class
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_http_response {
-	/** @var string Response number */
-	var $statusLine = '';
-	/** @var mixed Response headers, either as object or string */
-	var $headers = '';	
-	/** @var string Response message */
-	var $message = '';
-	/** @var boolean True if the chunked transfer-encoding of the response has been decoded */	
-	var $isResponseChunkDecoded = false;
-
-	/**
-	* Returns a reference to the headers array
-	* @return array The headers array
-	*/
-	function getResponse() {
-		return $this->message;
-	} //getResponse
-	
-	/**
-	* Returns the response status line
-	* @return string The response status line
-	*/
-	function getStatusLine() {
-		return $this->statusLine;
-	} //getStatusLine
-	
-	/**
-	* Returns the response status code
-	* @return int The response status code
-	*/
-	function getStatusCode() {
-		$statusArray = split(' ', $this->statusLine);
-		
-		if (count($statusArray > 1)) {
-			return intval($statusArray[1], 10);
-		}
-		
-		return -1;
-	} //getStatusCode
-	
-	/**
-	* Returns a reference to the headers array
-	* @return array The headers array
-	*/
-	function &getHeaders() {
-		return $this->headers;
-	} //getHeaders
-	
-	/**
-	* Converts a header string into a key value pair and sets header
-	*/
-	function setUnformattedHeader($headerString) {
-		$colonIndex = strpos($headerString, ':');
-
-		if ($colonIndex !== false) {
-			$key = trim(substr($headerString, 0, $colonIndex));
-			$value = trim(substr($headerString, ($colonIndex + 1)));
-			$this->headers->setHeader($key, $value, true);
-		}
-	} //setUnformattedHeader	
-} //php_http_response
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_client_include.php 4.6rc2/includes/domit/php_http_client_include.php
--- 4.5.4/includes/domit/php_http_client_include.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_client_include.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-<?php
-define('PHP_HTTP_TOOLS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_client_generic.php');
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_connector.php 4.6rc2/includes/domit/php_http_connector.php
--- 4.5.4/includes/domit/php_http_connector.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_connector.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,77 +0,0 @@
-<?php
-/**
-* PHP HTTP Tools is a library for working with the http protocol
-* php_http_connector establishes http connections
-* @package php-http-tools
-* @version 0.1
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/php_http_tools/ PHP HTTP Tools Home Page
-* PHP HTTP Tools are Free Software
-**/
-
-if (!defined('PHP_HTTP_TOOLS_INCLUDE_PATH')) {
-	define('PHP_HTTP_TOOLS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/**
-* A helper class for establishing HTTP connections
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_http_connector {
-	/** @var object A reference to a http connection or proxy, if one is required */
-	var $httpConnection = null;
-	
-	/**
-	* Specifies the parameters of the http conection used to obtain the xml data
-	* @param string The ip address or domain name of the connection
-	* @param string The path of the connection
-	* @param int The port that the connection is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_client_generic.php');
-		
-		$this->httpConnection =& new php_http_client_generic($host, $path, $port, $timeout, $user, $password);
-	} //setConnection
-	
-	/**
-	* Specifies basic authentication for an http connection
-	* @param string The user name
-	* @param string The password
-	*/
-	function setAuthorization($user, $password) {
-		$this->httpConnection->setAuthorization($user, $password);
-	} //setAuthorization
-	
-	/**
-	* Specifies that a proxy is to be used to obtain the data
-	* @param string The ip address or domain name of the proxy
-	* @param string The path to the proxy
-	* @param int The port that the proxy is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setProxyConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_proxy.php');
-		
-		$this->httpConnection =& new php_http_proxy($host, $path, $port, $timeout, $user, $password);
-	} //setProxyConnection
-	
-	/**
-	* Specifies basic authentication for the proxy
-	* @param string The user name
-	* @param string The password
-	*/
-	function setProxyAuthorization($user, $password) {
-		$this->httpConnection->setProxyAuthorization($user, $password);
-	} //setProxyAuthorization
-} //php_http_connector
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_exceptions.php 4.6rc2/includes/domit/php_http_exceptions.php
--- 4.5.4/includes/domit/php_http_exceptions.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_exceptions.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<?php
-/**
-* PHP HTTP Tools is a library for working with the http protocol
-* HTTPExceptions is an HTTP Exceptions class
-* @package php-http-tools
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/php_http_tools/ PHP HTTP Tools Home Page
-* PHP HTTP Tools are Free Software
-**/
-
-/** socket connection error */
-define('HTTP_SOCKET_CONNECTION_ERR', 1); 
-/** http transport error */
-define('HTTP_TRANSPORT_ERR', 2); 
-
-/**
-* An HTTP Exceptions class (not yet implemented)
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class HTTPExceptions {
-	function raiseException($errorNum, $errorString) {
-		die('HTTP Exception: ' . $errorNum  .  "\n " . $errorString);
-	} //raiseException
-} //HTTPExceptions
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_proxy.php 4.6rc2/includes/domit/php_http_proxy.php
--- 4.5.4/includes/domit/php_http_proxy.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_proxy.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,78 +0,0 @@
-<?php
-/**
-* PHP HTTP Tools is a library for working with the http protocol
-* php_http_proxy represents a basic http proxy
-* @package php-http-tools
-* @version 0.2-pre
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/php_http_tools/ PHP HTTP Tools Home Page
-* PHP HTTP Tools are Free Software
-**/
-if (!defined('PHP_HTTP_TOOLS_INCLUDE_PATH')) {
-	define('PHP_HTTP_TOOLS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_client_generic.php');
-
-/**
-* An HTTP Proxy class
-*
-* @package php-http-tools
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_http_proxy extends php_http_client_generic {
-	
-	/**
-	* HTTP Proxy constructor
-	* @param string The client connection host name, with or without its protocol prefix
-	* @param string The client connection path, not including the host name
-	* @param int The port to establish the client connection on
-	* @param int The timeout value for the client connection
-	*/
-	function php_http_proxy($host, $path = '/', $port = 80, $timeout = 0) {
-		$this->php_http_client_generic($host, $path, $port, $timeout);		
-		$this->setHeaders();		
-	} //php_http_proxy
-	
-	/**
-	* Sets the proxy timeout to the specified value
-	* @param int The timeout value for the client connection
-	*/
-	function setTimeout($timeout) {
-		$this->timeout = $timeout;
-	} //setTimeout
-	
-	/**
-	* Sets the proxy headers
-	*/
-	function setHeaders() {
-		$this->setHeader('User-Agent', 'PHP-HTTP-Proxy-Client/0.1');		
-		$this->setHeader('Connection', 'Close');
-	} //setHeaders
-	
-	/**
-	* Specifies a user name and password for basic proxy authentication
-	* @param string The user name for proxy authentication
-	* @param string The password for proxy authentication
-	*/
-	function setProxyAuthorization($user, $password) {
-		$encodedChallengeResponse = 'Basic ' . base64_encode($this->user . ':' . $this->password);
-		$this->setHeader('Proxy-Authorization', $encodedChallengeResponse);		
-	} //setProxyAuthorization	
-
-	/**
-	* Handler for customizing the HTTP GET call
-	* @param string The target url
-	*/
-	function get_custom($filename) {
-		$url = $this->connection->formatHost($filename);
-		$sep = strpos($url, '/');
-		$targetHost = substr($url, 0, $sep);
-		
-		$this->setHeader('Host', $targetHost);
-	} //get_custom
-} //php_http_proxy
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_server_generic.php 4.6rc2/includes/domit/php_http_server_generic.php
--- 4.5.4/includes/domit/php_http_server_generic.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_server_generic.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,193 +0,0 @@
-<?php
-//*******************************************************************
-//php_http_server_generic represents a basic http server
-//*******************************************************************
-//by John Heinstein
-//johnkarl@nbnet.nb.ca
-//*******************************************************************
-//Version 0.1
-//copyright 2004 Engage Interactive
-//http://www.engageinteractive.com/dom_xmlrpc/
-//All rights reserved
-//*******************************************************************
-//Licensed under the GNU General Public License (GPL)
-//http://www.gnu.org/copyleft/gpl.html
-//*******************************************************************
-
-if (!defined('PHP_HTTP_TOOLS_INCLUDE_PATH')) {
-	define('PHP_HTTP_TOOLS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-define ('CRLF', "\r\n"); //end-of-line char as defined in HTTP spec
-define ('CR', "\r");
-define ('LF', "\n");
-
-class php_http_server_generic {
-	var $httpStatusCodes;
-
-	var $protocol = 'HTTP';
-	var $protocolVersion = '1.0';
-	var $statusCode = 200;
-
-	var $events = array('onRequest' => null, 'onResponse' => null,
-						'onGet' => null, 'onHead' => null,
-						'onPost' => null, 'onPut' => null);
-
-	function php_http_server_generic() {
-		//require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_status_codes.php');
-		//$this->httpStatusCodes =&new php_http_status_codes();
-	} //php_http_server_generic
-
-	function &getHeaders() {
-		$headers = headers_list();
-		$response = '';
-
-		if (count($headers) > 0) {
-			foreach ($headers as $key => $value) {
-				$response .= $value . CRLF;
-			}
-		}
-
-		return $response;
-	} //getHeaders
-
-	function setProtocolVersion($version) {
-		if (($version == '1.0') || ($version == '1.1')) {
-			$$this->protocolVersion = $version;
-			return true;
-		}
-
-		return false;
-	} //setProtocolVersion
-
-	function setHeader($name, $value) {
-		header($name . ': ' . $value);
-	} //setHeader
-
-	function setHeaders() {
-		//you will want to override this method
-		$this->setHeader('Content-Type', 'text/html');
-		$this->setHeader('Server', 'PHP HTTP Server (Generic)/0.1');
-	} //setHeaders
-
-	function fireEvent($target, $data) {
-		if ($this->events[$target] != null) {
-			call_user_func($this->events[$target], $data);
-		}
-	} //fireEvent
-
-	function fireHTTPEvent($target, $data = null) {
-		if ($this->events[$target] == null) {
-			//if no handler is assigned,
-			//delegate the event to the default handler
-			$this->setHTTPEvent($target);
-		}
-
-		call_user_func($this->events[$target], $data);
-	} //fireHTTPEvent
-
-	function setHTTPEvent($option, $customHandler = null) {
-		if ($customHandler != null) {
-			$handler =& $customHandler;
-		}
-		else {
-			$handler = array(&$this, 'defaultHTTPEventHandler');
-		}
-
-		switch($option) {
-			case 'onGet':
-			case 'onHead':
-			case 'onPost':
-			case 'onPut':
-				$this->events[$option] =& $handler;
-				break;
-		}
-	} //setHTTPServerEvent
-
-	function defaultHTTPHandler() {
-		//will add functionality for this later
-		//work with subclasses for the time being
-	} //defaultHTTPHandler
-
-	function setDebug($option, $truthVal, $customHandler = null) {
-		if ($customHandler != null) {
-			$handler =& $customHandler;
-		}
-		else {
-			$handler = array(&$this, 'defaultDebugHandler');
-		}
-
-		switch($option) {
-			case 'onRequest':
-			case 'onResponse':
-				$truthVal ? ($this->events[$option] =& $handler) :
-							($this->events[$option] = null);
-				break;
-		}
-	} //setDebug
-
-	function getDebug($option) {
-		switch($option) {
-			case 'onRequest':
-			case 'onResponse':
-				return ($this->events[$option] != null);
-				break;
-		}
-	} //getDebug
-
-	function defaultDebugHandler($data) {
-		//just write to a log file, since can't display in a browser
-		$this->writeDebug($data);
-	} //defaultDebugHandler
-
-	function writeDebug($data) {
-		$filename = 'debug_' . time() . '.txt';
-		$fileHandle = fopen($fileName, 'a');
-		fwrite($fileHandle, $data);
-		fclose($fileHandle);
-	} //writeDebug
-
-	function receive() {
-		global $HTTP_SERVER_VARS;
-		$requestMethod = strToUpper($HTTP_SERVER_VARS['REQUEST_METHOD']);
-
-		switch ($requestMethod) {
-			case 'GET':
-				$this->fireHTTPEvent('onGet');
-				break;
-
-			case 'HEAD':
-				$this->fireHTTPEvent('onHead');
-				break;
-
-			case 'POST':
-				$this->fireHTTPEvent('onPost');
-				break;
-
-			case 'PUT':
-				$this->fireHTTPEvent('onPut');
-				break;
-		}
-	} //receive
-
-	function respond($response) {
-		//build header info
-		//$response = $this->protocol . '/' . $this->protocolVersion . ' ' .
-					//$this->statusCode . ' ' . $this->httpStatusCodes->getCodeString($this->statusCode) . CRLF;
-
-		if (!headers_sent()) { //avoid generating an error when in debug mode
-			$this->setHeader('Date', "date('r')");
-			$this->setHeader('Content-Length', strlen($response));
-			$this->setHeader('Connection', 'Close');
-		}
-
-		echo $response;
-	} //respond
-} //php_http_server_generic
-
-
-//To invoke the server, do:
-//$httpServer =& new php_http_server_generic(); //or instance of a subclass
-//$httpServer->receive();
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_server_include.php 4.6rc2/includes/domit/php_http_server_include.php
--- 4.5.4/includes/domit/php_http_server_include.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_server_include.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-<?php
-define('PHP_HTTP_TOOLS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-require_once(PHP_HTTP_TOOLS_INCLUDE_PATH . 'php_http_server_generic.php');
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_http_status_codes.php 4.6rc2/includes/domit/php_http_status_codes.php
--- 4.5.4/includes/domit/php_http_status_codes.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_http_status_codes.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,50 +0,0 @@
-<?php
-//*******************************************************************
-//php_http_status_codes list the http static codes as constants
-//*******************************************************************
-//by John Heinstein
-//johnkarl@nbnet.nb.ca
-//*******************************************************************
-//Version 0.1
-//copyright 2004 Engage Interactive
-//http://www.engageinteractive.com/dom_xmlrpc/
-//All rights reserved
-//*******************************************************************
-//Licensed under the GNU General Public License (GPL)
-//http://www.gnu.org/copyleft/gpl.html
-//*******************************************************************
-class php_http_status_codes {
-	var $codes;
-
-	function php_http_status_codes() {
-		$this->codes = array(
-			200 => 'OK',
-			201 => 'CREATED',
-			202 => 'Accepted',
-			203 => 'Partial Information',
-			204 => 'No Response',
-			301 => 'Moved',
-			302 => 'Found',
-			303 => 'Method',
-			304 => 'Not Modified',
-			400 => 'Bad Request',
-			401 => 'Unauthorized',
-			402 => 'PaymentRequired',
-			403 => 'Forbidden',
-			404 => 'Not found',
-			500 => 'Internal Error',
-			501 => 'Not implemented',
-			502 => 'Service temporarily overloaded',
-			503 => 'Gateway timeout');
-	} //php_http_status_codes
-
-	function getCodes() {
-		return $this->codes;
-	} //getCodes
-
-	function getCodeString($code) {
-		return $this->codes[$code];
-	} //getCodeString
-} //class php_http_status_codes
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/php_text_cache.php 4.6rc2/includes/domit/php_text_cache.php
--- 4.5.4/includes/domit/php_text_cache.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/php_text_cache.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,155 +0,0 @@
-<?php
-/**
-* PHP Text Cache is a simple caching class for for saving/retrieving local copies of url data
-* @package php_text_cache
-* @version 0.3-pre
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/php_text_cache/ PHP Text Cache Home Page
-* PHP Text Cache is Free Software
-**/
-
-if (!defined('PHP_TEXT_CACHE_INCLUDE_PATH')) {
-	define('PHP_TEXT_CACHE_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-require_once(PHP_TEXT_CACHE_INCLUDE_PATH . 'php_http_connector.php');
-
-/**
-* A simple caching class for saving/retrieving local copies of url data
-*
-* @package php_text_cache
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class php_text_cache extends php_http_connector {
-	/** @var string The directory in which cached files are stored */
-	var $cacheDir;
-	/** @var int The amount time of time to wait before a cached file should be updated  */
-	var $cacheTime;
-	
-	/**
-	* Constructor
-	* @param string Directory in which to store the cache files
-	* @param int Expiry time for cache file (-1 signifies no expiry limit)
-	*/
-	function php_text_cache($cacheDir = './', $cacheTime = -1) {
-		$this->cacheDir = $cacheDir;
-		$this->cacheTime = $cacheTime;
-	} //php_text_cache	
-	
-	
-	/**
-	* Gets data from an url, or its cache file
-	* 
-	* @param string The url of the data
-	* @return string The data at the specified url
-	*/
-	function getData($url) {
-		$cacheFile = $this->getCacheFileName($url);
-
-		if (is_file($cacheFile)) {
-			$fileStats = stat($cacheFile);
-			$lastChangeTime = $fileStats[9]; //mtime
-			$currTime = time();
-
-			if (($this->cacheTime != -1) && ($currTime - $lastChangeTime) > $this->cacheTime) { //get data from url	
-				return $this->fromURL($url, $cacheFile);
-			}
-			else { //get data from file	
-				return $this->fromCache($cacheFile);				
-			}			
-		}
-		else {
-			return $this->fromURL($url, $cacheFile);
-		}
-	} //getData
-	
-	/**
-	* Given an url, returns the path to the cache file
-	* 
-	* Uses an md5 hash of the url. This can be 
-	* overridden if a different approach is required
-	* 
-	* @param string The url of the data
-	* @return string The cache file name 
-	*/
-	function getCacheFileName($url) {
-		return ($this->cacheDir . md5($url));
-	} //getCacheFileName
-	
-	/**
-	* Establishes a connection, given an url
-	* @param string The url of the data
-	*/
-	function establishConnection($url) {
-		require_once(PHP_TEXT_CACHE_INCLUDE_PATH . 'php_http_client_generic.php');
-		
-		$host = php_http_connection::formatHost($url);
-		$host = substr($host, 0, strpos($host, '/'));
-		
-		$this->setConnection($host);
-	} //establishConnection
-	
-	/**
-	* Gets data from an url and caches a copy of the data
-	* @param string The url for the data
-	* @param string The cache file path
-	* @return string The contents of the url
-	*/
-	function fromURL($url, $cacheFile) {
-		$fileContents = '';
-
-		if ($this->httpConnection != null) {
-			$response =& $this->httpConnection->get($url);
-			$fileContents = $response->getResponse();
-		}
-		else {
-			$fileContents = $this->fromFile($url);						
-		}
-
-		//if file is empty, might need to establish an
-		//http connection to get the data
-		if ($fileContents == '') {
-			$this->establishConnection($url);
-			$response =& $this->httpConnection->get($url); 
-			$fileContents = $response->getResponse();
-		}
-		
-		if ($fileContents != '') {
-			require_once(PHP_TEXT_CACHE_INCLUDE_PATH . 'php_file_utilities.php');
-			php_file_utilities::putDataToFile($cacheFile, $fileContents, 'w');
-		}
-		
-		return $fileContents;
-	} //fromURL
-	
-	/**
-	* Get text from cache file
-	* @param string The file path
-	* @return string The text contained in the file, or an empty string
-	*/
-	function fromCache($cacheFile) {
-		return $this->fromFile($cacheFile);
-	} //fromCache
-	
-	/**
-	* Get text from an url or file
-	* @param string The url or file path
-	* @return string The text contained in the url or file, or an empty string
-	*/
-	function fromFile($filename) {
-		if (function_exists('file_get_contents')) {
-			return @file_get_contents($filename);
-		}
-		else {
-			require_once(PHP_TEXT_CACHE_INCLUDE_PATH . 'php_file_utilities.php');
-			$fileContents =& php_file_utilities::getDataFromFile($filename, 'r');
-			return $fileContents;
-		}
-		
-		return '';
-	} //fromFile
-} //php_text_cache
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/testing_domit.php 4.6rc2/includes/domit/testing_domit.php
--- 4.5.4/includes/domit/testing_domit.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/testing_domit.php	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-<html><body>Delete this file</body></html>
diff -ruN 4.5.4/includes/domit/timer.php 4.6rc2/includes/domit/timer.php
--- 4.5.4/includes/domit/timer.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/timer.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,43 +0,0 @@
-<?php
-
-class Timer {
-	var $startTime;
-	var $stopTime;
-	
-	function start() {
-		$this->startTime = microtime();
-	} //start
-	
-	function stop() {
-		$this->stopTime = microtime();
-	} //stop
-	
-	function getTime() {
-		return $this->elapsed($this->startTime, $this->stopTime);
-	} //getTime
-	
-	function elapsed($a, $b) {
-		list($a_micro, $a_int) = explode(' ',$a);
-		list($b_micro, $b_int) = explode(' ',$b);
-		
-		if ($a_int > $b_int) {
-			return ($a_int - $b_int) + ($a_micro - $b_micro);
-		} 
-		else if ($a_int == $b_int) {
-			if ($a_micro > $b_micro) {
-				return ($a_int - $b_int) + ($a_micro - $b_micro);
-			} 
-			else if ($a_micro<$b_micro) {
-				return ($b_int - $a_int) + ($b_micro - $a_micro);
-			} 
-			else {
-				return 0;
-			 }
-		} 
-		else { // $a_int < $b_int
-			return ($b_int - $a_int) + ($b_micro - $a_micro);
-		}
-	} //elapsed
-} //Timer
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/xml_domit_cache.php 4.6rc2/includes/domit/xml_domit_cache.php
--- 4.5.4/includes/domit/xml_domit_cache.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_cache.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,74 +0,0 @@
-<?php
-/**
-* @package domit-xmlparser
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-/** Extension for cache files */
-define ('DOMIT_FILE_EXTENSION_CACHE', 'dch');
-
-/**
-* A simple caching mechanism for a DOMIT_Document
-*/
-class DOMIT_cache {
-	/**
-	* Serializes and caches the specified DOMIT! document
-	* @param string The name of the xml file to be saved
-	* @param Object A reference to the document to be saved
-	* @param string The write attributes for the saved document ('w' or 'wb')
-	*/
-	function toCache($xmlFileName, &$doc, $writeAttributes = 'w') {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		require_once(DOMIT_INCLUDE_PATH . 'php_file_utilities.php');
-
-		$name = DOMIT_Utilities::removeExtension($xmlFileName) . '.' . DOMIT_FILE_EXTENSION_CACHE;
-		php_file_utilities::putDataToFile($name, serialize($doc), $writeAttributes);
-
-		return (file_exists($name) && is_writable($name));
-	} //toCache
-	
-	/**
-	* Unserializes a cached DOMIT! document
-	* @param string The name of the xml file to be retrieved
-	* @return Object The retrieved document
-	*/
-	function &fromCache($xmlFileName) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		require_once(DOMIT_INCLUDE_PATH . 'php_file_utilities.php');
-		
-		$name = DOMIT_Utilities::removeExtension($xmlFileName) . '.' . DOMIT_FILE_EXTENSION_CACHE;
-		$fileContents =& php_file_utilities::getDataFromFile($name, 'r');
-		$newxmldoc =& unserialize($fileContents);
-
-		return $newxmldoc;
-	} //fromCache	
-	
-	/**
-	* Determines whether a cached version of the specified document exists
-	* @param string The name of the xml file to be retrieved
-	* @return boolean True if a cache of the specified document exists
-	*/
-	function cacheExists($xmlFileName) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		
-		$name = DOMIT_Utilities::removeExtension($xmlFileName) . '.' . DOMIT_FILE_EXTENSION_CACHE;
-		return file_exists($name);
-	} //xmlFileName
-	
-	/**
-	* Removes a cache of the specified document
-	* @param string The name of the xml file to be retrieved
-	* @return boolean True if a cache has been removed
-	*/
-	function removeFromCache($xmlFileName) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		
-		$name = DOMIT_Utilities::removeExtension($xmlFileName) . '.' . DOMIT_FILE_EXTENSION_CACHE;
-		return unlink($name);
-	} //removeFromCache
-} //DOMIT_cache
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_doctor.php 4.6rc2/includes/domit/xml_domit_doctor.php
--- 4.5.4/includes/domit/xml_domit_doctor.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_doctor.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,94 +0,0 @@
-<?php
-/**
-* DOMIT! Doctor is a set of utilities for repairing malformed XML
-* @package domit-xmlparser
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-/**
-* A (static) class containing utilities for repairing malformed XML
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class domit_doctor {
-	
-	/**
-	* Looks for illegal ampersands and converts them to entities
-	* @param string The xml text to be repaired
-	* @return string The repaired xml text
-	*/
-	function fixAmpersands($xmlText) {
-		$xmlText = trim($xmlText);
-		$startIndex = -1;
-		$processing = true;
-		$illegalChar = '&';
-				
-		while ($processing) {
-			$startIndex = strpos($xmlText, $illegalChar, ($startIndex + 1));
-			
-			if ($startIndex !== false) {
-				$xmlText = domit_doctor::evaluateCharacter($xmlText, 
-									$illegalChar, ($startIndex + 1));
-			}
-			else {
-				$processing = false;
-			}
-		}
-		
-		return $xmlText;
-	} //fixAmpersands
-	
-	/**
-	* Evaluates whether an ampersand should be converted to an entity, and performs the conversion
-	* @param string The xml text
-	* @param string The (ampersand) character
-	* @param int The character index immediately following the ampersand in question
-	* @return string The repaired xml text
-	*/
-	function evaluateCharacter($xmlText, $illegalChar, $startIndex) {
-		$total = strlen($xmlText);
-		$searchingForCDATASection = false; 
-		
-		for ($i = $startIndex; $i < $total; $i++) {
-			$currChar = substr($xmlText, $i, 1);
-			
-			if (!$searchingForCDATASection) {
-				switch ($currChar) {
-					case ' ':
-					case "'":
-					case '"':
-					case "\n":
-					case "\r":
-					case "\t":
-					case '&':
-					case "]":
-						$searchingForCDATASection = true;
-						break;
-					case ";":
-						return $xmlText;
-						break;			
-				}
-			}
-			else {
-				switch ($currChar) {
-					case '<':
-					case '>':
-						return (substr_replace($xmlText, '&amp;', 
-										($startIndex - 1) , 1));
-						break;
-					case "]":
-						return $xmlText;
-						break;			
-				}
-			}
-		}
-		
-		return $xmlText;
-	} //evaluateCharacter
-} //domit_doctor
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_getelementsbypath.php 4.6rc2/includes/domit/xml_domit_getelementsbypath.php
--- 4.5.4/includes/domit/xml_domit_getelementsbypath.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_getelementsbypath.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,277 +0,0 @@
-<?php
-/**
-* @package domit-xmlparser
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-if (!defined('DOMIT_INCLUDE_PATH')) {
-	define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** Separator for elements path */
-define('GET_ELEMENTS_BY_PATH_SEPARATOR', '/');
-/** Constant for an absolute path search (starting at the document root) */
-define('GET_ELEMENTS_BY_PATH_SEARCH_ABSOLUTE', 0);
-/** Constant for a relative path search (starting at the level of the calling node) */
-define('GET_ELEMENTS_BY_PATH_SEARCH_RELATIVE', 1);
-/** Constant for a variable path search (finds all matches, regardless of place in the hierarchy) */
-define('GET_ELEMENTS_BY_PATH_SEARCH_VARIABLE', 2);
-
-/**
-* getElementsByPath is a simple utility for path-based access to nodes in a DOMIT! document.
-*/
-class DOMIT_GetElementsByPath {
-    /** @var Object The node from which the search is called */
-	var $callingNode;
-	/** @var int The type of search to be performed, i.e., relative, absolute, or variable */
-	var $searchType;
-	/** @var Object The node that is the current parent of the search */
-	var $contextNode;
-	/** @var array An array containing a series of path segments for which to search */
-	var $arPathSegments = array();
-	/** @var Object A DOMIT_NodeList of matching nodes */
-	var $nodeList;
-	/** @var Object The index of the current node of the search */
-	var $targetIndex;
-	/** @var Object if true, the search will be aborted once the first match is found */
-	var $abortSearch = false;
-	
-	/**
-	* Constructor - creates an empty DOMIT_NodeList to store matching nodes
-	*/
-	function DOMIT_GetElementsByPath() {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_nodemaps.php');
-		$this->nodeList =& new DOMIT_NodeList();
-	} //DOMIT_GetElementsByPath
-	
-	/**
-	* Parses the supplied "path"-based pattern
-	* @param Object The node from which the search is called
-	* @param string The pattern
-	* @param int The node level of the current search
-	* @return Object The NodeList containing matching nodes
-	*/
-	function &parsePattern(&$node, $pattern, $nodeIndex = 0) {
-		$this->callingNode =& $node;		 
-		$pattern = trim($pattern);	
-		
-		$this->determineSearchType($pattern);
-		$this->setContextNode();
-		$this->splitPattern($pattern);
-	
-		$this->targetIndex = $nodeIndex;
-		$totalSegments = count($this->arPathSegments);		
-		
-		if ($totalSegments > 0) {
-			if ($this->searchType == GET_ELEMENTS_BY_PATH_SEARCH_VARIABLE) {
-				$arContextNodes =& $this->contextNode->ownerDocument->getElementsByTagName($this->arPathSegments[0]);
-				$totalContextNodes = $arContextNodes->getLength();
-				
-				for ($i = 0; $i < $totalContextNodes; $i++) {
-					$this->selectNamedChild($arContextNodes->item($i), 1);
-				}
-			}
-			else {
-				if ($this->searchType == GET_ELEMENTS_BY_PATH_SEARCH_ABSOLUTE) {
-					if ($this->contextNode->nodeName == $this->arPathSegments[0]) {
-						if (count($this->arPathSegments) == 1) {
-							$this->nodeList->appendNode($this->contextNode);
-						}
-						else {
-							$this->selectNamedChild($this->contextNode, 1);	
-						}
-					}
-				}
-				else if ($this->searchType == GET_ELEMENTS_BY_PATH_SEARCH_RELATIVE) {
-					$this->selectNamedChild($this->contextNode, 0);	
-				}
-			}
-		}		
-	
-		if ($nodeIndex > 0) {
-			if ($nodeIndex <= $this->nodeList->getLength()) {
-				return $this->nodeList->item(($nodeIndex - 1));
-			}
-			else {
-				return null;
-			}
-		}
-		
-		return $this->nodeList;
-	} //parsePattern
-	
-	/**
-	* Determines the type of search to be performed: absolute, relative, or variable
-	* @param string The pattern
-	*/
-	function determineSearchType($pattern) {
-		$firstChar = $pattern{0};
-		
-		if ($firstChar != GET_ELEMENTS_BY_PATH_SEPARATOR) {
-			//relative path
-			$this->searchType = GET_ELEMENTS_BY_PATH_SEARCH_RELATIVE;
-		}
-		else {
-			$secondChar = $pattern{1};
-				
-			if ($secondChar != GET_ELEMENTS_BY_PATH_SEPARATOR) {
-				//absolute path
-				$this->searchType = GET_ELEMENTS_BY_PATH_SEARCH_ABSOLUTE;
-			}
-			else {
-				//variable path
-				$this->searchType = GET_ELEMENTS_BY_PATH_SEARCH_VARIABLE;				
-			}
-		}
-	} //determineSearchType
-	
-	
-	/**
-	* Sets the context node, i.e., the node from which the search begins
-	*/
-	function setContextNode() {
-		switch($this->searchType) {
-			case GET_ELEMENTS_BY_PATH_SEARCH_ABSOLUTE:
-				$this->contextNode =& $this->callingNode->ownerDocument->documentElement;
-				break;
-				
-			case GET_ELEMENTS_BY_PATH_SEARCH_RELATIVE:
-				if ($this->callingNode->uid != $this->callingNode->ownerDocument->uid) {
-					$this->contextNode =& $this->callingNode;
-				}
-				else {
-					$this->contextNode =& $this->callingNode->ownerDocument->documentElement;
-				}
-				break;
-
-			case GET_ELEMENTS_BY_PATH_SEARCH_VARIABLE:
-				$this->contextNode =& $this->callingNode->ownerDocument->documentElement;
-				break;
-		}
-	} //setContextNode
-	
-	/**
-	* Splits the supplied pattern into searchable segments
-	* @param string The pattern
-	*/
-	function splitPattern($pattern) {
-		switch($this->searchType) {
-			case GET_ELEMENTS_BY_PATH_SEARCH_ABSOLUTE:
-				$lastIndex = 1;
-				break;
-				
-			case GET_ELEMENTS_BY_PATH_SEARCH_RELATIVE:
-				$lastIndex = 0;
-				break;
-
-			case GET_ELEMENTS_BY_PATH_SEARCH_VARIABLE:
-				$lastIndex = 2;
-				break;
-		}
-		
-		$this->arPathSegments = explode(GET_ELEMENTS_BY_PATH_SEPARATOR, substr($pattern, $lastIndex));
-	} //splitPattern
-	
-	/**
-	* Matches the current path segment against the child nodes of the current context node
-	* @param Object The context node
-	* @param int The index in the arPathSegments array of the current path segment
-	*/
-	function selectNamedChild(&$node, $pIndex) {	
-		if (!$this->abortSearch) {
-			if ($pIndex < count($this->arPathSegments)) { //not at last path segment
-				$name = $this->arPathSegments[$pIndex];
-				$numChildren = $node->childCount;
-			
-				for ($i = 0; $i < $numChildren; $i++) {
-					$currentChild =& $node->childNodes[$i];
-		
-					if ($currentChild->nodeName == $name) {
-						$this->selectNamedChild($currentChild, ($pIndex + 1));
-					}
-				}
-			}
-			else {
-				$this->nodeList->appendNode($node);
-				
-				if ($this->targetIndex == $this->nodeList->getLength()) {
-					$this->abortSearch = true;
-				}
-			}
-		}
-	} //selectNamedChild
-} //DOMIT_GetElementsByPath
-
-
-
-/**
-* getElementsByAttributePath is a temporary utility requested by a DOMIT! user for path-based access to attributes in a DOMIT! document.
-* This class may be absent from future versions of DOMIT!
-*/
-class DOMIT_GetElementsByAttributePath {
-    /** @var Object A DOMIT_NodeList of matching attribute nodes */
-	var $nodeList;
-
-    /**
-	* Constructor - creates an empty DOMIT_NodeList to store matching nodes
-	*/
-	function DOMIT_GetElementsByAttributePath() {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_nodemaps.php');
-		$this->nodeList =& new DOMIT_NodeList();
-	} //DOMIT_GetElementsByAttributePath
-	
-	/**
-	* Matches the current path segment against the child nodes of the current context node
-	* @param Object The context node
-	* @param string The pattern
-	* @param int The index of the current path segment
-	*/
-	function &parsePattern(&$node, $pattern, $nodeIndex = 0) {
-		$beginSquareBrackets = strpos($pattern, '[');
-		
-		if ($beginSquareBrackets != 0) {
-			$path = substr($pattern, 0, $beginSquareBrackets);
-			
-			$attrPattern = substr($pattern, (strpos($pattern, '@') + 1));
-			$attrPattern = substr($attrPattern, 0, strpos($attrPattern, ')'));
-
-			$commaIndex = strpos($attrPattern, ',');
-			$key = trim(substr($attrPattern, 0, $commaIndex));
-			$value = trim(substr($attrPattern, ($commaIndex + 1)));
-			$value = substr($value, 1, (strlen($value) - 2));
-
-			$gebp = new DOMIT_GetElementsByPath();
-			$myResponse =& $gebp->parsePattern($node, $path);
-
-			$total = $myResponse->getLength();
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currNode =& $myResponse->item($i);
-				
-				if ($currNode->hasAttribute($key)) {
-					if ($currNode->getAttribute($key) == $value) {
-						$this->nodeList->appendNode($currNode);
-					}
-				}
-			}	
-		}
-
-		if ($nodeIndex == 0) {
-			return $this->nodeList;
-		}
-		else {
-			if ($nodeIndex <= $this->nodeList->getLength()) {
-				return $this->nodeList->item(($nodeIndex - 1));
-			}
-			else {
-				$this->nodeList = new DOMIT_NodeList();
-				return $this->nodeList;
-			}
-		}
-	} //parsePattern
-} //DOMIT_GetElementsByAttributePath
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_include.php 4.6rc2/includes/domit/xml_domit_include.php
--- 4.5.4/includes/domit/xml_domit_include.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_include.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-<?php
-/**
-* @package domit-xmlparser
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-/** The file system path to the domit library */
-define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-require_once(DOMIT_INCLUDE_PATH . 'xml_domit_parser.php');
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_lite_include.php 4.6rc2/includes/domit/xml_domit_lite_include.php
--- 4.5.4/includes/domit/xml_domit_lite_include.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_lite_include.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-<?php
-/**
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-/** The file system path to the domit library */
-define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-require_once(DOMIT_INCLUDE_PATH . 'xml_domit_lite_parser.php');
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_lite_parser.php 4.6rc2/includes/domit/xml_domit_lite_parser.php
--- 4.5.4/includes/domit/xml_domit_lite_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_lite_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,1822 +0,0 @@
-<?php
-/**
-* DOMIT! Lite is a non-validating, but lightweight and fast DOM parser for PHP
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @version 0.19
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-if (!defined('DOMIT_INCLUDE_PATH')) {
-	define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** current version of DOMIT! Lite */
-define ('DOMIT_LITE_VERSION', '0.19');
-
-/**
-*@global array Flipped version of $definedEntities array, to allow two-way conversion of entities
-*
-* Made global so that Attr nodes, which have no ownerDocument property, can access the array
-*/
-$GLOBALS['DOMIT_defined_entities_flip'] = array();
-
-require_once(DOMIT_INCLUDE_PATH . 'xml_domit_shared.php');
-
-/**
-* The base class of all DOMIT node types
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_Node {
-	/** @var string The name of the node, varies according to node type */
-	var $nodeName = null;
-	/** @var string The value of the node, varies according to node type */
-	var $nodeValue = null;
-	/** @var int The type of node, e.g. CDataSection */
-	var $nodeType = null;
-	/** @var Object A reference to the parent of the current node */
-	var $parentNode = null;
-	/** @var Array An array of child node references */
-	var $childNodes = null;
-	/** @var Object A reference to the first node in the childNodes list */
-	var $firstChild = null;
-	/** @var Object A reference to the last node in the childNodes list */
-	var $lastChild = null;
-	/** @var Object A reference to the node prior to the current node in its parents childNodes list */
-	var $previousSibling = null;
-	/** @var Object A reference to the node after the current node in its parents childNodes list */
-	var $nextSibling = null;
-	/** @var Array An array of attribute key / value pairs */
-	var $attributes = null;
-	/** @var Object A reference to the Document node */
-	var $ownerDocument = null;
-	/** @var string The unique node id */
-	var $uid;
-	/** @var int The number of children of the current node */
-	var $childCount = 0;
-
-	/**
-	* Raises error if abstract class is directly instantiated
-	*/
-	function DOMIT_Lite_Node() {
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_CLASS_INSTANTIATION_ERR,
-			 'Cannot instantiate abstract class DOMIT_Lite_Node');
-	} //DOMIT_Lite_Node
-
-	/**
-	* DOMIT_Lite_Node constructor, assigns a uid
-	*/
-	function _constructor() {
-		global $uidFactory;
-		$this->uid = $uidFactory->generateUID();
-	} //_constructor
-
-	/**
-	* Appends a node to the childNodes list of the current node
-	* @abstract
-	* @param Object The node to be appended
-	* @return Object The appended node
-	*/
-	function &appendChild(&$child) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-			('Method appendChild cannot be called by class ' . get_class($this)));
-	} //appendChild
-
-	/**
-	* Inserts a node to the childNodes list of the current node
-	* @abstract
-	* @param Object The node to be inserted
-	* @param Object The node before which the insertion is to occur
-	* @return Object The inserted node
-	*/
-	function &insertBefore(&$newChild, &$refChild) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-			('Method insertBefore cannot be called by class ' . get_class($this)));
-	} //insertBefore
-
-	/**
-	* Replaces a node with another
-	* @abstract
-	* @param Object The new node
-	* @param Object The old node
-	* @return Object The new node
-	*/
-	function &replaceChild(&$newChild, &$oldChild) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-			('Method replaceChild cannot be called by class ' . get_class($this)));
-	} //replaceChild
-
-	/**
-	* Removes a node from the childNodes list of the current node
-	* @abstract
-	* @param Object The node to be removed
-	* @return Object The removed node
-	*/
-	function &removeChild(&$oldChild) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-			('Method removeChild cannot be called by class ' . get_class($this)));
-	} //removeChild
-
-	/**
-	* Returns the index of the specified node in a childNodes list
-	* @param Array The childNodes array to be searched
-	* @param Object The node targeted by the search
-	* @return int The index of the target node, or -1 if not found
-	*/
-	function getChildNodeIndex(&$arr, &$child) {
-		$index = -1;
-		$total = count($arr);
-
-		for ($i = 0; $i < $total; $i++) {
-			if ($child->uid == $arr[$i]->uid) {
-				$index = $i;
-				break;
-			}
-		}
-
-		return $index;
-	} //getChildNodeIndex
-
-	/**
-	* Determines whether a node has any children
-	* @return boolean True if any child nodes are present
-	*/
-	function hasChildNodes() {
-		return ($this->childCount > 0);
-	} //hasChildNodes
-
-	/**
-	* Copies a node and/or its children
-	* @abstract
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_METHOD_INVOCATION_ERR,
-			 'Cannot invoke abstract method DOMIT_Lite_Node->cloneNode($deep). Must provide an overridden method in your subclass.');
-	} //cloneNode
-
-	/**
-	* Adds elements with the specified tag name to a NodeList collection
-	* @param Object The NodeList collection
-	* @param string The tag name of matching elements
-	*/
-	function getNamedElements(&$nodeList, $tagName) {
-		//Implemented in DOMIT_Lite_Element.
-		//Needs to be here though! This is called against all nodes in the document.
-	} //getNamedElements
-
-	/**
-	* Sets the ownerDocument property of a node to the containing DOMIT_Document
-	* @param Object A reference to the document element of the DOMIT_Document
-	*/
-	function setOwnerDocument(&$rootNode) {
-		if ($rootNode->ownerDocument == null) {
-			unset($this->ownerDocument);
-			$this->ownerDocument = null;
-		}
-		else {
-			$this->ownerDocument =& $rootNode->ownerDocument;
-		}
-
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$this->childNodes[$i]->setOwnerDocument($rootNode);
-		}
-	} //setOwnerDocument
-
-	/**
-	* Tests whether a value is null, and if so, returns a default value
-	* @param mixed The value to be tested
-	* @param mixed The default value
-	* @return mixed The specified value, or the default value if null
-	*/
-	function &nvl(&$value,$default) {
-		  if (is_null($value)) return $default;
-		  return $value;
-	} //nvl
-
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like expression.
-	* @abstract
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByPath($pattern, $nodeIndex = 0) {
-		 DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-			('Method getElementsByPath cannot be called by class ' . get_class($this)));
-	} //getElementsByPath
-
-	/**
-	* Returns the concatented text of the current node and its children
-	* @return string The concatented text of the current node and its children
-	*/
-	function getText() {
-		return $this->nodeValue;
-	} //getText
-
-	/**
-	* Formats a string for presentation as HTML
-	* @param string The string to be formatted
-	* @param boolean True if the string is to be sent directly to output
-	* @return string The HTML formatted string
-	*/
-	function forHTML($str, $doPrint = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		return DOMIT_Utilities::forHTML($str, $doPrint);
-	} //forHTML
-
-	/**
-	* Generates an array representation of the node and its children
-	* @abstract
-	* @return Array A representation of the node and its children
-	*/
-	function toArray() {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-			('Method toArray cannot be called by class ' . get_class($this)));
-	} //toArray
-
-	/**
-	* A node event that can be set to fire upon document loading, used for node initialization
-	* @abstract
-	*/
-	function onLoad() {
-		//you can override this method if you subclass any of the
-		//DOMIT_Lite_Nodes. It's a way of performing
-		//initialization of your subclass as soon as the document
-		//has been loaded (as opposed to as soon as the current node
-		//has been instantiated).
-	} //onLoad
-
-	/**
-	* Clears previousSibling, nextSibling, and parentNode references from a node that has been removed
-	*/
-	function clearReferences() {
-	    if ($this->previousSibling != null) {
-	        unset($this->previousSibling);
-	        $this->previousSibling = null;
-	    }
-	    if ($this->nextSibling != null) {
-            unset($this->nextSibling);
-	        $this->nextSibling = null;
-	    }
-	    if ($this->parentNode != null) {
-            unset($this->parentNode);
-	        $this->parentNode = null;
-	    }
-	} //clearReferences
-
-	/**
-	* Generates a normalized (formatted for readability) representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The formatted string representation
-	*/
-	function toNormalizedString($htmlSafe = false, $subEntities = true) {
-		//require this file for generating a normalized (readable) xml string representation
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		global $DOMIT_defined_entities_flip;
-
-		if ($htmlSafe) $subEntities = false;
-
-		$result = DOMIT_Utilities::toNormalizedString($this, $subEntities, $DOMIT_defined_entities_flip);
-
-		if ($htmlSafe) $result = $this->forHTML($result);
-
-		return $result;
-	} //toNormalizedString
-} //DOMIT_Lite_Node
-
-
-/**
-* A parent class for nodes which possess child nodes
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_ChildNodes_Interface extends DOMIT_Lite_Node {
-	/**
-	* Raises error if abstract class is directly instantiated
-	*/
-	function DOMIT_Lite_ChildNodes_Interface() {
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_CLASS_INSTANTIATION_ERR,
-			 'Cannot instantiate abstract class DOMIT_Lite_ChildNodes_Interface');
-	} //DOMIT_Lite_ChildNodes_Interface
-
-	/**
-	* Appends a node to the childNodes list of the current node
-	* @param Object The node to be appended
-	* @return Object The appended node
-	*/
-	function &appendChild(&$child) {
-		if (!($this->hasChildNodes())) {
-			$this->childNodes[0] =& $child;
-			$this->firstChild =& $child;
-		}
-		else {
-			//remove $child if it already exists
-			$index = $this->getChildNodeIndex($this->childNodes, $child);
-
-			if ($index != -1) {
-				$this->removeChild($child);
-			}
-
-			//append child
-			$numNodes = $this->childCount;
-			$prevSibling =& $this->childNodes[($numNodes - 1)];
-
-			$this->childNodes[$numNodes] =& $child;
-
-			//set next and previous relationships
-			$child->previousSibling =& $prevSibling;
-			$prevSibling->nextSibling =& $child;
-		}
-
-		$this->lastChild =& $child;
-		$child->parentNode =& $this;
-
-		unset($child->nextSibling);
-		$child->nextSibling = null;
-
-		$child->setOwnerDocument($this);
-		$this->childCount++;
-
-		return $child;
-	} //appendChild
-
-	/**
-	* Inserts a node to the childNodes list of the current node
-	* @param Object The node to be inserted
-	* @param Object The node before which the insertion is to occur
-	* @return Object The inserted node
-	*/
-	function &insertBefore(&$newChild, &$refChild) {
-		if (($refChild->nodeType == DOMIT_DOCUMENT_NODE)  ||
-			($refChild->parentNode == null)) {
-
-			DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR,
-				 'Reference child not present in the child nodes list.');
-		}
-
-		//if reference child is also the node to be inserted
-		//leave the document as is and don't raise an exception
-		if ($refChild->uid == $newChild->uid) {
-			return $newChild;
-		}
-
-		//remove $newChild if it already exists
-		$index = $this->getChildNodeIndex($this->childNodes, $newChild);
-		if ($index != -1) {
-			$this->removeChild($newChild);
-		}
-
-		//find index of $refChild in childNodes
-		$index = $this->getChildNodeIndex($this->childNodes, $refChild);
-
-		if ($index != -1) {
-			//reset sibling chain
-			if ($refChild->previousSibling != null) {
-				$refChild->previousSibling->nextSibling =& $newChild;
-				$newChild->previousSibling =& $refChild->previousSibling;
-			}
-			else {
-				$this->firstChild =& $newChild;
-
-				if ($newChild->previousSibling != null) {
-					unset($newChild->previousSibling);
-					$newChild->previousSibling = null;
-				}
-			}
-
-			$newChild->parentNode =& $refChild->parentNode;
-			$newChild->nextSibling =& $refChild;
-			$refChild->previousSibling =& $newChild;
-
-			//add node to childNodes
-			$i = $this->childCount;
-
-			while ($i >= 0) {
-				if ($i > $index) {
-					$this->childNodes[$i] =& $this->childNodes[($i - 1)];
-				}
-				else if ($i == $index) {
-					$this->childNodes[$i] =& $newChild;
-				}
-				$i--;
-			}
-
-			$this->childCount++;
-		}
-		else {
-			$this->appendChild($newChild);
-		}
-
-		$newChild->setOwnerDocument($this);
-
-		return $newChild;
-	} //insertBefore
-
-	/**
-	* Replaces a node with another
-	* @param Object The new node
-	* @param Object The old node
-	* @return Object The new node
-	*/
-	function &replaceChild(&$newChild, &$oldChild) {
-		if ($this->hasChildNodes()) {
-			//remove $newChild if it already exists
-			$index = $this->getChildNodeIndex($this->childNodes, $newChild);
-			if ($index != -1) {
-				$this->removeChild($newChild);
-			}
-
-			//find index of $oldChild in childNodes
-			$index = $this->getChildNodeIndex($this->childNodes, $oldChild);
-
-			if ($index != -1) {
-				$newChild->ownerDocument =& $oldChild->ownerDocument;
-				$newChild->parentNode =& $oldChild->parentNode;
-
-				//reset sibling chain
-				if ($oldChild->previousSibling == null) {
-					unset($newChild->previousSibling);
-					$newChild->previousSibling = null;
-				}
-				else {
-					$oldChild->previousSibling->nextSibling =& $newChild;
-					$newChild->previousSibling =& $oldChild->previousSibling;
-				}
-
-				if ($oldChild->nextSibling == null) {
-					unset($newChild->nextSibling);
-					$newChild->nextSibling = null;
-				}
-				else {
-					$oldChild->nextSibling->previousSibling =& $newChild;
-					$newChild->nextSibling =& $oldChild->nextSibling;
-				}
-
-				$this->childNodes[$index] =& $newChild;
-
-				if ($index == 0) $this->firstChild =& $newChild;
-				if ($index == ($this->childCount - 1)) $this->lastChild =& $newChild;
-
-				$newChild->setOwnerDocument($this);
-
-				return $newChild;
-			}
-		}
-
-		DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR,
-			('Reference node for replaceChild not found.'));
-	} //replaceChild
-
-	/**
-	* Removes a node from the childNodes list of the current node
-	* @param Object The node to be removed
-	* @return Object The removed node
-	*/
-	function &removeChild(&$oldChild) {
-		if ($this->hasChildNodes()) {
-			//find index of $oldChild in childNodes
-			$index = $this->getChildNodeIndex($this->childNodes, $oldChild);
-
-			if ($index != -1) {
-				//reset sibling chain
-				if (($oldChild->previousSibling != null) && ($oldChild->nextSibling != null)) {
-					$oldChild->previousSibling->nextSibling =& $oldChild->nextSibling;
-					$oldChild->nextSibling->previousSibling =& $oldChild->previousSibling;
-				}
-				else if (($oldChild->previousSibling != null) && ($oldChild->nextSibling == null)) {
-					$this->lastChild =& $oldChild->previousSibling;
-					unset($oldChild->previousSibling->nextSibling);
-					$oldChild->previousSibling->nextSibling = null;
-				}
-				else if (($oldChild->previousSibling == null) && ($oldChild->nextSibling != null)) {
-					unset($oldChild->nextSibling->previousSibling);
-					$oldChild->nextSibling->previousSibling = null;
-					$this->firstChild =& $oldChild->nextSibling;
-				}
-				else if (($oldChild->previousSibling == null) && ($oldChild->nextSibling == null)) {
-					unset($this->firstChild);
-					$this->firstChild = null;
-					unset($this->lastChild);
-					$this->lastChild = null;
-				}
-
-				$total = $this->childCount;
-
-				//remove node from childNodes
-				for ($i = 0; $i < $total; $i++) {
-					if ($i == ($total - 1)) {
-						array_splice($this->childNodes, $i, 1);
-					}
-					else if ($i >= $index) {
-						$this->childNodes[$i] =& $this->childNodes[($i + 1)];
-					}
-				}
-
-				$this->childCount--;
-
-				$oldChild->clearReferences();
-				return $oldChild;
-			}
-		}
-
-		DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR,
-				('Target node for removeChild not found.'));
-	} //removeChild
-
-	/**
-	* Searches the element tree for an element with the specified attribute name and value.
-	* @param string The value of the attribute
-	* @param string The name of the attribute
-	* @param boolean True if the first found node is to be returned as a node instead of a nodelist
-	* @return object A NodeList of found elements, or null
-	*/
-	function &getElementsByAttribute($attrName = 'id', $attrValue = '',
-											$returnFirstFoundNode = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_nodemaps.php');
-
-		$nodelist =& new DOMIT_NodeList();
-
-		switch ($this->nodeType) {
-			case DOMIT_ELEMENT_NODE:
-				$this->_getElementsByAttribute($nodelist, $attrName = 'id', $attrValue,
-															$returnFirstFoundNode);
-				break;
-
-			case DOMIT_DOCUMENT_NODE:
-				if ($this->documentElement != null) {
-					$this->documentElement->_getElementsByAttribute($nodelist,
-										$attrName, $attrValue, $returnFirstFoundNode);
-				}
-				break;
-		}
-
-		if ($returnFirstFoundNode) {
-			if ($nodelist->getLength() > 0) {
-				return $nodelist->item(0);
-			}
-			else {
-				return null;
-			}
-		}
-		else {
-			return $nodelist;
-		}
-	} //getElementsByAttribute
-
-	/**
-	* Searches the element tree for an element with the specified attribute name and value.
-	* @param object The node list of found elements
-	* @param string The value of the attribute
-	* @param string The name of the attribute
-	* @param boolean True if the first found node is to be returned as a node instead of a nodelist
-	* @param boolean True the node has been found
-	*/
-	function _getElementsByAttribute(&$nodelist, $attrName, $attrValue,
-										$returnFirstFoundNode, $foundNode = false) {
-		if (!($foundNode && $returnFirstFoundNode)) {
-			if ($this->getAttribute($attrName) == $attrValue) {
-				$nodelist->appendNode($this);
-				$foundNode = true;
-				if ($returnFirstFoundNode) return;
-			}
-
-			$total = $this->childCount;
-
-			for ($i = 0; $i < $total; $i++) {
-				$currNode =& $this->childNodes[$i];
-
-				if ($currNode->nodeType == DOMIT_ELEMENT_NODE) {
-					$currNode->_getElementsByAttribute($nodelist,
-									$attrName, $attrValue,
-									$returnFirstFoundNode, $foundNode);
-				}
-
-			}
-		}
-	} //_getElementsByAttribute
-} //DOMIT_Lite_ChildNodes_Interface
-
-/**
-* A class representing the DOM Document
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_Document extends DOMIT_Lite_ChildNodes_Interface {
-	/** @var string The xml declaration text */
-	var $xmlDeclaration;
-	/** @var string The doctype text */
-	var $doctype;
-	/** @var Object A reference to the root node of the DOM document */
-	var $documentElement;
-	/** @var string The parser used to process the DOM document, either "EXPAT" or "SAXY_LITE" */
-	var $parser;
-	/** @var Object A reference to the DOMIT_DOMImplementation object */
-	var $implementation;
-	/** @var Array User defined translation table for XML entities */
-	var $definedEntities = array();
-    /** @var boolean If true, loadXML or parseXML will attempt to detect and repair invalid xml */
-    var $doResolveErrors = false;
-    /** @var boolean If true, elements tags will be rendered to string as <element></element> rather than <element/> */
-    var $doExpandEmptyElementTags = false;
-	/** @var array A list of exceptions to the empty element expansion rule */
-	var $expandEmptyElementExceptions = array();
-	/** @var int The error code returned by the SAX parser */
-    var $errorCode = 0;
-	/** @var string The error string returned by the SAX parser */
-    var $errorString = '';
-	/** @var object A reference to a http connection or proxy server, if one is required */
-    var $httpConnection = null;
-
-	/**
-	* DOM Document constructor
-	*/
-	function DOMIT_Lite_Document() {
-		$this->_constructor();
-		$this->xmlDeclaration = '';
-		$this->doctype = '';
-		$this->documentElement = null;
-		$this->nodeType = DOMIT_DOCUMENT_NODE;
-		$this->nodeName = '#document';
-		$this->ownerDocument =& $this;
-		$this->parser = '';
-		$this->implementation =& new DOMIT_DOMImplementation();
-	} //DOMIT_Lite_Document
-
-	/**
-	* Specifies whether DOMIT! Lite will try to fix invalid XML before parsing begins
-	* @param boolean True if errors are to be resolved
-	*/
-	function resolveErrors($truthVal) {
-	    $this->doResolveErrors = $truthVal;
-	} //resolveErrors
-
-	/**
-	* Specifies the parameters of the http conection used to obtain the xml data
-	* @param string The ip address or domain name of the connection
-	* @param string The path of the connection
-	* @param int The port that the connection is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(DOMIT_INCLUDE_PATH . 'php_http_client_generic.php');
-
-		$this->httpConnection =& new php_http_client_generic($host, $path, $port, $timeout, $user, $password);
-	} //setConnection
-
-	/**
-	* Specifies basic authentication for an http connection
-	* @param string The user name
-	* @param string The password
-	*/
-	function setAuthorization($user, $password) {
-		$this->httpConnection->setAuthorization($user, $password);
-	} //setAuthorization
-
-	/**
-	* Specifies that a proxy is to be used to obtain the xml data
-	* @param string The ip address or domain name of the proxy
-	* @param string The path to the proxy
-	* @param int The port that the proxy is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setProxyConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(DOMIT_INCLUDE_PATH . 'php_http_proxy.php');
-
-		$this->httpConnection =& new php_http_proxy($host, $path, $port, $timeout, $user, $password);
-	} //setProxyConnection
-
-	/**
-	* Specifies basic authentication for the proxy
-	* @param string The user name
-	* @param string The password
-	*/
-	function setProxyAuthorization($user, $password) {
-		$this->httpConnection->setProxyAuthorization($user, $password);
-	} //setProxyAuthorization
-
-	/**
-	* Returns the error code from the underlying SAX parser
-	* @return int The error code
-	*/
-	function getErrorCode() {
-	    return $this->errorCode;
-	} //getErrorCode
-
-	/**
-	* Returns the error string from the underlying SAX parser
-	* @return string The error string
-	*/
-	function getErrorString() {
-	    return $this->errorString;
-	} //getErrorString
-
-	/**
-	* Specifies whether elements tags will be rendered to string as <element></element> rather than <element/>
-	* @param boolean True if the expanded form is to be used
-	* @param mixed An array of tag names that should be excepted from expandEmptyElements rule (optional)
-	*/
-	function expandEmptyElementTags($truthVal, $expandEmptyElementExceptions = false) {
-		$this->doExpandEmptyElementTags = $truthVal;
-
-		if (is_array($expandEmptyElementExceptions)) {
-			$this->expandEmptyElementExceptions = $expandEmptyElementExceptions;
-		}
-	} //expandEmptyElementTags
-
-	/**
-	* Set the specified node as document element
-	* @param Object The node that is to become document element
-	* @return Object The new document element
-	*/
-	function &setDocumentElement(&$node) {
-		if ($node->nodeType == DOMIT_ELEMENT_NODE) {
-			if ($this->documentElement == null) {
-				parent::appendChild($node);
-			}
-			else {
-				parent::replaceChild($node, $this->documentElement);
-			}
-
-			$this->documentElement =& $node;
-		}
-		else {
-			DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-				('Cannot add a node of type ' . get_class($node) . ' as a Document Element.'));
-		}
-
-		return $node;
-	} //setDocumentElement
-
-	/**
-	* Appends a node to the childNodes list of the current node
-	* @param Object The node to be appended
-	* @return Object The appended node
-	*/
-	function &appendChild(&$node) {
-		if ($node->nodeType == DOMIT_ELEMENT_NODE) {
-			if ($this->documentElement == null) {
-				parent::appendChild($node);
-				$this->setDocumentElement($node);
-			}
-			else {
-				//error thrown if documentElement already exists!
-				DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-					('Cannot have more than one root node (documentElement) in a DOMIT_Document.'));
-			}
-		}
-		else {
-			DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-				('Cannot add a node of type ' . get_class($node) . ' to a DOMIT_Document.'));
-		}
-
-		return $node;
-	} //appendChild
-
-	/**
-	* Replaces a node with another
-	* @param Object The new node
-	* @param Object The old node
-	* @return Object The new node
-	*/
-	function &replaceChild(&$newChild, &$oldChild) {
-			if (($this->documentElement != null) && ($oldChild->uid == $this->documentElement->uid)) {
-				if ($node->nodeType == DOMIT_ELEMENT_NODE) {
-					//replace documentElement with new node
-					$this->setDocumentElement($newChild);
-				}
-				else {
-					DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-						('Cannot replace Document Element with a node of class ' . get_class($newChild)));
-				}
-			}
-			else {
-				if ($node->nodeType == DOMIT_ELEMENT_NODE) {
-					if ($this->documentElement != null) {
-						DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-							('Cannot have more than one root node (documentElement) in a DOMIT_Document.'));
-					}
-					else {
-						parent::replaceChild($newChild, $oldChild);
-					}
-				}
-				else {
-					DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-						('Nodes of class ' . get_class($newChild) . ' cannot be children of a DOMIT_Document.'));
-				}
-			}
-
-		return $newChild;
-	} //replaceChild
-
-	/**
-	* Inserts a node to the childNodes list of the current node
-	* @param Object The node to be inserted
-	* @param Object The node before which the insertion is to occur
-	* @return Object The inserted node
-	*/
-	function &insertBefore(&$newChild, &$refChild) {
-		$type = $newChild->nodeType;
-
-		if ($type == DOMIT_ELEMENT_NODE) {
-			if ($this->documentElement == null) {
-				parent::insertBefore($newChild);
-				$this->setDocumentElement($newChild);
-			}
-			else {
-				//error thrown if documentElement already exists!
-				DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-					('Cannot have more than one root node (documentElement) in a DOMIT_Document.'));
-			}
-		}
-		else {
-			DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-				('Cannot insert a node of type ' . get_class($newChild) . ' to a DOMIT_Document.'));
-		}
-
-		return $newChild;
-	} //insertBefore
-
-	/**
-	* Removes a node from the childNodes list of the current node
-	* @param Object The node to be removed
-	* @return Object The removed node
-	*/
-	function &removeChild(&$oldChild) {
-		if (($this->documentElement != null) && ($oldChild->uid == $this->documentElement->uid)) {
-			parent::removeChild($oldChild);
-			$this->documentElement = null;
-		}
-		else {
-			parent::removeChild($oldChild);
-		}
-
-		$oldChild->clearReferences();
-		return $oldChild;
-	} //removeChild
-
-	/**
-	* Creates a new DOMIT_Lite_Element node
-	* @param string The tag name of the element
-	* @return Object The new element
-	*/
-	function &createElement($tagName) {
-		$node =& new DOMIT_Lite_Element($tagName);
-		$node->ownerDocument =& $this;
-
-		return $node;
-	} //createElement
-
-	/**
-	* Creates a new DOMIT_Text node
-	* @param string The text of the node
-	* @return Object The new text node
-	*/
-	function &createTextNode($data) {
-		$node =& new DOMIT_Lite_TextNode($data);
-		$node->ownerDocument =& $this;
-
-		return $node;
-	} //createTextNode
-
-	/**
-	* Creates a new DOMIT_Lite_CDATASection node
-	* @param string The text of the CDATASection
-	* @return Object The new CDATASection node
-	*/
-	function &createCDATASection($data) {
-		$node =& new DOMIT_Lite_CDATASection($data);
-		$node->ownerDocument =& $this;
-
-		return $node;
-	} //createCDATASection
-
-	/**
-	* Retrieves a NodeList of child elements with the specified tag name
-	* @param string The matching element tag name
-	* @return Object A NodeList of found elements
-	*/
-	function &getElementsByTagName($tagName) {
-		$nodeList =& new DOMIT_NodeList();
-
-		if ($this->documentElement != null) {
-			$this->documentElement->getNamedElements($nodeList, $tagName);
-		}
-
-		return $nodeList;
-	} //getElementsByTagName
-
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like expression.
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByPath($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_getelementsbypath.php');
-
-		$gebp = new DOMIT_GetElementsByPath();
-		$myResponse =& $gebp->parsePattern($this, $pattern, $nodeIndex);
-
-		return $myResponse;
-	} //getElementsByPath
-
-	/**
-	* Parses an xml string; first encodes string as UTF-8
-	* @param string The xml text to be parsed
-	* @param boolean True if SAXY is to be used instead of Expat
-	* @param boolean False if CDATA Section are to be generated as Text nodes
-	* @param boolean True if onLoad is to be called on each node after parsing
-	* @return boolean True if parsing is successful
-	*/
-	function parseXML_utf8($xmlText, $useSAXY = true, $preserveCDATA = true, $fireLoadEvent = false) {
-		return $this->parseXML(utf8_encode($xmlText), $useSAXY, $preserveCDATA, $fireLoadEvent);
-	} //parseXML_utf8
-
-	/**
-	* Parses an xml string
-	* @param string The xml text to be parsed
-	* @param boolean True if SAXY is to be used instead of Expat
-	* @param boolean False if CDATA Section are to be generated as Text nodes
-	* @param boolean True if onLoad is to be called on each node after parsing
-	* @return boolean True if parsing is successful
-	*/
-	function parseXML($xmlText, $useSAXY = true, $preserveCDATA = true, $fireLoadEvent = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-
-        if ($this->doResolveErrors) {
-            require_once(DOMIT_INCLUDE_PATH . 'xml_domit_doctor.php');
-            $xmlText = DOMIT_Doctor::fixAmpersands($xmlText);
-        }
-
-		if (DOMIT_Utilities::validateXML($xmlText)) {
-			$domParser =& new DOMIT_Lite_Parser();
-
-			if ($useSAXY || (!function_exists('xml_parser_create'))) {
-				//use SAXY parser to populate xml tree
-				$this->parser = 'SAXY_LITE';
-				$success = $domParser->parseSAXY($this, $xmlText, $preserveCDATA, $this->definedEntities);
-			}
-			else {
-				//use Expat parser to populate xml tree
-				$this->parser = 'EXPAT';
-				$success = $domParser->parse($this, $xmlText, $preserveCDATA);
-			}
-
-			if ($fireLoadEvent && ($this->documentElement != null)) $this->load($this->documentElement);
-
-			return $success;
-		}
-		else {
-			return false;
-		}
-	} //parseXML
-
-	/**
-	* Parses an xml file; first encodes text as UTF-8
-	* @param string The xml file to be parsed
-	* @param boolean True if SAXY is to be used instead of Expat
-	* @param boolean False if CDATA Section are to be generated as Text nodes
-	* @param boolean True if onLoad is to be called on each node after parsing
-	* @return boolean True if parsing is successful
-	*/
-	function loadXML_utf8($filename, $useSAXY = true, $preserveCDATA = true, $fireLoadEvent = false) {
-		$xmlText = $this->getTextFromFile($filename);
-		return $this->parseXML_utf8($xmlText, $useSAXY, $preserveCDATA, $fireLoadEvent);
-	} //loadXML_utf8
-
-	/**
-	* Parses an xml file
-	* @param string The xml file to be parsed
-	* @param boolean True if SAXY is to be used instead of Expat
-	* @param boolean False if CDATA Section are to be generated as Text nodes
-	* @param boolean True if onLoad is to be called on each node after parsing
-	* @return boolean True if parsing is successful
-	*/
-	function loadXML($filename, $useSAXY = true, $preserveCDATA = true, $fireLoadEvent = false) {
-		$xmlText = $this->getTextFromFile($filename);
-		return $this->parseXML($xmlText, $useSAXY, $preserveCDATA, $fireLoadEvent);
-	} //loadXML
-
-	/**
-	* Retrieves text from a file
-	* @param string The file path
-	* @return string The text contained in the file
-	*/
-	function getTextFromFile($filename) {
-		if ($this->httpConnection != null) {
-			$response =& $this->httpConnection->get($filename);
-			$this->httpConnection->disconnect();
-			return $response->getResponse();
-		}
-		else if (function_exists('file_get_contents')) {
-		    //if (file_exists($filename)) {
-				return file_get_contents($filename);
-		    //}
-		}
-		else {
-			require_once(DOMIT_INCLUDE_PATH . 'php_file_utilities.php');
-
-			$fileContents =& php_file_utilities::getDataFromFile($filename, 'r');
-			return $fileContents;
-		}
-
-		return '';
-	} //getTextFromFile
-
-	/**
-	* Saves the current DOM document as an xml file; first encodes text as UTF-8
-	* @param string The path of the xml file
-	* @param boolean True if xml text is to be normalized before saving
-	* @return boolean True if save is successful
-	*/
-	function saveXML_utf8($filename, $normalized=false) {
-		if ($normalized) {
-			$stringRep = $this->toNormalizedString(false, true); //param 2 is $subEntities
-		}
-		else {
-			$stringRep = $this->toString(false, true);
-		}
-
-		return $this->saveTextToFile($filename, utf8_encode($stringRep));
-	} //saveXML_utf8
-
-	/**
-	* Saves the current DOM document as an xml file
-	* @param string The path of the xml file
-	* @param boolean True if xml text is to be normalized before saving
-	* @return boolean True if save is successful
-	*/
-	function saveXML($filename, $normalized=false) {
-		if ($normalized) {
-			$stringRep = $this->toNormalizedString(false, true);
-		}
-		else {
-			$stringRep = $this->toString(false, true);
-		}
-		if ($this->xmlDeclaration) {
-			$stringRep = $this->xmlDeclaration . "\n" . $stringRep;
-		}
-		return $this->saveTextToFile($filename, $stringRep);
-	} //saveXML
-
-	/**
-	* Saves text to a file
-	* @param string The file path
-	* @param string The text to be saved
-	* @return boolean True if the save is successful
-	*/
-	function saveTextToFile($filename, $text) {
-		if (function_exists('file_put_contents')) {
-			file_put_contents($filename, $text);
-		}
-		else {
-			require_once(DOMIT_INCLUDE_PATH . 'php_file_utilities.php');
-			php_file_utilities::putDataToFile($filename, $text, 'w');
-		}
-
-		return (file_exists($filename) && is_writable($filename));
-	} //saveTextToFile
-
-	/**
-	* Indicates the SAX parser used to parse the current document
-	* @return string Either "SAXY_LITE" or "EXPAT"
-	*/
-	function parsedBy() {
-		return $this->parser;
-	} //parsedBy
-
-	/**
-	* Returns the concatented text of the current node and its children
-	* @return string The concatented text of the current node and its children
-	*/
-	function getText() {
-		if ($this->documentElement != null) {
-			$root =& $this->documentElement;
-			return $root->getText();
-		}
-		else {
-			return '';
-		}
-	} //getText
-
-	/**
-	* Returns the doctype text
-	* @return string The doctype text, or an emty string
-	*/
-	function getDocType() {
-		return $this->doctype;
-	} //getDocType
-
-	/**
-	* Returns the xml declaration text
-	* @return mixed The xml declaration text, or an empty string
-	*/
-	function getXMLDeclaration() {
-		return $this->xmlDeclaration;
-	} //getXMLDeclaration
-
-	/**
-	* Returns the xml declaration text
-	* @return mixed The xml declaration text, or an empty string
-	*/
-	function setXMLDeclaration( $decl ) {
-		$this->xmlDeclaration = $decl;
-	} //getXMLDeclaration
-
-	/**
-	* Returns a reference to the DOMIT_DOMImplementation object
-	* @return Object A reference to the DOMIT_DOMImplementation object
-	*/
-	function &getDOMImplementation() {
-		return $this->implementation;
-	} //getDOMImplementation
-
-	/**
-	* Manages the firing of the onLoad() event
-	* @param Object The parent node of the current recursion
-	*/
-	function load(&$contextNode) {
-		$total = $contextNode->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $contextNode->childNodes[$i];
-			$currNode->ownerDocument->load($currNode);
-		}
-
-		$contextNode->onLoad();
-	} //load
-
-	/**
-	* Returns the current version of DOMIT! Lite
-	* @return Object The current version of DOMIT! Lite
-	*/
-	function getVersion() {
-		return DOMIT_LITE_VERSION;
-	} //getVersion
-
-	/**
-	* Appends an array of entity mappings to the existing translation table
-	*
-	* Intended mainly to facilitate the conversion of non-ASCII entities into equivalent characters
-	*
-	* @param array A list of entity mappings in the format: array('&amp;' => '&');
-	*/
-	function appendEntityTranslationTable($table) {
-		$this->definedEntities = $table;
-
-		global $DOMIT_defined_entities_flip;
-		$DOMIT_defined_entities_flip = array_flip($table);
-	} //appendEntityTranslationTable
-
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children
-	*/
-	function toArray() {
-		$arReturn = array($this->nodeName => array());
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$arReturn[$this->nodeName][$i] = $this->childNodes[$i]->toArray();
-		}
-
-		return $arReturn;
-	} //toArray
-
-	/**
-	* Copies a node and/or its children
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName);
-
-		if ($deep) {
-			$total = $this->childCount;
-
-			for ($i = 0; $i < $total; $i++) {
-				$currentChild =& $this->childNodes[$i];
-				$clone->appendChild($currentChild->cloneNode($deep));
-			}
-		}
-
-		return $clone;
-	} //cloneNode
-
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		$result = '';
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$result .= $this->childNodes[$i]->toString(false, $subEntities);
-		}
-
-		if ($htmlSafe) $result = $this->forHTML($result);
-
-		return $result;
-	} //toString
-} //DOMIT_Lite_Document
-
-/**
-* A class representing the DOM Element
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_Element extends DOMIT_Lite_ChildNodes_Interface {
-	/**
-	* DOM Element constructor
-	* @param string The tag name of the element
-	*/
-	function DOMIT_Lite_Element($tagName) {
-		$this->_constructor();
-		$this->nodeType = DOMIT_ELEMENT_NODE;
-		$this->nodeName = $tagName;
-		$this->attributes = array();
-		$this->childNodes = array();
-	} //DOMIT_Lite_Element
-
-	/**
-	* Returns the tag name of the element
-	* @return string The tag name of the element
-	*/
-	function getTagName() {
-		return $this->nodeName;
-	} //getTagName
-
-	/**
-	* Adds elements with the specified tag name to a NodeList collection
-	* @param Object The NodeList collection
-	* @param string The tag name of matching elements
-	*/
-	function getNamedElements(&$nodeList, $tagName) {
-		if (($this->nodeName == $tagName) || ($tagName == '*')) {
-			$nodeList->appendNode($this);
-		}
-
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$this->childNodes[$i]->getNamedElements($nodeList, $tagName);
-		}
-	} //getNamedElements
-
-	/**
-	* Returns the concatented text of the current node and its children
-	* @return string The concatented text of the current node and its children
-	*/
-	function getText() {
-		$text = '';
-		$numChildren = $this->childCount;
-
-		for ($i = 0; $i < $numChildren; $i++) {
-			$child =& $this->childNodes[$i];
-			$text .= $child->getText();
-		}
-
-		return $text;
-	} //getText
-
-	/**
-	* If a child text node exists, sets the nodeValue to $data. A child text node is created if none exists
-	* @param string The text data of the node
-	*/
-	function setText($data) {
-	    switch ($this->childCount) {
-	        case 1:
-	            if ($this->firstChild->nodeType == DOMIT_TEXT_NODE) {
-	                $this->firstChild->setText($data);
-	            }
-	            break;
-
-	        case 0:
-	            $childTextNode =& $this->ownerDocument->createTextNode($data);
-	            $this->appendChild($childTextNode);
-	            break;
-
-	        default:
-	            //do nothing. Maybe throw error???
-	    }
-	} //setText
-
-	/**
-	* Retrieves a NodeList of child elements with the specified tag name
-	* @param string The matching element tag name
-	* @return Object A NodeList of found elements
-	*/
-	function &getElementsByTagName($tagName) {
-		$nodeList =& new DOMIT_NodeList();
-		$this->getNamedElements($nodeList, $tagName);
-
-		return $nodeList;
-	} //getElementsByTagName
-
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like expression.
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByPath($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_getelementsbypath.php');
-
-		$gebp = new DOMIT_GetElementsByPath();
-		$myResponse =& $gebp->parsePattern($this, $pattern, $nodeIndex);
-
-		return $myResponse;
-	} //getElementsByPath
-
-	/**
-	* Gets the value of the specified attribute, if it exists
-	* @param string The attribute name
-	* @return string The attribute value
-	*/
-	function getAttribute($name) {
-		if ($this->hasAttribute($name)) {
-			return $this->attributes[$name];
-		}
-	} //getAttribute
-
-	/**
-	* Sets the value of the specified attribute; creates a new attribute if one doesn't exist
-	* @param string The attribute name
-	* @param string The desired attribute value
-	*/
-	function setAttribute($name, $value) {
-		$this->attributes[$name] = $value;
-	} //setAttribute
-
-	/**
-	* Removes the specified attribute
-	* @param string The name of the attribute to be removed
-	*/
-	function removeAttribute($name) {
-		if ($this->hasAttribute($name)) {
-			unset($this->attributes[$name]);
-		}
-	} //removeAttribute
-
-	/**
-	* Determines whether an attribute with the specified name exists
-	* @param string The name of the attribute
-	* @return boolean True if the attribute exists
-	*/
-	function hasAttribute($name) {
-		return isset($this->attributes[$name]);
-	} //hasAttribute
-
-	/**
-	* Collapses adjacent text nodes in entire element subtree
-	*/
-	function normalize() {
-		if ($this->hasChildNodes()) {
-			$currNode =& $this->childNodes[0];
-
-			while ($currNode->nextSibling != null) {
-				$nextNode =& $currNode->nextSibling;
-
-				if (($currNode->nodeType == DOMIT_TEXT_NODE) &&
-					($nextNode->nodeType == DOMIT_TEXT_NODE)) {
-					$currNode->nodeValue .= $nextNode->nodeValue;
-					$this->removeChild($nextNode);
-				}
-				else {
-					$currNode->normalize();
-				}
-
-				if ($currNode->nextSibling != null) {
-					$currNode =& $currNode->nextSibling;
-				}
-			}
-		}
-	} //normalize
-
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children
-	*/
-	function toArray() {
-		$arReturn = array($this->nodeName => array("attributes" => $this->attributes));
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$arReturn[$this->nodeName][$i] = $this->childNodes[$i]->toArray();
-		}
-
-		return $arReturn;
-	} //toArray
-
-	/**
-	* Copies a node and/or its children
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName);
-
-		$clone->attributes = $this->attributes;
-
-		if ($deep) {
-			$total = $this->childCount;
-
-			for ($i = 0; $i < $total; $i++) {
-				$currentChild =& $this->childNodes[$i];
-				$clone->appendChild($currentChild->cloneNode($deep));
-			}
-		}
-
-		return $clone;
-	} //cloneNode
-
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		global $DOMIT_defined_entities_flip;
-
-		$result = '<' . $this->nodeName;
-
-		//get attributes
-		foreach ($this->attributes as $key => $value) {
-			$result .= ' ' . $key . '="';
-			$result .= ($subEntities && !$htmlSafe) ? DOMIT_Utilities::convertEntities($value,
-							$DOMIT_defined_entities_flip) : $value;
-			$result .= '"';
-		}
-
-		//get children
-		$myNodes =& $this->childNodes;
-		$total = count($myNodes);
-
-		if ($total != 0) {
-			$result .= '>';
-
-			for ($i = 0; $i < $total; $i++) {
-				$child =& $myNodes[$i];
-				$result .= $child->toString(false, $subEntities);
-			}
-
-			$result .= '</' . $this->nodeName . '>';
-		}
-		else {
-			if ($this->ownerDocument->doExpandEmptyElementTags) {
-				if (in_array($this->nodeName, $this->ownerDocument->expandEmptyElementExceptions)) {
-					$result .= ' />';
-				}
-				else {
-                	$result .= '></' . $this->nodeName . '>';
-				}
-		    }
-		    else {
-				if (in_array($this->nodeName, $this->ownerDocument->expandEmptyElementExceptions)) {
-					$result .= '></' . $this->nodeName . '>';
-				}
-				else {
-					$result .= ' />';
-				}
-		    }
-		}
-
-		if ($htmlSafe) $result = $this->forHTML($result);
-
-		return $result;
-	} //toString
-} //DOMIT_Lite_Element
-
-/**
-* A class representing the DOM Text Node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_TextNode extends DOMIT_Lite_Node {
-	/**
-	* DOM Text Node constructor
-	* @param string The text of the node
-	*/
-	function DOMIT_Lite_TextNode($data) {
-		$this->_constructor();
-		$this->nodeType = DOMIT_TEXT_NODE;
-		$this->nodeName = '#text';
-		$this->setText($data);
-	} //DOMIT_Lite_TextNode
-
-	/**
-	* Returns the text contained in the current node
-	* @return string The text of the current node
-	*/
-	function getText() {
-		return $this->nodeValue;
-	} //getText
-
- 	/**
-	* Sets the text contained in the current node to $data.
-	* @param string The text data of the node
-	*/
-	function setText($data) {
-        $this->nodeValue = $data;
-	} //setText
-
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children
-	*/
-	function toArray() {
-		return $this->toString();
-	} //toArray
-
-	/**
-	* Copies a node and/or its children
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeValue);
-
-		return $clone;
-	} //cloneNode
-
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters should be converted to entities
-	* @return string The string representation
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		global $DOMIT_defined_entities_flip;
-
-		$result = ($subEntities && !$htmlSafe) ? DOMIT_Utilities::convertEntities($this->nodeValue,
-						$DOMIT_defined_entities_flip) : $this->nodeValue;
-
-		if ($htmlSafe) $result = $this->forHTML($result);
-
-		return $result;
-	} //toString
-} //DOMIT_Lite_TextNode
-
-/**
-* A class representing the DOM CDATA Section
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_CDATASection extends DOMIT_Lite_TextNode {
-	/**
-	* DOM CDATA Section node constructor
-	* @param string The text of the node
-	*/
-	function DOMIT_Lite_CDATASection($data) {
-		$this->_constructor();
-		$this->nodeType = DOMIT_CDATA_SECTION_NODE;
-		$this->nodeName = '#cdata-section';
-		$this->setText($data);
-	} //DOMIT_Lite_CDATASection
-
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters should be converted to entities
-	* @return string The string representation
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		$result = '<![CDATA[';
-		$result .= ($subEntities && !$htmlSafe) ? str_replace("]]>", "]]&gt;", $this->nodeValue) :
-								 $this->nodeValue;
-		$result .= ']]>';
-
-		if ($htmlSafe) $result = $this->forHTML($result);
-
-		return $result;
-	} //toString
-} //DOMIT_Lite_CDATASection
-
-/**
-* Manages the generation of a DOMIT! document from SAX events
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Lite_Parser {
-	/** @var Object A reference to the resulting xmldoc */
-	var $xmlDoc = null;
-	/** @var Object A reference to the current node in the parsing process */
-	var $currentNode = null;
-	/** @var Object A reference to the last child in the parsing process */
-	var $lastChild = null;
-	/** @var boolean True if currently parsing a CDATA Section */
-	var $inCDATASection = false; //flag for Expat
-	/** @var boolean True if currently parsing a Text node */
-	var $inTextNode = false;
-	/** @var boolean True is CDATA Section nodes are not to be converted into Text nodes */
-	var $preserveCDATA;
-	/** @var string A container for holding the currently parsed text data */
-	var $parseContainer = '';
-	/** @var string The current docutype text */
-	var $parseItem = '';
-
-	/**
-	* Parses xml text using Expat
-	* @param Object A reference to the DOM document that the xml is to be parsed into
-	* @param string The text to be parsed
-	* @param boolean True if CDATA Section nodes are not to be converted into Text nodes
-	* @return boolean True if the parsing is successful
-	*/
-	function parse (&$myXMLDoc, $xmlText, $preserveCDATA = true) {
-		$this->xmlDoc =& $myXMLDoc;
-		$this->lastChild =& $this->xmlDoc;
-
-		$this->preserveCDATA = $preserveCDATA;
-
-		//create instance of expat parser (should be included in php distro)
-		if (version_compare(phpversion(), '5.0', '<=')) {
-			$parser =& xml_parser_create('');
-		}
-		else {
-			$parser =& xml_parser_create();
-		}
-
-		//set handlers for SAX events
-		xml_set_object($parser, $this);
-		xml_set_element_handler($parser, 'startElement', 'endElement');
-		xml_set_character_data_handler($parser, 'dataElement');
-		xml_set_default_handler($parser, 'defaultDataElement');
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-
-		//parse out whitespace -  (XML_OPTION_SKIP_WHITE = 1 does not
-		//seem to work consistently across versions of PHP and Expat
-		$xmlText = eregi_replace('>' . "[[:space:]]+" . '<' , '><', $xmlText);
-
-		$success = xml_parse($parser, $xmlText);
-
-		$this->xmlDoc->errorCode = xml_get_error_code($parser);
-		$this->xmlDoc->errorString = xml_error_string($this->xmlDoc->errorCode)
-			. ' at line ' . xml_get_current_line_number( $parser )
-			. ', column ' . xml_get_current_column_number( $parser )
-			. ', byte ' . xml_get_current_byte_index( $parser );
-
-		xml_parser_free($parser);
-
-		return $success;
-	} //parse
-
-	/**
-	* Parses xml text using SAXY
-	* @param Object A reference to the DOM document that the xml is to be parsed into
-	* @param string The text to be parsed
-	* @param boolean True if CDATA Section nodes are not to be converted into Text nodes
-	* @return boolean True if the parsing is successful
-	*/
-	function parseSAXY(&$myXMLDoc, $xmlText, $preserveCDATA, $definedEntities) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_saxy_lite_parser.php');
-
-		$this->xmlDoc =& $myXMLDoc;
-		$this->lastChild =& $this->xmlDoc;
-
-		//create instance of SAXY parser
-		$parser =& new SAXY_Lite_Parser();
-		$parser->appendEntityTranslationTable($definedEntities);
-
-		$parser->xml_set_element_handler(array(&$this, 'startElement'), array(&$this, 'endElement'));
-		$parser->xml_set_character_data_handler(array(&$this, 'dataElement'));
-
-		if ($preserveCDATA) {
-			$parser->xml_set_cdata_section_handler(array(&$this, 'cdataElement'));
-		}
-
-		$success = $parser->parse($xmlText);
-
-		$this->xmlDoc->errorCode = $parser->xml_get_error_code();
-		$this->xmlDoc->errorString = $parser->xml_error_string($this->xmlDoc->errorCode);
-
-		return $success;
-	} //parseSAXY
-
-	/**
-	* Generates and appends a new text node from the parseContainer text
-	*/
-	function dumpTextNode() {
-		//traps for mixed content
-	    $currentNode =& $this->xmlDoc->createTextNode($this->parseContainer);
-		$this->lastChild->appendChild($currentNode);
-		$this->inTextNode = false;
-		$this->parseContainer = '';
-	} //dumpTextNode
-
-	/**
-	* Catches a start element event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The tag name of the current element
-	* @param Array An array of the element attributes
-	*/
-	function startElement(&$parser, $name, $attrs) {
-		if ($this->inTextNode) {
-			$this->dumpTextNode();
-		}
-
-		$currentNode =& $this->xmlDoc->createElement($name);
-		$currentNode->attributes = $attrs;
-		$this->lastChild->appendChild($currentNode);
-		$this->lastChild =& $currentNode;
-	} //startElement
-
-	/**
-	* Catches an end element event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The tag name of the current element
-	*/
-	function endElement(&$parser, $name) {
-		if ($this->inTextNode) {
-			$this->dumpTextNode();
-		}
-
-		$this->lastChild =& $this->lastChild->parentNode;
-	} //endElement
-
-	/**
-	* Catches a data event and processes the text
-	* @param Object A reference to the current SAX parser
-	* @param string The current text data
-	*/
-	function dataElement(&$parser, $data) {
-		if (!$this->inCDATASection) $this->inTextNode = true;
-
-		$this->parseContainer .= $data;
-	} //dataElement
-
-	/**
-	* Catches a CDATA Section event and processes the text
-	* @param Object A reference to the current SAX parser
-	* @param string The current text data
-	*/
-	function cdataElement(&$parser, $data) {
-		$currentNode =& $this->xmlDoc->createCDATASection($data);
-
-		$this->lastChild->appendChild($currentNode);
-	} //cdataElement
-
-	/**
-	* Catches a default data event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The current data
-	*/
-	function defaultDataElement(&$parser, $data) {
-		if (strlen($data) > 2){
-			$pre = strtoupper(substr($data, 0, 3));
-
-			switch ($pre) {
-				case '<![': //cdata section coming
-					if ($this->preserveCDATA) {
-						$this->inCDATASection = true;
-					}
-					break;
-				case ']]>': //cdata remnant - ignore
-					$currentNode =& $this->xmlDoc->createCDATASection($this->parseContainer);
-					$this->lastChild->appendChild($currentNode);
-					$this->inCDATASection = false;
-					$this->parseContainer = '';
-					break;
-			}
-		}
-	} //defaultDataElement
-} //DOMIT_Lite_Parser
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/xml_domit_nodemaps.php 4.6rc2/includes/domit/xml_domit_nodemaps.php
--- 4.5.4/includes/domit/xml_domit_nodemaps.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_nodemaps.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,402 +0,0 @@
-<?php
-/**
-* DOMIT node maps are structures for storing and accessing collections of DOMIT_Nodes.
-* @package domit-xmlparser
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-if (!defined('DOMIT_INCLUDE_PATH')) {
-	define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/**
-* A DOM NodeList implementation
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_NodeList {
-	/** @var Array A container for the nodes in the list */
-	var $arNodeList = array();
-	
-	/**
-	* Return the node at the specified index
-	* @param int The index of the requested node
-	* @return Object A reference to the requested node, or null
-	*/
-	function &item($index) {
-		if ($index < $this->getLength()) {
-			return $this->arNodeList[$index];
-		}
-		return null;
-	} //item
-	
-	/**
-	* Returns the number of nodes in the list
-	* @return int The number of nodes in the list
-	*/
-	function getLength() {
-		return count($this->arNodeList);
-	} //getLength
-	
-	/**
-	* Appends a node to the list
-	* @return Object The appended node
-	*/
-	function &appendNode(&$node) {
-		$this->arNodeList[] =& $node;
-		return $node;
-	} //appendNode
-	
-	/**
-	* Removes the specified node from the list
-	* @param Object A reference to the node to be removed
-	* @return Object A reference to the removed node
-	*/
-	function &removeNode(&$node) {
-		$total = $this->getLength();
-		$returnNode = null;
-		$found = false;
-		
-		for ($i = 0; $i < $total; $i++) {
-			if (!$found) {
-				if ($node->uid == $this->arNodeList[$i]->uid) {
-					$found = true;
-					$returnNode=& $node;
-				}
-			}
-			
-			if ($found) {
-				if ($i == ($total - 1)) {
-					unset($this->arNodeList[$i]);
-				}
-				else {
-					$this->arNodeList[$i] =& $this->arNodeList[($i + 1)];
-				}
-			}			
-		}
-		
-		return $returnNode;
-	} //$removeNode
-	
-	/**
-	* Formats a string for presentation as HTML
-	* @param string The string to be formatted
-	* @param boolean True if the string is to be sent directly to output
-	* @return string The HTML formatted string  
-	*/
-	function forHTML($str, $doPrint = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		return DOMIT_Utilities::forHTML($str, $doPrint);
-	} //forHTML
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		return $this->arNodeList;
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &createClone($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className();
-		
-		foreach ($this->arNodeList as $key => $value) {
-			$currNode =& $this->arNodeList[$key];
-			$clone->arNodeList[$key] =& $currNode->cloneNode($deep);
-		}
-		
-		return $clone;
-	} //createClone
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities=false) {
-		$result = '';
-		
-		foreach ($this->arNodeList as $key => $value) {
-			$currNode =& $this->arNodeList[$key];
-			$result .= $currNode->toString(false, $subEntities);
-		}
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-		
-		return $result;
-	} //toString
-} //DOMIT_NodeList
-
-/**
-* A DOM NamedNodeMap implementation
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_NamedNodeMap {
-	/** @var Array A container for the nodes in the map */
-	var $arNodeMap = array();
-	/** @var Array A numerical index to the keys of the mapped nodes */
-	var $indexedNodeMap = array();
-	/** @var boolean True if the list has been modified and $indexedNodeMap needs reindexing */
-	var $isDirty = true;
-	
-	/**
-	* Gets a node with the specifed name
-	* @param string The name of the node
-	* @return mixed A reference to the requested node, or null
-	*/
-	function &getNamedItem($name) {
-		if (isset($this->arNodeMap[$name])) {
-			return $this->arNodeMap[$name];
-		}
-		
-		return null;
-	} //getNamedItem
-	
-	/**
-	* Reindexes the numerical index for the named node map
-	*/
-	function reindexNodeMap() {
-	    $this->indexedNodeMap = array();
-
-	    foreach ($this->arNodeMap as $key => $value) {
-	        $this->indexedNodeMap[] = $key;
-	    }
-	    
-	    $this->isDirty = false;
-	} //reindexNodeMap
-	
-	/**
-	* Assigns a node to the list 
-	* @param Object A reference to the node to be assigned
-	* @return Object A reference to the assigned node
-	*/
-	function &setNamedItem(&$arg) {
-		$returnNode = null;
-		
-		if (isset($this->arNodeMap[$arg->nodeName])) {
-			$returnNode =& $this->arNodeMap[$arg->nodeName];
-		}
-		else {
-		    $this->isDirty = true;
-		}
-		
-		$this->arNodeMap[$arg->nodeName] =& $arg;		
-		return $returnNode;
-	} //setNamedItem
-	
-	/**
-	* Removes a node from the list, by name
-	* @param string The name of the node to be removed
-	* @return mixed A reference to the removed node, or null
-	*/
-	function &removeNamedItem($name) {
-		$returnNode = null;
-		
-		if (isset($this->arNodeMap[$name])) {
-			$returnNode =& $this->arNodeMap[$name];
-			unset($this->arNodeMap[$name]);
-			$this->isDirty = true;
-		}
-		
-		return $returnNode;
-	} //removeNamedItem
-	
-	/**
-	* Gets a node with the specifed name, taking into account namespaces
-	* @param string The namespaceURI of the node
-	* @param string The localName of the node
-	* @return mixed A reference to the requested node, or null
-	*/
-	function &getNamedItemNS($namespaceURI, $localName) {
-	    $key = $this->getKeyNS($namespaceURI, $localName);
-
-		if (isset($this->arNodeMap[$key])) {
-			return $this->arNodeMap[$key];
-		}
-
-		return null;
-	} //getNamedItemNS
-	
-	/**
-	* Assigns a node to the list, using its namespaceURI and localName
-	* @param Object A reference to the node to be assigned
-	* @return Object A reference to the assigned node
-	*/
-	function &setNamedItemNS(&$arg) {
-		$returnNode = null;
-		$key = $this->getKeyNS($arg->namespaceURI, $arg->localName);
-
-		if (isset($this->arNodeMap[$key])) {
-			$returnNode =& $this->arNodeMap[$key];
-		}
-		else {
-		    $this->isDirty = true;
-		}
-
-		$this->arNodeMap[$key] =& $arg;
-		return $returnNode;
-	} //setNamedItemNS
-	
-	/**
-	* Removes a node from the list, by name, by local name and namespace URI
-	* @param string The namespaceURI of the node to be removed
-	* @param string The localName of the node to be removed
-	* @return mixed A reference to the removed node, or null
-	*/
-	function &removeNamedItemNS($namespaceURI, $localName) {
-		$returnNode = null;
-		$key = $this->getKeyNS($namespaceURI, $localName);
-
-		if (isset($this->arNodeMap[$key])) {
-			$returnNode =& $this->arNodeMap[$key];
-			unset($this->arNodeMap[$key]);
-			$this->isDirty = true;
-		}
-
-		return $returnNode;
-	} //removeNamedItemNS
-	
-	/**
-	* Returns the key of the NamedNodeMap, given the namespaceURI and localName
-	* @param string The namespaceURI of the node to be removed
-	* @param string The localName of the node to be removed
-	* @return string The key of the NamedNodeMap
-	*/
-	function getKeyNS($namespaceURI, $localName) {
-	    if ($namespaceURI != '') {
-	    	return $namespaceURI . ":" . $localName;
-	    }
-
-		return $localName;
-	} //getKeyNS
-	
-	/**
-	* Return the node at the specified index
-	* @param int The index of the requested node
-	* @return mixed A reference to the requested node, or null
-	*/
-	function &item($index) {
-  		if ($this->isDirty) $this->reindexNodeMap();
-  		return $this->arNodeMap[$this->indexedNodeMap[$index]];
-	} //item
-	
-	/**
-	* Returns the number of nodes in the map
-	* @return int The number of nodes in the map
-	*/
-	function getLength() {
-		return count($this->arNodeMap);
-	} //getLength
-	
-	/**
-	* Formats a string for presentation as HTML
-	* @param string The string to be formatted
-	* @param boolean True if the string is to be sent directly to output
-	* @return string The HTML formatted string  
-	*/
-	function forHTML($str, $doPrint = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		return DOMIT_Utilities::forHTML($str, $doPrint);
-	} //forHTML
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		return $this->arNodeMap;
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &createClone($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className();
-		
-		foreach ($this->arNodeMap as $key => $value) {
-			$currNode =& $this->arNodeMap[$key];
-			$clone->arNodeMap[$key] =& $currNode->cloneNode($deep);
-		}
-		
-		return $clone;
-	} //createClone
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities=false) {
-		$result = '';
-		
-		foreach ($this->arNodeMap as $key => $value) {
-			$currNode =& $this->arNodeMap[$key];
-			$result .= $currNode->toString(false, $subEntities);
-		}
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-		
-		return $result;
-	} //toString
-} //DOMIT_NamedNodeMap
-
-/**
-* A NamedNodeMap with specialized funtionality for Attribute nodes
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_NamedNodeMap_Attr extends DOMIT_NamedNodeMap {
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		$arReturn = array();
-		
-		foreach ($this->arNodeMap as $key => $value) {
-			$arReturn[$key] = $this->arNodeMap[$key]->getValue(); 
-		}
-		
-		return $arReturn;
-	} //toArray
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities=false) {
-		$result = '';
-
-		foreach ($this->arNodeMap as $key => $value) {
-			$currNode =& $this->arNodeMap[$key];
-			$result .= $currNode->toString(false, $subEntities);
-		}
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-		
-		return $result;
-	} //toString
-} //DOMIT_NamedNodeMap_Attr
-
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_parser.php 4.6rc2/includes/domit/xml_domit_parser.php
--- 4.5.4/includes/domit/xml_domit_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,3422 +0,0 @@
-<?php
-/**
-* DOMIT! is a non-validating, but lightweight and fast DOM parser for PHP
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @version 1.0
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-if (!defined('DOMIT_INCLUDE_PATH')) {
-	define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** current version of DOMIT! */
-define ('DOMIT_VERSION', '1.0');
-
-/** current version of SAXY */
-define ('DOMIT_XML_NAMESPACE', 'http://www.w3.org/xml/1998/namespace');
-
-/**
-*@global array Flipped version of $definedEntities array, to allow two-way conversion of entities
-* 
-* Made global so that Attr nodes, which have no ownerDocument property, can access the array
-*/
-$GLOBALS['DOMIT_defined_entities_flip'] = array();
-
-require_once(DOMIT_INCLUDE_PATH . 'xml_domit_shared.php');
-
-/**
-* The base class of all DOMIT node types
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Node {
-	/** @var string The name of the node, varies according to node type */
-	var $nodeName = null;
-	/** @var string The value of the node, varies according to node type */
-	var $nodeValue = null;
-	/** @var int The type of node, e.g. CDataSection */
-	var $nodeType = null;
-	/** @var Object A reference to the parent of the current node */
-	var $parentNode = null;
-	/** @var Array An array of child node references */
-	var $childNodes = null;
-	/** @var Object A reference to the first node in the childNodes list */
-	var $firstChild = null;
-	/** @var Object A reference to the last node in the childNodes list */
-	var $lastChild = null;
-	/** @var Object A reference to the node prior to the current node in its parents childNodes list */
-	var $previousSibling = null;
-	/** @var Object A reference to the node after the current node in its parents childNodes list */
-	var $nextSibling = null;
-	/** @var Object A NodeList of attribute nodes */
-	var $attributes = null;
-	/** @var Object A reference to the Document node */
-	var $ownerDocument = null;
-	/** @var String A URI that identifies the XML namespace to which the node belongs */
-	var $namespaceURI = null;
-	/** @var String The namespace prefix for the node */
-	var $prefix = null;
-	/** @var String The local name of the node */
-	var $localname = null;
-	/** @var string The unique node id */
-	var $uid;
-	/** @var int The number of children of the current node */
-	var $childCount = 0;
-	
-	/**
-	* Raises error if abstract class is directly instantiated
-	*/
-	function DOMIT_Node() {		
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_CLASS_INSTANTIATION_ERR, 
-			 'Cannot instantiate abstract class DOMIT_Node'); 
-	} //DOMIT_Node
-	
-	/**
-	* DOMIT_Node constructor, assigns a uid
-	*/
-	function _constructor() {
-		global $uidFactory;
-		$this->uid = $uidFactory->generateUID();
-	} //_constructor	
-	
-	/**
-	* Appends a node to the childNodes list of the current node
-	* @abstract 
-	* @param Object The node to be appended 
-	* @return Object The appended node
-	*/
-	function &appendChild(&$child) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method appendChild cannot be called by class ' . get_class($this)));
-	} //appendChild
-
-	/**
-	* Inserts a node to the childNodes list of the current node
-	* @abstract
-	* @param Object The node to be inserted
-	* @param Object The node before which the insertion is to occur 
-	* @return Object The inserted node
-	*/
-	function &insertBefore(&$newChild, &$refChild) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method insertBefore cannot be called by class ' . get_class($this)));
-	} //insertBefore
-	
-	/**
-	* Replaces a node with another
-	* @abstract
-	* @param Object The new node
-	* @param Object The old node
-	* @return Object The new node
-	*/
-	function &replaceChild(&$newChild, &$oldChild) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method replaceChild cannot be called by class ' . get_class($this)));
-	} //replaceChild
-	
-	/**
-	* Removes a node from the childNodes list of the current node
-	* @abstract
-	* @param Object The node to be removed
-	* @return Object The removed node
-	*/
-	function &removeChild(&$oldChild) {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method removeChild cannot be called by class ' . get_class($this)));
-	} //removeChild
-	
-	/**
-	* Returns the index of the specified node in a childNodes list
-	* @param Array The childNodes array to be searched
-	* @param Object The node targeted by the search
-	* @return int The index of the target node, or -1 if not found
-	*/
-	function getChildNodeIndex(&$arr, &$child) {
-		$index = -1;
-		$total = count($arr);
-		
-		for ($i = 0; $i < $total; $i++) {
-			if ($child->uid == $arr[$i]->uid) {
-				$index = $i;
-				break;
-			}
-		}
-		
-		return $index;
-	} //getChildNodeIndex
-	
-	/**
-	* Determines whether a node has any children
-	* @return boolean True if any child nodes are present
-	*/
-	function hasChildNodes() {
-		return ($this->childCount > 0);
-	} //hasChildNodes
-	
-	/**
-	* Determines whether a node has any attributes
-	* @return boolean True if the node has attributes
-	*/
-	function hasAttributes() {
-		//overridden in DOMIT_Element
-		return false;
-	} //hasChildNodes
-	
-	/**
-	* Collapses adjacent text nodes in entire node subtree
-	*/
-	function normalize() {
-		if (($this->nodeType == DOMIT_DOCUMENT_NODE) && ($this->documentElement != null)) {
-			$this->documentElement->normalize();
-		}
-	} //normalize
-	
-	/**
-	* Copies a node and/or its children 
-	* @abstract
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_METHOD_INVOCATION_ERR, 
-			 'Cannot invoke abstract method DOMIT_Node->cloneNode($deep). Must provide an overridden method in your subclass.'); 
-	} //cloneNode
-
-	/**
-	* Adds elements with the specified tag name to a NodeList collection 
-	* @param Object The NodeList collection
-	* @param string The tag name of matching elements 
-	*/
-	function getNamedElements(&$nodeList, $tagName) {
-		//Implemented in DOMIT_Element. 
-		//Needs to be here though! This is called against all nodes in the document.
-	} //getNamedElements	
-	
-	/**
-	* Sets the ownerDocument property of a node to the containing DOMIT_Document
-	* @param Object A reference to the document element of the DOMIT_Document
-	*/
-	function setOwnerDocument(&$rootNode) {
-		if ($rootNode->ownerDocument == null) {
-			unset($this->ownerDocument);
-			$this->ownerDocument = null;
-		}
-		else {
-			$this->ownerDocument =& $rootNode->ownerDocument;
-		}
-		
-		$total = $this->childCount;
-			
-		for ($i = 0; $i < $total; $i++) {
-			$this->childNodes[$i]->setOwnerDocument($rootNode);
-		}
-	} //setOwnerDocument
-	
-	/**
-	* Tests whether a value is null, and if so, returns a default value
-	* @param mixed The value to be tested
-	* @param mixed The default value
-	* @return mixed The specified value, or the default value if null
-	*/
-	function &nvl(&$value,$default) {
-		  if (is_null($value)) return $default;
-		  return $value;
-	} //nvl	
-	
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like expression.
-	* @abstract
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByPath($pattern, $nodeIndex = 0) {
-		 DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method getElementsByPath cannot be called by class ' . get_class($this)));
-	} //getElementsByPath	
-	
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like attribute expression (NOT YET IMPLEMENTED!)
-	* @abstract
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByAttributePath($pattern, $nodeIndex = 0) {
-		 DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method getElementsByAttributePath cannot be called by class ' . get_class($this)));
-	} //getElementsByAttributePath
-	
-	/**
-	* Adds all child nodes of the specified nodeType to the NodeList
-	* @abstract
-	* @param Object The NodeList collection
-	* @param string The nodeType of matching nodes 
-	*/
-	function getTypedNodes(&$nodeList, $type) {		 
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method getTypedNodes cannot be called by class ' . get_class($this)));
-	} //getTypedNodes
-	
-	/**
-	* Adds all child nodes of the specified nodeValue to the NodeList
-	* @abstract
-	* @param Object The NodeList collection
-	* @param string The nodeValue of matching nodes 
-	*/
-	function getValuedNodes(&$nodeList, $value) {		 
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method getValuedNodes cannot be called by class ' . get_class($this)));
-	} //getValuedNodes
-	
-	/**
-	* Returns the concatented text of the current node and its children
-	* @return string The concatented text of the current node and its children
-	*/
-	function getText() {
-		return $this->nodeValue;
-	} //getText
-	
-	/**
-	* Indicates whether the specified feature is supported by the DOM implementation and this node
-	* @param string The feature
-	* @param string The version of the DOM implementation
-	* @return boolean True if the specified feature is supported
-	*/
-	function isSupported($feature, $version = null) {
-		//don't worry about parsing based on version at this point in time; 
-		//the only feature that is supported is 'XML'...
-		if (($version == '1.0') || ($version == '2.0') || ($version == null)) {
-			if (strtoupper($feature) == 'XML') {
-				return true;
-			}				
-		}
-		
-		return false;
-	} //isSupported
-
-	/**
-	* Formats a string for presentation as HTML
-	* @param string The string to be formatted
-	* @param boolean True if the string is to be sent directly to output
-	* @return string The HTML formatted string  
-	*/
-	function forHTML($str, $doPrint = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		return DOMIT_Utilities::forHTML($str, $doPrint);
-	} //forHTML
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @abstract
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-			('Method toArray cannot be called by class ' . get_class($this)));
-	} //toArray
-	
-	/**
-	* A node event that can be set to fire upon document loading, used for node initialization
-	* @abstract
-	*/
-	function onLoad() {
-		//you can override this method if you subclass any of the 
-		//DOMIT_Nodes. It's a way of performing  
-		//initialization of your subclass as soon as the document
-		//has been loaded (as opposed to as soon as the current node
-		//has been instantiated).
-	} //onLoad
-	
-	/**
-	* Clears previousSibling, nextSibling, and parentNode references from a node that has been removed
-	*/
-	function clearReferences() {
-	    if ($this->previousSibling != null) {
-	        unset($this->previousSibling);
-	        $this->previousSibling = null;
-	    }
-	    if ($this->nextSibling != null) {
-            unset($this->nextSibling);
-	        $this->nextSibling = null;
-	    }
-	    if ($this->parentNode != null) {
-            unset($this->parentNode);
-	        $this->parentNode = null;
-	    }
-	} //clearReferences
-	
-	/**
-	* Generates a normalized (formatted for readability) representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The formatted string representation 
-	*/
-	function toNormalizedString($htmlSafe = false, $subEntities = true) {
-		//require this file for generating a normalized (readable) xml string representation
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		global $DOMIT_defined_entities_flip;
-		
-		if ($htmlSafe) $subEntities = false;
-		
-		$result = DOMIT_Utilities::toNormalizedString($this, $subEntities, $DOMIT_defined_entities_flip);
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-			
-		return $result;
-	} //toNormalizedString
-} //DOMIT_Node
-
-/**
-* A parent class for nodes which possess child nodes
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_ChildNodes_Interface extends DOMIT_Node {
-	/**
-	* Raises error if abstract class is directly instantiated
-	*/
-	function DOMIT_ChildNodes_Interface() {		
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_CLASS_INSTANTIATION_ERR, 
-			 'Cannot instantiate abstract class DOMIT_ChildNodes_Interface'); 
-	} //DOMIT_ChildNodes_Interface
-	
-	/**
-	* Appends a node to the childNodes list of the current node
-	* @param Object The node to be appended 
-	* @return Object The appended node
-	*/
-	function &appendChild(&$child) {
-		if ($child->nodeType == DOMIT_ATTRIBUTE_NODE) {
-		    DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-				('Cannot add a node of type ' . get_class($child) . ' using appendChild'));
-		}
-		else if ($child->nodeType == DOMIT_DOCUMENT_FRAGMENT_NODE) {
-			$total = $child->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currChild =& $child->childNodes[$i];
-				$this->appendChild($currChild);
-			}
-		}
-		else {
-			if (!($this->hasChildNodes())) {
-				$this->childNodes[0] =& $child;
-				$this->firstChild =& $child;
-			}
-			else {
-				//remove $child if it already exists
-				$index = $this->getChildNodeIndex($this->childNodes, $child);
-				
-				if ($index != -1) {
-					$this->removeChild($child);
-				}
-				
-				//append child
-				$numNodes = $this->childCount;
-				$prevSibling =& $this->childNodes[($numNodes - 1)];
-				
-				$this->childNodes[$numNodes] =& $child; 
-				
-				//set next and previous relationships
-				$child->previousSibling =& $prevSibling;
-				$prevSibling->nextSibling =& $child;
-			}
-	
-			$this->lastChild =& $child;
-			$child->parentNode =& $this;
-			
-			unset($child->nextSibling);
-			$child->nextSibling = null;
-		
-			$child->setOwnerDocument($this);
-			$this->childCount++;
-		}
-		
-		return $child;
-	} //appendChild
-	
-	/**
-	* Inserts a node to the childNodes list of the current node
-	* @param Object The node to be inserted
-	* @param Object The node before which the insertion is to occur 
-	* @return Object The inserted node
-	*/
-	function &insertBefore(&$newChild, &$refChild) {
-	    if ($newChild->nodeType == DOMIT_ATTRIBUTE_NODE) {
-	    	DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-				('Cannot add a node of type ' . get_class($newChild) . ' using insertBefore'));
-	    }
-	
-		if (($refChild->nodeType == DOMIT_DOCUMENT_NODE) ||
-			($refChild->parentNode->nodeType == DOMIT_DOCUMENT_NODE) || 
-			($refChild->parentNode == null)) {
-			
-			DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR, 
-				 'Reference child not present in the child nodes list.'); 
-		}
-		
-		//if reference child is also the node to be inserted
-		//leave the document as is and don't raise an exception
-		if ($refChild->uid == $newChild->uid) {
-			return $newChild;
-		}
-		
-		//if $newChild is a DocumentFragment, 
-		//loop through and insert each node separately
-		if ($newChild->nodeType == DOMIT_DOCUMENT_FRAGMENT_NODE) {
-			$total = $newChild->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currChild =& $newChild->childNodes[$i];
-				$this->insertBefore($currChild, $refChild);
-			}
-			
-			return $newChild;
-		}
-		
-		//remove $newChild if it already exists
-		$index = $this->getChildNodeIndex($this->childNodes, $newChild);
-		if ($index != -1) {
-			$this->removeChild($newChild);
-		}
-	
-		//find index of $refChild in childNodes
-		$index = $this->getChildNodeIndex($this->childNodes, $refChild);
-				
-		if ($index != -1) {
-			//reset sibling chain
-			if ($refChild->previousSibling != null) {			
-				$refChild->previousSibling->nextSibling =& $newChild;
-				$newChild->previousSibling =& $refChild->previousSibling;
-			}
-			else {
-				$this->firstChild =& $newChild;
-				
-				if ($newChild->previousSibling != null) {
-					unset($newChild->previousSibling);
-					$newChild->previousSibling = null; 
-				}
-			}
-			
-			$newChild->parentNode =& $refChild->parentNode;
-			$newChild->nextSibling =& $refChild;
-			$refChild->previousSibling =& $newChild;
-			
-			//add node to childNodes
-			$i = $this->childCount;
-	
-			while ($i >= 0) {		
-				if ($i > $index) {
-					$this->childNodes[$i] =& $this->childNodes[($i - 1)];
-				}
-				else if ($i == $index) {
-					$this->childNodes[$i] =& $newChild;
-				}
-				$i--;
-			}
-			
-			$this->childCount++;
-		}
-		else {
-			$this->appendChild($newChild);
-		}
-		
-		$newChild->setOwnerDocument($this); 
-		return $newChild;
-	} //insertBefore
-	
-	/**
-	* Replaces a node with another
-	* @param Object The new node
-	* @param Object The old node
-	* @return Object The new node
-	*/
-	function &replaceChild(&$newChild, &$oldChild) {
-	    if ($newChild->nodeType == DOMIT_ATTRIBUTE_NODE) {
-	    	DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-				('Cannot add a node of type ' . get_class($newChild) . ' using replaceChild'));
-	    }
-		else if ($newChild->nodeType == DOMIT_DOCUMENT_FRAGMENT_NODE) { //if $newChild is a DocumentFragment
-			//replace the first node then loop through and insert each node separately
-			$total = $newChild->childCount;
-			
-			if ($total > 0) {
-				$newRef =& $newChild->lastChild;
-				$this->replaceChild($newRef, $oldChild);
-			
-				for ($i = 0; $i < ($total - 1); $i++) {
-					$currChild =& $newChild->childNodes[$i];
-					$this->insertBefore($currChild, $newRef);
-				}
-			}
-			
-			return $newChild;
-		}
-		else {
-			if ($this->hasChildNodes()) { 
-				//remove $newChild if it already exists
-				$index = $this->getChildNodeIndex($this->childNodes, $newChild);
-				if ($index != -1) {
-					$this->removeChild($newChild);
-				}
-			
-				//find index of $oldChild in childNodes
-				$index = $this->getChildNodeIndex($this->childNodes, $oldChild);
-				
-				if ($index != -1) {
-					$newChild->ownerDocument =& $oldChild->ownerDocument;
-					$newChild->parentNode =& $oldChild->parentNode;
-					
-					//reset sibling chain
-					if ($oldChild->previousSibling == null) {
-						unset($newChild->previousSibling);
-						$newChild->previousSibling = null;
-					}
-					else {
-						$oldChild->previousSibling->nextSibling =& $newChild;
-						$newChild->previousSibling =& $oldChild->previousSibling;
-					}
-					
-					if ($oldChild->nextSibling == null) {
-						unset($newChild->nextSibling);
-						$newChild->nextSibling = null;
-					}
-					else {
-						$oldChild->nextSibling->previousSibling =& $newChild;
-						$newChild->nextSibling =& $oldChild->nextSibling;
-					}
-		
-					$this->childNodes[$index] =& $newChild;
-					
-					if ($index == 0) $this->firstChild =& $newChild;
-					if ($index == ($this->childCount - 1)) $this->lastChild =& $newChild;
-					
-					$newChild->setOwnerDocument($this);
-					return $newChild;
-				}
-			}
-			
-			DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR, 
-				('Reference node for replaceChild not found.'));
-		}
-	} //replaceChild
-	
-	/**
-	* Removes a node from the childNodes list of the current node
-	* @param Object The node to be removed
-	* @return Object The removed node
-	*/
-	function &removeChild(&$oldChild) {
-		if ($this->hasChildNodes()) { 
-			//find index of $oldChild in childNodes
-			$index = $this->getChildNodeIndex($this->childNodes, $oldChild);
-				
-			if ($index != -1) {
-				//reset sibling chain
-				if (($oldChild->previousSibling != null) && ($oldChild->nextSibling != null)) {
-					$oldChild->previousSibling->nextSibling =& $oldChild->nextSibling;
-					$oldChild->nextSibling->previousSibling =& $oldChild->previousSibling;			
-				}
-				else if (($oldChild->previousSibling != null) && ($oldChild->nextSibling == null)) {
-					$this->lastChild =& $oldChild->previousSibling;
-					unset($oldChild->previousSibling->nextSibling);
-					$oldChild->previousSibling->nextSibling = null;
-				}
-				else if (($oldChild->previousSibling == null) && ($oldChild->nextSibling != null)) {
-					unset($oldChild->nextSibling->previousSibling);
-					$oldChild->nextSibling->previousSibling = null;			
-					$this->firstChild =& $oldChild->nextSibling;
-				}
-				else if (($oldChild->previousSibling == null) && ($oldChild->nextSibling == null)) {
-					unset($this->firstChild);
-					$this->firstChild = null;					
-					unset($this->lastChild);
-					$this->lastChild = null;
-				}
-				
-				$total = $this->childCount;
-
-				//remove node from childNodes
-				for ($i = 0; $i < $total; $i++) {
-					if ($i == ($total - 1)) {
-						array_splice($this->childNodes, $i, 1);
-					}
-					else if ($i >= $index) {
-						$this->childNodes[$i] =& $this->childNodes[($i + 1)];
-					}
-				}
-				
-				$this->childCount--;
-				
-				$oldChild->clearReferences();
-				return $oldChild;
-			}
-		}
-
-		DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR, 
-				('Target node for removeChild not found.'));
-	} //removeChild
-	
-	/**
-	* Searches the element tree for an element with the specified attribute name and value.
-	* @param string The value of the attribute
-	* @param string The name of the attribute
-	* @param boolean True if the first found node is to be returned as a node instead of a nodelist
-	* @return object A NodeList of found elements, or null
-	*/
-	function &getElementsByAttribute($attrName = 'id', $attrValue = '', 
-											$returnFirstFoundNode = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_nodemaps.php');
-		
-		$nodelist =& new DOMIT_NodeList();
-		
-		switch ($this->nodeType) {
-			case DOMIT_ELEMENT_NODE:
-				$this->_getElementsByAttribute($nodelist, $attrName = 'id', $attrValue, 
-															$returnFirstFoundNode);
-				break;
-				
-			case DOMIT_DOCUMENT_NODE:
-				if ($this->documentElement != null) {
-					$this->documentElement->_getElementsByAttribute($nodelist, 
-										$attrName, $attrValue, $returnFirstFoundNode);
-				}
-				break;
-		}
-
-		if ($returnFirstFoundNode) {
-			if ($nodelist->getLength() > 0) {
-				return $nodelist->item(0);
-			}
-			else {
-				return null;	
-			}
-		}
-		else {
-			return $nodelist;
-		}
-	} //getElementsByAttribute
-	
-	/**
-	* Searches the element tree for an element with the specified attribute name and value.
-	* @param object The node list of found elements
-	* @param string The value of the attribute
-	* @param string The name of the attribute
-	* @param boolean True if the first found node is to be returned as a node instead of a nodelist
-	* @param boolean True the node has been found
-	*/
-	function _getElementsByAttribute(&$nodelist, $attrName, $attrValue, 
-										$returnFirstFoundNode, $foundNode = false) {
-		if (!($foundNode && $returnFirstFoundNode)) {
-			if ($this->getAttribute($attrName) == $attrValue) {
-				$nodelist->appendNode($this);
-				$foundNode = true;
-				if ($returnFirstFoundNode) return;				
-			} 
-
-			$total = $this->childCount;
-
-			for ($i = 0; $i < $total; $i++) {
-				$currNode =& $this->childNodes[$i];
-			
-				if ($currNode->nodeType == DOMIT_ELEMENT_NODE) {
-					$currNode->_getElementsByAttribute($nodelist, 
-									$attrName, $attrValue, 
-									$returnFirstFoundNode, $foundNode);
-				}
-			
-			}
-		}
-	} //_getElementsByAttribute
-	
-	/**
-	* Performs an XPath query
-	* @param string The query pattern
-	* @return Object A NodeList containing the found nodes
-	*/
-	function &selectNodes($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_xpath.php');
-		
-		$xpParser =& new DOMIT_XPath();
-		
-		return $xpParser->parsePattern($this, $pattern, $nodeIndex);		
-	} //selectNodes	
-} //DOMIT_ChildNodes_Interface
-
-/**
-* A class representing the DOM Document
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Document extends DOMIT_ChildNodes_Interface {
-	/** @var Object The xml declaration processing instruction */
-	var $xmlDeclaration;
-	/** @var Object A reference to a DOMIT_DocType object */
-	var $doctype;
-	/** @var Object A reference to the root node of the DOM document */
-	var $documentElement;
-	/** @var string The parser used to process the DOM document, either "EXPAT" or "SAXY" */
-	var $parser;
-	/** @var Object A reference to the DOMIT_DOMImplementation object */
-	var $implementation;
-	/** @var boolean True if the DOM document has been modifed since being parsed (NOT YET IMPLEMENTED!) */
-	var $isModified;
-	/** @var boolean True if whitespace is to be preserved during parsing (NOT YET IMPLEMENTED!) */
-	var $preserveWhiteSpace = false; 
-	/** @var Array User defined translation table for XML entities; passed to SAXY */
-	var $definedEntities = array();
-    /** @var boolean If true, loadXML or parseXML will attempt to detect and repair invalid xml */
-    var $doResolveErrors = false;
-    /** @var boolean If true, elements tags will be rendered to string as <element></element> rather than <element/> */
-    var $doExpandEmptyElementTags = false;
-	/** @var array A list of exceptions to the empty element expansion rule */
-	var $expandEmptyElementExceptions = array();
-    /** @var boolean If true, namespaces will be processed */
-    var $isNamespaceAware = false;
-	/** @var int The error code returned by the SAX parser */
-    var $errorCode = 0;
-	/** @var string The error string returned by the SAX parser */
-    var $errorString = '';
-	/** @var object A reference to a http connection or proxy server, if one is required */
-    var $httpConnection = null;
-	
-	/**
-	* DOM Document constructor
-	*/
-	function DOMIT_Document() {
-		$this->_constructor();
-		$this->xmlDeclaration = null;
-		$this->doctype = null;
-		$this->documentElement = null;
-		$this->nodeType = DOMIT_DOCUMENT_NODE;
-		$this->nodeName = '#document';
-		$this->ownerDocument =& $this;
-		$this->parser = '';
-		$this->implementation =& new DOMIT_DOMImplementation();
-	} //DOMIT_Document	
-	
-	/**
-	* Specifies whether DOMIT! will try to fix invalid XML before parsing begins
-	* @param boolean True if errors are to be resolved
-	*/
-	function resolveErrors($truthVal) {
-	    $this->doResolveErrors = $truthVal;
-	} //resolveErrors
-	
-	/**
-	* Specifies whether DOMIT! processes namespace information
-	* @param boolean True if namespaces are to be processed
-	*/
-	function setNamespaceAwareness($truthVal) {
-	    $this->isNamespaceAware = $truthVal;
-	} //setNamespaceAwareness
-	
-	/**
-	* Specifies the parameters of the http conection used to obtain the xml data
-	* @param string The ip address or domain name of the connection
-	* @param string The path of the connection
-	* @param int The port that the connection is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(DOMIT_INCLUDE_PATH . 'php_http_client_generic.php');
-		
-		$this->httpConnection =& new php_http_client_generic($host, $path, $port, $timeout, $user, $password);
-	} //setConnection
-	
-	/**
-	* Specifies basic authentication for an http connection
-	* @param string The user name
-	* @param string The password
-	*/
-	function setAuthorization($user, $password) {
-		$this->httpConnection->setAuthorization($user, $password);
-	} //setAuthorization
-	
-	/**
-	* Specifies that a proxy is to be used to obtain the xml data
-	* @param string The ip address or domain name of the proxy
-	* @param string The path to the proxy
-	* @param int The port that the proxy is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setProxyConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(DOMIT_INCLUDE_PATH . 'php_http_proxy.php');
-		
-		$this->httpConnection =& new php_http_proxy($host, $path, $port, $timeout, $user, $password);
-	} //setProxyConnection
-	
-	/**
-	* Specifies basic authentication for the proxy
-	* @param string The user name
-	* @param string The password
-	*/
-	function setProxyAuthorization($user, $password) {
-		$this->httpConnection->setProxyAuthorization($user, $password);
-	} //setProxyAuthorization
-	
-	/**
-	* Returns the error code from the underlying SAX parser
-	* @return int The error code
-	*/
-	function getErrorCode() {
-	    return $this->errorCode;
-	} //getErrorCode
-	
-	/**
-	* Returns the error string from the underlying SAX parser
-	* @return string The error string
-	*/
-	function getErrorString() {
-	    return $this->errorString;
-	} //getErrorString
-	
-	/**
-	* Specifies whether elements tags will be rendered to string as <element></element> rather than <element/>
-	* @param boolean True if the expanded form is to be used
-	* @param mixed An array of tag names that should be excepted from expandEmptyElements rule (optional)
-	*/
-	function expandEmptyElementTags($truthVal, $expandEmptyElementExceptions = false) {
-		$this->doExpandEmptyElementTags = $truthVal;
-		
-		if (is_array($expandEmptyElementExceptions)) {
-			$this->expandEmptyElementExceptions = $expandEmptyElementExceptions;
-		}
-	} //expandEmptyElementTags
-	
-	/**
-	* Set the specified node as document element
-	* @param Object The node that is to become document element
-	* @return Object The new document element
-	*/
-	function &setDocumentElement(&$node) {	
-		if ($node->nodeType == DOMIT_ELEMENT_NODE) {
-			if ($this->documentElement == null) {
-				parent::appendChild($node);
-			}
-			else {
-				parent::replaceChild($node, $this->documentElement);
-			}
-			
-			$this->documentElement =& $node;
-		}
-		else {
-			DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-				('Cannot add a node of type ' . get_class($node) . ' as a Document Element.'));
-		}
-		
-		return $node;
-	} //setDocumentElement
-	
-	/**
-	* Imports a node (and optionally its children) from another DOM Document
-	* @param object A reference to the node to be imported
-	* @param boolean True if the children of the imported node are also to be imported
-	* @return object The imported node (and, if specified, its children)
-	*/
-	function &importNode(&$importedNode, $deep = true) {
-		$parentNode = null;
-		return $this->_importNode($parentNode, $importedNode, $deep);
-	} //importNode
-	
-	
-	/**
-	* Imports a node (and optionally its children) from another DOM Document
-	* @param object A reference to the parent of the node to be imported
-	* @param object A reference to the node to be imported
-	* @param boolean True if the children of the imported node are also to be imported
-	* @return object The imported node if it is the top level node, otherwise null
-	*/
-	function &_importNode(&$parentNode, &$sourceNode, $deep) {
-		$hasChildren = false;
-		
-		switch ($sourceNode->nodeType) {
-			case DOMIT_ELEMENT_NODE:
-				$hasChildren = true;
-				
-				if ($this->isNamespaceAware) {
-					$importedNode =& $this->createElementNS($sourceNode->namespaceURI, 
-								($sourceNode->prefix . ":" . $sourceNode->localName));
-				}
-				else {
-					$importedNode =& $this->createElement($sourceNode->nodeName);
-				}
-				break;	
-				
-			case DOMIT_ATTRIBUTE_NODE:
-				if ($this->isNamespaceAware) {
-					$importedNode =& $this->createAttributeNS($sourceNode->namespaceURI, 
-								($sourceNode->prefix . ":" . $sourceNode->localName));
-				}
-				else {
-					$importedNode =& $this->createAttribute($sourceNode->nodeValue);
-				}
-				break;
-				
-			case DOMIT_TEXT_NODE:
-				$importedNode =& $this->createTextNode($sourceNode->nodeValue);
-				break;
-				
-			case DOMIT_CDATA_SECTION_NODE:
-				$importedNode =& $this->createCDATASection($sourceNode->nodeValue);
-				break;
-				
-			case DOMIT_COMMENT_NODE:
-				$importedNode =& $this->createComment($sourceNode->nodeValue);
-				break;
-				
-			case DOMIT_DOCUMENT_FRAGMENT_NODE:
-				$hasChildren = true;				
-				$importedNode =& $this->createDocumentFragment();
-				break;
-				
-			case DOMIT_PROCESSING_INSTRUCTION_NODE:
-				$importedNode =& $this->createProcessingInstruction($sourceNode->nodeName, 
-																	$sourceNode->nodeValue);
-				break;
-				
-			case DOMIT_DOCUMENT_NODE:
-			case DOMIT_DOCUMENT_TYPE_NODE:
-				DOMIT_DOMException::raiseException(DOMIT_NOT_SUPPORTED_ERR,
-					('Method importNode cannot be called by class ' . get_class($this)));
-				break;
-		}
-		
-		if ($hasChildren && $deep) {
-			$total = $sourceNode->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$importedNode->appendChild(
-						$this->_importNode($importedNode, $sourceNode->childNodes[$i], $deep));
-			}	
-		}
-		
-		return $importedNode;
-	} //_importNode
-	
-	/**
-	* Appends a node to the childNodes list of the current node
-	* @param Object The node to be appended 
-	* @return Object The appended node
-	*/
-	function &appendChild(&$node) {
-	    switch ($node->nodeType) {
-	        case DOMIT_ELEMENT_NODE:
-	            if ($this->documentElement == null) {
-					parent::appendChild($node);
-					$this->setDocumentElement($node);
-				}
-				else {
-					//error thrown if documentElement already exists!
-					DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-						('Cannot have more than one root node (documentElement) in a DOMIT_Document.'));
-				}
-	            break;
-	            
-			case DOMIT_PROCESSING_INSTRUCTION_NODE:
-			case DOMIT_COMMENT_NODE:
-			    parent::appendChild($node);
-			    break;
-			    
-   			case DOMIT_DOCUMENT_TYPE_NODE:
-   			    if ($this->doctype == null) {
-					parent::appendChild($node);
-				}
-				else {
-					DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-						('Cannot have more than one doctype node in a DOMIT_Document.'));
-				}
-   			    break;
-   			    
-			case DOMIT_DOCUMENT_FRAGMENT_NODE:
-			    $total = $node->childCount;
-
-				for ($i = 0; $i < $total; $i++) {
-					$currChild =& $node->childNodes[$i];
-					$this->appendChild($currChild);
-				}
-			    break;
-			    
-   			default:
-   			    DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-					('Cannot add a node of type ' . get_class($node) . ' to a DOMIT_Document.'));
-	    }
-
-		return $node;
-	} //appendChild
-	
-	/**
-	* Replaces a node with another
-	* @param Object The new node
-	* @param Object The old node
-	* @return Object The new node
-	*/
-	function &replaceChild(&$newChild, &$oldChild) {
-		if ($this->nodeType == DOMIT_DOCUMENT_FRAGMENT_NODE) {			
-			$total = $newChild->childCount;
-			
-			if ($total > 0) {
-				$newRef =& $newChild->lastChild;
-				$this->replaceChild($newRef, $oldChild);
-			
-				for ($i = 0; $i < ($total - 1); $i++) {
-					$currChild =& $newChild->childNodes[$i];
-					parent::insertBefore($currChild, $newRef);
-				}
-			}
-		}
-		else {
-			if (($this->documentElement != null) && ($oldChild->uid == $this->documentElement->uid)) {
-				if ($newChild->nodeType == DOMIT_ELEMENT_NODE) {
-					//replace documentElement with new node
-					$this->setDocumentElement($newChild);
-				}
-				else {
-					DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-						('Cannot replace Document Element with a node of class ' . get_class($newChild)));
-				}
-			}
-			else {
-				switch ($newChild->nodeType) {
-				    case DOMIT_ELEMENT_NODE:
-				        if ($this->documentElement != null) {
-							DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-								('Cannot have more than one root node (documentElement) in a DOMIT_Document.'));
-						}
-						else {
-							parent::replaceChild($newChild, $oldChild);
-						}
-				        break;
-
-					case DOMIT_PROCESSING_INSTRUCTION_NODE:
-					case DOMIT_COMMENT_NODE:
-					    parent::replaceChild($newChild, $oldChild);
-					    break;
-					    
-	 				case DOMIT_DOCUMENT_TYPE_NODE:
-	 				    if ($this->doctype != null) {
-							if ($this->doctype->uid == $oldchild->uid) {
-								parent::replaceChild($newChild, $oldChild);
-							}
-							else {
-								DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-									('Cannot have more than one doctype node in a DOMIT_Document.'));
-							}
-						}
-						else {
-							parent::replaceChild($newChild, $oldChild);
-						}
-	 				    break;
-	 				    
-	  				default:
-	  				    DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR,
-							('Nodes of class ' . get_class($newChild) . ' cannot be children of a DOMIT_Document.'));
-				}
-			}			
-		}	
-
-		return $newChild;
-	} //replaceChild
-	
-	/**
-	* Inserts a node to the childNodes list of the current node
-	* @param Object The node to be inserted
-	* @param Object The node before which the insertion is to occur 
-	* @return Object The inserted node
-	*/
-	function &insertBefore(&$newChild, &$refChild) {
-		$type = $newChild->nodeType;
-		
-		if ($this->nodeType == DOMIT_DOCUMENT_FRAGMENT_NODE) {			
-			$total = $newChild->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currChild =& $newChild->childNodes[$i];
-				$this->insertBefore($currChild, $refChild);
-			}
-		}
-		else if ($type == DOMIT_ELEMENT_NODE) {
-			if ($this->documentElement == null) { 
-				parent::insertBefore($newChild);
-				$this->setDocumentElement($newChild);
-			}
-			else {
-				//error thrown if documentElement already exists!
-				DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-					('Cannot have more than one root node (documentElement) in a DOMIT_Document.'));
-			}				
-		}	
-		else if ($type == DOMIT_PROCESSING_INSTRUCTION_NODE) {
-			parent::insertBefore($newChild);
-		}
-		else if ($type == DOMIT_DOCUMENT_TYPE_NODE) {
-			if ($this->doctype == null) {
-				parent::insertBefore($newChild);
-			}
-			else {
-				DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-					('Cannot have more than one doctype node in a DOMIT_Document.'));
-			}
-		}
-		else {
-			DOMIT_DOMException::raiseException(DOMIT_HIERARCHY_REQUEST_ERR, 
-				('Cannot insert a node of type ' . get_class($newChild) . ' to a DOMIT_Document.'));
-		}
-		
-		return $newChild;
-	} //insertBefore
-	
-	/**
-	* Removes a node from the childNodes list of the current node
-	* @param Object The node to be removed
-	* @return Object The removed node
-	*/
-	function &removeChild(&$oldChild) {
-		if ($this->nodeType == DOMIT_DOCUMENT_FRAGMENT_NODE) {			
-			$total = $oldChild->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currChild =& $oldChild->childNodes[$i];
-				$this->removeChild($currChild);
-			}
-		}
-		else {
-			if (($this->documentElement != null) && ($oldChild->uid == $this->documentElement->uid)) {
-				parent::removeChild($oldChild);
-				$this->documentElement = null;
-			}
-			else {
-				parent::removeChild($oldChild);
-			}
-		}
-		
-		$oldChild->clearReferences();
-		return $oldChild;
-	} //removeChild
-	
-
-	/**
-	* Creates a new DOMIT_DocumentFragment node
-	* @return Object The new document fragment node
-	*/
-	function &createDocumentFragment() {
-		$node =& new DOMIT_DocumentFragment();
-		$node->ownerDocument =& $this;
-		
-		return $node;
-	} //createDocumentFragment
-	
-	/**
-	* Creates a new DOMIT_Attr node
-	* @param string The name of the attribute
-	* @return Object The new attribute node
-	*/
-	function &createAttribute($name) {
-		$node =& new DOMIT_Attr($name);
-		
-		return $node;
-	} //createAttribute
-	
-	/**
-	* Creates a new DOMIT_Attr node (namespace aware)
-	* @param string The namespaceURI of the attribute
-	* @param string The qualifiedName of the attribute
-	* @return Object The new attribute node
-	*/
-	function &createAttributeNS($namespaceURI, $qualifiedName) {
-		$node =& new DOMIT_Attr($qualifiedName);
-		$node->namespaceURI = $namespaceURI;
-		
-		$colonIndex = strpos($qualifiedName, ":");
-		
-		if ($colonIndex !== false) {
-	    	$node->prefix = substr($qualifiedName, 0, $colonIndex);
-	    	$node->localName = substr($qualifiedName, ($colonIndex + 1));
-		}
-		else {
-			$node->prefix = '';
-			$node->localName = $qualifiedName;
-		}
-
-		return $node;
-	} //createAttributeNS
-	
-	/**
-	* Creates a new DOMIT_Element node
-	* @param string The tag name of the element
-	* @return Object The new element
-	*/
-	function &createElement($tagName) {
-		$node =& new DOMIT_Element($tagName);
-		$node->ownerDocument =& $this;
-		
-		return $node;
-	} //createElement
-	
-	/**
-	* Creates a new DOMIT_Element node (namespace aware)
-	* @param string The namespaceURI of the element
-	* @param string The qualifiedName of the element
-	* @return Object The new element
-	*/
-	function &createElementNS($namespaceURI, $qualifiedName) {
-	    $node =& new DOMIT_Element($qualifiedName);
-
-	    $colonIndex = strpos($qualifiedName, ":");
-		
-		if ($colonIndex !== false) { 
-	    	$node->prefix = substr($qualifiedName, 0, $colonIndex);
-	    	$node->localName = substr($qualifiedName, ($colonIndex + 1));
-		}
-		else {
-			$node->prefix = '';
-	    	$node->localName = $qualifiedName;
-		}
-		
-	    $node->namespaceURI = $namespaceURI;
-		
-		$node->ownerDocument =& $this;
-
-		return $node;
-	} //createElementNS
-	
-	/**
-	* Creates a new DOMIT_Text node
-	* @param string The text of the node
-	* @return Object The new text node
-	*/
-	function &createTextNode($data) {
-		$node =& new DOMIT_TextNode($data);
-		$node->ownerDocument =& $this;
-	
-		return $node;
-	} //createTextNode
-	
-	/**
-	* Creates a new DOMIT_CDataSection node
-	* @param string The text of the CDATASection
-	* @return Object The new CDATASection node
-	*/
-	function &createCDATASection($data) {
-		$node =& new DOMIT_CDATASection($data);
-		$node->ownerDocument =& $this;
-		
-		return $node;
-	} //createCDATASection
-	
-	/**
-	* Creates a new DOMIT_Comment node
-	* @param string The comment text
-	* @return Object The new comment node
-	*/
-	function &createComment($text) {
-		$node =& new DOMIT_Comment($text);
-		$node->ownerDocument =& $this;
-		
-		return $node;
-	} //createComment
-	
-	/**
-	* Creates a new DOMIT_ProcessingInstruction node
-	* @param string The target of the processing instruction
-	* @param string The data of the processing instruction
-	* @return Object The new processing instruction node
-	*/
-	function &createProcessingInstruction($target, $data) {
-		$node =& new DOMIT_ProcessingInstruction($target, $data);
-		$node->ownerDocument =& $this;
-		
-		return $node;
-	} //createProcessingInstruction
-	
-	/**
-	* Retrieves a NodeList of child elements with the specified tag name
-	* @param string The matching element tag name
-	* @return Object A NodeList of found elements
-	*/
-	function &getElementsByTagName($tagName) {
-		$nodeList =& new DOMIT_NodeList();
-		
-		if ($this->documentElement != null) {
-			$this->documentElement->getNamedElements($nodeList, $tagName);
-		}
-		
-		return $nodeList;
-	} //getElementsByTagName
-	
-	/**
-	* Retrieves a NodeList of child elements with the specified namespaceURI and localName
-	* @param string The matching namespaceURI
-	* @param string The matching localName
-	* @return Object A NodeList of found elements
-	*/
-	function &getElementsByTagNameNS($namespaceURI, $localName) {
-		$nodeList =& new DOMIT_NodeList();
-
-		if ($this->documentElement != null) {
-			$this->documentElement->getNamedElementsNS($nodeList, $namespaceURI, $localName);
-		}
-
-		return $nodeList;
-	} //getElementsByTagNameNS
-	
-	/**
-	* Returns the element whose ID is given by elementId.
-	* @param string The id of the matching element
-	* @param boolean True if XML spec is to be strictly adhered to (only attributes xml:id are considered valid)
-	* @return Object The found element or null
-	*/
-	function &getElementByID($elementID, $isStrict = true) {
-		if ($this->isNamespaceAware) {
-			if ($this->documentElement != null) {				
-				$targetAttrNode =& $this->documentElement->_getElementByID($elementID, $isStrict);
-				return $targetAttrNode->ownerElement;
-			}
-		
-			return null;
-		}
-		else {
-			DOMIT_DOMException::raiseException(DOMIT_INVALID_ACCESS_ERR, 
-			 	'Namespace awareness must be enabled to use method getElementByID'); 
-		}
-	} //getElementByID
-	
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like expression.
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByPath($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_getelementsbypath.php');
-	
-		$gebp = new DOMIT_GetElementsByPath();
-		$myResponse =& $gebp->parsePattern($this, $pattern, $nodeIndex);
-
-		return $myResponse;
-	} //getElementsByPath	
-	
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like attribute expression (NOT YET IMPLEMENTED!)
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByAttributePath($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_getelementsbypath.php');
-	
-		$gabp = new DOMIT_GetElementsByAttributePath();
-		$myResponse =& $gabp->parsePattern($this, $pattern, $nodeIndex);
-
-		return $myResponse;
-	} //getElementsByAttributePath	
-	
-	/**
-	* Retrieves all child nodes of the specified nodeType
-	* @param string The nodeType of matching nodes
-	* @param Object The root node of the search
-	* @return Object A NodeList containing found nodes	 
-	*/
-	function &getNodesByNodeType($type, &$contextNode) {
-		$nodeList =& new DOMIT_NodeList();
-		
-		if (($type == DOMIT_DOCUMENT_NODE) || ($contextNode->nodeType == DOMIT_DOCUMENT_NODE)){
-			$nodeList->appendNode($this); 
-		}
-		else if ($contextNode->nodeType == DOMIT_ELEMENT_NODE) {
-			$contextNode->getTypedNodes($nodeList, $type);
-		}
-		else if ($contextNode->uid == $this->uid) {
-			if ($this->documentElement != null) {
-				if ($type == DOMIT_ELEMENT_NODE) {
-					$nodeList->appendNode($this->documentElement); 
-				}
-					
-				$this->documentElement->getTypedNodes($nodeList, $type);
-			}
-		}
-		
-		return $nodeList;
-	} //getNodesByNodeType	
-
-	/**
-	* Retrieves all child nodes of the specified nodeValue
-	* @param string The nodeValue of matching nodes 
-	* @param Object The root node of the search
-	* @return Object A NodeList containing found nodes
-	*/
-	function &getNodesByNodeValue($value, &$contextNode) {
-		$nodeList =& new DOMIT_NodeList();
-		
-		 if ($contextNode->uid == $this->uid) {
-			 if ($this->nodeValue == $value) {
-				 $nodeList->appendNode($this);
-			 }
-		 }
-		
-		if ($this->documentElement != null) {
-			$this->documentElement->getValuedNodes($nodeList, $value);
-		}
-		
-		return $nodeList;
-	} //getNodesByNodeValue
-	
-	/**
-	* Parses an xml string
-	* @param string The xml text to be parsed
-	* @param boolean True if SAXY is to be used instead of Expat
-	* @param boolean False if CDATA Section are to be generated as Text nodes
-	* @param boolean True if onLoad is to be called on each node after parsing
-	* @return boolean True if parsing is successful
-	*/
-	function parseXML($xmlText, $useSAXY = true, $preserveCDATA = true, $fireLoadEvent = false) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-  
-        if ($this->doResolveErrors) {
-            require_once(DOMIT_INCLUDE_PATH . 'xml_domit_doctor.php');
-            $xmlText = DOMIT_Doctor::fixAmpersands($xmlText);
-        }
-		
-		if (DOMIT_Utilities::validateXML($xmlText)) {
-			$domParser =& new DOMIT_Parser();
-			
-			if ($useSAXY || (!function_exists('xml_parser_create'))) {
-				//use SAXY parser to populate xml tree
-				$this->parser = 'SAXY';
-				$success = $domParser->parseSAXY($this, $xmlText, $preserveCDATA, $this->definedEntities);
-			}
-			else {
-				//use Expat parser to populate xml tree
-				$this->parser = 'EXPAT';
-				$success = $domParser->parse($this, $xmlText, $preserveCDATA);
-			}
-			
-			if ($fireLoadEvent && ($this->documentElement != null)) $this->load($this->documentElement);
-				
-			return $success;
-		}
-		else {
-			return false;
-		}
-	} //parseXML
-	
-	/**
-	* Parses an xml file
-	* @param string The xml file to be parsed
-	* @param boolean True if SAXY is to be used instead of Expat
-	* @param boolean False if CDATA Section are to be generated as Text nodes
-	* @param boolean True if onLoad is to be called on each node after parsing
-	* @return boolean True if parsing is successful
-	*/
-	function loadXML($filename, $useSAXY = true, $preserveCDATA = true, $fireLoadEvent = false) {
-		$xmlText = $this->getTextFromFile($filename);
-
-		return $this->parseXML($xmlText, $useSAXY, $preserveCDATA, $fireLoadEvent);
-	} //loadXML
-	
-	/**
-	* Retrieves text from a file
-	* @param string The file path
-	* @return string The text contained in the file
-	*/
-	function getTextFromFile($filename) {
-		if ($this->httpConnection != null) {
-			$response =& $this->httpConnection->get($filename);
-
-			$this->httpConnection->disconnect();
-			return $response->getResponse();
-		}
-		else if (function_exists('file_get_contents')) {
-		    //if (file_exists($filename)) {
-				return file_get_contents($filename);
-		    //}
-		}
-		else {
-			require_once(DOMIT_INCLUDE_PATH . 'php_file_utilities.php');
-
-			$fileContents =& php_file_utilities::getDataFromFile($filename, 'r');
-			return $fileContents;
-		}
-		
-		return '';
-	} //getTextFromFile	
-
-	/**
-	* Saves the current DOM document as an xml file
-	* @param string The path of the xml file
-	* @param boolean True if xml text is to be normalized before saving
-	* @return boolean True if save is successful
-	*/
-	function saveXML($filename, $normalized = false) {
-		if ($normalized) {
-			$stringRep = $this->toNormalizedString(false, true);
-		}
-		else {
-			$stringRep = $this->toString(false, true);
-		}
-		
-		return $this->saveTextToFile($filename, $stringRep);
-	} //saveXML	
-
-	/**
-	* Saves text to a file
-	* @param string The file path
-	* @param string The text to be saved
-	* @return boolean True if the save is successful
-	*/
-	function saveTextToFile($filename, $text) {
-		if (function_exists('file_put_contents')) {
-			file_put_contents($filename, $text);
-		}
-		else {
-			require_once(DOMIT_INCLUDE_PATH . 'php_file_utilities.php');
-			php_file_utilities::putDataToFile($filename, $text, 'w');
-		}
-		
-		return (file_exists($filename) && is_writable($filename));
-	} //saveTextToFile		
-	
-	/**
-	* Indicates the SAX parser used to parse the current document
-	* @return string Either "SAXY" or "EXPAT"
-	*/
-	function parsedBy() {
-		return $this->parser;
-	} //parsedBy
-	
-	/**
-	* Returns the concatented text of the current node and its children
-	* @return string The concatented text of the current node and its children
-	*/
-	function getText() {
-		if ($this->documentElement != null) {
-			$root =& $this->documentElement; 
-			return $root->getText();
-		}
-
-		return '';
-	} //getText
-	
-	/**
-	* Returns a doctype object
-	* @return mixed The doctype object, or null if none exists
-	*/
-	function getDocType() {
-		return $this->doctype;
-	} //getDocType
-	
-	/**
-	* Returns the xml declaration processing instruction
-	* @return mixed The xml declaration processing instruction, or null if none exists
-	*/
-	function getXMLDeclaration() {
-		return $this->xmlDeclaration;
-	} //getXMLDeclaration
-	
-	/**
-	* Returns a reference to the DOMIT_DOMImplementation object
-	* @return Object A reference to the DOMIT_DOMImplementation object
-	*/
-	function &getDOMImplementation() {
-		return $this->implementation;
-	} //getDOMImplementation
-	
-	/**
-	* Manages the firing of the onLoad() event
-	* @param Object The parent node of the current recursion
-	*/
-	function load(&$contextNode) {		
-		$total = $contextNode->childCount;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $contextNode->childNodes[$i];
-			$currNode->ownerDocument->load($currNode);
-		}
-
-		$contextNode->onLoad();
-	} //load
-	
-	/**
-	* Returns the current version of DOMIT!
-	* @return Object The current version of DOMIT!
-	*/
-	function getVersion() {
-		return DOMIT_VERSION;
-	} //getVersion
-	
-	/**
-	* Appends an array of entity mappings to the existing translation table
-	* 
-	* Intended mainly to facilitate the conversion of non-ASCII entities into equivalent characters 
-	* 
-	* @param array A list of entity mappings in the format: array('&amp;' => '&');
-	*/
-	function appendEntityTranslationTable($table) {
-		$this->definedEntities = $table;
-		
-		global $DOMIT_defined_entities_flip;
-		$DOMIT_defined_entities_flip = array_flip($table);
-	} //appendEntityTranslationTable
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		$arReturn = array($this->nodeName => array());
-		$total = $this->childCount;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$arReturn[$this->nodeName][$i] = $this->childNodes[$i]->toArray();
-		} 
-		
-		return $arReturn;
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName);
-
-		if ($deep) {
-			$total = $this->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currentChild =& $this->childNodes[$i];
-				$clone->appendChild($currentChild->cloneNode($deep));
-				
-				if ($currentChild->nodeType == DOMIT_DOCUMENT_TYPE_NODE) {
-					$clone->doctype =& $clone->childNodes[$i];
-				}
-				
-				if (($currentChild->nodeType == DOMIT_PROCESSING_INSTRUCTION_NODE) && 
-						($currentChild->getTarget() == 'xml')) {
-					$clone->xmlDeclaration =& $clone->childNodes[$i];
-				}
-			}
-		}
-
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		$result = '';				
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$result .= $this->childNodes[$i]->toString(false, $subEntities);
-		}
-
-		if ($htmlSafe) $result = $this->forHTML($result);
-		
-		return $result;
-	} //toString
-} //DOMIT_Document
-
-/**
-* A class representing the DOM Element
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Element extends DOMIT_ChildNodes_Interface {
-	/**
-	* DOM Element constructor
-	* @param string The tag name of the element
-	*/
-	function DOMIT_Element($tagName) {
-		$this->_constructor();		
-		$this->nodeType = DOMIT_ELEMENT_NODE;
-		$this->nodeName = $tagName;
-		$this->attributes = new DOMIT_NamedNodeMap_Attr();
-		$this->childNodes = array();
-	} //DOMIT_Element
-	
-	/**
-	* Returns the tag name of the element
-	* @return string The tag name of the element
-	*/
-	function getTagName() {
-		return $this->nodeName;
-	} //getTagName
-	
-	/**
-	* Adds elements with the specified tag name to a NodeList collection 
-	* @param Object The NodeList collection
-	* @param string The tag name of matching elements 
-	*/
-	function getNamedElements(&$nodeList, $tagName) {
-		if (($this->nodeName == $tagName) || ($tagName == '*')) {
-			$nodeList->appendNode($this); 
-		}
-		
-		$total = $this->childCount;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$this->childNodes[$i]->getNamedElements($nodeList, $tagName);
-		}
-	} //getNamedElements
-	
-	/**
-	* Adds elements with the specified tag name to a NodeList collection
-	* @param Object The NodeList collection
-	* @param string The namespaceURI of matching elements
-	* @param string The localName of matching elements
-	*/
-	function getNamedElementsNS(&$nodeList, $namespaceURI, $localName) {
-	    if ((($namespaceURI == $this->namespaceURI) || ($namespaceURI == '*')) &&
-                (($localName == $this->localName) || ($localName == '*')))	{
-	        $nodeList->appendNode($this);
-	    }
-
-		$total = $this->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			if ($this->childNodes[$i]->nodeType == DOMIT_ELEMENT_NODE) {
-				$this->childNodes[$i]->getNamedElementsNS($nodeList, $namespaceURI, $localName);
-			}
-		}
-	} //getNamedElementsNS
-	
-	/**
-	* Returns the concatented text of the current node and its children
-	* @return string The concatented text of the current node and its children
-	*/
-	function getText() {
-		$text = '';
-		$numChildren = $this->childCount;
-		
-		for ($i = 0; $i < $numChildren; $i++) {
-			$child =& $this->childNodes[$i];
-			$text .= $child->getText();
-		}
-		
-		return $text;
-	} //getText
-	
-	/**
-	* If a child text node exists, sets the nodeValue to $data. A child text node is created if none exists
-	* @param string The text data of the node
-	*/
-	function setText($data) {
-	    switch ($this->childCount) {
-	        case 1:
-	            if ($this->firstChild->nodeType == DOMIT_TEXT_NODE) {
-	                $this->firstChild->setText($data);
-	            }
-	            break;
-	            
-	        case 0:
-	            $childTextNode =& $this->ownerDocument->createTextNode($data);
-	            $this->appendChild($childTextNode);
-	            break;
-	            
-	        default:
-	            //do nothing. Maybe throw error???
-	    }
-	} //setText
-	
-	/**
-	* Retrieves a NodeList of child elements with the specified tag name
-	* @param string The matching element tag name
-	* @return Object A NodeList of found elements
-	*/
-	function &getElementsByTagName($tagName) {
-		$nodeList =& new DOMIT_NodeList();		
-		$this->getNamedElements($nodeList, $tagName);
-		
-		return $nodeList;
-	} //getElementsByTagName
-	
-	/**
-	* Retrieves a NodeList of child elements with the specified namespaceURI and localName
-	* @param string The namespaceURI
-	* @param string The localName
-	* @return Object A NodeList of found elements
-	*/
-	function &getElementsByTagNameNS($namespaceURI, $localName) {
-		$nodeList =& new DOMIT_NodeList();
-		$this->getNamedElementsNS($nodeList, $namespaceURI, $localName);
-
-		return $nodeList;
-	} //getElementsByTagNameNS
-	
-	/**
-	* Returns the attribute node whose ID is given by elementId.
-	* @param string The id of the matching element
-	* @param boolean True if XML spec is to be strictly adhered to (only attributes xml:id are considered valid)
-	* @return Object The found attribute or null
-	*/
-	function &_getElementByID($elementID, $isStrict) {
-		if ($isStrict) {
-			$myAttrNode =& $this->getAttributeNodeNS(DOMIT_XML_NAMESPACE, 'id');
-			if (($myAttrNode != null)&& ($myAttrNode->getValue() == $elementID)) return $myAttrNode;
-		}
-		else {
-			$myAttrNode =& $this->getAttributeNodeNS('', 'ID');
-			if (($myAttrNode != null)&& ($myAttrNode->getValue() == $elementID)) return $myAttrNode;
-			
-			$myAttrNode =& $this->getAttributeNodeNS('', 'id');
-			if (($myAttrNode != null)&& ($myAttrNode->getValue() == $elementID)) return $myAttrNode;
-		}
-		
-		$total = $this->childCount;
-		
-		for ($i = 0; $i < $total; $i++) {
-			if ($this->childNodes[$i]->nodeType == DOMIT_ELEMENT_NODE) {
-				$foundNode =& $this->childNodes[$i]->_getElementByID($elementID, $isStrict);
-			
-				if ($foundNode != null) {
-					return $foundNode;
-				}	
-			}
-		}
-		
-		return null;
-	} //_getElementByID
-	
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like expression.
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByPath($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_getelementsbypath.php');
-	
-		$gebp = new DOMIT_GetElementsByPath();
-		$myResponse =& $gebp->parsePattern($this, $pattern, $nodeIndex);
-
-		return $myResponse;
-	} //getElementsByPath	
-	
-	/**
-	* Retrieves an element or DOMIT_NodeList of elements corresponding to an Xpath-like attribute expression (NOT YET IMPLEMENTED!)
-	* @param string The query pattern
-	* @param int If a single node is to be returned (rather than the entire NodeList) the index of that node
-	* @return mixed A NodeList or single node that matches the pattern
-	*/
-	function &getElementsByAttributePath($pattern, $nodeIndex = 0) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_getelementsbypath.php');
-	
-		$gabp = new DOMIT_GetElementsByAttributePath();
-		$myResponse =& $gabp->parsePattern($this, $pattern, $nodeIndex);
-
-		return $myResponse;
-	} //getElementsByAttributePath
-	
-	/**
-	* Adds all child nodes of the specified nodeType to the NodeList
-	* @param Object The NodeList collection
-	* @param string The nodeType of matching nodes 
-	*/
-	function getTypedNodes(&$nodeList, $type) {
-		$numChildren = $this->childCount;
-				
-		for ($i = 0; $i < $numChildren; $i++) {
-			$child =& $this->childNodes[$i];
-			
-			if ($child->nodeType == $type) {
-				$nodeList->appendNode($child);
-			}
-			
-			if ($child->hasChildNodes()) {
-				$child->getTypedNodes($nodeList, $type);
-			}
-		}
-	} //getTypedNodes
-	
-	/**
-	* Adds all child nodes of the specified nodeValue to the NodeList
-	* @param Object The NodeList collection
-	* @param string The nodeValue of matching nodes 
-	*/
-	function getValuedNodes(&$nodeList, $value) {
-		$numChildren = $this->childCount;
-				
-		for ($i = 0; $i < $numChildren; $i++) {
-			$child =& $this->childNodes[$i];
-			
-			if ($child->nodeValue == $value) {
-				$nodeList->appendNode($child);
-			}
-			
-			if ($child->hasChildNodes()) {
-				$child->getValuedNodes($nodeList, $value);
-			}
-		}
-	} //getValuedNodes
-	
-	/**
-	* Gets the value of the specified attribute, if it exists
-	* @param string The attribute name
-	* @return string The attribute value
-	*/
-	function getAttribute($name) {
-		$returnNode =& $this->attributes->getNamedItem($name);
-		
-		if ($returnNode == null) {
-			return '';
-		}
-		else {
-			return $returnNode->getValue();
-		}
-	} //getAttribute
-
-	/**
-	* Gets the value of the attribute with the specified namespaceURI and localName, if it exists
-	* @param string The namespaceURI
-	* @param string The localName
-	* @return string The attribute value
-	*/
-	function getAttributeNS($namespaceURI, $localName) {
-		$returnNode =& $this->attributes->getNamedItemNS($namespaceURI, $localName);
-
-		if ($returnNode == null) {
-			return '';
-		}
-		else {
-			return $returnNode->getValue();
-		}
-	} //getAttributeNS
-	
-	/**
-	* Sets the value of the specified attribute; creates a new attribute if one doesn't exist
-	* @param string The attribute name
-	* @param string The desired attribute value
-	*/
-	function setAttribute($name, $value) {
-		$returnNode =& $this->attributes->getNamedItem($name);
-		
-		if ($returnNode == null) {
-			$newAttr =& new DOMIT_Attr($name);
-			$newAttr->setValue($value);
-			$this->attributes->setNamedItem($newAttr);
-		}
-		else {
-			$returnNode->setValue($value);
-		}
-	} //setAttribute
-
-	/**
-	* Sets the value of the specified attribute; creates a new attribute if one doesn't exist
-	* @param string The attribute namespaceURI
-	* @param string The attribute qualifiedName
-	* @param string The desired attribute value
-	*/
-	function setAttributeNS($namespaceURI, $qualifiedName, $value) {
-	    //get localName
-	    $colonIndex = strpos($qualifiedName, ":");
-		
-		if ($colonIndex !== false) {
-	    	$localName = substr($qualifiedName, ($colonIndex + 1));
-		}
-		else {
-			$localName = $qualifiedName;
-		}
-	    
-		$returnNode =& $this->attributes->getNamedItemNS($namespaceURI, $localName);
-
-		if ($returnNode == null) {
-			//create this manually in case element has no ownerDocument to reference
-			$newAttr =& new DOMIT_Attr($qualifiedName);
-	    	$newAttr->prefix = substr($qualifiedName, 0, $colonIndex);
-	    	$newAttr->localName = $localName;
-	    	$newAttr->namespaceURI = $namespaceURI;
-	    	
-			$newAttr->setValue($value);
-			$this->attributes->setNamedItemNS($newAttr);
-			$newAttr->ownerElement =& $this;
-		}
-		else {
-			$returnNode->setValue($value);
-		}
-	} //setAttributeNS
-	
-	/**
-	* Removes the specified attribute
-	* @param string The name of the attribute to be removed
-	*/
-	function removeAttribute($name) {
-		$returnNode =& $this->attributes->removeNamedItem($name);
-	} //removeAttribute
-	
-	/**
-	* Removes the specified attribute
-	* @param string The namespaceURI of the attribute to be removed
-	* @param string The localName of the attribute to be removed
-	*/
-	function removeAttributeNS($namespaceURI, $localName) {
-		$returnNode =& $this->attributes->removeNamedItemNS($namespaceURI, $localName);
-		unset($returnNode->ownerElement);
-		$returnNode->ownerElement = null;
-	} //removeAttributeNS
-	
-	/**
-	* Determines whether an attribute with the specified name exists
-	* @param string The name of the attribute
-	* @return boolean True if the attribute exists
-	*/
-	function hasAttribute($name) {
-		$returnNode =& $this->attributes->getNamedItem($name);
-
-		return ($returnNode != null);
-	} //hasAttribute
-	
-	/**
-	* Determines whether an attribute with the specified namespaceURI and localName exists
-	* @param string The namespaceURI of the attribute
-	* @param string The localName of the attribute
-	* @return boolean True if the attribute exists
-	*/
-	function hasAttributeNS($namespaceURI, $localName) {
-		$returnNode =& $this->attributes->getNamedItemNS($namespaceURI, $localName);
-
-		return ($returnNode != null);
-	} //hasAttributeNS
-	
-	/**
-	* Determines whether the element has any atributes
-	* @return boolean True if the element has any atributes
-	*/
-	function hasAttributes() {
-		return ($this->attributes->getLength() > 0);
-	} //hasChildNodes
-	
-	/**
-	* Gets a reference to the specified attribute node
-	* @param string The attribute name
-	* @return Object A reference to the found node, or null 
-	*/
-	function &getAttributeNode($name) {
-		$returnNode =& $this->attributes->getNamedItem($name);
-		return $returnNode;
-	} //getAttributeNode
-
-	/**
-	* Gets a reference to the specified attribute node
-	* @param string The attribute namespaceURI
-	* @param string The attribute localName
-	* @return Object A reference to the found node, or null
-	*/
-	function &getAttributeNodeNS($namespaceURI, $localName) {
-		$returnNode =& $this->attributes->getNamedItemNS($namespaceURI, $localName);
-		return $returnNode;
-	} //getAttributeNodeNS
-	
-	/**
-	* Adds an attribute node to the current element
-	* @param Object The attribute node to be added
-	* @return Object A reference to the newly added node
-	*/
-	function &setAttributeNode(&$newAttr) {
-		$returnNode =& $this->attributes->setNamedItem($newAttr);
-		return $returnNode;
-	} //setAttributeNode
-
-	/**
-	* Adds an attribute node to the current element (namespace aware)
-	* @param Object The attribute node to be added
-	* @return Object A reference to the newly added node
-	*/
-	function &setAttributeNodeNS(&$newAttr) {
-		$returnNode =& $this->attributes->setNamedItemNS($newAttr);
-		$newAttr->ownerElement =& $this;
-		return $returnNode;
-	} //setAttributeNodeNS
-	
-	/**
-	* Removes an attribute node from the current element
-	* @param Object The attribute node to be removed
-	* @return Object A reference to the removed node
-	*/
-	function &removeAttributeNode(&$oldAttr) {
-		$attrName = $oldAttr->getName();
-		$returnNode =& $this->attributes->removeNamedItem($attrName);
-		
-		if ($returnNode == null) {
-			DOMIT_DOMException::raiseException(DOMIT_NOT_FOUND_ERR, 
-				'Target attribute not found.');
-		}
-		else {
-			return $returnNode;
-		}
-	} //removeAttributeNode
-	
-	/**
-	* Collapses adjacent text nodes in entire element subtree
-	*/
-	function normalize() {
-		if ($this->hasChildNodes()) {
-			$currNode =& $this->childNodes[0];
-			
-			while ($currNode->nextSibling != null) {
-				$nextNode =& $currNode->nextSibling;
-				
-				if (($currNode->nodeType == DOMIT_TEXT_NODE) && 
-						($nextNode->nodeType == DOMIT_TEXT_NODE)) {
-						
-					$currNode->nodeValue .= $nextNode->nodeValue;
-					$this->removeChild($nextNode);
-				}
-				else {
-					$currNode->normalize();
-				}
-				
-				if ($currNode->nextSibling != null) {
-					$currNode =& $currNode->nextSibling;
-				}
-			}
-		}
-	} //normalize
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		$arReturn = array($this->nodeName => array("attributes" => $this->attributes->toArray()));
-		$total = $this->childCount;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$arReturn[$this->nodeName][$i] = $this->childNodes[$i]->toArray();
-		} 
-		
-		return $arReturn;
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName);
-		
-		$clone->attributes =& $this->attributes->createClone($deep);
-		
-		if ($deep) {
-			$total = $this->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currentChild =& $this->childNodes[$i];
-				$clone->appendChild($currentChild->cloneNode($deep));				
-			}
-		}
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		$result = '<' . $this->nodeName;
-		$result .= $this->attributes->toString(false, $subEntities);		
-		
-		//get children
-		$myNodes =& $this->childNodes;
-		$total = count($myNodes);
-		
-		if ($total != 0) {
-			$result .= '>';
-			
-			for ($i = 0; $i < $total; $i++) {
-				$child =& $myNodes[$i];
-				$result .= $child->toString(false, $subEntities);
-			}
-			
-			$result .= '</' . $this->nodeName . '>';
-		}
-		else {
-		    if ($this->ownerDocument->doExpandEmptyElementTags) {
-				if (in_array($this->nodeName, $this->ownerDocument->expandEmptyElementExceptions)) {
-					$result .= ' />';
-				}
-				else {
-                	$result .= '></' . $this->nodeName . '>';
-				}
-		    }
-		    else {
-				if (in_array($this->nodeName, $this->ownerDocument->expandEmptyElementExceptions)) {
-					$result .= '></' . $this->nodeName . '>';
-				}
-				else {
-					$result .= ' />';
-				}
-		    }
-		}	
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-		
-		return $result;
-	} //toString
-} //DOMIT_Element
-
-/**
-* A parent class for Text and CDATA Section nodes
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_CharacterData extends DOMIT_Node {
-	/**
-	* Prevents direct instantiation of DOMIT_CharacterData class
-	* @abstract
-	*/
-	function DOMIT_CharacterData() {		
-		DOMIT_DOMException::raiseException(DOMIT_ABSTRACT_CLASS_INSTANTIATION_ERR, 
-			 'Cannot instantiate abstract class DOMIT_CharacterData'); 
-	} //DOMIT_CharacterData
-	
-	/**
-	* Gets the node value of the current text node 
-	* @return string The node value of the current text node 
-	*/
-	function getData() {
-		return $this->nodeValue;
-	} //getData
-	
-	/**
-	* Gets the length of the text in the current node
-	* @return int The length of the text in the current node 
-	*/
-	function getLength() {
-		return strlen($this->nodeValue);
-	} //getLength
-	
-	/**
-	* Gets a subset of the current node text
-	* @param int The starting point of the substring
-	* @param int The length of the substring
-	* @return string The subset of the current node text 
-	*/
-	function substringData($offset, $count) {
-		$totalChars = $this->getLength();
-		
-		if (($offset < 0) || (($offset + $count) > $totalChars)) {
-			
-			DOMIT_DOMException::raiseException(DOMIT_INDEX_SIZE_ERR, 
-				'Character Data index out of bounds.');
-				
-		}
-		else {
-			$data = $this->getData();
-			return substr($data, $offset, $count);
-		}
-	} //substringData
-	
-	/**
-	* Appends the specified text to the current node text
-	* @param string The text to be appended
-	*/
-	function appendData($arg) {
-		$this->setText($this->nodeValue . $arg);
-	} //appendData
-	
-	/**
-	* Inserts text at the sepecified offset
-	* @param int The insertion point
-	* @param string The text to be inserted
-	*/
-	function insertData($offset, $arg) {
-		$totalChars = $this->getLength();
-		
-		if (($offset < 0) || ($offset > $totalChars)) {
-
-			DOMIT_DOMException::raiseException(DOMIT_INDEX_SIZE_ERR, 
-				'Character Data index out of bounds.');
-				
-		}
-		else {
-			$data = $this->getData();
-			$pre = substr($data, 0, $offset);
-			$post = substr($data, $offset);
-			
-			$this->setText(($pre . $arg . $post));
-		}
-	} //insertData
-	
-	/**
-	* Deletes a subset of the current node text
-	* @param int The starting point of the deletion
-	* @param int The length of the deletion
-	*/
-	function deleteData($offset, $count) {
-		$totalChars = $this->getLength();
-		
-		if (($offset < 0) || (($offset + $count) > $totalChars)) {
-		
-			DOMIT_DOMException::raiseException(DOMIT_INDEX_SIZE_ERR, 
-				'Character Data index out of bounds.');
-				
-		}
-		else {
-			$data = $this->getData();
-			$pre = substr($data, 0, $offset);
-			$post = substr($data, ($offset + $count));
-			
-			$this->setText(($pre . $post));
-		}
-	} //substringData
-	
-	/**
-	* Replaces a subset of the current node text with the specified text
-	* @param int The starting point of the replacement
-	* @param int The length of the replacement
-	* @param string The replacement text
-	*/
-	function replaceData($offset, $count, $arg) {
-		$totalChars = $this->getLength();
-		
-		if (($offset < 0) || (($offset + $count) > $totalChars)) {
-		
-			DOMIT_DOMException::raiseException(DOMIT_INDEX_SIZE_ERR, 
-				'Character Data index out of bounds.');
-				
-		}
-		else {
-			$data = $this->getData();
-			$pre = substr($data, 0, $offset);
-			$post = substr($data, ($offset + $count));
-			
-			$this->setText(($pre . $arg . $post));
-		}
-	} //replaceData
-} //DOMIT_CharacterData
-
-/**
-* A class representing the DOM Text Node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_TextNode extends DOMIT_CharacterData {
-	/**
-	* DOM Text Node constructor
-	* @param string The text of the node
-	*/
-	function DOMIT_TextNode($data) {
-		$this->_constructor();	
-		$this->nodeType = DOMIT_TEXT_NODE;
-		$this->nodeName = '#text';
-		$this->setText($data);
-	} //DOMIT_TextNode
-	
-	/**
-	* Returns the text contained in the current node
-	* @return string The text of the current node
-	*/
-	function getText() {
-		return $this->nodeValue;
-	} //getText
-	
-	/**
-	* Sets the text contained in the current node to $data.
-	* @param string The text data of the node
-	*/
-	function setText($data) {
-        $this->nodeValue = $data;
-	} //setText
-	
-	/**
-	* Splits a single node into multiple nodes, based on the specified offset
-	* @param int The offset point for the split
-	* @return Object The newly created text node
-	*/
-	function splitText($offset) {
-		$totalChars = $this->getLength();
-		
-		if (($offset < 0) || ($offset > $totalChars)) {
-		
-			DOMIT_DOMException::raiseException(DOMIT_INDEX_SIZE_ERR, 
-				'Character Data index out of bounds.');
-				
-		}
-		else {
-			$data = $this->getData();
-			$pre = substr($data, 0, $offset);
-			$post = substr($data, $offset);
-			
-			$this->setText($pre);
-			
-			//create new text node
-			$className = get_class($this);
-			$newTextNode =& new $className($post);
-			$newTextNode->ownerDocument =& $this->ownerDocument;
-			
-			if ($this->parentNode->lastChild->uid == $this->uid) {
-				$this->parentNode->appendChild($newTextNode);
-			}
-			else {
-				$this->parentNode->insertBefore($newTextNode, $this);
-			}
-			
-			return $newTextNode;
-		}
-	} //splitText
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		return $this->toString();
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeValue);
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		global $DOMIT_defined_entities_flip;
-		
-		$result = ($subEntities && !$htmlSafe) ? DOMIT_Utilities::convertEntities($this->nodeValue, 
-							$DOMIT_defined_entities_flip) : $this->nodeValue;
-	
-		if ($htmlSafe) $result = $this->forHTML($result);
-	
-		return $result;
-	} //toString
-} //DOMIT_TextNode
-
-/**
-* A class representing the DOM CDATA Section
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_CDATASection extends DOMIT_TextNode {
-	/**
-	* DOM CDATA Section node constructor
-	* @param string The text of the node
-	*/
-	function DOMIT_CDATASection($data) {
-		$this->_constructor();		
-		$this->nodeType = DOMIT_CDATA_SECTION_NODE;
-		$this->nodeName = '#cdata-section';
-		$this->setText($data);
-	} //DOMIT_CDATASection
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters should be converted to entities
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		$result = '<![CDATA[';  
-		$result .= ($subEntities && !$htmlSafe) ? str_replace("]]>", "]]&gt;", $this->nodeValue) :
-								 $this->nodeValue; 
-		$result .= ']]>';
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-		 
-		return $result;
-	} //toString
-} //DOMIT_CDATASection
-
-/**
-* A class representing the Attr node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Attr extends DOMIT_Node {
-	/** @var boolean True if the attribute has been modified since parsing (NOT YET IMPLEMENTED!) */
-	var $specified = false;
-	/** @var Object A reference to the element to which the attribute is assigned */
-	var $ownerElement = null;
-	
-	/**
-	* DOM Attr node constructor
-	* @param string The name of the attribute
-	*/
-	function DOMIT_Attr($name) {
-		$this->_constructor();	
-		$this->nodeType = DOMIT_ATTRIBUTE_NODE;
-		$this->nodeName =$name;
-	} //DOMIT_Attr	
-	
-	/**
-	* Returns the name of the attribute
-	* @return string The name of the attribute
-	*/
-	function getName() {
-		return $this->nodeName;
-	} //getName
-	
-	/**
-	* Indicates whether an attribute has been modified since parsing
-	* @return boolean True if the node has been modified
-	*/
-	function getSpecified() {
-		return $this->specified;
-	} //getSpecified
-	
-	/**
-	* Returns the value of the attribute
-	* @return string The value of the attribute
-	*/
-	function getValue() {
-		return $this->nodeValue;
-	} //getValue
-	
-	/**
-	* Sets the value of the attribute
-	* @param string The value of the attribute
-	*/
-	function setValue($value) {
-		$this->nodeValue = $value;
-	} //setValue
-	
-	/**
-	* Returns the text contained in the current node
-	* @return string The text of the current node
-	*/
-	function getText() {
-		return $this->nodeValue;
-	} //getText
-	
-	/**
-	* Sets the text contained in the current node to $data.
-	* @param string The text data of the node
-	*/
-	function setText($data) {
-        $this->nodeValue = $data;
-	} //setText
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName);
-		$clone->nodeValue = $this->nodeValue;
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if HTML entities should be substituted
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_domit_utilities.php');
-		global $DOMIT_defined_entities_flip;
-		
-		$result = ' ' . $this->nodeName . '="';
-		$result .= ($subEntities && !$htmlSafe) ? DOMIT_Utilities::convertEntities($this->nodeValue, 
-							$DOMIT_defined_entities_flip) : $this->nodeValue;
-		$result .= '"';
-	
-		if ($htmlSafe) $result = $this->forHTML($result);
-	
-		return $result;
-	} //toString
-} //DOMIT_Attr
-
-/**
-* A class representing the DOM Document Fragment node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_DocumentFragment extends DOMIT_ChildNodes_Interface {
-	/**
-	* DOM Document Fragment node constructor
-	*/
-	function DOMIT_DocumentFragment() {
-		$this->_constructor();	
-		$this->nodeType = DOMIT_DOCUMENT_FRAGMENT_NODE;
-		$this->nodeName ='#document-fragment';
-		$this->nodeValue = null;
-		$this->childNodes = array();
-	} //DOMIT_DocumentFragment	
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		$arReturn = array();
-		$total = $this->childCount;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$arReturn[$i] = $this->childNodes[$i]->toArray();
-		} 
-		
-		return $arReturn;
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className();
-		
-		if ($deep) {
-			$total = $this->childCount;
-			
-			for ($i = 0; $i < $total; $i++) {
-				$currentChild =& $this->childNodes[$i];
-				$clone->appendChild($currentChild->cloneNode($deep));				
-			}
-		}
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false, $subEntities = true) {
-		//get children
-		$result = '';
-		$myNodes =& $this->childNodes;
-		$total = count($myNodes);
-		
-		if ($total != 0) {
-			for ($i = 0; $i < $total; $i++) {
-				$child =& $myNodes[$i];
-				$result .= $child->toString(false, $subEntities);
-			}
-		}
-		
-		if ($htmlSafe) $result = $this->forHTML($result);
-		
-		return $result;
-	} //toString
-} //DOMIT_DocumentFragment
-
-/**
-* A class representing the DOM Comment node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Comment extends DOMIT_CharacterData {
-	/**
-	* DOM Comment node constructor
-	* @param string The 
-	*/
-	function DOMIT_Comment($nodeValue) {
-		$this->_constructor();	
-		$this->nodeType = DOMIT_COMMENT_NODE;
-		$this->nodeName = '#comment';
-		$this->nodeValue = $nodeValue;
-	} //DOMIT_Comment	
-	
-	/**
-	* Returns the text contained in the current node
-	* @return string The text of the current node
-	*/
-	function getText() {
-		return $this->nodeValue;
-	} //getText
-	
-	/**
-	* Sets the text contained in the current node to $data.
-	* @param string The text data of the node
-	*/
-	function setText($data) {
-        $this->nodeValue = $data;
-	} //setText
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		return $this->toString();
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeValue);
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false) {
-		$result = '<!--' . $this->nodeValue . '-->';
-	
-		if ($htmlSafe) $result = $this->forHTML($result);
-	
-		return $result;
-	} //toString
-} //DOMIT_Comment
-
-/**
-* A class representing the DOM Processing Instruction node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_ProcessingInstruction extends DOMIT_Node {
-	/**
-	* DOM Processing Instruction node constructor
-	* @param string The 
-	*/
-	function DOMIT_ProcessingInstruction($target, $data) {
-		$this->_constructor();	
-		$this->nodeType = DOMIT_PROCESSING_INSTRUCTION_NODE;
-		$this->nodeName = $target;
-		$this->nodeValue = $data;
-	} //DOMIT_ProcessingInstruction	
-	
-	/**
-	* Returns the processing instruction target
-	* @return string The processing instruction target
-	*/
-	function getTarget() {
-		return $this->nodeName;
-	} //getTarget
-	
-	/**
-	* Returns the processing instruction data
-	* @return string The processing instruction data
-	*/
-	function getData() {
-		return $this->nodeValue;
-	} //getData
-	
-	/**
-	* Returns the text contained in the current node
-	* @return string The text of the current node
-	*/
-	function getText() {
-		return ($this->nodeName . ' ' . $this->nodeValue);
-	} //getText
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		return $this->toString();
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName, $this->nodeValue);
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false) {
-		$result = '<' . '?' . $this->nodeName . ' ' . $this->nodeValue . '?' . '>';
-	
-		if ($htmlSafe) $result = $this->forHTML($result);
-	
-		return $result;
-	} //toString
-} //DOMIT_ProcessingInstruction
-
-/**
-* A class representing the DOM Document Type node
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_DocumentType extends DOMIT_Node {
-	/** @var string The doctype name */
-	var $name;
-	/** @var Object True if the entity has been modified since parsing (NOT YET IMPLEMENTED!) */
-	var $entities;
-	/** @var Object A NodeList of notation nodes (NOT YET IMPLEMENTED!) */
-	var $notations;
-	/** @var Object A NodeList of elements (NOT YET IMPLEMENTED!) */
-	var $elements;
-	/** @var string The full text of the doctype */
-	var $text;
-	/** @var string The public identifier of the external subset */
-	var $publicID;
-	/** @var string The system identifier of the external subset */
-	var $systemID;
-	/** @var string The full text of internal subset */
-	var $internalSubset;
-	
-	/**
-	* DOM Document Type node constructor
-	* @param string The 
-	*/
-	function DOMIT_DocumentType($name, $text) {
-		$this->_constructor();	
-		$this->nodeType = DOMIT_DOCUMENT_TYPE_NODE;
-		$this->nodeName = $name;
-		$this->name = $name;
-		$this->entities = null; //implement later
-		$this->notations = null; //implement later
-		$this->elements = null; //implement later
-		$this->text = $text;
-	} //DOMIT_DocumentType	
-	
-	/**
-	* Returns the text contained in the current node
-	* @return string The text of the current node
-	*/
-	function getText() {
-		return $this->text;
-	} //getText
-	
-	/**
-	* Returns the name of the doctype node
-	* @return string The name of the doctype node 
-	*/
-	function getName() {
-		return $this->name;
-	} //getName
-	
-	/**
-	* Generates an array representation of the node and its children
-	* @return Array A representation of the node and its children 
-	*/
-	function toArray() {
-		return $this->toString();
-	} //toArray
-	
-	/**
-	* Copies a node and/or its children 
-	* @param boolean True if all child nodes are also to be cloned
-	* @return Object A copy of the node and/or its children
-	*/
-	function &cloneNode($deep = false) {
-		$className = get_class($this);
-		$clone =& new $className($this->nodeName, $this->text);
-		
-		return $clone;
-	} //cloneNode
-	
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @return string The string representation  
-	*/
-	function toString($htmlSafe = false) {
-		$result = $this->text;
-	
-		if ($htmlSafe) $result = $this->forHTML($result);
-	
-		return $result;
-	} //toString
-} //DOMIT_DocumentType
-
-
-/**
-* A class representing the DOM Notation node (NOT YET IMPLEMENTED!)
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Notation extends DOMIT_Node {
-	/**
-	* DOM Notation node constructor (NOT YET IMPLEMENTED!)
-	*/
-	function DOMIT_Notation() {		
-		DOMIT_DOMException::raiseException(DOMIT_NOT_SUPPORTED_ERR, 
-			 'Cannot instantiate DOMIT_Notation class. Notation nodes not yet supported.'); 
-	} //DOMIT_Notation
-} //DOMIT_Notation
-
-/**
-* Manages the generation of a DOMIT! document from SAX events
-*
-* @package domit-xmlparser
-* @subpackage domit-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Parser {
-	/** @var Object A reference to the resulting xmldoc */
-	var $xmlDoc = null;
-	/** @var Object A reference to the current node in the parsing process */
-	var $currentNode = null;
-	/** @var Object A reference to the last child in the parsing process */
-	var $lastChild = null;
-	/** @var boolean True if currently parsing a CDATA Section */
-	var $inCDATASection = false; //flag for Expat
-	/** @var boolean True if currently parsing a Text node */
-	var $inTextNode = false;
-	/** @var boolean True is CDATA Section nodes are not to be converted into Text nodes */
-	var $preserveCDATA;
-	/** @var string A container for holding the currently parsed text data */
-	var $parseContainer = '';
-	/** @var string The current docutype text */
-	var $parseItem = '';
-	/** @var array An array of namespacesURIs mapped to prefixes */
-	var $namespaceURIMap = array();	
-	
-	/**
-	* Parses xml text using Expat
-	* @param Object A reference to the DOM document that the xml is to be parsed into
-	* @param string The text to be parsed
-	* @param boolean True if CDATA Section nodes are not to be converted into Text nodes
-	* @return boolean True if the parsing is successful
-	*/
-	function parse (&$myXMLDoc, $xmlText, $preserveCDATA = true) {
-		$this->xmlDoc =& $myXMLDoc;
-		$this->lastChild =& $this->xmlDoc;
-		
-		$this->preserveCDATA = $preserveCDATA;
-		
-		//create instance of expat parser (should be included in php distro)
-		if (version_compare(phpversion(), '5.0', '<=')) {
-			if ($this->xmlDoc->isNamespaceAware) {
-				$parser = xml_parser_create_ns('');
-			}
-			else {
-		    	$parser = xml_parser_create('');
-			}
-		}
-		else {
-			if ($this->xmlDoc->isNamespaceAware) {
-				$parser = xml_parser_create_ns();
-			}
-			else {
-		    	$parser = xml_parser_create();
-			}
-		}	
-		
-		//set handlers for SAX events
-		xml_set_object($parser, $this); 
-		xml_set_character_data_handler($parser, 'dataElement'); 
-		xml_set_default_handler($parser, 'defaultDataElement'); 
-		xml_set_notation_decl_handler($parser, 'notationElement'); 
-		xml_set_processing_instruction_handler($parser, 'processingInstructionElement'); 
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); 	
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-		
-		if ($this->xmlDoc->isNamespaceAware) {
-			xml_set_start_namespace_decl_handler($parser, 'startNamespaceDeclaration');
-		    xml_set_end_namespace_decl_handler($parser, 'endNamespaceDeclaration');
-			xml_set_element_handler($parser, 'startElementNS', 'endElement');
-			$this->namespaceURIMap[DOMIT_XML_NAMESPACE] = 'xml';
-		}
-		else {
-			xml_set_element_handler($parser, 'startElement', 'endElement');
-		}
-			
-		//parse out whitespace -  (XML_OPTION_SKIP_WHITE = 1 does not 
-		//seem to work consistently across versions of PHP and Expat
-		$xmlText = eregi_replace('>' . "[[:space:]]+" . '<' , '><', $xmlText);
-		
-		$success = xml_parse($parser, $xmlText);
-		
-		$this->xmlDoc->errorCode = xml_get_error_code($parser);
-		$this->xmlDoc->errorString = xml_error_string($this->xmlDoc->errorCode);
-		
-		xml_parser_free($parser); 
-		
-		return $success;
-	} //parse
-	
-	/**
-	* Parses xml text using SAXY
-	* @param Object A reference to the DOM document that the xml is to be parsed into
-	* @param string The text to be parsed
-	* @param boolean True if CDATA Section nodes are not to be converted into Text nodes
-	* @return boolean True if the parsing is successful
-	*/
-	function parseSAXY(&$myXMLDoc, $xmlText, $preserveCDATA = true, $definedEntities) {
-		require_once(DOMIT_INCLUDE_PATH . 'xml_saxy_parser.php');
-		
-		$this->xmlDoc =& $myXMLDoc;
-		$this->lastChild =& $this->xmlDoc;
-		
-		//create instance of SAXY parser 
-		$parser =& new SAXY_Parser();
-		$parser->appendEntityTranslationTable($definedEntities);
-		
-		if ($this->xmlDoc->isNamespaceAware) {
-		    $parser->setNamespaceAwareness(true);
-		    $parser->xml_set_start_namespace_decl_handler(array(&$this, 'startNamespaceDeclaration'));
-		    $parser->xml_set_end_namespace_decl_handler(array(&$this, 'endNamespaceDeclaration'));
-			$parser->xml_set_element_handler(array(&$this, 'startElementNS'), array(&$this, 'endElement'));
-			$this->namespaceURIMap[DOMIT_XML_NAMESPACE] = 'xml';
-		}
-		else {
-			$parser->xml_set_element_handler(array(&$this, 'startElement'), array(&$this, 'endElement'));	
-		}
-		
-		$parser->xml_set_character_data_handler(array(&$this, 'dataElement'));
-		$parser->xml_set_doctype_handler(array(&$this, 'doctypeElement'));
-		$parser->xml_set_comment_handler(array(&$this, 'commentElement'));
-		$parser->xml_set_processing_instruction_handler(array(&$this, 'processingInstructionElement')); 
-		
-		if ($preserveCDATA) {
-			$parser->xml_set_cdata_section_handler(array(&$this, 'cdataElement'));
-		}
-		
-		$success = $parser->parse($xmlText);
-		
-		$this->xmlDoc->errorCode = $parser->xml_get_error_code();
-		$this->xmlDoc->errorString = $parser->xml_error_string($this->xmlDoc->errorCode);
-		
-		return $success;
-	} //parseSAXY
-	
-	/**
-	* Generates and appends a new text node from the parseContainer text
-	*/
-	function dumpTextNode() {
-	    $currentNode =& $this->xmlDoc->createTextNode($this->parseContainer);
-		$this->lastChild->appendChild($currentNode);
-		$this->inTextNode = false;
-		$this->parseContainer = '';
-	} //dumpTextNode
-
-	/**
-	* Catches a start element event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The tag name of the current element
-	* @param Array An array of the element attributes
-	*/
-	function startElement(&$parser, $name, $attrs) {
-		if ($this->inTextNode) {
-			$this->dumpTextNode();
-		}
-		
-		$currentNode =& $this->xmlDoc->createElement($name);
-		$this->lastChild->appendChild($currentNode);
-
-		reset ($attrs);
-			
-		while (list($key, $value) = each ($attrs)) {
-			$currentNode->setAttribute($key, $value);
-		}
-		
-		$this->lastChild =& $currentNode;
-	} //startElement	
-	
-	/**
-	* Catches a start element event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The tag name of the current element
-	* @param Array An array of the element attributes
-	*/
-	function startElementNS(&$parser, $name, $attrs) {
-		$colonIndex = strrpos($name, ":");
-
-		if ($colonIndex !== false) {
-			//force to lower case because Expat for some reason forces to upper case
-			$namespaceURI = strtolower(substr($name, 0, $colonIndex));
-			$prefix = $this->namespaceURIMap[$namespaceURI];
-				
-			if ($prefix != '') {
-				$qualifiedName = $prefix . ":" . substr($name, ($colonIndex + 1));
-			}
-			else {
-				$qualifiedName = substr($name, ($colonIndex + 1));
-			}					
-		}
-		else {
-			$namespaceURI = '';
-			$qualifiedName = $name;
-		}
-			
-		$currentNode =& $this->xmlDoc->createElementNS($namespaceURI, $qualifiedName);	
-		$this->lastChild->appendChild($currentNode);
-
-		reset ($attrs);
-			
-		while (list($key, $value) = each ($attrs)) {
-			$colonIndex = strrpos($key, ":");
-			
-			if ($colonIndex !== false) {
-				//force to lower case because Expat for some reason forces to upper case
-				$namespaceURI = strtolower(substr($key, 0, $colonIndex));
-					
-				if ($namespaceURI == 'xmlns') {
-					//$qualifiedName = substr($key, ($colonIndex + 1));
-					$qualifiedName = $key;
-				}
-				else {
-					$qualifiedName = $this->namespaceURIMap[$namespaceURI] . 
-						":" . substr($key, ($colonIndex + 1));;
-				}				
-			}
-			else {
-				$namespaceURI = '';
-				$qualifiedName = $key;
-			}
-
-			$currentNode->setAttributeNS($namespaceURI, $qualifiedName, $value);
-		}
-		
-		$this->lastChild =& $currentNode;	
-	} //startElementNS
-
-	
-	/**
-	* Catches an end element event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The tag name of the current element
-	*/
-	function endElement(&$parser, $name) {
-		if ($this->inTextNode) {
-			$this->dumpTextNode();
-		}
-		
-		$this->lastChild =& $this->lastChild->parentNode;
-	} //endElement	 
-	
-	/**
-	* Catches a data event and processes the text
-	* @param Object A reference to the current SAX parser
-	* @param string The current text data
-	*/
-	function dataElement(&$parser, $data) {
-		if (!$this->inCDATASection) {
-			$this->inTextNode = true;		
-		}
-		
-		$this->parseContainer .= $data;
-	} //dataElement	
-	
-	/**
-	* Catches a CDATA Section event and processes the text
-	* @param Object A reference to the current SAX parser
-	* @param string The current text data
-	*/
-	function cdataElement(&$parser, $data) {
-		$currentNode =& $this->xmlDoc->createCDATASection($data);
-
-		$this->lastChild->appendChild($currentNode);
-	} //cdataElement	
-	
-	/**
-	* Catches a default data event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The current data
-	*/
-	function defaultDataElement(&$parser, $data) {
-		if ((strlen($data) > 2)  && ($this->parseItem == '')){
-			$pre = strtoupper(substr($data, 0, 3));
-			
-			switch ($pre) {
-				case '<?X': //xml declaration
-					$this->processingInstructionElement($parser, 'xml', substr($data, 6, (strlen($data) - 6 - 2)));
-					break;
-				case '<!E': //dtd entity
-					$this->xmlDoc->doctype .= "\n   " . $data;
-					break;
-				case '<![': //cdata section coming
-					if ($this->preserveCDATA) {
-						$this->inCDATASection = true;
-					}
-					break;	
-				case '<!-': //comment
-					$currentNode =& $this->commentElement($this, substr($data, 4, (strlen($data) - 7)));	
-					break;
-				case '<!D': //doctype
-					$this->parseItem = 'doctype';
-					$this->parseContainer = $data;
-					break;
-				case ']]>': //cdata end tag
-					$this->inCDATASection = false;
-					$currentNode =& $this->xmlDoc->createCDataSection($this->parseContainer);
-					$this->lastChild->appendChild($currentNode);
-					$this->parseContainer = '';
-					break;
-			}
-		}
-		else {
-			switch ($this->parseItem) {
-				case 'doctype':
-					$this->parseContainer .= $data;
-					
-					if ($data == '>') {
-						$this->doctypeElement($parser, $this->parseContainer);
-						$this->parseContainer = '';
-						$this->parseItem = '';
-					}
-					else if ($data == '[') {
-						$this->parseItem = 'doctype_inline';
-					}
-					break;
-					
-				case 'doctype_inline':
-					$this->parseContainer .= $data;
-					
-					if ($data == ']') {
-						$this->parseItem = 'doctype';
-					}	
-					else if ($data{(strlen($data) - 1)} == '>') {
-						$this->parseContainer .= "\n   ";
-					}
-					break;
-			}
-		}
-	} //defaultDataElement
-	
-	/**
-	* Catches a doctype event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The current data
-	*/
-	function doctypeElement(&$parser, $data) {
-		$start = strpos($data, '<!DOCTYPE');
-		$name = trim(substr($data, $start));
-		$end = strpos($name, ' ');
-		$name = substr($name, 0, $end);		
-		
-		$currentNode =& new DOMIT_DocumentType($name, $data);
-		$currentNode->ownerDocument =& $this->xmlDoc;
-		
-		$this->lastChild->appendChild($currentNode);
-		$this->xmlDoc->doctype =& $currentNode;
-	} //doctypeElement
-	
-	/**
-	* Catches a notation node event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The current notation data
-	*/
-	function notationElement(&$parser, $data) {
-		//add to doctype string
-		if (($this->parseItem == 'doctype_inline')  || ($this->parseItem == 'doctype')) {
-			$this->parseContainer .= $data;
-		}
-	} //notationElement
-	
-	/**
-	* Catches a comment node event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The comment data
-	*/
-	function commentElement(&$parser, $data) {
-		if ($this->inTextNode) {
-			$this->dumpTextNode();
-		}
-		
-		$currentNode =& $this->xmlDoc->createComment($data);
-		$this->lastChild->appendChild($currentNode);
-	} //commentElement	
-	
-	/**
-	* Catches a processing instruction node event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The target of the processing instruction data
-	* @param string The processing instruction data
-	*/
-	function processingInstructionElement(&$parser, $target, $data) {	
-		if ($this->inTextNode) {
-			$this->dumpTextNode();
-		}
-		
-		$currentNode =& $this->xmlDoc->createProcessingInstruction($target, $data);
-		$this->lastChild->appendChild($currentNode);
-		
-		if (strtolower($target) == 'xml') {
-			$this->xmlDoc->xmldeclaration =& $currentNode;
-		}
-	} //processingInstructionElement
-	
-	/**
-	* Catches a start namespace declaration event and processes the data
-	* @param Object A reference to the current SAX parser
-	* @param string The namespace prefix
-	* @param string The namespace uri
-	*/
-	function startNamespaceDeclaration(&$parser, $prefix, $uri) {
-		//make uri lower case because Expat forces it to upper case for some reason
-		$this->namespaceURIMap[strtolower($uri)] = $prefix;
-	} //startNamespaceDeclaration
-	
-	/**
-	* Catches an end namespace declaration event
-	* @param Object A reference to the current SAX parser
-	* @param string The namespace prefix
-	*/
-	function endNamespaceDeclaration(&$parser, $prefix) {
-		//do nothing; could remove from map, but would hardly be optimal
-	} //endNamespaceDeclaration
-	
-} //DOMIT_Parser
-
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/domit/xml_domit_rss.php 4.6rc2/includes/domit/xml_domit_rss.php
--- 4.5.4/includes/domit/xml_domit_rss.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_rss.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,847 +0,0 @@
-<?php
-/**
-* DOMIT! RSS Lite is a DOM based RSS parser
-* @package domit-rss
-* @subpackage domit-rss-main
-* @version 0.3
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domitrss/ DOMIT! RSS Home Page
-* DOMIT! RSS is Free Software
-**/
-
-if (!defined('DOMIT_RSS_INCLUDE_PATH')) {
-	define('DOMIT_RSS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** current version of DOMIT! RSS */
-define ('DOMIT_RSS_VERSION', '0.3');
-/** language constant */
-define('DOMIT_RSS_ELEMENT_LANGUAGE', 'language');
-/** copyright constant */
-define('DOMIT_RSS_ELEMENT_COPYRIGHT', 'copyright');
-/** managing editor constant */
-define('DOMIT_RSS_ELEMENT_MANAGINGEDITOR', 'managingeditor');
-/** webmaster constant */
-define('DOMIT_RSS_ELEMENT_WEBMASTER', 'webmaster');
-/** pubdate constant */
-define('DOMIT_RSS_ELEMENT_PUBDATE', 'pubdate');
-/** last build date constant */
-define('DOMIT_RSS_ELEMENT_LASTBUILDDATE', 'lastbuilddate');
-/** category constant */
-define('DOMIT_RSS_ELEMENT_CATEGORY', 'category');
-/** generator constant */
-define('DOMIT_RSS_ELEMENT_GENERATOR', 'generator');
-/** docs constant */
-define('DOMIT_RSS_ELEMENT_DOCS', 'docs');
-/** cloud constant */
-define('DOMIT_RSS_ELEMENT_CLOUD', 'cloud');
-/** ttl constant */
-define('DOMIT_RSS_ELEMENT_TTL', 'ttl');
-/** image constant */
-define('DOMIT_RSS_ELEMENT_IMAGE', 'image');
-/** rating constant */
-define('DOMIT_RSS_ELEMENT_RATING', 'rating');
-/** textinput constant */
-define('DOMIT_RSS_ELEMENT_TEXTINPUT', 'textinput');
-/** skiphours constant */
-define('DOMIT_RSS_ELEMENT_SKIPHOURS', 'skiphours');
-/** skipdays constant */
-define('DOMIT_RSS_ELEMENT_SKIPDAYS', 'skipdays');
-/** url constant */
-define('DOMIT_RSS_ELEMENT_URL', 'url');
-/** width constant */
-define('DOMIT_RSS_ELEMENT_WIDTH', 'width');
-/** height constant */
-define('DOMIT_RSS_ELEMENT_HEIGHT', 'height');
-/** guid constant */
-define('DOMIT_RSS_ELEMENT_GUID', 'guid');
-/** enclosure constant */
-define('DOMIT_RSS_ELEMENT_ENCLOSURE', 'enclosure');
-/** comments constant */
-define('DOMIT_RSS_ELEMENT_COMMENTS', 'comments');
-/** source constant */
-define('DOMIT_RSS_ELEMENT_SOURCE', 'source');
-/** name constant */
-define('DOMIT_RSS_ELEMENT_NAME', 'name');
-/** author constant */
-define('DOMIT_RSS_ELEMENT_AUTHOR', 'author');
-
-/** domain constant */
-define('DOMIT_RSS_ATTR_DOMAIN', 'domain');
-/** port constant */
-define('DOMIT_RSS_ATTR_PORT', 'port');
-/** path constant */
-define('DOMIT_RSS_ATTR_PATH', 'path');
-/** registerProcedure constant */
-define('DOMIT_RSS_ATTR_REGISTERPROCEDURE', 'registerProcedure');
-/** protocol constant */
-define('DOMIT_RSS_ATTR_PROTOCOL', 'protocol');
-/** url constant */
-define('DOMIT_RSS_ATTR_URL', 'url');
-/** length constant */
-define('DOMIT_RSS_ATTR_LENGTH', 'length');
-/** type constant */
-define('DOMIT_RSS_ATTR_TYPE', 'type');
-/** isPermaLink constant */
-define('DOMIT_RSS_ATTR_ISPERMALINK', 'isPermaLink');
-
-require_once(DOMIT_RSS_INCLUDE_PATH . 'xml_domit_rss_shared.php');
-
-/**
-* The base DOMIT! RSS document class
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_document extends xml_domit_rss_base_document {
-	/**
-	* Constructor
-	* @param string Path to the rss file
-	* @param string Directory in which cache files are to be stored
-	* @param string Expiration time (in seconds) for the cache file
-	* @return Object A new instance of xml_domit_rss_document
-	*/
-	function xml_domit_rss_document($url = '', $cacheDir = './', $cacheTime = '3600') {
-	    $this->parser = 'DOMIT_RSS';
-		$this->xml_domit_rss_base_document($url, $cacheDir, $cacheTime);
-	} //xml_domit_rss_document
-	
-	/**
-	* Performs initialization of the RSS document
-	*/
-	function _init() {
-		$total = $this->node->documentElement->childCount;
-		$itemCounter = 0;
-		$channelCounter = 0;
-		$categoryCounter = 0;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->documentElement->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-
-			switch ($tagName) {
-				case DOMIT_RSS_ELEMENT_ITEM:					
-					$this->domit_rss_items[$itemCounter] =& new xml_domit_rss_item($currNode);
-					$itemCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_CHANNEL:
-					$this->domit_rss_channels[$channelCounter] =& new xml_domit_rss_channel($currNode);
-					$channelCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_CATEGORY:
-					$this->domit_rss_categories[$categoryCounter] =& new xml_domit_rss_category($currNode);
-					$categoryCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_IMAGE:
-					$this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_image($currNode);
-					break;
-				case DOMIT_RSS_ELEMENT_CLOUD:
-					$this->indexer[$tagName] =& new xml_domit_rss_cloud($currNode);
-					break;
-				case DOMIT_RSS_ELEMENT_TEXTINPUT:
-					$this->indexer[$tagName] =& new xml_domit_rss_textinput($currNode);
-					break;
-				case DOMIT_RSS_ELEMENT_TITLE:
-                case DOMIT_RSS_ELEMENT_LINK:
-                case DOMIT_RSS_ELEMENT_DESCRIPTION:
-                case DOMIT_RSS_ELEMENT_LANGUAGE:
-				case DOMIT_RSS_ELEMENT_COPYRIGHT:
-				case DOMIT_RSS_ELEMENT_MANAGINGEDITOR:
-				case DOMIT_RSS_ELEMENT_WEBMASTER:
-				case DOMIT_RSS_ELEMENT_PUBDATE:
-				case DOMIT_RSS_ELEMENT_LASTBUILDDATE:
-				case DOMIT_RSS_ELEMENT_GENERATOR:
-				case DOMIT_RSS_ELEMENT_DOCS:
-				case DOMIT_RSS_ELEMENT_TTL:
-				case DOMIT_RSS_ELEMENT_RATING:
-				case DOMIT_RSS_ELEMENT_SKIPHOURS:
-				case DOMIT_RSS_ELEMENT_SKIPDAYS:
-				    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-				    break;
-				default:
-				    $this->addIndexedElement($currNode);
-					//$this->indexer[$tagName] =& $currNode;
-			}
-		}
-		
-		if ($itemCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_ITEMS] =& $this->domit_rss_items;
-		}
-		
-		if ($channelCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_CHANNELS] =& $this->domit_rss_channels;
-		}
-		
-		if ($categoryCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_CATEGORIES] =& $this->domit_rss_categories;
-		}
-		
-		$this->handleChannelElementsEmbedded();
-	} //_init	
-	
-	/**
-	* Returns the current version of DOMIT! RSS
-	* @return int The current version of DOMIT! RSS
-	*/
-	function getVersion() {
-		return DOMIT_RSS_VERSION;
-	} //getVersion
-} //xml_domit_rss_document
-
-
-/**
-* Represents an RSS channel
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_channel extends xml_domit_rss_elementindexer {
-	/** @var array A list of references to channel items */
-	var $domit_rss_items = array();
-	/** @var array A list of references to category items */
-	var $domit_rss_categories = array();
-	
-	/**
-	* Constructor
-	* @param Object A DOM node containing channel data
-	* @param boolean True if channel elements are siblings of the channel rather than children
-	*/
-	function xml_domit_rss_channel(&$channel, $externalElements = false) {
-		$this->node =& $channel;
-		$this->rssDefinedElements = array('title','link','description','language','copyright',
-											'managingEditor','webmaster','pubDate','lastBuildDate',
-											'generator','docs','cloud','ttl','image', 'rating',
-											'textInput','skipHours','skipDays','domit_rss_channels',
-											'domit_rss_items','domit_rss_categories');
-		$this->_init();
-	} //xml_domit_rss_channel
-	
-	/**
-	* Performs initialization of the RSS channel element
-	*/
-	function _init() {
-		$total = $this->node->childCount;
-		$itemCounter = 0;
-		$categoryCounter = 0;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-			
-			switch($tagName) {
-				case DOMIT_RSS_ELEMENT_ITEM:
-					$this->domit_rss_items[$itemCounter] =& new xml_domit_rss_item($currNode);
-					$itemCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_CATEGORY:
-					$this->domit_rss_categories[$categoryCounter] =& new xml_domit_rss_category($currNode);
-					$categoryCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_IMAGE:
-					$this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_image($currNode);
-					break;
-				case DOMIT_RSS_ELEMENT_CLOUD:
-					$this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_cloud($currNode);
-					break;
-				case DOMIT_RSS_ELEMENT_TEXTINPUT:
-					$this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_textinput($currNode);
-					break;
-                case DOMIT_RSS_ELEMENT_TITLE:
-                case DOMIT_RSS_ELEMENT_LINK:
-                case DOMIT_RSS_ELEMENT_DESCRIPTION:
-                case DOMIT_RSS_ELEMENT_LANGUAGE:
-				case DOMIT_RSS_ELEMENT_COPYRIGHT:
-				case DOMIT_RSS_ELEMENT_MANAGINGEDITOR:
-				case DOMIT_RSS_ELEMENT_WEBMASTER:
-				case DOMIT_RSS_ELEMENT_PUBDATE:
-				case DOMIT_RSS_ELEMENT_LASTBUILDDATE:
-				case DOMIT_RSS_ELEMENT_GENERATOR:
-				case DOMIT_RSS_ELEMENT_DOCS:
-				case DOMIT_RSS_ELEMENT_TTL:
-				case DOMIT_RSS_ELEMENT_RATING:
-				case DOMIT_RSS_ELEMENT_SKIPHOURS:
-				case DOMIT_RSS_ELEMENT_SKIPDAYS:
-				    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-				    break;
-				default:
-				    $this->addIndexedElement($currNode);
-					//$this->DOMIT_RSS_indexer[$tagName] =& $currNode;
-			}
-		}
-		
-		if ($itemCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_ITEMS] =& $this->domit_rss_items;
-		}
-		
-		if ($categoryCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_CATEGORIES] =& $this->domit_rss_categories;
-		}
-	} //_init		
-	
-	/**
-	* Returns the title of the channel
-	* @return string The title of the channel, or an empty string
-	*/
-	function getTitle() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_TITLE);
-	} //getTitle	
-	
-	/**
-	* Returns the url of the channel
-	* @return string The url of the channel, or an empty string
-	*/
-	function getLink() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_LINK);
-	} //getLink
-	
-	/**
-	* Returns a description of the channel
-	* @return string A description of the channel, or an empty string
-	*/
-	function getDescription() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_DESCRIPTION);
-	} //getDescription
-	
-	/**
-	* Returns the number of items in the channel
-	* @return int The number of items in the channel
-	*/
-	function getItemCount() {
-		return count($this->domit_rss_items);
-	} //getItemCount
-	
-	/**
-	* Returns a reference to the item at the specified index
-	* @param int The index of the requested item
-	* @return Object A reference to the item at the specified index
-	*/
-	function &getItem($index) {
-		return $this->domit_rss_items[$index];
-	} //getItem
-	
-	/**
-	* Returns the number of categories in the channel
-	* @return int The number of categories in the channel
-	*/
-	function getCategoryCount() {
-		return count($this->domit_rss_categories);
-	} //getCategoryCount
-
-	/**
-	* Returns a reference to the category at the specified index
-	* @param int The index of the requested category
-	* @return Object A reference to the category at the specified index
-	*/
-	function &getCategory($index) {
-		return $this->domit_rss_categories[$index];
-	} //getCategory
-} //xml_domit_rss_channel
-
-/**
-* Represents an RSS item
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_item extends xml_domit_rss_elementindexer {
-	/** @var array A list of references to category items */
-	var $domit_rss_categories = array();
-	
-	/**
-	* Constructor
-	* @param Object A DOM node containing item data
-	*/
-	function xml_domit_rss_item(&$item) {
-		$this->node =& $item;
-		$this->rssDefinedElements = array('title','link','description','author','comments',
-											'enclosure','guid','pubDate','source','domit_rss_categories');
-		$this->_init();
-	} //xml_domit_rss_item
-	
-	/**
-	* Performs initialization of the item element
-	*/
-	function _init(){
-		$total = $this->node->childCount;
-		$categoryCounter = 0;
-		
-		for($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-		
-		    switch ($tagName) {
-		        case DOMIT_RSS_ELEMENT_CATEGORY:
-		            $this->categories[$categoryCounter] =& new xml_domit_rss_category($currNode);
-					$categoryCounter++;
-		            break;
-                case DOMIT_RSS_ELEMENT_ENCLOSURE:
-                    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_enclosure($currNode);
-		            break;
-                case DOMIT_RSS_ELEMENT_SOURCE:
-                    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_source($currNode);
-		            break;
-                case DOMIT_RSS_ELEMENT_GUID:
-                    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_guid($currNode);
-		            break;
-                case DOMIT_RSS_ELEMENT_TITLE:
-                case DOMIT_RSS_ELEMENT_LINK:
-                case DOMIT_RSS_ELEMENT_DESCRIPTION:
-                case DOMIT_RSS_ELEMENT_AUTHOR:
-				case DOMIT_RSS_ELEMENT_COMMENTS:
-				case DOMIT_RSS_ELEMENT_PUBDATE:
-				    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-				    break;
-				default:
-				    $this->addIndexedElement($currNode);
-				    //$this->DOMIT_RSS_indexer[$tagName] =& $currNode;
-		    }
-		}
-		
-		if ($categoryCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_CATEGORIES] =& $this->domit_rss_categories;
-		}
-	} //init
-	
-	/**
-	* Returns the title of the item
-	* @return string The title of the item, or an empty string
-	*/
-	function getTitle() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_TITLE);
-	} //getTitle	
-	
-	/**
-	* Returns the url of the item
-	* @return string The url of the item, or an empty string
-	*/
-	function getLink() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_LINK);
-	} //getLink
-	
-	/**
-	* Returns a description of the item
-	* @return string A description of the item, or an empty string
-	*/
-	function getDescription() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_DESCRIPTION);
-	} //getDescription
-	
-	/**
-	* Returns the number of categories in the item
-	* @return int The number of categories in the item
-	*/
-	function getCategoryCount() {
-		return count($this->domit_rss_categories);
-	} //getCategoryCount
-
-	/**
-	* Returns a reference to the category at the specified index
-	* @param int The index of the requested category
-	* @return Object A reference to the category at the specified index
-	*/
-	function &getCategory($index) {
-		return $this->domit_rss_categories[$index];
-	} //getCategory
-} //xml_domit_rss_item
-
-
-/**
-* Represents an RSS category
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_category extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing category data
-	*/
-	function xml_domit_rss_category(&$category) {
-		$this->node =& $category;
-		$this->_init();
-	} //xml_domit_rss_category
-	
-	/**
-	* Returns the category
-	* @return string The category text
-	*/
-	function getCategory() {
-		return $this->node->firstChild->toString();
-	} //getCategory	
-	
-	/**
-	* Returns the category domain
-	* @return string The category domain
-	*/
-	function getDomain() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_DOMAIN);
-	} //getDomain
-} //xml_domit_rss_category
-
-/**
-* Represents an RSS image
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_image extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing image data
-	*/
-	function xml_domit_rss_image(&$image) {
-		$this->node =& $image;
-		$this->rssDefinedElements = array('title','link','description','url',
-											'width', 'height');
-		$this->_init();
-	} //xml_domit_rss_image
-	
-	/**
-	* Performs initialization of image element
-	*/
-	function _init(){
-		$total = $this->node->childCount;
-
-		for($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-
-		    switch ($tagName) {
-                case DOMIT_RSS_ELEMENT_TITLE:
-                case DOMIT_RSS_ELEMENT_LINK:
-                case DOMIT_RSS_ELEMENT_DESCRIPTION:
-                case DOMIT_RSS_ELEMENT_URL:
-				case DOMIT_RSS_ELEMENT_WIDTH:
-				case DOMIT_RSS_ELEMENT_HEIGHT:
-				    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-				    break;
-				default:
-				    $this->addIndexedElement($currNode);
-				    //$this->DOMIT_RSS_indexer[$tagName] =& $currNode;
-		    }
-		}
-	} //_init
-	
-	/**
-	* Returns the image title
-	* @return string The image title
-	*/
-	function getTitle() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_TITLE);
-	} //getTitle	
-	
-	/**
-	* Returns the image link
-	* @return string The image link
-	*/
-	function getLink() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_LINK);
-	} //getLink
-	
-	/**
-	* Returns the image url
-	* @return string The image url
-	*/
-	function getUrl() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_URL);
-	} //getUrl
-	
-	/**
-	* Returns the image width in pixels
-	* @return string The image width (maximum 144, default 88)
-	*/
-	function getWidth() {
-		$myWidth = $this->getElementText(DOMIT_RSS_ELEMENT_WIDTH);
-		
-		if ($myWidth == '') {
-			$myWidth = '88';
-		}
-		else if (intval($myWidth) > 144) {
-	        $myWidth = '144';
-		}
-		
-		return $myWidth;
-	} //getWidth
-	
-	/**
-	* Returns the image height in pixels
-	* @return string The image height (maximum 400, default 31)
-	*/
-	function getHeight() {
-		$myHeight = $this->getElementText(DOMIT_RSS_ELEMENT_HEIGHT);
-
-		if ($myHeight == '') {
-			$myHeight = '31';
-		}
-		else if (intval($myHeight) > 400) {
-	        $myHeight = '400';
-		}
-
-		return $myHeight;
-	} //getHeight
-	
-	/**
-	* Returns the image description
-	* @return string The image description
-	*/
-	function getDescription() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_DESCRIPTION);
-	} //getDescription
-} //xml_domit_rss_image
-
-/**
-* Represents an RSS text input form
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_textinput extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing text input data
-	*/
-	function xml_domit_rss_textinput(&$textinput) {
-		$this->node =& $textinput;
-		$this->rssDefinedElements = array('title','link','description','name');
-		$this->_init();
-	} //xml_domit_rss_textinput
-	
-	/**
-	* Performs initialization of textInput element
-	*/
-	function _init(){
-		$total = $this->node->childCount;
-
-		for($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-
-		    switch ($tagName) {
-                case DOMIT_RSS_ELEMENT_TITLE:
-                case DOMIT_RSS_ELEMENT_LINK:
-                case DOMIT_RSS_ELEMENT_DESCRIPTION:
-                case DOMIT_RSS_ELEMENT_NAME:
-				    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-				    break;
-				default:
-				    $this->addIndexedElement($currNode);
-				    //$this->DOMIT_RSS_indexer[$tagName] =& $currNode;
-		    }
-		}
-	} //_init
-	
-	/**
-	* Returns the title of the text input
-	* @return string The title of the text input, or an empty string
-	*/
-	function getTitle() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_TITLE);
-	} //getTitle	
-	
-	/**
-	* Returns a description of the text input
-	* @return string A description of the text input, or an empty string
-	*/
-	function getDescription() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_DESCRIPTION);
-	} //getDescription
-	
-	/**
-	* Returns the name of the text input
-	* @return string The name of the text input, or an empty string
-	*/
-	function getName() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_NAME);
-	} //getName
-	
-	/**
-	* Returns the url of the text input
-	* @return string The url of the text input, or an empty string
-	*/
-	function getLink() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_LINK);
-	} //getLink
-} //xml_domit_rss_textinput
-
-/**
-* Represents an RSS cloud
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_cloud extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing cloud data
-	*/
-	function xml_domit_rss_cloud(&$cloud) {
-		$this->node =& $cloud;
-		$this->_init();
-	} //xml_domit_rss_cloud
-	
-	/**
-	* Returns the domain of the cloud
-	* @return string The domain of the cloud
-	*/
-	function getDomain() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_DOMAIN);
-	} //getDomain	
-	
-	/**
-	* Returns the port of the cloud
-	* @return string The port of the cloud
-	*/
-	function getPort() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_PORT);
-	} //getPort
-	
-	/**
-	* Returns the path of the cloud
-	* @return string The path of the cloud
-	*/
-	function getPath() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_PATH);
-	} //getPath
-	
-	/**
-	* Returns the register procedure value of the cloud
-	* @return string The register procedure value of the cloud
-	*/
-	function getRegisterProcedure() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_REGISTERPROCEDURE);
-	} //getRegisterProcedure
-	
-	/**
-	* Returns the protocol used by the cloud
-	* @return string The protocol used by the cloud
-	*/
-	function getProtocol() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_PROTOCOL);
-	} //getProtocol
-} //xml_domit_rss_cloud
-
-/**
-* Represents an RSS enclosure
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_enclosure extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing enclosure data
-	*/
-	function xml_domit_rss_enclosure(&$enclosure) {
-		$this->node =& $enclosure;
-		$this->_init();
-	} //xml_domit_rss_enclosure
-
-	/**
-	* Returns the url of the enclosure
-	* @return string The url of the enclosure
-	*/
-	function getUrl() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_URL);
-	} //getUrl	
-	
-	/**
-	* Returns the length of the enclosure
-	* @return string The length of the enclosure
-	*/
-	function getLength() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_LENGTH);
-	} //getLength
-	
-	/**
-	* Returns the type of the enclosure
-	* @return string The type of the enclosure
-	*/
-	function getType() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_TYPE);
-	} //getType
-} //xml_domit_rss_enclosure
-
-/**
-* Represents an RSS guid
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_guid extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing guid data
-	*/
-	function xml_domit_rss_guid(&$guid) {
-		$this->node =& $guid;
-		$this->_init();
-	} //xml_domit_rss_guid
-	
-	/**
-	* Returns the guid text
-	* @return string The guid text
-	*/
-	function getGuid() {
-	    return $this->node->getText();
-	} //getGuid
-	
-	/**
-	* Determines whether the guid is a permalink
-	* @return boolean True if the guid is a permalink (default true)
-	*/
-	function isPermaLink() {
-	    if (!$this->node->hasAttribute(DOMIT_RSS_ATTR_ISPERMALINK)) {
-	        return true;
-	    }
-	    else {
-			return (strtolower($this->node->getAttribute(DOMIT_RSS_ATTR_ISPERMALINK)) == "true");
-	    }
-	} //isPermaLink
-} //xml_domit_rss_guid
-
-/**
-* Represents an RSS source
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_source extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing source data
-	*/
-	function xml_domit_rss_source(&$source) {
-		$this->node =& $source;
-		$this->_init();
-	} //xml_domit_rss_source
-
-	/**
-	* Returns the source text
-	* @return string The source text
-	*/
-	function getSource() {
-	    return $this->node->getText();
-	} //getSource
-	
-	/**
-	* Returns the url of the source
-	* @return string The url of the source
-	*/
-	function getUrl() {
-		return $this->getAttribute(DOMIT_RSS_ATTR_URL);
-	} //getUrl
-} //xml_domit_rss_source
-
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_rss_lite.php 4.6rc2/includes/domit/xml_domit_rss_lite.php
--- 4.5.4/includes/domit/xml_domit_rss_lite.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_rss_lite.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,244 +0,0 @@
-<?php
-/**
-* DOMIT! RSS Lite is a lightweight version of the DOMIT! Lite RSS parser
-* @package domit-rss
-* @subpackage domit-rss-lite
-* @version 0.3
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domitrss/ DOMIT! RSS Home Page
-* DOMIT! RSS is Free Software
-**/
-
-if (!defined('DOMIT_RSS_INCLUDE_PATH')) {
-	define('DOMIT_RSS_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** current version of DOMIT! RSS Lite */
-define ('DOMIT_RSS_LITE_VERSION', '0.3');
-
-require_once(DOMIT_RSS_INCLUDE_PATH . 'xml_domit_rss_shared.php');
-
-/**
-* The base DOMIT! RSS Lite document class
-*
-* @package domit-rss
-* @subpackage domit-rss-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_document_lite extends xml_domit_rss_base_document {
-	/**
-	* Constructor
-	* @param string Path to the rss file
-	* @param string Directory for cache files
-	* @param int Expiration time for a cache file
-	*/
-	function xml_domit_rss_document_lite($url = '', $cacheDir = './', $cacheTime = 3600) {
-	    $this->parser = 'DOMIT_RSS_LITE';
-	    $this->xml_domit_rss_base_document($url, $cacheDir, $cacheTime);
-	} //xml_domit_rss_document_lite
-
- 	/**
-	* Performs initialization of the RSS document
-	*/
-	function _init() {
-		$total = $this->node->documentElement->childCount;
-		$itemCounter = 0;
-		$channelCounter = 0;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->documentElement->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-
-			switch ($tagName) {
-				case DOMIT_RSS_ELEMENT_ITEM:					
-					$this->domit_rss_items[$itemCounter] =& new xml_domit_rss_item_lite($currNode);
-					$itemCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_CHANNEL:
-					$this->domit_rss_channels[$channelCounter] =& new xml_domit_rss_channel_lite($currNode);
-					$channelCounter++;
-					break;
-                case DOMIT_RSS_ELEMENT_TITLE:
-                case DOMIT_RSS_ELEMENT_LINK:
-                case DOMIT_RSS_ELEMENT_DESCRIPTION:
-                    $this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-                    break;
-			}
-		}
-		
-		if ($itemCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_ITEMS] =& $this->domit_rss_items;
-		}
-		
-		if ($channelCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_CHANNELS] =& $this->domit_rss_channels;
-		}
-		
-		$this->handleChannelElementsEmbedded();
-	} //_init	
-	
-	/**
-	* Returns the current version of DOMIT! RSS
-	* @return Object The current version of DOMIT! RSS
-	*/
-	function getVersion() {
-		return DOMIT_RSS_LITE_VERSION;
-	} //getVersion
-} //xml_domit_rss_document_lite
-
-/**
-* Represents an RSS channel
-*
-* @package domit-rss
-* @subpackage domit-rss-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_channel_lite extends xml_domit_rss_elementindexer {
-	/** @var array A list of references to channel items */
-	var $domit_rss_items = array();
-	
-	/**
-	* Constructor
-	* @param Object A DOM node containing channel data
-	*/
-	function xml_domit_rss_channel_lite(&$channel) {
-		$this->node =& $channel;
-		$this->_init();
-	} //xml_domit_rss_channel_lite
-	
-	/**
-	* Performs initialization of the RSS channel element
-	*/
-	function _init() {
-		$total = $this->node->childCount;
-		$itemCounter = 0;
-		
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-			
-			switch ($tagName) {
-				case DOMIT_RSS_ELEMENT_ITEM:
-					$this->domit_rss_items[$itemCounter] =& new xml_domit_rss_item_lite($currNode);
-					$itemCounter++;
-					break;
-				case DOMIT_RSS_ELEMENT_TITLE:
-				case DOMIT_RSS_ELEMENT_LINK:
-				case DOMIT_RSS_ELEMENT_DESCRIPTION:
-					$this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-					break;
-			}
-		}
-		
-		if ($itemCounter != 0) {
-			$this->DOMIT_RSS_indexer[DOMIT_RSS_ARRAY_ITEMS] =& $this->domit_rss_items;
-		}
-	} //_init		
-	
-	/**
-	* Returns the title of the channel
-	* @return string The title of the channel, or an empty string
-	*/
-	function getTitle() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_TITLE);
-	} //getTitle	
-	
-	/**
-	* Returns the url of the channel
-	* @return string The url of the channel, or an empty string
-	*/
-	function getLink() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_LINK);
-	} //getLink
-	
-	/**
-	* Returns a description of the channel
-	* @return string A description of the channel, or an empty string
-	*/
-	function getDescription() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_DESCRIPTION);
-	} //getDescription
-	
-	/**
-	* Returns the number of items in the channel
-	* @return int The number of items in the channel
-	*/
-	function getItemCount() {
-		return count($this->domit_rss_items);
-	} //getItemCount
-	
-	/**
-	* Returns a reference to the item at the specified index
-	* @param int The index of the requested item
-	* @return Object A reference to the item at the specified index
-	*/
-	function &getItem($index) {
-		return $this->domit_rss_items[$index];
-	} //getItem
-} //xml_domit_rss_channel_lite
-
-/**
-* Represents an RSS item
-*
-* @package domit-rss
-* @subpackage domit-rss-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_item_lite extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing item data
-	*/
-	function xml_domit_rss_item_lite(&$item) {
-		$this->node =& $item;
-		$this->_init();
-	} //xml_domit_rss_item_lite
-	
-	/**
-	* Performs initialization of the item element
-	*/
-	function _init(){
-		$total = $this->node->childCount;
-		
-		for($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			$tagName = strtolower($currNode->nodeName);
-		
-			switch ($tagName) {
-				case DOMIT_RSS_ELEMENT_TITLE:
-				case DOMIT_RSS_ELEMENT_LINK:
-				case DOMIT_RSS_ELEMENT_DESCRIPTION:
-					$this->DOMIT_RSS_indexer[$tagName] =& new xml_domit_rss_simpleelement($currNode);
-					break;
-			}
-		}
-	} //init
-	
-	/**
-	* Returns the title of the item
-	* @return string The title of the item, or an empty string
-	*/
-	function getTitle() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_TITLE);
-	} //getTitle	
-	
-	/**
-	* Returns the url of the item
-	* @return string The url of the item, or an empty string
-	*/
-	function getLink() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_LINK);
-	} //getLink
-	
-	/**
-	* Returns a description of the item
-	* @return string A description of the item, or an empty string
-	*/
-	function getDescription() {
-		return $this->getElementText(DOMIT_RSS_ELEMENT_DESCRIPTION);
-	} //getDescription
-} //xml_domit_rss_item_lite
-
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_rss_shared.php 4.6rc2/includes/domit/xml_domit_rss_shared.php
--- 4.5.4/includes/domit/xml_domit_rss_shared.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_rss_shared.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,875 +0,0 @@
-<?php
-/**
-* @package domit-rss
-* @version 0.3
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domitrss/ DOMIT! RSS Home Page
-* DOMIT! RSS is Free Software
-**/
-
-/** channel constant */
-define('DOMIT_RSS_ELEMENT_CHANNEL', 'channel');
-/** item constant */
-define('DOMIT_RSS_ELEMENT_ITEM', 'item');
-/** title constant */
-define('DOMIT_RSS_ELEMENT_TITLE', 'title');
-/** link constant */
-define('DOMIT_RSS_ELEMENT_LINK', 'link');
-/** description constant */
-define('DOMIT_RSS_ELEMENT_DESCRIPTION', 'description');
-
-/** version constant */
-define('DOMIT_RSS_ATTR_VERSION', 'version');
-
-/** name of array containing list of existing RSS items */
-define('DOMIT_RSS_ARRAY_ITEMS', 'domit_rss_items');
-/** name of array containing list of existing RSS channels */
-define('DOMIT_RSS_ARRAY_CHANNELS', 'domit_rss_channels');
-/** name of array containing list of existing RSS categories */
-define('DOMIT_RSS_ARRAY_CATEGORIES', 'domit_rss_categories');
-
-/** DOMIT RSS error, attempt to call an abstract method */
-define('DOMIT_RSS_ABSTRACT_METHOD_INVOCATION_ERR', 101);
-/** DOMIT RSS error, specified element not present */
-define('DOMIT_RSS_ELEMENT_NOT_FOUND_ERR', 102);
-/** DOMIT RSS error, specified attribute not present */
-define('DOMIT_RSS_ATTR_NOT_FOUND_ERR', 103);
-/** DOMIT RSS error, parsing failed */
-define('DOMIT_RSS_PARSING_ERR', 104);
-
-
-/**
-* The base class of all DOMIT! RSS objects
-*
-* @package domit-rss
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_base {
-    /** @var Object The underlying DOMIT! node of the element */
-	var $node = null;
-	/** @var array A list of valid RSS defined child elements */
-	var $rssDefinedElements = array();
-
-	/**
-	* Retrieves the underlying DOMIT node
-	* @return Object The underlying DOMIT node
-	*/
-	function getNode() {
-	    return $this->node;
-	} //getNode
-
-	/**
-	* Retrieves the text of the named attribute, checking first if the attribute exists
-	* @param string The attribute name
-	* @return string The attribute value, or an empty string
-	*/
-	function getAttribute($attr) {
-		if ($this->node->hasAttribute($attr)) {
-			return $this->node->getAttribute($attr);
-		}
-
-		return "";
-	} //getAttribute
-
-	/**
-	* Checks whether the named attribute exists
-	* @param string The attribute name
-	* @return boolean True if the attribute exists
-	*/
-	function hasAttribute($attr) {
-	    return (($this->node->nodeType == DOMIT_ELEMENT_NODE) && $this->node->hasAttribute($attr));
-	} //hasAttribute
-	
-	/**
-	* Tests whether the named element is predefined by the RSS spec
-	* @param string The element name
-	* @return boolean True if the element is predefined by the RSS spec
-	*/
-	function isRSSDefined($elementName) {
-	    $isDefined = false;
-	    
-	    foreach ($this->rssDefinedElements as $key => $value) {
-	        if ($elementName == $value) {
-	            $isDefined = true;
-	            break;
-	        }
-	    }
-	    
-	    return $isDefined;
-	} //isRSSDefined
-	
-	/**
-	* Tests whether the named element has a single child text node
-	* @param string The element name
-	* @return boolean True if the named element has a single child text node
-	*/
-	function isSimpleRSSElement($elementName) {
-	    $elementName = strtolower($elementName);
-
-		if (isset($this->DOMIT_RSS_indexer[$elementName])) {
-	    	return (get_class($this->getElement($elementName)) == 'xml_domit_rss_simpleelement');
-		}
-		else {
-		    return false;
-		}
-	} //isSimpleRSSElement
-
-	/**
-	* Generates a string representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The string representation
-	*/
-    function toString($htmlSafe = false, $subEntities=false) {
-	    return $this->node->toString($htmlSafe, $subEntities);
-	} //toString
-
-    /**
-	* Generates a normalized (formatted for readability) representation of the node and its children
-	* @param boolean True if HTML readable output is desired
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The formatted string representation
-	*/
-	function toNormalizedString($htmlSafe = false, $subEntities=false) {
-	    return $this->node->toNormalizedString($htmlSafe, $subEntities);
-	} //toNormalizedString
-} //xml_domit_rss_base
-
-
-/**
-* Represents a collection of custom RSS elements, e.g. a set of dc:creator entries
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_collection extends xml_domit_rss_elementindexer {
-    /** @var array An array holding the collection of custom elements */
-	var $elements = array();
-	/** @var int The number of custom elements in the collection */
-	var $elementCount = 0;
-	
-	/**
-	* Adds a custom RSS element (DOM node) to the collection
-	* @param Object A DOM node representing a custom RSS element
-	*/
-	function addElement(&$node) {
-		$this->elements[] =& $node;
-		$this->elementCount++;
-	} //addElement
-	
-	/**
-	* Retrieves the element at the specified index 
-	* @param int The index of the requested custom RSS element
-	* @return Object The DOMIT node representing the requested element
-	*/
-	function &getElementAt($index) {
-		return $this->elements[$index];
-	} //getElementAt
-	
-	/**
-	* Retrieves the element at the specified index (alias for getElementAt)
-	* @param int The index of the requested custom RSS element
-	* @return Object The DOMIT node representing the requested element
-	*/
-	function &getElement($index) {
-		return $this->getElementAt($index);
-	} //getElement
-	
-	/**
-	* Returns the number of elements in the collection
-	* @return int The number of members in the collection
-	*/
-	function getElementCount() {
-	    return $this->elementCount;
-	} //getElementCount
-
-	/**
-	* Gets a text representation of the collection (applies the toString method to each member and concatenates)
-	* @return string The element text
-	*/
-	function getElementText() {
-		$total = $this->getElementCount();
-  		$result = '';
-
-        for ($i = 0; $i < $total; $i++) {
-            $result .= $currElement->toString();
-        }
-        
-        return $result;
-	} //getElementText
-} //xml_domit_rss_collection
-
-
-/**
-* Provides indexing functionality to RSS classes
-*
-* @package domit-rss
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_elementindexer extends xml_domit_rss_base {
-	/** @var Array Name based index to RSS elements */
-	var $DOMIT_RSS_indexer = array();
-	/** @var Array Numerical index to RSS elements; for optimization purposes, only set if requested by getElementAt */
-	var $DOMIT_RSS_numericalIndexer;
-	
-	/**
-	* Performs generic initialization of elements
-	*/
-	function _init(){
-		$total = $this->node->childCount;
-
-		for($i = 0; $i < $total; $i++) {
-			$currNode =& $this->node->childNodes[$i];
-			//$this->DOMIT_RSS_indexer[$currNode->nodeName] =& $currNode;
-			$this->addIndexedElement($currNode);
-		}
-	} //init
-
-	/**
-	* Adds a custom element (one not defined by the RSS specs, e..g., dc:creator) to the indexer
-	* @param Object A DOMIT! node representing the custom element
-	*/
-	function addIndexedElement(&$node) {
-	    $tagName = strtolower($node->nodeName);
-	    
-	    if (isset($this->DOMIT_RSS_indexer[$tagName])) {
-	        if (strtolower(get_class($this->DOMIT_RSS_indexer[$tagName])) == 'domit_element') {
-	        	$collection =& new xml_domit_rss_collection();
-	        	$collection->addElement($this->DOMIT_RSS_indexer[$tagName]);
-	        	$collection->addElement($node);
-	        	$this->DOMIT_RSS_indexer[$tagName] =& $collection;
-	        }
-	        else {
-				//Don't think I need this case???
-	            //$this->DOMIT_RSS_indexer[$tagName]->addElement($node);
-	        }
-	    }
-	    else {
-	        $this->DOMIT_RSS_indexer[$tagName] =& $node;
-	    }
-	} //addIndexedElement
-	
-	/**
-	* Indicates whether the requested element is actually a collection of elements of the same type
-	* @param string The name of the requested element
-	* @return boolean True if a collection of elements exists
-	*/
-	function isCollection($elementName) {
-	    $elementName = strtolower($elementName);
-
-		if (isset($this->DOMIT_RSS_indexer[$elementName])) {
-			return (get_class($this->DOMIT_RSS_indexer[$elementName]) == 'xml_domit_rss_collection');
-		}
-		else {
-			return false;
-		}
-	} //isCollection
-	
-	/**
-	* Indicates whether the requested element is a DOMIT! node
-	* @param string The name of the requested element
-	* @return boolean True if the requested element is a DOMIT! node
-	*/
-	function isNode($elementName) {
-	    $elementName = strtolower($elementName);
-
-		if (isset($this->DOMIT_RSS_indexer[$elementName])) {
-			return (strtolower(get_class($this->DOMIT_RSS_indexer[$elementName])) == 'domit_element');
-		}
-		else {
-			return false;
-		}
-	} //isNode
-	
-	/**
-	* Indicates whether the requested element is a DOMIT! node (alias for isNode)
-	* @param string The name of the requested element
-	* @return boolean True if the requested element is a DOMIT! node
-	*/
-	function isCustomRSSElement($elementName) {
-	    return isNode($elementName);
-	} //isCustomRSSElement
-
-	/**
-	* Gets a named list of existing elements as a child of the current element
-	* @return array A named list of existing elements
-	*/
-	function getElementList() {
-		return array_keys($this->DOMIT_RSS_indexer);
-	} //getElementList
-
-	/**
-	* Indicates whether a particular element exists
-	* @param string The name of the requested element
-	* @return boolean True if an element with the specified name exists
-	*/
-	function hasElement($elementName) {
-		return isset($this->DOMIT_RSS_indexer[strtolower($elementName)]);
-	} //hasElement
-	
-	/**
-	* Gets a reference to an element with the specified name
-	* @param string The name of the requested element
-	* @return mixed A reference to an element with the specified name, or the text of the element if it is a text node
-	*/
-	function &getElement($elementName) {
-		$elementName = strtolower($elementName);
-
-		if (isset($this->DOMIT_RSS_indexer[$elementName])) {
-			return $this->DOMIT_RSS_indexer[$elementName];
-		}
-		else {
-			xml_domit_rss_exception::raiseException(DOMIT_RSS_ELEMENT_NOT_FOUND_ERR,
-					'Element ' . $elementName . ' not present.');
-		}
-	} //getElement
-
-	/**
-	* Gets a reference to an element at the specified index
-	* @param int The index of the requested element
-	* @return mixed A reference to an element at the specified index, or the text of the element if it is a text node
-	*/
-	function &getElementAt($index) {
-		$this->indexNumerically();
-
-	    if (isset($this->DOMIT_RSS_numericalIndexer[$index])) {
-			return $this->DOMIT_RSS_numericalIndexer[$index];
-		}
-		else {
-			xml_domit_rss_exception::raiseException(DOMIT_RSS_ELEMENT_NOT_FOUND_ERR,
-					'Element ' . $index . ' not present.');
-		}
-	} //getElementAt
-	
-	/**
-	* Populates an integer-based index for elements if one isn't already present.
-	*/
-	function indexNumerically() {
-		if (!isset($this->DOMIT_RSS_numericalIndexer)) {
-			$counter = 0;
-
-            foreach ($this->DOMIT_RSS_indexer as $key => $value) {
-				$this->DOMIT_RSS_numericalIndexer[$counter] =& $this->DOMIT_RSS_indexer[$key];
-				$counter++;
-	    	}
-		}
-	} //indexNumerically
-	
-	/**
-	* Gets the text of the specified element
-	* @param string The name of the requested element
-	* @return string The element text, or an empty string
-	*/
-	function getElementText($elementName) {
-	    return $this->_getElementText($elementName, $this->DOMIT_RSS_indexer);
-	} //getElementText
-
-	/**
-	* Gets the text at the specified index
-	* @param int The index of the requested element
-	* @return string The element text, or an empty string
-	*/
-	function getElementTextAt($index) {
-	    $this->indexNumerically();
-
-	    return $this->_getElementText($index, $this->DOMIT_RSS_numericalIndexer);
-	} //getElementTextAt
-
-	/**
-	* Gets the text at the specified index
-	* @param mixed The index or name of the requested element
-	* @param array The indexing array from which to extract data
-	* @return string The element text, or an empty string
-	*/
-	function _getElementText($index, &$myArray) {
-	    if (isset($myArray[$index])) {
-			$element =& $myArray[$index];
-			$result = '';
-			
-			if (is_array($element)) {
-				//do nothing; data for domit_rss_channels, domit_rss_items,
-				//and domit_rss_categories should be extracted with their own methods
-			}
-			else {
-				switch (strtolower(get_class($element))) {
-				    case 'xml_domit_rss_simpleelement':
-				        $result = $element->getElementText();
-				        break;
-				        
-				    case 'xml_domit_rss_collection':
-				        $result = $element->getElementText();
-				        break;
-				        
-					case 'domit_element':
-					    $total = $element->childCount;
-
-						for ($i = 0; $i < $total; $i++) {
-							$currNode =& $element->childNodes[$i];
-
-							if ($currNode->nodeType == DOMIT_CDATA_SECTION_NODE) {
-								$result .= $currNode->nodeValue;
-							}
-							else {
-								$result .= $currNode->toString();
-							}
-						}
-						break;
-				}
-			}
-			
-			return $result;
-		}
-
-		return '';
-	} //_getElementText
-} //xml_domit_rss_elementindexer
-
-
-/**
-* A base class for DOMIT! RSS and DOMIT! RSS Lite documents
-*
-* @package domit-rss
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_base_document extends xml_domit_rss_elementindexer {
-	/** @var array An array of item elements (only present in some RSS formats) */
-	var $domit_rss_items = array();
-	/** @var array An array of existing channel elements */
-	var $domit_rss_channels = array();
-	/** @var array An array of existing category elements */
-	var $domit_rss_categories = array();
-	/** @var boolean True if caching is enabled */
-	var $cacheEnabled = true;
-	/** @var Object A reference to the file caching object */
-	var $cache;
-	/** @var boolean True if PEAR:Cache_Lite is to be used instead of php_text_cache */
-	var $useCacheLite = false;
-	/** @var string The name of the current parser - either 'DOMIT_RSS' or 'DOMIT_RSS_LITE' */
-	var $parser;
-	/** @var object A reference to a http connection or proxy, if one is required */
-	var $httpConnection = null;
-	
-	/**
-	* Constructor
-	* @param string Path to the rss file
-	* @param string Directory in which cache files are to be stored
-	* @param int Expiration time (in seconds) for the cache file
-	* @return mixed Null if an url was not provided, true if an url was provided and parsing was successful, false otherwise
-	*/
-	function xml_domit_rss_base_document ($url = '', $cacheDir = './', $cacheTime = 3600) {
-	    $success = null;
-	    $this->createDocument();
-
-	    if ($url != '') {
-	        $this->createDefaultCache($cacheDir, $cacheTime);
-			$success = $this->loadRSS($url, $cacheDir, $cacheTime);
-	    }
-	    
-	    return $success;
-	} //xml_domit_rss_base_document
-	
-	/**
-	* Specifies the parameters of the http conection used to obtain the xml data
-	* @param string The ip address or domain name of the connection
-	* @param string The path of the connection
-	* @param int The port that the connection is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-	    require_once(DOMIT_RSS_INCLUDE_PATH . 'php_http_client_generic.php');
-		
-		$this->httpConnection =& new php_http_client_generic($host, $path, $port, $timeout, $user, $password);
-	} //setConnection
-	
-	/**
-	* Specifies basic authentication for an http connection
-	* @param string The user name
-	* @param string The password
-	*/
-	function setAuthorization($user, $password) {
-		$this->httpConnection->setAuthorization($user, $password);
-	} //setAuthorization
-	
-	/**
-	* Specifies that a proxy is to be used to obtain the xml data
-	* @param string The ip address or domain name of the proxy
-	* @param string The path to the proxy
-	* @param int The port that the proxy is listening on
-	* @param int The timeout value for the connection
-	* @param string The user name, if authentication is required
-	* @param string The password, if authentication is required
-	*/
-	function setProxyConnection($host, $path = '/', $port = 80, $timeout = 0, $user = null, $password = null) {
-		require_once(DOMIT_RSS_INCLUDE_PATH . 'php_http_proxy.php');
-				
-		$this->httpConnection =& new php_http_proxy($host, $path, $port, $timeout, $user, $password);
-	} //setProxyConnection
-	
-	/**
-	* Specifies a user name and password for the proxy
-	* @param string The user name
-	* @param string The password
-	*/
-	function setProxyAuthorization($user, $password) {
-		$this->httpConnection->setProxyAuthorization($user, $password);
-	} //setProxyAuthorization
-	
-	/**
-	* Returns the name of the parser
-	*@return string Either 'DOMIT_RSS' or 'DOMIT_RSS_LITE'
-	*/
-	function parsedBy() {
-	    return $this->parser;
-	} //parsedBy
-	
-	/**
-	* Creates an empty DOMIT! document to contain the RSS nodes
-	*/
-	function createDocument() {
-	    require_once(DOMIT_RSS_INCLUDE_PATH . 'xml_domit_include.php');
-		$this->node =& new DOMIT_Document();
-		$this->node->resolveErrors(true);
-	} //createDocument
-	
-	/**
-	* Substitutes PEAR::Cache_Lite for the default php_text_cache
-	* @param boolean True if Cache Lite is to be used
-	* @param string Absolute or relative path to the Cache Lite library
-	* @param string Directory for cache files
-	* @param int Expiration time for a cache file
-	*/
-	function useCacheLite($doUseCacheLite, $pathToLibrary = './Lite.php', $cacheDir = './', $cacheTime = 3600) {
-		$this->useCacheLite = $doUseCacheLite;
-		
-		if ($doUseCacheLite) {
-		    if (!file_exists($pathToLibrary)) {
-				$this->useCacheLite(false);
-		    }
-		    else {
-				require_once($pathToLibrary);
-
-				$cacheOptions = array('cacheDir' => $cacheDir, 'lifeTime' => $cacheTime);
-				$this->cache =& new Cache_Lite($cacheOptions);
-		    }
-		}
-		else {
-		    $this->createDefaultCache($cacheDir, $cacheTime);
-		}
-	} //useCacheLite
-	
-	/**
-	* Instantiates a default cache (php_text_cache)
-	* @param string Directory for cache files
-	* @param int Expiration time for a cache file
-	*/
-	function createDefaultCache($cacheDir = './', $cacheTime = 3600) {
-	    require_once(DOMIT_RSS_INCLUDE_PATH . 'php_text_cache.php');
-		$this->cache =& new php_text_cache($cacheDir, $cacheTime);
-	} //initDefaultCache
-	
-	/**
-	* Disables caching mechanism
-	*/
-	function disableCache() {
-		$this->cacheEnabled = false;
-	} //initDefaultCache
-
-	/**
-	* Loads and parses the RSS at the specified url
-	* @param string The url of the RSS feed
-	* @return boolean True if parsing is successful
-	*/
-	function loadRSS($url) {
-	    if ($this->cacheEnabled && !isset($this->cache)) {
-			$this->createDefaultCache();
-			$this->cache->httpConnection =& $this->httpConnection;
-	    }
-		
-		$success = $this->loadRSSData($url);
-
-		if ($success) {
-			$this->_init();
-		}
-
-		return $success;
-	} //loadRSS
-
-	/**
-	* Parses the RSS text provided
-	* @param string The RSS text
-	* @return boolean True if parsing is successful
-	*/
-	function parseRSS($rssText) {
-	    if ($this->cacheEnabled && !isset($this->cache)) $this->createDefaultCache();
-	    $success = $this->parseRSSData($rssText);
-
-		if ($success) {
-			$this->_init();
-		}
-
-		return $success;
-	} //parseRSS
-
-	/**
-	* Retrieves the RSS data from the url/cache file and parses
-	* @param string The url for the RSS data
-	* @return boolean True if parsing is successful 
-	*/
-	function loadRSSData($url) {
-		$rssText = $this->getDataFromCache($url);		
-		return $this->parseRSSData($rssText);
-	} //loadRSSData
-	
-	/**
-	* Retrieves the RSS data from the url/cache file
-	* @param string The url for the RSS data
-	* @return string The RSS data
-	*/
-	function getDataFromCache($url) {
-		if ($this->cacheEnabled) {
-	    	if ($this->useCacheLite) {
-	        	if ($rssText = $this->cache->get($url)) {
-	            	return $rssText;
-	       		}
-	        	else {
-	            	$rssText = $this->getTextFromFile($url);
-					if ($rssText != '') $this->cache->save($rssText, $url);
-	            	return $rssText;
-	        	}
-	    	}
-	    	else {
-	        	return $this->cache->getData($url);
-	    	}
-		}
-		else {
-			return $this->getTextFromFile($url);
-		}
-	} //getDataFromCache
-	
-	/**
-	* Parses the RSS data provided
-	* @param string The the RSS data
-	* @return boolean True if parsing is successful
-	*/
-	function parseRSSData($rssText) {
-	    if ($rssText != '') {
-			return $this->fromString($rssText);
-		}
-		else {
-			return false;
-		}
-	} //parseRSSData
-	
-	/**
-	* Reads in RSS text from a file and parses it
-	* @param string The file path
-	* @return boolean True if parsing is successful 
-	*/
-	function &fromFile($filename) {
-		$success = $this->node->loadXML($filename, false);
-		return $success;
-	} //fromFile
-	
-	/**
-	* Reads in RSS text from a string and parses it
-	* @param string The RSS text
-	* @return boolean True if parsing is successful 
-	*/
-	function &fromString($rssText) {
-		$success = $this->node->parseXML($rssText, false);
-		return $success;
-	} //fromString
-	
-	/**
-	* Establishes a connection, given an url
-	* @param string The url of the data
-	*/
-	function establishConnection($url) {
-		require_once(DOMIT_RSS_INCLUDE_PATH . 'php_http_client_generic.php');
-		
-		$host = php_http_connection::formatHost($url);
-		$host = substr($host, 0, strpos($host, '/'));
-		
-		$this->setConnection($host);
-	} //establishConnection
-	
-	/**
-	* Get text from an url or file
-	* @param string The url or file path
-	* @return string The text contained in the url or file, or an empty string
-	*/
-	function getTextFromFile($filename) {
-		$fileContents = '';
-		
-		if (function_exists('file_get_contents')) {
-			$fileContents = @file_get_contents($filename);
-		}
-		else {
-			require_once(DOMIT_RSS_INCLUDE_PATH . 'php_file_utilities.php');
-			$fileContents =& php_file_utilities::getDataFromFile($filename, 'r');
-		}
-
-		if ($fileContents == '') {
-			$this->establishConnection($filename);
-			$response =& $this->httpConnection->get($filename); 
-			$fileContents = $response->getResponse();
-		}
-		
-		return $fileContents;
-	} //getTextFromFile
-	
-	/**
-	* Gets a reference to the underlying DOM document
-	* @return Object A reference to the underlying DOM document
-	*/
-	function &getDocument() {
-		return $this->node;
-	} //getDocument
-	
-	/**
-	* Gets a reference to the root DOM element
-	* @return Object A reference to the root DOM element
-	*/
-	function &getNode() {
-		return $this->node->documentElement;
-	} //getNode
-	
-	/**
-	* Forces channel elements that are external to a channel to be referenced as subelements of that channel
-	*/
-	function handleChannelElementsEmbedded() {
-		if (count($this->domit_rss_items) > 0) {
-			foreach ($this->domit_rss_channels as $key => $value) {
-				$this->domit_rss_channels[$key]->domit_rss_items =& $this->domit_rss_items;
-				
-				if (count($this->DOMIT_RSS_indexer) > 0) {
-					foreach ($this->DOMIT_RSS_indexer as $ikey => $ivalue) {
-						if ($ikey != DOMIT_RSS_ARRAY_CHANNELS) {
-							$this->domit_rss_channels[$key]->DOMIT_RSS_indexer[$ikey] =& $this->DOMIT_RSS_indexer[$ikey];
-							unset($this->DOMIT_RSS_indexer[$ikey]);
-						}
-					}
-				}
-			}
-		}		
-	} //handleChannelElementsEmbedded
-	
-	/**
-	* Returns the version of RSS used to format the data 
-	* @return string The version of RSS used to format the data 
-	*/
-	function getRSSVersion() {
-		$version = $this->node->documentElement->getAttribute(DOMIT_RSS_ATTR_VERSION);
-		
-		if ($version == '') {
-			$xmlns = $this->node->documentElement->getAttribute('xmlns');
-			$total = strlen($xmlns);
-			
-			if (substr($xmlns, $total) == '/') {
-			    $total--;
-			}
-
-			for ($i = ($total - 1); $i > -1; $i--) {
-			    $currentChar = substr($xmlns, $i);
-			    
-			    if ($currentChar == '/') {
-			        break;
-			    }
-			    else {
-			        $version = $currentChar . $version;
-			    }
-			}
-			
-		}
-		
-		return $version;
-	} //getRSSVersion
-	
-	/**
-	* Returns the number of channels in the document
-	* @return int The number of channels in the document
-	*/
-	function getChannelCount() {
-		return count($this->domit_rss_channels);
-	} //getChannelCount()
-	
-	/**
-	* Returns a reference to the channel located at the specified index
-	* @return Object A reference to the channel located at the specified index
-	*/
-	function &getChannel($index) {
-		return $this->domit_rss_channels[$index];
-	} //getChannel
-} //xml_domit_rss_base_document
-
-/**
-* Represents a simple RSS element, without attributes and only a single child text node
-*
-* @package domit-rss
-* @subpackage domit-rss-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_simpleelement extends xml_domit_rss_elementindexer {
-	/**
-	* Constructor
-	* @param Object A DOM node containing element data
-	*/
-	function xml_domit_rss_simpleelement(&$element) {
-		$this->node =& $element;
-	} //xml_domit_rss_simpleelement
-
-	/**
-	* Gets the text of the element
-	* @return string The element text
-	*/
-	function getElementText() {
-	    $element =& $this->node;
-	    $result = '';
-    	$total = $element->childCount;
-
-		for ($i = 0; $i < $total; $i++) {
-			$currNode =& $element->childNodes[$i];
-
-			if ($currNode->nodeType == DOMIT_CDATA_SECTION_NODE) {
-				$result .= $currNode->nodeValue;
-			}
-			else {
-				$result .= $currNode->toString();
-			}
-	    }
-
-        return $result;
-	} //getElementText
-} //xml_domit_rss_simpleelement
-
-
-/**
-* A DOMIT! RSS exception handling class
-*
-* @package domit-rss
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class xml_domit_rss_exception {
-	/**
-	* Raises the specified exception
-	* @param int The error number
-	* @param string A string explanation of the error
-	*/
-	function raiseException($errorNum, $errorString) {
-		$errorMessage = 'Error: ' . $errorNum  .  "\n " . $errorString;
-		
-		if ((!isset($GLOBALS['DOMIT_RSS_ERROR_FORMATTING_HTML'])) ||
-			($GLOBALS['DOMIT_RSS_ERROR_FORMATTING_HTML'] == true)) {
-		        $errorMessage = "<p><pre>" . $errorMessage . "</pre></p>";
-		}
-
-		die($errorMessage);
-	} //raiseException
-} //xml_domit_rss_exception
-
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_shared.php 4.6rc2/includes/domit/xml_domit_shared.php
--- 4.5.4/includes/domit/xml_domit_shared.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_shared.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,195 +0,0 @@
-<?php
-/**
-* @package domit-xmlparser
-* @version 0.98
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-if (!defined('DOMIT_INCLUDE_PATH')) {
-	/* Path to DOMIT! files */
-	define('DOMIT_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-//Nodes
-/** DOM Element nodeType */
-define('DOMIT_ELEMENT_NODE', 1);
-/** DOM Attr nodeType */
-define('DOMIT_ATTRIBUTE_NODE', 2);
-/** DOM Text nodeType */
-define('DOMIT_TEXT_NODE', 3);
-/** DOM CDATA Section nodeType */
-define('DOMIT_CDATA_SECTION_NODE', 4);
-/** DOM Entity Reference nodeType */
-define('DOMIT_ENTITY_REFERENCE_NODE', 5);
-/** DOM Entity nodeType */
-define('DOMIT_ENTITY_NODE', 6);
-/** DOM Processing Instruction nodeType */
-define('DOMIT_PROCESSING_INSTRUCTION_NODE', 7);
-/** DOM Comment nodeType */
-define('DOMIT_COMMENT_NODE', 8);
-/** DOM Document nodeType */
-define('DOMIT_DOCUMENT_NODE', 9);
-/** DOM DocType nodeType */
-define('DOMIT_DOCUMENT_TYPE_NODE', 10);
-/** DOM Document Fragment nodeType */
-define('DOMIT_DOCUMENT_FRAGMENT_NODE', 11);
-/** DOM Notation nodeType */
-define('DOMIT_NOTATION_NODE', 12);
-
-//DOM Level 1 Exceptions
-/** DOM error: array index out of bounds  */
-define('DOMIT_INDEX_SIZE_ERR', 1);
-/** DOM error: text doesn't fit into a DOMString */
-define('DOMIT_DOMSTRING_SIZE_ERR', 2); 
-/** DOM error: node can't be inserted at this location */
-define('DOMIT_HIERARCHY_REQUEST_ERR', 3);
-/** DOM error: node not a child of target document */
-define('DOMIT_WRONG_DOCUMENT_ERR', 4); 
-/** DOM error: invalid character specified */
-define('DOMIT_INVALID_CHARACTER_ERR', 5);
-/** DOM error: data can't be added to current node */
-define('DOMIT_NO_DATA_ALLOWED_ERR', 6);
-/** DOM error: node is read-only */
-define('DOMIT_NO_MODIFICATION_ALLOWED_ERR', 7);
-/** DOM error: node can't be found in specified context */
-define('DOMIT_NOT_FOUND_ERR', 8);
-/** DOM error: operation not supported by current implementation */
-define('DOMIT_NOT_SUPPORTED_ERR', 9);
-/** DOM error: attribute currently in use elsewhere */
-define('DOMIT_INUSE_ATTRIBUTE_ERR', 10);
-
-//DOM Level 2 Exceptions
-/** DOM error: attempt made to use an object that is no longer usable */
-define('DOMIT_INVALID_STATE_ERR', 11);
-/** DOM error: invalid or illegal string specified */
-define('DOMIT_SYNTAX_ERR', 12);
-/** DOM error: can't modify underlying type of node */
-define('DOMIT_INVALID_MODIFICATION_ERR', 13);
-/** DOM error: attempt to change node in a way incompatible with namespaces */
-define('DOMIT_NAMESPACE_ERR', 14);
-/** DOM error: operation unsupported by underlying object */
-define('DOMIT_INVALID_ACCESS_ERR', 15);
-
-//DOMIT! Exceptions
-/** DOM error: attempt to instantiate abstract class */
-define('DOMIT_ABSTRACT_CLASS_INSTANTIATION_ERR', 100);
-/** DOM error: attempt to call abstract method */
-define('DOMIT_ABSTRACT_METHOD_INVOCATION_ERR', 101);
-/** DOM error: can't perform this action on or with Document Fragment */
-define('DOMIT_DOCUMENT_FRAGMENT_ERR', 102);
-
-/**
-*@global Object Instance of the UIDGenerator class
-*/
-$GLOBALS['uidFactory'] = new UIDGenerator();
-
-require_once(DOMIT_INCLUDE_PATH . 'xml_domit_nodemaps.php');
-
-/**
-* Generates unique ids for each node
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class UIDGenerator {
-	/** @var int A seed value for generating uids */
-	var $seed;
-	/** @var int A tally of the number of uids generated */
-	var $counter = 0;
-	
-	/**
-	* UIDGenerator constructor
-	*/
-	function UIDGenerator() {
-		$this->seed = 'node' . time();
-	} //UIDGenerator
-	
-	/**
-	* Generates a unique id
-	* @return uid 
-	*/
-	function generateUID() {
-		return ($this->seed . $this->counter++);
-	} //generateUID
-} //UIDGenerator
-
-
-/**
-* A DOMIT! exception handling class
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_DOMException {
-	/**
-	* Raises the specified exception
-	* @param int The error number
-	* @param string A string explanation of the error
-	*/
-	function raiseException($errorNum, $errorString) {
-		$errorMessage = 'Error: ' . $errorNum  .  "\n " . $errorString;
-		
-		if ((!isset($GLOBALS['DOMIT_ERROR_FORMATTING_HTML'])) ||
-			($GLOBALS['DOMIT_ERROR_FORMATTING_HTML'] == true)) {
-		        $errorMessage = "<p><pre>" . $errorMessage . "</pre></p>";
-		}
-
-		die($errorMessage);
-	} //raiseException
-} //DOMIT_DOMException
-
-/**
-* A class representing the DOM Implementation node
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_DOMImplementation {
-	function hasFeature($feature, $version = null) {
-		if (strtoupper($feature) == 'XML') {
-			if (($version == '1.0') || ($version == '2.0') || ($version == null)) {
-				return true;
-			}
-		}
-		
-		return false;
-	} //hasFeature
-	
-	/**
-	* Creates a new DOMIT_Document node and appends a documentElement with the specified info
-	* @param string The namespaceURI of the documentElement
-	* @param string The $qualifiedName of the documentElement
-	* @param Object A document type node
-	* @return Object The new document fragment node
-	*/
-	function &createDocument($namespaceURI, $qualifiedName, &$docType) {
-		$xmldoc =& new DOMIT_Document();
-		$documentElement =& $xmldoc->createElementNS($namespaceURI, $qualifiedName);
-		
-		$xmldoc->setDocumentElement($documentElement);
-		
-		if ($docType != null) {
-			$xmldoc->doctype =& $docType;
-		}
-		
-		return $xmldoc;
-	} //createDocument
-	
-	/**
-	* Creates a new DOMIT_DocumentType node (not yet implemented!)
-	* @param string The $qualifiedName
-	* @param string The $publicID
-	* @param string The $systemID
-	* @return Object The new document type node
-	*/
-	function &createDocumentType($qualifiedName, $publicID, $systemID) {
-		//not yet implemented
-		DOMIT_DOMException::raiseException(DOMIT_NOT_SUPPORTED_ERROR, 
-			('Method createDocumentType is not yet implemented.'));
-	} //createDocumentType
-} //DOMIT_DOMImplementation
-
-?>
diff -ruN 4.5.4/includes/domit/xml_domit_utilities.php 4.6rc2/includes/domit/xml_domit_utilities.php
--- 4.5.4/includes/domit/xml_domit_utilities.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_domit_utilities.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,372 +0,0 @@
-<?php
-/**
-* DOMIT Utilities are a set of utilities for the DOMIT! parser
-* @package domit-xmlparser
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/domit/ DOMIT! Home Page
-* DOMIT! is Free Software
-**/
-
-/**
-*@global Array Translation table for predefined XML entities
-*/
-$GLOBALS['DOMIT_PREDEFINED_ENTITIES'] = array('&' => '&amp;', '<' => '&lt;', '>' => '&gt;',
-											'"' => '&quot;', "'" => '&apos;');
-/**
-* A set of utilities for the DOMIT! parser
-* 
-* These methods are intended to be called statically
-*
-* @package domit-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class DOMIT_Utilities {
-	/**
-	* Raises an error if an attempt to instantiate the class is made
-	*/
-	function DOMIT_Utilities() {		
-	    die("DOMIT_Utilities Error: this is a static class that should never be instantiated.\n" . 
-		    "Please use the following syntax to access methods of this class:\n" .
-		    'DOMIT_Utilities::methodName(parameters)');
-	} //DOMIT_Utilities	
-
-	/**
-	* Generates a normalized (formatted for readability) representation of the node and its children
-	* @param Object The root node of the narmalization
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @return string The formatted string representation 
-	*/
-	function toNormalizedString (&$node, $subEntities=false, $definedEntities) {
-		$node_level = 0;
-		$response = '';
-		
-		//$node is a DOMIT_Document
-		if ($node->nodeType == DOMIT_DOCUMENT_NODE) { 
-			$total = $node->childCount;
-
-			for ($i = 0; $i < $total; $i++) {
-				$response .= DOMIT_Utilities::getNormalizedString($node->childNodes[$i], 
-											$node_level, $subEntities, $definedEntities);
-			}
-			
-			return $response;
-		}
-		else {
-			return ($response . DOMIT_Utilities::getNormalizedString($node, 
-								$node_level, $subEntities, $definedEntities));
-		}
-	} //toNormalizedString		
-	
-	/**
-	* Converts illegal XML characters to their entity representations
-	* @param string The text to be formatted
-	* @param array User defined translation table for entities
-	* @return string The formatted text 
-	*/
-	function convertEntities($text, $definedEntities) {
-		global $DOMIT_PREDEFINED_ENTITIES;
-		$result = strtr($text, $DOMIT_PREDEFINED_ENTITIES);
-		$result = strtr($result, $definedEntities);
-		return $result;
-	} //convertEntities($text)
-	
-	/**
-	* Gets a normalized (formatted for readability) representation of the current node
-	* @param Object The node to be normalized
-	* @param int The level in the DOM hierarchy where the node is located
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @param array User defined translation table for entities
-	* @return string The normalized string representation 
-	*/
-	function getNormalizedString(&$node, $node_level, $subEntities=false, $definedEntities) {
-		$response = '';
-
-		switch ($node->nodeType)  {
-			case DOMIT_ELEMENT_NODE: 
-				$response .= DOMIT_Utilities::getNormalizedElementString($node, $response, 
-									 		$node_level, $subEntities, $definedEntities);								
-				break;
-			
-			case DOMIT_TEXT_NODE: 
-				if ($node->nextSibling == null) {
-					$node_level--;
-				}
-					
-				$response .= ($subEntities ? 
-								DOMIT_Utilities::convertEntities($node->nodeValue, $definedEntities) : 
-								$node->nodeValue);
-				break;
-			
-			case DOMIT_CDATA_SECTION_NODE:
-				if ($node->nextSibling == null) {
-					$node_level--;
-				}
-				
-				$response .= '<![CDATA[' . $node->nodeValue . ']]>';
-				break;
-				
-			case DOMIT_ATTRIBUTE_NODE:
-				$response .= $node->toString(false, $subEntities);
-				break;
-				
-			case DOMIT_DOCUMENT_FRAGMENT_NODE: 
-				$total = $node->childCount;
-				
-				for ($i = 0; $i < $total; $i++) {
-					$response .= DOMIT_Utilities::getNormalizedString($node->childNodes[$i], $node_level,
-															$subEntities, $definedEntities);
-				}
-				
-				break;
-				
-			case DOMIT_COMMENT_NODE: 
-				$response .= '<!--' . $node->nodeValue . '-->';
-
-				if ($node->nextSibling == null) {
-					$node_level--;
-				}
-								
-				$response .= DOMIT_Utilities::getIndentation($node_level) ;
-				
-				break;
-				
-			case DOMIT_PROCESSING_INSTRUCTION_NODE: 
-				$response .= '<' . '?' . $node->nodeName . ' ' . $node->nodeValue . '?' . '>';
-
-				if ($node->nextSibling == null) {
-					$node_level--;
-				}
-								
-				$response .= DOMIT_Utilities::getIndentation($node_level) ;
-				
-				break;
-				
-			case DOMIT_DOCUMENT_TYPE_NODE:
-				$response .= $node->toString() . "\n";
-				break;
-		} 
-
-		return $response;
-	} //getNormalizedString
-	
-	/**
-	* Gets a normalized (formatted for readability) representation of the current element
-	* @param Object The node to be normalized
-	* @param string The current normalized text
-	* @param int The level in the DOM hierarchy where the node is located
-	* @param boolean True if illegal xml characters in text nodes and attributes should be converted to entities
-	* @param array User defined translation table for entities
-	* @return string The normalized string representation 
-	*/
-	function getNormalizedElementString(&$node, $response, $node_level,  
-											$subEntities, $definedEntities) {
-		$response .= '<' . $node->nodeName;
-				
-		//get attributes text
-		if (is_object($node->attributes)) { //DOMIT
-			$response .= $node->attributes->toString(false, $subEntities);
-		}
-		else { //DOMIT_Lite
-			foreach ($node->attributes as $key => $value) {
-				$response .= ' ' . $key . '="';
-				$response .= ($subEntities ? DOMIT_Utilities::convertEntities($value, 
-														$definedEntities) : $value); 
-				$response .= '"';
-			}
-		}
-		
-		$node_level++;
-		
-		//if node is childless
-		if ($node->childCount == 0) {
-            if ($node->ownerDocument->doExpandEmptyElementTags) { 
-				if (in_array($node->nodeName, $node->ownerDocument->expandEmptyElementExceptions)) {
-					$response .= ' />';
-				}
-				else {
-                	$response .= '></' . $node->nodeName . '>';
-				}
-		    }
-		    else {
-				if (in_array($node->nodeName, $node->ownerDocument->expandEmptyElementExceptions)) {
-					$response .= '></' . $node->nodeName . '>';
-				}
-				else {
-					$response .= ' />';
-				}
-		    }
-		}
-		else {
-			$response .= '>';						
-			
-			//get children
-			$myNodes =& $node->childNodes;
-			$total = $node->childCount;
-			
-			//no indentation if first child is a text node 
-			if (!DOMIT_Utilities::isTextNode($node->firstChild)) {
-				$response .= DOMIT_Utilities::getIndentation($node_level); 
-			 } 
-
-			for ($i = 0; $i < $total; $i++) {
-				$child =& $myNodes[$i];
-				$response .= DOMIT_Utilities::getNormalizedString($child, $node_level,
-												$subEntities, $definedEntities);
-			}
-	
-			$response .= '</' . $node->nodeName . '>';
-		}
-
-		$node_level--;
-
-		if ($node->nextSibling == null) {
-			$node_level--;
-			$response .= DOMIT_Utilities::getIndentation($node_level);
-		}
-		else {				
-			//no indentation if next sibling is a text node 
-			if (!DOMIT_Utilities::isTextNode($node->nextSibling)) {
-				$response .= DOMIT_Utilities::getIndentation($node_level); 
-			}
-		} 
-		
-		return $response;
-	} //getNormalizedElementString
-	
-	/**
-	* Determines whether the specified node is a Text node
-	* @param Object The node to be tested
-	* @return boolean True if the node is a Text node 
-	*/
-	function isTextNode(&$node) {
-		$type = $node->nodeType;
-		return (($type == DOMIT_TEXT_NODE) || ($type == DOMIT_CDATA_SECTION_NODE));
-	} //isTextNode
-	
-	/**
-	* Returns the indentation required for the specified node level
-	* @param int The current node level
-	* @return string The indentation required for the specified node level
-	*/
-	function getIndentation($node_level) {
-		$INDENT_LEN = '    ';
-		$indentation = "\n";
-
-		for ($i = 0; $i < $node_level; $i++) {
-			$indentation .= $INDENT_LEN;
-		}
-		
-		return $indentation;
-	} //getIndentation
-	
-	/**
-	* Removes the extension from the specified file name
-	* @param string The file name
-	* @return string The file name, stripped of its extension
-	*/
-	function removeExtension($fileName) {
-		$total = strlen($fileName);
-		$index = -1;
-		
-		for ($i = ($total - 1); $i >= 0; $i--) {
-			if ($fileName{$i} == '.') {
-				$index = $i;
-			}
-		}
-		
-		if ($index == -1) {
-			return $fileName;
-		}
-		
-		return (substr($fileName, 0, $index));
-	} //removeExtension	
-	
-	/**
-	* Determines whether the XML string is valid (NOT FULLY IMPLEMENTED!)
-	* @param string The XML text
-	* @return boolean True if the XML text is valid
-	*/
-	function validateXML($xmlText) {
-		//this does only rudimentary validation
-		//at this point in time
-		$isValid = true;
-		
-		if (is_string($xmlText)) {		
-			$text = trim($xmlText);
-			
-			switch ($text) {
-				case '':
-					$isValid = false;
-					break;
-			}
-		}
-		else {
-			$isValid = false;
-		}
-		
-		return $isValid;
-	} //validateXML
-	
-	/**
-	* Set the browser header to interpret data as UTF-8 formatted
-	* @param string The content type of the data
-	*/
-	function printUTF8Header($contentType = 'text/html') {
-		echo header('Content-type: ' . $contentType . '; charset=utf-8');
-	} //printUTF8Header
-	
-	/**
-	* Formats a string for presentation as HTML
-	* @param string The string to be formatted
-	* @param boolean True if the string is to be sent directly to output
-	* @return string The HTML formatted string  
-	*/
-	function forHTML($text, $doPrint = false) {
-		if ($doPrint) {
-			print ('<pre>' . htmlspecialchars($text) . '</pre>');
-		}
-		else {
-			return ('<pre>' . htmlspecialchars($text) . '</pre>');
-		}		
-	} //forHTML
-	
-	/**
-	* Generates a node tree from an array and appends it to the specified document or node
-	* @param object The document or node to which the child nodes should be appended
-	* @param array An associative multidimensional array of elements and values
-	*/
-	function fromArray (&$node, &$myArray) {
-		if ($node->nodeType == DOMIT_DOCUMENT_NODE) {
-			$docNode =& $node;
-		}
-		else {
-			$docNode =& $node->ownerDocument;
-		}
-
-		foreach ($myArray as $key => $value) {			
-			if (is_array($value)) {
-				//check for numeric indices
-				$total = count($value);
-				
-				if (($total > 0)  && isset($value[0])){
-					for ($i = 0; $i < $total; $i++) {
-						$node->appendChild($docNode->createElement($key));
-						DOMIT_Utilities::fromArray($node->lastChild, $value[$i]);					
-					}
-				}
-				else {
-					//generate child elements
-					$node->appendChild($docNode->createElement($key));
-					DOMIT_Utilities::fromArray($node->lastChild, $value);
-				}
-			}
-			else {
-				$node->appendChild($docNode->createElement($key));
-				$node->lastChild->appendChild($docNode->createTextNode($value));
-			}			
-		}		
-	} //fromArray
-} //DOMIT_Utilities
-?>
diff -ruN 4.5.4/includes/domit/xml_saxy_lite_parser.php 4.6rc2/includes/domit/xml_saxy_lite_parser.php
--- 4.5.4/includes/domit/xml_saxy_lite_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_saxy_lite_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,239 +0,0 @@
-<?php
-/**
-* SAXY Lite is a non-validating, but lightweight and fast SAX parser for PHP, modelled on the Expat parser
-* @package saxy-xmlparser
-* @subpackage saxy-xmlparser-lite
-* @version 0.17
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/saxy/ SAXY Home Page
-* SAXY is Free Software
-**/
-
-if (!defined('SAXY_INCLUDE_PATH')) {
-	define('SAXY_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** current version of SAXY Lite */
-define ('SAXY_LITE_VERSION', '0.17');
-
-/** initial saxy lite parse state, before anything is encountered */
-define('SAXY_STATE_NONE', 0);
-/** saxy lite parse state, processing main document */
-define('SAXY_STATE_PARSING', 1);
-
-require_once(SAXY_INCLUDE_PATH . 'xml_saxy_shared.php');
-
-/**
-* The SAX Parser class
-*
-* @package saxy-xmlparser
-* @subpackage saxy-xmlparser-lite
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class SAXY_Lite_Parser extends SAXY_Parser_Base {
-	/**
-	* Constructor for SAX parser
-	*/
-	function SAXY_Lite_Parser() {
-		$this->SAXY_Parser_Base();
-		$this->state = SAXY_STATE_NONE;
-	} //SAXY_Lite_Parser
-
-	/**
-	* Returns the current version of SAXY Lite
-	* @return Object The current version of SAXY Lite
-	*/
-	function getVersion() {
-		return SAXY_LITE_VERSION;
-	} //getVersion
-
-	/**
-	* Processes the xml prolog, doctype, and any other nodes that exist outside of the main xml document
-	* @param string The xml text to be processed
-	* @return string The preprocessed xml text
-	*/
-	function preprocessXML($xmlText) {
-		//strip prolog
-		$xmlText = trim($xmlText);
-		$total = strlen($xmlText);
-
-		for ($i = 0; $i < $total; $i++) {
-			if ($xmlText{$i} == '<') {
-				switch ($xmlText{($i + 1)}) {
-					case '?':
-					case '!':
-						break;
-					default:
-						$this->state = SAXY_STATE_PARSING;
-						return (substr($xmlText, $i));
-				}
-			}
-		}
-	} //preprocessXML
-
-	/**
-	* The controlling method for the parsing process
-	* @param string The xml text to be processed
-	* @return boolean True if parsing is successful
-	*/
-	function parse ($xmlText) {
-		$xmlText = $this->preprocessXML($xmlText);
-		$total = strlen($xmlText);
-
-		for ($i = 0; $i < $total; $i++) {
-			$currentChar = $xmlText{$i};
-
-			switch ($this->state) {
-				case SAXY_STATE_PARSING:
-
-					switch ($currentChar) {
-						case '<':
-							if (substr($this->charContainer, 0, SAXY_CDATA_LEN) == SAXY_SEARCH_CDATA) {
-								$this->charContainer .= $currentChar;
-							}
-							else {
-								$this->parseBetweenTags($this->charContainer);
-								$this->charContainer = '';
-							}
-							break;
-
-						case '>':
-							if ((substr($this->charContainer, 0, SAXY_CDATA_LEN) == SAXY_SEARCH_CDATA) &&
-								!(($this->getCharFromEnd($this->charContainer, 0) == ']') &&
-								($this->getCharFromEnd($this->charContainer, 1) == ']'))) {
-								$this->charContainer .= $currentChar;
-							}
-							else {
-								$this->parseTag($this->charContainer);
-								$this->charContainer = '';
-							}
-							break;
-
-						default:
-							$this->charContainer .= $currentChar;
-					}
-
-					break;
-			}
-		}
-
-		return true;
-	} //parse
-
-	/**
-	* Parses an element tag
-	* @param string The interior text of the element tag
-	*/
-	function parseTag($tagText) {
-		$tagText = trim($tagText);
-		$firstChar = $tagText{0};
-		$myAttributes = array();
-
-		switch ($firstChar) {
-			case '/':
-				$tagName = substr($tagText, 1);
-				$this->fireEndElementEvent($tagName);
-				break;
-
-			case '!':
-				$upperCaseTagText = strtoupper($tagText);
-
-				if (strpos($upperCaseTagText, SAXY_SEARCH_CDATA) !== false) { //CDATA Section
-					$total = strlen($tagText);
-					$openBraceCount = 0;
-					$textNodeText = '';
-
-					for ($i = 0; $i < $total; $i++) {
-						$currentChar = $tagText{$i};
-
-						if (($currentChar == ']') && ($tagText{($i + 1)} == ']')) {
-							break;
-						}
-						else if ($openBraceCount > 1) {
-							$textNodeText .= $currentChar;
-						}
-						else if ($currentChar == '[') { //this won't be reached after the first open brace is found
-							$openBraceCount ++;
-						}
-					}
-
-					if ($this->cDataSectionHandler == null) {
-						$this->fireCharacterDataEvent($textNodeText);
-					}
-					else {
-						$this->fireCDataSectionEvent($textNodeText);
-					}
-				}
-				else if (strpos($upperCaseTagText, SAXY_SEARCH_NOTATION) !== false) { //NOTATION node, discard
-					return;
-				}
-				else if (substr($tagText, 0, 2) == '!-') { //comment node, discard
-					return;
-				}
-
-				break;
-
-			case '?':
-				//Processing Instruction node, discard
-				return;
-
-			default:
-				if ((strpos($tagText, '"') !== false) || (strpos($tagText, "'") !== false)) {
-					$total = strlen($tagText);
-					$tagName = '';
-
-					for ($i = 0; $i < $total; $i++) {
-						$currentChar = $tagText{$i};
-
-						if (($currentChar == ' ') || ($currentChar == "\t") ||
-							($currentChar == "\n") || ($currentChar == "\r") ||
-							($currentChar == "\x0B")) {
-							$myAttributes = $this->parseAttributes(substr($tagText, $i));
-							break;
-						}
-						else {
-							$tagName .= $currentChar;
-						}
-					}
-
-					if (strrpos($tagText, '/') == (strlen($tagText) - 1)) { //check $tagText, but send $tagName
-						$this->fireStartElementEvent($tagName, $myAttributes);
-						$this->fireEndElementEvent($tagName);
-					}
-					else {
-						$this->fireStartElementEvent($tagName, $myAttributes);
-					}
-				}
-				else {
-					if (strpos($tagText, '/') !== false) {
-						$tagText = trim(substr($tagText, 0, (strrchr($tagText, '/') - 1)));
-						$this->fireStartElementEvent($tagText, $myAttributes);
-						$this->fireEndElementEvent($tagText);
-					}
-					else {
-						$this->fireStartElementEvent($tagText, $myAttributes);
-					}
-				}
-		}
-	} //parseTag
-	
-	/**
-	* Returns the current error code (non-functional for SAXY Lite)
-	* @return int The current error code
-	*/
-	function xml_get_error_code() {
-		return -1;
-	} //xml_get_error_code
-	
-	/**
-	* Returns a textual description of the error code (non-functional for SAXY Lite)
-	* @param int The error code
-	* @return string The error message
-	*/
-	function xml_error_string($code) {
-		return "";
-	} //xml_error_string
-} //SAXY_Lite_Parser
-?>
diff -ruN 4.5.4/includes/domit/xml_saxy_parser.php 4.6rc2/includes/domit/xml_saxy_parser.php
--- 4.5.4/includes/domit/xml_saxy_parser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_saxy_parser.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,840 +0,0 @@
-<?php
-/**
-* SAXY is a non-validating, but lightweight and fast SAX parser for PHP, modelled on the Expat parser
-* @package saxy-xmlparser
-* @subpackage saxy-xmlparser-main
-* @version 0.87
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/saxy/ SAXY Home Page
-* SAXY is Free Software
-**/
-
-if (!defined('SAXY_INCLUDE_PATH')) {
-	define('SAXY_INCLUDE_PATH', (dirname(__FILE__) . "/"));
-}
-
-/** current version of SAXY */
-define ('SAXY_VERSION', '0.87');
-
-/** default XML namespace */
-define ('SAXY_XML_NAMESPACE', 'http://www.w3.org/xml/1998/namespace');
-
-/** saxy parse state, before prolog is encountered */
-define('SAXY_STATE_PROLOG_NONE', 0);
-/** saxy parse state, in processing instruction */
-define('SAXY_STATE_PROLOG_PROCESSINGINSTRUCTION', 1);
-/** saxy parse state, an exclamation mark has been encountered */
-define('SAXY_STATE_PROLOG_EXCLAMATION', 2);
-/** saxy parse state, in DTD */
-define('SAXY_STATE_PROLOG_DTD', 3);
-/** saxy parse state, an inline DTD */
-define('SAXY_STATE_PROLOG_INLINEDTD', 4);
-/** saxy parse state, a comment */
-define('SAXY_STATE_PROLOG_COMMENT', 5);
-/** saxy parse state, processing main document */
-define('SAXY_STATE_PARSING', 6);
-/** saxy parse state, processing comment in main document */
-define('SAXY_STATE_PARSING_COMMENT', 7);
-
-//SAXY error codes; same as EXPAT error codes
-/** no error */
-define('SAXY_XML_ERROR_NONE', 0);
-/** out of memory error */
-define('SAXY_XML_ERROR_NO_MEMORY', 1);
-/** syntax error */
-define('SAXY_XML_ERROR_SYNTAX', 2);
-/** no elements in document */
-define('SAXY_XML_ERROR_NO_ELEMENTS', 3);
-/** invalid token encountered error */
-define('SAXY_XML_ERROR_INVALID_TOKEN', 4);
-/** unclosed token error */
-define('SAXY_XML_ERROR_UNCLOSED_TOKEN', 5);
-/** partial character error */
-define('SAXY_XML_ERROR_PARTIAL_CHAR', 6);
-/** mismatched tag error */
-define('SAXY_XML_ERROR_TAG_MISMATCH', 7);
-/** duplicate attribute error */
-define('SAXY_XML_ERROR_DUPLICATE_ATTRIBUTE', 8);
-/** junk after document element error */
-define('SAXY_XML_ERROR_JUNK_AFTER_DOC_ELEMENT', 9);
-/** parameter enitity reference error */
-define('SAXY_XML_ERROR_PARAM_ENTITY_REF', 10);
-/** undefined entity error */
-define('SAXY_XML_ERROR_UNDEFINED_ENTITY', 11);
-/** recursive entity error */
-define('SAXY_XML_ERROR_RECURSIVE_ENTITY_REF', 12);
-/** asynchronous entity error */
-define('SAXY_XML_ERROR_ASYNC_ENTITY', 13);
-/** bad character reference error */
-define('SAXY_XML_ERROR_BAD_CHAR_REF', 14);
-/** binary entity reference error */
-define('SAXY_XML_ERROR_BINARY_ENTITY_REF', 15);
-/** attribute external entity error */
-define('SAXY_XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF', 16);
-/** misplaced processing instruction error */
-define('SAXY_XML_ERROR_MISPLACED_XML_PI', 17);
-/** unknown encoding error */
-define('SAXY_XML_ERROR_UNKNOWN_ENCODING', 18);
-/** incorrect encoding error */
-define('SAXY_XML_ERROR_INCORRECT_ENCODING', 19);
-/** unclosed CDATA Section error */
-define('SAXY_XML_ERROR_UNCLOSED_CDATA_SECTION', 20);
-/** external entity handling error */
-define('SAXY_XML_ERROR_EXTERNAL_ENTITY_HANDLING', 21);
-
-require_once(SAXY_INCLUDE_PATH . 'xml_saxy_shared.php');
-
-/**
-* The SAX Parser class
-*
-* @package saxy-xmlparser
-* @subpackage saxy-xmlparser-main
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class SAXY_Parser extends SAXY_Parser_Base {
-    /** @var int The current error number */
-	var $errorCode = SAXY_XML_ERROR_NONE;
-	/** @var Object A reference to the DocType event handler */
-	var $DTDHandler = null;
-	/** @var Object A reference to the Comment event handler */
-	var $commentHandler = null;
-	/** @var Object A reference to the Processing Instruction event handler */
-	var $processingInstructionHandler = null;
-	/** @var Object A reference to the Start Namespace Declaration event handler */
-	var $startNamespaceDeclarationHandler = null;
-	/** @var Object A reference to the End Namespace Declaration event handler */
-	var $endNamespaceDeclarationHandler = null;
-	/** @var boolean True if SAXY takes namespaces into consideration when parsing element tags */
-	var $isNamespaceAware = false;
-	/** @var array An indexed array containing associative arrays of namespace prefixes mapped to their namespace URIs */
-	var $namespaceMap = array();
-	/** @var array A stack used to determine when an end namespace event should be fired */
-	var $namespaceStack = array();
-	/** @var array A track used to track the uri of the current default namespace */
-	var $defaultNamespaceStack = array();
-	/** @var array A stack containing tag names of unclosed elements */
-	var $elementNameStack = array();
-	
-
-	/**
-	* Constructor for SAX parser
-	*/
-	function SAXY_Parser() {
-		$this->SAXY_Parser_Base();
-		$this->state = SAXY_STATE_PROLOG_NONE;
-	} //SAXY_Parser
-	
-	/**
-	* Sets a reference to the handler for the DocType event 
-	* @param mixed A reference to the DocType handler 
-	*/
-	function xml_set_doctype_handler($handler) {
-		$this->DTDHandler =& $handler;
-	} //xml_set_doctype_handler
-	
-	/**
-	* Sets a reference to the handler for the Comment event 
-	* @param mixed A reference to the Comment handler 
-	*/
-	function xml_set_comment_handler($handler) {
-		$this->commentHandler =& $handler;
-	} //xml_set_comment_handler
-	
-	/**
-	* Sets a reference to the handler for the Processing Instruction event 
-	* @param mixed A reference to the Processing Instruction handler 
-	*/
-	function xml_set_processing_instruction_handler($handler) {
-		$this->processingInstructionHandler =& $handler;
-	} //xml_set_processing_instruction_handler
-	
-	/**
-	* Sets a reference to the handler for the Start Namespace Declaration event
-	* @param mixed A reference to the Start Namespace Declaration handler
-	*/
-	function xml_set_start_namespace_decl_handler($handler) {
-		$this->startNamespaceDeclarationHandler =& $handler;
-	} //xml_set_start_namespace_decl_handler
-	
-	/**
-	* Sets a reference to the handler for the End Namespace Declaration event
-	* @param mixed A reference to the Start Namespace Declaration handler
-	*/
-	function xml_set_end_namespace_decl_handler($handler) {
-		$this->endNamespaceDeclarationHandler =& $handler;
-	} //xml_set_end_namespace_decl_handler
-	
-	/**
-	* Specifies whether SAXY is namespace sensitive
-	* @param boolean True if SAXY is namespace aware
-	*/
-	function setNamespaceAwareness($isNamespaceAware) {
-		$this->isNamespaceAware =& $isNamespaceAware;
-	} //setNamespaceAwareness
-	
-	/**
-	* Returns the current version of SAXY
-	* @return Object The current version of SAXY
-	*/
-	function getVersion() {
-		return SAXY_VERSION;
-	} //getVersion		
-	
-	/**
-	* Processes the xml prolog, doctype, and any other nodes that exist outside of the main xml document
-	* @param string The xml text to be processed
-	* @return string The preprocessed xml text
-	*/	
-	function preprocessXML($xmlText) {
-		//strip prolog
-		$xmlText = trim($xmlText);
-		$startChar = -1;
-		$total = strlen($xmlText);
-		
-		for ($i = 0; $i < $total; $i++) {
-			$currentChar = $xmlText{$i};
-
-			switch ($this->state) {
-				case SAXY_STATE_PROLOG_NONE:	
-					if ($currentChar == '<') {
-						$nextChar = $xmlText{($i + 1)};
-						
-						if ($nextChar == '?')  {
-							$this->state = SAXY_STATE_PROLOG_PROCESSINGINSTRUCTION;
-							$this->charContainer = '';
-						}
-						else if ($nextChar == '!') {								
-							$this->state = SAXY_STATE_PROLOG_EXCLAMATION;								
-							$this->charContainer .= $currentChar;
-							break;
-						}
-						else {
-							$this->charContainer = '';
-							$startChar  = $i;
-							$this->state = SAXY_STATE_PARSING;
-							return (substr($xmlText, $startChar));
-						}
-					}
-					
-					break;
-					
-				case SAXY_STATE_PROLOG_EXCLAMATION:
-					if ($currentChar == 'D') {
-						$this->state = SAXY_STATE_PROLOG_DTD;	
-						$this->charContainer .= $currentChar;							
-					}
-					else if ($currentChar == '-') {
-						$this->state = SAXY_STATE_PROLOG_COMMENT;	
-						$this->charContainer = '';
-					}
-					else {
-						//will trap ! and add it
-						$this->charContainer .= $currentChar;
-					}						
-					
-					break;
-					
-				case SAXY_STATE_PROLOG_PROCESSINGINSTRUCTION:
-					if ($currentChar == '>') {
-						$this->state = SAXY_STATE_PROLOG_NONE;							
-						$this->parseProcessingInstruction($this->charContainer);							
-						$this->charContainer = '';
-					}
-					else {
-						$this->charContainer .= $currentChar;
-					}
-					
-					break;
-					
-				case SAXY_STATE_PROLOG_COMMENT:
-					if ($currentChar == '>') {
-						$this->state = SAXY_STATE_PROLOG_NONE;							
-						$this->parseComment($this->charContainer);							
-						$this->charContainer = '';
-					}
-					else if ($currentChar == '-') {
-						if ((($xmlText{($i + 1)} == '-')  && ($xmlText{($i + 2)} == '>')) || 
-							($xmlText{($i + 1)} == '>') ||
-							(($xmlText{($i - 1)} == '-')  && ($xmlText{($i - 2)}== '!')) ){
-							//do nothing
-						}
-						else {
-							$this->charContainer .= $currentChar;
-						}
-					}
-					else {
-						$this->charContainer .= $currentChar;
-					}
-					
-					break;
-				
-				case SAXY_STATE_PROLOG_DTD:
-					if ($currentChar == '[') {
-						$this->charContainer .= $currentChar;
-						$this->state = SAXY_STATE_PROLOG_INLINEDTD;
-					}					
-					else if ($currentChar == '>') {
-						$this->state = SAXY_STATE_PROLOG_NONE;
-						
-						if ($this->DTDHandler != null) {
-							$this->fireDTDEvent($this->charContainer . $currentChar);
-						}
-						
-						$this->charContainer = '';
-					}
-					else {
-						$this->charContainer .= $currentChar;
-					}	
-					
-					break;
-					
-				case SAXY_STATE_PROLOG_INLINEDTD:
-					$previousChar = $xmlText{($i - 1)};
-
-					if (($currentChar == '>') && ($previousChar == ']')){
-						$this->state = SAXY_STATE_PROLOG_NONE;
-						
-						if ($this->DTDHandler != null) {
-							$this->fireDTDEvent($this->charContainer . $currentChar);
-						}
-						
-						$this->charContainer = '';
-					}
-					else {
-						$this->charContainer .= $currentChar;
-					}	
-					
-					break;
-				
-			}
-		}
-	} //preprocessXML
-
-	/**
-	* The controlling method for the parsing process 
-	* @param string The xml text to be processed
-	* @return boolean True if parsing is successful
-	*/
-	function parse ($xmlText) {
-		$xmlText = $this->preprocessXML($xmlText);			
-		$total = strlen($xmlText);
-
-		for ($i = 0; $i < $total; $i++) {
-			$currentChar = $xmlText{$i};
-
-			switch ($this->state) {
-				case SAXY_STATE_PARSING:
-					switch ($currentChar) {
-						case '<':
-							if (substr($this->charContainer, 0, SAXY_CDATA_LEN) == SAXY_SEARCH_CDATA) {
-								$this->charContainer .= $currentChar;
-							}
-							else {
-								$this->parseBetweenTags($this->charContainer);
-								$this->charContainer = '';
-							}						
-							break;
-							
-						case '-':
-							if (($xmlText{($i - 1)} == '-') && ($xmlText{($i - 2)} == '!')) {
-								$this->state = SAXY_STATE_PARSING_COMMENT;
-								$this->charContainer = '';
-							}
-							else {
-								$this->charContainer .= $currentChar;
-							}
-							break;
-
-						case '>':
-							if ((substr($this->charContainer, 0, SAXY_CDATA_LEN) == SAXY_SEARCH_CDATA) &&
-								!(($this->getCharFromEnd($this->charContainer, 0) == ']') &&
-								($this->getCharFromEnd($this->charContainer, 1) == ']'))) {
-								$this->charContainer .= $currentChar;
-							}
-							else {
-								$this->parseTag($this->charContainer);
-								$this->charContainer = '';
-							}
-							break;
-							
-						default:
-							$this->charContainer .= $currentChar;
-					}
-					
-					break;
-					
-				case SAXY_STATE_PARSING_COMMENT:
-					switch ($currentChar) {
-						case '>':
-							if (($xmlText{($i - 1)} == '-') && ($xmlText{($i - 2)} == '-')) {
-								$this->fireCommentEvent(substr($this->charContainer, 0, 
-													(strlen($this->charContainer) - 2)));
-								$this->charContainer = '';
-								$this->state = SAXY_STATE_PARSING;
-							}
-							else {
-								$this->charContainer .= $currentChar;
-							}
-							break;
-						
-						default:
-							$this->charContainer .= $currentChar;
-					}
-					
-					break;
-			}
-		}	
-
-		return ($this->errorCode == 0);
-	} //parse
-
-	/**
-	* Parses an element tag
-	* @param string The interior text of the element tag
-	*/
-	function parseTag($tagText) {
-		$tagText = trim($tagText);
-		$firstChar = $tagText{0};
-		$myAttributes = array();
-
-		switch ($firstChar) {
-			case '/':
-				$tagName = substr($tagText, 1);				
-				$this->_fireEndElementEvent($tagName);
-				break;
-			
-			case '!':
-				$upperCaseTagText = strtoupper($tagText);
-			
-				if (strpos($upperCaseTagText, SAXY_SEARCH_CDATA) !== false) { //CDATA Section
-					$total = strlen($tagText);
-					$openBraceCount = 0;
-					$textNodeText = '';
-					
-					for ($i = 0; $i < $total; $i++) {
-						$currentChar = $tagText{$i};
-						
-						if (($currentChar == ']') && ($tagText{($i + 1)} == ']')) {
-							break;
-						}
-						else if ($openBraceCount > 1) {
-							$textNodeText .= $currentChar;
-						}
-						else if ($currentChar == '[') { //this won't be reached after the first open brace is found
-							$openBraceCount ++;
-						}
-					}
-					
-					if ($this->cDataSectionHandler == null) {
-						$this->fireCharacterDataEvent($textNodeText);
-					}
-					else {
-						$this->fireCDataSectionEvent($textNodeText);
-					}
-				}
-				else if (strpos($upperCaseTagText, SAXY_SEARCH_NOTATION) !== false) { //NOTATION node, discard
-					return;
-				}
-				/*
-				else if (substr($tagText, 0, 2) == '!-') { //comment node
-					if ($this->commentHandler != null) {
-						$this->fireCommentEvent(substr($tagText, 3, (strlen($tagText) - 5)));
-					}
-				}
-				*/
-				break;
-				
-			case '?': 
-				//Processing Instruction node
-				$this->parseProcessingInstruction($tagText);
-				break;
-				
-			default:				
-				if ((strpos($tagText, '"') !== false) || (strpos($tagText, "'") !== false)) {
-					$total = strlen($tagText);
-					$tagName = '';
-
-					for ($i = 0; $i < $total; $i++) {
-						$currentChar = $tagText{$i};
-						
-						if (($currentChar == ' ') || ($currentChar == "\t") ||
-							($currentChar == "\n") || ($currentChar == "\r") ||
-							($currentChar == "\x0B")) {
-							$myAttributes = $this->parseAttributes(substr($tagText, $i));
-							break;
-						}
-						else {
-							$tagName .= $currentChar;
-						}
-					}
-
-					if (strrpos($tagText, '/') == (strlen($tagText) - 1)) { //check $tagText, but send $tagName
-						$this->_fireStartElementEvent($tagName, $myAttributes);
-						$this->_fireEndElementEvent($tagName);
-					}
-					else {
-						$this->_fireStartElementEvent($tagName, $myAttributes);
-					}
-				}
-				else {
-					if (strpos($tagText, '/') !== false) {
-						$tagText = trim(substr($tagText, 0, (strrchr($tagText, '/') - 1)));
-						$this->_fireStartElementEvent($tagText, $myAttributes);
-						$this->_fireEndElementEvent($tagText);
-					}
-					else {
-						$this->_fireStartElementEvent($tagText, $myAttributes);
-					}
-				}					
-		}
-	} //parseTag
-
- 	/**
-	* Fires a start element event and pushes the element name onto the elementName stack
-	* @param string The start element tag name
-	* @param Array The start element attributes
-	*/
-	function _fireStartElementEvent($tagName, &$myAttributes) {
-	    $this->elementNameStack[] = $tagName;
-	    
-	    if ($this->isNamespaceAware) {
-			$this->detectStartNamespaceDeclaration($myAttributes);
-			$tagName = $this->expandNamespacePrefix($tagName);
-			
-			$this->expandAttributePrefixes($myAttributes);
-	    }
-	    
-	    $this->fireStartElementEvent($tagName, $myAttributes);
-	} //_fireStartElementEvent
-	
-	/**
-	* Expands attribute prefixes to full namespace uri
-	* @param Array The start element attributes
-	*/
-	function expandAttributePrefixes(&$myAttributes) {
-	    $arTransform = array();
-	    
-	    foreach ($myAttributes as $key => $value) {
-	        if (strpos($key, 'xmlns') === false) {
-	            if (strpos($key, ':') !== false) {
-	                $expandedTag = $this->expandNamespacePrefix($key);
-	                $arTransform[$key] = $expandedTag;
-	            }
-	        }
-	    }
-	    
-	    foreach ($arTransform as $key => $value) {
-	        $myAttributes[$value] = $myAttributes[$key];
-	        unset($myAttributes[$key]);
-	    }
-	} //expandAttributePrefixes
-	
-	/**
-	* Expands the namespace prefix (if one exists) to the full namespace uri
-	* @param string The tagName with the namespace prefix
-	* @return string The tagName, with the prefix expanded to the namespace uri
-	*/
-	function expandNamespacePrefix($tagName) {
-	    $stackLen = count($this->defaultNamespaceStack);
-	    $defaultNamespace = $this->defaultNamespaceStack[($stackLen - 1)];
-
-	    $colonIndex = strpos($tagName, ':');
-
-	    if ($colonIndex !== false) {
-			$prefix = substr($tagName, 0, $colonIndex);
-			
-			if ($prefix != 'xml') {
-	        	$tagName = $this->getNamespaceURI($prefix) . substr($tagName, $colonIndex);
-			}
-			else {
-				$tagName = SAXY_XML_NAMESPACE . substr($tagName, $colonIndex);
-			}
-	    }
-	    else if ($defaultNamespace != '') {
-	        $tagName = $defaultNamespace . ':' . $tagName;
-	    }
-
-	    return $tagName;
-	} //expandNamespacePrefix
-	
-	/**
-	* Searches the namespaceMap for the specified prefix, and returns the full namespace URI
-	* @param string The namespace prefix
-	* @return string The namespace uri
-	*/
-	function getNamespaceURI($prefix) {
-	    $total = count($this->namespaceMap);
-	    $uri = $prefix; //in case uri can't be found, just send back prefix
-	                    //should really generate an error, but worry about this later
-		//reset($this->namespaceMap);
-
-	    for ($i = ($total - 1); $i >= 0; $i--) {
-	        $currMap =& $this->namespaceMap[$i];
-
-	        if (isset($currMap[$prefix])) {
-	            $uri = $currMap[$prefix];
-	            break;
-	        }
-	    }
-
-	    return $uri;
-	} //getNamespaceURI
-	
-	/**
-	* Searches the attributes array for an xmlns declaration and fires an event if found
-	* @param Array The start element attributes
-	*/
-	function detectStartNamespaceDeclaration($myAttributes) {
-	    $namespaceExists = false;
-	    $namespaceMapUpper = 0;
-	    $userDefinedDefaultNamespace = false;
-	    $total = count($myAttributes);
-	    
-	    foreach ($myAttributes as $key => $value) {
-	        if (strpos($key, 'xmlns') !== false) {
-	            //add an array to store all namespaces for the current element
-	            if (!$namespaceExists) {
-					$this->namespaceMap[] = array();
-					$namespaceMapUpper = count($this->namespaceMap) - 1;
-	            }
-
-				//check for default namespace override, i.e. xmlns='...'
-				if (strpos($key, ':') !== false) {
-				    $prefix = $namespaceMapKey = substr($key, 6);
-				    $this->namespaceMap[$namespaceMapUpper][$namespaceMapKey] = $value;
-				}
-				else {
-				    $prefix = '';
-					$userDefinedDefaultNamespace = true;
-					
-					//if default namespace '', store in map using key ':'
-					$this->namespaceMap[$namespaceMapUpper][':'] = $value;
-					$this->defaultNamespaceStack[] = $value;
-				}
-				
-	            $this->fireStartNamespaceDeclarationEvent($prefix, $value);
-	            $namespaceExists = true;
-	        }
-	    }
-	    
-	    //store the default namespace (inherited from the parent elements so grab last one)
-		if (!$userDefinedDefaultNamespace) {
-		    $stackLen = count($this->defaultNamespaceStack);
-		    if ($stackLen == 0) {
-		        $this->defaultNamespaceStack[] = '';
-		    }
-		    else {
-				$this->defaultNamespaceStack[] =
-					$this->defaultNamespaceStack[($stackLen - 1)];
-		    }
-		}
-		
-	    $this->namespaceStack[] = $namespaceExists;
-	} //detectStartNamespaceDeclaration
-	
-	/**
-	* Fires an end element event and pops the element name from the elementName stack
-	* @param string The end element tag name
-	*/
-	function _fireEndElementEvent($tagName) {
-	    $lastTagName = array_pop($this->elementNameStack);
-
-		//check for mismatched tag error
-		if ($lastTagName != $tagName) {
-			$this->errorCode = SAXY_XML_ERROR_TAG_MISMATCH;
-		}
-
-		if ($this->isNamespaceAware) {
-		    $tagName = $this->expandNamespacePrefix($tagName);
-		    $this->fireEndElementEvent($tagName);
-			$this->detectEndNamespaceDeclaration();
-			$defaultNamespace = array_pop($this->defaultNamespaceStack);
-		}
-		else {
-		    $this->fireEndElementEvent($tagName);
-		}
-	} //_fireEndElementEvent
-
-	/**
-	* Determines whether an end namespace declaration event should be fired
-	*/
-	function detectEndNamespaceDeclaration() {
-	    $isNamespaceEnded = array_pop($this->namespaceStack);
-	    
-	    if ($isNamespaceEnded) {
-			$map = array_pop($this->namespaceMap);
-			
-	        foreach ($map as $key => $value) {
-	            if ($key == ':') {
-					$key = '';
-	            }
-				$this->fireEndNamespaceDeclarationEvent($key);
-	        }
-		}
-	} //detectEndNamespaceDeclaration
-
-	/**
-	* Parses a processing instruction
-	* @param string The interior text of the processing instruction
-	*/
-	function parseProcessingInstruction($data) {
-		$endTarget = 0;
-		$total = strlen($data);
-		
-		for ($x = 2; $x < $total; $x++) {
-			if (trim($data{$x}) == '') {
-				$endTarget = $x;
-				break;
-			}
-		}
-		
-		$target = substr($data, 1, ($endTarget - 1));
-		$data = substr($data, ($endTarget + 1), ($total - $endTarget - 2));
-	
-		if ($this->processingInstructionHandler != null) {
-			$this->fireProcessingInstructionEvent($target, $data);
-		}
-	} //parseProcessingInstruction
-	
-	/**
-	* Parses a comment
-	* @param string The interior text of the comment
-	*/
-	function parseComment($data) {
-		if ($this->commentHandler != null) {
-			$this->fireCommentEvent($data);
-		}
-	} //parseComment
-	
-	/**
-	* Fires a doctype event
-	* @param string The doctype data
-	*/
-	function fireDTDEvent($data) {
-		call_user_func($this->DTDHandler, $this, $data);
-	} //fireDTDEvent
-	
-	/**
-	* Fires a comment event
-	* @param string The text of the comment
-	*/
-	function fireCommentEvent($data) {
-		call_user_func($this->commentHandler, $this, $data);
-	} //fireCommentEvent
-	
-	/**
-	* Fires a processing instruction event
-	* @param string The processing instruction data
-	*/
-	function fireProcessingInstructionEvent($target, $data) {
-		call_user_func($this->processingInstructionHandler, $this, $target, $data);
-	} //fireProcessingInstructionEvent
-	
-	/**
-	* Fires a start namespace declaration event
-	* @param string The namespace prefix
-	* @param string The namespace uri
-	*/
-	function fireStartNamespaceDeclarationEvent($prefix, $uri) {
-		call_user_func($this->startNamespaceDeclarationHandler, $this, $prefix, $uri);
-	} //fireStartNamespaceDeclarationEvent
-	
-	/**
-	* Fires an end namespace declaration event
-	* @param string The namespace prefix
-	*/
-	function fireEndNamespaceDeclarationEvent($prefix) {
-		call_user_func($this->endNamespaceDeclarationHandler, $this, $prefix);
-	} //fireEndNamespaceDeclarationEvent
-	
-	/**
-	* Returns the current error code
-	* @return int The current error code
-	*/
-	function xml_get_error_code() {
-		return $this->errorCode;
-	} //xml_get_error_code
-	
-	/**
-	* Returns a textual description of the error code
-	* @param int The error code
-	* @return string The error message
-	*/
-	function xml_error_string($code) {
-		switch ($code) {
-		    case SAXY_XML_ERROR_NONE:
-		        return "No error";
-		        break;
-			case SAXY_XML_ERROR_NO_MEMORY:
-			    return "Out of memory";
-		        break;
-			case SAXY_XML_ERROR_SYNTAX:
-			    return "Syntax error";
-		        break;
-			case SAXY_XML_ERROR_NO_ELEMENTS:
-			    return "No elements in document";
-		        break;
-			case SAXY_XML_ERROR_INVALID_TOKEN:
-			    return "Invalid token";
-		        break;
-			case SAXY_XML_ERROR_UNCLOSED_TOKEN:
-			    return "Unclosed token";
-		        break;
-			case SAXY_XML_ERROR_PARTIAL_CHAR:
-			    return "Partial character";
-		        break;
-			case SAXY_XML_ERROR_TAG_MISMATCH:
-			    return "Tag mismatch";
-		        break;
-			case SAXY_XML_ERROR_DUPLICATE_ATTRIBUTE:
-			    return "Duplicate attribute";
-		        break;
-			case SAXY_XML_ERROR_JUNK_AFTER_DOC_ELEMENT:
-			    return "Junk encountered after document element";
-		        break;
-			case SAXY_XML_ERROR_PARAM_ENTITY_REF:
-			    return "Parameter entity reference error";
-		        break;
-			case SAXY_XML_ERROR_UNDEFINED_ENTITY:
-			    return "Undefined entity";
-		        break;
-			case SAXY_XML_ERROR_RECURSIVE_ENTITY_REF:
-			    return "Recursive entity reference";
-		        break;
-			case SAXY_XML_ERROR_ASYNC_ENTITY:
-			    return "Asynchronous internal entity found in external entity";
-		        break;
-			case SAXY_XML_ERROR_BAD_CHAR_REF:
-			    return "Bad character reference";
-		        break;
-			case SAXY_XML_ERROR_BINARY_ENTITY_REF:
-				return "Binary entity reference";
-		        break;
-			case SAXY_XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF:
-			    return "Attribute external entity reference";
-		        break;
-			case SAXY_XML_ERROR_MISPLACED_XML_PI:
-			    return "Misplaced processing instruction";
-		        break;
-			case SAXY_XML_ERROR_UNKNOWN_ENCODING:
-			    return "Unknown encoding";
-		        break;
-			case SAXY_XML_ERROR_INCORRECT_ENCODING:
-				return "Incorrect encoding";
-		        break;
-			case SAXY_XML_ERROR_UNCLOSED_CDATA_SECTION:
-			    return "Unclosed CDATA Section";
-		        break;
-			case SAXY_XML_ERROR_EXTERNAL_ENTITY_HANDLING:
-			    return "Problem in external entity handling";
-		        break;
-			default:
-			    return "No definition for error code " . $code;
-		        break;
-		}
-	} //xml_error_string
-
-} //SAXY_Parser
-?>
diff -ruN 4.5.4/includes/domit/xml_saxy_shared.php 4.6rc2/includes/domit/xml_saxy_shared.php
--- 4.5.4/includes/domit/xml_saxy_shared.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/domit/xml_saxy_shared.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,287 +0,0 @@
-<?php
-/**
-* SAXY_Parser_Base is a base class for SAXY and SAXY Lite
-* @package saxy-xmlparser
-* @version 0.87
-* @copyright (C) 2004 John Heinstein. All rights reserved
-* @license http://www.gnu.org/copyleft/lesser.html LGPL License
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-* @link http://www.engageinteractive.com/saxy/ SAXY Home Page
-* SAXY is Free Software
-**/
-
-/** the initial characters of a cdata section */
-define('SAXY_SEARCH_CDATA', '![CDATA[');
-/** the length of the initial characters of a cdata section */
-define('SAXY_CDATA_LEN', 8);
-/** the initial characters of a notation */
-define('SAXY_SEARCH_NOTATION', '!NOTATION');
-/** the initial characters of a doctype */
-define('SAXY_SEARCH_DOCTYPE', '!DOCTYPE');
-/** saxy parse state, just before parsing an attribute */
-define('SAXY_STATE_ATTR_NONE', 0);
-/** saxy parse state, parsing an attribute key */
-define('SAXY_STATE_ATTR_KEY', 1);
-/** saxy parse state, parsing an attribute value */
-define('SAXY_STATE_ATTR_VALUE', 2);
-
-/**
-* The base SAX Parser class
-*
-* @package saxy-xmlparser
-* @author John Heinstein <johnkarl@nbnet.nb.ca>
-*/
-class SAXY_Parser_Base {
-	/** @var int The current state of the parser */
-	var $state;
-	/** @var int A temporary container for parsed characters */
-	var $charContainer;
-	/** @var Object A reference to the start event handler */
-	var $startElementHandler;
-	/** @var Object A reference to the end event handler */
-	var $endElementHandler;
-	/** @var Object A reference to the data event handler */
-	var $characterDataHandler;
-	/** @var Object A reference to the CDATA Section event handler */
-	var $cDataSectionHandler = null;
-	/** @var boolean True if predefined entities are to be converted into characters */
-	var $convertEntities = true;
-	/** @var Array Translation table for predefined entities */
-	var $predefinedEntities = array('&amp;' => '&', '&lt;' => '<', '&gt;' => '>',
-							'&quot;' => '"', '&apos;' => "'");
-	/** @var Array User defined translation table for entities */
-	var $definedEntities = array();
-
-
-	/**
-	* Constructor for SAX parser
-	*/
-	function SAXY_Parser_Base() {
-		$this->charContainer = '';
-	} //SAXY_Parser_Base
-
-	/**
-	* Sets a reference to the handler for the start element event
-	* @param mixed A reference to the start element handler
-	*/
-	function xml_set_element_handler($startHandler, $endHandler) {
-		$this->startElementHandler = $startHandler;
-		$this->endElementHandler = $endHandler;
-	} //xml_set_element_handler
-
-	/**
-	* Sets a reference to the handler for the data event
-	* @param mixed A reference to the data handler
-	*/
-	function xml_set_character_data_handler($handler) {
-		$this->characterDataHandler =& $handler;
-	} //xml_set_character_data_handler
-
-	/**
-	* Sets a reference to the handler for the CDATA Section event
-	* @param mixed A reference to the CDATA Section handler
-	*/
-	function xml_set_cdata_section_handler($handler) {
-		$this->cDataSectionHandler =& $handler;
-	} //xml_set_cdata_section_handler
-
-	/**
-	* Sets whether predefined entites should be replaced with their equivalent characters during parsing
-	* @param boolean True if entity replacement is to occur
-	*/
-	function convertEntities($truthVal) {
-		$this->convertEntities = $truthVal;
-	} //convertEntities
-
-	/**
-	* Appends an array of entity mappings to the existing translation table
-	*
-	* Intended mainly to facilitate the conversion of non-ASCII entities into equivalent characters
-	*
-	* @param array A list of entity mappings in the format: array('&amp;' => '&');
-	*/
-	function appendEntityTranslationTable($table) {
-		$this->definedEntities = $table;
-	} //appendEntityTranslationTable
-
-
-	/**
-	* Gets the nth character from the end of the string
-	* @param string The text to be queried
-	* @param int The index from the end of the string
-	* @return string The found character
-	*/
-	function getCharFromEnd($text, $index) {
-		$len = strlen($text);
-		$char = $text{($len - 1 - $index)};
-
-		return $char;
-	} //getCharFromEnd
-
-	/**
-	* Parses the attributes string into an array of key / value pairs
-	* @param string The attribute text
-	* @return Array An array of key / value pairs
-	*/
-	function parseAttributes($attrText) {
-		$attrText = trim($attrText);
-		$attrArray = array();
-		$maybeEntity = false;
-
-		$total = strlen($attrText);
-		$keyDump = '';
-		$valueDump = '';
-		$currentState = SAXY_STATE_ATTR_NONE;
-		$quoteType = '';
-
-		for ($i = 0; $i < $total; $i++) {
-			$currentChar = $attrText{$i};
-
-			if ($currentState == SAXY_STATE_ATTR_NONE) {
-				if (trim($currentChar != '')) {
-					$currentState = SAXY_STATE_ATTR_KEY;
-				}
-			}
-
-			switch ($currentChar) {
-				case "\t":
-					if ($currentState == SAXY_STATE_ATTR_VALUE) {
-						$valueDump .= $currentChar;
-					}
-					else {
-						$currentChar = '';
-					}
-					break;
-
-				case "\x0B": //vertical tab
-				case "\n":
-				case "\r":
-					$currentChar = '';
-					break;
-
-				case '=':
-					if ($currentState == SAXY_STATE_ATTR_VALUE) {
-						$valueDump .= $currentChar;
-					}
-					else {
-						$currentState = SAXY_STATE_ATTR_VALUE;
-						$quoteType = '';
-						$maybeEntity = false;
-					}
-					break;
-
-				case '"':
-					if ($currentState == SAXY_STATE_ATTR_VALUE) {
-						if ($quoteType == '') {
-							$quoteType = '"';
-						}
-						else {
-							if ($quoteType == $currentChar) {
-								if (isset( $this ) && $this->convertEntities && $maybeEntity) {
-								    $valueDump = strtr($valueDump, $this->predefinedEntities);
-									$valueDump = strtr($valueDump, $this->definedEntities);
-								}
-
-								$attrArray[trim($keyDump)] = $valueDump;
-								$keyDump = $valueDump = $quoteType = '';
-								$currentState = SAXY_STATE_ATTR_NONE;
-							}
-							else {
-								$valueDump .= $currentChar;
-							}
-						}
-					}
-					break;
-
-				case "'":
-					if ($currentState == SAXY_STATE_ATTR_VALUE) {
-						if ($quoteType == '') {
-							$quoteType = "'";
-						}
-						else {
-							if ($quoteType == $currentChar) {
-								if ($this->convertEntities && $maybeEntity) {
-								    $valueDump = strtr($valueDump, $this->predefinedEntities);
-									$valueDump = strtr($valueDump, $this->definedEntities);
-								}
-
-								$attrArray[trim($keyDump)] = $valueDump;
-								$keyDump = $valueDump = $quoteType = '';
-								$currentState = SAXY_STATE_ATTR_NONE;
-							}
-							else {
-								$valueDump .= $currentChar;
-							}
-						}
-					}
-					break;
-
-				case '&':
-					//might be an entity
-					$maybeEntity = true;
-					$valueDump .= $currentChar;
-					break;
-
-				default:
-					if ($currentState == SAXY_STATE_ATTR_KEY) {
-						$keyDump .= $currentChar;
-					}
-					else {
-						$valueDump .= $currentChar;
-					}
-			}
-		}
-
-		return $attrArray;
-	} //parseAttributes
-
-	/**
-	* Parses character data
-	* @param string The character data
-	*/
-	function parseBetweenTags($betweenTagText) {
-		if (trim($betweenTagText) != ''){
-			$this->fireCharacterDataEvent($betweenTagText);
-		}
-	} //parseBetweenTags
-
-	/**
-	* Fires a start element event
-	* @param string The start element tag name
-	* @param Array The start element attributes
-	*/
-	function fireStartElementEvent($tagName, $attributes) {
-		call_user_func($this->startElementHandler, $this, $tagName, $attributes);
-	} //fireStartElementEvent
-
-	/**
-	* Fires an end element event
-	* @param string The end element tag name
-	*/
-	function fireEndElementEvent($tagName) {
-		call_user_func($this->endElementHandler, $this, $tagName);
-	} //fireEndElementEvent
-
-	/**
-	* Fires a character data event
-	* @param string The character data
-	*/
-	function fireCharacterDataEvent($data) {
-		if ($this->convertEntities && ((strpos($data, "&") != -1))) {
-			$data = strtr($data, $this->predefinedEntities);
-			$data = strtr($data, $this->definedEntities);
-		}
-
-		call_user_func($this->characterDataHandler, $this, $data);
-	} //fireCharacterDataEvent
-
-	/**
-	* Fires a CDATA Section event
-	* @param string The CDATA Section data
-	*/
-	function fireCDataSectionEvent($data) {
-		call_user_func($this->cDataSectionHandler, $this, $data);
-	} //fireCDataSectionEvent
-} //SAXY_Parser_Base
-
-?>
diff -ruN 4.5.4/includes/feedcreator.class.php 4.6rc2/includes/feedcreator.class.php
--- 4.5.4/includes/feedcreator.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/feedcreator.class.php	2006-04-13 08:29:26.000000000 -0500
@@ -1,1542 +1,1620 @@
-<?php
-/***************************************************************************
-
-FeedCreator class v1.7.2
-originally (c) Kai Blankenhorn
-www.bitfolge.de
-kaib@bitfolge.de
-v1.3 work by Scott Reynen (scott@randomchaos.com) and Kai Blankenhorn
-v1.5 OPML support by Dirk Clemens
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-****************************************************************************
-
-
-Changelog:
-
-v1.7.2	10-11-04
-	license changed to LGPL
-
-v1.7.1
-	fixed a syntax bug
-	fixed left over debug code
-
-v1.7	07-18-04
-	added HTML and JavaScript feeds (configurable via CSS) (thanks to Pascal Van Hecke)
-	added HTML descriptions for all feed formats (thanks to Pascal Van Hecke)
-	added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
-	changed default content-type to application/xml
-	added character encoding setting
-	fixed numerous smaller bugs (thanks to Sren Fuhrmann of golem.de)
-	improved changing ATOM versions handling (thanks to August Trometer)
-	improved the UniversalFeedCreator's useCached method (thanks to Sren Fuhrmann of golem.de)
-	added charset output in HTTP headers (thanks to Sren Fuhrmann of golem.de)
-	added Slashdot namespace to RSS 1.0 (thanks to Sren Fuhrmann of golem.de)
-
-v1.6	05-10-04
-	added stylesheet to RSS 1.0 feeds
-	fixed generator comment (thanks Kevin L. Papendick and Tanguy Pruvot)
-	fixed RFC822 date bug (thanks Tanguy Pruvot)
-	added TimeZone customization for RFC8601 (thanks Tanguy Pruvot)
-	fixed Content-type could be empty (thanks Tanguy Pruvot)
-	fixed author/creator in RSS1.0 (thanks Tanguy Pruvot)
-
-v1.6 beta	02-28-04
-	added Atom 0.3 support (not all features, though)
-	improved OPML 1.0 support (hopefully - added more elements)
-	added support for arbitrary additional elements (use with caution)
-	code beautification :-)
-	considered beta due to some internal changes
-
-v1.5.1	01-27-04
-	fixed some RSS 1.0 glitches (thanks to Stphane Vanpoperynghe)
-	fixed some inconsistencies between documentation and code (thanks to Timothy Martin)
-
-v1.5	01-06-04
-	added support for OPML 1.0
-	added more documentation
-
-v1.4	11-11-03
-	optional feed saving and caching
-	improved documentation
-	minor improvements
-
-v1.3    10-02-03
-	renamed to FeedCreator, as it not only creates RSS anymore
-	added support for mbox
-	tentative support for echo/necho/atom/pie/???
-        
-v1.2    07-20-03
-	intelligent auto-truncating of RSS 0.91 attributes
-	don't create some attributes when they're not set
-	documentation improved
-	fixed a real and a possible bug with date conversions
-	code cleanup
-
-v1.1    06-29-03
-	added images to feeds
-	now includes most RSS 0.91 attributes
-	added RSS 2.0 feeds
-
-v1.0    06-24-03
-	initial release
-
-
-
-***************************************************************************/
-
-/*** GENERAL USAGE *********************************************************
-
-include("feedcreator.class.php"); 
-
-$rss = new UniversalFeedCreator(); 
-$rss->useCached(); // use cached version if age<1 hour
-$rss->title = "PHP news"; 
-$rss->description = "daily news from the PHP scripting world"; 
-
-//optional
-$rss->descriptionTruncSize = 500;
-$rss->descriptionHtmlSyndicated = true;
-
-$rss->link = "http://www.dailyphp.net/news"; 
-$rss->syndicationURL = "http://www.dailyphp.net/".$_SERVER["PHP_SELF"]; 
-
-$image = new FeedImage(); 
-$image->title = "dailyphp.net logo"; 
-$image->url = "http://www.dailyphp.net/images/logo.gif"; 
-$image->link = "http://www.dailyphp.net"; 
-$image->description = "Feed provided by dailyphp.net. Click to visit."; 
-
-//optional
-$image->descriptionTruncSize = 500;
-$image->descriptionHtmlSyndicated = true;
-
-$rss->image = $image; 
-
-// get your news items from somewhere, e.g. your database: 
-mysql_select_db($dbHost, $dbUser, $dbPass); 
-$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC"); 
-while ($data = mysql_fetch_object($res)) { 
-    $item = new FeedItem(); 
-    $item->title = $data->title; 
-    $item->link = $data->url; 
-    $item->description = $data->short; 
-    
-    //optional
-    item->descriptionTruncSize = 500;
-    item->descriptionHtmlSyndicated = true;
-
-    $item->date = $data->newsdate; 
-    $item->source = "http://www.dailyphp.net"; 
-    $item->author = "John Doe"; 
-     
-    $rss->addItem($item); 
-} 
-
-// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1 (deprecated),
-// MBOX, OPML, ATOM, ATOM0.3, HTML, JS
-echo $rss->saveFeed("RSS1.0", "news/feed.xml");
-
-
-***************************************************************************
-*          A little setup                                                 *
-**************************************************************************/
-
-// your local timezone, set to "" to disable or for GMT
-define("TIME_ZONE","+01:00");
-
-
-
-
-/**
- * Version string.
- **/
-define("FEEDCREATOR_VERSION", "FeedCreator 1.7.2");
-
-
-
-/**
- * A FeedItem is a part of a FeedCreator feed.
- *
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- * @since 1.3
- */
-class FeedItem extends HtmlDescribable {
-	/**
-	 * Mandatory attributes of an item.
-	 */
-	var $title, $description, $link;
-	
-	/**
-	 * Optional attributes of an item.
-	 */
-	var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
-	
-	/**
-	 * Publishing date of an item. May be in one of the following formats:
-	 *
-	 *	RFC 822:
-	 *	"Mon, 20 Jan 03 18:05:41 +0400"
-	 *	"20 Jan 03 18:05:41 +0000"
-	 *
-	 *	ISO 8601:
-	 *	"2003-01-20T18:05:41+04:00"
-	 *
-	 *	Unix:
-	 *	1043082341
-	 */
-	var $date;
-	
-	/**
-	 * Any additional elements to include as an assiciated array. All $key => $value pairs
-	 * will be included unencoded in the feed item in the form
-	 *     <$key>$value</$key>
-	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
-	 * if $value contains markup. This may be abused to embed tags not implemented by
-	 * the FeedCreator class used.
-	 */
-	var $additionalElements = Array();
-
-	// on hold
-	// var $source;
-}
-
-
-
-/**
- * An FeedImage may be added to a FeedCreator feed.
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- * @since 1.3
- */
-class FeedImage extends HtmlDescribable {
-	/**
-	 * Mandatory attributes of an image.
-	 */
-	var $title, $url, $link;
-	
-	/**
-	 * Optional attributes of an image.
-	 */
-	var $width, $height, $description;
-}
-
-
-
-/**
- * An HtmlDescribable is an item within a feed that can have a description that may
- * include HTML markup.
- */
-class HtmlDescribable {
-	/**
-	 * Indicates whether the description field should be rendered in HTML.
-	 */
-	var $descriptionHtmlSyndicated;
-	
-	/**
-	 * Indicates whether and to how many characters a description should be truncated.
-	 */
-	var $descriptionTruncSize;
-	
-	/**
-	 * Returns a formatted description field, depending on descriptionHtmlSyndicated and
-	 * $descriptionTruncSize properties
-	 * @return    string    the formatted description  
-	 */
-	function getDescription() {
-		$descriptionField = new FeedHtmlField($this->description);
-		$descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
-		$descriptionField->truncSize = $this->descriptionTruncSize;
-		return $descriptionField->output();
-	}
-
-}
-
-
-/**
- * An FeedHtmlField describes and generates
- * a feed, item or image html field (probably a description). Output is 
- * generated based on $truncSize, $syndicateHtml properties.
- * @author Pascal Van Hecke <feedcreator.class.php@vanhecke.info>
- * @version 1.6
- */
-class FeedHtmlField {
-	/**
-	 * Mandatory attributes of a FeedHtmlField.
-	 */
-	var $rawFieldContent;
-	
-	/**
-	 * Optional attributes of a FeedHtmlField.
-	 * 
-	 */
-	var $truncSize, $syndicateHtml;
-	
-	/**
-	 * Creates a new instance of FeedHtmlField.
-	 * @param  $string: if given, sets the rawFieldContent property
-	 */
-	function FeedHtmlField($parFieldContent) {
-		if ($parFieldContent) {
-			$this->rawFieldContent = $parFieldContent;
-		}
-	}
-		
-		
-	/**
-	 * Creates the right output, depending on $truncSize, $syndicateHtml properties.
-	 * @return string    the formatted field
-	 */
-	function output() {
-		// when field available and syndicated in html we assume 
-		// - valid html in $rawFieldContent and we enclose in CDATA tags
-		// - no truncation (truncating risks producing invalid html)
-		if (!$this->rawFieldContent) {
-			$result = "";
-		}	elseif ($this->syndicateHtml) {
-			$result = "<![CDATA[".$this->rawFieldContent."]]>";
-		} else {
-			if ($this->truncSize and is_int($this->truncSize)) {
-				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize);
-			} else {
-				$result = htmlspecialchars($this->rawFieldContent);
-			}
-		}
-		return $result;
-	}
-
-}
-
-
-
-/**
- * UniversalFeedCreator lets you choose during runtime which
- * format to build.
- * For general usage of a feed class, see the FeedCreator class
- * below or the example above.
- *
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class UniversalFeedCreator extends FeedCreator {
-	var $_feed;
-	
-	function _setFormat($format) {
-		switch (strtoupper($format)) {
-			
-			case "2.0":
-				// fall through
-			case "RSS2.0":
-				$this->_feed = new RSSCreator20();
-				break;
-			
-			case "1.0":
-				// fall through
-			case "RSS1.0":
-				$this->_feed = new RSSCreator10();
-				break;
-			
-			case "0.91":
-				// fall through
-			case "RSS0.91":
-				$this->_feed = new RSSCreator091();
-				break;
-			
-			case "PIE0.1":
-				$this->_feed = new PIECreator01();
-				break;
-			
-			case "MBOX":
-				$this->_feed = new MBOXCreator();
-				break;
-			
-			case "OPML":
-				$this->_feed = new OPMLCreator();
-				break;
-				
-			case "ATOM":
-				// fall through: always the latest ATOM version
-				
-			case "ATOM0.3":
-				$this->_feed = new AtomCreator03();
-				break;
-				
-			case "HTML":
-				$this->_feed = new HTMLCreator();
-				break;
-			
-			case "JS":
-				// fall through
-			case "JAVASCRIPT":
-				$this->_feed = new JSCreator();
-				break;
-			
-			default:
-				$this->_feed = new RSSCreator091();
-				break;
-		}
-        
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			// prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
-			if (!in_array($key, array("_feed", "contentType", "encoding"))) {
-				$this->_feed->{$key} = $this->{$key};
-			}
-		}
-	}
-	
-	/**
-	 * Creates a syndication feed based on the items previously added.
-	 *
-	 * @see        FeedCreator::addItem()
-	 * @param    string    format    format the feed should comply to. Valid values are:
-	 *			"PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
-	 * @return    string    the contents of the feed.
-	 */
-	function createFeed($format = "RSS0.91") {
-		$this->_setFormat($format);
-		return $this->_feed->createFeed();
-	}
-	
-	
-	
-	/**
-	 * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
-	 * header may be sent to redirect the use to the newly created file.
-	 * @since 1.4
-	 * 
-	 * @param	string	format	format the feed should comply to. Valid values are:
-	 *			"PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
-	 * @param	string	filename	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param	boolean	displayContents	optional	send the content of the file or not. If true, the file will be sent in the body of the response.
-	 */
-	function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
-		$this->_setFormat($format);
-		$this->_feed->saveFeed($filename, $displayContents);
-	}
-
-
-   /**
-    * Turns on caching and checks if there is a recent version of this feed in the cache.
-    * If there is, an HTTP redirect header is sent.
-    * To effectively use caching, you should create the FeedCreator object and call this method
-    * before anything else, especially before you do the time consuming task to build the feed
-    * (web fetching, for example).
-    *
-    * @param   string   format   format the feed should comply to. Valid values are:
-    *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
-    * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-    * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-    */
-   function useCached($format="RSS0.91", $filename="", $timeout=3600) {
-      $this->_setFormat($format);
-      $this->_feed->useCached($filename, $timeout);
-   }
-
-}
-
-
-/**
- * FeedCreator is the abstract base implementation for concrete
- * implementations that implement a specific format of syndication.
- *
- * @abstract
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- * @since 1.4
- */
-class FeedCreator extends HtmlDescribable {
-
-	/**
-	 * Mandatory attributes of a feed.
-	 */
-	var $title, $description, $link;
-	
-	
-	/**
-	 * Optional attributes of a feed.
-	 */
-	var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
-
-	/**
-	* The url of the external xsl stylesheet used to format the naked rss feed.
-	* Ignored in the output when empty.
-	*/
-	var $xslStyleSheet = "";
-	
-	
-	/**
-	 * @access private
-	 */
-	var $items = Array();
- 	
-	
-	/**
-	 * This feed's MIME content type.
-	 * @since 1.4
-	 * @access private
-	 */
-	var $contentType = "application/xml";
-	
-	
-	/**
-	 * This feed's character encoding.
-	 * @since 1.6.1
-	 **/
-	var $encoding = "ISO-8859-1";
-	
-	
-	/**
-	 * Any additional elements to include as an assiciated array. All $key => $value pairs
-	 * will be included unencoded in the feed in the form
-	 *     <$key>$value</$key>
-	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
-	 * if $value contains markup. This may be abused to embed tags not implemented by
-	 * the FeedCreator class used.
-	 */
-	var $additionalElements = Array();
-   
-    
-	/**
-	 * Adds an FeedItem to the feed.
-	 *
-	 * @param object FeedItem $item The FeedItem to add to the feed.
-	 * @access public
-	 */
-	function addItem($item) {
-		$this->items[] = $item;
-	}
-	
-	
-	/**
-	 * Truncates a string to a certain length at the most sensible point.
-	 * First, if there's a '.' character near the end of the string, the string is truncated after this character.
-	 * If there is no '.', the string is truncated after the last ' ' character.
-	 * If the string is truncated, " ..." is appended.
-	 * If the string is already shorter than $length, it is returned unchanged.
-	 * 
-	 * @static
-	 * @param string    string A string to be truncated.
-	 * @param int        length the maximum length the string should be truncated to
-	 * @return string    the truncated string
-	 */
-	function iTrunc($string, $length) {
-		if (strlen($string)<=$length) {
-			return $string;
-		}
-		
-		$pos = strrpos($string,".");
-		if ($pos>=$length-4) {
-			$string = substr($string,0,$length-4);
-			$pos = strrpos($string,".");
-		}
-		if ($pos>=$length*0.4) {
-			return substr($string,0,$pos+1)." ...";
-		}
-		
-		$pos = strrpos($string," ");
-		if ($pos>=$length-4) {
-			$string = substr($string,0,$length-4);
-			$pos = strrpos($string," ");
-		}
-		if ($pos>=$length*0.4) {
-			return substr($string,0,$pos)." ...";
-		}
-		
-		return substr($string,0,$length-4)." ...";
-			
-	}
-	
-	
-	/**
-	 * Creates a comment indicating the generator of this feed.
-	 * The format of this comment seems to be recognized by
-	 * Syndic8.com.
-	 */
-	function _createGeneratorComment() {
-		return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
-	}
-	
-	
-	/**
-	 * Creates a string containing all additional elements specified in
-	 * $additionalElements.
-	 * @param	elements	array	an associative array containing key => value pairs
-	 * @param indentString	string	a string that will be inserted before every generated line
-	 * @return    string    the XML tags corresponding to $additionalElements
-	 */
-	function _createAdditionalElements($elements, $indentString="") {
-		$ae = "";
-		if (is_array($elements)) {
-			foreach($elements AS $key => $value) {
-				$ae.= $indentString."<$key>$value</$key>\n";
-			}
-		}
-		return $ae;
-	}
-	
-	function _createStylesheetReferences() {
-		$xml = "";
-		if ($this->cssStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
-		if ($this->xslStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n";
-		return $xml;
-	}
-	
-	
-	/**
-	 * Builds the feed's text.
-	 * @abstract
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {
-	}
-	
-	/**
-	 * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
-	 * For example:
-	 * 
-	 * echo $_SERVER["PHP_SELF"]."\n";
-	 * echo FeedCreator::_generateFilename();
-	 * 
-	 * would produce:
-	 * 
-	 * /rss/latestnews.php
-	 * latestnews.xml
-	 *
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
-	}
-	
-	
-	/**
-	 * @since 1.4
-	 * @access private
-	 */
-	function _redirect($filename) {
-		// attention, heavily-commented-out-area
-		
-		// maybe use this in addition to file time checking
-		//Header("Expires: ".date("r",time()+$this->_timeout));
-		
-		/* no caching at all, doesn't seem to work as good:
-		Header("Cache-Control: no-cache");
-		Header("Pragma: no-cache");
-		*/
-		
-		// HTTP redirect, some feed readers' simple HTTP implementations don't follow it
-		//Header("Location: ".$filename);
-
-		//Header("Content-Type: ".$this->contentType."; charset=".$this->encoding."; filename=".basename($filename));
-		Header("Content-Type: ".$this->contentType."; charset=".$this->encoding);
-		Header("Content-Disposition: inline; filename=".basename($filename));
-		readfile($filename, "r");
-		die();
-	}
-    
-	/**
-	 * Turns on caching and checks if there is a recent version of this feed in the cache.
-	 * If there is, an HTTP redirect header is sent.
-	 * To effectively use caching, you should create the FeedCreator object and call this method
-	 * before anything else, especially before you do the time consuming task to build the feed
-	 * (web fetching, for example).
-	 * @since 1.4
-	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param timeout	int		optional	the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-	 */
-	function useCached($filename="", $timeout=3600) {
-		$this->_timeout = $timeout;
-		if ($filename=="") {
-			$filename = $this->_generateFilename();
-		}
-		if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) {
-			$this->_redirect($filename);
-		}
-	}
-	
-	
-	/**
-	 * Saves this feed as a file on the local disk. After the file is saved, a redirect
-	 * header may be sent to redirect the user to the newly created file.
-	 * @since 1.4
-	 * 
-	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-	 * @param redirect	boolean	optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
-	 */
-	function saveFeed($filename="", $displayContents=true) {
-		if ($filename=="") {
-			$filename = $this->_generateFilename();
-		}
-		$feedFile = @fopen($filename, "w+");
-		if ($feedFile) {
-			fputs($feedFile,$this->createFeed());
-			fclose($feedFile);
-			if ($displayContents) {
-				$this->_redirect($filename);
-			}
-		} else {
-			echo "<br /><b>Error creating feed file, please check write permissions.</b><br />";
-		}
-	}
-	
-}
-
-
-/**
- * FeedDate is an internal class that stores a date for a feed or feed item.
- * Usually, you won't need to use this.
- */
-class FeedDate {
-	var $unix;
-	
-	/**
-	 * Creates a new instance of FeedDate representing a given date.
-	 * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
-	 * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
-	 */
-	function FeedDate($dateString="") {
-		if ($dateString=="") $dateString = date("r");
-		
-		if (is_integer($dateString)) {
-			$this->unix = $dateString;
-			return;
-		}
-		if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",$dateString,$matches)) {
-			$months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12);
-			$this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]);
-			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
-			} else {
-				if (strlen($matches[7])==1) {
-					$oneHour = 3600;
-					$ord = ord($matches[7]);
-					if ($ord < ord("M")) {
-						$tzOffset = (ord("A") - $ord - 1) * $oneHour;
-					} elseif ($ord >= ord("M") AND $matches[7]!="Z") {
-						$tzOffset = ($ord - ord("M")) * $oneHour;
-					} elseif ($matches[7]=="Z") {
-						$tzOffset = 0;
-					}
-				}
-				switch ($matches[7]) {
-					case "UT":
-					case "GMT":	$tzOffset = 0;
-				}
-			}
-			$this->unix += $tzOffset;
-			return;
-		}
-		if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) {
-			$this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
-			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
-			} else {
-				if ($matches[7]=="Z") {
-					$tzOffset = 0;
-				}
-			}
-			$this->unix += $tzOffset;
-			return;
-		}
-		$this->unix = 0;
-	}
-
-	/**
-	 * Gets the date stored in this FeedDate as an RFC 822 date.
-	 *
-	 * @return a date in RFC 822 format
-	 */
-	function rfc822() {
-		//return gmdate("r",$this->unix);
-		$date = gmdate("D, d M Y H:i:s", $this->unix);
-		if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE);
-		return $date;
-	}
-	
-	/**
-	 * Gets the date stored in this FeedDate as an ISO 8601 date.
-	 *
-	 * @return a date in ISO 8601 format
-	 */
-	function iso8601() {
-		$date = gmdate("Y-m-d\TH:i:sO",$this->unix);
-		$date = substr($date,0,22) . ':' . substr($date,-2);
-		if (TIME_ZONE!="") $date = str_replace("+00:00",TIME_ZONE,$date);
-		return $date;
-	}
-	
-	/**
-	 * Gets the date stored in this FeedDate as unix time stamp.
-	 *
-	 * @return a date as a unix time stamp
-	 */
-	function unix() {
-		return $this->unix;
-	}
-}
-
-
-/**
- * RSSCreator10 is a FeedCreator that implements RDF Site Summary (RSS) 1.0.
- *
- * @see http://www.purl.org/rss/1.0/
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class RSSCreator10 extends FeedCreator {
-
-	/**
-	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
-	 * The feed will contain all items previously added in the same order.
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {     
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		if ($this->cssStyleSheet=="") {
-			$cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
-		}
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<rdf:RDF\n";
-		$feed.= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
-		$feed.= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"; 
-		$feed.= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
-		$feed.= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
-		$feed.= "    <channel rdf:about=\"".$this->syndicationURL."\">\n";
-		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
-		$feed.= "        <description>".htmlspecialchars($this->description)."</description>\n";
-		$feed.= "        <link>".$this->link."</link>\n";
-		if ($this->image!=null) {
-			$feed.= "        <image rdf:resource=\"".$this->image->url."\" />\n";
-		}
-		$now = new FeedDate();
-		$feed.= "       <dc:date>".htmlspecialchars($now->iso8601())."</dc:date>\n";
-		$feed.= "        <items>\n";
-		$feed.= "            <rdf:Seq>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
-		}
-		$feed.= "            </rdf:Seq>\n";
-		$feed.= "        </items>\n";
-		$feed.= "    </channel>\n";
-		if ($this->image!=null) {
-			$feed.= "    <image rdf:about=\"".$this->image->url."\">\n";
-			$feed.= "        <title>".$this->image->title."</title>\n";
-			$feed.= "        <link>".$this->image->link."</link>\n";
-			$feed.= "        <url>".$this->image->url."</url>\n";
-			$feed.= "    </image>\n";
-		}
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-		
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
-			//$feed.= "        <dc:type>Posting</dc:type>\n";
-			$feed.= "        <dc:format>text/html</dc:format>\n";
-			if ($this->items[$i]->date!=null) {
-				$itemDate = new FeedDate($this->items[$i]->date);
-				$feed.= "        <dc:date>".htmlspecialchars($itemDate->iso8601())."</dc:date>\n";
-			}
-			if ($this->items[$i]->source!="") {
-				$feed.= "        <dc:source>".htmlspecialchars($this->items[$i]->source)."</dc:source>\n";
-			}
-			if ($this->items[$i]->author!="") {
-				$feed.= "        <dc:creator>".htmlspecialchars($this->items[$i]->author)."</dc:creator>\n";
-			}
-			$feed.= "        <title>".htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")))."</title>\n";
-			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
-			$feed.= "        <description>".htmlspecialchars($this->items[$i]->description)."</description>\n";
-			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
-			$feed.= "    </item>\n";
-		}
-		$feed.= "</rdf:RDF>\n";
-		return $feed;
-	}
-}
-
-
-
-/**
- * RSSCreator091 is a FeedCreator that implements RSS 0.91 Spec, revision 3.
- *
- * @see http://my.netscape.com/publish/formats/rss-spec-0.91.html
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class RSSCreator091 extends FeedCreator {
-
-	/**
-	 * Stores this RSS feed's version number.
-	 * @access private
-	 */
-	var $RSSVersion;
-
-	function RSSCreator091() {
-		$this->_setRSSVersion("0.91");
-		$this->contentType = "application/rss+xml";
-	}
-	
-	/**
-	 * Sets this RSS feed's version number.
-	 * @access private
-	 */
-	function _setRSSVersion($version) {
-		$this->RSSVersion = $version;
-	}
-
-	/**
-	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
-	 * The feed will contain all items previously added in the same order.
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<rss version=\"".$this->RSSVersion."\">\n"; 
-		$feed.= "    <channel>\n";
-		$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
-		$this->descriptionTruncSize = 500;
-		$feed.= "        <description>".$this->getDescription()."</description>\n";
-		$feed.= "        <link>".$this->link."</link>\n";
-		$now = new FeedDate();
-		$feed.= "        <lastBuildDate>".htmlspecialchars($now->rfc822())."</lastBuildDate>\n";
-		$feed.= "        <generator>".FEEDCREATOR_VERSION."</generator>\n";
-
-		if ($this->image!=null) {
-			$feed.= "        <image>\n";
-			$feed.= "            <url>".$this->image->url."</url>\n"; 
-			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars($this->image->title),100)."</title>\n"; 
-			$feed.= "            <link>".$this->image->link."</link>\n";
-			if ($this->image->width!="") {
-				$feed.= "            <width>".$this->image->width."</width>\n";
-			}
-			if ($this->image->height!="") {
-				$feed.= "            <height>".$this->image->height."</height>\n";
-			}
-			if ($this->image->description!="") {
-				$feed.= "            <description>".$this->image->getDescription()."</description>\n";
-			}
-			$feed.= "        </image>\n";
-		}
-		if ($this->language!="") {
-			$feed.= "        <language>".$this->language."</language>\n";
-		}
-		if ($this->copyright!="") {
-			$feed.= "        <copyright>".FeedCreator::iTrunc(htmlspecialchars($this->copyright),100)."</copyright>\n";
-		}
-		if ($this->editor!="") {
-			$feed.= "        <managingEditor>".FeedCreator::iTrunc(htmlspecialchars($this->editor),100)."</managingEditor>\n";
-		}
-		if ($this->webmaster!="") {
-			$feed.= "        <webMaster>".FeedCreator::iTrunc(htmlspecialchars($this->webmaster),100)."</webMaster>\n";
-		}
-		if ($this->pubDate!="") {
-			$pubDate = new FeedDate($this->pubDate);
-			$feed.= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
-		}
-		if ($this->category!="") {
-			$feed.= "        <category>".htmlspecialchars($this->category)."</category>\n";
-		}
-		if ($this->docs!="") {
-			$feed.= "        <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."</docs>\n";
-		}
-		if ($this->ttl!="") {
-			$feed.= "        <ttl>".htmlspecialchars($this->ttl)."</ttl>\n";
-		}
-		if ($this->rating!="") {
-			$feed.= "        <rating>".FeedCreator::iTrunc(htmlspecialchars($this->rating),500)."</rating>\n";
-		}
-		if ($this->skipHours!="") {
-			$feed.= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
-		}
-		if ($this->skipDays!="") {
-			$feed.= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
-		}
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "        <item>\n";
-			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
-			$feed.= "            <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
-			$feed.= "            <description>".$this->items[$i]->getDescription()."</description>\n";
-			
-			if ($this->items[$i]->author!="") {
-				$feed.= "            <author>".htmlspecialchars($this->items[$i]->author)."</author>\n";
-			}
-			/*
-			// on hold
-			if ($this->items[$i]->source!="") {
-					$feed.= "            <source>".htmlspecialchars($this->items[$i]->source)."</source>\n";
-			}
-			*/
-			if ($this->items[$i]->category!="") {
-				$feed.= "            <category>".htmlspecialchars($this->items[$i]->category)."</category>\n";
-			}
-			if ($this->items[$i]->comments!="") {
-				$feed.= "            <comments>".htmlspecialchars($this->items[$i]->comments)."</comments>\n";
-			}
-			if ($this->items[$i]->date!="") {
-			$itemDate = new FeedDate($this->items[$i]->date);
-				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
-			}
-			if ($this->items[$i]->guid!="") {
-				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
-			}
-			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
-			$feed.= "        </item>\n";
-		}
-		$feed.= "    </channel>\n";
-		$feed.= "</rss>\n";
-		return $feed;
-	}
-}
-
-
-
-/**
- * RSSCreator20 is a FeedCreator that implements RDF Site Summary (RSS) 2.0.
- *
- * @see http://backend.userland.com/rss
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class RSSCreator20 extends RSSCreator091 {
-
-    function RSSCreator20() {
-        parent::_setRSSVersion("2.0");
-    }
-    
-}
-
-
-/**
- * PIECreator01 is a FeedCreator that implements the emerging PIE specification,
- * as in http://intertwingly.net/wiki/pie/Syntax.
- *
- * @deprecated
- * @since 1.3
- * @author Scott Reynen <scott@randomchaos.com> and Kai Blankenhorn <kaib@bitfolge.de>
- */
-class PIECreator01 extends FeedCreator {
-	
-	function PIECreator01() {
-		$this->encoding = "utf-8";
-	}
-    
-	function createFeed() {
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n"; 
-		$feed.= "    <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
-		$this->truncSize = 500;
-		$feed.= "    <subtitle>".$this->getDescription()."</subtitle>\n";
-		$feed.= "    <link>".$this->link."</link>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <entry>\n";
-			$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
-			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
-			$itemDate = new FeedDate($this->items[$i]->date);
-			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
-			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
-			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
-			$feed.= "        <id>".htmlspecialchars($this->items[$i]->guid)."</id>\n";
-			if ($this->items[$i]->author!="") {
-				$feed.= "        <author>\n";
-				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
-				if ($this->items[$i]->authorEmail!="") {
-					$feed.= "            <email>".$this->items[$i]->authorEmail."</email>\n";
-				}
-				$feed.="        </author>\n";
-			}
-			$feed.= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
-			$feed.= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n";
-			$feed.= "        </content>\n";
-			$feed.= "    </entry>\n";
-		}
-		$feed.= "</feed>\n";
-		return $feed;
-	}
-}
-
-
-/**
- * AtomCreator03 is a FeedCreator that implements the atom specification,
- * as in http://www.intertwingly.net/wiki/pie/FrontPage.
- * Please note that just by using AtomCreator03 you won't automatically
- * produce valid atom files. For example, you have to specify either an editor
- * for the feed or an author for every single feed item.
- *
- * Some elements have not been implemented yet. These are (incomplete list):
- * author URL, item author's email and URL, item contents, alternate links, 
- * other link content types than text/html. Some of them may be created with
- * AtomCreator03::additionalElements.
- *
- * @see FeedCreator#additionalElements
- * @since 1.6
- * @author Kai Blankenhorn <kaib@bitfolge.de>, Scott Reynen <scott@randomchaos.com>
- */
-class AtomCreator03 extends FeedCreator {
-
-	function AtomCreator03() {
-		$this->contentType = "application/atom+xml";
-		$this->encoding = "utf-8";
-	}
-	
-	function createFeed() {
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
-		if ($this->language!="") {
-			$feed.= " xml:lang=\"".$this->language."\"";
-		}
-		$feed.= ">\n"; 
-		$feed.= "    <title>".htmlspecialchars($this->title)."</title>\n";
-		$feed.= "    <tagline>".htmlspecialchars($this->description)."</tagline>\n";
-		$feed.= "    <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
-		$feed.= "    <id>".htmlspecialchars($this->link)."</id>\n";
-		$now = new FeedDate();
-		$feed.= "    <modified>".htmlspecialchars($now->iso8601())."</modified>\n";
-		if ($this->editor!="") {
-			$feed.= "    <author>\n";
-			$feed.= "        <name>".$this->editor."</name>\n";
-			if ($this->editorEmail!="") {
-				$feed.= "        <email>".$this->editorEmail."</email>\n";
-			}
-			$feed.= "    </author>\n";
-		}
-		$feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <entry>\n";
-			$feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
-			$feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
-			if ($this->items[$i]->date=="") {
-				$this->items[$i]->date = time();
-			}
-			$itemDate = new FeedDate($this->items[$i]->date);
-			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
-			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
-			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
-			$feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
-			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
-			if ($this->items[$i]->author!="") {
-				$feed.= "        <author>\n";
-				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
-				$feed.= "        </author>\n";
-			}
-			if ($this->items[$i]->description!="") {
-				$feed.= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
-			}
-			$feed.= "    </entry>\n";
-		}
-		$feed.= "</feed>\n";
-		return $feed;
-	}
-}
-
-
-/**
- * MBOXCreator is a FeedCreator that implements the mbox format
- * as described in http://www.qmail.org/man/man5/mbox.html
- *
- * @since 1.3
- * @author Kai Blankenhorn <kaib@bitfolge.de>
- */
-class MBOXCreator extends FeedCreator {
-
-	function MBOXCreator() {
-		$this->contentType = "text/plain";
-		$this->encoding = "ISO-8859-15";
-	}
-    
-	function qp_enc($input = "", $line_max = 76) { 
-		$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); 
-		$lines = preg_split("/(?:\r\n|\r|\n)/", $input); 
-		$eol = "\r\n"; 
-		$escape = "="; 
-		$output = ""; 
-		while( list(, $line) = each($lines) ) { 
-			//$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary 
-			$linlen = strlen($line); 
-			$newline = ""; 
-			for($i = 0; $i < $linlen; $i++) { 
-				$c = substr($line, $i, 1); 
-				$dec = ord($c); 
-				if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only 
-					$c = "=20"; 
-				} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required 
-					$h2 = floor($dec/16); $h1 = floor($dec%16); 
-					$c = $escape.$hex["$h2"].$hex["$h1"]; 
-				} 
-				if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted 
-					$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay 
-					$newline = ""; 
-				} 
-				$newline .= $c; 
-			} // end of for 
-			$output .= $newline.$eol; 
-		} 
-		return trim($output); 
-	}
-	
-
-	/**
-	 * Builds the MBOX contents.
-	 * @return    string    the feed's complete text 
-	 */
-	function createFeed() {
-		for ($i=0;$i<count($this->items);$i++) {
-			if ($this->items[$i]->author!="") {
-				$from = $this->items[$i]->author;
-			} else {
-				$from = $this->title;
-			}
-			$itemDate = new FeedDate($this->items[$i]->date);
-			$feed.= "From ".strtr(MBOXCreator::qp_enc($from)," ","_")." ".date("D M d H:i:s Y",$itemDate->unix())."\n";
-			$feed.= "Content-Type: text/plain;\n";
-			$feed.= "	charset=\"".$this->encoding."\"\n";
-			$feed.= "Content-Transfer-Encoding: quoted-printable\n";
-			$feed.= "Content-Type: text/plain\n";
-			$feed.= "From: \"".MBOXCreator::qp_enc($from)."\"\n";
-			$feed.= "Date: ".$itemDate->rfc822()."\n";
-			$feed.= "Subject: ".MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title,100))."\n";
-			$feed.= "\n";
-			$body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
-			$feed.= preg_replace("~\nFrom ([^\n]*)(\n?)~","\n>From $1$2\n",$body);
-			$feed.= "\n";
-			$feed.= "\n";
-		}
-		return $feed;
-	}
-	
-	/**
-	 * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox";
-	}
-}
-
-
-/**
- * OPMLCreator is a FeedCreator that implements OPML 1.0.
- * 
- * @see http://opml.scripting.com/spec
- * @author Dirk Clemens, Kai Blankenhorn
- * @since 1.5
- */
-class OPMLCreator extends FeedCreator {
-
-	function OPMLCreator() {
-		$this->encoding = "utf-8";
-	}
-    
-	function createFeed() {     
-		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		$feed.= $this->_createStylesheetReferences();
-		$feed.= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
-		$feed.= "    <head>\n";
-		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
-		if ($this->pubDate!="") {
-			$date = new FeedDate($this->pubDate);
-			$feed.= "         <dateCreated>".$date->rfc822()."</dateCreated>\n";
-		}
-		if ($this->lastBuildDate!="") {
-			$date = new FeedDate($this->lastBuildDate);
-			$feed.= "         <dateModified>".$date->rfc822()."</dateModified>\n";
-		}
-		if ($this->editor!="") {
-			$feed.= "         <ownerName>".$this->editor."</ownerName>\n";
-		}
-		if ($this->editorEmail!="") {
-			$feed.= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
-		}
-		$feed.= "    </head>\n";
-		$feed.= "    <body>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <outline type=\"rss\" ";
-			$title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")));
-			$feed.= " title=\"".$title."\"";
-			$feed.= " text=\"".$title."\"";
-			//$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
-			$feed.= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
-			$feed.= "/>\n";
-		}
-		$feed.= "    </body>\n";
-		$feed.= "</opml>\n";
-		return $feed;
-	}
-}
-
-
-
-/**
- * HTMLCreator is a FeedCreator that writes an HTML feed file to a specific 
- * location, overriding the createFeed method of the parent FeedCreator.
- * The HTML produced can be included over http by scripting languages, or serve
- * as the source for an IFrame.
- * All output by this class is embedded in <div></div> tags to enable formatting
- * using CSS. 
- *
- * @author Pascal Van Hecke
- * @since 1.7
- */
-class HTMLCreator extends FeedCreator {
-
-	var $contentType = "text/html";
-	
-	/**
-	 * Contains HTML to be output at the start of the feed's html representation.
-	 */
-	var $header;
-	
-	/**
-	 * Contains HTML to be output at the end of the feed's html representation.
-	 */
-	var $footer ;
-	
-	/**
-	 * Contains HTML to be output between entries. A separator is only used in 
-	 * case of multiple entries.
-	 */
-	var $separator;
-	
-	/**
-	 * Used to prefix the stylenames to make sure they are unique 
-	 * and do not clash with stylenames on the users' page.
-	 */
-	var $stylePrefix;
-	
-	/**
-	 * Determines whether the links open in a new window or not.
-	 */
-	var $openInNewWindow = true;
-	
-	var $imageAlign ="right";
-	
-	/**
-	 * In case of very simple output you may want to get rid of the style tags,
-	 * hence this variable.  There's no equivalent on item level, but of course you can 
-	 * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
-	 * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
-	 * in the function createFeed().
-	 */
-	var $stylelessOutput ="";
-
-	/**
-	 * Writes the HTML.
-	 * @return    string    the scripts's complete text 
-	 */
-	function createFeed() {
-		// if there is styleless output, use the content of this variable and ignore the rest
-		if ($this->stylelessOutput!="") {
-			return $this->stylelessOutput;
-		}
-		
-		//if no stylePrefix is set, generate it yourself depending on the script name
-		if ($this->stylePrefix=="") {
-			$this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_";
-		}
-
-		//set an openInNewWindow_token_to be inserted or not
-		if ($this->openInNewWindow) {
-			$targetInsert = " target='_blank'";
-		}
-		
-		// use this array to put the lines in and implode later with "document.write" javascript
-		$feedArray = array();
-		if ($this->image!=null) {
-			$imageStr = "<a href='".$this->image->link."'".$targetInsert.">".
-							"<img src='".$this->image->url."' border='0' alt='".
-							FeedCreator::iTrunc(htmlspecialchars($this->image->title),100).
-							"' align='".$this->imageAlign."' ";
-			if ($this->image->width) {
-				$imageStr .=" width='".$this->image->width. "' ";
-			}
-			if ($this->image->height) {
-				$imageStr .=" height='".$this->image->height."' ";
-			}
-			$imageStr .="/></a>";
-			$feedArray[] = $imageStr;
-		}
-		
-		if ($this->title) {
-			$feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".
-				FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</a></div>";
-		}
-		if ($this->getDescription()) {
-			$feedArray[] = "<div class='".$this->stylePrefix."description'>".
-				str_replace("]]>", "", str_replace("<![CDATA[", "", $this->getDescription())).
-				"</div>";
-		}
-		
-		if ($this->header) {
-			$feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header."</div>";
-		}
-		
-		for ($i=0;$i<count($this->items);$i++) {
-			if ($this->separator and $i > 0) {
-				$feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator."</div>";
-			}
-			
-			if ($this->items[$i]->title) {
-				if ($this->items[$i]->link) {
-					$feedArray[] = 
-						"<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix.
-						"item_title'".$targetInsert.">".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
-						"</a></div>";
-				} else {
-					$feedArray[] = 
-						"<div class='".$this->stylePrefix."item_title'>".
-						FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
-						"</div>";
-				}
-			}
-			if ($this->items[$i]->getDescription()) {
-				$feedArray[] = 
-				"<div class='".$this->stylePrefix."item_description'>".
-					str_replace("]]>", "", str_replace("<![CDATA[", "", $this->items[$i]->getDescription())).
-					"</div>";
-			}
-		}
-		if ($this->footer) {
-			$feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer."</div>";
-		}
-		
-		$feed= "".join($feedArray, "\r\n");
-		return $feed;
-	}
-    
-	/**
-	 * Overrrides parent to produce .html extensions
-	 *
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html";
-	}
-}	
-
-
-/**
- * JSCreator is a class that writes a js file to a specific 
- * location, overriding the createFeed method of the parent HTMLCreator.
- *
- * @author Pascal Van Hecke
- */
-class JSCreator extends HTMLCreator {
-	var $contentType = "text/javascript";
-	
-	/**
-	 * writes the javascript
-	 * @return    string    the scripts's complete text 
-	 */
-	function createFeed() 
-	{
-		$feed = parent::createFeed();
-		$feedArray = explode("\n",$feed);
-		
-		$jsFeed = "";
-		foreach ($feedArray as $value) {
-			$jsFeed .= "document.write('".trim(addslashes($value))."');\n";
-		}
-		return $jsFeed;
-	}
-    
-	/**
-	 * Overrrides parent to produce .js extensions
-	 *
-	 * @return string the feed cache filename
-	 * @since 1.4
-	 * @access private
-	 */
-	function _generateFilename() {
-		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
-	}
-	
-}	
-
-
-
-/*** TEST SCRIPT *********************************************************
-
-//include("feedcreator.class.php"); 
-
-$rss = new UniversalFeedCreator(); 
-$rss->useCached(); 
-$rss->title = "PHP news"; 
-$rss->description = "daily news from the PHP scripting world"; 
-
-//optional
-//$rss->descriptionTruncSize = 500;
-//$rss->descriptionHtmlSyndicated = true;
-//$rss->xslStyleSheet = "http://feedster.com/rss20.xsl";
-
-$rss->link = "http://www.dailyphp.net/news"; 
-$rss->feedURL = "http://www.dailyphp.net/".$PHP_SELF; 
-
-$image = new FeedImage(); 
-$image->title = "dailyphp.net logo"; 
-$image->url = "http://www.dailyphp.net/images/logo.gif"; 
-$image->link = "http://www.dailyphp.net"; 
-$image->description = "Feed provided by dailyphp.net. Click to visit."; 
-
-//optional
-$image->descriptionTruncSize = 500;
-$image->descriptionHtmlSyndicated = true;
-
-$rss->image = $image; 
-
-// get your news items from somewhere, e.g. your database: 
-//mysql_select_db($dbHost, $dbUser, $dbPass); 
-//$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC"); 
-//while ($data = mysql_fetch_object($res)) { 
-	$item = new FeedItem(); 
-	$item->title = "This is an the test title of an item"; 
-	$item->link = "http://localhost/item/"; 
-	$item->description = "<b>description in </b><br/>HTML"; 
-	
-	//optional
-	//item->descriptionTruncSize = 500;
-	$item->descriptionHtmlSyndicated = true;
-	
-	$item->date = time(); 
-	$item->source = "http://www.dailyphp.net"; 
-	$item->author = "John Doe"; 
-	 
-	$rss->addItem($item); 
-//} 
-
-// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1, MBOX, OPML, ATOM0.3, HTML, JS
-echo $rss->saveFeed("RSS0.91", "feed.xml"); 
-
-
-
-***************************************************************************/
-
-?>
+<?php
+/***************************************************************************
+
+FeedCreator class v1.7.2
+originally (c) Kai Blankenhorn
+www.bitfolge.de
+kaib@bitfolge.de
+v1.3 work by Scott Reynen (scott@randomchaos.com) and Kai Blankenhorn
+v1.5 OPML support by Dirk Clemens
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+****************************************************************************
+
+
+Changelog:
+13-04-2006 Neil Thompson (neilt)
+	added functionality for Atom 1.0
+
+v1.7.2	10-11-04
+	license changed to LGPL
+
+v1.7.1
+	fixed a syntax bug
+	fixed left over debug code
+
+v1.7	07-18-04
+	added HTML and JavaScript feeds (configurable via CSS) (thanks to Pascal Van Hecke)
+	added HTML descriptions for all feed formats (thanks to Pascal Van Hecke)
+	added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
+	changed default content-type to application/xml
+	added character encoding setting
+	fixed numerous smaller bugs (thanks to Sren Fuhrmann of golem.de)
+	improved changing ATOM versions handling (thanks to August Trometer)
+	improved the UniversalFeedCreator's useCached method (thanks to Sren Fuhrmann of golem.de)
+	added charset output in HTTP headers (thanks to Sren Fuhrmann of golem.de)
+	added Slashdot namespace to RSS 1.0 (thanks to Sren Fuhrmann of golem.de)
+
+v1.6	05-10-04
+	added stylesheet to RSS 1.0 feeds
+	fixed generator comment (thanks Kevin L. Papendick and Tanguy Pruvot)
+	fixed RFC822 date bug (thanks Tanguy Pruvot)
+	added TimeZone customization for RFC8601 (thanks Tanguy Pruvot)
+	fixed Content-type could be empty (thanks Tanguy Pruvot)
+	fixed author/creator in RSS1.0 (thanks Tanguy Pruvot)
+
+v1.6 beta	02-28-04
+	added Atom 0.3 support (not all features, though)
+	improved OPML 1.0 support (hopefully - added more elements)
+	added support for arbitrary additional elements (use with caution)
+	code beautification :-)
+	considered beta due to some internal changes
+
+v1.5.1	01-27-04
+	fixed some RSS 1.0 glitches (thanks to Stphane Vanpoperynghe)
+	fixed some inconsistencies between documentation and code (thanks to Timothy Martin)
+
+v1.5	01-06-04
+	added support for OPML 1.0
+	added more documentation
+
+v1.4	11-11-03
+	optional feed saving and caching
+	improved documentation
+	minor improvements
+
+v1.3    10-02-03
+	renamed to FeedCreator, as it not only creates RSS anymore
+	added support for mbox
+	tentative support for echo/necho/atom/pie/???
+
+v1.2    07-20-03
+	intelligent auto-truncating of RSS 0.91 attributes
+	don't create some attributes when they're not set
+	documentation improved
+	fixed a real and a possible bug with date conversions
+	code cleanup
+
+v1.1    06-29-03
+	added images to feeds
+	now includes most RSS 0.91 attributes
+	added RSS 2.0 feeds
+
+v1.0    06-24-03
+	initial release
+
+
+
+***************************************************************************/
+
+/*** GENERAL USAGE *********************************************************
+
+include("feedcreator.class.php");
+
+$rss = new UniversalFeedCreator();
+$rss->useCached(); // use cached version if age<1 hour
+$rss->title = "PHP news";
+$rss->description = "daily news from the PHP scripting world";
+
+//optional
+$rss->descriptionTruncSize = 500;
+$rss->descriptionHtmlSyndicated = true;
+
+$rss->link = "http://www.dailyphp.net/news";
+$rss->syndicationURL = "http://www.dailyphp.net/".$_SERVER["PHP_SELF"];
+
+$image = new FeedImage();
+$image->title = "dailyphp.net logo";
+$image->url = "http://www.dailyphp.net/images/logo.gif";
+$image->link = "http://www.dailyphp.net";
+$image->description = "Feed provided by dailyphp.net. Click to visit.";
+
+//optional
+$image->descriptionTruncSize = 500;
+$image->descriptionHtmlSyndicated = true;
+
+$rss->image = $image;
+
+// get your news items from somewhere, e.g. your database:
+mysql_select_db($dbHost, $dbUser, $dbPass);
+$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC");
+while ($data = mysql_fetch_object($res)) {
+    $item = new FeedItem();
+    $item->title = $data->title;
+    $item->link = $data->url;
+    $item->description = $data->short;
+
+    //optional
+    item->descriptionTruncSize = 500;
+    item->descriptionHtmlSyndicated = true;
+
+    $item->date = $data->newsdate;
+    $item->source = "http://www.dailyphp.net";
+    $item->author = "John Doe";
+
+    $rss->addItem($item);
+}
+
+// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1 (deprecated),
+// MBOX, OPML, ATOM1.0, HTML, JS
+echo $rss->saveFeed("RSS1.0", "news/feed.xml");
+
+
+***************************************************************************
+*          A little setup                                                 *
+**************************************************************************/
+
+// no direct access
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+
+// your local timezone, set to "" to disable or for GMT
+define("TIME_ZONE","+01:00");
+
+
+
+/**
+ * Version string.
+ **/
+define("FEEDCREATOR_VERSION", "FeedCreator 1.7.2");
+
+
+
+/**
+ * A FeedItem is a part of a FeedCreator feed.
+ *
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.3
+ */
+class FeedItem extends HtmlDescribable {
+	/**
+	 * Mandatory attributes of an item.
+	 */
+	var $title, $description, $link;
+
+	/**
+	 * Optional attributes of an item.
+	 */
+	var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
+
+	/**
+	 * Publishing date of an item. May be in one of the following formats:
+	 *
+	 *	RFC 822:
+	 *	"Mon, 20 Jan 03 18:05:41 +0400"
+	 *	"20 Jan 03 18:05:41 +0000"
+	 *
+	 *	ISO 8601:
+	 *	"2003-01-20T18:05:41+04:00"
+	 *
+	 *	Unix:
+	 *	1043082341
+	 */
+	var $date;
+
+	/**
+	 * Any additional elements to include as an assiciated array. All $key => $value pairs
+	 * will be included unencoded in the feed item in the form
+	 *     <$key>$value</$key>
+	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
+	 * if $value contains markup. This may be abused to embed tags not implemented by
+	 * the FeedCreator class used.
+	 */
+	var $additionalElements = Array();
+
+	// on hold
+	// var $source;
+}
+
+
+
+/**
+ * An FeedImage may be added to a FeedCreator feed.
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.3
+ */
+class FeedImage extends HtmlDescribable {
+	/**
+	 * Mandatory attributes of an image.
+	 */
+	var $title, $url, $link;
+
+	/**
+	 * Optional attributes of an image.
+	 */
+	var $width, $height, $description;
+}
+
+
+
+/**
+ * An HtmlDescribable is an item within a feed that can have a description that may
+ * include HTML markup.
+ */
+class HtmlDescribable {
+	/**
+	 * Indicates whether the description field should be rendered in HTML.
+	 */
+	var $descriptionHtmlSyndicated;
+
+	/**
+	 * Indicates whether and to how many characters a description should be truncated.
+	 */
+	var $descriptionTruncSize;
+
+	/**
+	 * Returns a formatted description field, depending on descriptionHtmlSyndicated and
+	 * $descriptionTruncSize properties
+	 * @return    string    the formatted description
+	 */
+	function getDescription() {
+		$descriptionField = new FeedHtmlField($this->description);
+		$descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
+		$descriptionField->truncSize = $this->descriptionTruncSize;
+		return $descriptionField->output();
+	}
+
+}
+
+
+/**
+ * An FeedHtmlField describes and generates
+ * a feed, item or image html field (probably a description). Output is
+ * generated based on $truncSize, $syndicateHtml properties.
+ * @author Pascal Van Hecke <feedcreator.class.php@vanhecke.info>
+ * @version 1.6
+ */
+class FeedHtmlField {
+	/**
+	 * Mandatory attributes of a FeedHtmlField.
+	 */
+	var $rawFieldContent;
+
+	/**
+	 * Optional attributes of a FeedHtmlField.
+	 *
+	 */
+	var $truncSize, $syndicateHtml;
+
+	/**
+	 * Creates a new instance of FeedHtmlField.
+	 * @param  $string: if given, sets the rawFieldContent property
+	 */
+	function FeedHtmlField($parFieldContent) {
+		if ($parFieldContent) {
+			$this->rawFieldContent = $parFieldContent;
+		}
+	}
+
+
+	/**
+	 * Creates the right output, depending on $truncSize, $syndicateHtml properties.
+	 * @return string    the formatted field
+	 */
+	function output() {
+		// when field available and syndicated in html we assume
+		// - valid html in $rawFieldContent and we enclose in CDATA tags
+		// - no truncation (truncating risks producing invalid html)
+		if (!$this->rawFieldContent) {
+			$result = "";
+		}	elseif ($this->syndicateHtml) {
+			$result = "<![CDATA[".$this->rawFieldContent."]]>";
+		} else {
+			if ($this->truncSize and is_int($this->truncSize)) {
+				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize);
+			} else {
+				$result = htmlspecialchars($this->rawFieldContent);
+			}
+		}
+		return $result;
+	}
+
+}
+
+
+
+/**
+ * UniversalFeedCreator lets you choose during runtime which
+ * format to build.
+ * For general usage of a feed class, see the FeedCreator class
+ * below or the example above.
+ *
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class UniversalFeedCreator extends FeedCreator {
+	var $_feed;
+
+	function _setFormat($format) {
+		switch (strtoupper($format)) {
+
+			case "2.0":
+				// fall through
+			case "RSS2.0":
+				$this->_feed = new RSSCreator20();
+				break;
+
+			case "1.0":
+				// fall through
+			case "RSS1.0":
+				$this->_feed = new RSSCreator10();
+				break;
+
+			case "0.91":
+				// fall through
+			case "RSS0.91":
+				$this->_feed = new RSSCreator091();
+				break;
+
+			case "PIE0.1":
+				$this->_feed = new PIECreator01();
+				break;
+
+			case "MBOX":
+				$this->_feed = new MBOXCreator();
+				break;
+
+			case "OPML":
+				$this->_feed = new OPMLCreator();
+				break;
+
+			case "ATOM":
+				// fall through
+
+			case "ATOM1.0":
+				$this->_feed = new AtomCreator10();
+				break;
+
+			case "HTML":
+				$this->_feed = new HTMLCreator();
+				break;
+
+			case "JS":
+				// fall through
+			case "JAVASCRIPT":
+				$this->_feed = new JSCreator();
+				break;
+
+			default:
+				$this->_feed = new RSSCreator091();
+				break;
+		}
+
+		$vars = get_object_vars($this);
+		foreach ($vars as $key => $value) {
+			// prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
+			if (!in_array($key, array("_feed", "contentType", "encoding"))) {
+				$this->_feed->{$key} = $this->{$key};
+			}
+		}
+	}
+
+	/**
+	 * Creates a syndication feed based on the items previously added.
+	 *
+	 * @see        FeedCreator::addItem()
+	 * @param    string    format    format the feed should comply to. Valid values are:
+	 *			"PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM1.0", "HTML", "JS"
+	 * @return    string    the contents of the feed.
+	 */
+	function createFeed($format = "RSS0.91") {
+		$this->_setFormat($format);
+		return $this->_feed->createFeed();
+	}
+
+
+
+	/**
+	 * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
+	 * header may be sent to redirect the use to the newly created file.
+	 * @since 1.4
+	 *
+	 * @param	string	format	format the feed should comply to. Valid values are:
+	 *			"PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM1.0", "HTML", "JS"
+	 * @param	string	filename	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param	boolean	displayContents	optional	send the content of the file or not. If true, the file will be sent in the body of the response.
+	 */
+	function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
+		$this->_setFormat($format);
+		$this->_feed->saveFeed($filename, $displayContents);
+	}
+
+
+   /**
+    * Turns on caching and checks if there is a recent version of this feed in the cache.
+    * If there is, an HTTP redirect header is sent.
+    * To effectively use caching, you should create the FeedCreator object and call this method
+    * before anything else, especially before you do the time consuming task to build the feed
+    * (web fetching, for example).
+    *
+    * @param   string   format   format the feed should comply to. Valid values are:
+    *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM1.0".
+    * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+    * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+    */
+   function useCached($format="RSS0.91", $filename="", $timeout=3600) {
+      $this->_setFormat($format);
+      $this->_feed->useCached($filename, $timeout);
+   }
+
+}
+
+
+/**
+ * FeedCreator is the abstract base implementation for concrete
+ * implementations that implement a specific format of syndication.
+ *
+ * @abstract
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.4
+ */
+class FeedCreator extends HtmlDescribable {
+
+	/**
+	 * Mandatory attributes of a feed.
+	 */
+	var $title, $description, $link;
+
+
+	/**
+	 * Optional attributes of a feed.
+	 */
+	var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
+
+	/**
+	* The url of the external xsl stylesheet used to format the naked rss feed.
+	* Ignored in the output when empty.
+	*/
+	var $xslStyleSheet = "";
+
+
+	/**
+	 * @access private
+	 */
+	var $items = Array();
+
+
+	/**
+	 * This feed's MIME content type.
+	 * @since 1.4
+	 * @access private
+	 */
+	var $contentType = "application/xml";
+
+
+	/**
+	 * This feed's character encoding.
+	 * @since 1.6.1
+	 **/
+	var $encoding = "ISO-8859-1";
+
+
+	/**
+	 * Any additional elements to include as an assiciated array. All $key => $value pairs
+	 * will be included unencoded in the feed in the form
+	 *     <$key>$value</$key>
+	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
+	 * if $value contains markup. This may be abused to embed tags not implemented by
+	 * the FeedCreator class used.
+	 */
+	var $additionalElements = Array();
+
+
+	/**
+	 * Adds an FeedItem to the feed.
+	 *
+	 * @param object FeedItem $item The FeedItem to add to the feed.
+	 * @access public
+	 */
+	function addItem($item) {
+		$this->items[] = $item;
+	}
+
+
+	/**
+	 * Truncates a string to a certain length at the most sensible point.
+	 * First, if there's a '.' character near the end of the string, the string is truncated after this character.
+	 * If there is no '.', the string is truncated after the last ' ' character.
+	 * If the string is truncated, " ..." is appended.
+	 * If the string is already shorter than $length, it is returned unchanged.
+	 *
+	 * @static
+	 * @param string    string A string to be truncated.
+	 * @param int        length the maximum length the string should be truncated to
+	 * @return string    the truncated string
+	 */
+	function iTrunc($string, $length) {
+		if (strlen($string)<=$length) {
+			return $string;
+		}
+
+		$pos = strrpos($string,".");
+		if ($pos>=$length-4) {
+			$string = substr($string,0,$length-4);
+			$pos = strrpos($string,".");
+		}
+		if ($pos>=$length*0.4) {
+			return substr($string,0,$pos+1)." ...";
+		}
+
+		$pos = strrpos($string," ");
+		if ($pos>=$length-4) {
+			$string = substr($string,0,$length-4);
+			$pos = strrpos($string," ");
+		}
+		if ($pos>=$length*0.4) {
+			return substr($string,0,$pos)." ...";
+		}
+
+		return substr($string,0,$length-4)." ...";
+
+	}
+
+
+	/**
+	 * Creates a comment indicating the generator of this feed.
+	 * The format of this comment seems to be recognized by
+	 * Syndic8.com.
+	 */
+	function _createGeneratorComment() {
+		return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
+	}
+
+
+	/**
+	 * Creates a string containing all additional elements specified in
+	 * $additionalElements.
+	 * @param	elements	array	an associative array containing key => value pairs
+	 * @param indentString	string	a string that will be inserted before every generated line
+	 * @return    string    the XML tags corresponding to $additionalElements
+	 */
+	function _createAdditionalElements($elements, $indentString="") {
+		$ae = "";
+		if (is_array($elements)) {
+			foreach($elements AS $key => $value) {
+				$ae.= $indentString."<$key>$value</$key>\n";
+			}
+		}
+		return $ae;
+	}
+
+	function _createStylesheetReferences() {
+		$xml = "";
+		if ($this->cssStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
+		if ($this->xslStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n";
+		return $xml;
+	}
+
+
+	/**
+	 * Builds the feed's text.
+	 * @abstract
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+	}
+
+	/**
+	 * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
+	 * For example:
+	 *
+	 * echo $_SERVER["PHP_SELF"]."\n";
+	 * echo FeedCreator::_generateFilename();
+	 *
+	 * would produce:
+	 *
+	 * /rss/latestnews.php
+	 * latestnews.xml
+	 *
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
+	}
+
+
+	/**
+	 * @since 1.4
+	 * @access private
+	 */
+	function _redirect($filename) {
+		// attention, heavily-commented-out-area
+
+		// maybe use this in addition to file time checking
+		//Header("Expires: ".date("r",time()+$this->_timeout));
+
+		/* no caching at all, doesn't seem to work as good:
+		Header("Cache-Control: no-cache");
+		Header("Pragma: no-cache");
+		*/
+
+		// HTTP redirect, some feed readers' simple HTTP implementations don't follow it
+		//Header("Location: ".$filename);
+
+		//Header("Content-Type: ".$this->contentType."; charset=".$this->encoding."; filename=".basename($filename));
+		Header("Content-Type: ".$this->contentType."; charset=".$this->encoding);
+		Header("Content-Disposition: inline; filename=".basename($filename));
+		readfile($filename, "r");
+		die();
+	}
+
+	/**
+	 * Turns on caching and checks if there is a recent version of this feed in the cache.
+	 * If there is, an HTTP redirect header is sent.
+	 * To effectively use caching, you should create the FeedCreator object and call this method
+	 * before anything else, especially before you do the time consuming task to build the feed
+	 * (web fetching, for example).
+	 * @since 1.4
+	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param timeout	int		optional	the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+	 */
+	function useCached($filename="", $timeout=3600) {
+		$this->_timeout = $timeout;
+		if ($filename=="") {
+			$filename = $this->_generateFilename();
+		}
+		if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) {
+			$this->_redirect($filename);
+		}
+	}
+
+
+	/**
+	 * Saves this feed as a file on the local disk. After the file is saved, a redirect
+	 * header may be sent to redirect the user to the newly created file.
+	 * @since 1.4
+	 *
+	 * @param filename	string	optional	the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param redirect	boolean	optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
+	 */
+	function saveFeed($filename="", $displayContents=true) {
+		if ($filename=="") {
+			$filename = $this->_generateFilename();
+		}
+		$feedFile = fopen($filename, "w+");
+		if ($feedFile) {
+			fputs($feedFile,$this->createFeed());
+			fclose($feedFile);
+			if ($displayContents) {
+				$this->_redirect($filename);
+			}
+		} else {
+			echo "<br /><b>Error creating feed file, please check write permissions.</b><br />";
+		}
+	}
+
+}
+
+
+/**
+ * FeedDate is an internal class that stores a date for a feed or feed item.
+ * Usually, you won't need to use this.
+ */
+class FeedDate {
+	var $unix;
+
+	/**
+	 * Creates a new instance of FeedDate representing a given date.
+	 * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
+	 * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
+	 */
+	function FeedDate($dateString="") {
+		if ($dateString=="") $dateString = date("r");
+
+		if (is_integer($dateString)) {
+			$this->unix = $dateString;
+			return;
+		}
+		if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",$dateString,$matches)) {
+			$months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12);
+			$this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]);
+			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
+				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+			} else {
+				if (strlen($matches[7])==1) {
+					$oneHour = 3600;
+					$ord = ord($matches[7]);
+					if ($ord < ord("M")) {
+						$tzOffset = (ord("A") - $ord - 1) * $oneHour;
+					} elseif ($ord >= ord("M") AND $matches[7]!="Z") {
+						$tzOffset = ($ord - ord("M")) * $oneHour;
+					} elseif ($matches[7]=="Z") {
+						$tzOffset = 0;
+					}
+				}
+				switch ($matches[7]) {
+					case "UT":
+					case "GMT":	$tzOffset = 0;
+				}
+			}
+			$this->unix += $tzOffset;
+			return;
+		}
+		if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) {
+			$this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
+			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
+				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+			} else {
+				if ($matches[7]=="Z") {
+					$tzOffset = 0;
+				}
+			}
+			$this->unix += $tzOffset;
+			return;
+		}
+		$this->unix = 0;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as an RFC 822 date.
+	 *
+	 * @return a date in RFC 822 format
+	 */
+	function rfc822() {
+		//return gmdate("r",$this->unix);
+		$date = gmdate("D, d M Y H:i:s", $this->unix);
+		if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE);
+		return $date;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as an ISO 8601 date.
+	 *
+	 * @return a date in ISO 8601 format
+	 */
+	function iso8601() {
+		$date = gmdate("Y-m-d\TH:i:sO",$this->unix);
+		$date = substr($date,0,22) . ':' . substr($date,-2);
+		if (TIME_ZONE!="") $date = str_replace("+00:00",TIME_ZONE,$date);
+		return $date;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as unix time stamp.
+	 *
+	 * @return a date as a unix time stamp
+	 */
+	function unix() {
+		return $this->unix;
+	}
+}
+
+
+/**
+ * RSSCreator10 is a FeedCreator that implements RDF Site Summary (RSS) 1.0.
+ *
+ * @see http://www.purl.org/rss/1.0/
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator10 extends FeedCreator {
+
+	/**
+	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+	 * The feed will contain all items previously added in the same order.
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		if ($this->cssStyleSheet=="") {
+			$cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
+		}
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<rdf:RDF\n";
+		$feed.= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
+		$feed.= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
+		$feed.= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
+		$feed.= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
+		$feed.= "    <channel rdf:about=\"".$this->syndicationURL."\">\n";
+		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
+		$feed.= "        <description>".htmlspecialchars($this->description)."</description>\n";
+		$feed.= "        <link>".$this->link."</link>\n";
+		if ($this->image!=null) {
+			$feed.= "        <image rdf:resource=\"".$this->image->url."\" />\n";
+		}
+		$now = new FeedDate();
+		$feed.= "       <dc:date>".htmlspecialchars($now->iso8601())."</dc:date>\n";
+		$feed.= "        <items>\n";
+		$feed.= "            <rdf:Seq>\n";
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+		}
+		$feed.= "            </rdf:Seq>\n";
+		$feed.= "        </items>\n";
+		$feed.= "    </channel>\n";
+		if ($this->image!=null) {
+			$feed.= "    <image rdf:about=\"".$this->image->url."\">\n";
+			$feed.= "        <title>".$this->image->title."</title>\n";
+			$feed.= "        <link>".$this->image->link."</link>\n";
+			$feed.= "        <url>".$this->image->url."</url>\n";
+			$feed.= "    </image>\n";
+		}
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
+			//$feed.= "        <dc:type>Posting</dc:type>\n";
+			$feed.= "        <dc:format>text/html</dc:format>\n";
+			if ($this->items[$i]->date!=null) {
+				$itemDate = new FeedDate($this->items[$i]->date);
+				$feed.= "        <dc:date>".htmlspecialchars($itemDate->iso8601())."</dc:date>\n";
+			}
+			if ($this->items[$i]->source!="") {
+				$feed.= "        <dc:source>".htmlspecialchars($this->items[$i]->source)."</dc:source>\n";
+			}
+			if ($this->items[$i]->author!="") {
+				$feed.= "        <dc:creator>".htmlspecialchars($this->items[$i]->author)."</dc:creator>\n";
+			}
+			$feed.= "        <title>".htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")))."</title>\n";
+			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+			$feed.= "        <description>".htmlspecialchars($this->items[$i]->description)."</description>\n";
+			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			$feed.= "    </item>\n";
+		}
+		$feed.= "</rdf:RDF>\n";
+		return $feed;
+	}
+}
+
+
+
+/**
+ * RSSCreator091 is a FeedCreator that implements RSS 0.91 Spec, revision 3.
+ *
+ * @see http://my.netscape.com/publish/formats/rss-spec-0.91.html
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator091 extends FeedCreator {
+
+	/**
+	 * Stores this RSS feed's version number.
+	 * @access private
+	 */
+	var $RSSVersion;
+
+	function RSSCreator091() {
+		$this->_setRSSVersion("0.91");
+		$this->contentType = "application/rss+xml";
+	}
+
+	/**
+	 * Sets this RSS feed's version number.
+	 * @access private
+	 */
+	function _setRSSVersion($version) {
+		$this->RSSVersion = $version;
+	}
+
+	/**
+	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+	 * The feed will contain all items previously added in the same order.
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<rss version=\"".$this->RSSVersion."\">\n";
+		$feed.= "    <channel>\n";
+		$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
+		$this->descriptionTruncSize = 500;
+		$feed.= "        <description>".$this->getDescription()."</description>\n";
+		$feed.= "        <link>".$this->link."</link>\n";
+		$now = new FeedDate();
+		$feed.= "        <lastBuildDate>".htmlspecialchars($now->rfc822())."</lastBuildDate>\n";
+		$feed.= "        <generator>".FEEDCREATOR_VERSION."</generator>\n";
+
+		if ($this->image!=null) {
+			$feed.= "        <image>\n";
+			$feed.= "            <url>".$this->image->url."</url>\n";
+			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars($this->image->title),100)."</title>\n";
+			$feed.= "            <link>".$this->image->link."</link>\n";
+			if ($this->image->width!="") {
+				$feed.= "            <width>".$this->image->width."</width>\n";
+			}
+			if ($this->image->height!="") {
+				$feed.= "            <height>".$this->image->height."</height>\n";
+			}
+			if ($this->image->description!="") {
+				$feed.= "            <description>".$this->image->getDescription()."</description>\n";
+			}
+			$feed.= "        </image>\n";
+		}
+		if ($this->language!="") {
+			$feed.= "        <language>".$this->language."</language>\n";
+		}
+		if ($this->copyright!="") {
+			$feed.= "        <copyright>".FeedCreator::iTrunc(htmlspecialchars($this->copyright),100)."</copyright>\n";
+		}
+		if ($this->editor!="") {
+			$feed.= "        <managingEditor>".FeedCreator::iTrunc(htmlspecialchars($this->editor),100)."</managingEditor>\n";
+		}
+		if ($this->webmaster!="") {
+			$feed.= "        <webMaster>".FeedCreator::iTrunc(htmlspecialchars($this->webmaster),100)."</webMaster>\n";
+		}
+		if ($this->pubDate!="") {
+			$pubDate = new FeedDate($this->pubDate);
+			$feed.= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
+		}
+		if ($this->category!="") {
+			$feed.= "        <category>".htmlspecialchars($this->category)."</category>\n";
+		}
+		if ($this->docs!="") {
+			$feed.= "        <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."</docs>\n";
+		}
+		if ($this->ttl!="") {
+			$feed.= "        <ttl>".htmlspecialchars($this->ttl)."</ttl>\n";
+		}
+		if ($this->rating!="") {
+			$feed.= "        <rating>".FeedCreator::iTrunc(htmlspecialchars($this->rating),500)."</rating>\n";
+		}
+		if ($this->skipHours!="") {
+			$feed.= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
+		}
+		if ($this->skipDays!="") {
+			$feed.= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
+		}
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "        <item>\n";
+			$feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
+			$feed.= "            <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+			$feed.= "            <description>".$this->items[$i]->getDescription()."</description>\n";
+
+			if ($this->items[$i]->author!="") {
+				$feed.= "            <author>".htmlspecialchars($this->items[$i]->author)."</author>\n";
+			}
+			/*
+			// on hold
+			if ($this->items[$i]->source!="") {
+					$feed.= "            <source>".htmlspecialchars($this->items[$i]->source)."</source>\n";
+			}
+			*/
+			if ($this->items[$i]->category!="") {
+				$feed.= "            <category>".htmlspecialchars($this->items[$i]->category)."</category>\n";
+			}
+			if ($this->items[$i]->comments!="") {
+				$feed.= "            <comments>".htmlspecialchars($this->items[$i]->comments)."</comments>\n";
+			}
+			if ($this->items[$i]->date!="") {
+			$itemDate = new FeedDate($this->items[$i]->date);
+				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
+			}
+			if ($this->items[$i]->guid!="") {
+				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
+			}
+			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			$feed.= "        </item>\n";
+		}
+		$feed.= "    </channel>\n";
+		$feed.= "</rss>\n";
+		return $feed;
+	}
+}
+
+
+
+/**
+ * RSSCreator20 is a FeedCreator that implements RDF Site Summary (RSS) 2.0.
+ *
+ * @see http://backend.userland.com/rss
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator20 extends RSSCreator091 {
+
+    function RSSCreator20() {
+        parent::_setRSSVersion("2.0");
+    }
+
+}
+
+
+/**
+ * PIECreator01 is a FeedCreator that implements the emerging PIE specification,
+ * as in http://intertwingly.net/wiki/pie/Syntax.
+ *
+ * @deprecated
+ * @since 1.3
+ * @author Scott Reynen <scott@randomchaos.com> and Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class PIECreator01 extends FeedCreator {
+
+	function PIECreator01() {
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n";
+		$feed.= "    <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
+		$this->truncSize = 500;
+		$feed.= "    <subtitle>".$this->getDescription()."</subtitle>\n";
+		$feed.= "    <link>".$this->link."</link>\n";
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <entry>\n";
+			$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
+			$feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
+			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
+			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
+			$feed.= "        <id>".htmlspecialchars($this->items[$i]->guid)."</id>\n";
+			if ($this->items[$i]->author!="") {
+				$feed.= "        <author>\n";
+				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+				if ($this->items[$i]->authorEmail!="") {
+					$feed.= "            <email>".$this->items[$i]->authorEmail."</email>\n";
+				}
+				$feed.="        </author>\n";
+			}
+			$feed.= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
+			$feed.= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n";
+			$feed.= "        </content>\n";
+			$feed.= "    </entry>\n";
+		}
+		$feed.= "</feed>\n";
+		return $feed;
+	}
+}
+
+
+/**
+ * DEPRICATED
+ *
+ *
+ * AtomCreator03 is a FeedCreator that implements the atom specification,
+ * as in http://www.intertwingly.net/wiki/pie/FrontPage.
+ * Please note that just by using AtomCreator03 you won't automatically
+ * produce valid atom files. For example, you have to specify either an editor
+ * for the feed or an author for every single feed item.
+ *
+ * Some elements have not been implemented yet. These are (incomplete list):
+ * author URL, item author's email and URL, item contents, alternate links,
+ * other link content types than text/html. Some of them may be created with
+ * AtomCreator03::additionalElements.
+ *
+ * @see FeedCreator#additionalElements
+ * @since 1.6
+ * @author Kai Blankenhorn <kaib@bitfolge.de>, Scott Reynen <scott@randomchaos.com>
+ */
+class AtomCreator03 extends FeedCreator {
+
+	function AtomCreator03() {
+		$this->contentType = "application/atom+xml";
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
+		if ($this->language!="") {
+			$feed.= " xml:lang=\"".$this->language."\"";
+		}
+		$feed.= ">\n";
+		$feed.= "    <title>".htmlspecialchars($this->title)."</title>\n";
+		$feed.= "    <tagline>".htmlspecialchars($this->description)."</tagline>\n";
+		$feed.= "    <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
+		$feed.= "    <id>".htmlspecialchars($this->link)."</id>\n";
+		$now = new FeedDate();
+		$feed.= "    <modified>".htmlspecialchars($now->iso8601())."</modified>\n";
+		if ($this->editor!="") {
+			$feed.= "    <author>\n";
+			$feed.= "        <name>".$this->editor."</name>\n";
+			if ($this->editorEmail!="") {
+				$feed.= "        <email>".$this->editorEmail."</email>\n";
+			}
+			$feed.= "    </author>\n";
+		}
+		$feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <entry>\n";
+			$feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
+			$feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+			if ($this->items[$i]->date=="") {
+				$this->items[$i]->date = time();
+			}
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
+			$feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
+			$feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
+			$feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
+			$feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			if ($this->items[$i]->author!="") {
+				$feed.= "        <author>\n";
+				$feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+				$feed.= "        </author>\n";
+			}
+			if ($this->items[$i]->description!="") {
+				$feed.= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
+			}
+			$feed.= "    </entry>\n";
+		}
+		$feed.= "</feed>\n";
+		return $feed;
+	}
+}
+
+/**
+ * AtomCreator10 is a FeedCreator that implements the atom specification,
+ * as in http://www.atomenabled.org/
+ * @author neil.thompson <nthompson@mambo-foundation.org>
+ */
+class AtomCreator10 extends FeedCreator {
+
+	function AtomCreator10() {
+		$this->contentType = "application/atom+xml";
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+
+		$now = new FeedDate();
+
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n";
+		$feed.= "    <title type=\"text\">".htmlspecialchars($this->title)."</title>\n";
+		$feed.= "    <subtitle>".htmlspecialchars($this->description)."</subtitle>\n";
+		$feed.= "    <link rel=\"alternate\" type=\"text/html\" hreflang=\"en\" href=\"".htmlspecialchars($this->link)."\"/>\n";
+		$feed.= "    <link rel=\"self\" type=\"application/atom+xml\"  hreflang=\"en\" href=\"".htmlspecialchars($this->link)."/index2.php?option=com_rss&amp;feed=ATOM1.0&amp;no_html=1\"/>\n";
+		$feed.= "    <id>".htmlspecialchars($this->link)."/</id>\n";
+		$feed.= "    <updated>".htmlspecialchars($now->iso8601())."</updated>\n";
+
+		if ($this->editor!="") {
+			$feed.= "    <rights>".$this->editor;
+			if ($this->editorEmail!="") {
+				$feed.= $this->editorEmail;
+			}
+			$feed.= "    </rights>\n";
+		}
+
+		$feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
+
+		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+		for ($i=0;$i<count($this->items);$i++) {
+
+			$this->items[$i]->created = time();
+			$itemDate = new FeedDate($this->items[$i]->created);
+
+			$feed.= "    <entry>\n";
+			$feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
+      $feed.= "        <link rel=\"self\" type=\"application/atom+xml\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+			$feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+			$feed.= "        <updated>".htmlspecialchars($itemDate->iso8601())."</updated>\n";
+			$feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
+			$feed.= "        <author>\n";
+      if ($this->items[$i]->author!="") {
+				$feed.= "        <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+			}else{
+        $feed.= "       <name>".htmlspecialchars($this->link)."</name>\n";
+      }
+      $feed.= "        </author>\n";
+
+			if ($this->items[$i]->description!="") {
+				$feed.= "        <summary type=\"html\">".htmlspecialchars($this->items[$i]->description)."</summary>\n";
+			}
+			$feed.= "    </entry>\n";
+
+		}
+
+		$feed.= "</feed>\n";
+		return $feed;
+	}
+}
+
+
+/**
+ * MBOXCreator is a FeedCreator that implements the mbox format
+ * as described in http://www.qmail.org/man/man5/mbox.html
+ *
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class MBOXCreator extends FeedCreator {
+
+	function MBOXCreator() {
+		$this->contentType = "text/plain";
+		$this->encoding = "ISO-8859-15";
+	}
+
+	function qp_enc($input = "", $line_max = 76) {
+		$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+		$lines = preg_split("/(?:\r\n|\r|\n)/", $input);
+		$eol = "\r\n";
+		$escape = "=";
+		$output = "";
+		while( list(, $line) = each($lines) ) {
+			//$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary
+			$linlen = strlen($line);
+			$newline = "";
+			for($i = 0; $i < $linlen; $i++) {
+				$c = substr($line, $i, 1);
+				$dec = ord($c);
+				if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+					$c = "=20";
+				} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+					$h2 = floor($dec/16); $h1 = floor($dec%16);
+					$c = $escape.$hex["$h2"].$hex["$h1"];
+				}
+				if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+					$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
+					$newline = "";
+				}
+				$newline .= $c;
+			} // end of for
+			$output .= $newline.$eol;
+		}
+		return trim($output);
+	}
+
+
+	/**
+	 * Builds the MBOX contents.
+	 * @return    string    the feed's complete text
+	 */
+	function createFeed() {
+		for ($i=0;$i<count($this->items);$i++) {
+			if ($this->items[$i]->author!="") {
+				$from = $this->items[$i]->author;
+			} else {
+				$from = $this->title;
+			}
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed.= "From ".strtr(MBOXCreator::qp_enc($from)," ","_")." ".date("D M d H:i:s Y",$itemDate->unix())."\n";
+			$feed.= "Content-Type: text/plain;\n";
+			$feed.= "	charset=\"".$this->encoding."\"\n";
+			$feed.= "Content-Transfer-Encoding: quoted-printable\n";
+			$feed.= "Content-Type: text/plain\n";
+			$feed.= "From: \"".MBOXCreator::qp_enc($from)."\"\n";
+			$feed.= "Date: ".$itemDate->rfc822()."\n";
+			$feed.= "Subject: ".MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title,100))."\n";
+			$feed.= "\n";
+			$body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
+			$feed.= preg_replace("~\nFrom ([^\n]*)(\n?)~","\n>From $1$2\n",$body);
+			$feed.= "\n";
+			$feed.= "\n";
+		}
+		return $feed;
+	}
+
+	/**
+	 * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox";
+	}
+}
+
+
+/**
+ * OPMLCreator is a FeedCreator that implements OPML 1.0.
+ *
+ * @see http://opml.scripting.com/spec
+ * @author Dirk Clemens, Kai Blankenhorn
+ * @since 1.5
+ */
+class OPMLCreator extends FeedCreator {
+
+	function OPMLCreator() {
+		$this->encoding = "utf-8";
+	}
+
+	function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+		$feed.= $this->_createGeneratorComment();
+		$feed.= $this->_createStylesheetReferences();
+		$feed.= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
+		$feed.= "<head>    \n";
+		$feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
+		if ($this->pubDate!="") {
+			$date = new FeedDate($this->pubDate);
+			$feed.= "         <dateCreated>".$date->rfc822()."</dateCreated>\n";
+		}
+		if ($this->lastBuildDate!="") {
+			$date = new FeedDate($this->lastBuildDate);
+			$feed.= "         <dateModified>".$date->rfc822()."</dateModified>\n";
+		}
+		if ($this->editor!="") {
+			$feed.= "         <ownerName>".$this->editor."</ownerName>\n";
+		}
+		if ($this->editorEmail!="") {
+			$feed.= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
+		}
+		$feed.= "    </head>\n";
+		$feed.= "    <body>\n";
+		for ($i=0;$i<count($this->items);$i++) {
+			$feed.= "    <outline type=\"rss\" ";
+			$title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")));
+			$feed.= " title=\"".$title."\"";
+			$feed.= " text=\"".$title."\"";
+			//$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
+			$feed.= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
+			$feed.= "/>\n";
+		}
+		$feed.= "    </body>\n";
+		$feed.= "</opml>\n";
+		return $feed;
+	}
+}
+
+
+
+/**
+ * HTMLCreator is a FeedCreator that writes an HTML feed file to a specific
+ * location, overriding the createFeed method of the parent FeedCreator.
+ * The HTML produced can be included over http by scripting languages, or serve
+ * as the source for an IFrame.
+ * All output by this class is embedded in <div></div> tags to enable formatting
+ * using CSS.
+ *
+ * @author Pascal Van Hecke
+ * @since 1.7
+ */
+class HTMLCreator extends FeedCreator {
+
+	var $contentType = "text/html";
+
+	/**
+	 * Contains HTML to be output at the start of the feed's html representation.
+	 */
+	var $header;
+
+	/**
+	 * Contains HTML to be output at the end of the feed's html representation.
+	 */
+	var $footer ;
+
+	/**
+	 * Contains HTML to be output between entries. A separator is only used in
+	 * case of multiple entries.
+	 */
+	var $separator;
+
+	/**
+	 * Used to prefix the stylenames to make sure they are unique
+	 * and do not clash with stylenames on the users' page.
+	 */
+	var $stylePrefix;
+
+	/**
+	 * Determines whether the links open in a new window or not.
+	 */
+	var $openInNewWindow = true;
+
+	var $imageAlign ="right";
+
+	/**
+	 * In case of very simple output you may want to get rid of the style tags,
+	 * hence this variable.  There's no equivalent on item level, but of course you can
+	 * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
+	 * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
+	 * in the function createFeed().
+	 */
+	var $stylelessOutput ="";
+
+	/**
+	 * Writes the HTML.
+	 * @return    string    the scripts's complete text
+	 */
+	function createFeed() {
+		// if there is styleless output, use the content of this variable and ignore the rest
+		if ($this->stylelessOutput!="") {
+			return $this->stylelessOutput;
+		}
+
+		//if no stylePrefix is set, generate it yourself depending on the script name
+		if ($this->stylePrefix=="") {
+			$this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_";
+		}
+
+		//set an openInNewWindow_token_to be inserted or not
+		if ($this->openInNewWindow) {
+			$targetInsert = " target='_blank'";
+		}
+
+		// use this array to put the lines in and implode later with "document.write" javascript
+		$feedArray = array();
+		if ($this->image!=null) {
+			$imageStr = "<a href='".$this->image->link."'".$targetInsert.">".
+							"<img src='".$this->image->url."' border='0' alt='".
+							FeedCreator::iTrunc(htmlspecialchars($this->image->title),100).
+							"' align='".$this->imageAlign."' ";
+			if ($this->image->width) {
+				$imageStr .=" width='".$this->image->width. "' ";
+			}
+			if ($this->image->height) {
+				$imageStr .=" height='".$this->image->height."' ";
+			}
+			$imageStr .="/></a>";
+			$feedArray[] = $imageStr;
+		}
+
+		if ($this->title) {
+			$feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".
+				FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</a></div>";
+		}
+		if ($this->getDescription()) {
+			$feedArray[] = "<div class='".$this->stylePrefix."description'>".
+				str_replace("</XMLCDATA>", "", str_replace("<![CDATA[", "", $this->getDescription())).
+				"</div>";
+		}
+
+		if ($this->header) {
+			$feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header."</div>";
+		}
+
+		for ($i=0;$i<count($this->items);$i++) {
+			if ($this->separator and $i > 0) {
+				$feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator."</div>";
+			}
+
+			if ($this->items[$i]->title) {
+				if ($this->items[$i]->link) {
+					$feedArray[] =
+						"<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix.
+						"item_title'".$targetInsert.">".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+						"</a></div>";
+				} else {
+					$feedArray[] =
+						"<div class='".$this->stylePrefix."item_title'>".
+						FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+						"</div>";
+				}
+			}
+			if ($this->items[$i]->getDescription()) {
+				$feedArray[] =
+				"<div class='".$this->stylePrefix."item_description'>".
+					str_replace("]]>", "", str_replace("<![CDATA[", "", $this->items[$i]->getDescription())).
+					"</div>";
+			}
+		}
+		if ($this->footer) {
+			$feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer."</div>";
+		}
+
+		$feed= "".join($feedArray, "\r\n");
+		return $feed;
+	}
+
+	/**
+	 * Overrrides parent to produce .html extensions
+	 *
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html";
+	}
+}
+
+
+/**
+ * JSCreator is a class that writes a js file to a specific
+ * location, overriding the createFeed method of the parent HTMLCreator.
+ *
+ * @author Pascal Van Hecke
+ */
+class JSCreator extends HTMLCreator {
+	var $contentType = "text/javascript";
+
+	/**
+	 * writes the javascript
+	 * @return    string    the scripts's complete text
+	 */
+	function createFeed()
+	{
+		$feed = parent::createFeed();
+		$feedArray = explode("\n",$feed);
+
+		$jsFeed = "";
+		foreach ($feedArray as $value) {
+			$jsFeed .= "document.write('".trim(addslashes($value))."');\n";
+		}
+		return $jsFeed;
+	}
+
+	/**
+	 * Overrrides parent to produce .js extensions
+	 *
+	 * @return string the feed cache filename
+	 * @since 1.4
+	 * @access private
+	 */
+	function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
+	}
+
+}
+
+
+
+/*** TEST SCRIPT *********************************************************
+
+//include("feedcreator.class.php");
+
+$rss = new UniversalFeedCreator();
+$rss->useCached();
+$rss->title = "PHP news";
+$rss->description = "daily news from the PHP scripting world";
+
+//optional
+//$rss->descriptionTruncSize = 500;
+//$rss->descriptionHtmlSyndicated = true;
+//$rss->xslStyleSheet = "http://feedster.com/rss20.xsl";
+
+$rss->link = "http://www.dailyphp.net/news";
+$rss->feedURL = "http://www.dailyphp.net/".$PHP_SELF;
+
+$image = new FeedImage();
+$image->title = "dailyphp.net logo";
+$image->url = "http://www.dailyphp.net/images/logo.gif";
+$image->link = "http://www.dailyphp.net";
+$image->description = "Feed provided by dailyphp.net. Click to visit.";
+
+//optional
+$image->descriptionTruncSize = 500;
+$image->descriptionHtmlSyndicated = true;
+
+$rss->image = $image;
+
+// get your news items from somewhere, e.g. your database:
+//mysql_select_db($dbHost, $dbUser, $dbPass);
+//$res = mysql_query("SELECT * FROM news ORDER BY newsdate DESC");
+//while ($data = mysql_fetch_object($res)) {
+	$item = new FeedItem();
+	$item->title = "This is an the test title of an item";
+	$item->link = "http://localhost/item/";
+	$item->description = "<b>description in </b><br/>HTML";
+
+	//optional
+	//item->descriptionTruncSize = 500;
+	$item->descriptionHtmlSyndicated = true;
+
+	$item->date = time();
+	$item->source = "http://www.dailyphp.net";
+	$item->author = "John Doe";
+
+	$rss->addItem($item);
+//}
+
+// valid format strings are: RSS0.91, RSS1.0, RSS2.0, PIE0.1, MBOX, OPML, ATOM0.3, HTML, JS
+echo $rss->saveFeed("RSS0.91", "feed.xml");
+
+
+
+***************************************************************************/
+
+?>
diff -ruN 4.5.4/includes/footer.php 4.6rc2/includes/footer.php
--- 4.5.4/includes/footer.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/footer.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: footer.php,v 1.2 2005/11/21 00:06:17 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Mambo Foundation
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/includes/frontend.html.php 4.6rc2/includes/frontend.html.php
--- 4.5.4/includes/frontend.html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/frontend.html.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,23 +1,22 @@
 <?php
 /**
-* @version $Id: frontend.html.php,v 1.3 2005/07/22 03:36:09 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-/**
-* @package Mambo
-*/
 class modules_html {
 
 	function module( &$module, &$params, $Itemid, $style=0 ) {
-		global $mosConfig_live_site, $mosConfig_sitename, $mosConfig_lang, $mosConfig_absolute_path;
-
+		global $mosConfig_live_site, $mosConfig_sitename, $mosConfig_lang;
+		$mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
 		// custom module params
 		$rssurl 			= $params->get( 'rssurl' );
 		$rssitems 			= $params->get( 'rssitems', 5 );
@@ -56,118 +55,92 @@
 		}
 		// feed output
 		if ( $rssurl ) {
-			$cacheDir 		= $mosConfig_absolute_path .'/cache/';
-			$LitePath 		= $mosConfig_absolute_path .'/includes/Cache/Lite.php';
-			require_once( $mosConfig_absolute_path .'/includes/domit/xml_domit_rss.php' );
-			$rssDoc =& new xml_domit_rss_document();
-			$rssDoc->useCacheLite(true, $LitePath, $cacheDir, 3600);
-			$rssDoc->loadRSS( $rssurl );
-			$totalChannels 	= $rssDoc->getChannelCount();
-
-			for ( $i = 0; $i < $totalChannels; $i++ ) {
-				$currChannel =& $rssDoc->getChannel($i);
-				$elements 	= $currChannel->getElementList();
-				$iUrl		= 0;
-				foreach ( $elements as $element ) {
-					//image handling
-					if ( $element == 'image' ) {
-						$image =& $currChannel->getElement( DOMIT_RSS_ELEMENT_IMAGE );
-						$iUrl	= $image->getUrl();
-						$iTitle	= $image->getTitle();
-					}
-				}
-
-				// feed title
+			if (!defined('MAGPIE_CACHE_DIR')) define ('MAGPIE_CACHE_DIR', mamboCore::get('mosConfig_absolute_path').'/includes/magpie_cache');
+			require_once (mamboCore::get('mosConfig_absolute_path').'/includes/magpierss/rss_fetch.php');
+			$rss = fetch_rss($rssurl);
+			if (isset($rss->image['title'])) $iTitle = $rss->image['title'];
+			if (isset($rss->image['url'])) $iUrl = $rss->image['url'];
+			// feed title
+			?>
+			<tr>
+				<td>
+				<strong>
+				<a href="<?php echo $rss->channel['link']; ?>" target="_blank">
+				<?php echo $rss->channel['title']; ?>
+				</a>
+				</strong>
+				</td>
+			</tr>
+			<?php
+			// feed description
+			if ( $rssdesc ) {
 				?>
 				<tr>
 					<td>
-					<strong>
-					<a href="<?php echo $currChannel->getLink(); ?>" target="_blank">
-					<?php echo $currChannel->getTitle(); ?>
-					</a>
-					</strong>
+					<?php echo $rss->channel['description']; ?>
 					</td>
 				</tr>
 				<?php
-				// feed description
-				if ( $rssdesc ) {
-					?>
-					<tr>
-						<td>
-						<?php echo $currChannel->getDescription(); ?>
-						</td>
-					</tr>
-					<?php
-				}
-				// feed image
-				if ( $rssimage ) {
-					?>
-					<tr>
-						<td align="center">
-						<image src="<?php echo $iUrl; ?>" alt="<?php echo $iTitle; ?>"/>
-						</td>
-					</tr>
-					<?php
-				}
-
-				$actualItems = $currChannel->getItemCount();
-				$setItems = $rssitems;
-
-				if ($setItems > $actualItems) {
-					$totalItems = $actualItems;
-				} else {
-					$totalItems = $setItems;
-				}
-
+			}
+			// feed image
+			if ( $rssimage AND isset($iUrl) ) {
 				?>
 				<tr>
-					<td>
-					<ul class="newsfeed<?php echo $moduleclass_sfx; ?>">
-					<?php
-					for ($j = 0; $j < $totalItems; $j++) {
-						$currItem =& $currChannel->getItem($j);
-						// item title
-						?>
-						<li class="newsfeed<?php echo $moduleclass_sfx; ?>">
-						<strong>
-						<a href="<?php echo $currItem->getLink(); ?>" target="_blank">
-						<?php echo $currItem->getTitle(); ?>
-						</a>
-						</strong>
-						<?php
-						// item description
-						if ( $rssitemdesc ) {
-							// item description
-							$text 	= html_entity_decode( $currItem->getDescription() );
-
-							// word limit check
-							if ( $words ) {
-								$texts = explode( ' ', $text );
-								$count = count( $texts );
-								if ( $count > $words ) {
-									$text = '';
-									for( $i=0; $i < $words; $i++ ) {
-										$text .= ' '. $texts[$i];
-									}
-									$text .= '...';
-								}
+					<td align="center">
+					<image src="<?php echo $iUrl; ?>" alt="<?php echo $iTitle; ?>"/>
+					</td>
+				</tr>
+				<?php
+			}
+			$itemnumber = 1;
+			?>
+			<tr>
+				<td>
+				<ul class="newsfeed<?php echo $moduleclass_sfx; ?>">
+			<?php
+			foreach ($rss->items as $item) {
+				if ($itemnumber > $rssitems) break;
+				$itemnumber++;
+				// item title
+				?>
+				<li class="newsfeed<?php echo $moduleclass_sfx; ?>">
+				<strong>
+				<a href="<?php echo $item['link']; ?>" target="_blank">
+				<?php echo $item['title']; ?>
+				</a>
+				</strong>
+				<?php
+				// item description
+				if ( $rssitemdesc ) {
+					// item description
+					$text = html_entity_decode( $item['description'] );
+						// word limit check
+					if ( $words ) {
+						$texts = explode( ' ', $text );
+						$count = count( $texts );
+						if ( $count > $words ) {
+							$text = '';
+							for( $i=0; $i < $words; $i++ ) {
+								$text .= ' '. $texts[$i];
 							}
-							?>
-							<div>
-							<?php echo $text; ?>
-							</div>
-							<?php
+							$text .= '...';
 						}
-						?>
-						</li>
-						<?php
 					}
 					?>
-					</ul>
-					</td>
-				</tr>
+					<div>
+					<?php echo $text; ?>
+					</div>
+					<?php
+				}
+				?>
+				</li>
 				<?php
 			}
+			?>
+			</ul>
+			</td>
+			</tr>
+			<?php
 		}
 		?>
 		</table>
@@ -181,12 +154,13 @@
 	* @param int -1=show without wrapper and title, -2=x-mambo style
 	*/
 	function module2( &$module, &$params, $Itemid, $style=0, $count=0 ) {
-		global $mosConfig_live_site, $mosConfig_sitename, $mosConfig_lang, $mosConfig_absolute_path;
+		global $mosConfig_live_site, $mosConfig_sitename, $mosConfig_lang;
 		global $mainframe, $database, $my;
+		$mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
 		$moduleclass_sfx 		= $params->get( 'moduleclass_sfx' );
-
 		// check for custom language file
-		$path = $mosConfig_absolute_path . '/modules/' . $module->module.$mosConfig_lang . '.php';
+/*
+		$path = $mosConfig_absolute_path . '/modules/' . $module->module . mamboCore::get('mosConfig_lang') . '.php';
 		if (file_exists( $path )) {
 			include( $path );
 		} else {
@@ -195,7 +169,7 @@
 				include( $path );
 			}
 		}
-
+*/
 		$number = '';
 		if ($count > 0) {
 			$number = '<span>' . $count . '</span> ';
@@ -273,4 +247,4 @@
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/includes/frontend.php 4.6rc2/includes/frontend.php
--- 4.5.4/includes/frontend.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/frontend.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,229 +1,44 @@
 <?php
 /**
-* @version $Id: frontend.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 /**
 * Displays the capture output of the main element
 */
 function mosMainBody() {
-	// message passed via the url
-	$mosmsg = mosGetParam( $_REQUEST, 'mosmsg', '' );
-	if (!get_magic_quotes_gpc()) {
-		$mosmsg = addslashes( $mosmsg );
-	}
-
-	$popMessages = false;
-
-	if ($mosmsg && !$popMessages) {
-		echo "\n<div class=\"message\">$mosmsg</div>";
-	}
-
-	echo $GLOBALS['_MOS_OPTION']['buffer'];
-
-	if ($mosmsg && $popMessages) {
-		echo "\n<script language=\"javascript\">alert('$mosmsg');</script>";
-	}
-}
-/**
-* Utility functions and classes
-*/
-function mosLoadComponent( $name ) {
-	// set up some global variables for use by the frontend component
-	global $mainframe, $database;
-	include( $mainframe->getCfg( 'absolute_path' )."/components/com_$name/$name.php" );
+	$handler =& mosComponentHandler::getInstance();
+	$handler->mosMainBody();
 }
-/**
-* Cache some modules information
-* @return array
-*/
-function &initModules() {
-	global $database, $my, $Itemid;
 
-	if (!isset( $GLOBALS['_MOS_MODULES'] )) {
-		$query = "SELECT id, title, module, position, content, showtitle, params"
-		."\nFROM #__modules AS m, #__modules_menu AS mm"
-		. "\nWHERE m.published='1' AND m.access <= '$my->gid' AND m.client_id='0'"
-		. "\nAND mm.moduleid=m.id"
-		. "\nAND (mm.menuid = '$Itemid' OR mm.menuid = '0')"
-		. "\nORDER BY ordering";
-
-		$database->setQuery( $query );
-		$modules = $database->loadObjectList();
-		foreach ($modules as $module) {
-			$GLOBALS['_MOS_MODULES'][$module->position][] = $module;
-		}
-	}
-	return $GLOBALS['_MOS_MODULES'];
-}
 /**
 * @param string THe template position
 */
 function mosCountModules( $position='left' ) {
-	global $database, $my, $Itemid;
-	$modules =& initModules();
-	if (isset( $GLOBALS['_MOS_MODULES'][$position] )) {
-	    return count( $GLOBALS['_MOS_MODULES'][$position] );
-	} else {
-		return 0;
-	}
+	$handler =& mosModuleHandler::getInstance();
+	return $handler->mosCountModules($position);
 }
+
 /**
 * @param string The position
 * @param int The style.  0=normal, 1=horiz, -1=no wrapper
 */
 function mosLoadModules( $position='left', $style=0 ) {
-	global $mosConfig_gzip, $mosConfig_absolute_path, $database, $my, $Itemid, $mosConfig_caching;
-
-	$tp = mosGetParam( $_GET, 'tp', 0 );
-	if ($tp) {
-	    echo '<div style="height:50px;background-color:#eee;margin:2px;padding:10px;border:1px solid #f00;color:#700;">';
-		echo $position;
-		echo '</div>';
-		return;
-	}
-	$style = intval( $style );
-	$cache =& mosCache::getCache( 'com_content' );
-
-	require_once( $mosConfig_absolute_path . '/includes/frontend.html.php' );
-
-	$allModules =& initModules();
-	if (isset( $GLOBALS['_MOS_MODULES'][$position] )) {
-	    $modules = $GLOBALS['_MOS_MODULES'][$position];
-	} else {
-		$modules = array();
-	}
-
-	if (count( $modules ) < 1) {
-		$style = 0;
-	}
-	if ($style == 1) {
-		echo "<table cellspacing=\"1\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
-		echo "<tr>\n";
-	}
-	$prepend = ($style == 1) ? "<td valign=\"top\">\n" : '';
-	$postpend = ($style == 1) ? "</td>\n" : '';
-
-	$count = 1;
-	foreach ($modules as $module) {
-		$params =& new mosParameters( $module->params );
-
-		echo $prepend;
-
-		if ((substr("$module->module",0,4))=="mod_") {
-			if ($params->get('cache') == 1 && $mosConfig_caching == 1) {
-				$cache->call('modules_html::module2', $module, $params, $Itemid, $style );
-			} else {
-				modules_html::module2( $module, $params, $Itemid, $style, $count );
-			}
-		} else {
-			if ($params->get('cache') == 1 && $mosConfig_caching == 1) {
-				$cache->call('modules_html::module', $module, $params, $Itemid, $style );
-			} else {
-				modules_html::module( $module, $params, $Itemid, $style );
-			}
-		}
-
-		echo $postpend;
-		$count++;
-	}
-	if ($style == 1) {
-		echo "</tr>\n</table>\n";
-	}
+	$handler =& mosModuleHandler::getInstance();
+	return $handler->mosLoadModules($position, $style);
 }
 /**
 * Assembles head tags
 */
 function mosShowHead() {
-	global $database, $option, $my, $mainframe, $_VERSION;
-	global $mosConfig_MetaDesc, $mosConfig_MetaKeys, $mosConfig_live_site, $mosConfig_sef, $mosConfig_absolute_path, $mosConfig_sitename, $mosConfig_favicon;
-
-	$task = mosGetParam( $_REQUEST, 'task', '' );
-
-	$mainframe->appendMetaTag( 'description', $mosConfig_MetaDesc );
-	$mainframe->appendMetaTag( 'keywords', $mosConfig_MetaKeys );
-	$mainframe->addMetaTag( 'Generator', $_VERSION->PRODUCT . " - " . $_VERSION->COPYRIGHT);
-	$mainframe->addMetaTag( 'robots', 'index, follow' );
-
-	echo $mainframe->getHead();
-
-	if ( isset($mosConfig_sef) && $mosConfig_sef ) {
-		echo "<base href=\"$mosConfig_live_site/\" />\r\n";
-	}
-
-	if ( $my->id ) { 
-		?>
-		<script language="JavaScript1.2" src="<?php echo $mosConfig_live_site;?>/includes/js/mambojavascript.js" type="text/javascript"></script>
-		<?php
-	}
-
-	// support for Firefox Live Bookmarks ability for site syndication
-	$query = "SELECT a.id"
-	. "\n FROM #__components AS a"
-	. "\n WHERE a.name = 'Syndicate'"
-	;
-	$database->setQuery( $query );
-	$id = $database->loadResult();
-
-	// load the row from the db table
-	$row = new mosComponent( $database );
-	$row->load( $id );
-
-	// get params definitions
-	$params =& new mosParameters( $row->params, $mainframe->getPath( 'com_xml', $row->option ), 'component' );
-	
-	$live_bookmark = $params->get( 'live_bookmark', 0 );
-	
-	if ( $live_bookmark ) {
-		// custom bookmark file name
-		$bookmark_file = $params->get( 'bookmark_file', $live_bookmark );
-
-		$link_file 	= $mosConfig_live_site .'/cache/'. $bookmark_file;
-		$filename 	= $mosConfig_absolute_path .'/cache/'. $bookmark_file;
-
-		$cache 		= $params->get( 'cache', 1 );
-		$cache_time = $params->get( 'cache_time', 3600 );
-		$title 		= $params->def( 'title', $mosConfig_sitename );
-		
-		// checks to see if cache file exists, to determine whether to create a new one
-		if ( !file_exists( $filename ) || ( ( time() - filemtime( $filename ) ) > $cache_time ) ) {
-			$tempTask 	= $task;
-			$task		= 'live_bookmark';
-			
-			// sets bookmark feed type
-			$_GET['feed'] = str_replace( '.xml', '', $live_bookmark );
-			
-			// loads rss component to create bookmark file
-			require_once( $mosConfig_absolute_path .'/components/com_rss/rss.php' );
-			$task 		= $tempTask;
-		}
-	
-		// outputs link tag for page
-		?>
-		<link rel="alternate" type="application/rss+xml" title="<?php echo $title; ?>" href="<?php echo $link_file; ?>" />
-		<?php
-	}		
-	
-	// favourites icon
-	if ( !$mosConfig_favicon ) {
-		$mosConfig_favicon = 'favicon.ico';
-	} 
-	$icon = $mosConfig_absolute_path .'/images/'. $mosConfig_favicon;
-	// checks to see if file exists
-	if ( !file_exists( $icon ) ) {
-		$icon = $mosConfig_live_site .'/images/favicon.ico';		
-	} else {
-		$icon = $mosConfig_live_site .'/images/' .$mosConfig_favicon;		
-	}
-	
-	// outputs link tag for page
-	?>
-	<link rel="shortcut icon" href="<?php echo $icon;?>" />
-	<?php
+	$mainframe =& mosMainFrame::getInstance();
+	$mainframe->mosShowHead();
 }
 ?>
diff -ruN 4.5.4/includes/gacl.class.php 4.6rc2/includes/gacl.class.php
--- 4.5.4/includes/gacl.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/gacl.class.php	2006-02-16 21:02:31.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: gacl.class.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /*
  * phpGACL - Generic Access Control List
@@ -124,10 +126,11 @@
 		$this->_mos_add_acl( 'administration', 'manage', 'users', 'administrator', 'components', 'com_menumanager' );
 		$this->_mos_add_acl( 'administration', 'manage', 'users', 'super administrator', 'components', 'com_menumanager' );
 		
-		// access to language
-		//$this->_mos_add_acl( 'administration', 'manage', 'users', 'administrator', 'components', 'com_languages' );
+		// access to languages
 		$this->_mos_add_acl( 'administration', 'manage', 'users', 'super administrator', 'components', 'com_languages' );
+		$this->_mos_add_acl( 'administration', 'manage', 'users', 'administrator', 'components', 'com_languages' );
 		$this->_mos_add_acl( 'administration', 'install', 'users', 'super administrator', 'languages', 'all' );
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'administrator', 'languages', 'all' );
 
 		// access to modules
 		$this->_mos_add_acl( 'administration', 'install', 'users', 'administrator', 'modules', 'all' );
@@ -145,10 +148,22 @@
 		// uncomment following to allow managers to edit modules
 		//array( 'administration', 'edit', 'users', 'manager', 'modules', 'all' );
 
+		// access to universal installer
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'administrator', 'universals', 'all' );
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'super administrator', 'universals', 'all' );
+
 		// access to components
 		$this->_mos_add_acl( 'administration', 'install', 'users', 'administrator', 'components', 'all' );
 		$this->_mos_add_acl( 'administration', 'install', 'users', 'super administrator', 'components', 'all' );
 
+		// access to parameters
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'administrator', 'parameters', 'all' );
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'super administrator', 'parameters', 'all' );
+
+		// access to includes
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'administrator', 'includes', 'all' );
+		$this->_mos_add_acl( 'administration', 'install', 'users', 'super administrator', 'includes', 'all' );
+
 		$this->_mos_add_acl( 'administration', 'edit', 'users', 'super administrator', 'components', 'all' );
 		$this->_mos_add_acl( 'administration', 'edit', 'users', 'administrator', 'components', 'all' );
 
@@ -241,7 +256,6 @@
 	\*======================================================================*/
 	function acl_check( $aco_section_value, $aco_value,
 		$aro_section_value, $aro_value, $axo_section_value=NULL, $axo_value=NULL ) {
-
 		$acl_result = 0;
 		for ($i=0; $i < $this->acl_count; $i++) {
 			if (strcasecmp( $aco_section_value, $this->acl[$i][0] ) == 0) {
diff -ruN 4.5.4/includes/gacl_api.class.php 4.6rc2/includes/gacl_api.class.php
--- 4.5.4/includes/gacl_api.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/gacl_api.class.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: gacl_api.class.php,v 1.2 2005/11/12 16:38:56 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /*
  * phpGACL - Generic Access Control List
diff -ruN 4.5.4/includes/getids.php 4.6rc2/includes/getids.php
--- 4.5.4/includes/getids.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/getids.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: getids.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/includes/js/ThemeOffice/theme.js 4.6rc2/includes/js/ThemeOffice/theme.js
--- 4.5.4/includes/js/ThemeOffice/theme.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/js/ThemeOffice/theme.js	2006-02-14 16:38:15.000000000 -0600
@@ -1,6 +1,6 @@
 
 // directory of where all the images are
-var cmThemeOfficeBase = 'includes/js/ThemeOffice/';
+var cmThemeOfficeBase = '../includes/js/ThemeOffice/';
 
 var cmThemeOffice =
 {
diff -ruN 4.5.4/includes/js/mambojavascript.js 4.6rc2/includes/js/mambojavascript.js
--- 4.5.4/includes/js/mambojavascript.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/js/mambojavascript.js	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 // <?php !! This fools phpdocumentor into parsing this file
 /**
-* @version $Id: mambojavascript.js,v 1.1 2005/07/22 01:57:16 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 // general utility for browsing a named array or object
 function xshow(o) {
diff -ruN 4.5.4/includes/magpie_cache/index.html 4.6rc2/includes/magpie_cache/index.html
--- 4.5.4/includes/magpie_cache/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpie_cache/index.html	2006-01-19 08:24:56.000000000 -0600
@@ -0,0 +1,4 @@
+<html>
+<body bgcolor="#FFFFFF">
+</body>
+</html>
\ No newline at end of file
diff -ruN 4.5.4/includes/magpierss/extlib/Snoopy.class.php 4.6rc2/includes/magpierss/extlib/Snoopy.class.php
--- 4.5.4/includes/magpierss/extlib/Snoopy.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/extlib/Snoopy.class.php	2006-01-19 08:24:56.000000000 -0600
@@ -0,0 +1,900 @@
+<?php
+
+/*************************************************
+
+Snoopy - the PHP net client
+Author: Monte Ohrt <monte@ispi.net>
+Copyright (c): 1999-2000 ispi, all rights reserved
+Version: 1.0
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+You may contact the author of Snoopy by e-mail at:
+monte@ispi.net
+
+Or, write to:
+Monte Ohrt
+CTO, ispi
+237 S. 70th suite 220
+Lincoln, NE 68510
+
+The latest version of Snoopy can be obtained from:
+http://snoopy.sourceforge.com
+
+*************************************************/
+
+class Snoopy
+{
+	/**** Public variables ****/
+	
+	/* user definable vars */
+
+	var $host			=	"www.php.net";		// host name we are connecting to
+	var $port			=	80;					// port we are connecting to
+	var $proxy_host		=	"";					// proxy host to use
+	var $proxy_port		=	"";					// proxy port to use
+	var $agent			=	"Snoopy v1.0";		// agent we masquerade as
+	var	$referer		=	"";					// referer info to pass
+	var $cookies		=	array();			// array of cookies to pass
+												// $cookies["username"]="joe";
+	var	$rawheaders		=	array();			// array of raw headers to send
+												// $rawheaders["Content-type"]="text/html";
+
+	var $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
+	var $lastredirectaddr	=	"";				// contains address of last redirected address
+	var	$offsiteok		=	true;				// allows redirection off-site
+	var $maxframes		=	0;					// frame content depth maximum. 0 = disallow
+	var $expandlinks	=	true;				// expand links to fully qualified URLs.
+												// this only applies to fetchlinks()
+												// or submitlinks()
+	var $passcookies	=	true;				// pass set cookies back through redirects
+												// NOTE: this currently does not respect
+												// dates, domains or paths.
+	
+	var	$user			=	"";					// user for http authentication
+	var	$pass			=	"";					// password for http authentication
+	
+	// http accept types
+	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	
+	var $results		=	"";					// where the content is put
+		
+	var $error			=	"";					// error messages sent here
+	var	$response_code	=	"";					// response code returned from server
+	var	$headers		=	array();			// headers returned from server sent here
+	var	$maxlength		=	500000;				// max return data length (body)
+	var $read_timeout	=	0;					// timeout on read operations, in seconds
+												// supported only since PHP 4 Beta 4
+												// set to 0 to disallow timeouts
+	var $timed_out		=	false;				// if a read operation timed out
+	var	$status			=	0;					// http request status
+	
+	var	$curl_path		=	"/usr/bin/curl";
+												// Snoopy will use cURL for fetching
+												// SSL content if a full system path to
+												// the cURL binary is supplied here.
+												// set to false if you do not have
+												// cURL installed. See http://curl.haxx.se
+												// for details on installing cURL.
+												// Snoopy does *not* use the cURL
+												// library functions built into php,
+												// as these functions are not stable
+												// as of this Snoopy release.
+	
+	// send Accept-encoding: gzip?
+	var $use_gzip		= true;	
+	
+	/**** Private variables ****/	
+	
+	var	$_maxlinelen	=	4096;				// max line length (headers)
+	
+	var $_httpmethod	=	"GET";				// default http request method
+	var $_httpversion	=	"HTTP/1.0";			// default http request version
+	var $_submit_method	=	"POST";				// default submit method
+	var $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
+	var $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
+	var $_redirectaddr	=	false;				// will be set if page fetched is a redirect
+	var $_redirectdepth	=	0;					// increments on an http redirect
+	var $_frameurls		= 	array();			// frame src urls
+	var $_framedepth	=	0;					// increments on frame depth
+	
+	var $_isproxy		=	false;				// set if using a proxy server
+	var $_fp_timeout	=	30;					// timeout for socket connection
+
+/*======================================================================*\
+	Function:	fetch
+	Purpose:	fetch the contents of a web page
+				(and possibly other protocols in the
+				future like ftp, nntp, gopher, etc.)
+	Input:		$URI	the location of the page to fetch
+	Output:		$this->results	the output text from the fetch
+\*======================================================================*/
+
+	function fetch($URI)
+	{
+	
+		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
+		$URI_PARTS = parse_url($URI);
+		if (!empty($URI_PARTS["user"]))
+			$this->user = $URI_PARTS["user"];
+		if (!empty($URI_PARTS["pass"]))
+			$this->pass = $URI_PARTS["pass"];
+				
+		switch($URI_PARTS["scheme"])
+		{
+			case "http":
+				$this->host = $URI_PARTS["host"];
+				if(!empty($URI_PARTS["port"]))
+					$this->port = $URI_PARTS["port"];
+				if($this->_connect($fp))
+				{
+					if($this->_isproxy)
+					{
+						// using proxy, send entire URI
+						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+					}
+					else
+					{
+						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
+						// no proxy, send only the path
+						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+					}
+					
+					$this->_disconnect($fp);
+
+					if($this->_redirectaddr)
+					{
+						/* url was redirected, check if we've hit the max depth */
+						if($this->maxredirs > $this->_redirectdepth)
+						{
+							// only follow redirect if it's on this site, or offsiteok is true
+							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							{
+								/* follow the redirect */
+								$this->_redirectdepth++;
+								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->fetch($this->_redirectaddr);
+							}
+						}
+					}
+
+					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					{
+						$frameurls = $this->_frameurls;
+						$this->_frameurls = array();
+						
+						while(list(,$frameurl) = each($frameurls))
+						{
+							if($this->_framedepth < $this->maxframes)
+							{
+								$this->fetch($frameurl);
+								$this->_framedepth++;
+							}
+							else
+								break;
+						}
+					}					
+				}
+				else
+				{
+					return false;
+				}
+				return true;					
+				break;
+			case "https":
+				if(!$this->curl_path || (!is_executable($this->curl_path))) {
+					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
+					return false;
+				}
+				$this->host = $URI_PARTS["host"];
+				if(!empty($URI_PARTS["port"]))
+					$this->port = $URI_PARTS["port"];
+				if($this->_isproxy)
+				{
+					// using proxy, send entire URI
+					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+				}
+				else
+				{
+					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+					// no proxy, send only the path
+					$this->_httpsrequest($path, $URI, $this->_httpmethod);
+				}
+
+				if($this->_redirectaddr)
+				{
+					/* url was redirected, check if we've hit the max depth */
+					if($this->maxredirs > $this->_redirectdepth)
+					{
+						// only follow redirect if it's on this site, or offsiteok is true
+						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						{
+							/* follow the redirect */
+							$this->_redirectdepth++;
+							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->fetch($this->_redirectaddr);
+						}
+					}
+				}
+
+				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				{
+					$frameurls = $this->_frameurls;
+					$this->_frameurls = array();
+
+					while(list(,$frameurl) = each($frameurls))
+					{
+						if($this->_framedepth < $this->maxframes)
+						{
+							$this->fetch($frameurl);
+							$this->_framedepth++;
+						}
+						else
+							break;
+					}
+				}					
+				return true;					
+				break;
+			default:
+				// not a valid protocol
+				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				return false;
+				break;
+		}		
+		return true;
+	}
+
+
+
+/*======================================================================*\
+	Private functions
+\*======================================================================*/
+	
+	
+/*======================================================================*\
+	Function:	_striplinks
+	Purpose:	strip the hyperlinks from an html document
+	Input:		$document	document to strip.
+	Output:		$match		an array of the links
+\*======================================================================*/
+
+	function _striplinks($document)
+	{	
+		preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
+						([\"\'])?					# find single or double quote
+						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
+													# quote, otherwise match up to next space
+						'isx",$document,$links);
+						
+
+		// catenate the non-empty matches from the conditional subpattern
+
+		while(list($key,$val) = each($links[2]))
+		{
+			if(!empty($val))
+				$match[] = $val;
+		}				
+		
+		while(list($key,$val) = each($links[3]))
+		{
+			if(!empty($val))
+				$match[] = $val;
+		}		
+		
+		// return the links
+		return $match;
+	}
+
+/*======================================================================*\
+	Function:	_stripform
+	Purpose:	strip the form elements from an html document
+	Input:		$document	document to strip.
+	Output:		$match		an array of the links
+\*======================================================================*/
+
+	function _stripform($document)
+	{	
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		
+		// catenate the matches
+		$match = implode("\r\n",$elements[0]);
+				
+		// return the links
+		return $match;
+	}
+
+	
+	
+/*======================================================================*\
+	Function:	_striptext
+	Purpose:	strip the text from an html document
+	Input:		$document	document to strip.
+	Output:		$text		the resulting text
+\*======================================================================*/
+
+	function _striptext($document)
+	{
+		
+		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
+		// so, list your entities one by one here. I included some of the
+		// more common ones.
+								
+		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
+						"'([\r\n])[\s]+'",					// strip out white space
+						"'&(quote|#34);'i",					// replace html entities
+						"'&(amp|#38);'i",
+						"'&(lt|#60);'i",
+						"'&(gt|#62);'i",
+						"'&(nbsp|#160);'i",
+						"'&(iexcl|#161);'i",
+						"'&(cent|#162);'i",
+						"'&(pound|#163);'i",
+						"'&(copy|#169);'i"
+						);				
+		$replace = array(	"",
+							"",
+							"\\1",
+							"\"",
+							"&",
+							"<",
+							">",
+							" ",
+							chr(161),
+							chr(162),
+							chr(163),
+							chr(169));
+					
+		$text = preg_replace($search,$replace,$document);
+								
+		return $text;
+	}
+
+/*======================================================================*\
+	Function:	_expandlinks
+	Purpose:	expand each link into a fully qualified URL
+	Input:		$links			the links to qualify
+				$URI			the full URI to get the base from
+	Output:		$expandedLinks	the expanded links
+\*======================================================================*/
+
+	function _expandlinks($links,$URI)
+	{
+		
+		preg_match("/^[^\?]+/",$URI,$match);
+
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+				
+		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+							"|^(?!http://)(\/)?(?!mailto:)|i",
+							"|/\./|",
+							"|/[^\/]+/\.\./|"
+						);
+						
+		$replace = array(	"",
+							$match."/",
+							"/",
+							"/"
+						);			
+				
+		$expandedLinks = preg_replace($search,$replace,$links);
+
+		return $expandedLinks;
+	}
+
+/*======================================================================*\
+	Function:	_httprequest
+	Purpose:	go get the http data from the server
+	Input:		$url		the url to fetch
+				$fp			the current open file pointer
+				$URI		the full URI
+				$body		body contents to send if any (POST)
+	Output:		
+\*======================================================================*/
+	
+	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	{
+		if($this->passcookies && $this->_redirectaddr)
+			$this->setcookies();
+			
+		$URI_PARTS = parse_url($URI);
+		if(empty($url))
+			$url = "/";
+		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
+		if(!empty($this->agent))
+			$headers .= "User-Agent: ".$this->agent."\r\n";
+		if(!empty($this->host) && !isset($this->rawheaders['Host']))
+			$headers .= "Host: ".$this->host."\r\n";
+		if(!empty($this->accept))
+			$headers .= "Accept: ".$this->accept."\r\n";
+		
+		if($this->use_gzip) {
+			// make sure PHP was built with --with-zlib
+			// and we can handle gzipp'ed data
+			if ( function_exists(gzinflate) ) {
+			   $headers .= "Accept-encoding: gzip\r\n";
+			}
+			else {
+			   trigger_error(
+			   	"use_gzip is on, but PHP was built without zlib support.".
+				"  Requesting file(s) without gzip encoding.", 
+				E_USER_NOTICE);
+			}
+		}
+		
+		if(!empty($this->referer))
+			$headers .= "Referer: ".$this->referer."\r\n";
+		if(!empty($this->cookies))
+		{			
+			if(!is_array($this->cookies))
+				$this->cookies = (array)$this->cookies;
+	
+			reset($this->cookies);
+			if ( count($this->cookies) > 0 ) {
+				$cookie_headers .= 'Cookie: ';
+				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
+				}
+				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+			} 
+		}
+		if(!empty($this->rawheaders))
+		{
+			if(!is_array($this->rawheaders))
+				$this->rawheaders = (array)$this->rawheaders;
+			while(list($headerKey,$headerVal) = each($this->rawheaders))
+				$headers .= $headerKey.": ".$headerVal."\r\n";
+		}
+		if(!empty($content_type)) {
+			$headers .= "Content-type: $content_type";
+			if ($content_type == "multipart/form-data")
+				$headers .= "; boundary=".$this->_mime_boundary;
+			$headers .= "\r\n";
+		}
+		if(!empty($body))	
+			$headers .= "Content-length: ".strlen($body)."\r\n";
+		if(!empty($this->user) || !empty($this->pass))	
+			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+
+		$headers .= "\r\n";
+		
+		// set the read timeout if needed
+		if ($this->read_timeout > 0)
+			socket_set_timeout($fp, $this->read_timeout);
+		$this->timed_out = false;
+		
+		fwrite($fp,$headers.$body,strlen($headers.$body));
+		
+		$this->_redirectaddr = false;
+		unset($this->headers);
+		
+		// content was returned gzip encoded?
+		$is_gzipped = false;
+						
+		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		{
+			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+			{
+				$this->status=-100;
+				return false;
+			}
+				
+		//	if($currentHeader == "\r\n")
+			if(preg_match("/^\r?\n$/", $currentHeader) )
+			      break;
+						
+			// if a header begins with Location: or URI:, set the redirect
+			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			{
+				// get URL portion of the redirect
+				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
+				// look for :// in the Location header to see if hostname is included
+				if(!preg_match("|\:\/\/|",$matches[2]))
+				{
+					// no host in the path, so prepend
+					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+					// eliminate double slash
+					if(!preg_match("|^/|",$matches[2]))
+							$this->_redirectaddr .= "/".$matches[2];
+					else
+							$this->_redirectaddr .= $matches[2];
+				}
+				else
+					$this->_redirectaddr = $matches[2];
+			}
+		
+			if(preg_match("|^HTTP/|",$currentHeader))
+			{
+                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+				{
+					$this->status= $status[1];
+                }				
+				$this->response_code = $currentHeader;
+			}
+			
+			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+				$is_gzipped = true;
+			}
+			
+			$this->headers[] = $currentHeader;
+		}
+
+		# $results = fread($fp, $this->maxlength);
+		$results = "";
+		while ( $data = fread($fp, $this->maxlength) ) {
+		    $results .= $data;
+		    if (
+		        strlen($results) > $this->maxlength ) {
+		        break;
+		    }
+		}
+		
+		// gunzip
+		if ( $is_gzipped ) {
+			// per http://www.php.net/manual/en/function.gzencode.php
+			$results = substr($results, 10);
+			$results = gzinflate($results);
+		}
+		
+		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+		{
+			$this->status=-100;
+			return false;
+		}
+		
+		// check if there is a a redirect meta tag
+		
+		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		{
+			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+		}
+
+		// have we hit our frame depth and is there frame src to fetch?
+		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		{
+			$this->results[] = $results;
+			for($x=0; $x<count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+		}
+		// have we already fetched framed content?
+		elseif(is_array($this->results))
+			$this->results[] = $results;
+		// no framed content
+		else
+			$this->results = $results;
+		
+		return true;
+	}
+
+/*======================================================================*\
+	Function:	_httpsrequest
+	Purpose:	go get the https data from the server using curl
+	Input:		$url		the url to fetch
+				$URI		the full URI
+				$body		body contents to send if any (POST)
+	Output:		
+\*======================================================================*/
+	
+	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	{
+		if($this->passcookies && $this->_redirectaddr)
+			$this->setcookies();
+
+		$headers = array();		
+					
+		$URI_PARTS = parse_url($URI);
+		if(empty($url))
+			$url = "/";
+		// GET ... header not needed for curl
+		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
+		if(!empty($this->agent))
+			$headers[] = "User-Agent: ".$this->agent;
+		if(!empty($this->host))
+			$headers[] = "Host: ".$this->host;
+		if(!empty($this->accept))
+			$headers[] = "Accept: ".$this->accept;
+		if(!empty($this->referer))
+			$headers[] = "Referer: ".$this->referer;
+		if(!empty($this->cookies))
+		{			
+			if(!is_array($this->cookies))
+				$this->cookies = (array)$this->cookies;
+	
+			reset($this->cookies);
+			if ( count($this->cookies) > 0 ) {
+				$cookie_str = 'Cookie: ';
+				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
+				}
+				$headers[] = substr($cookie_str,0,-2);
+			}
+		}
+		if(!empty($this->rawheaders))
+		{
+			if(!is_array($this->rawheaders))
+				$this->rawheaders = (array)$this->rawheaders;
+			while(list($headerKey,$headerVal) = each($this->rawheaders))
+				$headers[] = $headerKey.": ".$headerVal;
+		}
+		if(!empty($content_type)) {
+			if ($content_type == "multipart/form-data")
+				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+			else
+				$headers[] = "Content-type: $content_type";
+		}
+		if(!empty($body))	
+			$headers[] = "Content-length: ".strlen($body);
+		if(!empty($this->user) || !empty($this->pass))	
+			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+			
+		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
+		}
+			  	                         
+		if(!empty($body))
+			$cmdline_params .= " -d \"$body\"";
+		
+		if($this->read_timeout > 0)
+			$cmdline_params .= " -m ".$this->read_timeout;
+		
+		$headerfile = uniqid(time());
+		
+		# accept self-signed certs
+		$cmdline_params .= " -k"; 
+		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
+		
+		if($return)
+		{
+			$this->error = "Error: cURL could not retrieve the document, error $return.";
+			return false;
+		}
+			
+			
+		$results = implode("\r\n",$results);
+		
+		$result_headers = file("/tmp/$headerfile");
+						
+		$this->_redirectaddr = false;
+		unset($this->headers);
+						
+		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		{
+			
+			// if a header begins with Location: or URI:, set the redirect
+			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			{
+				// get URL portion of the redirect
+				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
+				// look for :// in the Location header to see if hostname is included
+				if(!preg_match("|\:\/\/|",$matches[2]))
+				{
+					// no host in the path, so prepend
+					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+					// eliminate double slash
+					if(!preg_match("|^/|",$matches[2]))
+							$this->_redirectaddr .= "/".$matches[2];
+					else
+							$this->_redirectaddr .= $matches[2];
+				}
+				else
+					$this->_redirectaddr = $matches[2];
+			}
+		
+			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			{
+			    $this->response_code = $result_headers[$currentHeader];
+			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+			    {
+				$this->status= $match[1];
+                	    }
+			}
+			$this->headers[] = $result_headers[$currentHeader];
+		}
+
+		// check if there is a a redirect meta tag
+		
+		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		{
+			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+		}
+
+		// have we hit our frame depth and is there frame src to fetch?
+		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		{
+			$this->results[] = $results;
+			for($x=0; $x<count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+		}
+		// have we already fetched framed content?
+		elseif(is_array($this->results))
+			$this->results[] = $results;
+		// no framed content
+		else
+			$this->results = $results;
+
+		unlink("/tmp/$headerfile");
+		
+		return true;
+	}
+
+/*======================================================================*\
+	Function:	setcookies()
+	Purpose:	set cookies for a redirection
+\*======================================================================*/
+	
+	function setcookies()
+	{
+		for($x=0; $x<count($this->headers); $x++)
+		{
+		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+			$this->cookies[$match[1]] = $match[2];
+		}
+	}
+
+	
+/*======================================================================*\
+	Function:	_check_timeout
+	Purpose:	checks whether timeout has occurred
+	Input:		$fp	file pointer
+\*======================================================================*/
+
+	function _check_timeout($fp)
+	{
+		if ($this->read_timeout > 0) {
+			$fp_status = socket_get_status($fp);
+			if ($fp_status["timed_out"]) {
+				$this->timed_out = true;
+				return true;
+			}
+		}
+		return false;
+	}
+
+/*======================================================================*\
+	Function:	_connect
+	Purpose:	make a socket connection
+	Input:		$fp	file pointer
+\*======================================================================*/
+	
+	function _connect(&$fp)
+	{
+		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+			{
+				$this->_isproxy = true;
+				$host = $this->proxy_host;
+				$port = $this->proxy_port;
+			}
+		else
+		{
+			$host = $this->host;
+			$port = $this->port;
+		}
+	
+		$this->status = 0;
+		
+		if($fp = fsockopen(
+					$host,
+					$port,
+					$errno,
+					$errstr,
+					$this->_fp_timeout
+					))
+		{
+			// socket connection succeeded
+
+			return true;
+		}
+		else
+		{
+			// socket connection failed
+			$this->status = $errno;
+			switch($errno)
+			{
+				case -3:
+					$this->error="socket creation failed (-3)";
+				case -4:
+					$this->error="dns lookup failure (-4)";
+				case -5:
+					$this->error="connection refused or timed out (-5)";
+				default:
+					$this->error="connection failed (".$errno.")";
+			}
+			return false;
+		}
+	}
+/*======================================================================*\
+	Function:	_disconnect
+	Purpose:	disconnect a socket connection
+	Input:		$fp	file pointer
+\*======================================================================*/
+	
+	function _disconnect($fp)
+	{
+		return(fclose($fp));
+	}
+
+	
+/*======================================================================*\
+	Function:	_prepare_post_body
+	Purpose:	Prepare post body according to encoding type
+	Input:		$formvars  - form variables
+				$formfiles - form upload files
+	Output:		post body
+\*======================================================================*/
+	
+	function _prepare_post_body($formvars, $formfiles)
+	{
+		settype($formvars, "array");
+		settype($formfiles, "array");
+
+		if (count($formvars) == 0 && count($formfiles) == 0)
+			return;
+		
+		switch ($this->_submit_type) {
+			case "application/x-www-form-urlencoded":
+				reset($formvars);
+				while(list($key,$val) = each($formvars)) {
+					if (is_array($val) || is_object($val)) {
+						while (list($cur_key, $cur_val) = each($val)) {
+							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
+						}
+					} else
+						$postdata .= urlencode($key)."=".urlencode($val)."&";
+				}
+				break;
+
+			case "multipart/form-data":
+				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
+				
+				reset($formvars);
+				while(list($key,$val) = each($formvars)) {
+					if (is_array($val) || is_object($val)) {
+						while (list($cur_key, $cur_val) = each($val)) {
+							$postdata .= "--".$this->_mime_boundary."\r\n";
+							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
+							$postdata .= "$cur_val\r\n";
+						}
+					} else {
+						$postdata .= "--".$this->_mime_boundary."\r\n";
+						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
+						$postdata .= "$val\r\n";
+					}
+				}
+				
+				reset($formfiles);
+				while (list($field_name, $file_names) = each($formfiles)) {
+					settype($file_names, "array");
+					while (list(, $file_name) = each($file_names)) {
+						if (!is_readable($file_name)) continue;
+
+						$fp = fopen($file_name, "r");
+						$file_content = fread($fp, filesize($file_name));
+						fclose($fp);
+						$base_name = basename($file_name);
+
+						$postdata .= "--".$this->_mime_boundary."\r\n";
+						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
+						$postdata .= "$file_content\r\n";
+					}
+				}
+				$postdata .= "--".$this->_mime_boundary."--\r\n";
+				break;
+		}
+
+		return $postdata;
+	}
+}
+
+?>
diff -ruN 4.5.4/includes/magpierss/extlib/index.html 4.6rc2/includes/magpierss/extlib/index.html
--- 4.5.4/includes/magpierss/extlib/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/extlib/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/includes/magpierss/index.html 4.6rc2/includes/magpierss/index.html
--- 4.5.4/includes/magpierss/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/includes/magpierss/rss_cache.php 4.6rc2/includes/magpierss/rss_cache.php
--- 4.5.4/includes/magpierss/rss_cache.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/rss_cache.php	2006-01-19 08:24:56.000000000 -0600
@@ -0,0 +1,200 @@
+<?php
+/*
+ * Project:     MagpieRSS: a simple RSS integration tool
+ * File:        rss_cache.php, a simple, rolling(no GC), cache
+ *              for RSS objects, keyed on URL.
+ * Author:      Kellan Elliott-McCrea <kellan@protest.net>
+ * Version:     0.51
+ * License:     GPL
+ *
+ * The lastest version of MagpieRSS can be obtained from:
+ * http://magpierss.sourceforge.net
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Magpie mailing list:
+ * http://lists.sourceforge.net/lists/listinfo/magpierss-general
+ *
+ */
+
+class RSSCache {
+    var $BASE_CACHE = './cache';    // where the cache files are stored
+    var $MAX_AGE    = 3600;         // when are files stale, default one hour
+    var $ERROR      = "";           // accumulate error messages
+    
+    function RSSCache ($base='', $age='') {
+        if ( $base ) {
+            $this->BASE_CACHE = $base;
+        }
+        if ( $age ) {
+            $this->MAX_AGE = $age;
+        }
+        
+        // attempt to make the cache directory
+        if ( ! file_exists( $this->BASE_CACHE ) ) {
+            $status = @mkdir( $this->BASE_CACHE, 0755 );
+            
+            // if make failed 
+            if ( ! $status ) {
+                $this->error(
+                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
+                );
+            }
+        }
+    }
+    
+/*=======================================================================*\
+    Function:   set
+    Purpose:    add an item to the cache, keyed on url
+    Input:      url from wich the rss file was fetched
+    Output:     true on sucess  
+\*=======================================================================*/
+    function set ($url, $rss) {
+        $this->ERROR = "";
+        $cache_file = $this->file_name( $url );
+        $fp = @fopen( $cache_file, 'w' );
+        
+        if ( ! $fp ) {
+            $this->error(
+                "Cache unable to open file for writing: $cache_file"
+            );
+            return 0;
+        }
+        
+        
+        $data = $this->serialize( $rss );
+        fwrite( $fp, $data );
+        fclose( $fp );
+        
+        return $cache_file;
+    }
+    
+/*=======================================================================*\
+    Function:   get
+    Purpose:    fetch an item from the cache
+    Input:      url from wich the rss file was fetched
+    Output:     cached object on HIT, false on MISS 
+\*=======================================================================*/ 
+    function get ($url) {
+        $this->ERROR = "";
+        $cache_file = $this->file_name( $url );
+        
+        if ( ! file_exists( $cache_file ) ) {
+            $this->debug( 
+                "Cache doesn't contain: $url (cache file: $cache_file)"
+            );
+            return 0;
+        }
+        
+        $fp = @fopen($cache_file, 'r');
+        if ( ! $fp ) {
+            $this->error(
+                "Failed to open cache file for reading: $cache_file"
+            );
+            return 0;
+        }
+        
+        if ($filesize = filesize($cache_file) ) {
+        	$data = fread( $fp, filesize($cache_file) );
+        	$rss = $this->unserialize( $data );
+        
+        	return $rss;
+    	}
+    	
+    	return 0;
+    }
+
+/*=======================================================================*\
+    Function:   check_cache
+    Purpose:    check a url for membership in the cache
+                and whether the object is older then MAX_AGE (ie. STALE)
+    Input:      url from wich the rss file was fetched
+    Output:     cached object on HIT, false on MISS 
+\*=======================================================================*/     
+    function check_cache ( $url ) {
+        $this->ERROR = "";
+        $filename = $this->file_name( $url );
+        
+        if ( file_exists( $filename ) ) {
+            // find how long ago the file was added to the cache
+            // and whether that is longer then MAX_AGE
+            $mtime = filemtime( $filename );
+            $age = time() - $mtime;
+            if ( $this->MAX_AGE > $age ) {
+                // object exists and is current
+                return 'HIT';
+            }
+            else {
+                // object exists but is old
+                return 'STALE';
+            }
+        }
+        else {
+            // object does not exist
+            return 'MISS';
+        }
+    }
+
+	function cache_age( $cache_key ) {
+		$filename = $this->file_name( $url );
+		if ( file_exists( $filename ) ) {
+			$mtime = filemtime( $filename );
+            $age = time() - $mtime;
+			return $age;
+		}
+		else {
+			return -1;	
+		}
+	}
+	
+/*=======================================================================*\
+    Function:   serialize
+\*=======================================================================*/     
+    function serialize ( $rss ) {
+        return serialize( $rss );
+    }
+
+/*=======================================================================*\
+    Function:   unserialize
+\*=======================================================================*/     
+    function unserialize ( $data ) {
+        return unserialize( $data );
+    }
+    
+/*=======================================================================*\
+    Function:   file_name
+    Purpose:    map url to location in cache
+    Input:      url from wich the rss file was fetched
+    Output:     a file name
+\*=======================================================================*/     
+    function file_name ($url) {
+        $filename = md5( $url );
+        return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
+    }
+
+/*=======================================================================*\
+    Function:   error
+    Purpose:    register error
+\*=======================================================================*/         
+    function error ($errormsg, $lvl=E_USER_WARNING) {
+        // append PHP's error message if track_errors enabled
+        if ( isset($php_errormsg) ) { 
+            $errormsg .= " ($php_errormsg)";
+        }
+        $this->ERROR = $errormsg;
+        if ( MAGPIE_DEBUG ) {
+            trigger_error( $errormsg, $lvl);
+        }
+        else {
+            error_log( $errormsg, 0);
+        }
+    }
+    
+    function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+        if ( MAGPIE_DEBUG ) {
+            $this->error("MagpieRSS [debug] $debugmsg", $lvl);
+        }
+    }
+
+}
+
+?>
diff -ruN 4.5.4/includes/magpierss/rss_fetch.php 4.6rc2/includes/magpierss/rss_fetch.php
--- 4.5.4/includes/magpierss/rss_fetch.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/rss_fetch.php	2006-01-26 05:51:01.000000000 -0600
@@ -0,0 +1,458 @@
+<?php
+/*
+ * Project:     MagpieRSS: a simple RSS integration tool
+ * File:        rss_fetch.php, a simple functional interface
+                to fetching and parsing RSS files, via the
+                function fetch_rss()
+ * Author:      Kellan Elliott-McCrea <kellan@protest.net>
+ * License:     GPL
+ *
+ * The lastest version of MagpieRSS can be obtained from:
+ * http://magpierss.sourceforge.net
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Magpie mailing list:
+ * magpierss-general@lists.sourceforge.net
+ *
+ */
+ 
+// Setup MAGPIE_DIR for use on hosts that don't include
+// the current path in include_path.
+// with thanks to rajiv and smarty
+if (!defined('DIR_SEP')) {
+    define('DIR_SEP', DIRECTORY_SEPARATOR);
+}
+
+if (!defined('MAGPIE_DIR')) {
+    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+}
+
+require_once( MAGPIE_DIR . 'rss_parse.php' );
+require_once( MAGPIE_DIR . 'rss_cache.php' );
+
+// for including 3rd party libraries
+define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
+require_once( MAGPIE_EXTLIB . 'Snoopy.class.php');
+
+
+/* 
+ * CONSTANTS - redefine these in your script to change the
+ * behaviour of fetch_rss() currently, most options effect the cache
+ *
+ * MAGPIE_CACHE_ON - Should Magpie cache parsed RSS objects? 
+ * For me a built in cache was essential to creating a "PHP-like" 
+ * feel to Magpie, see rss_cache.php for rationale
+ *
+ *
+ * MAGPIE_CACHE_DIR - Where should Magpie cache parsed RSS objects?
+ * This should be a location that the webserver can write to.   If this 
+ * directory does not already exist Mapie will try to be smart and create 
+ * it.  This will often fail for permissions reasons.
+ *
+ *
+ * MAGPIE_CACHE_AGE - How long to store cached RSS objects? In seconds.
+ *
+ *
+ * MAGPIE_CACHE_FRESH_ONLY - If remote fetch fails, throw error
+ * instead of returning stale object?
+ *
+ * MAGPIE_DEBUG - Display debugging notices?
+ *
+*/
+
+
+/*=======================================================================*\
+    Function: fetch_rss: 
+    Purpose:  return RSS object for the give url
+              maintain the cache
+    Input:    url of RSS file
+    Output:   parsed RSS object (see rss_parse.php)
+
+    NOTES ON CACHEING:  
+    If caching is on (MAGPIE_CACHE_ON) fetch_rss will first check the cache.
+    
+    NOTES ON RETRIEVING REMOTE FILES:
+    If conditional gets are on (MAGPIE_CONDITIONAL_GET_ON) fetch_rss will
+    return a cached object, and touch the cache object upon recieving a
+    304.
+    
+    NOTES ON FAILED REQUESTS:
+    If there is an HTTP error while fetching an RSS object, the cached
+    version will be return, if it exists (and if MAGPIE_CACHE_FRESH_ONLY is off)
+\*=======================================================================*/
+
+define('MAGPIE_VERSION', '0.72');
+
+$MAGPIE_ERROR = "";
+
+function fetch_rss ($url) {
+    // initialize constants
+    init();
+    
+    if ( !isset($url) ) {
+        error("fetch_rss called without a url");
+        return false;
+    }
+    
+    // if cache is disabled
+    if ( !MAGPIE_CACHE_ON ) {
+        // fetch file, and parse it
+        $resp = _fetch_remote_file( $url );
+        if ( is_success( $resp->status ) ) {
+            return _response_to_rss( $resp );
+        }
+        else {
+            error("Failed to fetch $url and cache is off");
+            return false;
+        }
+    } 
+    // else cache is ON
+    else {
+        // Flow
+        // 1. check cache
+        // 2. if there is a hit, make sure its fresh
+        // 3. if cached obj fails freshness check, fetch remote
+        // 4. if remote fails, return stale object, or error
+        
+        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        
+        if (MAGPIE_DEBUG and $cache->ERROR) {
+            debug($cache->ERROR, E_USER_WARNING);
+        }
+        
+        
+        $cache_status    = 0;       // response of check_cache
+        $request_headers = array(); // HTTP headers to send with fetch
+        $rss             = 0;       // parsed RSS object
+        $errormsg        = 0;       // errors, if any
+        
+        // store parsed XML by desired output encoding
+        // as character munging happens at parse time
+        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        
+        if (!$cache->ERROR) {
+            // return cache HIT, MISS, or STALE
+            $cache_status = $cache->check_cache( $cache_key);
+        }
+                
+        // if object cached, and cache is fresh, return cached obj
+        if ( $cache_status == 'HIT' ) {
+            $rss = $cache->get( $cache_key );
+            if ( isset($rss) and $rss ) {
+                // should be cache age
+                $rss->from_cache = 1;
+                if ( MAGPIE_DEBUG > 1) {
+                    debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
+                }
+                return $rss;
+            }
+        }
+        
+        // else attempt a conditional get
+        
+        // setup headers
+        if ( $cache_status == 'STALE' ) {
+            $rss = $cache->get( $cache_key );
+            if ( $rss and @$rss->etag and @$rss->last_modified ) {
+                $request_headers['If-None-Match'] = $rss->etag;
+                $request_headers['If-Last-Modified'] = $rss->last_modified;
+            }
+        }
+        
+        $resp = _fetch_remote_file( $url, $request_headers );
+        
+        if (isset($resp) and $resp) {
+          if ($resp->status == '304' ) {
+                // we have the most current copy
+                if ( MAGPIE_DEBUG > 1) {
+                    debug("Got 304 for $url");
+                }
+                // reset cache on 304 (at minutillo insistent prodding)
+                $cache->set($cache_key, $rss);
+                return $rss;
+            }
+            elseif ( is_success( $resp->status ) ) {
+                $rss = _response_to_rss( $resp );
+                if ( $rss ) {
+                    if (MAGPIE_DEBUG > 1) {
+                        debug("Fetch successful");
+                    }
+                    // add object to cache
+                    $cache->set( $cache_key, $rss );
+                    return $rss;
+                }
+            }
+            else {
+                $errormsg = "Failed to fetch $url ";
+                if ( $resp->status == '-100' ) {
+                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                }
+                elseif ( $resp->error ) {
+                    # compensate for Snoopy's annoying habbit to tacking
+                    # on '\n'
+                    $http_error = substr($resp->error, 0, -2); 
+                    $errormsg .= "(HTTP Error: $http_error)";
+                }
+                else {
+                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                }
+            }
+        }
+        else {
+            $errormsg = "Unable to retrieve RSS file for unknown reasons.";
+        }
+        
+        // else fetch failed
+        
+        // attempt to return cached object
+        if ($rss) {
+            if ( MAGPIE_DEBUG ) {
+                debug("Returning STALE object for $url");
+            }
+            return $rss;
+        }
+        
+        // else we totally failed
+        error( $errormsg ); 
+        
+        return false;
+        
+    } // end if ( !MAGPIE_CACHE_ON ) {
+} // end fetch_rss()
+
+/*=======================================================================*\
+    Function:   error
+    Purpose:    set MAGPIE_ERROR, and trigger error
+\*=======================================================================*/
+
+function error ($errormsg, $lvl=E_USER_WARNING) {
+        global $MAGPIE_ERROR;
+        
+        // append PHP's error message if track_errors enabled
+        if ( isset($php_errormsg) ) { 
+            $errormsg .= " ($php_errormsg)";
+        }
+        if ( $errormsg ) {
+            $errormsg = "MagpieRSS: $errormsg";
+            $MAGPIE_ERROR = $errormsg;
+            trigger_error( $errormsg, $lvl);                
+        }
+}
+
+function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+    trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
+}
+            
+/*=======================================================================*\
+    Function:   magpie_error
+    Purpose:    accessor for the magpie error variable
+\*=======================================================================*/
+function magpie_error ($errormsg="") {
+    global $MAGPIE_ERROR;
+    
+    if ( isset($errormsg) and $errormsg ) { 
+        $MAGPIE_ERROR = $errormsg;
+    }
+    
+    return $MAGPIE_ERROR;   
+}
+
+/*=======================================================================*\
+    Function:   _fetch_remote_file
+    Purpose:    retrieve an arbitrary remote file
+    Input:      url of the remote file
+                headers to send along with the request (optional)
+    Output:     an HTTP response object (see Snoopy.class.php)
+\*=======================================================================*/
+function _fetch_remote_file ($url, $headers = "" ) {
+    // Snoopy is an HTTP client in PHP
+    $client = new Snoopy();
+    $client->agent = MAGPIE_USER_AGENT;
+    $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
+    $client->use_gzip = MAGPIE_USE_GZIP;
+    if (is_array($headers) ) {
+        $client->rawheaders = $headers;
+    }
+    
+    @$client->fetch($url);
+    return $client;
+
+}
+
+/*=======================================================================*\
+    Function:   _response_to_rss
+    Purpose:    parse an HTTP response object into an RSS object
+    Input:      an HTTP response object (see Snoopy)
+    Output:     parsed RSS object (see rss_parse)
+\*=======================================================================*/
+function _response_to_rss ($resp) {
+    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+    
+    // if RSS parsed successfully       
+    if ( $rss and !$rss->ERROR) {
+        
+        // find Etag, and Last-Modified
+        foreach($resp->headers as $h) {
+            // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
+            if (strpos($h, ": ")) {
+                list($field, $val) = explode(": ", $h, 2);
+            }
+            else {
+                $field = $h;
+                $val = "";
+            }
+            
+            if ( $field == 'ETag' ) {
+                $rss->etag = $val;
+            }
+            
+            if ( $field == 'Last-Modified' ) {
+                $rss->last_modified = $val;
+            }
+        }
+        
+        return $rss;    
+    } // else construct error message
+    else {
+        $errormsg = "Failed to parse RSS file.";
+        
+        if ($rss) {
+            $errormsg .= " (" . $rss->ERROR . ")";
+        }
+        error($errormsg);
+        
+        return false;
+    } // end if ($rss and !$rss->error)
+}
+
+/*=======================================================================*\
+    Function:   init
+    Purpose:    setup constants with default values
+                check for user overrides
+\*=======================================================================*/
+function init () {
+    if ( defined('MAGPIE_INITALIZED') ) {
+        return;
+    }
+    else {
+        define('MAGPIE_INITALIZED', true);
+    }
+    
+    if ( !defined('MAGPIE_CACHE_ON') ) {
+        define('MAGPIE_CACHE_ON', true);
+    }
+
+    if ( !defined('MAGPIE_CACHE_DIR') ) {
+        define('MAGPIE_CACHE_DIR', './cache');
+    }
+
+    if ( !defined('MAGPIE_CACHE_AGE') ) {
+        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    }
+
+    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+        define('MAGPIE_CACHE_FRESH_ONLY', false);
+    }
+
+    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+        define('MAGPIE_OUTPUT_ENCODING', 'ISO-8859-1');
+    }
+    
+    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+        define('MAGPIE_INPUT_ENCODING', null);
+    }
+    
+    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+        define('MAGPIE_DETECT_ENCODING', true);
+    }
+    
+    if ( !defined('MAGPIE_DEBUG') ) {
+        define('MAGPIE_DEBUG', 0);
+    }
+    
+    if ( !defined('MAGPIE_USER_AGENT') ) {
+        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+        
+        if ( MAGPIE_CACHE_ON ) {
+            $ua = $ua . ')';
+        }
+        else {
+            $ua = $ua . '; No cache)';
+        }
+        
+        define('MAGPIE_USER_AGENT', $ua);
+    }
+    
+    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+        define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
+    }
+    
+    // use gzip encoding to fetch rss files if supported?
+    if ( !defined('MAGPIE_USE_GZIP') ) {
+        define('MAGPIE_USE_GZIP', true);    
+    }
+}
+
+// NOTE: the following code should really be in Snoopy, or at least
+// somewhere other then rss_fetch!
+
+/*=======================================================================*\
+    HTTP STATUS CODE PREDICATES
+    These functions attempt to classify an HTTP status code
+    based on RFC 2616 and RFC 2518.
+    
+    All of them take an HTTP status code as input, and return true or false
+
+    All this code is adapted from LWP's HTTP::Status.
+\*=======================================================================*/
+
+
+/*=======================================================================*\
+    Function:   is_info
+    Purpose:    return true if Informational status code
+\*=======================================================================*/
+function is_info ($sc) { 
+    return $sc >= 100 && $sc < 200; 
+}
+
+/*=======================================================================*\
+    Function:   is_success
+    Purpose:    return true if Successful status code
+\*=======================================================================*/
+function is_success ($sc) { 
+    return $sc >= 200 && $sc < 300; 
+}
+
+/*=======================================================================*\
+    Function:   is_redirect
+    Purpose:    return true if Redirection status code
+\*=======================================================================*/
+function is_redirect ($sc) { 
+    return $sc >= 300 && $sc < 400; 
+}
+
+/*=======================================================================*\
+    Function:   is_error
+    Purpose:    return true if Error status code
+\*=======================================================================*/
+function is_error ($sc) { 
+    return $sc >= 400 && $sc < 600; 
+}
+
+/*=======================================================================*\
+    Function:   is_client_error
+    Purpose:    return true if Error status code, and its a client error
+\*=======================================================================*/
+function is_client_error ($sc) { 
+    return $sc >= 400 && $sc < 500; 
+}
+
+/*=======================================================================*\
+    Function:   is_client_error
+    Purpose:    return true if Error status code, and its a server error
+\*=======================================================================*/
+function is_server_error ($sc) { 
+    return $sc >= 500 && $sc < 600; 
+}
+
+?>
diff -ruN 4.5.4/includes/magpierss/rss_parse.php 4.6rc2/includes/magpierss/rss_parse.php
--- 4.5.4/includes/magpierss/rss_parse.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/rss_parse.php	2006-01-26 05:51:01.000000000 -0600
@@ -0,0 +1,605 @@
+<?php
+
+/**
+* Project:     MagpieRSS: a simple RSS integration tool
+* File:        rss_parse.php  - parse an RSS or Atom feed
+*               return as a simple object.
+*
+* Handles RSS 0.9x, RSS 2.0, RSS 1.0, and Atom 0.3
+*
+* The lastest version of MagpieRSS can be obtained from:
+* http://magpierss.sourceforge.net
+*
+* For questions, help, comments, discussion, etc., please join the
+* Magpie mailing list:
+* magpierss-general@lists.sourceforge.net
+*
+* @author           Kellan Elliott-McCrea <kellan@protest.net>
+* @version          0.7a
+* @license          GPL
+*
+*/
+
+define('RSS', 'RSS');
+define('ATOM', 'Atom');
+
+require_once (MAGPIE_DIR . 'rss_utils.php');
+
+/**
+* Hybrid parser, and object, takes RSS as a string and returns a simple object.
+*
+* see: rss_fetch.php for a simpler interface with integrated caching support
+*
+*/
+class MagpieRSS {
+    var $parser;
+    
+    var $current_item   = array();  // item currently being parsed
+    var $items          = array();  // collection of parsed items
+    var $channel        = array();  // hash of channel fields
+    var $textinput      = array();
+    var $image          = array();
+    var $feed_type;
+    var $feed_version;
+    var $encoding       = '';       // output encoding of parsed rss
+    
+    var $_source_encoding = '';     // only set if we have to parse xml prolog
+    
+    var $ERROR = "";
+    var $WARNING = "";
+    
+    // define some constants
+    
+    var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
+    var $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
+
+    // parser variables, useless if you're not a parser, treat as private
+    var $stack              = array(); // parser stack
+    var $inchannel          = false;
+    var $initem             = false;
+    var $incontent          = false; // if in Atom <content mode="xml"> field 
+    var $intextinput        = false;
+    var $inimage            = false;
+    var $current_namespace  = false;
+    
+
+    /**
+     *  Set up XML parser, parse source, and return populated RSS object..
+     *   
+     *  @param string $source           string containing the RSS to be parsed
+     *
+     *  NOTE:  Probably a good idea to leave the encoding options alone unless
+     *         you know what you're doing as PHP's character set support is
+     *         a little weird.
+     *
+     *  NOTE:  A lot of this is unnecessary but harmless with PHP5 
+     *
+     *
+     *  @param string $output_encoding  output the parsed RSS in this character 
+     *                                  set defaults to ISO-8859-1 as this is PHP's
+     *                                  default.
+     *
+     *                                  NOTE: might be changed to UTF-8 in future
+     *                                  versions.
+     *                               
+     *  @param string $input_encoding   the character set of the incoming RSS source. 
+     *                                  Leave blank and Magpie will try to figure it
+     *                                  out.
+     *                                  
+     *                                   
+     *  @param bool   $detect_encoding  if false Magpie won't attempt to detect
+     *                                  source encoding. (caveat emptor)
+     *
+     */
+    function MagpieRSS ($source, $output_encoding='ISO-8859-1', 
+                        $input_encoding=null, $detect_encoding=true) 
+    {   
+        # if PHP xml isn't compiled in, die
+        #
+        if (!function_exists('xml_parser_create')) {
+            $this->error( "Failed to load PHP's XML Extension. " . 
+                          "http://www.php.net/manual/en/ref.xml.php",
+                           E_USER_ERROR );
+        }
+        
+        list($parser, $source) = $this->create_parser($source, 
+                $output_encoding, $input_encoding, $detect_encoding);
+        
+        
+        if (!is_resource($parser)) {
+            $this->error( "Failed to create an instance of PHP's XML parser. " .
+                          "http://www.php.net/manual/en/ref.xml.php",
+                          E_USER_ERROR );
+        }
+
+        
+        $this->parser = $parser;
+        
+        # pass in parser, and a reference to this object
+        # setup handlers
+        #
+        xml_set_object( $this->parser, $this );
+        xml_set_element_handler($this->parser, 
+                'feed_start_element', 'feed_end_element' );
+                        
+        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
+    
+        $status = xml_parse( $this->parser, $source );
+        
+        if (! $status ) {
+            $errorcode = xml_get_error_code( $this->parser );
+            if ( $errorcode != XML_ERROR_NONE ) {
+                $xml_error = xml_error_string( $errorcode );
+                $error_line = xml_get_current_line_number($this->parser);
+                $error_col = xml_get_current_column_number($this->parser);
+                $errormsg = "$xml_error at line $error_line, column $error_col";
+
+                $this->error( $errormsg );
+            }
+        }
+        
+        xml_parser_free( $this->parser );
+
+        $this->normalize();
+    }
+    
+    function feed_start_element($p, $element, &$attrs) {
+        $el = $element = strtolower($element);
+        $attrs = array_change_key_case($attrs, CASE_LOWER);
+        
+        // check for a namespace, and split if found
+        $ns = false;
+        if ( strpos( $element, ':' ) ) {
+            list($ns, $el) = split( ':', $element, 2); 
+        }
+        if ( $ns and $ns != 'rdf' ) {
+            $this->current_namespace = $ns;
+        }
+            
+        # if feed type isn't set, then this is first element of feed
+        # identify feed from root element
+        #
+        if (!isset($this->feed_type) ) {
+            if ( $el == 'rdf' ) {
+                $this->feed_type = RSS;
+                $this->feed_version = '1.0';
+            }
+            elseif ( $el == 'rss' ) {
+                $this->feed_type = RSS;
+                $this->feed_version = $attrs['version'];
+            }
+            elseif ( $el == 'feed' ) {
+                $this->feed_type = ATOM;
+                $this->feed_version = $attrs['version'];
+                $this->inchannel = true;
+            }
+            return;
+        }
+    
+        if ( $el == 'channel' ) 
+        {
+            $this->inchannel = true;
+        }
+        elseif ($el == 'item' or $el == 'entry' ) 
+        {
+            $this->initem = true;
+            if ( isset($attrs['rdf:about']) ) {
+                $this->current_item['about'] = $attrs['rdf:about']; 
+            }
+        }
+        
+        // if we're in the default namespace of an RSS feed,
+        //  record textinput or image fields
+        elseif ( 
+            $this->feed_type == RSS and 
+            $this->current_namespace == '' and 
+            $el == 'textinput' ) 
+        {
+            $this->intextinput = true;
+        }
+        
+        elseif (
+            $this->feed_type == RSS and 
+            $this->current_namespace == '' and 
+            $el == 'image' ) 
+        {
+            $this->inimage = true;
+        }
+        
+        # handle atom content constructs
+        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        {
+            // avoid clashing w/ RSS mod_content
+            if ($el == 'content' ) {
+                $el = 'atom_content';
+            }
+            
+            $this->incontent = $el;
+            
+            
+        }
+        
+        // if inside an Atom content construct (e.g. content or summary) field treat tags as text
+        elseif ($this->feed_type == ATOM and $this->incontent ) 
+        {
+            // if tags are inlined, then flatten
+            $attrs_str = join(' ', 
+                    array_map('map_attrs', 
+                    array_keys($attrs), 
+                    array_values($attrs) ) );
+            
+            $this->append_content( "<$element $attrs_str>"  );
+                    
+            array_unshift( $this->stack, $el );
+        }
+        
+        // Atom support many links per containging element.
+        // Magpie treats link elements of type rel='alternate'
+        // as being equivalent to RSS's simple link element.
+        //
+        elseif ($this->feed_type == ATOM and $el == 'link' ) 
+        {
+            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
+            {
+                $link_el = 'link';
+            }
+            else {
+                $link_el = 'link_' . $attrs['rel'];
+            }
+            
+            $this->append($link_el, $attrs['href']);
+        }
+        // set stack[0] to current element
+        else {
+            array_unshift($this->stack, $el);
+        }
+    }
+    
+
+    
+    function feed_cdata ($p, $text) {
+        if ($this->feed_type == ATOM and $this->incontent) 
+        {
+            $this->append_content( $text );
+        }
+        else {
+            $current_el = join('_', array_reverse($this->stack));
+            $this->append($current_el, $text);
+        }
+    }
+    
+    function feed_end_element ($p, $el) {
+        $el = strtolower($el);
+        
+        if ( $el == 'item' or $el == 'entry' ) 
+        {
+            $this->items[] = $this->current_item;
+            $this->current_item = array();
+            $this->initem = false;
+        }
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        {
+            $this->intextinput = false;
+        }
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        {
+            $this->inimage = false;
+        }
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        {   
+            $this->incontent = false;
+        }
+        elseif ($el == 'channel' or $el == 'feed' ) 
+        {
+            $this->inchannel = false;
+        }
+        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+            // balance tags properly
+            // note:  i don't think this is actually neccessary
+            if ( $this->stack[0] == $el ) 
+            {
+                $this->append_content("</$el>");
+            }
+            else {
+                $this->append_content("<$el />");
+            }
+
+            array_shift( $this->stack );
+        }
+        else {
+            array_shift( $this->stack );
+        }
+        
+        $this->current_namespace = false;
+    }
+    
+    function concat (&$str1, $str2="") {
+        if (!isset($str1) ) {
+            $str1="";
+        }
+        $str1 .= $str2;
+    }
+    
+    
+    
+    function append_content($text) {
+        if ( $this->initem ) {
+            $this->concat( $this->current_item[ $this->incontent ], $text );
+        }
+        elseif ( $this->inchannel ) {
+            $this->concat( $this->channel[ $this->incontent ], $text );
+        }
+    }
+    
+    // smart append - field and namespace aware
+    function append($el, $text) {
+        if (!$el) {
+            return;
+        }
+        if ( $this->current_namespace ) 
+        {
+            if ( $this->initem ) {
+                $this->concat(
+                    $this->current_item[ $this->current_namespace ][ $el ], $text);
+            }
+            elseif ($this->inchannel) {
+                $this->concat(
+                    $this->channel[ $this->current_namespace][ $el ], $text );
+            }
+            elseif ($this->intextinput) {
+                $this->concat(
+                    $this->textinput[ $this->current_namespace][ $el ], $text );
+            }
+            elseif ($this->inimage) {
+                $this->concat(
+                    $this->image[ $this->current_namespace ][ $el ], $text );
+            }
+        }
+        else {
+            if ( $this->initem ) {
+                $this->concat(
+                    $this->current_item[ $el ], $text);
+            }
+            elseif ($this->intextinput) {
+                $this->concat(
+                    $this->textinput[ $el ], $text );
+            }
+            elseif ($this->inimage) {
+                $this->concat(
+                    $this->image[ $el ], $text );
+            }
+            elseif ($this->inchannel) {
+                $this->concat(
+                    $this->channel[ $el ], $text );
+            }
+            
+        }
+    }
+    
+    function normalize () {
+        // if atom populate rss fields
+        if ( $this->is_atom() ) {
+            $this->channel['description'] = $this->channel['tagline'];
+            for ( $i = 0; $i < count($this->items); $i++) {
+                $item = $this->items[$i];
+                if ( isset($item['summary']) )
+                    $item['description'] = $item['summary'];
+                if ( isset($item['atom_content']))
+                    $item['content']['encoded'] = $item['atom_content'];
+                
+                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
+                if ( $atom_date ) {
+                    $epoch = @parse_w3cdtf($atom_date);
+                    if ($epoch and $epoch > 0) {
+                        $item['date_timestamp'] = $epoch;
+                    }
+                }
+                
+                $this->items[$i] = $item;
+            }       
+        }
+        elseif ( $this->is_rss() ) {
+            $this->channel['tagline'] = @$this->channel['description'];
+            for ( $i = 0; $i < count($this->items); $i++) {
+                $item = $this->items[$i];
+                if ( isset($item['description']))
+                    $item['summary'] = $item['description'];
+                if ( isset($item['content']['encoded'] ) )
+                    $item['atom_content'] = $item['content']['encoded'];
+                
+                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
+                    $epoch = @parse_w3cdtf($item['dc']['date']);
+                    if ($epoch and $epoch > 0) {
+                        $item['date_timestamp'] = $epoch;
+                    }
+                }
+                elseif ( isset($item['pubdate']) ) {
+                    $epoch = @strtotime($item['pubdate']);
+                    if ($epoch > 0) {
+                        $item['date_timestamp'] = $epoch;
+                    }
+                }
+                
+                $this->items[$i] = $item;
+            }
+        }
+    }
+    
+    
+    function is_rss () {
+        if ( $this->feed_type == RSS ) {
+            return $this->feed_version; 
+        }
+        else {
+            return false;
+        }
+    }
+    
+    function is_atom() {
+        if ( $this->feed_type == ATOM ) {
+            return $this->feed_version;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+    * return XML parser, and possibly re-encoded source
+    *
+    */
+    function create_parser($source, $out_enc, $in_enc, $detect) {
+        if ( substr(phpversion(),0,1) == 5) {
+            $parser = $this->php5_create_parser($in_enc, $detect);
+        }
+        else {
+            list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
+        }
+        if ($out_enc) {
+            $this->encoding = $out_enc;
+            xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $out_enc);
+        }
+        
+        return array($parser, $source);
+    }
+    
+    /**
+    * Instantiate an XML parser under PHP5
+    *
+    * PHP5 will do a fine job of detecting input encoding
+    * if passed an empty string as the encoding. 
+    *
+    * All hail libxml2!
+    *
+    */
+    function php5_create_parser($in_enc, $detect) {
+        // by default php5 does a fine job of detecting input encodings
+        if(!$detect && $in_enc) {
+            return xml_parser_create($in_enc);
+        }
+        else {
+            return xml_parser_create('');
+        }
+    }
+    
+    /**
+    * Instaniate an XML parser under PHP4
+    *
+    * Unfortunately PHP4's support for character encodings
+    * and especially XML and character encodings sucks.  As
+    * long as the documents you parse only contain characters
+    * from the ISO-8859-1 character set (a superset of ASCII,
+    * and a subset of UTF-8) you're fine.  However once you
+    * step out of that comfy little world things get mad, bad,
+    * and dangerous to know.
+    *
+    * The following code is based on SJM's work with FoF
+    * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+    *
+    */
+    function php4_create_parser($source, $in_enc, $detect) {
+        if ( !$detect ) {
+            return array(xml_parser_create($in_enc), $source);
+        }
+        
+        if (!$in_enc) {
+            if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
+                $in_enc = strtoupper($m[1]);
+                $this->source_encoding = $in_enc;
+            }
+            else {
+                $in_enc = 'UTF-8';
+            }
+        }
+        
+        if ($this->known_encoding($in_enc)) {
+            return array(xml_parser_create($in_enc), $source);
+        }
+        
+        // the dectected encoding is not one of the simple encodings PHP knows
+        
+        // attempt to use the iconv extension to
+        // cast the XML to a known encoding
+        // @see http://php.net/iconv
+       
+        if (function_exists('iconv'))  {
+            $encoded_source = iconv($in_enc,'UTF-8', $source);
+            if ($encoded_source) {
+                return array(xml_parser_create('UTF-8'), $encoded_source);
+            }
+        }
+        
+        // iconv didn't work, try mb_convert_encoding
+        // @see http://php.net/mbstring
+        if(function_exists('mb_convert_encoding')) {
+            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
+            if ($encoded_source) {
+                return array(xml_parser_create('UTF-8'), $encoded_source);
+            }
+        }
+        
+        // else 
+        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
+                     "You may see strange artifacts, and mangled characters.",
+                     E_USER_NOTICE);
+            
+        return array(xml_parser_create(), $source);
+    }
+    
+    function known_encoding($enc) {
+        $enc = strtoupper($enc);
+        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+            return $enc;
+        }
+        else {
+            return false;
+        }
+    }
+
+    function error ($errormsg, $lvl=E_USER_WARNING) {
+        // append PHP's error message if track_errors enabled
+        if ( isset($php_errormsg) ) { 
+            $errormsg .= " ($php_errormsg)";
+        }
+        if ( MAGPIE_DEBUG ) {
+            trigger_error( $errormsg, $lvl);        
+        }
+        else {
+            error_log( $errormsg, 0);
+        }
+        
+        $notices = E_USER_NOTICE|E_NOTICE;
+        if ( $lvl&$notices ) {
+            $this->WARNING = $errormsg;
+        } else {
+            $this->ERROR = $errormsg;
+        }
+    }
+    
+    
+} // end class RSS
+
+function map_attrs($k, $v) {
+    return "$k=\"$v\"";
+}
+
+// patch to support medieval versions of PHP4.1.x, 
+// courtesy, Ryan Currie, ryan@digibliss.com
+
+if (!function_exists('array_change_key_case')) {
+	define("CASE_UPPER",1);
+	define("CASE_LOWER",0);
+
+
+	function array_change_key_case($array,$case=CASE_LOWER) {
+       if ($case=CASE_LOWER) $cmd=strtolower;
+       elseif ($case=CASE_UPPER) $cmd=strtoupper;
+       foreach($array as $key=>$value) {
+               $output[$cmd($key)]=$value;
+       }
+       return $output;
+	}
+
+}
+
+?>
diff -ruN 4.5.4/includes/magpierss/rss_utils.php 4.6rc2/includes/magpierss/rss_utils.php
--- 4.5.4/includes/magpierss/rss_utils.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/magpierss/rss_utils.php	2006-01-19 08:24:56.000000000 -0600
@@ -0,0 +1,67 @@
+<?php
+/*
+ * Project:     MagpieRSS: a simple RSS integration tool
+ * File:        rss_utils.php, utility methods for working with RSS
+ * Author:      Kellan Elliott-McCrea <kellan@protest.net>
+ * Version:     0.51
+ * License:     GPL
+ *
+ * The lastest version of MagpieRSS can be obtained from:
+ * http://magpierss.sourceforge.net
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Magpie mailing list:
+ * magpierss-general@lists.sourceforge.net
+ */
+
+
+/*======================================================================*\
+    Function: parse_w3cdtf
+    Purpose:  parse a W3CDTF date into unix epoch
+
+    NOTE: http://www.w3.org/TR/NOTE-datetime
+\*======================================================================*/
+
+function parse_w3cdtf ( $date_str ) {
+    
+    # regex to match wc3dtf
+    $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
+    
+    if ( preg_match( $pat, $date_str, $match ) ) {
+        list( $year, $month, $day, $hours, $minutes, $seconds) = 
+            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+        
+        # calc epoch for current date assuming GMT
+        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        
+        $offset = 0;
+        if ( $match[10] == 'Z' ) {
+            # zulu time, aka GMT
+        }
+        else {
+            list( $tz_mod, $tz_hour, $tz_min ) =
+                array( $match[8], $match[9], $match[10]);
+            
+            # zero out the variables
+            if ( ! $tz_hour ) { $tz_hour = 0; }
+            if ( ! $tz_min ) { $tz_min = 0; }
+        
+            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            
+            # is timezone ahead of GMT?  then subtract offset
+            #
+            if ( $tz_mod == '+' ) {
+                $offset_secs = $offset_secs * -1;
+            }
+            
+            $offset = $offset_secs; 
+        }
+        $epoch = $epoch + $offset;
+        return $epoch;
+    }
+    else {
+        return -1;
+    }
+}
+
+?>
diff -ruN 4.5.4/includes/mambo.php 4.6rc2/includes/mambo.php
--- 4.5.4/includes/mambo.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/mambo.php	2006-05-16 04:44:41.000000000 -0500
@@ -1,4248 +1,342 @@
 <?php
 /**
-* @version $Id: mambo.php,v 1.14 2005/11/14 21:56:04 eliasan Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-define( '_MOS_MAMBO_INCLUDED', 1 );
-
-if (phpversion() < '4.2.0') {
-	require_once( $mosConfig_absolute_path . '/includes/compat.php41x.php' );
-}
-if (phpversion() < '4.3.0') {
-	require_once( $mosConfig_absolute_path . '/includes/compat.php42x.php' );
-}
-if (in_array( 'globals', array_keys( array_change_key_case( $_REQUEST, CASE_LOWER ) ) ) ) {
-	die( 'Fatal error.  Global variable hack attempted.' );
-}
-if (in_array( '_post', array_keys( array_change_key_case( $_REQUEST, CASE_LOWER ) ) ) ) {
-	die( 'Fatal error.  Post variable hack attempted.' );
-}
-
+*/ 
 
-@set_magic_quotes_runtime( 0 );
 
-if (@$mosConfig_error_reporting === 0) {
-	error_reporting( 0 );
-} else if (@$mosConfig_error_reporting > 0) {
-	error_reporting( $mosConfig_error_reporting );
-}
-
-$local_backup_path = $mosConfig_absolute_path.'/administrator/backups';
-$media_path = $mosConfig_absolute_path.'/media/';
-$image_path = $mosConfig_absolute_path.'/images/stories';
-$image_size = 100;
-
-require_once( $mosConfig_absolute_path . '/includes/version.php' );
-require_once( $mosConfig_absolute_path . '/includes/database.php' );
-require_once( $mosConfig_absolute_path . '/includes/gacl.class.php' );
-require_once( $mosConfig_absolute_path . '/includes/gacl_api.class.php' );
-require_once( $mosConfig_absolute_path . '/includes/phpmailer/class.phpmailer.php' );
-require_once( $mosConfig_absolute_path . '/includes/mamboxml.php' );
-require_once( $mosConfig_absolute_path . '/includes/phpInputFilter/class.inputfilter.php' );
-
-/**
- * Task routing class
- * @package Mambo
- * @abstract
- */
-class mosAbstractTasker {
-	/** @var array An array of the class methods to call for a task */
-	var $taskMap = null;
-	/** @var string The name of the default task */
-	var $defaultTask = null;
-	/** @var string The name of the current task*/
-	var $task = null;
-	/** @var array An array of the class methods*/
-	var $_methods = null;
-	/** @var string A url to redirect to */
-	var $_redirect = null;
-	/** @var string A message about the operation of the task */
-	var $_message = null;
+class mosAuthoriser {
+	var $connection = '';
+	var $perm_found;
+	var $permissions = array();
+	var $assignments = array();
 
-	/**
-	 * Constructor
-	 */
-	function mosAbstractTasker() {
-		$taskMap = array();
-		$this->_methods = array();
-		foreach (get_class_methods( get_class( $this ) ) as $method) {
-			$this->_methods[] = strtolower( $method );
-		}
-		$this->_redirect = '';
-		$this->_message = '';
-	}
-	/**
-	 * Set a URL to redirect the browser to
-	 * @param string A URL
-	 */
-	function setRedirect( $url, $msg = null ) {
-		$this->_redirect = $url;
-		if ($msg !== null) {
-			$this->_message = $msg;
-		}
+	function mosAuthoriser () {
+		$this->connection =& mamboDatabase::getInstance();
 	}
-	/**
-	 * Redirects the browser
-	 */
-	function redirect() {
-		if ($this->_redirect) {
-			mosRedirect( $this->_redirect, $this->_message );
-		}
-	}
-	/**
-	 * Register (map) a task to a method in the class
-	 * @param string The task
-	 * @param string The name of the method in the derived class to perform for this task
-	 */
-	function registerTask( $task, $method ) {
-		if (in_array( strtolower( $method ), $this->_methods )) {
-			$this->taskMap[$task] = $method;
-		} else {
-			$this->methodNotFound( $method );
-		}
-	}
-	/**
-	 * Register the default task to perfrom if a mapping is not found
-	 * @param string The name of the method in the derived class to perform if the task is not found
-	 */
-	function registerDefaultTask( $method ) {
-		$this->registerTask( '__default', $method );
-	}
-	/**
-	 * Perform a task by triggering a method in the derived class
-	 * @param string The task to perform
-	 * @return mixed The value returned by the function
-	 */
-	function performTask( $task ) {
-		$this->task = $task;
 
-		if (isset( $this->taskMap[$task] )) {
-			return call_user_func( array( &$this, $this->taskMap[$task] ) );
-		} else if (isset( $this->taskMap['__default'] )) {
-			return call_user_func( array( &$this, $this->taskMap['__default'] ) );
-		} else {
-			return $this->taskNotFound( $task );
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) {
+			$instance =& new mosAuthoriser();
 		}
+		return $instance;
 	}
-	/**
-	 * Get the last task that was to be performed
-	 * @return string The task that was or is being performed
-	 */
-	function getTask() {
-		return $this->task;
-	}
-	/**
-	 * Basic method if the task is not found
-	 * @param string The task
-	 * @return null
-	 */
-	function taskNotFound( $task ) {
-		echo 'Task ' . $task . ' not found';
-		return null;
-	}
-	/**
-	 * Basic method if the registered method is not found
-	 * @param string The name of the method in the derived class
-	 * @return null
-	 */
-	function methodNotFound( $name ) {
-		echo 'Method ' . $name . ' not found';
-		return null;
-	}
-}
-
-
-/**
-* Class to support function caching
-* @package Mambo
-*/
-class mosCache {
-	/**
-	* @return object A function cache object
-	*/
-	function &getCache(  $group=''  ) {
-		global $mosConfig_absolute_path, $mosConfig_caching, $mosConfig_cachepath, $mosConfig_cachetime;
-
-		require_once( "$mosConfig_absolute_path/includes/Cache/Lite/Function.php" );
-
-		$options = array(
-		'cacheDir' => "$mosConfig_cachepath/",
-		'caching' => $mosConfig_caching,
-		'defaultGroup' => $group,
-		'lifeTime' => $mosConfig_cachetime
-		);
-		$cache =& new Cache_Lite_Function( $options );
-		return $cache;
-	}
-	/**
-	* Cleans the cache
-	*/
-	function cleanCache( $group=false ) {
-		global $mosConfig_caching;
-		if ($mosConfig_caching) {
-			$cache =& mosCache::getCache( $group );
-			$cache->clean( $group );
+	
+	function doSQL ($sql) {
+		$this->connection->setQuery($sql);
+		if (!$this->connection->query()) {
+			echo "<script> alert('".$this->connection->getErrorMsg()."'); window.history.go(-1); </script>\n";
+			exit();
 		}
 	}
-}
-/**
-* Mambo Mainframe class
-*
-* Provide many supporting API functions
-* @package Mambo
-*/
-class mosMainFrame {
-	/** @var database Internal database class pointer */
-	var $_db=null;
-	/** @var object An object of configuration variables */
-	var $_config=null;
-	/** @var object An object of path variables */
-	var $_path=null;
-	/** @var mosSession The current session */
-	var $_session=null;
-	/** @var string The current template */
-	var $_template=null;
-	/** @var array An array to hold global user state within a session */
-	var $_userstate=null;
-	/** @var array An array of page meta information */
-	var $_head=null;
-	/** @var string Custom html string to append to the pathway */
-	var $_custom_pathway=null;
 
-	/**
-	* Class constructor
-	* @param database A database connection object
-	* @param string The url option
-	* @param string The path of the mos directory
-	*/
-	function mosMainFrame( &$db, $option, $basePath, $isAdmin=false ) {
-		$this->_db =& $db;
-
-		// load the configuration values
-		//return( $this->loadConfig() );
-		$this->_setConfig( $basePath );
-		$this->_setTemplate( $isAdmin );
-		$this->_setAdminPaths( $option, $this->getCfg( 'absolute_path' ) );
-		if (isset( $_SESSION['session_userstate'] )) {
-			$this->_userstate =& $_SESSION['session_userstate'];
-		} else {
-			$this->_userstate = null;
-		}
-		$this->_head = array();
-		$this->_head['title'] = $GLOBALS['mosConfig_sitename'];
-		$this->_head['meta'] = array();
-		$this->_head['custom'] = array();
-	}
-	/**
-	* @param string
-	*/
-	function setPageTitle( $title=null ) {
-	    if (@$GLOBALS['mosConfig_pagetitles']) {
-		    $title = trim( htmlspecialchars( $title ) );
-			$this->_head['title'] = $title ? $GLOBALS['mosConfig_sitename'] . ' - '. $title : $GLOBALS['mosConfig_sitename'];
+	function getAccessorData ($type, $id) {
+		if (isset($this->perm_found[$type][$id])) return;
+		$sql = "SELECT a.*, p.control, p.action, p.subject_type, p.subject_id, p.system FROM #__assignments AS a LEFT JOIN #__permissions AS p ON p.role=a.role WHERE a.access_type='$type'";
+		if (isset($this->perm_found[$type])) $sql .= " AND a.access_id='$id'";
+		else $sql .= " AND (a.access_id='$id' OR a.access_id='*' OR a.access_id='+')";
+		$this->doSQL($sql);
+		$new_permissions = $this->connection->loadObjectList();
+		if ($new_permissions) $this->permissions = array_merge($this->permissions, $new_permissions);
+		$this->perm_found[$type][$id] = 1;
+	}
+
+	function &getRoles ($type, $id) {
+		$this->getAccessorData ($type, $id);
+		$rolenames = array();
+		foreach ($this->permissions as $role) {
+			if (strcasecmp($role->access_type, $type) == 0
+			AND ($role->access_id == $id OR $role->access_id == '*' OR ($role->access_id == '+' AND $id != 0))
+			AND !in_array($role->role,$rolenames)) $rolenames[] = $role->role;
+		}
+		return $rolenames;
+	}
+
+	function accessorPermissionOrControl  ($mask, $a_type, $a_id, $action, $s_type='*', $s_id='*') {
+		$this->getAccessorData ($a_type, $a_id);
+		foreach ($this->permissions as $permission) {
+			if ((strcasecmp($permission->access_type,$a_type) == 0 OR $permission->access_type == '*')
+			AND (strcasecmp($permission->access_id,$a_id) == 0 OR $permission->access_id == '*')
+			AND (strcasecmp($permission->action,$action)==0 OR $permission->action == '*' OR $action == '*')
+			AND (strcasecmp($permission->subject_type,$s_type)==0 OR $s_type=='*')
+			AND (strcasecmp($permission->subject_id,$s_id)==0 OR $permission->subject_id == '*')
+			AND ($permission->control&$mask)) return 1;
 		}
+		return 0;
 	}
-	/**
-	* @param string The value of the name attibute
-	* @param string The value of the content attibute
-	* @param string Text to display before the tag
-	* @param string Text to display after the tag
-	*/
-	function addMetaTag( $name, $content, $prepend='', $append='' ) {
-	    $name = trim( htmlspecialchars( $name ) );
-	    $content = trim( htmlspecialchars( $content ) );
-	    $prepend = trim( $prepend );
-	    $append = trim( $append );
-		$this->_head['meta'][] = array( $name, $content, $prepend, $append );
+	
+	function checkPermission ($a_type, $a_id, $action, $s_type='*', $s_id='*') {
+		return $this->accessorPermissionOrControl(2, $a_type, $a_id, $action, $s_type='*', $s_id='*');
 	}
-	/**
-	* @param string The value of the name attibute
-	* @param string The value of the content attibute to append to the existing
-	* Tags ordered in with Site Keywords and Description first
-	*/
-	function appendMetaTag( $name, $content ) {
-		$name = trim( htmlspecialchars( $name ) );
-		$n = count( $this->_head['meta'] );
-		for ($i = 0; $i < $n; $i++) {
-			if ($this->_head['meta'][$i][0] == $name) {
-				$content = trim( htmlspecialchars( $content ) );
-				if ( $content ) {
-					if ( !$this->_head['meta'][$i][1] ) {
-						$this->_head['meta'][$i][1] = $content ;
-					} else {
-						$this->_head['meta'][$i][1] = $content .', '. $this->_head['meta'][$i][1];
-					}
-				}
-				return;
-			}
-		}
-		$this->addMetaTag( $name , $content );
-    }
-
-	/**
-	* @param string The value of the name attibute
-	* @param string The value of the content attibute to append to the existing
-	*/
-	function prependMetaTag( $name, $content ) {
-	    $name = trim( htmlspecialchars( $name ) );
-	    $n = count( $this->_head['meta'] );
-	    for ($i = 0; $i < $n; $i++) {
-	        if ($this->_head['meta'][$i][0] == $name) {
-			    $content = trim( htmlspecialchars( $content ) );
-				$this->_head['meta'][$i][1] = $content . $this->_head['meta'][$i][1];
-				return;
-			}
-		}
-		$this->addMetaTag( $name, $content );
+	
+	function checkControl ($a_type, $a_id, $action, $s_type='*', $s_id='*') {
+		return $this->accessorPermissionOrControl(1, $a_type, $a_id, $action, $s_type='*', $s_id='*');
 	}
-	/**
-	 * Adds a custom html string to the head block
-	 * @param string The html to add to the head
-	 */
-	function addCustomHeadTag( $html ) {
-		$this->_head['custom'][] = trim( $html );
+	
+	function checkGrant ($a_type, $a_id, $action, $s_type='*', $s_id='*') {
+		return $this->accessorPermissionOrControl(4, $a_type, $a_id, $action, $s_type='*', $s_id='*');
 	}
-	/**
-	* @return string
-	*/
-	function getHead() {
-	    $head = array();
-	    $head[] = '<title>' . $this->_head['title'] . '</title>';
-	    foreach ($this->_head['meta'] as $meta) {
-	        if ($meta[2]) {
-	            $head[] = $meta[2];
-			}
-	        $head[] = '<meta name="' . $meta[0] . '" content="' . $meta[1] . '" />';
-	        if ($meta[3]) {
-	            $head[] = $meta[3];
+
+	function rolePermissionOrControl ($mask, $role, $action, $s_type, $s_id) {
+		$sql = "SELECT * FROM #__permissions WHERE role='$role'";
+		$this->connection->setQuery($sql);
+		$permissions = $this->connection->loadObjectList();
+		if ($permissions) {
+			foreach ($permissions as $permission) {
+				if (strcasecmp($permission->role,$role) == 0
+				AND (strcasecmp($permission->action,$action)==0 OR $permission->action == '*')
+				AND (strcasecmp($permission->subject_type,$s_type)==0)
+				AND (strcasecmp($permission->subject_id,$s_id)==0 OR $permission->subject_id == '*')
+				AND ($permission->control&$mask)) return 1;
 			}
 		}
-	    foreach ($this->_head['custom'] as $html) {
-	        $head[] = $html;
-		}
-		return implode( "\n", $head ) . "\n";
-	}
-	/**
-	* @return string
-	*/
-	function getPageTitle() {
-	    return $this->_head['title'];
+		return 0;
 	}
 
-	/**
-	* @return string
-	*/
-	function getCustomPathWay() {
-	    return $this->_custom_pathway;
+	function checkRolePermission  ($role, $action, $s_type, $s_id) {
+		return $this->rolePermissionOrControl(2, $role, $action, $s_type, $s_id);
 	}
 
-	function appendPathWay( $html ) {
-    $this->_custom_pathway[] = $html;
-  }
-
-  /**
-	* Gets the value of a user state variable
-	* @param string The name of the variable
-	*/
-	function getUserState( $var_name ) {
-		if (is_array( $this->_userstate )) {
-			return mosGetParam( $this->_userstate, $var_name, null );
-		} else {
-			return null;
-		}
-	}
-	/**
-	* Gets the value of a user state variable
-	* @param string The name of the user state variable
-	* @param string The name of the variable passed in a request
-	* @param string The default value for the variable if not found
-	*/
-	function getUserStateFromRequest( $var_name, $req_name, $var_default=null ) {
-		if (is_array( $this->_userstate )) {
-			if (isset( $_REQUEST[$req_name] )) {
-				$this->setUserState( $var_name, $_REQUEST[$req_name] );
-			} else if (!isset( $this->_userstate[$var_name] )) {
-				$this->setUserState( $var_name, $var_default );
-			}
-			return $this->_userstate[$var_name];
-		} else {
-			return null;
-		}
-	}
-	/**
-	* Sets the value of a user state variable
-	* @param string The name of the variable
-	* @param string The value of the variable
-	*/
-	function setUserState( $var_name, $var_value ) {
-		if (is_array( $this->_userstate )) {
-			$this->_userstate[$var_name] = $var_value;
-		}
+	function checkRoleControl  ($role, $action, $s_type, $s_id) {
+		return $this->rolePermissionOrControl(1, $role, $action, $s_type, $s_id);
 	}
-	/**
-	* Initialises the user session
-	*
-	* Old sessions are flushed based on the configuration value for the cookie
-	* lifetime. If an existing session, then the last access time is updated.
-	* If a new session, a session id is generated and a record is created in
-	* the mos_sessions table.
-	*/
-	function initSession() {
-		$session =& $this->_session;
-		$session = new mosSession( $this->_db );
-		$session->purge(intval( $this->getCfg( 'lifetime' ) ));
-
-		$sessionCookieName = md5( 'site'.$GLOBALS['mosConfig_live_site'] );
-
-		$sessioncookie = mosGetParam( $_COOKIE, $sessionCookieName, null );
-		$usercookie = mosGetParam( $_COOKIE, 'usercookie', null );
-
-		if ($session->load( md5( $sessioncookie . $_SERVER['REMOTE_ADDR'] ) )) {
-			// Session cookie exists, update time in session table
-			$session->time = time();
-			$session->update();
-		} else {
-			$session->generateId();
-			$session->guest = 1;
-			$session->username = '';
-			$session->time = time();
-			$session->gid = 0;
-
-			if (!$session->insert()) {
-				die( $session->getError() );
-			}
-
-			setcookie( $sessionCookieName, $session->getCookie(), time() + 43200, '/' );
-			//$_COOKIE["sessioncookie"] = $session->getCookie();
 
-			if ($usercookie) {
-				// Remember me cookie exists. Login with usercookie info.
-				$this->login($usercookie['username'], $usercookie['password']);
-			}
-		}
+	function checkRoleGrant  ($role, $action, $s_type, $s_id) {
+		return $this->rolePermissionOrControl(4, $role, $action, $s_type, $s_id);
 	}
 
-	/**
-	* Login validation function
-	*
-	* Username and encoded password is compare to db entries in the mos_users
-	* table. A successful validation updates the current session record with
-	* the users details.
-	*/
-	function login( $username=null,$passwd=null ) {
-		global $acl;
-
-		$usercookie = mosGetParam( $_COOKIE, 'usercookie', '' );
-		$sessioncookie = mosGetParam( $_COOKIE, 'sessioncookie', '' );
-		if (!$username || !$passwd) {
-			$username = trim( mosGetParam( $_POST, 'username', '' ) );
-			$passwd = trim( mosGetParam( $_POST, 'passwd', '' ) );
-			$passwd = md5( $passwd );
-			$bypost = 1;
-		}
-		$remember = trim( mosGetParam( $_POST, 'remember', '' ) );
-
-		if (!$username || !$passwd) {
-			echo "<script> alert(\""._LOGIN_INCOMPLETE."\"); window.history.go(-1); </script>\n";
-			exit();
-		} else {
-			$username = $this->_db->getEscaped($username);
-			$this->_db->setQuery( "SELECT id, gid, block, usertype"
-			. "\nFROM #__users"
-			. "\nWHERE username='$username' AND password='$passwd'"
-			);
-			$row = null;
-			if ($this->_db->loadObject( $row )) {
-				if ($row->block == 1) {
-					echo "<script>alert(\""._LOGIN_BLOCKED."\"); window.history.go(-1); </script>\n";
-					exit();
-				}
-				// fudge the group stuff
-				$grp = $acl->getAroGroup( $row->id );
-				$row->gid = 1;
-
-				if ($acl->is_group_child_of( $grp->name, 'Registered', 'ARO' ) ||
-				$acl->is_group_child_of( $grp->name, 'Public Backend', 'ARO' )) {
-					// fudge Authors, Editors, Publishers and Super Administrators into the Special Group
-					$row->gid = 2;
-				}
-				$row->usertype = $grp->name;
-
-				$session =& $this->_session;
-				$session->guest = 0;
-				$session->username = $username;
-				$session->userid = intval( $row->id );
-				$session->usertype = $row->usertype;
-				$session->gid = intval( $row->gid );
-
-				$session->update();
-
-				$currentDate = date("Y-m-d\TH:i:s");
-				$query = "UPDATE #__users SET lastvisitDate='$currentDate' where id='$session->userid'";
-				$this->_db->setQuery($query);
-				if (!$this->_db->query()) {
-					die($this->_db->stderr(true));
-				}
-
-				if ($remember=="yes") {
-					$lifetime = time() + 365*24*60*60;
-					setcookie( "usercookie[username]", $username, $lifetime, "/" );
-					setcookie( "usercookie[password]", $passwd, $lifetime, "/" );
-				}
-				//mosCache::cleanCache('com_content');
-				mosCache::cleanCache();
-			} else {
-				if (isset($bypost)) {
-					echo "<script>alert(\""._LOGIN_INCORRECT."\"); window.history.go(-1); </script>\n";
-				} else {
-					$this->logout();
-					mosRedirect("index.php");
-				}
-				exit();
+	function &listPermissions ($a_type, $a_id, $action, $property) {
+		$this->getAccessorData ($a_type, $a_id);
+		$results = array();
+		foreach ($this->permissions as $permission) {
+			if (strcasecmp($permission->access_type,$a_type) == 0
+			AND (strcasecmp($permission->access_id,$a_id) == 0 OR $permission->access_id == '*' OR ($permission->access_id == '+' AND $a_id != 0))
+			AND (strcasecmp($permission->action,$action) == 0 OR $permission->action == '*')
+			AND $permission->subject_type != null AND $permission->subject_id != null) {
+				$results[] = $permission->$property;
 			}
 		}
+		return $results;
 	}
-	/**
-	* User logout
-	*
-	* Reverts the current session record back to 'anonymous' parameters
-	*/
-	function logout() {
-		//mosCache::cleanCache('com_content');
-		mosCache::cleanCache();
-		$session =& $this->_session;
-
-		$session->guest = 1;
-		$session->username = '';
-		$session->userid = '';
-		$session->usertype = '';
-		$session->gid = 0;
-
-		$session->update();
 
-		// this is daggy??
-		$lifetime = time() - 1800;
-		setcookie( "usercookie[username]", " ", $lifetime, "/" );
-		setcookie( "usercookie[password]", " ", $lifetime, "/" );
-		setcookie( "usercookie", " ", $lifetime, "/" );
-		@session_destroy();
-	}
-	/**
-	* @return mosUser A user object with the information from the current session
-	*/
-	function getUser() {
-		$user = new mosUser( $this->_db );
+}
 
-		$user->id = intval( $this->_session->userid );
-		$user->username = $this->_session->username;
-		$user->usertype = $this->_session->usertype;
-		$user->gid = intval( $this->_session->gid );
+class mosAuthorisationAdmin {
+	var $connection;
+	var $roles = array();
 
-		return $user;
+	function mosAuthorisationAdmin () {
+		$this->connection =& mamboDatabase::getInstance();
 	}
-	/**
-	* Loads the configuration.php file and assigns values to the internal variable
-	* @param string The base path from which to load the configuration file
-	*/
-	function _setConfig( $basePath='.' ) {
-		$this->_config = new stdClass();
-
-		require( $basePath . '/configuration.php' );
-
-		$this->_config->offline 				= $mosConfig_offline;
-		$this->_config->host 				= $mosConfig_host;
-		$this->_config->user 				= $mosConfig_user;
-		$this->_config->password 			= $mosConfig_password;
-		$this->_config->db 					= $mosConfig_db;
-		$this->_config->dbprefix 			= $mosConfig_dbprefix;
-		$this->_config->lang 				= $mosConfig_lang;
-		$this->_config->absolute_path 		= $mosConfig_absolute_path;
-		$this->_config->live_site 			= $mosConfig_live_site;
-		$this->_config->sitename 			= $mosConfig_sitename;
-		$this->_config->shownoauth 			= $mosConfig_shownoauth;
-		$this->_config->useractivation 		= $mosConfig_useractivation;
-		$this->_config->uniquemail 			= $mosConfig_uniquemail;
-		$this->_config->offline_message 		= $mosConfig_offline_message;
-		$this->_config->error_message 		= $mosConfig_error_message;
-		$this->_config->lifetime 			= $mosConfig_lifetime;
-		$this->_config->MetaDesc 			= $mosConfig_MetaDesc;
-		$this->_config->MetaKeys 			= $mosConfig_MetaKeys;
-		$this->_config->debug 				= $mosConfig_debug;
-		$this->_config->vote 				= $mosConfig_vote;
-		$this->_config->hideAuthor 			= $mosConfig_hideAuthor;
-		$this->_config->hideCreateDate 		= $mosConfig_hideCreateDate;
-		$this->_config->hideModifyDate 		= $mosConfig_hideModifyDate;
-		$this->_config->hidePdf 				= $mosConfig_hidePdf;
-		$this->_config->hidePrint 			= $mosConfig_hidePrint;
-		$this->_config->hideEmail 			= $mosConfig_hideEmail;
-		$this->_config->enable_log_items 		= $mosConfig_enable_log_items;
-		$this->_config->enable_log_searches 	= $mosConfig_enable_log_searches;
-		$this->_config->enable_stats 			= $mosConfig_enable_stats;
-		$this->_config->sef 				= $mosConfig_sef;
-		$this->_config->vote 				= $mosConfig_vote;
-		$this->_config->hideModifyDate 		= $mosConfig_hideModifyDate;
-		$this->_config->multipage_toc 		= $mosConfig_multipage_toc;
-		$this->_config->allowUserRegistration 	= $mosConfig_allowUserRegistration;
-		$this->_config->error_reporting 		= $mosConfig_error_reporting;
-		$this->_config->mosConfig_register_globals 		= $mosConfig_register_globals;
-		$this->_config->link_titles 			= $mosConfig_link_titles;
-		$this->_config->list_limit 			= $mosConfig_list_limit;
-		$this->_config->caching 				= $mosConfig_caching;
-		$this->_config->cachepath 			= $mosConfig_cachepath;
-		$this->_config->cachetime 			= $mosConfig_cachetime;
-		$this->_config->mailer 				= $mosConfig_mailer;
-		$this->_config->mailfrom 			= $mosConfig_mailfrom;
-		$this->_config->fromname 			= $mosConfig_fromname;
-		$this->_config->smtpauth 			= $mosConfig_smtpauth;
-		$this->_config->smtpuser 			= $mosConfig_smtpuser;
-		$this->_config->smtppass 			= $mosConfig_smtppass;
-		$this->_config->smtphost 			= $mosConfig_smtphost;
-		$this->_config->back_button 			= $mosConfig_back_button;
-		$this->_config->item_navigation 		= $mosConfig_item_navigation;
-		$this->_config->secret 				= $mosConfig_secret;
-		$this->_config->pagetitles 			= $mosConfig_pagetitles;
-		$this->_config->readmore 			= $mosConfig_readmore;
-		$this->_config->hits 				= $mosConfig_hits;
-		$this->_config->icons 				= $mosConfig_icons;
 
-		if (@$mosConfig_error_reporting === 0) {
-			error_reporting( 0 );
-		} else if (@$mosConfig_error_reporting > 0) {
-			error_reporting( $mosConfig_error_reporting );
-		}
-	}
-	/**
-	* @param string The name of the variable (from configuration.php)
-	* @return mixed The value of the configuration variable or null if not found
-	*/
-	function getCfg( $varname ) {
-		if (isset( $this->_config->$varname )) {
-			return $this->_config->$varname;
-		} else {
-			return null;
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) {
+			$instance =& new mosAuthorisationAdmin();
 		}
+		return $instance;
 	}
 
-	// TODO
-	function loadConfig() {
-		unset( $this->_config );
-
-		$this->_db->setQuery( "SELECT name,value FROM #__config2" );
-		if (!$this->_config = $this->_db->loadObjectList( 'name' )) {
-			echo $this->_db->stderr();
-			return false;
+	function doSQL ($sql) {
+		$this->connection->setQuery($sql);
+		if (!$this->connection->query()) {
+			echo "<script> alert('".$this->connection->getErrorMsg()."'); window.history.go(-1); </script>\n";
+			exit();
 		}
-		return true;
 	}
-
-	function _setTemplate( $isAdmin=false ) {
-		global $Itemid;
-		$mosConfig_absolute_path = $this->getCfg( 'absolute_path' );
-
-		// Default template
-		$this->_db->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'" );
-		$cur_template = $this->_db->loadResult();
-
-		// Assigned template
-		if (isset($Itemid) && $Itemid!="" && $Itemid!=0) {
-			$this->_db->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='$Itemid' LIMIT 1" );
-			$cur_template = $this->_db->loadResult() ? $this->_db->loadResult() : $cur_template;
-		}
-
-		if ($isAdmin) {
-			$this->_db->setQuery( "SELECT template FROM #__templates_menu WHERE client_id='1' AND menuid='0'" );
-			$cur_template = $this->_db->loadResult();
-			$path = "$mosConfig_absolute_path/administrator/templates/$cur_template/index.php";
-			if (!file_exists( $path )) {
-				$cur_template = 'mambo_admin';
-			}
-		} else {
-			// TemplateChooser Start
-			$mos_user_template = mosGetParam( $_COOKIE, 'mos_user_template', '' );
-			$mos_change_template = mosGetParam( $_REQUEST, 'mos_change_template', $mos_user_template );
-			if ($mos_change_template AND strpos($mos_change_template,'..') == false AND strpos($mos_change_template,':') == false) {
-				// check that template exists in case it was deleted
-				if (file_exists( "$mosConfig_absolute_path/templates/$mos_change_template/index.php" )) {
-					$lifetime = 60*10;
-					$cur_template = $mos_change_template;
-					setcookie( "mos_user_template", "$mos_change_template", time()+$lifetime);
-				} else {
-					setcookie( "mos_user_template", "", time()-3600 );
-				}
-			}
-			// TemplateChooser End
+	
+	function getRoles () {
+		if (count($this->roles) == 0) {
+			$sql = "SELECT DISTINCT role FROM #__assignments";
+			$this->connection->setQuery($sql);
+			$this->roles = $this->connection->loadResultArray();
+			$sql = "SELECT DISTINCT role FROM #__permissions";
+			$this->connection->setQuery($sql);
+			$more = $this->connection->loadResultArray();
+			foreach ($more as $role) $this->addRole($role);
 		}
-
-		$this->_template = $cur_template;
+    	return $this->roles;
 	}
-
-	function getTemplate() {
-		return $this->_template;
+	
+	function addRole ($role) {
+		if (!in_array($role, $this->roles)) $this->roles[] = $role;
 	}
-
-	/**
-	* Determines the paths for including engine and menu files
-	* @param string The current option used in the url
-	* @param string The base path from which to load the configuration file
-	*/
-	function _setAdminPaths( $option, $basePath='.' ) {
-		$option = strtolower( $option );
-		$this->_path = new stdClass();
-
-		$prefix = substr( $option, 0, 4 );
-		if ($prefix != 'com_') {
-			// ensure backward compatibility with existing links
-			$name = $option;
-			$option = "com_$option";
-		} else {
-			$name = substr( $option, 4 );
-		}
-		// components
-		if (file_exists( "$basePath/templates/$this->_template/components/$name.html.php" )) {
-			$this->_path->front = "$basePath/components/$option/$name.php";
-			$this->_path->front_html = "$basePath/templates/$this->_template/components/$name.html.php";
-		} else if (file_exists( "$basePath/components/$option/$name.php" )) {
-			$this->_path->front = "$basePath/components/$option/$name.php";
-			$this->_path->front_html = "$basePath/components/$option/$name.html.php";
-		}
-		if (file_exists( "$basePath/administrator/components/$option/admin.$name.php" )) {
-			$this->_path->admin = "$basePath/administrator/components/$option/admin.$name.php";
-			$this->_path->admin_html = "$basePath/administrator/components/$option/admin.$name.html.php";
-		}
-		if (file_exists( "$basePath/administrator/components/$option/toolbar.$name.php" )) {
-			$this->_path->toolbar = "$basePath/administrator/components/$option/toolbar.$name.php";
-			$this->_path->toolbar_html = "$basePath/administrator/components/$option/toolbar.$name.html.php";
-			$this->_path->toolbar_default = "$basePath/administrator/includes/toolbar.html.php";
-		}
-		if (file_exists( "$basePath/components/$option/$name.class.php" )) {
-			$this->_path->class = "$basePath/components/$option/$name.class.php";
-		} else if (file_exists( "$basePath/administrator/components/$option/$name.class.php" )) {
-			$this->_path->class = "$basePath/administrator/components/$option/$name.class.php";
-		} else if (file_exists( "$basePath/includes/$name.php" )) {
-			$this->_path->class = "$basePath/includes/$name.php";
-		}
-		if (file_exists("$basePath/administrator/components/$option/admin.$name.php" )) {
-			$this->_path->admin = "$basePath/administrator/components/$option/admin.$name.php";
-			$this->_path->admin_html = "$basePath/administrator/components/$option/admin.$name.html.php";
-		} else {
-			$this->_path->admin = "$basePath/administrator/components/com_admin/admin.admin.php";
-			$this->_path->admin_html = "$basePath/administrator/components/com_admin/admin.admin.html.php";
-		}
+	
+	function removeRole ($role) {
+		$key = array_search($role, $this->roles);
+		if ($key !== false) unset($this->roles[$key]);
 	}
-	/**
-	* Returns a stored path variable
-	*
-	*/
-	function getPath( $varname, $option='' ) {
-		global $mosConfig_absolute_path;
-		if ($option) {
-			$temp = $this->_path;
-			$this->_setAdminPaths( $option, $this->getCfg( 'absolute_path' ) );
-		}
-		$result = null;
-		if (isset( $this->_path->$varname )) {
-			$result = $this->_path->$varname;
-		} else {
-			switch ($varname) {
-				case 'com_xml':
-				$name = substr( $option, 4 );
-				$path = "$mosConfig_absolute_path/administrator/components/$option/$name.xml";
-				if (file_exists( $path )) {
-					$result = $path;
-				} else {
-					$path = "$mosConfig_absolute_path/components/$option/$name.xml";
-					if (file_exists( $path )) {
-						$result = $path;
-					}
-				}
-				break;
-				case 'mod0_xml':
-				// Site modules
-				if ($option == '') {
-					$path = $mosConfig_absolute_path . "/modules/custom.xml";
-				} else {
-					$path = $mosConfig_absolute_path . "/modules/$option.xml";
-				}
-				if (file_exists( $path )) {
-					$result = $path;
-				}
-				break;
-				case 'mod1_xml':
-				// admin modules
-				if ($option == '') {
-					$path = $mosConfig_absolute_path . '/administrator/modules/custom.xml';
-				} else {
-					$path = $mosConfig_absolute_path . "/administrator/modules/$option.xml";
-				}
-				if (file_exists( $path )) {
-					$result = $path;
-				}
-				break;
-				case 'bot_xml':
-				// Site mambots
-				$path = $mosConfig_absolute_path . "/mambots/$option.xml";
-				if (file_exists( $path )) {
-					$result = $path;
-				}
-				break;
-				case 'menu_xml':
-				$path = $mosConfig_absolute_path . "/administrator/components/com_menus/$option/$option.xml";
-				if (file_exists( $path )) {
-					$result = $path;
-				}
-				break;
-				case 'installer_html':
-				$path = $mosConfig_absolute_path . "/administrator/components/com_installer/$option/$option.html.php";
-				if (file_exists( $path )) {
-					$result = $path;
-				}
-				break;
-				case 'installer_class':
-				$path = $mosConfig_absolute_path . "/administrator/components/com_installer/$option/$option.class.php";
-				if (file_exists( $path )) {
-					$result = $path;
-				}
-				break;
-			}
-		}
-		if ($option) {
-			$this->_path = $temp;
-		}
+	
+	function &permissionHolders ($subject_type, $subject_id) {
+		$sql = "SELECT role, action, control FROM #__permissions";
+		if ($subject_type != '*') $where[] = "(subject_type='$subject_type' OR subject_type='*')";
+		if ($subject_id != '*') $where[] = "(subject_id='$subject_id' OR subject_id='*')";
+		if (isset($where)) $sql .= " WHERE ".implode(' AND ', $where);
+		$this->connection->setQuery($sql);
+		$result = $this->connection->loadObjectList();
+		if (!$result) $result = array();
 		return $result;
 	}
-	/**
-	* Detects a 'visit'
-	*
-	* This function updates the agent and domain table hits for a particular
-	* visitor.  The user agent is recorded/incremented if this is the first visit.
-	* A cookie is set to mark the first visit.
-	*/
-	function detect() {
-		global $mosConfig_enable_stats;
-		if ($mosConfig_enable_stats == 1) {
-			if (mosGetParam( $_COOKIE, 'mosvisitor', 0 )) {
-				return;
-			}
-			setcookie( "mosvisitor", "1" );
-
-			if (phpversion() <= "4.2.1") {
-				$agent = getenv( "HTTP_USER_AGENT" );
-				$domain = gethostbyaddr( getenv( "REMOTE_ADDR" ) );
-			} else {
-				$agent = $_SERVER['HTTP_USER_AGENT'];
-				$domain = gethostbyaddr( $_SERVER['REMOTE_ADDR'] );
-			}
-
-			$browser = mosGetBrowser( $agent );
-
-			$this->_db->setQuery( "SELECT count(*) FROM #__stats_agents WHERE agent='$browser' AND type='0'" );
-			if ($this->_db->loadResult()) {
-				$this->_db->setQuery( "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$browser' AND type='0'" );
-			} else {
-				$this->_db->setQuery( "INSERT INTO #__stats_agents (agent,type) VALUES ('$browser','0')" );
-			}
-			$this->_db->query();
-
-			$os = mosGetOS( $agent );
-
-			$this->_db->setQuery( "SELECT count(*) FROM #__stats_agents WHERE agent='$os' AND type='1'" );
-			if ($this->_db->loadResult()) {
-				$this->_db->setQuery( "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$os' AND type='1'" );
-			} else {
-				$this->_db->setQuery( "INSERT INTO #__stats_agents (agent,type) VALUES ('$os','1')" );
-			}
-			$this->_db->query();
-
-			// tease out the last element of the domain
-			$tldomain = split( "\.", $domain );
-			$tldomain = $tldomain[count( $tldomain )-1];
-
-			if (is_numeric( $tldomain )) {
-				$tldomain = "Unknown";
-			}
-
-			$this->_db->setQuery( "SELECT count(*) FROM #__stats_agents WHERE agent='$tldomain' AND type='2'" );
-			if ($this->_db->loadResult()) {
-				$this->_db->setQuery( "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$tldomain' AND type='2'" );
-			} else {
-				$this->_db->setQuery( "INSERT INTO #__stats_agents (agent,type) VALUES ('$tldomain','2')" );
-			}
-			$this->_db->query();
-		}
-	}
-
-	/**
-	* @return correct Itemid for Content Item
-	*/
-	function getItemid( $id, $typed=1, $link=1, $bs=1, $bc=1, $gbs=1 ) {
-		global $Itemid;
-
-		$_Itemid = '';
-		if ($_Itemid == '' && $typed) {
-			// Search for typed link
-			$this->_db->setQuery( "SELECT id "
-			."\nFROM #__menu "
-			."\nWHERE type='content_typed' AND published='1' AND link='index.php?option=com_content&task=view&id=$id'" );
-			$_Itemid = $this->_db->loadResult();
-		}
-
-		if ($_Itemid == '' && $link) {
-			// Search for item link
-			$this->_db->setQuery( "SELECT id "
-			."\nFROM #__menu "
-			."\nWHERE type='content_item_link' AND published='1' AND link='index.php?option=com_content&task=view&id=$id'" );
-			$_Itemid = $this->_db->loadResult();
-		}
-
-		if ($_Itemid == '') {
-			// Search in sections
-			$this->_db->setQuery( "SELECT m.id "
-			."\nFROM #__content AS i"
-			."\nLEFT JOIN #__sections AS s ON i.sectionid=s.id"
-			."\nLEFT JOIN #__menu AS m ON m.componentid=s.id "
-			."\nWHERE m.type='content_section' AND m.published='1' AND i.id=".$id );
-			$_Itemid = $this->_db->loadResult();
-		}
-
-		if ($_Itemid == '' && $bs) {
-			// Search in specific blog section
-			$this->_db->setQuery( "SELECT m.id "
-			."\nFROM #__content AS i"
-			."\nLEFT JOIN #__sections AS s ON i.sectionid=s.id"
-			."\nLEFT JOIN #__menu AS m ON m.componentid=s.id "
-			."\nWHERE m.type='content_blog_section' AND m.published='1' AND i.id=".$id );
-			$_Itemid = $this->_db->loadResult();
-		}
-
-		if ($_Itemid == '' && $bc) {
-			// Search in specific blog category
-			$this->_db->setQuery( "SELECT m.id "
-			."\nFROM #__content AS i"
-			."\nLEFT JOIN #__categories AS c ON i.catid=c.id"
-			."\nLEFT JOIN #__menu AS m ON m.componentid=c.id "
-			."\nWHERE m.type='content_blog_category' AND m.published='1' AND i.id=".$id );
-			$_Itemid = $this->_db->loadResult();
-		}
-
-		if ($_Itemid == '' && $gbs) {
-			// Search in global blog section
-			$this->_db->setQuery( "SELECT id "
-			."\nFROM #__menu "
-			."\nWHERE type='content_blog_section' AND published='1' AND componentid=0" );
-			$_Itemid = $this->_db->loadResult();
-		}
-/*
-		if ($_Itemid == '') {
-			// Search in global blog category
-			$this->_db->setQuery( "SELECT id "
-			."\nFROM #__menu "
-			."\nWHERE type='content_blog_category' AND published='1' AND componentid=0" );
-			$_Itemid = $this->_db->loadResult();
-		}
-*/
-		if ($_Itemid != "") {
-			return $_Itemid;
-		} else {
-			return $Itemid;
-		}
-	}
-
-	/**
-	* @return number of Published Blog Sections
-	*/
-	function getBlogSectionCount( ) {
-		$query = "SELECT COUNT( m.id )"
-		."\n FROM #__content AS i"
-		."\n LEFT JOIN #__sections AS s ON i.sectionid=s.id"
-		."\n LEFT JOIN #__menu AS m ON m.componentid=s.id "
-		."\n WHERE m.type='content_blog_section'"
-		."\n AND m.published='1'"
-		;
-		$this->_db->setQuery( $query );
-		$count = $this->_db->loadResult();
-		return $count;
-	}
-
-	/**
-	* @return number of Published Blog Categories
-	*/
-	function getBlogCategoryCount( ) {
-		$query = "SELECT COUNT( m.id )"
-		. "\n FROM #__content AS i"
-		. "\n LEFT JOIN #__categories AS c ON i.catid=c.id"
-		. "\n LEFT JOIN #__menu AS m ON m.componentid=c.id "
-		. "\n WHERE m.type='content_blog_category'"
-		. "\n  AND m.published='1'"
-		;
-		$this->_db->setQuery( $query );
-		$count = $this->_db->loadResult();
-		return $count;
-	}
-
-	/**
-	* @return number of Published Global Blog Sections
-	*/
-	function getGlobalBlogSectionCount( ) {
-		$query = "SELECT COUNT( id )"
-		."\n FROM #__menu "
-		."\n WHERE type='content_blog_section'"
-		."\n AND published='1'"
-		."\n AND componentid=0"
-		;
-		$this->_db->setQuery( $query );
-		$count = $this->_db->loadResult();
-		return $count;
-	}
-
-	/**
-	* @return number of Static Content
-	*/
-	function getStaticContentCount( ) {
-		$query = "SELECT COUNT( id )"
-		."\n FROM #__menu "
-		."\n WHERE type='content_typed'"
-		."\n AND published='1'"
-		;
-		$this->_db->setQuery( $query );
-		$count = $this->_db->loadResult();
-		return $count;
-	}
-
-	/**
-	* @return number of Content Item Links
-	*/
-	function getContentItemLinkCount( ) {
-		$query = "SELECT COUNT( id )"
-		."\n FROM #__menu "
-		."\n WHERE type='content_item_link'"
-		."\n AND published='1'"
-		;
-		$this->_db->setQuery( $query );
-		$count = $this->_db->loadResult();
-		return $count;
-	}
-}
-
-/**
-* Component database table class
-* @package Mambo
-*/
-class mosComponent extends mosDBTable {
-	/** @var int Primary key */
-	var $id=null;
-	/** @var string */
-	var $name=null;
-	/** @var string */
-	var $link=null;
-	/** @var int */
-	var $menuid=null;
-	/** @var int */
-	var $parent=null;
-	/** @var string */
-	var $admin_menu_link=null;
-	/** @var string */
-	var $admin_menu_alt=null;
-	/** @var string */
-	var $option=null;
-	/** @var string */
-	var $ordering=null;
-	/** @var string */
-	var $admin_menu_img=null;
-	/** @var int */
-	var $iscore=null;
-	/** @var string */
-	var $params=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosComponent( &$db ) {
-		$this->mosDBTable( '#__components', 'id', $db );
+	
+	function &nonLocalPermissionHolders ($subject_type, $subject_id) {
+		$sql = "SELECT role, action, control FROM #__permissions WHERE (action='*' OR subject_type='*' OR subject_id='*') AND ((subject_type='$subject_type' OR subject_type='*') AND (subject_id='$subject_id' OR subject_id='*'))";
+		$this->connection->setQuery($sql);
+		$result = $this->connection->loadObjectList();
+		if (!$result) $result = array();
+		return $result;
 	}
-}
-
-/**
-* Utility class for all HTML drawing classes
-* @package Mambo
-*/
-class mosHTML {
-	function makeOption( $value, $text='' ) {
-		$obj = new stdClass;
-		$obj->value = $value;
-		$obj->text = trim( $text ) ? $text : $value;
-		return $obj;
+	
+	function permitSQL ($role, $control, $action, $subject_type, $subject_id) {
+		$sql = "REPLACE INTO #__permissions (role, control, action, subject_type, subject_id) VALUES ('$role', '$control', '$action', '$subject_type', '$subject_id');";
+		return $sql;
+	}
+
+	function permit ($role, $control, $action, $subject_type, $subject_id) {
+		$sql = $this->permitSQL($role, $control, $action, $subject_type, $subject_id);
+		$this->doSQL($sql);
+		$this->addRole($role);
+	}
+
+	function assign ($role, $access_type, $access_id) {
+		$sql = "REPLACE INTO #__assignments (role, access_type, access_id) VALUES ('$role', '$access_type', '$access_id')";
+		$this->doSQL($sql);
+		$this->addRole($role);
+	}
+
+	function dropAccess ($access_type, $access_id) {
+		$sql = "DELETE FROM #__assignments WHERE access_type='$access_type' AND access_id='$access_id'";
+		$this->doSQL($sql);
+	}
+
+	function &getControllingRoles ($access_type, $access_id, $action, $subject_type, $subject_id) {
+		$sql = "SELECT a.role FROM #__permissions AS p, #__assignments AS a WHERE a.access_type='$access_type'"
+		." AND a.access_id='$access_id' AND a.role=p.role AND (p.control&1)"
+		." AND p.action='$action' AND p.subject_type='$subject_type' AND p.subject_id='$subject_id'";
+		$this->doSQL($sql);
+		$roles = $this->connection->loadResultArray();
+		return $roles;
+	}
+
+	function &getMyPermissions ($access_type, $access_id) {
+		$sql = 'SELECT p.action, p.subject_type, p.subject_id, control FROM #__permissions AS p, #__assignments AS a'
+		. " WHERE p.role=a.role AND a.access_type='$access_type' AND (a.access_id='$access_id' OR a.access_id='*')"
+		. ' AND (p.control&1)';
+		$this->doSQL($sql);
+		$permissions =& $this->connection->loadObjectList();
+		return $permissions;
+	}
+
+	function getJointPermissions ($access_type, $access_id, $role) {
+		$sql = "SELECT p2.control AS hiscontrol, p1.control AS mycontrol, p1.action, p1.subject_type, p1.subject_id"
+		." FROM `#__assignments` AS a, `#__permissions` AS p1 LEFT JOIN `#__permissions` AS p2"
+		." ON (p2.role='$role' AND p1.action=p2.action AND p1.subject_type=p2.subject_type AND p1.subject_id=p2.subject_id)"
+		." WHERE  (p1.control&1) AND p1.role=a.role AND a.access_type='$access_type' AND (a.access_id='$access_id' OR a.access_id='*')";
+		$this->doSQL($sql);
+		$permissions =& $this->connection->loadObjectList();
+		return $permissions;
 	}
-
-  function writableCell( $folder ) {
-
-  	echo '<tr>';
-  	echo '<td class="item">' . $folder . '/</td>';
-  	echo '<td align="left">';
-  	echo is_writable( "../$folder" ) ? '<b><font color="green">Writeable</font></b>' : '<b><font color="red">Unwriteable</font></b>' . '</td>';
-  	echo '</tr>';
-  }
-
-	/**
-	* Generates an HTML select list
-	* @param array An array of objects
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param string The name of the object variable for the option value
-	* @param string The name of the object variable for the option text
-	* @param mixed The key that is selected
-	* @returns string HTML for the select list
-	*/
-	function selectList( &$arr, $tag_name, $tag_attribs, $key, $text, $selected=NULL ) {
-		reset( $arr );
-		$html = "\n<select name=\"$tag_name\" $tag_attribs>";
-		for ($i=0, $n=count( $arr ); $i < $n; $i++ ) {
-			$k = $arr[$i]->$key;
-			$t = $arr[$i]->$text;
-			$id = @$arr[$i]->id;
-
-			$extra = '';
-			$extra .= $id ? " id=\"" . $arr[$i]->id . "\"" : '';
-			if (is_array( $selected )) {
-				foreach ($selected as $obj) {
-					$k2 = $obj->$key;
-					if ($k == $k2) {
-						$extra .= " selected=\"selected\"";
-						break;
+	
+	function getAccessLists ($access_type, $access_id, $action, $subject_type, $subject_id) {
+		$authoriser =& mosAuthoriser::getInstance();
+		if ($authoriser->checkControl($access_type, $access_id, $action, $subject_type, $subject_id)) {
+			$cangrant = $authoriser->checkGrant($access_type, $access_id, $action, $subject_type, $subject_id);
+			$permissions = $this->permissionHolders($subject_type, $subject_id);
+			$allroles = $this->getRoles();
+			foreach ($allroles as $role) {
+				$itemc[] = $optionc = mosHTML::makeOption($role, $role);
+				$itema[] = $optiona = mosHTML::makeOption($role, $role);
+				if ($cangrant) $itemg[] = $optiong = mosHTML::makeOption($role, $role);
+				foreach ($permissions as $permission) {
+					if (($permission->action == '*' OR $permission->action == $action) AND $permission->role == $role) {
+						if ($permission->control & 1) $cselected[] = $optionc;
+						if ($permission->control & 2) $aselected[] = $optiona;
+						if ($cangrant AND $permission->control & 4) $gselected[] = $optiong;
 					}
 				}
-			} else {
-				$extra .= ($k == $selected ? " selected=\"selected\"" : '');
 			}
-			$html .= "\n\t<option value=\"".$k."\"$extra>" . $t . "</option>";
-		}
-		$html .= "\n</select>\n";
-		return $html;
-	}
-
-	/**
-	* Writes a select list of integers
-	* @param int The start integer
-	* @param int The end integer
-	* @param int The increment
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param mixed The key that is selected
-	* @param string The printf format to be applied to the number
-	* @returns string HTML for the select list
-	*/
-	function integerSelectList( $start, $end, $inc, $tag_name, $tag_attribs, $selected, $format="" ) {
-		$start = intval( $start );
-		$end = intval( $end );
-		$inc = intval( $inc );
-		$arr = array();
-		for ($i=$start; $i <= $end; $i+=$inc) {
-			$fi = $format ? sprintf( "$format", $i ) : "$i";
-			$arr[] = mosHTML::makeOption( $fi, $fi );
+			$results[] = mosHTML::selectList($itema, $action.'_arole[]', 'multiple="multiple"', 'value', 'text', $aselected);
+			$results[] = mosHTML::selectList($itemc, $action.'_crole[]', 'multiple="multiple"', 'value', 'text', $cselected);
+			if ($cangrant) $results[] = mosHTML::selectList($itemg, $action.'_grole[]', 'multiple="multiple"', 'value', 'text', $gselected);
 		}
-
-		return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected );
-	}
-
-	/**
-	* Writes a select list of month names based on Language settings
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param mixed The key that is selected
-	* @returns string HTML for the select list values
-	*/
-	function monthSelectList( $tag_name, $tag_attribs, $selected ) {
-		$arr = array(
-		mosHTML::makeOption( '01', _JAN ),
-		mosHTML::makeOption( '02', _FEB ),
-		mosHTML::makeOption( '03', _MAR ),
-		mosHTML::makeOption( '04', _APR ),
-		mosHTML::makeOption( '05', _MAY ),
-		mosHTML::makeOption( '06', _JUN ),
-		mosHTML::makeOption( '07', _JUL ),
-		mosHTML::makeOption( '08', _AUG ),
-		mosHTML::makeOption( '09', _SEP ),
-		mosHTML::makeOption( '10', _OCT ),
-		mosHTML::makeOption( '11', _NOV ),
-		mosHTML::makeOption( '12', _DEC )
-		);
-
-		return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected );
+		else $results = array();
+		return $results;
 	}
-
-	/**
-	* Generates an HTML select list from a tree based query list
-	* @param array Source array with id and parent fields
-	* @param array The id of the current list item
-	* @param array Target array.  May be an empty array.
-	* @param array An array of objects
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param string The name of the object variable for the option value
-	* @param string The name of the object variable for the option text
-	* @param mixed The key that is selected
-	* @returns string HTML for the select list
-	*/
-	function treeSelectList( &$src_list, $src_id, $tgt_list, $tag_name, $tag_attribs, $key, $text, $selected ) {
-
-		// establish the hierarchy of the menu
-		$children = array();
-		// first pass - collect children
-		foreach ($src_list as $v ) {
-			$pt = $v->parent;
-			$list = @$children[$pt] ? $children[$pt] : array();
-			array_push( $list, $v );
-			$children[$pt] = $list;
-		}
-		// second pass - get an indent list of the items
-		$ilist = mosTreeRecurse( 0, '', array(), $children );
-
-		// assemble menu items to the array
-		$this_treename = '';
-		foreach ($ilist as $item) {
-			if ($this_treename) {
-				if ($item->id != $src_id && strpos( $item->treename, $this_treename ) === false) {
-					$tgt_list[] = mosHTML::makeOption( $item->id, $item->treename );
-				}
-			} else {
-				if ($item->id != $src_id) {
-					$tgt_list[] = mosHTML::makeOption( $item->id, $item->treename );
-				} else {
-					$this_treename = "$item->treename/";
+	
+	function resetPermissions ($action, $subject_type, $subject_id) {
+		$control_types = array ('crole', 'arole', 'grole');
+		$control_values = array (1,2,4);
+		$permissions = $this->nonLocalPermissionHolders($subject_type, $subject_id);
+		$this->dropPermissions($action, $subject_type, $subject_id);
+		foreach ($control_types as $i=>$type) {
+			$key = $action.'_'.$type;
+			if (isset($_POST[$key])) {
+				foreach ($_POST[$key] as $role) {
+					$value = isset($newpermits[$role]) ? $newpermits[$role] : 0;
+					$newpermits[$role] = $value | $control_values[$i];
 				}
 			}
 		}
-		// build the html select list
-		return mosHTML::selectList( $tgt_list, $tag_name, $tag_attribs, $key, $text, $selected );
-	}
-
-	/**
-	* Writes a yes/no select list
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param mixed The key that is selected
-	* @returns string HTML for the select list values
-	*/
-	function yesnoSelectList( $tag_name, $tag_attribs, $selected, $yes=_CMN_YES, $no=_CMN_NO ) {
-		$arr = array(
-		mosHTML::makeOption( '0', $no ),
-		mosHTML::makeOption( '1', $yes ),
-		);
-
-		return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected );
-	}
-
-	/**
-	* Generates an HTML radio list
-	* @param array An array of objects
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param mixed The key that is selected
-	* @param string The name of the object variable for the option value
-	* @param string The name of the object variable for the option text
-	* @returns string HTML for the select list
-	*/
-	function radioList( &$arr, $tag_name, $tag_attribs, $selected=null, $key='value', $text='text' ) {
-		reset( $arr );
-		$html = "";
-		for ($i=0, $n=count( $arr ); $i < $n; $i++ ) {
-			$k = $arr[$i]->$key;
-			$t = $arr[$i]->$text;
-			$id = @$arr[$i]->id;
-
-			$extra = '';
-			$extra .= $id ? " id=\"" . $arr[$i]->id . "\"" : '';
-			if (is_array( $selected )) {
-				foreach ($selected as $obj) {
-					$k2 = $obj->$key;
-					if ($k == $k2) {
-						$extra .= " selected=\"selected\"";
+		$sql = '';
+		foreach ($newpermits as $role=>$value) {
+			$needed = true;
+			foreach ($permissions as $permission) {
+				if (($permission->action == '*' OR $permission->action == $action) AND $permission->role == $role) {
+					if (($value & $permission->control) === $value) {
+						$needed = false;
 						break;
 					}
 				}
-			} else {
-				$extra .= ($k == $selected ? " checked=\"checked\"" : '');
-			}
-			$html .= "\n\t<input type=\"radio\" name=\"$tag_name\" value=\"".$k."\"$extra $tag_attribs />" . $t;
-		}
-		$html .= "\n";
-		return $html;
-	}
-
-	/**
-	* Writes a yes/no radio list
-	* @param string The value of the HTML name attribute
-	* @param string Additional HTML attributes for the <select> tag
-	* @param mixed The key that is selected
-	* @returns string HTML for the radio list
-	*/
-	function yesnoRadioList( $tag_name, $tag_attribs, $selected, $yes=_CMN_YES, $no=_CMN_NO ) {
-		$arr = array(
-		mosHTML::makeOption( '0', $no, true ),
-		mosHTML::makeOption( '1', $yes, true )
-		);
-		return mosHTML::radioList( $arr, $tag_name, $tag_attribs, $selected );
-	}
-
-	/**
-	* @param int The row index
-	* @param int The record id
-	* @param boolean
-	* @param string The name of the form element
-	* @return string
-	*/
-	function idBox( $rowNum, $recId, $checkedOut=false, $name='cid' ) {
-		if ( $checkedOut ) {
-			return '';
-		} else {
-			return '<input type="checkbox" id="cb'.$rowNum.'" name="'.$name.'[]" value="'.$recId.'" onclick="isChecked(this.checked);" />';
-		}
-	}
-
-	function sortIcon( $base_href, $field, $state='none' ) {
-		global $mosConfig_live_site;
-
-		$alts = array(
-		'none' => _CMN_SORT_NONE,
-		'asc' => _CMN_SORT_ASC,
-		'desc' => _CMN_SORT_DESC,
-		);
-		$next_state = 'asc';
-		if ($state == 'asc') {
-			$next_state = 'desc';
-		} else if ($state == 'desc') {
-			$next_state = 'none';
-		}
-
-		$html = "<a href=\"$base_href&field=$field&order=$next_state\">"
-		. "<img src=\"$mosConfig_live_site/images/M_images/sort_$state.png\" width=\"12\" height=\"12\" border=\"0\" alt=\"{$alts[$next_state]}\" />"
-		. "</a>";
-		return $html;
-	}
-
-	/**
-	* Writes Close Button
-	*/
-	function CloseButton ( &$params, $hide_js=NULL ) {
-		// displays close button in Pop-up window
-		if ( $params->get( 'popup' ) && !$hide_js ) {
-			?>
-			<div align="center" style="margin-top: 30px; margin-bottom: 30px;">
-			<a href='javascript:window.close();'>
-			<span class="small">
-			<?php echo _PROMPT_CLOSE;?>
-			</span>
-			</a>
-			</div>
-			<?php
-		}
-	}
-
-	/**
-	* Writes Back Button
-	*/
-	function BackButton ( &$params, $hide_js=NULL ) {
-		// Back Button
-		if ( $params->get( 'back_button' ) && !$params->get( 'popup' ) && !$hide_js) {
-			?>
-			<div class="back_button">
-			<a href='javascript:history.go(-1)'>
-			<?php echo _BACK; ?>
-			</a>
-			</div>
-			<?php
-		}
-	}
-
-	/**
-	* Cleans text of all formating and scripting code
-	*/
-	function cleanText ( &$text ) {
-		$text = preg_replace( "'<script[^>]*>.*?</script>'si", '', $text );
-		$text = preg_replace( '/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is', '\2 (\1)', $text );
-		$text = preg_replace( '/<!--.+?-->/', '', $text );
-		$text = preg_replace( '/{.+?}/', '', $text );
-		$text = preg_replace( '/&nbsp;/', ' ', $text );
-		$text = preg_replace( '/&amp;/', ' ', $text );
-		$text = preg_replace( '/&quot;/', ' ', $text );
-		$text = strip_tags( $text );
-		$text = htmlspecialchars( $text );
-		return $text;
-	}
-
-	/**
-	* Writes Print icon
-	*/
-	function PrintIcon( &$row, &$params, $hide_js, $link, $status=NULL ) {
-		global $mosConfig_live_site, $mosConfig_absolute_path, $cur_template, $Itemid;
-		if ( $params->get( 'print' )  && !$hide_js ) {
-			// use default settings if none declared
-			if ( !$status ) {
-				$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
-			}
-
-			// checks template image directory for image, if non found default are loaded
-			if ( $params->get( 'icons' ) ) {
-				$image = mosAdminMenus::ImageCheck( 'printButton.png', '/images/M_images/', NULL, NULL, _CMN_PRINT );
-			} else {
-				$image = _ICON_SEP .'&nbsp;'. _CMN_PRINT. '&nbsp;'. _ICON_SEP;
-			}
-
-			if ( $params->get( 'popup' ) && !$hide_js ) {
-				// Print Preview button - used when viewing page
-				?>
-				<td align="right" width="100%" class="buttonheading">
-				<a href="#" onclick="javascript:window.print(); return false" title="<?php echo _CMN_PRINT;?>">
-				<?php echo $image;?>
-				</a>
-				</td>
-				<?php
-			} else {
-				// Print Button - used in pop-up window
-				?>
-				<td align="right" width="100%" class="buttonheading">
-				<a href="javascript:void window.open('<?php echo $link; ?>', 'win2', '<?php echo $status; ?>');" title="<?php echo _CMN_PRINT;?>">
-				<?php echo $image;?>
-				</a>
-				</td>
-				<?php
-			}
-		}
-	}
-
-	/**
-	* simple Javascript Cloaking
-	* email cloacking
- 	* by default replaces an email with a mailto link with email cloacked
-	*/
-	function emailCloaking( $mail, $mailto=1, $text='', $email=1 ) {
-		// convert text
-		$mail 		= mosHTML::encoding_converter( $mail );
-		// split email by @ symbol
-		$mail		= explode( '@', $mail );
-		$mail_parts	= explode( '.', $mail[1] );
-		// random number
-		$rand	= rand( 1, 100000 );
-
-		$replacement 	= "\n<script language='JavaScript' type='text/javascript'> \n";
-		$replacement 	.= "<!-- \n";
-		$replacement 	.= "var prefix = '&#109;a' + 'i&#108;' + '&#116;o'; \n";
-		$replacement 	.= "var path = 'hr' + 'ef' + '='; \n";
-		$replacement 	.= "var addy". $rand ." = '". @$mail[0] ."' + '&#64;' + '". implode( "' + '&#46;' + '", $mail_parts ) ."'; \n";
-		if ( $mailto ) {
-			// special handling when mail text is different from mail addy
-			if ( $text ) {
-				if ( $email ) {
-					// convert text
-					$text 	= mosHTML::encoding_converter( $text );
-					// split email by @ symbol
-					$text 	= explode( '@', $text );
-					$text_parts	= explode( '.', $text[1] );
-					$replacement 	.= "var addy_text". $rand ." = '". @$text[0] ."' + '&#64;' + '". implode( "' + '&#46;' + '", @$text_parts ) ."'; \n";
-				} else {
-					$text 	= mosHTML::encoding_converter( $text );
-					$replacement 	.= "var addy_text". $rand ." = '". $text ."';\n";
-				}
-				$replacement 	.= "document.write( '<a ' + path + '\'' + prefix + ':' + addy". $rand ." + '\'>' ); \n";
-				$replacement 	.= "document.write( addy_text". $rand ." ); \n";
-				$replacement 	.= "document.write( '<\/a>' ); \n";
-			} else {
-				$replacement 	.= "document.write( '<a ' + path + '\'' + prefix + ':' + addy". $rand ." + '\'>' ); \n";
-				$replacement 	.= "document.write( addy". $rand ." ); \n";
-				$replacement 	.= "document.write( '<\/a>' ); \n";
 			}
-		} else {
-			$replacement 	.= "document.write( addy". $rand ." ); \n";
+			if ($needed) $sql .= $this->permitSQL ($role, $value, $action, $subject_type, $subject_id);
 		}
-		$replacement 	.= "//--> \n";
-		$replacement 	.= "</script> \n";
-		$replacement 	.= "<noscript> \n";
-		$replacement 	.= _CLOAKING;
-		$replacement 	.= "\n</noscript> \n";
-
-		return $replacement;
+		if ($sql) $this->doSQL($sql);
 	}
 
-	function encoding_converter( $text ) {
-		// replace vowels with character encoding
-		$text 	= str_replace( 'a', '&#97;', $text );
-		$text 	= str_replace( 'e', '&#101;', $text );
-		$text 	= str_replace( 'i', '&#105;', $text );
-		$text 	= str_replace( 'o', '&#111;', $text );
-		$text	= str_replace( 'u', '&#117;', $text );
-
-		return $text;
+	function roleExists ($role) {
+		$sql = "SELECT COUNT(role) FROM #__permissions WHERE role='$role' GROUP BY role";
+		$this->doSQL($sql);
+		if ($this->connection->loadResult()) return true;
+		$sql = "SELECT COUNT(role) FROM #__assignments WHERE role='$role' GROUP BY role";
+		$this->doSQL($sql);
+		if ($this->connection->loadResult()) return true;
+		else return false;
 	}
-}
 
-/**
-* Category database table class
-* @package Mambo
-*/
-class mosCategory extends mosDBTable {
-	/** @var int Primary key */
-	var $id=null;
-	/** @var string The menu title for the Category (a short name)*/
-	var $title=null;
-	/** @var string The full name for the Category*/
-	var $name=null;
-	/** @var string */
-	var $image=null;
-	/** @var string */
-	var $section=null;
-	/** @var int */
-	var $image_position=null;
-	/** @var string */
-	var $description=null;
-	/** @var boolean */
-	var $published=null;
-	/** @var boolean */
-	var $checked_out=null;
-	/** @var time */
-	var $checked_out_time=null;
-	/** @var int */
-	var $ordering=null;
-	/** @var int */
-	var $access=null;
-	/** @var string */
-	var $params=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosCategory( &$db ) {
-		$this->mosDBTable( '#__categories', 'id', $db );
+	function dropRole ($role) {
+		$sql = "DELETE FROM #__permissions WHERE action='administer' AND subject_type='$role' AND system=0";
+		$this->doSQL($sql);
+		$sql = "DELETE a FROM #__assignments AS a LEFT JOIN #__permissions AS p ON a.role=p.role WHERE a.role='$role' AND (p.system=0 OR p.system=NULL)";
+		$this->doSQL($sql);
+		$this->dropRolePermissions($role);
+		$this->removeRole($role);
 	}
-	// overloaded check function
-	function check() {
-		// check for valid name
-		if (trim( $this->title ) == '') {
-			$this->_error = "Your Category must contain a title.";
-			return false;
-		}
-		if (trim( $this->name ) == '') {
-			$this->_error = "Your Category must have a name.";
-			return false;
-		}
-		// check for existing name
-		$this->_db->setQuery( "SELECT id FROM #__categories "
-		. "\nWHERE name='".$this->name."' AND section='".$this->section."'"
-		);
 
-		$xid = intval( $this->_db->loadResult() );
-		if ($xid && $xid != intval( $this->id )) {
-			$this->_error = "There is a category already with that name, please try again.";
-			return false;
-		}
-		return true;
+	function dropRolePermissions ($role) {
+		$sql = "DELETE FROM #__permissions WHERE role='$role' AND system=0";
+		$this->doSQL($sql);
+		$this->roles = array();
 	}
-}
-
-/**
-* Section database table class
-* @package Mambo
-*/
-class mosSection extends mosDBTable {
-	/** @var int Primary key */
-	var $id=null;
-	/** @var string The menu title for the Section (a short name)*/
-	var $title=null;
-	/** @var string The full name for the Section*/
-	var $name=null;
-	/** @var string */
-	var $image=null;
-	/** @var string */
-	var $scope=null;
-	/** @var int */
-	var $image_position=null;
-	/** @var string */
-	var $description=null;
-	/** @var boolean */
-	var $published=null;
-	/** @var boolean */
-	var $checked_out=null;
-	/** @var time */
-	var $checked_out_time=null;
-	/** @var int */
-	var $ordering=null;
-	/** @var int */
-	var $access=null;
-	/** @var string */
-	var $params='';
 
-	/**
-	* @param database A database connector object
-	*/
-	function mosSection( &$db ) {
-		$this->mosDBTable( '#__sections', 'id', $db );
+	function dropPermissions ($action, $subject_type, $subject_id) {
+		$sql = "DELETE FROM #__permissions WHERE action='$action' AND subject_type='$subject_type'AND subject_id='$subject_id' AND system=0";
+		$this->doSQL($sql);
+		$this->roles = array();
 	}
-	// overloaded check function
-	function check() {
-		// check for valid name
-		if (trim( $this->title ) == '') {
-			$this->_error = "Your Section must contain a title.";
-			return false;
-		}
-		if (trim( $this->name ) == '') {
-			$this->_error = "Your Section must have a name.";
-			return false;
-		}
-		// check for existing name
-		$this->_db->setQuery( "SELECT id FROM #__sections "
-		. "\nWHERE name='$this->name' AND scope='$this->scope'"
-		);
 
-		$xid = intval( $this->_db->loadResult() );
-		if ($xid && $xid != intval( $this->id )) {
-			$this->_error = "There is a section already with that name, please try again.";
-			return false;
-		}
-		return true;
-	}
 }
 
-/**
-* Module database table class
-* @package Mambo
-*/
-class mosContent extends mosDBTable {
-	/** @var int Primary key */
-	var $id=null;
-	/** @var string */
-	var $title=null;
-	/** @var string */
-	var $title_alias=null;
-	/** @var string */
-	var $introtext=null;
-	/** @var string */
-	var $fulltext=null;
-	/** @var int */
-	var $state=null;
-	/** @var int The id of the category section*/
-	var $sectionid=null;
-	/** @var int DEPRECATED */
-	var $mask=null;
-	/** @var int */
-	var $catid=null;
-	/** @var datetime */
-	var $created=null;
-	/** @var int User id*/
-	var $created_by=null;
-	/** @var string An alias for the author*/
-	var $created_by_alias=null;
-	/** @var datetime */
-	var $modified=null;
-	/** @var int User id*/
-	var $modified_by=null;
-	/** @var boolean */
-	var $checked_out=null;
-	/** @var time */
-	var $checked_out_time=null;
-	/** @var datetime */
-	var $frontpage_up=null;
-	/** @var datetime */
-	var $frontpage_down=null;
-	/** @var datetime */
-	var $publish_up=null;
-	/** @var datetime */
-	var $publish_down=null;
-	/** @var string */
-	var $images=null;
-	/** @var string */
-	var $urls=null;
-	/** @var string */
-	var $attribs=null;
-	/** @var int */
-	var $version=null;
-	/** @var int */
-	var $parentid=null;
-	/** @var int */
-	var $ordering=null;
-	/** @var string */
-	var $metakey=null;
-	/** @var string */
-	var $metadesc=null;
-	/** @var int */
-	var $access=null;
-	/** @var int */
-	var $hits=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosContent( &$db ) {
-		$this->mosDBTable( '#__content', 'id', $db );
-	}
-
-	/**
-	 * Validation and filtering
-	 */
-	function check() {
-		// filter malicious code
-		$ignoreList = array( 'introtext', 'fulltext' );
-		$this->filter( $ignoreList );
 
-		/*
-		TODO: This filter is too rigorous,
-		need to implement more configurable solution
-		// specific filters
-		$iFilter = new InputFilter( null, null, 1, 1 );
-		$this->introtext = trim( $iFilter->process( $this->introtext ) );
-		$this->fulltext =  trim( $iFilter->process( $this->fulltext ) );
-		*/
 
-		if (trim( str_replace( '&nbsp;', '', $this->fulltext ) ) == '') {
-			$this->fulltext = '';
-		}
-
-		return true;
-	}
-
-	/**
-	* Converts record to XML
-	* @param boolean Map foreign keys to text values
-	*/
-	function toXML( $mapKeysToText=false ) {
-		global $database;
-
-		if ($mapKeysToText) {
-			$query = 'SELECT name FROM #__sections WHERE id=' . $this->sectionid;
-			$database->setQuery( $query );
-			$this->sectionid = $database->loadResult();
-
-			$query = 'SELECT name FROM #__categories WHERE id=' . $this->catid;
-			$database->setQuery( $query );
-			$this->catid = $database->loadResult();
-
-			$query = 'SELECT name FROM #__users WHERE id=' . $this->created_by;
-			$database->setQuery( $query );
-			$this->created_by = $database->loadResult();
-		}
-
-		return parent::toXML( $mapKeysToText );
-	}
-}
-
-/**
-* Module database table class
-* @package Mambo
-*/
-class mosMenu extends mosDBTable {
-	/** @var int Primary key */
-	var $id=null;
-	/** @var string */
-	var $menutype=null;
-	/** @var string */
-	var $name=null;
-	/** @var string */
-	var $link=null;
-	/** @var int */
-	var $type=null;
-	/** @var int */
-	var $published=null;
-	/** @var int */
-	var $componentid=null;
-	/** @var int */
-	var $parent=null;
-	/** @var int */
-	var $sublevel=null;
-	/** @var int */
-	var $ordering=null;
-	/** @var boolean */
-	var $checked_out=null;
-	/** @var datetime */
-	var $checked_out_time=null;
-	/** @var boolean */
-	var $pollid=null;
-
-	/** @var string */
-	var $browserNav=null;
-	/** @var int */
-	var $access=null;
-	/** @var int */
-	var $utaccess=null;
-	/** @var string */
-	var $params=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosMenu( &$db ) {
-		$this->mosDBTable( '#__menu', 'id', $db );
-	}
-}
-
-/**
-* Users Table Class
-*
-* Provides access to the mos_templates table
-* @package Mambo
-*/
-class mosUser extends mosDBTable {
-	/** @var int Unique id*/
-	var $id=null;
-	/** @var string The users real name (or nickname)*/
-	var $name=null;
-	/** @var string The login name*/
-	var $username=null;
-	/** @var string email*/
-	var $email=null;
-	/** @var string MD5 encrypted password*/
-	var $password=null;
-	/** @var string */
-	var $usertype=null;
-	/** @var int */
-	var $block=null;
-	/** @var int */
-	var $sendEmail=null;
-	/** @var int The group id number */
-	var $gid=null;
-	/** @var datetime */
-	var $registerDate=null;
-	/** @var datetime */
-	var $lastvisitDate=null;
-	/** @var string activation hash*/
-	var $activation=null;
-	/** @var string */
-	var $params=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosUser( &$database ) {
-		$this->mosDBTable( '#__users', 'id', $database );
-	}
-
-	/**
-	 * Validation and filtering
-	 * @return boolean True is satisfactory
-	 */
-	function check() {
-		global $mosConfig_uniquemail;
-
-		// filter malicious code
-		//$this->filter();
-
-		// Validate user information
-		if (trim( $this->name ) == '') {
-			$this->_error = _REGWARN_NAME;
-			return false;
-		}
-
-		if (trim( $this->username ) == '') {
-			$this->_error = _REGWARN_UNAME;
-			return false;
-		}
-
-		if (eregi( "[\<|\>|\"|\'|\%|\;|\(|\)|\&|\+|\-]", $this->username) || strlen( $this->username ) < 3) {
-			$this->_error = sprintf( _VALID_AZ09, _PROMPT_UNAME, 2 );
-			return false;
-		}
-
-		if ((trim($this->email == "")) || (preg_match("/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $this->email )==false)) {
-			$this->_error = _REGWARN_MAIL;
-			return false;
-		}
-
-		// check for existing username
-		$this->_db->setQuery( "SELECT id FROM #__users "
-		. "\nWHERE LOWER(username)=LOWER('$this->username') AND id!='$this->id'"
-		);
-
-		$xid = intval( $this->_db->loadResult() );
-		if ($xid && $xid != intval( $this->id )) {
-			$this->_error = _REGWARN_INUSE;
-			return false;
-		}
-
-		if ($mosConfig_uniquemail) {
-			// check for existing email
-			$this->_db->setQuery( "SELECT id FROM #__users "
-			. "\nWHERE email='$this->email' AND id!='$this->id'"
-			);
-
-			$xid = intval( $this->_db->loadResult() );
-			if ($xid && $xid != intval( $this->id )) {
-				$this->_error = _REGWARN_EMAIL_INUSE;
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	function store( $updateNulls=false ) {
-		global $acl, $migrate;
-		$section_value = 'users';
-
-		$k = $this->_tbl_key;
-		$key =  $this->$k;
-		if( $key && !$migrate) {
-			// existing record
-			$ret = $this->_db->updateObject( $this->_tbl, $this, $this->_tbl_key, $updateNulls );
-			// syncronise ACL
-			// single group handled at the moment
-			// trivial to expand to multiple groups
-			$groups = $acl->get_object_groups( $section_value, $this->$k, 'ARO' );
-			$acl->del_group_object( $groups[0], $section_value, $this->$k, 'ARO' );
-			$acl->add_group_object( $this->gid, $section_value, $this->$k, 'ARO' );
-
-			$object_id = $acl->get_object_id( $section_value, $this->$k, 'ARO' );
-			$acl->edit_object( $object_id, $section_value, $this->_db->getEscaped( $this->name ), $this->$k, 0, 0, 'ARO' );
-		} else {
-			// new record
-			$ret = $this->_db->insertObject( $this->_tbl, $this, $this->_tbl_key );
-			// syncronise ACL
-			$acl->add_object( $section_value, $this->_db->getEscaped( $this->name ), $this->$k, null, null, 'ARO' );
-			$acl->add_group_object( $this->gid, $section_value, $this->$k, 'ARO' );
-		}
-		if( !$ret ) {
-			$this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->getErrorMsg();
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	function delete( $oid=null ) {
-		global $acl;
-
-		$k = $this->_tbl_key;
-		if ($oid) {
-			$this->$k = intval( $oid );
-		}
-		$aro_id = $acl->get_object_id( 'users', $this->$k, 'ARO' );
-//		$acl->del_object( $aro_id, 'ARO', true );
-
-		$this->_db->setQuery( "DELETE FROM $this->_tbl WHERE $this->_tbl_key = '".$this->$k."'" );
-
-		if ($this->_db->query()) {
-			// cleanup related data
-
-			// :: private messaging
-			$this->_db->setQuery( "DELETE FROM #__messages_cfg WHERE user_id='".$this->$k."'" );
-			if (!$this->_db->query()) {
-				$this->_error = $this->_db->getErrorMsg();
-				return false;
-			}
-			$this->_db->setQuery( "DELETE FROM #__messages WHERE user_id_to='".$this->$k."'" );
-			if (!$this->_db->query()) {
-				$this->_error = $this->_db->getErrorMsg();
-				return false;
-			}
-
-			return true;
-		} else {
-			$this->_error = $this->_db->getErrorMsg();
-			return false;
-		}
-	}
-}
-
-/**
-* Template Table Class
-*
-* Provides access to the mos_templates table
-* @package Mambo
-*/
-class mosTemplate extends mosDBTable {
-	/** @var int */
-	var $id=null;
-	/** @var string */
-	var $cur_template=null;
-	/** @var int */
-	var $col_main=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosTemplate( &$database ) {
-		$this->mosDBTable( '#__templates', 'id', $database );
-	}
-}
-
-/**
-* Utility function to return a value from a named array or a specified default
-*/
-define( "_MOS_NOTRIM", 0x0001 );
-define( "_MOS_ALLOWHTML", 0x0002 );
-define( "_MOS_ALLOWRAW", 0x0004 );
-function mosGetParam( &$arr, $name, $def=null, $mask=0 ) {
-	if (isset( $arr[$name] )) {
-		if (is_array($arr[$name])) foreach ($arr[$name] as $key=>$element) mosGetParam ($arr[$name], $key, $def, $mask);
-		else {
-			if (!($mask&_MOS_NOTRIM)) $arr[$name] = trim( $arr[$name] );
-			if (!is_numeric( $arr[$name] )) {
-				if (!($mask&_MOS_ALLOWHTML)) $arr[$name] = strip_tags( $arr[$name] );
-				if (!($mask&_MOS_ALLOWRAW)) {
-					if (is_numeric($def)) $arr[$name] = intval($arr[$name]);
-				}
-			}
-		}
-		return $arr[$name];
-	} else {
-		return $def;
-	}
-}
-
-/**
-* Strip slashes from strings or arrays of strings
-* @param value the input string or array
-*/
-function mosStripslashes(&$value)
-{
-	$ret = '';
-    if (is_string($value)) {
-		$ret = stripslashes($value);
-	} else {
-	    if (is_array($value)) {
-	        $ret = array();
-	        while (list($key,$val) = each($value)) {
-	            $ret[$key] = mosStripslashes($val);
-	        } // while
-	    } else {
-	        $ret = $value;
-		} // if
-	} // if
-    return $ret;
-} // mosStripSlashes
-
-/**
-* Copy the named array content into the object as properties
-* only existing properties of object are filled. when undefined in hash, properties wont be deleted
-* @param array the input array
-* @param obj byref the object to fill of any class
-* @param string
-* @param boolean
-*/
-function mosBindArrayToObject( $array, &$obj, $ignore='', $prefix=NULL, $checkSlashes=true ) {
-	if (!is_array( $array ) || !is_object( $obj )) {
-		return (false);
-	}
-
-	foreach (get_object_vars($obj) as $k => $v) {
-		if( substr( $k, 0, 1 ) != '_' ) {			// internal attributes of an object are ignored
-			if (strpos( $ignore, $k) === false) {
-				if ($prefix) {
-					$ak = $prefix . $k;
-				} else {
-					$ak = $k;
-				}
-				if (isset($array[$ak])) {
-					$obj->$k = ($checkSlashes && get_magic_quotes_gpc()) ? mosStripslashes( $array[$k] ) : $array[$k];
-				}
-			}
-		}
-	}
-
-	return true;
-}
-
-/**
-* Utility function to read the files in a directory
-* @param string The file system path
-* @param string A filter for the names
-* @param boolean Recurse search into sub-directories
-* @param boolean True if to prepend the full path to the file name
-*/
-function mosReadDirectory( $path, $filter='.', $recurse=false, $fullpath=false  ) {
-	$arr = array();
-	if (!@is_dir( $path )) {
-		return $arr;
-	}
-	$handle = opendir( $path );
-
-	while ($file = readdir($handle)) {
-		$dir = mosPathName( $path.'/'.$file, false );
-		$isDir = is_dir( $dir );
-		if (($file <> ".") && ($file <> "..")) {
-			if (preg_match( "/$filter/", $file )) {
-				if ($fullpath) {
-					$arr[] = trim( mosPathName( $path.'/'.$file, false ) );
-				} else {
-					$arr[] = trim( $file );
-				}
-			}
-			if ($recurse && $isDir) {
-				$arr2 = mosReadDirectory( $dir, $filter, $recurse, $fullpath );
-				$arr = array_merge( $arr, $arr2 );
-			}
-		}
-	}
-	closedir($handle);
-	asort($arr);
-	return $arr;
-}
-
-/**
-* Utility function redirect the browser location to another url
-*
-* Can optionally provide a message.
-* @param string The file system path
-* @param string A filter for the names
-*/
-function mosRedirect( $url, $msg='' ) {
-	// specific filters
-	$iFilter = new InputFilter();
-	$url = $iFilter->process( $url );
-	$msg = $iFilter->process( $msg );
-
-	if ($iFilter->badAttributeValue( array( 'href', $url ))) {
-		$url = $GLOBALS['mosConfig_live_site'];
-	}
-
-	if (trim( $msg )) {
-	 	if (strpos( $url, '?' )) {
-			$url .= '&mosmsg=' . urlencode( $msg );
-		} else {
-			$url .= '?mosmsg=' . urlencode( $msg );
-		}
-	}
-
-	if (headers_sent()) {
-		echo "<script>document.location.href='$url';</script>\n";
-	} else {
-		@ob_end_clean(); // clear output buffer
-		header( "Location: $url" );
-	}
-	exit();
-}
-
-function mosTreeRecurse( $id, $indent, $list, &$children, $maxlevel=9999, $level=0, $type=1 ) {
-	if (@$children[$id] && $level <= $maxlevel) {
-		foreach ($children[$id] as $v) {
-			$id = $v->id;
-
-			if ( $type ) {
-				$pre 	= '<sup>L</sup>&nbsp;';
-				$spacer = '.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			} else {
-				$pre 	= '- ';
-				$spacer = '&nbsp;&nbsp;';
-			}
-
-			if ( $v->parent == 0 ) {
-				$txt 	= $v->name;
-			} else {
-				$txt 	= $pre . $v->name;
-			}
-			$pt = $v->parent;
-			$list[$id] = $v;
-			$list[$id]->treename = "$indent$txt";
-			$list[$id]->children = count( @$children[$id] );
-			$list = mosTreeRecurse( $id, $indent . $spacer, $list, $children, $maxlevel, $level+1, $type );
-		}
-	}
-	return $list;
-}
-
-/**
-* Function to strip additional / or \ in a path name
-* @param string The path
-* @param boolean Add trailing slash
-*/
-function mosPathName($p_path,$p_addtrailingslash = true) {
-	$retval = "";
-
-	$isWin = (substr(PHP_OS, 0, 3) == 'WIN');
-
-	if ($isWin)	{
-		$retval = str_replace( '/', '\\', $p_path );
-		if ($p_addtrailingslash) {
-			if (substr( $retval, -1 ) != '\\') {
-				$retval .= '\\';
-			}
-		}
-		// Remove double \\
-		$retval = str_replace( '\\\\', '\\', $retval );
-	} else {
-		$retval = str_replace( '\\', '/', $p_path );
-		if ($p_addtrailingslash) {
-			if (substr( $retval, -1 ) != '/') {
-				$retval .= '/';
-			}
-		}
-		// Remove double //
-		$retval = str_replace('//','/',$retval);
-	}
-
-	return $retval;
-}
-
-/**
-* Class mosMambot
-* @package Mambo
-*/
-class mosMambot extends mosDBTable {
-	/** @var int */
-	var $id=null;
-	/** @var varchar */
-	var $name=null;
-	/** @var varchar */
-	var $element=null;
-	/** @var varchar */
-	var $folder=null;
-	/** @var tinyint unsigned */
-	var $access=null;
-	/** @var int */
-	var $ordering=null;
-	/** @var tinyint */
-	var $published=null;
-	/** @var tinyint */
-	var $iscore=null;
-	/** @var tinyint */
-	var $client_id=null;
-	/** @var int unsigned */
-	var $checked_out=null;
-	/** @var datetime */
-	var $checked_out_time=null;
-	/** @var text */
-	var $params=null;
-
-	function mosMambot( &$db ) {
-		$this->mosDBTable( '#__mambots', 'id', $db );
-	}
-}
-
-/**
-* Module database table class
-* @package Mambo
-*/
-class mosModule extends mosDBTable {
-	/** @var int Primary key */
-	var $id=null;
-	/** @var string */
-	var $title=null;
-	/** @var string */
-	var $showtitle=null;
-	/** @var int */
-	var $content=null;
-	/** @var int */
-	var $ordering=null;
-	/** @var string */
-	var $position=null;
-	/** @var boolean */
-	var $checked_out=null;
-	/** @var time */
-	var $checked_out_time=null;
-	/** @var boolean */
-	var $published=null;
-	/** @var string */
-	var $module=null;
-	/** @var int */
-	var $numnews=null;
-	/** @var int */
-	var $access=null;
-	/** @var string */
-	var $params=null;
-	/** @var string */
-	var $iscore=null;
-	/** @var string */
-	var $client_id=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosModule( &$db ) {
-		$this->mosDBTable( '#__modules', 'id', $db );
-	}
-	// overloaded check function
-	function check() {
-		// check for valid name
-		if (trim( $this->title ) == '') {
-			$this->_error = "Your Module must contain a title.";
-			return false;
-		}
-
-		// limitation has been removed
-		// check for existing title
-		//$this->_db->setQuery( "SELECT id FROM #__modules"
-		//. "\nWHERE title='$this->title'"
-		//);
-		// check for module of same name
-		//$xid = intval( $this->_db->loadResult() );
-		//if ($xid && $xid != intval( $this->id )) {
-		//	$this->_error = "There is a module already with that name, please try again.";
-		//	return false;
-		//}
-		return true;
-	}
-}
-
-/**
-* Session database table class
-* @package Mambo
-*/
-class mosSession extends mosDBTable {
-	/** @var int Primary key */
-	var $session_id=null;
-	/** @var string */
-	var $time=null;
-	/** @var string */
-	var $userid=null;
-	/** @var string */
-	var $usertype=null;
-	/** @var string */
-	var $username=null;
-	/** @var time */
-	var $gid=null;
-	/** @var int */
-	var $guest=null;
-	/** @var string */
-	var $_session_cookie=null;
-
-	/**
-	* @param database A database connector object
-	*/
-	function mosSession( &$db ) {
-		$this->mosDBTable( '#__session', 'session_id', $db );
-	}
-
-	function insert() {
-		$ret = $this->_db->insertObject( $this->_tbl, $this );
-
-		if( !$ret ) {
-			$this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->stderr();
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	function update( $updateNulls=false ) {
-		$ret = $this->_db->updateObject( $this->_tbl, $this, 'session_id', $updateNulls );
-
-		if( !$ret ) {
-			$this->_error = strtolower(get_class( $this ))."::store failed <br />" . $this->_db->stderr();
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	function generateId() {
-		$failsafe = 20;
-		$randnum = 0;
-		while ($failsafe--) {
-			$randnum = md5( uniqid( microtime(), 1 ) );
-			if ($randnum != "") {
-				$cryptrandnum = md5( $randnum );
-				$this->_db->setQuery( "SELECT $this->_tbl_key FROM $this->_tbl WHERE $this->_tbl_key=MD5('$randnum')" );
-				if(!$result = $this->_db->query()) {
-					die( $this->_db->stderr( true ));
-					// todo: handle gracefully
-				}
-				if ($this->_db->getNumRows($result) == 0) {
-					break;
-				}
-			}
-		}
-		$this->_session_cookie = $randnum;
-		$this->session_id = md5( $randnum . $_SERVER['REMOTE_ADDR'] );
-	}
-
-	function getCookie() {
-		return $this->_session_cookie;
-	}
-
-	function purge( $inc=1800 ) {
-		$past = time() - $inc;
-		$query = "DELETE FROM $this->_tbl"
-		. "\nWHERE (time < $past)";
-		$this->_db->setQuery($query);
-
-		return $this->_db->query();
-	}
-}
-
-
-function mosObjectToArray($p_obj)
-{
-	$retarray = null;
-	if(is_object($p_obj))
-	{
-		$retarray = array();
-		foreach (get_object_vars($p_obj) as $k => $v)
-		{
-			if(is_object($v))
-			$retarray[$k] = mosObjectToArray($v);
-			else
-			$retarray[$k] = $v;
-		}
-	}
-	return $retarray;
-}
-/**
-* Checks the user agent string against known browsers
-*/
-function mosGetBrowser( $agent ) {
-	require( "includes/agent_browser.php" );
-
-	if (preg_match( "/msie[\/\sa-z]*([\d\.]*)/i", $agent, $m )
-	&& !preg_match( "/webtv/i", $agent )
-	&& !preg_match( "/omniweb/i", $agent )
-	&& !preg_match( "/opera/i", $agent )) {
-		// IE
-		return "MS Internet Explorer $m[1]";
-	} else if (preg_match( "/netscape.?\/([\d\.]*)/i", $agent, $m )) {
-		// Netscape 6.x, 7.x ...
-		return "Netscape $m[1]";
-	} else if ( preg_match( "/mozilla[\/\sa-z]*([\d\.]*)/i", $agent, $m )
-	&& !preg_match( "/gecko/i", $agent )
-	&& !preg_match( "/compatible/i", $agent )
-	&& !preg_match( "/opera/i", $agent )
-	&& !preg_match( "/galeon/i", $agent )
-	&& !preg_match( "/safari/i", $agent )) {
-		// Netscape 3.x, 4.x ...
-		return "Netscape $m[2]";
-	} else {
-		// Other
-		$found = false;
-		foreach ($browserSearchOrder as $key) {
-			if (preg_match( "/$key.?\/([\d\.]*)/i", $agent, $m )) {
-				$name = "$browsersAlias[$key] $m[1]";
-				return $name;
-				break;
-			}
-		}
-	}
-
-	return 'Unknown';
-}
-
-/**
-* Checks the user agent string against known operating systems
-*/
-function mosGetOS( $agent ) {
-	require( "includes/agent_os.php" );
-
-	foreach ($osSearchOrder as $key) {
-		if (preg_match( "/$key/i", $agent )) {
-			return $osAlias[$key];
-			break;
-		}
-	}
-
-	return 'Unknown';
-}
-
-/**
-* @param string SQL with ordering As value and 'name field' AS text
-* @param integer The length of the truncated headline
-*/
-function mosGetOrderingList( $sql, $chop='30' ) {
-	global $database;
-
-	$order = array();
-	$database->setQuery( $sql );
-	if (!($orders = $database->loadObjectList())) {
-		if ($database->getErrorNum()) {
-			echo $database->stderr();
-			return false;
-		} else {
-			$order[] = mosHTML::makeOption( 1, 'first' );
-			return $order;
-		}
-	}
-	$order[] = mosHTML::makeOption( 0, '0 first' );
-	for ($i=0, $n=count( $orders ); $i < $n; $i++) {
-
-        if (strlen($orders[$i]->text) > $chop) {
-        	$text = substr($orders[$i]->text,0,$chop)."...";
-        } else {
-        	$text = $orders[$i]->text;
-        }
-
-		$order[] = mosHTML::makeOption( $orders[$i]->value, $orders[$i]->value.' ('.$text.')' );
-	}
-	$order[] = mosHTML::makeOption( $orders[$i-1]->value+1, ($orders[$i-1]->value+1).' last' );
-
-	return $order;
-}
-
-/**
-* Makes a variable safe to display in forms
-*
-* Object parameters that are non-string, array, object or start with underscore
-* will be converted
-* @param object An object to be parsed
-* @param int The optional quote style for the htmlspecialchars function
-* @param string|array An optional single field name or array of field names not
-*                     to be parsed (eg, for a textarea)
-*/
-function mosMakeHtmlSafe( &$mixed, $quote_style=ENT_QUOTES, $exclude_keys='' ) {
-	if (is_object( $mixed )) {
-		foreach (get_object_vars( $mixed ) as $k => $v) {
-			if (is_array( $v ) || is_object( $v ) || $v == NULL || substr( $k, 1, 1 ) == '_' ) {
-				continue;
-			}
-			if (is_string( $exclude_keys ) && $k == $exclude_keys) {
-				continue;
-			} else if (is_array( $exclude_keys ) && in_array( $k, $exclude_keys )) {
-				continue;
-			}
-			$mixed->$k = htmlspecialchars( $v, $quote_style );
-		}
-	}
-}
-
-/**
-* Checks whether a menu option is within the users access level
-* @param int Item id number
-* @param string The menu option
-* @param int The users group ID number
-* @param database A database connector object
-* @return boolean True if the visitor's group at least equal to the menu access
-*/
-function mosMenuCheck( $Itemid, $menu_option, $task, $gid ) {
-	global $database;
-	$dblink="index.php?option=$menu_option";
-	if ($Itemid!="" && $Itemid!=0) {
-		$database->setQuery( "SELECT access FROM #__menu WHERE id='$Itemid'" );
-	} else {
-		if ($task!="") {
-			$task = $database->getEscaped($task);
-			$dblink.="&task=$task";
-		}
-		$database->setQuery( "SELECT access FROM #__menu WHERE link like '$dblink%'" );
-	}
-	$results = $database->loadObjectList();
-	$access = 0;
-	//echo "<pre>"; print_r($results); echo "</pre>";
-	foreach ($results as $result) {
-		$access = max( $access, $result->access );
-	}
-	return ($access <= $gid);
-}
-
-/**
-* Returns formated date according to current local and adds time offset
-* @param string date in datetime format
-* @param string format optional format for strftime
-* @param offset time offset if different than global one
-* @returns formated date
-*/
-function mosFormatDate( $date, $format="", $offset="" ){
-	global $mosConfig_offset;
-	if ( $format == '' ) {
-		// %Y-%m-%d %H:%M:%S
-		$format = _DATE_FORMAT_LC;
-	}
-	if ( $offset == '' ) {
-		$offset = $mosConfig_offset;
-	}
-	if ( $date && ereg( "([0-9]{4})-([0-9]{2})-([0-9]{2})[ ]([0-9]{2}):([0-9]{2}):([0-9]{2})", $date, $regs ) ) {
-		$date = mktime( $regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1] );
-		$date = $date > -1 ? strftime( $format, $date + ($offset*60*60) ) : '-';
-	}
-	return $date;
-}
-
-/**
-* Returns current date according to current local and time offset
-* @param string format optional format for strftime
-* @returns current date
-*/
-function mosCurrentDate( $format="" ) {
-	global $mosConfig_offset;
-	if ($format=="") {
-		$format = _DATE_FORMAT_LC;
-	}
-	$date = strftime( $format, time() + ($mosConfig_offset*60*60) );
-	return $date;
-}
-
-/**
-* Utility function to provide ToolTips
-* @param string ToolTip text
-* @param string Box title
-* @returns HTML code for ToolTip
-*/
-function mosToolTip( $tooltip, $title='', $width='', $image='tooltip.png', $text='', $href='#' ) {
-	global $mosConfig_live_site;
-
-	if ( $width ) {
-		$width = ', WIDTH, \''.$width .'\'';
-	}
-	if ( $title ) {
-		$title = ', CAPTION, \''.$title .'\'';
-	}
-	if ( !$text ) {
-		$image 	= $mosConfig_live_site . '/includes/js/ThemeOffice/'. $image;
-		$text 	= '<img src="'. $image .'" border="0" />';
-	}
-	$style = 'style="text-decoration: none; color: #333;"';
-	if ( $href ) {
-		$style = '';
-	}
-	$tip 	= "<a href=\"". $href ."\" onMouseOver=\"return overlib('" . $tooltip . "'". $title .", BELOW, RIGHT". $width .");\" onmouseout=\"return nd();\" ". $style .">". $text ."</a>";
-	return $tip;
-}
-
-/**
-* Utility function to provide Warning Icons
-* @param string Warning text
-* @param string Box title
-* @returns HTML code for Warning
-*/
-function mosWarning($warning, $title='Mambo Warning') {
-	global $mosConfig_live_site;
-	$tip = "<a href=\"#\" onMouseOver=\"return overlib('" . $warning . "', CAPTION, '$title', BELOW, RIGHT);\" onmouseout=\"return nd();\"><img src=\"" . $mosConfig_live_site . "/includes/js/ThemeOffice/warning.png\" border=\"0\" /></a>";
-	return $tip;
-}
-
-function mosCreateGUID(){
-	srand((double)microtime()*1000000);
-	$r = rand ;
-	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
-	$m = md5 ($u);
-	return($m);
-}
-
-function mosCompressID( $ID ){
-	return(Base64_encode(pack("H*",$ID)));
-}
-
-function mosExpandID( $ID ) {
-	return ( implode(unpack("H*",Base64_decode($ID)), '') );
-}
-
-/**
-* Page generation time
-* @package Mambo
-*/
-class mosProfiler {
-	var $start=0;
-	var $prefix='';
-
-	function mosProfiler( $prefix='' ) {
-		$this->start = $this->getmicrotime();
-		$this->prefix = $prefix;
-	}
-
-	function mark( $label ) {
-		return sprintf ( "\n<div class=\"profiler\">$this->prefix %.3f $label</div>", $this->getmicrotime() - $this->start );
-	}
-
-	function getmicrotime(){
-		list($usec, $sec) = explode(" ",microtime());
-		return ((float)$usec + (float)$sec);
-	}
-}
-
-/**
-* Function to create a mail object for futher use (uses phpMailer)
-* @param string From e-mail address
-* @param string From name
-* @param string E-mail subject
-* @param string Message body
-* @return object Mail object
-*/
-function mosCreateMail( $from='', $fromname='', $subject, $body ) {
-	global $mosConfig_absolute_path, $mosConfig_sendmail;
-	global $mosConfig_smtpauth, $mosConfig_smtpuser;
-	global $mosConfig_smtppass, $mosConfig_smtphost;
-	global $mosConfig_mailfrom, $mosConfig_fromname, $mosConfig_mailer;
-
-	$mail = new mosPHPMailer();
-
-	$mail->PluginDir = $mosConfig_absolute_path .'/includes/phpmailer/';
-	$mail->SetLanguage( 'en', $mosConfig_absolute_path . '/includes/phpmailer/language/' );
-	$mail->CharSet 	= substr_replace(_ISO, '', 0, 8);
-	$mail->IsMail();
-	$mail->From 	= $from ? $from : $mosConfig_mailfrom;
-	$mail->FromName = $fromname ? $fromname : $mosConfig_fromname;
-	$mail->Mailer 	= $mosConfig_mailer;
-
-	// Add smtp values if needed
-	if ( $mosConfig_mailer == 'smtp' ) {
-		$mail->SMTPAuth = $mosConfig_smtpauth;
-		$mail->Username = $mosConfig_smtpuser;
-		$mail->Password = $mosConfig_smtppass;
-		$mail->Host 	= $mosConfig_smtphost;
-	} else
-
-	// Set sendmail path
-	if ( $mosConfig_mailer == 'sendmail' ) {
-		if (isset($mosConfig_sendmail))
-			$mail->Sendmail = $mosConfig_sendmail;
-	} // if
-
-	$mail->Subject 	= $subject;
-	$mail->Body 	= $body;
-
-	return $mail;
-}
-
-/**
-* Mail function (uses phpMailer)
-* @param string From e-mail address
-* @param string From name
-* @param string/array Recipient e-mail address(es)
-* @param string E-mail subject
-* @param string Message body
-* @param boolean false = plain text, true = HTML
-* @param string/array CC e-mail address(es)
-* @param string/array BCC e-mail address(es)
-* @param string/array Attachment file name(s)
-* @param string/array Reply-to e-mail address
-* @param string/array Reply-to name
-*/
-function mosMail($from, $fromname, $recipient, $subject, $body, $mode=0, $cc=NULL, $bcc=NULL, $attachment=NULL, $replyto=NULL, $replytoname=NULL ) {
-	global $mosConfig_debug;
-	$mail = mosCreateMail( $from, $fromname, $subject, $body );
-
-	// activate HTML formatted emails
-	if ( $mode ) {
-		$mail->IsHTML(true);
-	}
-
-	if( is_array($recipient) ) {
-		foreach ($recipient as $to) {
-			$mail->AddAddress($to);
-		}
-	} else {
-		$mail->AddAddress($recipient);
-	}
-	if (isset($cc)) {
-	    if( is_array($cc) )
-	        foreach ($cc as $to) $mail->AddCC($to);
-	    else
-	        $mail->AddCC($cc);
-	}
-	if (isset($bcc)) {
-	    if( is_array($bcc) )
-	        foreach ($bcc as $to) $mail->AddBCC($to);
-	    else
-	        $mail->AddBCC($bcc);
-	}
-    if ($attachment) {
-        if ( is_array($attachment) )
-            foreach ($attachment as $fname) $mail->AddAttachment($fname);
-        else
-            $mail->AddAttachment($attachment);
-    } // if
-    if ($replyto) {
-        if ( is_array($replyto) ) {
-        	reset($replytoname);
-            foreach ($replyto as $to) {
-            	$toname = ((list($key, $value) = each($replytoname))
-				? $value : "");
-            	$mail->AddReplyTo($to, $toname);
-            }
-        } else
-            $mail->AddReplyTo($replyto, $replytoname);
-    }
-	$mailssend = $mail->Send();
-
-	if( $mosConfig_debug ) {
-		//$mosDebug->message( "Mails send: $mailssend");
-	}
-	if( $mail->error_count > 0 ) {
-		//$mosDebug->message( "The mail message $fromname <$from> about $subject to $recipient <b>failed</b><br /><pre>$body</pre>", false );
-		//$mosDebug->message( "Mailer Error: " . $mail->ErrorInfo . "" );
-	}
-	return $mailssend;
-} // mosMail
-
-/**
-* Initialise GZIP
-*/
-function initGzip() {
-	global $mosConfig_gzip, $do_gzip_compress;
-	$do_gzip_compress = FALSE;
-	
-	//zlib.output_compression and ob_gzhandler don't get along well so we'll check to make
-	//that zlib.output_compression is not enable in the php.ini before turning on ob_gzhandler
-	if ( $mosConfig_gzip == 1 && (int)ini_get('zlib.output_compression') != 1 ) {
-		$phpver = phpversion();
-		$useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' );
-		$canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' );
-
-		if ( $phpver >= '4.0.4pl1' &&
-				( strpos($useragent,'compatible') !== false ||
-				  strpos($useragent,'Gecko')      !== false
-				)
-		   ) {
-			if ( extension_loaded('zlib') ) {
-				ob_start( 'ob_gzhandler' );
-				return;
-			}
-		} else if ( $phpver > '4.0' ) {
-			if ( strpos($canZip,'gzip') !== false ) {
-				if (extension_loaded( 'zlib' )) {
-					$do_gzip_compress = TRUE;
-					ob_start();
-					ob_implicit_flush(0);
-
-					header( 'Content-Encoding: gzip' );
-					return;
-				}
-			}
-		}
-	}
-	ob_start();
-}
-
-/**
-* Perform GZIP
-*/
-function doGzip() {
-	global $do_gzip_compress;
-	if ( $do_gzip_compress ) {
-		/**
-		*Borrowed from php.net!
-		*/
-		$gzip_contents = ob_get_contents();
-		ob_end_clean();
-
-		$gzip_size = strlen($gzip_contents);
-		$gzip_crc = crc32($gzip_contents);
-
-		$gzip_contents = gzcompress($gzip_contents, 9);
-		$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
-
-		echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
-		echo $gzip_contents;
-		echo pack('V', $gzip_crc);
-		echo pack('V', $gzip_size);
-	} else {
-		ob_end_flush();
-	}
-}
-
-/**
-* Random password generator
-* @return password
-*/
-function mosMakePassword() {
-	$salt = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-	$len = strlen($salt);
-	$makepass="";
-	mt_srand(10000000*(double)microtime());
-	for ($i = 0; $i < 8; $i++)
-	$makepass .= $salt[mt_rand(0,$len - 1)];
-	return $makepass;
-}
-
-if (!function_exists('html_entity_decode')) {
-	/**
-	* html_entity_decode function for backward compatability in PHP
-	* @param string
-	* @param string
-	*/
-	function html_entity_decode ($string, $opt = ENT_COMPAT) {
-
-		$trans_tbl = get_html_translation_table (HTML_ENTITIES);
-		$trans_tbl = array_flip ($trans_tbl);
-
-		if ($opt & 1) { // Translating single quotes
-		// Add single quote to translation table;
-		// doesn't appear to be there by default
-		$trans_tbl["&apos;"] = "'";
-		}
-
-		if (!($opt & 2)) { // Not translating double quotes
-		// Remove double quote from translation table
-		unset($trans_tbl["&quot;"]);
-		}
-
-		return strtr ($string, $trans_tbl);
-	}
-}
-
-/**
-* Plugin handler
-* @package Mambo
-*/
-class mosMambotHandler {
-	/** @var array An array of functions in event groups */
-	var $_events=null;
-	/** @var array An array of lists */
-	var $_lists=null;
-	/** @var array An array of mambots */
-	var $_bots=null;
-	/** @var int Index of the mambot being loaded */
-	var $_loading=null;
-
-	/**
-	* Constructor
-	*/
-	function mosMambotHandler() {
-		$this->_events = array();
-	}
-	/**
-	* Loads all the bot files for a particular group
-	* @param string The group name, relates to the sub-directory in the mambots directory
-	*/
-	function loadBotGroup( $group ) {
-		global $database, $my, $mosConfig_absolute_path;
-		global $_MAMBOTS;
-
-		$group = trim( $group );
-		$database->setQuery( "SELECT folder, element, published, CONCAT_WS('/',folder,element) AS lookup"
-		. "\nFROM #__mambots"
-		. "\nWHERE published >= 1 AND access <= $my->gid AND folder='$group'"
-		. "\nORDER BY ordering"
-		);
-		if (!($bots = $database->loadObjectList())) {
-			//echo "Error loading Mambots: " . $database->getErrorMsg();
-			return false;
-		}
-		$n = count( $bots);
-		for ($i = 0; $i < $n; $i++) {
-			$path = $mosConfig_absolute_path . '/mambots/' . $bots[$i]->folder . '/' . $bots[$i]->element . '.php';
-			if (file_exists( $path )) {
-				$this->_loading = count( $this->_bots );
-				$this->_bots[] = $bots[$i];
-				require_once( $path );
-				$this->_loading = null;
-			}
-		}
-		return true;
-	}
-	/**
-	* Registers a function to a particular event group
-	* @param string The event name
-	* @param string The function name
-	*/
-	function registerFunction( $event, $function ) {
-		$this->_events[$event][] = array( $function, $this->_loading );
-	}
-	/**
-	* Makes a option for a particular list in a group
-	* @param string The group name
-	* @param string The list name
-	* @param string The value for the list option
-	* @param string The text for the list option
-	*/
-	function addListOption( $group, $listName, $value, $text='' ) {
-		$this->_lists[$group][$listName][] = mosHTML::makeOption( $value, $text );
-	}
-	/**
-	* @param string The group name
-	* @param string The list name
-	* @return array
-	*/
-	function getList( $group, $listName ) {
-		return $this->_lists[$group][$listName];
-	}
-	/**
-	* Calls all functions associated with an event group
-	* @param string The event name
-	* @param array An array of arguments
-	* @param boolean True is unpublished bots are to be processed
-	* @return array An array of results from each function call
-	*/
-	function trigger( $event, $args=null, $doUnpublished=false ) {
-		$result = array();
-
-		if ($args === null) {
-			$args = array();
-		}
-		if ($doUnpublished) {
-			// prepend the published argument
-			array_unshift( $args, null );
-		}
-		if (isset( $this->_events[$event] )) {
-			foreach ($this->_events[$event] as $func) {
-				if (function_exists( $func[0] )) {
-					if ($doUnpublished) {
-						$args[0] = $this->_bots[$func[1]]->published;
-						$result[] = call_user_func_array( $func[0], $args );
-					} else if ($this->_bots[$func[1]]->published) {
-						$result[] = call_user_func_array( $func[0], $args );
-					}
-				}
-			}
-		}
-		return $result;
-	}
-	/**
-	* Same as trigger but only returns the first event and
-	* allows for a variable argument list
-	* @param string The event name
-	* @return array The result of the first function call
-	*/
-	function call( $event ) {
-		$doUnpublished=false;
-
-		$args =& func_get_args();
-		array_shift( $args );
-
-		if (isset( $this->_events[$event] )) {
-			foreach ($this->_events[$event] as $func) {
-				if (function_exists( $func[0] )) {
-					if ($this->_bots[$func[1]]->published) {
-						return call_user_func_array( $func[0], $args );
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
-
-/**
-* Tab Creation handler
-* @package Mambo
-* @author Phil Taylor
-*/
-class mosTabs {
-	/** @var int Use cookies */
-	var $useCookies = 0;
-
-	/**
-	* Constructor
-	* Includes files needed for displaying tabs and sets cookie options
-	* @param int useCookies, if set to 1 cookie will hold last used tab between page refreshes
-	*/
-	function mosTabs($useCookies) {
-		global $mosConfig_live_site;
-		echo "<link id=\"luna-tab-style-sheet\" type=\"text/css\" rel=\"stylesheet\" href=\"" . $mosConfig_live_site. "/includes/js/tabs/tabpane.css\" />";
-		echo "<script type=\"text/javascript\" src=\"". $mosConfig_live_site . "/includes/js/tabs/tabpane.js\"></script>";
-		$this->useCookies = $useCookies;
-	}
-
-	/**
-	* creates a tab pane and creates JS obj
-	* @param string The Tab Pane Name
-	*/
-	function startPane($id){
-		echo "<div class=\"tab-page\" id=\"".$id."\">";
-		echo "<script type=\"text/javascript\">\n";
-		echo "   var tabPane1 = new WebFXTabPane( document.getElementById( \"".$id."\" ), ".$this->useCookies." )\n";
-		echo "</script>\n";
-	}
-
-	/**
-	* Ends Tab Pane
-	*/
-	function endPane() {
-		echo "</div>";
-	}
-
-	/*
-	* Creates a tab with title text and starts that tabs page
-	* @param tabText - This is what is displayed on the tab
-	* @param paneid - This is the parent pane to build this tab on
-	*/
-	function startTab( $tabText, $paneid ) {
-		echo "<div class=\"tab-page\" id=\"".$paneid."\">";
-		echo "<h2 class=\"tab\">".$tabText."</h2>";
-		echo "<script type=\"text/javascript\">\n";
-		echo "  tabPane1.addTabPage( document.getElementById( \"".$paneid."\" ) );";
-		echo "</script>";
-	}
-
-	/*
-	* Ends a tab page
-	*/
-	function endTab() {
-		echo "</div>";
-	}
-}
-
-/**
-* Common HTML Output Files
-* @package Mambo
-*/
-class mosAdminMenus {
-	/**
-	* build the select list for Menu Ordering
-	*/
-	function Ordering( &$row, $id ) {
-		global $database;
-
-		if ( $id ) {
-			$order = mosGetOrderingList( "SELECT ordering AS value, name AS text"
-			. "\n FROM #__menu"
-			. "\n WHERE menutype='". $row->menutype ."'"
-			. "\n AND parent='". $row->parent ."'"
-			. "\n AND published != '-2'"
-			. "\n ORDER BY ordering"
-			);
-			$ordering = mosHTML::selectList( $order, 'ordering', 'class="inputbox" size="1"', 'value', 'text', intval( $row->ordering ) );
-		} else {
-			$ordering = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />'. _CMN_NEW_ITEM_LAST;
-		}
-		return $ordering;
-	}
-
-	/**
-	* build the select list for access level
-	*/
-	function Access( &$row ) {
-		global $database;
-
-		$query = 'SELECT id AS value, name AS text FROM #__groups ORDER BY id';
-		$database->setQuery( $query );
-		$groups = $database->loadObjectList();
-		$access = mosHTML::selectList( $groups, 'access', 'class="inputbox" size="3"', 'value', 'text', intval( $row->access ) );
-		return $access;
-	}
-
-	/**
-	* build the select list for parent item
-	*/
-	function Parent( &$row ) {
-		global $database;
-
-		// get a list of the menu items
-		$query = "SELECT m.*"
-		. "\n FROM #__menu m"
-		. "\n WHERE menutype='$row->menutype'"
-		. "\n AND published <> -2"
-		. "\n ORDER BY ordering"
-		;
-		$database->setQuery( $query );
-		$mitems = $database->loadObjectList();
-
-		// establish the hierarchy of the menu
-		$children = array();
-		// first pass - collect children
-		foreach ( $mitems as $v ) {
-			$pt = $v->parent;
-			$list = @$children[$pt] ? $children[$pt] : array();
-			array_push( $list, $v );
-			$children[$pt] = $list;
-		}
-		// second pass - get an indent list of the items
-		$list = mosTreeRecurse( 0, '', array(), $children, 9999, 0, 0 );
-
-		// assemble menu items to the array
-		$mitems = array();
-		$mitems[] = mosHTML::makeOption( '0', 'Top' );
-		$this_treename = '';
-		foreach ( $list as $item ) {
-			if ( $this_treename ) {
-				if ( $item->id != $row->id && strpos( $item->treename, $this_treename ) === false) {
-					$mitems[] = mosHTML::makeOption( $item->id, $item->treename );
-				}
-			} else {
-				if ( $item->id != $row->id ) {
-					$mitems[] = mosHTML::makeOption( $item->id, $item->treename );
-				} else {
-					$this_treename = "$item->treename/";
-				}
-			}
-		}
-		$parent = mosHTML::selectList( $mitems, 'parent', 'class="inputbox" size="1"', 'value', 'text', $row->parent );
-		return $parent;
-	}
-
-	/**
-	* build a radio button option for published state
-	*/
-	function Published( &$row ) {
-		$published = mosHTML::yesnoRadioList( 'published', 'class="inputbox"', $row->published );
-		return $published;
-	}
-
-	/**
-	* build the link/url of a menu item
-	*/
-	function Link( &$row, $id, $link=NULL ) {
-		if ( $id ) {
-			if ( $link ) {
-				$link = $row->link;
-			} else {
-				$link = $row->link .'&amp;Itemid='. $row->id;
-			}
-		} else {
-			$link = NULL;
-		}
-		return $link;
-	}
-
-	/**
-	* build the select list for target window
-	*/
-	function Target( &$row ) {
-		$click[] = mosHTML::makeOption( '0', 'Parent Window With Browser Navigation' );
-		$click[] = mosHTML::makeOption( '1', 'New Window With Browser Navigation' );
-		$click[] = mosHTML::makeOption( '2', 'New Window Without Browser Navigation' );
-		$target = mosHTML::selectList( $click, 'browserNav', 'class="inputbox" size="4"', 'value', 'text', intval( $row->browserNav ) );
-		return $target;
-	}
-
-	/**
-	* build the multiple select list for Menu Links/Pages
-	*/
-	function MenuLinks( &$lookup, $all=NULL, $none=NULL ) {
-		global $database;
-
-		// get a list of the menu items
-		$database->setQuery( "SELECT m.*"
-		. "\n FROM #__menu m"
-		. "\n WHERE type != 'separator'"
-		. "\n AND link NOT LIKE '%tp:/%'"
-		. "\n AND published = '1'"
-		. "\n ORDER BY menutype, parent, ordering"
-		);
-		$mitems = $database->loadObjectList();
-		$mitems_temp = $mitems;
-
-		// establish the hierarchy of the menu
-		$children = array();
-		// first pass - collect children
-		foreach ( $mitems as $v ) {
-			$id = $v->id;
-			$pt = $v->parent;
-			$list = @$children[$pt] ? $children[$pt] : array();
-			array_push( $list, $v );
-			$children[$pt] = $list;
-		}
-		// second pass - get an indent list of the items
-		$list = mosTreeRecurse( intval( $mitems[0]->parent ), '', array(), $children, 9999, 0, 0 );
-
-		// Code that adds menu name to Display of Page(s)
-		$text_count = "0";
-		$mitems_spacer = $mitems_temp[0]->menutype;
-		foreach ($list as $list_a) {
-			foreach ($mitems_temp as $mitems_a) {
-				if ($mitems_a->id == $list_a->id) {
-					// Code that inserts the blank line that seperates different menus
-					if ($mitems_a->menutype <> $mitems_spacer) {
-						$list_temp[] = mosHTML::makeOption( -999, '----' );
-						$mitems_spacer = $mitems_a->menutype;
-					}
-					$text = $mitems_a->menutype." | ".$list_a->treename;
-					$list_temp[] = mosHTML::makeOption( $list_a->id, $text );
-					if ( strlen($text) > $text_count) {
-						$text_count = strlen($text);
-					}
-				}
-			}
-		}
-		$list = $list_temp;
-
-		$mitems = array();
-		if ( $all ) {
-			// prepare an array with 'all' as the first item
-			$mitems[] = mosHTML::makeOption( 0, 'All' );
-			// adds space, in select box which is not saved
-			$mitems[] = mosHTML::makeOption( -999, '----' );
-		}
-		if ( $none ) {
-			// prepare an array with 'all' as the first item
-			$mitems[] = mosHTML::makeOption( -999, 'None' );
-			// adds space, in select box which is not saved
-			$mitems[] = mosHTML::makeOption( -999, '----' );
-		}
-		// append the rest of the menu items to the array
-		foreach ($list as $item) {
-			$mitems[] = mosHTML::makeOption( $item->value, $item->text );
-		}
-		$pages = mosHTML::selectList( $mitems, 'selections[]', 'class="inputbox" size="26" multiple="multiple"', 'value', 'text', $lookup );
-		return $pages;
-	}
-
-
-	/**
-	* build the select list to choose a category
-	*/
-	function Category( &$menu, $id, $javascript='' ) {
-		global $database;
-
-		$query = "SELECT c.id AS `value`, c.section AS `id`, CONCAT_WS( ' / ', s.title, c.title) AS `text`"
-		. "\n FROM #__sections AS s"
-		. "\n INNER JOIN #__categories AS c ON c.section = s.id"
-		. "\n WHERE s.scope = 'content'"
-		. "\n ORDER BY s.name,c.name"
-		;
-		$database->setQuery( $query );
-		$rows = $database->loadObjectList();
-		$category = '';
-		if ( $id ) {
-			foreach ( $rows as $row ) {
-				if ( $row->value == $menu->componentid ) {
-					$category = $row->text;
-				}
-			}
-			$category .= '<input type="hidden" name="componentid" value="'. $menu->componentid .'" />';
-			$category .= '<input type="hidden" name="link" value="'. $menu->link .'" />';
-		} else {
-			$category = mosHTML::selectList( $rows, 'componentid', 'class="inputbox" size="10"'. $javascript, 'value', 'text' );
-			$category .= '<input type="hidden" name="link" value="" />';
-		}
-		return $category;
-	}
-
-	/**
-	* build the select list to choose a section
-	*/
-	function Section( &$menu, $id, $all=0 ) {
-		global $database;
-
-		$query = "SELECT s.id AS `value`, s.id AS `id`, s.title AS `text`"
-		. "\n FROM #__sections AS s"
-		. "\n WHERE s.scope = 'content'"
-		. "\n ORDER BY s.name"
-		;
-		$database->setQuery( $query );
-		if ( $all ) {
-			$rows[] = mosHTML::makeOption( 0, '- All Sections -' );
-			$rows = array_merge( $rows, $database->loadObjectList() );
-		} else {
-			$rows = $database->loadObjectList();
-		}
-
-		if ( $id ) {
-			foreach ( $rows as $row ) {
-				if ( $row->value == $menu->componentid ) {
-					$section = $row->text;
-				}
-			}
-			$section .= '<input type="hidden" name="componentid" value="'. $menu->componentid .'" />';
-			$section .= '<input type="hidden" name="link" value="'. $menu->link .'" />';
-		} else {
-			$section = mosHTML::selectList( $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text' );
-			$section .= '<input type="hidden" name="link" value="" />';
-		}
-		return $section;
-	}
-
-	/**
-	* build the select list to choose a component
-	*/
-	function Component( &$menu, $id ) {
-		global $database;
-
-		$query = "SELECT c.id AS value, c.name AS text, c.link"
-		. "\n FROM #__components AS c"
-		. "\n WHERE c.link <> ''"
-		. "\n ORDER BY c.name"
-		;
-		$database->setQuery( $query );
-		$rows = $database->loadObjectList( );
-
-		if ( $id ) {
-			// existing component, just show name
-			foreach ( $rows as $row ) {
-				if ( $row->value == $menu->componentid ) {
-					$component = $row->text;
-				}
-			}
-			$component .= '<input type="hidden" name="componentid" value="'. $menu->componentid .'" />';
-		} else {
-			$component = mosHTML::selectList( $rows, 'componentid', 'class="inputbox" size="10"', 'value', 'text' );
-		}
-		return $component;
-	}
-
-	/**
-	* build the select list to choose a component
-	*/
-	function ComponentName( &$menu, $id ) {
-		global $database;
-
-		$query = "SELECT c.id AS value, c.name AS text, c.link"
-		. "\n FROM #__components AS c"
-		. "\n WHERE c.link <> ''"
-		. "\n ORDER BY c.name"
-		;
-		$database->setQuery( $query );
-		$rows = $database->loadObjectList( );
-
-		$component = 'Component';
-		foreach ( $rows as $row ) {
-			if ( $row->value == $menu->componentid ) {
-				$component = $row->text;
-			}
-		}
-
-		return $component;
-	}
-
-	/**
-	* build the select list to choose an image
-	*/
-	function Images( $name, &$active, $javascript=NULL, $directory=NULL ) {
-		global $mosConfig_absolute_path;
-
-		if ( !$javascript ) {
-			$javascript = "onchange=\"javascript:if (document.forms[0].image.options[selectedIndex].value!='') {document.imagelib.src='../images/stories/' + document.forms[0].image.options[selectedIndex].value} else {document.imagelib.src='../images/blank.png'}\"";
-		}
-		if ( !$directory ) {
-			$directory = '/images/stories';
-		}
-
-		$imageFiles = mosReadDirectory( $mosConfig_absolute_path . $directory );
-		$images = array(  mosHTML::makeOption( '', '- Select Image -' ) );
-		foreach ( $imageFiles as $file ) {
-			if ( eregi( "bmp|gif|jpg|png", $file ) ) {
-				$images[] = mosHTML::makeOption( $file );
-			}
-		}
-		$images = mosHTML::selectList( $images, $name, 'class="inputbox" size="1" '. $javascript, 'value', 'text', $active );
-
-		return $images;
-	}
-
-	/**
-	* build the select list for Ordering of a specified Table
-	*/
-	function SpecificOrdering( &$row, $id, $query, $neworder=0 ) {
-		global $database;
-
-		if ( $neworder ) {
-			$text = _CMN_NEW_ITEM_FIRST;
-		} else {
-			$text = _CMN_NEW_ITEM_LAST;
-		}
-
-		if ( $id ) {
-			$order = mosGetOrderingList( $query );
-			$ordering = mosHTML::selectList( $order, 'ordering', 'class="inputbox" size="1"', 'value', 'text', intval( $row->ordering ) );
-		} else {
-			$ordering = '<input type="hidden" name="ordering" value="'. $row->ordering .'" />'. $text;
-		}
-		return $ordering;
-	}
-
-	/**
-	* Select list of active users
-	*/
-	function UserSelect( $name, $active, $nouser=0, $javascript=NULL, $order='name' ) {
-		global $database, $my;
-
-		$query = "SELECT id AS value, name AS text"
-		. "\n FROM #__users"
-		. "\n WHERE block = '0'"
-		. "\n ORDER BY ". $order
-		;
-		$database->setQuery( $query );
-		if ( $nouser ) {
-			$users[] = mosHTML::makeOption( '0', '- No User -' );
-			$users = array_merge( $users, $database->loadObjectList() );
-		} else {
-			$users = $database->loadObjectList();
-		}
-
-		$users = mosHTML::selectList( $users, $name, 'class="inputbox" size="1" '. $javascript, 'value', 'text', $active );
-
-		return $users;
-	}
-
-	/**
-	* Select list of positions - generally used for location of images
-	*/
-	function Positions( $name, $active=NULL, $javascript=NULL, $none=1, $center=1, $left=1, $right=1 ) {
-		if ( $none ) {
-			$pos[] = mosHTML::makeOption( '', _CMN_NONE );
-		}
-		if ( $center ) {
-			$pos[] = mosHTML::makeOption( 'center', _CMN_CENTER );
-		}
-		if ( $left ) {
-			$pos[] = mosHTML::makeOption( 'left', _CMN_LEFT );
-		}
-		if ( $right ) {
-			$pos[] = mosHTML::makeOption( 'right', _CMN_RIGHT );
-		}
-
-		$positions = mosHTML::selectList( $pos, $name, 'class="inputbox" size="1"'. $javascript, 'value', 'text', $active );
-
-		return $positions;
-	}
-
-	/**
-	* Select list of active categories for components
-	*/
-	function ComponentCategory( $name, $section, $active=NULL, $javascript=NULL, $order='ordering', $size=1, $sel_cat=1 ) {
-		global $database;
-
-		$query = "SELECT id AS value, name AS text"
-		. "\n FROM #__categories"
-		. "\n WHERE section = '". $section ."'"
-		. "\n AND published = '1'"
-		. "\n ORDER BY ". $order
-		;
-		$database->setQuery( $query );
-		if ( $sel_cat ) {
-			$categories[] = mosHTML::makeOption( '0', _SEL_CATEGORY );
-			$categories = array_merge( $categories, $database->loadObjectList() );
-		} else {
-			$categories = $database->loadObjectList();
-		}
-
-		if ( count( $categories ) < 1 ) {
-			mosRedirect( 'index2.php?option=com_categories&section='. $section, 'You must create a category first.' );
-		}
-
-		$category = mosHTML::selectList( $categories, $name, 'class="inputbox" size="'. $size .'" '. $javascript, 'value', 'text', $active );
-
-		return $category;
-	}
-
-	/**
-	* Select list of active sections
-	*/
-	function SelectSection( $name, $active=NULL, $javascript=NULL, $order='ordering' ) {
-		global $database;
-
-		$categories[] = mosHTML::makeOption( '0', _SEL_SECTION );
-		$query = "SELECT id AS value, title AS text"
-		. "\n FROM #__sections"
-		. "\n WHERE published = '1'"
-		. "\n ORDER BY ". $order
-		;
-		$database->setQuery( $query );
-		$sections = array_merge( $categories, $database->loadObjectList() );
-
-		$category = mosHTML::selectList( $sections, $name, 'class="inputbox" size="1" '. $javascript, 'value', 'text', $active );
-
-		return $category;
-	}
-
-	/**
-	* Select list of menu items for a specific menu
-	*/
-	function Links2Menu( $type, $and ) {
-		global $database;
-
-		$query = "SELECT *"
-		. "\n FROM #__menu"
-		. "\n WHERE type = '". $type ."'"
-		. "\n AND published = '1'"
-		. $and
-		;
-		$database->setQuery( $query );
-		$menus = $database->loadObjectList();
-
-		return $menus;
-	}
-
-	/**
-	* Select list of menus
-	*/
-	function MenuSelect( $name='menuselect', $javascript=NULL ) {
-		global $database;
-
-		$query = "SELECT params"
-		. "\n FROM #__modules"
-		. "\n WHERE module = 'mod_mainmenu'"
-		;
-		$database->setQuery( $query );
-		$menus = $database->loadObjectList();
-		$total = count( $menus );
-		for( $i = 0; $i < $total; $i++ ) {
-			$params = mosParseParams( $menus[$i]->params );
-			$menuselect[$i]->value 	= $params->menutype;
-			$menuselect[$i]->text 	= $params->menutype;
-		}
-		// sort array of objects
-		SortArrayObjects( $menuselect, 'text', 1 );
-
-		$menus = mosHTML::selectList( $menuselect, $name, 'class="inputbox" size="10" '. $javascript, 'value', 'text' );
-
-		return $menus;
-	}
-
-	/**
-	* Internal function to recursive scan the media manager directories
-	* @param string Path to scan
-	* @param string root path of this folder
-	* @param array  Value array of all existing folders
-	* @param array  Value array of all existing images
-	*/
-	function ReadImages( $imagePath, $folderPath, &$folders, &$images ) {
-		$imgFiles = mosReadDirectory( $imagePath );
-
-		foreach ($imgFiles as $file) {
-			$ff_ 	= $folderPath . $file .'/';
-			$ff 		= $folderPath . $file;
-			$i_f 	= $imagePath .'/'. $file;
-
-			if ( is_dir( $i_f ) && $file <> 'CVS' ) {
-				$folders[] = mosHTML::makeOption( $ff_ );
-				mosAdminMenus::ReadImages( $i_f, $ff_, $folders, $images );
-			} else if ( eregi( "bmp|gif|jpg|png", $file ) && is_file( $i_f ) ) {
-				// leading / we don't need
-				$imageFile = substr( $ff, 1 );
-				$images[$folderPath][] = mosHTML::makeOption( $imageFile, $file );
-			}
-		}
-	}
-
-	function GetImageFolders( &$folders, $path ) {
-		$javascript 	= "onchange=\"changeDynaList( 'imagefiles', folderimages, document.adminForm.folders.options[document.adminForm.folders.selectedIndex].value, 0, 0);  previewImage( 'imagefiles', 'view_imagefiles', '$path/' );\"";
-		$getfolders 	= mosHTML::selectList( $folders, 'folders', 'class="inputbox" size="1" '. $javascript, 'value', 'text', '/' );
-		return $getfolders;
-	}
-
-	function GetImages( &$images, $path ) {
-		if ( !isset($images['/'] ) ) {
-			$images['/'][] = mosHTML::makeOption( '' );
-		}
-
-		//$javascript	= "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\" onfocus=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
-		$javascript	= "onchange=\"previewImage( 'imagefiles', 'view_imagefiles', '$path/' )\"";
-		$getimages	= mosHTML::selectList( $images['/'], 'imagefiles', 'class="inputbox" size="10" multiple="multiple" '. $javascript , 'value', 'text', null );
-
-		return $getimages;
-	}
-
-	function GetSavedImages( &$row, $path ) {
-		$images2 = array();
-		foreach( $row->images as $file ) {
-			$temp = explode( '|', $file );
-			if( strrchr($temp[0], '/') ) {
-				$filename = substr( strrchr($temp[0], '/' ), 1 );
-			} else {
-				$filename = $temp[0];
-			}
-			$images2[] = mosHTML::makeOption( $file, $filename );
-		}
-		//$javascript	= "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \" onfocus=\"previewImage( 'imagelist', 'view_imagelist', '$path/' )\"";
-		$javascript	= "onchange=\"previewImage( 'imagelist', 'view_imagelist', '$path/' ); showImageProps( '$path/' ); \"";
-		$imagelist 	= mosHTML::selectList( $images2, 'imagelist', 'class="inputbox" size="10" '. $javascript, 'value', 'text' );
-
-		return $imagelist;
-	}
-
-	/**
-	* Checks to see if an image exists in the current templates image directory
- 	* if it does it loads this image.  Otherwise the default image is loaded.
-	* Also can be used in conjunction with the menulist param to create the chosen image
-	* load the default or use no image
-	*/
-	function ImageCheck( $file, $directory='/images/M_images/', $param=NULL, $param_directory='/images/M_images/', $alt=NULL, $name='image', $type=1, $align='middle' ) {
-		global $mosConfig_absolute_path, $mosConfig_live_site, $mainframe;
-		$cur_template = $mainframe->getTemplate();
-
-		if ( $param ) {
-			$image = $mosConfig_live_site. $param_directory . $param;
-			if ( $type ) {
-				$image = '<img src="'. $image .'" align="'. $align .'" alt="'. $alt .'" name="'. $name .'" border="0" />';
-			}
-		} else if ( $param == -1 ) {
-			$image = '';
-		} else {
-			if ( file_exists( $mosConfig_absolute_path .'/templates/'. $cur_template .'/images/'. $file ) ) {
-				$image = $mosConfig_live_site .'/templates/'. $cur_template .'/images/'. $file;
-			} else {
-				// outputs only path to image
-				$image = $mosConfig_live_site. $directory . $file;
-			}
-
-			// outputs actual html <img> tag
-			if ( $type ) {
-				$image = '<img src="'. $image .'" alt="'. $alt .'" align="'. $align .'" name="'. $name .'" border="0" />';
-			}
-		}
-
-		return $image;
-	}
-
-	/**
-	* Checks to see if an image exists in the current templates image directory
- 	* if it does it loads this image.  Otherwise the default image is loaded.
-	* Also can be used in conjunction with the menulist param to create the chosen image
-	* load the default or use no image
-	*/
-	function ImageCheckAdmin( $file, $directory='/administrator/images/', $param=NULL, $param_directory='/administrator/images/', $alt=NULL, $name=NULL, $type=1, $align='middle' ) {
-		global $mosConfig_absolute_path, $mosConfig_live_site, $mainframe;
-		$cur_template = $mainframe->getTemplate();
-
-		if ( $param ) {
-			$image = $mosConfig_live_site. $param_directory . $param;
-			if ( $type ) {
-				$image = '<img src="'. $image .'" align="'. $align .'" alt="'. $alt .'" name="'. $name .'" border="0" />';
-			}
-		} else if ( $param == -1 ) {
-			$image = '';
-		} else {
-			if ( file_exists( $mosConfig_absolute_path .'/administrator/templates/'. $cur_template .'/images/'. $file ) ) {
-				$image = $mosConfig_live_site .'/administrator/templates/'. $cur_template .'/images/'. $file;
-			} else {
-				$image = $mosConfig_live_site. $directory . $file;
-			}
-
-			// outputs actual html <img> tag
-			if ( $type ) {
-				$image = '<img src="'. $image .'" alt="'. $alt .'" align="'. $align .'" name="'. $name .'" border="0" />';
-			}
-		}
-
-		return $image;
-	}
-
-	function menutypes() {
-		global $database;
-
-		$query = "SELECT params"
-		. "\n FROM #__modules"
-		. "\n WHERE module = 'mod_mainmenu'"
-		. "\n ORDER BY title"
-		;
-		$database->setQuery( $query	);
-		$modMenus = $database->loadObjectList();
-
-		$query = "SELECT menutype"
-		. "\n FROM #__menu"
-		. "\n GROUP BY menutype"
-		. "\n ORDER BY menutype"
-		;
-		$database->setQuery( $query	);
-		$menuMenus = $database->loadObjectList();
-
-		$menuTypes = '';
-		foreach ( $modMenus as $modMenu ) {
-			$check = 1;
-			mosMakeHtmlSafe( $modMenu) ;
-			$modParams 	= mosParseParams( $modMenu->params );
-			$menuType 	= @$modParams->menutype;
-			if (!$menuType) {
-				$menuType = 'mainmenu';
-			}
-
-			// stop duplicate menutype being shown
-			if ( !is_array( $menuTypes) ) {
-				// handling to create initial entry into array
-				$menuTypes[] = $menuType;
-			} else {
-				$check = 1;
-				foreach ( $menuTypes as $a ) {
-					if ( $a == $menuType ) {
-						$check = 0;
-					}
-				}
-				if ( $check ) {
-					$menuTypes[] = $menuType;
-				}
-			}
-
-		}
-		// add menutypes from mos_menu
-		foreach ( $menuMenus as $menuMenu ) {
-			$check = 1;
-			foreach ( $menuTypes as $a ) {
-				if ( $a == $menuMenu->menutype ) {
-					$check = 0;
-				}
-			}
-			if ( $check ) {
-				$menuTypes[] = $menuMenu->menutype;
-			}
-		}
-
-		// sorts menutypes
-		asort( $menuTypes );
-
-		return $menuTypes;
-	}
-
-	/*
-	* loads files required for menu items
-	*/
-	function menuItem( $item ) {
-		global $mosConfig_absolute_path;
-
-		$path = $mosConfig_absolute_path .'/administrator/components/com_menus/'. $item .'/';
-		include_once( $path . $item .'.class.php' );
-		include_once( $path . $item .'.menu.html.php' );
-	}
-}
-
-
-class mosCommonHTML {
-
-	function ContentLegend( ) {
-		?>
-		<table cellspacing="0" cellpadding="4" border="0" align="center">
-		<tr align="center">
-			<td>
-			<img src="images/publish_y.png" width="12" height="12" border="0" alt="Pending" />
-			</td>
-			<td>
-			Published, but is <u>Pending</u> |
-			</td>
-			<td>
-			<img src="images/publish_g.png" width="12" height="12" border="0" alt="Visible" />
-			</td>
-			<td>
-			Published and is <u>Current</u> |
-			</td>
-			<td>
-			<img src="images/publish_r.png" width="12" height="12" border="0" alt="Finished" />
-			</td>
-			<td>
-			Published, but has <u>Expired</u> |
-			</td>
-			<td>
-			<img src="images/publish_x.png" width="12" height="12" border="0" alt="Finished" />
-			</td>
-			<td>
-			Not Published
-			</td>
-		</tr>
-		<tr>
-			<td colspan="8" align="center">
-			Click on icon to toggle state.
-			</td>
-		</tr>
-		</table>
-		<?php
-	}
-
-	function menuLinksContent( &$menus ) {
-		?>
-		<script language="javascript" type="text/javascript">
-		function go2( pressbutton, menu, id ) {
-			var form = document.adminForm;
-
-			if (pressbutton == 'go2menu') {
-				form.menu.value = menu;
-				submitform( pressbutton );
-				return;
-			}
-
-			if (pressbutton == 'go2menuitem') {
-				form.menu.value 	= menu;
-				form.menuid.value 	= id;
-				submitform( pressbutton );
-				return;
-			}
-		}
-		</script>
-		<?php
-		foreach( $menus as $menu ) {
-			?>
-			<tr>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				Menu
-				</td>
-				<td>
-				<a href="javascript:go2( 'go2menu', '<?php echo $menu->menutype; ?>' );" title="Go to Menu">
-				<?php echo $menu->menutype; ?>
-				</a>
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				Link Name
-				</td>
-				<td>
-				<strong>
-				<a href="javascript:go2( 'go2menuitem', '<?php echo $menu->menutype; ?>', '<?php echo $menu->id; ?>' );" title="Go to Menu Item">
-				<?php echo $menu->name; ?>
-				</a>
-				</strong>
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				State
-				</td>
-				<td>
-				<?php
-				switch ( $menu->published ) {
-					case -2:
-						echo '<font color="red">Trashed</font>';
-						break;
-					case 0:
-						echo 'UnPublished';
-						break;
-					case 1:
-					default:
-						echo '<font color="green">Published</font>';
-						break;
-				}
-				?>
-				</td>
-			</tr>
-			<?php
-		}
-		?>
-		<input type="hidden" name="menu" value="" />
-		<input type="hidden" name="menuid" value="" />
-		<?php
-	}
-
-	function menuLinksSecCat( &$menus ) {
-		?>
-		<script language="javascript" type="text/javascript">
-		function go2( pressbutton, menu, id ) {
-			var form = document.adminForm;
-
-			if (pressbutton == 'go2menu') {
-				form.menu.value = menu;
-				submitform( pressbutton );
-				return;
-			}
-
-			if (pressbutton == 'go2menuitem') {
-				form.menu.value 	= menu;
-				form.menuid.value 	= id;
-				submitform( pressbutton );
-				return;
-			}
-		}
-		</script>
-		<?php
-		foreach( $menus as $menu ) {
-			?>
-			<tr>
-				<td colspan="2">
-				<hr/>
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				Menu
-				</td>
-				<td>
-				<a href="javascript:go2( 'go2menu', '<?php echo $menu->menutype; ?>' );" title="Go to Menu">
-				<?php echo $menu->menutype; ?>
-				</a>
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				Type
-				</td>
-				<td>
-				<?php echo $menu->type; ?>
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				Item Name
-				</td>
-				<td>
-				<strong>
-				<a href="javascript:go2( 'go2menuitem', '<?php echo $menu->menutype; ?>', '<?php echo $menu->id; ?>' );" title="Go to Menu Item">
-				<?php echo $menu->name; ?>
-				</a>
-				</strong>
-				</td>
-			</tr>
-			<tr>
-				<td width="90px" valign="top">
-				State
-				</td>
-				<td>
-				<?php
-				switch ( $menu->published ) {
-					case -2:
-						echo '<font color="red">Trashed</font>';
-						break;
-					case 0:
-						echo 'UnPublished';
-						break;
-					case 1:
-					default:
-						echo '<font color="green">Published</font>';
-						break;
-				}
-				?>
-				</td>
-			</tr>
-			<?php
-		}
-		?>
-		<input type="hidden" name="menu" value="" />
-		<input type="hidden" name="menuid" value="" />
-		<?php
-	}
-
-	function checkedOut( &$row, $overlib=1 ) {
-		$hover = '';
-		if ( $overlib ) {
-			$date 				= mosFormatDate( $row->checked_out_time, '%A, %d %B %Y' );
-			$time				= mosFormatDate( $row->checked_out_time, '%H:%M' );
-			$checked_out_text 	= '<table>';
-			$checked_out_text 	.= '<tr><td>'. $row->editor .'</td></tr>';
-			$checked_out_text 	.= '<tr><td>'. $date .'</td></tr>';
-			$checked_out_text 	.= '<tr><td>'. $time .'</td></tr>';
-			$checked_out_text 	.= '</table>';
-			$hover = 'onMouseOver="return overlib(\''. $checked_out_text .'\', CAPTION, \'Checked Out\', BELOW, RIGHT);" onMouseOut="return nd();"';
-		}
-		$checked	 		= '<img src="images/checked_out.png" '. $hover .'/>';
-
-		return $checked;
-	}
-
-	/*
-	* Loads all necessary files for JS Overlib tooltips
-	*/
-	function loadOverlib() {
-		global  $mosConfig_live_site;
-		?>
-		<script language="Javascript" src="<?php echo $mosConfig_live_site;?>/includes/js/overlib_mini.js"></script>
-		<div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>
-		<?php
-	}
-
-
-	/*
-	* Loads all necessary files for JS Calendar
-	*/
-	function loadCalendar() {
-		global  $mosConfig_live_site;
-		?>
-		<link rel="stylesheet" type="text/css" media="all" href="<?php echo $mosConfig_live_site;?>/includes/js/calendar/calendar-mos.css" title="green" />
-		<!-- import the calendar script -->
-		<script type="text/javascript" src="<?php echo $mosConfig_live_site;?>/includes/js/calendar/calendar.js"></script>
-		<!-- import the language module -->
-		<script type="text/javascript" src="<?php echo $mosConfig_live_site;?>/includes/js/calendar/lang/calendar-en.js"></script>
-		<?php
-	}
-
-	function AccessProcessing( &$row, $i ) {
-		if ( !$row->access ) {
-			$color_access = 'style="color: green;"';
-			$task_access = 'accessregistered';
-		} else if ( $row->access == 1 ) {
-			$color_access = 'style="color: red;"';
-			$task_access = 'accessspecial';
-		} else {
-			$color_access = 'style="color: black;"';
-			$task_access = 'accesspublic';
-		}
-
-		$href = '
-		<a href="javascript: void(0);" onclick="return listItemTask(\'cb'. $i .'\',\''. $task_access .'\')" '. $color_access .'>
-		'. $row->groupname .'
-		</a>'
-		;
-
-		return $href;
-	}
-
-	function CheckedOutProcessing( &$row, $i ) {
-		global $my;
-
-		if ( $row->checked_out ) {
-			$checked = mosCommonHTML::checkedOut( $row );
-		} else {
-			$checked = mosHTML::idBox( $i, $row->id, ($row->checked_out && $row->checked_out != $my->id ) );
-		}
-
-		return $checked;
-	}
-
-	function PublishedProcessing( &$row, $i ) {
-		$img 	= $row->published ? 'publish_g.png' : 'publish_x.png';
-		$task 	= $row->published ? 'unpublish' : 'publish';
-		$alt 	= $row->published ? 'Published' : 'Unpublished';
-		$action	= $row->published ? 'Unpublish Item' : 'Publish item';
-
-		$href = '
-		<a href="javascript: void(0);" onclick="return listItemTask(\'cb'. $i .'\',\''. $task .'\')" title="'. $action .'">
-		<img src="images/'. $img .'" border="0" alt="'. $alt .'" />
-		</a>'
-		;
-
-		return $href;
-	}
-}
-
-/**
-* Sorts an Array of objects
-*/
-function SortArrayObjects_cmp( &$a, &$b ) {
-	global $csort_cmp;
-
-	if ( $a->$csort_cmp['key'] > $b->$csort_cmp['key'] ) {
-		return $csort_cmp['direction'];
-	}
-
-	if ( $a->$csort_cmp['key'] < $b->$csort_cmp['key'] ) {
-		return -1 * $csort_cmp['direction'];
-	}
-
-	return 0;
-}
-
-/**
-* Sorts an Array of objects
-* sort_direction [1 = Ascending] [-1 = Descending]
-*/
-function SortArrayObjects( &$a, $k, $sort_direction=1 ) {
-	global $csort_cmp;
-
-	$csort_cmp = array(
-		'key'          => $k,
-		'direction'    => $sort_direction
-	);
-
-	usort( $a, 'SortArrayObjects_cmp' );
-
-	unset( $csort_cmp );
-}
-
-/**
-* Sends mail to admin
-*/
-function mosSendAdminMail( $adminName, $adminEmail, $email, $type, $title, $author ) {
-	global $mosConfig_live_site;
-
-	$subject = _MAIL_SUB." '$type'";
-	$message = _MAIL_MSG;
-	eval ("\$message = \"$message\";");
-	mosMail($mosConfig_mailfrom, $mosConfig_fromname, $adminEmail, $subject, $message);
-}
-
-/*
-* Includes pathway file
-*/
-function mosPathWay() {
-    $Itemid = mosGetParam($_REQUEST,'Itemid','');
-    require $GLOBALS['mosConfig_absolute_path'] . '/includes/pathway.php';
-}
-
-/**
-* Displays a not authorised message
-*
-* If the user is not logged in then an addition message is displayed.
-*/
-function mosNotAuth() {
-	global $my;
-
-	echo _NOT_AUTH;
-	if ($my->id < 1) {
-		echo "<br />" . _DO_LOGIN;
-	}
-}
-
-/**
-* Replaces &amp; with & for xhtml compliance
-*
-* Needed to handle unicode conflicts due to unicode conflicts
-*/
-function ampReplace( $text ) {
-	$text = str_replace( '&#', '*-*', $text );
-	$text = str_replace( '&', '&amp;', $text );
-	$text = str_replace( '*-*', '&#', $text );
-
-	return $text;
-}
-
-/**
-* Prepares results from search for display
-* @param string The source string
-* @param int Number of chars to trim
-* @param string The searchword to select around
-* @return string
-*/
-function mosPrepareSearchContent( $text, $length=200, $searchword ) {
-	// strips tags won't remove the actual jscript
-	$text = preg_replace( "'<script[^>]*>.*?</script>'si", "", $text );
-	$text = preg_replace( '/{.+?}/', '', $text);
-	//$text = preg_replace( '/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is','\2', $text );
-	return mosSmartSubstr( strip_tags( $text ), $length, $searchword );
-}
-
-/**
-* returns substring of characters around a searchword
-* @param string The source string
-* @param int Number of chars to return
-* @param string The searchword to select around
-* @return string
-*/
-function mosSmartSubstr($text, $length=200, $searchword) {
-  $wordpos = strpos(strtolower($text), strtolower($searchword));
-  $halfside = intval($wordpos - $length/2 - strlen($searchword));
-  if ($wordpos && $halfside > 0) {
-      return '...' . substr($text, $halfside, $length);
-  } else {
-    return substr( $text, 0, $length);
-  }
-}
-
-/**
-* Chmods files and directories recursively to given permissions. Available from 4.5.2 up.
-* @param path The starting file or directory (no trailing slash)
-* @param filemode Integer value to chmod files. NULL = dont chmod files.
-* @param dirmode Integer value to chmod directories. NULL = dont chmod directories.
-* @return TRUE=all succeeded FALSE=one or more chmods failed
-*/
-function mosChmodRecursive($path, $filemode=NULL, $dirmode=NULL)
-{
-	$ret = TRUE;
-	if (is_dir($path)) {
-	    $dh = opendir($path);
-	    while ($file = readdir($dh)) {
-	        if ($file != '.' && $file != '..') {
-	            $fullpath = $path.'/'.$file;
-	            if (is_dir($fullpath)) {
-                    if (!mosChmodRecursive($fullpath, $filemode, $dirmode))
-                        $ret = FALSE;
-	            } else {
-	                if (isset($filemode))
-	                    if (!@chmod($fullpath, $filemode))
-	                        $ret = FALSE;
-	            } // if
-	        } // if
-	    } // while
-	    closedir($dh);
-	    if (isset($dirmode))
-	        if (!@chmod($path, $dirmode))
-	            $ret = FALSE;
-	} else {
-		if (isset($filemode))
-			$ret = @chmod($path, $filemode);
-    } // if
-	return $ret;
-} // mosChmodRecursive
-
-/**
-* Chmods files and directories recursively to mos global permissions. Available from 4.5.2 up.
-* @param path The starting file or directory (no trailing slash)
-* @param filemode Integer value to chmod files. NULL = dont chmod files.
-* @param dirmode Integer value to chmod directories. NULL = dont chmod directories.
-* @return TRUE=all succeeded FALSE=one or more chmods failed
-*/
-function mosChmod($path)
-{
-	global $mosConfig_fileperms, $mosConfig_dirperms;
-	$filemode = NULL;
-	if ($mosConfig_fileperms != '')
-		$filemode = octdec($mosConfig_fileperms);
-	$dirmode = NULL;
-	if ($mosConfig_dirperms != '')
-		$dirmode = octdec($mosConfig_dirperms);
-	if (isset($filemode) || isset($dirmode))
-		return mosChmodRecursive($path, $filemode, $dirmode);
-	return TRUE;
-} // mosChmod
-
-/**
- * Function to convert array to integer values
- */
-function mosArrayToInts( &$array, $default=null ) {
-	if (is_array( $array )) {
-		$n = count( $array );
-		for ($i = 0; $i < $n; $i++) {
-			$array[$i] = intval( $array[$i] );
-		}
-	} else {
-		if (is_null( $default )) {
-			return array();
-		} else {
-			return array( $default );
-		}
-	}
-}
 
 // ----- NO MORE CLASSES OR FUNCTIONS PASSED THIS POINT -----
 // Post class declaration initialisations
 // some version of PHP don't allow the instantiation of classes
 // before they are defined
 
-/** @global mosPlugin $_MAMBOTS */
-$_MAMBOTS = new mosMambotHandler();
 ?>
diff -ruN 4.5.4/includes/mamboHTML.php 4.6rc2/includes/mamboHTML.php
--- 4.5.4/includes/mamboHTML.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/mamboHTML.php	2006-04-03 08:47:34.000000000 -0500
@@ -0,0 +1,730 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/**
+* Utility class for all HTML drawing classes
+*/
+
+class mosHTML {
+
+	function makeOption( $value, $text='' ) {
+		$obj = new stdClass;
+		$obj->value = $value;
+		$obj->text = trim( $text ) ? $text : $value;
+		return $obj;
+	}
+
+	function writableCell( $folder ) {
+	 	echo '<tr>';
+	  	echo '<td class="item">' . $folder . '/</td>';
+	  	echo '<td align="left">';
+	  	echo is_writable( "../$folder" ) ? '<b><span class="green">'.T_('Writeable').'</span></b>' : '<b><span class="red">'.T_('Unwriteable').'</span></b>' . '</td>';
+	  	echo '</tr>';
+	}
+
+	/**
+	* Generates an HTML select list
+	* @param array An array of objects
+	* @param string The value of the HTML name attribute
+	* @param string Additional HTML attributes for the <select> tag
+	* @param string The name of the object variable for the option value
+	* @param string The name of the object variable for the option text
+	* @param mixed The key that is selected
+	* @returns string HTML for the select list
+	*/
+	function selectList ( &$arr, $tag_name, $tag_attribs, $key, $text, $selected=NULL ) {
+		reset( $arr );
+		$html = "\n<select name=\"$tag_name\" $tag_attribs>";
+		for ($i=0, $n=count( $arr ); $i < $n; $i++ ) {
+			$k = $arr[$i]->$key;
+			$t = $arr[$i]->$text;
+			$id = isset($arr[$i]->id) ? $arr[$i]->id : null;
+
+			$extra = '';
+			$extra .= $id ? " id=\"" . $arr[$i]->id . "\"" : '';
+			if (is_array( $selected )) {
+				foreach ($selected as $obj) {
+					$k2 = $obj->$key;
+					if ($k == $k2) {
+						$extra .= " selected=\"selected\"";
+						break;
+					}
+				}
+			} else {
+				$extra .= ($k == $selected ? " selected=\"selected\"" : '');
+			}
+			$html .= "\n\t<option value=\"".$k."\"$extra>" . $t . "</option>";
+		}
+		$html .= "\n</select>\n";
+		return $html;
+	}
+
+	/**
+	* Writes a select list of integers
+	* @param int The start integer
+	* @param int The end integer
+	* @param int The increment
+	* @param string The value of the HTML name attribute
+	* @param string Additional HTML attributes for the <select> tag
+	* @param mixed The key that is selected
+	* @param string The printf format to be applied to the number
+	* @returns string HTML for the select list
+	*/
+	function integerSelectList( $start, $end, $inc, $tag_name, $tag_attribs, $selected, $format="" ) {
+		$start = intval( $start );
+		$end = intval( $end );
+		$inc = intval( $inc );
+		$arr = array();
+		for ($i=$start; $i <= $end; $i+=$inc) {
+			$fi = $format ? sprintf( "$format", $i ) : "$i";
+			$arr[] = mosHTML::makeOption( $fi, $fi );
+		}
+
+		return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected );
+	}
+
+	/**
+	* Writes a select list of month names based on Language settings
+	* @param string The value of the HTML name attribute
+	* @param string Additional HTML attributes for the <select> tag
+	* @param mixed The key that is selected
+	* @returns string HTML for the select list values
+	*/
+	function monthSelectList( $tag_name, $tag_attribs, $selected ) {
+		$arr = array(
+		mosHTML::makeOption( '01', T_('January') ),
+		mosHTML::makeOption( '02', T_('February') ),
+		mosHTML::makeOption( '03', T_('March') ),
+		mosHTML::makeOption( '04', T_('April') ),
+		mosHTML::makeOption( '05', T_('May') ),
+		mosHTML::makeOption( '06', T_('June') ),
+		mosHTML::makeOption( '07', T_('July') ),
+		mosHTML::makeOption( '08', T_('August') ),
+		mosHTML::makeOption( '09', T_('September') ),
+		mosHTML::makeOption( '10', T_('October') ),
+		mosHTML::makeOption( '11', T_('November') ),
+		mosHTML::makeOption( '12', T_('December') )
+		);
+
+		return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected );
+	}
+
+	/**
+	* Writes a yes/no select list
+	* @param string The value of the HTML name attribute
+	* @param string Additional HTML attributes for the <select> tag
+	* @param mixed The key that is selected
+	* @returns string HTML for the select list values
+	*/
+	function yesnoSelectList( $tag_name, $tag_attribs, $selected, $yes=false, $no=false ) {
+		$arr = array(
+		mosHTML::makeOption( '0', $no  ? $no  : T_('Yes') ),
+		mosHTML::makeOption( '1', $yes ? $yes : T_('No') ),
+		);
+
+		return mosHTML::selectList( $arr, $tag_name, $tag_attribs, 'value', 'text', $selected );
+	}
+
+	/**
+	* Generates an HTML radio list
+	* @param array An array of objects
+	* @param string The value of the HTML name attribute
+	* @param string Additional HTML attributes for the <select> tag
+	* @param mixed The key that is selected
+	* @param string The name of the object variable for the option value
+	* @param string The name of the object variable for the option text
+	* @returns string HTML for the select list
+	*/
+	function radioList( &$arr, $tag_name, $tag_attribs, $selected=null, $key='value', $text='text' ) {
+		reset( $arr );
+		$html = "";
+		foreach ($arr as $choice) {
+			$id = @$choice->id;
+			$extra = $id ? " id=\"" . $choice->id . "\"" : '';
+			if (is_array( $selected )) {
+				foreach ($selected as $obj) {
+					if ($choice->$key == $obj->$key) {
+						$extra .= ' selected="selected"';
+						break;
+					}
+				}
+			} else {
+				$extra .= ($choice->$key == $selected ? " checked=\"checked\"" : '');
+			}
+			$html .= "\n\t<input type=\"radio\" name=\"$tag_name\" value=\"".$choice->$key."\"$extra $tag_attribs />" . $choice->$text;
+		}
+		$html .= "\n";
+		return $html;
+	}
+
+	/**
+	* Writes a yes/no radio list
+	* @param string The value of the HTML name attribute
+	* @param string Additional HTML attributes for the <select> tag
+	* @param mixed The key that is selected
+	* @returns string HTML for the radio list
+	*/
+	function yesnoRadioList( $tag_name, $tag_attribs, $selected, $yes=false, $no=false ) {
+
+		$arr = array(
+		mosHTML::makeOption( '0', $no  ? $no  : T_('No') ),
+		mosHTML::makeOption( '1', $yes ? $yes : T_('Yes') )
+		);
+		return mosHTML::radioList( $arr, $tag_name, $tag_attribs, $selected );
+	}
+
+	/**
+	* @param int The row index
+	* @param int The record id
+	* @param boolean
+	* @param string The name of the form element
+	* @return string
+	*/
+	function idBox( $rowNum, $recId, $checkedOut=false, $name='cid' ) {
+		if ( $checkedOut ) {
+			return '';
+		} else {
+			return '<input type="checkbox" id="cb'.$rowNum.'" name="'.$name.'[]" value="'.$recId.'" onclick="isChecked(this.checked);" />';
+		}
+	}
+
+	function sortIcon( $base_href, $field, $state='none' ) {
+		$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+		$alts = array(
+		'none' => T_('No Sorting'),
+		'asc' => T_('Sort Ascending'),
+		'desc' => T_('Sort Descending'),
+		);
+		$next_state = 'asc';
+		if ($state == 'asc') {
+			$next_state = 'desc';
+		} else if ($state == 'desc') {
+			$next_state = 'none';
+		}
+
+		$html = "<a href=\"$base_href&field=$field&order=$next_state\">"
+		. "<img src=\"$mosConfig_live_site/images/M_images/sort_$state.png\" width=\"12\" height=\"12\" border=\"0\" alt=\"{$alts[$next_state]}\" />"
+		. "</a>";
+		return $html;
+	}
+
+	/**
+	* Writes Close Button
+	*/
+	function CloseButton ( &$params, $hide_js=NULL ) {
+		// displays close button in Pop-up window
+		if ( $params->get( 'popup' ) && !$hide_js ) {
+			?>
+			<div align="center" style="margin-top: 30px; margin-bottom: 30px;">
+			<a href='javascript:window.close();'>
+			<span class="small">
+			<?php echo T_('Close Window');?>
+			</span>
+			</a>
+			</div>
+			<?php
+		}
+	}
+
+	/**
+	* Writes Back Button
+	*/
+	function BackButton ( &$params, $hide_js=NULL ) {
+		// Back Button
+		if ( $params->get( 'back_button' ) && !$params->get( 'popup' ) && !$hide_js) {
+			?>
+			<div class="back_button">
+			<a href='javascript:history.go(-1)'>
+			<?php echo T_('Back'); ?>
+			</a>
+			</div>
+			<?php
+		}
+	}
+
+	/**
+	* Cleans text of all formating and scripting code
+	*/
+	function cleanText ( &$text ) {
+		$text = preg_replace( "'<script[^>]*>.*?</script>'si", '', $text );
+		$text = preg_replace( '/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is', '\2 (\1)', $text );
+		$text = preg_replace( '/<!--.+?-->/', '', $text );
+		$text = preg_replace( '/{.+?}/', '', $text );
+		$text = preg_replace( '/&nbsp;/', ' ', $text );
+		$text = preg_replace( '/&amp;/', ' ', $text );
+		$text = preg_replace( '/&quot;/', ' ', $text );
+		$text = strip_tags( $text );
+		$text = htmlspecialchars( $text );
+		return $text;
+	}
+
+	/**
+	* Writes Print icon
+	*/
+	function PrintIcon( &$row, &$params, $hide_js, $link, $status=NULL ) {
+		if ( $params->get( 'print' )  && !$hide_js ) {
+			// use default settings if none declared
+			if ( !$status ) {
+				$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
+			}
+
+			// checks template image directory for image, if non found default are loaded
+			if ( $params->get( 'icons' ) ) {
+				$mainframe =& mosMainFrame::getInstance();
+				$image = $mainframe->ImageCheck( 'printButton.png', '/images/M_images/', NULL, NULL, T_('Print'));
+			} else {
+				$image = _ICON_SEP .'&nbsp;'. T_('Print'). '&nbsp;'. _ICON_SEP;
+			}
+
+			if ( $params->get( 'popup' ) && !$hide_js ) {
+				// Print Preview button - used when viewing page
+				?>
+				<td align="right" class="buttonheading">
+				<a href="#" onclick="javascript:window.print(); return false" title="<?php echo T_('Print');?>">
+				<?php echo $image;?>
+				</a>
+				</td>
+				<?php
+			} else {
+				// Print Button - used in pop-up window
+				?>
+				<td align="right" class="buttonheading">
+				<a href="javascript:void window.open('<?php echo $link; ?>', 'win2', '<?php echo $status; ?>');" title="<?php echo T_('Print');?>">
+				<?php echo $image;?>
+				</a>
+				</td>
+				<?php
+			}
+		}
+	}
+
+	/**
+	* simple Javascript Cloaking
+	* email cloacking
+ 	* by default replaces an email with a mailto link with email cloacked
+	*/
+	function emailCloaking( $mail, $mailto=1, $text='', $email=1 ) {
+		// convert text
+		$mail 		= mosHTML::encoding_converter( $mail );
+		// split email by @ symbol
+		$mail		= explode( '@', $mail );
+		$mail_parts	= explode( '.', $mail[1] );
+		// random number
+		$rand	= rand( 1, 100000 );
+
+		$replacement 	= "\n<script language='JavaScript' type='text/javascript'> \n";
+		$replacement 	.= "<!-- \n";
+		$replacement 	.= "var prefix = '&#109;a' + 'i&#108;' + '&#116;o'; \n";
+		$replacement 	.= "var path = 'hr' + 'ef' + '='; \n";
+		$replacement 	.= "var addy". $rand ." = '". @$mail[0] ."' + '&#64;' + '". implode( "' + '&#46;' + '", $mail_parts ) ."'; \n";
+		if ( $mailto ) {
+			// special handling when mail text is different from mail addy
+			if ( $text ) {
+				if ( $email ) {
+					// convert text
+					$text 	= mosHTML::encoding_converter( $text );
+					// split email by @ symbol
+					$text 	= explode( '@', $text );
+					$text_parts	= explode( '.', $text[1] );
+					$replacement 	.= "var addy_text". $rand ." = '". @$text[0] ."' + '&#64;' + '". implode( "' + '&#46;' + '", @$text_parts ) ."'; \n";
+				} else {
+					$text 	= mosHTML::encoding_converter( $text );
+					$replacement 	.= "var addy_text". $rand ." = '". $text ."';\n";
+				}
+				$replacement 	.= "document.write( '<a ' + path + '\'' + prefix + ':' + addy". $rand ." + '\'>' ); \n";
+				$replacement 	.= "document.write( addy_text". $rand ." ); \n";
+				$replacement 	.= "document.write( '<\/a>' ); \n";
+			} else {
+				$replacement 	.= "document.write( '<a ' + path + '\'' + prefix + ':' + addy". $rand ." + '\'>' ); \n";
+				$replacement 	.= "document.write( addy". $rand ." ); \n";
+				$replacement 	.= "document.write( '<\/a>' ); \n";
+			}
+		} else {
+			$replacement 	.= "document.write( addy". $rand ." ); \n";
+		}
+		$replacement 	.= "//--> \n";
+		$replacement 	.= "</script> \n";
+		$replacement 	.= "<noscript> \n";
+		$replacement 	.= T_('This email address is being protected from spam bots, you need Javascript enabled to view it');
+		$replacement 	.= "\n</noscript> \n";
+
+		return $replacement;
+	}
+
+	function encoding_converter( $text ) {
+		// replace vowels with character encoding
+		$text 	= str_replace( 'a', '&#97;', $text );
+		$text 	= str_replace( 'e', '&#101;', $text );
+		$text 	= str_replace( 'i', '&#105;', $text );
+		$text 	= str_replace( 'o', '&#111;', $text );
+		$text	= str_replace( 'u', '&#117;', $text );
+
+		return $text;
+	}
+}
+
+class mosCommonHTML {
+
+	function ContentLegend( ) {
+		?>
+		<table cellspacing="0" cellpadding="4" border="0" align="center">
+		<tr align="center">
+			<td>
+			<img src="images/publish_y.png" width="12" height="12" border="0" alt="<?php echo T_('Pending') ?>" />
+			</td>
+			<td>
+			<?php echo T_('Published, but is <u>Pending</u>') ?> |
+			</td>
+			<td>
+			<img src="images/publish_g.png" width="12" height="12" border="0" alt="<?php echo T_('Visible') ?>" />
+			</td>
+			<td>
+			<?php echo T_('Published and is <u>Current</u>') ?> |
+			</td>
+			<td>
+			<img src="images/publish_r.png" width="12" height="12" border="0" alt="<?php echo T_('Finished') ?>" />
+			</td>
+			<td>
+			<?php echo T_('Published, but has <u>Expired</u>') ?> |
+			</td>
+			<td>
+			<img src="images/publish_x.png" width="12" height="12" border="0" alt="<?php echo T_('Finished') ?>" />
+			</td>
+			<td>
+			<?php echo T_('Not Published') ?>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="8" align="center">
+			<?php echo T_('Click on icon to toggle state.') ?>
+			</td>
+		</tr>
+		</table>
+		<?php
+	}
+
+	function menuLinksContent( &$menus ) {
+		?>
+		<script language="javascript" type="text/javascript">
+		function go2( pressbutton, menu, id ) {
+			var form = document.adminForm;
+
+			if (pressbutton == 'go2menu') {
+				form.menu.value = menu;
+				submitform( pressbutton );
+				return;
+			}
+
+			if (pressbutton == 'go2menuitem') {
+				form.menu.value 	= menu;
+				form.menuid.value 	= id;
+				submitform( pressbutton );
+				return;
+			}
+		}
+		</script>
+		<?php
+		foreach( $menus as $menu ) {
+			?>
+			<tr>
+				<td colspan="2">
+				<hr />
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('Menu') ?>
+				</td>
+				<td>
+				<a href="javascript:go2( 'go2menu', '<?php echo $menu->menutype; ?>' );" title="<?php echo T_('Go to Menu') ?>">
+				<?php echo $menu->menutype; ?>
+				</a>
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('Link Name') ?>
+				</td>
+				<td>
+				<strong>
+				<a href="javascript:go2( 'go2menuitem', '<?php echo $menu->menutype; ?>', '<?php echo $menu->id; ?>' );" title="<?php echo T_('Go to Menu Item') ?>">
+				<?php echo $menu->name; ?>
+				</a>
+				</strong>
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('State') ?>
+				</td>
+				<td>
+				<?php
+				switch ( $menu->published ) {
+					case -2:
+						echo '<font color="red">'.T_('Trashed').'</font>';
+						break;
+					case 0:
+						echo T_('UnPublished') ;
+						break;
+					case 1:
+					default:
+						echo '<font color="green">'.T_('Published').'</font>';
+						break;
+				}
+				?>
+				</td>
+			</tr>
+			<?php
+		}
+		?>
+		<input type="hidden" name="menu" value="" />
+		<input type="hidden" name="menuid" value="" />
+		<?php
+	}
+
+	function menuLinksSecCat( &$menus ) {
+		?>
+		<script language="javascript" type="text/javascript">
+		function go2( pressbutton, menu, id ) {
+			var form = document.adminForm;
+
+			if (pressbutton == 'go2menu') {
+				form.menu.value = menu;
+				submitform( pressbutton );
+				return;
+			}
+
+			if (pressbutton == 'go2menuitem') {
+				form.menu.value 	= menu;
+				form.menuid.value 	= id;
+				submitform( pressbutton );
+				return;
+			}
+		}
+		</script>
+		<?php
+		foreach( $menus as $menu ) {
+			?>
+			<tr>
+				<td colspan="2">
+				<hr/>
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('Menu') ?>
+				</td>
+				<td>
+				<a href="javascript:go2( 'go2menu', '<?php echo $menu->menutype; ?>' );" title="<?php echo T_('Go to Menu') ?>">
+				<?php echo $menu->menutype; ?>
+				</a>
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('Type') ?>
+				</td>
+				<td>
+				<?php echo $menu->type; ?>
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('Item Name') ?>
+				</td>
+				<td>
+				<strong>
+				<a href="javascript:go2( 'go2menuitem', '<?php echo $menu->menutype; ?>', '<?php echo $menu->id; ?>' );" title="<?php echo T_('Go to Menu Item') ?>">
+				<?php echo $menu->name; ?>
+				</a>
+				</strong>
+				</td>
+			</tr>
+			<tr>
+				<td width="90px" valign="top">
+				<?php echo T_('State') ?>
+				</td>
+				<td>
+				<?php
+				switch ( $menu->published ) {
+					case -2:
+						echo '<font color="red">'.T_('Trashed').'</font>';
+						break;
+					case 0:
+						echo T_('UnPublished');
+						break;
+					case 1:
+					default:
+						echo '<font color="green">'.T_('Published').'</font>';
+						break;
+				}
+				?>
+				</td>
+			</tr>
+			<?php
+		}
+		?>
+		<input type="hidden" name="menu" value="" />
+		<input type="hidden" name="menuid" value="" />
+		<?php
+	}
+
+	function checkedOut( &$row, $overlib=1 ) {
+		$hover = '';
+		if ( $overlib ) {
+			$date 				= mosFormatDate( $row->checked_out_time, '%A, %d %B %Y' );
+			$time				= mosFormatDate( $row->checked_out_time, '%H:%M' );
+			$checked_out_text 	= '<table>';
+			$checked_out_text 	.= '<tr><td>'. $row->editor .'</td></tr>';
+			$checked_out_text 	.= '<tr><td>'. $date .'</td></tr>';
+			$checked_out_text 	.= '<tr><td>'. $time .'</td></tr>';
+			$checked_out_text 	.= '</table>';
+			$hover = 'onMouseOver="return overlib(\''. $checked_out_text .'\', CAPTION, \''.T_('Checked Out') .'\', BELOW, RIGHT);" onMouseOut="return nd();"';
+		}
+		$checked	 		= '<img src="images/checked_out.png" '. $hover .'/>';
+
+		return $checked;
+	}
+
+	/*
+	* Loads all necessary files for JS Overlib tooltips
+	*/
+	function loadOverlib() {
+		?>
+		<script language="Javascript" src="<?php echo mamboCore::get('mosConfig_live_site');?>/includes/js/overlib_mini.js"></script>
+		<div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>
+		<?php
+	}
+
+
+	/*
+	* Loads all necessary files for JS Calendar
+	*/
+	function loadCalendar() {
+		$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+		?>
+		<link rel="stylesheet" type="text/css" media="all" href="<?php echo $mosConfig_live_site;?>/includes/js/calendar/calendar-mos.css" title="green" />
+		<!-- import the calendar script -->
+		<script type="text/javascript" src="<?php echo $mosConfig_live_site;?>/includes/js/calendar/calendar.js"></script>
+		<!-- import the language module -->
+		<script type="text/javascript" src="<?php echo $mosConfig_live_site;?>/includes/js/calendar/lang/calendar-en.js"></script>
+		<?php
+	}
+
+	function AccessProcessing( &$row, $i ) {
+		if ( !$row->access ) {
+			$color_access = 'style="color: green;"';
+			$task_access = 'accessregistered';
+		} else if ( $row->access == 1 ) {
+			$color_access = 'style="color: red;"';
+			$task_access = 'accessspecial';
+		} else {
+			$color_access = 'style="color: black;"';
+			$task_access = 'accesspublic';
+		}
+
+		$href = '
+		<a href="javascript: void(0);" onclick="return listItemTask(\'cb'. $i .'\',\''. $task_access .'\')" '. $color_access .'>
+		'. $row->groupname .'
+		</a>'
+		;
+
+		return $href;
+	}
+
+	function CheckedOutProcessing( &$row, $i ) {
+		$my = mamboCore::get('currentUser');
+		if ( $row->checked_out ) {
+			$checked = mosCommonHTML::checkedOut( $row );
+		} else {
+			$checked = mosHTML::idBox( $i, $row->id, ($row->checked_out && $row->checked_out != $my->id ) );
+		}
+
+		return $checked;
+	}
+
+	function PublishedProcessing( &$row, $i ) {
+		$img 	= $row->published ? 'publish_g.png' : 'publish_x.png';
+		$task 	= $row->published ? 'unpublish' : 'publish';
+		$alt 	= $row->published ? T_('Published') : T_('Unpublished');
+		$action	= $row->published ? T_('Unpublish Item') : T_('Publish item');
+
+		$href = '
+		<a href="javascript: void(0);" onclick="return listItemTask(\'cb'. $i .'\',\''. $task .'\')" title="'. $action .'">
+		<img src="images/'. $img .'" border="0" alt="'. $alt .'" />
+		</a>'
+		;
+
+		return $href;
+	}
+}
+
+/**
+* Tab Creation handler
+* @package Mambo
+* @author Phil Taylor
+*/
+class mosTabs {
+	/** @var int Use cookies */
+	var $useCookies = 0;
+
+	/**
+	* Constructor
+	* Includes files needed for displaying tabs and sets cookie options
+	* @param int useCookies, if set to 1 cookie will hold last used tab between page refreshes
+	*/
+	function mosTabs($useCookies) {
+		$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+		echo "<link id=\"luna-tab-style-sheet\" type=\"text/css\" rel=\"stylesheet\" href=\"" . $mosConfig_live_site. "/includes/js/tabs/tabpane.css\" />";
+		echo "<script type=\"text/javascript\" src=\"". $mosConfig_live_site . "/includes/js/tabs/tabpane.js\"></script>";
+		$this->useCookies = $useCookies;
+	}
+
+	/**
+	* creates a tab pane and creates JS obj
+	* @param string The Tab Pane Name
+	*/
+	function startPane($id){
+		echo "<div class=\"tab-page\" id=\"".$id."\">";
+		echo "<script type=\"text/javascript\">\n";
+		echo "   var tabPane1 = new WebFXTabPane( document.getElementById( \"".$id."\" ), ".$this->useCookies." )\n";
+		echo "</script>\n";
+	}
+
+	/**
+	* Ends Tab Pane
+	*/
+	function endPane() {
+		echo "</div>";
+	}
+
+	/*
+	* Creates a tab with title text and starts that tabs page
+	* @param tabText - This is what is displayed on the tab
+	* @param paneid - This is the parent pane to build this tab on
+	*/
+	function startTab( $tabText, $paneid ) {
+		echo "<div class=\"tab-page\" id=\"".$paneid."\">";
+		echo "<h2 class=\"tab\">".$tabText."</h2>";
+		echo "<script type=\"text/javascript\">\n";
+		echo "  tabPane1.addTabPage( document.getElementById( \"".$paneid."\" ) );";
+		echo "</script>";
+	}
+
+	/*
+	* Ends a tab page
+	*/
+	function endTab() {
+		echo "</div>";
+	}
+}
+
+?>
diff -ruN 4.5.4/includes/mambofunc.php 4.6rc2/includes/mambofunc.php
--- 4.5.4/includes/mambofunc.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/mambofunc.php	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,436 @@
+<?php
+
+/**
+* Sorts an Array of objects
+* sort_direction [1 = Ascending] [-1 = Descending]
+*/
+function SortArrayObjects( &$a, $k, $sort_direction=1 ) {
+	$sorter =& new mosObjectSorter($a, $k, $sort_direction);
+}
+
+/**
+* Sends mail to admin
+* Deprecated - not used in Mambo (code copied into weblinks.php)
+* Could do with a better facility that works out who to send it to as well
+* Note the "email" parameter was not used in the earlier version
+*/
+function mosSendAdminMail( $adminName, $adminEmail, $email, $type, $title, $author ) {
+	$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+	$from = mamboCore::get('mosConfig_mailfrom');
+	$fromname = mamboCore::get('mosConfig_fromname');
+	$subject = sprintf(T_("User Submitted '%s'"), $type);
+	$message = T_("Hello %s,\n\n
+A user submitted %s:\n[ %s ]\n
+has been just been submitted by user:\n[ %s ]\n\n
+for %\n\nPlease go to %s/administrator to view and approve this %s\n\n
+Please do not respond to this message as it is automatically generated and is for information purposes only.");
+	$message = sprintf($message, $adminName ,$type, $title, $author, $mosConfig_live_site, $mosConfig_live_site, $type);
+	require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpmailer/class.phpmailer.php');
+	$mail =& new mosMailer ($from, $fromname, $subject, $message);
+	return $mail->mosMail($adminEmail);
+}
+
+/*
+* Includes pathway file
+* Needed by templates
+*/
+function mosPathWay() {
+	$pathway =& mosPathway::getInstance();
+	echo $pathway->makePathway();
+}
+
+/**
+* Displays a not authorised message
+*
+* If the user is not logged in then an addition message is displayed.
+*/
+function mosNotAuth() {
+	global $my;
+
+	echo T_('You are not authorized to view this resource.');
+	if ($my->id < 1) {
+		echo "<br />" . T_('You need to login.');
+	}
+}
+
+/**
+* Replaces &amp; with & for xhtml compliance
+*
+* Needed to handle unicode conflicts due to unicode conflicts
+* Deprecated - simply code the line below
+*/
+function ampReplace( $text ) {
+	return preg_replace('/(&)([^#]|$)/','&amp;$2', $text);
+}
+
+/**
+* Chmods files and directories recursively to given permissions. Available from 4.5.2 up.
+* @param path The starting file or directory (no trailing slash)
+* @param filemode Integer value to chmod files. NULL = dont chmod files.
+* @param dirmode Integer value to chmod directories. NULL = dont chmod directories.
+* @return TRUE=all succeeded FALSE=one or more chmods failed
+*/
+function mosChmodRecursive($path, $filemode=NULL, $dirmode=NULL)
+{
+	$fileman =& mosFileManager::getInstance();
+	return $fileman->mosChmodRecursive($path, $filemode, $dirmode);
+}
+
+/**
+* Chmods files and directories recursively to mos global permissions. Available from 4.5.2 up.
+* @param path The starting file or directory (no trailing slash)
+* @param filemode Integer value to chmod files. NULL = dont chmod files.
+* @param dirmode Integer value to chmod directories. NULL = dont chmod directories.
+* @return TRUE=all succeeded FALSE=one or more chmods failed
+*/
+function mosChmod($path)
+{
+	$fileman =& mosFileManager::getInstance();
+	return $fileman->mosChmod($path);
+} // mosChmod
+
+/**
+ * Function to convert array to integer values
+ * Deprecated - not used within Mambo
+ */
+function mosArrayToInts( &$array, $default=null ) {
+	if (is_array( $array )) {
+		$n = count( $array );
+		for ($i = 0; $i < $n; $i++) {
+			$array[$i] = intval( $array[$i] );
+		}
+	} else {
+		if (is_null( $default )) {
+			return array();
+		} else {
+			return array( $default );
+		}
+	}
+}
+
+/**
+* Strip slashes from strings or arrays of strings
+* @param value the input string or array
+*/
+function mosStripslashes(&$value)
+{
+	$database =& mamboDatabase::getInstance();
+	return $database->mosStripslashes($value);
+}
+
+/**
+* Copy the named array content into the object as properties
+* only existing properties of object are filled. when undefined in hash, properties wont be deleted
+* @param array the input array
+* @param obj byref the object to fill of any class
+* @param string
+* @param boolean
+*/
+function mosBindArrayToObject( $array, &$obj, $ignore='', $prefix=NULL, $checkSlashes=true ) {
+	$database =& mamboDatabase::getInstance();
+	return $database->mosBindArrayToOBject($array, $obj, $ignore='', $prefix=NULL, $checkSlashes=true);
+}
+
+/**
+* Utility function to read the files in a directory
+* @param string The file system path
+* @param string A filter for the names
+* @param boolean Recurse search into sub-directories
+* @param boolean True if to prepend the full path to the file name
+*/
+function mosReadDirectory( $path, $filter='.', $recurse=false, $fullpath=false  ) {
+	if (@is_dir($path)) {
+		$dir =& new mosDirectory($path);
+		$arr =& $dir->listFiles ($filter, $type='both', $recurse, $fullpath);
+	}
+	else $arr = array();
+	return $arr;
+}
+	
+/**
+* Utility function redirect the browser location to another url
+*
+* Can optionally provide a message.
+* @param string The file system path
+* @param string A filter for the names
+*/
+function mosRedirect( $url, $msg='' ) {
+	mamboCore::redirect($url, $msg);
+}
+
+/**
+* Function to strip additional / or \ in a path name
+* @param string The path
+* @param boolean Add trailing slash
+*/
+function mosPathName($p_path,$p_addtrailingslash = true) {
+	$fileman =& mosFileManager::getInstance();
+	return $fileman->mosPathName($p_path,$p_addtrailingslash);
+}
+
+/**
+* Checks the user agent string against known browsers
+*/
+function mosGetBrowser( $agent ) {
+	require( "includes/agent_browser.php" );
+
+	if (preg_match( "/msie[\/\sa-z]*([\d\.]*)/i", $agent, $m )
+	&& !preg_match( "/webtv/i", $agent )
+	&& !preg_match( "/omniweb/i", $agent )
+	&& !preg_match( "/opera/i", $agent )) {
+		// IE
+		return "MS Internet Explorer $m[1]";
+	} else if (preg_match( "/netscape.?\/([\d\.]*)/i", $agent, $m )) {
+		// Netscape 6.x, 7.x ...
+		return "Netscape $m[1]";
+	} else if ( preg_match( "/mozilla[\/\sa-z]*([\d\.]*)/i", $agent, $m )
+	&& !preg_match( "/gecko/i", $agent )
+	&& !preg_match( "/compatible/i", $agent )
+	&& !preg_match( "/opera/i", $agent )
+	&& !preg_match( "/galeon/i", $agent )
+	&& !preg_match( "/safari/i", $agent )) {
+		// Netscape 3.x, 4.x ...
+		return "Netscape $m[2]";
+	} else {
+		// Other
+		$found = false;
+		foreach ($browserSearchOrder as $key) {
+			if (preg_match( "/$key.?\/([\d\.]*)/i", $agent, $m )) {
+				$name = "$browsersAlias[$key] $m[1]";
+				return $name;
+				break;
+			}
+		}
+	}
+
+	return 'Unknown';
+}
+
+/**
+* Checks the user agent string against known operating systems
+*/
+function mosGetOS( $agent ) {
+	require( "includes/agent_os.php" );
+
+	foreach ($osSearchOrder as $key) {
+		if (preg_match( "/$key/i", $agent )) {
+			return $osAlias[$key];
+			break;
+		}
+	}
+
+	return 'Unknown';
+}
+
+/**
+* Makes a variable safe to display in forms
+*
+* Object parameters that are non-string, array, object or start with underscore
+* will be converted
+* @param object An object to be parsed
+* @param int The optional quote style for the htmlspecialchars function
+* @param string|array An optional single field name or array of field names not
+*                     to be parsed (eg, for a textarea)
+*/
+function mosMakeHtmlSafe( &$mixed, $quote_style=ENT_QUOTES, $exclude_keys='' ) {
+	if (is_object( $mixed )) {
+		foreach (get_object_vars( $mixed ) as $k => $v) {
+			if (is_array( $v ) || is_object( $v ) || $v == NULL || substr( $k, 1, 1 ) == '_' ) {
+				continue;
+			}
+			if (is_string( $exclude_keys ) && $k == $exclude_keys) {
+				continue;
+			} else if (is_array( $exclude_keys ) && in_array( $k, $exclude_keys )) {
+				continue;
+			}
+			$mixed->$k = htmlspecialchars( $v, $quote_style );
+		}
+	}
+}
+
+/**
+* Checks whether a menu option is within the users access level
+* @param int Item id number
+* @param string The menu option
+* @param int The users group ID number
+* @param database A database connector object
+* @return boolean True if the visitor's group at least equal to the menu access
+*/
+function mosMenuCheck( $Itemid, $menu_option, $task, $gid ) {
+	$menuhandler =& mosMenuHandler::getInstance();
+	return $menuhandler->menuCheck($Itemid, $menu_option, $task, $gid);
+}
+
+/**
+* Returns formated date according to current local and adds time offset
+* @param string date in datetime format
+* @param string format optional format for strftime
+* @param offset time offset if different than global one
+* @returns formated date
+*/
+function mosFormatDate( $date, $format="", $offset="" ){
+    $core = mamboCore::getMamboCore();
+	if ( $format == '' ) {
+		// %Y-%m-%d %H:%M:%S
+		$format = $core->current_language->date_format;
+	}
+	
+	
+	if ( !$offset ) {
+		$offset = $core->mosConfig_offset;
+	}
+	if ( $date && ereg( "([0-9]{4})-([0-9]{2})-([0-9]{2})[ ]([0-9]{2}):([0-9]{2}):([0-9]{2})", $date, $regs ) ) {
+	    $date = mktime( $regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1] );
+		$date = $date > -1 ? $core->current_language->getDate($format,  $date + ($offset*60*60)) : '-';
+	}
+	return $date;
+}
+
+/**
+* Returns current date according to current local and time offset
+* @param string format optional format for strftime
+* @returns current date
+*/
+function mosCurrentDate( $format="" ) {
+	$core =& mamboCore::getMamboCore();
+	$offset = mamboCore::get('mosConfig_offset');
+	if ($format=="") {
+		$format = $format = $core->current_language->date_format;
+	}
+	$date = $core->current_language->getDate($format,  time() + ($offset*60*60));
+	return $date;
+}
+
+/**
+* Utility function to provide ToolTips
+* @param string ToolTip text
+* @param string Box title
+* @returns HTML code for ToolTip
+*/
+function mosToolTip( $tooltip, $title='', $width='', $image='tooltip.png', $text='', $href='#' ) {
+	global $mosConfig_live_site;
+
+	if ( $width ) {
+		$width = ', WIDTH, \''.$width .'\'';
+	}
+	if ( $title ) {
+		$title = ', CAPTION, \''.$title .'\'';
+	}
+	if ( !$text ) {
+		$image 	= $mosConfig_live_site . '/includes/js/ThemeOffice/'. $image;
+		$text 	= '<img src="'. $image .'" border="0" />';
+	}
+	$style = 'style="text-decoration: none; color: #333;"';
+	if ( $href ) {
+		$style = '';
+	}
+	$tip 	= "<a href=\"". $href ."\" onMouseOver=\"return overlib('" . $tooltip . "'". $title .", BELOW, RIGHT". $width .");\" onmouseout=\"return nd();\" ". $style .">". $text ."</a>";
+	return $tip;
+}
+
+/**
+* Utility function to provide Warning Icons
+* @param string Warning text
+* @param string Box title
+* @returns HTML code for Warning
+*/
+function mosWarning($warning, $title=null) {
+    if (is_null($title)) $title = T_('Mambo Warning');
+	$mosConfig_live_site = mamboCore::get('mosConfig_live_site');
+	$tip = "<a href=\"#\" onMouseOver=\"return overlib('" . $warning . "', CAPTION, '$title', BELOW, RIGHT);\" onmouseout=\"return nd();\"><img src=\"" . $mosConfig_live_site . "/includes/js/ThemeOffice/warning.png\" border=\"0\" /></a>";
+	return $tip;
+}
+
+function mosCreateGUID(){
+	srand((double)microtime()*1000000);
+	$r = rand ;
+	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
+	$m = md5 ($u);
+	return($m);
+}
+
+function mosCompressID( $ID ){
+	return(Base64_encode(pack("H*",$ID)));
+}
+
+function mosExpandID( $ID ) {
+	return ( implode(unpack("H*",Base64_decode($ID)), '') );
+}
+
+/**
+* Mail function (uses phpMailer)
+* @param string From e-mail address
+* @param string From name
+* @param string/array Recipient e-mail address(es)
+* @param string E-mail subject
+* @param string Message body
+* @param boolean false = plain text, true = HTML
+* @param string/array CC e-mail address(es)
+* @param string/array BCC e-mail address(es)
+* @param string/array Attachment file name(s)
+* @param string/array Reply-to e-mail address
+* @param string/array Reply-to name
+*/
+function mosMail($from, $fromname, $recipient, $subject, $body, $mode=0, $cc=NULL, $bcc=NULL, $attachment=NULL, $replyto=NULL, $replytoname=NULL ) {
+	require_once(mamboCore::get('mosConfig_absolute_path').'/includes/phpmailer/class.phpmailer.php');
+	$mail =& new mosMailer ($from, $fromname, $subject, $body);
+	$result = $mail->mosMail($recipient, $mode, $cc, $bcc, $attachment, $replyto, $replytoname);
+	return $result;
+} // mosMail
+
+/**
+* Random password generator
+* @return password
+*/
+function mosMakePassword() {
+	require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
+	$authenticator =& mamboAuthenticator::getInstance();
+	return $authenticator->mosMakePassword();
+}
+
+if (!function_exists('html_entity_decode')) {
+	/**
+	* html_entity_decode function for backward compatability in PHP
+	* @param string
+	* @param string
+	*/
+	function html_entity_decode ($string, $opt = ENT_COMPAT) {
+
+		$trans_tbl = get_html_translation_table (HTML_ENTITIES);
+		$trans_tbl = array_flip ($trans_tbl);
+
+		if ($opt & 1) { // Translating single quotes
+		// Add single quote to translation table;
+		// doesn't appear to be there by default
+		$trans_tbl["&apos;"] = "'";
+		}
+
+		if (!($opt & 2)) { // Not translating double quotes
+		// Remove double quote from translation table
+		unset($trans_tbl["&quot;"]);
+		}
+
+		return strtr ($string, $trans_tbl);
+	}
+}
+
+/**
+* @param string
+* @return string
+* Deprecated - use the code within this function instead - not used in Mambo
+*/
+function mosParseParams( $txt ) {
+	$pparser = new mosParameters($txt);
+	return $pparser->getParams();
+}
+
+class mosEmpty {
+	function def( $key, $value='' ) {
+	    return 1;
+	}
+	function get( $key, $default='' ) {
+	    return 1;
+	}
+}
+
+?>
diff -ruN 4.5.4/includes/mambolanguage.class.php 4.6rc2/includes/mambolanguage.class.php
--- 4.5.4/includes/mambolanguage.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/mambolanguage.class.php	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,364 @@
+<?php
+
+class mamboLanguage {
+    var $name = '';
+    var $path = '';
+    var $version = '4.6';
+    var $title = '';
+    var $description = '';
+    var $creationdate = '';
+    var $author = '';
+    var $authorurl = '';
+    var $authoremail = '';
+    var $copyright = '';
+    var $license = '';
+    var $territory = '';
+    var $text_direction = '';
+    var $date_format = '';
+    var $iso639 = '';
+    var $iso3166_2 = '';
+    var $iso3166_3 = '';
+    var $locale = '';
+    var $charset = '';
+    var $codesets = array();
+    var $plural_form = array();
+    var $days = array('sun'=>'','mon'=>'','tue'=>'','wed'=>'','thu'=>'','fri'=>'','sat'=>'');
+    var $months = array('jan'=>'','feb'=>'','mar'=>'','apr'=>'','may'=>'','jun'=>'','jul'=>'','aug'=>'','sep'=>'','oct'=>'','nov'=>'','dec'=>'');
+    var $files = array();
+
+    function mamboLanguage($lang, $path = null) {
+        $this->name = $lang;
+        $this->path = $path;
+        if (is_null($this->path)) $this->path = mamboCore::get('rootPath').'/language/';
+        $this->load();
+    }
+
+    function getFileName() {
+        $file = $this->iso639;
+        $file .= strlen($this->iso3166_2) == 2 ? '_' . $this->iso3166_2 : '';
+        return $file;
+    }
+
+    function get($var) {
+        return isset($this->$var) ? $this->$var : null;
+    }
+    function set($var, $value) {
+        if (isset($this->$var)) $this->$var = $value;
+    }
+    function save() {
+        $this->updateFiles();
+        
+        $xml = $this->toXML();
+        
+        if (strtolower($this->charset) != 'utf-8') {
+            if (function_exists('iconv')) {
+                $xml = iconv("utf-8", $this->charset, $xml);
+            }
+        }
+        /**/
+        $fp = fopen($this->path . $this->getFileName() . '.xml', 'w+');
+        fwrite($fp, $xml);
+        fclose($fp);
+    }
+
+    function getLanguages() {
+        $langfiles = glob($this->path . "*.xml");
+        foreach($langfiles as $xml) {
+            $xml = str_replace($this->path, '', $xml);
+            if (substr($xml, 0, -4) != 'locales') {
+                $lobj = &new mamboLanguage(substr($xml, 0, -4), $this->path) ;
+                $langs[$lobj->name] = $lobj;
+            }
+        }
+        return $langs;
+    }
+
+    function setPlurals($exp) {
+        preg_match('/nplurals\s*=\s*(\d+)\s*;\s*plural\s*=\s*(.*)\s*;/', $exp, $plurals);
+        $this->plural_form = array('nplurals' => $plurals[1], 'plural' => $plurals[2], 'expression' => $plurals[0]);
+    }
+
+    function getDate($format = null, $timestamp = null) {
+        if (is_null($format)) $format = $this->date_format;
+        if (is_null($timestamp)) {
+            $timestamp = time();
+        }
+        $days = array_values($this->days);
+        $months = array_values($this->months);
+        $date = preg_replace('/%[aA]/', $days[(int)strftime('%w', $timestamp)], $format);
+        $date = preg_replace('/%[bB]/', $months[(int)strftime('%m', $timestamp)-1], $date);
+        return strftime($date, $timestamp);
+    }
+
+    function load($load_catalogs = false) {
+        if (is_readable($this->path . $this->name . ".xml")) {
+            
+            $source = file_get_contents($this->path . $this->name . ".xml");
+            if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
+                $encoding = strtoupper($m[1]);
+            } else {
+                $encoding = "UTF-8";
+            }
+
+            if($encoding == "UTF-8" || $encoding == "US-ASCII" || $encoding == "ISO-8859-1") {
+                $parser = xml_parser_create($encoding);
+            } else {
+
+                #if(function_exists('mb_convert_encoding')) {
+                    $encoded_source = iconv($encoding, "UTF-8", $source);
+               # }
+
+                if($encoded_source != NULL) {
+                    $source = str_replace ( $m[0],'<?xml version="1.0" encoding="utf-8"?>', $encoded_source);
+                }
+
+                $parser = xml_parser_create("UTF-8");
+            }
+
+            xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
+            xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+            xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+            if (!xml_parse_into_struct($parser, implode("", file($this->path . $this->name . ".xml")), $values)) {
+                die(sprintf("XML error: %s at ".$this->path . $this->name.".xml in line %d",
+                xml_error_string(xml_get_error_code($parser)),
+                xml_get_current_line_number($parser)));
+            }
+            xml_parser_free($parser);
+
+            
+            foreach($values as $key => $value) {
+                $tag = strtolower($value['tag']);
+                switch ($tag) {
+                    case 'name':
+                    $this->title = $value['value'];
+                    break;
+                    case 'author':
+                    case 'creationdate':
+                    case 'copyright':
+                    case 'license':
+                    case 'authoremail':
+                    case 'authorurl':
+                    case 'version':
+                    case 'description':
+                    $this->$tag = $value['value'];
+                    break;
+                    case 'locale':
+                    if ($value['type'] == 'open') {
+                        foreach ($value['attributes'] as $k => $v)
+                        $this->$k = $v;
+                    }
+                    break;
+                    case 'date_format':
+                    $this->date_format = $value['value'];
+                    break;
+                    case 'plural_form':
+                    if (!empty($value['attributes']['expression'])) {
+                        $this->plural_form = $value['attributes'];
+                    }
+                    break;
+                    case 'charset':
+                    $this->codesets[] = $value['value'];
+                    break;
+                    case 'days':
+                    $this->days = $value['attributes'];
+                    break;
+                    case 'months':
+                    $this->months = $value['attributes'];
+                    break;
+                    case 'filename':
+                    if ($load_catalogs) {
+                        $file = $value['attributes'];
+                        $file['filename'] = $value['value'];
+                        $this->files[] = $file;
+                    }
+                    break;
+                }
+            }
+            $this->codesets = array_unique($this->codesets);
+
+            return true;
+        }
+        return false;
+    }
+
+
+
+
+    function updateFiles() {
+        $dir = $this->path . $this->name . '/';
+        $langfiles = mosReadDirectory($dir, '.po$');
+        set_time_limit(60);
+
+        foreach ($langfiles as $lf) {
+            $domain = substr($lf, 0, -3);
+            $catalog = new PHPGettext_Catalog($domain, $this->path);
+            $catalog->setproperty('lang', $this->name);
+            $catalog->setproperty('mode', _MODE_PO_);
+            $catalog->load();
+            $file['filename'] = "language/" . $this->name . '/' . $lf;
+            $file['domain'] = $domain;
+            $file['strings'] = count($catalog->strings);
+            $file['percent'] = '';
+            $file['translated'] = 0;
+            $file['fuzzy'] = 0;
+            $pluralfuzz = false;
+            foreach ($catalog->strings as $msg) {
+                if (is_array($msg->msgstr)) {
+                    foreach ($msg->msgstr as $i) {
+                        $unt = empty($i);
+                    }
+                    if (!$unt) {
+                        $file['translated']++;
+                    }
+                }
+                if (!is_array($msg->msgstr) && !empty($msg->msgstr) && !$msg->is_fuzzy) {
+                    $file['translated']++;
+                }
+                if ($msg->is_fuzzy) {
+                    $file['fuzzy']++;
+                }
+            }
+
+
+            $nonfuzzy = $file['strings'] - $file['fuzzy'];
+            if (!$nonfuzzy) $nonfuzzy = 1;
+            $file['percent'] = round($file['translated'] * 100 / $nonfuzzy, 2);
+            unset($nonfuzzy);
+            $this->files[] = $file;
+        }
+    }
+
+    function toXML() {
+        $array[] = array('tag' => 'mosinstall', 'type' => 'open', 'level' => 1, 'attributes' => array('version' => '4.6', 'type' => 'language'));
+        $array[] = array('tag' => 'name', 'type' => 'complete', 'level' => 2, 'value' => $this->title);
+        $array[] = array('tag' => 'version', 'type' => 'complete', 'level' => 2, 'value' => $this->version);
+        $array[] = array('tag' => 'description', 'type' => 'complete', 'level' => 2, 'value' => $this->description);
+        $array[] = array('tag' => 'creationdate', 'type' => 'complete', 'level' => 2, 'value' => $this->creationdate);
+        $array[] = array('tag' => 'author', 'type' => 'complete', 'level' => 2, 'value' => $this->author);
+        $array[] = array('tag' => 'authorurl', 'type' => 'complete', 'level' => 2, 'value' => $this->authorurl);
+        $array[] = array('tag' => 'authoremail', 'type' => 'complete', 'level' => 2, 'value' => $this->authoremail);
+        $array[] = array('tag' => 'copyright', 'type' => 'complete', 'level' => 2, 'value' => $this->copyright);
+        $array[] = array('tag' => 'license', 'type' => 'complete', 'level' => 2, 'value' => $this->license);
+        $array[] = array('tag' => 'params', 'type' => 'open', 'level' => 2);
+        $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'locale', 'type' => 'text', 'default' => $this->locale, 'label' => 'Locale String', 'description' => 'Locale string for setlocale() (eg. en, english)'));
+        $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'charset', 'type' => 'text', 'default' => $this->charset, 'label' => 'Character Set', 'description' => 'Character set for this language.'));
+        $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'text_direction', 'type' => 'text', 'default' => $this->text_direction, 'label' => 'Text Direction', 'description' => 'left-to-right or light-to-left'));
+        $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'date_format', 'type' => 'text', 'default' => $this->date_format, 'label' => 'Date Format', 'description' => 'Date format for strftime() (eg. %A, %d %B %Y)'));
+        $array[] = array('tag' => 'param', 'type' => 'complete', 'level' => 3, 'attributes' => array('name' => 'plural_form', 'type' => 'text', 'default' => htmlentities($this->plural_form['expression']), 'label' => 'Plural Forms', 'description' => 'Plural Forms expression'));
+        $array[] = array('tag' => 'params', 'type' => 'close', 'level' => 2);
+        $array[] = array('tag' => 'locale', 'type' => 'open', 'level' => 2, 'attributes' => array('name' => $this->name, 'title' => $this->title, 'territory' => $this->territory, 'locale' => $this->locale, 'text_direction' => $this->text_direction, 'iso639' => $this->iso639, 'iso3166_2' => $this->iso3166_2, 'iso3166_3' => $this->iso3166_3, 'charset' => $this->charset));
+        $array[] = array('tag' => 'plural_form', 'type' => 'complete', 'level' => 3, 'attributes' => array('nplurals' => $this->plural_form['nplurals'] , 'plural' => htmlentities($this->plural_form['plural']), 'expression' => htmlentities($this->plural_form['expression'])));
+        $array[] = array('tag' => 'date_format', 'type' => 'complete', 'level' => 3, 'value' => $this->date_format);
+        $array[] = array('tag' => 'codesets', 'type' => 'open', 'level' => 3);
+        foreach ($this->codesets as $charset) $array[] = array('tag' => 'charset', 'type' => 'complete', 'level' => 4, 'value' => $charset);
+        $array[] = array('tag' => 'codesets', 'type' => 'close', 'level' => 3);
+        foreach ($this->days as $name => $day) $days[$name] = $day;
+        $array[] = array('tag' => 'days', 'type' => 'complete', 'level' => 3, 'attributes' => $days);
+        foreach ($this->months as $name => $month) $months[$name] = $month;
+        $array[] = array('tag' => 'months', 'type' => 'complete', 'level' => 3, 'attributes' => $months);
+        $array[] = array('tag' => 'locale', 'type' => 'close', 'level' => 2);
+        $array[] = array('tag' => 'files', 'type' => 'open', 'level' => 2);
+        foreach ($this->files as $file) {
+            $array[] = array('tag' => 'filename', 'type' => 'complete', 'level' => 3, 'value' => $file['filename'], 'attributes' => array('domain' => $file['domain'] , 'strings' => $file['strings'] , 'translated' => $file['translated'] , 'fuzzy' => $file['fuzzy'] , 'percent' => $file['percent']));
+        }
+        $array[] = array('tag' => 'files', 'type' => 'close', 'level' => 2);
+        $array[] = array('tag' => 'mosinstall', 'type' => 'close', 'level' => 1);
+
+        $xml = "<?xml version=\"1.0\" encoding=\"$this->charset\"?>\n";
+        if ((!empty($array)) AND (is_array($array))) {
+            foreach ($array as $key => $value) {
+                switch ($value["type"]) {
+                    case "open":
+                    $xml .= str_repeat("\t", $value["level"] - 1);
+                    $xml .= "<" . strtolower($value["tag"]);
+                    if (isset($value["attributes"])) {
+                        foreach ($value["attributes"] as $k => $v) {
+                            $xml .= sprintf(' %s="%s"', strtolower($k), $v);
+                        }
+                    }
+                    $xml .= ">\n";
+                    break;
+                    case "complete":
+                    $xml .= str_repeat("\t", $value["level"] - 1);
+                    $xml .= "<" . strtolower($value["tag"]);
+                    if (isset($value["attributes"])) {
+                        foreach ($value["attributes"] as $k => $v) {
+                            $xml .= sprintf(' %s="%s"', strtolower($k), $v);
+                        }
+                    }
+                    $xml .= ">";
+                    $xml .= isset($value['value']) ? $value['value'] : false;
+                    $xml .= "</" . strtolower($value["tag"]) . ">\n";
+                    break;
+                    case "close":
+                    $xml .= str_repeat("\t", $value["level"] - 1);
+                    $xml .= "</" . strtolower($value["tag"]) . ">\n";
+                    break;
+                    default:
+                    break;
+                }
+            }
+        }
+        return $xml;
+    }
+
+    function getLocales() {
+        $xmlfile = "../language/locales.xml";
+        $p = xml_parser_create();
+        xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
+        xml_parse_into_struct($p, implode("", file($xmlfile)), $values);
+        xml_parser_free($p);
+        $locales = array();
+        foreach($values as $key => $value) {
+            switch ($value['tag']) {
+                case 'locale':
+                if ($value['type'] == 'open') {
+                    $iso639 = $value['attributes']['iso639'];
+                    $language[$iso639] = $value['attributes']['title'];
+                    $locale[$iso639] = $value['attributes'];
+                    $directions[$iso639] = $value['attributes']['text_direction'];
+                }
+                break;
+                case 'territory':
+                $t['iso3166_2'] = $value['attributes']['iso3166_2'];
+                $t['iso3166_3'] = $value['attributes']['iso3166_3'];
+                $t['territory'] = $value['value'];
+                $territories[$iso639][] = $t;
+                break;
+                case 'charset':
+                $locale[$iso639]['codesets'][] = $codesets[$iso639][] = $value['value'];
+                break;
+                case 'date_format':
+                $locale[$iso639]['dateformats'] = $dateformats[$iso639] = $value['value'];
+                break;
+                case 'days':
+                $locale[$iso639]['days'] = $value['attributes'];
+                break;
+                case 'months':
+                $locale[$iso639]['months'] = $value['attributes'];
+                break;
+                case 'plural_form':
+                $exp = '';
+                if (!empty($value['attributes']['expression'])) {
+                    $locale[$iso639]['plural_form'] = $value['attributes'];
+                    $plural_forms[$iso639] = $value['attributes']['expression'];
+                }
+                break;
+            }
+        }
+        $locales['locales'] = $locale;
+        $locales['languages'] = $language;
+        $locales['territories'] = $territories;
+        $locales['codesets'] = $codesets;
+        $locales['dateformats'] = $dateformats;
+        $locales['directions'] = $directions;
+        $locales['plural_forms'] = $plural_forms;
+        return $locales;
+    }
+}
+
+function getlocales() {
+    return mamboLanguage::getLocales();
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/mamboxml.php 4.6rc2/includes/mamboxml.php
--- 4.5.4/includes/mamboxml.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/mamboxml.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,493 +0,0 @@
-<?php
-/**
-* @version $Id: mamboxml.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-// ensure this file is being included by a parent file
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
-* Parameters handler
-* @package Mambo
-*/
-class mosParameters {
-	/** @var object */
-	var $_params = null;
-	/** @var string The raw params string */
-	var $_raw = null;
-	/** @var string Path to the xml setup file */
-	var $_path = null;
-	/** @var string The type of setup file */
-	var $_type = null;
-	/** @var object The xml params element */
-	var $_xmlElem = null;
-/**
-* Constructor
-* @param string The raw parms text
-* @param string Path to the xml setup file
-* @var string The type of setup file
-*/
-	function mosParameters( $text, $path='', $type='component' ) {
-	    $this->_params = $this->parse( $text );
-	    $this->_raw = $text;
-	    $this->_path = $path;
-	    $this->_type = $type;
-	}
-/**
-* @param string The name of the param
-* @param string The value of the parameter
-* @return string The set value
-*/
-	function set( $key, $value='' ) {
-		$this->_params->$key = $value;
-		return $value;
-	}
-/**
-* Sets a default value if not alreay assigned
-* @param string The name of the param
-* @param string The value of the parameter
-* @return string The set value
-*/
-	function def( $key, $value='' ) {
-	    return $this->set( $key, $this->get( $key, $value ) );
-	}
-/**
-* @param string The name of the param
-* @param mixed The default value if not found
-* @return string
-*/
-	function get( $key, $default='' ) {
-	    if (isset( $this->_params->$key )) {
-	        return $this->_params->$key === '' ? $default : $this->_params->$key;
-		} else {
-		    return $default;
-		}
-	}
-/**
-* Parse an .ini string, based on phpDocumentor phpDocumentor_parse_ini_file function
-* @param mixed The ini string or array of lines
-* @param boolean add an associative index for each section [in brackets]
-* @return object
-*/
-	function parse( $txt, $process_sections = false ) {
-	    if (is_string( $txt )) {
-			$lines = explode( "\n", $txt );
-		} else if (is_array( $txt )) {
-		    $lines = $txt;
-		} else {
-		    $lines = array();
-		}
-		$obj = new stdClass();
-
-	    $sec_name = '';
-	    $unparsed = 0;
-	    if (!$lines) {
-			return $obj;
-		}
-	    foreach ($lines as $line) {
-	        // ignore comments
-	        if ($line && $line[0] == ';') {
-				continue;
-			}
-	        $line = trim( $line );
-
-	        if ($line == '') {
-	            continue;
-	        }
-	        if ($line && $line[0] == '[' && $line[strlen($line) - 1] == ']') {
-	            $sec_name = substr( $line, 1, strlen($line) - 2 );
-				if ($process_sections) {
-	            	$obj->$sec_name = new stdClass();
-	            }
-	        } else {
-	            if ($pos = strpos( $line, '=' )) {
-	                $property = trim( substr( $line, 0, $pos ) );
-
-	                if (substr($property, 0, 1) == '"' && substr($property, -1) == '"') {
-	            		$property = stripcslashes(substr($property,1,count($property) - 2));
-	                }
-	                $value = trim( substr( $line, $pos + 1 ) );
-	                if ($value == 'false') {
-						$value = false;
-					}
-	                if ($value == 'true') {
-						$value = true;
-					}
-	                if (substr( $value, 0, 1 ) == '"' && substr( $value, -1 ) == '"') {
-	                    $value = stripcslashes( substr( $value, 1, count( $value ) - 2 ) );
-	                }
-
-	                if ($process_sections) {
-	                    if ($sec_name != '') {
-      						$obj->$sec_name->$property = $value;
-      					} else {
-        					$obj->$property = $value;
-        				}
-	                } else {
-						$obj->$property = $value;
-	                }
-	            } else {
-	                if ($line && trim($line[0]) == ';') {
-						continue;
-					}
-	                if ($process_sections) {
-	                    $property = '__invalid' . $unparsed++ . '__';
-		                if ($process_sections) {
-		                    if ($sec_name != '') {
-	      						$obj->$sec_name->$property = trim($line);
-	      					} else {
-	        					$obj->$property = trim($line);
-	        				}
-		                } else {
-							$obj->$property = trim($line);
-		                }
-	                }
-	            }
-	        }
-	    }
-	    return $obj;
-	}
-/**
-* @param string The name of the control, or the default text area if a setup file is not found
-* @return string HTML
-*/
-	function render( $name='params' ) {
-		global $mosConfig_absolute_path;
-
-	    if ($this->_path) {
-	        if (!is_object( $this->_xmlElem )) {
-				require_once( $mosConfig_absolute_path . '/includes/domit/xml_domit_lite_include.php' );
-
-				$xmlDoc =& new DOMIT_Lite_Document();
-				$xmlDoc->resolveErrors( true );
-				if ($xmlDoc->loadXML( $this->_path, false, true )) {
-					$element =& $xmlDoc->documentElement;
-
-					if ($element->getTagName() == 'mosinstall' && $element->getAttribute( "type" ) == $this->_type) {
-						if ($element = &$xmlDoc->getElementsByPath( 'params', 1 )) {
-							$this->_xmlElem =& $element;
-						}
-					}
-				}
-			}
-		}
-
-	    if (is_object( $this->_xmlElem )) {
-			$html = array();
-			$html[] = '<table class="paramlist">';
-
-			$element =& $this->_xmlElem;
-
-			if ($description = $element->getAttribute( 'description' )) {
-			    // add the params description to the display
-			    $html[] = '<tr><td colspan="3">' . $description . '</td></tr>';
-			}
-
-			//$params = mosParseParams( $row->params );
-			$this->_methods = get_class_methods( get_class( $this ) );
-
-			foreach ($element->childNodes as $param) {
-				$result = $this->renderParam( $param, $name );
-				$html[] = '<tr>';
-
-				$html[] = '<td width="35%" align="right" valign="top">' . $result[0] . '</td>';
-				$html[] = '<td>' . $result[1] . '</td>';
-				$html[] = '<td width="10%" align="left" valign="top">' . $result[2] . "</td>";
-
-				$html[] = '</tr>';
-			}
-			$html[] = '</table>';
-
-			if (count( $element->childNodes ) < 1) {
-				$html[] = "<tr><td colspan=\"2\"><i>" . _NO_PARAMS . "</i></td></tr>";
-			}
-			return implode( "\n", $html );
-		} else {
-			return "<textarea name=\"$name\" cols=\"40\" rows=\"10\" class=\"text_area\">$this->_raw</textarea>";
-		}
-	}
-/**
-* @param object A param tag node
-	* @param string The control name
-* @return array Any array of the label, the form element and the tooltip
-*/
-	function renderParam( &$param, $control_name='params' ) {
-	    $result = array();
-
-		$name = $param->getAttribute( 'name' );
-		$label = $param->getAttribute( 'label' );
-
-		$value = $this->get( $name, $param->getAttribute( 'default' ) );
-		$description = $param->getAttribute( 'description' );
-
-		$result[0] = $label ? $label : $name;
-		if ( $result[0] == '@spacer' ) {
-			$result[0] = '<hr/>';
-		} else if ( $result[0] ) {
-			$result[0] .= ':';
-		}
-
-		$type = $param->getAttribute( 'type' );
-
-		if (in_array( '_form_' . $type, $this->_methods )) {
-			$result[1] = call_user_func( array( &$this, '_form_' . $type ), $name, $value, $param, $control_name );
-		} else {
-		    $result[1] = _HANDLER . ' = ' . $type;
-		}
-
-		if ( $description ) {
-			$result[2] = mosToolTip( $description, $name );
-		} else {
-			$result[2] = '';
-		}
-
-		return $result;
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_text( $name, $value, &$node, $control_name ) {
-		$size = $node->getAttribute( 'size' );
-
-		return '<input type="text" name="'. $control_name .'['. $name .']" value="'. $value .'" class="text_area" size="'. $size .'"/>';
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_list( $name, $value, &$node, $control_name ) {
-		$size = $node->getAttribute( 'size' );
-
-		$options = array();
-		foreach ($node->childNodes as $option) {
-			$val = $option->getAttribute( 'value' );
-			$text = $option->gettext();
-			$options[] = mosHTML::makeOption( $val, $text );
-		}
-
-		return mosHTML::selectList( $options, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value );
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_radio( $name, $value, &$node, $control_name ) {
-		$options = array();
-		foreach ($node->childNodes as $option) {
-			$val = $option->getAttribute( 'value' );
-			$text = $option->gettext();
-			$options[] = mosHTML::makeOption( $val, $text, true );
-		}
-
-		return mosHTML::radioList( $options, ''. $control_name .'['. $name .']', '', $value );
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_mos_section( $name, $value, &$node, $control_name ) {
-		global $database;
-
-		$query = "SELECT id AS value, title AS text"
-		. "\n FROM #__sections"
-		. "\n WHERE published='1' AND scope='content'"
-		. "\n ORDER BY title"
-		;
-		$database->setQuery( $query );
-		$options = $database->loadObjectList();
-		array_unshift( $options, mosHTML::makeOption( '0', '- Select Content Section -' ) );
-
-		return mosHTML::selectList( $options, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value );
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_mos_category( $name, $value, &$node, $control_name ) {
-		global $database;
-
-		$query 	= "SELECT c.id AS value, CONCAT_WS( '/',s.title, c.title ) AS text"
-		. "\n FROM #__categories AS c"
-		. "\n LEFT JOIN #__sections AS s ON s.id=c.section"
-		. "\n WHERE c.published='1' AND s.scope='content'"
-		. "\n ORDER BY c.title"
-		;
-		$database->setQuery( $query );
-		$options = $database->loadObjectList();
-		array_unshift( $options, mosHTML::makeOption( '0', '- Select Content Category -' ) );
-
-		return mosHTML::selectList( $options, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value );
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_mos_menu( $name, $value, &$node, $control_name ) {
-		global $database;
-
-		$menuTypes = mosAdminMenus::menutypes();
-		
-		foreach($menuTypes as $menutype ) {
-			$options[] = mosHTML::makeOption( $menutype, $menutype );
-		}
-		array_unshift( $options, mosHTML::makeOption( '', '- Select Menu -' ) );
-
-		return mosHTML::selectList( $options, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value );
-	}
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_imagelist( $name, $value, &$node, $control_name ) {
-		global $mosConfig_absolute_path;
-
-		// path to images directory
-		$path = $mosConfig_absolute_path . $node->getAttribute( 'directory' );
-		$files = mosReadDirectory( $path, '\.png$|\.gif$|\.jpg$|\.bmp$|\.ico$' );
-
-		$options = array();
-		foreach ($files as $file) {
-			$options[] = mosHTML::makeOption( $file, $file );
-		}
-		if ( !$node->getAttribute( 'hide_none' ) ) {
-			array_unshift( $options, mosHTML::makeOption( '-1', '- Do not use an image -' ) );
-		}
-		if ( !$node->getAttribute( 'hide_default' ) ) {
-			array_unshift( $options, mosHTML::makeOption( '', '- Use Default image -' ) );
-		}
-
-		return mosHTML::selectList( $options, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value );
-	}
-
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_textarea( $name, $value, &$node, $control_name ) {
- 		$rows 	= $node->getAttribute( 'rows' );
- 		$cols 	= $node->getAttribute( 'cols' );
- 		// convert <br /> tags so they are not visible when editing
- 		$value 	= str_replace( '<br />', "\n", $value );
-
- 		return '<textarea name="params['. $name .']" cols="'. $cols .'" rows="'. $rows .'" class="text_area">'. $value .'</textarea>';
-	}
-
-	/**
-	* @param string The name of the form element
-	* @param string The value of the element
-	* @param object The xml element for the parameter
-	* @param string The control name
-	* @return string The html for the element
-	*/
-	function _form_spacer( $name, $value, &$node, $control_name ) {
-		if ( $value ) {
-			return $value;
-		} else {
-			return '<hr />';
-		}
-	}
-
-	/**
-	* special handling for textarea param
-	*/
-	function textareaHandling( &$txt ) {
-		$total = count( $txt );
-		for( $i=0; $i < $total; $i++ ) {
-			if ( strstr( $txt[$i], "\n" ) ) {
-				$txt[$i] = str_replace( "\n", '<br />', $txt[$i] );
-			}
-		}
-		$txt = implode( "\n", $txt );
-
-		return $txt;
-	}
-}
-
-/**
-* @param string
-* @return string
-*/
-function mosParseParams( $txt ) {
-	return mosParameters::parse( $txt );
-}
-
-function walkNodesAndReturnMosNodeList(&$nodeList, &$contextNode) {
-	//STEP 1: DO SOME ERROR CHECKING (this can be omitted if you want to optimize, but isn't as safe)
-	//ensure that node is not null
-	if (!isset( $contextNode )) {
-		return;
-	}
-
-	//ensure that node is a DOMIT element
-	if (strtolower( get_class( $contextNode ) ) != 'domit_element') {
-		//if contextNode is a DOMIT Document, grab the documentElement
-		if (strtolower( get_class( $contextNode ) ) == 'domit_document') {
-			$contextNode =& $contextNode->documentElement;
-			if (!isset( $contextNode )) {
-				return;
-			}
-		} else {
-			return;
-		}
-	}
-
-	//STEP 2: EVALUATE THE CONTEXT NODE BASED ON SOME CRITERIA
-	//determine whether the context node should be added to the master nodeList
-	if ((strlen( $contextNode->nodeName ) > 3) && (substr( $contextNode->nodeName, 0, 4 ) == "mos:")) {
-		$nodeList->appendNode($contextNode);
-	}
-
-	//STEP 3: ITERATE THROUGH THE CONTEXT NODE CHILDREN AND
-	//RECURSIVELY CALL THIS FUNCTION WITH THE CHILD AS THE CONTEXT NODE
-	$total = $contextNode->childCount;
-
-	for ($i = 0; $i < $total; $i++) {
-		walkNodesAndReturnMosNodeList($nodeList, $contextNode->childNodes[$i]);
-	}
-} //walkNodesAndReturnMosNodeList
-
-/*
-	You'd call the function like this:
-
-	$myNodeList =& new DOMIT_NodeList();
-	walkNodesAndReturnMosNodeList($myNodeList, $someXMLDoc);
-*/
-
-class mosEmpty {
-	function def( $key, $value='' ) {
-	    return 1;
-	}
-	function get( $key, $default='' ) {
-	    return 1;
-	}
-}
-?>
diff -ruN 4.5.4/includes/metadata.php 4.6rc2/includes/metadata.php
--- 4.5.4/includes/metadata.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/metadata.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: metadata.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/includes/pageNavigation.php 4.6rc2/includes/pageNavigation.php
--- 4.5.4/includes/pageNavigation.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/pageNavigation.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,18 +1,19 @@
 <?php
 /**
-* @version $Id: pageNavigation.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 /**
 * Page navigation support class
-* @package Mambo
 */
 class mosPageNav {
 	/** @var int The record number to start dislpaying from */
@@ -64,7 +65,7 @@
 			$to_result = $this->total;
 		}
 		if ($this->total > 0) {
-			$txt .= _PN_RESULTS." $from_result - $to_result "._PN_OF." $this->total";
+			$txt .= sprintf(T_('Results %d - %d of %d'), $from_result, $to_result, $this->total);
 		}
 		return $txt;
 	}
@@ -76,7 +77,7 @@
 		$txt = '';
 		$page = $this->limitstart+1;
 		if ($this->total > 0) {
-			$txt .= _PN_PAGE." $page "._PN_OF." $this->total";
+			$txt .= sprintf(T_('Page %d of %d'), $page, $this->total);
 		}
 		return $txt;
 	}
@@ -102,11 +103,11 @@
 
 		if ($this_page > 1) {
 			$page = ($this_page - 2) * $this->limit;
-			$txt .= '<a href="'. sefRelToAbs( "$link&amp;limitstart=0" ) .'" class="pagenav" title="first page">&lt;&lt; '. _PN_START .'</a> ';
-			$txt .= '<a href="'. sefRelToAbs( "$link&amp;limitstart=$page" ) .'" class="pagenav" title="previous page">&lt; '. _PN_PREVIOUS .'</a> ';
+			$txt .= '<a href="'. sefRelToAbs( "$link&amp;limitstart=0" ) .'" class="pagenav" title="'.T_('first page').'">&lt;&lt; '. T_('Start') .'</a> ';
+			$txt .= '<a href="'. sefRelToAbs( "$link&amp;limitstart=$page" ) .'" class="pagenav" title="'.T_('previous page').'">&lt; '. T_('Previous') .'</a> ';
 		} else {
-			$txt .= '<span class="pagenav">&lt;&lt; '. _PN_START .'</span> ';
-			$txt .= '<span class="pagenav">&lt; '. _PN_PREVIOUS .'</span> ';
+			$txt .= '<span class="pagenav">&lt;&lt; '. T_('Start') .'</span> ';
+			$txt .= '<span class="pagenav">&lt; '. T_('Previous') .'</span> ';
 		}
 
 		for ($i=$start_loop; $i <= $stop_loop; $i++) {
@@ -121,11 +122,11 @@
 		if ($this_page < $total_pages) {
 			$page = $this_page * $this->limit;
 			$end_page = ($total_pages-1) * $this->limit;
-			$txt .= '<a href="'. sefRelToAbs( $link .'&amp;limitstart='. $page ) .' " class="pagenav" title="next page">'. _PN_NEXT .' &gt;</a> ';
-			$txt .= '<a href="'. sefRelToAbs( $link .'&amp;limitstart='. $end_page ) .' " class="pagenav" title="end page">'. _PN_END .' &gt;&gt;</a>';
+			$txt .= '<a href="'. sefRelToAbs( $link .'&amp;limitstart='. $page ) .' " class="pagenav" title="'.T_('next page').'">'. T_('Next') .' &gt;</a> ';
+			$txt .= '<a href="'. sefRelToAbs( $link .'&amp;limitstart='. $end_page ) .' " class="pagenav" title="'.T_('end page').'">'. T_('End') .' &gt;&gt;</a>';
 		} else {
-			$txt .= '<span class="pagenav">'. _PN_NEXT .' &gt;</span> ';
-			$txt .= '<span class="pagenav">'. _PN_END .' &gt;&gt;</span>';
+			$txt .= '<span class="pagenav">'. T_('Next') .' &gt;</span> ';
+			$txt .= '<span class="pagenav">'. T_('End') .' &gt;&gt;</span>';
 		}
 		return $txt;
 	}
diff -ruN 4.5.4/includes/patTemplate/patError.php 4.6rc2/includes/patTemplate/patError.php
--- 4.5.4/includes/patTemplate/patError.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patError.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,297 +0,0 @@
-<?php
-/**
- * patError error object used by the patFormsError manager as error messages
- * container for precise error management.
- *
- *	$Id: patError.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * @access		public
- * @package		patError
- */
-
-/**
- * patError error object used by the patFormsError manager as error messages
- * container for precise error management.
- *
- * $Id: patError.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * @access		public
- * @package		patError
- * @version		0.3
- * @author		gERD Schaufelberger <gerd@php-tools.net>
- * @author		Sebastian Mordziol <argh@php-tools.net>
- * @author		Stephan Schmidt <schst@php-tools.net>
- * @license		LGPL
- * @link		http://www.php-tools.net
- */
-class patError
-{
-   /**
-	* stores the error level for this error
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$level  =   null;
-
-   /**
-	* stores the code of the error
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$code  =   null;
-
-   /**
-	* stores the error message - this is the message that can also be shown the
-	* user if need be.
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$message  =   null;
-
-   /**
-	* additional info that is relevant for the developer of the script (e.g. if
-	* a database connect fails, the dsn used) and that the end-user should not
-	* see.
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$info  =   '';
-
-   /**
-	* stores the filename of the file the error occurred in.
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$file  =   '';
-
-   /**
-	* stores the line number the error occurred in.
-	*
-	* @access	private
-	* @var		integer
-	*/
-	var	$line  =   0;
-
-   /**
-	* stores the name of the method the error occurred in
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$function  =   '';
-
-   /**
-	* stores the name of the class (if any) the error occurred in.
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$class  =   '';
-
-   /**
-	* stores the type of error, as it is listed in the error backtrace
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$type  =   '';
-
-   /**
-	* stores the arguments the method that the error occurred in had received.
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$args  =   array();
-
-   /**
-	* stores the complete debug backtrace (if your PHP version has the
-	* debug_backtrace function)
-	*
-	* @access	private
-	* @var		mixed
-	*/
-	var	$backtrace  =   false;
-
-   /**
-	* constructor, wrapper for the upcoming PHP5 constructors for upward
-	* compatibility.
-	*
-	* @access	public
-	* @param	int		$level	The error level (use the PHP constants E_ALL, E_NOTICE etc.).
-	* @param	string	$code	The error code from the application
-	* @param	string	$msg	The error message
-	* @param	string	$info	Optional: The additional error information.
-	* @see		__construct()
-	*/
-    function patError( $level, $code, $msg, $info = null )
-    {
-		$this->__construct( $level, $code, $msg, $info );
-    }
-
-   /**
-	* constructor - used to set up the error with all needed error details.
-	*
-	* @access	public
-	* @param	int		$level	The error level (use the PHP constants E_ALL, E_NOTICE etc.).
-	* @param	string	$code	The error code from the application
-	* @param	string	$msg	The error message
-	* @param	string	$info	Optional: The additional error information.
-	* @todo		all calls to patErrorManager::raise* should not be included in backtrace
-	*/
-    function __construct( $level, $code, $msg, $info = null )
-    {
-		static $raise		=	array(	'raise',
-										'raiseerror',
-										'raisewarning',
-										'raisenotice'
-									);
-
-		$this->level	=	$level;
-		$this->code		=	$code;
-		$this->message	=	$msg;
-
-		if( $info != null )
-		{
-			$this->info = $info;
-		}
-
-		if( function_exists( 'debug_backtrace' ) )
-		{
-			$this->backtrace	=	debug_backtrace();
-
-			for( $i = count( $this->backtrace ) - 1; $i >= 0; --$i )
-			{
-				if( in_array( $this->backtrace[$i]['function'], $raise ) )
-				{
-					++$i;
-					if( isset( $this->backtrace[$i]['file'] ) )
-						$this->file		=	$this->backtrace[$i]['file'];
-					if( isset( $this->backtrace[$i]['line'] ) )
-						$this->line		=	$this->backtrace[$i]['line'];
-					if( isset( $this->backtrace[$i]['class'] ) )
-						$this->class	=	$this->backtrace[$i]['class'];
-					if( isset( $this->backtrace[$i]['function'] ) )
-						$this->function	=	$this->backtrace[$i]['function'];
-					if( isset( $this->backtrace[$i]['type'] ) )
-						$this->type		=	$this->backtrace[$i]['type'];
-
-					$this->args		=	false;
-					if( isset( $this->backtrace[$i]['args'] ) )
-					{
-						$this->args		=	$this->backtrace[$i]['args'];
-					}
-					break;
-				}
-			}
-		}
-    }
-
-   /**
-	* returns the error level of the error - corresponds to the PHP
-	* error levels (E_ALL, E_NOTICE...)
-	*
-	* @access	public
-	* @return	int $level	The error level
-	* @see		$level
-	*/
-    function getLevel()
-    {
-        return  $this->level;
-    }
-
-
-   /**
-	* retrieves the error message
-	*
-	* @access	public
-	* @return	string 	$msg	The stored error message
-	* @see		$message
-	*/
-    function getMessage()
-    {
-		return $this->message;
-    }
-
-   /**
-	* retrieves the additional error information (information usually
-	* only relevant for developers)
-	*
-	* @access	public
-	* @return	mixed $info	The additional information
-	* @see		$info
-	*/
-    function getInfo()
-    {
-		return $this->info;
-    }
-
-   /**
-	* recieve error code
-	*
-	* @access	public
-	* @return	string|integer		error code (may be a string or an integer)
-	* @see		$code
-	*/
-    function getCode()
-    {
-		return $this->code;
-    }
-
-   /**
-	* get the backtrace
-	*
-	* This is only possible, if debug_backtrace() is available.
-	*
-	* @access	public
-	* @return	array backtrace
-	* @see		$backtrace
-	*/
-    function getBacktrace( $formatted=false )
-    {
-    	if ($formatted && is_array( $this->backtrace )) {
-    		$result = '';
-    		foreach( debug_backtrace() as $back) {
-			    if (!eregi( 'patErrorManager.php', $back['file'])) {
-				    $result .= '<br />'.$back['file'].':'.$back['line'];
-				}
-			}
-			return $result;
-		}
-		return $this->backtrace;
-    }
-
-   /**
-	* get the filename in which the error occured
-	*
-	* This is only possible, if debug_backtrace() is available.
-	*
-	* @access	public
-	* @return	string filename
-	* @see		$file
-	*/
-    function getFile()
-    {
-		return $this->file;
-    }
-
-   /**
-	* get the line number in which the error occured
-	*
-	* This is only possible, if debug_backtrace() is available.
-	*
-	* @access	public
-	* @return	integer line number
-	* @see		$line
-	*/
-    function getLine()
-    {
-		return $this->line;
-    }
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patErrorManager.php 4.6rc2/includes/patTemplate/patErrorManager.php
--- 4.5.4/includes/patTemplate/patErrorManager.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patErrorManager.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,697 +0,0 @@
-<?php
-/**
- * patErrorManager main error management class used by pat tools for the
- * application-internal error management. Creates patError objects for
- * any errors for precise error management.
- *
- *	$Id: patErrorManager.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * @package	patError
- */
-
-/**
- * error definition: illegal options.
- */
-define( 'PATERRORMANAGER_ERROR_ILLEGAL_OPTIONS', 1 );
-
-/**
- * error definition: callback function does not exist.
- */
-define( 'PATERRORMANAGER_ERROR_CALLBACK_NOT_CALLABLE', 2 );
-
-/**
- * error definition: illegal error handling mode.
- */
-define( 'PATERRORMANAGER_ERROR_ILLEGAL_MODE', 3 );
-
-
-/**
- * global definitions needed to keep track of things when calling the patErrorManager
- * static methods.
- */
-$GLOBALS['_pat_errorHandling']	=	array(
-											E_NOTICE	=> array( 'mode' => 'echo' ),
-											E_WARNING	=> array( 'mode' => 'echo' ),
-											E_ERROR		=> array( 'mode' => 'die' )
-										);
-
-/**
- * available error levels
- * Stored in a variable to keep them flexible
- */
-$GLOBALS['_pat_errorLevels']	=	array(
-											E_NOTICE	=> 'Notice',
-											E_WARNING	=> 'Warning',
-											E_ERROR		=> 'Error'
-										);
-/**
- * error class names
- * Stored in a variable allows to change during runtime
- */
-$GLOBALS['_pat_errorClass']	=	'patError';
-
-/**
- * ignore errors
- * Store error-codes that will be ignored forever
- */
-$GLOBALS['_pat_errorIgnores']	=	array();
-
-/**
- * expects errors
- * Store error-codes that will be ignored once
- */
-$GLOBALS['_pat_errorExpects']	=	array();
-
-
-/**
- * patErrorManager main error management class used by pat tools for the
- * application-internal error management. Creates patError objects for
- * any errors for precise error management.
- *
- * @static
- * @package	patError
- * @version	0.3
- * @author	gERD Schaufelberger <gerd@php-tools.net>
- * @author	Stephan Schmidt <schst@php-tools.net>
- * @license	LGPL
- * @link	http://www.php-tools.net
- * @todo	implement ignoreError() to ignore errrors with a certain code
- * @todo	implement expectError() to ignore an error with a certain code only once.
- */
-class patErrorManager
-{
-   /**
-	* method for checking whether the return value of a pat application method is a pat
-	* error object.
-	*
-	* @static
-	* @access	public
-	* @param	mixed	&$object
-	* @return	boolean $result	True if argument is a patError-object, false otherwise.
-	*/
-    function isError( &$object )
-    {
-		if( !is_object( $object ) )
-		{
-			return false;
-		}
-
-		if( get_class( $object ) != strtolower( $GLOBALS['_pat_errorClass'] ) && !is_subclass_of( $object, $GLOBALS['_pat_errorClass'] ) )
-		{
-			return false;
-		}
-
-        return  true;
-    }
-
-   /**
-	* wrapper for the {@link raise()} method where you do not have to specify the
-	* error level - a {@link patError} object with error level E_ERROR will be returned.
-	*
-	* @static
-	* @access	public
-	* @param	string	$code	The application-internal error code for this error
-	* @param	string	$msg	The error message, which may also be shown the user if need be.
-	* @param	mixed	$info	Optional: Additional error information (usually only developer-relevant information that the user should never see, like a database DSN).
-	* @return	object	$error	The configured patError object
-	* @see		raise()
-	* @see		patError
-	*/
-	function &raiseError( $code, $msg, $info = null )
-	{
-		return patErrorManager::raise( E_ERROR, $code, $msg, $info );
-	}
-
-   /**
-	* wrapper for the {@link raise()} method where you do not have to specify the
-	* error level - a {@link patError} object with error level E_WARNING will be returned.
-	*
-	* @static
-	* @access	public
-	* @param	string	$code	The application-internal error code for this error
-	* @param	string	$msg	The error message, which may also be shown the user if need be.
-	* @param	mixed	$info	Optional: Additional error information (usually only developer-relevant information that the user should never see, like a database DSN).
-	* @return	object	$error	The configured patError object
-	* @see		raise()
-	* @see		patError
-	*/
-	function &raiseWarning( $code, $msg, $info = null )
-	{
-		return patErrorManager::raise( E_WARNING, $code, $msg, $info );
-	}
-
-   /**
-	* wrapper for the {@link raise()} method where you do not have to specify the
-	* error level - a {@link patError} object with error level E_NOTICE will be returned.
-	*
-	* @static
-	* @access	public
-	* @param	string	$code	The application-internal error code for this error
-	* @param	string	$msg	The error message, which may also be shown the user if need be.
-	* @param	mixed	$info	Optional: Additional error information (usually only developer-relevant information that the user should never see, like a database DSN).
-	* @return	object	$error	The configured patError object
-	* @see		raise()
-	* @see		patError
-	*/
-	function &raiseNotice( $code, $msg, $info = null )
-	{
-		return patErrorManager::raise( E_NOTICE, $code, $msg, $info );
-	}
-
-   /**
-	* creates a new patError object given the specified information.
-	*
-	* @access	public
-	* @param	int		$level	The error level - use any of PHP's own error levels for this: E_ERROR, E_WARNING, E_NOTICE, E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE.
-	* @param	string	$code	The application-internal error code for this error
-	* @param	string	$msg	The error message, which may also be shown the user if need be.
-	* @param	mixed	$info	Optional: Additional error information (usually only developer-relevant information that the user should never see, like a database DSN).
-	* @return	mixed	$error	The configured patError object or false if this error should be ignored
-	* @see		patError
-	* @todo		implement 'simple' mode that returns just false (BC for patConfiguration)
-	* @todo		either remove HTML tags and entities from output or test for enviroment!!! <b></b> in shell is ugly!
-	*/
-    function &raise( $level, $code, $msg, $info = null )
-    {
-		// ignore this error?
-		if( in_array( $code, $GLOBALS['_pat_errorIgnores'] ) )
-		{
-			return false;
-		}
-
-		// this error was expected
-		if( !empty( $GLOBALS['_pat_errorExpects'] ) )
-		{
-			$expected =	array_pop( $GLOBALS['_pat_errorExpects'] );
-			if( in_array( $code, $expected ) )
-			{
-				return false;
-			}
-		}
-
-		// need patError
-		$class	=	$GLOBALS['_pat_errorClass'];
-		if( !class_exists( $class ) )
-		{
-			include_once dirname( __FILE__ ) . '/'. $class .'.php';
-		}
-
-		// build error object
-		$error			=&	new	$class( $level, $code, $msg, $info );
-
-		// see what to do with this kind of error
-		$handling	=	patErrorManager::getErrorHandling( $level );
-
-		$function	=	'handleError' . ucfirst( $handling['mode'] );
-		return patErrorManager::$function( $error, $handling );
-    }
-
-   /**
-	* register a new error level
-	*
-	* This allows you to add custom error levels to the built-in
-	* - E_NOTICE
-	* - E_WARNING
-	* - E_NOTICE
-	*
-	* You may use this level in subsequent calls to raise().
-	* Error handling will be set to 'ignore' for the new level, you
-	* may change it by using setErrorHandling().
-	*
-	* You could be using PHP's predefined constants for error levels
-	* or any other integer value.
-	*
-	* @access	public
-	* @param	integer	error level
-	* @param	string	human-readable name
-	* @return	boolean	true on success; false if the level already has been registered
-	* @see		raise(), setErrorHandling()
-	* @link		http://www.php.net/manual/en/function.error-reporting.php
-	*/
-	function registerErrorLevel( $level, $name )
-	{
-		if( isset( $GLOBALS['_pat_errorLevels'][$level] ) )
-		{
-			return false;
-		}
-		$GLOBALS['_pat_errorLevels'][$level]	=	$name;
-		patErrorManager::setErrorHandling( $level, 'ignore' );
-		return	true;
-	}
-
-   /**
-	* sets the way the patErrorManager will handle teh different error levels. Use this
-	* if you want to override the default settings.
-	*
-	* Error handling modes:
-	* - ignore
-	* - trigger
-	* - verbose
-	* - echo
-	* - callback
-	* - die
-	*
-	* You may also set the error handling for several modes at once using PHP's bit operations.
-	* Examples:
-	* - E_ALL = Set the handling for all levels
-	* - E_ERROR | E_WARNING = Set the handling for errors and warnings
-	* - E_ALL ^ E_ERROR = Set the handling for all levels except errors
-	*
-	* @static
-	* @access	public
-	* @param	int		$level		The error level for which to set the error handling
-	* @param	string	$mode		The mode to use for the error handling.
-	* @param	mixed	$options	Optional: Any options needed for the given mode.
-	* @return	mixed	$result		True on success, or a patError object if failed.
-	* @see		getErrorHandling()
-	*/
-    function setErrorHandling( $level, $mode, $options = null )
-    {
-		$levels	=	$GLOBALS['_pat_errorLevels'];
-
-		$function	=	'handleError' . ucfirst( $mode );
-		if( !is_callable( array( 'patErrorManager', $function ) ) )
-		{
-			return patErrorManager::raiseError( E_ERROR,
-												'patErrorManager:' . PATERRORMANAGER_ERROR_ILLEGAL_MODE,
-												'Error Handling mode is not knwon',
-												'Mode: ' .  $mode . ' is not implemented.'
-												);
-		}
-
-		foreach( $levels as $eLevel => $eTitle )
-		{
-			if( ( $level & $eLevel ) != $eLevel )
-			{
-				continue;
-			}
-
-			// set callback options
-			if( $mode == 'callback' )
-			{
-				if( !is_array( $options ) )
-				{
-					return patErrorManager::raiseError( E_ERROR,
-														'patErrorManager:' . PATERRORMANAGER_ERROR_ILLEGAL_OPTIONS,
-														'Options for callback not valid'
-														);
-				}
-
-				if( !is_callable( $options ) )
-				{
-					$tmp	=	array( 'GLOBAL' );
-					if( is_array( $options ) )
-					{
-						$tmp[0]	=	$options[0];
-						$tmp[1]	=	$options[1];
-					}
-					else
-					{
-						$tmp[1]	=	$options;
-					}
-
-					return patErrorManager::raiseError(	E_ERROR,
-														'patErrorManager:' . PATERRORMANAGER_ERROR_CALLBACK_NOT_CALLABLE,
-														'Function is not callable',
-														'Function:' . $tmp[1]  . ' scope ' . $tmp[0] . '.'
-														);
-				}
-			}
-
-
-			// save settings
-			$GLOBALS['_pat_errorHandling'][$eLevel]	=	array( 'mode' => $mode );
-			if( $options	!= null )
-			{
-				$GLOBALS['_pat_errorHandling'][$eLevel]['options']	=	$options;
-			}
-		}
-
-        return  true;
-    }
-
-   /**
-	* retrieves the current error handling settings for the specified error level.
-	*
-	* @access	public
-	* @param	int		$level		The error level to retrieve. This can be any of PHP's own error levels, e.g. E_ALL, E_NOTICE...
-	* @return	array	$handling	All error handling details
-	*/
-    function getErrorHandling( $level )
-    {
-		return $GLOBALS['_pat_errorHandling'][$level];
-    }
-
-   /**
-	* translate an error level
-	*
-	* returns the human-readable name for an error level,
-	* e.g. E_ERROR will be translated to 'Error'.
-	*
-	* @access	public
-	* @param	integer		error level
-	* @return	string		human-readable representation
-	*/
-	function translateErrorLevel( $level )
-	{
-		if( isset( $GLOBALS['_pat_errorLevels'][$level] ) )
-		{
-			return	$GLOBALS['_pat_errorLevels'][$level];
-		}
-		return	'Unknown error level';
-	}
-
-   /**
-	* setErrorClass
-	*
-	* In order to autoload this class, the filename containing that class must be
-	* named like the class itself; with an appending ".php". Although the file must be stored
-	* in the same directory as patErrorManager.php (this file)
-	*
-	* @access public
-	* @param string $name classname
-	* @return boolean $result true on success
-	*/
-    function setErrorClass( $name )
-    {
-		// include old error-class
-		if( $name !== $GLOBALS['_pat_errorClass'] && !class_exists( $GLOBALS['_pat_errorClass'] ) )
-		{
-			include_once dirname( __FILE__ ) . '/' . $GLOBALS['_pat_errorClass'] . '.php';
-		}
-
-		$GLOBALS['_pat_errorClass']	=	$name;
-		return true;
-    }
-
-   /**
-	* add error codes to be ingored
-	*
-	* @static
-	* @access public
-	* @param mixed $codes either an array of error code or a single code that will be ignored in future
-	* @return boolean $result true on success
-	*/
-    function addIgnore( $codes )
-    {
-		if( !is_array( $codes ) )
-		{
-			$codes	=	array( $codes );
-		}
-
-		$codes							=	array_merge( $GLOBALS['_pat_errorIgnores'], $codes );
-		$GLOBALS['_pat_errorIgnores']	=	array_unique( $codes );
-
-		return true;
-    }
-
-   /**
-	* removeIgnore
-	*
-	*
-	* @static
-	* @access public
-	* @return boolean $result true on success
-	*/
-    function removeIgnore( $codes )
-    {
-		if( !is_array( $codes ) )
-		{
-			$codes	=	array( $codes );
-		}
-
-		foreach( $codes as $code )
-		{
-			$index	=	array_search( $code, $GLOBALS['_pat_errorIgnores'] );
-			if( $index === false )
-			{
-				continue;
-			}
-
-			unset( $GLOBALS['_pat_errorIgnores'][$index] );
-		}
-
-		// reorder the codes
-		$GLOBALS['_pat_errorIgnores']	=	array_values( $GLOBALS['_pat_errorIgnores'] );
-
-		return true;
-    }
-
-   /**
-	* recieve all registerd error codes that will be ignored
-	*
-	* @static
-	* @access public
-	* @return array $codes list of error codes
-	*/
-    function getIgnore()
-    {
-		return $GLOBALS['_pat_errorIgnores'];
-    }
-
-   /**
-	* empty list of errors to be ignored
-	*
-	* @static
-	* @access public
-	* @return boolean $result true on success
-	*/
-    function clearIgnore()
-    {
-		$GLOBALS['_pat_errorIgnores']	=	array();
-		return true;
-    }
-
-   /**
-	* add expected errors to stack
-	*
-	* @static
-	* @access public
-	* @param mixed $codes either an array of error code or a single code that will be ignored in future
-	* @return boolean $result true on success
-	*/
-    function pushExpect( $codes )
-    {
-		if( !is_array( $codes ) )
-		{
-			$codes	=	array( $codes );
-		}
-
-		array_push( $GLOBALS['_pat_errorExpects'], $codes );
-
-		return true;
-    }
-
-   /**
-	* remove top of error-codes from stack
-	*
-	* @static
-	* @access public
-	* @return boolean $result true on success
-	*/
-    function popExpect()
-    {
-		if( empty( $GLOBALS['_pat_errorExpects'] ) )
-		{
-			return false;
-		}
-
-		array_pop( $GLOBALS['_pat_errorExpects'] );
-		return true;
-    }
-
-   /**
-	* recieve all registerd error codes that will be ignored
-	*
-	* @static
-	* @access public
-	* @return array $codes list of error codes
-	*/
-    function getExpect()
-    {
-		return $GLOBALS['_pat_errorExpects'];
-    }
-
-   /**
-	* empty list of errors to be ignored
-	*
-	* @static
-	* @access public
-	* @return boolean $result true on success
-	*/
-    function clearExpect()
-    {
-		$GLOBALS['_pat_errorExpects']	=	array();
-		return true;
-    }
-
-   /**
-	* handleError: Ignore
-	* Does nothing
-	*
-	* @access private
-	* @param object $error patError-Object
-	* @param array $options options for handler
-	* @return object $error error-object
-	* @see raise()
-	*/
-    function &handleErrorIgnore( &$error, $options )
-    {
-		return $error;
-    }
-
-   /**
-	* handleError: Echo
-	* display error message
-	*
-	* @access private
-	* @param object $error patError-Object
-	* @param array $options options for handler
-	* @return object $error error-object
-	* @see raise()
-	*/
-    function &handleErrorEcho( &$error, $options )
-    {
-		$level_human	=	patErrorManager::translateErrorLevel( $error->getLevel() );
-
-		if( isset( $_SERVER['HTTP_HOST'] ) )
-		{
-			// output as html
-			echo "<br /><b>pat-$level_human</b>: " . $error->getMessage() . "<br />\n";
-		}
-		else
-		{
-			// output as simple text
-			if( defined( 'STDERR' ) )
-			{
-				fwrite( STDERR, "pat-$level_human: " . $error->getMessage() . "\n" );
-			}
-			else
-			{
-				echo "pat-$level_human: " . $error->getMessage() . "\n";
-			}
-		}
-		return $error;
-    }
-
-   /**
-	* handleError: Verbose
-	* display verbose output for developing purpose
-	*
-	* @access private
-	* @param object $error patError-Object
-	* @param array $options options for handler
-	* @return object $error error-object
-	* @see raise()
-	*/
-    function &handleErrorVerbose( &$error, $options )
-    {
-		$level_human	=	patErrorManager::translateErrorLevel( $error->getLevel() );
-		$info			=	$error->getInfo();
-
-		if( isset( $_SERVER['HTTP_HOST'] ) )
-		{
-			// output as html
-			echo "<br /><b>pat-$level_human</b>: " . $error->getMessage() . "<br />\n";
-			if( $info != null )
-			{
-				echo "&nbsp;&nbsp;&nbsp;" . $error->getInfo() . "<br />\n";
-			}
-			echo $error->getBacktrace( true );
-		}
-		else
-		{
-			// output as simple text
-			echo "pat-$level_human: " . $error->getMessage() . "\n";
-			if( $info != null )
-			{
-				echo "    " . $error->getInfo() . "\n";
-			}
-
-		}
-		return $error;
-    }
-
-   /**
-	* handleError: die
-	* display error-message and die
-	*
-	* @access private
-	* @param object $error patError-Object
-	* @param array $options options for handler
-	* @return object $error error-object
-	* @see raise()
-	*/
-    function &handleErrorDie( &$error, $options )
-    {
-		$level_human	=	patErrorManager::translateErrorLevel( $error->getLevel() );
-
-		if( isset( $_SERVER['HTTP_HOST'] ) )
-		{
-			// output as html
-			die( "<br /><b>pat-$level_human</b> " . $error->getMessage() . "<br />\n" );
-		}
-		else
-		{
-			// output as simple text
-			if( defined( 'STDERR' ) )
-			{
-				fwrite( STDERR, "pat-$level_human " . $error->getMessage() . "\n" );
-			}
-			else
-			{
-				die( "pat-$level_human " . $error->getMessage() . "\n" );
-			}
-		}
-		return $error;
-    }
-
-   /**
-	* handleError: trigger
-	* trigger php-error
-	*
-	* @access private
-	* @param object $error patError-Object
-	* @param array $options options for handler
-	* @return object $error error-object
-	* @see raise()
-	*/
-    function &handleErrorTrigger( &$error, $options )
-    {
-		switch( $error->getLevel() )
-		{
-			case	E_NOTICE:
-				$level	=	E_USER_NOTICE;
-				break;
-			case	E_WARNING:
-				$level	=	E_USER_WARNING;
-				break;
-			case	E_NOTICE:
-				$level =	E_NOTICE;
-				break;
-			default:
-				$level	=	E_USER_ERROR;
-				break;
-		}
-
-		trigger_error( $error->getMessage(), $level );
-		return $error;
-    }
-
-   /**
-	* handleError: callback
-	* forward error to custom handler
-	*
-	* @access private
-	* @param object $error patError-Object
-	* @param array $options options for handler
-	* @return object $error error-object
-	* @see raise()
-	*/
-    function &handleErrorCallback( &$error, $options )
-    {
-		$opt	=	$options['options'];
-		return call_user_func( $opt, $error );
-    }
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Compiler.php 4.6rc2/includes/patTemplate/patTemplate/Compiler.php
--- 4.5.4/includes/patTemplate/patTemplate/Compiler.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Compiler.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,482 +0,0 @@
-<?PHP
-/**
- * Compiler for patTemplate
- *
- * $Id: Compiler.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * WARNING: This is still experimental!
- *
- * @package		patTemplate
- * @subpackage	Compiler
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Compiler for patTemplate
- *
- * $Id: Compiler.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * WARNING: This is still experimental!
- *
- * @package		patTemplate
- * @subpackage	Compiler
- * @author		Stephan Schmidt <schst@php.net>
- *
- * @todo		implement all template types
- * @todo		implement variable modifiers
- * @todo		implement getParsedTemplate
- * @todo		check for existing compiled template
- */
-class patTemplate_Compiler extends patTemplate
-{
-   /**
-	* list of all templates that already have been compiled
-	*
-	* @access	private
-	* @var		array()
-	*/
-    var $_compiledTemplates = array();
-	
-   /**
-	* file pointer to the compiled template
-	*
-	* @access	private
-	* @var		resource
-	*/
-    var $_fp;
-    
-   /**
-	* constructor
-	*
-	* Creates a new patTemplate Compiler
-	*
-	* @access	public
-	* @param	string		type of the templates, either 'html' or 'tex'
-	*/
-	function patTemplate_Compiler( $type = 'html' )
-	{
-		$GLOBALS['patTemplate_Compiler']	=	&$this;
-		patTemplate::patTemplate( $type );
-	}
-
-   /**
-	* compile the currently loaded templates
-	*
-	* @access	public
-	* @param	string	name of the input (filename, shm segment, etc.)
-	*/
-	function compile( $compileName = null )
-	{
-		$this->_varRegexp = '/'.$this->_startTag.'([^a-z:]+)'.$this->_endTag.'/U';
-		$this->_depRegexp = '/'.$this->_startTag.'TMPL:([^a-z:]+)'.$this->_endTag.'/U';
-
-		$compileFolder	=	$this->getOption( 'compileFolder' );
-		$compileFile	=	sprintf( '%s/%s', $compileFolder, $compileName );
-		
-   		$this->_fp	=	fopen( $compileFile, 'w' );
-		$this->_addToCode( '<?PHP' );
-		$this->_addToCode( '/**' );
-		$this->_addToCode( ' * compiled patTemplate file' );
-		$this->_addToCode( ' *' );
-		$this->_addToCode( ' * compiled on '. date( 'Y-m-d H:i:s' ) );
-		$this->_addToCode( ' */' );
-		$this->_addToCode( 'class compiledTemplate {' );
-
-		foreach( $this->_templates as $template => $spec )
-		{
-			$this->compileTemplate( $template );
-		}
-
-		$this->_addToCode( '}' );
-		$this->_addToCode( '?>' );
-		fclose( $this->_fp );
-		
-		include_once $compileFile;
-		return true;
-	}
-
-   /**
-	* compile a template
-	*
-	* @access	public
-	* @param	string	name of the template
-	*/
-	function compileTemplate( $template )
-	{
-		$name	=	strtolower( $template );
-		
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$name' does not exist."
-												);
-		}
-		
-
-		/**
-		 * check, if the template has been loaded
-		 * and load it if necessary.
-		 */
-		if( $this->_templates[$template]['loaded'] !== true )
-		{
-			if( $this->_templates[$template]['attributes']['parse'] == 'on' )
-			{
-				$result = $this->readTemplatesFromInput( $this->_templates[$template]['attributes']['src'], $this->_templates[$template]['attributes']['reader'], null, $template );
-			}
-			else
-			{
-				$result = $this->loadTemplateFromInput( $this->_templates[$template]['attributes']['src'], $this->_templates[$template]['attributes']['reader'], $template );
-			}
-			if( patErrorManager::isError( $result ) )
-			{
-				return $result;
-			}
-		}
-
-		$this->_addToCode( '' );
-		$this->_addToCode( '/**' );
-		$this->_addToCode( ' * Compiled version of '.$template );
-		$this->_addToCode( ' *' );
-		$this->_addToCode( ' * Template type is '.$this->_templates[$template]['attributes']['type'] );
-		$this->_addToCode( ' */' );
-
-
-		/**
-		 * start the output
-		 */
-		$this->_addToCode( 'function '.$template.'()' );
-		$this->_addToCode( '{' );
-		$this->_addToCode( '$this->_prepareCompiledTemplate( "'.$template.'" );', 1 );
-		$this->_addToCode( '$this->prepareTemplate( "'.$template.'" );', 1 );
-
-		/**
-		 * attributes
-		 */
-		$this->_addToCode( '$this->_templates["'.$template.'"]["attributes"] = unserialize( \''.serialize($this->_templates[$template]['attributes']).'\' );', 1, 'Read the attributes' );
-
-		/**
-		 * copyVars
-		 */
-		$this->_addToCode( '$this->_templates["'.$template.'"]["copyVars"] = unserialize( \''.serialize($this->_templates[$template]['copyVars']).'\' );', 1, 'Read the copyVars' );
-		
-		/**
-		 * check visibility
-		 */
-		$this->_addToCode( 'if( $this->_templates["'.$template.'"]["attributes"]["visibility"] != "hidden" ) {', 1, 'Check, whether template is hidden' );
-
-			/**
-			 * autoloop the template
-			 */
-   			$this->_addToCode( '$this->_templates["'.$template.'"]["iteration"] = 0;', 2, 'Reset the iteration' );
-
-			$this->_addToCode( '$loop = count( $this->_vars["'.$template.'"]["rows"] );', 2, 'Get the amount of loops' );
-			$this->_addToCode( '$loop = max( $loop, 1 );', 2 );
-			$this->_addToCode( '$this->_templates["'.$template.'"]["loop"] = $loop;', 2 );
-			
-			$this->_addToCode( 'for( $i = 0; $i < $loop; $i++ ) {', 2, 'Traverse all variables.' );
-	
-				/**
-				 * fetch the variables
-				 */
-				$this->_addToCode( 'unset( $this->_templates["'.$template.'"]["vars"] );', 3 );
-				$this->_addToCode( '$this->_fetchVariables("'.$template.'");', 3 );
-
-				/**
-				 * different templates have to be compiled differently
-				 */
-				switch( $this->_templates[$template]['attributes']['type'] )
-				{
-					/**
-					 * modulo template
-					 */
-					case 'modulo':
-						$this->_compileModuloTemplate( $template );
-						break;
-						
-					/**
-					 * simple condition template
-					 */
-					case 'simplecondition':
-						$this->_compileSimpleConditionTemplate( $template );
-						break;
-						
-					/**
-					 * condition template
-					 */
-					case 'condition':
-						$this->_compileConditionTemplate( $template );
-						break;
-						
-					/**
-					 * standard template
-					 */
-					default:
-						$this->_compileStandardTemplate( $template );
-						break;
-				}
-    			$this->_addToCode( '$this->_templates["'.$template.'"]["iteration"]++;', 3 );
-				
-			$this->_addToCode( '}', 2 );
-
-		$this->_addToCode( '}', 1 );
-		$this->_addToCode( '}' );
-
-        /**
-         * remember this template
-         */
-        array_push( $this->_compiledTemplates, $template );
-	}
-
-   /**
-	* compile a standard template
-	*
-	* @access	private
-	* @param	string		name of the template
-	*/
-	function _compileStandardTemplate( $template )
-	{
-		$content = $this->_templateToPHP( $this->_templates[$template]['content'], $template );
-		$this->_addToCode( $content );
-		return true;
-	}
-
-   /**
-	* compile a modulo template
-	*
-	* A modulo template will be compiled into a switch/case
-	* statement.
-	*
-	* @access	private
-	* @param	string		name of the template
-	* @todo		check special conditions (__first, __last, __default)
-	*/
-	function _compileModuloTemplate( $template )
-	{
-		$this->_compileBuiltinConditions( $template );
-
-
-		$this->_addToCode( 'if( !$_displayed ) {', 3, 'Builtin condition has been displayed?' );
-
-		/**
-		 * build switch statement
-		 */
-		$this->_addToCode( 'switch( ( $this->_templates["'.$template.'"]["iteration"] + 1 ) % '.$this->_templates[$template]['attributes']['modulo'].' ) {', 4 );
-
-		foreach( $this->_templates[$template]['subtemplates'] as $condition => $spec )
-		{
-			$this->_addToCode( 'case "'.$condition.'":', 5 );
-			$content = $this->_templateToPHP( $spec['data'], $template );
-			$this->_addToCode( $content );
-			$this->_addToCode( 'break;', 6 );
-		}
-		$this->_addToCode( '}', 4 );
-		$this->_addToCode( '}', 3 );
-		return true;
-	}
-
-   /**
-	* compile a simpleCondition template
-	*
-	* A simpleCondition template will be compiled into an 'if'
-	* statement.
-	*
-	* @access	private
-	* @param	string		name of the template
-	*/
-	function _compileSimpleConditionTemplate( $template )
-	{
-		$conditions	=	array();
-		foreach( $this->_templates[$template]['attributes']['requiredvars'] as $var )
-		{
-			array_push( $conditions, 'isset( $this->_templates["'.$template.'"]["vars"]["'.$var.'"] )' );
-		}
-
-		/**
-		 * build switch statement
-		 */
-		$this->_addToCode( 'if( '.implode( ' && ', $conditions ).' ) {', 3, 'Check for required variables' );
-
-		$content = $this->_templateToPHP( $this->_templates[$template]['content'], $template );
-		$this->_addToCode( $content );
-		$this->_addToCode( '}', 3 );
-		return true;
-	}
-
-   /**
-	* compile a condition template
-	*
-	* A condition template will be compiled into an 'switch/case'
-	* statement.
-	*
-	* @access	private
-	* @param	string		name of the template
-	*/
-	function _compileConditionTemplate( $template )
-	{
-		/**
-		 * __first, __last
-		 */
-		$this->_compileBuiltinConditions( $template );
-
-		$this->_addToCode( 'if( !$_displayed ) {', 3, 'Builtin condition has been displayed?' );
-
-		/**
-		 * build switch statement
-		 */
-		$this->_addToCode( 'switch( $this->_templates["'.$template.'"]["vars"]["'.$this->_templates[$template]["attributes"]["conditionvar"].'"] ) {', 4 );
-
-		foreach( $this->_templates[$template]['subtemplates'] as $condition => $spec )
-		{
-			if( $condition == '__default' )
-			{
-				$this->_addToCode( 'default:', 5 );
-			}
-			else
-			{
-				$this->_addToCode( 'case "'.$condition.'":', 5 );
-			}
-			$content = $this->_templateToPHP( $spec['data'], $template );
-			$this->_addToCode( $content );
-			$this->_addToCode( 'break;', 6 );
-		}
-		$this->_addToCode( '}', 4 );
-		$this->_addToCode( '}', 3 );
-		return true;
-	}
-
-   /**
-	* compile built-in conditions
-	*
-	* This will create the neccessary PHP code for:
-	* - __first
-	* - __last
-	*
-	* @access	private
-	* @param	string	template name
-	*/
-	function _compileBuiltinConditions( $template )
-	{
-		$this->_addToCode( '$_displayed = false;', 3 );
-
-		if( isset( $this->_templates[$template]['subtemplates']['__first'] ) )
-		{
-			$this->_addToCode( 'if( $this->_templates["'.$template.'"]["iteration"] == 0 ) {', 3, 'Check for first entry' );
-			$content = $this->_templateToPHP( $this->_templates[$template]['subtemplates']['__first']['data'], $template );
-			$this->_addToCode( $content );
-			$this->_addToCode( '$_displayed = true;', 4 );
-			$this->_addToCode( '}', 3 );
-		}
-
-		if( isset( $this->_templates[$template]['subtemplates']['__last'] ) )
-		{
-			$this->_addToCode( 'if( $this->_templates["'.$template.'"]["iteration"] == ($this->_templates["'.$template.'"]["loop"]-1) ) {', 3, 'Check for last entry' );
-			$content = $this->_templateToPHP( $this->_templates[$template]['subtemplates']['__last']['data'], $template );
-			$this->_addToCode( $content );
-			$this->_addToCode( '$_displayed = true;', 4 );
-			$this->_addToCode( '}', 3 );
-		}
-	}
-
-   /**
-	* build PHP code from a template
-	*
-	* This will replace the variables in a template with
-	* PHP Code.
-	*
-	* @access	private
-	* @param	string		template content
-	* @param	string		name of the template
-	* @return	string		PHP code
-	*/
-	function _templateToPHP( $content, $template )
-	{
-		$content = preg_replace( $this->_varRegexp, '<?PHP echo $this->_getVar( "'.$template.'", "$1"); ?>', $content  );
-		$content = preg_replace( $this->_depRegexp, '<?PHP compiledTemplate::$1(); ?>', $content  );
-		$content = '?>'.$content.'<?PHP';
-		return $content;	
-	}
-	
-
-   /**
-	* display the compiled template
-	*
-	* This is a replacement for patTemplate::displayParsedTemplate.
-	*
-	* @access	public
-	* @param	string		name of the template to display
-	*/
-    function displayParsedTemplate( $name = null )
-    {
-		if( is_null( $name ) )
-			$name = $this->_root;
-		
-		$name	=	strtolower( $name );
-
-		if( !is_callable( 'compiledTemplate', $name ) )
-		{
-			die( 'Unknown template' );
-		}
-		
-        compiledTemplate::$name();
-    }
-
-   /**
-	* add a line to the compiled code
-	*
-	* @access	public
-	* @param	string		line to add
-	* @param	integer		indentation
-	* @return	void
-	*/
-	function _addToCode( $line, $indent = 0, $comment = null )
-	{
-		if( !is_null( $comment ) )
-		{
-			fputs( $this->_fp, "\n" );
-	        if( $indent > 0 )
-	            fputs( $this->_fp, str_repeat( "\t", $indent ) );
-			fputs( $this->_fp, "/* $comment */\n" );
-		}
-        if( $indent > 0 )
-            fputs( $this->_fp, str_repeat( "\t", $indent ) );
-		fputs( $this->_fp, $line."\n" );
-	}
-
-   /**
-	* function, used by the compiler to get a value of a variable
-	*
-	* Checks, whether the value is locally or globally set
-	*
-	* @access	private
-	* @param	string		template
-	* @param	string		variable name
-	*
-	* @todo		check for 'unusedvars' attribute
-	*/
-	function _getVar( $template, $varname )
-	{
-		if( isset( $this->_templates[$template]['vars'][$varname] ) )
-			return $this->_templates[$template]['vars'][$varname];
-	
-		if( isset( $this->_globals[$this->_startTag.$varname.$this->_endTag] ) )
-			return $this->_globals[$this->_startTag.$varname.$this->_endTag];
-
-		return '';
-	}
-
-   /**
-	* prepare a template for the compiler
-	*
-	* @access	private
-	* @param	string		template name
-	*/
-	function _prepareCompiledTemplate( $template )
-	{
-		$this->_templates[$template]	=	array(
-													'attributes' => array(),
-													'copyVars'   => array(),
-												);
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Dump/Html.php 4.6rc2/includes/patTemplate/patTemplate/Dump/Html.php
--- 4.5.4/includes/patTemplate/patTemplate/Dump/Html.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Dump/Html.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,650 +0,0 @@
-<?PHP
-/**
- * Dumps templates as HTML
- *
- * $Id: Html.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Dump
- * @author		Sebastian Mordziol <argh@php-tools.net>
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Dumps templates as HTML
- *
- * @package		patTemplate
- * @subpackage	Dump
- * @author		Sebastian Mordziol <argh@php-tools.net>
- * @author		Stephan Schmidt <schst@php.net>
- *
- * @todo		move this into patTemplate_Dump_Dhtml and keep it free from javascript
- */
-class patTemplate_Dump_Html extends patTemplate_Dump
-{
-	var $colors	=	array(
-		'borders'			=>	'C8D3DA',
-		'headerFills'		=>	'E1E7EB',
-		'subHeaderFills'	=>	'F0F2F4',
-		'source'			=>	'F5F7F8',
-		'linkNormal'		=>	'8CA0B4',
-		'linkHover'			=>	'8BC3E0',
-	);
-	
-	var $_useBorders	=	false;
-
-   /**
-	* display the header
-	*
-	* @access	public
-	*/
-	function displayHeader()
-	{
-		echo '<html>';
-		echo ' <head>';
-		echo '  <style type="text/css">';
-		echo '   BODY,TD{';
-		echo '		font-family: Arial, Tahoma, sans-serif;';
-		echo '		font-size: 12px;';
-		echo '   }';
-		echo '   TABLE.patTemplate{';
-		echo '      border-collapse:collapse;';
-		echo '   }';
-		echo '   A.patTemplate{';
-		echo '		color:#'.$this->colors['linkNormal'].';';
-		echo '   }';
-		echo '   A.patTemplate:hover{';
-		echo '		color:#'.$this->colors['linkHover'].';';
-		echo '   }';
-		echo '   H1.patTemplate{';
-		echo '		margin: 0px;';
-		echo '		padding: 4px;';
-		echo '		font-size: 18px;';
-		echo '   }';
-		echo '   I.patTemplate{';
-		echo '		font-style:italic;';
-		echo '		color:#777777;';
-		echo '   }';
-		echo '   H2.patTemplate{';
-		echo '		background-color: #'.$this->colors['headerFills'].';';
-		echo '		margin: 0px;';
-		echo '		margin-bottom: 15px;';
-		echo '		padding: 4px;';
-		echo '		border-bottom: 1px dashed #'.$this->colors['borders'].';';
-		echo '		border-top: 1px dashed #'.$this->colors['borders'].';';
-		echo '		font-size: 14px;';
-		echo '   }';
-		echo '   H3.patTemplate,H3.patTemplateSub{';
-		echo '		background-color: #'.$this->colors['headerFills'].';';
-		echo '		margin: 0px;';
-		echo '		padding: 4px;';
-		echo '		border-bottom: 1px dashed #'.$this->colors['borders'].';';
-		echo '		border-top: 1px dashed #'.$this->colors['borders'].';';
-		echo '		font-size: 12px;';
-		echo '		font-weight: bold;';
-		echo '   }';
-		echo '   H3.patTemplateSub{';
-		echo '		background-color: #'.$this->colors['subHeaderFills'].';';
-		echo '		border:1px dashed #'.$this->colors['borders'].';';
-		echo '		font-weight:normal;';
-		echo '		margin-bottom:3px;';
-		echo '   }';
-		echo '   #patTemplateContent{';
-		echo '		width: 100%;';
-		echo '		background-color:#ffffff;';
-		echo '		border:dashed 1px #'.$this->colors['borders'].';';
-		echo '		padding:0px;';
-		echo '   }';
-		echo '   .patTemplateSection{';
-		echo '      margin-bottom:20px;';
-		echo '   }';
-		echo '   .patTemplateSubSection{';
-		echo '      margin-bottom:3px;';
-		echo '   }';
-		echo '   .patTemplateData{';
-		echo '      display:none;';
-		echo '   }';
-		echo '   .patTemplatePropBorder{';
-		echo '      white-space:nowrap;';
-		echo '		font-weight:bold;';
-		echo '      color:#333333;';
-		echo '      border:solid 1px #C8D3DA;';
-		echo '   }';
-		echo '   .patTemplateProp{';
-		echo '      white-space:nowrap;';
-		echo '		font-weight:bold;';
-		echo '      color:#333333;';
-		echo '   }';
-		echo '   .patTemplateSign{';
-		echo '      font-family:monospace;';
-		echo '   }';
-		echo '   .patTemplateClick{';
-		echo '      cursor:pointer;';
-		echo '   }';
-		echo '   .patTemplateCol{';
-		echo '      margin-bottom:8px;';
-		echo '      font-weight:bold;';
-		echo '   }';
-		echo '   .patTemplateTblCol{';
-		echo '      padding:8px;';
-		echo '      padding-right:15px;';
-		echo '      border-right:dashed 1px #'.$this->colors['borders'].';';
-		echo '   }';
-		echo '   .patTemplateTmplContent{';
-		echo '      padding:8px;';
-		echo '      border-top:dashed 1px #'.$this->colors['borders'].';';
-		echo '   }';
-		echo '   .patTemplateSource{';
-		echo '      padding:5px;';
-		echo '      font-family:monospace;';
-		echo '      background-color:#'.$this->colors['source'].';';
-		echo '      margin-bottom:8px;';
-		echo '   }';
-		echo '   .patTemplateVar{';
-		echo '		color: #009900;';
-		echo '      font-weight:bold;';
-		echo '   }';
-		echo '   .patTemplateVarBorder{';
-		echo '		color: #009900;';
-		echo '      font-weight:bold;';
-		echo '      border:solid 1px #C8D3DA;';
-		echo '   }';
-		echo '   .patTemplateVal{';
-		echo '		color:#333333;';
-		echo '   }';
-		echo '   .patTemplateValBorder{';
-		echo '		color: #333333;';
-		echo '      border:solid 1px #C8D3DA;';
-		echo '   }';
-		echo '   .patTemplateTmpl {';
-		echo '		color: #990000;';
-		echo '      font-weight:bold;';
-		echo '      cursor:pointer;';
-		echo '   }';
-		echo '  </style>';
-		echo ' <script language="JavaScript1.2" type="text/javascript">';
-		echo '   var tmpls = new Array();';
-		echo '   function patTemplateToggle( tmplName )';
-		echo '   {';
-		echo '      var el = document.getElementById( \'tmpl-\' + tmplName );';
-		echo '      if( el.style.display == \'block\' )';
-		echo '        patTemplateCollapse( tmplName );';
-		echo '      else';
-		echo '        patTemplateExpand( tmplName );';
-		echo '   }';
-		echo '   function jump( tmplName )';
-		echo '   {';
-		echo '      tmplName = tmplName.toLowerCase();';
-		echo '      patTemplateExpand( tmplName );';
-		echo '      document.location = \'#\' + tmplName';
-		echo '   }';
-		echo '   function patTemplateExpandAll()';
-		echo '   {';
-		echo '     	for( var i = 0; i < tmpls.length; i++ )';
-		echo '        patTemplateExpand( tmpls[i] );';
-		echo '   }';
-		echo '   function patTemplateCollapseAll()';
-		echo '   {';
-		echo '     	for( var i = 0; i < tmpls.length; i++ )';
-		echo '        patTemplateCollapse( tmpls[i] );';
-		echo '   }';
-		echo '   function patTemplateExpand( tmplName )';
-		echo '   {';
-		echo '      var el1 = document.getElementById( \'tmpl-\' + tmplName );';
-		echo '      var el2 = document.getElementById( \'tmpl-\' + tmplName + \'-sign\' );';
-		echo '      el1.style.display = \'block\';';
-		echo '      el2.innerHTML = \'[-]\';';
-		echo '   }';
-		echo '   function patTemplateCollapse( tmplName )';
-		echo '   {';
-		echo '      var el1 = document.getElementById( \'tmpl-\' + tmplName );';
-		echo '      var el2 = document.getElementById( \'tmpl-\' + tmplName + \'-sign\' );';
-		echo '      el1.style.display = \'none\';';
-		echo '      el2.innerHTML = \'[+]\';';
-		echo '   }';
-		echo '   function patTemplateAddTmpl( tmplName )';
-		echo '   {';
-		echo '      tmpls.push( tmplName );';
-		echo '   }';
-		echo ' </script>';
-		echo ' </head>';
-		echo '<body>';
-		echo ' <div id="patTemplateContent">';
-		echo ' <h1 class="patTemplate">patTemplate Dump</h1>';
-	}
-
-   /**
-	* dump the global variables
-	*
-	* @access	public
-	* @param	array		array containing all global variables
-	*/
-	function dumpGlobals( $globals )
-	{
-		echo '<div class="patTemplateSection"><h2 class="patTemplate">Global template variables ('.count( $globals ).')</h2>';
-		if( !empty( $globals ) )
-		{
-			echo '<div class="patTemplateSubSection" style="padding:5px;">';
-			echo '  <table border="0" cellpadding="0" cellpadding="0" class="patTemplate">';
-			foreach( $globals as $key => $value )
-			{
-				$this->_displayLine( $key, $value );
-			}
-			echo '  </table>';
-			echo '</div></div>';
-		}
-	}
-
-   /**
-	* dump the templates
-	*
-	* @access	public
-	* @param	array	templates
-	*/
-	function dumpTemplates( $templates, $vars )
-	{
-		$templates = array_reverse( $templates );
-
-		echo '<div class="patTemplateSection"><h2 class="patTemplate">Templates ('.count( $templates ).') &nbsp; <span style="font-size:12px;font-weight:normal;"><a href="javascript:patTemplateExpandAll();" class="patTemplate">Expand all</a> | <a href="javascript:patTemplateCollapseAll();" class="patTemplate">Collapse all</a></span></h2>';
-		echo '<div class="patTemplateData">Dumping selected templates...</div>';
-		
-		foreach( $templates as $name => $tmpl )
-		{
-			if( !isset( $vars[$name] ) )
-				$vars[$name] = array();
-
-			$vars[$name] = $this->_flattenVars( $vars[$name] );
-
-			echo '<div class="patTemplateSubSection">';
-			echo '  <h3 class="patTemplate" onclick="patTemplateToggle(\''.$name.'\');" style="cursor:pointer;"><span id="tmpl-'.$name.'-sign" class="patTemplateSign">[+]</span> Template <a name="'.$name.'">"'.$name.'"</a></h3>';
-			echo '  <div class="patTemplateData" id="tmpl-'.$name.'">';
-			echo '    <script language="JavaScript1.2" type="text/javascript">';
-			echo '      patTemplateAddTmpl( \''.$name.'\' );';
-			echo '    </script>';
-			echo '    <table cellpadding="0" cellspacing="0" border="0">';
-			echo '      <tr valign="top">';
-			echo '        <td style="width:200px;" class="patTemplateTblCol">';
-
-							$this->_displayAttributes( $tmpl, $name );
-
-			echo '        </td>';
-			echo '        <td class="patTemplateTblCol" style="width:130px;">';
-
-							$this->_displayTemplateState( $tmpl );			
-
-			echo '        </td>';
-			echo '        <td class="patTemplateTblCol" style="width:130px;">';
-			echo '          <div class="patTemplateCol">Dependencies</div>';
-
-							if( !empty( $tmpl['dependencies'] ) )
-							{
-								$dependencies = array();
-								foreach( $tmpl['dependencies'] as $dependency )
-									array_push( $dependencies, '<a href="javascript:jump( \''.$dependency.'\' );" class="patTemplate">'.$dependency.'</a>' );
-					
-								echo implode( '<br>', $dependencies );
-							}
-							else
-							{
-								echo '<i class="patTemplate">[none]</i>';
-							}
-
-			echo '        </td>';
-			echo '      </tr>';
-			echo '    </table>';
-
-			
-			/**
-			 * ------------------------------------------------------------------
-			 * display variables
-			 */
-			$nestedTypes = array(
-				'condition',
-				'modulo',
-			);
-			
-			if( in_array( $tmpl['attributes']['type'], $nestedTypes ) )
-			{
-				$content = '';
-				
-				foreach( $tmpl['subtemplates'] as $subName => $subDetails )
-				{
-					$content .= $subDetails['data'];
-				}
-			}
-			else
-			{
-				$content = $tmpl['content'];
-			}
-			
-			$setVars = $this->_extractVars( $content );
-
-			echo '<div class="patTemplateTmplContent">';
-			echo '  <div class="patTemplateCol">Variables</div>';
-					$this->_displayVariables( $tmpl, $name, $setVars, $vars );
-			echo '</div>';
-
-			if( !empty( $tmpl['comments'] ) )
-			{
-				echo '    <div class="patTemplateTmplContent">';
-				echo '      <div class="patTemplateCol">Comments</div>';
-				echo '      <div style="margin-bottom:7px;">';
-							  echo implode( '<br>', $tmpl['comments'] );
-				echo '      </div>';
-				echo '    </div>';
-			}
-			
-			/**
-			 * ------------------------------------------------------------------
-			 * display template content
-			 */
-			echo '    <div class="patTemplateTmplContent">';
-			switch( $tmpl['attributes']['type'] )
-			{
-				case 'condition':
-				case 'modulo':
-					$this->_displayConditions( $tmpl, $name, $vars );
-					break;
-
-				default:
-					echo '      <div class="patTemplateCol">Content</div>';
-					echo '      <div class="patTemplateSource"><pre>'.$this->_highlightVars( htmlspecialchars( $tmpl['content'] ), $vars[$name] ).'</pre></div>';
-					break;
-			}
-
-			echo '    </div>';
-			echo '  </div>';
-			echo '</div>';
-		}
-		
-		echo '</div>';
-	}
-	
-	function _displayVariables( $tmpl, $tmplName, $setVars, $vars )
-	{
-		if( empty( $setVars ) )
-		{
-			echo '<i class="patTemplate">[none]</i>';
-			return true;
-		}
-		
-		echo '<table border="0" cellpadding="3" cellpadding="0" class="patTemplate">';
-		$this->_useBorders( true );
-		$this->_displayHead( 'Name', 'Assigned value', 'Modifier' );
-
-		foreach( $setVars as $var )
-		{
-			if( isset( $vars[$tmplName][$var] ) )
-				$value = $vars[$tmplName][$var];
-			else
-				$value = '<i class="patTemplate">[no value set]</i>';
-
-			if( isset( $tmpl['modifyVars'][$var] ) )
-			{
-				$params	=	array();
-				foreach( $tmpl['modifyVars'][$var]['params'] as $n => $val )
-				{
-					array_push( $params, $n.'="'.$val.'"' );
-				}
-				$modifier = sprintf( '%s( %s )', $tmpl['modifyVars'][$var]['mod'], implode( ', ', $params ) );
-			}
-			else
-			{
-				$modifier = '<i class="patTemplate">[none]</i>';
-			}
-				
-			$this->_displayLine( $var, $value, $modifier );
-		}
-		echo '</table>';
-
-		$this->_useBorders( false );
-	}
-	
-	function _displayConditions( $tmpl, $tmplName, $vars )
-	{
-		foreach( $tmpl['subtemplates'] as $cond => $spec )
-		{
-			echo '  <h3 class="patTemplateSub" onclick="patTemplateToggle(\'Cond'.$cond.'\');" style="cursor:pointer;"><span id="tmpl-Cond'.$cond.'-sign" class="patTemplateSign">[+]</span> Subtemplate <a name="Cond'.$cond.'">"'.$cond.'"</a></h3>';
-			echo '  <div class="patTemplateData" id="tmpl-Cond'.$cond.'" style="margin-bottom:15px;">';
-			echo '    <script language="JavaScript1.2" type="text/javascript">';
-			echo '      patTemplateAddTmpl( \'Cond'.$cond.'\' );';
-			echo '    </script>';
-			
-			if( !empty( $spec['comments'] ) )
-			{
-				echo '    <div class="patTemplateCol">Comments</div>';
-				echo '    <div style="margin-bottom:7px;">';
-							echo implode( '<br>', $spec['comments'] );
-				echo '    </div>';
-			}
-
-				echo '    <div class="patTemplateCol">Dependencies</div>';
-				echo '    <div style="margin-bottom:7px;">';
-			if( !empty( $spec['dependencies'] ) )
-			{
-				$dependencies = array();
-				foreach( $spec['dependencies'] as $dependency )
-					array_push( $dependencies, '<a href="javascript:jump( \''.$dependency.'\' );" class="patTemplate">'.$dependency.'</a>' );
-	
-				echo implode( ', ', $dependencies );
-			}
-			else
-			{
-				echo '<i class="patTemplate">[none]</i>';
-			}
-				echo '    </div>';
-			
-			echo '    <div class="patTemplateCol">Content</div>';
-			echo '    <div class="patTemplateSource"><pre>'.$this->_highlightVars( htmlspecialchars( $spec['data'] ), $vars[$tmplName] ).'</pre></div>';
-			echo '  </div>';
-		}
-	}
-	
-   /**
-    * display the attributes of a template
-    *
-    * @access   private
-    * @param    array       template data
-    * @param    string      name of the template
-    */
-	function _displayAttributes( $tmpl, $tmplName = null )
-	{
-		echo '<div class="patTemplateCol">Attributes</div>';
-		echo '<table border="0" cellpadding="0" cellpadding="0">';
-		
-		/**
-		 * type
-		 */
-		switch( $tmpl['attributes']['type'] )
-		{
-			case 'modulo':
-				if( $tmpl['attributes']['modulo'] == 2 )
-					$type = 'OddEven';
-				else
-					$type = 'modulo (' . $tmpl['attributes']['modulo'] . ')';
-			case 'condition':
-				if( !isset( $type ) )
-					$type	=	'condition';
-
-				$this->_displayLine( 'Type', $tmpl['attributes']['type'] );
-				/**
-				 * condition variable, only used in condition templates
-				 */
-				if( isset( $tmpl['attributes']['conditionvar'] ) )
-				{
-					if( isset( $tmpl['attributes']['conditiontmpl'] ) )
-						$this->_displayLine( 'ConditionVar', $tmpl['attributes']['conditiontmpl'].'.'.$tmpl['attributes']['conditionvar'] );
-					elseif( isset( $tmpl['attributes']['useglobals'] ) && $tmpl['attributes']['useglobals'] == 'yes' )
-						$this->_displayLine( 'ConditionVar', '__globals.'.$tmpl['attributes']['conditionvar'] );
-					else
-						$this->_displayLine( 'ConditionVar', $tmpl['attributes']['conditionvar'] );
-				}
-				break;
-
-			case 'simplecondition':
-				$this->_displayLine( 'Type', 'simplecondition' );
-				$requiredvars = array();
-				foreach ($tmpl['attributes']['requiredvars'] as $tmp) {
-				    if ($tmp[0] !== $tmplName) {
-				    	$var = $tmp[0] . '.' . $tmp[1];
-				    } else {
-				    	$var = $tmp[1];
-				    }
-				    if ($tmp[2] !== null) {
-				    	$var = $var . '='.$tmp[2];
-				    }
-				    array_push($requiredvars, $var);
-				}
-				
-				$this->_displayLine( 'RequiredVars', implode( ', ', $requiredvars ) );
-
-				break;
-			default:
-				$this->_displayLine( 'Type', $tmpl['attributes']['type'] );
-		}
-
-		/**
-		 * standard attributes
-		 */
-		$this->_displayLine( 'Visibility', $tmpl['attributes']['visibility'] );
-		$this->_displayLine( 'WhiteSpace', $tmpl['attributes']['whitespace'] );
-		$this->_displayLine( 'AddSystemVars', $tmpl['attributes']['addsystemvars'] );
-		$this->_displayLine( 'UnusedVars', $tmpl['attributes']['unusedvars'] );
-
-		/**
-		 * external source
-		 */
-		if( isset( $tmpl['attributes']['src'] ) )
-			$this->_displayLine( 'External Src', $tmpl['attributes']['src'] );
-		/**
-		 * varscope
-		 */
-		if( isset( $tmpl['attributes']['varscope'] ) )
-			$this->_displayLine( 'Varscope', $tmpl['attributes']['varscope'] );
-
-		echo '          </table>';
-	}
-	
-	function _displayTemplateState( $tmpl )
-	{
-			echo '          <div class="patTemplateCol">States</div>';
-			echo '          <table border="0" cellpadding="0" cellpadding="0">';
-							$this->_displayLine( 'Loaded', $tmpl['loaded'] );
-							$this->_displayLine( 'Parsed', $tmpl['parsed'] );
-			echo '          </table>';
-	}
-
-   /**
-	* hilight variables in a template
-	*
-	* @access	private
-	* @param	string		template content
-	* @return	string		template content
-	*/
-	function _highlightVars( $template, $vars )
-	{
-		$pattern  = '/('.$this->_tmpl->getStartTag().'TMPL\:([^a-z]+)'.$this->_tmpl->getEndTag().')/U';
-		$template = preg_replace( $pattern, '<span class="patTemplateTmpl" onclick="jump(\'\2\')" title="Click to view the dependency \'\2\'.">\1</span>', $template );
-		
-		$pattern = '/('.$this->_tmpl->getStartTag().'([^a-z:]+)'.$this->_tmpl->getEndTag().')/U';
-		$matches = array();
-		preg_match_all( $pattern, $template, $matches );
-		for( $i = 0; $i < count( $matches[1] ); $i++ )
-		{
-			if( isset( $vars[$matches[2][$i]] ) )
-			{
-				$value = $vars[$matches[2][$i]];
-			}
-			else
-			{
-				$value = '[No value set]';
-			}
-			$replace  = '<span class="patTemplateVar" title="'.$value.'">'.$matches[1][$i].'</span>';
-			$template = str_replace( $matches[1][$i], $replace, $template );
-		}
-		return $template;
-	}
-	
-   /**
-	* display a table header
-	*
-	* @access	private
-	* @param	string		property
-	* @param	mixed		value, you may pass more than one value
-	*/
-	function _displayHead()
-	{
-		$args		=	func_get_args();
-
-		echo '  <tr valign="top">';
-		foreach( $args as $head )
-		{
-			printf( '   <td class="'.$this->_getClassName( 'patTemplateProp' ).'">%s</td>', $head );
-		}
-		echo '  </tr>';
-	}
-	
-	function _getClassName( $class )
-	{
-		if( !$this->_useBorders )
-			return $class;
-			
-		return $class .= 'Border';
-	}
-	
-   /**
-	* sets whether to draw borders in the tables generated via the
-	* {@link _displayHead()} and {@link _displayLine()} methods.
-	*
-	* @access	private
-	* @param	bool		$state	Whether to draw the borders. true=draw, false=don't draw
-	*/
-	function _useBorders( $state )
-	{
-		$this->_useBorders = $state;
-	}
-	
-   /**
-	* display a line in a table
-	*
-	* @access	private
-	* @param	string		property
-	* @param	mixed		value, you may pass more than one value
-	*/
-	function _displayLine( $prop, $value )
-	{
-		$args	=	func_get_args();
-		$prop	=	array_shift( $args );
-
-		echo '  <tr valign="top">';
-		printf( '   <td class="'.$this->_getClassName( 'patTemplateProp' ).'">%s</td>', $prop );
-		if( count( $args ) == 1 )
-		{
-			echo '   <td class="'.$this->_getClassName( 'patTemplateVal' ).'">&nbsp;:&nbsp;</td>';
-		}
-		
-		foreach( $args as $value )
-		{
-			if( is_bool( $value ) )
-			{
-				$value = ( $value === true ) ? 'yes' : 'no';
-			}
-			
-			printf( '   <td class="'.$this->_getClassName( 'patTemplateVal' ).'">%s</td>', $value );
-		}
-		echo '  </tr>';
-	}
-	
-   /**
-	* display the footer
-	*
-	* @access	public
-	*/
-	function displayFooter()
-	{
-		echo ' </div>';
-		echo ' </body>';
-		echo '</html>';
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Dump.php 4.6rc2/includes/patTemplate/patTemplate/Dump.php
--- 4.5.4/includes/patTemplate/patTemplate/Dump.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Dump.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,157 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate dumpers
- *
- * $Id: Dump.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * The dump functionality is separated from the main class
- * for performance reasons.
- *
- * @package		patTemplate
- * @subpackage	Dump
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate dumpers
- *
- * The dump functionality is separated from the main class
- * for performance reasons.
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Dump
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Dump extends patTemplate_Module
-{
-   /**
-    * reference to the patTemplate object that instantiated the module
-	*
-	* @access	protected
-	* @var	object
-	*/
-	var	$_tmpl;
-
-   /**
-    * set a reference to the patTemplate object that instantiated the reader
-	*
-	* @access	public
-	* @param	object		patTemplate object
-	*/
-	function setTemplateReference( &$tmpl )
-	{
-		$this->_tmpl		=	&$tmpl;
-	}
-
-   /**
-	* display the header
-	*
-	* @access	public
-	*/
-	function displayHeader()
-	{
-	}
-
-   /**
-	* dump the global variables
-	*
-	* @access	public
-	* @param	array		array containing all global variables
-	* @abstract
-	*/
-	function dumpGlobals( $globals )
-	{
-	}
-	
-   /**
-	* dump the templates
-	*
-	* This method has to be implemented in the dumpers.
-	*
-	* @access	public
-	* @abstract
-	* @param	array	templates
-	* @param	array	variables
-	*/
-	function dumpTemplates( $templates, $vars )
-	{
-	}
-
-   /**
-	* display the footer
-	*
-	* @access	public
-	*/
-	function displayFooter()
-	{
-	}
-
-   /**
- 	* flatten the variables
-	*
-	* This will convert the variable definitions
-	* to a one-dimensional array. If there are
-	* rows defined, they will be converted to a string
-	* where the values are seperated with commas.
-	*
-	* @access	private
-	* @param	array		variable definitions
-	* @return	array		flattened variables
-	*/
-	function _flattenVars( $vars )
-	{
-		$flatten	=	array();
-		foreach( $vars['scalar'] as $var => $value )
-		{
-			$flatten[$var]	=	$value;
-		}
-		foreach( $vars['rows'] as $row )
-		{
-			foreach( $row as $var => $value )
-			{
-				if( !isset( $flatten[$var] ) || !is_array( $flatten[$var] ) )
-					$flatten[$var]	=	array();
-				array_push( $flatten[$var], $value );
-			}
-		}
-
-		foreach( $flatten as $var => $value )
-		{
-			if( !is_array( $value ) )
-				continue;
-				
-			$flatten[$var] = '['.count($value).' rows] ('.implode( ', ', $value ).')';
-		}
-
-		return $flatten;
-	}
-
-   /**
-	* extract all variables from a template
-	*
-	* @access	private
-	* @param	string		template content
-	* @return	array		array containing all variables
-	*/
-	function _extractVars( $template )
-	{
-		$pattern = '/'.$this->_tmpl->getStartTag().'([^a-z]+)'.$this->_tmpl->getEndTag().'/U';
-		
-		$matches = array();
-		
-		$result = preg_match_all( $pattern, $template, $matches );
-		if( $result == false )
-			return array();
-
-		$vars = array();
-		foreach( $matches[1] as $var )
-		{
-			if( strncmp( $var, 'TMPL:', 5 ) === 0 )
-				continue;
-			array_push( $vars, $var );
-		}
-		return array_unique( $vars );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Alias.php 4.6rc2/includes/patTemplate/patTemplate/Function/Alias.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Alias.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Alias.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,54 +0,0 @@
-<?PHP
-/**
- * creates a new function alias
- *
- * $Id: Alias.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * creates a new function alias
- *
- * Possible attributes:
- * - alias => new alias
- * - function => function to call
- *
- * $Id: Alias.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Alias extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Alias';
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		if( !isset( $params['alias'] ) )
-            return false;
-
-		if( !isset( $params['function'] ) )
-            return false;
-
-        $this->_reader->addFunctionAlias($params['alias'], $params['function']);
-        return '';
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Attribute.php 4.6rc2/includes/patTemplate/patTemplate/Function/Attribute.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Attribute.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Attribute.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,54 +0,0 @@
-<?PHP
-/**
- * patTemplate function to dynamically change the
- * value of _any_ attribute of the parent tag.
- *
- * $Id: Attribute.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate function to dynamically change the
- * value of _any_ attribute of the parent tag.
- *
- * Possible attributes:
- * - name => name of the attribute to change
- *
- * The enclosed data will be used as the value of the attribute.
- *
- * $Id: Attribute.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Attribute extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Attribute';
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		if( isset( $params['name'] ) )
-		{ 
-			$this->_reader->_addToParentTag( 'attributes', $content, $params['name'] );
-		}
-		return '';
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Call.php 4.6rc2/includes/patTemplate/patTemplate/Function/Call.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Call.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Call.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,116 +0,0 @@
-<?PHP
-/**
- * patTemplate function that enables you to insert any
- * template, that has been loaded previously into the
- * current template.
- *
- * You may pass any variables to the template.
- *
- * $Id: Call.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * template does not exist
- */
-define( 'PATTEMPLATE_FUNCTION_CALL_ERROR_NO_TEMPLATE', 'patTemplate::Function::Call::NT' );
- 
-/**
- * patTemplate function that enables you to insert any
- * template, that has been loaded previously into the
- * current template.
- *
- * You may pass any variables to the template.
- *
- * $Id: Call.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Call extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Call';
-
-   /**
-    * reference to the patTemplate object that instantiated the module
-	*
-	* @access	protected
-	* @var	object
-	*/
-	var	$_tmpl;
-
-   /**
-    * set a reference to the patTemplate object that instantiated the reader
-	*
-	* @access	public
-	* @param	object		patTemplate object
-	*/
-	function setTemplateReference( &$tmpl )
-	{
-		$this->_tmpl = &$tmpl;
-	}
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		// get the name of the template to use
-		if (isset($params['template'])) {
-			$tmpl = $params['template'];
-			unset( $params['template'] );
-		} elseif (isset($params['_originalTag'])) {
-			$tmpl = $params['_originalTag'];
-			unset( $params['_originalTag'] );
-		} else {
-			return patErrorManager::raiseError( PATTEMPLATE_FUNCTION_CALL_ERROR_NO_TEMPLATE, 'No template for Call function specified.' );
-		} 
-		
-		if (!$this->_tmpl->exists( $tmpl )) {
-
-			$tmpl = strtolower($tmpl);
-			
-			// try some autoloading magic
-			$componentLocation  = $this->_tmpl->getOption('componentFolder');
-			$componentExtension = $this->_tmpl->getOption('componentExtension');
-			$filename = $componentLocation . '/' . $tmpl . '.' . $componentExtension;
-			$this->_tmpl->readTemplatesFromInput($filename);
-			
-			// still does not exist
-			if( !$this->_tmpl->exists( $tmpl ) ) {
-				return patErrorManager::raiseError( PATTEMPLATE_FUNCTION_CALL_ERROR_NO_TEMPLATE, 'Template '.$tmpl.' does not exist' );
-			}
-		}
-		
-		/**
-		 * clear template and all of its dependencies
-		 */
-		$this->_tmpl->clearTemplate( $tmpl, true );
-		
-		/**
-		 * add variables
-		 */
-		$this->_tmpl->addVars( $tmpl, $params );
-		$this->_tmpl->addVar( $tmpl, 'CONTENT', $content );
-		
-		/**
-		 * get content
-		 */
-		return $this->_tmpl->getParsedTemplate( $tmpl );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Globalvar.php 4.6rc2/includes/patTemplate/patTemplate/Function/Globalvar.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Globalvar.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Globalvar.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,85 +0,0 @@
-<?PHP
-/**
- * patTemplate function that enables adding global variables
- * from within a template.
- *
- * $Id: Globalvar.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Sebastian Mordziol <argh@php-tools.net>
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate function that enables adding global variables
- * from within a template.
- *
- * Available attributes:
- *
- * name     >  name of the variable
- * default  >  default value of the variable
- * hidden   >  whether to output the content of the variable: yes|no
- *
- * $Id: Globalvar.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Sebastian Mordziol <argh@php-tools.net>
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Globalvar extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Globalvar';
-
-   /**
-    * reference to the patTemplate object that instantiated the module
-	*
-	* @access	protected
-	* @var	object
-	*/
-	var	$_tmpl;
-
-   /**
-    * set a reference to the patTemplate object that instantiated the reader
-	*
-	* @access	public
-	* @param	object		patTemplate object
-	*/
-	function setTemplateReference( &$tmpl )
-	{
-		$this->_tmpl		=	&$tmpl;
-	}
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		if( isset( $params['default'] ) )
-		{
-			$this->_tmpl->addGlobalVar( $params['name'], $params['default'] );
-		}
-		
-		if( !isset( $params['hidden'] ) )
-		{
-			$params['hidden'] = 'no';
-		}
-		
-		if( $params['hidden'] != 'yes' )
-			return $this->_tmpl->getOption('startTag').strtoupper($params['name']).$this->_tmpl->getOption('endTag');
-			
-		return '';
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Mambo.php 4.6rc2/includes/patTemplate/patTemplate/Function/Mambo.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Mambo.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Mambo.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,102 +0,0 @@
-<?php
-/**
-* @version $Id: Mambo.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-class patTemplate_Function_Mambo extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Mambo';
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/
-	function call( $params, $content )
-	{
-		if( !isset( $params['macro'] ) ) {
-            return false;
-		}
-
-        $macro = strtolower( $params['macro'] );
-		$page =& $GLOBALS['mainframe']->getPage();
-
-        switch ($macro) {
-
-        	case 'initeditor':
-        		return initEditor( true );
-        		break;
-
-        	case 'mainbody':
-        		return $page->showMainBody();
-        		break;
-
-        	case 'loadcomponent':
-        		// deprecated ??
-				if( !isset( $params['component'] ) ) {
-		            return false;
-				} else {
-					return $page->showComponent( $params['component'] );
-				}
-        		break;
-
-			case 'hasmodules':
-				$position = mosGetParam( $params, 'position', '' );
-
-				if ($page->countModules( $position ) > 0) {
-					return $content;
-				} else {
-					return false;
-				}
-        		break;
-
-         	case 'loadmodule':
-				$name = mosGetParam( $params, 'name', '' );
-				$style = mosGetParam( $params, 'style', 0 );
-				ob_start();
-				$page->showModule( $name, $style );
-				$html = ob_get_contents();
-				ob_end_clean();
-				return $html;
-        		break;
-
-        	case 'loadmodules':
-				$position = mosGetParam( $params, 'position', '' );
-				$style = mosGetParam( $params, 'style', 0 );
-				ob_start();
-				$page->showModules( $position, $style );
-				$html = ob_get_contents();
-				ob_end_clean();
-				return $html;
-        		break;
-
-	       	case 'showhead':
-        		return $page->showHead();
-        		break;
-
-        	case 'pathway':
-				$Itemid = mosGetParam( $_REQUEST, 'Itemid', '' );
-				ob_start();
-				require $GLOBALS['_CONFIG']->SITEPATH . '/includes/pathway.php';
-				$html = ob_get_contents();
-				ob_end_clean();
-				return $html;
-        		break;
-		}
-
-		return false;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Phphighlight.php 4.6rc2/includes/patTemplate/patTemplate/Function/Phphighlight.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Phphighlight.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Phphighlight.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,47 +0,0 @@
-<?PHP
-/**
- * patTemplate function that highlights PHP code in your templates
- *
- * $Id: Phphighlight.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate function that highlights PHP code in your templates
- *
- * $Id: Phphighlight.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Phphighlight extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Phphighlight';
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		ob_start();
-		highlight_string( $content );
-		$content = ob_get_contents();
-		ob_end_clean();
-		return $content;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Strip.php 4.6rc2/includes/patTemplate/patTemplate/Function/Strip.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Strip.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Strip.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,45 +0,0 @@
-<?PHP
-/**
- * patTemplate function that strips whitespace from a text
- * block. This is an implementation of Smarty's strip function.
- *
- * $Id: Strip.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate function that strips whitespace from a text
- * block. This is an implementation of Smarty's strip function.
- *
- * $Id: Strip.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Strip extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Strip';
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		return preg_replace( '/\s+/m', ' ', $content );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Time.php 4.6rc2/includes/patTemplate/patTemplate/Function/Time.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Time.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Time.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,60 +0,0 @@
-<?PHP
-/**
- * patTemplate function that calculates the current time
- * or any other time and returns it in the specified format.
- *
- * $Id: Time.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate function that calculates the current time
- * or any other time and returns it in the specified format.
- *
- * $Id: Time.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function_Time extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Time';
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		if( !empty( $content ) )
-		{
-			$params['time'] = $content;
-		}
-		
-		if( isset( $params['time'] ) )
-		{
-			$params['time'] = strtotime( $params['time'] );
-		}
-		else
-		{
-			$params['time'] = time();
-		}
-		
-		
-		return date( $params['format'], $params['time'] );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function/Translate.php 4.6rc2/includes/patTemplate/patTemplate/Function/Translate.php
--- 4.5.4/includes/patTemplate/patTemplate/Function/Translate.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function/Translate.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,328 +0,0 @@
-<?PHP
-/**
- * patTemplate function that emulates gettext's behaviour
- * 
- * This can be used to create multi-lingual websites.
- * When the template is read, all texts inside the
- * Translation tags are extracted and written to a file
- * called '$tmplname-default.ini'. 
- *
- * You should copy this file and translate all sentences.
- * When the template is used the next time, the sentences
- * will be replaced with their respective translations,
- * according to the langanuge you set with:
- * <code>
- * $tmpl->setOption( 'lang', 'de' );
- * </code>
- *
- * $Id: Translate.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate function that emulates gettext's behaviour
- * 
- * This can be used to create multi-lingual websites.
- * When the template is read, all texts inside the
- * Translation tags are extracted and written to a file
- * called '$tmplname-default.ini'. 
- *
- * You should copy this file and translate all sentences.
- * When the template is used the next time, the sentences
- * will be replaced with their respective translations,
- * according to the langanuge you set with:
- * <code>
- * $tmpl->setOption( 'lang', 'de' );
- * </code>
- *
- * $Id: Translate.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- * @todo		add error management
- */
-class patTemplate_Function_Translate extends patTemplate_Function
-{
-   /**
-	* name of the function
-	* @access	private
-	* @var		string
-	*/
-	var $_name	=	'Translate';
-
-   /**
-	* configuration of all files
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_config	=	array();
-
-   /**
-	* global config
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_globalconfig	=	array();
-
-   /**
-	* list of all sentences
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_sentences	=	array();
-	
-   /**
-	* translations of the language files
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_translation = array();
-
-   /**
-    * reference to the patTemplate object that instantiated the module
-	*
-	* @access	protected
-	* @var	object
-	*/
-	var	$_tmpl;
-
-   /**
-    * set a reference to the patTemplate object that instantiated the reader
-	*
-	* @access	public
-	* @param	object		patTemplate object
-	*/
-	function setTemplateReference( &$tmpl )
-	{
-		$this->_tmpl		=	&$tmpl;
-	}
-
-   /**
-	* call the function
-	*
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-		/**
-		 * nothing to translate
-		 */
-		if( empty( $content ) )
-		{
-			return;
-		}
-
-		if( empty( $this->_globalconfig ) )
-			$this->_retrieveGlobalConfig();
-		
-		$input = $this->_reader->getCurrentInput();
-		
-		/**
-		 * get config
-		 */
-		if( empty( $this->_config[$input] ) )
-		{
-			//$this->_retrieveConfig( $input );
-			$this->_loadTranslationFile( $input );
-		}
-
-		/**
-		 * unique key for the sentence to translate
-		 */
-		if( isset( $params['key'] ) )
-			$key	=	$params['key'];
-		else
-			$key	=	'';
-
-		/**
-		 * does this already exists?
-		 */
-		/*
-		if( !isset( $this->_sentences[$key] ) )
-		{
-			$this->_sentences[$key]	=	$content;
-			//$this->_addToTranslationFile( $input, $key, $content );
-		}
-		*/
-
-		$ucContent = strtoupper( $content );
-		/**
-		 * has it been translated?
-		 */
-		if( isset( $this->_translation[$key] ) )
-		{
-			return $this->_translation[$key];
-		}
-		/**
-		 * try original string
-		 */
-		else if( isset( $this->_translation[$ucContent] ) )
-		{
-			return $this->_translation[$ucContent];
-		}
-
-		/**
-		 * use original sentence
-		 */
-		return $content;
-	}
-
-   /**
-	* get the global configuration
-	*
-	* This method fetches the selected language and the translation folder
-	* as it is shared by all templates.
-	*
-	* @access	private
-	* @return	boolean		currently always returns true
-	*/
-	function _retrieveGlobalConfig()
-	{
-		/**
-		 * get config values from patTemplate
-		 */
-		$this->_globalconfig['lang'] = $this->_tmpl->getOption( 'lang' );
-		if( !is_array( $this->_globalconfig['lang'] ) )
-		{
-			if( $this->_globalconfig['lang'] == 'auto' )
-				$this->_globalconfig['lang'] = $this->_guessLanguage();
-			else
-				$this->_globalconfig['lang'] = array( $this->_globalconfig['lang'] );
-		}
-		
-		$this->_globalconfig['translationFolder'] = $this->_tmpl->getOption( 'translationFolder' );
-		
-		return true;
-	}
-	
-   /**
-	* retrieve configuration
-	*
-	* This method sets the used files and loads the original sentence file, if it exists.
-	*
-	* @access	private
-	* @param	string		current input that is used by patTemplate
-	* @return	boolean		true on success
-	*/
-	function _retrieveConfig( $input )
-	{
-		if( !is_array( $this->_config ) )
-			$this->_config	=	array();
-
-		$this->_config[$input] = array();
-		$this->_sentences[$input] = array();
-		
-		$this->_config[$input]['sentenceFile'] = $this->_tmpl->getOption( 'translationFolder' ) . '/'.$input.'-default.ini';
-		$this->_config[$input]['langFile'] = $this->_tmpl->getOption( 'translationFolder' ) . '/'.$input.'-%s.ini';
-
-		/**
-		 * get the 'gettext' source file
-		 */
-		$this->_sentences[$input]	=	@parse_ini_file( $this->_config[$input]['sentenceFile'] );
-		if( !is_array( $this->_sentences[$input] ) )
-			$this->_sentences[$input] = array();
-		else
-			$this->_sentences[$input] = array_map( array( $this, '_unescape' ), $this->_sentences[$input] );
-		
-		
-		return true;
-	}
-
-   /**
-	* load the translation file
-	*
-	* @access	private
-	* @param	string		current input that is used by patTemplate
-	* @return	boolean		true on success
-	*/
-	function _loadTranslationFile( $input )
-	{
-	    global $_LANG;
-	    if (isset( $_LANG->_strings )) {
-			$this->_translation	=& $_LANG->_strings;
-			return true;
-		}
-		/*
-		foreach( $this->_globalconfig['lang'] as $lang )
-		{
-			$translationFile	=	sprintf( $this->_config[$input]['langFile'], $lang );
-			if( !file_exists( $translationFile ) )
-				continue;
-			$tmp	=	parse_ini_file( $translationFile );
-			if( is_array( $tmp ) )
-			{
-				$tmp = array_map( array( $this, '_unescape' ), $tmp );
-				$this->_translation	=	$tmp;
-				return true;
-			}
-		}
-		*/
-		return false;
-	}
-
-   /**
-	* unsecape the text that has been read from the translation file
-	*
-	* @access	private
-	* @param	string
-	* @return	string
-	*/
-	function _unescape( $text )
-	{
-		return str_replace( '&quot;', '"', $text );
-	}
-	
-   /**
-  	* add a new sentence to the translation file
-	*
-	* @access	private
-	* @param	string	unique key
-	* @param	string	sentence to translate
-	* @return	boolean
-	*/
-	function _addToTranslationFile( $input, $key, $content )
-	{
-		$fp	=	fopen( $this->_config[$input]['sentenceFile'], 'a' );
-		if( !$fp )
-			return false;
-		flock( $fp, LOCK_EX );
-		fputs( $fp, sprintf( '%s = "%s"'."\n", $key, str_replace( '"', '&quot;', $content ) ) );
-		flock( $fp, LOCK_UN );
-		fclose( $fp );
-		return true;
-	}
-
-   /**
-	* guess the language
-	*
-	* @access	private
-	* @return	array		array containing all accepted languages
-	*/
-	function _guessLanguage()
-	{
-		if( !preg_match_all( '/([a-z\-]*)?[,;]/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches) )
-		{
-			return array();
-		}
-		$langs = array();
-		foreach( $matches[1] as $lang )
-		{
-			if( empty( $lang ) )
-				continue;
-			array_push( $langs, $lang );
-		}
-		return $langs;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Function.php 4.6rc2/includes/patTemplate/patTemplate/Function.php
--- 4.5.4/includes/patTemplate/patTemplate/Function.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Function.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,74 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate functions
- *
- * $Id: Function.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * function is executed, when template is compiled (preg_match)
- */
-define('PATTEMPLATE_FUNCTION_COMPILE', 1);
-
-/**
- * function is executed, when template parsed
- */
-define('PATTEMPLATE_FUNCTION_RUNTIME', 2);
- 
-/**
- * Base class for patTemplate functions
- *
- * $Id: Function.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Functions
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Function extends patTemplate_Module
-{
-   /**
-	* reader object
-	*
-	* @access private
-	* @var	  object
-	*/
-	var $_reader;
-	
-   /**
-	* function type
-	*
-	* @access public
-	* @var	  integer
-	*/
-	var $type = PATTEMPLATE_FUNCTION_COMPILE;
-	
-   /**
-	* set the reference to the reader object
-	*
-	* @access	public
-	* @param	object patTemplate_Reader
-	*/ 
-	function setReader( &$reader )
-	{
-		$this->_reader = &$reader;
-	}
-
-   /**
-	* call the function
-	*
-	* @abstract
-	* @access	public
-	* @param	array	parameters of the function (= attributes of the tag)
-	* @param	string	content of the tag
-	* @return	string	content to insert into the template
-	*/ 
-	function call( $params, $content )
-	{
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/InputFilter/StripComments.php 4.6rc2/includes/patTemplate/patTemplate/InputFilter/StripComments.php
--- 4.5.4/includes/patTemplate/patTemplate/InputFilter/StripComments.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/InputFilter/StripComments.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,50 +0,0 @@
-<?PHP
-/**
- * patTemplate StripComments input filter
- *
- * $Id: StripComments.php,v 1.1 2005/07/22 01:57:31 eddieajau Exp $
- *
- * Will remove all HTML comments.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate StripComments output filter
- *
- * $Id: StripComments.php,v 1.1 2005/07/22 01:57:31 eddieajau Exp $
- *
- * Will remove all HTML comments.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_InputFilter_StripComments extends patTemplate_InputFilter
-{
-   /**
-    * filter name
-	*
-	* @access	protected
-	* @abstract
-	* @var	string
-	*/
-	var	$_name	=	'StripComments';
-
-   /**
-	* compress the data
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		data without whitespace
-	*/
-	function apply( $data )
-	{
-        $data = preg_replace( '<!--.*-->msU', '', $data );
-	
-		return $data;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/InputFilter.php 4.6rc2/includes/patTemplate/patTemplate/InputFilter.php
--- 4.5.4/includes/patTemplate/patTemplate/InputFilter.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/InputFilter.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,42 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate input filter
- *
- * $Id: InputFilter.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * An input filter is used to modify the stream
- * before it has been processed by patTemplate_Reader.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate input filter
- *
- * $Id: InputFilter.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * An input filter is used to modify the stream
- * before it has been processed by patTemplate_Reader.
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_InputFilter extends patTemplate_Module
-{
-   /**
-	* apply the filter
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		filtered data
-	*/
-	function apply( $data )
-	{
-		return $data;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/Dateformat.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/Dateformat.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/Dateformat.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/Dateformat.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,45 +0,0 @@
-<?PHP
-/**
- * patTemplate modfifier Dateformat
- *
- * $Id: Dateformat.php,v 1.1 2005/07/22 03:19:45 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate modfifier Dateformat
- *
- * formats dates and times according to a format string.
- *
- * Possible attributes are:
- * - format (string)
- *
- * See the PHP documentation for strftime() for
- * more information.
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- * @link		http://www.php.net/manual/en/function.strftime.php
- */
-class patTemplate_Modifier_Dateformat extends patTemplate_Modifier
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-        if( !isset( $params['format'] ) )
-            return $value;
-		
-		return strftime( $params['format'], strtotime( $value ) );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/Expression.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/Expression.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/Expression.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/Expression.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,60 +0,0 @@
-<?PHP
-/**
- * patTemplate modfifier Expression
- *
- * $Id: Expression.php,v 1.1 2005/07/22 01:57:32 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate modfifier Expression
- *
- * Evaluates an expression and returns one of
- * the defined values for true and false.
- *
- * Possible attributes are:
- * - expression (string)
- * - true (string)
- * - false (string)
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- * @link		http://www.php.net/manual/en/function.wordwrap.php
- */
-class patTemplate_Modifier_Expression extends patTemplate_Modifier
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-		/*
-		 * true and false
-		 */
-		if( !isset( $params['true'] ) )
-			$params['true']	=	'true';
-		if( !isset( $params['false'] ) )
-			$params['false']=	'false';
-
-        /*
-         * replace the value in the expression
-         */
-        $params['expression'] = str_replace( '$self', "'$value'", $params['expression'] );
-
-        @eval( '$result = '.$params['expression'].';' );
-        
-        if ($result === true) {
-            return str_replace( '$self', $value, $params['true'] );
-        }
-        return str_replace( '$self', $value, $params['false'] );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/HTML/Img.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/HTML/Img.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/HTML/Img.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/HTML/Img.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,60 +0,0 @@
-<?PHP
-/**
- * Modifier that creates an HTML image tag from a variable
- *
- * It automatically retrieves the width and height of the image.
- *
- * $Id: Img.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Modifier that creates an HTML image tag from a variable
- *
- * It automatically retrieves the width and height of the image.
- *
- * $Id: Img.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Modifier_HTML_Img extends patTemplate_Modifier
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-		$size = getimagesize( $value );
-		$params['src']    = $value;
-		$params['width']  = $size[0];
-		$params['height'] = $size[1];
-		return '<img'.$this->arrayToAttributes($params).' />';
-	}
-
-   /**
-	* create an attribute list
-	*
-	* @access	private
-	* @param	array
-	* @return	string
-	*/
-	function arrayToAttributes( $array )
-	{
-		$string = '';
-		foreach( $array as $key => $val )
-		{
-			$string .= ' '.$key.'="'.htmlspecialchars( $val ).'"';
-		}
-		return $string;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/HTML/SEF.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/HTML/SEF.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/HTML/SEF.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/HTML/SEF.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,32 +0,0 @@
-<?php
-/**
-* patTemplate modfifier for Search Engine Friendly URL's
-* @version $Id: SEF.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
- */
-
-/**
-* @package Mambo
-*/
-class patTemplate_Modifier_SEF extends patTemplate_Modifier
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-		if (function_exists( 'sefRelToAbs' )) {
-			return sefRelToAbs( $value );
-		} else {
-			return $value;
-		}
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/QuoteLatex.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/QuoteLatex.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/QuoteLatex.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/QuoteLatex.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,47 +0,0 @@
-<?PHP
-/**
- * patTemplate modifier that quotes LaTeX special chars
- *
- * $Id: QuoteLatex.php,v 1.1 2005/07/22 01:57:32 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate modifier that quotes LaTeX special chars
- *
- * This is useful when creating PDF documents with patTemplate
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- * @link		http://www.php.net/manual/en/function.strftime.php
- */
-class patTemplate_Modifier_QuoteLatex extends patTemplate_Modifier
-{
-    /**
-     *
-     *
-     */
-    var $_chars = array(
-                        '%' => '\%',
-                        '&' => '\&',
-                        '_' => '\_',
-                        '$' => '\$'
-                    );
-    
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-	    return strtr($value, $this->_chars);
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/Surround.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/Surround.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/Surround.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/Surround.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,87 +0,0 @@
-<?PHP
-/**
- * patTemplate modfifier Surround
- *
- * $Id: Surround.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate modfifier Surround
- *
- * splits a text and surrunds each part by custom start and end strings
- *
- * Possible attributes are:
- * - delimiter (string) 
- * - start (string)
- * - end (string)
- * - keepdelimiter (yes|no) default: no
- * - withfirst (yes|no) default: yes
- * - withlast (yes|no) default: yes
- *
- * 
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		gERD Schaufelberger <gerd@php-tools.net>
- * @version		0.2
- */
-class patTemplate_Modifier_Surround extends patTemplate_Modifier
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-		// set default values
-		$delimiter	=	"\n";
-		$start		=	'';
-		$end		=	'';
-	
-		// where to split
-        if( isset( $params['delimiter'] ) )
-		{
-			$delimiter	=	$params['delimiter'];
-		}
-		
-        if( isset( $params['start'] ) )
-		{
-			$start	=	$params['start'];
-		}
-		
-        if( isset( $params['end'] ) )
-		{
-			$end	=	$params['end'];
-		}
-
-		// append the delimiter?
-        if( isset( $params['keepdelimiter'] ) && $params['keepdelimiter'] === 'yes' )
-		{
-			$end	.=	$delimiter;
-		}
-
-		$split	=	explode( $delimiter, $value );
-		$value	=	implode( $end . $start, $split );
-		
-		// add first?
-        if( !isset( $params['withfirst'] ) || $params['withfirst'] !== 'no' )
-		{
-			$value	=	$start . $value;
-		}
-		
-		// add last?
-        if( !isset( $params['withlast'] ) || $params['withlast'] !== 'no' )
-		{
-			$value	.=	$end;
-		}
-		
-		return $value;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier/Wordwrapper.php 4.6rc2/includes/patTemplate/patTemplate/Modifier/Wordwrapper.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier/Wordwrapper.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier/Wordwrapper.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,71 +0,0 @@
-<?PHP
-/**
- * patTemplate modfifier Wordwrapper
- *
- * $Id: Wordwrapper.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate modfifier Wordwrapper
- *
- * Wraps lines of long texts.
- *
- * Possible attributes are:
- * - width (integer)
- * - break (string)
- * - cut (yes|no)
- * - nl2br (yes|no)
- *
- * See the PHP documentation for wordwrap() for
- * more information.
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- * @link		http://www.php.net/manual/en/function.wordwrap.php
- */
-class patTemplate_Modifier_Wordwrapper extends patTemplate_Modifier
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-		/**
-		 * width
-		 */
-		if( !isset( $params['width'] ) )
-			$params['width']	=	72;
-		settype( $params['width'], 'integer' );
-
-		/**
-		 * character used for linebreaks
-		 */
-		if( !isset( $params['break'] ) )
-			$params['break']	=	"\n";
-
-		/**
-		 * cut at the specified width
-		 */
-		if( !isset( $params['cut'] ) )
-			$params['cut']	=	'no';
-
-		$params['cut'] = ($params['cut'] === 'yes') ? true : false;
-
-		$value = wordwrap( $value, $params['width'], $params['break'], $params['cut'] );
-
-		if( isset( $params['nl2br'] ) && $params['nl2br'] === 'yes' )
-			$value	=	nl2br( $value );
-		
-		return $value;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Modifier.php 4.6rc2/includes/patTemplate/patTemplate/Modifier.php
--- 4.5.4/includes/patTemplate/patTemplate/Modifier.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Modifier.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,42 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate variable modifiers
- *
- * $Id: Modifier.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * A modifier is used to modify a variable when it's parsed
- * into the template.
- *
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate variable modifiers
- *
- * $Id: Modifier.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * A modifier is used to modify a variable when it's parsed
- * into the template.
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Modifiers
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Modifier extends patTemplate_Module
-{
-   /**
-	* modify the value
-	*
-	* @access	public
-	* @param	string		value
-	* @return	string		modified value
-	*/
-	function modify( $value, $params = array() )
-	{
-		return $value;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Module.php 4.6rc2/includes/patTemplate/patTemplate/Module.php
--- 4.5.4/includes/patTemplate/patTemplate/Module.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Module.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,87 +0,0 @@
-<?PHP
-/**
- * patTemplate Module base class
- *
- * $Id: Module.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * The patTemplate_Module is the base class for all patTemplate
- * modules like readers, dumpers, filters, etc.
- *
- * @package		patTemplate
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate Module base class
- *
- * $Id: Module.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * The patTemplate_Module is the base class for all patTemplate
- * modules like readers, dumpers, filters, etc.
- *
- * @abstract
- * @package		patTemplate
- * @author		Stephan Schmidt <schst@php.net>
- * @abstract
- */
-class patTemplate_Module
-{
-   /**
-    * module name
-	*
-	* This has to be set in the final
-	* module classes.
-	*
-	* @access	protected
-	* @var		string
-	*/
-	var	$_name = null;
-
-   /**
-    * module parameters
-	*
-	* @access	protected
-	* @var		array
-	*/
-	var	$_params = array();
-
-   /**
-	* get the name of the module
-	*
-	* @access	public
-	* @return	string	name of the module
-	*/
-	function getName()
-	{
-		return $this->_name;
-	}
-
-   /**
-	* sets parameters of the module
-	*
-	* @access	public
-	* @param	array	assoc array containing parameters
-	* @param	boolean	flag to indicate, whether previously set parameters should be cleared
-	*/
-	function setParams( $params, $clear = false )
-	{
-		if( $clear === true )
-			$this->_params = array();
-		$this->_params = array_merge( $this->_params, $params );
-	}
-
-   /**
-	* gets a parameter of the module
-	*
-	* @access	public
-	* @param	string	name of the parameter
-	* @return	mixed	value of the parameter
-	*/
-	function getParam( $name )
-	{
-		if( isset( $this->_params[$name] ) )
-			return $this->_params[$name];
-		return false;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputCache.php 4.6rc2/includes/patTemplate/patTemplate/OutputCache.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputCache.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputCache.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,41 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate output cache
- *
- * $Id: OutputCache.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * An output cache is used to cache the data before
- * the template has been read.
- *
- * It stores the HTML (or any other output) that is
- * generated to increase performance.
- *
- * This is not related to a template cache!
- *
- * @package		patTemplate
- * @subpackage	Caches
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate output cache
- *
- * $Id: OutputCache.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * An output cache is used to cache the data before
- * the template has been read.
- *
- * It stores the HTML (or any other output) that is
- * generated to increase performance.
- *
- * This is not related to a template cache!
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Caches
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputCache extends patTemplate_Module
-{
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputFilter/BBCode.php 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/BBCode.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputFilter/BBCode.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/BBCode.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,89 +0,0 @@
-<?PHP
-/**
- * patTemplate BBCode output filter
- *
- * $Id: BBCode.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Uses patBBCode.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate BBCode output filter
- *
- * $Id: BBCode.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Uses patBBCode.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputFilter_BBCode extends patTemplate_OutputFilter
-{
-   /**
-    * filter name
-	*
-	* @access	protected
-	* @abstract
-	* @var	string
-	*/
-	var	$_name	=	'BBCode';
-
-   /**
-	* BBCode parser
-	*
-	* @access	private
-	* @var		object patBBCode
-	*/
-	var $BBCode = null;
-
-   /**
-	* remove all whitespace from the output
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		data without whitespace
-	*/
-	function apply( $data )
-	{
-		if( !$this->_prepare() )
-			return $data;
-
-		$data = $this->BBCode->parseString( $data );
-			
-		return $data;
-	}
-
-   /**
-	* prepare BBCode object
-	*
-	* @access	private
-	*/
-	function _prepare()
-	{
-		if( is_object( $this->BBCode ) )
-			return true;
-		if( !class_exists( 'patBBCode' ) )
-		{
-			if( !@include_once 'pat/patBBCode.php' )
-				return false;
-		}
-
-		$this->BBCode = &new patBBCode();
-		
-		if( isset( $this->_params['skinDir'] ) )
-			$this->BBCode->setSkinDir( $this->_params['skinDir'] );
-		
-		$reader =& $this->BBCode->createConfigReader( $this->_params['reader'] );
-		
-		// give patBBCode the reader we just created
-		$this->BBCode->setConfigReader( $reader );
-
-		return true;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputFilter/Gzip.php 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/Gzip.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputFilter/Gzip.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/Gzip.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,98 +0,0 @@
-<?PHP
-/**
- * patTemplate GZip output filter
- *
- * $Id: Gzip.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Checks the accept encoding of the browser and
- * compresses the data before sending it to the client.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate GZip output filter
- *
- * $Id: Gzip.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Checks the accept encoding of the browser and
- * compresses the data before sending it to the client.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputFilter_Gzip extends patTemplate_OutputFilter
-{
-   /**
-    * filter name
-	*
-	* This has to be set in the final
-	* filter classes.
-	*
-	* @access	protected
-	* @abstract
-	* @var	string
-	*/
-	var	$_name	=	'Gzip';
-
-   /**
-	* compress the data
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		compressed data
-	*/
-	function apply( $data )
-	{
-		if( !$this->_clientSupportsGzip() )
-			return $data;
-	
-		$size = strlen( $data );
-		$crc  = crc32( $data );
-
-        $data = gzcompress( $data, 9 );
-        $data = substr( $data, 0, strlen( $data ) - 4 );
-
-		$data .= $this->_gfc( $crc );
-		$data .= $this->_gfc( $size );
-	
-		header( 'Content-Encoding: gzip' );
-		$data = "\x1f\x8b\x08\x00\x00\x00\x00\x00" . $data;
-		return $data;
-	}
-
-   /**
-	* check, whether client supports compressed data
-	*
-	* @access	private
-	* @return	boolean
-	*/
-	function _clientSupportsGzip()
-	{
-		if( false !== strpos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) )
-			return  true;
-		return  false;
-	}
-
-   /**
-	* get value as hex-string
-	*
-	* @access       public
-	* @param        integer $value  value to convert
-	* @return       string  $string converted string
-	*/
-	function _gfc( $value )
-	{
-		$str = '';
-		for( $i = 0; $i < 4; $i ++)
-		{
-			$str	.=	chr( $value % 256 );
-			$value	=	floor( $value / 256 );
-		}
-		return  $str;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputFilter/PdfLatex.php 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/PdfLatex.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputFilter/PdfLatex.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/PdfLatex.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,62 +0,0 @@
-<?PHP
-/**
- * patTemplate output filter that creates PDF files from latex
- *
- * $Id: PdfLatex.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
- 
-/**
- * patTemplate output filter that creates PDF files from latex
- *
- * $Id: PdfLatex.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputFilter_PdfLatex extends patTemplate_OutputFilter
-{
-   /**
-    * filter name
-	*
-	* This has to be set in the final
-	* filter classes.
-	*
-	* @var	string
-	*/
-	var	$_name	=	'PdfLatex';
-
-	var $_params = array(
-	                       'cacheFolder' => './'
-	                   );
-	
-   /**
-	* tidy the data
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		compressed data
-	*/
-	function apply( $data )
-	{
-	    $cacheFolder = $this->getParam('cacheFolder');
-	    $texFile     = tempnam($cacheFolder, 'pt_tex_');
-	    $fp = fopen($texFile, 'w');
-	    fwrite($fp, $data);
-	    fclose($fp);
-	    
-	    $command = 'pdflatex '.$texFile;
-	    exec($command);
-	    exec($command);
-	    
-	    $pdf = $texFile . '.pdf';
-	    $pdf = file_get_contents($pdf);
-	    
-	    return $pdf;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputFilter/StripWhitespace.php 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/StripWhitespace.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputFilter/StripWhitespace.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/StripWhitespace.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,51 +0,0 @@
-<?PHP
-/**
- * patTemplate StripWhitespace output filter
- *
- * $Id: StripWhitespace.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Will remove all whitespace and replace it with a single space.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate StripWhitespace output filter
- *
- * $Id: StripWhitespace.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Will remove all whitespace and replace it with a single space.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputFilter_StripWhitespace extends patTemplate_OutputFilter
-{
-   /**
-    * filter name
-	*
-	* @access	protected
-	* @abstract
-	* @var	string
-	*/
-	var	$_name	=	'StripWhitespace';
-
-   /**
-	* remove all whitespace from the output
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		data without whitespace
-	*/
-	function apply( $data )
-	{
-		$data = str_replace( "\n", ' ', $data );
-        $data = preg_replace( '/\s\s+/', ' ', $data );
-	
-		return $data;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputFilter/Tidy.php 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/Tidy.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputFilter/Tidy.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputFilter/Tidy.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,81 +0,0 @@
-<?PHP
-/**
- * patTemplate Tidy output filter
- *
- * $Id: Tidy.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Used to tidy up your resulting HTML document,
- * requires ext/tidy.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * requires tidy extension
- */
-define( 'PATTEMPLATE_OUTPUTFILTER_TIDY_ERROR_NOT_SUPPORTED', 'patTemplate::Outputfilter::Tidy::1' );
- 
-/**
- * patTemplate Tidy output filter
- *
- * $Id: Tidy.php,v 1.1 2005/07/22 01:57:33 eddieajau Exp $
- *
- * Used to tidy up your resulting HTML document,
- * requires ext/tidy.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputFilter_Tidy extends patTemplate_OutputFilter
-{
-   /**
-    * filter name
-	*
-	* This has to be set in the final
-	* filter classes.
-	*
-	* @var	string
-	*/
-	var	$_name	=	'Tidy';
-
-   /**
-	* tidy the data
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		compressed data
-	*/
-	function apply( $data )
-	{
-		if( !function_exists( 'tidy_parse_string' ) )
-		{
-			return $data;
-		}
-
-		/**
-		 * tidy 1.0
-		 */
-		if( function_exists( 'tidy_setopt' ) && is_array( $this->_params ) )
-		{
-			foreach( $this->_params as $opt => $value )
-			{
-				tidy_setopt( $opt, $value );
-			}
-			tidy_parse_string($data);
-			tidy_clean_repair();
-			$data = tidy_get_output();
-		}
-		else
-		{
-			tidy_parse_string($data, $this->_params);
-			tidy_clean_repair();
-			$data = tidy_get_output();
-		}
-		
-		return $data;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/OutputFilter.php 4.6rc2/includes/patTemplate/patTemplate/OutputFilter.php
--- 4.5.4/includes/patTemplate/patTemplate/OutputFilter.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/OutputFilter.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,44 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate output filter
- *
- * $Id: OutputFilter.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * An output filter is used to modify the output
- * after it has been processed by patTemplate, but before
- * it is sent to the browser.
- *
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate output filter
- *
- * $Id: OutputFilter.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * An output filter is used to modify the output
- * after it has been processed by patTemplate, but before
- * it is sent to the browser.
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Filters
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_OutputFilter extends patTemplate_Module
-{
-   /**
-	* apply the filter
-	*
-	* @access	public
-	* @param	string		data
-	* @return	string		filtered data
-	*/
-	function apply( $data )
-	{
-		return $data;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Reader/File.php 4.6rc2/includes/patTemplate/patTemplate/Reader/File.php
--- 4.5.4/includes/patTemplate/patTemplate/Reader/File.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Reader/File.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,157 +0,0 @@
-<?PHP
-/**
- * patTemplate Reader that reads from a file
- *
- * $Id: File.php,v 1.1 2005/07/22 01:57:35 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
- 
-/**
- * patTemplate Reader that reads from a file
- *
- * $Id: File.php,v 1.1 2005/07/22 01:57:35 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Reader_File extends patTemplate_Reader
-{
-   /**
-    * reader name
-	* @access	private
-	* @var		string
-	*/
-	var	$_name	=	'File';
-
-   /**
-	* flag to indicate, that current file is remote
-	*
-	* @access	private
-	* @var		boolean
-	*/
-	var $_isRemote = false;
-	
-   /**
-	* all files, that have been opened
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_files = array();
-	
-   /**
-    * read templates from any input 
-	*
-	* @final
-	* @access	public
-	* @param	string	file to parse
-	* @return	array	templates
-	*/
-	function readTemplates( $input )
-	{
-		if (isset($this->_rootAtts['relative'])) {
-			$relative = $this->_rootAtts['relative'];
-		} else {
-			$relative = false;
-		}
-		if ($relative === false) {
-       		$this->_currentInput = $input;
-		} else {
-			$this->_currentInput = dirname($relative) . DIRECTORY_SEPARATOR . $input;
-		}
-		
-		$fullPath	=	$this->_resolveFullPath( $input, $relative );
-		if( patErrorManager::isError( $fullPath ) )
-			return $fullPath;
-		$content	=	$this->_getFileContents( $fullPath );
-		if( patErrorManager::isError( $content ) )
-			return $content;
-
-		$templates	=	$this->parseString( $content );
-		
-		return	$templates;
-	}
-
-   /**
-    * load template from any input 
-    *
-    * If the a template is loaded, the content will not get
-    * analyzed but the whole content is returned as a string.
-	*
-	* @abstract	must be implemented in the template readers
-	* @param	mixed	input to load from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @return	string  template content
-	*/
-	function loadTemplate( $input )
-	{
-		if (isset($this->_rootAtts['relative'])) {
-			$relative = $this->_rootAtts['relative'];
-		} else {
-			$relative = false;
-		}
-		$fullPath	=	$this->_resolveFullPath( $input, $relative );
-		if( patErrorManager::isError( $fullPath ) )
-			return $fullPath;
-		return $this->_getFileContents( $fullPath );
-	}
-
-   /**
-	* resolve path for a template
-	*
-	* @access	private
-	* @param	string		    filename
-	* @param    boolean|string  filename for relative path calculation
-	* @return	string		    full path
-	*/	
-	function _resolveFullPath( $filename, $relativeTo = false )
-	{
-		if (preg_match( '/^[a-z]+:\/\//', $filename )) {
-			$this->_isRemote = true;
-			return $filename;
-		} else {
-		    if ($relativeTo === false) {
-    			$baseDir = $this->_options['root'];
-		    } else {
-                $baseDir = $this->_options['root'] . DIRECTORY_SEPARATOR . dirname($relativeTo);
-		    }
-			$fullPath	=	$baseDir . '/' . $filename;
-		}
-		return	$fullPath;
-	}
-
-   /**
-	* get the contents of a file
-	*
-	* @access	private
-	* @param	string		filename
-	* @return	string		file contents
-	*/	
-	function _getFileContents( $file )
-	{
-		if( !$this->_isRemote && ( !file_exists( $file ) || !is_readable( $file ) ) )
-		{
-			return patErrorManager::raiseError(
-										PATTEMPLATE_READER_ERROR_NO_INPUT,
-										"Could not load templates from $file."
-										);
-		}
-		
-		if( function_exists( 'file_get_contents' ) )
-			$content	=	@file_get_contents( $file );
-		else
-			$content	=	implode( '', file( $file ) );
-			
-		/**
-		 * store the file name
-		 */
-		array_push( $this->_files, $file );
-		
-		return	$content;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Reader/IT.php 4.6rc2/includes/patTemplate/patTemplate/Reader/IT.php
--- 4.5.4/includes/patTemplate/patTemplate/Reader/IT.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Reader/IT.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,231 +0,0 @@
-<?PHP
-/**
- * patTemplate reader that reads HTML_Template_IT files
- *
- * $Id: IT.php,v 1.1 2005/07/22 01:57:35 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate reader that reads HTML_Template_IT files
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Reader_IT extends patTemplate_Reader
-{
-   /**
-    * reader name
-	* @access	private
-	* @var		string
-	*/
-	var	$_name	=	'IT';
-
-   /**
-	* files that have been used
-	* @access	private
-	* @var		array
-	*/	
-	var	$_files	=	array();
-
-   /**
-	* parse templates from string
-	*
-	* @access	private
-	* @param	string		string to parse
-	* @return	array		templates
-	*/
-	function parseString( $string )
-	{
-		/**
-		 * apply input filter before parsing
-		 */
-		$string = $this->_tmpl->applyInputFilters( $string );
-		
-		$this->_inheritAtts	=	array();
-		$this->_elStack		=	array();
-		$this->_data		=	array( '' );
-		$this->_tmplStack	=	array();
-		$this->_depth		=	0;
-		$this->_templates	=	array();
-		$this->_path		=	array();
-		$this->_processedData	=	'';
-		
-		$this->_defaultAtts	=	$this->_tmpl->getDefaultAttributes();
-		
-		if( !isset( $this->_defaultAtts['autoload'] ) )
-			$this->_defaultAtts['autoload']	=	'on';
-
-		/**
-		 * create a special root template
-		 */
-		$attributes		= $this->_rootAtts;
-		$attributes['name']	= '__global';
-		
-		$rootTemplate	= $this->_initTemplate( $attributes );
-
-		array_push( $this->_tmplStack, $rootTemplate );
-
-		/**
-		 *start parsing
-		 */		
-		$patNamespace	=	strtolower( $this->_tmpl->getNamespace() );
-
-		$regexp	=	'/(<!-- (BEGIN|END) ([a-zA-Z]+) -->)/m';
-
-		$tokens	=	preg_split( $regexp, $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-
-		/**
-		 * the first token is always character data
-		 * Though it could just be empty
-		 */
-		if( $tokens[0] != '' )
-			$this->_characterData( $tokens[0] );
-
-		$cnt	=	count( $tokens );
-		$i		=	1;
-		// process all tokens
-		while( $i < $cnt )
-		{
-			$fullTag	=	$tokens[$i++];
-			$closing	=	strtoupper( $tokens[$i++] ) == 'END' ? true : false;
-            $tmplName	=	$tokens[$i++];
-            $namespace  =   $patNamespace;
-			$tagname	=	'tmpl';
-			$data		=	$tokens[$i++];
-
-			/**
-			 * is it a closing tag?
-			 */
-			if( $closing === true )
-			{
-				$result	=	$this->_endElement( $namespace, $tagname );
-				if( patErrorManager::isError( $result ) )
-				{
-					return	$result;
-				}
-				$this->_characterData( $data );
-				continue;
-			}
-
-			$attributes	=	array( 'name' => $tmplName );
-			$result 	=	$this->_startElement( $namespace, $tagname, $attributes );
-			if( patErrorManager::isError( $result ) )
-			{
-				return	$result;
-			}
-
-			$this->_characterData( $data );
-		}
-
-		$rootTemplate = array_pop( $this->_tmplStack );
-
-		$this->_closeTemplate( $rootTemplate, $this->_data[0] );
-		
-		/**
-		 * check for tags that are still open
-		 */
-		if( $this->_depth > 0 )
-		{
-			$el	=	array_pop( $this->_elStack );
-			return patErrorManager::raiseError(
-				PATTEMPLATE_READER_ERROR_NO_CLOSING_TAG,
-				$this->_createErrorMessage( "No closing tag for {$el['ns']}:{$el['name']} found" )
-			);
-		}
-		
-		return	$this->_templates;
-	}
-	
-   /**
-    * read templates from any input 
-	*
-	* @final
-	* @access	public
-	* @param	string	file to parse
-	* @return	array	templates
-	*/
-	function readTemplates( $input )
-	{
-		$this->_currentInput = $input;
-		$fullPath	=	$this->_resolveFullPath( $input );
-		if( patErrorManager::isError( $fullPath ) )
-			return $fullPath;
-		$content	=	$this->_getFileContents( $fullPath );
-		if( patErrorManager::isError( $content ) )
-			return $content;
-
-		$templates	=	$this->parseString( $content );
-		
-		return	$templates;
-	}
-
-   /**
-    * load template from any input 
-    *
-    * If the a template is loaded, the content will not get
-    * analyzed but the whole content is returned as a string.
-	*
-	* @abstract	must be implemented in the template readers
-	* @param	mixed	input to load from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @return	string  template content
-	*/
-	function loadTemplate( $input )
-	{
-		$fullPath	=	$this->_resolveFullPath( $input );
-		if( patErrorManager::isError( $fullPath ) )
-			return $fullPath;
-		return $this->_getFileContents( $fullPath );
-	}
-
-   /**
-	* resolve path for a template
-	*
-	* @access	private
-	* @param	string		filename
-	* @return	string		full path
-	*/	
-	function _resolveFullPath( $filename )
-	{
-		$baseDir	=	$this->_options['root'];
-		$fullPath	=	$baseDir . '/' . $filename;
-		return	$fullPath;
-	}
-
-   /**
-	* get the contents of a file
-	*
-	* @access	private
-	* @param	string		filename
-	* @return	string		file contents
-	*/	
-	function _getFileContents( $file )
-	{
-
-		if( !file_exists( $file ) || !is_readable( $file ) )
-		{
-			return patErrorManager::raiseError(
-										PATTEMPLATE_READER_ERROR_NO_INPUT,
-										"Could not load templates from $file."
-										);
-		}
-		
-		if( function_exists( 'file_get_contents' ) )
-			$content	=	@file_get_contents( $file );
-		else
-			$content	=	implode( '', file( $file ) );
-			
-		/**
-		 * store the file name
-		 */
-		array_push( $this->_files, $file );
-		
-		return	$content;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Reader/String.php 4.6rc2/includes/patTemplate/patTemplate/Reader/String.php
--- 4.5.4/includes/patTemplate/patTemplate/Reader/String.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Reader/String.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,39 +0,0 @@
-<?PHP
-/**
- * patTemplate Reader that reads from a string
- *
- * $Id: String.php,v 1.1 2005/07/22 01:57:35 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate Reader that reads from a string
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Reader_String extends patTemplate_Reader
-{
-   /**
-    * Read templates from a string
-	*
-	* @final
-	* @access	public
-	* @param	string	string to parse
-	* @param	array	options, not implemented in current versions, but future versions will allow passing of options
-	* @return	array	templates
-	*/
-	function readTemplates( $input )
-	{
-		$this->_currentInput = $input;
-
-		$templates	=	$this->parseString( $input );
-		
-		return	$templates;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Reader.php 4.6rc2/includes/patTemplate/patTemplate/Reader.php
--- 4.5.4/includes/patTemplate/patTemplate/Reader.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Reader.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,1547 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate readers
- *
- * $Id: Reader.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * This class is able to parse patTemplate tags from any string you hand it over
- * It will emulate some kind of SAX parsing by calling start-, end- and CData-handlers.
- *
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-/**
- * No input
- */
-define( 'PATTEMPLATE_READER_ERROR_NO_INPUT', 6000 );
-
-/**
- * Unknown tag
- */
-define( 'PATTEMPLATE_READER_ERROR_UNKNOWN_TAG', 6001 );
-
-/**
- * Invalid tag (missing attribute)
- */
-define( 'PATTEMPLATE_READER_ERROR_INVALID_TAG', 6002 );
-
-/**
- * Closing tag is missing
- */
-define( 'PATTEMPLATE_READER_ERROR_NO_CLOSING_TAG', 6003 );
- 
-/**
- * Invalid closing tag
- */
-define( 'PATTEMPLATE_READER_ERROR_INVALID_CLOSING_TAG', 6004 );
-
-/**
- * Invalid condition specified
- */
-define( 'PATTEMPLATE_READER_ERROR_INVALID_CONDITION', 6005 );
-
-/**
- * No name has been specified
- */
-define( 'PATTEMPLATE_READER_ERROR_NO_NAME_SPECIFIED', 6010 );
-
-/**
- * CData in a conditional template
- */
-define( 'PATTEMPLATE_READER_NOTICE_INVALID_CDATA_SECTION', 6050 );
-
-/**
- * template already exists
- */
-define( 'PATTEMPLATE_READER_NOTICE_TEMPLATE_EXISTS', 6051 );
-
-/**
- * Base class for patTemplate readers
- *
- * This class is able to parse patTemplate tags from any string you hand it over
- * It will emulate some kind of SAX parsing by calling start-, end- and CData-handlers.
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Readers
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Reader extends patTemplate_Module
-{
-   /**
-    * reference to the patTemplate object that instantiated the module
-	*
-	* @access	protected
-	* @var	object
-	*/
-	var	$_tmpl;
-
-   /**
-    * stack for all open elements
-	* @access	private
-	* @var	array
-	*/
-	var	$_elStack;
-
-   /**
-    * stack for all open templates
-	* @access	private
-	* @var	array
-	*/
-	var	$_tmplStack;
-
-   /**
-    * character data
-	* @access	private
-	* @var	array
-	*/
-	var	$_data;
-
-   /**
-    * tag depth
-	* @access	private
-	* @var	integer
-	*/
-	var	$_depth;
-
-   /**
-   	* templates that have been found
-	* @access	protected
-	* @var		array
-	*/
-	var $_templates	=	array();
-	
-   /**
-   	* path to the template
-	* @access	protected
-	* @var		array
-	*/
-	var $_path	=	array();
-	
-   /**
-	* start tag for variables
-	* @access	private
-	* @var		string
-	*/
-	var	$_startTag;
-	
-   /**
-	* end tag for variables
-	* @access	private
-	* @var		string
-	*/
-	var	$_endTag;
-	
-   /**
-    * default attributes
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_defaultAtts	=	array();
-
-   /**
-    * root attributes
-	*
-	* This is used when reading the template content
-	* from an external file.
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_rootAtts	=	array();
-
-   /**
-    * inherit attributes
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_inheritAtts	=	array();
-
-   /**
-    * name of the first template that has been found
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$_root = null;
-
-   /**
-    * all data that has been processed
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$_processedData = null;
-
-   /**
-    * current input
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$_currentInput = null;
-
-   /**
-    * all loaded functions
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_functions	=	array();
-
-   /**
-    * function aliases
-    *
-    * @access   private
-    * @var      array
-    */
-    var $_funcAliases = array();
-	
-   /**
-    * options
-    *
-    * @access   private
-    * @var      array
-    */
-    var $_options = array();
-	
-   /**
-    * reader is in use
-    *
-    * @access   private
-    * @var      boolean
-    */
-    var $_inUse = false;
-	
-   /**
-    * set a reference to the patTemplate object that instantiated the reader
-	*
-	* @access	public
-	* @param	object		patTemplate object
-	*/
-	function setTemplateReference( &$tmpl )
-	{
-		$this->_tmpl = &$tmpl;
-	}
-
-   /**
-    * read templates from any input 
-	*
-	* @abstract	must be implemented in the template readers
-	* @param	mixed	input to read from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @param	array	options, not implemented in current versions, but future versions will allow passing of options
-	* @return	array	template structure
-	*/
-	function readTemplates( $input, $options = array() )
-	{
-		return array();
-	}
-
-   /**
-    * load template from any input 
-    *
-    * If the a template is loaded, the content will not get
-    * analyzed but the whole content is returned as a string.
-	*
-	* @abstract	must be implemented in the template readers
-	* @param	mixed	input to load from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @param	array	options, not implemented in current versions, but future versions will allow passing of options
-	* @return	string  template content
-	*/
-	function loadTemplate( $input, $options = array() )
-	{
-		return $input;
-	}
-
-
-   /**
-	* set options
-	*
-	* @access	public
-	* @param	array	array containing options
-	*/
-	function setOptions( $options )
-	{
-		$this->_startTag = $options['startTag'];
-		$this->_endTag   = $options['endTag'];
-
-		$this->_options  = $options;
-		
-		if (isset($options['functionAliases'])) {
-		    $this->_funcAliases = $options['functionAliases'];
-		}
-		array_map('strtolower', $this->_funcAliases);
-	}
-
-   /**
-    * add an alias for a function
-    *
-    * @access   public
-    * @param    string  alias
-    * @param    string  function name
-    */
-    function addFunctionAlias($alias, $function)
-    {
-        $this->_funcAliases[strtolower($alias)] = $function;
-    }
-	
-   /**
-	* set the root attributes
-	*
-	* @access	public
-	* @param	array	array containing options
-	*/
-	function setRootAttributes( $attributes )
-	{
-		$this->_rootAtts = $attributes;
-	}
-
-   /**
-	* parse templates from string
-	*
-	* @access	private
-	* @param	string		string to parse
-	* @return	array		templates
-	*/
-	function parseString( $string )
-	{
-		$this->_inUse = true;
-
-		/**
-		 * apply input filter before parsing
-		 */
-		$string = $this->_tmpl->applyInputFilters( $string );
-		
-		$this->_inheritAtts	  =	array();
-		$this->_elStack		  =	array();
-		$this->_data		  =	array( '' );
-		$this->_tmplStack	  =	array();
-		$this->_depth		  =	0;
-		$this->_templates	  =	array();
-		$this->_path		  =	array();
-		$this->_processedData =	'';
-		
-		$this->_defaultAtts	= $this->_tmpl->getDefaultAttributes();
-		
-		if( !isset( $this->_defaultAtts['autoload'] ) ) {
-			$this->_defaultAtts['autoload']	= 'on';
-		}
-
-		/**
-		 * create a special root template
-		 */
-		$attributes		    = $this->_rootAtts;
-		$attributes['name']	= '__ptroot';
-		
-		$rootTemplate = $this->_initTemplate( $attributes );
-		$this->_root  = null;
-		unset( $rootTemplate['isRoot'] );
-
-		array_push( $this->_tmplStack, $rootTemplate );
-
-		$patNamespace = $this->_tmpl->getNamespace();
-		if (is_array($patNamespace)) {
-			$patNamespace = array_map('strtolower', $patNamespace);
-		} else {
-			$patNamespace = array(strtolower( $patNamespace ));
-		}
-
-		/**
-		 *start parsing
-		 */
-		$regexp	=	'/(<(\/?)([[:alnum:]]+):([[:alnum:]]+)[[:space:]]*([^>]*)>)/im';
-
-		$tokens	=	preg_split( $regexp, $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-
-		/**
-		 * the first token is always character data
-		 * Though it could just be empty
-		 */
-		if( $tokens[0] != '' ) {
-			$this->_characterData( $tokens[0] );
-		}
-
-		$cnt	=	count( $tokens );
-		$i		=	1;
-		// process all tokens
-		while( $i < $cnt ) {
-			$fullTag	= $tokens[$i++];
-			$closing	= $tokens[$i++];
-			$namespace	= strtolower( $tokens[$i++] );
-			$tagname	= strtolower( $tokens[$i++] );
-			$attString	= $tokens[$i++];
-			$empty		= substr( $attString, -1 );
-			$data		= $tokens[$i++];
-
-			/**
-			 * check, whether it's a known namespace
-			 * currently only the template namespace is possible
-			 */
-			 if( !in_array($namespace, $patNamespace) ) {
-			 	$this->_characterData( $fullTag );
-			 	$this->_characterData( $data );
-				continue;
-			 }
-
-			/**
-			 * is it a closing tag?
-			 */
-			if( $closing === '/' ) {
-				$result	=	$this->_endElement( $namespace, $tagname );
-				if( patErrorManager::isError( $result ) ) {
-					return	$result;
-				}
-				$this->_characterData( $data );
-				continue;
-			}
-
-			/**
-			 * Is empty or opening tag!
-			 */
-			if( $empty === '/' ) {
-				$attString	=	substr( $attString, 0, -1 );
-			}
-
-			$attributes	=	$this->_parseAttributes( $attString );
-			$result 	=	$this->_startElement( $namespace, $tagname, $attributes );
-			if( patErrorManager::isError( $result ) ) {
-				return	$result;
-			}
-
-			/**
-			 * check, if the tag is empty
-			 */
-			if( $empty === '/' ) {
-				$result	=	$this->_endElement( $namespace, $tagname );
-				if( patErrorManager::isError( $result ) ) {
-					return	$result;
-				}
-			}
-
-			$this->_characterData( $data );
-		}
-
-		$rootTemplate = array_pop( $this->_tmplStack );
-
-		$this->_closeTemplate( $rootTemplate, $this->_data[0] );
-		
-		/**
-		 * check for tags that are still open
-		 */
-		if( $this->_depth > 0 ) {
-			$el	=	array_pop( $this->_elStack );
-			return patErrorManager::raiseError(
-				PATTEMPLATE_READER_ERROR_NO_CLOSING_TAG,
-				$this->_createErrorMessage( "No closing tag for {$el['ns']}:{$el['name']} found" )
-			);
-		}
-
-		$this->_inUse = false;
-		
-		return	$this->_templates;
-	}
-	
-   /**
-	* parse an attribute string and build an array
-	*
-	* @access	private
-	* @param	string	attribute string
-	* @param	array	attribute array
-	*/
-	function _parseAttributes( $string )
-	{
-	 	static $entities = array(
-									'&lt;' => '<',
-									'&gt;' => '>',
-									'&amp;' => '&',
-									'&quot;' => '"',
-									'&apos;' => '\''
-								);
-
-		$attributes	=	array();
-		$match = array();
-		preg_match_all('/([a-zA-Z_0-9]+)="((?:\\\.|[^"\\\])*)"/U', $string, $match);
-		for ($i = 0; $i < count($match[1]); $i++) {
-			$attributes[strtolower( $match[1][$i] )] = strtr( (string)$match[2][$i], $entities );
-		}
-		return	$attributes;
-	}
-
-   /**
-	* handle start element
-	*
-	* @access	private
-	* @param	string		element name
-	* @param	array		attributes
-	*/
-	function _startElement( $ns, $name, $attributes )
-	{
-		array_push( $this->_elStack, array(
-                                            'ns'			=>  $ns,
-											'name'			=>	$name,
-											'attributes'	=>	$attributes,
-										)
-				 );
-
-		$this->_depth++;
-
-		$this->_data[$this->_depth]	=	'';
-
-		/**
-		 * handle tag
-		 */
-		switch( $name )
-		{
-			/**
-			 * template
-			 */
-			case 'tmpl':
-				$result	=	$this->_initTemplate( $attributes );
-				break;
-
-			/**
-			 * sub-template
-			 */
-			case 'sub':
-				$result	=	$this->_initSubTemplate( $attributes );
-				break;		
-
-			/**
-			 * link
-			 */
-			case 'link':
-				$result	=	$this->_initLink( $attributes );
-				break;		
-
-			/**
-			 * variable
-			 */
-			case 'var':
-				$result	=	false;
-				break;	
-
-			/**
-			 * instance
-			 */
-			case 'instance':
-			case 'comment':
-				$result	=	false;
-				break;	
-
-			/**
-			 * any other tag
-			 */
-			default:
-				if (isset($this->_funcAliases[strtolower($name)])) {
-					$name = $this->_funcAliases[strtolower($name)];
-				}
-				$name = ucfirst( $name );
-				
-				if( !$this->_tmpl->moduleExists( 'Function', $name ) ) {
-
-					if (isset($this->_options['defaultFunction']) && !empty($this->_options['defaultFunction'])) {
-						$attributes['_originalTag'] = $name;
-						$name = ucfirst($this->_options['defaultFunction']);
-					} else {
-						return patErrorManager::raiseError(
-															PATTEMPLATE_READER_ERROR_UNKNOWN_TAG,
-															$this->_createErrorMessage( "Unknown tag {$ns}:{$name}." )
-														);
-					}
-				}
-				$result = array(
-								'type'       => 'custom',
-								'function'   => $name,
-								'attributes' => $attributes
-								);
-				break;
-		}
-
-		if( patErrorManager::isError( $result ) ) {
-			return	$result;
-		}
-		
-		array_push( $this->_tmplStack, $result );
-		return true;
-	}
-	
-   /**
-	* handle end element
-	*
-	* @access	private
-	* @param	string		element name
-	*/
-	function _endElement( $ns, $name )
-	{
-		$el			=	array_pop( $this->_elStack );
-		$data		=	$this->_getCData();
-		$this->_depth--;
-
-		if( $el['name'] != $name || $el['ns'] != $ns ) {
-			return patErrorManager::raiseError(
-				PATTEMPLATE_READER_ERROR_INVALID_CLOSING_TAG,
-				$this->_createErrorMessage( "Invalid closing tag {$ns}:{$name}, {$el['ns']}:{$el['name']} expected" )
-			);
-		}
-		
-		$tmpl	=	array_pop( $this->_tmplStack );
-
-		/**
-		 * handle tag
-		 */
-		switch( $name )
-		{
-			/**
-			 * template
-			 */
-			case 'tmpl':
-				$this->_closeTemplate( $tmpl, $data );
-				break;
-
-			/**
-			 * sub-template
-			 */
-			case 'sub':
-				$this->_closeSubTemplate( $tmpl, $data );
-				break;
-
-			/**
-			 * link
-			 */
-			case 'link':
-				$this->_closeLink( $tmpl );
-				break;
-
-			/**
-			 * variable
-			 */
-			case 'var':
-				$this->_handleVariable( $el['attributes'], $data );
-				break;
-
-			/**
-			 * instance
-			 */
-			case 'instance':
-				break;
-
-			/**
-			 * comment
-			 */
-			case 'comment':
-				$this->_handleComment( $el['attributes'], $data );
-				break;	
-
-			/**
-			 * custom function
-			 */
-			default:
-                $name = ucfirst( $tmpl['function'] );
-                
-				if( !isset( $this->_functions[$name] ) ) {
-					$this->_functions[$name] = $this->_tmpl->loadModule( 'Function', $name );
-					$this->_functions[$name]->setReader( $this );
-				}
-				
-				$result = $this->_functions[$name]->call( $tmpl['attributes'], $data );
-
-				if( patErrorManager::isError( $result ) ) {
-					return $result;
-				}
-				
-				if( is_string( $result ) ) {
-					$this->_characterData( $result, false );
-				}
-				break;
-		}
-		return true;
-	}
-
-   /**
-	* handle character data
-	*
-	* @access	private
-	* @param	string		data
-	*/
-	function _characterData( $data, $readFromTemplate = true )
-	{
-		$this->_data[$this->_depth]	.=	$data;
-
-		if ($readFromTemplate) {
-			$this->_processedData .= $data;
-		}
-
-		return	true;
-	}
-	
-   /**
-	* handle a Link
-	*
-	* @access	private
-	* @param	array		attributes
-	* @return	boolean		true on success
-	*/
-	function _initLink( $attributes )
-	{
-		/**
-		 * needs a src attribute
-		 */
-		if( !isset( $attributes['src'] ) ) {
-			return patErrorManager::raiseError(
-												PATTEMPLATE_READER_ERROR_INVALID_TAG,
-												$this->_createErrorMessage( "Attribute 'src' missing for link" )
-												);
-		}
-		
-		/**
-		 * create a new template
-		 */
-		$tmpl	=	array(
-							'type'			=>	'link',
-							'src'			=>	$attributes['src'],
-						);
-		return $tmpl;
-	}
-
-   /**
-	* close a link template
-	*
-	* It will be added to the dependecies of the parent template.
-	*
-	* @access	private
-	* @param	array	template definition for the link
-	*/
-	function _closeLink( $tmpl )
-	{
-		/**
-		 * add it to the dependencies
-		 */
-		if( !empty( $this->_tmplStack ) )
-		{
-			$this->_addToParentTag( 'dependencies', strtolower( $tmpl['src'] ) );
-			$this->_characterData( sprintf( "%sTMPL:%s%s", $this->_startTag, strtoupper( $tmpl['src'] ), $this->_endTag ) );
-		}
-
-		return true;	
-	}
-	
-   /**
-	* create a new template
-	*
-	* @access	private
-	* @param	array		attributes
-	* @return	boolean		true on success
-	*/
-	function _initTemplate( $attributes )
-	{
-		/**
-		 * build name for the template
-		 */
-		if (!isset( $attributes['name'] )) {
-			$name	=	$this->_buildTemplateName();
-		} else {
-			$name	=	strtolower( $attributes['name'] );
-			unset( $attributes['name'] );
-		}
-		
-		/**
-		 * name must be unique
-		 */
-		if( isset( $this->_templates[$name] ) || $this->_tmpl->exists( $name ) ) {
-			patErrorManager::raiseNotice(
-										PATTEMPLATE_READER_NOTICE_TEMPLATE_EXISTS,
-										$this->_createErrorMessage( "Template $name already exists" ),
-										$name
-										);
-		}
-
-		/**
-		 * update the path
-		 */
-		array_push( $this->_path, $name );
-
-		if( isset( $attributes['maxloop'] ) ) {
-			if (!isset( $attributes['parent'] )) {
-				$attributes['parent'] = $this->_getFromParentTemplate( 'name' );
-			}
-		}
-
-		$attributes	= $this->_prepareTmplAttributes( $attributes, $name );
-
-		array_push( $this->_inheritAtts, array(
-												'whitespace' => $attributes['whitespace'],
-												'unusedvars' => $attributes['unusedvars'],
-												'autoclear'  => $attributes['autoclear']
-											)
-				 );
-		
-		/**
-		 * create a new template
-		 */
-		$tmpl	=	array(
-							'type'			=>	'tmpl',
-							'name'			=>	$name,
-							'attributes'	=>	$attributes,
-							'content'		=>	'',
-							'dependencies'	=>	array(),
-							'varspecs'		=>	array(),
-							'comments'		=>	array(),
-							'loaded'		=>	false,
-							'parsed'		=>	false,
-							'input'			=>  $this->_name.'://'.$this->_currentInput
-						);
-
-		if( $this->_root == null ) {
-			$this->_root = $name;
-			$tmpl['isRoot'] = true;
-		}
-
-
-		/**
-		 * prepare subtemplates
-		 */
-		switch( $attributes['type'] ) {
-			case 'condition':
-			case 'modulo':
-				$tmpl['subtemplates']	=	array();
-				break;
-		}
-
-		return $tmpl;
-	}
-
-   /**
-    * prepare attributes
-	*
-	* @access	private
-	* @param	array	attributes
-	* @param	string	template name (only used for error messages)
-	* @return	array	attributes
-	*/
-	function _prepareTmplAttributes( $attributes, $templatename )
-	{
-		/**
-		 * do not prepare twice
-		 */
-		if( isset( $attributes['__prepared'] ) && $attributes['__prepared'] === true ) {
-			return $attributes;
-		}
-			
-		$attributes	= $this->_inheritAttributes( $attributes );
-
-		/**
-		 * get the attributes
-		 */
-		$attributes	= array_merge( $this->_tmpl->getDefaultAttributes(), $attributes );
-
-		$attributes['type']	= strtolower( $attributes['type'] );
-
-        if( !isset( $attributes['rowoffset'] ) ) {
-        	$attributes['rowoffset'] = 1;
-        }
-		
-        if( !isset( $attributes['addsystemvars'] ) ) {
-        	$attributes['addsystemvars'] = false;
-        } else {
-            switch ($attributes['addsystemvars']) {
-                case 'on':
-                case 'boolean':
-                    $attributes['addsystemvars'] = 'boolean';
-                    break;
-                case 'int':
-                case 'integer':
-                    $attributes['addsystemvars'] = 'integer';
-                    break;
-                case 'off':
-                    $attributes['addsystemvars'] = false;
-                    break;
-            }
-        }
-		
-		/**
-		 * external template
-		 */
-		if( isset( $attributes['src'] ) ) {
-		 	if( !isset( $attributes['parse'] ) )
-				$attributes['parse']	=	'on';
-		 	if( !isset( $attributes['reader'] ) )
-				$attributes['reader']	=	$this->getName();
-		 	if( !isset( $attributes['autoload'] ) )
-				$attributes['autoload']	=	$this->_defaultAtts['autoload'];
-
-		 	if (isset($attributes['relative']) && strtolower($attributes['relative'] === 'yes')) {
-                $attributes['relative']	= $this->getCurrentInput();
-		 	} else {
-                $attributes['relative']	= false;
-		 	}
-		}
-
-		/**
-		 * varscope is set
-		 */
-		if( isset( $attributes['varscope'] ) ) {
-		 	/**
-			 * varscope is parent
-			 */
-		 	if( $attributes['varscope'] === '__parent' ) {
-				$attributes['varscope'] = $this->_getFromParentTemplate( 'name' );
-			}
-		 
-			$attributes['varscope']	= strtolower( $attributes['varscope'] );
-			if (strstr($attributes['varscope'], ',')) {
-				$attributes['varscope'] = array_map('trim', explode(',', $attributes['varscope']));
-			}
-		}
-
-		switch( $attributes['type'] ) {
-			/**
-			 * validate condition template
-			 */
-			case	'condition':
-				if( !isset( $attributes['conditionvar'] ) ) {
-					return patErrorManager::raiseError(
-														PATTEMPLATE_READER_ERROR_INVALID_TAG,
-														$this->_createErrorMessage( "Attribute 'conditionvar' missing for $templatename" )
-														);
-				}
-				$attributes['conditionvar']	=	strtoupper( $attributes['conditionvar'] );
-
-				if( strstr( $attributes['conditionvar'], '.' ) ) {
-					list( $attributes['conditiontmpl'], $attributes['conditionvar'] ) = explode( '.', $attributes['conditionvar'] );
-					$attributes['conditiontmpl'] = strtolower( $attributes['conditiontmpl'] );
-				}
-
-				$attributes['autoclear']	=	'yes';
-
-				if (!isset( $attributes['useglobals'] )) {
-					$attributes['useglobals']	=	'no';
-				}
-				break;
-
-			/**
-			 * validate simplecondition template
-			 */
-			case	'simplecondition':
-				if( !isset( $attributes['requiredvars'] ) ) {
-					return patErrorManager::raiseError(
-														PATTEMPLATE_READER_ERROR_INVALID_TAG,
-														$this->_createErrorMessage( "Attribute 'requiredvars' missing for $templatename" )
-														);
-				}
-				$tmp = array_map( 'trim', explode( ',', $attributes['requiredvars'] ) );
-				$attributes['requiredvars']   = array();
-				foreach( $tmp as $var ) {
-				    
-					$pos = strpos( $var, '=' );
-					if ($pos !== false) {
-						$val = trim(substr( $var, $pos+1 ));
-						$var = trim(substr( $var, 0, $pos ));
-					} else {
-                        $val = null;
-					}
-				    $var = strtoupper($var);
-					$pos = strpos( $var, '.' );
-
-					if ($pos === false) {
-						array_push( $attributes['requiredvars'], array( $templatename, $var, $val ) );
-					} else {
-						array_push( $attributes['requiredvars'], array(
-																		strtolower( substr( $var, 0, $pos ) ),
-																		substr( $var, $pos+1 ),
-																		$val
-																	)
-								);
-					}
-				    	
-				}
-				$attributes['autoclear'] = 'yes';
-				break;
-				
-			/**
-			 * oddeven => switch to new modulo syntax
-			 */
-			case	'oddeven':
-				$attributes['type']		 = 'modulo';
-				$attributes['modulo']	 = 2;
-				$attributes['autoclear'] = 'yes';
-				break;
-				
-			/**
-			 * modulo => requires a module attribute
-			 */
-			case	'modulo':
-				if( !isset( $attributes['modulo'] ) ) {
-					return patErrorManager::raiseError(
-														PATTEMPLATE_READER_ERROR_INVALID_TAG,
-														$this->_createErrorMessage( "Attribute 'modulo' missing for $templatename" )
-														);
-				}
-				$attributes['autoclear'] = 'yes';
-				break;
-
-			/**
-			 * standard template => do nothing
-			 */
-			case	'standard':
-				break;
-
-			/**
-			 * unknown type
-			 */
-			default:
-				return patErrorManager::raiseError(
-													PATTEMPLATE_READER_ERROR_INVALID_TAG,
-													$this->_createErrorMessage( "Unknown value for attribute type: {$attributes['type']}" )
-													);
-				break;
-		}
-
-		$attributes['__prepared'] = true;
-		
-		return $attributes;
-	}
-	
-   /**
-	* build a template name
-	*
-	* @access	private
-	* @return	string	new template name
-	*/	
-	function _buildTemplateName()
-	{
-		return strtolower( uniqid( 'tmpl' ) );
-	}
-
-   /**
-	* close the current template
-	*
-	* @access	private
-	* @return	boolean	true on success
-	*/
-	function _closeTemplate( $tmpl, $data )
-	{
-		$name = array_pop( $this->_path );
-
-		$data = $this->_adjustWhitespace( $data, $tmpl['attributes']['whitespace'] );
-
-		array_pop( $this->_inheritAtts );
-		
-		/**
-		 * check for special templates
-		 */
-		switch( $tmpl['attributes']['type'] )
-		{
-			/**
-			 * check for whitespace in conditional templates
-			 * and raise a notice
-			 */
-			case	'condition':
-			case	'modulo':
-				if( trim( $data ) != '' ) {
-					patErrorManager::raiseNotice(
-													PATTEMPLATE_READER_NOTICE_INVALID_CDATA_SECTION,
-													$this->_createErrorMessage( sprintf( 'No cdata is allowed inside a template of type %s (cdata was found in %s)', $tmpl['attributes']['type'], $tmpl['name'] ) )
-												);
-				}
-				$data	=	null;
-				break;
-		}
-		
-		/**
-		 * store the content
-		 */
-		$tmpl['content'] = $data;
-		
-		/**
-		 * No external template
-		 */
-		if( !isset( $tmpl['attributes']['src'] ) ) {
-			$tmpl['loaded']	=	true;
-		}
-
-		/**
-		 * add it to the dependencies
-		 */
-		 if( !empty( $this->_tmplStack ) ) {
-			$this->_addToParentTag( 'dependencies', $name );
-			
-			if( isset( $tmpl['attributes']['placeholder'] ) ) {
-				// maintain BC
-				if( $this->shouldMaintainBc() && $tmpl['attributes']['placeholder'] === 'none' ) {
-					$tmpl['attributes']['placeholder'] = '__none';
-				}
-				
-				if( $tmpl['attributes']['placeholder'] !== '__none' ) {
-					$this->_characterData( $this->_startTag.(strtoupper( $tmpl['attributes']['placeholder'] ) ).$this->_endTag );
-				}
-			} else {
-				$this->_characterData( sprintf( "%sTMPL:%s%s", $this->_startTag, strtoupper( $name ), $this->_endTag ) );
-			}
-		 }
-
-		unset( $tmpl['name'] );
-		unset( $tmpl['tag'] );
-		
-		$this->_templates[$name] = $tmpl;
-		 
-		return true;
-	}
-
-   /**
-	* create a new sub-template
-	*
-	* @access	private
-	* @param	array		attributes
-	* @return	boolean		true on success
-	*/
-	function _initSubTemplate( $attributes )
-	{
-		/**
-		 * has to be embedded in a 'tmpl' tag
-		 */
-		if (!$this->_parentTagIs( 'tmpl' )) {
-			return patErrorManager::raiseError(
-												PATTEMPLATE_READER_ERROR_INVALID_TAG,
-												$this->_createErrorMessage( 'A subtemplate is only allowed in a TMPL tag' )
-												);
-		}
-
-		/**
-		 * needs a condition attribute
-		 */
-		if (!isset( $attributes['condition'] )) {
-			return patErrorManager::raiseError(
-												PATTEMPLATE_READER_ERROR_NO_CONDITION_SPECIFIED,
-												$this->_createErrorMessage( 'Missing \'condition\' attribute for subtemplate' )
-												);
-		}
-
-		/**
-		 * maintain BC
-		 */
-		if( $this->shouldMaintainBc() && in_array( $attributes['condition'], array( 'default', 'empty', 'odd', 'even' ) ) ) {
-			$attributes['condition']	=	'__' . $attributes['condition'];
-		}
-
-		if( $attributes['condition'] == '__odd' ) {
-			$attributes['condition'] = 1;
-		} elseif( $attributes['condition'] == '__even' ) {
-			$attributes['condition'] = 0;
-		}
-		
-		$parent	= array_pop( $this->_tmplStack );
-		array_push( $this->_tmplStack, $parent );
-		if( $parent['attributes']['type'] == 'modulo' ) {
-			
-			if( preg_match( '/^\d$/', $attributes['condition'] ) ) {
-				
-				if( (integer)$attributes['condition'] >= $parent['attributes']['modulo'] ) {
-					return patErrorManager::raiseError(
-														PATTEMPLATE_READER_ERROR_INVALID_CONDITION,
-														$this->_createErrorMessage( 'Condition may only be between 0 and '.($parent['attributes']['modulo']-1) )
-													);
-				}
-			}
-
-		}		
-		
-		$attributes = $this->_inheritAttributes( $attributes );
-		
-		$condition  = $attributes['condition'];
-		unset( $attributes['condition'] );
-		
-		$subTmpl = array(
-						'type'			=>	'sub',
-						'condition'		=>	$condition,
-						'data'			=>	'',
-						'attributes'	=>	$attributes,
-						'comments'		=>	array(),
-						'dependencies'	=>	array()
-						);
-		
-		return	$subTmpl;
-	}
-
-   /**
-	* close subtemplate
-	*
-	* @access	private
-	* @param	string		data
-	* @return	boolean		true on success
-	*/
-	function _closeSubTemplate( $subTmpl, $data )
-	{
-		$data				=	$this->_adjustWhitespace( $data, $subTmpl['attributes']['whitespace'] );
-		
-		$subTmpl['data']	=	$data;
-		$condition			=	$subTmpl['condition'];
-		unset( $subTmpl['condition'] );
-
-		$this->_addToParentTemplate( 'subtemplates',
-									  $subTmpl,
-									  $condition
-									);
-		return true;
-	}
-	
-   /**
-	* handle a variable
-	*
-	* @access	private
-	* @param	array	attributes of the var tag
-	* @param	string	cdata between the tags (will be used as default)
-	* @return	boolean	true on success
-	*/
-	function _handleVariable( $attributes, $data )
-	{
-		if( !isset( $attributes['name'] ) ) {
-			return patErrorManager::raiseError(
-												PATTEMPLATE_READER_ERROR_NO_NAME_SPECIFIED,
-												$this->_createErrorMessage( 'Variable needs a name attribute' )
-												);
-		}
-
-		$specs = array();		
-		
-		/**
-		 * get name
-		 */
-		$name	=	strtoupper( $attributes['name'] );
-		unset( $attributes['name'] );
-		$specs['name']	=	$name;
-
-		/**
-		 * use data as default value
-		 */
-		if( isset( $attributes['default'] ) ) {
-			$data 				=	$attributes['default'];
-			$specs['default']	=	$data;
-			unset( $attributes['default'] );
-		} elseif (!empty( $data )) {
-			$specs['default']	=	$data;
-		}
-		
-		/**
-		 * add it to template, if it's not hidden
-		 */
-		if (!isset( $attributes['hidden'] ) || $attributes['hidden'] == 'no') {
-			$this->_characterData( $this->_startTag . strtoupper( $name ) . $this->_endTag );
-		}
-		
-		if( isset( $attributes['hidden'] ) ) {
-			unset( $attributes['hidden'] );
-		}
-
-		/**
-		 * copy value from any other variable
-		 */	
-		if (isset( $attributes['copyfrom'] )) {
-			$specs['copyfrom'] = strtoupper( $attributes['copyfrom'] );
-			
-			if (strstr( $specs['copyfrom'], '.' )) {
-				$specs['copyfrom']    = explode( '.', $specs['copyfrom'] );
-				$specs['copyfrom'][0] = strtolower( $specs['copyfrom'][0] );
-			}
-			
-			unset( $attributes['copyfrom'] );
-		}
-		
-		if( isset( $attributes['modifier'] ) ) {
-			$modifier = $attributes['modifier'];
-			unset( $attributes['modifier'] );
-
-			$type = isset( $attributes['modifiertype'] ) ? $attributes['modifiertype'] : 'auto';
-
-			if( isset( $attributes['modifiertype'] ) )
-				unset( $attributes['modifiertype'] );
-
-			$specs['modifier'] = array( 'mod' => $modifier, 'type' => $type, 'params' => $attributes );
-		}
-		
-		if (!empty( $specs )) {
-			$this->_addToParentTemplate(
-										'varspecs',
-										$specs,
-										$name
-										);
-		}
-		return true;
-	}
-
-
-   /**
-	* handle a comment
-	*
-	* @access	private
-	* @param	array	attributes of the comment tag
-	* @param	string	cdata between the tags (will be used as default)
-	* @return	boolean	true on success
-	*/
-	function _handleComment( $attributes, $data )
-	{
-		$this->_addToParentTag( 'comments', $data );
-	}
-
-   /**
-	* get the character data of the element
-	*
-	* @access	private
-	* @return	string
-	*/
-	function _getCData()
-	{
-		if( $this->_depth == 0 ) {
-			return	'';
-		}
-		return $this->_data[$this->_depth];
-	}
-
-   /**
-	* add to a property of the parent template
-	*
-	* @access	private
-	* @param	string	property to add to
-	* @param	mixed	value to add
-	* @param	string	key
-	*/
-	function _addToParentTemplate( $property, $value, $key = null )
-	{
-		$cnt = count( $this->_tmplStack );
-		
-		if ($cnt === 0) {
-			return false;
-		}
-
-		$pos = $cnt - 1;
-		while ($pos >= 0) {
-			if ($this->_tmplStack[$pos]['type'] != 'tmpl') {
-				$pos--;
-				continue;
-			}
-			
-			if ($key === null) {
-				
-				if (!in_array( $value, $this->_tmplStack[$pos][$property] )) {
-					array_push( $this->_tmplStack[$pos][$property], $value );
-				}
-			} else {
-				$this->_tmplStack[$pos][$property][$key] = $value;
-			}
-
-			return true;
-		}
-		
-		return	false;
-	}
-
-   /**
-	* get a property of the parent template
-	*
-	* @access	private
-	* @param	string	property to add to
-	* @return	mixed	value to add
-	*/
-	function _getFromParentTemplate( $property )
-	{
-		$cnt = count( $this->_tmplStack );
-		
-		if ($cnt === 0) {
-			return false;
-		}
-
-		$pos = $cnt - 1;
-		while ($pos >= 0) {
-			if( $this->_tmplStack[$pos]['type'] != 'tmpl' ) {
-				$pos--;
-				continue;
-			}
-
-			if (isset( $this->_tmplStack[$pos][$property] )) {
-				return $this->_tmplStack[$pos][$property];
-			}
-
-			return false;
-		}
-		return	false;
-	}
-
-
-   /**
-	* add to a property of the parent tag
-	*
-	* @access	private
-	* @param	string	property to add to
-	* @param	mixed	value to add
-	* @param	string	key
-	*/
-	function _addToParentTag( $property, $value, $key = null )
-	{
-		$cnt = count( $this->_tmplStack );
-		
-		if ($cnt === 0) {
-			return false;
-		}
-
-		$pos = $cnt - 1;
-			
-		if ($key === null) {
-			
-			if (!in_array( $value, $this->_tmplStack[$pos][$property] )) {
-				array_push( $this->_tmplStack[$pos][$property], $value );
-			}
-		} else {
-			$this->_tmplStack[$pos][$property][$key] = $value;
-		}
-
-		return true;
-	}
-
-   /**
-	* adjust whitespace in a CData block
-	*
-	* @access	private
-	* @param	string		data
-	* @param	string		behaviour
-	* @return	string		data
-	*/
-	function _adjustWhitespace( $data, $behaviour )
-	{
-		switch( $behaviour ) {
-			case 'trim':
-				$data = str_replace( '\n', ' ', $data );
-				$data = preg_replace( '/\s\s+/', ' ', $data );
-				$data = trim( $data );
-				break;
-		}
-		return	$data;
-	}
-
-   /**
-	* inherit attributes from the parent template
-	*
-	* The following attributes are inherited automatically:
-	* - whitespace
-	* - unusedvars
-	*
-	* @access	private
-	* @param	array	attributes
-	* @param	array	attributes with inherited attributes
-	* @return	array	new attribute collection
-	*/
-	function _inheritAttributes( $attributes )
-	{
-		if (!empty( $this->_inheritAtts )) {
-			$parent = end( $this->_inheritAtts );
-		} else {
-			$parent = array(
-								'whitespace' => $this->_defaultAtts['whitespace'],
-								'unusedvars' => $this->_defaultAtts['unusedvars'],
-								'autoclear'  => $this->_defaultAtts['autoclear']
-							);
-		}
-
-		$attributes = array_merge( $parent, $attributes );
-		
-		return	$attributes;
-	}
-
-   /**
-	* checks, whether the parent tag is of a certain type
-	*
-	* This is needed to ensure, that subtemplates are only
-	* placed inside a template
-	*
-	* @access	private
-	* @param	string	type (tmpl, sub, var, link)
-	* @return	boolean
-	*/
-	function _parentTagIs( $type )
-	{
-		$parent	=	array_pop( $this->_tmplStack );
-		if( $parent === null ) {
-			return false;
-		}
-		array_push( $this->_tmplStack, $parent );
-		
-		if( $parent['type'] == $type ) {
-			return true;
-		}
-			
-		return false;
-	}
-
-   /**
-	* get the current line number
-	*
-	* @access	private
-	* @return	integer		line number
-	*/
-	function _getCurrentLine()
-	{
-		$line = count( explode( "\n", $this->_processedData ) );
-		return $line;
-	}
-
-   /**
-	* create an error message
-	*
-	* This method takes an error messages and appends the
-	* current line number as well as a pointer to the input
-	* (filename)
-	*
-	* @access	private
-	* @param	string	base error message
-	* @return	strin	error message
-	*/
-	function _createErrorMessage( $msg )
-	{
-		return sprintf( '%s in %s on line %d', $msg, $this->getCurrentInput(), $this->_getCurrentLine() );
-	}
-
-   /**
-    * get the current input
-    *
-    * @access   public
-    * @return   string
-    */
-	function getCurrentInput()
-	{
-		return $this->_currentInput;
-	}
-    
-   /**
-	* tests whether the reader should maintain backwards compatibility
-	*
-	* If enabled, you can still use 'default', 'empty', 'odd' and 'even'
-	* instead of '__default', '__empty', etc.
-	*
-	* This will be disabled by default in future versions.
-	*
-	* @access	public
-	* @return	boolean
-	*/
-	function shouldMaintainBc()
-	{
-		if (!isset( $this->_options['maintainBc'] )) {
-			return false;
-		}
-		return $this->_options['maintainBc'];
-	}
-
-   /**
-    * returns, whether the reader currently is in use
-    *
-    * @access   public
-    * @return   boolean
-    */
-	function isInUse()
-	{
-		return $this->_inUse;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Stat/File.php 4.6rc2/includes/patTemplate/patTemplate/Stat/File.php
--- 4.5.4/includes/patTemplate/patTemplate/Stat/File.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Stat/File.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,48 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate Stat
- *
- * $Id: File.php,v 1.1 2005/07/22 01:57:36 eddieajau Exp $
- *
- * A stat component should be implemented for each reader
- * to support caching. Stats return information about the
- * template source.
- *
- * @package		patTemplate
- * @subpackage	Stat
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate Stat
- *
- * $Id: File.php,v 1.1 2005/07/22 01:57:36 eddieajau Exp $
- *
- * A stat component should be implemented for each reader
- * to support caching. Stats return information about the
- * template source.
- *
- * @package		patTemplate
- * @subpackage	Stat
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_Stat_File extends patTemplate_Stat
-{
-   /**
-    * get the modification time of a template
-	*
-	* Needed, if a template cache should be used, that auto-expires
-	* the cache.
-	*
-	* @abstract	must be implemented in the template readers
-	* @param	mixed	input to read from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @return	integer	unix timestamp
-	*/
-	function getModificationTime( $input )
-	{
-		$fullPath	=	$this->_options['root'] . '/' . $input;
-		return @filemtime( $fullPath );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/Stat.php 4.6rc2/includes/patTemplate/patTemplate/Stat.php
--- 4.5.4/includes/patTemplate/patTemplate/Stat.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/Stat.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,67 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate Stat
- *
- * $Id: Stat.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * A stat component should be implemented for each reader
- * to support caching. Stats return information about the
- * template source.
- *
- * @package		patTemplate
- * @subpackage	Stat
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate Stat
- *
- * $Id: Stat.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * A stat component should be implemented for each reader
- * to support caching. Stats return information about the
- * template source.
- *
- * @package		patTemplate
- * @subpackage	Stat
- * @author		Stephan Schmidt <schst@php.net>
- * @abstract
- */
-class patTemplate_Stat extends patTemplate_Module
-{
-   /**
-	* options, are identical to those of the corresponding reader
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_options = array();
-
-   /**
-    * get the modification time of a template
-	*
-	* Needed, if a template cache should be used, that auto-expires
-	* the cache.
-	*
-	* @abstract	must be implemented in the template readers
-	* @param	mixed	input to read from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @return	integer	unix timestamp
-	*/
-	function getModificationTime( $input )
-	{
-		return	-1;
-	}
-
-   /**
-	* set options
-	*
-	* @access	public
-	* @param	array	array containing options
-	*/
-	function setOptions( $options )
-	{
-		$this->_options		=	$options;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/TemplateCache/File.php 4.6rc2/includes/patTemplate/patTemplate/TemplateCache/File.php
--- 4.5.4/includes/patTemplate/patTemplate/TemplateCache/File.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/TemplateCache/File.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,107 +0,0 @@
-<?PHP
-/**
- * patTemplate Template cache that stores data on filesystem
- *
- * $Id: File.php,v 1.1 2005/07/22 01:57:37 eddieajau Exp $
- *
- * @package		patTemplate
- * @subpackage	Caches
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * patTemplate Template cache that stores data on filesystem
- *
- * $Id: File.php,v 1.1 2005/07/22 01:57:37 eddieajau Exp $
- *
- * Possible parameters for the cache are:
- * - cacheFolder : set the folder from which to load the cache
- * - lifetime : seconds for which the cache is valid, if set to auto, it will check
- *   whether the cache is older than the original file (if the reader supports this)
- * - prefix for the filenames
- *
- * @package		patTemplate
- * @subpackage	Caches
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_TemplateCache_File extends patTemplate_TemplateCache
-{
-   /**
-	* parameters of the cache
-	*
-	* @access	private
-	* @var		array
-	*/
-	var $_params = array(
-						 'cacheFolder' => './cache',
-						 'lifetime'	   => 'auto',
-						 'prefix'	   => ''
-						);
-
-
-   /**
-	* load template from cache
-	*
-	* @access	public
-	* @param	string			cache key
-	* @param	integer			modification time of original template
-	* @return	array|boolean	either an array containing the templates or false cache could not be loaded
-	*/
-	function load( $key, $modTime = -1 )
-	{
-		$filename = $this->_getCachefileName( $key );
-		if( !file_exists( $filename ) || !is_readable( $filename ) )
-			return false;
-
-		$generatedOn = filemtime( $filename );
-		$ttl		 = $this->getParam( 'lifetime' );
-		if( $ttl == 'auto' )
-		{
-			if( $modTime < 1 )
-				return false;
-			if( $modTime > $generatedOn )
-				return false;
-			return unserialize( file_get_contents( $filename ) );
-		}
-		elseif( is_int( $ttl ) )
-		{
-			if( $generatedOn + $ttl < time() )
-				return false;
-			return unserialize( file_get_contents( $filename ) );
-		}
-		
-		return false;
-	}
-	
-   /**
-	* write template to cache
-	*
-	* @access	public
-	* @param	string		cache key
-	* @param	array		templates to store
-	* @return	boolean		true on success
-	*/
-	function write( $key, $templates )
-	{
-		$fp = @fopen( $this->_getCachefileName( $key ), 'w' );
-		if( !$fp )
-			return false;
-		flock( $fp, LOCK_EX );
-		fputs( $fp, serialize( $templates ) );
-		flock( $fp, LOCK_UN );
-		return true;
-	}
-	
-   /**
-	* get the cache filename
-	*
-	* @access	private
-	* @param	string		cache key
-	* @return	string		cache file name
-	*/
-	function _getCachefileName( $key )
-	{
-		return $this->getParam( 'cacheFolder' ) . '/' . $this->getParam( 'prefix' ).$key . '.cache';
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate/TemplateCache.php 4.6rc2/includes/patTemplate/patTemplate/TemplateCache.php
--- 4.5.4/includes/patTemplate/patTemplate/TemplateCache.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate/TemplateCache.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,80 +0,0 @@
-<?PHP
-/**
- * Base class for patTemplate template cache
- *
- * $Id: TemplateCache.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * A template cache is used to cache the data after
- * the template has been read, but before the variables
- * have been added.
- *
- * Data is normally stored in serialized format. This
- * will increase performance.
- *
- * This is not related to an output cache!
- *
- * @package		patTemplate
- * @subpackage	Caches
- * @author		Stephan Schmidt <schst@php.net>
- */
-
-/**
- * Base class for patTemplate template cache
- *
- * $Id: TemplateCache.php,v 1.1 2005/07/22 01:57:26 eddieajau Exp $
- *
- * A template cache is used to cache the data after
- * the template has been read, but before the variables
- * have been added.
- *
- * Data is normally stored in serialized format. This
- * will increase performance.
- *
- * This is not related to an output cache!
- *
- * @abstract
- * @package		patTemplate
- * @subpackage	Caches
- * @author		Stephan Schmidt <schst@php.net>
- */
-class patTemplate_TemplateCache extends patTemplate_Module
-{
-   /**
-	* load template from cache
-	*
-	* @access	public
-	* @param	string			cache key
-	* @param	integer			modification time of original template
-	* @return	array|boolean	either an array containing the templates or false cache could not be loaded
-	*/
-	function load( $key, $modTime = -1 )
-	{
-		return false;
-	}
-	
-   /**
-	* write template to cache
-	*
-	* @access	public
-	* @param	string		cache key
-	* @param	array		templates to store
-	*/
-	function write( $key, $templates )
-	{
-		return true;
-	}
-
-   /**
-    * get the cache key for the input
-	*
-	* @param	mixed	input to read from.
-	*					This can be a string, a filename, a resource or whatever the derived class needs to read from
-	* @param	array	options
-	* @return	string	key
-	*/
-	function getKey( $input, $options = array() )
-	{
-		return	md5( $input . serialize( $options ) );
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/patTemplate.php 4.6rc2/includes/patTemplate/patTemplate.php
--- 4.5.4/includes/patTemplate/patTemplate.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/patTemplate.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,2572 +0,0 @@
-<?PHP
-/**
- * patTemplate
- *
- * $Id: patTemplate.php,v 1.1 2005/07/22 01:57:25 eddieajau Exp $
- *
- * powerful templating engine
- *
- * @version		3.1.0
- * @package		patTemplate
- * @author		Stephan Schmidt <schst@php.net>
- * @license		LGPL
- * @link		http://www.php-tools.net
- */
-
-// ** Following line Mambo specific **
-require_once( dirname( __FILE__ ) . '/patErrorManager.php' );
-
-/**
- * template already exists
- */
-define( 'PATTEMPLATE_ERROR_TEMPLATE_EXISTS', 5010 );
-
-/**
- * template does not exist
- */
-define ( 'PATTEMPLATE_WARNING_NO_TEMPLATE', 5011 );
-
-/**
- * unknown type
- */
-define ( 'PATTEMPLATE_WARNING_UNKNOWN_TYPE', 5012 );
-
-/**
- * base class for module could not be found
- */
-define( 'PATTEMPLATE_ERROR_BASECLASS_NOT_FOUND', 5050 );
-
-/**
- * module could not be found
- */
-define( 'PATTEMPLATE_ERROR_MODULE_NOT_FOUND', 5051 );
-
-/**
- * array expected
- */
-define( 'PATTEMPLATE_ERROR_EXPECTED_ARRAY', 5052 );
-
-/**
- * No input
- */
-define( 'PATTEMPLATE_ERROR_NO_INPUT', 6000 );
-
-/**
- * patTemplate
- *
- * powerful templating engine
- *
- * @version		3.1.0
- * @package		patTemplate
- * @author		Stephan Schmidt <schst@php.net>
- * @license		LGPL
- * @link		http://www.php-tools.net
- */
-class patTemplate
-{
-   /**
-	* standard system vars that identify pat tools
-	* @var	array
-	*/
-	var	$_systemVars			=	array(
-										'appName'		=>	'patTemplate',
-										'appVersion'	=>	'3.0.0',
-										'author'		=>	array(
-																	'Stephan Schmidt <schst@php.net>'
-																 )
-									);
-
-   /**
-	* default attributes for new templates
-	* @access	private
-	* @var		array
-	*/
-	var	$_defaultAttributes	=	array(
-										'type'			=>	'standard',
-										'visibility'	=>	'visible',
-										'loop'			=>	1,
-										'unusedvars'	=>	'strip',
-										'whitespace'	=>	'keep',
-										'autoclear'		=>	'off',
-										'autoload'		=>	'on'
-									);
-
-   /**
-	* options for patTemplate
-    *
-    * Currently the following options are implemented:
-    * - maintainBc defines, whether patTemplate should be backwards compatible.
-    *   This means, that you may use 'default' and 'empty' for subtemplates.
-    *
-	* @access	private
-	* @var		array
-	*/
-	var	$_options	=	array(
-								'startTag'        => '{',
-								'endTag'          => '}',
-								'root'            => '.',
-								'namespace'       => 'patTemplate',
-                                'maintainBc'      => true,
-                                'defaultFunction' => false
-                             );
-
-   /**
-	* start tag
-	*
-	* @access	private
-	* @var		string
-	*/
-	var $_startTag = '{';
-
-   /**
-	* end tag
-	*
-	* @access	private
-	* @var		string
-	*/
-	var $_endTag = '}';
-
-   /**
-	* loaded modules
-	*
-	* Modules are:
-	* - Readers
-	* - Caches
-	* - Variable modifiers
-	* - Filters
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_modules		=	array();
-
-   /**
-	* directories, where modules can be stored
-	* @access	private
-	* @var		array
-	*/
-	var	$_moduleDirs	=	array();
-
-   /**
-	* stores all template names
-	* @access	private
-	* @var		array
-	*/
-	var	$_templateList	=	array();
-
-   /**
-	* stores all template data
-	* @access	private
-	* @var		array
-	*/
-	var	$_templates		=	array();
-
-   /**
-	* stores all global variables
-	* @access	private
-	* @var		array
-	*/
-	var	$_globals	=	array();
-
-   /**
-	* stores all local variables
-	* @access	private
-	* @var		array
-	*/
-	var	$_vars	=	array();
-
-   /**
-	* stores the name of the first template that has been
-	* found
-	*
-	* @access	private
-	* @var		string
-	*/
-	var	$_root;
-
-   /**
-	* output filters that should be used
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_outputFilters = array();
-
-   /**
-	* input filters that should be used
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_inputFilters = array();
-
-   /**
-	* template cache, that should be used
-	*
-	* @access	private
-	* @var		array
-	*/
-	var	$_tmplCache = null;
-
-   /**
-    * Create a new patTemplate instance.
-	*
-	* The constructor accepts the type of the templates as sole parameter.
-	* You may choose one of:
-	* - html (default)
-	* - tex
-	*
-	* The type influences the tags you are using in your templates.
-	*
-	* @access	public
-	* @param	string	type (either html or tex)
-	*/
-	function patTemplate( $type = 'html' )
-	{
-		if( !defined( 'PATTEMPLATE_INCLUDE_PATH' ) ) {
-			define( 'PATTEMPLATE_INCLUDE_PATH', dirname( __FILE__ ) . '/patTemplate' );
-		}
-
-		$this->setType( $type );
-	}
-
-   /**
-	* sets an option
-	*
-	* Currently, the following options are supported
-	* - maintainBc (true|false)
-	* - namespace (string)
-	*
-	* @access	public
-	* @param	string	option to set
-	* @param	string	value of the option
-	*/
-	function setOption( $option, $value )
-	{
-		$this->_options[$option] = $value;
-	}
-
-   /**
-	* gets an option
-	*
-	* @access	public
-	* @param	string	option to get
-	* @return	mixed	value of the option
-	*/
-	function getOption( $option )
-	{
-		if( !isset( $this->_options[$option] ) )
-			return null;
-		return $this->_options[$option];
-	}
-
-   /**
-	* sets name of directory where templates are stored
-	*
-	* @access	public
-	* @param	string	dir where templates are stored
-	* @deprecated		please use patTemplate::setRoot() instead
-	*/
-	function setBasedir( $basedir )
-	{
-		$this->_options['root']	= $basedir;
-	}
-
-   /**
-	* sets root base for the template
-	*
-	* The parameter depends on the reader you are using.
-	*
-	* @access	public
-	* @param	string	root base of the templates
-	*/
-	function setRoot( $root )
-	{
-		$this->_options['root']	= $root;
-	}
-
-   /**
-	* gets name of root base for the templates
-	*
-	* @access	public
-	* @return	mixed 		root base
-	*/
-	function getRoot()
-	{
-		return	$this->_options['root'];
-	}
-
-   /**
-	* sets namespace of patTemplate tags
-	*
-	* If you want to use more than one namespace, you may set this to
-	* an array. All tags in these namespaces will be treated as patTemplate
-	* tags.
-	*
-	* @access	public
-	* @param	string|array	namespace(s)
-	*/
-	function setNamespace( $ns )
-	{
-		$this->_options['namespace'] = $ns;
-	}
-
-   /**
-	* gets namespace of patTemplate tags
-	*
-	* @access	public
-	* @return	string|array	namespace(s)
-	*/
-	function getNamespace()
-	{
-		return $this->_options['namespace'];
-	}
-
-   /**
-	* set default attribute
-	*
-	* @access	public
-	* @param	string	attribute name
-	* @param	mixed	attribute value
-	*/
-	function setDefaultAttribute( $name, $value )
-	{
-		$this->_defaultAttributes[$name]	=	$value;
-	}
-
-   /**
-	* set default attributes
-	*
-	* @access	public
-	* @param	array	attributes
-	*/
-	function setDefaultAttributes( $attributes )
-	{
-		$this->_defaultAttributes	=	array_merge( $this->_defaultAttributes, $attributes );
-	}
-
-   /**
-	* get default attributes
-	*
-	* @access	public
-	* @return	return default attributes
-	*/
-	function getDefaultAttributes()
-	{
-		return	$this->_defaultAttributes;
-	}
-
-   /**
-	* set the type for the templates
-	*
-	* @access	public
-	* @param	string	type (html or tex)
-	* @return	boolean	true on success
-	*/
-	function setType( $type )
-	{
-		switch( strtolower( $type ) )
-		{
-			case "tex":
-				$this->setTags( '<{', '}>' );
-				break;
-			case "html":
-				$this->setTags( '{', '}' );
-				break;
-			default:
-				return	patErrorManager::raiseWarning(
-														PATTEMPLATE_WARNING_UNKNOWN_TYPE,
-														"Unknown type '$type'. Please use 'html' or 'tex'."
-													);
-		}
-		return true;
-	}
-
-   /**
-	* set the start and end tag for variables
-	*
-	* @access	public
-	* @param	string	start tag
-	* @param	string	end tag
-	* @return	boolean	true on success
-	*/
-	function setTags( $startTag, $endTag )
-	{
-		$this->_options['startTag']	=	$startTag;
-		$this->_options['endTag']	=	$endTag;
-
-		$this->_startTag	=	$startTag;
-		$this->_endTag		=	$endTag;
-		return true;
-	}
-
-   /**
-	* get start tag for variables
-	*
-	* @access	public
-	* @return	string	start tag
-	*/
-	function getStartTag()
-	{
-		return $this->_options['startTag'];
-	}
-
-   /**
-	* get end tag for variables
-	*
-	* @access	public
-	* @return	string	end tag
-	*/
-	function getEndTag()
-	{
-		return $this->_options['endTag'];
-	}
-
-   /**
-	* add a directory where patTemplate should search for
-	* modules.
-	*
-	* You may either pass a string or an array of directories.
-	*
-	* patTemplate will be searching for a module in the same
-	* order you added them. If the module cannot be found in
-	* the custom folders, it will look in
-	* patTemplate/$moduleType.
-	*
-	* @access	public
-	* @param	string			module type
-	* @param	string|array	directory or directories to search.
-	*/
-	function addModuleDir( $moduleType, $dir )
-	{
-		if( !isset( $this->_moduleDirs[$moduleType] ) )
-			$this->_moduleDirs[$moduleType]	=	array();
-		if( is_array( $dir ) )
-			$this->_moduleDirs[$moduleType] = array_merge( $this->_moduleDirs[$moduleType], $dir );
-		else
-			array_push( $this->_moduleDirs[$moduleType], $dir );
-	}
-
-   /**
-	* Sets an attribute of a template
-	*
-	* supported attributes: visibilty, loop, parse, unusedvars
-	*
-	* @param	string	$template	name of the template
-	* @param	string	$attribute	name of the attribute
-	* @param	mixed	$value	value of the attribute
-	* @access	public
-	* @see		setAttributes(),getAttribute(), clearAttribute()
-	*/
-	function setAttribute( $template, $attribute, $value )
-	{
-		$template	=	strtolower( $template );
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-
-		$attribute	=	strtolower( $attribute );
-		$this->_templates[$template]['attributes'][$attribute]	=	$value;
-		return true;
-	}
-
-   /**
-	* Sets several attribute of a template
-	*
-	* $attributes has to be a assotiative arrays containing attribute/value pairs
-	* supported attributes: visibilty, loop, parse, unusedvars
-	*
-	* @param	string	$template	name of the template
-	* @param	array	$attributes	attribute/value pairs
-	* @access	public
-	* @see		setAttribute(), getAttribute(), clearAttribute()
-	*/
-	function setAttributes( $template, $attributes )
-	{
-		if( !is_array( $attributes ) )
-		{
-			return patErrorManager::raiseError( PATTEMPLATE_ERROR_EXPECTED_ARRAY, 'patTemplate::setAttributes: Expected array as second parameter, '.gettype( $attributes ).' given' );
-		}
-
-		$template	=	strtolower( $template );
-		$attributes	=	array_change_key_case( $attributes );
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-
-		$this->_templates[$template]['attributes']	=	array_merge( $this->_templates[$template]['attributes'], $attributes );
-		return true;
-	}
-
-   /**
-	* Get all attributes of a template
-	*
-	* @param	string	name of the template
-	* @return	array	attributes
-	* @access	public
-	*/
-	function getAttributes( $template )
-	{
-		$template	=	strtolower( $template );
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-		return	$this->_templates[$template]['attributes'];
-	}
-
-   /**
-	* Gets an attribute of a template
-	*
-	* supported attributes: visibilty, loop, parse, unusedvars
-	*
-	* @param	string	$template	name of the template
-	* @param	string	$attribute	name of the attribute
-	* @return	mixed	value of the attribute
-	* @access	public
-	* @see		setAttribute(), setAttributes(), clearAttribute()
-	*/
-	function getAttribute( $template, $attribute )
-	{
-		$template	=	strtolower( $template );
-		$attribute	=	strtolower( $attribute );
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-		return	$this->_templates[$template]['attributes'][$attribute];
-	}
-
-   /**
-	* Clears an attribute of a template
-	*
-	* supported attributes: visibilty, loop, parse, unusedvars
-	*
-	* @param	string	$template	name of the template
-	* @param	string	$attribute	name of the attribute
-	* @access	public
-	* @see		setAttribute(), setAttributes(), getAttribute()
-	*/
-	function clearAttribute( $template, $attribute )
-	{
-		$template	=	strtolower( $template );
-		$attribute	=	strtolower( $attribute );
-
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-		$this->_templates[$template]['attributes'][$attribute]	=	'';;
-		return true;
-	}
-
-   /**
-	* Prepare a template
-	*
-	* This can be used if you want to add variables to
-	* a template, that has not been loaded yet.
-	*
-	* @access	public
-	* @param	string	template name
-	*/
-	function prepareTemplate( $name )
-	{
-		$name	=	strtolower( $name );
-		if( !isset( $this->_vars[$name] ) )
-		{
-			$this->_vars[$name]	=	array(
-												'scalar'	=>	array(),
-												'rows'		=>	array()
-											);
-		}
-	}
-
-   /**
-	* add a variable to a template
-	*
-	* A variable may also be an indexed array, but _not_
-	* an associative array!
-	*
-	* @access	public
-	* @param	string	$template	name of the template
-	* @param	string	$varname	name of the variable
-	* @param	mixed	$value		value of the variable
-	*/
-	function addVar( $template, $varname, $value )
-	{
-		$template = strtolower( $template );
-		$varname  = strtoupper( $varname );
-
-		if( !is_array( $value ) ) {
-			$this->_vars[$template]['scalar'][$varname] = $value;
-			return true;
-		}
-
-		$cnt = count( $value );
-		for ($i = 0; $i < $cnt; $i++) {
-			if (!isset( $this->_vars[$template]['rows'][$i] )) {
-				$this->_vars[$template]['rows'][$i] = array();
-			}
-			$this->_vars[$template]['rows'][$i][$varname] = $value[$i];
-		}
-
-		return true;
-	}
-
-   /**
-	* get the value of a variable
-	*
-	* @access	public
-	* @param	string	name of the template
-	* @param	string	name of the variable
-	* @return	string	value of the variable, null if the variable is not set
-	*/
-	function getVar( $template, $varname )
-	{
-		$template	=	strtolower( $template );
-		$varname	=	strtoupper( $varname );
-
-		if( isset( $this->_vars[$template]['scalar'][$varname] ) )
-			return $this->_vars[$template]['scalar'][$varname];
-
-		$value = array();
-
-		$cnt = count( $this->_vars[$template]['rows'] );
-		for( $i = 0; $i < $cnt; $i++ )
-		{
-			if( !isset( $this->_vars[$template]['rows'][$i][$varname] ) )
-				continue;
-			array_push( $value, $this->_vars[$template]['rows'][$i][$varname] );
-		}
-		if( !empty( $value ) )
-			return $value;
-		return null;
-	}
-
-   /**
-	* clear the value of a variable
-	*
-	* @access	public
-	* @param	string	name of the template
-	* @param	string	name of the variable
-	* @return   boolean
-	* @see      clearVars(), clearTemplate()
-	*/
-	function clearVar( $template, $varname )
-	{
-		$template	=	strtolower( $template );
-		$varname	=	strtoupper( $varname );
-
-		if (isset( $this->_vars[$template]['scalar'][$varname] )) {
-			unset ($this->_vars[$template]['scalar'][$varname]);
-			return true;
-		}
-
-        $result = false;
-		$cnt = count( $this->_vars[$template]['rows'] );
-		for ($i = 0; $i < $cnt; $i++) {
-			if (!isset($this->_vars[$template]['rows'][$i][$varname])) {
-				continue;
-			}
-			unset($this->_vars[$template]['rows'][$i][$varname]);
-			$result = true;
-		}
-		return $result;
-	}
-
-
-   /**
-	* Adds several variables to a template
-	*
-	* Each Template can have an unlimited amount of its own variables
-	* $variables has to be an assotiative array containing variable/value pairs
-	*
-	* @param	string	$template	name of the template
-	* @param	array	$variables	assotiative array of the variables
-	* @param	string	$prefix	prefix for all variable names
-	* @access	public
-	* @see		addVar(), addRows(), addGlobalVar(), addGlobalVars()
-	*/
-	function addVars( $template, $variables, $prefix = '' )
-	{
-		$template	=	strtolower( $template );
-		$prefix		=	strtoupper( $prefix );
-		$variables	=	array_change_key_case( $variables, CASE_UPPER );
-
-		foreach ($variables as $varname => $value) {
-			$varname = $prefix.$varname;
-
-			if (!is_array($value)) {
-			    if (!is_scalar($value)) {
-    				continue;
-			    }
-			    $this->_vars[$template]['scalar'][$varname] = $value;
-				continue;
-			}
-
-			$cnt = count( $value );
-			for( $i = 0; $i < $cnt; $i++ ) {
-				if( !isset( $this->_vars[$template]['rows'][$i] ) )
-					$this->_vars[$template]['rows'][$i]	=	array();
-
-				$this->_vars[$template]['rows'][$i][$varname]	=	$value[$i];
-			}
-		}
-	}
-
-   /**
-	* Clear all variables in a template
-	*
-	* This clears only variables, but does
-	*
-	* @access	public
-	* @param	string	$template	name of the template
-	* @return   boolean
-	* @see		clearVar(), clearTemplate()
-	*/
-	function clearVars( $template )
-	{
-		$template = strtolower($template);
-		$this->_vars[$template] = array(
-									     'scalar' => array(),
-										 'rows'   => array()
-										);
-		return true;
-	}
-
-
-   /**
-	* Adds several rows of variables to a template
-	*
-	* Each Template can have an unlimited amount of its own variables
-	* Can be used to add a database result as variables to a template
-	*
-	* @param	string	$template	name of the template
-	* @param	array	$rows	array containing assotiative arrays with variable/value pairs
-	* @param	string	$prefix	prefix for all variable names
-	* @access	public
-	* @see		addVar(), addVars(), addGlobalVar(), addGlobalVars()
-	*/
-	function addRows( $template, $rows, $prefix = '' )
-	{
-		$template	=	strtolower( $template );
-		$prefix		=	strtoupper( $prefix );
-
-		$cnt		=	count( $rows );
-		for( $i = 0; $i < $cnt; $i++ )
-		{
-			if( !isset( $this->_vars[$template]['rows'][$i] ) )
-				$this->_vars[$template]['rows'][$i]	=	array();
-
-			$rows[$i]	=	array_change_key_case( $rows[$i], CASE_UPPER );
-
-			foreach( $rows[$i] as $varname => $value )
-			{
-				$this->_vars[$template]['rows'][$i][$prefix.$varname]	=	$value;
-			}
-		}
-	}
-
-   /**
-	* Adds an object to a template
-	*
-	* All properties of the object will be available as template variables.
-	*
-	* @access	public
-	* @param	string		    name of the template
-	* @param	object|array	object or array of objects
-	* @param	string		    prefix for all variable names
-    * @param    boolean         ignore private properties (starting with _)
-	* @see		addVar(), addRows(), addGlobalVar(), addGlobalVars()
-	*/
-	function addObject( $template, $object, $prefix = '', $ignorePrivate = false )
-	{
-        if( is_array( $object ) ) {
-			$rows = array();
-            foreach($object as $o) {
-				array_push( $rows, $this->getObjectVars($o, $ignorePrivate) );
-            }
-
-       		return $this->addRows( $template, $rows, $prefix );
-        } elseif (is_object($object)) {
-            return $this->addVars( $template, $this->getObjectVars($object, $ignorePrivate), $prefix );
-        }
-        return false;
-	}
-
-   /**
-    * get the vars from an object
-    *
-    * @access   private
-    * @param    object
-    * @param    boolean     ignore private properties (starting with _)
-    * @return   array
-    */
-    function getObjectVars($obj, $ignorePrivate = false)
-    {
-        if (method_exists($obj, 'getVars')) {
-            return $obj->getVars();
-        }
-        $vars = get_object_vars($obj);
-        if ($ignorePrivate === false) {
-        	return $vars;
-        }
-        foreach ($vars as $var => $value) {
-        	if ($var{0} == '_') {
-        		unset($vars[$var]);
-        	}
-        }
-        return $vars;
-    }
-
-   /**
-	* Adds a global variable
-	*
-	* Global variables are valid in all templates of this object.
-	* A global variable has to be scalar, it will be converted to a string.
-	*
-	* @access	public
-	* @param	string	$varname	name of the global variable
-	* @param	string	$value		value of the variable
-	* @return	boolean	true on success
-	* @see		addGlobalVars(), addVar(), addVars(), addRows()
-	*/
-	function addGlobalVar( $varname, $value )
-	{
-		$this->_globals[strtoupper( $varname )]	=	( string )$value;
-		return	true;
-	}
-
-   /**
-	* Clears a global variable
-	*
-	* @access	public
-	* @param	string	$varname	name of the global variable
-	* @return	boolean	true on success
-	* @see		clearVar(), clearVars(), clearGlobalVars()
-	*/
-	function clearGlobalVar( $varname )
-	{
-	    $varname = strtoupper( $varname );
-	    if (!isset($this->_globals[$varname])) {
-	    	return false;
-	    }
-		unset($this->_globals[$varname]);
-		return	true;
-	}
-
-   /**
-	* Clears all global variables
-	*
-	* @access	public
-	* @return	boolean	true on success
-	* @see		clearVar(), clearVars(), clearGlobalVar()
-	*/
-	function clearGlobalVars( $varname )
-	{
-	    $this->_globals = array();
-		return	true;
-	}
-
-   /**
-	* Adds several global variables
-	*
-	* Global variables are valid in all templates of this object.
-	*
-	* $variables is an associative array, containing name/value pairs of the variables.
-	*
-	* @access	public
-	* @param	array	$variables	array containing the variables
-	* @param	string	$prefix		prefix for variable names
-	* @return	boolean	true on success
-	* @see		addGlobalVar(), addVar(), addVars(), addRows()
-	*/
-	function addGlobalVars( $variables, $prefix = '' )
-	{
-		$variables	=	array_change_key_case( $variables, CASE_UPPER );
-		$prefix		=	strtoupper( $prefix );
-		foreach( $variables as $varname => $value )
-		{
-			$this->_globals[$prefix.$varname]	=	( string )$value;
-		}
-
-		return	true;
-	}
-
-   /**
-	* get all global variables
-	*
-	* @access	public
-	* @return	array	global variables
-	*/
-	function getGlobalVars()
-	{
-		return	$this->_globals;
-	}
-
-	/**
-	* checks wether a template exists
-	*
-	* @access	public
-	* @param	string		name of the template
-	* @return	boolean		true, if the template exists, false otherwise
-	*/
-	function exists( $name )
-	{
-		return	in_array( strtolower( $name ), $this->_templateList );
-	}
-
-   /**
-	* enable a template cache
-	*
-	* A template cache will improve performace, as the templates
-	* do not have to be read on each request.
-	*
-	* @access	public
-	* @param	string		name of the template cache
-	* @param	array		parameters for the template cache
-	* @return	boolean		true on success, patError otherwise
-	*/
-	function useTemplateCache( $cache, $params = array() )
-	{
-		if( !is_object( $cache ) )
-		{
-			$cache = &$this->loadModule( 'TemplateCache', $cache, $params );
-		}
-		if( patErrorManager::isError( $cache ) )
-			return $cache;
-
-		$this->_tmplCache = &$cache;
-		return true;
-	}
-
-   /**
-	* enable an output filter
-	*
-	* Output filters are used to modify the template
-	* result before it is sent to the browser.
-	*
-	* They are applied, when displayParsedTemplate() is called.
-	*
-	* @access	public
-	* @param	string		name of the output filter
-	* @param	array		parameters for the output filter
-	* @return	boolean		true on success, patError otherwise
-	*/
-	function applyOutputFilter( $filter, $params = array() )
-	{
-		if( !is_object( $filter ) )
-		{
-			$filter = &$this->loadModule( 'OutputFilter', $filter, $params );
-		}
-		if( patErrorManager::isError( $filter ) )
-			return $filter;
-
-		$this->_outputFilters[] = &$filter;
-		return true;
-	}
-
-   /**
-	* enable an input filter
-	*
-	* input filters are used to modify the template
-	* stream before it is split into smaller templates-
-	*
-	* @access	public
-	* @param	string		name of the input filter
-	* @param	array		parameters for the input filter
-	* @return	boolean		true on success, patError otherwise
-	*/
-	function applyInputFilter( $filter, $params = array() )
-	{
-		if( !is_object( $filter ) )
-		{
-			$filter = &$this->loadModule( 'InputFilter', $filter, $params );
-		}
-		if( patErrorManager::isError( $filter ) )
-			return $filter;
-
-		$this->_inputFilters[] = &$filter;
-		return true;
-	}
-
-   /**
-	* open a file and parse for patTemplate tags
-	*
-	* @access		public
-	* @param		name of the file
-	* @return		true, if the template could be parsed
-	* @deprecated	Use patTemplate::readTemplatesFromInput() instead, as the method name is misleading
-	* @see			readTemplatesFromInput()
-	*/
-	function readTemplatesFromFile( $filename )
-	{
-		return	$this->readTemplatesFromInput( $filename, 'File' );
-	}
-
-   /**
-	* open any input and parse for patTemplate tags
-	*
-	* @access	public
-	* @param	string	name of the input (filename, shm segment, etc.)
-	* @param	string	driver that is used as reader, you may also pass a Reader object
-	* @param	array	additional options that will only be used for this template
-	* @param	string	name of the template that should be used as a container, should not be used by public
-	*					calls.
-	* @return	boolean	true, if the template could be parsed, false otherwise
-	*/
-	function readTemplatesFromInput( $input, $reader = 'File', $options = null, $parseInto = null )
-	{
-		if ($input === '') {
-			return patErrorManager::raiseError(PATTEMPLATE_ERROR_NO_INPUT, 'No input to read has been passed.');
-		}
-
-		if( is_array( $options ) )
-			$options = array_merge( $this->_options, $options );
-		else
-			$options = $this->_options;
-
-		if( !is_null( $parseInto ) )
-			$parseInto	=	strtolower( $parseInto );
-
-		$templates	=	false;
-		if( $this->_tmplCache !== null )
-		{
-			/**
-			 * get the unique cache key
-			 */
-			$key = $this->_tmplCache->getKey( $input, $options );
-
-			$templates = $this->_loadTemplatesFromCache( $input, $reader, $options, $key );
-
-			/**
-			 * check for error returned from cache
-			 */
-			if( patErrorManager::isError( $templates ) )
-				return $templates;
-		}
-
-		/**
-		 * templates have not been loaded from cache
-		 */
-		if( $templates === false )
-		{
-			if( !is_object( $reader ) )
-			{
-				$reader = &$this->loadModule( 'Reader', $reader);
-				if( patErrorManager::isError( $reader ) ) {
-					return $reader;
-				}
-			}
-
-			if ($reader->isInUse()) {
-				$reader = &$this->loadModule( 'Reader', $reader->getName(), array(), true);
-				if( patErrorManager::isError( $reader ) ) {
-					return $reader;
-				}
-			}
-
-			$reader->setOptions( $options );
-
-			/**
-			 * set the root attributes
-			 */
-			if( !is_null( $parseInto ) )
-			{
-				$attributes = $this->getAttributes( $parseInto );
-				if( !patErrorManager::isError( $attributes ) )
-				{
-					$reader->setRootAttributes( $attributes );
-				}
-			}
-
-			$templates	=	$reader->readTemplates( $input );
-
-			/**
-			 * check for error returned from reader
-			 */
-			if( patErrorManager::isError( $templates ) )
-				return $templates;
-
-			/**
-			 * store the
-			 */
-			if( $this->_tmplCache !== null )
-			{
-				$this->_tmplCache->write( $key, $templates );
-			}
-		}
-
-		/**
-		 * traverse all templates
-		 */
-		foreach( $templates as $name => $spec )
-		{
-			/**
-			 * root template
-			 */
-			if( $name == '__ptroot' )
-			{
-				if( $parseInto === false )
-				{
-					continue;
-				}
-				if( !in_array( $parseInto, $this->_templateList ) )
-					continue;
-
-				$spec['loaded']		= true;
-				$spec['attributes']	= $this->_templates[$parseInto]['attributes'];
-				$name	=	$parseInto;
-			}
-			else
-			{
-				/**
-				 * store the name
-				 */
-				array_push( $this->_templateList, $name );
-			}
-
-			/**
-			 * if this is the first template that has been loaded
-			 * set it as the root template
-			 */
-			if( $this->_root === null && is_null( $parseInto ) && isset( $spec['isRoot'] ) && $spec['isRoot'] == true )
-			{
-				$this->_root = $name;
-			}
-
-			/**
-			 * set some default values
-			 */
-			$spec['iteration']			=	0;
-			$spec['lastMode']			=	'w';
-			$spec['result']				=	'';
-			$spec['modifyVars']			=	array();
-			$spec['copyVars']			=	array();
-			$spec['defaultVars']		=	array();
-
-			/**
-			 * store the template
-			 */
-			$this->_templates[$name]	=	$spec;
-
-			$this->prepareTemplate( $name );
-
-			/**
-			 * store the default values of the variables
-			 */
-			foreach( $spec['varspecs'] as $varname => $varspec )
-			{
-				if( isset( $varspec['modifier'] ) )
-				{
-					$this->_templates[$name]['modifyVars'][$varname] = $varspec['modifier'];
-				}
-
-				if( isset( $varspec['copyfrom'] ) )
-				{
-					$this->_templates[$name]['copyVars'][$varname] = $varspec['copyfrom'];
-				}
-
-				if( !isset( $varspec['default'] ) )
-					continue;
-
-				$this->_templates[$name]['defaultVars'][$varname] = $varspec['default'];
-
-				if( !is_null( $this->getVar( $name, $varname ) ) )
-					continue;
-
-				$this->addVar( $name, $varname, $varspec['default'] );
-			}
-
-			unset($this->_templates[$name]['varspecs']);
-
-			/**
-			 * autoload the template
-			 *
-			 * Some error management is needed here...
-			 */
-			if( isset( $this->_templates[$name]['attributes']['src'] ) && $this->_templates[$name]['attributes']['autoload'] == 'on' )
-			{
-				if( $this->_templates[$name]['loaded'] !== true )
-				{
-                    if( $this->_templates[$name]['attributes']['parse'] == 'on' )
-					{
-    					$this->readTemplatesFromInput( $this->_templates[$name]['attributes']['src'], $this->_templates[$name]['attributes']['reader'], $options, $name );
-					}
-					else
-					{
-						$this->loadTemplateFromInput( $this->_templates[$name]['attributes']['src'], $this->_templates[$name]['attributes']['reader'], null, $name );
-					}
-					$this->_templates[$name]['loaded']	=	true;
-				}
-			}
-		}
-
-		return true;
-	}
-
-   /**
-	* load from template cache
-	*
-	* @access	private
-	* @param	string	name of the input (filename, shm segment, etc.)
-	* @param	string	driver that is used as reader, you may also pass a Reader object
-	* @param	array	options for the reader
-	* @param	string	cache key
-	* @return	array|boolean	either an array containing the templates, or false
-	*/
-	function _loadTemplatesFromCache( $input, &$reader, $options, $key )
-	{
-        if( is_object( $reader ) )
-			$statName   =   $reader->getName();
-        else
-			$statName	=	$reader;
-
-		$stat	=	&$this->loadModule( 'Stat', $statName );
-		$stat->setOptions( $options );
-
-		/**
-		 * get modification time
-		 */
-		$modTime   = $stat->getModificationTime( $input );
-		$templates = $this->_tmplCache->load( $key, $modTime );
-
-		return $templates;
-	}
-
-   /**
-	* open any input and load content into template
-	*
-	* @access	public
-	* @param	string	name of the input (filename, shm segment, etc.)
-	* @param	string	driver that is used as reader
-	* @param	string	name of the template that should be used as a container,
-	* @return	boolean	true, if the template could be parsed, false otherwise
-	*/
-	function loadTemplateFromInput( $input, $reader = 'File', $options = null, $parseInto = false )
-	{
-		if( is_array( $options ) )
-			$options = array_merge( $this->_options, $options );
-		else
-			$options = $this->_options;
-
-		if( !is_null( $parseInto ) )
-			$parseInto	=	strtolower( $parseInto );
-
-		$reader	= &$this->loadModule( 'Reader', $reader );
-		if( patErrorManager::isError( $reader ) )
-		{
-			return $reader;
-		}
-		$reader->setOptions($options);
-
-		$result	= $reader->loadTemplate( $input );
-
-		if( patErrorManager::isError( $result ) )
-		{
-			return $result;
-		}
-
-		$this->_templates[$parseInto]['content'] .= $result;
-		$this->_templates[$parseInto]['loaded']   = true;
-		return true;
-	}
-
-   /**
-	* load a template that had autoload="off"
-	*
-	* This is needed, if you change the source of a template and want to
-	* load it, after changing the attribute.
-	*
-	* @access	public
-	* @param	string		template name
-	* @return	boolean		true, if template could be loaded
-	*/
-	function  loadTemplate( $template )
-	{
-		$template = strtolower( $template );
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-
-		if( $this->_templates[$template]['loaded'] === true )
-			return true;
-
-		if( $this->_templates[$template]['attributes']['parse'] == 'on' )
-		{
-			return $this->readTemplatesFromInput( $this->_templates[$template]['attributes']['src'], $this->_templates[$template]['attributes']['reader'], null, $template );
-		}
-		else
-		{
-			return $this->loadTemplateFromInput( $this->_templates[$template]['attributes']['src'], $this->_templates[$template]['attributes']['reader'], null, $template );
-		}
-	}
-
-   /**
-    * loads a patTemplate module
-	*
-	* Modules are located in the patTemplate folder and include:
-	* - Readers
-	* - Caches
-	* - Variable Modifiers
-	* - Filters
-	* - Functions
-	* - Stats
-	*
-	* @access	public
-	* @param	string	moduleType (Reader|TemplateCache|Modifier|OutputFilter|InputFilter)
-	* @param	string	moduleName
-	* @param	array	parameters for the module
-	* @return	object
-	*/
-	function &loadModule( $moduleType, $moduleName, $params = array(), $new = false )
-	{
-		if( !isset( $this->_modules[$moduleType] ) )
-			$this->_modules[$moduleType]	=	array();
-
-		$sig = md5( $moduleName . serialize( $params ) );
-
-		if( isset( $this->_modules[$moduleType][$sig] ) && $new === false ) {
-			return	$this->_modules[$moduleType][$sig];
-		}
-
-		if( !class_exists( 'patTemplate_Module' ) )
-		{
-			$file	=	sprintf( "%s/Module.php", $this->getIncludePath() );
-			if( !@include_once $file )
-				return	patErrorManager::raiseError( PATTEMPLATE_ERROR_BASECLASS_NOT_FOUND, 'Could not load module base class.' );
-		}
-
-		$baseClass	=	'patTemplate_' . $moduleType;
-		if( !class_exists( $baseClass ) )
-		{
-			$baseFile	=	sprintf( "%s/%s.php", $this->getIncludePath(), $moduleType );
-			if( !@include_once $baseFile )
-				return	patErrorManager::raiseError( PATTEMPLATE_ERROR_BASECLASS_NOT_FOUND, "Could not load base class for $moduleType ($baseFile)." );
-		}
-
-		$moduleClass	=	'patTemplate_' . $moduleType . '_' .$moduleName;
-		if( !class_exists( $moduleClass ) )
-		{
-			if( isset( $this->_moduleDirs[$moduleType] ) )
-				$dirs = $this->_moduleDirs[$moduleType];
-			else
-				$dirs = array();
-			array_push( $dirs, $this->getIncludePath() .'/'. $moduleType );
-
-			foreach( $dirs as $dir )
-			{
-				$moduleFile	= sprintf( "%s/%s.php", $dir, str_replace( '_', '/', $moduleName ) );
-				if (@include_once $moduleFile) {
-					break;
-				}
-				return	patErrorManager::raiseError( PATTEMPLATE_ERROR_MODULE_NOT_FOUND, "Could not load module $moduleClass ($moduleFile)." );
-			}
-		}
-
-		if( !class_exists( $moduleClass ) )
-		{
-			return	patErrorManager::raiseError( PATTEMPLATE_ERROR_MODULE_NOT_FOUND, "Module file $moduleFile does not contain class $moduleClass." );
-		}
-
-		$this->_modules[$moduleType][$sig]	=	&new $moduleClass;
-		if( method_exists( $this->_modules[$moduleType][$sig], 'setTemplateReference' ) )
-		{
-			$this->_modules[$moduleType][$sig]->setTemplateReference( $this );
-		}
-
-		$this->_modules[$moduleType][$sig]->setParams( $params );
-
-		return $this->_modules[$moduleType][$sig];
-	}
-
-   /**
-    * checks whether a module exists.
-	*
-	* Modules are located in the patTemplate folder and include:
-	* - Readers
-	* - Caches
-	* - Variable Modifiers
-	* - Filters
-	* - Functions
-	* - Stats
-	*
-	* @access	public
-	* @param	string	moduleType (Reader|TemplateCache|Modifier|OutputFilter|InputFilter)
-	* @param	string	moduleName
-	* @return	boolean
-	*/
-	function moduleExists( $moduleType, $moduleName )
-	{
-		if( isset( $this->_moduleDirs[$moduleType] ) )
-			$dirs = $this->_moduleDirs[$moduleType];
-		else
-			$dirs = array();
-		array_push( $dirs, $this->getIncludePath() .'/'. $moduleType );
-
-		foreach( $dirs as $dir )
-		{
-			$moduleFile	=	sprintf( "%s/%s.php", $dir, str_replace( '_', '/', $moduleName ) );
-		if( !file_exists( $moduleFile ) )
-				continue;
-		if( !is_readable( $moduleFile ) )
-				continue;
-			return true;
-		}
-			return false;
-	}
-
-   /**
-	* parses a template
-	*
-	* Parses a template and stores the parsed content.
-	* mode can be "w" for write (delete already parsed content) or "a" for append (appends the
-	* new parsed content to the already parsed content)
-	*
-	* @access	public
-	* @param	string	name of the template
-	* @param	string	mode for the parsing
-	*/
-	function parseTemplate( $template, $mode = 'w' )
-	{
-		$template	=	strtolower( $template );
-
-		if( !isset( $this->_templates[$template] ) )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$template' does not exist."
-												);
-		}
-
-		/**
-		 * template is not visible
-		 */
-		if( $this->_templates[$template]['attributes']['visibility'] == 'hidden' )
-		{
-			$this->_templates[$template]['result']	=	'';
-			$this->_templates[$template]['parsed']	=	true;
-			return true;
-		}
-
-		/**
-		 * check, if the template has been loaded
-		 * and load it if necessary.
-		 */
-		if( $this->_templates[$template]['loaded'] !== true )
-		{
-			if( $this->_templates[$template]['attributes']['parse'] == 'on' )
-			{
-				$result = $this->readTemplatesFromInput( $this->_templates[$template]['attributes']['src'], $this->_templates[$template]['attributes']['reader'], null, $template );
-			}
-			else
-			{
-				$result = $this->loadTemplateFromInput( $this->_templates[$template]['attributes']['src'], $this->_templates[$template]['attributes']['reader'], null, $template );
-			}
-			if( patErrorManager::isError( $result ) )
-			{
-				return $result;
-			}
-		}
-
-		/**
-		 * check for autoclear
-		 */
-		if(
-			isset( $this->_templates[$template]['attributes']['autoclear'] ) &&
-			$this->_templates[$template]['attributes']['autoclear'] == 'yes' &&
-			$mode === 'w' &&
-			$this->_templates[$template]['lastMode'] != 'a'
-		  )
-		{
-			$this->_templates[$template]['parsed']	= false;
-		}
-
-		/**
-		 * template has been parsed and mode is not 'append'
-		 */
-		if( $this->_templates[$template]['parsed'] === true && $mode === 'w' )
-		{
-			return true;
-		}
-
-		$this->_templates[$template]['lastMode'] = $mode;
-
-		$this->_initTemplate( $template );
-
-		if( !isset( $this->_vars[$template]['rows'] ) )
-			$this->_vars[$template]['rows']	=	array();
-		$loop	=	count( $this->_vars[$template]['rows'] );
-
-		/**
-		 * loop at least one times
-		 */
-		if( $loop < 1 )
-			$loop	=	1;
-
-		if( isset( $this->_templates[$template]['attributes']['maxloop'] ) )
-		{
-			$loop	=	ceil( $loop / $this->_templates[$template]['attributes']['maxloop'] ) * $this->_templates[$template]['attributes']['maxloop'];
-		}
-
-		$this->_templates[$template]['loop']		=	max( $this->_templates[$template]['attributes']['loop'], $loop );
-
-		$start = 0;
-		if( isset( $this->_templates[$template]['attributes']['limit'] ) )
-		{
-			$p = strpos( $this->_templates[$template]['attributes']['limit'], ',' );
-			if( $p === false )
-			{
-			$this->_templates[$template]['loop'] = min( $this->_templates[$template]['loop'], $this->_templates[$template]['attributes']['limit'] );
-				$start = 0;
-			}
-			else
-			{
-				$start = substr( $this->_templates[$template]['attributes']['limit'], 0, $p );
-				$end   = substr( $this->_templates[$template]['attributes']['limit'], $p+1 )+$start;
-
-				$this->_templates[$template]['loop'] = min( $this->_templates[$template]['loop'], $end );
-			}
-		}
-
-		/**
-		 * template should be cleared before parsing
-		 */
-		if( $mode == 'w' )
-		{
-			$this->_templates[$template]['result']		= '';
-			$this->_templates[$template]['iteration']	= $start;
-		}
-
-		$loopCount = 0;
-		for( $i = $start; $i < $this->_templates[$template]['loop']; $i++ )
-		{
-			$finished  = false;
-
-			unset( $this->_templates[$template]['vars'] );
-
-			/**
-			 * fetch the variables
-			 */
-			$this->_fetchVariables( $template );
-
-			/**
-			 * fetch the template
-			 */
-			$result = $this->_fetchTemplate( $template );
-
-			if( $result === false )
-			{
-				$this->_templates[$template]['iteration']++;
-				continue;
-			}
-
-			/**
-			 * parse
-			 */
-			$this->_parseVariables( $template );
-			$this->_parseDependencies( $template );
-
-			/**
-			 * store result
-			 */
-			$this->_templates[$template]['result']	.=	$this->_templates[$template]['work'];
-
-			$this->_templates[$template]['iteration']++;
-
-			++$loopCount;
-
-			/**
-			 * check for maximum loops
-			 */
-			if( isset( $this->_templates[$template]['attributes']['maxloop'] ) )
-			{
-				if( $loopCount == $this->_templates[$template]['attributes']['maxloop'] && $i < ( $loop-1 ) )
-				{
-					$loopCount = 0;
-					$finished  = true;
-					$this->_templates[$template]['parsed']	=	true;
-					$this->parseTemplate( $this->_templates[$template]['attributes']['parent'], 'a' );
-					$this->_templates[$template]['parsed']	=	false;
-					$this->_templates[$template]['result']	=	'';
-				}
-			}
-		}
-
-		if( !$finished && isset( $this->_templates[$template]['attributes']['maxloop'] ) )
-		{
-			$this->_templates[$template]['parsed']	=	true;
-			$this->parseTemplate( $this->_templates[$template]['attributes']['parent'], 'a', false );
-			$this->_templates[$template]['parsed']	=	false;
-			$this->_templates[$template]['result']	=	'';
-			$this->_templates[$this->_templates[$template]['attributes']['parent']]['work'] = '';
-		}
-
-		$this->_parseGlobals($template);
-
-		$this->_handleUnusedVars( $template );
-
-		$this->_templates[$template]['parsed']	=	true;
-
-		if( isset( $this->_templates[$template]['attributes']['autoclear'] ) && $this->_templates[$template]['attributes']['autoclear'] == 'yes' )
-		{
-			$this->_vars[$template]					=	array(
-															'scalar'	=>	array(),
-															'rows'		=>	array()
-													);
-		}
-
-		return true;
-	}
-
-   /**
-	* Initialize a template
-	*
-	* This method checks the variable specifications and
-	* copys variables from other templates.
-	*
-	* @access	private
-	* @param	string	name of the template
-	* @return	boolean	true on success
-	*/
-	function _initTemplate( $template )
-	{
-		foreach( $this->_templates[$template]['copyVars'] as $dest => $src )
-		{
-			/**
-			 * copy from the same template
-			 */
-			if( !is_array( $src ) )
-			{
-				$srcTemplate = $template;
-				$srcVar      = $src;
-			}
-			else
-			{
-				$srcTemplate = $src[0];
-				$srcVar      = $src[1];
-			}
-
-			$copied = false;
-
-			/**
-			 * copy from another template
-			 */
-			if( isset( $this->_vars[$srcTemplate] ) )
-			{
-    			if( isset( $this->_vars[$srcTemplate]['scalar'][$srcVar] ) )
-    			{
-    				$this->_vars[$template]['scalar'][$dest] = $this->_vars[$srcTemplate]['scalar'][$srcVar];
-    				continue;
-    			}
-
-    			$rows = count( $this->_vars[$srcTemplate]['rows'] );
-
-    			for( $i = 0; $i < $rows; $i++ )
-    			{
-    				if( !isset( $this->_vars[$srcTemplate]['rows'][$i][$srcVar] ) )
-    					continue;
-    				if( !isset( $this->_vars[$template]['rows'][$i] ) )
-    					$this->_vars[$template]['rows'][$i] = array();
-    				$this->_vars[$template]['rows'][$i][$dest] = $this->_vars[$srcTemplate]['rows'][$i][$srcVar];
-    				$copied = true;
-    			}
-			}
-			if( !$copied && isset( $this->_globals[$srcVar] ))
-			{
-				$this->_vars[$template]['scalar'][$dest] = $this->_globals[$srcVar];
-			}
-
-		}
-		return true;
-	}
-
-   /**
-	* parse all variables in a template
-	*
-	* @access	private
-	* @param	string
-	*/
-	function _parseVariables( $template )
-	{
-		/**
-		 * modify variables before parsing
-		 */
-		$this->_applyModifers($template, $this->_templates[$template]['vars']);
-
-		foreach( $this->_templates[$template]['vars'] as $key => $value )
-		{
-			if( is_array( $value ) )
-			{
-				if( count( $this->_templates[$template]['currentDependencies'] ) == 1 )
-				{
-					$child	=	$this->_templates[$template]['currentDependencies'][0];
-				}
-				else
-				{
-					if( isset( $this->_templates[$template]['attributes']['child'] ) )
-						$child = $this->_templates[$template]['attributes']['child'];
-					else
-						continue;
-				}
-
-				$this->setAttribute( $child, 'autoclear', 'yes' );
-				$this->addVar( $child, $key, $value );
-				continue;
-			}
-
-			$var  = $this->_startTag.$key.$this->_endTag;
-			$this->_templates[$template]['work'] = str_replace( $var, $value, $this->_templates[$template]['work'] );
-		}
-		return true;
-	}
-
-   /**
-    * parse global variables in the template
-    *
-    * @access   private
-    * @param    string      name of the template
-    * @return   boolean
-    */
-	function _parseGlobals($template)
-	{
-        $globalVars = $this->_globals;
-        $this->_applyModifers($template, $globalVars);
-
-		foreach( $globalVars as $key => $value )
-		{
-			if( is_array( $value ) )
-			{
-			    continue;
-			}
-
-			$var  = $this->_startTag.$key.$this->_endTag;
-			$this->_templates[$template]['result'] = str_replace( $var, $value, $this->_templates[$template]['result'] );
-		}
-		return true;
-	}
-
-   /**
-    * apply variable modifiers
-    *
-    * The variables will be passed by reference.
-    *
-    * @access   private
-    * @param    string      name of the template (use modifiers from this template)
-    * @param    array       variables to which the modifiers should be applied
-    * @return   boolean
-    */
-	function _applyModifers($template, &$vars)
-	{
-		foreach( $this->_templates[$template]['modifyVars'] as $varname => $modifier )
-		{
-			if( !isset( $vars[$varname] ) )
-				continue;
-
-			if( ( $modifier['type'] === 'php' || $modifier['type'] === 'auto' ) && is_callable( $modifier['mod'] ) )
-			{
-				$vars[$varname] = call_user_func( $modifier['mod'], $vars[$varname] );
-				continue;
-			}
-
-			if( $modifier['type'] === 'php' )
-				continue;
-
-			$mod = &$this->loadModule( 'Modifier', ucfirst( $modifier['mod'] ) );
-			$vars[$varname] = $mod->modify( $vars[$varname], $modifier['params'] );
-		}
-        return true;
-	}
-
-   /**
-	* parse all dependencies in a template
-	*
-	* @access	private
-	* @param	string
-	*/
-	function _parseDependencies( $template )
-	{
-		$countDep	=	count( $this->_templates[$template]['currentDependencies'] );
-		for( $i = 0; $i < $countDep; $i++ )
-		{
-			$depTemplate	=	$this->_templates[$template]['currentDependencies'][$i];
-			$this->parseTemplate( $depTemplate );
-			$var    = $this->_startTag.'TMPL:'.strtoupper( $depTemplate) .$this->_endTag;
-			$this->_templates[$template]['work'] = str_replace( $var, $this->_templates[$depTemplate]['result'], $this->_templates[$template]['work'] );
-		}
-		return true;
-	}
-
-   /**
-	* fetch plain template
-	*
-	* The template content will be stored in the template
-	* configuration so it can be used by other
-	* methods.
-	*
-	* @access	private
-	* @param	string	template name
-	* @return	boolean
-	*/
-	function _fetchTemplate( $template )
-	{
-		switch( $this->_templates[$template]['attributes']['type'] )
-		{
-			/**
-			 * condition template
-			 */
-			case 'condition':
-				$value = $this->_getConditionValue( $template, $this->_templates[$template]['attributes']['conditionvar'] );
-				if( $value === false )
-				{
-					$this->_templates[$template]['work']				= '';
-					$this->_templates[$template]['currentDependencies']	= array();
-				}
-				else
-				{
-					$this->_templates[$template]['work']				= $this->_templates[$template]['subtemplates'][$value]['data'];
-					$this->_templates[$template]['currentDependencies']	= $this->_templates[$template]['subtemplates'][$value]['dependencies'];
-				}
-				break;
-
-			/**
-			 * condition template
-			 */
-			case 'simplecondition':
-				foreach( $this->_templates[$template]['attributes']['requiredvars'] as $var )
-				{
-				    // different template scope
-					if( $var[0] !== $template ) {
-						$this->_fetchVariables($var[0]);
-					}
-					$value = null;
-                    // fetch the local variable
-					if( isset( $this->_templates[$var[0]]['vars'][$var[1]] )
-					  && strlen( $this->_templates[$var[0]]['vars'][$var[1]] ) > 0 ) {
-					   $value = $this->_templates[$var[0]]['vars'][$var[1]];
-					}
-                    if (isset($this->_templates[$template]['attributes']['useglobals'])) {
-                        if(isset($this->_globals[$var[1]]) && strlen($this->_globals[$var[1]]) > 1) {
-                            $value = $this->_globals[$var[1]];
-                        }
-                    }
-                    if ($value !== null) {
-                        if ($var[2] === null) {
-                        	continue;
-                        } else {
-                            if ($var[2] == $value) {
-                               	continue;
-                            }
-                        }
-                    }
-
-					$this->_templates[$template]['work']				= '';
-					$this->_templates[$template]['currentDependencies']	= array();
-					break 2;
-				}
-				$this->_templates[$template]['work'] 				= $this->_templates[$template]['content'];
-				$this->_templates[$template]['currentDependencies']	= $this->_templates[$template]['dependencies'];
-				break;
-
-			/**
-			 * modulo template
-			 */
-			case 'modulo':
-                // check for empty template
-                if ($this->_hasVariables($template)) {
-                    $value = ( $this->_templates[$template]['iteration'] + 1 ) % $this->_templates[$template]['attributes']['modulo'];
-                } else {
-                    $value = '__empty';
-                }
-
-				$value = $this->_getConditionValue( $template, $value, false );
-				if( $value === false )
-				{
-					$this->_templates[$template]['work']				= '';
-					$this->_templates[$template]['currentDependencies']	= array();
-				}
-				else
-				{
-					$this->_templates[$template]['work']				= $this->_templates[$template]['subtemplates'][$value]['data'];
-					$this->_templates[$template]['currentDependencies']	= $this->_templates[$template]['subtemplates'][$value]['dependencies'];
-				}
-				break;
-
-			/**
-			 * standard template
-			 */
-			default:
-				$this->_templates[$template]['work'] 				=	$this->_templates[$template]['content'];
-				$this->_templates[$template]['currentDependencies']	=	$this->_templates[$template]['dependencies'];
-				break;
-		}
-		return true;
-	}
-
-   /**
-    * check, whether a template contains variables
-    *
-    * @access   private
-    * @param    string  template name
-    * @return   boolean
-    */
-    function _hasVariables($template)
-    {
-        if (!empty($this->_vars[$template]['scalar'])) {
-        	return true;
-        }
-        if (isset($this->_vars[$template]['rows'][$this->_templates[$template]['iteration']])) {
-        	return true;
-        }
-        return false;
-    }
-
-   /**
-	* fetch the value of a condition variable
-	*
-	* _fetchVariables() has to be called before this
-	* method is being called.
-	*
-	* @access	private
-	* @param	string	template name
-	* @param	string	condition value
-	* @param	boolean	flag that indicates whether value is the name of the variable that should be resolved
-	*
-	* @todo		split this method into smaller check methods that will be called according to
-	*			a priority list
-	*/
-	function _getConditionValue( $template, $value, $isVar = true )
-	{
-		if( $isVar === true )
-		{
-			if( isset( $this->_templates[$template]['attributes']['conditiontmpl'] ) )
-			{
-				$_template = $this->_templates[$template]['attributes']['conditiontmpl'];
-				$this->_fetchVariables( $_template );
-			}
-			else
-			{
-				$_template = $template;
-			}
-
-			/**
-			 * get the value from the template variables
-			 */
-			if( !isset( $this->_templates[$_template]['vars'][$value] ) || strlen( $this->_templates[$_template]['vars'][$value] ) === 0 )
-			{
-				if( $this->_templates[$template]['attributes']['useglobals'] == 'yes' || $this->_templates[$template]['attributes']['useglobals'] == 'useglobals' )
-				{
-					if( isset( $this->_globals[$value] ) && strlen( $this->_globals[$value] ) > 0 )
-					{
-						$value = $this->_globals[$value];
-					}
-					else
-					{
-						$value	=	'__empty';
-					}
-				}
-				else
-				{
-					$value	=	'__empty';
-				}
-			}
-			else
-			{
-				$value	=	$this->_templates[$_template]['vars'][$value];
-			}
-		}
-		else
-		{
-			$_template = $template;
-		}
-
-		// only one iteration, use the __single condition
-		if ($this->_templates[$_template]['loop'] === 1) {
-			if( isset( $this->_templates[$template]['subtemplates']['__single'] ) ) {
-				return '__single';
-			}
-		} else {
-
-			// is __first?
-			if( $this->_templates[$_template]['iteration'] == 0 ) {
-				if( isset( $this->_templates[$template]['subtemplates']['__first'] ) ) {
-					return '__first';
-				}
-			}
-
-			/**
-			 * is __last?
-			 */
-			$max	=	$this->_templates[$_template]['loop'] - 1;
-			if( $this->_templates[$_template]['iteration'] == $max ) {
-				if( isset( $this->_templates[$template]['subtemplates']['__last'] ) ) {
-					return '__last';
-				}
-			}
-		}
-
-		/**
-		 * found an exact match
-		 */
-		if( isset( $this->_templates[$template]['subtemplates'][$value] ) ) {
-			return $value;
-		}
-
-		/**
-		 * is __default?
-		 */
-		if( isset( $this->_templates[$template]['subtemplates']['__default'] ) ) {
-			return '__default';
-		}
-
-		return false;
-	}
-
-   /**
-	* fetch variables for a template
-	*
-	* The variables will be stored in the template
-	* configuration so they can be used by other
-	* methods.
-	*
-	* @access	private
-	* @param	string	template name
-	* @return	boolean
-	*/
-	function _fetchVariables( $template )
-	{
-		/**
-		 * variables already have been fetched
-		 */
-		if( isset( $this->_templates[$template]['vars'] ) )
-		{
-			return true;
-		}
-
-		$iteration	=	$this->_templates[$template]['iteration'];
-
-		$vars = array();
-		if( isset( $this->_templates[$template]['attributes']['varscope'] ) )
-		{
-			if (!is_array($this->_templates[$template]['attributes']['varscope'])) {
-				$this->_templates[$template]['attributes']['varscope'] = array($this->_templates[$template]['attributes']['varscope']);
-			}
-			foreach ($this->_templates[$template]['attributes']['varscope'] as $scopeTemplate) {
-				if ($this->exists($scopeTemplate)) {
-					$this->_fetchVariables( $scopeTemplate );
-					$vars = array_merge($this->_templates[$scopeTemplate]['vars'], $vars);
-				} else {
-					patErrorManager::raiseWarning(PATTEMPLATE_WARNING_NO_TEMPLATE, 'Template \''.$scopeTemplate.'\' does not exist, referenced in varscope attribute of template \''.$template.'\'');
-				}
-			}
-		} else {
-			$vars	=	array();
-		}
-
-		/**
-		 * get the scalar variables
-		 */
-		if( isset( $this->_vars[$template] ) && isset( $this->_vars[$template]['scalar'] ) )
-		{
-            $vars = array_merge( $vars, $this->_vars[$template]['scalar'] );
-		}
-
-		/**
-		 * get the row variables
-		 */
-		if( isset( $this->_vars[$template]['rows'][$iteration] ) )
-		{
-			$vars = array_merge( $vars, $this->_vars[$template]['rows'][$iteration] );
-		}
-
-		/**
-		 * add some system variables
-		 */
-		$currentRow				=	$iteration + $this->_templates[$template]['attributes']['rowoffset'];
-		$vars['PAT_ROW_VAR']	=	$currentRow;
-
-		if( $this->_templates[$template]['attributes']['type'] == 'modulo' )
-		{
-			$vars['PAT_MODULO_REP']	=	ceil( $currentRow / $this->_templates[$template]['attributes']['modulo'] );
-			$vars['PAT_MODULO']	    =	( $this->_templates[$template]['iteration'] + 1 ) % $this->_templates[$template]['attributes']['modulo'];
-		}
-
-		if( $this->_templates[$template]['attributes']['addsystemvars'] !== false )
-		{
-			$vars['PATTEMPLATE_VERSION'] = $this->_systemVars['appVersion'];
-			$vars['PAT_LOOPS']		=	$this->_templates[$template]['loop'];
-
-			switch ($this->_templates[$template]['attributes']['addsystemvars'])
-			{
-			    case 'boolean':
-                    $trueValue  = 'true';
-                    $falseValue = 'false';
-                    break;
-			    case 'integer':
-                    $trueValue  = '1';
-                    $falseValue = '0';
-                    break;
-			    default:
-                    $trueValue  = $this->_templates[$template]['attributes']['addsystemvars'];
-                    $falseValue = '';
-                    break;
-			}
-
-			$vars['PAT_IS_ODD']		= ( $currentRow % 2 == 1 ) ? $trueValue : $falseValue;
-			$vars['PAT_IS_EVEN']	= ( $currentRow % 2 == 0 ) ? $trueValue : $falseValue;
-			$vars['PAT_IS_FIRST']	= ( $currentRow == 1 ) ? $trueValue : $falseValue;
-			$vars['PAT_IS_LAST']	= ( $currentRow == $this->_templates[$template]['loop'] ) ? $trueValue : $falseValue;
-			$vars['PAT_ROW_TYPE']	= ( $currentRow % 2 == 1 ) ? 'odd' : 'even';
-		}
-
-		$this->_templates[$template]['vars'] = $vars;
-		return true;
-	}
-
-   /**
-	* handle all unused variables in a template
-	*
-	* This is influenced by the 'unusedvars' attribute of the
-	* template
-	*
-	* @access	private
-	* @param	string
-	*/
-	function _handleUnusedVars( $template )
-	{
-		$regexp = '/([^\\\])('.$this->_startTag.'[^a-z]+[^\\\]'.$this->_endTag.')/U';
-
-		switch( $this->_templates[$template]['attributes']['unusedvars'] )
-		{
-			case 'comment':
-				$this->_templates[$template]['result'] = preg_replace( $regexp, '<!-- \\1\\2 -->', $this->_templates[$template]['result'] );
-				break;
-			case 'strip':
-				$this->_templates[$template]['result'] = preg_replace( $regexp, '\\1', $this->_templates[$template]['result'] );
-				break;
-			case 'nbsp':
-				$this->_templates[$template]['result'] = preg_replace( $regexp, '\\1&nbsp;', $this->_templates[$template]['result'] );
-				break;
-			case 'ignore':
-				break;
-			default:
-				$this->_templates[$template]['result'] = preg_replace( $regexp, '\\1'.$this->_templates[$template]['attributes']['unusedvars'], $this->_templates[$template]['result'] );
-				break;
-		}
-
-		// replace quoted variables
-		$regexp = '/[\\\]'.$this->_startTag.'([^a-z]+)[\\\]'.$this->_endTag.'/U';
-		$this->_templates[$template]['result'] = preg_replace( $regexp, $this->_startTag.'\\1'.$this->_endTag, $this->_templates[$template]['result'] );
-
-		return true;
-	}
-
-   /**
-	* returns a parsed Template
-	*
-	* If the template already has been parsed, it just returns the parsed template.
-	* If the template has not been loaded, it will be loaded.
-	*
-	* @access	public
-	* @param	string	 name of the template
-	* @param    boolean  whether to apply output filters
-	* @return	string	 Content of the parsed template
-	* @see		displayParsedTemplate()
-	*/
-	function getParsedTemplate( $name = null, $applyFilters = false )
-	{
-		if (is_null($name)) {
-			$name = $this->_root;
-		}
-
-		$name = strtolower( $name );
-		$result = $this->parseTemplate( $name );
-
-		if (patErrorManager::isError( $result )) {
-			return $result;
-		}
-
-		if ($applyFilters === false) {
-			return $this->_templates[$name]['result'];
-		}
-
-		$result = $this->_templates[$name]['result'];
-
-		$cnt = count ($this->_outputFilters);
-		for ($i = 0; $i < $cnt; $i++) {
-			$result = $this->_outputFilters[$i]->apply( $result );
-		}
-
-		return $result;
-	}
-
-   /**
-	* displays a parsed Template
-	*
-	* If the template has not been loaded, it will be loaded.
-	*
-	* @see		getParsedTemplate()
-	* @param	string	name of the template
-	* @param    boolean  whether to apply output filters
-	* @return	boolean	true on success
-	* @access	public
-	*/
-	function displayParsedTemplate($name = null, $applyFilters = true)
-	{
-		$result = $this->getParsedTemplate($name, $applyFilters);
-
-		/**
-		 * error happened
-		 */
-		if (patErrorManager::isError($result)) {
-			return $result;
-		}
-
-		echo $result;
-		return true;
-	}
-
-   /**
-	* parse a template and push the result into a variable of any other
-	* template
-	*
-	* If the template already has been parsed, it will just be pushed into the variable.
-	* If the template has not been loaded, it will be loaded.
-	*
-	* @access	public
-	* @param	string	name of the template
-	* @return	string	Content of the parsed template
-	* @param	boolean	if set to true, the value will be appended to the value already stored.
-	* @see		getParsedTemplate()
-	* @see		addVar()
-	*/
-	function parseIntoVar( $srcTmpl, $destTmpl, $var, $append = false )
-	{
-		$srcTmpl  =	strtolower( $srcTmpl );
-		$destTmpl =	strtolower( $destTmpl );
-		$var      = strtoupper($var);
-
-		$result	=	$this->parseTemplate( $srcTmpl );
-
-		if( patErrorManager::isError( $result ) )
-			return $result;
-
-		if( $append !== true || !isset( $this->_vars[$destTmpl]['scalar'][$var] ) )
-			$this->_vars[$destTmpl]['scalar'][$var] = '';
-
-		$this->_vars[$destTmpl]['scalar'][$var] .= $this->_templates[$srcTmpl]['result'];
-
-		return true;
-	}
-
-   /**
-	* clears a parsed Template
-	*
-	* Parsed Content, variables and the loop attribute are cleared
-	*
-	* If you will not be using this template anymore, then you should
-	* call freeTemplate()
-	*
-	* @access	public
-	* @param	string	name of the template
-	* @param	boolean		set this to true to clear all child templates, too
-	* @see		clearAllTemplates()
-	* @see		freeTemplate()
-	*/
-	function clearTemplate( $name, $recursive = false )
-	{
-		$name	=	strtolower( $name );
-		$this->_templates[$name]['parsed']		=	false;
-		$this->_templates[$name]['work']		=	'';
-		$this->_templates[$name]['iteration']	=	0;
-		$this->_templates[$name]['result']		=	'';
-		$this->_vars[$name]						=	array(
-														'scalar'	=>	array(),
-														'rows'		=>	array()
-													);
-
-		if (!empty($this->_templates[$name]['defaultVars'])) {
-			foreach ($this->_templates[$name]['defaultVars'] as $varname => $value) {
-				$this->addVar($name, $varname, $value);
-			}
-		}
-
-		/**
-		 * clear child templates as well
-		 */
-		if( $recursive === true )
-		{
-			$deps = $this->_getDependencies( $name );
-			foreach( $deps as $dep )
-			{
-				$this->clearTemplate( $dep, true );
-			}
-		}
-		return true;
-	}
-
-   /**
-	* clears all templates
-	*
-	* @access	public
-	* @uses		clearTemplate()
-	*/
-	function clearAllTemplates()
-	{
-		$templates	=	array_keys( $this->_templates );
-		$cnt		=	count( $templates );
-		for( $i = 0; $i < $cnt; $i++ )
-		{
-			$this->clearTemplate( $templates[$i] );
-		}
-		return true;
-	}
-
-   /**
-	* frees a template
-	*
-	* All memory consumed by the template
-	* will be freed.
-	*
-	* @access	public
-	* @param	string	name of the template
-	* @param	boolean	clear dependencies of the template
-	* @see		freeAllTemplates()
-	*/
-	function freeTemplate( $name, $recursive = false )
-	{
-		$name	=	strtolower( $name );
-		$key = array_search( $name, $this->_templateList );
-		if( $key === false )
-		{
-			return	patErrorManager::raiseWarning(
-													PATTEMPLATE_WARNING_NO_TEMPLATE,
-													"Template '$name' does not exist."
-												);
-		}
-
-		unset( $this->_templateList[$key] );
-		$this->_templateList = array_values( $this->_templateList );
-
-		/**
-		 * free child templates as well
-		 */
-		if( $recursive === true )
-		{
-			$deps = $this->_getDependencies( $name );
-			foreach( $deps as $dep )
-			{
-				$this->freeTemplate( $dep, true );
-			}
-		}
-
-		unset( $this->_templates[$name] );
-		unset( $this->_vars[$name] );
-
-		return true;
-	}
-
-   /**
-	* frees all templates
-	*
-	* All memory consumed by the templates
-	* will be freed.
-	*
-	* @access	public
-	* @see		freeTemplate()
-	*/
-	function freeAllTemplates()
-	{
-		$this->_templates	 = array();
-		$this->_vars		 = array();
-		$this->_templateList = array();
-	}
-
-   /**
-	* get _all_ dependencies of a template,
-	* regardless of the subtemplates
-	*
-	* @access	private
-	* @param	string	template name
-	* @return	array	list of all subtemplates
-	*/
-	function _getDependencies( $template )
-	{
-		$deps = array();
-		if( isset( $this->_templates[$template]['dependencies'] ) )
-			$deps = $this->_templates[$template]['dependencies'];
-
-		if( isset( $this->_templates[$template]['subtemplates'] ) )
-		{
-			foreach( $this->_templates[$template]['subtemplates'] as $sub )
-			{
-				if( isset( $sub['dependencies'] ) )
-					$deps = array_merge( $deps, $sub['dependencies'] );
-			}
-		}
-		$deps = array_unique( $deps );
-		return $deps;
-	}
-
-   /**
-	* Displays useful information about all or named templates
-	*
-	* This method breaks BC, as it now awaits an array instead of
-	* unlimited parameters.
-	*
-	* @param	mixed	array of templates that should be dumped, or null if you
-	*					want all templates to be dumped
-	* @param	string	dumper
-	* @access	public
-	*/
-	function dump( $restrict = null, $dumper = 'Html' )
-	{
-		if( is_string( $restrict ) )
-			$restrict = array( $restrict );
-
-		$dumper	=	&$this->loadModule( 'Dump', $dumper );
-
-		if( patErrorManager::isError( $dumper ) )
-		{
-			return	$dumper;
-		}
-
-		if( is_null( $restrict ) )
-		{
-			$templates = $this->_templates;
-			$vars      = $this->_vars;
-		}
-		else
-		{
-			$restrict = array_map( 'strtolower', $restrict );
-
-			$templates = array();
-			$vars      = array();
-
-			foreach( $this->_templates as $name => $spec )
-			{
-				if( !in_array( $name, $restrict ) )
-					continue;
-				$templates[$name] = $spec;
-				$vars[$name]      = $this->_vars[$name];
-			}
-		}
-
-		$dumper->displayHeader();
-		$dumper->dumpGlobals( $this->_globals );
-		$dumper->dumpTemplates( $templates, $vars );
-		$dumper->displayFooter();
-
-		return	true;
-	}
-
-   /**
-	* get the include path
-	*
-	* @access	public
-	*/
-	function getIncludePath()
-	{
-		return	PATTEMPLATE_INCLUDE_PATH;
-	}
-
-   /**
-	* apply input filters that have been set
-	*
-	* This is being called by the readers.
-	*
-	* @access	public
-	* @param	string		template
-	* @return	string		filtered templeta
-	*/
-	function applyInputFilters( $template )
-	{
-		$cnt = count( $this->_inputFilters );
-		for( $i = 0; $i < $cnt; $i++ )
-		{
-			$template = $this->_inputFilters[$i]->apply( $template );
-		}
-		return $template;
-	}
-
-   /**
-	* Convert the template to its string representation.
-	*
-	* This method allows you to just echo the patTemplate
-	* object in order to display the template.
-	*
-	* Requires PHP5
-	*
-	* <code>
-	* $tmpl = new patTemplate();
-	* $tmpl->readTemplatesFromFile( 'myfile.tmpl' );
-	* echo $tmpl;
-	* </code>
-	*
-	* @access	private
-	* @return	string
-	*/
-	function __toString()
-	{
-		return $this->getParsedTemplate();
-	}
-}
-
-class patFactory {
-	function &createTemplate( $option, $isAdmin=false, $useCache=false ) {
-		global $mainframe;
-		$tmpl =& new patTemplate;
-
-		// patTemplate
-		if ($useCache) {
-	   		$tmpl->useTemplateCache( 'File', array(
-                'cacheFolder' => $GLOBALS['mosConfig_cachepath'], 'lifetime' => 20 ));
-		}
-
-		$tmpl->setNamespace( 'mos' );
-
-		// load the wrapper and common templates
-		$tmpl->setRoot( dirname( __FILE__ ) . '/tmpl' );
-		$tmpl->readTemplatesFromFile( 'page.html' );
-
-		//echo $this->basePath() . '/components/' . $option . '/tmpl';
-
-		$tmpl->addGlobalVar( 'option', $option );
-		$tmpl->addGlobalVar( 'siteurl', $GLOBALS['mosConfig_live_site'] );
-		$tmpl->addGlobalVar( 'adminurl', $GLOBALS['mosConfig_live_site'] . '/administrator' );
-		$tmpl->addGlobalVar( 'admintemplateurl', $GLOBALS['mosConfig_live_site'] . '/administrator/templates/' . $mainframe->getTemplate() );
-		$tmpl->addGlobalVar( 'sitename', $GLOBALS['mosConfig_sitename'] );
-
-		$iso = split( '=', _ISO );
-		$tmpl->addGlobalVar( 'page_encoding', $iso[1] );
-		$tmpl->addGlobalVar( 'version_copyright', $GLOBALS['_VERSION']->COPYRIGHT );
-		$tmpl->addGlobalVar( 'version_url', $GLOBALS['_VERSION']->URL );
-
-		$tmpl->addVar( 'form', 'formAction', $_SERVER['PHP_SELF'] );
-		$tmpl->addVar( 'form', 'formName', 'adminForm' );
-
-		return $tmpl;
-	}
-}
-?>
\ No newline at end of file
diff -ruN 4.5.4/includes/patTemplate/tmpl/page.html 4.6rc2/includes/patTemplate/tmpl/page.html
--- 4.5.4/includes/patTemplate/tmpl/page.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/patTemplate/tmpl/page.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,186 +0,0 @@
-<mos:comment>
-@version $Id: page.html,v 1.1 2005/07/22 01:57:37 eddieajau Exp $
-@package Mambo_4.5.2
-@copyright (C) (C) 2000 - 2005 Miro International Pty Ltd
-@license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-</mos:comment>
-
-<!-- GENERIC PAGE -->
-<mos:tmpl name="page" src="dynamic" autoload="off" parse="on" />
-
-<!-- GENERIC FORM -->
-<mos:tmpl name="form" autoclear="yes">
-	<form action="{FORMACTION}" method="post" name="{FORMNAME}">
-		<mos:tmpl name="body" src="dynamic" autoload="off" parse="on" varscope="form" />
-	</form>
-</mos:tmpl>
-
-<!-- MOSMSG -->
-<mos:tmpl name="mosmsg" type="simplecondition" requiredvars="mosmsg" useglobals="yes">
-	<mos:Translate><div class="message">{MOSMSG}</div></mos:Translate>
-</mos:tmpl>
-
-<!-- A HELP LINK -->
-<mos:tmpl name="help">
-	<a href="#" onclick="window.open('{SITEURL}/help/{FILE}.xml', 'mambo_help_win', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');">
-		<mos:Translate>Help</mos:Translate>
-	</a>
-</mos:tmpl>
-
-<!-- FORM VALIDATION -->
-<mos:tmpl name="js-validate" type="simplecondition" requiredvars="condition, message">
-	if ({CONDITION}) {
-		alert( '<mos:Translate>{MESSAGE}</mos:Translate>' );
-		return false;
-	}
-</mos:tmpl>
-
-<mos:tmpl name="js-cancel" type="simplecondition" requiredvars="TASK">
-	if (pressbutton == '{TASK}') {
-		submitform( pressbutton );
-		return;
-	}
-</mos:tmpl>
-
-<mos:tmpl name="js-refresh-frame">
-	<script language="javascript" type="text/javascript">
-	if (window.location != parent.{FRAME}.location) {
-		parent.{FRAME}.location=parent.{FRAME}.location;
-	}
-	</script>
-</mos:tmpl>
-
-<!-- TOOLBARS -->
-<mos:tmpl name="toolbar-button-site">
-		<a class="toolbar" href="javascript:void submitbutton('{EVENT}');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('{EVENT}','','{SITEURL}/{IMAGE_OFF}',1);">
-			<img src="{SITEURL}/{IMAGE_ON}" alt="{ALT}" align="{ALIGN}" name="{EVENT}" border="0" />
-			{ALT}</a>
-</mos:tmpl>
-
-<mos:tmpl name="toolbar-button-admin">
-		<a class="toolbar" href="javascript:void submitbutton('{EVENT}');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('{EVENT}','','{ADMINURL}/images/{IMAGE_OFF}',1);">
-			<img src="{ADMINURL}/images/{IMAGE_ON}" alt="{ALT}" align="{ALIGN}" name="{EVENT}" border="0" />
-			{ALT}</a>
-</mos:tmpl>
-
-<mos:tmpl name="toolbar-help">
-		<a class="toolbar" href="#" onclick="window.open('{SITEURL}/help/{REF}.xml', 'mambo_help_win', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('help','','{ADMINURL}/images/{IMAGE_OFF}',1);">
-			<img src="{ADMINURL}/images/{IMAGE_ON}" alt="{ALT}" align="{ALIGN}" name="help" border="0" />
-			{ALT}</a>
-</mos:tmpl>
-
-<mos:tmpl name="toolbar-help-a">
-		<a class="toolbar" href="#" onclick="window.open('{ADMINURL}/components/{OPTION}/{REF}', 'mambo_help_win', 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no');" onmouseout="MM_swapImgRestore();"  onmouseover="MM_swapImage('help','','{ADMINURL}/images/{IMAGE_OFF}',1);">
-			<img src="{ADMINURL}/images/{IMAGE_ON}" alt="{ALT}" align="{ALIGN}" name="help" border="0" />
-			{ALT}</a>
-</mos:tmpl>
-
-<!-- TOOL TIPS :: note include must go last -->
-<mos:tmpl name="include-tooltips">
-<script language="JavaScript" type="text/javascript" src="{SITEURL}/includes/js/wz_tooltip.js"></script>
-</mos:tmpl>
-
-<mos:tmpl name="tooltip">
-	<a href="#" onmouseover="{OPTIONS};return escape('<mos:Translate>{TIP}</mos:Translate>')">
-		<mos:Translate>{TEXT}</mos:Translate></a>
-</mos:tmpl>
-<mos:tmpl name="tooltip-i">
-	<a href="#" onmouseover="{OPTIONS};return escape('<mos:Translate>{TIP}</mos:Translate>')">
-		<img src="{SITEURL}/includes/js/ThemeOffice/tooltip.png" border="0" /></a>
-</mos:tmpl>
-
-<!-- DYNAMIC TABS -->
-<mos:tmpl name="includeTabs" useglobals="yes">
-	<link id="luna-tab-style-sheet" type="text/css" rel="stylesheet" href="{SITEURL}/includes/js/tabs/tabpane.css" />
-	<script type="text/javascript" src="{SITEURL}/includes/js/tabs/tabpane.js"></script>
-</mos:tmpl>
-
-<mos:tmpl name="startTabPane" varscope="body">
-	<div class="tab-page" id="{PANEID}">
-	<script type="text/javascript">
-	var tabPane1 = new WebFXTabPane( document.getElementById( '{PANEID}' ), {PANECOOKIES} );
-	</script>
-</mos:tmpl>
-
-<mos:tmpl name="startTab" varscope="body">
-	<div class="tab-page" id="{PANEID}">
-	<h2 class="tab">
-		<mos:Translate>{TABTITLE}</mos:Translate>
-	</h2>
-	<script type="text/javascript">
-	tabPane1.addTabPage( document.getElementById( '{PANEID}' ) );
-	</script>
-</mos:tmpl>
-
-<mos:tmpl name="endTab">
-	</div>
-</mos:tmpl>
-
-<mos:tmpl name="endTabPane">
-	</div>
-</mos:tmpl>
-
-<!-- CALENDAR -->
-<mos:tmpl name="includeCalendar" useglobals="yes">
-	<link rel="stylesheet" type="text/css" media="all" href="{SITEURL}/includes/js/calendar/calendar-mos.css" title="green" />
-	<script type="text/javascript" src="{SITEURL}/includes/js/calendar/calendar.js"></script>
-	<script type="text/javascript" src="{SITEURL}/includes/js/calendar/lang/calendar-en.js"></script>
-	<script type="text/javascript" src="{SITEURL}/includes/js/calendar/calendar-setup.js"></script>
-</mos:tmpl>
-
-<!-- GENERIC LIST -->
-<mos:tmpl name="select-list-options" type="condition" conditionvar="selected">
-	<mos:sub condition="__default">
-		<option value="{VALUE}">{TEXT}</option>
-	</mos:sub>
-	<mos:sub condition="yes">
-		<option value="{VALUE}" selected="yes">{TEXT}</option>
-	</mos:sub>
-</mos:tmpl>
-
-<!-- LIST PAGINATION -->
-<mos:tmpl name="admin-list-footer" varscope="body">
-	<table class="adminlist">
-	<tr>
-		<th colspan="3">
-			{PAGE_LINKS}
-		</th>
-	</tr>
-	<tr>
-		<td nowrap="true" width="48%" align="right">
-			<mos:Translate>Display #</mos:Translate>
-		</td>
-		<td>
-			<select name="limit" size="1" class="inputbox" onchange="document.adminForm.submit();">
-				{PAGE_LIMIT_OPTIONS}
-			</select>
-		</td>
-		<td nowrap="true" width="48%" align="left">
-			{PAGE_COUNTER}
-		</td>
-	</tr>
-	</table>
-</mos:tmpl>
-
-
-<!-- SELECT LISTS -->
-<mos:tmpl name="yes-no-radio" type="condition" conditionvar="value">
-	<mos:sub condition="__default">
-		<input type="radio" name="{NAME}" class="{CLASS}" />
-		<mos:Translate>No</mos:Translate>
-		<input type="radio" name="{NAME}" class="{CLASS}" />
-		<mos:Translate>Yes</mos:Translate>
-	</mos:sub>
-	<mos:sub condition="0">
-		<input type="radio" name="{NAME}" class="{CLASS}" checked="yes" />
-		<mos:Translate>No</mos:Translate>
-		<input type="radio" name="{NAME}" class="{CLASS}" />
-		<mos:Translate>Yes</mos:Translate>
-	</mos:sub>
-	<mos:sub condition="1">
-		<input type="radio" name="{NAME}" class="{CLASS}" />
-		<mos:Translate>No</mos:Translate>
-		<input type="radio" name="{NAME}" class="{CLASS}" checked="yes" />
-		<mos:Translate>Yes</mos:Translate>
-	</mos:sub>
-</mos:tmpl>
diff -ruN 4.5.4/includes/pathway.php 4.6rc2/includes/pathway.php
--- 4.5.4/includes/pathway.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/pathway.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,275 +1,18 @@
 <?php
 /**
-* @version $Id: pathway.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-function pathwayMakeLink( $id, $name, $link, $parent ) {
-	$mitem = new stdClass();
-	$mitem->id 		= $id;
-	$mitem->name 	= $mitem->name = html_entity_decode( $name ); 
-	$mitem->link 	= $link;
-	$mitem->parent 	= $parent;
-	$mitem->type 	= '';
+$pathway =& mosPathway::getInstance();
+echo $pathway->makePathway();
 
-	return $mitem;
-}
-
-/**
-* Outputs the pathway breadcrumbs
-* @param database A database connector object
-* @param int The db id field value of the current menu item
-*/
-function showPathway( $Itemid ) {
-	global $database, $option, $task, $mainframe, $mosConfig_absolute_path, $mosConfig_live_site;
-	// get the home page
-	$database->setQuery( "SELECT *"
-	. "\nFROM #__menu"
-	. "\nWHERE menutype='mainmenu' AND published='1'"
-	. "\nORDER BY parent, ordering LIMIT 1"
-	);
-	$home_menu = new mosMenu( $database );
-	$database->loadObject( $home_menu );
-
-	// the the whole menu array and index the array by the id
-	$database->setQuery( "SELECT id, name, link, parent, type"
-	. "\nFROM #__menu"
-	. "\nWHERE published='1'"
-	. "\nORDER BY parent, ordering"
-	);
-	$mitems = $database->loadObjectList( 'id' );
-
-	$isWin = (substr(PHP_OS, 0, 3) == 'WIN');
-	$optionstring = $isWin ? $_SERVER['QUERY_STRING'] : $_SERVER['REQUEST_URI'];
-
-	// are we at the home page or not
-	$homekeys = array_keys( $mitems );
-	$home = @$mitems[$home_menu->id]->name;
-	$path = "";
-
-	// this is a patch job for the frontpage items! aje
-	if ($Itemid == $home_menu->id) {
-		switch ($option) {
-			case 'content':
-			$id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-			if ($task=='blogsection'){
-
-				$database->setQuery( "SELECT title FROM #__sections WHERE id=$id" );
-			} else if ( $task=='blogcategory' ) {
-				$database->setQuery( "SELECT title FROM #__categories WHERE id=$id" );
-			} else {
-				$database->setQuery( "SELECT title, catid FROM #__content WHERE id=$id" );
-			}
-
-			$row = null;
-			$database->loadObject( $row );
-
-			$id = max( array_keys( $mitems ) ) + 1;
-
-			// add the content item
-			$mitem2 = pathwayMakeLink(
-			$Itemid,
-			$row->title,
-			"",
-			1
-			);
-			$mitems[$id] = $mitem2;
-			$Itemid = $id;
-
-			$home = '<a href="'. sefRelToAbs('index.php') .'" class="pathway">'. $home .'</a>';
-			break;
-
-		}
-	}
-
-	switch( @$mitems[$Itemid]->type ) {
-		case 'content_section':
-		$id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-
-		switch ($task) {
-			case 'category':
-			if ($id) {
-				$database->setQuery( "SELECT title FROM #__categories WHERE id=$id" );
-				$title = $database->loadResult();
-
-				$id = max( array_keys( $mitems ) ) + 1;
-				$mitem = pathwayMakeLink(
-				$id,
-				$title,
-				'index.php?option='. $option .'&task='. $task .'&id='. $id .'&Itemid='. $Itemid,
-				$Itemid
-				);
-				$mitems[$id] = $mitem;
-				$Itemid = $id;
-			}
-			break;
-
-			case 'view':
-			if ($id) {
-				// load the content item name and category
-				$database->setQuery( "SELECT title, catid, id FROM #__content WHERE id=$id" );
-				$row = null;
-				$database->loadObject( $row );
-
-				// load and add the category
-				$database->setQuery( "SELECT c.title AS title, s.id AS sectionid "
-				."FROM #__categories AS c "
-				."LEFT JOIN #__sections AS s "
-				."ON c.section=s.id "
-				."WHERE c.id=$row->catid" );
-				$result = $database->loadObjectList();
-
-				$title = $result[0]->title;
-				$sectionid = $result[0]->sectionid;
-
-				$id = max( array_keys( $mitems ) ) + 1;
-				$mitem1 = pathwayMakeLink(
-				$Itemid,
-				$title,
-				'index.php?option='. $option .'&task=category&sectionid='. $sectionid .'&id='. $row->catid,
-				$Itemid
-				);
-				$mitems[$id] = $mitem1;
-
-				// add the final content item
-				$id++;
-				$mitem2 = pathwayMakeLink(
-				$Itemid,
-				$row->title,
-				"",
-				$id-1
-				);
-				$mitems[$id] = $mitem2;
-				$Itemid = $id;
-
-			}
-			break;
-		}
-		break;
-
-		case 'content_category':
-		$id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-
-		switch ($task) {
-
-			case 'view':
-			if ($id) {
-				// load the content item name and category
-				$database->setQuery( "SELECT title, catid FROM #__content WHERE id=$id" );
-				$row = null;
-				$database->loadObject( $row );
-
-				$id = max( array_keys( $mitems ) ) + 1;
-				// add the final content item
-				$mitem2 = pathwayMakeLink(
-				$Itemid,
-				$row->title,
-				"",
-				$Itemid
-				);
-				$mitems[$id] = $mitem2;
-				$Itemid = $id;
-
-			}
-			break;
-		}
-		break;
-
-		case 'content_blog_category':
-		case 'content_blog_section':
-		switch ($task) {
-			case 'view':
-			$id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-
-			if ($id) {
-				// load the content item name and category
-				$database->setQuery( "SELECT title, catid FROM #__content WHERE id=$id" );
-				$row = null;
-				$database->loadObject( $row );
-
-				$id = max( array_keys( $mitems ) ) + 1;
-				$mitem2 = pathwayMakeLink(
-				$Itemid,
-				$row->title,
-				"",
-				$Itemid
-				);
-				$mitems[$id] = $mitem2;
-				$Itemid = $id;
-
-			}
-			break;
-		}
-		break;
-	}
-
-	$i = count( $mitems );
-	$mid = $Itemid;
-
-	$imgPath =  'templates/' . $mainframe->getTemplate() . '/images/arrow.png';
-	if (file_exists( "$mosConfig_absolute_path/$imgPath" )){
-		$img = '<img src="' . $mosConfig_live_site . '/' . $imgPath . '" border="0" alt="arrow" />';
-	} else { 
-		$imgPath = '/images/M_images/arrow.png';
-		if (file_exists( $mosConfig_absolute_path . $imgPath )){
-			$img = '<img src="' . $mosConfig_live_site . '/images/M_images/arrow.png" alt="arrow" />';
-		} else {
-		    $img = '&gt;';
-		}
-	}
-
-	while ($i--) {
-		if (!$mid || empty( $mitems[$mid] ) || $mid == 1 || !eregi("option", $optionstring)) {
-			break;
-		}
-		$item =& $mitems[$mid];
-
-		// converts & to &amp; for xtml compliance
-		$itemname = ampReplace( $item->name );
-		
-		// if it is the current page, then display a non hyperlink
-		if ($item->id == $Itemid || empty( $mid ) || empty($item->link)) {
-			$newlink = "  $itemname";
-		} else if (isset($item->type) && $item->type == 'url') {
-			$correctLink = eregi( 'http://', $item->link);
-			if ($correctLink==1) {
-				$newlink = '<a href="'. $item->link .'" target="_window" class="pathway">'. $itemname .'</a>';
-			} else {
-				$newlink = $itemname;
-			}
-		} else {
-			$newlink = '<a href="'. sefRelToAbs( $item->link .'&Itemid='. $item->id ) .'" class="pathway">'. $itemname .'</a>';
-		}
-
-		$newlink = ampReplace( $newlink );
-		
-		if (trim($newlink)!="") {
-			$path = $img .' '. $newlink .' '. $path;
-		} else {
-			$path = '';
-		}
-
-		$mid = $item->parent;
-	}
-	
-	if ( eregi( 'option', $optionstring ) && trim( $path  ) ) {
-		$home = '<a href="'. sefRelToAbs( 'index.php' ) .'" class="pathway">'. $home .'</a>';
-	}
-
-	if ($mainframe->getCustomPathWay()){
-		$path .= $img . ' ';
-		$path .= implode ("$img " ,$mainframe->getCustomPathWay());
-	}
-  
-	echo ( "<span class=\"pathway\">". $home ." ". $path ."</span>\n" );
-}
-
-// code placed in a function to prevent messing up global variables
-showPathway( $Itemid );
 ?>
diff -ruN 4.5.4/includes/pdf.php 4.6rc2/includes/pdf.php
--- 4.5.4/includes/pdf.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/pdf.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,18 +1,18 @@
 <?php
 /**
-* @version $Id: pdf.php,v 1.1 2005/07/22 01:57:13 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-* Created by Phil Taylor me@phil-taylor.com
-* Support file to display PDF Text Only using class from - http://www.ros.co.nz/pdf/readme.pdf
-* HTMLDoc is available from: http://www.easysw.com/htmldoc and needs installing on the server for better HTML to PDF conversion
-**/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
 global $mosConfig_offset, $mosConfig_hideAuthor, $mosConfig_hideModifyDate, $mosConfig_hideCreateDate, $mosConfig_live_site;
 
 function dofreePDF ( $database ) {
@@ -63,8 +63,8 @@
 	$pdf->line( 10, 40, 578, 40 );
 	$pdf->line( 10, 822, 578, 822 );
 	$pdf->addText( 30, 34, 6, $mosConfig_live_site .' - '. $mosConfig_sitename );
-	$pdf->addText( 250, 34, 6, 'Powered by Mambo' );
-	$pdf->addText( 450, 34, 6, 'Generated: '. date( 'j F, Y, H:i', time() + $mosConfig_offset*60*60 ) );
+	$pdf->addText( 250, 34, 6, T_('Powered by Mambo') );
+	$pdf->addText( 450, 34, 6, T_('Generated:'). date( 'j F, Y, H:i', time() + $mosConfig_offset*60*60 ) );
 
 	$pdf->restoreState();
 	$pdf->closeObject();
@@ -91,15 +91,15 @@
 	if ( $mosConfig_hideAuthor == "0" ) {
 		if ( $row->author != '' && $mosConfig_hideAuthor == '0' ) {
 			if ($row->usertype == 'administrator' || $row->usertype == 'superadministrator') {
-				$txt2 .=  _WRITTEN_BY .' '. ( $row->created_by_alias ? $row->created_by_alias : $row->author );
+				$txt2 .=  T_('Written by') .' '. ( $row->created_by_alias ? $row->created_by_alias : $row->author );
 			} else {
-				$txt2 .=  _AUTHOR_BY .' '. ( $row->created_by_alias ? $row->created_by_alias : $row->author );
+				$txt2 .=  T_('Contributed by') .' '. ( $row->created_by_alias ? $row->created_by_alias : $row->author );
 			}
 		}
 	}
 
 	if ( $mosConfig_hideModifyDate == "0" ) {
-		$txt2 .= ' - '. _LAST_UPDATED .' ('. $mod_date .') ';
+		$txt2 .= ' - '. T_('Last Updated') .' ('. $mod_date .') ';
 	}
 
 	$txt2 .= "\n\n";
@@ -117,7 +117,7 @@
 
 function get_php_setting ($val ) {
 	$r = ( ini_get( $val ) == '1' ? 1 : 0 );
-	return $r ? 'ON' : 'OFF';
+	return $r ? T_('ON') : T_('OFF');
 }
 
 dofreePDF ( $database );
diff -ruN 4.5.4/includes/phpgettext/error.php 4.6rc2/includes/phpgettext/error.php
--- 4.5.4/includes/phpgettext/error.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/error.php	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,18 @@
+<?php
+
+function dump($var) {
+    $trace = debug_backtrace();
+    echo "<div style=\"text-align:left\">dump() in {$trace[0]['file']}:{$trace[0]['line']}</div>";
+    //include_once 'Var_Dump.php';
+    if (class_exists('Var_Dump')) {
+        Var_Dump::displayInit(array('display_mode'=>'HTML4_Table'));
+        Var_Dump::display($var);
+    } else {
+        echo "<pre style=\"text-align:left\">";
+        var_dump($var);
+        echo "</pre>";
+    }
+}
+
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpgettext/index.html 4.6rc2/includes/phpgettext/index.html
--- 4.5.4/includes/phpgettext/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpgettext/phpgettext.catalog.php 4.6rc2/includes/phpgettext/phpgettext.catalog.php
--- 4.5.4/includes/phpgettext/phpgettext.catalog.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/phpgettext.catalog.php	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,410 @@
+<?php
+/**
+ * @version		0.9
+ * @author      Carlos Souza
+ * @copyright   Copyright (c) 2005 Carlos Souza <csouza@web-sense.net>
+ * @package     PHPGettext
+ * @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @link		http://phpgettext.web-sense.net
+ */
+
+
+define('_MODE_MO_', 'mo');
+define('_MODE_PO_', 'po');
+define('_MODE_POT_','pot');
+
+require_once('phpgettext.message.php');
+class PHPGettext_Catalog
+{
+    var $mode = _MODE_MO_;
+    var $name = '';
+    var $path = '';
+    var $lang = 'en';
+    var $charset = 'utf-8';
+    var $category = 'LC_MESSAGES';
+    var $comments = array();
+    var $headers = array();
+    var $strings = array();
+    function PHPGettext_Catalog($name, $path)
+    {
+        $this->name = trim($name);
+        $this->path = trim($path);
+    }
+
+    function load()
+    {
+        switch ($this->mode)
+        {
+            case _MODE_MO_:
+            return $this->_readMO();
+            break;
+            case _MODE_PO_:
+            return $this->_readPO();
+            break;
+            case _MODE_POT_:
+            return $this->_readPO();            
+            break;
+            default:
+            trigger_error('Unrecognized mode in '.__CLASS__.'->'.__FUNCTION__, E_USER_ERROR);
+            return false;
+            break;
+        }
+    }
+
+    function save()
+    {
+
+        $langdir = $this->path.DIRECTORY_SEPARATOR.$this->lang;
+        if (!is_dir($langdir)) {
+            $this->createdir($langdir.DIRECTORY_SEPARATOR.$this->category);
+        }
+
+        switch ($this->mode)
+        {
+            case _MODE_MO_:
+            return $this->_writeMO();
+            break;
+            case _MODE_PO_:
+            $this->setRevisionDate();
+            return $this->_writePO();
+            case _MODE_POT_:
+            return $this->_writePO();
+            break;
+            default:
+            trigger_error('Unrecognized mode in '.__CLASS__.'->'.__FUNCTION__, E_USER_ERROR);
+            return false;
+            break;
+        }
+    }
+
+
+    function filename()
+    {
+        $return = $this->path.DIRECTORY_SEPARATOR;
+        $return .= !empty($this->lang) ? $this->lang.DIRECTORY_SEPARATOR : '';
+        $return .= (!empty($this->category) && $this->mode == _MODE_MO_) ? $this->category.DIRECTORY_SEPARATOR : '';
+        $return .= $this->name.'.'.$this->mode;
+        return  $return;
+    }
+
+    function createdir($path)
+    {
+        if (!file_exists($path))
+        {
+            // The directory doesn't exist.  Recurse, passing in the parent
+            // directory so that it gets created.
+            $this->createdir(dirname($path));
+            mkdir($path, 0777);
+        }
+    }
+
+    function setRevisionDate()
+    {
+        $this->headers['PO-Revision-Date'] = date('Y-m-d G:iO');
+    }
+    
+    function setComments($comments)
+    {        
+        $comments   = trim($comments);
+        if (is_string($comments)) {
+            $comments = explode("\n", $comments);
+            if (is_array($comments)) {
+                foreach ($comments as $comment)   {
+                    if (strpos($comment, '#') == 1)  {
+                        $this->comments .= $comment."\n";
+                    }
+                }
+            }
+        }
+    }
+    
+    function setHeaders($headers)
+    {
+        if (!is_array($headers)) {
+            return false;
+        }
+        foreach ($headers as $key => $value) {
+            $this->headers[$key] = $value;
+        }
+    }
+
+    function setproperty($property, $value = null) {
+        $return = $this->$property;
+        $this->$property = $value;
+        return $return;
+    }
+    function getproperty($property) {
+        return $this->$property;
+    }
+    function addentry($msgid, $msgid_plural=null, $msgstr=null, $comments=array())
+    {
+        $entry =  new PHPGettext_Message($msgid, $msgid_plural);
+        if (!is_null($msgstr)) $entry->setmsgstr($msgstr);
+        if (!empty($comments)) $entry->setcomments($comments);
+        $this->strings[$msgid] = $entry;
+    }
+
+    function _writePO()
+    {
+        $file = $this->filename();
+
+        // open PO file
+        if (!is_resource($res = @fopen($file, 'w'))) {
+            trigger_error("Cannot create '$file'. ", E_USER_WARNING);
+        }
+        // lock PO file exclusively
+        if (!@flock($res, LOCK_EX)) {
+            @fclose($res);
+            trigger_error("Cannot lock '$file'. ", E_USER_WARNING);
+        }
+        // write comments
+        if (count($this->comments > 0)) {
+            foreach ($this->comments as $line) {
+                fwrite($res, trim($line)."\n");
+            }
+        }
+        // write meta info
+        if (count($this->headers > 0)) {
+            $header = 'msgid ""' . "\nmsgstr " . '""' . "\n";
+            foreach ($this->headers as $k => $v) {
+                $header .= '"' . $k . ': ' . $v . '\n"' . "\n";
+            }
+            fwrite($res, $header . "\n");
+        }
+
+        // write strings
+        if (count($this->strings > 0)) {
+            foreach ($this->strings as $string) {
+                fwrite($res, $string->toString());
+            }
+        }
+        //done
+        @flock($res, LOCK_UN);
+        @fclose($res);
+        return true;
+    }
+
+    function _readPO()
+    {
+        $file = $this->filename();
+        if (!is_readable($file)) {
+            trigger_error('Gettext Catalog '.$this->filename().' not found', E_USER_WARNING);
+            return false;
+        }
+        // load file
+        if (!$data = @file($file)) {
+            trigger_error('Gettext Catalog '.$this->filename().' not found', E_USER_WARNING);
+            return false;
+        }
+        $count      = 0;
+        $comments   = '';
+        $is_fuzzy   = false;
+        $nplural    = false;
+
+        // get all strings
+        foreach ($data as $line) {
+            // comments
+            if (strncmp($line, "#", 1) == 0) {
+                if ($count < 1) {
+                    $this->comments[] = $line;
+                } else {
+                    if (strncmp($line, "#,", 2) == 0 && preg_match('/fuzzy/', $line)) {
+                        unset($line);
+                        $is_fuzzy = true;
+                    }
+                    if (isset($line)) {
+                        $comments[] = $line;
+                    }
+                }
+            }// msgid
+            elseif (preg_match('/^msgid\s*"(.*)"\s*|^msgid_plural\s*"(.*)"\s*/s', $line, $matches)) {
+                if (preg_match('/^msgid_plural\s*/s', $line, $arr)) {
+                    $nplural = true;
+                    $strings[$count]['msgid_plural'] = $matches[2];
+                } else {
+                    $count++;
+                    $strings[$count]['comments'] = isset($comments) ? $comments : '';
+                    $strings[$count]['msgid']    = '';
+                    $strings[$count]['msgid_plural']    = '';
+                    $strings[$count]['msgstr']   = '';
+                    $strings[$count]['is_fuzzy'] = $is_fuzzy;
+                    if (!empty($matches[1])) {
+                        $strings[$count]['msgid'] = $matches[1];
+                    }
+                    unset($msgstr);
+                    unset($comments);
+                    $nplural  = false;
+                    $is_fuzzy = false;
+
+                }
+            } // msgstr
+            elseif  (preg_match('/^msgstr\s*"(.*)"\s*|^msgstr\[[0-9]\]\s*"(.*)"\s*/s', $line, $matches)) {
+                $msgstr = true;
+                if ($nplural) {
+                    $strings[$count]['msgstr'][] = isset($matches[2]) ? $matches[2] : '';
+                } else {
+                    $strings[$count]['msgstr'] = $matches[1];
+                }
+            } // multiline msgid or msgstr
+            elseif (preg_match('/^"(.*)"\s*$/s', $line, $matches)) {
+                // headers
+                if (isset($msgstr) && $count == 1) {
+                    list($key, $value) = explode(':', $matches[1], 2);
+                    $this->headers[$key] = $value;
+                }
+                elseif (isset($msgstr) && $count > 1) {
+                    $strings[$count]['msgstr'] .= $matches[1];
+                }
+                else { // msgid
+                    $strings[$count]['msgid']  .= $matches[1];
+                }
+            }
+        }
+
+        // load the strings
+        array_shift($strings);
+        for ($a=0; $a < count($strings); $a++) {
+            $this->strings[$a] = new PHPGettext_Message($strings[$a]['msgid'], $strings[$a]['msgid_plural']);
+            $this->strings[$a]->setmsgstr($strings[$a]['msgstr']);
+            $this->strings[$a]->setfuzzy($strings[$a]['is_fuzzy']);
+            $this->strings[$a]->setcomments($strings[$a]['comments']);
+        }
+        return true;
+    }
+
+    function _writeMO()
+    {
+        $file = $this->filename();
+
+        // open MO file
+        if (!is_resource($res = @fopen($file, 'w'))) {
+            trigger_error("Cannot create '$file'. ", E_USER_WARNING);
+        }
+        // lock MO file exclusively
+        if (!@flock($res, LOCK_EX)) {
+            @fclose($res);
+            trigger_error("Cannot lock '$file'. ", E_USER_WARNING);
+        }
+
+        // get the headers
+        foreach ($this->headers as $key => $val) {
+            $headers .= $key . ': ' . $val . "\n";
+        }
+        $strings[] = array('msgid' => "", 'msgstr' => $headers);
+
+        // don't write fuzzy entries
+        foreach ($this->strings as $message) {
+            if (!$message->is_fuzzy) {
+                $strings[] = array('msgid' => $message->msgid,'msgid_plural' => $message->msgid_plural, 'msgstr' => $message->msgstr);
+            }
+
+        }
+
+        $count = count($strings);
+        fwrite($res, pack('L', (int) 0x950412de));  // magic number
+        fwrite($res, pack('L', 0));                 // revision  0
+        fwrite($res, pack('L', $count));            // N - number of strings
+        $offset = 28;
+        fwrite($res, pack('L', $offset));           // O - offset of table with original strings
+        $offset += ($count * 8);
+        fwrite($res, pack('L', $offset));           // T - offset of table with translation strings
+        fwrite($res, pack('L', 0));                 // S - size of hashing table (set to 0 to omit the table)
+        $offset += ($count * 8);
+        fwrite($res, pack('L', $offset));           // H - offset of hashing table
+
+        // offsets for original strings
+        for ($a=0; $a<$count; $a++) {
+            if (isset($strings[$a]['msgid_plural'])) { // plurals
+                $strings[$a]['msgid'] = $strings[$a]['msgid'] ."\0".$strings[$a]['msgid_plural'];
+            }
+            $len = strlen($strings[$a]['msgid']);
+            fwrite($res, pack('L', $len));
+            fwrite($res, pack('L', $offset));
+            $offset += $len + 1;
+        }
+
+        // offsets for translated strings
+        for ($a=0; $a<$count; $a++) {
+            if (is_array($strings[$a]['msgstr'])) { // plurals
+                $strings[$a]['msgstr'] = implode("\0", $strings[$a]['msgstr']);
+            }
+            $len = strlen($strings[$a]['msgstr']);
+            fwrite($res, pack('L', $len));
+            fwrite($res, pack('L', $offset));
+            $offset += $len + 1;
+        }
+
+        // write original strings
+        foreach ($strings as $str) {
+            fwrite($res, $str['msgid'] . "\0");
+        }
+        // write translated strings
+        foreach ($strings as $str) {
+            fwrite($res, $str['msgstr'] . "\0");
+        }
+        // done
+        @flock($res, LOCK_UN);
+        @fclose($res);
+        return true;
+    }
+
+
+    function _readMO()
+    {
+        $file = $this->filename();
+        if (!file_exists($file)) return false;
+
+        //  read in data file completely
+        $f = fopen($file, "rb");
+        $data = fread($f, 1<<20);
+        fclose($f);
+
+        //  extract header fields and check file magic
+        if ($data) {
+            $header = substr($data, 0, 20);
+            $header = unpack("L1magic/L1version/L1count/L1o_msg/L1o_trn", $header);
+            extract($header);
+            if ((dechex($magic) == "950412de") && ($version == 0)) {
+                //  fetch all strings
+                for ($a=0; $a<$count; $a++) {
+                    //  msgid
+                    $r = unpack("L1len/L1offs", substr($data, $o_msg + $a * 8, 8));
+                    $msgid = substr($data, $r["offs"], $r["len"]);
+                    unset($msgid_plural);
+                    if (strpos($msgid, "\0")) { // plurals
+                        list($msgid, $msgid_plural) = explode("\0", $msgid);
+                    }
+                    //  msgstr
+                    $r = unpack("L1len/L1offs", substr($data, $o_trn + $a * 8, 8));
+                    $msgstr = substr($data, $r["offs"], $r["len"]);
+                    if (isset($msgid_plural)) { // plurals
+                        $msgstr = explode("\0", $msgstr);
+                    }
+                    $strings[$a]['msgid'] = $msgid;
+                    $strings[$a]['msgstr'] = $msgstr;
+                    $strings[$a]['msgid_plural'] = isset($msgid_plural) ? $msgid_plural : '';
+                }
+                if (!empty($strings[0]['msgstr'])){ // header
+                    $str = explode("\n", $strings[0]['msgstr']);
+                    foreach ($str as $s){
+                        if (!empty($s)) {
+                            list($key, $value) = explode(':', $s, 2);
+                            $this->headers[$key] = $value;
+                        }
+                    }
+                }
+                // load the strings
+                array_shift($strings);
+                for ($a=0; $a < count($strings); $a++) {
+                    $this->strings[$a] = new PHPGettext_Message($strings[$a]['msgid'], $strings[$a]['msgid_plural']);
+                    $this->strings[$a]->setmsgstr($strings[$a]['msgstr']);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpgettext/phpgettext.class.php 4.6rc2/includes/phpgettext/phpgettext.class.php
--- 4.5.4/includes/phpgettext/phpgettext.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/phpgettext.class.php	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,599 @@
+<?php
+/**
+ * @version		0.9
+ * @author      Carlos Souza
+ * @copyright   Copyright (c) 2005 Carlos Souza <csouza@web-sense.net>
+ * @package     PHPGettext
+ * @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @link		http://phpgettext.web-sense.net
+ * 
+ * 
+ */
+class PHPGettext
+{
+    var $has_gettext;
+
+    /**
+     * The current locale. eg: en-GB
+     */
+    var $lang;
+    /**
+     * The current locale. eg: en-GB
+     */
+    var $locale;
+
+    /**
+     * The current domain
+     */
+    var $domain;
+
+    /**
+     * The current character set
+     */
+    var $charset;
+
+    /**
+     * Container for the loaded domains
+     */
+    var $text_domains = array();
+
+    /**
+     * The asssociative array of headers for the current domain
+     */
+    var $headers = array();
+    /**
+     * The asssociative array of messages for the current domain
+     */
+    var $messages = array();
+
+    /**
+     * The debugging flag
+     */
+    var $debug;
+
+    function PHPGettext() {}
+
+    /**
+     * 
+     * Set and lookup the locale from the environment variables.
+     * Priority order for gettext is:
+     * 1. LANGUAGE
+     * 2. LC_ALL
+     * 3. LC_MESSAGE
+     * 4. LANG      
+     *
+     * @return unknown
+     */
+
+    function setlocale($lang, $locale=false) {
+        #dump(setlocale(LC_ALL, 0));
+        putenv("LANGUAGE=$lang");
+        putenv("LC_ALL=$lang");
+        putenv("LC_MESSAGE=$lang");
+        putenv("LANG=$lang");
+        $this->lang =  $lang;
+        if ($locale) {
+            $this->locale =  setlocale(LC_ALL, $locale);
+            setlocale(LC_ALL, $locale);
+        }
+    }
+
+    function getlocale() {
+        if (empty($this->locale)) {
+            $langs = array( getenv('LANGUAGE'),
+            getenv('LC_ALL'),
+            getenv('LC_MESSAGE'),
+            getenv('LANG')
+            );
+            foreach ($langs as $lang)
+            if ($lang){
+                $this->locale = $lang;
+                break;
+            }
+        }
+        return $this->locale;
+    }
+
+    /**
+     * debugging function
+     * 
+     */
+    function output($message, $untranslated = false){
+        switch ($this->debug)
+        {
+            case 2:
+            $trace = debug_backtrace();
+            $html = '<span style="border-bottom: thin solid %s" title="%s(%d)">T_(%s)</span>';
+            $str = sprintf($html, ($untranslated ? 'red' : 'green'), str_replace('\\', '/', $trace[2]['file']), $trace[2]['line'], $message);
+            break;
+            case 1:
+            $str    = sprintf('%sT_(%s)',$untranslated ? '!' : '', $message);
+            break;
+            case 0:
+            default:
+            $str    = $message;
+            break;
+        }
+        return $str;
+    }
+
+    /**
+     * Alias for gettext
+     * will also output the result if $output = true
+     */
+    function _($message, $output = false){
+        $return = $this->gettext($message);
+        if ($output) {
+            echo $return;
+            return true;
+        }
+        return $return;
+    }
+
+    /**
+     * Lookup a message in the current domain
+     * returns translation if it exists or original message
+     */
+    function gettext($message){
+        $translation = $message;
+        if ($this->has_gettext){
+            $translation = gettext($message);
+        }
+        elseif (isset($this->messages[$this->domain][$message])) {
+            $translation = !empty($this->messages[$this->domain][$message]) ? $this->messages[$this->domain][$message] : $message;
+        }
+        $untranslated = (strcmp($translation, $message) === 0) ? true : false;
+        return $this->output($translation, $untranslated);
+    }
+
+    /**
+     * Override the current domain
+     * The dgettext() function allows you to override the current domain for a single message lookup.
+     */
+    function dgettext($domain, $message){
+        $translation = $message;
+        if (array_key_exists($domain, $this->messages)){
+            if (isset($this->messages[$domain][$message]))
+            $translation = !empty($this->messages[$domain][$message]) ? $this->messages[$domain][$message] : $message;
+        }
+        $untranslated = (strcmp($translation, $message) === 0) ? true : false;
+        return $this->output($translation, $untranslated);
+    }
+
+    /**
+     * Plural version of gettext      
+     */
+    function ngettext($msgid, $msgid_plural, $count){
+        if ($this->has_gettext){
+            $translation = ngettext($msgid, $msgid_plural, $count);
+        }
+        $plural = $this->getplural($count, $this->domain);
+        $original = array($msgid, $msgid_plural);
+        if (isset($this->messages[$this->domain][$msgid][$plural])) {
+            $translation  = $this->messages[$this->domain][$msgid][$plural];
+        } else {
+            $original   = array($msgid, $msgid_plural);
+            $translation  = $original[$plural];
+        }
+        $untranslated = isset($original[$plural]) && (strcmp($translation, $original[$plural]) === 0) ? true : false;
+        return $this->output($translation, $untranslated);
+    }
+    /**
+     * Plural version of dgettext 
+     */
+    function dngettext($domain, $msgid, $msgid_plural, $count){
+        $original   = array($msgid, $msgid_plural);
+        $plural = $this->getplural($count, $domain);
+        if ($this->has_gettext){
+            $translation = dngettext($domain, $msgid, $msgid_plural, $count);
+        } else {
+            if (isset($this->messages[$domain][$msgid][$plural])) {
+                $translation  = $this->messages[$domain][$msgid][$plural];
+            } else {
+                $translation  = $original[$plural];
+            }
+        }
+        $untranslated = (strcmp($translation, $original[$plural]) === 0) ? true : false;
+        return $this->output($translation, $untranslated);
+    }
+
+    /**
+     * Specify the character encoding in which the messages 
+     * from the DOMAIN message catalog will be returned 
+     *
+     */
+    function bind_textdomain_codeset($domain, $charset){
+        if ($this->has_gettext){
+            bind_textdomain_codeset($domain, $charset);
+        }
+        return $this->text_domains[$domain]["charset"] = $charset;
+    }
+
+    /**
+     * Sets the path for a domain
+     * if gettext is unavailable, translation files will be loaded here
+     * 
+     */
+    function bindtextdomain($domain, $path){
+        if ($this->has_gettext){
+            bindtextdomain($domain, $path);
+        } else {
+            $this->load($domain, $path);
+        }
+        return $this->text_domains[$domain]["path"] = $path;
+    }
+
+    /**
+     * Sets the default domain textdomain
+     */
+    function textdomain($domain = null){
+        if ($this->has_gettext) {
+            $domain = textdomain($domain);
+        }
+        elseif (!is_null($domain)) {
+            $this->domain = $domain;
+            $this->load($domain, $this->text_domains[$this->domain]['path']);
+        }
+        return $this->domain;
+    }
+
+    /**
+     * Overrides the domain for a single lookup
+     * This function allows you to override the current domain for a single message lookup. 
+     * It also allows you to specify a category. 
+     * Categories are folders within the languages directory  .
+     * currently, only LC_MESSAGES is implemented     
+     *
+     *   The values for categories are:
+     *   LC_CTYPE        0
+     *   LC_NUMERIC      1
+     *   LC_TIME         2
+     *   LC_COLLATE      3
+     *   LC_MONETARY     4
+     *   LC_MESSAGES     5
+     *   LC_ALL          6
+     *
+     *   not yet implemented
+     */
+    function dcgettext($domain, $message, $category){
+        return $message;
+    }
+
+    /**
+     * dcngettext -- Plural version of dcgettext
+     * not yet implemented
+     */
+    function dcngettext($domain, $msg1, $msg2, $count, $category){
+        return $msg1;
+    }
+
+
+    /**
+     * Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1; 
+     * 
+     * nplurals - total number of plurals
+     * plural   - the plural index
+     * 
+     * Plural-Forms: nplurals=1; plural=0;
+     * 1 form only      
+     * 
+     * Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1; 
+     * Plural-Forms: nplurals=2; plural=n != 1;
+     * 2 forms, singular used for one only
+     * 
+     * Plural-Forms: nplurals=2; plural=n>1;
+     * 2 forms, singular used for zero and one
+     * 
+     * Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;
+     * 3 forms, special case for zero
+     * 
+     * Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;
+     * 3 forms, special cases for one and two
+     * 
+     * Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;
+     * 4 forms, special case for one and all numbers ending in 02, 03, or 04
+     */
+    function getplural($count, $domain) {
+        if (isset($this->headers[$domain]['Plural-Forms'])) {
+            $plural_forms = $this->headers[$domain]['Plural-Forms'];
+            preg_match('/nplurals[\s]*[=]{1}[\s]*([\d]+);[\s]*plural[\s]*[=]{1}[\s]*(.*);$/', $plural_forms, $matches);
+            $nplurals   = $matches[1];
+            $plural_exp = $matches[2];
+            if ($nplurals > 1 && strpos($plural_exp, ':') === false) {
+                $plural =  'return ('.preg_replace('/n/', $count, $plural_exp).') ? 1 : 0;';
+            } else {
+                $plural = 'return '.preg_replace('/n/', $count, $plural_exp);
+            }
+        } else {
+            $plural = 'return '.preg_replace('/n/', $count, 'n != 1 ? 1 : 0;');
+        }
+        return eval($plural);
+    }
+
+    function load($domain, $path) {
+        require_once('phpgettext.catalog.php');
+        $catalog = new PHPGettext_catalog($domain, $path);
+        $catalog->setproperty('mode', _MODE_MO_);
+        $catalog->setproperty('lang', $this->lang);
+        $catalog->load();
+        $this->headers[$domain] = $catalog->headers;
+        foreach ($catalog->strings as $string)
+        $this->messages[$domain][$string->msgid] = $string->msgstr;
+    }
+}
+
+
+class PHPGettextAdmin
+{
+    var $has_gettext    = false;
+    var $gettext_path   = '';
+    var $debug          = false;
+
+    function PHPGettextAdmin($debug = false)
+    {
+        if (ini_get('open_basedir') || ini_get('safe_mode')) {
+            $this->has_gettext = false;
+            return false;
+        }
+        $cmd = 'which gettext';
+        if (substr(strtoupper(PHP_OS), 0, 3) == 'WIN'){
+            $cmd = dirname(__FILE__).DIRECTORY_SEPARATOR.$cmd;
+        }
+        exec($cmd, $output, $return);
+        if ($output) {
+            $path = dirname($output[0]);
+            if (is_dir($path)) {
+                $this->has_gettext  = true;
+                $this->gettext_path = $path;
+            }
+        }
+        if ($debug) {
+            $this->debug = $debug;
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function message_format ($domain, $textdomain, $lang, $enc='utf-8')
+    {
+        $path   = "$textdomain/$lang";
+        if ($this->has_gettext) {
+            $cmd = "msgfmt -o $path/LC_MESSAGES/$domain.mo $path/$domain.po";
+            return $this->execute($cmd);
+        }
+        $catalog = new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', _MODE_PO_);
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+        $catalog->setproperty('mode', _MODE_MO_);
+        $catalog->save();
+        return true;
+    }
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function compile($lang, $textdomain, $enc='utf-8') {
+        
+        if ($this->has_gettext) {
+            $cmd = "msgfmt -o $textdomain/$lang/LC_MESSAGES/$lang.mo $textdomain/$lang/$lang.po";
+            return $this->execute($cmd);
+        }
+        $catalog = new PHPGettext_catalog($lang, $textdomain);
+        $catalog->setproperty('mode', _MODE_PO_);
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+        $catalog->setproperty('mode', _MODE_MO_);
+        $catalog->save();
+        return true;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function initialize_translation ($domain, $textdomain, $lang, $enc='utf-8')
+    {
+        if (!$this->has_gettext) {
+            return false;
+        }
+        set_time_limit(120);
+        $path   = "$textdomain/$lang";
+        copy("$textdomain/untranslated/$domain.pot", "$path/ref.po");
+        $cmd = "msgmerge --width=80 --compendium $textdomain/glossary/$lang.$enc.po -o $path/$domain.po $path/ref.po $textdomain/untranslated/$domain.pot";
+        $this->execute($cmd);
+        unlink("$textdomain/$lang/ref.po");
+    }
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function update_translation($domain, $textdomain, $lang, $enc='utf-8')
+    {
+        $path   = "$textdomain/$lang";
+        if (!file_exists("$path/$domain.po")) {
+            copy($textdomain."/untranslated/$domain.pot", "$path/$domain.po");
+        }
+        copy("$path/$domain.po", "$path/$domain.pot");
+        $cmd = "msgcat --use-first -o $path/update.po $path/$domain.po $textdomain/glossary/$lang.$enc.po";
+        $this->execute($cmd);
+        $cmd = "msgmerge --width=80 --compendium $textdomain/glossary/$lang.$enc.po -o $textdomain/$lang/$domain.po $textdomain/$lang/update.po $textdomain/untranslated/$domain.pot";
+        $this->execute($cmd);
+        unlink("$textdomain/$lang/update.po");
+        unlink("$textdomain/$lang/$domain.pot");
+    }
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function add_to_dict($domain, $textdomain, $lang, $enc='utf-8') {
+
+        if (!$this->has_gettext) return false;
+
+        $textdomain = rtrim($textdomain, '\/');
+        $path = "$textdomain/$lang";
+        if (!is_dir("$textdomain/glossary/")) {
+            mkdir("$textdomain/glossary/");
+        }
+        if (!file_exists("$textdomain/glossary/$lang.$enc.po")) {
+            set_time_limit(360);
+            $create_dict = true;
+            $cmd = "msgcat --use-first -o $textdomain/glossary/$lang.$enc.po $path/$domain.po";
+            $this->execute($cmd);
+        } else {
+            copy("$textdomain/glossary/$lang.$enc.po", "$textdomain/glossary/$lang.$enc.pot");
+            $cmd = "msgcat --use-first -o $textdomain/glossary/$lang.$enc.po $textdomain/$lang/$domain.po $textdomain/glossary/$lang.$enc.po";
+            $this->execute($cmd);
+            unlink("$textdomain/glossary/$lang.$enc.pot");
+        }
+    }
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function convert_charset($domain, $textdomain, $lang, $from_charset, $to_charset) {
+
+        $path = "$textdomain/$lang";
+        if ($this->has_gettext) {
+            $cmd = "msgconv --to-code=$to_charset -o $path/$domain.po $path/$domain.po";
+            $ret = $this->execute($cmd);
+            return $ret;
+        }
+
+        if (!function_exists('iconv')) {
+            return false;
+        }
+
+        $catalog = new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', _MODE_PO_);
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+        $catalog->headers['Content-Type'] = "text/plain; charset=$to_charset\n";
+        foreach ($catalog->strings as $index => $message) {
+            if (empty($message->msgid_plural)) {
+                $catalog->strings[$index]->msgstr = iconv($from_charset, $to_charset, $message->msgstr);
+            }
+        }
+        $catalog->save();
+        return true;
+    }
+
+
+    /**
+     * Invoke the xgettext utility with $args
+     * the xgettext executable must be in PATH
+     *
+     * @param string the commandline arguments to gettext
+     * @return unknown
+     */
+    function xgettext($domain, $textdomain, $php_sources, $lang='untranslated') {
+
+        $cmd  = "xgettext ";
+        if (file_exists("$textdomain/$lang/$domain.pot")) $cmd  .= '-j ';
+        $cmd  .= "-n -c --sort-by-file --keyword=T_ --keyword=Tn_:1,2 --keyword=Td_:2 --keyword=Tdn_:2,3 --output-dir=$textdomain/$lang -o $domain.pot";
+        if (count($php_sources) > 10) {
+            $tmpfile = $textdomain.'/xgettext.txt';
+            $fp = fopen($tmpfile, "w");
+            fwrite($fp, implode("\r\n", $php_sources));
+            fclose($fp);
+            $cmd = $cmd." --files-from=$tmpfile";
+        } else {
+            $cmd = $cmd." ".implode(" ", $php_sources);
+        }       
+        $ret = $this->execute($cmd);
+        @unlink($tmpfile);
+        return $ret;
+    }
+
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $domain
+     * @param unknown_type $langdir
+     */
+    function execute($cmd) {
+
+        if (!$this || !$this->has_gettext) return false;
+        #$cmd = $this->gettext_path.DIRECTORY_SEPARATOR.escapeshellcmd($cmd);
+        $cmd = escapeshellcmd($cmd);
+        $return = 0;
+        if (substr(strtoupper(PHP_OS), 0, 3) == 'WIN'){
+            $fp = fopen("execute.bat", 'w+');
+            fwrite($fp, "@echo on\r\n $cmd");
+            fclose($fp);
+            exec("execute.bat", $output, $retval);
+            unlink("execute.bat");
+        } else {
+            $lastline = exec($cmd, $output, $retval);
+        }
+        if ($this->debug || $retval > 0) {
+            $trace = debug_backtrace();
+            $msg = "<div style=\"border: thin solid silver; text-align:left;margin-left:10px\">";
+            $msg .= "<p><span style=\"font-weight:bold\">PHPGettextAdmin->execute('</span><i>$cmd</i><span style=\"font-weight:bold\">')</span><br/>in ".str_replace($_SERVER['DOCUMENT_ROOT'], '', $trace[1]['file']).":{$trace[1]['line']}</p>";
+            $msg .= "<p><i><b>trace:</b></i></p><ul>";
+            for ($a=1; $a < 3; $a++)  {
+                $called = isset($trace[$a]['class']) ? $trace[$a]['class'] : '';
+                $called .= $trace[$a]['type'].$trace[$a]['function']."(".@implode(', ',$trace[$a]['args']).")";
+                $msg .= "<li>$called in ".str_replace($_SERVER['DOCUMENT_ROOT'], '', $trace[$a]['file'])." : {$trace[$a]['line']}</li>";
+            }
+            $msg .= "</ul>";
+            $msg .= "<p><i><b>return value:</b></i>  $retval</p>";
+            $msg .= "<p><i><b>output:</b></i> </p><pre>{$output[1]}</pre>";
+            $msg .= "</div>";
+            echo $msg;
+        }
+        return $output;
+    }
+}
+
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
+function &phpgettext(){
+    static $gettext;
+    if (is_null($gettext)) {
+        require_once('phpgettext.class.php');
+        $gettext = new PHPGettext();
+        $gettext->has_gettext = true;
+        if (!function_exists("gettext") || !function_exists("_")) {
+            $gettext->has_gettext = false;
+            require_once('phpgettext.compat.php');
+        }
+    }
+    return $gettext;
+}
+function T_($message) {
+    $gettext =& phpgettext();
+    $trans = $gettext->gettext($message);
+    return $trans;
+}
+function Tn_($msg1, $msg2, $count) {
+    $gettext =& phpgettext();
+    return $gettext->ngettext($msg1, $msg2, $count);
+}
+function Td_($domain, $message) {
+    $gettext =& phpgettext();
+    return $gettext->dgettext($domain, $message);
+}
+function Tdn_($domain, $msg1, $msg2, $count) {
+    $gettext =& phpgettext();
+    return $gettext->dngettext($domain, $msg1, $msg2, $count);
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpgettext/phpgettext.compat.php 4.6rc2/includes/phpgettext/phpgettext.compat.php
--- 4.5.4/includes/phpgettext/phpgettext.compat.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/phpgettext.compat.php	2005-12-19 15:03:57.000000000 -0600
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @version		0.9
+ * @author      Carlos Souza
+ * @copyright   Copyright (c) 2005 Carlos Souza <csouza@web-sense.net>
+ * @package     PHPGettext
+ * @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @link		http://phpgettext.web-sense.net
+ * 
+ * gettext.compat.php
+ *
+ * comptibility file for gettext
+ *
+ * @author Carlos Souza
+ * @package PHPGettext
+ */
+ 
+ 
+function _($message){	
+    return gettext($message);
+}
+function gettext($message){	
+    $gettext =& phpgettext();
+    return $gettext->gettext($message);
+}
+function bind_textdomain_codeset($domain, $codeset){
+    $gettext =& phpgettext();
+    return $gettext->bind_textdomain_codeset($domain, $codeset);
+}    
+function bindtextdomain($domain, $directory){
+    $gettext =& phpgettext();
+    return $gettext->bindtextdomain($domain, $directory);
+} 
+function dgettext($domain, $message){
+    $gettext =& phpgettext();
+    return $gettext->dgettext($domain, $message);
+}
+function ngettext($msg1, $msg2, $count){    
+    $gettext =& phpgettext();
+    return $gettext->ngettext($msg1, $msg2, $count);
+}
+function dngettext($domain, $msg1, $msg2, $count){    
+    $gettext =& phpgettext();
+    return $gettext->dngettext($domain, $msg1, $msg2, $count);
+}
+function dcgettext($domain, $message, $category){
+    $gettext =& phpgettext();
+    return $gettext->dcgettext($domain, $message, $category);
+} 
+function dcngettext($domain, $msg1, $msg2, $count, $category){
+    $gettext =& phpgettext();
+    return $gettext->dcngettext($domain, $msg1, $msg2, $count, $category);
+} 
+function textdomain($domain = null){
+    $gettext =& phpgettext();
+    return $gettext->textdomain($domain);
+}
+
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpgettext/phpgettext.includes.php 4.6rc2/includes/phpgettext/phpgettext.includes.php
--- 4.5.4/includes/phpgettext/phpgettext.includes.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/phpgettext.includes.php	2006-02-12 17:49:56.000000000 -0600
@@ -0,0 +1,640 @@
+<?php
+
+/**
+ * function phpgettext()
+ *
+ * static function (we only need one phpgettext instance)
+ * loads a PHPGettext instance
+ * will detect if gettext is available and load compatibility file if it isn't
+ * 
+ */
+
+class ActionHandler
+{
+    var $name;
+    var $action;
+    var $view;
+
+    function ActionHandler($name)
+    {
+        $this->name  = $name;
+        $this->action  = requestvar('action', '_default');
+
+        $views = $this->name.'Views';
+
+        if (class_exists($views)) {
+            $this->view = new $views($this);
+        } else {
+            trigger_error("View class '$views' does not exist.", E_USER_ERROR);
+        }
+    }
+
+    function run()
+    {
+        $method = $this->action;
+        /*
+        * do acl check here
+        */
+        if ($method && strlen($method) > 2 && method_exists($this, $method))
+        return $this->$method();
+
+        return false;
+    }
+
+    function redirect($url)
+    {
+        if (headers_sent()) {
+            echo "<script>document.location.href='$url';</script>\n";
+        } else {
+            while (@ob_end_clean()); // clear output buffer
+            header( "Location: $url" );
+        }
+        exit;
+    }
+    function &container($reset = false)
+    {
+        $name = '__com_' . $this->_name . '_container';
+        if (!isset($_SESSION[$name]) || $reset) {
+            $_SESSION[$name] = array();
+        }
+        return $_SESSION[$name];
+    }
+
+}
+
+class phpgettextActions extends ActionHandler
+{
+    function _default(){
+        $this->view->_default();
+    }
+    function view(){
+        require_once('phpgettext.catalog.php');
+
+        $mode = requestvar('mode');
+        $lang = requestvar('lang');
+        $domain = requestvar('domain');
+        $textdomain = requestvar('textdomain');
+
+        $catalog = new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', $mode);
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+
+        $renderer =& renderer();
+        $renderer->addbyref('catalog', $catalog);
+        $renderer->addvar('mode', $mode);
+        $renderer->addvar('comments', $catalog->comments);
+        $renderer->addvar('headers', $catalog->headers);
+        $renderer->addvar('strings', $catalog->strings);
+
+        switch ($mode)
+        {
+            case 'mo':
+            return $this->view->view();
+            break;
+            case 'po':
+            return $this->view->form();
+            break;
+            case 'pot':
+            return $this->view->view();
+            break;
+            default:
+            trigger_error(__CLASS__.'->'.__FUNCTION__.' - mode not recognized', E_USER_ERROR);
+            return false;
+            break;
+        }
+    }
+    function extract(){
+        require_once('phpgettext.catalog.php');        
+        $gettext =& phpgettext();
+        $path = _site_path_;
+        $args = "--keyword=T_ --default-domain=phpgettext ";
+        $args .= '-o '.$path.'locale/phpgettext.pot ';
+        $args .= $path.'includes/*.php '.$path.'templates/*.php';
+        $gettext->xgettext($args);
+        $catalog = new PHPGettext_catalog('phpgettext', $path.'locale/');
+        $catalog->setproperty('mode', _MODE_POT_);
+        $catalog->load();
+
+        $renderer =& renderer();
+        $renderer->addbyref('catalog', $catalog);        
+        $renderer->addvar('mode', 'pot');
+        $renderer->addvar('comments', $catalog->comments);
+        $renderer->addvar('headers', $catalog->headers);
+        $renderer->addvar('strings', $catalog->strings);
+        
+        return $this->view->view();
+    }
+    function cleartests(){
+        rmdirr('tests/locale/');
+        mkdir('tests/locale');
+        $this->redirect($_SERVER['PHP_SELF']);
+    }
+    
+    function delpot(){
+        $domain     = requestvar('domain');
+        $textdomain = requestvar('textdomain');
+        @unlink($textdomain.'/'.$domain.'.pot');
+        $this->redirect($_SERVER['PHP_SELF']);
+    }
+    function newfrompot(){
+        require_once('phpgettext.catalog.php');
+        $locale     = requestvar('locale');
+        $domain     = requestvar('domain');
+        $textdomain = requestvar('textdomain');
+        
+        $catalog =& new PHPGettext_catalog($domain, $textdomain);
+        $catalog->setproperty('mode', _MODE_POT_);
+        $catalog->load();
+        $catalog->setproperty('lang', $locale);
+        $catalog->setproperty('mode', _MODE_PO_);
+        $catalog->save();        
+        
+        $renderer =& renderer();
+        $renderer->addbyref('catalog', $catalog);        
+        $renderer->addvar('mode', _MODE_PO_);
+        $renderer->addvar('comments', $catalog->comments);
+        $renderer->addvar('headers', $catalog->headers);
+        $renderer->addvar('strings', $catalog->strings);
+        
+        return $this->view->form();
+    }
+    function runtests(){
+        ob_start();
+        require_once('tests/simpletest/unit_tester.php');
+        require_once('tests/simpletest/reporter.php');        
+        require_once('phpgettext.catalog.php');
+        /*
+        $test = &new GroupTest('PHPGettext tests');
+        $test->addTestFile('tests/gettext_test_cases.php');
+        $test->run(new HtmlReporter());
+        */
+        $test = &new GroupTest('PHPGettext_Catalog tests');
+        $test->addTestFile('tests/catalog_test_cases.php');
+        $test->run(new HtmlReporter());
+        $contents = ob_get_contents();
+        ob_end_clean();
+        $renderer =& renderer();
+        $renderer->addvar('content', $contents);
+        $this->view->display();
+    }
+    function save(){
+        require_once('phpgettext.catalog.php');
+        $domain     = trim(requestvar('domain'));
+        $textdomain = trim(requestvar('textdomain'));
+        $lang       = trim(requestvar('lang'));
+        $compile    = trim(requestvar('compile'));
+        $comments   = trim(requestvar('comments'));
+        $headers    = requestvar('headers');
+        $msgstr     = requestvar('msgstr');
+        $fuzzy      = requestvar('is_fuzzy');
+
+        $catalog =& new PHPGettext_catalog($domain, $textdomain, $lang);
+        $catalog->setproperty('mode', 'po');
+        $catalog->setproperty('lang', $lang);
+        $catalog->load();
+
+        if (isset($comments)) {
+            $comments = explode("\n", $comments);
+            if (is_array($comments)) {
+                foreach ($comments as $comment)   {
+                    if (strpos($comment, '#') == 1)  {
+                        $catalog->comments .= $comment."\n";
+                    }
+                }
+            }
+        }
+
+        foreach ($headers as $key => $value) {
+            $catalog->headers[$key] = $value;
+        }
+
+
+        foreach ($msgstr as $index => $string) {
+            $catalog->strings[$index]->setmsgstr($string);
+            if (isset($is_fuzzy[$index])) {
+                $catalog->strings[$index]->setfuzzy(true);
+            }
+        }
+        $catalog->save();
+        if ($compile > 0) {
+            $catalog->setproperty('mode', 'mo');
+            $catalog->save();
+        }
+        
+        $renderer =& renderer();
+        $renderer->addbyref('catalog', $catalog);        
+        $renderer->addvar('mode', _MODE_MO_);
+        $renderer->addvar('comments', $catalog->comments);
+        $renderer->addvar('headers', $catalog->headers);
+        $renderer->addvar('strings', $catalog->strings);
+        
+        return $this->view->view();
+    }
+}
+
+class phpgettextViews
+{
+    var $action;
+
+    function phpgettextViews(&$action) {
+        $this->action =& $action;
+    }
+    function _default()
+    {
+        $renderer =& renderer();
+        $renderer->addvar('content', $renderer->fetch('home.tpl.php'));
+        $this->display();
+    }
+
+    function display() {
+        $renderer =& renderer();
+        $renderer->addbyref('view', $this);
+        $renderer->addbyref('t', phpgettext());
+        $renderer->display('main.tpl.php');
+    }
+
+    function edit()
+    {
+        $renderer =& Renderer::instance('php');
+        $renderer->display();
+    }
+
+
+    function view()
+    {
+        $renderer =& renderer();
+        $renderer->addvar('content', $renderer->fetch('view.tpl.php'));
+        $this->display();
+    }
+
+    function form()
+    {
+        $renderer =& renderer();
+        $renderer->addvar('content', $renderer->fetch('form.tpl.php'));
+        $this->display();
+    }
+
+
+    function dtree($return = false) {
+        $textdomains = $this->gettextdomains(rtrim($_SERVER['DOCUMENT_ROOT'], '/'));
+        $dtree =  "<script language=\"javascript\" type=\"text/javascript\">\n";
+        $dtree .= "d = new dTree('d', '"._site_url_."img/');\n";
+        $dtree .= "d.add(0,-1,'Text Domains');\n";
+        $cnt = 1;
+        foreach ($textdomains as $path) {
+            $name = str_replace($_SERVER['DOCUMENT_ROOT'], "", $path);
+            $name = str_replace(_gettext_dirname_, "", $name);
+            $name = rtrim(ucwords($name), '/');
+            if (strlen($name) < 1) {
+                $name = T_("Main");
+            }
+            $dtree .= "d.add($cnt,0,'$name ($path)');\n"; // textdomains
+            $td = $cnt;
+            $cnt++;
+
+            $translations = $this->getlanguages($path);
+
+            if (is_array($translations)) {
+                foreach ($translations as $lang => $files) {
+                    $dtree .= "d.add($cnt,$td,'$lang');\n"; // languages
+                    $lg = $cnt;
+                    $cnt++;
+
+                    if (is_array($files)) {
+                        foreach ($files as $file) {
+                            if (is_array($file)) {
+                                $dtree .= "d.add($cnt,$lg,'LC_MESSAGES');\n";
+                                $mo = $cnt;
+                                $cnt++;
+                                foreach ($file as $k => $v) {
+                                    if (is_array($v)) {
+                                        foreach ($v as $f) {
+                                            $dom = substr($f, 0, -3);
+                                            $dtree .= "d.add($cnt, $mo, '$f', '".$_SERVER['PHP_SELF']."?action=view&mode=mo&lang=$lang&domain=$dom&textdomain=$path', '', '', '"._site_url_."img/square.gif');\n";
+                                            $cnt++;
+                                        }
+                                    }
+                                }
+                            } else {
+                                $dom = substr($file, 0, -3);
+                                $dtree .= "d.add($cnt,$lg,'$file', '".$_SERVER['PHP_SELF']."?action=view&mode=po&lang=$lang&domain=$dom&textdomain=$path', '', '', '"._site_url_."img/add_content.gif');\n";
+                                $cnt++;
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            $templates = $this->gettemplates($path);
+            for ($a=0; $a<count($templates); $a++) {
+                $dom = substr($templates[$a], 0, -4);
+                $dtree .= "d.add($cnt,$td,'".$templates[$a]."', '".$_SERVER['PHP_SELF']."?action=view&mode=pot&domain=$dom&textdomain=$path');\n";
+                $cnt++;
+            }
+
+        }
+        $dtree .= "document.write(d);\n";
+        $dtree .= "</script>\n";
+        if ($return)
+        return $dtree;
+
+        echo $dtree;
+    }
+    function gettextdomains($path){
+        static $domains;
+        if ($handle=@opendir($path)) {
+            while (($file = readdir($handle)) !== false) {
+                if (is_dir("$path/$file") && $file!= "." && $file!= "..") {
+                    if (preg_match('/^'._gettext_dirname_.'$/', $file)) {
+                        $domains[] = "$path/$file";
+                    }
+                    $this->gettextdomains("$path/$file");
+                }
+            }
+            closedir($handle);
+        } else {
+            trigger_error(get_class($this)." File ( $path ) not found.", E_USER_ERROR);
+        }
+        return isset($domains) ? $domains : array();
+    }
+
+    function getlanguages($domain) {
+        if ($handle = opendir($domain)) {
+            while (false !== ($file = readdir($handle))) {
+                if (is_dir("$domain/$file") && $file!= "." && $file!= "..")
+                $langs[$file] = $this->gettranslations("$domain/$file");
+            }
+            closedir($handle);
+        }
+        return (isset($langs) ? $langs : array());
+    }
+
+    function gettemplates($textdomain) {
+        if ($handle=@opendir($textdomain)) {
+            while (($file = readdir($handle)) !== false)
+            if (preg_match('/.pot$/', $file))
+            $templates[] = $file;
+            closedir($handle);
+        } else {
+            trigger_error(get_class($this)." textdomain ( $path ) not found.", E_USER_ERROR);
+        }
+        return isset($templates) ? $templates : array();
+    }
+
+    function gettranslations($path) {
+        $lang = basename($path);
+        if (is_dir($path) && $handle=@opendir($path)) {
+            while (($file = readdir($handle)) !== false) {
+                if ($file== "LC_MESSAGES") {
+                    $po[]['LC_MESSAGES'] = $this->getbinaries($path.'/LC_MESSAGES');
+                } elseif (preg_match('/.po$/', $file)) {
+                    $po[]= $file;
+                }
+            }
+            closedir($handle);
+        } else {
+            trigger_error(get_class($this)." textdomain ( $path ) not found.", E_USER_ERROR);
+        }
+        return isset($po) ? $po : array();
+    }
+
+    function getbinaries($path) {
+        if (is_dir($path) && $handle=@opendir($path)) {
+            while (($file = readdir($handle)) !== false) {
+                if (preg_match('/.mo$/', $file)) {
+                    $mo[] = $file;
+                }
+            }
+            closedir($handle);
+        } else {
+            trigger_error(get_class($this)." textdomain ( $path ) not found.", E_USER_ERROR);
+        }
+        return isset($mo) ? $mo : array();
+    }
+
+}
+
+class Renderer
+{
+
+    var $dir;
+    var $vars = array();
+    var $engine = 'php';
+    var $template = '';
+
+    function Renderer(){}
+
+    function display($template, $return = false){
+        if ($template == NULL){
+            $error = 'A template has not been specified';
+            trigger_error($error, E_USER_ERROR);
+            return false;
+        }
+        $this->template = $this->dir . $template;
+
+        if (is_readable($this->template)) {
+            extract($this->getvars());
+            if ($return) {
+                ob_start();
+                include_once($this->template);
+                $ret = ob_get_contents();
+                ob_end_clean();
+                return $ret;
+            } else {
+                include_once($this->template);
+            }
+        } else {
+            $error = 'Template file ' . $template . ' does ' . 'not exist or is not readable';
+            trigger_error($error, E_USER_ERROR);
+            return false;
+        }
+        return false;
+    }
+
+    function fetch($template){
+        return $this->display($template, true);
+    }
+    function &getengine(){
+        return $this->engine;
+    }
+    function addvar($key, $value){
+        $this->vars[$key] = $value;
+    }
+    function addbyref ($key, &$value) {
+        $this->vars[$key] =& $value;
+    }
+    function getvars($name = false){
+        return (isset($this->vars[$name])) ? $this->vars[$name] : $this->vars;
+    }
+
+    function setdir($dir){
+        $this->dir = (substr($dir, -1) == DIRECTORY_SEPARATOR) ? $dir : $dir.DIRECTORY_SEPARATOR;
+    }
+    function getdir(){
+        return $this->dir;
+    }
+    function template($template){
+        $this->template = $template;
+    }
+}
+
+
+
+
+// cleans out a directory recursively
+function rmdirr($dir) {
+    if($objs = glob($dir."/*")){
+        foreach($objs as $obj) {
+            is_dir($obj)? rmdirr($obj) : unlink($obj);
+        }
+    }
+    rmdir($dir);
+}
+
+
+
+
+function &renderer($engine = 'php') {
+    static $renderer;
+    if (is_null($renderer[$engine])) {
+        if ($engine == 'php') {
+            $renderer[$engine] = new Renderer();
+        } else {
+            $classname = $engine . 'Renderer';
+            if (class_exists($classname))
+            $renderer[$engine] = new $classname();
+        }
+    }
+    return $renderer[$engine];
+}
+
+
+function dump($var) {
+    $trace = debug_backtrace();
+    echo "<div>dump() in {$trace[0]['file']}:{$trace[0]['line']}</div>";
+    include_once 'Var_Dump.php';
+    if (class_exists('Var_Dump')) {
+        Var_Dump::displayInit(array('display_mode'=>'HTML4_Table'));
+        Var_Dump::display($var);
+    } else {
+        echo "<pre>";
+        var_dump($var);
+        echo "</pre>";
+    }
+}
+
+function error_handler($errno, $errmsg, $filename, $linenum) {
+
+    $dt = date("Y-m-d H:i:s (T)");
+    $errortype = array (
+    E_ERROR           => "Error",
+    E_WARNING         => "Warning",
+    E_PARSE           => "Parse Error",
+    E_NOTICE          => "Notice",
+    E_CORE_ERROR      => "Core Error",
+    E_CORE_WARNING    => "Core Warning",
+    E_COMPILE_ERROR   => "Compile Error",
+    E_COMPILE_WARNING => "Compile Warning",
+    E_USER_ERROR      => "User Error",
+    E_USER_WARNING    => "User Warning",
+    E_USER_NOTICE     => "User Notice"
+    );
+
+    // set of errors for which a var trace will be saved
+    //$user_errors = array(E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE);
+
+    $output = <<<EOT
+<style type="text/css">
+<!-- 
+    .red_bold {color:red; font-weight:bold;}
+    .error { border: 1px solid grey; color: #000000;}
+    .error p.errmsg { font-size: 1em;  background-color: #990033; color: white; margin: 0 0 0 0;}
+    .error p.errfile { font-size: .8em; font-style: italic; margin: 0 0 0 20px;}
+    .error table.backtrace { }
+    .error table.backtrace th { text-align: left; background-color: #339900; color: white}
+    .error table.backtrace td {  color: #000000; background-color: #E8E8E8;}
+    .error table.backtrace span.function { font-weight: bold; }
+    .error table.backtrace span.file { font-size: .8em; font-style: italic; }
+    .error table.backtrace span.args { color: #000000; }
+-->
+</style>
+EOT;
+    $output .= "<div class=\"error\">";
+    $output .= "<p class=\"errmsg\">$errortype[$errno] : $errmsg</p>\n";
+    $output .= "<p class=\"errfile\">in file $filename : $linenum</p>\n";
+    $output .=  backtrace();
+    $output .= "</div>";
+    echo $output;
+    // save to the error log, and e-mail it if there is a critical user error
+    /*
+    error_log($err, 3, "/error.log");
+    if ($errno == E_USER_ERROR) {
+    mail("phpdev@example.com", "Critical User Error", $err);
+    }
+    */
+}
+
+function backtrace(){
+    $backtrace = debug_backtrace();
+    $output = "<table class=\"backtrace\"  border=\"1\" cellpadding=\"0\" cellspacing=\"0\">";
+    $output .= "<tr><th>#</th><th>function / location</th><th>args</th></tr>";
+    $count = 0;
+    if (isset($backtrace[0]['line'])) {
+        foreach ($backtrace as $bt) {
+            $argstr = '';
+            $class = isset($bt['class']) ? $bt['class'] : '';
+            $type = isset($bt['type']) ? $bt['type'] : '';
+            $function = isset($bt['function']) ? $bt['function'] : '';
+            $file = isset($bt['file']) ? $bt['file'] : '';
+            $line = isset($bt['line']) ? $bt['line'] : '';
+            $args = isset($bt['args']) ? $bt['args'] : array();
+            foreach ($args as $a) {
+                if (!empty($args)) {
+                    $argstr .= ', ';
+                }
+                switch (gettype($a)) {
+                    case 'integer':
+                    case 'double':
+                    $argstr .= $a;
+                    break;
+                    case 'string':
+                    $a = htmlspecialchars($a);
+                    $argstr .= "\"$a\"";
+                    break;
+                    case 'array':
+                    $argstr .= 'Array('.count($a).')';
+                    break;
+                    case 'object':
+                    $argstr .= 'Object('.get_class($a).')';
+                    break;
+                    case 'resource':
+                    $argstr .= 'Resource('.strstr($a, '#').')';
+                    break;
+                    case 'boolean':
+                    $argstr .= $a ? 'True' : 'False';
+                    break;
+                    case 'NULL':
+                    $argstr .= 'Null';
+                    break;
+                    default:
+                    $argstr .= 'Unknown';
+                }
+            }
+            if ($count > 1) {
+                $output .= "<tr>\n";
+                $output .= "<td><span>".($count-1)."</span></td>\n";
+                $output .= "<td><span class=\"function\">{$class}{$type}{$function}()</span><br />\n";
+                $output .= "<span class=\"file\">{$file}:{$line}</span></td>\n";
+                $output .= "<td><span class=\"args\">$argstr<br /></span></td>\n";
+                $output .= "</tr>\n";
+            }
+            $count++;
+        }
+    }
+    $output .= "</table>\n";
+    return $output;
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpgettext/phpgettext.message.php 4.6rc2/includes/phpgettext/phpgettext.message.php
--- 4.5.4/includes/phpgettext/phpgettext.message.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/includes/phpgettext/phpgettext.message.php	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,222 @@
+<?php
+/**
+ * @version		0.9
+ * @author      Carlos Souza
+ * @copyright   Copyright (c) 2005 Carlos Souza <csouza@web-sense.net>
+ * @package     PHPGettext
+ * @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @link		http://phpgettext.web-sense.net
+ * 
+ * 
+ */
+
+
+class PHPGettext_Message
+{
+    // --- ATTRIBUTES ---
+    /**
+     * Short description of attribute comments
+     *
+     * @access public
+     * @var int
+     */
+    var $comments = array();
+
+    /**
+     * Short description of attribute is_fuzzy
+     *
+     * @access public
+     * @var int
+     */
+    var $is_fuzzy = false;
+
+    /**
+     * Short description of attribute msgid
+     *
+     * @access public
+     * @var int
+     */
+    var $msgid = '';
+
+    /**
+     * Short description of attribute msgid
+     *
+     * @access public
+     * @var int
+     */
+    var $msgid_plural = '';
+
+    /**
+     * Short description of attribute msgstr
+     *
+     * @access public
+     * @var int
+     */
+    var $msgstr = '';
+
+    // --- OPERATIONS ---
+
+    /**
+     * Short description of method PHPGettext_Catalog_Entry
+     *
+     * @access public
+     * @author firstname and lastname of author, <author@example.org>
+     * @param void
+     * @param void
+     * @return void
+     */
+    function PHPGettext_Message($msgid = "", $msgid_plural = null)
+    {
+        $this->msgid = $msgid;
+        $this->msgid_plural =  $msgid_plural;
+    }
+
+    /**
+     * Short description of method setmsgstr
+     *
+     * @access public
+     * @author firstname and lastname of author, <author@example.org>
+     * @param void
+     * @return void
+     */
+    function setmsgstr($msgstr)
+    {        
+        $this->msgstr = $msgstr;
+        if (is_array($msgstr) && count($msgstr) == 1) $this->msgstr = $msgstr[0];
+    }
+
+    /**
+     * Short description of method setFuzzy
+     *
+     * @access public
+     * @author firstname and lastname of author, <author@example.org>
+     * @param void
+     * @return void
+     */
+    function setfuzzy($is_fuzzy = true)
+    {
+        $this->is_fuzzy = ($is_fuzzy) ? true : false;
+    }
+
+    /**
+     * Short description of method setComments
+     *
+     * @access public
+     * @author firstname and lastname of author, <author@example.org>
+     * @param void
+     * @return void
+     */
+    function setcomments($comments)
+    {
+        if (is_array($comments))
+        return $this->comments = $comments;
+
+        return false;
+    }
+
+    /**
+     * Short description of method reset
+     *
+     * @access public
+     * @author firstname and lastname of author, <author@example.org>
+     * @param void
+     * @return void
+     */
+    function reset($property = 'all')
+    {
+        switch ($property)
+        {
+            case 'comments':
+            unset($this->comments);
+            break;
+            case 'is_fuzzy':
+            unset($this->fuzzy);
+            break;
+            case 'msgid':
+            unset($this->msgid);
+            break;
+            case 'msgstr':
+            unset($this->msgstr);
+            break;
+            case 'all':
+            default:
+            unset($this->comments);
+            unset($this->is_fuzzy);
+            unset($this->msgid);
+            unset($this->msgstr);
+            break;
+        }
+    }
+
+
+    /**
+     * Short description of method toString
+     *
+     * @access public
+     * @author firstname and lastname of author, <author@example.org>
+     * @return void
+     */
+    function toString()
+    {
+        $string = '';
+        // comments
+        if (count($this->comments > 0)) {
+            foreach ($this->comments as $comment){
+                if (!preg_match('/^#,/', $comment) && !is_null($comment)) {
+                    $string .= trim($comment)."\n";
+                } elseif (strncmp($comment, "#:", 2)   == 0) {
+                    $string .= trim($comment)."\n";
+                } else {
+                    continue;
+                }
+            }
+        }
+        
+        // fuzzy entries
+        if ($this->is_fuzzy) {
+            $string .= "#, fuzzy\n";
+        }
+        /*
+        
+        if (strlen($msgid) > 76) {
+        $entry .= 'msgid ""'."\n";
+        $entry .= '"'.wordwrap($msgid, 76, " \"\n\"")."\"\n";
+        } else {
+        $entry .= 'msgid "'.$msgid.'"'."\n";
+        }
+        */
+        // msgid
+        if (strpos($this->msgid, "\n") > 0) {
+            $string .= "msgid \"\"\n";
+            $msgid = explode("\n", $this->msgid);
+            foreach ($msgid as $line)
+                $string .= "\"$line\\n\"\n";
+        } else {
+            $string .= "msgid \"$this->msgid\"\n";
+        }
+        
+        if (!empty($this->msgid_plural)) {
+            $string .= "msgid_plural \"$this->msgid_plural\"\n";    
+        } 
+        // msgstr
+        if (!is_array($this->msgstr) && strpos($this->msgstr, "\n") > 0) {
+            $string .= "msgstr \"\"\n";
+            $msgstr = explode("\n", $this->msgstr);
+            foreach ($msgstr as $line)
+                $string .= "\"$line\\n\"\n";
+            $string .= "\n";
+        }  // plurals
+        elseif (is_array($this->msgstr)){            
+            foreach ($this->msgstr as $k => $msgstr) {
+                $string .= "msgstr[$k] \"$msgstr\"\n";
+            }
+            $string .= "\n";
+        } else {
+            $string .= "msgstr \"$this->msgstr\"\n\n";
+        }
+        return $string;
+    }
+
+} /* end of class PHPGettext_Catalog_Entry */
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/includes/phpmailer/class.phpmailer.php 4.6rc2/includes/phpmailer/class.phpmailer.php
--- 4.5.4/includes/phpmailer/class.phpmailer.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/phpmailer/class.phpmailer.php	2006-01-26 10:07:51.000000000 -0600
@@ -1496,4 +1496,94 @@
     }
 }
 
+class mosMailer extends mosPHPMailer {
+	
+	/**
+	* Function to create a mail object for futher use (uses phpMailer)
+	* @param string From e-mail address
+	* @param string From name
+	* @param string E-mail subject
+	* @param string Message body
+	* @return object Mail object
+	*/
+	function mosMailer ( $from='', $fromname='', $subject, $body ) {
+		$this->PluginDir = mamboCore::get('mosConfig_absolute_path').'/includes/phpmailer/';
+		$this->SetLanguage( 'en', mamboCore::get('mosConfig_absolute_path').'/includes/phpmailer/language/' );
+		$this->CharSet 	= substr_replace(_ISO, '', 0, 8);
+		$this->IsMail();
+		$this->From 	= $from ? $from : mamboCore::get('mosConfig_mailfrom');
+		$this->FromName = $fromname ? $fromname : mamboCore::get('mosConfig_fromname');
+		$this->Mailer 	= mamboCore::get('mosConfig_mailer');
+
+		// Add smtp values if needed
+		if ( $this->Mailer == 'smtp' ) {
+			$this->SMTPAuth = mamboCore::get('mosConfig_smtpauth');
+			$this->Username = mamboCore::get('mosConfig_smtpuser');
+			$this->Password = mamboCore::get('mosConfig_smtppass');
+			$this->Host 	= mamboCore::get('mosConfig_smtphost');
+		}
+
+		// Set sendmail path
+		elseif ( $this->Mailer == 'sendmail' AND mamboCore::is_set('mosConfig_sendmail')) $this->Sendmail = mamboCore::get('mosConfig_sendmail');
+
+		$this->Subject 	= $subject;
+		$this->Body 	= $body;
+
+	}
+
+	/**
+	* Mail function (uses phpMailer)
+	* @param string From e-mail address
+	* @param string From name
+	* @param string/array Recipient e-mail address(es)
+	* @param string E-mail subject
+	* @param string Message body
+	* @param boolean false = plain text, true = HTML
+	* @param string/array CC e-mail address(es)
+	* @param string/array BCC e-mail address(es)
+	* @param string/array Attachment file name(s)
+	* @param string/array Reply-to e-mail address
+	* @param string/array Reply-to name
+	*/
+	function mosMail($recipient, $mode=0, $cc=NULL, $bcc=NULL, $attachment=NULL, $replyto=NULL, $replytoname=NULL ) {
+		// activate HTML formatted emails
+		if ($mode) $this->IsHTML(true);
+		if(is_array($recipient)) foreach ($recipient as $to) $this->AddAddress($to);
+		else $this->AddAddress($recipient);
+		if (isset($cc)) {
+		    if (is_array($cc)) foreach ($cc as $to) $this->AddCC($to);
+		    else $this->AddCC($cc);
+		}
+		if (isset($bcc)) {
+		    if(is_array($bcc)) foreach ($bcc as $to) $this->AddBCC($to);
+		    else $this->AddBCC($bcc);
+		}
+	    if ($attachment) {
+	        if (is_array($attachment)) foreach ($attachment as $fname) $this->AddAttachment($fname);
+	        else $this->AddAttachment($attachment);
+	    } // if
+	    if ($replyto) {
+	        if (is_array($replyto)) {
+	        	reset($replytoname);
+	            foreach ($replyto as $to) {
+	            	$toname = ((list($key, $value) = each($replytoname))
+					? $value : "");
+	            	$this->AddReplyTo($to, $toname);
+	            }
+	        } else $this->AddReplyTo($replyto, $replytoname);
+	    }
+		$result = $this->Send();
+		if( mamboCore::get('mosConfig_debug') ) {
+			//$mosDebug->message( "Mails send: $thisssend");
+		}
+		if( $this->error_count > 0 ) {
+			//$mosDebug->message( "The mail message $fromname <$from> about $subject to $recipient <b>failed</b><br /><pre>$body</pre>", false );
+			//$mosDebug->message( "Mailer Error: " . $this->ErrorInfo . "" );
+		}
+		return $result;
+	} // mosMail
+
+}
+
+
 ?>
diff -ruN 4.5.4/includes/sef.php 4.6rc2/includes/sef.php
--- 4.5.4/includes/sef.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/sef.php	2006-05-16 04:44:41.000000000 -0500
@@ -1,257 +1,379 @@
-<?php
-/**
-* @version $Id: sef.php,v 1.3 2005/11/23 22:49:07 csouza Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-if ($mosConfig_sef) sefParseUrl(config_register_globals());
-
-function sefParseUrl($register_globals){
-    // prevent globals overwrite via REQUEST_URI
-    if (preg_match('/(\b)GLOBALS|_REQUEST|_SERVER|_ENV|_COOKIE|_GET|_POST|_FILES|_SESSION(\b)/i', $_SERVER['REQUEST_URI']) > 0) {
-        die('Invalid Request');
-    }
-	$url_array = explode("/", $_SERVER['REQUEST_URI']);
-	/**
-	* Content
-	* http://www.domain.com/$option/$task/$sectionid/$id/$Itemid/$limit/$limitstart
-	*/
-	if (in_array("content", $url_array)) {
-
-		$uri = explode("content/", $_SERVER['REQUEST_URI']);
-		$option = "com_content";
-		$_GET['option'] = $option;
-		$_REQUEST['option'] = $option;
-		$pos = array_search ("content", $url_array);
-
-		// language hook for content
-		$lang = "";
-		foreach($url_array as $key=>$value) {
-			if ( !strcasecmp(substr($value,0,5),"lang,") ) {
-				$temp = explode(",", $value);
-				if (isset($temp[0]) && $temp[0]!="" && isset($temp[1]) && $temp[1]!="") {
-					$_GET['lang'] = $temp[1];
-					$_REQUEST['lang'] = $temp[1];
-					$lang = $temp[1];
-				}
-				unset($url_array[$key]);
-			}
-		}
-
-		// $option/$task/$sectionid/$id/$Itemid/$limit/$limitstart
-		if (isset($url_array[$pos+6]) && $url_array[$pos+6]!="") {
-			$task = $url_array[$pos+1];
-			$sectionid = $url_array[$pos+2];
-			$id = $url_array[$pos+3];
-			$Itemid = $url_array[$pos+4];
-			$limit = $url_array[$pos+5];
-			$limitstart = $url_array[$pos+6];
-			$_GET['task'] = $task;
-			$_REQUEST['task'] = $task;
-			$_GET['sectionid'] = $sectionid;
-			$_REQUEST['sectionid'] = $sectionid;
-			$_GET['id'] = $id;
-			$_REQUEST['id'] = $id;
-			$_GET['Itemid'] = $Itemid;
-			$_REQUEST['Itemid'] = $Itemid;
-			$_GET['limit'] = $limit;
-			$_REQUEST['limit'] = $limit;
-			$_GET['limitstart'] = $limitstart;
-			$_REQUEST['limitstart'] = $limitstart;
-			$QUERY_STRING = "option=com_content&task=$task&sectionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart";
-			// $option/$task/$id/$Itemid/$limit/$limitstart
-		} else if (isset($url_array[$pos+5]) && $url_array[$pos+5]!="") {
-			$task = $url_array[$pos+1];
-			$id = $url_array[$pos+2];
-			$Itemid = $url_array[$pos+3];
-			$limit = $url_array[$pos+4];
-			$limitstart = $url_array[$pos+5];
-			$_GET['task'] = $task;
-			$_REQUEST['task'] = $task;
-			$_GET['id'] = $id;
-			$_REQUEST['id'] = $id;
-			$_GET['Itemid'] = $Itemid;
-			$_REQUEST['Itemid'] = $Itemid;
-			$_GET['limit'] = $limit;
-			$_REQUEST['limit'] = $limit;
-			$_GET['limitstart'] = $limitstart;
-			$_REQUEST['limitstart'] = $limitstart;
-			$QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart";
-			// $option/$task/$sectionid/$id/$Itemid
-		} else if (!(isset($url_array[$pos+5]) && $url_array[$pos+5]!="") && isset($url_array[$pos+4]) && $url_array[$pos+4]!="") {
-			$task = $url_array[$pos+1];
-			$sectionid = $url_array[$pos+2];
-			$id = $url_array[$pos+3];
-			$Itemid = $url_array[$pos+4];
-			$_GET['task'] = $task;
-			$_REQUEST['task'] = $task;
-			$_GET['sectionid'] = $sectionid;
-			$_REQUEST['sectionid'] = $sectionid;
-			$_GET['id'] = $id;
-			$_REQUEST['id'] = $id;
-			$_GET['Itemid'] = $Itemid;
-			$_REQUEST['Itemid'] = $Itemid;
-			$QUERY_STRING = "option=com_content&task=$task&sectionid=$sectionid&id=$id&Itemid=$Itemid";
-			// $option/$task/$id/$Itemid
-		} else if (!(isset($url_array[$pos+4]) && $url_array[$pos+4]!="") && (isset($url_array[$pos+3]) && $url_array[$pos+3]!="")) {
-			$task = $url_array[$pos+1];
-			$id = $url_array[$pos+2];
-			$Itemid = $url_array[$pos+3];
-			$_GET['task'] = $task;
-			$_REQUEST['task'] = $task;
-			$_GET['id'] = $id;
-			$_REQUEST['id'] = $id;
-			$_GET['Itemid'] = $Itemid;
-			$_REQUEST['Itemid'] = $Itemid;
-			$QUERY_STRING = "option=com_content&task=$task&id=$id&Itemid=$Itemid";
-			// $option/$task/$id
-		} else if (!(isset($url_array[$pos+3]) && $url_array[$pos+3]!="") && (isset($url_array[$pos+2]) && $url_array[$pos+2]!="")) {
-			$task = $url_array[$pos+1];
-			$id = $url_array[$pos+2];
-			$_GET['task'] = $task;
-			$_REQUEST['task'] = $task;
-			$_GET['id'] = $id;
-			$_REQUEST['id'] = $id;
-			$QUERY_STRING = "option=com_content&task=$task&id=$id";
-			// $option/$task
-		} else if (!(isset($url_array[$pos+2]) && $url_array[$pos+2]!="") && (isset($url_array[$pos+1]) && $url_array[$pos+1]!="")) {
-			$task = $url_array[$pos+1];
-			$_GET['task'] = $task;
-			$_REQUEST['task'] = $task;
-			$QUERY_STRING = "option=com_content&task=$task";
-		}
-
-		if ($lang!="") {
-			$QUERY_STRING .= "&lang=$lang";
-		}
-
-		$_SERVER['QUERY_STRING'] = $QUERY_STRING;
-		$REQUEST_URI = $uri[0]."index.php?".$QUERY_STRING;
-		$_SERVER['REQUEST_URI'] = $REQUEST_URI;
-	}
-
-	/*
-	Components
-	http://www.domain.com/component/$name,$value
-	*/
-	if (in_array("component", $url_array)) {
-
-		$uri = explode("component/", $_SERVER['REQUEST_URI']);
-		$uri_array = explode("/", $uri[1]);
-		$QUERY_STRING = "";
-
-		foreach($uri_array as $value) {
-			$temp = explode(",", $value);
-			if (isset($temp[0]) && $temp[0]!="" && isset($temp[1]) && $temp[1]!="") {
-				$_GET[$temp[0]] = $temp[1];
-				$_REQUEST[$temp[0]] = $temp[1];
-				$QUERY_STRING .= $temp[0]=="option" ? "$temp[0]=$temp[1]" : "&$temp[0]=$temp[1]";
-			}
-		}
-
-		$_SERVER['QUERY_STRING'] = $QUERY_STRING;
-		$REQUEST_URI = $uri[0]."index.php?".$QUERY_STRING;
-		$_SERVER['REQUEST_URI'] = $REQUEST_URI;
-	}
-	
-	if ($register_globals) {
-        // Extract to globals
-        while(list($key,$value)=each($_GET)) {
-            if (!isset($GLOBALS[$key])) $GLOBALS[$key]=$value;
-        }
-    } 
-}
-
-function sefRelToAbs( $string ) {
-	GLOBAL $mosConfig_live_site, $mosConfig_sef, $mosConfig_mbf_content;
-
-	global $iso_client_lang;
-	if( $mosConfig_mbf_content && $string!="index.php" &&
-		!eregi("^(([^:/?#]+):)",$string) && !strcasecmp(substr($string,0,9),"index.php") &&
-		!eregi("lang=", $string) ) {
-		$string .= "&lang=$iso_client_lang";
-	}
-
-	if ($mosConfig_sef && !eregi("^(([^:/?#]+):)",$string) && !strcasecmp(substr($string,0,9),"index.php")) {
-
-		// Replace all &amp; with &
-		$string = str_replace( '&amp;', '&', $string );
-
-		/*
-		Home
-		index.php
-		*/
-		if ($string=="index.php") {
-			$string="";
-		}
-
-		$sefstring = "";
-		if ( (eregi("option=com_content",$string) || eregi("option=content",$string) ) && !eregi("task=new",$string) && !eregi("task=edit",$string) ) {
-			/*
-			Content
-			index.php?option=com_content&task=$task&sectionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart
-			*/
-			$sefstring .= "content/";
-			if (eregi("&task=",$string)) {
-				$temp = split("&task=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= $temp[0]."/";
-			}
-			if (eregi("&sectionid=",$string)) {
-				$temp = split("&sectionid=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= $temp[0]."/";
-			}
-			if (eregi("&id=",$string)) {
-				$temp = split("&id=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= $temp[0]."/";
-			}
-			if (eregi("&Itemid=",$string)) {
-				$temp = split("&Itemid=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= $temp[0]."/";
-			}
-			if (eregi("&limit=",$string)) {
-				$temp = split("&limit=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= $temp[0]."/";
-			}
-			if (eregi("&limitstart=",$string)) {
-				$temp = split("&limitstart=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= $temp[0]."/";
-			}
-			if (eregi("&lang=",$string)) {
-				$temp = split("&lang=", $string);
-				$temp = split("&", $temp[1]);
-				$sefstring .= "lang,".$temp[0]."/";
-			}
-			$string = $sefstring;
-		} else if (eregi("option=com_",$string) && !eregi("option=com_registration",$string) && !eregi("task=new",$string) && !eregi("task=edit",$string)) {
-			/*
-			Components
-			index.php?option=com_xxxx&...
-			*/
-			$sefstring = "component/";
-			$temp = split("\?", $string);
-			$temp = split("&", $temp[1]);
-			foreach($temp as $key => $value) {
-				$sefstring .= $value."/";
-			}
-			$string = str_replace( '=', ',', $sefstring );
-		}
-		//echo $mosConfig_live_site."/".$string;
-		return $mosConfig_live_site."/".$string;
-	} else {
-		return $string;
-	}
-
-}
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+class mosSEF {
+	
+	var $prefix = '';
+	var $custom_code = array();
+	var $custom_name = array();
+	var $custom_PHP = array();
+	var $custom_short = array();
+	var $sef_content_task = array();
+	var $sef_name_chars = array();
+	var $sef_translate_chars = array();
+	var $sef_name_string = '';
+	var $sef_translate_string = '';
+	var $content_data = null;
+	var $content_items = array();
+	var $content_sections = array();
+	var $content_categories = array();
+	var $SEF_SPACE;
+	
+	function mosSEF () {
+		/*******************************************************************************
+		**  The following are parameters for the ReMOSef Search Engine
+		**  Optimisation component.  $this->SEF_SPACE should be set to the
+		**  character that is to replace blanks in names that form the URL.
+		**  You can vary this, although the only sensible choices seem to be
+		**  underscore or hyphen (_ or -).
+		**
+		**  The arrays $this->custom_code and $this->custom_name must be kept exactly
+		**  in step with each other.  $this->custom_code is a list of the components
+		**  that are to be handled by ReMOSef.
+		**
+		**  The array $this->custom_name is the alternative name that will be used
+		**  in the optimised URL to identify the component and can be whatever
+		**  you please so long as it is unique and legal for a URL.  Apart from
+		**  using the custom name for the component, ReMOSef will do no further
+		**  translation of the URL than is done by the standard Mambo SEF - UNLESS
+		**  there is a sef_ext.php file installed for that component.  The
+		**  exception to this is ReMOSitory - the optimisation code for Remository
+		**  is integrated in ReMOSef.  For other components, if a sef_ext.php is
+		**  present, it will be invoked by ReMOSef.
+		**
+		**  The array $remosef_content_task is capable of translating the tasks
+		**  understood by the Mambo content component.  Please DO NOT CHANGE what
+		**  is to the left of the equals sign.  When putting different values on
+		**  the right hand side, remember that they must all be different, and must
+		**  also be different from any of the custom names used for components.
+		**  Without that, Remosef cannot figure out what a SEF URL means and will
+		**  give unpredictable results.
+		**
+		**  Note that the names in custom_name must not be allowed to clash with
+		**  the names used as tasks by the content component, in their
+		**  translated form - see below.
+		*******************************************************************************/
+		$this->SEF_SPACE = "_";					// divide words with underscores
+											// can be changed to a hyphen "-"
+		$this->custom_code = array('com_frontpage','com_contact');
+		$this->custom_name = array('Frontpage','Contact_Us');
+		/*******************************************************************************
+		**  The following are the parameters for the optional content specific
+		**  URL optimisation.  They are not used within the standard SEF processing
+		**  unless you add in a sef_ext.php that is integrated with the Mambo SEF.
+		**
+		**  The following two lines define the translations that SEF will perform on
+		**  names of sections and categories when translating them for inclusion in a URL.
+		**  Each item in $this->sef_name_chars is translated into the corresponding
+		**  element of $this->sef_translate_chars.
+		**
+		**  NOTE it is important that space be the last translate character, since the
+		**  characters are processed in the order in which they appear.  Since earlier
+		**  translates may create new spaces, it is vital that the space translation is
+		**  done last.
+		**
+		**  You can extend these arrays as you wish, although it is obviously important
+		**  to make sure that the items of one match the items of the other exactly.
+		*******************************************************************************/
+		$this->sef_name_chars = array('?', '&', '/', ' ');
+		$this->sef_translate_chars = array('', 'and', ' or ', $this->SEF_SPACE);
+		$this->sef_name_string = '\'';
+		$this->sef_translate_string = '--';
+
+/************** DO NOT MAKE CHANGES IN THE FOLLOWING LINES EXCEPT AT YOUR OWN RISK! ********************/
+
+		if (mamboCore::is_set('mosConfig_sef_prefix')) $this->prefix = mamboCore::get('mosConfig_sef_prefix');
+		else $this->prefix = 'mos';
+		if ($this->prefix == 'content' OR $this->prefix == 'component') $this->prefix = 'mos';
+		foreach ($this->custom_code as $code) {
+			$codefile = "components/$code/sef_ext.php";
+			if (file_exists($codefile)) {
+				include ($codefile);
+				$this->custom_PHP[] = true;
+			}
+			else $this->custom_PHP[] = false;
+			$split = explode('_',$code);
+			$this->custom_short[] = $split[1];
+		}
+
+		$this->sef_content_task['findkey'] = 'findkey';
+		$this->sef_content_task['view'] = 'view';
+		$this->sef_content_task['section'] = 'section';
+		$this->sef_content_task['category'] = 'category';
+		$this->sef_content_task['blogsection'] = 'blogsection';
+		$this->sef_content_task['blogcategorymulti'] = 'blogcategorymulti';
+		$this->sef_content_task['blogcategory'] = 'blogcategory';
+		$this->sef_content_task['archivesection'] = 'archivesection';
+		$this->sef_content_task['archivecategory'] = 'archivecategory';
+		$this->sef_content_task['save'] = 'save';
+		$this->sef_content_task['cancel'] = 'cancel';
+		$this->sef_content_task['emailform'] = 'emailform';
+		$this->sef_content_task['emailsend'] = 'emailsend';
+		$this->sef_content_task['vote'] = 'vote';
+		$this->sef_content_task['showblogsection'] = 'showblogsection';
+
+	}
+	
+	function &getInstance () {
+		static $instance;
+		if (!is_object($instance)) $instance = new mosSEF();
+		return $instance;
+	}
+	
+	function nameForURL ($string) {
+	    $accented = "".$this->sef_name_string;
+	    $nonaccent = "SOZsozYYuAAAAAAACEEEEIIIIDNOOOOOOUUUUYsaaaaaaaceeeeiiiionoooooouuuuyy".$this->sef_translate_string;
+	    $string = strtr($string, $accented, $nonaccent);
+	    foreach ($this->sef_name_chars as $i=>$char) $string = str_replace($char, $this->sef_translate_chars[$i], $string);
+	    $string = urlencode($string);
+	    return $string;
+	}
+	    
+
+	function sefRetrieval($register_globals){
+		
+	    if (preg_match('/(\b)GLOBALS|_REQUEST|_SERVER|_ENV|_COOKIE|_GET|_POST|_FILES|_SESSION(\b)/i', $_SERVER['REQUEST_URI']) > 0) {
+	        die('Invalid Request');
+	    }
+		if (mamboCore::get('mosConfig_sef')) {
+			$subdir = mamboCore::get('subdirectory');
+			$uri = substr($_SERVER['REQUEST_URI'], strlen($subdir));
+			$url_array = explode('/', $uri);
+			/**
+			* Content
+			* /$option/$task/$sectionid/$id/$Itemid/$limit/$limitstart
+			*/
+			if (!isset($url_array[2]) AND strpos($uri, '?')) return 0;
+ 			elseif ($url_array[2] == 'syndstyle') {
+			    array_splice($url_array, 2, 1);
+			    $_REQUEST['syndstyle'] = $_GET['syndstyle'] = $syndstyle = 'yes';
+			    $QUERY_STRING = 'syndstyle=yes&';
+			}
+			else $QUERY_STRING = '';
+			$foundit = false;
+			if ($url_array[1] == 'content') {
+				$foundit = true;
+				$_REQUEST['option'] = $_GET['option'] = $option = 'com_content';
+
+				// language hook for content
+				$lang = "";
+				$parms = array();
+				foreach($url_array as $key=>$value) {
+					if ( strcasecmp(substr($value,0,5),'lang,') == 0 ) {
+						$parts = explode(",", $value);
+						if (count($parts) > 1) {
+							$lang = $_REQUEST['lang'] = $_GET['lang'] = $parts[1];
+						}
+					}
+					elseif ( $value != '' AND $key > 1 ) $parms[] = $value;
+				}
+
+				// $option/$task/$sectionid/$id/$Itemid/$limit/$limitstart
+				$task = array_search($parms[0], $this->sef_content_task);
+				if ($task === false OR $task === null) return 1;
+				$_REQUEST['task'] = $_GET['task'] = $task;
+				$QUERY_STRING .= "option=com_content&task=$task";
+				if ($task == 'archivecategory') {
+					$_REQUEST['year'] = $_GET['year'] = $year = intval(@$parms[1]);
+					$_REQUEST['month'] = $_GET['month'] = $month = intval(@$parms[2]);
+					$_REQUEST['module'] = $_GET['module'] = $module = intval(@$parms[3]);
+					$QUERY_STRING .= "&year=$year&month=$month&module=$module";
+				}
+				else {
+					$num = count($parms);
+					for ($i = 1; $i <= $num-1; $i++) {
+						if (strcmp($parms[$i], (int)$parms[$i]) !== 0) return 1;
+					}
+					$i = 1;
+					if ($num == 6 OR $num == 4) {
+						$_REQUEST['sectionid'] = $_GET['sectionid'] = $sectionid = $parms[$i];
+						$QUERY_STRING .= "&sectionid=$sectionid";
+						$i++;
+					}
+					if ($num > 1) {
+						$_REQUEST['id'] = $_GET['id'] = $id = $parms[$i];
+						$QUERY_STRING .= "&id=$id";
+					}
+					if ($num > 2) {
+						$_REQUEST['Itemid'] = $_GET['Itemid'] = $Itemid = $parms[$i+1];
+						mamboCore::set('Itemid',$Itemid);
+						$QUERY_STRING .= "&Itemid=$Itemid";
+					}
+					if ($num > 4) {
+						$_REQUEST['limit'] = $_GET['limit'] = $limit = $parms[$i+2];
+						$_REQUEST['limitstart'] = $_GET['limitstart'] = $limitstart = $parms[$i+3];
+						$QUERY_STRING .= "&limit=$limit&limitstart=$limitstart";
+					}
+				}
+
+				if ($lang!="") {
+					$QUERY_STRING .= "&lang=$lang";
+				}
+			}
+
+			/*
+			Components
+			http://www.domain.com/component/$name,$value
+			*/
+			elseif ($url_array[1] == 'component') {
+				$QUERY_STRING .= $this->default_revert('component');
+				if ($QUERY_STRING) $foundit = true;
+			}
+			elseif ($url_array[1] == $this->prefix) {
+				$menuhandler =& mosMenuHandler::getInstance();
+				foreach ($this->custom_name as $i=>$compname) {
+					if ($url_array[2] == $compname) {
+						$origname = $this->custom_code[$i];
+						$_REQUEST['Itemid'] = $_GET['Itemid'] = $Itemid = $menuhandler->getIDLikeLink("index.php?option=$origname");
+						mamboCore::set('Itemid', $Itemid);
+						if ($this->custom_PHP[$i]) {
+							$fixup = '$QUERY_STRING .= "option='.$origname.'&Itemid=".$Itemid.sef_'.$this->custom_short[$i].'::revert($url_array,1);';
+							eval($fixup);
+						}
+						else $QUERY_STRING .= "option=$origname&Itemid=$Itemid".$this->default_revert($compname);
+						$_REQUEST['option'] = $this->custom_code[$i];
+						$foundit = true;
+						break;
+					}
+				}
+				if (!$foundit) {
+					$content_sef = mamboCore::get('mosConfig_absolute_path').'/components/com_content/sef_ext.php';
+					if (file_exists($content_sef)) {
+						require_once($content_sef);
+						$crevert = sef_content::revert($url_array,1);
+						if ($crevert) {
+							$foundit = true;
+							$QUERY_STRING .= $crevert;
+						}
+					}
+				}
+			}
+			if ($foundit) {
+				$_SERVER['QUERY_STRING'] = $QUERY_STRING;
+				$REQUEST_URI = '/index.php?'.$QUERY_STRING;
+				$_SERVER['REQUEST_URI'] = $REQUEST_URI;
+				return 0;
+			}
+			else return 1;
+		}
+		return 0;
+	}
+	
+	function default_revert ($specialname) {
+		$request = explode($specialname.'/', $_SERVER['REQUEST_URI']);
+		if (isset($request[1])) $parmset = explode("/", $request[1]);
+		else $parmset = array();
+		$QUERY_STRING = '';
+		$menuhandler =& mosMenuHandler::getInstance();
+		foreach($parmset as $values) {
+			$parts = explode(",", $values);
+			if (count($parts) > 1) {
+				$_REQUEST[$parts[0]] = $_GET[$parts[0]] = $parts[1];
+				if ($parts[0] == 'option') {
+					$_REQUEST['Itemid'] = $_GET['Itemid'] = $Itemid = $menuhandler->getIDLikeLink("index.php?option=$parts[1]");
+					mamboCore::set('Itemid', $Itemid);
+					$QUERY_STRING .= "$parts[0]=$parts[1]&Itemid=$Itemid";
+				}
+				$QUERY_STRING .= "&$parts[0]=$parts[1]";
+			}
+		}
+		return $QUERY_STRING;
+	}
+
+	function sefRelToAbs( $string ) {
+		global $iso_client_lang;
+
+		$server = mamboCore::get('mosConfig_live_site');
+		if ($string == 'index.php') return $server.'/';
+		if (strtolower(substr($string,0,9)) != 'index.php' OR eregi('^(([^:/?#]+):)',$string)) return $string;
+		if (mosGetParam($_GET, 'syndstyle', '') == 'yes') $string .= '&syndstyle=yes';
+		$passed_string = str_replace('&amp;', '&', $string);
+		if (!mamboCore::get('mosConfig_sef')) return $server.'/'.str_replace( '&', '&amp;', $passed_string );
+		$string = substr($passed_string,10);
+		if(mamboCore::get('mosConfig_mbf_content') AND strpos("lang=", strtolower($string)) === false) {
+			$string .= "&lang=$iso_client_lang";
+		}
+		$option = $task = '';
+		$oktasks = true;
+		$syndmark = '';
+		parse_str($string, $params);
+		foreach ($params as $key=>$value) {
+			$lowkey = strtolower($key);
+			$lowvalue = strtolower($value);
+			$unset = true;
+			switch ($lowkey) {
+				case 'option':
+				    $option = $lowvalue;
+				    break;
+				case 'task':
+				    $task = $value;
+					if ($lowvalue == 'new' OR $lowvalue == 'edit') $oktasks = false;
+					break;
+				case 'syndstyle':
+				    $syndmark = '/syndstyle';
+				    break;
+				default:
+					$check_params[$lowkey] = $key;
+					$unset = false;
+			}
+			if ($unset) unset($params[$key]);
+		}
+		// Process content items
+		if (($option == 'com_content' OR $option == 'content') AND $oktasks) {
+			/*
+			Content
+			index.php?option=com_content&task=$task&sectionid=$sectionid&id=$id&Itemid=$Itemid&limit=$limit&limitstart=$limitstart
+			*/
+			$task = $this->sef_content_task[$task];
+			$content_sef = mamboCore::get('mosConfig_absolute_path').'/components/com_content/sef_ext.php';
+			if (file_exists($content_sef)) {
+				require_once($content_sef);
+				return $server.'/'.$this->prefix.$syndmark.sef_content::create($task, $params);
+			}
+			$keys = array('sectionid', 'id', 'itemid', 'limit', 'limitstart', 'year', 'month', 'module', 'lang');
+			$string = '/content'.$syndmark.'/'.$task.'/';
+			foreach ($keys as $key) {
+				if (isset($check_params[$key])) {
+					$pkey = $check_params[$key];
+					$string .= $params[$pkey].'/';
+				}
+			}
+			return $server.$string;
+		}
+		// Other types of URL than content do not use Itemid in the SEO version
+		if (isset($check_params['itemid'])) {
+			$pkey = $check_params['itemid'];
+			unset($params[$pkey]);
+			unset($check_params['itemid']);
+		}
+		// Process customised components
+		$i = array_search($option,$this->custom_code);
+		if ($i !== false AND $i !== null) {
+			if ($this->custom_PHP[$i]) eval('$string = sef_'.$this->custom_short[$i].'::create($passed_string);');
+			else $string = $this->componentDetails($params,$task);
+			return $server.'/'.$this->prefix.$syndmark.'/'.$this->custom_name[$i].'/'.$string;
+		}
+		// Process ordinary components
+		if (strpos($option,'com_')===0 AND $option != 'com_registration' AND $oktasks) {
+			return "$server/component$syndmark/option,$option/".$this->componentDetails($params,$task);
+		}
+		// Anything else is returned as received, except it is guaranteed that & will be &amp;
+		return $server.'/'.str_replace( '&', '&amp;', $passed_string );
+	}
+
+	function componentDetails (&$params, $task) {
+		$string = ($task ? "task,$task/" : '');
+		foreach ($params as $key=>$param) $string .= "$key,$param/";
+		return $string;
+	}
+
+}
+?>
diff -ruN 4.5.4/includes/vcard.class.php 4.6rc2/includes/vcard.class.php
--- 4.5.4/includes/vcard.class.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/vcard.class.php	2006-01-24 03:23:40.000000000 -0600
@@ -1,4 +1,4 @@
-<?
+<?php
 /***************************************************************************
 
 PHP vCard class v2.0
@@ -177,4 +177,4 @@
 
 echo $output;
 */
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/includes/version.php 4.6rc2/includes/version.php
--- 4.5.4/includes/version.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/includes/version.php	2006-07-02 15:21:22.000000000 -0500
@@ -1,39 +1,36 @@
-<?php
-/**
-* @version $Id: version.php,v 1.8 2006/05/19 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** Version information */
-class version {
-	/** @var string Product */
-	var $PRODUCT = 'Mambo';
-	/** @var int Main Release Level */
-	var $RELEASE = '4.5';
-	/** @var string Development Status */
-	var $DEV_STATUS = 'Stable';
-	/** @var int Sub Release Level */
-	var $DEV_LEVEL = '4';
-	/** @var string Codename */
-	var $CODENAME = 'Sani';
-	/** @var string Date */
-	var $RELDATE = '26-May-2006';
-	/** @var string Time */
-	var $RELTIME = '10:00';
-	/** @var string Timezone */
-	var $RELTZ = 'GMT';
-	/** @var string Copyright Text */
-	var $COPYRIGHT = 'Copyright 2000 - 2006 Mambo Foundation.  All rights reserved.';
-	/** @var string URL */
-	var $URL = '<a href="http://mambo-foundation.org">Mambo</a> is Free Software released under the GNU/GPL License.';
-}
-$_VERSION =& new version();
-
-$version = $_VERSION->PRODUCT .' '. $_VERSION->RELEASE .'.'. $_VERSION->DEV_LEVEL .' '
-. $_VERSION->DEV_STATUS
-.' [ '.$_VERSION->CODENAME .' ] '. $_VERSION->RELDATE .' '
-. $_VERSION->RELTIME .' '. $_VERSION->RELTZ;
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** Version information */
+class version {
+	/** @var string Product */
+	var $PRODUCT = 'Mambo';
+	/** @var int Main Release Level */
+	var $RELEASE = '4.6';
+	/** @var string Development Status */
+	var $DEV_STATUS = 'Release Candidate 2';
+	/** @var int Sub Release Level */
+	var $DEV_LEVEL = '0';
+	/** @var string Codename */
+	var $CODENAME = 'Kare';
+	/** @var string Date */
+	var $RELDATE = '3-July-2006';
+	/** @var string Time */
+	var $RELTIME = '03:00';
+	/** @var string Timezone */
+	var $RELTZ = 'GMT';
+	/** @var string Copyright Text */
+	var $COPYRIGHT = 'Copyright 2000 - 2006 Mambo Foundation.  All rights reserved.';
+	/** @var string URL */
+	var $URL = '<a href="http://www.mambo-foundation.org">Mambo</a> is Free Software released under the GNU/GPL License.';
+}
+
+?>
diff -ruN 4.5.4/index.php 4.6rc2/index.php
--- 4.5.4/index.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/index.php	2006-06-07 03:15:51.000000000 -0500
@@ -1,235 +1,322 @@
-<?php
-/**
-* @version $Id: index.php,v 1.6 2005/11/21 11:57:20 csouza Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-// fix to address the globals overwrite problem in php versions < 4.4.1
-$protect_globals = array('_REQUEST', '_GET', '_POST', '_COOKIE', '_FILES', '_SERVER', '_ENV', 'GLOBALS', '_SESSION');
-foreach ($protect_globals as $global) {
-    if ( in_array($global , array_keys($_REQUEST)) ||
-         in_array($global , array_keys($_GET))     ||
-         in_array($global , array_keys($_POST))    ||
-         in_array($global , array_keys($_COOKIE))  ||
-         in_array($global , array_keys($_FILES))) {
-        die("Invalid Request.");
-    }
-}
-
-/** Set flag that this is a parent file  */
-define( '_VALID_MOS', 1 );
-session_start();
-// checks for configuration file, if none found loads installation page
-if ( !file_exists( 'configuration.php' ) || filesize( 'configuration.php' ) < 10 ) {
-	header( 'Location: installation/index.php' );
-	exit();
-}
-
-include_once( 'globals.php' );
-require_once( 'configuration.php' );
-
-// displays offline page
-if ( $mosConfig_offline == 1 ){
-	include( 'offline.php' );
-	exit();
-}
-
-require_once( 'includes/mambo.php' );
-if (file_exists( 'components/com_sef/sef.php' )) {
-	require_once( 'components/com_sef/sef.php' );
-} else {
-	require_once( 'includes/sef.php' );
-}
-require_once( 'includes/frontend.php' );
-
-/*
-Installation sub folder check, removed for work with CVS*/
-if (file_exists( 'installation/index.php' )) {
-	include ('offline.php');
-	exit();
-}
-/**/
-/** retrieve some expected url (or form) arguments */
-$option = trim( strtolower( mosGetParam( $_REQUEST, 'option' ) ) );
-$Itemid = intval( mosGetParam( $_REQUEST, 'Itemid', null ) );
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
-$acl = new gacl_api();
-
-if ($option == '') {
-	if ($Itemid) {
-		$query = "SELECT id, link"
-		. "\n FROM #__menu"
-		. "\n WHERE menutype='mainmenu'"
-		. "\n AND id = '$Itemid'"
-		. "\n AND published = '1'"
-		;
-		$database->setQuery( $query );
-	} else {
-		$query = "SELECT id, link"
-		. "\n FROM #__menu"
-		. "\n WHERE menutype='mainmenu' AND published='1'"
-		. "\n ORDER BY parent, ordering LIMIT 1"
-		;
-		$database->setQuery( $query );
-	}
-	$menu = new mosMenu( $database );
-	if ($database->loadObject( $menu )) {
-		$Itemid = $menu->id;
-	}
-	$link = $menu->link;
-	if (($pos = strpos( $link, '?' )) !== false) {
-		$link = substr( $link, $pos+1 ). '&Itemid='.$Itemid;
-	}
-	parse_str( $link, $temp );
-	/** this is a patch, need to rework when globals are handled better */
-	foreach ($temp as $k=>$v) {
-		$GLOBALS[$k] = $v;
-		$_REQUEST[$k] = $v;
-		if ($k == 'option') {
-			$option = $v;
-		}
-	}
-}
-
-/** mainframe is an API workhorse, lots of 'core' interaction routines */
-$mainframe = new mosMainFrame( $database, $option, '.' );
-$mainframe->initSession();
-
-// checking if we can find the Itemid thru the content
-if ( $option == 'com_content' && $Itemid === 0 ) {
-	$id = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
-	$Itemid = $mainframe->getItemid( $id );
-}
-
-/** do we have a valid Itemid yet?? */
-if ( $Itemid === null ) {
-	/** Nope, just use the homepage then. */
-	$query = "SELECT id"
-	. "\n FROM #__menu"
-	. "\n WHERE menutype='mainmenu'"
-	. "\n AND published='1'"
-	. "\n ORDER BY parent, ordering"
-	. "\n LIMIT 1"
-	;
-	$database->setQuery( $query );
-	$Itemid = $database->loadResult();
-}
-
-/** patch to lessen the impact on templates */
-if ($option == 'search') {
-	$option = 'com_search';
-}
-
-// loads english language file by default
-if ( $mosConfig_lang == '' ) {
-	$mosConfig_lang = 'english';
-}
-include_once ( 'language/'.$mosConfig_lang.'.php' );
-
-// frontend login & logout controls
-$return = mosGetParam( $_REQUEST, 'return', NULL );
-if ($option == "login") {
-	$mainframe->login();
-
-	// JS Popup message
-	if ( mosGetParam( $_POST, 'message', 0 ) ) {
-		?>
-		<script> 
-		<!--//
-		alert( "<?php echo _LOGIN_SUCCESS; ?>" ); 
-		//-->
-		</script>
-		<?php
-	}
-
-	if ($return) {
-		mosRedirect( $return );
-	} else {
-		mosRedirect( 'index.php' );
-	}
-
-} else if ($option == "logout") {
-	$mainframe->logout();
-
-	// JS Popup message
-	if ( mosGetParam( $_POST, 'message', 0 ) ) {
-		?>
-		<script> 
-		<!--//
-		alert( "<?php echo _LOGOUT_SUCCESS; ?>" ); 
-		//-->
-		</script>
-		<?php
-	}
-
-	if ($return) {
-		mosRedirect( $return );
-	} else {
-		mosRedirect( 'index.php' );
-	}
-}
-
-/** get the information about the current user from the sessions table */
-$my = $mainframe->getUser();
-
-/** detect first visit */
-$mainframe->detect();
-
-$gid = intval( $my->gid );
-
-// gets template for page
-$cur_template = $mainframe->getTemplate();
-/** temp fix - this feature is currently disabled */
-
-/** @global A places to store information from processing of the component */
-$_MOS_OPTION = array();
-
-// precapture the output of the component
-require_once( $mosConfig_absolute_path . '/editor/editor.php' );
-
-ob_start();
-if ($path = $mainframe->getPath( 'front' )) {
-	$task = mosGetParam( $_REQUEST, 'task', '' );
-	$ret = mosMenuCheck( $Itemid, $option, $task, $gid );
-	if ($ret) {
-		require_once( $path );
-	} else {
-		mosNotAuth();
-	}
-} else {
-	echo _NOT_EXIST;
-}
-$_MOS_OPTION['buffer'] = ob_get_contents();
-ob_end_clean();
-
-initGzip();
-
-header( 'Expires: Mon, 26 Jul 1997 05:00:00 GMT' );
-header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-header( 'Cache-Control: no-store, no-cache, must-revalidate' );
-header( 'Cache-Control: post-check=0, pre-check=0', false );
-header( 'Pragma: no-cache' );
-
-// loads template file
-if ( !file_exists( 'templates/'. $cur_template .'/index.php' ) ) {
-	echo _TEMPLATE_WARN . $cur_template;
-} else {
-	require_once( 'templates/'. $cur_template .'/index.php' );
-	echo "<!-- ".time()." -->";
-}
-
-// displays queries performed for page
-if ($mosConfig_debug) {
-	echo $database->_ticker . ' queries executed';
-	echo '<pre>';
- 	foreach ($database->_log as $k=>$sql) {
- 	    echo $k+1 . "\n" . $sql . '<hr />';
-	}
-}
-
-doGzip();
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** Set flag that this is a parent file */
+if (!defined('_VALID_MOS')) define( '_VALID_MOS', 1 );
+
+$protects = array('_REQUEST', '_GET', '_POST', '_COOKIE', '_FILES', '_SERVER', '_ENV', 'GLOBALS', '_SESSION');
+
+foreach ($protects as $protect) {
+    if ( in_array($protect , array_keys($_REQUEST)) ||
+    in_array($protect , array_keys($_GET)) ||
+    in_array($protect , array_keys($_POST)) ||
+    in_array($protect , array_keys($_COOKIE)) ||
+    in_array($protect , array_keys($_FILES))) {
+        die("Invalid Request.");
+    }
+}
+
+/**
+* Utility function to return a value from a named array or a specified default
+*/
+define( "_MOS_NOTRIM", 0x0001 );
+define( "_MOS_ALLOWHTML", 0x0002 );
+define( "_MOS_ALLOWRAW", 0x0004 );
+define( "_MOS_NOMAGIC", 0x0008 );
+function mosGetParam( &$arr, $name, $def=null, $mask=0 ) {
+    if (isset( $arr[$name] )) {
+        if (is_array($arr[$name])) foreach ($arr[$name] as $key=>$element) $result[$key] = mosGetParam ($arr[$name], $key, $def, $mask);
+        else {
+            $result = $arr[$name];
+            if (!($mask&_MOS_NOTRIM)) $result = trim($result);
+            if (!is_numeric( $result)) {
+                if (!($mask&_MOS_ALLOWHTML)) $result = strip_tags($result);
+                if (!($mask&_MOS_ALLOWRAW)) {
+                    if (is_numeric($def)) $result = intval($result);
+                }
+            }
+        }
+        return $result;
+    } else {
+        return $def;
+    }
+}
+
+function sefRelToAbs ($string) {
+    $sef =& mosSEF::getInstance();
+    return $sef->sefRelToAbs($string);
+}
+
+if (!isset($adminside)) {
+    $adminside = 0;
+}
+if (!isset($indextype)) {
+    $indextype = 1;
+}
+
+require_once (dirname(__FILE__).'/includes/database.php');
+require_once(dirname(__FILE__).'/includes/core.classes.php');
+$configuration =& mamboCore::getMamboCore();
+$configuration->handleGlobals();
+
+//new mosErrorHandler();
+
+
+
+require($configuration->rootPath().'/includes/version.php');
+$_VERSION =& new version();
+
+
+
+$version = $_VERSION->PRODUCT .' '. $_VERSION->RELEASE .'.'. $_VERSION->DEV_LEVEL .' '
+. $_VERSION->DEV_STATUS
+.' [ '.$_VERSION->CODENAME .' ] '. $_VERSION->RELDATE .' '
+. $_VERSION->RELTIME .' '. $_VERSION->RELTZ;
+
+if (phpversion() < '4.2.0') require_once( $configuration->rootPath() . '/includes/compat.php41x.php' );
+if (phpversion() < '4.3.0') require_once( $configuration->rootPath() . '/includes/compat.php42x.php' );
+
+$local_backup_path = $configuration->rootPath().'/administrator/backups';
+$media_path = $configuration->rootPath().'/media/';
+$image_path = $configuration->rootPath().'/images/stories';
+$lang_path = $configuration->rootPath().'/language';
+$image_size = 100;
+
+$database =& mamboDatabase::getInstance();
+$database->debug(mamboCore::get('mosConfig_debug'));
+
+
+if (!$adminside) {
+    $sefcode = $configuration->rootPath().'/components/com_sef/sef.php';
+    if (file_exists($sefcode)) require_once($sefcode);
+    else require_once($configuration->rootPath().'/includes/sef.php');
+    $urlerror = 0;
+    if (mamboCore::get('mosConfig_sef') AND $indextype == 3) {
+        $sef =& mosSEF::getInstance();
+        $urlerror = $sef->sefRetrieval(mamboCore::get('mosConfig_register_globals'));
+        $indextype = 1;
+    }
+}
+
+/** retrieve some possible request string (or form) arguments */
+$type = mosGetParam($_REQUEST, 'type', 1);
+$act = mosGetParam( $_REQUEST, 'act', '' );
+$do_pdf = mosGetParam( $_REQUEST, 'do_pdf', 0 );
+$id = mosGetParam( $_REQUEST, 'id', 0 );
+$task = mosGetParam($_REQUEST, 'task', '');
+$act = strtolower(mosGetParam($_REQUEST, 'act', ''));
+$section = mosGetParam($_REQUEST, 'section', '');
+$no_html = strtolower(mosGetParam($_REQUEST, 'no_html', ''));
+$cid = (array) mosGetParam( $_POST, 'cid', array() );
+
+ini_set('session.use_trans_sid', 0);
+ini_set('session.use_cookies', 1);
+ini_set('session.use_only_cookies', 1);
+
+
+/* initialize i18n */
+$lang       = $configuration->current_language->name;
+$charset    = $configuration->current_language->charset;
+$gettext =& phpgettext();
+$gettext->debug       = $configuration->mosConfig_locale_debug;
+$gettext->has_gettext = $configuration->mosConfig_locale_use_gettext;
+$gettext->setlocale($lang);
+$gettext->bindtextdomain($lang, $configuration->rootPath().'/language');
+$gettext->textdomain($lang);
+#$gettext =& phpgettext(); dump($gettext);
+
+if ($adminside) {
+    // Start ACL
+    require_once($configuration->rootPath().'/includes/gacl.class.php' );
+    require_once($configuration->rootPath().'/includes/gacl_api.class.php' );
+    $acl = new gacl_api();
+    // Handle special admin side options
+    $option = strtolower(mosGetParam($_REQUEST,'option','com_admin'));
+
+    $domain = substr($option, 4);
+    session_name(md5(mamboCore::get('mosConfig_live_site')));
+    session_start();
+    // restore some session variables
+    $my = new mosUser();
+    $my->getSession();
+    if (mosSession::validate($my)) {
+        mosSession::purge();
+    } else {
+        mosSession::purge();
+        $my = null;
+    }
+    if (!$my AND $option == 'login') {
+        require_once($configuration->rootPath().'/includes/authenticator.php');
+        $authenticator =& mamboAuthenticator::getInstance();
+        $my = $authenticator->loginAdmin($acl);
+    }
+    // Handle the remaining special options
+    elseif ($option == 'logout') {
+        require($configuration->rootPath().'/administrator/logout.php');
+        exit();
+    }
+    // We can now create the mainframe object
+    $mainframe =& new mosMainFrame($database, $option, '..', true);
+    // Provided $my is set, we have a valid admin side session and can include remaining code
+    if ($my) {
+        mamboCore::set('currentUser', $my);
+        if ($option == 'simple_mode') $admin_mode = 'on';
+        elseif ($option == 'advanced_mode') $admin_mode = 'off';
+        else $admin_mode = mosGetParam($_SESSION, 'simple_editing', '');
+        $_SESSION['simple_editing'] = mosGetParam($_POST, 'simple_editing', $admin_mode);
+        require_once($configuration->rootPath().'/administrator/includes/admin.php');
+        require_once( $configuration->rootPath().'/includes/mambo.php' );
+        require_once ($configuration->rootPath().'/includes/mambofunc.php');
+        require_once ($configuration->rootPath().'/includes/mamboHTML.php');
+        require_once( $configuration->rootPath().'/administrator/includes/mosAdminMenus.php');
+        require_once($configuration->rootPath().'/administrator/includes/admin.php');
+        require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
+        require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
+        $_MAMBOTS =& mosMambotHandler::getInstance();
+
+
+        // If no_html is set, we avoid starting the template, and go straight to the component
+        if ($no_html) {
+            if ($path = $mainframe->getPath( "admin" )) require $path;
+            exit();
+        }
+        $configuration->initGzip();
+        // When adminside = 3 we assume that HTML is being explicitly written and do nothing more
+        if ($adminside != 3) {
+            $path = $configuration->rootPath().'/administrator/templates/'.$mainframe->getTemplate().'/index.php';
+            require_once($path);
+            $configuration->doGzip();
+        }
+        else {
+            if (!isset($popup)) {
+                $pop = mosGetParam($_REQUEST, 'pop', '');
+                if ($pop) require($configuration->rootPath()."/administrator/popups/$pop");
+                else require($configuration->rootPath()."/administrator/popups/index3pop.php");
+                $configuration->doGzip();
+            }
+        }
+    }
+    // If $my was not set, the only possibility is to offer a login screen
+    else {
+        $configuration->initGzip();
+        $path = $configuration->rootPath().'/administrator/templates/'.$mainframe->getTemplate().'/login.php';
+        require_once( $path );
+        $configuration->doGzip();
+    }
+}
+// Finished admin side; the rest is user side code:
+else {
+    $option = $configuration->determineOptionAndItemid();
+    $configuration->handleGlobals();
+    $Itemid = $configuration->get('Itemid');
+
+    $mainframe =& new mosMainFrame($database, $option, '.');
+    if ($option == 'login') $configuration->handleLogin();
+    elseif ($option == 'logout') $configuration->handleLogout();
+
+    $session =& mosSession::getCurrent();
+    $my =& new mosUser();
+    $my->getSessionData();
+    mamboCore::set('currentUser',$my);
+    $configuration->offlineCheck($my, $database);
+    $gid = intval( $my->gid );
+    // gets template for page
+    $cur_template = $mainframe->getTemplate();
+
+    require_once( $configuration->rootPath().'/includes/frontend.php' );
+    require_once( $configuration->rootPath().'/includes/mambo.php' );
+    require_once ($configuration->rootPath().'/includes/mambofunc.php');
+    require_once ($configuration->rootPath().'/includes/mamboHTML.php');
+
+    if ($indextype == 2 AND $do_pdf == 1 ) {
+        include_once('includes/pdf.php');
+        exit();
+    }
+
+    /** detect first visit */
+    $mainframe->detect();
+
+    /** @global mosPlugin $_MAMBOTS */
+    $_MAMBOTS =& mosMambotHandler::getInstance();
+    require_once( $configuration->rootPath().'/editor/editor.php' );
+    require_once( $configuration->rootPath() . '/includes/gacl.class.php' );
+    require_once( $configuration->rootPath() . '/includes/gacl_api.class.php' );
+    require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
+    $acl = new gacl_api();
+
+    /** Get the component handler */
+    require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
+    $c_handler =& mosComponentHandler::getInstance();
+    $c_handler->startBuffer();
+
+    if (!$urlerror AND $path = $mainframe->getPath( 'front' )) {
+        $menuhandler =& mosMenuHandler::getInstance();
+        $ret = $menuhandler->menuCheck($Itemid, $option, $task, $gid);
+        $menuhandler->setPathway($Itemid);
+        if ($ret) {
+            require ($path);
+        }
+        else mosNotAuth();
+    }
+    else {
+        header ('HTTP/1.1 404 Not Found');
+        $mainframe->setPageTitle(T_('404 Error - page not found'));
+        include ($configuration->rootPath().'/page404.php');
+    }
+
+    $c_handler->endBuffer();
+
+    $configuration->initGzip();
+
+    $configuration->standardHeaders();
+    if (mosGetParam($_GET, 'syndstyle', '') == 'yes') mosMainBody();
+    elseif ($indextype == 1) {
+        // loads template file
+        if ( !file_exists( 'templates/'. $cur_template .'/index.php' ) ) {
+            echo '<font color=\"red\"><b>'.T_('Template File Not Found! Looking for template').'</b></font>'.$cur_template;
+        } else {
+            require_once( 'templates/'. $cur_template .'/index.php' );
+            $mambothandler =& mosMambotHandler::getInstance();
+            $mambothandler->loadBotGroup('system');
+            $mambothandler->trigger('afterTemplate', array($configuration));
+            echo "<!-- ".time()." -->";
+        }
+    }
+    elseif ($indextype == 2) {
+        if ( $no_html == 0 ) {
+            // needed to seperate the ISO number from the language file constant _ISO
+            $iso = split( '=', _ISO );
+            // xml prolog
+            echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+			?>
+			<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+			<html xmlns="http://www.w3.org/1999/xhtml">
+			<head>
+			<link rel="stylesheet" href="templates/<?php echo $cur_template;?>/css/template_css.css" type="text/css" />
+			<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+			<meta name="robots" content="noindex, nofollow">
+			</head>
+			<body class="contentpane">
+			<?php mosMainBody(); ?>
+			</body>
+			</html>
+			<?php
+        } else {
+            mosMainBody();
+        }
+    }
+
+    $configuration->doGzip();
+}
+// displays queries performed for page
+if ($configuration->get('mosConfig_debug') AND $adminside != 3) $database->displayLogged();
+
+?>
diff -ruN 4.5.4/index2.php 4.6rc2/index2.php
--- 4.5.4/index2.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/index2.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,132 +1,15 @@
-<?php
-/**
-* @version $Id: index2.php,v 1.3 2005/11/21 11:57:20 csouza Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-// fix to address the globals overwrite problem in php versions < 4.4.1
-$protect_globals = array('_REQUEST', '_GET', '_POST', '_COOKIE', '_FILES', '_SERVER', '_ENV', 'GLOBALS', '_SESSION');
-foreach ($protect_globals as $global) {
-    if ( in_array($global , array_keys($_REQUEST)) ||
-         in_array($global , array_keys($_GET))     ||
-         in_array($global , array_keys($_POST))    ||
-         in_array($global , array_keys($_COOKIE))  ||
-         in_array($global , array_keys($_FILES))) {
-        die("Invalid Request.");
-    }
-}
-
-/** Set flag that this is a parent file */
-define( "_VALID_MOS", 1 );
-session_start();
-
-include_once ('globals.php');
-require_once ('configuration.php');
-require_once ('includes/mambo.php');
-if (file_exists( 'components/com_sef/sef.php' )) {
-	require_once( 'components/com_sef/sef.php' );
-} else {
-	require_once( 'includes/sef.php' );
-}
-require_once ('includes/frontend.php');
-$database = new database( $mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db, $mosConfig_dbprefix );
-$database->debug( $mosConfig_debug );
-
-// retrieve some expected url (or form) arguments
-$option 	= trim( strtolower( mosGetParam( $_REQUEST, 'option' ) ) );
-$no_html 	= intval( mosGetParam( $_REQUEST, 'no_html', 0 ) );
-$Itemid 	= strtolower( trim( mosGetParam( $_REQUEST, 'Itemid',0 ) ) );
-$act 		= mosGetParam( $_REQUEST, 'act', '' );
-$do_pdf 	= intval( mosGetParam( $_REQUEST, 'do_pdf', 0 ) );
-
-// mainframe is an API workhorse, lots of 'core' interaction routines
-$mainframe = new mosMainFrame( $database, $option, '.' );
-
-$mainframe->initSession();
-if ($mosConfig_lang=='') {
-	$mosConfig_lang='english';
-}
-include_once ('language/'.$mosConfig_lang.'.php');
-
-if ($mosConfig_offline == 1){
-	include( 'offline.php' );
-	exit();
-}
-
-if ($option == 'login') {
-	$mainframe->login();
-	mosRedirect('index.php');
-} else if ($option == 'logout') {
-	$mainframe->logout();
-	mosRedirect( 'index.php' );
-}
-
-if ( $do_pdf == 1 ){
-	include ('includes/pdf.php');
-	exit();
-}
-
-$acl = new gacl_api();
-
-// get the information about the current user from the sessions table
-$my = $mainframe->getUser();
-
-$mainframe->detect();
-
-$gid = intval( $my->gid );
-
-$cur_template = $mainframe->getTemplate();
-
-// precapture the output of the component
-require_once( $mosConfig_absolute_path . '/editor/editor.php' );
-
-ob_start();
-if ($path = $mainframe->getPath( 'front' )) {
-	$task = mosGetParam( $_REQUEST, 'task', '' );
-	$ret = mosMenuCheck( $Itemid, $option, $task, $gid );
-	if ($ret) {
-		require_once( $path );
-	} else {
-		mosNotAuth();
-	}
-} else {
-	echo _NOT_EXIST;
-}
-$_MOS_OPTION['buffer'] = ob_get_contents();
-ob_end_clean();
-
-initGzip();
-
-header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-header( "Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT" );
-header( "Cache-Control: no-store, no-cache, must-revalidate" );
-header( "Cache-Control: post-check=0, pre-check=0", false );
-header( "Pragma: no-cache" );
-// start basic HTML
-if ( $no_html == 0 ) {
-	// needed to seperate the ISO number from the language file constant _ISO
-	$iso = split( '=', _ISO );
-	// xml prolog
-	echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
-	?>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-	<link rel="stylesheet" href="templates/<?php echo $cur_template;?>/css/template_css.css" type="text/css" />
-	<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
-	<meta name="robots" content="noindex, nofollow">
-	</head>
-	<body class="contentpane">
-	<?php mosMainBody(); ?>
-	</body>
-	</html>
-	<?php
-} else {
-	mosMainBody();
-}
-doGzip();
-
-?>
\ No newline at end of file
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+$indextype = 2;
+include ('index.php');
+
+?>
diff -ruN 4.5.4/index3.php 4.6rc2/index3.php
--- 4.5.4/index3.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/index3.php	2006-02-16 15:43:38.000000000 -0600
@@ -0,0 +1,15 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+$indextype = 3;
+include ('index.php');
+
+?>
diff -ruN 4.5.4/language/en.xml 4.6rc2/language/en.xml
--- 4.5.4/language/en.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/en.xml	2006-06-07 03:15:51.000000000 -0500
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mosinstall version="4.6" type="language">
+	<name>English</name>
+	<version>4.6</version>
+	<description>English Locale</description>
+	<creationdate>06-06-2006</creationdate>
+	<author>Mambo Foundation Inc.</author>
+	<authorurl>http://www.mambo-foundation.org</authorurl>
+	<authoremail>translation@mambo-foundation.org</authoremail>
+	<copyright>(C) 2005 - 2006 Mambo Foundation Inc.</copyright>
+	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
+	<params>
+		<param name="locale" type="text" default="en.utf-8,en,en,english" label="Locale String" description="Locale string for setlocale() (eg. en, english)"></param>
+		<param name="charset" type="text" default="utf-8" label="Character Set" description="Character set for this language."></param>
+		<param name="text_direction" type="text" default="ltr" label="Text Direction" description="left-to-right or light-to-left"></param>
+		<param name="date_format" type="text" default="%B %d, %Y at %I:%M %p" label="Date Format" description="Date format for strftime() (eg. %A, %d %B %Y)"></param>
+		<param name="plural_form" type="text" default="nplurals=2; plural=n != 1;" label="Plural Forms" description="Plural Forms expression"></param>
+	</params>
+	<locale name="en" title="English" territory="" locale="en.utf-8,en,en,english" text_direction="ltr" iso639="en" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<days sun="Sun" mon="Mon" tue="Tue" wed="Wed" thu="Thu" fri="Fri" sat="Sat"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="May" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Oct" nov="Nov" dec="Dec"></months>
+	</locale>
+	<files>
+	</files>
+</mosinstall>
diff -ruN 4.5.4/language/english.ignore.php 4.6rc2/language/english.ignore.php
--- 4.5.4/language/english.ignore.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/language/english.ignore.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: english.ignore.php,v 1.1 2005/07/22 01:57:48 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/language/english.php 4.6rc2/language/english.php
--- 4.5.4/language/english.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/language/english.php	2006-05-14 15:48:05.000000000 -0500
@@ -1,15 +1,30 @@
 <?php
 /**
-* @version $Id: english.php,v 1.2 2005/11/24 04:44:09 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
+
+
+if (!defined('_ISO')) DEFINE('_ISO','charset=utf-8');
+if (!defined('_DATE_FORMAT')) DEFINE('_DATE_FORMAT','l, F d Y');  //Uses PHP's DATE Command Format - Depreciated
+/**
+* Modify this line to reflect how you want the date to appear in your site
+*
+*e.g. DEFINE("_DATE_FORMAT_LC","%A, %d %B %Y %H:%M"); //Uses PHP's strftime Command Format
+*/
+if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC',"%A, %d %B %Y"); //Uses PHP's strftime Command Format
+if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2',"%A, %d %B %Y %H:%M");
+
+
 /** common */
 DEFINE('_LANGUAGE','en');
 DEFINE('_NOT_AUTH','You are not authorized to view this resource.');
@@ -73,6 +88,7 @@
 DEFINE('_LOGIN_BLOCKED','Your login has been blocked. Please contact the administrator.');
 DEFINE('_LOGIN_INCORRECT','Incorrect username or password. Please try again.');
 DEFINE('_LOGIN_NOADMINS','You cannot login. There are no administrators set up.');
+DEFINE('_LOGIN_NOAUTHENTICS','Logins are not permitted.  There is no authentication check active.');
 DEFINE('_CMN_JAVASCRIPT','!Warning! Javascript must be enabled for proper operation.');
 
 DEFINE('_NEW_MESSAGE','A new private message has arrived');
@@ -382,15 +398,6 @@
 DEFINE('_SEARCH_CATEGORY','Section/Category');
 
 /** templates/*.php */
-DEFINE('_ISO','charset=iso-8859-1');
-DEFINE('_DATE_FORMAT','l, F d Y');  //Uses PHP's DATE Command Format - Depreciated
-/**
-* Modify this line to reflect how you want the date to appear in your site
-*
-*e.g. DEFINE("_DATE_FORMAT_LC","%A, %d %B %Y %H:%M"); //Uses PHP's strftime Command Format
-*/
-DEFINE('_DATE_FORMAT_LC',"%A, %d %B %Y"); //Uses PHP's strftime Command Format
-DEFINE('_DATE_FORMAT_LC2',"%A, %d %B %Y %H:%M");
 DEFINE('_SEARCH_BOX','search...');
 DEFINE('_NEWSFLASH_BOX','Newsflash!');
 DEFINE('_MAINMENU_BOX','Main Menu');
@@ -486,7 +493,7 @@
 DEFINE('_MEMBERS_STAT','Members');
 DEFINE('_HITS_STAT','Hits');
 DEFINE('_NEWS_STAT','News');
-DEFINE('_LINKS_STAT','WebLinks');
+DEFINE('_LINKS_STAT','Web Links');
 DEFINE('_VISITORS','Visitors');
 
 /** /adminstrator/components/com_menus/admin.menus.html.php */
@@ -516,4 +523,4 @@
 Message:
 " );
 
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/language/english.xml 4.6rc2/language/english.xml
--- 4.5.4/language/english.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/language/english.xml	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<mosinstall version="4.5.2" type="language">
-	<name>English</name>
-	<version>4.5.2</version>
-	<creationDate>2004-09-20</creationDate>
-	<author>Mambo Project</author>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<files>
-		<filename>english.php</filename>
-	</files>
-</mosinstall>
diff -ruN 4.5.4/language/glossary/it_IT.utf-8.po 4.6rc2/language/glossary/it_IT.utf-8.po
--- 4.5.4/language/glossary/it_IT.utf-8.po	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/glossary/it_IT.utf-8.po	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,6956 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Mambo 4.6\n"
+"Report-Msgid-Bugs-To: translation@mambo-foundation.org\n"
+"POT-Creation-Date: 2006-06-06 01:51+0100\n"
+"PO-Revision-Date: 2006-06-06 2:04+0100\n"
+"Last-Translator: Translation Team <translation@mambo-foundation.org>\n"
+"Language-Team: Translation Team <translation@mambo-foundation.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: administrator/components/com_admin/admin.admin.html.php:27
+msgid "Home"
+msgstr "Home"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Advanced Mode"
+msgstr "Modo  avanzato"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Simple Mode"
+msgstr "Modo base"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "selected"
+msgstr "selezionato"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "unselected"
+msgstr "deselezionato"
+
+#: administrator/components/com_admin/admin.admin.html.php:80
+msgid "Information"
+msgstr "Informazione"
+
+#: administrator/components/com_admin/admin.admin.html.php:86
+#: administrator/components/com_admin/admin.admin.html.php:482
+msgid "System Info"
+msgstr "Info Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:91
+msgid "System Information"
+msgstr "Informazioni Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:97
+msgid "PHP built On:"
+msgstr "PHP installato:"
+
+#: administrator/components/com_admin/admin.admin.html.php:107
+msgid "Database Version:"
+msgstr "Versione Database:"
+
+#: administrator/components/com_admin/admin.admin.html.php:117
+msgid "PHP Version:"
+msgstr "Versione PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:127
+msgid "Web Server:"
+msgstr "Web Server:"
+
+#: administrator/components/com_admin/admin.admin.html.php:137
+msgid "WebServer to PHP interface:"
+msgstr "Interfaccia web server a PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:147
+msgid "Mambo Version:"
+msgstr "Versione Mambo:"
+
+#: administrator/components/com_admin/admin.admin.html.php:157
+msgid "User Agent:"
+msgstr "Agente Utente:"
+
+#: administrator/components/com_admin/admin.admin.html.php:167
+msgid "Relevant PHP Settings:"
+msgstr "Configurazione PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:174
+msgid "Safe Mode:"
+msgstr "Safe Mode:"
+
+#: administrator/components/com_admin/admin.admin.html.php:182
+msgid "Open basedir:"
+msgstr "Directory di base:"
+
+#: administrator/components/com_admin/admin.admin.html.php:190
+msgid "Display Errors:"
+msgstr "Mostra errori"
+
+#: administrator/components/com_admin/admin.admin.html.php:198
+msgid "Short Open Tags:"
+msgstr "Short Open Tags:"
+
+#: administrator/components/com_admin/admin.admin.html.php:206
+msgid "File Uploads:"
+msgstr "Carica files:"
+
+#: administrator/components/com_admin/admin.admin.html.php:214
+msgid "Magic Quotes"
+msgstr "Magic Quotes"
+
+#: administrator/components/com_admin/admin.admin.html.php:222
+msgid "Register Globals:"
+msgstr "Register Globals:"
+
+#: administrator/components/com_admin/admin.admin.html.php:230
+msgid "Output Buffering:"
+msgstr "Output Buffering:"
+
+#: administrator/components/com_admin/admin.admin.html.php:238
+msgid "Session save path:"
+msgstr "Session save path:"
+
+#: administrator/components/com_admin/admin.admin.html.php:246
+msgid "Session auto start:"
+msgstr "Session auto start:"
+
+#: administrator/components/com_admin/admin.admin.html.php:254
+msgid "XML enabled:"
+msgstr "XML abilitato"
+
+#: administrator/components/com_admin/admin.admin.html.php:262
+msgid "Zlib enabled:"
+msgstr "Zlib abilitate:"
+
+#: administrator/components/com_admin/admin.admin.html.php:270
+msgid "Disabled Functions:"
+msgstr "Funzioni disabilitate"
+
+#: administrator/components/com_admin/admin.admin.html.php:285
+msgid "WYSIWYG Editor:"
+msgstr "Editore WYSIWYG :"
+
+#: administrator/components/com_admin/admin.admin.html.php:297
+msgid "Configuration File:"
+msgstr "File di configurazione"
+
+#: administrator/components/com_admin/admin.admin.html.php:323
+msgid "PHP Info"
+msgstr "Info PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:328
+msgid "PHP Information"
+msgstr "Informazioni sul  PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:350
+msgid "Permissions"
+msgstr "Permessi"
+
+#: administrator/components/com_admin/admin.admin.html.php:354
+msgid "Directory Permissions"
+msgstr "Permessi cartelle"
+
+#: administrator/components/com_admin/admin.admin.html.php:358
+msgid ""
+"For all Mambo functions and features to work ALL of the following "
+"directories should be writeable:"
+msgstr ""
+"Perché tutte le funzioni di Mambo siano attive e funzionanti, TUTTE le "
+"seguenti  cartelle dovranno essere scrivibili:"
+
+#: administrator/components/com_admin/admin.admin.html.php:434
+msgid "Help"
+msgstr "Aiuto"
+
+#: administrator/components/com_admin/admin.admin.html.php:442
+msgid "Search:"
+msgstr "Cerca"
+
+#: administrator/components/com_admin/admin.admin.html.php:445
+msgid "Go"
+msgstr "Vai"
+
+#: administrator/components/com_admin/admin.admin.html.php:446
+msgid "Clear Results"
+msgstr "Cancella risultati"
+
+#: administrator/components/com_admin/admin.admin.html.php:453
+#: administrator/components/com_admin/admin.admin.html.php:464
+msgid "Glossary"
+msgstr "Glossario"
+
+#: administrator/components/com_admin/admin.admin.html.php:456
+#: administrator/components/com_admin/admin.admin.html.php:467
+msgid "Credits"
+msgstr "Crediti"
+
+#: administrator/components/com_admin/admin.admin.html.php:459
+#: administrator/components/com_admin/admin.admin.html.php:470
+msgid "Support"
+msgstr "Supporto"
+
+#: administrator/components/com_admin/admin.admin.html.php:476
+msgid "License"
+msgstr "Licenza"
+
+#: administrator/components/com_admin/admin.admin.html.php:491
+msgid "Search Results"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:493
+msgid "Index"
+msgstr "Indice"
+
+#: administrator/components/com_admin/admin.admin.html.php:536
+msgid "Site Preview"
+msgstr "Anteprima sito"
+
+#: administrator/components/com_admin/admin.admin.html.php:540
+msgid "Open in new window"
+msgstr "Apri in una nuova finestra"
+
+#: administrator/components/com_admin/admin.admin.php:22
+msgid "There is no link associated with this item"
+msgstr "Non ci sono links associati a questo elemento"
+
+#: administrator/components/com_checkin/admin.checkin.php:17
+msgid "You are not authorized to view this resource."
+msgstr "Non si dispone dell'autorizzazione per  vedere questa risorsa"
+
+#: administrator/components/com_checkin/admin.checkin.php:22
+msgid "Global Check-in"
+msgstr "Controllo globale"
+
+#: administrator/components/com_checkin/admin.checkin.php:27
+msgid "Database Table"
+msgstr "Tabelle database"
+
+#: administrator/components/com_checkin/admin.checkin.php:28
+msgid "# of Items"
+msgstr "# di elementi"
+
+#: administrator/components/com_checkin/admin.checkin.php:29
+msgid "Checked-In"
+msgstr "Sbloccati"
+
+#: administrator/components/com_checkin/admin.checkin.php:76
+#: administrator/components/com_checkin/admin.checkin.php:83
+msgid "Checking table"
+msgstr "Controllo tabella"
+
+#: administrator/components/com_checkin/admin.checkin.php:77
+#: administrator/components/com_checkin/admin.checkin.php:84
+msgid "Checked in <strong>%d</strong> item"
+msgid_plural "Checked in <strong>%d</strong> items"
+msgstr[0] "Sbloccato <strong>%d</strong> elemento"
+msgstr[1] "Sbloccati <strong>%d</strong> elementi"
+
+#: administrator/components/com_checkin/admin.checkin.php:95
+msgid "Checked out items have now been all checked in"
+msgstr "Tutti gli elementi bloccati sono stati ripristinati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:42
+msgid "XML ERROR in %s: %s at line %d"
+msgstr "ERRORE XML  in %s: %s alla linea %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:48
+msgid "Unable to open XML file %s"
+msgstr "Impossibile aprire il file  XML %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:51
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr "Errore XML in %s - tag non chiusi  (%s) alla fine del file"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:78
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr "Errore XML in %s: %s non è un  elemento contenitore valido"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:79
+msgid "XML error in %s: %s not permitted within %s"
+msgstr "Errore XML in %s: %s non è permesso con %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:88
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr "Errore XML in %s atteso MOSINSTALL ma  trovato %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:94
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr ""
+"Errore XML in %s l’ultimo tag aperto era %s, ma è stata trovata la fine di %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:106
+msgid "XML handler error - no method provided to deal with character data"
+msgstr "Errore gestore XML - nessun metodo ha fornito i dati carattere"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:111
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr "Errore XML in %s mosinstall non ha attributi di tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:280
+msgid "Handler not defined for type"
+msgstr "Gestore non definito per il tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:293
+msgid "There are no Parameters for this item"
+msgstr "Non ci sono parametri per questo elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:78
+msgid "Please make a selection from the list to %s"
+msgstr "Prego effettuare una selezione dalla lista a %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:108
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:128
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:55
+msgid "New"
+msgstr "Nuovo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:166
+msgid "Publish"
+msgstr "Pubblica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:171
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:102
+msgid "Please make a selection from the list to publish"
+msgstr "Prego effettuare una selezione dalla lista per pubblicazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:185
+msgid "Default"
+msgstr "Predefinito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:190
+msgid "Please select an item to make default"
+msgstr "Prego selezionare un elemento come predefinito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:204
+msgid "Assign"
+msgstr "Assegna"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:209
+msgid "Please select an item to assign"
+msgstr "Prego selezionare un elemento da assegnare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:223
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:242
+msgid "Unpublish"
+msgstr "Non pubblicare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:247
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:142
+msgid "Please make a selection from the list to unpublish"
+msgstr "Prego effettuare una selezione dalla lista per depubblicare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:261
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:150
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:155
+msgid "Archive"
+msgstr "Archivio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:266
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:162
+msgid "Please make a selection from the list to archive"
+msgstr "Prego effettuare una selezione dalla lista per archiviare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:280
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:175
+msgid "Unarchive"
+msgstr "Non archiviare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:182
+msgid "Please select a news story to unarchive"
+msgstr "Prego selezionare una nuova storia da ripubblicare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:299
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:319
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:195
+msgid "Edit"
+msgstr "Modifica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:324
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:343
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:363
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:382
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:402
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:202
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:221
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:240
+msgid "Please select an item from the list to edit"
+msgstr "Prego selezionare un articolo dalla lista per modificarlo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:338
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:358
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:215
+msgid "Edit HTML"
+msgstr "Modifica HTML"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:377
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:397
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:234
+msgid "Edit CSS"
+msgstr "Modifica CSS"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:417
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:438
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:254
+msgid "Delete"
+msgstr "Cancella"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:422
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:443
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Are you sure you want to delete selected items?"
+msgstr "Sei sicuro di voler cancellare l’articolo selezionato?"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:422
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:443
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Please make a selection from the list to delete"
+msgstr "Prego effettuare una selezione dalla lista, per cancellare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:455
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:79
+msgid "Trash"
+msgstr "Cestino"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:474
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:475
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:80
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:277
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:278
+msgid "Preview"
+msgstr "Anteprima"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:540
+msgid "Apply"
+msgstr "Applica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:560
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:294
+msgid "Save"
+msgstr "Salva"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:611
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:344
+msgid "Cancel"
+msgstr "Annulla"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:629
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:239
+msgid "Back"
+msgstr "Indietro"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:664
+msgid "Upload"
+msgstr "Carica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:669
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:670
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:391
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:392
+msgid "Upload Image"
+msgstr "Carica immagine"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:86
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:410
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+"I nuovi elementi vanno automaticamente in ultima posizione. L’ordinamento "
+"può essere cambiato dopo che l’elemento è stato salvato."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:181
+msgid "Parent Window With Browser Navigation"
+msgstr "Stessa finestra, con navigazione browser"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:182
+msgid "New Window With Browser Navigation"
+msgstr "Nuova finestra con navigazione browser"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:183
+msgid "New Window Without Browser Navigation"
+msgstr "Nuova finestra senza navigazione browser"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:242
+msgid "All"
+msgstr "Tutto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:248
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:451
+msgid "None"
+msgstr "Nessuno"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:503
+msgid "- All Sections -"
+msgstr "- Tutte le sezioni -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:390
+msgid "- Select Image -"
+msgstr "- Seleziona immagine -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:408
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr ""
+"I nuovi elementi vanno automaticamente in prima posizione. L’ordinamento può "
+"essere cambiato dopo che l’elemento è stato salvato."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:435
+msgid "- No User -"
+msgstr "- Nessun utente -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:454
+msgid "Center"
+msgstr "Centro"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:457
+msgid "Left"
+msgstr "Sinistra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:460
+msgid "Right"
+msgstr "Destra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:482
+msgid "- All Categories -"
+msgstr "- Tutte le categorie -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:489
+msgid "You must create a category first."
+msgstr "Si deve creare una categoria, prima."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:73
+msgid "Results %d to %d of %d"
+msgstr "Risultati %d a %d di %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:75
+msgid "No records found."
+msgstr "Nessun record trovato."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:102
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:108
+msgid "Start"
+msgstr "Inizio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:102
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+msgid "first page"
+msgstr "prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:103
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:109
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:226
+msgid "Previous"
+msgstr "Precedente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:103
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+msgid "previous page"
+msgstr "pagina precedente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:121
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:124
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:127
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:217
+msgid "Next"
+msgstr "Prossimo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:121
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+msgid "next page"
+msgstr "prossima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:122
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:128
+msgid "End"
+msgstr "Fine"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:122
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+msgid "end page"
+msgstr "fine pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:65
+msgid "Control Panel"
+msgstr "Pannello di controllo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site"
+msgstr "Sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site Management"
+msgstr "Gestione sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:292
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:115
+msgid "Global Configuration"
+msgstr "Configurazione globale"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Language Manager"
+msgstr "Gestore lingue"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Manage languages"
+msgstr "Gestione lingue"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Manage Media Files"
+msgstr "Gestione file Media"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Media Manager"
+msgstr "Gestore Media"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:81
+msgid "In New Window"
+msgstr "In una nuova finestra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:82
+msgid "Inline"
+msgstr "In linea"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:83
+msgid "Inline with Positions"
+msgstr "In linea con posizioni"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Site Statistics"
+msgstr "Statistiche sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:88
+msgid "Browser, OS, Domain"
+msgstr "Browser, SO, Domini"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:89
+msgid "Page Impressions"
+msgstr "Pagine visitate"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:92
+msgid "Search Text"
+msgstr "Testi di ricerca"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Change site template"
+msgstr "Cambia template del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+msgid "Template Manager"
+msgstr "Gestore template"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Site Templates"
+msgstr "Templates del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+msgid "Install"
+msgstr "Installa"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Install Site Templates"
+msgstr "Installa Template del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Administrator Templates"
+msgstr "Template amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Change admin template"
+msgstr "Cambia template amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Install Administrator Templates"
+msgstr "Installa template amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Module Positions"
+msgstr "Posizione moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Template positions"
+msgstr "Posizione template"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Manage Trash"
+msgstr "Gestisci cestino"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Trash Manager"
+msgstr "Gestore cestino"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "Manage users"
+msgstr "Gestisci utenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "User Manager"
+msgstr "Gestore utenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_stats.php:24
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:438
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:517
+msgid "Menu"
+msgstr "Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+msgid "Menu Management"
+msgstr "Gestione menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:122
+msgid "Menu Manager"
+msgstr "Gestore menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content"
+msgstr "Contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content Management"
+msgstr "Gestione contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content Managers"
+msgstr "Gestore contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content by Section"
+msgstr "Contenuti per sezione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:144
+msgid "Items"
+msgstr "Articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+msgid "Add/Edit"
+msgstr "Aggiungi/Modifica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:58
+msgid "Categories"
+msgstr "Categorie"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:28
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:137
+msgid "All Content Items"
+msgstr "Tutti gli articoli di contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+msgid "Manage Content Items"
+msgstr "Gestisci articoli di contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Manage Typed Content Items"
+msgstr "Gestisci articoli di contenuto testuale"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Static Content Manager"
+msgstr "Gestore contenuti statici"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Manage Content Sections"
+msgstr "Gestione sezione contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Section Manager"
+msgstr "Gestore sezioni"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Category Manager"
+msgstr "Gestore categorie"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Manage Content Categories"
+msgstr "Gestisci  categorie di contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Frontpage Manager"
+msgstr "Gestore prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Manage Frontpage Items"
+msgstr "Gestisci articoli in prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Archive Manager"
+msgstr "Gestore archivio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Manage Archive Items"
+msgstr "Gestisci articoli in archivio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+msgid "Component Management"
+msgstr "Gestore componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Components"
+msgstr "Componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install/Uninstall"
+msgstr "Installa/Disinstalla"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+msgid "Install/Uninstall components"
+msgstr "Installa/Disinstalla componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components"
+msgstr "Altri componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components..."
+msgstr "Altri componenti..."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+msgid "Module Management"
+msgstr "Gestione moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Modules"
+msgstr "Moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+msgid "Install custom modules"
+msgstr "Installa moduli personalizzati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Manage Site modules"
+msgstr "Gestisci moduli del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Site Modules"
+msgstr "Moduli del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Administrator Modules"
+msgstr "Moduli amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Manage Administrator modules"
+msgstr "Gestione moduli amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+msgid "Mambot Management"
+msgstr "Gestione mambot"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Mambots"
+msgstr "Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install custom mambot"
+msgstr "Installa mambot personalizzato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Manage Site Mambots"
+msgstr "Gestione mambots del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Site Mambots"
+msgstr "Mambots del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installer List"
+msgstr "Elenco installatore"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installers"
+msgstr "Installatore"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Templates - Site"
+msgstr "Templates - Sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Templates - Admin"
+msgstr "Templates - Amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Install Languages"
+msgstr "Installa lingua"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Languages"
+msgstr "Lingue"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Install/Uninstall Components"
+msgstr "Installa/Disinstalla componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Install/Uninstall Modules"
+msgstr "Installa/Disinstalla moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Install/Uninstall Mambots"
+msgstr "Installa/Disinstalla mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messages"
+msgstr "Messaggi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messaging Management"
+msgstr "Gestione messaggi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Inbox"
+msgstr "Arrivati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Private Messages"
+msgstr "Messaggi  privati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System"
+msgstr "Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System Management"
+msgstr "Gestione sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Check-in all checked-out items"
+msgstr "Sblocca tutti gli elementi bloccati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Global Checkin"
+msgstr "Controllo generale"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:301
+msgid "View System Information"
+msgstr "Vedi informazioni di sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean Cache"
+msgstr "Pulisci la cache"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean the content items cache"
+msgstr "Pulisci la cache dagli elementi di contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:27
+msgid "Most Recently Added Content"
+msgstr "Ultimi contenuti aggiunti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:64
+msgid "Edit User"
+msgstr "Modifica utente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:56
+msgid "Currently Logged in Users"
+msgstr "Utenti attualmente connessi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+msgid "Force Logout User"
+msgstr "Forza disconnessione utente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:62
+msgid "Logout"
+msgstr "Disconnetti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_online.php:22
+msgid "Users Online"
+msgstr "Utenti online"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:27
+msgid "Most Popular Items"
+msgstr "Articoli più popolari"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:30
+msgid "Created"
+msgstr "Creato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:33
+msgid "Hits"
+msgstr "Visite"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:35
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:144
+msgid "Static Content"
+msgstr "Contenuto statico"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:42
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:152
+msgid "Frontpage"
+msgstr "Prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:51
+msgid "Sections"
+msgstr "Sezioni"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:65
+msgid "Media"
+msgstr "Media"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:89
+msgid "Menus"
+msgstr "Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:102
+msgid "Users"
+msgstr "Utenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_stats.php:27
+msgid "# Items"
+msgstr "# Articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_unread.php:17
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_unread.php:19
+msgid "Mail"
+msgstr "Posta"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:22
+msgid "Content Preview"
+msgstr "Anteprima contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:60
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:68
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:49
+msgid "Close"
+msgstr "Chiudi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:61
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:276
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:278
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:294
+msgid "Print"
+msgstr "Stampa"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:40
+msgid "Module Preview"
+msgstr "Anteprima modulo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:25
+msgid "Poll Preview"
+msgstr "Anteprima sondaggio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:46
+msgid "Results"
+msgstr "Risultati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:46
+msgid "Vote"
+msgstr "Vota"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:25
+msgid "Please select an image to upload"
+msgstr "Prego selezionare un’immagine da caricare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:31
+msgid "File must only contain alphanumeric characters and no spaces please."
+msgstr "Il file deve contenere solo caratteri alfanumerici e nessuno spazio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:36
+msgid "Image %s already exists."
+msgstr "L’immagine %s esiste già."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:41
+msgid "The file must be gif, png, jpg, bmp, swf, doc, xls or ppt"
+msgstr "Il  file deve essere gif, png, jpg, bmp, swf, doc, xls o ppt"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:48
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:56
+msgid "Upload of $userfile_name failed"
+msgstr "Caricamento di $userfile_name fallito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:52
+msgid "Upload of $userfile_name to $media_path successful"
+msgstr "Caricamento di $userfile_name in $media_path effettuato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:60
+msgid "Upload of $userfile_name to $base_Dir successful"
+msgstr "Caricamento di $userfile_name in $base_Dir effettuato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:84
+msgid "File Upload :"
+msgstr "Caricamento file:"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:94
+msgid "Max size"
+msgstr "Grandezza massima"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:34
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:88
+msgid "Mambo Logo"
+msgstr "Logo Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:19
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:22
+msgid "Administration"
+msgstr "Amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:40
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:49
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/login.php:40
+msgid "Login"
+msgstr "Entra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:43
+msgid "Username"
+msgstr "Nome utente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:45
+msgid "Password"
+msgstr "Password"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:55
+msgid "Welcome to Mambo!"
+msgstr "benvenuto in  Mambo!"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:56
+msgid ""
+"Use a valid username and password to gain access to the administration "
+"console."
+msgstr ""
+"Usa un nome utente ed una password validi per accedere al pannello di "
+"controllo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:36
+msgid "Please make a selection from the list to"
+msgstr "Prego effettuare una selezione dalla lista a"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:75
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:95
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:473
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:560
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:653
+msgid "Published"
+msgstr "Pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:115
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:135
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:653
+msgid "Unpublished"
+msgstr "Non pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:312
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:313
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:327
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:328
+msgid "save"
+msgstr "salva"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:363
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:364
+msgid "back"
+msgstr "indietro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr "Prego completare i campi nome utente e password."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:41
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr "Entrata non permessa. Non ci sono controlli di autenticazione attivi."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr ""
+"Il tuo accesso è stato bloccato. Per  favore contattare l’amministratore"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr "Nome utente o password non corretti. Per favore prova ancora."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:147
+msgid "Please enter a password"
+msgstr "Prego inserire una  password"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:166
+msgid "You cannot login. There are no administrators set up."
+msgstr "Non puoi entrare. Non ci sono amministratori configurati."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr ""
+"Nome utente, password o livello di accesso non corretti. Per favore, prova "
+"ancora"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/cmtclasses.php:348
+msgid "Your Module must contain a title."
+msgstr "Il modulo deve avere un titolo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:21
+msgid "Unwriteable"
+msgstr "Non scrivibile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:21
+msgid "Writeable"
+msgstr "Scrivibile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:95
+msgid "January"
+msgstr "Gennaio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:96
+msgid "February"
+msgstr "Febbraio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:97
+msgid "March"
+msgstr "Marzo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:98
+msgid "April"
+msgstr "Aprile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:99
+msgid "May"
+msgstr "Maggio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:100
+msgid "June"
+msgstr "Giugno"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:101
+msgid "July"
+msgstr "Luglio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:102
+msgid "August"
+msgstr "Agosto"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:103
+msgid "September"
+msgstr "Settembre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:104
+msgid "October"
+msgstr "Ottobre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:105
+msgid "November"
+msgstr "Novembre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:106
+msgid "December"
+msgstr "Dicembre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:121
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:171
+msgid "Yes"
+msgstr "Si"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:122
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:170
+msgid "No"
+msgstr "No"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:195
+msgid "No Sorting"
+msgstr "Nessun ordinamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:196
+msgid "Sort Ascending"
+msgstr "Ordinamento ascendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:197
+msgid "Sort Descending"
+msgstr "Ordibamento discendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:222
+msgid "Close Window"
+msgstr "Chiudi finestra"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:350
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr ""
+"Questo indirizzo email è protetto contro i robot spam, hai bisogno del "
+"Javascript abilitato, per vederlo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:375
+msgid "Pending"
+msgstr "In attesa"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:378
+msgid "Published, but is <u>Pending"
+msgstr "Pubblicato, ma è <u> in attesa</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:381
+msgid "Visible"
+msgstr "Visibile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:384
+msgid "Published and is <u>Current</u>"
+msgstr "Attualmente <u>pubblicato</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:387
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:393
+msgid "Finished"
+msgstr "Finito"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:390
+msgid "Published, but has <u>Expired</u>"
+msgstr "Pubblicazione <u>scaduta</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:396
+msgid "Not Published"
+msgstr "Non pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:401
+msgid "Click on icon to toggle state."
+msgstr "Cliccare sull’icona per cambiare lo stato."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:441
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:520
+msgid "Go to Menu"
+msgstr "Vai la menu"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:448
+msgid "Link Name"
+msgstr "Nome collegamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:452
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:539
+msgid "Go to Menu Item"
+msgstr "Vai al menu articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:460
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:547
+msgid "State"
+msgstr "Stato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:466
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:553
+msgid "Trashed"
+msgstr "Cestinato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:469
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:556
+msgid "UnPublished"
+msgstr "Non pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:527
+msgid "Type"
+msgstr "Tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:535
+msgid "Item Name"
+msgstr "Nome elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:584
+msgid "Checked Out"
+msgstr "Bloccato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Publish item"
+msgstr "Pubblica elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Unpublish Item"
+msgstr "Non pubblicare elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:21
+msgid "User Submitted '%s'"
+msgstr "Utente inviato '%s'"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:22
+msgid ""
+"Hello %s,\\n\\n\\nA user submitted %s:\\n [ %s ]\\n has been just been "
+"submitted by user:\\n [ %s ]\\n"
+msgstr ""
+"Ciao %s,\\n\\n\\nUn utente ha inviato %s:\\n [ %s ]\\n è stato appena "
+"inserito dall’utente:\\n [ %s ]\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:23
+msgid " for %.\\n\\n\\n\\n"
+msgstr "per %.\\n\\n\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:24
+msgid "Please go to %s/administrator to view and approve this %s.\\n\\n"
+msgstr ""
+"Per favore, vai in amministrazione di %s/ per vederlo ed eventualmente "
+"approvarlo %s.\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:25
+msgid ""
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only\\n"
+msgstr ""
+"Per favore, non rispondere a questo messaggio, in quanto è stato generato "
+"automaticamente a puro scopo informativo\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:50
+msgid "You need to login."
+msgstr "Devi identificarti."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:334
+msgid "Mambo Warning"
+msgstr "Avviso Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:67
+msgid "Results %d - %d of %d"
+msgstr "Risultati %d - %d di %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:79
+msgid "Page %d of %d"
+msgstr "Pagina %d di %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:67
+msgid "Powered by Mambo"
+msgstr "Powered by Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:68
+msgid "Generated:"
+msgstr "Generato:"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:95
+msgid "Written by"
+msgstr "Scritto da"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:97
+msgid "Contributed by"
+msgstr "Contributi di"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:103
+msgid "Last Updated"
+msgstr "Ultimo aggiornamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:121
+msgid "OFF"
+msgstr "OFF"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:121
+msgid "ON"
+msgstr "ON"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:283
+msgid "Text Domains"
+msgstr "Dominio testuale"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:290
+msgid "Main"
+msgstr "Principale"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:58
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:183
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:194
+msgid "Page"
+msgstr "Pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:142
+msgid "Article Index"
+msgstr "Indice articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:215
+msgid "Next &gt;&gt;"
+msgstr "Prossimi >>"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:224
+msgid "&lt;&lt;Previous"
+msgstr "<<Precedenti"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:39
+msgid "User Rating"
+msgstr "Valutazione utente"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:47
+msgid "Poor"
+msgstr "Povero"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:48
+msgid "vote 1 star"
+msgstr "voto 1 stella"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:49
+msgid "vote 2 star"
+msgstr "voto 2 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:50
+msgid "vote 3 star"
+msgstr "voto 3 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:51
+msgid "vote 4 star"
+msgstr "voto 4 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:52
+msgid "vote 5 star"
+msgstr "voto 5 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:53
+msgid "Best"
+msgstr "Migliore"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:54
+msgid "Rate"
+msgstr "Valuta"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:70
+msgid "Category List"
+msgstr "Elenco categorie"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:74
+msgid "Category Blog"
+msgstr "Categoria Blog"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/contacts.searchbot.php:32
+msgid "Contact"
+msgstr "Contatti"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/sections.searchbot.php:66
+msgid "Section List"
+msgstr "Elenco sezione"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/sections.searchbot.php:70
+msgid "Section Blog"
+msgstr "Sezione Blog"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/weblinks.searchbot.php:31
+msgid "Web Links"
+msgstr "Web Links"
+
+#: administrator/components/com_banners/admin.banners.html.php:29
+msgid "Banner Manager"
+msgstr "Gestore Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:43
+msgid "Banner Name"
+msgstr "Nome Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:49
+msgid "Impressions Made"
+msgstr "Esposizioni fatte"
+
+#: administrator/components/com_banners/admin.banners.html.php:52
+msgid "Impressions Left"
+msgstr "Esposizioni da fare"
+
+#: administrator/components/com_banners/admin.banners.html.php:55
+#: administrator/components/com_banners/admin.banners.html.php:58
+#: administrator/components/com_banners/admin.banners.html.php:256
+msgid "Clicks"
+msgstr "Clicks"
+
+#: administrator/components/com_banners/admin.banners.html.php:99
+msgid "Edit Banner"
+msgstr "Modifica Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:159
+msgid "You must provide a banner name"
+msgstr "Si deve inserire un nome per  il banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:161
+msgid "Please select a client"
+msgstr "Prego selezionare un cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:163
+msgid "Please select an image."
+msgstr "Prego selezionare una immagine"
+
+#: administrator/components/com_banners/admin.banners.html.php:165
+msgid "Please fill in the URL for the banner."
+msgstr "Prego inserire una URL per il banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:176
+msgid "Banner:"
+msgstr "Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:187
+#: administrator/components/com_banners/admin.banners.html.php:433
+msgid "Details"
+msgstr "Dettagli"
+
+#: administrator/components/com_banners/admin.banners.html.php:192
+msgid "Banner Name:"
+msgstr "Nome del Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:200
+#: administrator/components/com_banners/admin.banners.html.php:438
+msgid "Client Name:"
+msgstr "Nome del Cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:208
+msgid "Impressions Purchased:"
+msgstr "Esposizioni acquistate:"
+
+#: administrator/components/com_banners/admin.banners.html.php:219
+msgid "Unlimited"
+msgstr "Illimitate"
+
+#: administrator/components/com_banners/admin.banners.html.php:224
+msgid "Banner URL"
+msgstr "URL del Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:232
+msgid "Show Banner :"
+msgstr "Mostra Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:240
+msgid "Click URL:"
+msgstr "URL di destinazione"
+
+#: administrator/components/com_banners/admin.banners.html.php:248
+msgid "Custom banner code:"
+msgstr "Codice personalizzato del banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:258
+msgid "Reset Clicks"
+msgstr "Azzera clicks"
+
+#: administrator/components/com_banners/admin.banners.html.php:270
+msgid "Banner Image:"
+msgstr "Immagine del banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:320
+msgid "Banner Client Manager"
+msgstr "Gestore clienti dei banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:334
+msgid "Client Name"
+msgstr "Nome cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:340
+msgid "No. of Active Banners"
+msgstr "N. di banner attivi"
+
+#: administrator/components/com_banners/admin.banners.html.php:366
+msgid "Edit Banner Client"
+msgstr "Modifica cliente banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:407
+msgid "Please fill in the Client Name."
+msgstr "Prego inserire il nome del cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:409
+msgid "Please fill in the Contact Name."
+msgstr "Prego inserire il nome del contatto"
+
+#: administrator/components/com_banners/admin.banners.html.php:411
+msgid "Please fill in the Contact Email."
+msgstr "Prego inserire l'email del contatto"
+
+#: administrator/components/com_banners/admin.banners.html.php:421
+msgid "Banner Client:"
+msgstr "Cliente del banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:446
+msgid "Contact Name:"
+msgstr "Nome del contatto:"
+
+#: administrator/components/com_banners/admin.banners.html.php:454
+msgid "Contact Email:"
+msgstr "Email del contatto:"
+
+#: administrator/components/com_banners/admin.banners.html.php:462
+msgid "Extra Info:"
+msgstr "Altre info:"
+
+#: administrator/components/com_banners/admin.banners.php:165
+msgid "Saved Banner info"
+msgstr "Informazioni banner salvate"
+
+#: administrator/components/com_banners/admin.banners.php:168
+msgid "Reset Banner clicks"
+msgstr "Azzera clicks del banner"
+
+#: administrator/components/com_banners/admin.banners.php:201
+msgid "publish"
+msgstr "pubblica"
+
+#: administrator/components/com_banners/admin.banners.php:201
+msgid "unpublish"
+msgstr "non pubblicare"
+
+#: administrator/components/com_banners/admin.banners.php:202
+msgid "Select an item to %s"
+msgstr "Seleziona un articolo da %s"
+
+#: administrator/components/com_banners/admin.banners.php:276
+msgid "The client [ %s ] is currently being edited by another person."
+msgstr ""
+"Il cliente [ %s ] è attualmente in fase di modifica da parte di un'altra "
+"persona."
+
+#: administrator/components/com_banners/admin.banners.php:334
+msgid "Cannot delete client at this time as they have a banner still running"
+msgstr ""
+"Al momento non è possibile cancellare il cliente, dato che ha ancora banner "
+"attivi"
+
+#: administrator/components/com_banners/banners.xml
+msgid "Banners"
+msgstr "Banners"
+
+#: administrator/components/com_banners/banners.xml
+msgid "This component manages banners and banner clients"
+msgstr "Questo componente gestisce i banner ed i clienti dei banners"
+
+#: components/com_banners/banners.class.php:35
+msgid "You must select a name for the client."
+msgstr "Si deve inserire un nome, per il cliente."
+
+#: components/com_banners/banners.class.php:41
+msgid "You must select a contact for the client."
+msgstr "Si deve inserire un contatto, per il cliente."
+
+#: components/com_banners/banners.class.php:47
+msgid "You must select a valid email for the client."
+msgstr "Si deve inserire un indirizzo email valido, per il cliente."
+
+#: components/com_banners/banners.class.php:102
+msgid "You must select a client."
+msgstr "Si deve selezionare un cliente."
+
+#: components/com_banners/banners.class.php:107
+msgid "You must select a name for the banner."
+msgstr "Si deve selezionare un nome, per il banner."
+
+#: components/com_banners/banners.class.php:112
+msgid "You must select a image for the banner."
+msgstr "Si deve selezionare una immagine, per il banner."
+
+#: components/com_banners/banners.class.php:116
+msgid "You must select a URL/Custom banner code for the banner."
+msgstr ""
+"Si deve selezionare una URL/codice banner personalizzato, per il banner."
+
+#: administrator/components/com_categories/admin.categories.html.php:37
+msgid "Content: All"
+msgstr "Contenuti: Tutti"
+
+#: administrator/components/com_categories/admin.categories.html.php:72
+msgid "Category Name"
+msgstr "Nome categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:81
+msgid "Reorder"
+msgstr "Riordina"
+
+#: administrator/components/com_categories/admin.categories.html.php:87
+msgid "Order"
+msgstr "Ordina"
+
+#: administrator/components/com_categories/admin.categories.html.php:90
+msgid "Save Order"
+msgstr "Salva ordinamento"
+
+#: administrator/components/com_categories/admin.categories.html.php:93
+msgid "Access"
+msgstr "Accesso"
+
+#: administrator/components/com_categories/admin.categories.html.php:99
+msgid "Section"
+msgstr "Sezione"
+
+#: administrator/components/com_categories/admin.categories.html.php:105
+msgid "Category ID"
+msgstr "ID categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:111
+msgid "Active"
+msgstr "Attiva"
+
+#: administrator/components/com_categories/admin.categories.html.php:183
+msgid "Edit Section"
+msgstr "Modifica  sezione"
+
+#: administrator/components/com_categories/admin.categories.html.php:262
+msgid "Please select a Menu"
+msgstr "Prego selezionare un menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:265
+msgid "Please select a menu type"
+msgstr "Prego selezionare un tipo di menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:268
+msgid "Please enter a Name for this menu item"
+msgstr "Prego inserire un nome per questo menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:274
+msgid "Category must have a name"
+msgstr "Una categoria deve avere un nome"
+
+#: administrator/components/com_categories/admin.categories.html.php:322
+msgid "Category:"
+msgstr "Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:336
+msgid "Show Advanced Details"
+msgstr "Mostra dettagli"
+
+#: administrator/components/com_categories/admin.categories.html.php:339
+msgid "Hide Advanced Details"
+msgstr "Nascondi dettagli"
+
+#: administrator/components/com_categories/admin.categories.html.php:350
+msgid "Category Details"
+msgstr "Dettagli categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:355
+msgid "Category Title:"
+msgstr "Titolo categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:358
+msgid "A short name to appear in menus"
+msgstr "Un nome corto da mostrare nel menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:363
+msgid "Category Name:"
+msgstr "Nome categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:366
+msgid "A long name to be displayed in headings"
+msgstr "Un nome lungo da essere visualizzato nelle intestazioni"
+
+#: administrator/components/com_categories/admin.categories.html.php:371
+msgid "Section:"
+msgstr "Sezione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:379
+msgid "Image:"
+msgstr "Immagine"
+
+#: administrator/components/com_categories/admin.categories.html.php:397
+msgid "Image Position:"
+msgstr "Posizione immagine"
+
+#: administrator/components/com_categories/admin.categories.html.php:405
+msgid "Ordering:"
+msgstr "Ordinamento:"
+
+#: administrator/components/com_categories/admin.categories.html.php:413
+msgid "Access Level:"
+msgstr "Livelli di accesso:"
+
+#: administrator/components/com_categories/admin.categories.html.php:421
+msgid "Published:"
+msgstr "Pubblicato:"
+
+#: administrator/components/com_categories/admin.categories.html.php:429
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:450
+#: administrator/components/com_categories/admin.categories.html.php:487
+msgid "Link to Menu"
+msgstr "Collegamento al menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:455
+msgid "This will create a new menu item in the menu you select"
+msgstr "Questo creerà un nuovo elemento nel menu selezionato"
+
+#: administrator/components/com_categories/admin.categories.html.php:461
+msgid "Select a Menu"
+msgstr "Seleziona un menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:469
+msgid "Select Menu Typ"
+msgstr "Seleziona un tipo di menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:477
+msgid "Menu Item Name"
+msgstr "Nome dell'elemento di menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:492
+msgid "Existing Menu Links"
+msgstr "Collegamenti  ai menu esistenti"
+
+#: administrator/components/com_categories/admin.categories.html.php:518
+msgid "Menu links available when saved"
+msgstr "Il collegamento al menu sarà disponibile dopo il salvataggio"
+
+#: administrator/components/com_categories/admin.categories.html.php:555
+msgid "Move Category"
+msgstr "Sposta categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:565
+msgid "Move to Section:"
+msgstr "Sposta alla sezione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:571
+msgid "Categories being moved:"
+msgstr "Categoria che sarà spostata:"
+
+#: administrator/components/com_categories/admin.categories.html.php:582
+msgid "Content Items being moved:"
+msgstr "Articolo di contenuto che sarà spostato:"
+
+#: administrator/components/com_categories/admin.categories.html.php:593
+msgid ""
+"This will move the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"Questo sposterà le categorie elencate\n"
+"\t\t\t<br />\n"
+"\t\t\te tutti gli articoli contenuti in esse (anche loro elencati)\n"
+"\t\t\t<br />\n"
+"\t\t\talla sezione selezionata."
+
+#: administrator/components/com_categories/admin.categories.html.php:628
+msgid "Copy Category"
+msgstr "Copia categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:638
+msgid "Copy to Section:"
+msgstr "Copia alla sezione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:644
+msgid "Categories being copied:"
+msgstr "Categoria che sarà copiata"
+
+#: administrator/components/com_categories/admin.categories.html.php:655
+msgid "Content Items being copied:"
+msgstr "Articolo di contenuto che sarà copiato:"
+
+#: administrator/components/com_categories/admin.categories.html.php:666
+msgid ""
+"\n"
+"\t\t\tThis will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"\n"
+"\t\t\tQuesto copierà le categorie elencate\n"
+"\t\t\t<br />\n"
+"\t\t\te tutti gli articoli contenuti in esse (anche loro elencati)\n"
+"\t\t\t<br />\n"
+"\t\t\talla sezione selezionata."
+
+#: administrator/components/com_categories/admin.categories.php:142
+msgid "Component: "
+msgstr "Componente:"
+
+#: administrator/components/com_categories/admin.categories.php:251
+msgid "The category %s is currently being edited by another administrator"
+msgstr ""
+"La categoria %s è in corso di modifica da parte di un altro amministratore"
+
+#: administrator/components/com_categories/admin.categories.php:270
+msgid "Category Table"
+msgstr "Tabella categoria"
+
+#: administrator/components/com_categories/admin.categories.php:278
+msgid "Category Blog Archive"
+msgstr "Archivio blog categoria"
+
+#: administrator/components/com_categories/admin.categories.php:322
+msgid "Select Type"
+msgstr "Seleziona tipo"
+
+#: administrator/components/com_categories/admin.categories.php:324
+#: administrator/components/com_categories/admin.categories.php:797
+msgid "Contact Category Table"
+msgstr "Tabella categoria contatti"
+
+#: administrator/components/com_categories/admin.categories.php:327
+#: administrator/components/com_categories/admin.categories.php:802
+msgid "Newsfeed Category Table"
+msgstr "Tabella categoria newsfeed"
+
+#: administrator/components/com_categories/admin.categories.php:330
+#: administrator/components/com_categories/admin.categories.php:807
+msgid "Weblink Category Table"
+msgstr "Tabella categoria weblinks"
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:782
+msgid "Content Category Table"
+msgstr "Tabella categoria contenuti"
+
+#: administrator/components/com_categories/admin.categories.php:333
+#: administrator/components/com_categories/admin.categories.php:787
+msgid "Content Category Blog"
+msgstr "Blog contenuti categoria"
+
+#: administrator/components/com_categories/admin.categories.php:334
+msgid "Content Category Archive Blog"
+msgstr "Blog archivio contenuti categoria"
+
+#: administrator/components/com_categories/admin.categories.php:447
+msgid "Select a category to delete"
+msgstr "Seleziona una categoria cancellare"
+
+#: administrator/components/com_categories/admin.categories.php:524
+msgid "Select a category to %s"
+msgstr "Seleziona  una categoria da %s"
+
+#: administrator/components/com_categories/admin.categories.php:585
+#: administrator/components/com_categories/admin.categories.php:655
+msgid "Select an item to move"
+msgstr "Seleziona un articolo da spostare"
+
+#: administrator/components/com_categories/admin.categories.php:741
+msgid "%d Category copied to %s"
+msgid_plural "%d Categories copied to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_categories/admin.categories.php:792
+msgid "Content Category Blog Archive"
+msgstr "Archivio blog contenuto categoria"
+
+#: administrator/components/com_categories/admin.categories.php:833
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr "%s ( %s ) nel menu: %s creato correttamente"
+
+#: administrator/components/com_categories/admin.categories.php:872
+msgid "New ordering saved"
+msgstr "Nuovo ordinamento salvato"
+
+#: administrator/components/com_categories/toolbar.categories.html.php:80
+msgid "Move"
+msgstr "Sposta"
+
+#: administrator/components/com_categories/toolbar.categories.html.php:82
+msgid "Copy"
+msgstr "Copia"
+
+#: administrator/components/com_config/admin.config.html.php:106
+msgid "configuration.php is :"
+msgstr "configuration.php è:"
+
+#: administrator/components/com_config/admin.config.html.php:116
+msgid "Make unwriteable after saving"
+msgstr "Rendi non scrivibile, dopo il salvataggio"
+
+#: administrator/components/com_config/admin.config.html.php:123
+msgid "Override write protection while saving"
+msgstr ""
+"Annulla temporaneamente la protezione per permettere il salvataggio dei dati"
+
+#: administrator/components/com_config/admin.config.html.php:137
+msgid "Site Offline:"
+msgstr "Sito non in linea:"
+
+#: administrator/components/com_config/admin.config.html.php:141
+msgid "Offline Message:"
+msgstr "Messaggio sito non in linea:"
+
+#: administrator/components/com_config/admin.config.html.php:143
+msgid "A message that displays if your site is offline"
+msgstr "Il messaggio che viene mostrato in caso di sito non in linea"
+
+#: administrator/components/com_config/admin.config.html.php:148
+msgid "System Error Message:"
+msgstr "Messaggio errore di sistema:"
+
+#: administrator/components/com_config/admin.config.html.php:150
+msgid "A message that displays if Mambo could not connect to the database"
+msgstr ""
+"Il messaggio che viene mostrato se Mambo non può connettersi al database"
+
+#: administrator/components/com_config/admin.config.html.php:155
+msgid "Site Name:"
+msgstr "Nome del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:159
+msgid "Show UnAuthorized Links:"
+msgstr "Mostra collegamenti non autorizzati:"
+
+#: administrator/components/com_config/admin.config.html.php:161
+msgid ""
+"If yes, will show links to content to registered content even if you are not "
+"logged in.  The user will need to login to see the item in full."
+msgstr ""
+"Se SI, mostrerà i contenuti riservati agli utenti registrati, anche ai "
+"visitatori, ma l'utente dovrà essere connesso al sito, per vedere l'articolo "
+"per intero."
+
+#: administrator/components/com_config/admin.config.html.php:166
+msgid "Allow User Registration:"
+msgstr "Permetti la registrazione di nuovi utenti:"
+
+#: administrator/components/com_config/admin.config.html.php:168
+msgid "If yes, allows users to self-register"
+msgstr "Se SI, permette agli utenti di auto registrarsi"
+
+#: administrator/components/com_config/admin.config.html.php:173
+msgid "Use New Account Activation:"
+msgstr "Usa l'attivazione del nuovo account:"
+
+#: administrator/components/com_config/admin.config.html.php:176
+msgid ""
+"If yes, the user will be mailed a link to activate their account before they "
+"can log in."
+msgstr ""
+"Se SI, all'utente sarà inviata una mail contenente un collegamento per "
+"attivare il proprio account e confermare l'iscrizione, prima di potersi "
+"identificare sul sito."
+
+#: administrator/components/com_config/admin.config.html.php:181
+msgid "Require Unique Email:"
+msgstr "Richiedi email univoca:"
+
+#: administrator/components/com_config/admin.config.html.php:183
+msgid "If yes, users cannot share the same email address"
+msgstr ""
+"Se si, nel database non potranno esserci indirizzi email condivisi tra gli "
+"utenti, ma ognuno dovrà avere un indirizzo univoco"
+
+#: administrator/components/com_config/admin.config.html.php:188
+msgid "Debug Site:"
+msgstr "Debug del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:190
+msgid "If yes, displays diagnostic information and SQL errors if present"
+msgstr ""
+"Se SI, mostra informazioni diagnostiche ed eventuali errori SQL se presenti"
+
+#: administrator/components/com_config/admin.config.html.php:199
+msgid "List Length:"
+msgstr "Lunghezza elenchi:"
+
+#: administrator/components/com_config/admin.config.html.php:201
+msgid "Sets the default length of lists in the administrator for all users"
+msgstr ""
+"Configura la lunghezza predefinita degli elenchi che sono usati in "
+"amministrazione ed è valida per tutti gli utenti "
+
+#: administrator/components/com_config/admin.config.html.php:206
+msgid "Favourites Site Icon:"
+msgstr "Icona Preferita per il sito:"
+
+#: administrator/components/com_config/admin.config.html.php:210
+msgid ""
+"If left blank or the file cannot be found, the default favicon.ico will be "
+"used."
+msgstr ""
+"Se lasciata in bianco o il file non viene trovato, sarà usata l'icona "
+"preconfigurata favicon.ico."
+
+#: administrator/components/com_config/admin.config.html.php:211
+msgid "Favourite Icon"
+msgstr "Icona preferita"
+
+#: administrator/components/com_config/admin.config.html.php:217
+msgid "Locale"
+msgstr "Locale"
+
+#: administrator/components/com_config/admin.config.html.php:221
+msgid "Language:"
+msgstr "Lingua:"
+
+#: administrator/components/com_config/admin.config.html.php:225
+msgid "Time Offset:"
+msgstr "Scarto orario:"
+
+#: administrator/components/com_config/admin.config.html.php:229
+msgid "Current date/time configured to display: %s"
+msgstr "Le data ed ora attuali sono: %s"
+
+#: administrator/components/com_config/admin.config.html.php:234
+msgid "Country Locale:"
+msgstr "Nazione locale"
+
+#: administrator/components/com_config/admin.config.html.php:244
+msgid "These Parameters control Output elements"
+msgstr "Questo parametro controlla gli elementi di Output"
+
+#: administrator/components/com_config/admin.config.html.php:247
+msgid "Linked Titles:"
+msgstr "Titoli collegati:"
+
+#: administrator/components/com_config/admin.config.html.php:250
+msgid "If yes, the title of content items will be hyperlinked to the item"
+msgstr "Se SI, il titolo degli articoli sarà collegato all'articolo stesso"
+
+#: administrator/components/com_config/admin.config.html.php:255
+msgid "Read More Link:"
+msgstr "Collegamento Leggi tutto.. :"
+
+#: administrator/components/com_config/admin.config.html.php:258
+msgid ""
+"If set to show, the read-more link will show if main-text has been provided "
+"for the item"
+msgstr ""
+"Se si sceglie di mostrarlo, il collegamento Leggi tutto.. sarà visualizzato "
+"nel caso che l'articolo abbia, oltre all'introduzione, anche il testo esteso"
+
+#: administrator/components/com_config/admin.config.html.php:263
+msgid "Item Rating/Voting:"
+msgstr "Valuta/vota articolo:"
+
+#: administrator/components/com_config/admin.config.html.php:266
+msgid "If set to show, a voting system will be enabled for content items"
+msgstr ""
+"Se si sceglie di mostrarlo, sarà abilitato un sistema di votazione del "
+"contenuto degli articoli"
+
+#: administrator/components/com_config/admin.config.html.php:271
+msgid "Author Names:"
+msgstr "Nome autore:"
+
+#: administrator/components/com_config/admin.config.html.php:274
+msgid ""
+"If set to show, the name of the author will be displayed.  This a global "
+"setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurato per essere mostrato, sarà visualizzato il nome dell'autore. "
+"Questa è una configurazione globale, ma può essere cambiata singolarmente "
+"per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:279
+msgid "Created Date and Time:"
+msgstr "Data e ora di creazione:"
+
+#: administrator/components/com_config/admin.config.html.php:282
+msgid ""
+"If set to show, the date and time an item was created will be displayed. "
+"This a global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurata per essere mostrate, saranno visualizzate la data e l'ora di "
+"creazione dell'articolo. Questa è una configurazione globale, ma può essere "
+"cambiata singolarmente per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:287
+msgid "Modified Date and Time:"
+msgstr "Data e ora modificate:"
+
+#: administrator/components/com_config/admin.config.html.php:290
+msgid ""
+"If set to show, the date and time an item was last modified will be "
+"displayed.  This a global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurata per essere mostrate, saranno visualizzate la data e l'ora "
+"dell'ultima modifica dell'articolo. Questa è una configurazione globale, ma "
+"può essere cambiata singolarmente per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:295
+msgid "Hits:"
+msgstr "Visite:"
+
+#: administrator/components/com_config/admin.config.html.php:298
+msgid ""
+"If set to show, the hits for a particular item will be displayed.  This a "
+"global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurato per essere mostrato, saranno visualizzate le visite ad un "
+"determinato articolo. Questa è una configurazione globale, ma può essere "
+"cambiata singolarmente per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:303
+msgid "PDF Icon:"
+msgstr "Icona PDF"
+
+#: administrator/components/com_config/admin.config.html.php:308
+msgid "Option not available as /media directory not writable"
+msgstr "Opzione non disponibile, dato che la cartella /media non è scrivibile"
+
+#: administrator/components/com_config/admin.config.html.php:316
+msgid "Print Icon:"
+msgstr "Icona Stampa:"
+
+#: administrator/components/com_config/admin.config.html.php:321
+msgid "Email Icon:"
+msgstr "Icona email:"
+
+#: administrator/components/com_config/admin.config.html.php:326
+msgid "Icons:"
+msgstr "Icone:"
+
+#: administrator/components/com_config/admin.config.html.php:328
+msgid "Print, PDF and Email will utilise Icons or Text"
+msgstr "Stampa, PDF ed Email utilizzeranno icone o testo"
+
+#: administrator/components/com_config/admin.config.html.php:331
+msgid "Table of Contents on multi-page items:"
+msgstr "Tabella dei contenuti, in articoli  multi pagina:"
+
+#: administrator/components/com_config/admin.config.html.php:336
+msgid "Back Button:"
+msgstr "Bottone indietro:"
+
+#: administrator/components/com_config/admin.config.html.php:341
+msgid "Content Item Navigation:"
+msgstr "Navigazione articoli di contenuto:"
+
+#: administrator/components/com_config/admin.config.html.php:360
+msgid "Hostname:"
+msgstr "Nome host:"
+
+#: administrator/components/com_config/admin.config.html.php:364
+msgid "MySQL Username:"
+msgstr "MySQL nome utente:"
+
+#: administrator/components/com_config/admin.config.html.php:368
+msgid "MySQL Password:"
+msgstr "MySQL password:"
+
+#: administrator/components/com_config/admin.config.html.php:372
+msgid "MySQL Database:"
+msgstr "MySQL  database:"
+
+#: administrator/components/com_config/admin.config.html.php:376
+msgid "MySQL Database Prefix:"
+msgstr "MySQL prefisso database:"
+
+#: administrator/components/com_config/admin.config.html.php:379
+msgid ""
+"!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE "
+"PREFIX YOU ARE SETTING !!"
+msgstr ""
+"!! NON CAMBIARE SE NON HAI UN DATABASE CREATO USANDO IL PREFISSO DI TABELLE "
+"CHE STAI CONFIGURANDO !!"
+
+#: administrator/components/com_config/admin.config.html.php:385
+msgid "Server"
+msgstr "Server"
+
+#: administrator/components/com_config/admin.config.html.php:389
+msgid "Absolute Path:"
+msgstr "Percorso assoluto:"
+
+#: administrator/components/com_config/admin.config.html.php:394
+msgid "Live Site:"
+msgstr "Sito attuale:"
+
+#: administrator/components/com_config/admin.config.html.php:399
+msgid "Secret Word:"
+msgstr "Parola segreta:"
+
+#: administrator/components/com_config/admin.config.html.php:404
+msgid "GZIP Page Compression:"
+msgstr "Compressione pagine GZIP:"
+
+#: administrator/components/com_config/admin.config.html.php:407
+msgid "Compress buffered output if supported"
+msgstr "Se supportato, comprime il contenuto del buffer dati"
+
+#: administrator/components/com_config/admin.config.html.php:412
+msgid "Login Session Lifetime:"
+msgstr "Durata della sessione di connessione:"
+
+#: administrator/components/com_config/admin.config.html.php:416
+msgid "Auto logout after this time of inactivity"
+msgstr ""
+"Trascorso questo tempo di inattività, l'utente è disconnesso automaticamente"
+
+#: administrator/components/com_config/admin.config.html.php:421
+msgid "Error Reporting:"
+msgstr "Rapporto errori:"
+
+#: administrator/components/com_config/admin.config.html.php:426
+msgid "Register Globals Emulation:"
+msgstr "Emulazione Register Globals:"
+
+#: administrator/components/com_config/admin.config.html.php:430
+msgid ""
+"Register globals emulation. Some components may stop working if this option "
+"is set to Off."
+msgstr ""
+"Emulazione del Register Globals. Qualche componente potrebbe non funzionare "
+"correttamente se questa opzione fosse configurata su OFF."
+
+#: administrator/components/com_config/admin.config.html.php:436
+msgid "Help Server:"
+msgstr "Server dell'Aiuto:"
+
+#: administrator/components/com_config/admin.config.html.php:448
+msgid "File Creation:"
+msgstr "Creazione file:"
+
+#: administrator/components/com_config/admin.config.html.php:450
+msgid "File Permissions"
+msgstr "Permessi dei files"
+
+#: administrator/components/com_config/admin.config.html.php:454
+msgid "Dont CHMOD new files (use server defaults)"
+msgstr ""
+"Non dare permessi CHMOD ai nuovi files (usa quelli predefiniti del server)"
+
+#: administrator/components/com_config/admin.config.html.php:459
+msgid "CHMOD new files"
+msgstr "Dai permessi CHMOD ai nuovi files"
+
+#: administrator/components/com_config/admin.config.html.php:461
+msgid "to:"
+msgstr "a:"
+
+#: administrator/components/com_config/admin.config.html.php:464
+msgid "Select this option to define permission flags for new created files"
+msgstr ""
+"Seleziona questa opzione per definire i permessi per i nuovi files creati"
+
+#: administrator/components/com_config/admin.config.html.php:473
+#: administrator/components/com_config/admin.config.html.php:552
+msgid "User:"
+msgstr "Utente:"
+
+#: administrator/components/com_config/admin.config.html.php:475
+#: administrator/components/com_config/admin.config.html.php:484
+#: administrator/components/com_config/admin.config.html.php:504
+#: administrator/components/com_config/admin.config.html.php:554
+#: administrator/components/com_config/admin.config.html.php:563
+#: administrator/components/com_config/admin.config.html.php:581
+msgid "read"
+msgstr "lettura"
+
+#: administrator/components/com_config/admin.config.html.php:477
+#: administrator/components/com_config/admin.config.html.php:486
+#: administrator/components/com_config/admin.config.html.php:506
+#: administrator/components/com_config/admin.config.html.php:556
+#: administrator/components/com_config/admin.config.html.php:565
+#: administrator/components/com_config/admin.config.html.php:583
+msgid "write"
+msgstr "scrittura"
+
+#: administrator/components/com_config/admin.config.html.php:479
+#: administrator/components/com_config/admin.config.html.php:488
+#: administrator/components/com_config/admin.config.html.php:508
+msgid "execute"
+msgstr "esecuzione"
+
+#: administrator/components/com_config/admin.config.html.php:482
+#: administrator/components/com_config/admin.config.html.php:561
+msgid "Group:"
+msgstr "Gruppo:"
+
+#: administrator/components/com_config/admin.config.html.php:492
+msgid "Apply to existing files"
+msgstr "Applica ai files esistenti"
+
+#: administrator/components/com_config/admin.config.html.php:495
+msgid ""
+"Checking here will apply the permission flags to <em>all existing files</em> "
+"of the site.<br/>"
+msgstr ""
+"Selezionando questo, saranno applicati questi permessi a tutti i files "
+"esistenti nel sito."
+
+#: administrator/components/com_config/admin.config.html.php:496
+#: administrator/components/com_config/admin.config.html.php:574
+msgid ""
+"<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>"
+msgstr ""
+"<b> UN USO IMPROPRIO DI QUESTA FUNZIONE POTREBBE RENDERE IL SITO NON "
+"OPERATIVO!</b>"
+
+#: administrator/components/com_config/admin.config.html.php:502
+#: administrator/components/com_config/admin.config.html.php:579
+msgid "World:"
+msgstr "Altri:"
+
+#: administrator/components/com_config/admin.config.html.php:527
+msgid "Directory Creation:"
+msgstr "Creazione cartelle:"
+
+#: administrator/components/com_config/admin.config.html.php:533
+msgid "Dont CHMOD new directories (use server defaults)"
+msgstr ""
+"Non dare permessi CHMOD alle nuove cartelle (usa quelli predefiniti del "
+"server)"
+
+#: administrator/components/com_config/admin.config.html.php:538
+msgid "CHMOD new directories"
+msgstr "Dai permessi CHMOD alle nuove cartelle"
+
+#: administrator/components/com_config/admin.config.html.php:543
+msgid ""
+"Select this option to define permission flags for new created directories"
+msgstr ""
+"Seleziona questa opzione per definire i permessi per per le nuove cartelle "
+"create"
+
+#: administrator/components/com_config/admin.config.html.php:558
+#: administrator/components/com_config/admin.config.html.php:567
+#: administrator/components/com_config/admin.config.html.php:585
+msgid "search"
+msgstr "cerca"
+
+#: administrator/components/com_config/admin.config.html.php:571
+msgid "Apply to existing directories"
+msgstr "Applica alle cartelle esistenti"
+
+#: administrator/components/com_config/admin.config.html.php:573
+msgid ""
+"Checking here will apply the permission flags to <em>all existing "
+"directories</em> of the site.<br/>"
+msgstr ""
+"Selezionando questo, saranno applicati questi permessi a tutte le cartelle "
+"esistenti nel sito."
+
+#: administrator/components/com_config/admin.config.html.php:598
+msgid "Metadata"
+msgstr "Metadati"
+
+#: administrator/components/com_config/admin.config.html.php:602
+msgid "Global Site Meta Description:"
+msgstr "Meta Descrizione generale del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:606
+msgid "Global Site Meta Keywords:"
+msgstr "Meta parole chiave generali del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:610
+msgid "Show Title Meta Tag:"
+msgstr "Mostra Meta tag Titolo:"
+
+#: administrator/components/com_config/admin.config.html.php:614
+msgid "Show the title meta tag when viewing content items"
+msgstr ""
+"Mostra il meta tag Titolo quando viene visualizzato un articolo di contenuto"
+
+#: administrator/components/com_config/admin.config.html.php:618
+msgid "Show Author Meta Tag:"
+msgstr "Mostra meta tag Autore:"
+
+#: administrator/components/com_config/admin.config.html.php:622
+msgid "Show the author meta tag when viewing content items"
+msgstr ""
+"Mostra il meta tag Autore quando viene visualizzato un articolo di contenuto"
+
+#: administrator/components/com_config/admin.config.html.php:632
+msgid "Mailer:"
+msgstr "Mittente:"
+
+#: administrator/components/com_config/admin.config.html.php:636
+msgid "Mail From:"
+msgstr "Posta da:"
+
+#: administrator/components/com_config/admin.config.html.php:640
+msgid "From Name:"
+msgstr "Da nome:"
+
+#: administrator/components/com_config/admin.config.html.php:644
+msgid "Sendmail Path:"
+msgstr "Percorso sendmail:"
+
+#: administrator/components/com_config/admin.config.html.php:648
+msgid "SMTP Auth:"
+msgstr "SMTP autenticazione:"
+
+#: administrator/components/com_config/admin.config.html.php:652
+msgid "SMTP User:"
+msgstr "SMTP utente:"
+
+#: administrator/components/com_config/admin.config.html.php:656
+msgid "SMTP Pass"
+msgstr "SMTP pass:"
+
+#: administrator/components/com_config/admin.config.html.php:660
+msgid "SMTP Host:"
+msgstr "SMTP Host:"
+
+#: administrator/components/com_config/admin.config.html.php:673
+msgid "Caching:"
+msgstr "Caching:"
+
+#: administrator/components/com_config/admin.config.html.php:681
+msgid "Cache Folder:"
+msgstr "Cartella cache:"
+
+#: administrator/components/com_config/admin.config.html.php:686
+msgid "Current cache is directory is <b>Writeable</b>"
+msgstr "Attualmente la cartella cache è <b>Scrivibile</b>"
+
+#: administrator/components/com_config/admin.config.html.php:688
+msgid ""
+"The cache directory is UNWRITEABLE - please set this directory to CHMOD755 "
+"before turning on the cache"
+msgstr ""
+"La cartella cache  NON è SCRIVIBILE - Prego configiurare questa cartella con "
+"i permessi CHMOD 755 prima di abilitare la cache"
+
+#: administrator/components/com_config/admin.config.html.php:694
+msgid "Cache Time:"
+msgstr "Tempo di cache:"
+
+#: administrator/components/com_config/admin.config.html.php:695
+msgid "seconds"
+msgstr "secondi"
+
+#: administrator/components/com_config/admin.config.html.php:705
+msgid "Statistics:"
+msgstr "Statistiche:"
+
+#: administrator/components/com_config/admin.config.html.php:707
+msgid "Enable/disable collection of site statistics"
+msgstr "Abilita/disabilita raccolta statistiche del sito"
+
+#: administrator/components/com_config/admin.config.html.php:710
+msgid "Log Content Hits by Date:"
+msgstr "Accessi ai contenuti per data:"
+
+#: administrator/components/com_config/admin.config.html.php:712
+msgid "WARNING : Large amounts of data will be collected"
+msgstr ""
+"ATTENZIONE: saranno archiviati parecchi dati, tenere d'occhio la grandezza "
+"del database"
+
+#: administrator/components/com_config/admin.config.html.php:715
+msgid "Log Search Strings:"
+msgstr "Stringhe di ricerca:"
+
+#: administrator/components/com_config/admin.config.html.php:722
+msgid "SEO"
+msgstr "SEO"
+
+#: administrator/components/com_config/admin.config.html.php:726
+msgid "Search Engine Optimization"
+msgstr "Ottimizzazione per Motori di Ricerca"
+
+#: administrator/components/com_config/admin.config.html.php:731
+msgid "Search Engine Friendly URLs:"
+msgstr "URL amichevoli per i motori di ricerca:"
+
+#: administrator/components/com_config/admin.config.html.php:733
+msgid "Apache only! Rename htaccess.txt to .htaccess before activating"
+msgstr ""
+"Solo per Apache! Rinominare il file htaccess.txt in .htaccess,  prima di "
+"attivare questa funzione"
+
+#: administrator/components/com_config/admin.config.html.php:736
+msgid "Dynamic Page Titles:"
+msgstr "Titoli pagina dinamici:"
+
+#: administrator/components/com_config/admin.config.html.php:738
+msgid "Dynamically changes the page title to reflect current content viewed"
+msgstr ""
+"Il titolo cambia dinamicamente per riflettere il contenuto correntemente "
+"visualizzato"
+
+#: administrator/components/com_config/admin.config.php:322
+#: administrator/components/com_config/admin.config.php:327
+msgid "Hide"
+msgstr "Nascondi"
+
+#: administrator/components/com_config/admin.config.php:323
+#: administrator/components/com_config/admin.config.php:328
+msgid "Show"
+msgstr "Mostra"
+
+#: administrator/components/com_config/admin.config.php:342
+msgid "System Default"
+msgstr "Predefinite di sistema"
+
+#: administrator/components/com_config/admin.config.php:344
+msgid "Simple"
+msgstr "Semplice"
+
+#: administrator/components/com_config/admin.config.php:345
+msgid "Maximum"
+msgstr "Massimo"
+
+#: administrator/components/com_config/admin.config.php:349
+msgid "On"
+msgstr "On"
+
+#: administrator/components/com_config/admin.config.php:350
+msgid "Off"
+msgstr "Off"
+
+#: administrator/components/com_config/admin.config.php:354
+msgid "PHP mail function"
+msgstr "Funzione email del PHP"
+
+#: administrator/components/com_config/admin.config.php:355
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: administrator/components/com_config/admin.config.php:356
+msgid "SMTP Server"
+msgstr "Server SMTP"
+
+#: administrator/components/com_config/admin.config.php:400
+msgid "Remember to rename htaccess.txt to .htaccess"
+msgstr "Ricorda di rinominare htaccess.txt in .htaccess"
+
+#: administrator/components/com_config/admin.config.php:428
+msgid "Remember to install the MambelFish component."
+msgstr "Ricorda di installare il componente Mambelfish."
+
+#: administrator/components/com_config/admin.config.php:485
+msgid "The Configuration Details have been updated"
+msgstr "I dettagli della Configurazione sono stati aggiornati"
+
+#: administrator/components/com_config/admin.config.php:539
+msgid "An Error Has Occurred! Unable to open config file to write!"
+msgstr ""
+"Si è verificato un errore! Non è possibile scrivere nel file configuration."
+"php!"
+
+#: administrator/components/com_contact/admin.contact.html.php:29
+msgid "Contact Manager"
+msgstr "Gestore contatti"
+
+#: administrator/components/com_contact/admin.contact.html.php:32
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: administrator/components/com_contact/admin.contact.html.php:52
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:94
+msgid "Name"
+msgstr "Nome"
+
+#: administrator/components/com_contact/admin.contact.html.php:61
+msgid "Category"
+msgstr "Categoria"
+
+#: administrator/components/com_contact/admin.contact.html.php:64
+msgid "Linked to User"
+msgstr "Collegato all'utente"
+
+#: administrator/components/com_contact/admin.contact.html.php:96
+msgid "Edit Contact"
+msgstr "Modifica contatto"
+
+#: administrator/components/com_contact/admin.contact.html.php:115
+msgid "Edit Category"
+msgstr "Modifica categoria"
+
+#: administrator/components/com_contact/admin.contact.html.php:162
+msgid "You must provide a name."
+msgstr "Si deve inserire un nome"
+
+#: administrator/components/com_contact/admin.contact.html.php:164
+msgid "Please select a Category."
+msgstr "Prego selezionare una categoria."
+
+#: administrator/components/com_contact/admin.contact.html.php:176
+msgid "Contact:"
+msgstr "Contatto:"
+
+#: administrator/components/com_contact/admin.contact.html.php:190
+msgid "Contact Details"
+msgstr "Dettagli contatto"
+
+#: administrator/components/com_contact/admin.contact.html.php:203
+msgid "Linked to User:"
+msgstr "Collegato all'utente:"
+
+#: administrator/components/com_contact/admin.contact.html.php:211
+msgid "Name:"
+msgstr "Nome:"
+
+#: administrator/components/com_contact/admin.contact.html.php:219
+msgid "Contact's Position:"
+msgstr "Posizione del contatto:"
+
+#: administrator/components/com_contact/admin.contact.html.php:227
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: administrator/components/com_contact/admin.contact.html.php:235
+msgid "Street Address:"
+msgstr "Indirizzo:"
+
+#: administrator/components/com_contact/admin.contact.html.php:243
+msgid "Town/Suburb:"
+msgstr "Città/Località:"
+
+#: administrator/components/com_contact/admin.contact.html.php:251
+msgid "State/County:"
+msgstr "Provincia/Stato:"
+
+#: administrator/components/com_contact/admin.contact.html.php:259
+msgid "Country:"
+msgstr "Nazione:"
+
+#: administrator/components/com_contact/admin.contact.html.php:267
+msgid "Postal Code/ZIP:"
+msgstr "CAP:"
+
+#: administrator/components/com_contact/admin.contact.html.php:275
+msgid "Telephone:"
+msgstr "Telefono:"
+
+#: administrator/components/com_contact/admin.contact.html.php:283
+msgid "Fax:"
+msgstr "Fax:"
+
+#: administrator/components/com_contact/admin.contact.html.php:291
+msgid "Miscellaneous Info:"
+msgstr "Informazioni varie:"
+
+#: administrator/components/com_contact/admin.contact.html.php:308
+msgid "Publishing Info"
+msgstr "Info pubblicazione"
+
+#: administrator/components/com_contact/admin.contact.html.php:313
+msgid "Site Default:"
+msgstr "Sito predefinito:"
+
+#: administrator/components/com_contact/admin.contact.html.php:337
+msgid "Access:"
+msgstr "Accesso:"
+
+#: administrator/components/com_contact/admin.contact.html.php:351
+msgid "Images"
+msgstr "Immagini"
+
+#: administrator/components/com_contact/admin.contact.html.php:356
+msgid "Image Info"
+msgstr "Info immagine"
+
+#: administrator/components/com_contact/admin.contact.html.php:361
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Image"
+msgstr "Immagine"
+
+#: administrator/components/com_contact/admin.contact.html.php:384
+#: administrator/components/com_contact/admin.contact.html.php:389
+msgid "Parameters"
+msgstr "Parametri"
+
+#: administrator/components/com_contact/admin.contact.html.php:394
+msgid ""
+"These Parameters only control what you see when you click to view a Contact "
+"item"
+msgstr ""
+"Questi parametri controllano cosa si mostra quando si visualizza un contatto"
+
+#: administrator/components/com_contact/admin.contact.php:255
+msgid "Select a record to %s"
+msgstr "Selezionare un record da  %s"
+
+#: administrator/components/com_contact/contact.xml
+msgid "# Category Items"
+msgstr "# articoli della categoria"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+"Una piccola immagine da piazzare a sinistra o a destra del menu articoli. "
+"L'immagine deve essere posta nella  cartella images/stories/"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+"Un suffisso da applicare alle classi del CSS della pagina, questo permette "
+"di personalizzare ogni  pagina con  lo stile desiderato"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Alignment of the image"
+msgstr "Allineamento dell'immagine"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Back Button"
+msgstr "Bottone indietro"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category Description"
+msgstr "Descrizione categoria"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category List - Category"
+msgstr "Elenco categoria - Categoria"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category List - Section"
+msgstr "Elenco Categoria - Sezione"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Description"
+msgstr "descrizione"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Description Text"
+msgstr "Testo descrizione"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr ""
+"Descrizione per pagina, se lasciato vuoto sarà caricata la variabile "
+"_WEBLINK_DESC dal file di lingua attuale"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Email Column"
+msgstr "Colonna email"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Fax Column"
+msgstr "Colonna fax"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Image Align"
+msgstr "Allineamento immagine"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+"L'immagine dev'essere collocata nella cartella /images/stories. Come "
+"predefinita verrà caricata web_links.jpg, Nessuna immagine, significa che "
+"non ci sono immagini caricate"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Menu Image"
+msgstr "Menu immagine"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Page Class Suffix"
+msgstr "Suffisso per la classe  della pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Page Title"
+msgstr "Titolo pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Position Column"
+msgstr "Colonna Posizione"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+"Mostra/nascondi il bottone Indietro, il quale rimanda alla pagina precedente"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Description below"
+msgstr "Mostra/nascondi la descrizione sotto"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr "Mostra/nascondi la descrizione per l'elenco delle altre categorie"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Email column"
+msgstr "Mostra/nascondi la colonna Email"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Fax column"
+msgstr "Mostra/nascondi la colonna Fax"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr "Mostra/nascondi la lista delle categorie nell'elenco vista pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr "Mostra/nascondi la lista delle categorie nell'elenco  vista pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Position column"
+msgstr "Mostra/nascondi la colonna Posizione"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Table Headings"
+msgstr "Mostra/nascondi l'intestazione delle tabelle"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Telephone column"
+msgstr "Mostra/nascondi la colonna telefono"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the number of items in each category"
+msgstr "Mostra/nascondi il numero di articoli in ogni categoria"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the pages Title"
+msgstr "Mostra/nascondi il titolo della pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Table Headings"
+msgstr "Intestazioni delle tabelle"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Telephone Column"
+msgstr "Colonna telefono"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+"Testo da mostrare in cima alla pagina. Se  lasciato bianco,  sarà usato il "
+"nome del Menu"
+
+#: administrator/components/com_contact/contact.xml
+msgid "This component shows a listing of Contact Information"
+msgstr "Questo componente mostra un elenco delle informazioni sui contatti"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Global"
+msgstr "Usa le Globali"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Address Icon"
+msgstr "Icona indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Contact Items"
+msgstr "Elemento Contatto"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Country"
+msgstr "Nazione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Description text"
+msgstr "Testo descrizione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Drop Down"
+msgstr "Menu a tendina"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:109
+msgid "Email"
+msgstr "Email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Copy"
+msgstr "Copia email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Form"
+msgstr "Modulo email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Icon"
+msgstr "Icona email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email description"
+msgstr "Descrizione email"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:127
+msgid "Fax"
+msgstr "Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Fax Icon"
+msgstr "Icona fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Address info"
+msgstr "Icona per informazioni sull'indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Email info"
+msgstr "Icona per informazioni sull'email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Fax info"
+msgstr "Icona per informazioni sul fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Misc info"
+msgstr "Icona per informazioni su informazioni  varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Telephone info"
+msgstr "Icona per informazioni sul telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons"
+msgstr "Icone"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons/text"
+msgstr "Icone/testo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Icon"
+msgstr "Icona varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Info"
+msgstr "Info varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Parameters for individual Contact Items"
+msgstr "Parametri per elemento Contatto individuale"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:100
+msgid "Position"
+msgstr "Posizione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Post/Zip Code"
+msgstr "C.A.P."
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Print Icon"
+msgstr "Icona stampa"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Description Text below"
+msgstr "Mostra/nascondi la descrizione sottostante"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Drop Down select list in Contact view"
+msgstr "Mostra/nascondi il menu a tendina nella vista contatti"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Vcard"
+msgstr "Mostra/nascondi la Vcard"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the checkbox to email a copy to the senders address"
+msgstr ""
+"Mostra/nascondi la scelta se inviare o meno una copia, via email, "
+"all'indirizzo del mittente"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the country info"
+msgstr "Mostra/nascondi la Nazione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"Show/Hide the email info, if you set to show the address will be protected "
+"from spambots by javascript cloaking"
+msgstr ""
+"Mostra/nascondi l'email. Se si sceglie di mostrare l'indirizzo, questo sarà "
+"protetto dagli spambots con un javascript di codifica"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the email to form"
+msgstr "Mostra/nascondi l'email nel modulo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the fax info"
+msgstr "Mostra/nascondi il Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the image"
+msgstr "Mostra/nascondi l'immagine"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr "Mostra/nascondi il bottone Stampa - avrà effetto solo in questa pagina"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the misc info"
+msgstr "Mostra/nascondi le info varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the name info"
+msgstr "Mostra/nascondi il Nome"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the position info"
+msgstr "Mostra/nascondi la Posizione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the post code info"
+msgstr "Mostra/nascondi il Codice Postale"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the state info"
+msgstr "Mostra/nascondi la Provincia"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the street address info"
+msgstr "Mostra/nascondi l'Indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the suburb info"
+msgstr "Mostra/nascondi la Città/Località"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the telephone info"
+msgstr "Mostra/nascondi il Telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Street Address"
+msgstr "Indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone"
+msgstr "Telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone Icon"
+msgstr "Icona telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Text"
+msgstr "Testo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"The Description text for the Email form, if left blank it will use the "
+"_EMAIL_DESCRIPTION language definition"
+msgstr ""
+"Il testo descrittivo per il modulo da inviare, se lasciato vuoto, si "
+"utilizzerà la definizione della variabile _EMAIL_DESCRIPTION, nella lingua "
+"attualmente in uso"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Town/Suburb"
+msgstr "Città/Località"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Icons, text or nothing next to the contact information displayed"
+msgstr ""
+"Visualizza un'icona, del testo oppure nulla a fianco dei campi, nella pagina "
+"contatti"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Vcard"
+msgstr "Vcard"
+
+#: components/com_contact/contact.class.php:129
+msgid "Mambo vCard for %s"
+msgstr "Mambo vCard per %s"
+
+#: components/com_contact/contact.html.php:118
+msgid "Phone"
+msgstr "Telefono"
+
+#: components/com_contact/contact.html.php:263
+#: components/com_contact/contact.php:345
+msgid "Please make sure the form is complete and valid."
+msgstr "Prego assicurarsi che il modulo sia completo ed esatto."
+
+#: components/com_contact/contact.html.php:390
+msgid "Select Contact:"
+msgstr "Seleziona contatto:"
+
+#: components/com_contact/contact.html.php:634
+msgid "Download information as a"
+msgstr "Scarica informazione come"
+
+#: components/com_contact/contact.html.php:636
+msgid "VCard"
+msgstr "VCard"
+
+#: components/com_contact/contact.html.php:657
+msgid "Enter your name:"
+msgstr "Inserisci il tuo nome:"
+
+#: components/com_contact/contact.html.php:661
+msgid "E-mail address:"
+msgstr "Indirizzo e-mail:"
+
+#: components/com_contact/contact.html.php:665
+msgid "Message subject:"
+msgstr "Soggetto del messaggio:"
+
+#: components/com_contact/contact.html.php:669
+msgid "Enter your message:"
+msgstr "Testo del messaggio:"
+
+#: components/com_contact/contact.html.php:677
+msgid "Email a copy of this message to your own address"
+msgstr "Invia una copia di questo messaggio, al  tuo indirizo email"
+
+#: components/com_contact/contact.html.php:681
+msgid "Send"
+msgstr "Invia"
+
+#: components/com_contact/contact.html.php:698
+msgid "There are no Contact Details listed."
+msgstr "Non ci sono contatti elencati."
+
+#: components/com_contact/contact.php:111
+msgid "The Contact list for this Website."
+msgstr "La lista Contatti di questo sito."
+
+#: components/com_contact/contact.php:233
+msgid "Send an Email to this Contact:"
+msgstr "Invia una email a questo Contatto:"
+
+#: components/com_contact/contact.php:280
+msgid "Address: "
+msgstr "Indirizzo:"
+
+#: components/com_contact/contact.php:281
+msgid "Email: "
+msgstr "Email:"
+
+#: components/com_contact/contact.php:282
+msgid "Telephone: "
+msgstr "Telefono:"
+
+#: components/com_contact/contact.php:283
+msgid "Fax: "
+msgstr "Fax:"
+
+#: components/com_contact/contact.php:284
+msgid "Information: "
+msgstr "Informazione:"
+
+#: components/com_contact/contact.php:337
+msgid "Enquiry"
+msgstr "Richiesta"
+
+#: components/com_contact/contact.php:348
+msgid "This is an enquiry e-mail via %s from:"
+msgstr "Questa è una richiesta via email da %s da parte di:"
+
+#: components/com_contact/contact.php:354
+msgid "The following is a copy of the message you sent to %s via %s "
+msgstr "La seguente è la copia del messaggio che hai spedito a %s da %s"
+
+#: components/com_contact/contact.php:356
+msgid "Copy of: %s"
+msgstr "Copia di: %s"
+
+#: components/com_contact/contact.php:361
+msgid "Thank you for your e-mail"
+msgstr "Grazie per la tua e-mail"
+
+#: administrator/components/com_content/admin.content.html.php:37
+#: administrator/components/com_content/admin.content.html.php:41
+msgid "Content Items Manager"
+msgstr "Gestore articoli di contenuto"
+
+#: administrator/components/com_content/admin.content.html.php:37
+msgid "Section: All"
+msgstr "Sezioni: Tutte"
+
+#: administrator/components/com_content/admin.content.html.php:81
+#: administrator/components/com_content/admin.content.html.php:350
+msgid "Title"
+msgstr "Titolo"
+
+#: administrator/components/com_content/admin.content.html.php:87
+msgid "Front Page"
+msgstr "Pagina principale"
+
+#: administrator/components/com_content/admin.content.html.php:102
+msgid "ID"
+msgstr "ID"
+
+#: administrator/components/com_content/admin.content.html.php:117
+#: administrator/components/com_content/admin.content.html.php:362
+#: components/com_content/content.html.php:220
+msgid "Author"
+msgstr "Autore"
+
+#: administrator/components/com_content/admin.content.html.php:120
+#: administrator/components/com_content/admin.content.html.php:365
+#: components/com_content/content.html.php:206
+msgid "Date"
+msgstr "Data"
+
+#: administrator/components/com_content/admin.content.html.php:142
+msgid "Expired"
+msgstr "Scaduto"
+
+#: administrator/components/com_content/admin.content.html.php:150
+msgid "Always"
+msgstr "Sempre"
+
+#: administrator/components/com_content/admin.content.html.php:150
+msgid "Start:"
+msgstr "Inizio:"
+
+#: administrator/components/com_content/admin.content.html.php:157
+#: administrator/components/com_content/admin.content.html.php:159
+msgid "Finish:"
+msgstr "Fine:"
+
+#: administrator/components/com_content/admin.content.html.php:157
+msgid "No Expiry"
+msgstr "Senza scadenza"
+
+#: administrator/components/com_content/admin.content.html.php:196
+msgid "Edit Content"
+msgstr "Modifica contenuto"
+
+#: administrator/components/com_content/admin.content.html.php:207
+msgid "Publish Information"
+msgstr "Pubblica informazione"
+
+#: administrator/components/com_content/admin.content.html.php:289
+msgid "Please make a selection from the list to send to Trash"
+msgstr "Prego selezionare un articolo da cestinare"
+
+#: administrator/components/com_content/admin.content.html.php:290
+msgid ""
+"Are you sure you want to Trash the selected items? \\nThis will not "
+"permanently delete the items."
+msgstr ""
+"Si è sicuri di voler cestinare l'articolo selezionato? \\n Questa "
+"operazione  non cancellerà permanentemente l'articolo."
+
+#: administrator/components/com_content/admin.content.html.php:521
+#: components/com_content/content.html.php:908
+msgid "Content item must have a title"
+msgstr "L'articolo di contenuto deve avere un titolo"
+
+#: administrator/components/com_content/admin.content.html.php:523
+msgid "You must select a Section."
+msgstr "Si deve selezionare una Sezione"
+
+#: administrator/components/com_content/admin.content.html.php:525
+#: administrator/components/com_content/admin.content.html.php:527
+msgid "You must select a Category."
+msgstr "Si deve selezionare una Categoria"
+
+#: administrator/components/com_content/admin.content.html.php:579
+msgid "Content Item:"
+msgstr "Articolo di contenuto:"
+
+#: administrator/components/com_content/admin.content.html.php:618
+msgid "Item Details"
+msgstr "Dettagli articolo"
+
+#: administrator/components/com_content/admin.content.html.php:623
+#: components/com_content/content.html.php:986
+msgid "Title:"
+msgstr "Titolo:"
+
+#: administrator/components/com_content/admin.content.html.php:637
+msgid "Title Alias:"
+msgstr "Titolo Alias:"
+
+#: administrator/components/com_content/admin.content.html.php:655
+msgid "Intro Text:"
+msgstr "Introduzione:"
+
+#: administrator/components/com_content/admin.content.html.php:655
+msgid "required"
+msgstr "richiesto"
+
+#: administrator/components/com_content/admin.content.html.php:663
+msgid "Main Text:"
+msgstr "testo esteso:"
+
+#: administrator/components/com_content/admin.content.html.php:663
+msgid "optional"
+msgstr "opzionale"
+
+#: administrator/components/com_content/admin.content.html.php:682
+#: components/com_content/content.html.php:1141
+msgid "Publishing"
+msgstr "Pubblicazione"
+
+#: administrator/components/com_content/admin.content.html.php:692
+msgid "Show on Frontpage:"
+msgstr "Mostra nella pagina principale:"
+
+#: administrator/components/com_content/admin.content.html.php:715
+#: components/com_content/content.html.php:1167
+msgid "Author Alias:"
+msgstr "Alias Autore:"
+
+#: administrator/components/com_content/admin.content.html.php:723
+msgid "Change Creator:"
+msgstr "Cambia creatore:"
+
+#: administrator/components/com_content/admin.content.html.php:735
+msgid "Override Created Date"
+msgstr "Cambia data creazione"
+
+#: administrator/components/com_content/admin.content.html.php:744
+#: components/com_content/content.html.php:1183
+msgid "Start Publishing:"
+msgstr "Inizio pubblicazione:"
+
+#: administrator/components/com_content/admin.content.html.php:753
+#: components/com_content/content.html.php:1192
+msgid "Finish Publishing:"
+msgstr "Scadenza pubblicazione:"
+
+#: administrator/components/com_content/admin.content.html.php:768
+msgid "Content ID:"
+msgstr "ID Contenuto:"
+
+#: administrator/components/com_content/admin.content.html.php:779
+#: components/com_content/content.html.php:1149
+msgid "State:"
+msgstr "Stato:"
+
+#: administrator/components/com_content/admin.content.html.php:782
+msgid "Archived"
+msgstr "Archiviato"
+
+#: administrator/components/com_content/admin.content.html.php:782
+msgid "Draft Unpublished"
+msgstr "Bozza non pubblicata"
+
+#: administrator/components/com_content/admin.content.html.php:794
+msgid "Reset Hit Count"
+msgstr "Azzera contatore visite"
+
+#: administrator/components/com_content/admin.content.html.php:801
+msgid "Revised"
+msgstr "Revisionato"
+
+#: administrator/components/com_content/admin.content.html.php:805
+msgid "times"
+msgstr "volte"
+
+#: administrator/components/com_content/admin.content.html.php:815
+#: administrator/components/com_content/admin.content.html.php:825
+msgid "By"
+msgstr "Da"
+
+#: administrator/components/com_content/admin.content.html.php:821
+msgid "Last Modified"
+msgstr "Ultima modifica"
+
+#: administrator/components/com_content/admin.content.html.php:836
+msgid "MOSImage Control"
+msgstr "Controllo MOSImage"
+
+#: administrator/components/com_content/admin.content.html.php:840
+msgid "Sub-folder:"
+msgstr "Sotto-cartella:"
+
+#: administrator/components/com_content/admin.content.html.php:844
+msgid "Gallery Images:"
+msgstr "Gallerua immagini:"
+
+#: administrator/components/com_content/admin.content.html.php:854
+#: components/com_content/content.html.php:962
+msgid "Add"
+msgstr "Aggiungi"
+
+#: administrator/components/com_content/admin.content.html.php:859
+msgid "Content Images:"
+msgstr "Immagini contenuto:"
+
+#: administrator/components/com_content/admin.content.html.php:869
+msgid "up"
+msgstr "su"
+
+#: administrator/components/com_content/admin.content.html.php:870
+msgid "down"
+msgstr "giù"
+
+#: administrator/components/com_content/admin.content.html.php:871
+msgid "remove"
+msgstr "rimuovi"
+
+#: administrator/components/com_content/admin.content.html.php:876
+msgid "Edit the image selected:"
+msgstr "Modifica l'immagine selezionata:"
+
+#: administrator/components/com_content/admin.content.html.php:880
+#: components/com_content/content.html.php:1091
+msgid "Source:"
+msgstr "Sorgente:"
+
+#: administrator/components/com_content/admin.content.html.php:888
+msgid "Image Align:"
+msgstr "Allinea immagine:"
+
+#: administrator/components/com_content/admin.content.html.php:896
+#: components/com_content/content.html.php:1107
+msgid "Alt Text:"
+msgstr "Testo Alt:"
+
+#: administrator/components/com_content/admin.content.html.php:904
+#: components/com_content/content.html.php:1115
+msgid "Border:"
+msgstr "Bordo:"
+
+#: administrator/components/com_content/admin.content.html.php:912
+msgid "Caption:"
+msgstr "Didascalìa:"
+
+#: administrator/components/com_content/admin.content.html.php:920
+msgid "Caption Position:"
+msgstr "Posizione didascalìa:"
+
+#: administrator/components/com_content/admin.content.html.php:928
+msgid "Caption Align:"
+msgstr "Allinea disascalìa:"
+
+#: administrator/components/com_content/admin.content.html.php:936
+msgid "Width:"
+msgstr "Larghezza:"
+
+#: administrator/components/com_content/admin.content.html.php:958
+msgid "Parameter Control"
+msgstr "Controllo parametri"
+
+#: administrator/components/com_content/admin.content.html.php:963
+msgid ""
+"These Parameters only control what you see when you click to view an item "
+"fully"
+msgstr ""
+"Questi parametri controllano solamente cosa si vede quando si clicca per "
+"vedere l'articolo completo."
+
+#: administrator/components/com_content/admin.content.html.php:975
+msgid "Meta Info"
+msgstr "Meta Info"
+
+#: administrator/components/com_content/admin.content.html.php:980
+msgid "Meta Data"
+msgstr "Meta data"
+
+#: administrator/components/com_content/admin.content.html.php:992
+#: components/com_content/content.html.php:1223
+msgid "Keywords:"
+msgstr "Parola chiave:"
+
+#: administrator/components/com_content/admin.content.html.php:999
+msgid "Add Sect/Cat/Title"
+msgstr "Aggiungi Sez/Cat/Titolo"
+
+#: administrator/components/com_content/admin.content.html.php:1015
+msgid "This will create a 'Link - Content Item' in the menu you select"
+msgstr ""
+"Questo creerà un \"Collegamento ad articolo di contenuto\" nel menu  "
+"selezionato"
+
+#: administrator/components/com_content/admin.content.html.php:1118
+msgid "Please select something"
+msgstr "Prego selezionare qualcosa"
+
+#: administrator/components/com_content/admin.content.html.php:1130
+msgid "Move Items"
+msgstr "Sposata articolo"
+
+#: administrator/components/com_content/admin.content.html.php:1139
+msgid "Move to Section/Category:"
+msgstr "Sposta alla Sezione/Categoria:"
+
+#: administrator/components/com_content/admin.content.html.php:1145
+msgid "Items being Moved:"
+msgstr "Articoli che stanno per essere spostati:"
+
+#: administrator/components/com_content/admin.content.html.php:1188
+msgid "Please select a Section/Category to copy the items to"
+msgstr "Prego selezionare una Sezione/Categoria dove copiare gli articoli"
+
+#: administrator/components/com_content/admin.content.html.php:1199
+msgid "Copy Content Items"
+msgstr "Copia articolo di contenuto"
+
+#: administrator/components/com_content/admin.content.html.php:1208
+msgid "Copy to Section/Category:"
+msgstr "Copia nella Sezione/Categoria:"
+
+#: administrator/components/com_content/admin.content.html.php:1214
+msgid "Items being copied:"
+msgstr "Articoli che stanno per essere copiati:"
+
+#: administrator/components/com_content/admin.content.php:242
+#: administrator/components/com_content/admin.content.php:351
+msgid "- All Authors -"
+msgstr "- Tutti gli Autori -"
+
+#: administrator/components/com_content/admin.content.php:382
+msgid "You cannot edit an archived item"
+msgstr "Non si può modificare un articolo archiviato"
+
+#: administrator/components/com_content/admin.content.php:407
+msgid "The module %s is currently being edited by another administrator"
+msgstr ""
+"Il Modulo %s è attualmente in corso di modifica da parte di un altro "
+"amministratore"
+
+#: administrator/components/com_content/admin.content.php:423
+#: administrator/components/com_content/admin.content.php:455
+#: administrator/components/com_content/admin.content.php:594
+msgid "Never"
+msgstr "Mai"
+
+#: administrator/components/com_content/admin.content.php:470
+msgid "Select Section"
+msgstr "Seleziona Sezione"
+
+#: administrator/components/com_content/admin.content.php:483
+#: administrator/components/com_content/admin.content.php:499
+#: administrator/components/com_content/admin.content.php:507
+msgid "Select Category"
+msgstr "Seleziona categoria"
+
+#: administrator/components/com_content/admin.content.php:549
+msgid "Bottom"
+msgstr "In basso"
+
+#: administrator/components/com_content/admin.content.php:550
+msgid "Top"
+msgstr "In alto"
+
+#: administrator/components/com_content/admin.content.php:677
+msgid "Successfully Saved changes to Item: "
+msgstr "Le modifiche all'articolo sono state salvate"
+
+#: administrator/components/com_content/admin.content.php:682
+msgid "Successfully Saved Item: "
+msgstr "Articolo salvato correttamente"
+
+#: administrator/components/com_content/admin.content.php:701
+msgid "archive"
+msgstr "archivio"
+
+#: administrator/components/com_content/admin.content.php:723
+msgid "%d Item successfully Archived"
+msgstr "%d articolo è stato archiviato"
+
+#: administrator/components/com_content/admin.content.php:725
+msgid "%d Item successfully Published"
+msgstr "%d articolo è stato pubblicato"
+
+#: administrator/components/com_content/admin.content.php:727
+msgid "%d Item successfully Unpublished"
+msgstr "%d articolo non più pubblicato"
+
+#: administrator/components/com_content/admin.content.php:753
+msgid "Select an item to toggle"
+msgstr "Selezionare un articolo al quale cambiare lo stato"
+
+#: administrator/components/com_content/admin.content.php:788
+msgid "Select an item to delete"
+msgstr "Selezionare un articolo da cancellare"
+
+#: administrator/components/com_content/admin.content.php:805
+msgid "%d Item sent to the Trash"
+msgstr "%d articolo cestinato"
+
+#: administrator/components/com_content/admin.content.php:886
+#: administrator/components/com_content/admin.content.php:990
+msgid "An error has occurred"
+msgstr "Si è verificato un errore"
+
+#: administrator/components/com_content/admin.content.php:935
+msgid "%d Item successfully moved to Section: %s, Category: %s"
+msgstr "%d l'articolo è stato spostato alla Sezione: %s, Categoria: %s"
+
+#: administrator/components/com_content/admin.content.php:1062
+msgid "%d Item successfully copied to Section: %s, Category: %s"
+msgstr "%d l'articolo è stato copiato nella Sezione: %s, Categoria: %s"
+
+#: administrator/components/com_content/admin.content.php:1079
+msgid "Successfully Reset Hit count"
+msgstr "Il contatore delle visite è stato azzerato"
+
+#: administrator/components/com_content/admin.content.php:1145
+msgid "%s (Link - Static Content) in menu: %s successfully created"
+msgstr "%s (collegamento - contenuto statico) nel menu: %s è stato creato"
+
+#: administrator/components/com_content/content.xml
+msgid "A text key that an item may be referenced by (like a help reference)"
+msgstr ""
+"Un testo chiave con il quale un articolo può essere referenziato (come un "
+"aiuto di riferimento)"
+
+#: administrator/components/com_content/content.xml
+msgid "Author Names"
+msgstr "Nomi Autori"
+
+#: administrator/components/com_content/content.xml
+msgid "Category Name Linkable"
+msgstr "Nome categoria collegabile"
+
+#: administrator/components/com_content/content.xml
+msgid "Content Page"
+msgstr "Pagina di contenuto"
+
+#: administrator/components/com_content/content.xml
+msgid "Created Date and Time"
+msgstr "Data ed Ora create"
+
+#: administrator/components/com_content/content.xml
+#: components/com_content/content.html.php:1015
+msgid "Intro Text"
+msgstr "Introduzione"
+
+#: administrator/components/com_content/content.xml
+msgid "Item Rating"
+msgstr "Valutazione articolo"
+
+#: administrator/components/com_content/content.xml
+msgid "Key Reference"
+msgstr "Riferimento chiave"
+
+#: administrator/components/com_content/content.xml
+msgid "Linked Titles"
+msgstr "Titoli collegati"
+
+#: administrator/components/com_content/content.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr ""
+"Trasforma il testo Categoria, un collegamento all'attuale pagina di categoria"
+
+#: administrator/components/com_content/content.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr ""
+"Trasforma il testo Sezione, un collegamento all'attuale pagina di sezione"
+
+#: administrator/components/com_content/content.xml
+msgid "Make your Item titles linkable"
+msgstr "Rendi collegabile il titolo dell'articolo"
+
+#: administrator/components/com_content/content.xml
+msgid "Modified Date and Time"
+msgstr "Data ed Ora modificate"
+
+#: administrator/components/com_content/content.xml
+msgid "PDF Icon"
+msgstr "Icona PDF"
+
+#: administrator/components/com_content/content.xml
+msgid "Section Name"
+msgstr "Nome Sezione"
+
+#: administrator/components/com_content/content.xml
+msgid "Section Name Linkable"
+msgstr "Nome Sezione collegabile"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr "Mostra/Nascondi la categoria alla quale l'articolo  appartiene"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr "Mostra/Nascondi la sezione alla quale l'articolo  appartiene"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the intro text"
+msgstr "Mostra/Nascondi l'Introduzione"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr ""
+"Mostra/Nascondi l'Autore dell'articolo - ha effetto solo in questa pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr ""
+"Mostra/Nascondi la data di creazione dell'articolo - ha effetto solo in "
+"questa pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr ""
+"Mostra/Nascondi il bottone Email dell'articolo - ha effetto solo in questa "
+"pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr ""
+"Mostra/Nascondi la data di modifica dell'articolo - ha effetto solo in "
+"questa pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr ""
+"Mostra/Nascondi il bottone PDF dell'articolo - ha effetto solo in questa "
+"pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr ""
+"Mostra/Nascondi la valutazione dell'articolo - ha effetto solo in questa "
+"pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the items title"
+msgstr "Mostra/Nascondi il titolo dell'articolo"
+
+#: administrator/components/com_content/content.xml
+msgid "This shows a single content page"
+msgstr "Questo mostra una singola pagina di contenuto"
+
+#: components/com_content/content.html.php:70
+msgid "This Category is currently empty"
+msgstr "Questa categoria è vuota"
+
+#: components/com_content/content.html.php:118
+msgid "%d item"
+msgstr "%d articolo"
+
+#: components/com_content/content.html.php:134
+msgid "Registered Users Only"
+msgstr "Solo Utenti registrati"
+
+#: components/com_content/content.html.php:164
+msgid "Filter"
+msgstr "Filtro"
+
+#: components/com_content/content.html.php:186
+msgid "Display #"
+msgstr "Mostra #"
+
+#: components/com_content/content.html.php:213
+msgid "Item Title"
+msgstr "Titolo articolo"
+
+#: components/com_content/content.html.php:270
+#: components/com_content/content.html.php:420
+msgid "Register to read more..."
+msgstr "Registrati per leggere il resto..."
+
+#: components/com_content/content.html.php:350
+msgid "More..."
+msgstr "Continua..."
+
+#: components/com_content/content.html.php:415
+msgid "Read more..."
+msgstr "Leggi tutto..."
+
+#: components/com_content/content.html.php:610
+#: components/com_content/content.html.php:612
+#: components/com_content/content.html.php:616
+msgid "PDF"
+msgstr "PDF"
+
+#: components/com_content/content.html.php:635
+#: components/com_content/content.html.php:637
+#: components/com_content/content.html.php:641
+msgid "E-mail"
+msgstr "E-mail"
+
+#: components/com_content/content.html.php:912
+msgid "Please select a category"
+msgstr "Prego selezionare una categoria"
+
+#: components/com_content/content.html.php:914
+#: components/com_content/content.html.php:923
+msgid "Content item must have intro text"
+msgstr "Il contenuto deve avere almeno l'Introduzione"
+
+#: components/com_content/content.html.php:939
+msgid "Please either Cancel or Save the current change"
+msgstr "Prego Salvare o Cancellare le modifiche effettuate"
+
+#: components/com_content/content.html.php:948
+msgid "Expiry Date:"
+msgstr "Data scadenza:"
+
+#: components/com_content/content.html.php:950
+msgid "Version:"
+msgstr "Versione:"
+
+#: components/com_content/content.html.php:952
+msgid "Created:"
+msgstr "Creato:"
+
+#: components/com_content/content.html.php:954
+msgid "Last Modified:"
+msgstr "Ultima modifica:"
+
+#: components/com_content/content.html.php:964
+msgid "Item Information"
+msgstr "Informazione articolo"
+
+#: components/com_content/content.html.php:965
+msgid "Info"
+msgstr "Info"
+
+#: components/com_content/content.html.php:1015
+#: components/com_content/content.html.php:1021
+msgid "Required"
+msgstr "Richiesto"
+
+#: components/com_content/content.html.php:1021
+#: components/com_content/content.html.php:1039
+msgid "Main Text"
+msgstr "Testo principale"
+
+#: components/com_content/content.html.php:1039
+msgid "Optional"
+msgstr "Opzionale"
+
+#: components/com_content/content.html.php:1061
+msgid "Sub-folder"
+msgstr "Sotto-cartella"
+
+#: components/com_content/content.html.php:1066
+msgid "Gallery Images"
+msgstr "Galleria immagini"
+
+#: components/com_content/content.html.php:1069
+msgid "Content Images"
+msgstr "Immagini di contenuto"
+
+#: components/com_content/content.html.php:1072
+msgid "Edit Image"
+msgstr "Modifica immagine"
+
+#: components/com_content/content.html.php:1078
+msgid "Insert"
+msgstr "Inserisci"
+
+#: components/com_content/content.html.php:1083
+msgid "Up"
+msgstr "Su"
+
+#: components/com_content/content.html.php:1084
+msgid "Down"
+msgstr "Giù"
+
+#: components/com_content/content.html.php:1085
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: components/com_content/content.html.php:1099
+msgid "Align:"
+msgstr "Allinea:"
+
+#: components/com_content/content.html.php:1132
+#: components/com_content/content.html.php:1135
+msgid "No Image"
+msgstr "Nessuna immagine"
+
+#: components/com_content/content.html.php:1201
+msgid "Show on Front Page:"
+msgstr "Mostra nella Pagina Principale:"
+
+#: components/com_content/content.html.php:1260
+#: components/com_content/content.php:1444
+msgid ""
+"You must enter valid e-mail addresses for both yourself and your recipient."
+msgstr ""
+"Si deve inserire un indirizzo e-mail valido sia per il mittente che per il "
+"destinatario."
+
+#: components/com_content/content.html.php:1274
+msgid "E-mail this to a friend."
+msgstr "Invia per e-mail ad un amico."
+
+#: components/com_content/content.html.php:1282
+msgid "Your friend's E-mail:"
+msgstr "L'email del tuo amico:"
+
+#: components/com_content/content.html.php:1290
+msgid "Your Name:"
+msgstr "Il tuo nome:"
+
+#: components/com_content/content.html.php:1298
+msgid "Your E-mail:"
+msgstr "La tua email:"
+
+#: components/com_content/content.html.php:1317
+msgid "Send e-mail"
+msgstr "Invia e-mail"
+
+#: components/com_content/content.html.php:1338
+msgid "This item has been sent to %s"
+msgstr "Questo articolo è stato spedito a %s"
+
+#: components/com_content/content.php:432
+msgid "Date Asc"
+msgstr "Data asc"
+
+#: components/com_content/content.php:433
+msgid "Date Desc"
+msgstr "Data disc"
+
+#: components/com_content/content.php:437
+msgid "Title Asc"
+msgstr "Titolo asc"
+
+#: components/com_content/content.php:438
+msgid "Title Desc"
+msgstr "Titolo disc"
+
+#: components/com_content/content.php:442
+msgid "Hits Asc"
+msgstr "Visite asc"
+
+#: components/com_content/content.php:443
+msgid "Hits Desc"
+msgstr "Visite disc"
+
+#: components/com_content/content.php:447
+msgid "Author Asc"
+msgstr "Autore asc"
+
+#: components/com_content/content.php:448
+msgid "Author Desc"
+msgstr "Autore disc"
+
+#: components/com_content/content.php:451
+msgid "Ordering"
+msgstr "Ordinamento"
+
+#: components/com_content/content.php:642
+#: components/com_content/content.php:722
+msgid "There are currently no Archived Entries for this Category"
+msgstr "Attualmente non ci sono articoli archiviati per questa categoria"
+
+#: components/com_content/content.php:820
+msgid "Here are the Archived entries for %s %s"
+msgstr "Ci sono articoli archiviati per %s %s"
+
+#: components/com_content/content.php:954
+msgid "There are no Archived entries for %s %s"
+msgstr "Non ci sono articoli archiviati per %s %s"
+
+#: components/com_content/content.php:958
+msgid "There are no items to display"
+msgstr "Non ci sono articoli da mostrare"
+
+#: components/com_content/content.php:1161
+msgid "The module [ %s ] is currently being edited by another person."
+msgstr ""
+"Il modulo [%s] è attualmente in corso di modifca da parte di un altro "
+"amministratore."
+
+#: components/com_content/content.php:1368
+msgid ""
+"A new content item has been submitted by [ %s ]  titled [ %s ]  from section "
+"[ %s ]  and category  [ %s ]"
+msgstr ""
+"Un nuovo articolo di contenuto è stato inserito da [ %s ] intitolato [ %s ] "
+"nella sezione [ %s ] e categoria [ %s ]"
+
+#: components/com_content/content.php:1368
+msgid "New Item"
+msgstr "Nuovo articolo"
+
+#: components/com_content/content.php:1373
+msgid "Item saved successfully."
+msgstr "Articolo salvato correttamente."
+
+#: components/com_content/content.php:1373
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+"Grazie per il tuo contributo, sarà visionato prima di essere inserito sul "
+"sito."
+
+#: components/com_content/content.php:1435
+msgid "Item sent by %s"
+msgstr "Articolo inviato da %s"
+
+#: components/com_content/content.php:1455
+msgid ""
+" The following page from the \"%s\" website has been sent to you by %s ( %"
+"s ).\n"
+"\n"
+"You can access it at the following url:\n"
+"%s"
+msgstr ""
+"Ti sono state spedite le seguenti pagine dal sito \"%s\"  da  %s ( %s ).\n"
+"\n"
+
+#: components/com_content/content.php:1506
+msgid "You already voted for this poll today!"
+msgstr "Hai già votato per questo sondaggio, oggi!"
+
+#: components/com_content/content.php:1509
+msgid "Thanks for your vote!"
+msgstr "Grazie per il tuo voto"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_banners.php:73
+msgid "Advertisement"
+msgstr "Pubblicità"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:40
+msgid "Hi, %s"
+msgstr "Ciao, %s"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:65
+msgid "username"
+msgstr "nome utente"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:69
+msgid "password"
+msgstr "password"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:71
+msgid "Remember Me"
+msgstr "Memorizza"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:72
+msgid "Remember me"
+msgstr "Memorizza"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:81
+msgid "Password Reminder"
+msgstr "Password dimenticata?"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:90
+msgid "No account yet?"
+msgstr "Non sei utente?"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:92
+msgid "Create one"
+msgstr "Registrati ora"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_search.php:15
+msgid "Search"
+msgstr "Cerca"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_search.php:17
+msgid "search..."
+msgstr "cerca..."
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:25
+msgid "Time"
+msgstr "Tempo"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:26
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:28
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:26
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:28
+msgid "Enabled"
+msgstr "Abilitato"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:35
+msgid "Members"
+msgstr "Membri"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:39
+msgid "News"
+msgstr "Novità"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:43
+msgid "WebLinks"
+msgstr "WebLinks"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:57
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:59
+msgid "Visitors"
+msgstr "Visitatori"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_templatechooser.php:75
+msgid "Select"
+msgstr "Seleziona"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:28
+msgid "We have %d guest online"
+msgid_plural "We have %d guests online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:32
+msgid "We have %d member online"
+msgid_plural "We have %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:36
+msgid "We have %d guest online and "
+msgid_plural "We have %d guests online and "
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:37
+msgid " %d member online"
+msgid_plural " %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:54
+msgid "No Users Online"
+msgstr "Nessun utente online"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:189
+msgid "Select an item to %a"
+msgstr "seleziona un articolo da %a"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Intro"
+msgstr "# Intro"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Leading"
+msgstr "# Intestazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Links"
+msgstr "# Collegamenti"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Alphabetical"
+msgstr "Autore in ordine alfabetico"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Reverse-Alphabetical"
+msgstr "Autore in ordine alfabetico inverso"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Auto"
+msgstr "Auto"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Category Order"
+msgstr "Ordine categoria"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Columns"
+msgstr "Colonne"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Display {mosimages}."
+msgstr "Mostra {mosimage}."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage Ordering"
+msgstr "Ordinamento pagina principale"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Item Titles"
+msgstr "Titoli articoli"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Least Hits"
+msgstr "Visite minime"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "MOSImages"
+msgstr "MOSImages"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Most Hits"
+msgstr "Più visitati"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Most recent first"
+msgstr "I più recenti prima"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "No, order by Primary Order only"
+msgstr "No, ordinati solo per ordine primario"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Number of Items to display as Links."
+msgstr "Numero di articoli da mostrare come collegamenti"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"Number of Items to display as a leading (full width) item. 0 will mean that "
+"no items will be displayed as leading."
+msgstr ""
+"Numero di articoli da mostrare come principali (a piena larghezza). 0 "
+"significa che nessun articolo sarà mostrato come prioritario."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Number of Items to display with the introduction text shown."
+msgstr "Numero di articoli da mostrare con l'intestazione."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Oldest first"
+msgstr "I più vecchi, prima"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Order items by catgeory"
+msgstr "Ordina articoli per categoria"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Order that the items will be displayed in."
+msgstr "Ordine con il quale  saranno visualizzati gli articoli."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Pagination"
+msgstr "Paginazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Pagination Results"
+msgstr "Risultati paginazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Primary Order"
+msgstr "Ordine primario"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Read More"
+msgstr "Leggi tutto"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide Pagination Results info ( e.g 1-4 of 4 )"
+msgstr "Mostra/nascondi risultati paginazione (ad es. 1-4 di 4)"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide Pagination support"
+msgstr "Mostra/nascondi supporto paginazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Page title"
+msgstr "Mostra/nascondi il titolo della pagina"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Read More link"
+msgstr "Mostra/nascondi il collegamento Leggi tutto"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Text to display at the top of the page"
+msgstr "Testo da mostrare in cima alla pagina"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"This component shows all the published content items from your site marked "
+"Show on Frontpage."
+msgstr ""
+"Questo componente mostra tutti i contenuti pubblicati nel sito, marcati con "
+"Mostra nella Pagina Principale"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Title Alphabetical"
+msgstr "Titolo, ordine alfabetico"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Title Reverse-Alphabetical"
+msgstr "Titolo, ordine alfabetico inverso"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "When displaying the intro text, how many columns to use per row"
+msgstr ""
+"Quando si mostrano i testi introduttivi, quante colonne bisogna usare per "
+"riga?"
+
+#: administrator/components/com_installer/admin.installer.html.php:35
+#: administrator/components/com_installer/admin.installer.php:149
+msgid "Please select a directory"
+msgstr "Prego selezionare una cartella"
+
+#: administrator/components/com_installer/admin.installer.html.php:56
+msgid "Upload Package File"
+msgstr "Caricare il file compresso"
+
+#: administrator/components/com_installer/admin.installer.html.php:61
+msgid "Package File:"
+msgstr "File compresso:"
+
+#: administrator/components/com_installer/admin.installer.html.php:63
+msgid "Upload File &amp; Install"
+msgstr "Carica file ed installa"
+
+#: administrator/components/com_installer/admin.installer.html.php:79
+msgid "Install from directory"
+msgstr "Installa  dalla cartella"
+
+#: administrator/components/com_installer/admin.installer.html.php:84
+msgid "Install directory:"
+msgstr "Cartella installazione"
+
+#: administrator/components/com_installer/admin.installer.html.php:148
+msgid "Continue ..."
+msgstr "Continua..."
+
+#: administrator/components/com_installer/admin.installer.php:160
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Error"
+msgstr "Errore"
+
+#: administrator/components/com_installer/admin.installer.php:160
+msgid "Install new "
+msgstr "Installa nuovo"
+
+#: administrator/components/com_installer/admin.installer.php:160
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Success"
+msgstr "Successo"
+
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Uninstall "
+msgstr "Disinstalla"
+
+#: administrator/components/com_installer/admin.installer.php:198
+msgid "Failed to change the permissions of the uploaded file."
+msgstr "Il tentativo di cambiare i permessi del file caricato è fallito."
+
+#: administrator/components/com_installer/admin.installer.php:201
+msgid "Failed to move uploaded file to <code>/media</code> directory."
+msgstr ""
+"Il tentativo di spostare il file caricato in <code>/media</code> è fallito."
+
+#: administrator/components/com_installer/admin.installer.php:204
+msgid "Upload failed as <code>/media</code> directory is not writable."
+msgstr ""
+"Caricamento fallito in quanto la cartella <code>/media</code> non è "
+"scrivibile."
+
+#: administrator/components/com_installer/admin.installer.php:207
+msgid "Upload failed as <code>/media</code> directory does not exist."
+msgstr ""
+"Caricamento fallito in quanto la cartella <code>/media</code> non esiste."
+
+#: administrator/components/com_installer/admin.installer.php:223
+#: administrator/components/com_installer/admin.installer.php:298
+#: administrator/components/com_installer/admin.installer.php:303
+#: administrator/components/com_installer/admin.installer.php:308
+#: administrator/components/com_installer/admin.installer.php:365
+msgid "Uninstall -  error"
+msgstr "Errore nella disinstallazione"
+
+#: administrator/components/com_installer/admin.installer.php:228
+msgid "Is core component - may not be deleted"
+msgstr ""
+"E' un componente del codice principale e in quanto tale non può essere "
+"disinstallato"
+
+#: administrator/components/com_installer/admin.installer.php:229
+msgid ""
+"Component %s is a core component, and can not be uninstalled.<br />You need "
+"to unpublish it if you don't want to use it"
+msgstr ""
+"Il componente %s è un componente del codice principale e in quanto tale non "
+"può essere disinstallato.<br /> Se non lo si vuole usare, si deve toglierne "
+"la pubblicazione"
+
+#: administrator/components/com_installer/admin.installer.php:268
+msgid ""
+"%s is a core module, and can not be uninstalled.<br />You need to unpublish "
+"it if you don't want to use it"
+msgstr ""
+"%s è un modulo del codice principale e in quanto tale non può essere "
+"disinstallato.<br /> Se non lo si vuole usare, si deve toglierne la "
+"pubblicazione"
+
+#: administrator/components/com_installer/admin.installer.php:303
+msgid "Invalid object id"
+msgstr "ID dell'oggetto non valido"
+
+#: administrator/components/com_installer/admin.installer.php:308
+msgid "Folder field empty, cannot remove files"
+msgstr "Campo cartella vuoto, non è possibile rimuovere i files"
+
+#: administrator/components/com_installer/admin.installer.php:365
+msgid "Language id empty, cannot remove files"
+msgstr "ID del linguaggio vuoto, non è possibile rimuovere i files"
+
+#: administrator/components/com_installer/component/component.html.php:30
+msgid "Installed Components"
+msgstr "Componenti installati"
+
+#: administrator/components/com_installer/component/component.html.php:38
+msgid "Currently Installed"
+msgstr "Attualmente installati"
+
+#: administrator/components/com_installer/component/component.html.php:41
+msgid "Component Menu Link"
+msgstr "Collegamento al menu del componente"
+
+#: administrator/components/com_installer/component/component.html.php:47
+#: administrator/components/com_installer/mambot/mambot.html.php:60
+#: administrator/components/com_installer/module/module.html.php:56
+msgid "Version"
+msgstr "Versione"
+
+#: administrator/components/com_installer/component/component.html.php:53
+#: administrator/components/com_installer/mambot/mambot.html.php:66
+#: administrator/components/com_installer/module/module.html.php:62
+msgid "Author Email"
+msgstr "Email Autore"
+
+#: administrator/components/com_installer/component/component.html.php:56
+#: administrator/components/com_installer/mambot/mambot.html.php:69
+#: administrator/components/com_installer/module/module.html.php:65
+msgid "Author URL"
+msgstr "URL Autore"
+
+#: administrator/components/com_installer/component/component.html.php:96
+msgid "There are no custom components installed"
+msgstr "Non ci sono componenti personalizzati installati"
+
+#: administrator/components/com_installer/component/component.php:21
+msgid "Install new Component"
+msgstr "Instala nuovo componente"
+
+#: administrator/components/com_installer/installer.class.php:57
+msgid "XML error in %s: no handler %s"
+msgstr "Errore XML in %s: non c'è il gestore %s"
+
+#: administrator/components/com_installer/installer.class.php:59
+msgid "XML error in %s: mosinstall has no type"
+msgstr "Errore XML in %s: mosinstall non ha il tipo"
+
+#: administrator/components/com_installer/installer.class.php:64
+msgid "XML Error in %s: install has no name"
+msgstr "Errore XML in %s: install non ha il nome"
+
+#: administrator/components/com_installer/installer.class.php:89
+msgid "XML error in %s: MENU found, but this is not component XML"
+msgstr "Errore XML in %s: MENU è stato trovato, ma non è un componente XML"
+
+#: administrator/components/com_installer/installer.class.php:117
+msgid "XML Error in %s: Mambot does not have a group specified"
+msgstr "Errore XML in %s: Mambot non ha un gruppo specificato"
+
+#: administrator/components/com_installer/installer.class.php:142
+msgid "XML error in %s: no installer %s"
+msgstr "Errore XML in %s: nessun installatore %s"
+
+#: administrator/components/com_installer/installer.class.php:188
+msgid "Installer error with %s: unable to create admin directory for %s %s"
+msgstr ""
+"Errore installatore  con %s: impossibile creare cartella amministratore per %"
+"s %s"
+
+#: administrator/components/com_installer/installer.class.php:195
+msgid "Installer error with %s: unable to create user directory for %s %s"
+msgstr ""
+"Errore installatore con %s: impossibile creare cartella utente per %s %s"
+
+#: administrator/components/com_installer/installer.class.php:221
+msgid "Installer error with %s: writing component menu SQL error %s"
+msgstr "Errore installatore con %s: scrittura componente menu SQL errore %s"
+
+#: administrator/components/com_installer/installer.class.php:233
+#: administrator/components/com_installer/installer.class.php:279
+#: administrator/components/com_installer/installer.class.php:316
+#: administrator/components/com_installer/installer.class.php:344
+msgid "Installer error with %s: %s %s already installed"
+msgstr "Errore installatore con %s: %s %s già installato"
+
+#: administrator/components/com_installer/installer.class.php:249
+#: administrator/components/com_installer/installer.class.php:301
+#: administrator/components/com_installer/installer.class.php:335
+msgid "Installer error with %s: %s %s SQL error %s"
+msgstr "Errore installatore con %s: %s %s SQL errore %s"
+
+#: administrator/components/com_installer/installer.class.php:270
+#: administrator/components/com_installer/installer.class.php:308
+msgid "Installer error with %s: no file identified as the %s"
+msgstr "Errore installatore con %s: nessun file identificato come %s"
+
+#: administrator/components/com_installer/installer.class.php:430
+msgid "Uninstaller error with %s: no uninstaller %s"
+msgstr "Errore disinstallatore con %s: nessun disinstallatore %s"
+
+#: administrator/components/com_installer/installer.class.php:493
+msgid "Uninstaller error with %s: %s %s SQL error %s"
+msgstr "Errore disinstallatore con %s: %s %s SQL errore %s"
+
+#: administrator/components/com_installer/installer.class.php:503
+#: administrator/components/com_installer/installer.class.php:525
+#: administrator/components/com_installer/installer.class.php:544
+msgid "Uninstaller error with %s: %s %s not fully deleted from database"
+msgstr ""
+"Errore disinstallatore con %s: %s %s non interamente cancellato dal database"
+
+#: administrator/components/com_installer/installer.class.php:516
+msgid "Uninstaller error with %s: no file identified as the %s"
+msgstr "Errore disinstallatore con %s: nessun file identificato come %s"
+
+#: administrator/components/com_installer/installer.class.php:621
+msgid "Installer unrecoverable ZIP error %s in %s"
+msgstr "Installatore: errore ZIP non recuperabile %s in %s"
+
+#: administrator/components/com_installer/installer.class.php:630
+msgid "Installer unrecoverable TAR error in %s"
+msgstr "Installatore: errore TAR non recuperabile  in %s"
+
+#: administrator/components/com_installer/language/language.php:19
+msgid "Back to Language Manager"
+msgstr "Torna al gestore linguaggio"
+
+#: administrator/components/com_installer/language/language.php:20
+msgid "Install new Language - Site"
+msgstr "Installa nuovo linguaggio - Sito"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:29
+msgid "Installed Mambots"
+msgstr "Mambots installati"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:34
+msgid ""
+"Only those Mambots that can be uninstalled are displayed - some Core Mambots "
+"cannot be removed."
+msgstr ""
+"Sono elencati solo i Mambots che possono essere disinstallati - qualche "
+"Mambot necessario al codice principale non può essere rimosso."
+
+#: administrator/components/com_installer/mambot/mambot.html.php:45
+msgid "Mambot"
+msgstr "Mambot"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:124
+msgid "There are no non-core, custom mambots installed."
+msgstr "Non ci sono Mambots personalizzati installati."
+
+#: administrator/components/com_installer/mambot/mambot.php:21
+msgid "Install new Mambots"
+msgstr "Installa nuovo mambot"
+
+#: administrator/components/com_installer/module/module.html.php:27
+msgid "Installed Modules"
+msgstr "Moduli installati"
+
+#: administrator/components/com_installer/module/module.html.php:38
+msgid ""
+"Only those Modules that can be uninstalled are displayed - some Core Modules "
+"cannot be removed."
+msgstr ""
+"Sono elencati solo i Moduli che possono essere disinstallati - qualche "
+"Modulo necessario al codice principale non può essere rimosso."
+
+#: administrator/components/com_installer/module/module.html.php:47
+msgid "Module File"
+msgstr "Modulo file"
+
+#: administrator/components/com_installer/module/module.html.php:50
+msgid "Client"
+msgstr "Clente"
+
+#: administrator/components/com_installer/module/module.html.php:77
+#: administrator/components/com_installer/template/template.php:24
+msgid "Administrator"
+msgstr "Amministratore"
+
+#: administrator/components/com_installer/module/module.html.php:101
+msgid "No custom modules installed"
+msgstr "Nessun modulo personalizzato installato"
+
+#: administrator/components/com_installer/module/module.php:21
+msgid "Install new Modules"
+msgstr "Installa nuovo modulo"
+
+#: administrator/components/com_installer/module/module.php:42
+msgid "Admin Modules"
+msgstr "Moduli amministrazione"
+
+#: administrator/components/com_installer/template/template.php:24
+msgid "Install new Template"
+msgstr "Installa nuovo template"
+
+#: administrator/components/com_installer/template/template.php:26
+msgid "Back to Templates"
+msgstr "Torna ai templates"
+
+#: administrator/components/com_installer/toolbar.installer.html.php:25
+msgid "Uninstall"
+msgstr "Disinstalla"
+
+#: administrator/components/com_languages/actions/publish.action.php:25
+msgid "Configuration succesfully updated!"
+msgstr "Configurazione aggiornata!"
+
+#: administrator/components/com_languages/actions/publish.action.php:27
+msgid "Error! Make sure that configuration.php is writeable."
+msgstr "Errore! Ci si assicuri che configuration.php sia scrivibile."
+
+#: administrator/components/com_languages/toolbar.languages.php:44
+msgid "Extract"
+msgstr "Estrai"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:9
+msgid "Compile Catalog?"
+msgstr "Compilare catalogo?"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:10
+msgid "yes"
+msgstr "si"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:11
+msgid "no"
+msgstr "no"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:22
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:35
+msgid "MsgId"
+msgstr "MsgId"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:24
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:37
+msgid "MsgId Plural"
+msgstr "MsgId plurale"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:25
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:54
+msgid "MsgStr"
+msgstr "MsgStr"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:27
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:41
+msgid "Plural form"
+msgstr "Forma plurale"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:43
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:58
+msgid "Fuzzy Entry"
+msgstr "Inserimento dubbio"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Catalog dump"
+msgstr "Dump catalogo"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Comments"
+msgstr "Commenti"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Headers"
+msgstr "Intestazioni"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Strings"
+msgstr "Stringhe"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:11
+msgid "PHPGettext Example"
+msgstr "PHPGettext esempio"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:21
+msgid "PHPGettext"
+msgstr "PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:22
+msgid "Gettext for PHP"
+msgstr "Gettext per PHP"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:25
+msgid "Current language is:"
+msgstr "Il linguaggio corrente è:"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:34
+msgid "Change language"
+msgstr "Cambia lingua"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:41
+msgid "Gettext is enabled!"
+msgstr "Gettext è abilitato!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:43
+msgid "Gettext is disabled!"
+msgstr "Gettext è disabilitato!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:55
+msgid "Disable Gettext"
+msgstr "Disabilita Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:56
+msgid "Enable Gettext"
+msgstr "Abilita Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:57
+msgid "Extract Strings"
+msgstr "Estrai stringhe"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:58
+msgid "Run Unit Tests"
+msgstr "Esegui unità di tests"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:59
+msgid "Clear Tests"
+msgstr "Cancella tests"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:10
+msgid "Create Translation for:"
+msgstr "Crea traduzione per:"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:20
+msgid "Delete This Template"
+msgstr "Cancella questo template"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Login Image"
+msgstr "Allineamento per immagine di login"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Logout Image"
+msgstr "Allineamento per immagine di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Login Page"
+msgstr "Immagine della pagina di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Logout Page"
+msgstr "Immagine della pagina di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description"
+msgstr "Descrizione del Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description Text"
+msgstr "Testo del Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image"
+msgstr "Immagine di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image Align"
+msgstr "Allineamento dell'Immagine di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login JS Message"
+msgstr "Messaggio JavaScript per il Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Page Title"
+msgstr "Titolo della Pagina di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Redirection URL"
+msgstr "URL della redirezione dopo il Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description"
+msgstr "Descrizione del Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description Text"
+msgstr "Testo del Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image"
+msgstr "Immagine di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image Align"
+msgstr "Allineamento dell'Immagine di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout JS Message"
+msgstr "Messaggio JavaScript dopo il Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Page Title"
+msgstr "Titolo della Pagina di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Redirection URL"
+msgstr "URL della redirezione dopo il Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Login Description below"
+msgstr "Visualizza o nasconde la descrizione inferiore del Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Logout Description below"
+msgstr "Visualizza o nasconde la descrizione inferiore del Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr "Attiva o Disattiva la finestrella pop-up che conferma l'avvenuto Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr ""
+"Attiva o Disattiva la finestrella pop-up che conferma l'avvenuto Logout"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the login Page, if left blank _LOGIN_DESCRIPTION will be "
+"used"
+msgstr ""
+"Testo che verrà visualizzato nella pagina di Login. Se viene lasciato vuoto, "
+"apparirà _LOGIN_DESCRIPTION"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the logout Page, if left blank _LOGOUT_DESCRIPTION will "
+"be used"
+msgstr ""
+"Testo che verrà visualizzato nella pagina di Logout. Se viene lasciato "
+"vuoto, apparirà _LOGOUT_DESCRIPTION"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will be redirected to after logout, if let blank will load front "
+"page"
+msgstr ""
+"Pagina alla quale si verrà rediretti dopo il Logout. Se lasciata vuota, si "
+"verrà inviati alla home page."
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+"Pagina alla quale si verrà rediretti dopo il Login. Se lasciata vuota, si "
+"verrà inviati alla home page."
+
+#: components/com_login/login.html.php:109
+msgid "!Warning! Javascript must be enabled for proper operation."
+msgstr ""
+"Attenzione! Per eseguire correttamente questa operazione devi avere "
+"JavaScript abilitato sul tuo browser."
+
+#: components/com_login/login.php:38
+msgid "To access the Private areas of this site please Login"
+msgstr "Devi eseguire il Login per accedere alle aree riservate di questo sito"
+
+#: components/com_login/login.php:39
+msgid "You are now Logged in to a private area of this site"
+msgstr "Sei entrato nell'area riservata del sito"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:34
+msgid "Mambot Manager"
+msgstr "Gestione Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:55
+msgid "Mambot Name"
+msgstr "Nome del Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:76
+msgid "File"
+msgstr "File"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:179
+msgid "Mambot must have a name"
+msgstr "Il mambot deve avere un nome"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:181
+msgid "Mambot must have a filename"
+msgstr "Il file relativo al mambot deve avere un nome"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:190
+msgid "Site Mambot:"
+msgstr "Mambot del Sito:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:206
+msgid "Mambot Details"
+msgstr "Dettagli del Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:219
+msgid "Folder:"
+msgstr "Cartella:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:227
+msgid "Mambot file:"
+msgstr "File del Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:235
+msgid "Mambot Order:"
+msgstr "Ordinamento Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:285
+msgid "No Parameters"
+msgstr "Nessun Parametro"
+
+#: administrator/components/com_mambots/admin.mambots.php:137
+msgid "- All Types -"
+msgstr "- Tutti i Tipi -"
+
+#: administrator/components/com_mambots/admin.mambots.php:184
+msgid "Successfully Saved changes to Mambot: %s"
+msgstr "I cambiamenti al mambot %s sono stati eseguiti correttamente"
+
+#: administrator/components/com_mambots/admin.mambots.php:189
+msgid "Successfully Saved Mambot: %s"
+msgstr "Il mambot %s è stato memorizzato correttamente"
+
+#: administrator/components/com_mambots/admin.mambots.php:247
+msgid "This mambot cannot be reordered"
+msgstr "Questo mambot non può essere soggetto a riordinamento"
+
+#: administrator/components/com_mambots/admin.mambots.php:290
+msgid "Select a module to delete"
+msgstr "Seleziona un modulo da cancellare"
+
+#: administrator/components/com_mambots/admin.mambots.php:307
+msgid "Select a mambot to %s"
+msgstr "Seleziona un mambot per %s"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:30
+msgid "Please fill in the subject"
+msgstr "Per favore, assicurati di scrivere il soggetto"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:32
+msgid "Please select a group"
+msgstr "Seleziona un gruppo"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:34
+msgid "Please fill in the message"
+msgstr "Per favore, assicurati di scrivere il Messaggio"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:45
+#: administrator/components/com_massmail/massmail.xml
+msgid "Mass Mail"
+msgstr "Invio Mail agli Utenti"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:66
+msgid "Mail to Child Groups:"
+msgstr "Invia anche ai sottoGruppi:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:74
+msgid "Send in HTML mode:"
+msgstr "Invia in modalità HTML:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:82
+msgid "Subject"
+msgstr "Soggetto:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:90
+msgid "Message:"
+msgstr "Messaggio:"
+
+#: administrator/components/com_massmail/admin.massmail.php:39
+msgid "- All User Groups -"
+msgstr "- Tutti i Gruppi di Utenti -"
+
+#: administrator/components/com_massmail/admin.massmail.php:69
+msgid "Please fill in the form correctly"
+msgstr ""
+"Per favore, assicurati di completare correttamente tutte le parti del modulo"
+
+#: administrator/components/com_massmail/admin.massmail.php:92
+msgid ""
+"This is an email from '%s'\n"
+"\n"
+"Message:\n"
+msgstr ""
+"Hai ricevuto un messaggio da '%s'\n"
+"\n"
+"Messaggio:\n"
+
+#: administrator/components/com_massmail/admin.massmail.php:105
+msgid "E-mail sent to %d user."
+msgid_plural "E-mail sent to %d users."
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_massmail/massmail.xml
+msgid "This component allows you to send a mass email to certain user groups"
+msgstr ""
+"Questo componente consente di spedire una mail contemporaneamente ad uno o "
+"più gruppi di utenti"
+
+#: administrator/components/com_massmail/toolbar.massmail.html.php:24
+msgid "Send Mail"
+msgstr "Invia la Mail"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:53
+msgid "Menu Name"
+msgstr "Nome del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:56
+msgid "Menu Items"
+msgstr "Elementi del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:59
+msgid "# Published"
+msgstr "n. di Pubblicati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:62
+msgid "# Unpublished"
+msgstr "n. di Non pubblicati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:65
+msgid "# Trash"
+msgstr "n. di Cestinati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:68
+msgid "# Modules"
+msgstr "n. di Moduli"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:94
+msgid "Edit Menu Name"
+msgstr "Modifica il Nome del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:99
+msgid "Edit Menu Items"
+msgstr "Modifica gli Elementi del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:156
+msgid "Please enter a menu name"
+msgstr "Devi assegnare un nome al menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:164
+msgid "Please enter a module name for your menu"
+msgstr "Assegna un nome al modulo da associare al menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:182
+msgid "Menu Details"
+msgstr "Dettagli Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:190
+msgid "Menu Name:"
+msgstr "Nome del Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:195
+msgid ""
+"This is the identification name used by mambo to identify this menu within "
+"the code - it must be unique. It is recommended that you do not have any "
+"spaces in your Menu Name"
+msgstr ""
+"Questo è il nome di identificazione usato da Mambo per identificare questo "
+"menu nel codice - deve essere univoco. Si raccomanda di non  inserire spazi "
+"nel nome del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:210
+msgid "Title of the mod_mainmenu module required to show this Menu"
+msgstr ""
+"Per visualizzare questo menu, il modulo mod_mainmenu deve avere un titolo"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:216
+msgid ""
+"A new mod_mainmenu module, with the Title you have entered above will "
+"automatically be created when you save this menu."
+msgstr ""
+"Un nuovo modulo mod_mainmenu, con il Titolo che si è inserito sopra, sarà "
+"creato automaticamente non appena salvato il menu."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:218
+msgid ""
+"Parameters for the module created are to be edited through the \"Modules "
+"Manager [site]\": Modules -> Site Modules"
+msgstr ""
+"I parametri per il modulo creato, saranno modificabili attraverso la "
+"\"Gestione  moduli [site]\":  Moduli -> Moduli del sito"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:266
+msgid "Delete Menu: %s"
+msgstr "Cancella menu: %s"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:279
+msgid "Module(s) being Deleted:"
+msgstr "Moduli che stanno per essere cancellati:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:301
+msgid "Menu Items being Deleted:"
+msgstr "Elementi di menu che stanno per essere cancellati:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:319
+msgid ""
+"This will <span style=\"font-weight:bold;color:#FF0000\">Delete</span> this "
+"Menu, <br />ALL its Menu Items and the Module(s) associated with it"
+msgstr ""
+"Questa operazione <span style=\"font-weight:bold;color:#FF0000\">cancellerà</"
+"span> questo menu, <br />TUTTI i suoi elementi ed i moduli associati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:322
+msgid ""
+"Are you sure you want to Delete this menu? \\nThis will Delete the Menu, its "
+"Items and the Module(s)."
+msgstr ""
+"Si è sicuri di voler cancellare questo menu? \\n Questa operazione "
+"cancellerà il menu, i suoi elementi ed i moduli associati."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:354
+msgid "Please enter a name for the copy of the Menu"
+msgstr "Prego inserire un nome per la copia del menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:357
+msgid "Please enter a name for the new Module"
+msgstr "Prego inserire un nome per il uovo Modulo"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:371
+msgid "Copy Menu"
+msgstr "Copia menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:381
+msgid "New Menu Name:"
+msgstr "Nuovo nome del modulo:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:385
+msgid "New Module Name:"
+msgstr "Nuovo nome del modulo:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:392
+msgid "Menu being copied:"
+msgstr "Menu che sta per essere copiato:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:402
+msgid "Menu Items being copied:"
+msgstr "Elemento del menu che sta per essere copiato:"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:207
+msgid ""
+"You cannot rename the \"mainmenu\" Menu as this will disrupt the proper "
+"operation of Mambo"
+msgstr ""
+"Non puoi rinominare il menu \"mainmenu\", perché distruggerebbe alcune "
+"operazioni peculiari di Mambo"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:223
+msgid ""
+"A menu already exists with that name - you must enter a unique Menu Name"
+msgstr ""
+"Un menu con questo nome esiste già - si deve inserire un nome menu univoco"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:258
+msgid "New Menu created [ %s ]"
+msgstr "Creat il nuovo menu [ %s ]"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:312
+msgid "Menu Items & Modules updated"
+msgstr "Il menu Articoli & Moduli è stato aggiornato"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:326
+#: administrator/components/com_menumanager/admin.menumanager.php:376
+msgid "You cannot delete the \"mainmenu\" menu as it is a core menu"
+msgstr ""
+"Non puoi cancellare il menu \"mainmenu\", perché è un elemento del codice "
+"principale"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:467
+msgid ""
+"A menu with that name already exists - you must enter a unique Menu Name"
+msgstr ""
+"Un menu con questo nome esiste già - si deve inserire un nome menu univoco"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:527
+msgid "Copy of Menu `%s` created, consisting of %d item"
+msgid_plural "Copy of Menu `%s` created, consisting of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "This component manages your Menus."
+msgstr "Questo componente gestisce i menu."
+
+#: administrator/components/com_messages/admin.messages.html.php:24
+msgid "Private Messaging"
+msgstr "Messaggi Privati"
+
+#: administrator/components/com_messages/admin.messages.html.php:36
+msgid "From"
+msgstr "Da"
+
+#: administrator/components/com_messages/admin.messages.html.php:39
+#: administrator/components/com_messages/admin.messages.html.php:55
+msgid "Read"
+msgstr "Letti"
+
+#: administrator/components/com_messages/admin.messages.html.php:57
+msgid "Unread"
+msgstr "Non letti"
+
+#: administrator/components/com_messages/admin.messages.html.php:77
+msgid "Private Messaging Configuration"
+msgstr "Configurazione dei Messaggi Privati"
+
+#: administrator/components/com_messages/admin.messages.html.php:82
+msgid "General"
+msgstr "Generale"
+
+#: administrator/components/com_messages/admin.messages.html.php:89
+msgid "Are you sure?"
+msgstr "Sei sicuro?"
+
+#: administrator/components/com_messages/admin.messages.html.php:101
+msgid "Lock Inbox:"
+msgstr "Blocca i Messaggi in Entrata"
+
+#: administrator/components/com_messages/admin.messages.html.php:105
+msgid "Mail me on new Message:"
+msgstr "Inviami i nuovi messaggi per e-mail"
+
+#: administrator/components/com_messages/admin.messages.html.php:123
+msgid "View Private Message"
+msgstr "Visualizza i Messaggi Privati"
+
+#: administrator/components/com_messages/admin.messages.html.php:130
+msgid "From:"
+msgstr "Da:"
+
+#: administrator/components/com_messages/admin.messages.html.php:134
+msgid "Posted:"
+msgstr "Inviato il:"
+
+#: administrator/components/com_messages/admin.messages.html.php:138
+#: administrator/components/com_messages/admin.messages.html.php:193
+msgid "Subject:"
+msgstr "Soggetto:"
+
+#: administrator/components/com_messages/admin.messages.html.php:169
+msgid "You must provide a subject."
+msgstr "Devi scrivere un soggetto."
+
+#: administrator/components/com_messages/admin.messages.html.php:171
+msgid "You must provide a message."
+msgstr "Devi scrivere un messaggio."
+
+#: administrator/components/com_messages/admin.messages.html.php:173
+msgid "You must select a recipient."
+msgstr "Devi selezionare un destinatario."
+
+#: administrator/components/com_messages/admin.messages.html.php:182
+msgid "New Private Message"
+msgstr "Nuovo Messaggio Privato."
+
+#: administrator/components/com_messages/admin.messages.html.php:189
+msgid "To:"
+msgstr "A:"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:21
+msgid "Reply"
+msgstr "Rispondi"
+
+#: components/com_messages/messages.class.php:76
+#: components/com_messages/messages.class.php:77
+msgid "A new private message has arrived"
+msgstr "Hai ricevuto un nuovo messaggio"
+
+#: components/com_messages/messages.class.php:84
+msgid "The user has locked their mailbox. Message failed."
+msgstr ""
+"L'utente ha bloccato i messaggi in arrivo. Il tuo messaggio non è stato "
+"consegnato."
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE Editor mambot.</p><p>Please refer to the "
+"changelog and other information in the 'Admin Info' tab in the Admin "
+"component.&nbsp;</p>"
+msgstr ""
+"<p>Componente di Amministrazione per il mambot Editor MOStlyCE.</p><p>Prego "
+"di fare riferimento al changelog e alle altre informazioni nel tab 'Admin "
+"Info? nel componente Admin. </p>"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid "mostlyce"
+msgstr "mostlyce"
+
+#: administrator/components/com_modules/admin.modules.html.php:34
+msgid "Module Manager"
+msgstr "Modulo Manager"
+
+#: administrator/components/com_modules/admin.modules.html.php:60
+msgid "Module Name"
+msgstr "Nome Modulo"
+
+#: administrator/components/com_modules/admin.modules.html.php:87
+msgid "Pages"
+msgstr "Pagine"
+
+#: administrator/components/com_modules/admin.modules.html.php:156
+msgid "Varies"
+msgstr "Varie"
+
+#: administrator/components/com_modules/admin.modules.html.php:166
+msgid "User"
+msgstr "Utente"
+
+#: administrator/components/com_modules/admin.modules.html.php:213
+msgid "Module must have a title"
+msgstr "Il Modulo deve avere un titolo"
+
+#: administrator/components/com_modules/admin.modules.html.php:239
+msgid "Module:"
+msgstr "Modulo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:270
+msgid "Show title:"
+msgstr "Mostra il titolo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:278
+msgid "Position:"
+msgstr "Posizione:"
+
+#: administrator/components/com_modules/admin.modules.html.php:286
+msgid "Module Order:"
+msgstr "Ordinamento Moduli:"
+
+#: administrator/components/com_modules/admin.modules.html.php:318
+msgid "ID:"
+msgstr "ID:"
+
+#: administrator/components/com_modules/admin.modules.html.php:351
+msgid "Pages / Items"
+msgstr "Pagine / Oggetti"
+
+#: administrator/components/com_modules/admin.modules.html.php:356
+msgid "Menu Item Link(s):"
+msgstr "Link(s) all'oggetto Menu"
+
+#: administrator/components/com_modules/admin.modules.html.php:372
+msgid "Custom Output"
+msgstr "Output personalizzata"
+
+#: administrator/components/com_modules/admin.modules.html.php:377
+msgid "Content:"
+msgstr "Contenuto:"
+
+#: administrator/components/com_modules/admin.modules.php:149
+msgid "- All Positions -"
+msgstr "- Tutte le Posizioni -"
+
+#: administrator/components/com_modules/admin.modules.php:211
+msgid "Module Copied [%s]"
+msgstr "Modulo copiato [%s]"
+
+#: administrator/components/com_modules/admin.modules.php:268
+msgid "Successfully Saved changes to Module: %s"
+msgstr "I cambiamenti al modulo: %s  sono stati  salvati"
+
+#: administrator/components/com_modules/admin.modules.php:274
+msgid "Successfully Saved Module: %s"
+msgstr "Il modulo: %s  è stato salvato"
+
+#: administrator/components/com_modules/admin.modules.php:377
+#: administrator/components/com_modules/admin.modules.php:378
+#: administrator/components/com_modules/admin.modules.php:381
+#: administrator/components/com_modules/admin.modules.php:382
+msgid "N/A"
+msgstr "N/A"
+
+#: administrator/components/com_modules/admin.modules.php:440
+msgid ""
+"You cannot delete mod_mainmenu module that displays the \"mainmenu\" as it "
+"is a core Menu"
+msgstr ""
+"Non è possibile cancellare il mod_mainmenu che mostra il \"mainmenu\" perché "
+"è un menu del codice principale"
+
+#: administrator/components/com_modules/admin.modules.php:466
+msgid ""
+"Module(s): \"%s\" cannot be deleted they can only be un-installed as they "
+"are Mambo modules."
+msgstr ""
+"I moduli: \"%s\" non possono essere cancellati ma solo disinstallati perché "
+"fanno parte del codice principale di Mambo."
+
+#: administrator/components/com_modules/admin.modules.php:482
+msgid "Select a module to %s"
+msgstr "Selezionare un modulo da %s"
+
+#: administrator/components/com_modules/toolbar.modules.html.php:41
+msgid "You can only preview typed modules."
+msgstr ""
+"Si possono vedere in anteprima solo i moduli di contenuto testo digitato."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:29
+msgid "Newsfeed Manager"
+msgstr "Amministrazione delle Newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:46
+msgid "News Feed"
+msgstr "News Feed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:58
+#: components/com_newsfeeds/newsfeeds.html.php:107
+msgid "# Articles"
+msgstr "n. Articoli"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:61
+msgid "Cache time"
+msgstr "Tempo di Cache"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:95
+msgid "Edit Newsfeed"
+msgstr "Modifica newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please fill in the newsfeed name."
+msgstr "Prego, inserisci il nome delle newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please fill in the newsfeed link."
+msgstr "Prego, inserisci il collegamento delle newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:160
+msgid "Please select a category."
+msgstr "Prego seleziona una categoria."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:162
+msgid "Please fill in the number of articles to display."
+msgstr "Prego, inserisci il numero di articoli da visualizzare."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:164
+msgid "Please fill in the cache refresh time."
+msgstr "Prego, inserisci il tempo di refresh della cache."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:175
+msgid "Newsfeed:"
+msgstr "Newsfeed:"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:204
+msgid "Link"
+msgstr "Collegamento"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:212
+msgid "Number of Articles"
+msgstr "Numero di Articoli"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:220
+msgid "Cache time (in seconds)"
+msgstr "Tempo di Cache (in secondi)"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Articles Column"
+msgstr "n. Articoli per colonna"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+"Permette di limitare la quantità di descrizione visualizzata. 0 mostrerà il "
+"testo intero"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description for page"
+msgstr "Descrizione della Pagina"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Description"
+msgstr "Descrizione del Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Image"
+msgstr "Immagine del Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Item Description"
+msgstr "Descrizione dell'elemento"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Link Column"
+msgstr "Colonna dei Link"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Name Column"
+msgstr "Colonna dei Nomi"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Newsfeeds"
+msgstr "Newsfeeds"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the # of articles in the feed"
+msgstr "Visualizza o Nascondi il numero di articoli nel Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Link column"
+msgstr "Visualizza o nascondi la Colonna dei Link nel Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Name column"
+msgstr "Visualizza o Nascondi la Colonna dei Nomi nel feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr "Mostra/Nascondi il testo di introduzione dell'articolo"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description text of the feed"
+msgstr "Mostra/Nascondi il testo di descrizione del feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the image of the feed"
+msgstr "Mostra/Nascondi le immagini del feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "This component manages RSS/RDF newsfeeds"
+msgstr "Questo componente serve a gestire i feed RSS/RDF"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Word Count"
+msgstr "Conteggio delle Parole"
+
+#: components/com_newsfeeds/newsfeeds.html.php:98
+msgid "Feed Name"
+msgstr "Nome del Feed"
+
+#: components/com_newsfeeds/newsfeeds.html.php:116
+msgid "Feed Link"
+msgstr "Link del Feed"
+
+#: administrator/components/com_poll/admin.poll.html.php:28
+msgid "Poll Manager"
+msgstr "Amministrazione Sondaggi"
+
+#: administrator/components/com_poll/admin.poll.html.php:41
+msgid "Poll Title"
+msgstr "Titolo sondaggio"
+
+#: administrator/components/com_poll/admin.poll.html.php:47
+msgid "Options"
+msgstr "Opzioni"
+
+#: administrator/components/com_poll/admin.poll.html.php:50
+msgid "Lag"
+msgstr "ritardo"
+
+#: administrator/components/com_poll/admin.poll.html.php:74
+msgid "Edit Poll"
+msgstr "Edita il sondaggio"
+
+#: administrator/components/com_poll/admin.poll.html.php:118
+msgid "Poll must have a title"
+msgstr "Il sondaggio deve avere un titolo"
+
+#: administrator/components/com_poll/admin.poll.html.php:120
+msgid "Poll must have a non-zero lag time"
+msgstr "Il sondaggio deve avere un non-zero tempo di ritardo"
+
+#: administrator/components/com_poll/admin.poll.html.php:134
+msgid "Poll:"
+msgstr "Sondaggio:"
+
+#: administrator/components/com_poll/admin.poll.html.php:159
+msgid "Show on menu items:"
+msgstr "Mostra il menu dell'oggetto"
+
+#: administrator/components/com_poll/admin.poll.html.php:166
+msgid "Lag:"
+msgstr "Ritardo:"
+
+#: administrator/components/com_poll/admin.poll.html.php:175
+msgid "Options:"
+msgstr "Opzioni:"
+
+#: administrator/components/com_poll/admin.poll.php:106
+msgid "The poll %s is currently being edited by another administrator."
+msgstr "Il sondaggio %s è al momento aperto da un'altro amministratore."
+
+#: administrator/components/com_poll/poll.class.php:44
+msgid "Your Poll must contain a title."
+msgstr "Il tuo sondaggio deve avere un titolo."
+
+#: administrator/components/com_poll/poll.class.php:50
+msgid "Your Poll must have a non-zero lag time."
+msgstr "Il tuo sondaggio deve avere un non-zero tempo di ritardo."
+
+#: administrator/components/com_poll/poll.class.php:59
+msgid "There is a module already with that name, please try again."
+msgstr "Esiste già un modulo con lo stesso nome, prego di riprovare."
+
+#: administrator/components/com_poll/poll.xml
+msgid "Poll"
+msgstr "Sondaggio"
+
+#: administrator/components/com_poll/poll.xml
+msgid "This component shows Polls/Surveys"
+msgstr "Questo componente mostra i Sondaggi"
+
+#: components/com_poll/poll.html.php:51
+msgid "Select Poll:"
+msgstr "Seleziona sondaggio"
+
+#: components/com_poll/poll.html.php:83
+msgid "There are no results for this poll."
+msgstr "Non ci sono risultati per questo sondaggio."
+
+#: components/com_poll/poll.html.php:193
+msgid "Number of Voters"
+msgstr "Numero di votanti"
+
+#: components/com_poll/poll.html.php:202
+msgid "First Vote"
+msgstr "Primo voto"
+
+#: components/com_poll/poll.html.php:211
+msgid "Last Vote"
+msgstr "Ultimo voto"
+
+#: components/com_poll/poll.php:48
+msgid "Cookies must be enabled!"
+msgstr "I coockies devono essere abilitati!"
+
+#: components/com_poll/poll.php:49 components/com_poll/poll.php:56
+#: components/com_poll/poll.php:65 components/com_poll/poll.php:72
+msgid "Continue"
+msgstr "Continua"
+
+#: components/com_poll/poll.php:71
+msgid "No selection has been made, please try again"
+msgstr "Nessuna selezione fatta, per favore prova ancora"
+
+#: components/com_poll/poll.php:112 components/com_poll/poll.php:154
+msgid "Select Poll from the list"
+msgstr "Seleziona un sondaggio dall'elenco"
+
+#: components/com_registration/registration.html.php:23
+#: components/com_registration/registration.php:40
+msgid "Lost your Password?"
+msgstr "Hai perso la Password?"
+
+#: components/com_registration/registration.html.php:28
+msgid ""
+"Please enter your Username and e-mail address then click on the Send "
+"Password button.%s You will receive a new password shortly.  Use the new "
+"password to access the site."
+msgstr ""
+"Prego, inserisci il tuo Nome Utente e indirizzo e-mail poi clicca sul "
+"Pulsante Spedisci. %s Riceverai una nuova password rapidamente. Usa la nuova "
+"password per accedere al sito."
+
+#: components/com_registration/registration.html.php:31
+#: components/com_registration/registration.html.php:94
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: components/com_registration/registration.html.php:35
+msgid "E-mail Address:"
+msgstr "Indirizzo E-Mail:"
+
+#: components/com_registration/registration.html.php:40
+msgid "Send Password"
+msgstr "Invia Password"
+
+#: components/com_registration/registration.html.php:58
+msgid "Please enter your name."
+msgstr "Prego inserisci il tuo Nome."
+
+#: components/com_registration/registration.html.php:60
+#: components/com_registration/registration.html.php:62
+msgid "Please enter a user name."
+msgstr "Prego inserisci il tuo nome utente."
+
+#: components/com_registration/registration.html.php:62
+#: components/com_registration/registration.html.php:72
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+"Prego, inserisci un valido %s. Nessun spazio, più di %d caratteri e solo "
+"caratteri 0-9, a-z, o A-Z"
+
+#: components/com_registration/registration.html.php:64
+msgid "Please enter a valid e-mail address."
+msgstr "Prego, inserisci un indirizzo e-mail valido."
+
+#: components/com_registration/registration.html.php:66
+msgid ""
+"Please enter a valid password -- more than 6 characters with no spaces and "
+"containing only the characters 0-9, a-z, or A-Z"
+msgstr ""
+"Prego, inserisci una password valida -- più lunga di 6 caratteri senza spazi "
+"e contenente solo caratteri 0-9, a-z, o A-Z"
+
+#: components/com_registration/registration.html.php:68
+msgid "Please verify the password."
+msgstr "Prego, verifica la password."
+
+#: components/com_registration/registration.html.php:70
+msgid "Password and verification do not match, please try again."
+msgstr "La password e la verifica non coincidono, prego di riprovare."
+
+#: components/com_registration/registration.html.php:72
+#: components/com_registration/registration.html.php:103
+msgid "Password:"
+msgstr "Password:"
+
+#: components/com_registration/registration.html.php:80
+#: components/com_registration/registration.php:109
+msgid "Registration"
+msgstr "Registrazione"
+
+#: components/com_registration/registration.html.php:85
+msgid "Fields marked with an asterisk (*) are required."
+msgstr "I campi contrassegnati con l'asterisco (*) sono richiesti."
+
+#: components/com_registration/registration.html.php:108
+msgid "Verify Password:"
+msgstr "Verifica Password:"
+
+#: components/com_registration/registration.html.php:126
+msgid "Send Registration"
+msgstr "Invia Registrazione"
+
+#: components/com_registration/registration.php:62
+msgid "Sorry, no corresponding user was found"
+msgstr "Scusate, ma non è stata trovata alcuna corrispondenza"
+
+#: components/com_registration/registration.php:74
+msgid ""
+"The user account %s has this email associated with it.\n"
+"\n"
+"A web user from %s has just requested that a new password be sent.\n"
+"\n"
+"\n"
+"Your New Password is: %s\n"
+"\n"
+"\n"
+"If you didn't ask for this, don't worry. You are seeing this message, not "
+"them. \n"
+"If this was an error just login with your new password and then change your "
+"password to what you would like it to be."
+msgstr ""
+"L'account dell'utente %s ha questo indirizzo email associato.\n"
+"\n"
+"Un utente web da %s ha appena richiesto che gli fosse spedita una nuova "
+"password.\n"
+"\n"
+"\n"
+"La tua nuova password è: %s\n"
+"\n"
+"\n"
+"se non hai effettuato tu la richiesta, non ti preoccupare: solo tu stai "
+"vedendo questo messaggio e nessun altro. \n"
+"Se questo è un errore, è sufficiente che ti connetta al sito con la nuova "
+"password e la cambi con un'altra di tua scelta."
+
+#: components/com_registration/registration.php:81
+msgid "%s :: New password for - %s"
+msgstr "%s :: Nuova Password per - %s"
+
+#: components/com_registration/registration.php:97
+msgid "New User Password created and sent!"
+msgstr "La nuova Password è stata creata e inviata!"
+
+#: components/com_registration/registration.php:160
+#: components/com_registration/registration.php:208
+msgid "Account details for %s at %s"
+msgstr "Dettagli Account di %s a %s"
+
+#: components/com_registration/registration.php:165
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s. Your account has been created but, as a "
+"precaution, it must be activated by you before you can use it.\n"
+"To activate the account click on the following link or copy and paste it in "
+"your browser:\n"
+"%s\n"
+"\n"
+"After activation you may login to %s using the following username and "
+"password:\n"
+"\n"
+"Username - %s\n"
+"Password - %s"
+msgstr ""
+"Ciao %s, \n"
+"\n"
+"Grazie per esserti registrato a %s. Il tuo Account è stato creato ma, per "
+"precauzione, lo devi attivare prima di usarlo. \n"
+"Per attivare l'account clicca sul seguente link o copia e incolla sul tuo "
+"browser:\n"
+"\n"
+"NomeUtente - %s\n"
+"Password - %s"
+
+#: components/com_registration/registration.php:180
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s.\n"
+"\n"
+"You may now login to %s using the username and password you registered with."
+msgstr ""
+"Ciao %s,\n"
+"\n"
+"Grazie per esserti registrato a %s.\n"
+"\n"
+"Ora puoi connetterti al sito %s inserendo i nome Utente e password che hai "
+"usato per registrarti."
+
+#: components/com_registration/registration.php:209
+msgid ""
+"Hello %s,\n"
+"\n"
+"A new user has registered at %s.\n"
+"This email contains their details:\n"
+"\n"
+"Name - %s\n"
+"e-mail - %s\n"
+"Username - %s\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Ciao %s,\n"
+"\n"
+"Un nuovo utente si è registrato a %s.\n"
+"\n"
+"Nome - %s\n"
+"e-mail - %s\n"
+"NomeUtente - %s\n"
+"\n"
+"Prego di non rispondere a questo messaggio in quanto generato "
+"automaticamente e a solo scopo informativo"
+
+#: components/com_registration/registration.php:239
+#: components/com_registration/registration.php:242
+msgid "Registration Complete"
+msgstr "Registrazione Completata"
+
+#: components/com_registration/registration.php:240
+msgid ""
+"Your account has been created and an activation link has been sent to the e-"
+"mail address you entered. Note that you must activate the account by "
+"clicking on the activation link before you can login."
+msgstr ""
+"Il tuo account è stato creato e un link di attivazione è stato inviato "
+"all'indirizzo email che hai inserito. Nota che devi attivare l'account "
+"cliccando sul link di attivazione, prima di poterti connettere al sito."
+
+#: components/com_registration/registration.php:243
+msgid "You may now login."
+msgstr "Ora puoi connetteri al sito."
+
+#: components/com_registration/registration.php:261
+#: components/com_registration/registration.php:282
+msgid "Invalid Activation Link!"
+msgstr "Link di attivazione non valido!"
+
+#: components/com_registration/registration.php:262
+#: components/com_registration/registration.php:283
+msgid ""
+"There is no such account in our database or the account has already been "
+"activated."
+msgstr ""
+"Non c'è un utente simile nel nostro archivio oppure il suo account è già "
+"stato  attivato."
+
+#: components/com_registration/registration.php:275
+msgid "Activation Complete!"
+msgstr "Attivazione completata!"
+
+#: components/com_registration/registration.php:276
+msgid ""
+"Your account has been activated successfully. You can now login using the "
+"username and password you chose during registration."
+msgstr ""
+"Il tuo account è stato attivato correttamente. Ora puoi connetterti al sito "
+"usando il nome utente e la password che hai scelto durante la registrazione."
+
+#: administrator/components/com_search/search.xml
+msgid "This component manages the Search functionality."
+msgstr "Questo componente amministra le funzionalità di ricerca."
+
+#: components/com_search/search.html.php:37
+#: components/com_search/search.html.php:67
+msgid "Search Keyword"
+msgstr "Cerca Keyword"
+
+#: components/com_search/search.html.php:98
+msgid "returned %d match"
+msgid_plural "returned %d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_search/search.php:55
+msgid "Newest first"
+msgstr "Prima i più recenti"
+
+#: components/com_search/search.php:57
+msgid "Most popular"
+msgstr "I più popolari"
+
+#: components/com_search/search.php:58
+msgid "Alphabetical"
+msgstr "Alfabetico"
+
+#: components/com_search/search.php:59
+msgid "Section/Category"
+msgstr "Sezione/Categoria"
+
+#: components/com_search/search.php:69
+msgid "Any words"
+msgstr "Qualunque parola"
+
+#: components/com_search/search.php:74
+msgid "All words"
+msgstr "Tutte le parole"
+
+#: components/com_search/search.php:79
+msgid "Exact phrase"
+msgstr "Frase esatta"
+
+#: components/com_search/search.php:91
+msgid "No results were found"
+msgstr "Nessun risultato trovato"
+
+#: components/com_search/search.php:96
+msgid "One or more common words were ignored in the search"
+msgstr "Una o più parole comuni sono state ignorate nella ricerca"
+
+#: administrator/components/com_sections/admin.sections.html.php:65
+msgid "Section ID"
+msgstr "ID Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:68
+msgid "# Categories"
+msgstr "# Categorie"
+
+#: administrator/components/com_sections/admin.sections.html.php:71
+msgid "# Active"
+msgstr "# Attive"
+
+#: administrator/components/com_sections/admin.sections.html.php:175
+msgid "New Section"
+msgstr "Nuova Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:203
+msgid "Section must have a name"
+msgstr "La Sezione deve avere un nome"
+
+#: administrator/components/com_sections/admin.sections.html.php:205
+msgid "Section must have a title"
+msgstr "La Sezione deve avere un titolo"
+
+#: administrator/components/com_sections/admin.sections.html.php:281
+msgid "Section Details"
+msgstr "Dettagli della Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:286
+msgid "Scope:"
+msgstr "Scope:"
+
+#: administrator/components/com_sections/admin.sections.html.php:401
+msgid "Select Menu Type"
+msgstr "Seleziona un Tipo di Menu"
+
+#: administrator/components/com_sections/admin.sections.html.php:489
+msgid "Copy Section"
+msgstr "Copia Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:501
+msgid "The new Section name"
+msgstr "Nuovo nome di Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:529
+msgid ""
+"This will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the new Section created."
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:189
+msgid "The section %s is currently being edited by another administrator"
+msgstr ""
+"La sezione %d è attualmente aperta per modifiche da un altro amministratore"
+
+#: administrator/components/com_sections/admin.sections.php:207
+#: administrator/components/com_sections/admin.sections.php:624
+msgid "Section Table"
+msgstr "Tabella di una Sezione"
+
+#: administrator/components/com_sections/admin.sections.php:215
+#: administrator/components/com_sections/admin.sections.php:634
+msgid "Section Blog Archive"
+msgstr "Archivio del Blog di una Sezione"
+
+#: administrator/components/com_sections/admin.sections.php:232
+msgid "Section Archive Blog"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:306
+msgid "Changes to Section saved"
+msgstr "Le modifiche alla Sezione sono state effettuate"
+
+#: administrator/components/com_sections/admin.sections.php:312
+msgid "Section saved"
+msgstr "Sezione salvata"
+
+#: administrator/components/com_sections/admin.sections.php:327
+msgid "Select a section to delete"
+msgstr "Seleziona una Sezione da cancellare"
+
+#: administrator/components/com_sections/admin.sections.php:365
+msgid "Sections(s): %s cannot be removed as they contain categories"
+msgstr ""
+"La Sezione (o le sezioni): %s non possono essere cancellate in quanto "
+"contengono categorie"
+
+#: administrator/components/com_sections/admin.sections.php:370
+msgid "Section(s): %s successfully deleted"
+msgstr "la Sezione (o le sezioni): %s sono state correttamente cancellate"
+
+#: administrator/components/com_sections/admin.sections.php:388
+msgid "Select a section to "
+msgstr "Seleziona una Sezione da"
+
+#: administrator/components/com_sections/admin.sections.php:396
+msgid "Cannot Publish an Empty Section"
+msgstr "Non si può pubblicare una Sezione vuota"
+
+#: administrator/components/com_sections/admin.sections.php:585
+msgid "Section %s and all its Categories and Items have been copied as %s"
+msgstr "La sezione %s e tutte le sue categorie sono state copiate in %s"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:35
+msgid "Browser, OS, Domain Statistics"
+msgstr "Browser, So, Statistiche Dominio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:41
+msgid "Browsers"
+msgstr "Browsers"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:45
+msgid "Browser"
+msgstr "Browser"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:84
+msgid "OS Stats"
+msgstr "Statistiche SO"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:88
+msgid "Operating System"
+msgstr "Sistema Operativo"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:127
+msgid "Domain Stats"
+msgstr "Statistiche Dominio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:131
+msgid "Domain"
+msgstr "Dominio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:182
+msgid "Page Impression Statistics"
+msgstr "Statistiche Impression per pagina"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:228
+msgid "Search Engine Text :"
+msgstr "Motore di ricerca testo :"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:229
+msgid "logging is :"
+msgstr "connesso :"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:240
+msgid "Times Requested"
+msgstr "Tempo richiesto"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:241
+msgid "Results Returned"
+msgstr "Risultati ritornati"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:28
+msgid "Syndication Settings"
+msgstr "Impostazioni syndication"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:51
+msgid "Manage Syndication Settings"
+msgstr "Amministra le impostazioni di Syndication"
+
+#: administrator/components/com_syndicate/admin.syndicate.php:95
+msgid "Settings successfully Saved"
+msgstr "Impostazioni salvate"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 0.3"
+msgstr "ATOM 0.3"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Activate support for Firefox Live Bookmarks functionality"
+msgstr "Attiva il supporto per la funzionalità di Live Bookmarks di Firefox"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Alt text for image"
+msgstr "Alt text per l'immagine"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Bookmark file"
+msgstr "Bookmark file"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache"
+msgstr "Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache Time"
+msgstr "Tempo di Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache file will refresh every x seconds"
+msgstr "Refresh del file della Cache ogni x secondi"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache the feed files"
+msgstr "Metti in cache i file del feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image Alt"
+msgstr "Alt testo dell'immagine"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image to be included in feed"
+msgstr "Immagine da inserire nel feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit Text"
+msgstr "Limite del testo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit the article text to the value indicated below"
+msgstr "Il limite del testo dell'articolo è indicato di seguito"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Live Bookmarks"
+msgstr "Live Bookmarks"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Number of Items to syndicate"
+msgstr "Numero di oggetti da condividere (syndicate)"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order that the items will be displayed"
+msgstr "L'ordine con cui vengono visualizzati"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 0.91"
+msgstr "RSS 0.91"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Special file name, if empty the default will be used."
+msgstr ""
+"Nome di file speciale, se lasciato vuoto sarà usato il nome di default "
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndicate"
+msgstr "Syndicate"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Description"
+msgstr "Descrizione della condivisione (Syndication)"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Title"
+msgstr "Titolo della condivisione (Sindication)"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Text Length"
+msgstr "Lunghezza del testo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "The word length of the article text - 0 will show no text"
+msgstr "La lunghezza del testo dell'articolo a 0 significa nessun testo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "This component controls the Syndication settings"
+msgstr "Questo componente amministra le impostazioni della condivisione"
+
+#: administrator/components/com_trash/admin.trash.html.php:61
+#: administrator/components/com_trash/admin.trash.html.php:65
+msgid "Content Items"
+msgstr "Oggetti contenuti"
+
+#: administrator/components/com_trash/admin.trash.html.php:230
+msgid "Delete Items"
+msgstr "Cancella oggetti"
+
+#: administrator/components/com_trash/admin.trash.html.php:239
+#: administrator/components/com_trash/admin.trash.html.php:304
+msgid "Number of Items:"
+msgstr "Numero di oggetti"
+
+#: administrator/components/com_trash/admin.trash.html.php:245
+msgid "Items being Deleted:"
+msgstr "Gli oggetti stanno per essere cancellati:"
+
+#: administrator/components/com_trash/admin.trash.html.php:256
+msgid ""
+"This will <strong><font color=\"#FF0000\">Permanently Delete</font></strong> "
+"<br />these Items from the Database"
+msgstr ""
+"Gli oggetti <strong><font color=\"#FF0000\">stanno per essere cancellati "
+"definitivamente</font></strong> <br />dal database"
+
+#: administrator/components/com_trash/admin.trash.html.php:259
+msgid ""
+"Are you sure you want to Deleted the listed items? \\nThis will Permanently "
+"Delete them from the database."
+msgstr ""
+"Sei sicuro di voler cancellare gli oggetti nella seguente lista? \\n Questi "
+"oggetti saranno cancellati definitivamente dal database."
+
+#: administrator/components/com_trash/admin.trash.html.php:295
+msgid "Restore Items"
+msgstr "Ripristina gli oggetti"
+
+#: administrator/components/com_trash/admin.trash.html.php:310
+msgid "Items being Restored:"
+msgstr "Gli oggetti stanno per essere ripristinati:"
+
+#: administrator/components/com_trash/admin.trash.html.php:321
+msgid ""
+"This will <strong><font color=\"#FF0000\">Restore</font></strong> these "
+"Items,<br />they will be returned to their orignial places as Unpublished "
+"items"
+msgstr ""
+"Gli oggetti stanno per essere  <strong><font color=\"#FF0000\">ripristinati</"
+"font></strong> ,<br />nella loro posizione originale"
+
+#: administrator/components/com_trash/admin.trash.html.php:324
+msgid "Are you sure you want to Restore the listed items?."
+msgstr "Sei sicuro di voler Ripristinare gli oggetti della lista?"
+
+#: administrator/components/com_trash/admin.trash.html.php:325
+#: administrator/components/com_trash/admin.trash.html.php:326
+#: administrator/components/com_trash/toolbar.trash.html.php:21
+msgid "Restore"
+msgstr "Ripristina"
+
+#: administrator/components/com_trash/admin.trash.php:182
+msgid "%s Item successfully Deleted"
+msgid_plural "%s Items successfully Deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/admin.trash.php:256
+msgid "%s Item successfully Restored"
+msgid_plural "%s Items successfully Restored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/trash.xml
+msgid "This component manages the Trash functionality."
+msgstr "Questo componente amministra le funzionalità del cestino."
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:81
+msgid "Links"
+msgstr "Links"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:177
+msgid "Edit Static Content"
+msgstr "Edita il Contenuto Statico"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:271
+msgid ""
+"Are you sure you want to reset the Hits to Zero? \\nAny unsaved changes to "
+"this content will be lost."
+msgstr ""
+"Sei sicuro di voler riportare a Zero gli Hits? \\nOgni cambiamento non "
+"salvato sarà perso"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:302
+msgid "Content item must have a name"
+msgstr "L'oggetto deve avere un nome"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:353
+msgid "Static Content Item:"
+msgstr "Ogetto Contenuto Statico"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:402
+msgid "Text: (required)"
+msgstr "Testo: (richiesto)"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:547
+msgid "New document"
+msgstr "Nuovo documento"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:555
+msgid "Not modified"
+msgstr "Non modificato"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:560
+msgid "Expires"
+msgstr "Scade"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:614
+msgid "Source"
+msgstr "Sorgente"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:622
+msgid "Align"
+msgstr "Alinea"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:630
+msgid "Alt Text"
+msgstr "Alt Text"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:638
+msgid "Border"
+msgstr "Bordo"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:736
+msgid "This will create a \"Link - Static Content\" in the menu you select"
+msgstr "Questo genera un \"Link - Al Contenuto Statico\" nel menu selezionato"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:155
+msgid "Ordering asc"
+msgstr "Ordinamento asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:156
+msgid "Ordering desc"
+msgstr "Ordinamento decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:157
+msgid "ID asc"
+msgstr "ID asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:158
+msgid "ID desc"
+msgstr "ID decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:159
+msgid "Title asc"
+msgstr "Titolo asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:160
+msgid "Title desc"
+msgstr "Titolo decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:161
+msgid "Date asc"
+msgstr "Data asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:162
+msgid "Date desc"
+msgstr "Data decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:163
+msgid "Author asc"
+msgstr "Autore asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:164
+msgid "Author desc"
+msgstr "Autore decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:165
+msgid "Published asc"
+msgstr "Pubblicazione asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:166
+msgid "Published desc"
+msgstr "Pubblicazione decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:167
+msgid "Access asc"
+msgstr "Accesso asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:168
+msgid "Access desc"
+msgstr "Accesso decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:202
+msgid "The module % is currently being edited by another administrator"
+msgstr "Il modulo % è attualmente editato da un'altro amministratore"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:356
+msgid "Typed Content Item saved"
+msgstr "Modifiche salvate"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:362
+msgid "Changes to Typed Content Item saved"
+msgstr "Modifiche dell'oggetto salvate "
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:473
+msgid "Successfully Reset Hit"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Typed Content Page"
+msgstr "Contenuto della pagina"
+
+#: components/com_user/user.html.php:22
+msgid "Welcome!"
+msgstr "Benvenuto!"
+
+#: components/com_user/user.html.php:27
+msgid "Welcome to the user section of our site"
+msgstr "Benvenuto alla sezione utente del nostro sito"
+
+#: components/com_user/user.html.php:61
+msgid "Edit Your Details"
+msgstr "Inserisci i tuoi dettagli"
+
+#: components/com_user/user.html.php:69
+msgid "e-mail:"
+msgstr "e-mail:"
+
+#: components/com_user/user.html.php:72
+msgid "User Name:"
+msgstr "Neme Utente:"
+
+#: components/com_user/user.html.php:99
+msgid "Submission Success!"
+msgstr "Invio riuscito!"
+
+#: components/com_user/user.html.php:103
+msgid ""
+"Your item has been submitted to the site administrators. It will be reviewed "
+"before being published on the site."
+msgstr ""
+"Il tuo contenuto è stato inviato all'amministratore del sito. Sarà  "
+"visionato prima di essere pubblicato."
+
+#: components/com_user/user.php:29
+msgid "Update"
+msgstr "Update"
+
+#: components/com_user/user.php:56
+msgid "You cannot upload files greater than 15kb in size."
+msgstr "Non puoi inviare files di dimensioni superiori ai 15 kb."
+
+#: components/com_user/user.php:59
+msgid "Image %s already exists. Please rename the file and try again."
+msgstr ""
+"L'immagine %s è già  presente. Prego rinominare il file e provare nuovamente."
+
+#: components/com_user/user.php:65
+msgid "Failed to copy %s"
+msgstr "La copia non è riuscita %s"
+
+#: components/com_user/user.php:87
+msgid "You may only upload a gif or jpg image."
+msgstr "Puoi solamente inviare immagini nel formato gif o jpg."
+
+#: components/com_user/user.php:129
+msgid "Passwords do not match"
+msgstr "La password non corrisponde"
+
+#: components/com_user/user.php:152
+msgid "Your settings have been saved."
+msgstr "I tuoi dati sono stati salvati."
+
+#: components/com_user/user.php:211
+msgid "Checked in %d item"
+msgstr "Controllato in %d elementi"
+
+#: components/com_user/user.php:222
+msgid "All items checked out have now been checked in"
+msgstr "Tutti gli elementi bloccati sono stati ripristinati"
+
+#: administrator/components/com_users/admin.users.html.php:57
+#: administrator/components/com_users/admin.users.php:157
+msgid "Logged In"
+msgstr "Loggato"
+
+#: administrator/components/com_users/admin.users.html.php:63
+msgid "UserID"
+msgstr "Utente ID"
+
+#: administrator/components/com_users/admin.users.html.php:66
+msgid "Group"
+msgstr "Gruppo"
+
+#: administrator/components/com_users/admin.users.html.php:69
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: administrator/components/com_users/admin.users.html.php:72
+msgid "Last Visit"
+msgstr "Ultima visita"
+
+#: administrator/components/com_users/admin.users.html.php:156
+msgid "You must provide a user login name."
+msgstr "Devi fornire il nome utente di login"
+
+#: administrator/components/com_users/admin.users.html.php:158
+msgid "Your login name contains invalid characters or is too short."
+msgstr "Il tuo nome di login contien caratteri non validi o è troppo breve."
+
+#: administrator/components/com_users/admin.users.html.php:160
+msgid "You must provide an email address."
+msgstr "Devi inserire un indirizzo email"
+
+#: administrator/components/com_users/admin.users.html.php:162
+msgid "You must assign user to a group."
+msgstr "Devi assegnare l’utente al gruppo"
+
+#: administrator/components/com_users/admin.users.html.php:164
+msgid "Passwords do not match."
+msgstr "La password non corrisponde"
+
+#: administrator/components/com_users/admin.users.html.php:166
+msgid ""
+"Please Select another group as `Public Frontend` is not a selectable option"
+msgstr ""
+"Prego seleziona un altro gruppo come ’Public Frontend’ non ’ una opzione "
+"selezionabile"
+
+#: administrator/components/com_users/admin.users.html.php:168
+msgid ""
+"Please Select another group as `Public Backend` is not a selectable option"
+msgstr ""
+"rego seleziona un altro gruppo come ’Public  Backend’ non ’ una opzione "
+"selezionabile"
+
+#: administrator/components/com_users/admin.users.html.php:196
+msgid "User Details"
+msgstr "Dettagli utente"
+
+#: administrator/components/com_users/admin.users.html.php:216
+msgid "Email:"
+msgstr "Email:"
+
+#: administrator/components/com_users/admin.users.html.php:224
+msgid "New Password:"
+msgstr "Nuova Password:"
+
+#: administrator/components/com_users/admin.users.html.php:251
+msgid "Block User"
+msgstr "Blocca utente"
+
+#: administrator/components/com_users/admin.users.html.php:263
+msgid "Receive Submission Emails"
+msgstr "Ricevi email di iscrizione"
+
+#: administrator/components/com_users/admin.users.html.php:275
+msgid "Register Date"
+msgstr "Data di registrazione"
+
+#: administrator/components/com_users/admin.users.html.php:283
+msgid "Last Visit Date"
+msgstr "Data ultima visita"
+
+#: administrator/components/com_users/admin.users.html.php:306
+#: administrator/components/com_users/admin.users.html.php:325
+msgid "Contact Information"
+msgstr "Informazioni contatti"
+
+#: administrator/components/com_users/admin.users.html.php:312
+msgid "No Contact details linked to this User:"
+msgstr "Nessun dettaglio del contatto è collegato a questo utente"
+
+#: administrator/components/com_users/admin.users.html.php:314
+msgid "See \"Components -> Contact -> Manage Contacts\" for details."
+msgstr "Vedi  \"Components -> Contact -> Manage Contacts\" per i dettagli."
+
+#: administrator/components/com_users/admin.users.html.php:391
+msgid "Change Contact Details"
+msgstr "Cambia dettagli del contatto"
+
+#: administrator/components/com_users/admin.users.html.php:394
+msgid "Components -> Contact -> Manage Contacts"
+msgstr "Components -> Contact -> Manage Contacts"
+
+#: administrator/components/com_users/admin.users.php:150
+msgid "- Select Group -"
+msgstr "- Seleziona un gruppo -"
+
+#: administrator/components/com_users/admin.users.php:156
+msgid "- Select Log Status - "
+msgstr "- Seleziona lo stato corrente - "
+
+#: administrator/components/com_users/admin.users.php:158
+msgid "Not Logged In"
+msgstr "Non hai fatto il login"
+
+#: administrator/components/com_users/admin.users.php:186
+msgid "Super Administrator"
+msgstr "Super Administrator"
+
+#: administrator/components/com_users/admin.users.php:296
+msgid "New User Details"
+msgstr "Dettagli nuovo utente"
+
+#: administrator/components/com_users/admin.users.php:297
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"You have been added as a user to %s by an Administrator.\n"
+"\n"
+"This email contains your username and password to log into the %s\n"
+"\n"
+"Username - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Hello %s,\n"
+"\n"
+"\n"
+"Se stato aggiunto come utente %s by an Administrator.\n"
+"\n"
+"Questa email contine il tuo nome utente e password per il login a %s\n"
+"\n"
+"Nome utente - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Siete pregati di non rispondere a questa email che è stata generata "
+"automaticamente solamente per informarvi"
+
+#: administrator/components/com_users/admin.users.php:326
+msgid "Successfully Saved changes to User: %s"
+msgstr "Modifiche salvate per l’utente: %s"
+
+#: administrator/components/com_users/admin.users.php:331
+msgid "Successfully Saved User: %s"
+msgstr "utente correttamente registrato: %s"
+
+#: administrator/components/com_users/admin.users.php:361
+msgid "You cannot delete a Super Administrator"
+msgstr "Non puoi cancellare un Super Administrator"
+
+#: administrator/components/com_users/admin.users.php:363
+msgid "You cannot delete Yourself!"
+msgstr "Non puoi cancellarti"
+
+#: administrator/components/com_users/admin.users.php:365
+msgid ""
+"You cannot delete another `Administrator` only `Super Administrators` have "
+"this power"
+msgstr ""
+"Non puoi cancellare un’Administrator solo un Super Administrator ha questa "
+"facoltà"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "block"
+msgstr "blocca"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "unblock"
+msgstr "sblocca"
+
+#: administrator/components/com_users/admin.users.php:413
+msgid "Please select a user"
+msgstr "Prego seleziona un utente"
+
+#: administrator/components/com_users/toolbar.users.html.php:49
+msgid "Force Logout"
+msgstr "Forza il logout"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:29
+msgid "Weblink Manager"
+msgstr "Weblink Manager"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:58
+msgid "Approved"
+msgstr "Approvato"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:98
+msgid "Edit Weblinks"
+msgstr "Scrivi Weblinks"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:176
+#: components/com_weblinks/weblinks.html.php:249
+msgid "Weblink item must have a title"
+msgstr "Il Weblink deve avere un titolo"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:178
+#: components/com_weblinks/weblinks.html.php:251
+msgid "You must select a category."
+msgstr "Devi selezionare una categoria"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:180
+#: components/com_weblinks/weblinks.html.php:253
+msgid "You must have a url."
+msgstr "Devi avere la url"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "Weblink:"
+msgstr "Weblink:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:225
+#: components/com_weblinks/weblinks.html.php:297
+msgid "URL:"
+msgstr "URL:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:250
+msgid "Approved:"
+msgstr "Approvato:"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:143
+#: components/com_weblinks/weblinks.php:183
+msgid "The module %s is currently being edited by another administrator."
+msgstr "Al momento un amministratore ha aperto il modulo %s"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon"
+msgstr "Icona"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon to be used to the left of the url links in Table view"
+msgstr "Icona usata sulla sinistra del link sulla vista Table"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Link Descriptions"
+msgstr "Descrizione Link"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr "Mostra/Nascondi il testo di Descrizione del Link"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Hits column"
+msgstr "Mostra/Nascondi la colonna degli Hits"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "This component shows a listing of Weblinks"
+msgstr "Questo componente mostra una lista di Weblinks"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Weblinks"
+msgstr "Weblinks"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target"
+msgstr "Target"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target window when the link is clicked"
+msgstr "Finestra Target quando si clicca sul link"
+
+#: components/com_weblinks/weblinks.class.php:70
+msgid "Please provide a valid URL"
+msgstr "Prego inserire una URL valida"
+
+#: components/com_weblinks/weblinks.class.php:76
+msgid "Your web link must be given a title."
+msgstr "Il tuo weblink deve avere un titolo"
+
+#: components/com_weblinks/weblinks.class.php:91
+msgid "There is already a web link that name, please try again."
+msgstr "Esiste già un link con lo stesso nome, prova nuovamente"
+
+#: components/com_weblinks/weblinks.html.php:109
+msgid "Web Link"
+msgstr "Web Link"
+
+#: components/com_weblinks/weblinks.html.php:264
+msgid "Submit A Web Link"
+msgstr "Invia un Web Link"
+
+#: components/com_weblinks/weblinks.php:98
+msgid ""
+"From the list below choose one of our web link categories, then select a URL "
+"to visit the site."
+msgstr ""
+"Dalla seguente lista seleziona una delle nostre categorie di link, poi "
+"seleziona la URL per visitare il sito."
+
+#: components/com_weblinks/weblinks.php:290
+msgid "User Submitted '%'"
+msgstr "User Submitted '%'"
+
+#: components/com_weblinks/weblinks.php:292
+msgid " for %s.\\n\\n\\n\\n"
+msgstr " for %s.\\n\\n\\n\\n"
+
+#: components/com_wrapper/wrapper.html.php:55
+msgid ""
+"This option will not work correctly.  Unfortunately, your browser does not "
+"support Inline Frames"
+msgstr ""
+"Questa opzione non lavora correttamente. Sfortunatamente, il tuo browser non "
+"gestisce i Frame Inline (iFrames)"
diff -ruN 4.5.4/language/glossary/it_IT_utf-8.po 4.6rc2/language/glossary/it_IT_utf-8.po
--- 4.5.4/language/glossary/it_IT_utf-8.po	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/glossary/it_IT_utf-8.po	2006-06-07 03:21:25.000000000 -0500
@@ -0,0 +1,6956 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Mambo 4.6\n"
+"Report-Msgid-Bugs-To: translation@mambo-foundation.org\n"
+"POT-Creation-Date: 2006-06-06 01:51+0100\n"
+"PO-Revision-Date: 2006-06-06 2:04+0100\n"
+"Last-Translator: Translation Team <translation@mambo-foundation.org>\n"
+"Language-Team: Translation Team <translation@mambo-foundation.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: administrator/components/com_admin/admin.admin.html.php:27
+msgid "Home"
+msgstr "Home"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Advanced Mode"
+msgstr "Modo  avanzato"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Simple Mode"
+msgstr "Modo base"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "selected"
+msgstr "selezionato"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "unselected"
+msgstr "deselezionato"
+
+#: administrator/components/com_admin/admin.admin.html.php:80
+msgid "Information"
+msgstr "Informazione"
+
+#: administrator/components/com_admin/admin.admin.html.php:86
+#: administrator/components/com_admin/admin.admin.html.php:482
+msgid "System Info"
+msgstr "Info Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:91
+msgid "System Information"
+msgstr "Informazioni Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:97
+msgid "PHP built On:"
+msgstr "PHP installato:"
+
+#: administrator/components/com_admin/admin.admin.html.php:107
+msgid "Database Version:"
+msgstr "Versione Database:"
+
+#: administrator/components/com_admin/admin.admin.html.php:117
+msgid "PHP Version:"
+msgstr "Versione PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:127
+msgid "Web Server:"
+msgstr "Web Server:"
+
+#: administrator/components/com_admin/admin.admin.html.php:137
+msgid "WebServer to PHP interface:"
+msgstr "Interfaccia web server a PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:147
+msgid "Mambo Version:"
+msgstr "Versione Mambo:"
+
+#: administrator/components/com_admin/admin.admin.html.php:157
+msgid "User Agent:"
+msgstr "Agente Utente:"
+
+#: administrator/components/com_admin/admin.admin.html.php:167
+msgid "Relevant PHP Settings:"
+msgstr "Configurazione PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:174
+msgid "Safe Mode:"
+msgstr "Safe Mode:"
+
+#: administrator/components/com_admin/admin.admin.html.php:182
+msgid "Open basedir:"
+msgstr "Directory di base:"
+
+#: administrator/components/com_admin/admin.admin.html.php:190
+msgid "Display Errors:"
+msgstr "Mostra errori"
+
+#: administrator/components/com_admin/admin.admin.html.php:198
+msgid "Short Open Tags:"
+msgstr "Short Open Tags:"
+
+#: administrator/components/com_admin/admin.admin.html.php:206
+msgid "File Uploads:"
+msgstr "Carica files:"
+
+#: administrator/components/com_admin/admin.admin.html.php:214
+msgid "Magic Quotes"
+msgstr "Magic Quotes"
+
+#: administrator/components/com_admin/admin.admin.html.php:222
+msgid "Register Globals:"
+msgstr "Register Globals:"
+
+#: administrator/components/com_admin/admin.admin.html.php:230
+msgid "Output Buffering:"
+msgstr "Output Buffering:"
+
+#: administrator/components/com_admin/admin.admin.html.php:238
+msgid "Session save path:"
+msgstr "Session save path:"
+
+#: administrator/components/com_admin/admin.admin.html.php:246
+msgid "Session auto start:"
+msgstr "Session auto start:"
+
+#: administrator/components/com_admin/admin.admin.html.php:254
+msgid "XML enabled:"
+msgstr "XML abilitato"
+
+#: administrator/components/com_admin/admin.admin.html.php:262
+msgid "Zlib enabled:"
+msgstr "Zlib abilitate:"
+
+#: administrator/components/com_admin/admin.admin.html.php:270
+msgid "Disabled Functions:"
+msgstr "Funzioni disabilitate"
+
+#: administrator/components/com_admin/admin.admin.html.php:285
+msgid "WYSIWYG Editor:"
+msgstr "Editore WYSIWYG :"
+
+#: administrator/components/com_admin/admin.admin.html.php:297
+msgid "Configuration File:"
+msgstr "File di configurazione"
+
+#: administrator/components/com_admin/admin.admin.html.php:323
+msgid "PHP Info"
+msgstr "Info PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:328
+msgid "PHP Information"
+msgstr "Informazioni sul  PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:350
+msgid "Permissions"
+msgstr "Permessi"
+
+#: administrator/components/com_admin/admin.admin.html.php:354
+msgid "Directory Permissions"
+msgstr "Permessi cartelle"
+
+#: administrator/components/com_admin/admin.admin.html.php:358
+msgid ""
+"For all Mambo functions and features to work ALL of the following "
+"directories should be writeable:"
+msgstr ""
+"Perché tutte le funzioni di Mambo siano attive e funzionanti, TUTTE le "
+"seguenti  cartelle dovranno essere scrivibili:"
+
+#: administrator/components/com_admin/admin.admin.html.php:434
+msgid "Help"
+msgstr "Aiuto"
+
+#: administrator/components/com_admin/admin.admin.html.php:442
+msgid "Search:"
+msgstr "Cerca"
+
+#: administrator/components/com_admin/admin.admin.html.php:445
+msgid "Go"
+msgstr "Vai"
+
+#: administrator/components/com_admin/admin.admin.html.php:446
+msgid "Clear Results"
+msgstr "Cancella risultati"
+
+#: administrator/components/com_admin/admin.admin.html.php:453
+#: administrator/components/com_admin/admin.admin.html.php:464
+msgid "Glossary"
+msgstr "Glossario"
+
+#: administrator/components/com_admin/admin.admin.html.php:456
+#: administrator/components/com_admin/admin.admin.html.php:467
+msgid "Credits"
+msgstr "Crediti"
+
+#: administrator/components/com_admin/admin.admin.html.php:459
+#: administrator/components/com_admin/admin.admin.html.php:470
+msgid "Support"
+msgstr "Supporto"
+
+#: administrator/components/com_admin/admin.admin.html.php:476
+msgid "License"
+msgstr "Licenza"
+
+#: administrator/components/com_admin/admin.admin.html.php:491
+msgid "Search Results"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:493
+msgid "Index"
+msgstr "Indice"
+
+#: administrator/components/com_admin/admin.admin.html.php:536
+msgid "Site Preview"
+msgstr "Anteprima sito"
+
+#: administrator/components/com_admin/admin.admin.html.php:540
+msgid "Open in new window"
+msgstr "Apri in una nuova finestra"
+
+#: administrator/components/com_admin/admin.admin.php:22
+msgid "There is no link associated with this item"
+msgstr "Non ci sono links associati a questo elemento"
+
+#: administrator/components/com_checkin/admin.checkin.php:17
+msgid "You are not authorized to view this resource."
+msgstr "Non si dispone dell'autorizzazione per  vedere questa risorsa"
+
+#: administrator/components/com_checkin/admin.checkin.php:22
+msgid "Global Check-in"
+msgstr "Controllo globale"
+
+#: administrator/components/com_checkin/admin.checkin.php:27
+msgid "Database Table"
+msgstr "Tabelle database"
+
+#: administrator/components/com_checkin/admin.checkin.php:28
+msgid "# of Items"
+msgstr "# di elementi"
+
+#: administrator/components/com_checkin/admin.checkin.php:29
+msgid "Checked-In"
+msgstr "Sbloccati"
+
+#: administrator/components/com_checkin/admin.checkin.php:76
+#: administrator/components/com_checkin/admin.checkin.php:83
+msgid "Checking table"
+msgstr "Controllo tabella"
+
+#: administrator/components/com_checkin/admin.checkin.php:77
+#: administrator/components/com_checkin/admin.checkin.php:84
+msgid "Checked in <strong>%d</strong> item"
+msgid_plural "Checked in <strong>%d</strong> items"
+msgstr[0] "Sbloccato <strong>%d</strong> elemento"
+msgstr[1] "Sbloccati <strong>%d</strong> elementi"
+
+#: administrator/components/com_checkin/admin.checkin.php:95
+msgid "Checked out items have now been all checked in"
+msgstr "Tutti gli elementi bloccati sono stati ripristinati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:42
+msgid "XML ERROR in %s: %s at line %d"
+msgstr "ERRORE XML  in %s: %s alla linea %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:48
+msgid "Unable to open XML file %s"
+msgstr "Impossibile aprire il file  XML %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:51
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr "Errore XML in %s - tag non chiusi  (%s) alla fine del file"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:78
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr "Errore XML in %s: %s non è un  elemento contenitore valido"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:79
+msgid "XML error in %s: %s not permitted within %s"
+msgstr "Errore XML in %s: %s non è permesso con %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:88
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr "Errore XML in %s atteso MOSINSTALL ma  trovato %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:94
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr ""
+"Errore XML in %s l’ultimo tag aperto era %s, ma è stata trovata la fine di %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:106
+msgid "XML handler error - no method provided to deal with character data"
+msgstr "Errore gestore XML - nessun metodo ha fornito i dati carattere"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:111
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr "Errore XML in %s mosinstall non ha attributi di tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:280
+msgid "Handler not defined for type"
+msgstr "Gestore non definito per il tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:293
+msgid "There are no Parameters for this item"
+msgstr "Non ci sono parametri per questo elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:78
+msgid "Please make a selection from the list to %s"
+msgstr "Prego effettuare una selezione dalla lista a %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:108
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:128
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:55
+msgid "New"
+msgstr "Nuovo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:166
+msgid "Publish"
+msgstr "Pubblica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:171
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:102
+msgid "Please make a selection from the list to publish"
+msgstr "Prego effettuare una selezione dalla lista per pubblicazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:185
+msgid "Default"
+msgstr "Predefinito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:190
+msgid "Please select an item to make default"
+msgstr "Prego selezionare un elemento come predefinito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:204
+msgid "Assign"
+msgstr "Assegna"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:209
+msgid "Please select an item to assign"
+msgstr "Prego selezionare un elemento da assegnare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:223
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:242
+msgid "Unpublish"
+msgstr "Non pubblicare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:247
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:142
+msgid "Please make a selection from the list to unpublish"
+msgstr "Prego effettuare una selezione dalla lista per depubblicare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:261
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:150
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:155
+msgid "Archive"
+msgstr "Archivio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:266
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:162
+msgid "Please make a selection from the list to archive"
+msgstr "Prego effettuare una selezione dalla lista per archiviare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:280
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:175
+msgid "Unarchive"
+msgstr "Non archiviare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:182
+msgid "Please select a news story to unarchive"
+msgstr "Prego selezionare una nuova storia da ripubblicare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:299
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:319
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:195
+msgid "Edit"
+msgstr "Modifica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:324
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:343
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:363
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:382
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:402
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:202
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:221
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:240
+msgid "Please select an item from the list to edit"
+msgstr "Prego selezionare un articolo dalla lista per modificarlo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:338
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:358
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:215
+msgid "Edit HTML"
+msgstr "Modifica HTML"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:377
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:397
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:234
+msgid "Edit CSS"
+msgstr "Modifica CSS"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:417
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:438
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:254
+msgid "Delete"
+msgstr "Cancella"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:422
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:443
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Are you sure you want to delete selected items?"
+msgstr "Sei sicuro di voler cancellare l’articolo selezionato?"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:422
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:443
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Please make a selection from the list to delete"
+msgstr "Prego effettuare una selezione dalla lista, per cancellare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:455
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:79
+msgid "Trash"
+msgstr "Cestino"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:474
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:475
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:80
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:277
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:278
+msgid "Preview"
+msgstr "Anteprima"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:540
+msgid "Apply"
+msgstr "Applica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:560
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:294
+msgid "Save"
+msgstr "Salva"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:611
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:344
+msgid "Cancel"
+msgstr "Annulla"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:629
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:239
+msgid "Back"
+msgstr "Indietro"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:664
+msgid "Upload"
+msgstr "Carica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:669
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:670
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:391
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:392
+msgid "Upload Image"
+msgstr "Carica immagine"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:86
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:410
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+"I nuovi elementi vanno automaticamente in ultima posizione. L’ordinamento "
+"può essere cambiato dopo che l’elemento è stato salvato."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:181
+msgid "Parent Window With Browser Navigation"
+msgstr "Stessa finestra, con navigazione browser"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:182
+msgid "New Window With Browser Navigation"
+msgstr "Nuova finestra con navigazione browser"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:183
+msgid "New Window Without Browser Navigation"
+msgstr "Nuova finestra senza navigazione browser"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:242
+msgid "All"
+msgstr "Tutto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:248
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:451
+msgid "None"
+msgstr "Nessuno"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:503
+msgid "- All Sections -"
+msgstr "- Tutte le sezioni -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:390
+msgid "- Select Image -"
+msgstr "- Seleziona immagine -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:408
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr ""
+"I nuovi elementi vanno automaticamente in prima posizione. L’ordinamento può "
+"essere cambiato dopo che l’elemento è stato salvato."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:435
+msgid "- No User -"
+msgstr "- Nessun utente -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:454
+msgid "Center"
+msgstr "Centro"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:457
+msgid "Left"
+msgstr "Sinistra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:460
+msgid "Right"
+msgstr "Destra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:482
+msgid "- All Categories -"
+msgstr "- Tutte le categorie -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:489
+msgid "You must create a category first."
+msgstr "Si deve creare una categoria, prima."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:73
+msgid "Results %d to %d of %d"
+msgstr "Risultati %d a %d di %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:75
+msgid "No records found."
+msgstr "Nessun record trovato."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:102
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:108
+msgid "Start"
+msgstr "Inizio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:102
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+msgid "first page"
+msgstr "prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:103
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:109
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:226
+msgid "Previous"
+msgstr "Precedente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:103
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+msgid "previous page"
+msgstr "pagina precedente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:121
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:124
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:127
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:217
+msgid "Next"
+msgstr "Prossimo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:121
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+msgid "next page"
+msgstr "prossima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:122
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:128
+msgid "End"
+msgstr "Fine"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:122
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+msgid "end page"
+msgstr "fine pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:65
+msgid "Control Panel"
+msgstr "Pannello di controllo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site"
+msgstr "Sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site Management"
+msgstr "Gestione sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:292
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:115
+msgid "Global Configuration"
+msgstr "Configurazione globale"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Language Manager"
+msgstr "Gestore lingue"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Manage languages"
+msgstr "Gestione lingue"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Manage Media Files"
+msgstr "Gestione file Media"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Media Manager"
+msgstr "Gestore Media"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:81
+msgid "In New Window"
+msgstr "In una nuova finestra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:82
+msgid "Inline"
+msgstr "In linea"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:83
+msgid "Inline with Positions"
+msgstr "In linea con posizioni"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Site Statistics"
+msgstr "Statistiche sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:88
+msgid "Browser, OS, Domain"
+msgstr "Browser, SO, Domini"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:89
+msgid "Page Impressions"
+msgstr "Pagine visitate"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:92
+msgid "Search Text"
+msgstr "Testi di ricerca"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Change site template"
+msgstr "Cambia template del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+msgid "Template Manager"
+msgstr "Gestore template"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Site Templates"
+msgstr "Templates del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+msgid "Install"
+msgstr "Installa"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Install Site Templates"
+msgstr "Installa Template del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Administrator Templates"
+msgstr "Template amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Change admin template"
+msgstr "Cambia template amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Install Administrator Templates"
+msgstr "Installa template amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Module Positions"
+msgstr "Posizione moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Template positions"
+msgstr "Posizione template"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Manage Trash"
+msgstr "Gestisci cestino"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Trash Manager"
+msgstr "Gestore cestino"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "Manage users"
+msgstr "Gestisci utenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "User Manager"
+msgstr "Gestore utenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_stats.php:24
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:438
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:517
+msgid "Menu"
+msgstr "Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+msgid "Menu Management"
+msgstr "Gestione menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:122
+msgid "Menu Manager"
+msgstr "Gestore menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content"
+msgstr "Contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content Management"
+msgstr "Gestione contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content Managers"
+msgstr "Gestore contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content by Section"
+msgstr "Contenuti per sezione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:144
+msgid "Items"
+msgstr "Articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+msgid "Add/Edit"
+msgstr "Aggiungi/Modifica"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:58
+msgid "Categories"
+msgstr "Categorie"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:28
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:137
+msgid "All Content Items"
+msgstr "Tutti gli articoli di contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+msgid "Manage Content Items"
+msgstr "Gestisci articoli di contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Manage Typed Content Items"
+msgstr "Gestisci articoli di contenuto testuale"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Static Content Manager"
+msgstr "Gestore contenuti statici"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Manage Content Sections"
+msgstr "Gestione sezione contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Section Manager"
+msgstr "Gestore sezioni"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Category Manager"
+msgstr "Gestore categorie"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Manage Content Categories"
+msgstr "Gestisci  categorie di contenuti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Frontpage Manager"
+msgstr "Gestore prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Manage Frontpage Items"
+msgstr "Gestisci articoli in prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Archive Manager"
+msgstr "Gestore archivio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Manage Archive Items"
+msgstr "Gestisci articoli in archivio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+msgid "Component Management"
+msgstr "Gestore componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Components"
+msgstr "Componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install/Uninstall"
+msgstr "Installa/Disinstalla"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+msgid "Install/Uninstall components"
+msgstr "Installa/Disinstalla componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components"
+msgstr "Altri componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components..."
+msgstr "Altri componenti..."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+msgid "Module Management"
+msgstr "Gestione moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Modules"
+msgstr "Moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+msgid "Install custom modules"
+msgstr "Installa moduli personalizzati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Manage Site modules"
+msgstr "Gestisci moduli del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Site Modules"
+msgstr "Moduli del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Administrator Modules"
+msgstr "Moduli amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Manage Administrator modules"
+msgstr "Gestione moduli amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+msgid "Mambot Management"
+msgstr "Gestione mambot"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Mambots"
+msgstr "Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install custom mambot"
+msgstr "Installa mambot personalizzato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Manage Site Mambots"
+msgstr "Gestione mambots del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Site Mambots"
+msgstr "Mambots del sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installer List"
+msgstr "Elenco installatore"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installers"
+msgstr "Installatore"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Templates - Site"
+msgstr "Templates - Sito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Templates - Admin"
+msgstr "Templates - Amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Install Languages"
+msgstr "Installa lingua"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Languages"
+msgstr "Lingue"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Install/Uninstall Components"
+msgstr "Installa/Disinstalla componenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Install/Uninstall Modules"
+msgstr "Installa/Disinstalla moduli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Install/Uninstall Mambots"
+msgstr "Installa/Disinstalla mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messages"
+msgstr "Messaggi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messaging Management"
+msgstr "Gestione messaggi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Inbox"
+msgstr "Arrivati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Private Messages"
+msgstr "Messaggi  privati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System"
+msgstr "Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System Management"
+msgstr "Gestione sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Check-in all checked-out items"
+msgstr "Sblocca tutti gli elementi bloccati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Global Checkin"
+msgstr "Controllo generale"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:301
+msgid "View System Information"
+msgstr "Vedi informazioni di sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean Cache"
+msgstr "Pulisci la cache"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean the content items cache"
+msgstr "Pulisci la cache dagli elementi di contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:27
+msgid "Most Recently Added Content"
+msgstr "Ultimi contenuti aggiunti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:64
+msgid "Edit User"
+msgstr "Modifica utente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:56
+msgid "Currently Logged in Users"
+msgstr "Utenti attualmente connessi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+msgid "Force Logout User"
+msgstr "Forza disconnessione utente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:62
+msgid "Logout"
+msgstr "Disconnetti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_online.php:22
+msgid "Users Online"
+msgstr "Utenti online"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:27
+msgid "Most Popular Items"
+msgstr "Articoli più popolari"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:30
+msgid "Created"
+msgstr "Creato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:33
+msgid "Hits"
+msgstr "Visite"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:35
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:144
+msgid "Static Content"
+msgstr "Contenuto statico"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:42
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:152
+msgid "Frontpage"
+msgstr "Prima pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:51
+msgid "Sections"
+msgstr "Sezioni"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:65
+msgid "Media"
+msgstr "Media"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:89
+msgid "Menus"
+msgstr "Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:102
+msgid "Users"
+msgstr "Utenti"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_stats.php:27
+msgid "# Items"
+msgstr "# Articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_unread.php:17
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_unread.php:19
+msgid "Mail"
+msgstr "Posta"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:22
+msgid "Content Preview"
+msgstr "Anteprima contenuto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:60
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:68
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:49
+msgid "Close"
+msgstr "Chiudi"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:61
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:276
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:278
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:294
+msgid "Print"
+msgstr "Stampa"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:40
+msgid "Module Preview"
+msgstr "Anteprima modulo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:25
+msgid "Poll Preview"
+msgstr "Anteprima sondaggio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:46
+msgid "Results"
+msgstr "Risultati"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:46
+msgid "Vote"
+msgstr "Vota"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:25
+msgid "Please select an image to upload"
+msgstr "Prego selezionare un’immagine da caricare"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:31
+msgid "File must only contain alphanumeric characters and no spaces please."
+msgstr "Il file deve contenere solo caratteri alfanumerici e nessuno spazio"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:36
+msgid "Image %s already exists."
+msgstr "L’immagine %s esiste già."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:41
+msgid "The file must be gif, png, jpg, bmp, swf, doc, xls or ppt"
+msgstr "Il  file deve essere gif, png, jpg, bmp, swf, doc, xls o ppt"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:48
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:56
+msgid "Upload of $userfile_name failed"
+msgstr "Caricamento di $userfile_name fallito"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:52
+msgid "Upload of $userfile_name to $media_path successful"
+msgstr "Caricamento di $userfile_name in $media_path effettuato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:60
+msgid "Upload of $userfile_name to $base_Dir successful"
+msgstr "Caricamento di $userfile_name in $base_Dir effettuato"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:84
+msgid "File Upload :"
+msgstr "Caricamento file:"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:94
+msgid "Max size"
+msgstr "Grandezza massima"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:34
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:88
+msgid "Mambo Logo"
+msgstr "Logo Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:19
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:22
+msgid "Administration"
+msgstr "Amministrazione"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:40
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:49
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/login.php:40
+msgid "Login"
+msgstr "Entra"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:43
+msgid "Username"
+msgstr "Nome utente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:45
+msgid "Password"
+msgstr "Password"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:55
+msgid "Welcome to Mambo!"
+msgstr "benvenuto in  Mambo!"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:56
+msgid ""
+"Use a valid username and password to gain access to the administration "
+"console."
+msgstr ""
+"Usa un nome utente ed una password validi per accedere al pannello di "
+"controllo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:36
+msgid "Please make a selection from the list to"
+msgstr "Prego effettuare una selezione dalla lista a"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:75
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:95
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:473
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:560
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:653
+msgid "Published"
+msgstr "Pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:115
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:135
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:653
+msgid "Unpublished"
+msgstr "Non pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:312
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:313
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:327
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:328
+msgid "save"
+msgstr "salva"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:363
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:364
+msgid "back"
+msgstr "indietro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr "Prego completare i campi nome utente e password."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:41
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr "Entrata non permessa. Non ci sono controlli di autenticazione attivi."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr ""
+"Il tuo accesso è stato bloccato. Per  favore contattare l’amministratore"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr "Nome utente o password non corretti. Per favore prova ancora."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:147
+msgid "Please enter a password"
+msgstr "Prego inserire una  password"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:166
+msgid "You cannot login. There are no administrators set up."
+msgstr "Non puoi entrare. Non ci sono amministratori configurati."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr ""
+"Nome utente, password o livello di accesso non corretti. Per favore, prova "
+"ancora"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/cmtclasses.php:348
+msgid "Your Module must contain a title."
+msgstr "Il modulo deve avere un titolo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:21
+msgid "Unwriteable"
+msgstr "Non scrivibile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:21
+msgid "Writeable"
+msgstr "Scrivibile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:95
+msgid "January"
+msgstr "Gennaio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:96
+msgid "February"
+msgstr "Febbraio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:97
+msgid "March"
+msgstr "Marzo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:98
+msgid "April"
+msgstr "Aprile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:99
+msgid "May"
+msgstr "Maggio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:100
+msgid "June"
+msgstr "Giugno"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:101
+msgid "July"
+msgstr "Luglio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:102
+msgid "August"
+msgstr "Agosto"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:103
+msgid "September"
+msgstr "Settembre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:104
+msgid "October"
+msgstr "Ottobre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:105
+msgid "November"
+msgstr "Novembre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:106
+msgid "December"
+msgstr "Dicembre"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:121
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:171
+msgid "Yes"
+msgstr "Si"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:122
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:170
+msgid "No"
+msgstr "No"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:195
+msgid "No Sorting"
+msgstr "Nessun ordinamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:196
+msgid "Sort Ascending"
+msgstr "Ordinamento ascendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:197
+msgid "Sort Descending"
+msgstr "Ordibamento discendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:222
+msgid "Close Window"
+msgstr "Chiudi finestra"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:350
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr ""
+"Questo indirizzo email è protetto contro i robot spam, hai bisogno del "
+"Javascript abilitato, per vederlo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:375
+msgid "Pending"
+msgstr "In attesa"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:378
+msgid "Published, but is <u>Pending"
+msgstr "Pubblicato, ma è <u> in attesa</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:381
+msgid "Visible"
+msgstr "Visibile"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:384
+msgid "Published and is <u>Current</u>"
+msgstr "Attualmente <u>pubblicato</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:387
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:393
+msgid "Finished"
+msgstr "Finito"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:390
+msgid "Published, but has <u>Expired</u>"
+msgstr "Pubblicazione <u>scaduta</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:396
+msgid "Not Published"
+msgstr "Non pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:401
+msgid "Click on icon to toggle state."
+msgstr "Cliccare sull’icona per cambiare lo stato."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:441
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:520
+msgid "Go to Menu"
+msgstr "Vai la menu"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:448
+msgid "Link Name"
+msgstr "Nome collegamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:452
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:539
+msgid "Go to Menu Item"
+msgstr "Vai al menu articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:460
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:547
+msgid "State"
+msgstr "Stato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:466
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:553
+msgid "Trashed"
+msgstr "Cestinato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:469
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:556
+msgid "UnPublished"
+msgstr "Non pubblicato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:527
+msgid "Type"
+msgstr "Tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:535
+msgid "Item Name"
+msgstr "Nome elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:584
+msgid "Checked Out"
+msgstr "Bloccato"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Publish item"
+msgstr "Pubblica elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Unpublish Item"
+msgstr "Non pubblicare elemento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:21
+msgid "User Submitted '%s'"
+msgstr "Utente inviato '%s'"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:22
+msgid ""
+"Hello %s,\\n\\n\\nA user submitted %s:\\n [ %s ]\\n has been just been "
+"submitted by user:\\n [ %s ]\\n"
+msgstr ""
+"Ciao %s,\\n\\n\\nUn utente ha inviato %s:\\n [ %s ]\\n è stato appena "
+"inserito dall’utente:\\n [ %s ]\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:23
+msgid " for %.\\n\\n\\n\\n"
+msgstr "per %.\\n\\n\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:24
+msgid "Please go to %s/administrator to view and approve this %s.\\n\\n"
+msgstr ""
+"Per favore, vai in amministrazione di %s/ per vederlo ed eventualmente "
+"approvarlo %s.\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:25
+msgid ""
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only\\n"
+msgstr ""
+"Per favore, non rispondere a questo messaggio, in quanto è stato generato "
+"automaticamente a puro scopo informativo\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:50
+msgid "You need to login."
+msgstr "Devi identificarti."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:334
+msgid "Mambo Warning"
+msgstr "Avviso Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:67
+msgid "Results %d - %d of %d"
+msgstr "Risultati %d - %d di %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:79
+msgid "Page %d of %d"
+msgstr "Pagina %d di %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:67
+msgid "Powered by Mambo"
+msgstr "Powered by Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:68
+msgid "Generated:"
+msgstr "Generato:"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:95
+msgid "Written by"
+msgstr "Scritto da"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:97
+msgid "Contributed by"
+msgstr "Contributi di"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:103
+msgid "Last Updated"
+msgstr "Ultimo aggiornamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:121
+msgid "OFF"
+msgstr "OFF"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:121
+msgid "ON"
+msgstr "ON"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:283
+msgid "Text Domains"
+msgstr "Dominio testuale"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:290
+msgid "Main"
+msgstr "Principale"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:58
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:183
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:194
+msgid "Page"
+msgstr "Pagina"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:142
+msgid "Article Index"
+msgstr "Indice articoli"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:215
+msgid "Next &gt;&gt;"
+msgstr "Prossimi >>"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:224
+msgid "&lt;&lt;Previous"
+msgstr "<<Precedenti"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:39
+msgid "User Rating"
+msgstr "Valutazione utente"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:47
+msgid "Poor"
+msgstr "Povero"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:48
+msgid "vote 1 star"
+msgstr "voto 1 stella"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:49
+msgid "vote 2 star"
+msgstr "voto 2 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:50
+msgid "vote 3 star"
+msgstr "voto 3 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:51
+msgid "vote 4 star"
+msgstr "voto 4 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:52
+msgid "vote 5 star"
+msgstr "voto 5 stelle"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:53
+msgid "Best"
+msgstr "Migliore"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:54
+msgid "Rate"
+msgstr "Valuta"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:70
+msgid "Category List"
+msgstr "Elenco categorie"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:74
+msgid "Category Blog"
+msgstr "Categoria Blog"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/contacts.searchbot.php:32
+msgid "Contact"
+msgstr "Contatti"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/sections.searchbot.php:66
+msgid "Section List"
+msgstr "Elenco sezione"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/sections.searchbot.php:70
+msgid "Section Blog"
+msgstr "Sezione Blog"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/weblinks.searchbot.php:31
+msgid "Web Links"
+msgstr "Web Links"
+
+#: administrator/components/com_banners/admin.banners.html.php:29
+msgid "Banner Manager"
+msgstr "Gestore Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:43
+msgid "Banner Name"
+msgstr "Nome Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:49
+msgid "Impressions Made"
+msgstr "Esposizioni fatte"
+
+#: administrator/components/com_banners/admin.banners.html.php:52
+msgid "Impressions Left"
+msgstr "Esposizioni da fare"
+
+#: administrator/components/com_banners/admin.banners.html.php:55
+#: administrator/components/com_banners/admin.banners.html.php:58
+#: administrator/components/com_banners/admin.banners.html.php:256
+msgid "Clicks"
+msgstr "Clicks"
+
+#: administrator/components/com_banners/admin.banners.html.php:99
+msgid "Edit Banner"
+msgstr "Modifica Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:159
+msgid "You must provide a banner name"
+msgstr "Si deve inserire un nome per  il banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:161
+msgid "Please select a client"
+msgstr "Prego selezionare un cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:163
+msgid "Please select an image."
+msgstr "Prego selezionare una immagine"
+
+#: administrator/components/com_banners/admin.banners.html.php:165
+msgid "Please fill in the URL for the banner."
+msgstr "Prego inserire una URL per il banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:176
+msgid "Banner:"
+msgstr "Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:187
+#: administrator/components/com_banners/admin.banners.html.php:433
+msgid "Details"
+msgstr "Dettagli"
+
+#: administrator/components/com_banners/admin.banners.html.php:192
+msgid "Banner Name:"
+msgstr "Nome del Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:200
+#: administrator/components/com_banners/admin.banners.html.php:438
+msgid "Client Name:"
+msgstr "Nome del Cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:208
+msgid "Impressions Purchased:"
+msgstr "Esposizioni acquistate:"
+
+#: administrator/components/com_banners/admin.banners.html.php:219
+msgid "Unlimited"
+msgstr "Illimitate"
+
+#: administrator/components/com_banners/admin.banners.html.php:224
+msgid "Banner URL"
+msgstr "URL del Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:232
+msgid "Show Banner :"
+msgstr "Mostra Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:240
+msgid "Click URL:"
+msgstr "URL di destinazione"
+
+#: administrator/components/com_banners/admin.banners.html.php:248
+msgid "Custom banner code:"
+msgstr "Codice personalizzato del banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:258
+msgid "Reset Clicks"
+msgstr "Azzera clicks"
+
+#: administrator/components/com_banners/admin.banners.html.php:270
+msgid "Banner Image:"
+msgstr "Immagine del banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:320
+msgid "Banner Client Manager"
+msgstr "Gestore clienti dei banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:334
+msgid "Client Name"
+msgstr "Nome cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:340
+msgid "No. of Active Banners"
+msgstr "N. di banner attivi"
+
+#: administrator/components/com_banners/admin.banners.html.php:366
+msgid "Edit Banner Client"
+msgstr "Modifica cliente banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:407
+msgid "Please fill in the Client Name."
+msgstr "Prego inserire il nome del cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:409
+msgid "Please fill in the Contact Name."
+msgstr "Prego inserire il nome del contatto"
+
+#: administrator/components/com_banners/admin.banners.html.php:411
+msgid "Please fill in the Contact Email."
+msgstr "Prego inserire l'email del contatto"
+
+#: administrator/components/com_banners/admin.banners.html.php:421
+msgid "Banner Client:"
+msgstr "Cliente del banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:446
+msgid "Contact Name:"
+msgstr "Nome del contatto:"
+
+#: administrator/components/com_banners/admin.banners.html.php:454
+msgid "Contact Email:"
+msgstr "Email del contatto:"
+
+#: administrator/components/com_banners/admin.banners.html.php:462
+msgid "Extra Info:"
+msgstr "Altre info:"
+
+#: administrator/components/com_banners/admin.banners.php:165
+msgid "Saved Banner info"
+msgstr "Informazioni banner salvate"
+
+#: administrator/components/com_banners/admin.banners.php:168
+msgid "Reset Banner clicks"
+msgstr "Azzera clicks del banner"
+
+#: administrator/components/com_banners/admin.banners.php:201
+msgid "publish"
+msgstr "pubblica"
+
+#: administrator/components/com_banners/admin.banners.php:201
+msgid "unpublish"
+msgstr "non pubblicare"
+
+#: administrator/components/com_banners/admin.banners.php:202
+msgid "Select an item to %s"
+msgstr "Seleziona un articolo da %s"
+
+#: administrator/components/com_banners/admin.banners.php:276
+msgid "The client [ %s ] is currently being edited by another person."
+msgstr ""
+"Il cliente [ %s ] è attualmente in fase di modifica da parte di un'altra "
+"persona."
+
+#: administrator/components/com_banners/admin.banners.php:334
+msgid "Cannot delete client at this time as they have a banner still running"
+msgstr ""
+"Al momento non è possibile cancellare il cliente, dato che ha ancora banner "
+"attivi"
+
+#: administrator/components/com_banners/banners.xml
+msgid "Banners"
+msgstr "Banners"
+
+#: administrator/components/com_banners/banners.xml
+msgid "This component manages banners and banner clients"
+msgstr "Questo componente gestisce i banner ed i clienti dei banners"
+
+#: components/com_banners/banners.class.php:35
+msgid "You must select a name for the client."
+msgstr "Si deve inserire un nome, per il cliente."
+
+#: components/com_banners/banners.class.php:41
+msgid "You must select a contact for the client."
+msgstr "Si deve inserire un contatto, per il cliente."
+
+#: components/com_banners/banners.class.php:47
+msgid "You must select a valid email for the client."
+msgstr "Si deve inserire un indirizzo email valido, per il cliente."
+
+#: components/com_banners/banners.class.php:102
+msgid "You must select a client."
+msgstr "Si deve selezionare un cliente."
+
+#: components/com_banners/banners.class.php:107
+msgid "You must select a name for the banner."
+msgstr "Si deve selezionare un nome, per il banner."
+
+#: components/com_banners/banners.class.php:112
+msgid "You must select a image for the banner."
+msgstr "Si deve selezionare una immagine, per il banner."
+
+#: components/com_banners/banners.class.php:116
+msgid "You must select a URL/Custom banner code for the banner."
+msgstr ""
+"Si deve selezionare una URL/codice banner personalizzato, per il banner."
+
+#: administrator/components/com_categories/admin.categories.html.php:37
+msgid "Content: All"
+msgstr "Contenuti: Tutti"
+
+#: administrator/components/com_categories/admin.categories.html.php:72
+msgid "Category Name"
+msgstr "Nome categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:81
+msgid "Reorder"
+msgstr "Riordina"
+
+#: administrator/components/com_categories/admin.categories.html.php:87
+msgid "Order"
+msgstr "Ordina"
+
+#: administrator/components/com_categories/admin.categories.html.php:90
+msgid "Save Order"
+msgstr "Salva ordinamento"
+
+#: administrator/components/com_categories/admin.categories.html.php:93
+msgid "Access"
+msgstr "Accesso"
+
+#: administrator/components/com_categories/admin.categories.html.php:99
+msgid "Section"
+msgstr "Sezione"
+
+#: administrator/components/com_categories/admin.categories.html.php:105
+msgid "Category ID"
+msgstr "ID categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:111
+msgid "Active"
+msgstr "Attiva"
+
+#: administrator/components/com_categories/admin.categories.html.php:183
+msgid "Edit Section"
+msgstr "Modifica  sezione"
+
+#: administrator/components/com_categories/admin.categories.html.php:262
+msgid "Please select a Menu"
+msgstr "Prego selezionare un menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:265
+msgid "Please select a menu type"
+msgstr "Prego selezionare un tipo di menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:268
+msgid "Please enter a Name for this menu item"
+msgstr "Prego inserire un nome per questo menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:274
+msgid "Category must have a name"
+msgstr "Una categoria deve avere un nome"
+
+#: administrator/components/com_categories/admin.categories.html.php:322
+msgid "Category:"
+msgstr "Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:336
+msgid "Show Advanced Details"
+msgstr "Mostra dettagli"
+
+#: administrator/components/com_categories/admin.categories.html.php:339
+msgid "Hide Advanced Details"
+msgstr "Nascondi dettagli"
+
+#: administrator/components/com_categories/admin.categories.html.php:350
+msgid "Category Details"
+msgstr "Dettagli categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:355
+msgid "Category Title:"
+msgstr "Titolo categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:358
+msgid "A short name to appear in menus"
+msgstr "Un nome corto da mostrare nel menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:363
+msgid "Category Name:"
+msgstr "Nome categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:366
+msgid "A long name to be displayed in headings"
+msgstr "Un nome lungo da essere visualizzato nelle intestazioni"
+
+#: administrator/components/com_categories/admin.categories.html.php:371
+msgid "Section:"
+msgstr "Sezione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:379
+msgid "Image:"
+msgstr "Immagine"
+
+#: administrator/components/com_categories/admin.categories.html.php:397
+msgid "Image Position:"
+msgstr "Posizione immagine"
+
+#: administrator/components/com_categories/admin.categories.html.php:405
+msgid "Ordering:"
+msgstr "Ordinamento:"
+
+#: administrator/components/com_categories/admin.categories.html.php:413
+msgid "Access Level:"
+msgstr "Livelli di accesso:"
+
+#: administrator/components/com_categories/admin.categories.html.php:421
+msgid "Published:"
+msgstr "Pubblicato:"
+
+#: administrator/components/com_categories/admin.categories.html.php:429
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:450
+#: administrator/components/com_categories/admin.categories.html.php:487
+msgid "Link to Menu"
+msgstr "Collegamento al menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:455
+msgid "This will create a new menu item in the menu you select"
+msgstr "Questo creerà un nuovo elemento nel menu selezionato"
+
+#: administrator/components/com_categories/admin.categories.html.php:461
+msgid "Select a Menu"
+msgstr "Seleziona un menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:469
+msgid "Select Menu Typ"
+msgstr "Seleziona un tipo di menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:477
+msgid "Menu Item Name"
+msgstr "Nome dell'elemento di menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:492
+msgid "Existing Menu Links"
+msgstr "Collegamenti  ai menu esistenti"
+
+#: administrator/components/com_categories/admin.categories.html.php:518
+msgid "Menu links available when saved"
+msgstr "Il collegamento al menu sarà disponibile dopo il salvataggio"
+
+#: administrator/components/com_categories/admin.categories.html.php:555
+msgid "Move Category"
+msgstr "Sposta categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:565
+msgid "Move to Section:"
+msgstr "Sposta alla sezione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:571
+msgid "Categories being moved:"
+msgstr "Categoria che sarà spostata:"
+
+#: administrator/components/com_categories/admin.categories.html.php:582
+msgid "Content Items being moved:"
+msgstr "Articolo di contenuto che sarà spostato:"
+
+#: administrator/components/com_categories/admin.categories.html.php:593
+msgid ""
+"This will move the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"Questo sposterà le categorie elencate\n"
+"\t\t\t<br />\n"
+"\t\t\te tutti gli articoli contenuti in esse (anche loro elencati)\n"
+"\t\t\t<br />\n"
+"\t\t\talla sezione selezionata."
+
+#: administrator/components/com_categories/admin.categories.html.php:628
+msgid "Copy Category"
+msgstr "Copia categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:638
+msgid "Copy to Section:"
+msgstr "Copia alla sezione:"
+
+#: administrator/components/com_categories/admin.categories.html.php:644
+msgid "Categories being copied:"
+msgstr "Categoria che sarà copiata"
+
+#: administrator/components/com_categories/admin.categories.html.php:655
+msgid "Content Items being copied:"
+msgstr "Articolo di contenuto che sarà copiato:"
+
+#: administrator/components/com_categories/admin.categories.html.php:666
+msgid ""
+"\n"
+"\t\t\tThis will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"\n"
+"\t\t\tQuesto copierà le categorie elencate\n"
+"\t\t\t<br />\n"
+"\t\t\te tutti gli articoli contenuti in esse (anche loro elencati)\n"
+"\t\t\t<br />\n"
+"\t\t\talla sezione selezionata."
+
+#: administrator/components/com_categories/admin.categories.php:142
+msgid "Component: "
+msgstr "Componente:"
+
+#: administrator/components/com_categories/admin.categories.php:251
+msgid "The category %s is currently being edited by another administrator"
+msgstr ""
+"La categoria %s è in corso di modifica da parte di un altro amministratore"
+
+#: administrator/components/com_categories/admin.categories.php:270
+msgid "Category Table"
+msgstr "Tabella categoria"
+
+#: administrator/components/com_categories/admin.categories.php:278
+msgid "Category Blog Archive"
+msgstr "Archivio blog categoria"
+
+#: administrator/components/com_categories/admin.categories.php:322
+msgid "Select Type"
+msgstr "Seleziona tipo"
+
+#: administrator/components/com_categories/admin.categories.php:324
+#: administrator/components/com_categories/admin.categories.php:797
+msgid "Contact Category Table"
+msgstr "Tabella categoria contatti"
+
+#: administrator/components/com_categories/admin.categories.php:327
+#: administrator/components/com_categories/admin.categories.php:802
+msgid "Newsfeed Category Table"
+msgstr "Tabella categoria newsfeed"
+
+#: administrator/components/com_categories/admin.categories.php:330
+#: administrator/components/com_categories/admin.categories.php:807
+msgid "Weblink Category Table"
+msgstr "Tabella categoria weblinks"
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:782
+msgid "Content Category Table"
+msgstr "Tabella categoria contenuti"
+
+#: administrator/components/com_categories/admin.categories.php:333
+#: administrator/components/com_categories/admin.categories.php:787
+msgid "Content Category Blog"
+msgstr "Blog contenuti categoria"
+
+#: administrator/components/com_categories/admin.categories.php:334
+msgid "Content Category Archive Blog"
+msgstr "Blog archivio contenuti categoria"
+
+#: administrator/components/com_categories/admin.categories.php:447
+msgid "Select a category to delete"
+msgstr "Seleziona una categoria cancellare"
+
+#: administrator/components/com_categories/admin.categories.php:524
+msgid "Select a category to %s"
+msgstr "Seleziona  una categoria da %s"
+
+#: administrator/components/com_categories/admin.categories.php:585
+#: administrator/components/com_categories/admin.categories.php:655
+msgid "Select an item to move"
+msgstr "Seleziona un articolo da spostare"
+
+#: administrator/components/com_categories/admin.categories.php:741
+msgid "%d Category copied to %s"
+msgid_plural "%d Categories copied to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_categories/admin.categories.php:792
+msgid "Content Category Blog Archive"
+msgstr "Archivio blog contenuto categoria"
+
+#: administrator/components/com_categories/admin.categories.php:833
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr "%s ( %s ) nel menu: %s creato correttamente"
+
+#: administrator/components/com_categories/admin.categories.php:872
+msgid "New ordering saved"
+msgstr "Nuovo ordinamento salvato"
+
+#: administrator/components/com_categories/toolbar.categories.html.php:80
+msgid "Move"
+msgstr "Sposta"
+
+#: administrator/components/com_categories/toolbar.categories.html.php:82
+msgid "Copy"
+msgstr "Copia"
+
+#: administrator/components/com_config/admin.config.html.php:106
+msgid "configuration.php is :"
+msgstr "configuration.php è:"
+
+#: administrator/components/com_config/admin.config.html.php:116
+msgid "Make unwriteable after saving"
+msgstr "Rendi non scrivibile, dopo il salvataggio"
+
+#: administrator/components/com_config/admin.config.html.php:123
+msgid "Override write protection while saving"
+msgstr ""
+"Annulla temporaneamente la protezione per permettere il salvataggio dei dati"
+
+#: administrator/components/com_config/admin.config.html.php:137
+msgid "Site Offline:"
+msgstr "Sito non in linea:"
+
+#: administrator/components/com_config/admin.config.html.php:141
+msgid "Offline Message:"
+msgstr "Messaggio sito non in linea:"
+
+#: administrator/components/com_config/admin.config.html.php:143
+msgid "A message that displays if your site is offline"
+msgstr "Il messaggio che viene mostrato in caso di sito non in linea"
+
+#: administrator/components/com_config/admin.config.html.php:148
+msgid "System Error Message:"
+msgstr "Messaggio errore di sistema:"
+
+#: administrator/components/com_config/admin.config.html.php:150
+msgid "A message that displays if Mambo could not connect to the database"
+msgstr ""
+"Il messaggio che viene mostrato se Mambo non può connettersi al database"
+
+#: administrator/components/com_config/admin.config.html.php:155
+msgid "Site Name:"
+msgstr "Nome del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:159
+msgid "Show UnAuthorized Links:"
+msgstr "Mostra collegamenti non autorizzati:"
+
+#: administrator/components/com_config/admin.config.html.php:161
+msgid ""
+"If yes, will show links to content to registered content even if you are not "
+"logged in.  The user will need to login to see the item in full."
+msgstr ""
+"Se SI, mostrerà i contenuti riservati agli utenti registrati, anche ai "
+"visitatori, ma l'utente dovrà essere connesso al sito, per vedere l'articolo "
+"per intero."
+
+#: administrator/components/com_config/admin.config.html.php:166
+msgid "Allow User Registration:"
+msgstr "Permetti la registrazione di nuovi utenti:"
+
+#: administrator/components/com_config/admin.config.html.php:168
+msgid "If yes, allows users to self-register"
+msgstr "Se SI, permette agli utenti di auto registrarsi"
+
+#: administrator/components/com_config/admin.config.html.php:173
+msgid "Use New Account Activation:"
+msgstr "Usa l'attivazione del nuovo account:"
+
+#: administrator/components/com_config/admin.config.html.php:176
+msgid ""
+"If yes, the user will be mailed a link to activate their account before they "
+"can log in."
+msgstr ""
+"Se SI, all'utente sarà inviata una mail contenente un collegamento per "
+"attivare il proprio account e confermare l'iscrizione, prima di potersi "
+"identificare sul sito."
+
+#: administrator/components/com_config/admin.config.html.php:181
+msgid "Require Unique Email:"
+msgstr "Richiedi email univoca:"
+
+#: administrator/components/com_config/admin.config.html.php:183
+msgid "If yes, users cannot share the same email address"
+msgstr ""
+"Se si, nel database non potranno esserci indirizzi email condivisi tra gli "
+"utenti, ma ognuno dovrà avere un indirizzo univoco"
+
+#: administrator/components/com_config/admin.config.html.php:188
+msgid "Debug Site:"
+msgstr "Debug del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:190
+msgid "If yes, displays diagnostic information and SQL errors if present"
+msgstr ""
+"Se SI, mostra informazioni diagnostiche ed eventuali errori SQL se presenti"
+
+#: administrator/components/com_config/admin.config.html.php:199
+msgid "List Length:"
+msgstr "Lunghezza elenchi:"
+
+#: administrator/components/com_config/admin.config.html.php:201
+msgid "Sets the default length of lists in the administrator for all users"
+msgstr ""
+"Configura la lunghezza predefinita degli elenchi che sono usati in "
+"amministrazione ed è valida per tutti gli utenti "
+
+#: administrator/components/com_config/admin.config.html.php:206
+msgid "Favourites Site Icon:"
+msgstr "Icona Preferita per il sito:"
+
+#: administrator/components/com_config/admin.config.html.php:210
+msgid ""
+"If left blank or the file cannot be found, the default favicon.ico will be "
+"used."
+msgstr ""
+"Se lasciata in bianco o il file non viene trovato, sarà usata l'icona "
+"preconfigurata favicon.ico."
+
+#: administrator/components/com_config/admin.config.html.php:211
+msgid "Favourite Icon"
+msgstr "Icona preferita"
+
+#: administrator/components/com_config/admin.config.html.php:217
+msgid "Locale"
+msgstr "Locale"
+
+#: administrator/components/com_config/admin.config.html.php:221
+msgid "Language:"
+msgstr "Lingua:"
+
+#: administrator/components/com_config/admin.config.html.php:225
+msgid "Time Offset:"
+msgstr "Scarto orario:"
+
+#: administrator/components/com_config/admin.config.html.php:229
+msgid "Current date/time configured to display: %s"
+msgstr "Le data ed ora attuali sono: %s"
+
+#: administrator/components/com_config/admin.config.html.php:234
+msgid "Country Locale:"
+msgstr "Nazione locale"
+
+#: administrator/components/com_config/admin.config.html.php:244
+msgid "These Parameters control Output elements"
+msgstr "Questo parametro controlla gli elementi di Output"
+
+#: administrator/components/com_config/admin.config.html.php:247
+msgid "Linked Titles:"
+msgstr "Titoli collegati:"
+
+#: administrator/components/com_config/admin.config.html.php:250
+msgid "If yes, the title of content items will be hyperlinked to the item"
+msgstr "Se SI, il titolo degli articoli sarà collegato all'articolo stesso"
+
+#: administrator/components/com_config/admin.config.html.php:255
+msgid "Read More Link:"
+msgstr "Collegamento Leggi tutto.. :"
+
+#: administrator/components/com_config/admin.config.html.php:258
+msgid ""
+"If set to show, the read-more link will show if main-text has been provided "
+"for the item"
+msgstr ""
+"Se si sceglie di mostrarlo, il collegamento Leggi tutto.. sarà visualizzato "
+"nel caso che l'articolo abbia, oltre all'introduzione, anche il testo esteso"
+
+#: administrator/components/com_config/admin.config.html.php:263
+msgid "Item Rating/Voting:"
+msgstr "Valuta/vota articolo:"
+
+#: administrator/components/com_config/admin.config.html.php:266
+msgid "If set to show, a voting system will be enabled for content items"
+msgstr ""
+"Se si sceglie di mostrarlo, sarà abilitato un sistema di votazione del "
+"contenuto degli articoli"
+
+#: administrator/components/com_config/admin.config.html.php:271
+msgid "Author Names:"
+msgstr "Nome autore:"
+
+#: administrator/components/com_config/admin.config.html.php:274
+msgid ""
+"If set to show, the name of the author will be displayed.  This a global "
+"setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurato per essere mostrato, sarà visualizzato il nome dell'autore. "
+"Questa è una configurazione globale, ma può essere cambiata singolarmente "
+"per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:279
+msgid "Created Date and Time:"
+msgstr "Data e ora di creazione:"
+
+#: administrator/components/com_config/admin.config.html.php:282
+msgid ""
+"If set to show, the date and time an item was created will be displayed. "
+"This a global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurata per essere mostrate, saranno visualizzate la data e l'ora di "
+"creazione dell'articolo. Questa è una configurazione globale, ma può essere "
+"cambiata singolarmente per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:287
+msgid "Modified Date and Time:"
+msgstr "Data e ora modificate:"
+
+#: administrator/components/com_config/admin.config.html.php:290
+msgid ""
+"If set to show, the date and time an item was last modified will be "
+"displayed.  This a global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurata per essere mostrate, saranno visualizzate la data e l'ora "
+"dell'ultima modifica dell'articolo. Questa è una configurazione globale, ma "
+"può essere cambiata singolarmente per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:295
+msgid "Hits:"
+msgstr "Visite:"
+
+#: administrator/components/com_config/admin.config.html.php:298
+msgid ""
+"If set to show, the hits for a particular item will be displayed.  This a "
+"global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurato per essere mostrato, saranno visualizzate le visite ad un "
+"determinato articolo. Questa è una configurazione globale, ma può essere "
+"cambiata singolarmente per ogni articolo e menu."
+
+#: administrator/components/com_config/admin.config.html.php:303
+msgid "PDF Icon:"
+msgstr "Icona PDF"
+
+#: administrator/components/com_config/admin.config.html.php:308
+msgid "Option not available as /media directory not writable"
+msgstr "Opzione non disponibile, dato che la cartella /media non è scrivibile"
+
+#: administrator/components/com_config/admin.config.html.php:316
+msgid "Print Icon:"
+msgstr "Icona Stampa:"
+
+#: administrator/components/com_config/admin.config.html.php:321
+msgid "Email Icon:"
+msgstr "Icona email:"
+
+#: administrator/components/com_config/admin.config.html.php:326
+msgid "Icons:"
+msgstr "Icone:"
+
+#: administrator/components/com_config/admin.config.html.php:328
+msgid "Print, PDF and Email will utilise Icons or Text"
+msgstr "Stampa, PDF ed Email utilizzeranno icone o testo"
+
+#: administrator/components/com_config/admin.config.html.php:331
+msgid "Table of Contents on multi-page items:"
+msgstr "Tabella dei contenuti, in articoli  multi pagina:"
+
+#: administrator/components/com_config/admin.config.html.php:336
+msgid "Back Button:"
+msgstr "Bottone indietro:"
+
+#: administrator/components/com_config/admin.config.html.php:341
+msgid "Content Item Navigation:"
+msgstr "Navigazione articoli di contenuto:"
+
+#: administrator/components/com_config/admin.config.html.php:360
+msgid "Hostname:"
+msgstr "Nome host:"
+
+#: administrator/components/com_config/admin.config.html.php:364
+msgid "MySQL Username:"
+msgstr "MySQL nome utente:"
+
+#: administrator/components/com_config/admin.config.html.php:368
+msgid "MySQL Password:"
+msgstr "MySQL password:"
+
+#: administrator/components/com_config/admin.config.html.php:372
+msgid "MySQL Database:"
+msgstr "MySQL  database:"
+
+#: administrator/components/com_config/admin.config.html.php:376
+msgid "MySQL Database Prefix:"
+msgstr "MySQL prefisso database:"
+
+#: administrator/components/com_config/admin.config.html.php:379
+msgid ""
+"!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE "
+"PREFIX YOU ARE SETTING !!"
+msgstr ""
+"!! NON CAMBIARE SE NON HAI UN DATABASE CREATO USANDO IL PREFISSO DI TABELLE "
+"CHE STAI CONFIGURANDO !!"
+
+#: administrator/components/com_config/admin.config.html.php:385
+msgid "Server"
+msgstr "Server"
+
+#: administrator/components/com_config/admin.config.html.php:389
+msgid "Absolute Path:"
+msgstr "Percorso assoluto:"
+
+#: administrator/components/com_config/admin.config.html.php:394
+msgid "Live Site:"
+msgstr "Sito attuale:"
+
+#: administrator/components/com_config/admin.config.html.php:399
+msgid "Secret Word:"
+msgstr "Parola segreta:"
+
+#: administrator/components/com_config/admin.config.html.php:404
+msgid "GZIP Page Compression:"
+msgstr "Compressione pagine GZIP:"
+
+#: administrator/components/com_config/admin.config.html.php:407
+msgid "Compress buffered output if supported"
+msgstr "Se supportato, comprime il contenuto del buffer dati"
+
+#: administrator/components/com_config/admin.config.html.php:412
+msgid "Login Session Lifetime:"
+msgstr "Durata della sessione di connessione:"
+
+#: administrator/components/com_config/admin.config.html.php:416
+msgid "Auto logout after this time of inactivity"
+msgstr ""
+"Trascorso questo tempo di inattività, l'utente è disconnesso automaticamente"
+
+#: administrator/components/com_config/admin.config.html.php:421
+msgid "Error Reporting:"
+msgstr "Rapporto errori:"
+
+#: administrator/components/com_config/admin.config.html.php:426
+msgid "Register Globals Emulation:"
+msgstr "Emulazione Register Globals:"
+
+#: administrator/components/com_config/admin.config.html.php:430
+msgid ""
+"Register globals emulation. Some components may stop working if this option "
+"is set to Off."
+msgstr ""
+"Emulazione del Register Globals. Qualche componente potrebbe non funzionare "
+"correttamente se questa opzione fosse configurata su OFF."
+
+#: administrator/components/com_config/admin.config.html.php:436
+msgid "Help Server:"
+msgstr "Server dell'Aiuto:"
+
+#: administrator/components/com_config/admin.config.html.php:448
+msgid "File Creation:"
+msgstr "Creazione file:"
+
+#: administrator/components/com_config/admin.config.html.php:450
+msgid "File Permissions"
+msgstr "Permessi dei files"
+
+#: administrator/components/com_config/admin.config.html.php:454
+msgid "Dont CHMOD new files (use server defaults)"
+msgstr ""
+"Non dare permessi CHMOD ai nuovi files (usa quelli predefiniti del server)"
+
+#: administrator/components/com_config/admin.config.html.php:459
+msgid "CHMOD new files"
+msgstr "Dai permessi CHMOD ai nuovi files"
+
+#: administrator/components/com_config/admin.config.html.php:461
+msgid "to:"
+msgstr "a:"
+
+#: administrator/components/com_config/admin.config.html.php:464
+msgid "Select this option to define permission flags for new created files"
+msgstr ""
+"Seleziona questa opzione per definire i permessi per i nuovi files creati"
+
+#: administrator/components/com_config/admin.config.html.php:473
+#: administrator/components/com_config/admin.config.html.php:552
+msgid "User:"
+msgstr "Utente:"
+
+#: administrator/components/com_config/admin.config.html.php:475
+#: administrator/components/com_config/admin.config.html.php:484
+#: administrator/components/com_config/admin.config.html.php:504
+#: administrator/components/com_config/admin.config.html.php:554
+#: administrator/components/com_config/admin.config.html.php:563
+#: administrator/components/com_config/admin.config.html.php:581
+msgid "read"
+msgstr "lettura"
+
+#: administrator/components/com_config/admin.config.html.php:477
+#: administrator/components/com_config/admin.config.html.php:486
+#: administrator/components/com_config/admin.config.html.php:506
+#: administrator/components/com_config/admin.config.html.php:556
+#: administrator/components/com_config/admin.config.html.php:565
+#: administrator/components/com_config/admin.config.html.php:583
+msgid "write"
+msgstr "scrittura"
+
+#: administrator/components/com_config/admin.config.html.php:479
+#: administrator/components/com_config/admin.config.html.php:488
+#: administrator/components/com_config/admin.config.html.php:508
+msgid "execute"
+msgstr "esecuzione"
+
+#: administrator/components/com_config/admin.config.html.php:482
+#: administrator/components/com_config/admin.config.html.php:561
+msgid "Group:"
+msgstr "Gruppo:"
+
+#: administrator/components/com_config/admin.config.html.php:492
+msgid "Apply to existing files"
+msgstr "Applica ai files esistenti"
+
+#: administrator/components/com_config/admin.config.html.php:495
+msgid ""
+"Checking here will apply the permission flags to <em>all existing files</em> "
+"of the site.<br/>"
+msgstr ""
+"Selezionando questo, saranno applicati questi permessi a tutti i files "
+"esistenti nel sito."
+
+#: administrator/components/com_config/admin.config.html.php:496
+#: administrator/components/com_config/admin.config.html.php:574
+msgid ""
+"<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>"
+msgstr ""
+"<b> UN USO IMPROPRIO DI QUESTA FUNZIONE POTREBBE RENDERE IL SITO NON "
+"OPERATIVO!</b>"
+
+#: administrator/components/com_config/admin.config.html.php:502
+#: administrator/components/com_config/admin.config.html.php:579
+msgid "World:"
+msgstr "Altri:"
+
+#: administrator/components/com_config/admin.config.html.php:527
+msgid "Directory Creation:"
+msgstr "Creazione cartelle:"
+
+#: administrator/components/com_config/admin.config.html.php:533
+msgid "Dont CHMOD new directories (use server defaults)"
+msgstr ""
+"Non dare permessi CHMOD alle nuove cartelle (usa quelli predefiniti del "
+"server)"
+
+#: administrator/components/com_config/admin.config.html.php:538
+msgid "CHMOD new directories"
+msgstr "Dai permessi CHMOD alle nuove cartelle"
+
+#: administrator/components/com_config/admin.config.html.php:543
+msgid ""
+"Select this option to define permission flags for new created directories"
+msgstr ""
+"Seleziona questa opzione per definire i permessi per per le nuove cartelle "
+"create"
+
+#: administrator/components/com_config/admin.config.html.php:558
+#: administrator/components/com_config/admin.config.html.php:567
+#: administrator/components/com_config/admin.config.html.php:585
+msgid "search"
+msgstr "cerca"
+
+#: administrator/components/com_config/admin.config.html.php:571
+msgid "Apply to existing directories"
+msgstr "Applica alle cartelle esistenti"
+
+#: administrator/components/com_config/admin.config.html.php:573
+msgid ""
+"Checking here will apply the permission flags to <em>all existing "
+"directories</em> of the site.<br/>"
+msgstr ""
+"Selezionando questo, saranno applicati questi permessi a tutte le cartelle "
+"esistenti nel sito."
+
+#: administrator/components/com_config/admin.config.html.php:598
+msgid "Metadata"
+msgstr "Metadati"
+
+#: administrator/components/com_config/admin.config.html.php:602
+msgid "Global Site Meta Description:"
+msgstr "Meta Descrizione generale del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:606
+msgid "Global Site Meta Keywords:"
+msgstr "Meta parole chiave generali del sito:"
+
+#: administrator/components/com_config/admin.config.html.php:610
+msgid "Show Title Meta Tag:"
+msgstr "Mostra Meta tag Titolo:"
+
+#: administrator/components/com_config/admin.config.html.php:614
+msgid "Show the title meta tag when viewing content items"
+msgstr ""
+"Mostra il meta tag Titolo quando viene visualizzato un articolo di contenuto"
+
+#: administrator/components/com_config/admin.config.html.php:618
+msgid "Show Author Meta Tag:"
+msgstr "Mostra meta tag Autore:"
+
+#: administrator/components/com_config/admin.config.html.php:622
+msgid "Show the author meta tag when viewing content items"
+msgstr ""
+"Mostra il meta tag Autore quando viene visualizzato un articolo di contenuto"
+
+#: administrator/components/com_config/admin.config.html.php:632
+msgid "Mailer:"
+msgstr "Mittente:"
+
+#: administrator/components/com_config/admin.config.html.php:636
+msgid "Mail From:"
+msgstr "Posta da:"
+
+#: administrator/components/com_config/admin.config.html.php:640
+msgid "From Name:"
+msgstr "Da nome:"
+
+#: administrator/components/com_config/admin.config.html.php:644
+msgid "Sendmail Path:"
+msgstr "Percorso sendmail:"
+
+#: administrator/components/com_config/admin.config.html.php:648
+msgid "SMTP Auth:"
+msgstr "SMTP autenticazione:"
+
+#: administrator/components/com_config/admin.config.html.php:652
+msgid "SMTP User:"
+msgstr "SMTP utente:"
+
+#: administrator/components/com_config/admin.config.html.php:656
+msgid "SMTP Pass"
+msgstr "SMTP pass:"
+
+#: administrator/components/com_config/admin.config.html.php:660
+msgid "SMTP Host:"
+msgstr "SMTP Host:"
+
+#: administrator/components/com_config/admin.config.html.php:673
+msgid "Caching:"
+msgstr "Caching:"
+
+#: administrator/components/com_config/admin.config.html.php:681
+msgid "Cache Folder:"
+msgstr "Cartella cache:"
+
+#: administrator/components/com_config/admin.config.html.php:686
+msgid "Current cache is directory is <b>Writeable</b>"
+msgstr "Attualmente la cartella cache è <b>Scrivibile</b>"
+
+#: administrator/components/com_config/admin.config.html.php:688
+msgid ""
+"The cache directory is UNWRITEABLE - please set this directory to CHMOD755 "
+"before turning on the cache"
+msgstr ""
+"La cartella cache  NON è SCRIVIBILE - Prego configiurare questa cartella con "
+"i permessi CHMOD 755 prima di abilitare la cache"
+
+#: administrator/components/com_config/admin.config.html.php:694
+msgid "Cache Time:"
+msgstr "Tempo di cache:"
+
+#: administrator/components/com_config/admin.config.html.php:695
+msgid "seconds"
+msgstr "secondi"
+
+#: administrator/components/com_config/admin.config.html.php:705
+msgid "Statistics:"
+msgstr "Statistiche:"
+
+#: administrator/components/com_config/admin.config.html.php:707
+msgid "Enable/disable collection of site statistics"
+msgstr "Abilita/disabilita raccolta statistiche del sito"
+
+#: administrator/components/com_config/admin.config.html.php:710
+msgid "Log Content Hits by Date:"
+msgstr "Accessi ai contenuti per data:"
+
+#: administrator/components/com_config/admin.config.html.php:712
+msgid "WARNING : Large amounts of data will be collected"
+msgstr ""
+"ATTENZIONE: saranno archiviati parecchi dati, tenere d'occhio la grandezza "
+"del database"
+
+#: administrator/components/com_config/admin.config.html.php:715
+msgid "Log Search Strings:"
+msgstr "Stringhe di ricerca:"
+
+#: administrator/components/com_config/admin.config.html.php:722
+msgid "SEO"
+msgstr "SEO"
+
+#: administrator/components/com_config/admin.config.html.php:726
+msgid "Search Engine Optimization"
+msgstr "Ottimizzazione per Motori di Ricerca"
+
+#: administrator/components/com_config/admin.config.html.php:731
+msgid "Search Engine Friendly URLs:"
+msgstr "URL amichevoli per i motori di ricerca:"
+
+#: administrator/components/com_config/admin.config.html.php:733
+msgid "Apache only! Rename htaccess.txt to .htaccess before activating"
+msgstr ""
+"Solo per Apache! Rinominare il file htaccess.txt in .htaccess,  prima di "
+"attivare questa funzione"
+
+#: administrator/components/com_config/admin.config.html.php:736
+msgid "Dynamic Page Titles:"
+msgstr "Titoli pagina dinamici:"
+
+#: administrator/components/com_config/admin.config.html.php:738
+msgid "Dynamically changes the page title to reflect current content viewed"
+msgstr ""
+"Il titolo cambia dinamicamente per riflettere il contenuto correntemente "
+"visualizzato"
+
+#: administrator/components/com_config/admin.config.php:322
+#: administrator/components/com_config/admin.config.php:327
+msgid "Hide"
+msgstr "Nascondi"
+
+#: administrator/components/com_config/admin.config.php:323
+#: administrator/components/com_config/admin.config.php:328
+msgid "Show"
+msgstr "Mostra"
+
+#: administrator/components/com_config/admin.config.php:342
+msgid "System Default"
+msgstr "Predefinite di sistema"
+
+#: administrator/components/com_config/admin.config.php:344
+msgid "Simple"
+msgstr "Semplice"
+
+#: administrator/components/com_config/admin.config.php:345
+msgid "Maximum"
+msgstr "Massimo"
+
+#: administrator/components/com_config/admin.config.php:349
+msgid "On"
+msgstr "On"
+
+#: administrator/components/com_config/admin.config.php:350
+msgid "Off"
+msgstr "Off"
+
+#: administrator/components/com_config/admin.config.php:354
+msgid "PHP mail function"
+msgstr "Funzione email del PHP"
+
+#: administrator/components/com_config/admin.config.php:355
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: administrator/components/com_config/admin.config.php:356
+msgid "SMTP Server"
+msgstr "Server SMTP"
+
+#: administrator/components/com_config/admin.config.php:400
+msgid "Remember to rename htaccess.txt to .htaccess"
+msgstr "Ricorda di rinominare htaccess.txt in .htaccess"
+
+#: administrator/components/com_config/admin.config.php:428
+msgid "Remember to install the MambelFish component."
+msgstr "Ricorda di installare il componente Mambelfish."
+
+#: administrator/components/com_config/admin.config.php:485
+msgid "The Configuration Details have been updated"
+msgstr "I dettagli della Configurazione sono stati aggiornati"
+
+#: administrator/components/com_config/admin.config.php:539
+msgid "An Error Has Occurred! Unable to open config file to write!"
+msgstr ""
+"Si è verificato un errore! Non è possibile scrivere nel file configuration."
+"php!"
+
+#: administrator/components/com_contact/admin.contact.html.php:29
+msgid "Contact Manager"
+msgstr "Gestore contatti"
+
+#: administrator/components/com_contact/admin.contact.html.php:32
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: administrator/components/com_contact/admin.contact.html.php:52
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:94
+msgid "Name"
+msgstr "Nome"
+
+#: administrator/components/com_contact/admin.contact.html.php:61
+msgid "Category"
+msgstr "Categoria"
+
+#: administrator/components/com_contact/admin.contact.html.php:64
+msgid "Linked to User"
+msgstr "Collegato all'utente"
+
+#: administrator/components/com_contact/admin.contact.html.php:96
+msgid "Edit Contact"
+msgstr "Modifica contatto"
+
+#: administrator/components/com_contact/admin.contact.html.php:115
+msgid "Edit Category"
+msgstr "Modifica categoria"
+
+#: administrator/components/com_contact/admin.contact.html.php:162
+msgid "You must provide a name."
+msgstr "Si deve inserire un nome"
+
+#: administrator/components/com_contact/admin.contact.html.php:164
+msgid "Please select a Category."
+msgstr "Prego selezionare una categoria."
+
+#: administrator/components/com_contact/admin.contact.html.php:176
+msgid "Contact:"
+msgstr "Contatto:"
+
+#: administrator/components/com_contact/admin.contact.html.php:190
+msgid "Contact Details"
+msgstr "Dettagli contatto"
+
+#: administrator/components/com_contact/admin.contact.html.php:203
+msgid "Linked to User:"
+msgstr "Collegato all'utente:"
+
+#: administrator/components/com_contact/admin.contact.html.php:211
+msgid "Name:"
+msgstr "Nome:"
+
+#: administrator/components/com_contact/admin.contact.html.php:219
+msgid "Contact's Position:"
+msgstr "Posizione del contatto:"
+
+#: administrator/components/com_contact/admin.contact.html.php:227
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: administrator/components/com_contact/admin.contact.html.php:235
+msgid "Street Address:"
+msgstr "Indirizzo:"
+
+#: administrator/components/com_contact/admin.contact.html.php:243
+msgid "Town/Suburb:"
+msgstr "Città/Località:"
+
+#: administrator/components/com_contact/admin.contact.html.php:251
+msgid "State/County:"
+msgstr "Provincia/Stato:"
+
+#: administrator/components/com_contact/admin.contact.html.php:259
+msgid "Country:"
+msgstr "Nazione:"
+
+#: administrator/components/com_contact/admin.contact.html.php:267
+msgid "Postal Code/ZIP:"
+msgstr "CAP:"
+
+#: administrator/components/com_contact/admin.contact.html.php:275
+msgid "Telephone:"
+msgstr "Telefono:"
+
+#: administrator/components/com_contact/admin.contact.html.php:283
+msgid "Fax:"
+msgstr "Fax:"
+
+#: administrator/components/com_contact/admin.contact.html.php:291
+msgid "Miscellaneous Info:"
+msgstr "Informazioni varie:"
+
+#: administrator/components/com_contact/admin.contact.html.php:308
+msgid "Publishing Info"
+msgstr "Info pubblicazione"
+
+#: administrator/components/com_contact/admin.contact.html.php:313
+msgid "Site Default:"
+msgstr "Sito predefinito:"
+
+#: administrator/components/com_contact/admin.contact.html.php:337
+msgid "Access:"
+msgstr "Accesso:"
+
+#: administrator/components/com_contact/admin.contact.html.php:351
+msgid "Images"
+msgstr "Immagini"
+
+#: administrator/components/com_contact/admin.contact.html.php:356
+msgid "Image Info"
+msgstr "Info immagine"
+
+#: administrator/components/com_contact/admin.contact.html.php:361
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Image"
+msgstr "Immagine"
+
+#: administrator/components/com_contact/admin.contact.html.php:384
+#: administrator/components/com_contact/admin.contact.html.php:389
+msgid "Parameters"
+msgstr "Parametri"
+
+#: administrator/components/com_contact/admin.contact.html.php:394
+msgid ""
+"These Parameters only control what you see when you click to view a Contact "
+"item"
+msgstr ""
+"Questi parametri controllano cosa si mostra quando si visualizza un contatto"
+
+#: administrator/components/com_contact/admin.contact.php:255
+msgid "Select a record to %s"
+msgstr "Selezionare un record da  %s"
+
+#: administrator/components/com_contact/contact.xml
+msgid "# Category Items"
+msgstr "# articoli della categoria"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+"Una piccola immagine da piazzare a sinistra o a destra del menu articoli. "
+"L'immagine deve essere posta nella  cartella images/stories/"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+"Un suffisso da applicare alle classi del CSS della pagina, questo permette "
+"di personalizzare ogni  pagina con  lo stile desiderato"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Alignment of the image"
+msgstr "Allineamento dell'immagine"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Back Button"
+msgstr "Bottone indietro"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category Description"
+msgstr "Descrizione categoria"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category List - Category"
+msgstr "Elenco categoria - Categoria"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category List - Section"
+msgstr "Elenco Categoria - Sezione"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Description"
+msgstr "descrizione"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Description Text"
+msgstr "Testo descrizione"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr ""
+"Descrizione per pagina, se lasciato vuoto sarà caricata la variabile "
+"_WEBLINK_DESC dal file di lingua attuale"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Email Column"
+msgstr "Colonna email"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Fax Column"
+msgstr "Colonna fax"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Image Align"
+msgstr "Allineamento immagine"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+"L'immagine dev'essere collocata nella cartella /images/stories. Come "
+"predefinita verrà caricata web_links.jpg, Nessuna immagine, significa che "
+"non ci sono immagini caricate"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Menu Image"
+msgstr "Menu immagine"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Page Class Suffix"
+msgstr "Suffisso per la classe  della pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Page Title"
+msgstr "Titolo pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Position Column"
+msgstr "Colonna Posizione"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+"Mostra/nascondi il bottone Indietro, il quale rimanda alla pagina precedente"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Description below"
+msgstr "Mostra/nascondi la descrizione sotto"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr "Mostra/nascondi la descrizione per l'elenco delle altre categorie"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Email column"
+msgstr "Mostra/nascondi la colonna Email"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Fax column"
+msgstr "Mostra/nascondi la colonna Fax"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr "Mostra/nascondi la lista delle categorie nell'elenco vista pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr "Mostra/nascondi la lista delle categorie nell'elenco  vista pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Position column"
+msgstr "Mostra/nascondi la colonna Posizione"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Table Headings"
+msgstr "Mostra/nascondi l'intestazione delle tabelle"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Telephone column"
+msgstr "Mostra/nascondi la colonna telefono"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the number of items in each category"
+msgstr "Mostra/nascondi il numero di articoli in ogni categoria"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the pages Title"
+msgstr "Mostra/nascondi il titolo della pagina"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Table Headings"
+msgstr "Intestazioni delle tabelle"
+
+#: administrator/components/com_contact/contact.xml
+msgid "Telephone Column"
+msgstr "Colonna telefono"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+"Testo da mostrare in cima alla pagina. Se  lasciato bianco,  sarà usato il "
+"nome del Menu"
+
+#: administrator/components/com_contact/contact.xml
+msgid "This component shows a listing of Contact Information"
+msgstr "Questo componente mostra un elenco delle informazioni sui contatti"
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Global"
+msgstr "Usa le Globali"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Address Icon"
+msgstr "Icona indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Contact Items"
+msgstr "Elemento Contatto"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Country"
+msgstr "Nazione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Description text"
+msgstr "Testo descrizione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Drop Down"
+msgstr "Menu a tendina"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:109
+msgid "Email"
+msgstr "Email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Copy"
+msgstr "Copia email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Form"
+msgstr "Modulo email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Icon"
+msgstr "Icona email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email description"
+msgstr "Descrizione email"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:127
+msgid "Fax"
+msgstr "Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Fax Icon"
+msgstr "Icona fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Address info"
+msgstr "Icona per informazioni sull'indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Email info"
+msgstr "Icona per informazioni sull'email"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Fax info"
+msgstr "Icona per informazioni sul fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Misc info"
+msgstr "Icona per informazioni su informazioni  varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Telephone info"
+msgstr "Icona per informazioni sul telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons"
+msgstr "Icone"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons/text"
+msgstr "Icone/testo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Icon"
+msgstr "Icona varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Info"
+msgstr "Info varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Parameters for individual Contact Items"
+msgstr "Parametri per elemento Contatto individuale"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:100
+msgid "Position"
+msgstr "Posizione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Post/Zip Code"
+msgstr "C.A.P."
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Print Icon"
+msgstr "Icona stampa"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Description Text below"
+msgstr "Mostra/nascondi la descrizione sottostante"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Drop Down select list in Contact view"
+msgstr "Mostra/nascondi il menu a tendina nella vista contatti"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Vcard"
+msgstr "Mostra/nascondi la Vcard"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the checkbox to email a copy to the senders address"
+msgstr ""
+"Mostra/nascondi la scelta se inviare o meno una copia, via email, "
+"all'indirizzo del mittente"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the country info"
+msgstr "Mostra/nascondi la Nazione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"Show/Hide the email info, if you set to show the address will be protected "
+"from spambots by javascript cloaking"
+msgstr ""
+"Mostra/nascondi l'email. Se si sceglie di mostrare l'indirizzo, questo sarà "
+"protetto dagli spambots con un javascript di codifica"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the email to form"
+msgstr "Mostra/nascondi l'email nel modulo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the fax info"
+msgstr "Mostra/nascondi il Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the image"
+msgstr "Mostra/nascondi l'immagine"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr "Mostra/nascondi il bottone Stampa - avrà effetto solo in questa pagina"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the misc info"
+msgstr "Mostra/nascondi le info varie"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the name info"
+msgstr "Mostra/nascondi il Nome"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the position info"
+msgstr "Mostra/nascondi la Posizione"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the post code info"
+msgstr "Mostra/nascondi il Codice Postale"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the state info"
+msgstr "Mostra/nascondi la Provincia"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the street address info"
+msgstr "Mostra/nascondi l'Indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the suburb info"
+msgstr "Mostra/nascondi la Città/Località"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the telephone info"
+msgstr "Mostra/nascondi il Telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Street Address"
+msgstr "Indirizzo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone"
+msgstr "Telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone Icon"
+msgstr "Icona telefono"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Text"
+msgstr "Testo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"The Description text for the Email form, if left blank it will use the "
+"_EMAIL_DESCRIPTION language definition"
+msgstr ""
+"Il testo descrittivo per il modulo da inviare, se lasciato vuoto, si "
+"utilizzerà la definizione della variabile _EMAIL_DESCRIPTION, nella lingua "
+"attualmente in uso"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Town/Suburb"
+msgstr "Città/Località"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Icons, text or nothing next to the contact information displayed"
+msgstr ""
+"Visualizza un'icona, del testo oppure nulla a fianco dei campi, nella pagina "
+"contatti"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Vcard"
+msgstr "Vcard"
+
+#: components/com_contact/contact.class.php:129
+msgid "Mambo vCard for %s"
+msgstr "Mambo vCard per %s"
+
+#: components/com_contact/contact.html.php:118
+msgid "Phone"
+msgstr "Telefono"
+
+#: components/com_contact/contact.html.php:263
+#: components/com_contact/contact.php:345
+msgid "Please make sure the form is complete and valid."
+msgstr "Prego assicurarsi che il modulo sia completo ed esatto."
+
+#: components/com_contact/contact.html.php:390
+msgid "Select Contact:"
+msgstr "Seleziona contatto:"
+
+#: components/com_contact/contact.html.php:634
+msgid "Download information as a"
+msgstr "Scarica informazione come"
+
+#: components/com_contact/contact.html.php:636
+msgid "VCard"
+msgstr "VCard"
+
+#: components/com_contact/contact.html.php:657
+msgid "Enter your name:"
+msgstr "Inserisci il tuo nome:"
+
+#: components/com_contact/contact.html.php:661
+msgid "E-mail address:"
+msgstr "Indirizzo e-mail:"
+
+#: components/com_contact/contact.html.php:665
+msgid "Message subject:"
+msgstr "Soggetto del messaggio:"
+
+#: components/com_contact/contact.html.php:669
+msgid "Enter your message:"
+msgstr "Testo del messaggio:"
+
+#: components/com_contact/contact.html.php:677
+msgid "Email a copy of this message to your own address"
+msgstr "Invia una copia di questo messaggio, al  tuo indirizo email"
+
+#: components/com_contact/contact.html.php:681
+msgid "Send"
+msgstr "Invia"
+
+#: components/com_contact/contact.html.php:698
+msgid "There are no Contact Details listed."
+msgstr "Non ci sono contatti elencati."
+
+#: components/com_contact/contact.php:111
+msgid "The Contact list for this Website."
+msgstr "La lista Contatti di questo sito."
+
+#: components/com_contact/contact.php:233
+msgid "Send an Email to this Contact:"
+msgstr "Invia una email a questo Contatto:"
+
+#: components/com_contact/contact.php:280
+msgid "Address: "
+msgstr "Indirizzo:"
+
+#: components/com_contact/contact.php:281
+msgid "Email: "
+msgstr "Email:"
+
+#: components/com_contact/contact.php:282
+msgid "Telephone: "
+msgstr "Telefono:"
+
+#: components/com_contact/contact.php:283
+msgid "Fax: "
+msgstr "Fax:"
+
+#: components/com_contact/contact.php:284
+msgid "Information: "
+msgstr "Informazione:"
+
+#: components/com_contact/contact.php:337
+msgid "Enquiry"
+msgstr "Richiesta"
+
+#: components/com_contact/contact.php:348
+msgid "This is an enquiry e-mail via %s from:"
+msgstr "Questa è una richiesta via email da %s da parte di:"
+
+#: components/com_contact/contact.php:354
+msgid "The following is a copy of the message you sent to %s via %s "
+msgstr "La seguente è la copia del messaggio che hai spedito a %s da %s"
+
+#: components/com_contact/contact.php:356
+msgid "Copy of: %s"
+msgstr "Copia di: %s"
+
+#: components/com_contact/contact.php:361
+msgid "Thank you for your e-mail"
+msgstr "Grazie per la tua e-mail"
+
+#: administrator/components/com_content/admin.content.html.php:37
+#: administrator/components/com_content/admin.content.html.php:41
+msgid "Content Items Manager"
+msgstr "Gestore articoli di contenuto"
+
+#: administrator/components/com_content/admin.content.html.php:37
+msgid "Section: All"
+msgstr "Sezioni: Tutte"
+
+#: administrator/components/com_content/admin.content.html.php:81
+#: administrator/components/com_content/admin.content.html.php:350
+msgid "Title"
+msgstr "Titolo"
+
+#: administrator/components/com_content/admin.content.html.php:87
+msgid "Front Page"
+msgstr "Pagina principale"
+
+#: administrator/components/com_content/admin.content.html.php:102
+msgid "ID"
+msgstr "ID"
+
+#: administrator/components/com_content/admin.content.html.php:117
+#: administrator/components/com_content/admin.content.html.php:362
+#: components/com_content/content.html.php:220
+msgid "Author"
+msgstr "Autore"
+
+#: administrator/components/com_content/admin.content.html.php:120
+#: administrator/components/com_content/admin.content.html.php:365
+#: components/com_content/content.html.php:206
+msgid "Date"
+msgstr "Data"
+
+#: administrator/components/com_content/admin.content.html.php:142
+msgid "Expired"
+msgstr "Scaduto"
+
+#: administrator/components/com_content/admin.content.html.php:150
+msgid "Always"
+msgstr "Sempre"
+
+#: administrator/components/com_content/admin.content.html.php:150
+msgid "Start:"
+msgstr "Inizio:"
+
+#: administrator/components/com_content/admin.content.html.php:157
+#: administrator/components/com_content/admin.content.html.php:159
+msgid "Finish:"
+msgstr "Fine:"
+
+#: administrator/components/com_content/admin.content.html.php:157
+msgid "No Expiry"
+msgstr "Senza scadenza"
+
+#: administrator/components/com_content/admin.content.html.php:196
+msgid "Edit Content"
+msgstr "Modifica contenuto"
+
+#: administrator/components/com_content/admin.content.html.php:207
+msgid "Publish Information"
+msgstr "Pubblica informazione"
+
+#: administrator/components/com_content/admin.content.html.php:289
+msgid "Please make a selection from the list to send to Trash"
+msgstr "Prego selezionare un articolo da cestinare"
+
+#: administrator/components/com_content/admin.content.html.php:290
+msgid ""
+"Are you sure you want to Trash the selected items? \\nThis will not "
+"permanently delete the items."
+msgstr ""
+"Si è sicuri di voler cestinare l'articolo selezionato? \\n Questa "
+"operazione  non cancellerà permanentemente l'articolo."
+
+#: administrator/components/com_content/admin.content.html.php:521
+#: components/com_content/content.html.php:908
+msgid "Content item must have a title"
+msgstr "L'articolo di contenuto deve avere un titolo"
+
+#: administrator/components/com_content/admin.content.html.php:523
+msgid "You must select a Section."
+msgstr "Si deve selezionare una Sezione"
+
+#: administrator/components/com_content/admin.content.html.php:525
+#: administrator/components/com_content/admin.content.html.php:527
+msgid "You must select a Category."
+msgstr "Si deve selezionare una Categoria"
+
+#: administrator/components/com_content/admin.content.html.php:579
+msgid "Content Item:"
+msgstr "Articolo di contenuto:"
+
+#: administrator/components/com_content/admin.content.html.php:618
+msgid "Item Details"
+msgstr "Dettagli articolo"
+
+#: administrator/components/com_content/admin.content.html.php:623
+#: components/com_content/content.html.php:986
+msgid "Title:"
+msgstr "Titolo:"
+
+#: administrator/components/com_content/admin.content.html.php:637
+msgid "Title Alias:"
+msgstr "Titolo Alias:"
+
+#: administrator/components/com_content/admin.content.html.php:655
+msgid "Intro Text:"
+msgstr "Introduzione:"
+
+#: administrator/components/com_content/admin.content.html.php:655
+msgid "required"
+msgstr "richiesto"
+
+#: administrator/components/com_content/admin.content.html.php:663
+msgid "Main Text:"
+msgstr "testo esteso:"
+
+#: administrator/components/com_content/admin.content.html.php:663
+msgid "optional"
+msgstr "opzionale"
+
+#: administrator/components/com_content/admin.content.html.php:682
+#: components/com_content/content.html.php:1141
+msgid "Publishing"
+msgstr "Pubblicazione"
+
+#: administrator/components/com_content/admin.content.html.php:692
+msgid "Show on Frontpage:"
+msgstr "Mostra nella pagina principale:"
+
+#: administrator/components/com_content/admin.content.html.php:715
+#: components/com_content/content.html.php:1167
+msgid "Author Alias:"
+msgstr "Alias Autore:"
+
+#: administrator/components/com_content/admin.content.html.php:723
+msgid "Change Creator:"
+msgstr "Cambia creatore:"
+
+#: administrator/components/com_content/admin.content.html.php:735
+msgid "Override Created Date"
+msgstr "Cambia data creazione"
+
+#: administrator/components/com_content/admin.content.html.php:744
+#: components/com_content/content.html.php:1183
+msgid "Start Publishing:"
+msgstr "Inizio pubblicazione:"
+
+#: administrator/components/com_content/admin.content.html.php:753
+#: components/com_content/content.html.php:1192
+msgid "Finish Publishing:"
+msgstr "Scadenza pubblicazione:"
+
+#: administrator/components/com_content/admin.content.html.php:768
+msgid "Content ID:"
+msgstr "ID Contenuto:"
+
+#: administrator/components/com_content/admin.content.html.php:779
+#: components/com_content/content.html.php:1149
+msgid "State:"
+msgstr "Stato:"
+
+#: administrator/components/com_content/admin.content.html.php:782
+msgid "Archived"
+msgstr "Archiviato"
+
+#: administrator/components/com_content/admin.content.html.php:782
+msgid "Draft Unpublished"
+msgstr "Bozza non pubblicata"
+
+#: administrator/components/com_content/admin.content.html.php:794
+msgid "Reset Hit Count"
+msgstr "Azzera contatore visite"
+
+#: administrator/components/com_content/admin.content.html.php:801
+msgid "Revised"
+msgstr "Revisionato"
+
+#: administrator/components/com_content/admin.content.html.php:805
+msgid "times"
+msgstr "volte"
+
+#: administrator/components/com_content/admin.content.html.php:815
+#: administrator/components/com_content/admin.content.html.php:825
+msgid "By"
+msgstr "Da"
+
+#: administrator/components/com_content/admin.content.html.php:821
+msgid "Last Modified"
+msgstr "Ultima modifica"
+
+#: administrator/components/com_content/admin.content.html.php:836
+msgid "MOSImage Control"
+msgstr "Controllo MOSImage"
+
+#: administrator/components/com_content/admin.content.html.php:840
+msgid "Sub-folder:"
+msgstr "Sotto-cartella:"
+
+#: administrator/components/com_content/admin.content.html.php:844
+msgid "Gallery Images:"
+msgstr "Gallerua immagini:"
+
+#: administrator/components/com_content/admin.content.html.php:854
+#: components/com_content/content.html.php:962
+msgid "Add"
+msgstr "Aggiungi"
+
+#: administrator/components/com_content/admin.content.html.php:859
+msgid "Content Images:"
+msgstr "Immagini contenuto:"
+
+#: administrator/components/com_content/admin.content.html.php:869
+msgid "up"
+msgstr "su"
+
+#: administrator/components/com_content/admin.content.html.php:870
+msgid "down"
+msgstr "giù"
+
+#: administrator/components/com_content/admin.content.html.php:871
+msgid "remove"
+msgstr "rimuovi"
+
+#: administrator/components/com_content/admin.content.html.php:876
+msgid "Edit the image selected:"
+msgstr "Modifica l'immagine selezionata:"
+
+#: administrator/components/com_content/admin.content.html.php:880
+#: components/com_content/content.html.php:1091
+msgid "Source:"
+msgstr "Sorgente:"
+
+#: administrator/components/com_content/admin.content.html.php:888
+msgid "Image Align:"
+msgstr "Allinea immagine:"
+
+#: administrator/components/com_content/admin.content.html.php:896
+#: components/com_content/content.html.php:1107
+msgid "Alt Text:"
+msgstr "Testo Alt:"
+
+#: administrator/components/com_content/admin.content.html.php:904
+#: components/com_content/content.html.php:1115
+msgid "Border:"
+msgstr "Bordo:"
+
+#: administrator/components/com_content/admin.content.html.php:912
+msgid "Caption:"
+msgstr "Didascalìa:"
+
+#: administrator/components/com_content/admin.content.html.php:920
+msgid "Caption Position:"
+msgstr "Posizione didascalìa:"
+
+#: administrator/components/com_content/admin.content.html.php:928
+msgid "Caption Align:"
+msgstr "Allinea disascalìa:"
+
+#: administrator/components/com_content/admin.content.html.php:936
+msgid "Width:"
+msgstr "Larghezza:"
+
+#: administrator/components/com_content/admin.content.html.php:958
+msgid "Parameter Control"
+msgstr "Controllo parametri"
+
+#: administrator/components/com_content/admin.content.html.php:963
+msgid ""
+"These Parameters only control what you see when you click to view an item "
+"fully"
+msgstr ""
+"Questi parametri controllano solamente cosa si vede quando si clicca per "
+"vedere l'articolo completo."
+
+#: administrator/components/com_content/admin.content.html.php:975
+msgid "Meta Info"
+msgstr "Meta Info"
+
+#: administrator/components/com_content/admin.content.html.php:980
+msgid "Meta Data"
+msgstr "Meta data"
+
+#: administrator/components/com_content/admin.content.html.php:992
+#: components/com_content/content.html.php:1223
+msgid "Keywords:"
+msgstr "Parola chiave:"
+
+#: administrator/components/com_content/admin.content.html.php:999
+msgid "Add Sect/Cat/Title"
+msgstr "Aggiungi Sez/Cat/Titolo"
+
+#: administrator/components/com_content/admin.content.html.php:1015
+msgid "This will create a 'Link - Content Item' in the menu you select"
+msgstr ""
+"Questo creerà un \"Collegamento ad articolo di contenuto\" nel menu  "
+"selezionato"
+
+#: administrator/components/com_content/admin.content.html.php:1118
+msgid "Please select something"
+msgstr "Prego selezionare qualcosa"
+
+#: administrator/components/com_content/admin.content.html.php:1130
+msgid "Move Items"
+msgstr "Sposata articolo"
+
+#: administrator/components/com_content/admin.content.html.php:1139
+msgid "Move to Section/Category:"
+msgstr "Sposta alla Sezione/Categoria:"
+
+#: administrator/components/com_content/admin.content.html.php:1145
+msgid "Items being Moved:"
+msgstr "Articoli che stanno per essere spostati:"
+
+#: administrator/components/com_content/admin.content.html.php:1188
+msgid "Please select a Section/Category to copy the items to"
+msgstr "Prego selezionare una Sezione/Categoria dove copiare gli articoli"
+
+#: administrator/components/com_content/admin.content.html.php:1199
+msgid "Copy Content Items"
+msgstr "Copia articolo di contenuto"
+
+#: administrator/components/com_content/admin.content.html.php:1208
+msgid "Copy to Section/Category:"
+msgstr "Copia nella Sezione/Categoria:"
+
+#: administrator/components/com_content/admin.content.html.php:1214
+msgid "Items being copied:"
+msgstr "Articoli che stanno per essere copiati:"
+
+#: administrator/components/com_content/admin.content.php:242
+#: administrator/components/com_content/admin.content.php:351
+msgid "- All Authors -"
+msgstr "- Tutti gli Autori -"
+
+#: administrator/components/com_content/admin.content.php:382
+msgid "You cannot edit an archived item"
+msgstr "Non si può modificare un articolo archiviato"
+
+#: administrator/components/com_content/admin.content.php:407
+msgid "The module %s is currently being edited by another administrator"
+msgstr ""
+"Il Modulo %s è attualmente in corso di modifica da parte di un altro "
+"amministratore"
+
+#: administrator/components/com_content/admin.content.php:423
+#: administrator/components/com_content/admin.content.php:455
+#: administrator/components/com_content/admin.content.php:594
+msgid "Never"
+msgstr "Mai"
+
+#: administrator/components/com_content/admin.content.php:470
+msgid "Select Section"
+msgstr "Seleziona Sezione"
+
+#: administrator/components/com_content/admin.content.php:483
+#: administrator/components/com_content/admin.content.php:499
+#: administrator/components/com_content/admin.content.php:507
+msgid "Select Category"
+msgstr "Seleziona categoria"
+
+#: administrator/components/com_content/admin.content.php:549
+msgid "Bottom"
+msgstr "In basso"
+
+#: administrator/components/com_content/admin.content.php:550
+msgid "Top"
+msgstr "In alto"
+
+#: administrator/components/com_content/admin.content.php:677
+msgid "Successfully Saved changes to Item: "
+msgstr "Le modifiche all'articolo sono state salvate"
+
+#: administrator/components/com_content/admin.content.php:682
+msgid "Successfully Saved Item: "
+msgstr "Articolo salvato correttamente"
+
+#: administrator/components/com_content/admin.content.php:701
+msgid "archive"
+msgstr "archivio"
+
+#: administrator/components/com_content/admin.content.php:723
+msgid "%d Item successfully Archived"
+msgstr "%d articolo è stato archiviato"
+
+#: administrator/components/com_content/admin.content.php:725
+msgid "%d Item successfully Published"
+msgstr "%d articolo è stato pubblicato"
+
+#: administrator/components/com_content/admin.content.php:727
+msgid "%d Item successfully Unpublished"
+msgstr "%d articolo non più pubblicato"
+
+#: administrator/components/com_content/admin.content.php:753
+msgid "Select an item to toggle"
+msgstr "Selezionare un articolo al quale cambiare lo stato"
+
+#: administrator/components/com_content/admin.content.php:788
+msgid "Select an item to delete"
+msgstr "Selezionare un articolo da cancellare"
+
+#: administrator/components/com_content/admin.content.php:805
+msgid "%d Item sent to the Trash"
+msgstr "%d articolo cestinato"
+
+#: administrator/components/com_content/admin.content.php:886
+#: administrator/components/com_content/admin.content.php:990
+msgid "An error has occurred"
+msgstr "Si è verificato un errore"
+
+#: administrator/components/com_content/admin.content.php:935
+msgid "%d Item successfully moved to Section: %s, Category: %s"
+msgstr "%d l'articolo è stato spostato alla Sezione: %s, Categoria: %s"
+
+#: administrator/components/com_content/admin.content.php:1062
+msgid "%d Item successfully copied to Section: %s, Category: %s"
+msgstr "%d l'articolo è stato copiato nella Sezione: %s, Categoria: %s"
+
+#: administrator/components/com_content/admin.content.php:1079
+msgid "Successfully Reset Hit count"
+msgstr "Il contatore delle visite è stato azzerato"
+
+#: administrator/components/com_content/admin.content.php:1145
+msgid "%s (Link - Static Content) in menu: %s successfully created"
+msgstr "%s (collegamento - contenuto statico) nel menu: %s è stato creato"
+
+#: administrator/components/com_content/content.xml
+msgid "A text key that an item may be referenced by (like a help reference)"
+msgstr ""
+"Un testo chiave con il quale un articolo può essere referenziato (come un "
+"aiuto di riferimento)"
+
+#: administrator/components/com_content/content.xml
+msgid "Author Names"
+msgstr "Nomi Autori"
+
+#: administrator/components/com_content/content.xml
+msgid "Category Name Linkable"
+msgstr "Nome categoria collegabile"
+
+#: administrator/components/com_content/content.xml
+msgid "Content Page"
+msgstr "Pagina di contenuto"
+
+#: administrator/components/com_content/content.xml
+msgid "Created Date and Time"
+msgstr "Data ed Ora create"
+
+#: administrator/components/com_content/content.xml
+#: components/com_content/content.html.php:1015
+msgid "Intro Text"
+msgstr "Introduzione"
+
+#: administrator/components/com_content/content.xml
+msgid "Item Rating"
+msgstr "Valutazione articolo"
+
+#: administrator/components/com_content/content.xml
+msgid "Key Reference"
+msgstr "Riferimento chiave"
+
+#: administrator/components/com_content/content.xml
+msgid "Linked Titles"
+msgstr "Titoli collegati"
+
+#: administrator/components/com_content/content.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr ""
+"Trasforma il testo Categoria, un collegamento all'attuale pagina di categoria"
+
+#: administrator/components/com_content/content.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr ""
+"Trasforma il testo Sezione, un collegamento all'attuale pagina di sezione"
+
+#: administrator/components/com_content/content.xml
+msgid "Make your Item titles linkable"
+msgstr "Rendi collegabile il titolo dell'articolo"
+
+#: administrator/components/com_content/content.xml
+msgid "Modified Date and Time"
+msgstr "Data ed Ora modificate"
+
+#: administrator/components/com_content/content.xml
+msgid "PDF Icon"
+msgstr "Icona PDF"
+
+#: administrator/components/com_content/content.xml
+msgid "Section Name"
+msgstr "Nome Sezione"
+
+#: administrator/components/com_content/content.xml
+msgid "Section Name Linkable"
+msgstr "Nome Sezione collegabile"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr "Mostra/Nascondi la categoria alla quale l'articolo  appartiene"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr "Mostra/Nascondi la sezione alla quale l'articolo  appartiene"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the intro text"
+msgstr "Mostra/Nascondi l'Introduzione"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr ""
+"Mostra/Nascondi l'Autore dell'articolo - ha effetto solo in questa pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr ""
+"Mostra/Nascondi la data di creazione dell'articolo - ha effetto solo in "
+"questa pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr ""
+"Mostra/Nascondi il bottone Email dell'articolo - ha effetto solo in questa "
+"pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr ""
+"Mostra/Nascondi la data di modifica dell'articolo - ha effetto solo in "
+"questa pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr ""
+"Mostra/Nascondi il bottone PDF dell'articolo - ha effetto solo in questa "
+"pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr ""
+"Mostra/Nascondi la valutazione dell'articolo - ha effetto solo in questa "
+"pagina"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the items title"
+msgstr "Mostra/Nascondi il titolo dell'articolo"
+
+#: administrator/components/com_content/content.xml
+msgid "This shows a single content page"
+msgstr "Questo mostra una singola pagina di contenuto"
+
+#: components/com_content/content.html.php:70
+msgid "This Category is currently empty"
+msgstr "Questa categoria è vuota"
+
+#: components/com_content/content.html.php:118
+msgid "%d item"
+msgstr "%d articolo"
+
+#: components/com_content/content.html.php:134
+msgid "Registered Users Only"
+msgstr "Solo Utenti registrati"
+
+#: components/com_content/content.html.php:164
+msgid "Filter"
+msgstr "Filtro"
+
+#: components/com_content/content.html.php:186
+msgid "Display #"
+msgstr "Mostra #"
+
+#: components/com_content/content.html.php:213
+msgid "Item Title"
+msgstr "Titolo articolo"
+
+#: components/com_content/content.html.php:270
+#: components/com_content/content.html.php:420
+msgid "Register to read more..."
+msgstr "Registrati per leggere il resto..."
+
+#: components/com_content/content.html.php:350
+msgid "More..."
+msgstr "Continua..."
+
+#: components/com_content/content.html.php:415
+msgid "Read more..."
+msgstr "Leggi tutto..."
+
+#: components/com_content/content.html.php:610
+#: components/com_content/content.html.php:612
+#: components/com_content/content.html.php:616
+msgid "PDF"
+msgstr "PDF"
+
+#: components/com_content/content.html.php:635
+#: components/com_content/content.html.php:637
+#: components/com_content/content.html.php:641
+msgid "E-mail"
+msgstr "E-mail"
+
+#: components/com_content/content.html.php:912
+msgid "Please select a category"
+msgstr "Prego selezionare una categoria"
+
+#: components/com_content/content.html.php:914
+#: components/com_content/content.html.php:923
+msgid "Content item must have intro text"
+msgstr "Il contenuto deve avere almeno l'Introduzione"
+
+#: components/com_content/content.html.php:939
+msgid "Please either Cancel or Save the current change"
+msgstr "Prego Salvare o Cancellare le modifiche effettuate"
+
+#: components/com_content/content.html.php:948
+msgid "Expiry Date:"
+msgstr "Data scadenza:"
+
+#: components/com_content/content.html.php:950
+msgid "Version:"
+msgstr "Versione:"
+
+#: components/com_content/content.html.php:952
+msgid "Created:"
+msgstr "Creato:"
+
+#: components/com_content/content.html.php:954
+msgid "Last Modified:"
+msgstr "Ultima modifica:"
+
+#: components/com_content/content.html.php:964
+msgid "Item Information"
+msgstr "Informazione articolo"
+
+#: components/com_content/content.html.php:965
+msgid "Info"
+msgstr "Info"
+
+#: components/com_content/content.html.php:1015
+#: components/com_content/content.html.php:1021
+msgid "Required"
+msgstr "Richiesto"
+
+#: components/com_content/content.html.php:1021
+#: components/com_content/content.html.php:1039
+msgid "Main Text"
+msgstr "Testo principale"
+
+#: components/com_content/content.html.php:1039
+msgid "Optional"
+msgstr "Opzionale"
+
+#: components/com_content/content.html.php:1061
+msgid "Sub-folder"
+msgstr "Sotto-cartella"
+
+#: components/com_content/content.html.php:1066
+msgid "Gallery Images"
+msgstr "Galleria immagini"
+
+#: components/com_content/content.html.php:1069
+msgid "Content Images"
+msgstr "Immagini di contenuto"
+
+#: components/com_content/content.html.php:1072
+msgid "Edit Image"
+msgstr "Modifica immagine"
+
+#: components/com_content/content.html.php:1078
+msgid "Insert"
+msgstr "Inserisci"
+
+#: components/com_content/content.html.php:1083
+msgid "Up"
+msgstr "Su"
+
+#: components/com_content/content.html.php:1084
+msgid "Down"
+msgstr "Giù"
+
+#: components/com_content/content.html.php:1085
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: components/com_content/content.html.php:1099
+msgid "Align:"
+msgstr "Allinea:"
+
+#: components/com_content/content.html.php:1132
+#: components/com_content/content.html.php:1135
+msgid "No Image"
+msgstr "Nessuna immagine"
+
+#: components/com_content/content.html.php:1201
+msgid "Show on Front Page:"
+msgstr "Mostra nella Pagina Principale:"
+
+#: components/com_content/content.html.php:1260
+#: components/com_content/content.php:1444
+msgid ""
+"You must enter valid e-mail addresses for both yourself and your recipient."
+msgstr ""
+"Si deve inserire un indirizzo e-mail valido sia per il mittente che per il "
+"destinatario."
+
+#: components/com_content/content.html.php:1274
+msgid "E-mail this to a friend."
+msgstr "Invia per e-mail ad un amico."
+
+#: components/com_content/content.html.php:1282
+msgid "Your friend's E-mail:"
+msgstr "L'email del tuo amico:"
+
+#: components/com_content/content.html.php:1290
+msgid "Your Name:"
+msgstr "Il tuo nome:"
+
+#: components/com_content/content.html.php:1298
+msgid "Your E-mail:"
+msgstr "La tua email:"
+
+#: components/com_content/content.html.php:1317
+msgid "Send e-mail"
+msgstr "Invia e-mail"
+
+#: components/com_content/content.html.php:1338
+msgid "This item has been sent to %s"
+msgstr "Questo articolo è stato spedito a %s"
+
+#: components/com_content/content.php:432
+msgid "Date Asc"
+msgstr "Data asc"
+
+#: components/com_content/content.php:433
+msgid "Date Desc"
+msgstr "Data disc"
+
+#: components/com_content/content.php:437
+msgid "Title Asc"
+msgstr "Titolo asc"
+
+#: components/com_content/content.php:438
+msgid "Title Desc"
+msgstr "Titolo disc"
+
+#: components/com_content/content.php:442
+msgid "Hits Asc"
+msgstr "Visite asc"
+
+#: components/com_content/content.php:443
+msgid "Hits Desc"
+msgstr "Visite disc"
+
+#: components/com_content/content.php:447
+msgid "Author Asc"
+msgstr "Autore asc"
+
+#: components/com_content/content.php:448
+msgid "Author Desc"
+msgstr "Autore disc"
+
+#: components/com_content/content.php:451
+msgid "Ordering"
+msgstr "Ordinamento"
+
+#: components/com_content/content.php:642
+#: components/com_content/content.php:722
+msgid "There are currently no Archived Entries for this Category"
+msgstr "Attualmente non ci sono articoli archiviati per questa categoria"
+
+#: components/com_content/content.php:820
+msgid "Here are the Archived entries for %s %s"
+msgstr "Ci sono articoli archiviati per %s %s"
+
+#: components/com_content/content.php:954
+msgid "There are no Archived entries for %s %s"
+msgstr "Non ci sono articoli archiviati per %s %s"
+
+#: components/com_content/content.php:958
+msgid "There are no items to display"
+msgstr "Non ci sono articoli da mostrare"
+
+#: components/com_content/content.php:1161
+msgid "The module [ %s ] is currently being edited by another person."
+msgstr ""
+"Il modulo [%s] è attualmente in corso di modifca da parte di un altro "
+"amministratore."
+
+#: components/com_content/content.php:1368
+msgid ""
+"A new content item has been submitted by [ %s ]  titled [ %s ]  from section "
+"[ %s ]  and category  [ %s ]"
+msgstr ""
+"Un nuovo articolo di contenuto è stato inserito da [ %s ] intitolato [ %s ] "
+"nella sezione [ %s ] e categoria [ %s ]"
+
+#: components/com_content/content.php:1368
+msgid "New Item"
+msgstr "Nuovo articolo"
+
+#: components/com_content/content.php:1373
+msgid "Item saved successfully."
+msgstr "Articolo salvato correttamente."
+
+#: components/com_content/content.php:1373
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+"Grazie per il tuo contributo, sarà visionato prima di essere inserito sul "
+"sito."
+
+#: components/com_content/content.php:1435
+msgid "Item sent by %s"
+msgstr "Articolo inviato da %s"
+
+#: components/com_content/content.php:1455
+msgid ""
+" The following page from the \"%s\" website has been sent to you by %s ( %"
+"s ).\n"
+"\n"
+"You can access it at the following url:\n"
+"%s"
+msgstr ""
+"Ti sono state spedite le seguenti pagine dal sito \"%s\"  da  %s ( %s ).\n"
+"\n"
+
+#: components/com_content/content.php:1506
+msgid "You already voted for this poll today!"
+msgstr "Hai già votato per questo sondaggio, oggi!"
+
+#: components/com_content/content.php:1509
+msgid "Thanks for your vote!"
+msgstr "Grazie per il tuo voto"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_banners.php:73
+msgid "Advertisement"
+msgstr "Pubblicità"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:40
+msgid "Hi, %s"
+msgstr "Ciao, %s"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:65
+msgid "username"
+msgstr "nome utente"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:69
+msgid "password"
+msgstr "password"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:71
+msgid "Remember Me"
+msgstr "Memorizza"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:72
+msgid "Remember me"
+msgstr "Memorizza"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:81
+msgid "Password Reminder"
+msgstr "Password dimenticata?"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:90
+msgid "No account yet?"
+msgstr "Non sei utente?"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:92
+msgid "Create one"
+msgstr "Registrati ora"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_search.php:15
+msgid "Search"
+msgstr "Cerca"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_search.php:17
+msgid "search..."
+msgstr "cerca..."
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:25
+msgid "Time"
+msgstr "Tempo"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:26
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:28
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:26
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:28
+msgid "Enabled"
+msgstr "Abilitato"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:35
+msgid "Members"
+msgstr "Membri"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:39
+msgid "News"
+msgstr "Novità"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:43
+msgid "WebLinks"
+msgstr "WebLinks"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:57
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:59
+msgid "Visitors"
+msgstr "Visitatori"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_templatechooser.php:75
+msgid "Select"
+msgstr "Seleziona"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:28
+msgid "We have %d guest online"
+msgid_plural "We have %d guests online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:32
+msgid "We have %d member online"
+msgid_plural "We have %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:36
+msgid "We have %d guest online and "
+msgid_plural "We have %d guests online and "
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:37
+msgid " %d member online"
+msgid_plural " %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:54
+msgid "No Users Online"
+msgstr "Nessun utente online"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:189
+msgid "Select an item to %a"
+msgstr "seleziona un articolo da %a"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Intro"
+msgstr "# Intro"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Leading"
+msgstr "# Intestazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Links"
+msgstr "# Collegamenti"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Alphabetical"
+msgstr "Autore in ordine alfabetico"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Reverse-Alphabetical"
+msgstr "Autore in ordine alfabetico inverso"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Auto"
+msgstr "Auto"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Category Order"
+msgstr "Ordine categoria"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Columns"
+msgstr "Colonne"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Display {mosimages}."
+msgstr "Mostra {mosimage}."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage Ordering"
+msgstr "Ordinamento pagina principale"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Item Titles"
+msgstr "Titoli articoli"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Least Hits"
+msgstr "Visite minime"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "MOSImages"
+msgstr "MOSImages"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Most Hits"
+msgstr "Più visitati"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Most recent first"
+msgstr "I più recenti prima"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "No, order by Primary Order only"
+msgstr "No, ordinati solo per ordine primario"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Number of Items to display as Links."
+msgstr "Numero di articoli da mostrare come collegamenti"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"Number of Items to display as a leading (full width) item. 0 will mean that "
+"no items will be displayed as leading."
+msgstr ""
+"Numero di articoli da mostrare come principali (a piena larghezza). 0 "
+"significa che nessun articolo sarà mostrato come prioritario."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Number of Items to display with the introduction text shown."
+msgstr "Numero di articoli da mostrare con l'intestazione."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Oldest first"
+msgstr "I più vecchi, prima"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Order items by catgeory"
+msgstr "Ordina articoli per categoria"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Order that the items will be displayed in."
+msgstr "Ordine con il quale  saranno visualizzati gli articoli."
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Pagination"
+msgstr "Paginazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Pagination Results"
+msgstr "Risultati paginazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Primary Order"
+msgstr "Ordine primario"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Read More"
+msgstr "Leggi tutto"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide Pagination Results info ( e.g 1-4 of 4 )"
+msgstr "Mostra/nascondi risultati paginazione (ad es. 1-4 di 4)"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide Pagination support"
+msgstr "Mostra/nascondi supporto paginazione"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Page title"
+msgstr "Mostra/nascondi il titolo della pagina"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Read More link"
+msgstr "Mostra/nascondi il collegamento Leggi tutto"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Text to display at the top of the page"
+msgstr "Testo da mostrare in cima alla pagina"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"This component shows all the published content items from your site marked "
+"Show on Frontpage."
+msgstr ""
+"Questo componente mostra tutti i contenuti pubblicati nel sito, marcati con "
+"Mostra nella Pagina Principale"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Title Alphabetical"
+msgstr "Titolo, ordine alfabetico"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Title Reverse-Alphabetical"
+msgstr "Titolo, ordine alfabetico inverso"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "When displaying the intro text, how many columns to use per row"
+msgstr ""
+"Quando si mostrano i testi introduttivi, quante colonne bisogna usare per "
+"riga?"
+
+#: administrator/components/com_installer/admin.installer.html.php:35
+#: administrator/components/com_installer/admin.installer.php:149
+msgid "Please select a directory"
+msgstr "Prego selezionare una cartella"
+
+#: administrator/components/com_installer/admin.installer.html.php:56
+msgid "Upload Package File"
+msgstr "Caricare il file compresso"
+
+#: administrator/components/com_installer/admin.installer.html.php:61
+msgid "Package File:"
+msgstr "File compresso:"
+
+#: administrator/components/com_installer/admin.installer.html.php:63
+msgid "Upload File &amp; Install"
+msgstr "Carica file ed installa"
+
+#: administrator/components/com_installer/admin.installer.html.php:79
+msgid "Install from directory"
+msgstr "Installa  dalla cartella"
+
+#: administrator/components/com_installer/admin.installer.html.php:84
+msgid "Install directory:"
+msgstr "Cartella installazione"
+
+#: administrator/components/com_installer/admin.installer.html.php:148
+msgid "Continue ..."
+msgstr "Continua..."
+
+#: administrator/components/com_installer/admin.installer.php:160
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Error"
+msgstr "Errore"
+
+#: administrator/components/com_installer/admin.installer.php:160
+msgid "Install new "
+msgstr "Installa nuovo"
+
+#: administrator/components/com_installer/admin.installer.php:160
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Success"
+msgstr "Successo"
+
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Uninstall "
+msgstr "Disinstalla"
+
+#: administrator/components/com_installer/admin.installer.php:198
+msgid "Failed to change the permissions of the uploaded file."
+msgstr "Il tentativo di cambiare i permessi del file caricato è fallito."
+
+#: administrator/components/com_installer/admin.installer.php:201
+msgid "Failed to move uploaded file to <code>/media</code> directory."
+msgstr ""
+"Il tentativo di spostare il file caricato in <code>/media</code> è fallito."
+
+#: administrator/components/com_installer/admin.installer.php:204
+msgid "Upload failed as <code>/media</code> directory is not writable."
+msgstr ""
+"Caricamento fallito in quanto la cartella <code>/media</code> non è "
+"scrivibile."
+
+#: administrator/components/com_installer/admin.installer.php:207
+msgid "Upload failed as <code>/media</code> directory does not exist."
+msgstr ""
+"Caricamento fallito in quanto la cartella <code>/media</code> non esiste."
+
+#: administrator/components/com_installer/admin.installer.php:223
+#: administrator/components/com_installer/admin.installer.php:298
+#: administrator/components/com_installer/admin.installer.php:303
+#: administrator/components/com_installer/admin.installer.php:308
+#: administrator/components/com_installer/admin.installer.php:365
+msgid "Uninstall -  error"
+msgstr "Errore nella disinstallazione"
+
+#: administrator/components/com_installer/admin.installer.php:228
+msgid "Is core component - may not be deleted"
+msgstr ""
+"E' un componente del codice principale e in quanto tale non può essere "
+"disinstallato"
+
+#: administrator/components/com_installer/admin.installer.php:229
+msgid ""
+"Component %s is a core component, and can not be uninstalled.<br />You need "
+"to unpublish it if you don't want to use it"
+msgstr ""
+"Il componente %s è un componente del codice principale e in quanto tale non "
+"può essere disinstallato.<br /> Se non lo si vuole usare, si deve toglierne "
+"la pubblicazione"
+
+#: administrator/components/com_installer/admin.installer.php:268
+msgid ""
+"%s is a core module, and can not be uninstalled.<br />You need to unpublish "
+"it if you don't want to use it"
+msgstr ""
+"%s è un modulo del codice principale e in quanto tale non può essere "
+"disinstallato.<br /> Se non lo si vuole usare, si deve toglierne la "
+"pubblicazione"
+
+#: administrator/components/com_installer/admin.installer.php:303
+msgid "Invalid object id"
+msgstr "ID dell'oggetto non valido"
+
+#: administrator/components/com_installer/admin.installer.php:308
+msgid "Folder field empty, cannot remove files"
+msgstr "Campo cartella vuoto, non è possibile rimuovere i files"
+
+#: administrator/components/com_installer/admin.installer.php:365
+msgid "Language id empty, cannot remove files"
+msgstr "ID del linguaggio vuoto, non è possibile rimuovere i files"
+
+#: administrator/components/com_installer/component/component.html.php:30
+msgid "Installed Components"
+msgstr "Componenti installati"
+
+#: administrator/components/com_installer/component/component.html.php:38
+msgid "Currently Installed"
+msgstr "Attualmente installati"
+
+#: administrator/components/com_installer/component/component.html.php:41
+msgid "Component Menu Link"
+msgstr "Collegamento al menu del componente"
+
+#: administrator/components/com_installer/component/component.html.php:47
+#: administrator/components/com_installer/mambot/mambot.html.php:60
+#: administrator/components/com_installer/module/module.html.php:56
+msgid "Version"
+msgstr "Versione"
+
+#: administrator/components/com_installer/component/component.html.php:53
+#: administrator/components/com_installer/mambot/mambot.html.php:66
+#: administrator/components/com_installer/module/module.html.php:62
+msgid "Author Email"
+msgstr "Email Autore"
+
+#: administrator/components/com_installer/component/component.html.php:56
+#: administrator/components/com_installer/mambot/mambot.html.php:69
+#: administrator/components/com_installer/module/module.html.php:65
+msgid "Author URL"
+msgstr "URL Autore"
+
+#: administrator/components/com_installer/component/component.html.php:96
+msgid "There are no custom components installed"
+msgstr "Non ci sono componenti personalizzati installati"
+
+#: administrator/components/com_installer/component/component.php:21
+msgid "Install new Component"
+msgstr "Instala nuovo componente"
+
+#: administrator/components/com_installer/installer.class.php:57
+msgid "XML error in %s: no handler %s"
+msgstr "Errore XML in %s: non c'è il gestore %s"
+
+#: administrator/components/com_installer/installer.class.php:59
+msgid "XML error in %s: mosinstall has no type"
+msgstr "Errore XML in %s: mosinstall non ha il tipo"
+
+#: administrator/components/com_installer/installer.class.php:64
+msgid "XML Error in %s: install has no name"
+msgstr "Errore XML in %s: install non ha il nome"
+
+#: administrator/components/com_installer/installer.class.php:89
+msgid "XML error in %s: MENU found, but this is not component XML"
+msgstr "Errore XML in %s: MENU è stato trovato, ma non è un componente XML"
+
+#: administrator/components/com_installer/installer.class.php:117
+msgid "XML Error in %s: Mambot does not have a group specified"
+msgstr "Errore XML in %s: Mambot non ha un gruppo specificato"
+
+#: administrator/components/com_installer/installer.class.php:142
+msgid "XML error in %s: no installer %s"
+msgstr "Errore XML in %s: nessun installatore %s"
+
+#: administrator/components/com_installer/installer.class.php:188
+msgid "Installer error with %s: unable to create admin directory for %s %s"
+msgstr ""
+"Errore installatore  con %s: impossibile creare cartella amministratore per %"
+"s %s"
+
+#: administrator/components/com_installer/installer.class.php:195
+msgid "Installer error with %s: unable to create user directory for %s %s"
+msgstr ""
+"Errore installatore con %s: impossibile creare cartella utente per %s %s"
+
+#: administrator/components/com_installer/installer.class.php:221
+msgid "Installer error with %s: writing component menu SQL error %s"
+msgstr "Errore installatore con %s: scrittura componente menu SQL errore %s"
+
+#: administrator/components/com_installer/installer.class.php:233
+#: administrator/components/com_installer/installer.class.php:279
+#: administrator/components/com_installer/installer.class.php:316
+#: administrator/components/com_installer/installer.class.php:344
+msgid "Installer error with %s: %s %s already installed"
+msgstr "Errore installatore con %s: %s %s già installato"
+
+#: administrator/components/com_installer/installer.class.php:249
+#: administrator/components/com_installer/installer.class.php:301
+#: administrator/components/com_installer/installer.class.php:335
+msgid "Installer error with %s: %s %s SQL error %s"
+msgstr "Errore installatore con %s: %s %s SQL errore %s"
+
+#: administrator/components/com_installer/installer.class.php:270
+#: administrator/components/com_installer/installer.class.php:308
+msgid "Installer error with %s: no file identified as the %s"
+msgstr "Errore installatore con %s: nessun file identificato come %s"
+
+#: administrator/components/com_installer/installer.class.php:430
+msgid "Uninstaller error with %s: no uninstaller %s"
+msgstr "Errore disinstallatore con %s: nessun disinstallatore %s"
+
+#: administrator/components/com_installer/installer.class.php:493
+msgid "Uninstaller error with %s: %s %s SQL error %s"
+msgstr "Errore disinstallatore con %s: %s %s SQL errore %s"
+
+#: administrator/components/com_installer/installer.class.php:503
+#: administrator/components/com_installer/installer.class.php:525
+#: administrator/components/com_installer/installer.class.php:544
+msgid "Uninstaller error with %s: %s %s not fully deleted from database"
+msgstr ""
+"Errore disinstallatore con %s: %s %s non interamente cancellato dal database"
+
+#: administrator/components/com_installer/installer.class.php:516
+msgid "Uninstaller error with %s: no file identified as the %s"
+msgstr "Errore disinstallatore con %s: nessun file identificato come %s"
+
+#: administrator/components/com_installer/installer.class.php:621
+msgid "Installer unrecoverable ZIP error %s in %s"
+msgstr "Installatore: errore ZIP non recuperabile %s in %s"
+
+#: administrator/components/com_installer/installer.class.php:630
+msgid "Installer unrecoverable TAR error in %s"
+msgstr "Installatore: errore TAR non recuperabile  in %s"
+
+#: administrator/components/com_installer/language/language.php:19
+msgid "Back to Language Manager"
+msgstr "Torna al gestore linguaggio"
+
+#: administrator/components/com_installer/language/language.php:20
+msgid "Install new Language - Site"
+msgstr "Installa nuovo linguaggio - Sito"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:29
+msgid "Installed Mambots"
+msgstr "Mambots installati"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:34
+msgid ""
+"Only those Mambots that can be uninstalled are displayed - some Core Mambots "
+"cannot be removed."
+msgstr ""
+"Sono elencati solo i Mambots che possono essere disinstallati - qualche "
+"Mambot necessario al codice principale non può essere rimosso."
+
+#: administrator/components/com_installer/mambot/mambot.html.php:45
+msgid "Mambot"
+msgstr "Mambot"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:124
+msgid "There are no non-core, custom mambots installed."
+msgstr "Non ci sono Mambots personalizzati installati."
+
+#: administrator/components/com_installer/mambot/mambot.php:21
+msgid "Install new Mambots"
+msgstr "Installa nuovo mambot"
+
+#: administrator/components/com_installer/module/module.html.php:27
+msgid "Installed Modules"
+msgstr "Moduli installati"
+
+#: administrator/components/com_installer/module/module.html.php:38
+msgid ""
+"Only those Modules that can be uninstalled are displayed - some Core Modules "
+"cannot be removed."
+msgstr ""
+"Sono elencati solo i Moduli che possono essere disinstallati - qualche "
+"Modulo necessario al codice principale non può essere rimosso."
+
+#: administrator/components/com_installer/module/module.html.php:47
+msgid "Module File"
+msgstr "Modulo file"
+
+#: administrator/components/com_installer/module/module.html.php:50
+msgid "Client"
+msgstr "Clente"
+
+#: administrator/components/com_installer/module/module.html.php:77
+#: administrator/components/com_installer/template/template.php:24
+msgid "Administrator"
+msgstr "Amministratore"
+
+#: administrator/components/com_installer/module/module.html.php:101
+msgid "No custom modules installed"
+msgstr "Nessun modulo personalizzato installato"
+
+#: administrator/components/com_installer/module/module.php:21
+msgid "Install new Modules"
+msgstr "Installa nuovo modulo"
+
+#: administrator/components/com_installer/module/module.php:42
+msgid "Admin Modules"
+msgstr "Moduli amministrazione"
+
+#: administrator/components/com_installer/template/template.php:24
+msgid "Install new Template"
+msgstr "Installa nuovo template"
+
+#: administrator/components/com_installer/template/template.php:26
+msgid "Back to Templates"
+msgstr "Torna ai templates"
+
+#: administrator/components/com_installer/toolbar.installer.html.php:25
+msgid "Uninstall"
+msgstr "Disinstalla"
+
+#: administrator/components/com_languages/actions/publish.action.php:25
+msgid "Configuration succesfully updated!"
+msgstr "Configurazione aggiornata!"
+
+#: administrator/components/com_languages/actions/publish.action.php:27
+msgid "Error! Make sure that configuration.php is writeable."
+msgstr "Errore! Ci si assicuri che configuration.php sia scrivibile."
+
+#: administrator/components/com_languages/toolbar.languages.php:44
+msgid "Extract"
+msgstr "Estrai"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:9
+msgid "Compile Catalog?"
+msgstr "Compilare catalogo?"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:10
+msgid "yes"
+msgstr "si"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:11
+msgid "no"
+msgstr "no"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:22
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:35
+msgid "MsgId"
+msgstr "MsgId"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:24
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:37
+msgid "MsgId Plural"
+msgstr "MsgId plurale"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:25
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:54
+msgid "MsgStr"
+msgstr "MsgStr"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:27
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:41
+msgid "Plural form"
+msgstr "Forma plurale"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:43
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:58
+msgid "Fuzzy Entry"
+msgstr "Inserimento dubbio"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Catalog dump"
+msgstr "Dump catalogo"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Comments"
+msgstr "Commenti"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Headers"
+msgstr "Intestazioni"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Strings"
+msgstr "Stringhe"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:11
+msgid "PHPGettext Example"
+msgstr "PHPGettext esempio"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:21
+msgid "PHPGettext"
+msgstr "PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:22
+msgid "Gettext for PHP"
+msgstr "Gettext per PHP"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:25
+msgid "Current language is:"
+msgstr "Il linguaggio corrente è:"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:34
+msgid "Change language"
+msgstr "Cambia lingua"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:41
+msgid "Gettext is enabled!"
+msgstr "Gettext è abilitato!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:43
+msgid "Gettext is disabled!"
+msgstr "Gettext è disabilitato!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:55
+msgid "Disable Gettext"
+msgstr "Disabilita Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:56
+msgid "Enable Gettext"
+msgstr "Abilita Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:57
+msgid "Extract Strings"
+msgstr "Estrai stringhe"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:58
+msgid "Run Unit Tests"
+msgstr "Esegui unità di tests"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:59
+msgid "Clear Tests"
+msgstr "Cancella tests"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:10
+msgid "Create Translation for:"
+msgstr "Crea traduzione per:"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:20
+msgid "Delete This Template"
+msgstr "Cancella questo template"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Login Image"
+msgstr "Allineamento per immagine di login"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Logout Image"
+msgstr "Allineamento per immagine di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Login Page"
+msgstr "Immagine della pagina di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Logout Page"
+msgstr "Immagine della pagina di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description"
+msgstr "Descrizione del Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description Text"
+msgstr "Testo del Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image"
+msgstr "Immagine di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image Align"
+msgstr "Allineamento dell'Immagine di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login JS Message"
+msgstr "Messaggio JavaScript per il Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Page Title"
+msgstr "Titolo della Pagina di Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Redirection URL"
+msgstr "URL della redirezione dopo il Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description"
+msgstr "Descrizione del Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description Text"
+msgstr "Testo del Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image"
+msgstr "Immagine di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image Align"
+msgstr "Allineamento dell'Immagine di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout JS Message"
+msgstr "Messaggio JavaScript dopo il Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Page Title"
+msgstr "Titolo della Pagina di Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Redirection URL"
+msgstr "URL della redirezione dopo il Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Login Description below"
+msgstr "Visualizza o nasconde la descrizione inferiore del Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Logout Description below"
+msgstr "Visualizza o nasconde la descrizione inferiore del Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr "Attiva o Disattiva la finestrella pop-up che conferma l'avvenuto Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr ""
+"Attiva o Disattiva la finestrella pop-up che conferma l'avvenuto Logout"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the login Page, if left blank _LOGIN_DESCRIPTION will be "
+"used"
+msgstr ""
+"Testo che verrà visualizzato nella pagina di Login. Se viene lasciato vuoto, "
+"apparirà _LOGIN_DESCRIPTION"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the logout Page, if left blank _LOGOUT_DESCRIPTION will "
+"be used"
+msgstr ""
+"Testo che verrà visualizzato nella pagina di Logout. Se viene lasciato "
+"vuoto, apparirà _LOGOUT_DESCRIPTION"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will be redirected to after logout, if let blank will load front "
+"page"
+msgstr ""
+"Pagina alla quale si verrà rediretti dopo il Logout. Se lasciata vuota, si "
+"verrà inviati alla home page."
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+"Pagina alla quale si verrà rediretti dopo il Login. Se lasciata vuota, si "
+"verrà inviati alla home page."
+
+#: components/com_login/login.html.php:109
+msgid "!Warning! Javascript must be enabled for proper operation."
+msgstr ""
+"Attenzione! Per eseguire correttamente questa operazione devi avere "
+"JavaScript abilitato sul tuo browser."
+
+#: components/com_login/login.php:38
+msgid "To access the Private areas of this site please Login"
+msgstr "Devi eseguire il Login per accedere alle aree riservate di questo sito"
+
+#: components/com_login/login.php:39
+msgid "You are now Logged in to a private area of this site"
+msgstr "Sei entrato nell'area riservata del sito"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:34
+msgid "Mambot Manager"
+msgstr "Gestione Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:55
+msgid "Mambot Name"
+msgstr "Nome del Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:76
+msgid "File"
+msgstr "File"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:179
+msgid "Mambot must have a name"
+msgstr "Il mambot deve avere un nome"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:181
+msgid "Mambot must have a filename"
+msgstr "Il file relativo al mambot deve avere un nome"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:190
+msgid "Site Mambot:"
+msgstr "Mambot del Sito:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:206
+msgid "Mambot Details"
+msgstr "Dettagli del Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:219
+msgid "Folder:"
+msgstr "Cartella:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:227
+msgid "Mambot file:"
+msgstr "File del Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:235
+msgid "Mambot Order:"
+msgstr "Ordinamento Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:285
+msgid "No Parameters"
+msgstr "Nessun Parametro"
+
+#: administrator/components/com_mambots/admin.mambots.php:137
+msgid "- All Types -"
+msgstr "- Tutti i Tipi -"
+
+#: administrator/components/com_mambots/admin.mambots.php:184
+msgid "Successfully Saved changes to Mambot: %s"
+msgstr "I cambiamenti al mambot %s sono stati eseguiti correttamente"
+
+#: administrator/components/com_mambots/admin.mambots.php:189
+msgid "Successfully Saved Mambot: %s"
+msgstr "Il mambot %s è stato memorizzato correttamente"
+
+#: administrator/components/com_mambots/admin.mambots.php:247
+msgid "This mambot cannot be reordered"
+msgstr "Questo mambot non può essere soggetto a riordinamento"
+
+#: administrator/components/com_mambots/admin.mambots.php:290
+msgid "Select a module to delete"
+msgstr "Seleziona un modulo da cancellare"
+
+#: administrator/components/com_mambots/admin.mambots.php:307
+msgid "Select a mambot to %s"
+msgstr "Seleziona un mambot per %s"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:30
+msgid "Please fill in the subject"
+msgstr "Per favore, assicurati di scrivere il soggetto"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:32
+msgid "Please select a group"
+msgstr "Seleziona un gruppo"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:34
+msgid "Please fill in the message"
+msgstr "Per favore, assicurati di scrivere il Messaggio"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:45
+#: administrator/components/com_massmail/massmail.xml
+msgid "Mass Mail"
+msgstr "Invio Mail agli Utenti"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:66
+msgid "Mail to Child Groups:"
+msgstr "Invia anche ai sottoGruppi:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:74
+msgid "Send in HTML mode:"
+msgstr "Invia in modalità HTML:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:82
+msgid "Subject"
+msgstr "Soggetto:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:90
+msgid "Message:"
+msgstr "Messaggio:"
+
+#: administrator/components/com_massmail/admin.massmail.php:39
+msgid "- All User Groups -"
+msgstr "- Tutti i Gruppi di Utenti -"
+
+#: administrator/components/com_massmail/admin.massmail.php:69
+msgid "Please fill in the form correctly"
+msgstr ""
+"Per favore, assicurati di completare correttamente tutte le parti del modulo"
+
+#: administrator/components/com_massmail/admin.massmail.php:92
+msgid ""
+"This is an email from '%s'\n"
+"\n"
+"Message:\n"
+msgstr ""
+"Hai ricevuto un messaggio da '%s'\n"
+"\n"
+"Messaggio:\n"
+
+#: administrator/components/com_massmail/admin.massmail.php:105
+msgid "E-mail sent to %d user."
+msgid_plural "E-mail sent to %d users."
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_massmail/massmail.xml
+msgid "This component allows you to send a mass email to certain user groups"
+msgstr ""
+"Questo componente consente di spedire una mail contemporaneamente ad uno o "
+"più gruppi di utenti"
+
+#: administrator/components/com_massmail/toolbar.massmail.html.php:24
+msgid "Send Mail"
+msgstr "Invia la Mail"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:53
+msgid "Menu Name"
+msgstr "Nome del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:56
+msgid "Menu Items"
+msgstr "Elementi del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:59
+msgid "# Published"
+msgstr "n. di Pubblicati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:62
+msgid "# Unpublished"
+msgstr "n. di Non pubblicati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:65
+msgid "# Trash"
+msgstr "n. di Cestinati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:68
+msgid "# Modules"
+msgstr "n. di Moduli"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:94
+msgid "Edit Menu Name"
+msgstr "Modifica il Nome del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:99
+msgid "Edit Menu Items"
+msgstr "Modifica gli Elementi del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:156
+msgid "Please enter a menu name"
+msgstr "Devi assegnare un nome al menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:164
+msgid "Please enter a module name for your menu"
+msgstr "Assegna un nome al modulo da associare al menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:182
+msgid "Menu Details"
+msgstr "Dettagli Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:190
+msgid "Menu Name:"
+msgstr "Nome del Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:195
+msgid ""
+"This is the identification name used by mambo to identify this menu within "
+"the code - it must be unique. It is recommended that you do not have any "
+"spaces in your Menu Name"
+msgstr ""
+"Questo è il nome di identificazione usato da Mambo per identificare questo "
+"menu nel codice - deve essere univoco. Si raccomanda di non  inserire spazi "
+"nel nome del Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:210
+msgid "Title of the mod_mainmenu module required to show this Menu"
+msgstr ""
+"Per visualizzare questo menu, il modulo mod_mainmenu deve avere un titolo"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:216
+msgid ""
+"A new mod_mainmenu module, with the Title you have entered above will "
+"automatically be created when you save this menu."
+msgstr ""
+"Un nuovo modulo mod_mainmenu, con il Titolo che si è inserito sopra, sarà "
+"creato automaticamente non appena salvato il menu."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:218
+msgid ""
+"Parameters for the module created are to be edited through the \"Modules "
+"Manager [site]\": Modules -> Site Modules"
+msgstr ""
+"I parametri per il modulo creato, saranno modificabili attraverso la "
+"\"Gestione  moduli [site]\":  Moduli -> Moduli del sito"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:266
+msgid "Delete Menu: %s"
+msgstr "Cancella menu: %s"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:279
+msgid "Module(s) being Deleted:"
+msgstr "Moduli che stanno per essere cancellati:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:301
+msgid "Menu Items being Deleted:"
+msgstr "Elementi di menu che stanno per essere cancellati:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:319
+msgid ""
+"This will <span style=\"font-weight:bold;color:#FF0000\">Delete</span> this "
+"Menu, <br />ALL its Menu Items and the Module(s) associated with it"
+msgstr ""
+"Questa operazione <span style=\"font-weight:bold;color:#FF0000\">cancellerà</"
+"span> questo menu, <br />TUTTI i suoi elementi ed i moduli associati"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:322
+msgid ""
+"Are you sure you want to Delete this menu? \\nThis will Delete the Menu, its "
+"Items and the Module(s)."
+msgstr ""
+"Si è sicuri di voler cancellare questo menu? \\n Questa operazione "
+"cancellerà il menu, i suoi elementi ed i moduli associati."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:354
+msgid "Please enter a name for the copy of the Menu"
+msgstr "Prego inserire un nome per la copia del menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:357
+msgid "Please enter a name for the new Module"
+msgstr "Prego inserire un nome per il uovo Modulo"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:371
+msgid "Copy Menu"
+msgstr "Copia menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:381
+msgid "New Menu Name:"
+msgstr "Nuovo nome del modulo:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:385
+msgid "New Module Name:"
+msgstr "Nuovo nome del modulo:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:392
+msgid "Menu being copied:"
+msgstr "Menu che sta per essere copiato:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:402
+msgid "Menu Items being copied:"
+msgstr "Elemento del menu che sta per essere copiato:"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:207
+msgid ""
+"You cannot rename the \"mainmenu\" Menu as this will disrupt the proper "
+"operation of Mambo"
+msgstr ""
+"Non puoi rinominare il menu \"mainmenu\", perché distruggerebbe alcune "
+"operazioni peculiari di Mambo"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:223
+msgid ""
+"A menu already exists with that name - you must enter a unique Menu Name"
+msgstr ""
+"Un menu con questo nome esiste già - si deve inserire un nome menu univoco"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:258
+msgid "New Menu created [ %s ]"
+msgstr "Creat il nuovo menu [ %s ]"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:312
+msgid "Menu Items & Modules updated"
+msgstr "Il menu Articoli & Moduli è stato aggiornato"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:326
+#: administrator/components/com_menumanager/admin.menumanager.php:376
+msgid "You cannot delete the \"mainmenu\" menu as it is a core menu"
+msgstr ""
+"Non puoi cancellare il menu \"mainmenu\", perché è un elemento del codice "
+"principale"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:467
+msgid ""
+"A menu with that name already exists - you must enter a unique Menu Name"
+msgstr ""
+"Un menu con questo nome esiste già - si deve inserire un nome menu univoco"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:527
+msgid "Copy of Menu `%s` created, consisting of %d item"
+msgid_plural "Copy of Menu `%s` created, consisting of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "This component manages your Menus."
+msgstr "Questo componente gestisce i menu."
+
+#: administrator/components/com_messages/admin.messages.html.php:24
+msgid "Private Messaging"
+msgstr "Messaggi Privati"
+
+#: administrator/components/com_messages/admin.messages.html.php:36
+msgid "From"
+msgstr "Da"
+
+#: administrator/components/com_messages/admin.messages.html.php:39
+#: administrator/components/com_messages/admin.messages.html.php:55
+msgid "Read"
+msgstr "Letti"
+
+#: administrator/components/com_messages/admin.messages.html.php:57
+msgid "Unread"
+msgstr "Non letti"
+
+#: administrator/components/com_messages/admin.messages.html.php:77
+msgid "Private Messaging Configuration"
+msgstr "Configurazione dei Messaggi Privati"
+
+#: administrator/components/com_messages/admin.messages.html.php:82
+msgid "General"
+msgstr "Generale"
+
+#: administrator/components/com_messages/admin.messages.html.php:89
+msgid "Are you sure?"
+msgstr "Sei sicuro?"
+
+#: administrator/components/com_messages/admin.messages.html.php:101
+msgid "Lock Inbox:"
+msgstr "Blocca i Messaggi in Entrata"
+
+#: administrator/components/com_messages/admin.messages.html.php:105
+msgid "Mail me on new Message:"
+msgstr "Inviami i nuovi messaggi per e-mail"
+
+#: administrator/components/com_messages/admin.messages.html.php:123
+msgid "View Private Message"
+msgstr "Visualizza i Messaggi Privati"
+
+#: administrator/components/com_messages/admin.messages.html.php:130
+msgid "From:"
+msgstr "Da:"
+
+#: administrator/components/com_messages/admin.messages.html.php:134
+msgid "Posted:"
+msgstr "Inviato il:"
+
+#: administrator/components/com_messages/admin.messages.html.php:138
+#: administrator/components/com_messages/admin.messages.html.php:193
+msgid "Subject:"
+msgstr "Soggetto:"
+
+#: administrator/components/com_messages/admin.messages.html.php:169
+msgid "You must provide a subject."
+msgstr "Devi scrivere un soggetto."
+
+#: administrator/components/com_messages/admin.messages.html.php:171
+msgid "You must provide a message."
+msgstr "Devi scrivere un messaggio."
+
+#: administrator/components/com_messages/admin.messages.html.php:173
+msgid "You must select a recipient."
+msgstr "Devi selezionare un destinatario."
+
+#: administrator/components/com_messages/admin.messages.html.php:182
+msgid "New Private Message"
+msgstr "Nuovo Messaggio Privato."
+
+#: administrator/components/com_messages/admin.messages.html.php:189
+msgid "To:"
+msgstr "A:"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:21
+msgid "Reply"
+msgstr "Rispondi"
+
+#: components/com_messages/messages.class.php:76
+#: components/com_messages/messages.class.php:77
+msgid "A new private message has arrived"
+msgstr "Hai ricevuto un nuovo messaggio"
+
+#: components/com_messages/messages.class.php:84
+msgid "The user has locked their mailbox. Message failed."
+msgstr ""
+"L'utente ha bloccato i messaggi in arrivo. Il tuo messaggio non è stato "
+"consegnato."
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE Editor mambot.</p><p>Please refer to the "
+"changelog and other information in the 'Admin Info' tab in the Admin "
+"component.&nbsp;</p>"
+msgstr ""
+"<p>Componente di Amministrazione per il mambot Editor MOStlyCE.</p><p>Prego "
+"di fare riferimento al changelog e alle altre informazioni nel tab 'Admin "
+"Info? nel componente Admin. </p>"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid "mostlyce"
+msgstr "mostlyce"
+
+#: administrator/components/com_modules/admin.modules.html.php:34
+msgid "Module Manager"
+msgstr "Modulo Manager"
+
+#: administrator/components/com_modules/admin.modules.html.php:60
+msgid "Module Name"
+msgstr "Nome Modulo"
+
+#: administrator/components/com_modules/admin.modules.html.php:87
+msgid "Pages"
+msgstr "Pagine"
+
+#: administrator/components/com_modules/admin.modules.html.php:156
+msgid "Varies"
+msgstr "Varie"
+
+#: administrator/components/com_modules/admin.modules.html.php:166
+msgid "User"
+msgstr "Utente"
+
+#: administrator/components/com_modules/admin.modules.html.php:213
+msgid "Module must have a title"
+msgstr "Il Modulo deve avere un titolo"
+
+#: administrator/components/com_modules/admin.modules.html.php:239
+msgid "Module:"
+msgstr "Modulo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:270
+msgid "Show title:"
+msgstr "Mostra il titolo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:278
+msgid "Position:"
+msgstr "Posizione:"
+
+#: administrator/components/com_modules/admin.modules.html.php:286
+msgid "Module Order:"
+msgstr "Ordinamento Moduli:"
+
+#: administrator/components/com_modules/admin.modules.html.php:318
+msgid "ID:"
+msgstr "ID:"
+
+#: administrator/components/com_modules/admin.modules.html.php:351
+msgid "Pages / Items"
+msgstr "Pagine / Oggetti"
+
+#: administrator/components/com_modules/admin.modules.html.php:356
+msgid "Menu Item Link(s):"
+msgstr "Link(s) all'oggetto Menu"
+
+#: administrator/components/com_modules/admin.modules.html.php:372
+msgid "Custom Output"
+msgstr "Output personalizzata"
+
+#: administrator/components/com_modules/admin.modules.html.php:377
+msgid "Content:"
+msgstr "Contenuto:"
+
+#: administrator/components/com_modules/admin.modules.php:149
+msgid "- All Positions -"
+msgstr "- Tutte le Posizioni -"
+
+#: administrator/components/com_modules/admin.modules.php:211
+msgid "Module Copied [%s]"
+msgstr "Modulo copiato [%s]"
+
+#: administrator/components/com_modules/admin.modules.php:268
+msgid "Successfully Saved changes to Module: %s"
+msgstr "I cambiamenti al modulo: %s  sono stati  salvati"
+
+#: administrator/components/com_modules/admin.modules.php:274
+msgid "Successfully Saved Module: %s"
+msgstr "Il modulo: %s  è stato salvato"
+
+#: administrator/components/com_modules/admin.modules.php:377
+#: administrator/components/com_modules/admin.modules.php:378
+#: administrator/components/com_modules/admin.modules.php:381
+#: administrator/components/com_modules/admin.modules.php:382
+msgid "N/A"
+msgstr "N/A"
+
+#: administrator/components/com_modules/admin.modules.php:440
+msgid ""
+"You cannot delete mod_mainmenu module that displays the \"mainmenu\" as it "
+"is a core Menu"
+msgstr ""
+"Non è possibile cancellare il mod_mainmenu che mostra il \"mainmenu\" perché "
+"è un menu del codice principale"
+
+#: administrator/components/com_modules/admin.modules.php:466
+msgid ""
+"Module(s): \"%s\" cannot be deleted they can only be un-installed as they "
+"are Mambo modules."
+msgstr ""
+"I moduli: \"%s\" non possono essere cancellati ma solo disinstallati perché "
+"fanno parte del codice principale di Mambo."
+
+#: administrator/components/com_modules/admin.modules.php:482
+msgid "Select a module to %s"
+msgstr "Selezionare un modulo da %s"
+
+#: administrator/components/com_modules/toolbar.modules.html.php:41
+msgid "You can only preview typed modules."
+msgstr ""
+"Si possono vedere in anteprima solo i moduli di contenuto testo digitato."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:29
+msgid "Newsfeed Manager"
+msgstr "Amministrazione delle Newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:46
+msgid "News Feed"
+msgstr "News Feed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:58
+#: components/com_newsfeeds/newsfeeds.html.php:107
+msgid "# Articles"
+msgstr "n. Articoli"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:61
+msgid "Cache time"
+msgstr "Tempo di Cache"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:95
+msgid "Edit Newsfeed"
+msgstr "Modifica newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please fill in the newsfeed name."
+msgstr "Prego, inserisci il nome delle newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please fill in the newsfeed link."
+msgstr "Prego, inserisci il collegamento delle newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:160
+msgid "Please select a category."
+msgstr "Prego seleziona una categoria."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:162
+msgid "Please fill in the number of articles to display."
+msgstr "Prego, inserisci il numero di articoli da visualizzare."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:164
+msgid "Please fill in the cache refresh time."
+msgstr "Prego, inserisci il tempo di refresh della cache."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:175
+msgid "Newsfeed:"
+msgstr "Newsfeed:"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:204
+msgid "Link"
+msgstr "Collegamento"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:212
+msgid "Number of Articles"
+msgstr "Numero di Articoli"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:220
+msgid "Cache time (in seconds)"
+msgstr "Tempo di Cache (in secondi)"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Articles Column"
+msgstr "n. Articoli per colonna"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+"Permette di limitare la quantità di descrizione visualizzata. 0 mostrerà il "
+"testo intero"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description for page"
+msgstr "Descrizione della Pagina"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Description"
+msgstr "Descrizione del Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Image"
+msgstr "Immagine del Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Item Description"
+msgstr "Descrizione dell'elemento"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Link Column"
+msgstr "Colonna dei Link"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Name Column"
+msgstr "Colonna dei Nomi"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Newsfeeds"
+msgstr "Newsfeeds"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the # of articles in the feed"
+msgstr "Visualizza o Nascondi il numero di articoli nel Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Link column"
+msgstr "Visualizza o nascondi la Colonna dei Link nel Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Name column"
+msgstr "Visualizza o Nascondi la Colonna dei Nomi nel feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr "Mostra/Nascondi il testo di introduzione dell'articolo"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description text of the feed"
+msgstr "Mostra/Nascondi il testo di descrizione del feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the image of the feed"
+msgstr "Mostra/Nascondi le immagini del feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "This component manages RSS/RDF newsfeeds"
+msgstr "Questo componente serve a gestire i feed RSS/RDF"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Word Count"
+msgstr "Conteggio delle Parole"
+
+#: components/com_newsfeeds/newsfeeds.html.php:98
+msgid "Feed Name"
+msgstr "Nome del Feed"
+
+#: components/com_newsfeeds/newsfeeds.html.php:116
+msgid "Feed Link"
+msgstr "Link del Feed"
+
+#: administrator/components/com_poll/admin.poll.html.php:28
+msgid "Poll Manager"
+msgstr "Amministrazione Sondaggi"
+
+#: administrator/components/com_poll/admin.poll.html.php:41
+msgid "Poll Title"
+msgstr "Titolo sondaggio"
+
+#: administrator/components/com_poll/admin.poll.html.php:47
+msgid "Options"
+msgstr "Opzioni"
+
+#: administrator/components/com_poll/admin.poll.html.php:50
+msgid "Lag"
+msgstr "ritardo"
+
+#: administrator/components/com_poll/admin.poll.html.php:74
+msgid "Edit Poll"
+msgstr "Edita il sondaggio"
+
+#: administrator/components/com_poll/admin.poll.html.php:118
+msgid "Poll must have a title"
+msgstr "Il sondaggio deve avere un titolo"
+
+#: administrator/components/com_poll/admin.poll.html.php:120
+msgid "Poll must have a non-zero lag time"
+msgstr "Il sondaggio deve avere un non-zero tempo di ritardo"
+
+#: administrator/components/com_poll/admin.poll.html.php:134
+msgid "Poll:"
+msgstr "Sondaggio:"
+
+#: administrator/components/com_poll/admin.poll.html.php:159
+msgid "Show on menu items:"
+msgstr "Mostra il menu dell'oggetto"
+
+#: administrator/components/com_poll/admin.poll.html.php:166
+msgid "Lag:"
+msgstr "Ritardo:"
+
+#: administrator/components/com_poll/admin.poll.html.php:175
+msgid "Options:"
+msgstr "Opzioni:"
+
+#: administrator/components/com_poll/admin.poll.php:106
+msgid "The poll %s is currently being edited by another administrator."
+msgstr "Il sondaggio %s è al momento aperto da un'altro amministratore."
+
+#: administrator/components/com_poll/poll.class.php:44
+msgid "Your Poll must contain a title."
+msgstr "Il tuo sondaggio deve avere un titolo."
+
+#: administrator/components/com_poll/poll.class.php:50
+msgid "Your Poll must have a non-zero lag time."
+msgstr "Il tuo sondaggio deve avere un non-zero tempo di ritardo."
+
+#: administrator/components/com_poll/poll.class.php:59
+msgid "There is a module already with that name, please try again."
+msgstr "Esiste già un modulo con lo stesso nome, prego di riprovare."
+
+#: administrator/components/com_poll/poll.xml
+msgid "Poll"
+msgstr "Sondaggio"
+
+#: administrator/components/com_poll/poll.xml
+msgid "This component shows Polls/Surveys"
+msgstr "Questo componente mostra i Sondaggi"
+
+#: components/com_poll/poll.html.php:51
+msgid "Select Poll:"
+msgstr "Seleziona sondaggio"
+
+#: components/com_poll/poll.html.php:83
+msgid "There are no results for this poll."
+msgstr "Non ci sono risultati per questo sondaggio."
+
+#: components/com_poll/poll.html.php:193
+msgid "Number of Voters"
+msgstr "Numero di votanti"
+
+#: components/com_poll/poll.html.php:202
+msgid "First Vote"
+msgstr "Primo voto"
+
+#: components/com_poll/poll.html.php:211
+msgid "Last Vote"
+msgstr "Ultimo voto"
+
+#: components/com_poll/poll.php:48
+msgid "Cookies must be enabled!"
+msgstr "I coockies devono essere abilitati!"
+
+#: components/com_poll/poll.php:49 components/com_poll/poll.php:56
+#: components/com_poll/poll.php:65 components/com_poll/poll.php:72
+msgid "Continue"
+msgstr "Continua"
+
+#: components/com_poll/poll.php:71
+msgid "No selection has been made, please try again"
+msgstr "Nessuna selezione fatta, per favore prova ancora"
+
+#: components/com_poll/poll.php:112 components/com_poll/poll.php:154
+msgid "Select Poll from the list"
+msgstr "Seleziona un sondaggio dall'elenco"
+
+#: components/com_registration/registration.html.php:23
+#: components/com_registration/registration.php:40
+msgid "Lost your Password?"
+msgstr "Hai perso la Password?"
+
+#: components/com_registration/registration.html.php:28
+msgid ""
+"Please enter your Username and e-mail address then click on the Send "
+"Password button.%s You will receive a new password shortly.  Use the new "
+"password to access the site."
+msgstr ""
+"Prego, inserisci il tuo Nome Utente e indirizzo e-mail poi clicca sul "
+"Pulsante Spedisci. %s Riceverai una nuova password rapidamente. Usa la nuova "
+"password per accedere al sito."
+
+#: components/com_registration/registration.html.php:31
+#: components/com_registration/registration.html.php:94
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: components/com_registration/registration.html.php:35
+msgid "E-mail Address:"
+msgstr "Indirizzo E-Mail:"
+
+#: components/com_registration/registration.html.php:40
+msgid "Send Password"
+msgstr "Invia Password"
+
+#: components/com_registration/registration.html.php:58
+msgid "Please enter your name."
+msgstr "Prego inserisci il tuo Nome."
+
+#: components/com_registration/registration.html.php:60
+#: components/com_registration/registration.html.php:62
+msgid "Please enter a user name."
+msgstr "Prego inserisci il tuo nome utente."
+
+#: components/com_registration/registration.html.php:62
+#: components/com_registration/registration.html.php:72
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+"Prego, inserisci un valido %s. Nessun spazio, più di %d caratteri e solo "
+"caratteri 0-9, a-z, o A-Z"
+
+#: components/com_registration/registration.html.php:64
+msgid "Please enter a valid e-mail address."
+msgstr "Prego, inserisci un indirizzo e-mail valido."
+
+#: components/com_registration/registration.html.php:66
+msgid ""
+"Please enter a valid password -- more than 6 characters with no spaces and "
+"containing only the characters 0-9, a-z, or A-Z"
+msgstr ""
+"Prego, inserisci una password valida -- più lunga di 6 caratteri senza spazi "
+"e contenente solo caratteri 0-9, a-z, o A-Z"
+
+#: components/com_registration/registration.html.php:68
+msgid "Please verify the password."
+msgstr "Prego, verifica la password."
+
+#: components/com_registration/registration.html.php:70
+msgid "Password and verification do not match, please try again."
+msgstr "La password e la verifica non coincidono, prego di riprovare."
+
+#: components/com_registration/registration.html.php:72
+#: components/com_registration/registration.html.php:103
+msgid "Password:"
+msgstr "Password:"
+
+#: components/com_registration/registration.html.php:80
+#: components/com_registration/registration.php:109
+msgid "Registration"
+msgstr "Registrazione"
+
+#: components/com_registration/registration.html.php:85
+msgid "Fields marked with an asterisk (*) are required."
+msgstr "I campi contrassegnati con l'asterisco (*) sono richiesti."
+
+#: components/com_registration/registration.html.php:108
+msgid "Verify Password:"
+msgstr "Verifica Password:"
+
+#: components/com_registration/registration.html.php:126
+msgid "Send Registration"
+msgstr "Invia Registrazione"
+
+#: components/com_registration/registration.php:62
+msgid "Sorry, no corresponding user was found"
+msgstr "Scusate, ma non è stata trovata alcuna corrispondenza"
+
+#: components/com_registration/registration.php:74
+msgid ""
+"The user account %s has this email associated with it.\n"
+"\n"
+"A web user from %s has just requested that a new password be sent.\n"
+"\n"
+"\n"
+"Your New Password is: %s\n"
+"\n"
+"\n"
+"If you didn't ask for this, don't worry. You are seeing this message, not "
+"them. \n"
+"If this was an error just login with your new password and then change your "
+"password to what you would like it to be."
+msgstr ""
+"L'account dell'utente %s ha questo indirizzo email associato.\n"
+"\n"
+"Un utente web da %s ha appena richiesto che gli fosse spedita una nuova "
+"password.\n"
+"\n"
+"\n"
+"La tua nuova password è: %s\n"
+"\n"
+"\n"
+"se non hai effettuato tu la richiesta, non ti preoccupare: solo tu stai "
+"vedendo questo messaggio e nessun altro. \n"
+"Se questo è un errore, è sufficiente che ti connetta al sito con la nuova "
+"password e la cambi con un'altra di tua scelta."
+
+#: components/com_registration/registration.php:81
+msgid "%s :: New password for - %s"
+msgstr "%s :: Nuova Password per - %s"
+
+#: components/com_registration/registration.php:97
+msgid "New User Password created and sent!"
+msgstr "La nuova Password è stata creata e inviata!"
+
+#: components/com_registration/registration.php:160
+#: components/com_registration/registration.php:208
+msgid "Account details for %s at %s"
+msgstr "Dettagli Account di %s a %s"
+
+#: components/com_registration/registration.php:165
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s. Your account has been created but, as a "
+"precaution, it must be activated by you before you can use it.\n"
+"To activate the account click on the following link or copy and paste it in "
+"your browser:\n"
+"%s\n"
+"\n"
+"After activation you may login to %s using the following username and "
+"password:\n"
+"\n"
+"Username - %s\n"
+"Password - %s"
+msgstr ""
+"Ciao %s, \n"
+"\n"
+"Grazie per esserti registrato a %s. Il tuo Account è stato creato ma, per "
+"precauzione, lo devi attivare prima di usarlo. \n"
+"Per attivare l'account clicca sul seguente link o copia e incolla sul tuo "
+"browser:\n"
+"\n"
+"NomeUtente - %s\n"
+"Password - %s"
+
+#: components/com_registration/registration.php:180
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s.\n"
+"\n"
+"You may now login to %s using the username and password you registered with."
+msgstr ""
+"Ciao %s,\n"
+"\n"
+"Grazie per esserti registrato a %s.\n"
+"\n"
+"Ora puoi connetterti al sito %s inserendo i nome Utente e password che hai "
+"usato per registrarti."
+
+#: components/com_registration/registration.php:209
+msgid ""
+"Hello %s,\n"
+"\n"
+"A new user has registered at %s.\n"
+"This email contains their details:\n"
+"\n"
+"Name - %s\n"
+"e-mail - %s\n"
+"Username - %s\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Ciao %s,\n"
+"\n"
+"Un nuovo utente si è registrato a %s.\n"
+"\n"
+"Nome - %s\n"
+"e-mail - %s\n"
+"NomeUtente - %s\n"
+"\n"
+"Prego di non rispondere a questo messaggio in quanto generato "
+"automaticamente e a solo scopo informativo"
+
+#: components/com_registration/registration.php:239
+#: components/com_registration/registration.php:242
+msgid "Registration Complete"
+msgstr "Registrazione Completata"
+
+#: components/com_registration/registration.php:240
+msgid ""
+"Your account has been created and an activation link has been sent to the e-"
+"mail address you entered. Note that you must activate the account by "
+"clicking on the activation link before you can login."
+msgstr ""
+"Il tuo account è stato creato e un link di attivazione è stato inviato "
+"all'indirizzo email che hai inserito. Nota che devi attivare l'account "
+"cliccando sul link di attivazione, prima di poterti connettere al sito."
+
+#: components/com_registration/registration.php:243
+msgid "You may now login."
+msgstr "Ora puoi connetteri al sito."
+
+#: components/com_registration/registration.php:261
+#: components/com_registration/registration.php:282
+msgid "Invalid Activation Link!"
+msgstr "Link di attivazione non valido!"
+
+#: components/com_registration/registration.php:262
+#: components/com_registration/registration.php:283
+msgid ""
+"There is no such account in our database or the account has already been "
+"activated."
+msgstr ""
+"Non c'è un utente simile nel nostro archivio oppure il suo account è già "
+"stato  attivato."
+
+#: components/com_registration/registration.php:275
+msgid "Activation Complete!"
+msgstr "Attivazione completata!"
+
+#: components/com_registration/registration.php:276
+msgid ""
+"Your account has been activated successfully. You can now login using the "
+"username and password you chose during registration."
+msgstr ""
+"Il tuo account è stato attivato correttamente. Ora puoi connetterti al sito "
+"usando il nome utente e la password che hai scelto durante la registrazione."
+
+#: administrator/components/com_search/search.xml
+msgid "This component manages the Search functionality."
+msgstr "Questo componente amministra le funzionalità di ricerca."
+
+#: components/com_search/search.html.php:37
+#: components/com_search/search.html.php:67
+msgid "Search Keyword"
+msgstr "Cerca Keyword"
+
+#: components/com_search/search.html.php:98
+msgid "returned %d match"
+msgid_plural "returned %d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_search/search.php:55
+msgid "Newest first"
+msgstr "Prima i più recenti"
+
+#: components/com_search/search.php:57
+msgid "Most popular"
+msgstr "I più popolari"
+
+#: components/com_search/search.php:58
+msgid "Alphabetical"
+msgstr "Alfabetico"
+
+#: components/com_search/search.php:59
+msgid "Section/Category"
+msgstr "Sezione/Categoria"
+
+#: components/com_search/search.php:69
+msgid "Any words"
+msgstr "Qualunque parola"
+
+#: components/com_search/search.php:74
+msgid "All words"
+msgstr "Tutte le parole"
+
+#: components/com_search/search.php:79
+msgid "Exact phrase"
+msgstr "Frase esatta"
+
+#: components/com_search/search.php:91
+msgid "No results were found"
+msgstr "Nessun risultato trovato"
+
+#: components/com_search/search.php:96
+msgid "One or more common words were ignored in the search"
+msgstr "Una o più parole comuni sono state ignorate nella ricerca"
+
+#: administrator/components/com_sections/admin.sections.html.php:65
+msgid "Section ID"
+msgstr "ID Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:68
+msgid "# Categories"
+msgstr "# Categorie"
+
+#: administrator/components/com_sections/admin.sections.html.php:71
+msgid "# Active"
+msgstr "# Attive"
+
+#: administrator/components/com_sections/admin.sections.html.php:175
+msgid "New Section"
+msgstr "Nuova Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:203
+msgid "Section must have a name"
+msgstr "La Sezione deve avere un nome"
+
+#: administrator/components/com_sections/admin.sections.html.php:205
+msgid "Section must have a title"
+msgstr "La Sezione deve avere un titolo"
+
+#: administrator/components/com_sections/admin.sections.html.php:281
+msgid "Section Details"
+msgstr "Dettagli della Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:286
+msgid "Scope:"
+msgstr "Scope:"
+
+#: administrator/components/com_sections/admin.sections.html.php:401
+msgid "Select Menu Type"
+msgstr "Seleziona un Tipo di Menu"
+
+#: administrator/components/com_sections/admin.sections.html.php:489
+msgid "Copy Section"
+msgstr "Copia Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:501
+msgid "The new Section name"
+msgstr "Nuovo nome di Sezione"
+
+#: administrator/components/com_sections/admin.sections.html.php:529
+msgid ""
+"This will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the new Section created."
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:189
+msgid "The section %s is currently being edited by another administrator"
+msgstr ""
+"La sezione %d è attualmente aperta per modifiche da un altro amministratore"
+
+#: administrator/components/com_sections/admin.sections.php:207
+#: administrator/components/com_sections/admin.sections.php:624
+msgid "Section Table"
+msgstr "Tabella di una Sezione"
+
+#: administrator/components/com_sections/admin.sections.php:215
+#: administrator/components/com_sections/admin.sections.php:634
+msgid "Section Blog Archive"
+msgstr "Archivio del Blog di una Sezione"
+
+#: administrator/components/com_sections/admin.sections.php:232
+msgid "Section Archive Blog"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:306
+msgid "Changes to Section saved"
+msgstr "Le modifiche alla Sezione sono state effettuate"
+
+#: administrator/components/com_sections/admin.sections.php:312
+msgid "Section saved"
+msgstr "Sezione salvata"
+
+#: administrator/components/com_sections/admin.sections.php:327
+msgid "Select a section to delete"
+msgstr "Seleziona una Sezione da cancellare"
+
+#: administrator/components/com_sections/admin.sections.php:365
+msgid "Sections(s): %s cannot be removed as they contain categories"
+msgstr ""
+"La Sezione (o le sezioni): %s non possono essere cancellate in quanto "
+"contengono categorie"
+
+#: administrator/components/com_sections/admin.sections.php:370
+msgid "Section(s): %s successfully deleted"
+msgstr "la Sezione (o le sezioni): %s sono state correttamente cancellate"
+
+#: administrator/components/com_sections/admin.sections.php:388
+msgid "Select a section to "
+msgstr "Seleziona una Sezione da"
+
+#: administrator/components/com_sections/admin.sections.php:396
+msgid "Cannot Publish an Empty Section"
+msgstr "Non si può pubblicare una Sezione vuota"
+
+#: administrator/components/com_sections/admin.sections.php:585
+msgid "Section %s and all its Categories and Items have been copied as %s"
+msgstr "La sezione %s e tutte le sue categorie sono state copiate in %s"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:35
+msgid "Browser, OS, Domain Statistics"
+msgstr "Browser, So, Statistiche Dominio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:41
+msgid "Browsers"
+msgstr "Browsers"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:45
+msgid "Browser"
+msgstr "Browser"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:84
+msgid "OS Stats"
+msgstr "Statistiche SO"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:88
+msgid "Operating System"
+msgstr "Sistema Operativo"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:127
+msgid "Domain Stats"
+msgstr "Statistiche Dominio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:131
+msgid "Domain"
+msgstr "Dominio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:182
+msgid "Page Impression Statistics"
+msgstr "Statistiche Impression per pagina"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:228
+msgid "Search Engine Text :"
+msgstr "Motore di ricerca testo :"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:229
+msgid "logging is :"
+msgstr "connesso :"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:240
+msgid "Times Requested"
+msgstr "Tempo richiesto"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:241
+msgid "Results Returned"
+msgstr "Risultati ritornati"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:28
+msgid "Syndication Settings"
+msgstr "Impostazioni syndication"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:51
+msgid "Manage Syndication Settings"
+msgstr "Amministra le impostazioni di Syndication"
+
+#: administrator/components/com_syndicate/admin.syndicate.php:95
+msgid "Settings successfully Saved"
+msgstr "Impostazioni salvate"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 0.3"
+msgstr "ATOM 0.3"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Activate support for Firefox Live Bookmarks functionality"
+msgstr "Attiva il supporto per la funzionalità di Live Bookmarks di Firefox"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Alt text for image"
+msgstr "Alt text per l'immagine"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Bookmark file"
+msgstr "Bookmark file"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache"
+msgstr "Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache Time"
+msgstr "Tempo di Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache file will refresh every x seconds"
+msgstr "Refresh del file della Cache ogni x secondi"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache the feed files"
+msgstr "Metti in cache i file del feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image Alt"
+msgstr "Alt testo dell'immagine"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image to be included in feed"
+msgstr "Immagine da inserire nel feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit Text"
+msgstr "Limite del testo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit the article text to the value indicated below"
+msgstr "Il limite del testo dell'articolo è indicato di seguito"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Live Bookmarks"
+msgstr "Live Bookmarks"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Number of Items to syndicate"
+msgstr "Numero di oggetti da condividere (syndicate)"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order that the items will be displayed"
+msgstr "L'ordine con cui vengono visualizzati"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 0.91"
+msgstr "RSS 0.91"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Special file name, if empty the default will be used."
+msgstr ""
+"Nome di file speciale, se lasciato vuoto sarà usato il nome di default "
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndicate"
+msgstr "Syndicate"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Description"
+msgstr "Descrizione della condivisione (Syndication)"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Title"
+msgstr "Titolo della condivisione (Sindication)"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Text Length"
+msgstr "Lunghezza del testo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "The word length of the article text - 0 will show no text"
+msgstr "La lunghezza del testo dell'articolo a 0 significa nessun testo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "This component controls the Syndication settings"
+msgstr "Questo componente amministra le impostazioni della condivisione"
+
+#: administrator/components/com_trash/admin.trash.html.php:61
+#: administrator/components/com_trash/admin.trash.html.php:65
+msgid "Content Items"
+msgstr "Oggetti contenuti"
+
+#: administrator/components/com_trash/admin.trash.html.php:230
+msgid "Delete Items"
+msgstr "Cancella oggetti"
+
+#: administrator/components/com_trash/admin.trash.html.php:239
+#: administrator/components/com_trash/admin.trash.html.php:304
+msgid "Number of Items:"
+msgstr "Numero di oggetti"
+
+#: administrator/components/com_trash/admin.trash.html.php:245
+msgid "Items being Deleted:"
+msgstr "Gli oggetti stanno per essere cancellati:"
+
+#: administrator/components/com_trash/admin.trash.html.php:256
+msgid ""
+"This will <strong><font color=\"#FF0000\">Permanently Delete</font></strong> "
+"<br />these Items from the Database"
+msgstr ""
+"Gli oggetti <strong><font color=\"#FF0000\">stanno per essere cancellati "
+"definitivamente</font></strong> <br />dal database"
+
+#: administrator/components/com_trash/admin.trash.html.php:259
+msgid ""
+"Are you sure you want to Deleted the listed items? \\nThis will Permanently "
+"Delete them from the database."
+msgstr ""
+"Sei sicuro di voler cancellare gli oggetti nella seguente lista? \\n Questi "
+"oggetti saranno cancellati definitivamente dal database."
+
+#: administrator/components/com_trash/admin.trash.html.php:295
+msgid "Restore Items"
+msgstr "Ripristina gli oggetti"
+
+#: administrator/components/com_trash/admin.trash.html.php:310
+msgid "Items being Restored:"
+msgstr "Gli oggetti stanno per essere ripristinati:"
+
+#: administrator/components/com_trash/admin.trash.html.php:321
+msgid ""
+"This will <strong><font color=\"#FF0000\">Restore</font></strong> these "
+"Items,<br />they will be returned to their orignial places as Unpublished "
+"items"
+msgstr ""
+"Gli oggetti stanno per essere  <strong><font color=\"#FF0000\">ripristinati</"
+"font></strong> ,<br />nella loro posizione originale"
+
+#: administrator/components/com_trash/admin.trash.html.php:324
+msgid "Are you sure you want to Restore the listed items?."
+msgstr "Sei sicuro di voler Ripristinare gli oggetti della lista?"
+
+#: administrator/components/com_trash/admin.trash.html.php:325
+#: administrator/components/com_trash/admin.trash.html.php:326
+#: administrator/components/com_trash/toolbar.trash.html.php:21
+msgid "Restore"
+msgstr "Ripristina"
+
+#: administrator/components/com_trash/admin.trash.php:182
+msgid "%s Item successfully Deleted"
+msgid_plural "%s Items successfully Deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/admin.trash.php:256
+msgid "%s Item successfully Restored"
+msgid_plural "%s Items successfully Restored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/trash.xml
+msgid "This component manages the Trash functionality."
+msgstr "Questo componente amministra le funzionalità del cestino."
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:81
+msgid "Links"
+msgstr "Links"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:177
+msgid "Edit Static Content"
+msgstr "Edita il Contenuto Statico"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:271
+msgid ""
+"Are you sure you want to reset the Hits to Zero? \\nAny unsaved changes to "
+"this content will be lost."
+msgstr ""
+"Sei sicuro di voler riportare a Zero gli Hits? \\nOgni cambiamento non "
+"salvato sarà perso"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:302
+msgid "Content item must have a name"
+msgstr "L'oggetto deve avere un nome"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:353
+msgid "Static Content Item:"
+msgstr "Ogetto Contenuto Statico"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:402
+msgid "Text: (required)"
+msgstr "Testo: (richiesto)"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:547
+msgid "New document"
+msgstr "Nuovo documento"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:555
+msgid "Not modified"
+msgstr "Non modificato"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:560
+msgid "Expires"
+msgstr "Scade"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:614
+msgid "Source"
+msgstr "Sorgente"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:622
+msgid "Align"
+msgstr "Alinea"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:630
+msgid "Alt Text"
+msgstr "Alt Text"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:638
+msgid "Border"
+msgstr "Bordo"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:736
+msgid "This will create a \"Link - Static Content\" in the menu you select"
+msgstr "Questo genera un \"Link - Al Contenuto Statico\" nel menu selezionato"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:155
+msgid "Ordering asc"
+msgstr "Ordinamento asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:156
+msgid "Ordering desc"
+msgstr "Ordinamento decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:157
+msgid "ID asc"
+msgstr "ID asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:158
+msgid "ID desc"
+msgstr "ID decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:159
+msgid "Title asc"
+msgstr "Titolo asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:160
+msgid "Title desc"
+msgstr "Titolo decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:161
+msgid "Date asc"
+msgstr "Data asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:162
+msgid "Date desc"
+msgstr "Data decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:163
+msgid "Author asc"
+msgstr "Autore asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:164
+msgid "Author desc"
+msgstr "Autore decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:165
+msgid "Published asc"
+msgstr "Pubblicazione asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:166
+msgid "Published desc"
+msgstr "Pubblicazione decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:167
+msgid "Access asc"
+msgstr "Accesso asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:168
+msgid "Access desc"
+msgstr "Accesso decr"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:202
+msgid "The module % is currently being edited by another administrator"
+msgstr "Il modulo % è attualmente editato da un'altro amministratore"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:356
+msgid "Typed Content Item saved"
+msgstr "Modifiche salvate"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:362
+msgid "Changes to Typed Content Item saved"
+msgstr "Modifiche dell'oggetto salvate "
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:473
+msgid "Successfully Reset Hit"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Typed Content Page"
+msgstr "Contenuto della pagina"
+
+#: components/com_user/user.html.php:22
+msgid "Welcome!"
+msgstr "Benvenuto!"
+
+#: components/com_user/user.html.php:27
+msgid "Welcome to the user section of our site"
+msgstr "Benvenuto alla sezione utente del nostro sito"
+
+#: components/com_user/user.html.php:61
+msgid "Edit Your Details"
+msgstr "Inserisci i tuoi dettagli"
+
+#: components/com_user/user.html.php:69
+msgid "e-mail:"
+msgstr "e-mail:"
+
+#: components/com_user/user.html.php:72
+msgid "User Name:"
+msgstr "Neme Utente:"
+
+#: components/com_user/user.html.php:99
+msgid "Submission Success!"
+msgstr "Invio riuscito!"
+
+#: components/com_user/user.html.php:103
+msgid ""
+"Your item has been submitted to the site administrators. It will be reviewed "
+"before being published on the site."
+msgstr ""
+"Il tuo contenuto è stato inviato all'amministratore del sito. Sarà  "
+"visionato prima di essere pubblicato."
+
+#: components/com_user/user.php:29
+msgid "Update"
+msgstr "Update"
+
+#: components/com_user/user.php:56
+msgid "You cannot upload files greater than 15kb in size."
+msgstr "Non puoi inviare files di dimensioni superiori ai 15 kb."
+
+#: components/com_user/user.php:59
+msgid "Image %s already exists. Please rename the file and try again."
+msgstr ""
+"L'immagine %s è già  presente. Prego rinominare il file e provare nuovamente."
+
+#: components/com_user/user.php:65
+msgid "Failed to copy %s"
+msgstr "La copia non è riuscita %s"
+
+#: components/com_user/user.php:87
+msgid "You may only upload a gif or jpg image."
+msgstr "Puoi solamente inviare immagini nel formato gif o jpg."
+
+#: components/com_user/user.php:129
+msgid "Passwords do not match"
+msgstr "La password non corrisponde"
+
+#: components/com_user/user.php:152
+msgid "Your settings have been saved."
+msgstr "I tuoi dati sono stati salvati."
+
+#: components/com_user/user.php:211
+msgid "Checked in %d item"
+msgstr "Controllato in %d elementi"
+
+#: components/com_user/user.php:222
+msgid "All items checked out have now been checked in"
+msgstr "Tutti gli elementi bloccati sono stati ripristinati"
+
+#: administrator/components/com_users/admin.users.html.php:57
+#: administrator/components/com_users/admin.users.php:157
+msgid "Logged In"
+msgstr "Loggato"
+
+#: administrator/components/com_users/admin.users.html.php:63
+msgid "UserID"
+msgstr "Utente ID"
+
+#: administrator/components/com_users/admin.users.html.php:66
+msgid "Group"
+msgstr "Gruppo"
+
+#: administrator/components/com_users/admin.users.html.php:69
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: administrator/components/com_users/admin.users.html.php:72
+msgid "Last Visit"
+msgstr "Ultima visita"
+
+#: administrator/components/com_users/admin.users.html.php:156
+msgid "You must provide a user login name."
+msgstr "Devi fornire il nome utente di login"
+
+#: administrator/components/com_users/admin.users.html.php:158
+msgid "Your login name contains invalid characters or is too short."
+msgstr "Il tuo nome di login contien caratteri non validi o è troppo breve."
+
+#: administrator/components/com_users/admin.users.html.php:160
+msgid "You must provide an email address."
+msgstr "Devi inserire un indirizzo email"
+
+#: administrator/components/com_users/admin.users.html.php:162
+msgid "You must assign user to a group."
+msgstr "Devi assegnare l’utente al gruppo"
+
+#: administrator/components/com_users/admin.users.html.php:164
+msgid "Passwords do not match."
+msgstr "La password non corrisponde"
+
+#: administrator/components/com_users/admin.users.html.php:166
+msgid ""
+"Please Select another group as `Public Frontend` is not a selectable option"
+msgstr ""
+"Prego seleziona un altro gruppo come ’Public Frontend’ non ’ una opzione "
+"selezionabile"
+
+#: administrator/components/com_users/admin.users.html.php:168
+msgid ""
+"Please Select another group as `Public Backend` is not a selectable option"
+msgstr ""
+"rego seleziona un altro gruppo come ’Public  Backend’ non ’ una opzione "
+"selezionabile"
+
+#: administrator/components/com_users/admin.users.html.php:196
+msgid "User Details"
+msgstr "Dettagli utente"
+
+#: administrator/components/com_users/admin.users.html.php:216
+msgid "Email:"
+msgstr "Email:"
+
+#: administrator/components/com_users/admin.users.html.php:224
+msgid "New Password:"
+msgstr "Nuova Password:"
+
+#: administrator/components/com_users/admin.users.html.php:251
+msgid "Block User"
+msgstr "Blocca utente"
+
+#: administrator/components/com_users/admin.users.html.php:263
+msgid "Receive Submission Emails"
+msgstr "Ricevi email di iscrizione"
+
+#: administrator/components/com_users/admin.users.html.php:275
+msgid "Register Date"
+msgstr "Data di registrazione"
+
+#: administrator/components/com_users/admin.users.html.php:283
+msgid "Last Visit Date"
+msgstr "Data ultima visita"
+
+#: administrator/components/com_users/admin.users.html.php:306
+#: administrator/components/com_users/admin.users.html.php:325
+msgid "Contact Information"
+msgstr "Informazioni contatti"
+
+#: administrator/components/com_users/admin.users.html.php:312
+msgid "No Contact details linked to this User:"
+msgstr "Nessun dettaglio del contatto è collegato a questo utente"
+
+#: administrator/components/com_users/admin.users.html.php:314
+msgid "See \"Components -> Contact -> Manage Contacts\" for details."
+msgstr "Vedi  \"Components -> Contact -> Manage Contacts\" per i dettagli."
+
+#: administrator/components/com_users/admin.users.html.php:391
+msgid "Change Contact Details"
+msgstr "Cambia dettagli del contatto"
+
+#: administrator/components/com_users/admin.users.html.php:394
+msgid "Components -> Contact -> Manage Contacts"
+msgstr "Components -> Contact -> Manage Contacts"
+
+#: administrator/components/com_users/admin.users.php:150
+msgid "- Select Group -"
+msgstr "- Seleziona un gruppo -"
+
+#: administrator/components/com_users/admin.users.php:156
+msgid "- Select Log Status - "
+msgstr "- Seleziona lo stato corrente - "
+
+#: administrator/components/com_users/admin.users.php:158
+msgid "Not Logged In"
+msgstr "Non hai fatto il login"
+
+#: administrator/components/com_users/admin.users.php:186
+msgid "Super Administrator"
+msgstr "Super Administrator"
+
+#: administrator/components/com_users/admin.users.php:296
+msgid "New User Details"
+msgstr "Dettagli nuovo utente"
+
+#: administrator/components/com_users/admin.users.php:297
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"You have been added as a user to %s by an Administrator.\n"
+"\n"
+"This email contains your username and password to log into the %s\n"
+"\n"
+"Username - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Hello %s,\n"
+"\n"
+"\n"
+"Se stato aggiunto come utente %s by an Administrator.\n"
+"\n"
+"Questa email contine il tuo nome utente e password per il login a %s\n"
+"\n"
+"Nome utente - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Siete pregati di non rispondere a questa email che è stata generata "
+"automaticamente solamente per informarvi"
+
+#: administrator/components/com_users/admin.users.php:326
+msgid "Successfully Saved changes to User: %s"
+msgstr "Modifiche salvate per l’utente: %s"
+
+#: administrator/components/com_users/admin.users.php:331
+msgid "Successfully Saved User: %s"
+msgstr "utente correttamente registrato: %s"
+
+#: administrator/components/com_users/admin.users.php:361
+msgid "You cannot delete a Super Administrator"
+msgstr "Non puoi cancellare un Super Administrator"
+
+#: administrator/components/com_users/admin.users.php:363
+msgid "You cannot delete Yourself!"
+msgstr "Non puoi cancellarti"
+
+#: administrator/components/com_users/admin.users.php:365
+msgid ""
+"You cannot delete another `Administrator` only `Super Administrators` have "
+"this power"
+msgstr ""
+"Non puoi cancellare un’Administrator solo un Super Administrator ha questa "
+"facoltà"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "block"
+msgstr "blocca"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "unblock"
+msgstr "sblocca"
+
+#: administrator/components/com_users/admin.users.php:413
+msgid "Please select a user"
+msgstr "Prego seleziona un utente"
+
+#: administrator/components/com_users/toolbar.users.html.php:49
+msgid "Force Logout"
+msgstr "Forza il logout"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:29
+msgid "Weblink Manager"
+msgstr "Weblink Manager"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:58
+msgid "Approved"
+msgstr "Approvato"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:98
+msgid "Edit Weblinks"
+msgstr "Scrivi Weblinks"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:176
+#: components/com_weblinks/weblinks.html.php:249
+msgid "Weblink item must have a title"
+msgstr "Il Weblink deve avere un titolo"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:178
+#: components/com_weblinks/weblinks.html.php:251
+msgid "You must select a category."
+msgstr "Devi selezionare una categoria"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:180
+#: components/com_weblinks/weblinks.html.php:253
+msgid "You must have a url."
+msgstr "Devi avere la url"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "Weblink:"
+msgstr "Weblink:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:225
+#: components/com_weblinks/weblinks.html.php:297
+msgid "URL:"
+msgstr "URL:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:250
+msgid "Approved:"
+msgstr "Approvato:"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:143
+#: components/com_weblinks/weblinks.php:183
+msgid "The module %s is currently being edited by another administrator."
+msgstr "Al momento un amministratore ha aperto il modulo %s"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon"
+msgstr "Icona"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon to be used to the left of the url links in Table view"
+msgstr "Icona usata sulla sinistra del link sulla vista Table"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Link Descriptions"
+msgstr "Descrizione Link"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr "Mostra/Nascondi il testo di Descrizione del Link"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Hits column"
+msgstr "Mostra/Nascondi la colonna degli Hits"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "This component shows a listing of Weblinks"
+msgstr "Questo componente mostra una lista di Weblinks"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Weblinks"
+msgstr "Weblinks"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target"
+msgstr "Target"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target window when the link is clicked"
+msgstr "Finestra Target quando si clicca sul link"
+
+#: components/com_weblinks/weblinks.class.php:70
+msgid "Please provide a valid URL"
+msgstr "Prego inserire una URL valida"
+
+#: components/com_weblinks/weblinks.class.php:76
+msgid "Your web link must be given a title."
+msgstr "Il tuo weblink deve avere un titolo"
+
+#: components/com_weblinks/weblinks.class.php:91
+msgid "There is already a web link that name, please try again."
+msgstr "Esiste già un link con lo stesso nome, prova nuovamente"
+
+#: components/com_weblinks/weblinks.html.php:109
+msgid "Web Link"
+msgstr "Web Link"
+
+#: components/com_weblinks/weblinks.html.php:264
+msgid "Submit A Web Link"
+msgstr "Invia un Web Link"
+
+#: components/com_weblinks/weblinks.php:98
+msgid ""
+"From the list below choose one of our web link categories, then select a URL "
+"to visit the site."
+msgstr ""
+"Dalla seguente lista seleziona una delle nostre categorie di link, poi "
+"seleziona la URL per visitare il sito."
+
+#: components/com_weblinks/weblinks.php:290
+msgid "User Submitted '%'"
+msgstr "User Submitted '%'"
+
+#: components/com_weblinks/weblinks.php:292
+msgid " for %s.\\n\\n\\n\\n"
+msgstr " for %s.\\n\\n\\n\\n"
+
+#: components/com_wrapper/wrapper.html.php:55
+msgid ""
+"This option will not work correctly.  Unfortunately, your browser does not "
+"support Inline Frames"
+msgstr ""
+"Questa opzione non lavora correttamente. Sfortunatamente, il tuo browser non "
+"gestisce i Frame Inline (iFrames)"
diff -ruN 4.5.4/language/glossary/pt_BR.utf-8.po 4.6rc2/language/glossary/pt_BR.utf-8.po
--- 4.5.4/language/glossary/pt_BR.utf-8.po	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/glossary/pt_BR.utf-8.po	2006-06-14 07:50:53.000000000 -0500
@@ -0,0 +1,8675 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Mambo 4.6 Brazilian Portuguese\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-31 20:49+0000\n"
+"PO-Revision-Date: 2006-03-17 22:42-0000\n"
+"Last-Translator: Carlos Souza <csouza@mamboprojects.com>\n"
+"Language-Team: No Ritmo do Mambo <webmaster@noritmodomambo.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: BRAZIL\n"
+
+#: components/com_wrapper/wrapper.html.php:55
+msgid ""
+"This option will not work correctly.  Unfortunately, your browser does not "
+"support Inline Frames"
+msgstr ""
+"Esta opção pode não funcionar corretamente. Infelizmente, seu navegador não "
+"suporta Frames Inline"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:29
+msgid "Weblink Manager"
+msgstr "Gerenciador de Links Web"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:32
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:52
+msgid "Title"
+msgstr "Título"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:55
+msgid "Published"
+msgstr "Publicado"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:58
+msgid "Approved"
+msgstr "Aprovado"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:61
+msgid "Reorder"
+msgstr "Reordenar"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:64
+msgid "Category"
+msgstr "Categoria"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:67
+#: administrator/components/com_weblinks/weblinks.xml
+#: components/com_weblinks/weblinks.html.php:115
+msgid "Hits"
+msgstr "Acessos"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:98
+msgid "Edit Weblinks"
+msgstr "Editar Links Web"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:131
+msgid "Edit Category"
+msgstr "Editar Categoria"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:176
+#: components/com_weblinks/weblinks.html.php:249
+msgid "Weblink item must have a title"
+msgstr "Links Web devem ter um Título"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:178
+#: components/com_weblinks/weblinks.html.php:251
+msgid "You must select a category."
+msgstr "Você deve selecionar uma categoria."
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:180
+#: components/com_weblinks/weblinks.html.php:253
+msgid "You must have a url."
+msgstr "Você deve informar uma URL."
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "Weblink:"
+msgstr "Link Web:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:192
+msgid "Edit"
+msgstr "Editar"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:192
+msgid "New"
+msgstr "Novo"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:204
+msgid "Details"
+msgstr "Detalhes"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:209
+#: components/com_weblinks/weblinks.html.php:281
+msgid "Name:"
+msgstr "Nome:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:217
+msgid "Category:"
+msgstr "Categoria:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:225
+#: components/com_weblinks/weblinks.html.php:297
+msgid "URL:"
+msgstr "URL:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:233
+#: components/com_weblinks/weblinks.html.php:305
+msgid "Description:"
+msgstr "Descrição:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:242
+msgid "Ordering:"
+msgstr "Ordem:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:250
+msgid "Approved:"
+msgstr "Aprovado:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:258
+msgid "Published:"
+msgstr "Publciado:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:270
+msgid "Parameters"
+msgstr "Parâmetros"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:17
+msgid "You are not authorized to view this resource."
+msgstr "Você não está autorizado a ver este recurso."
+
+#: administrator/components/com_weblinks/admin.weblinks.php:143
+#: components/com_weblinks/weblinks.php:183
+#, php-format
+msgid "The module %s is currently being edited by another administrator."
+msgstr "O módulo %s está sendo editada por outro administrador"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:223
+msgid "Select an item to delete"
+msgstr "Selecione um item para apagar."
+
+#: administrator/components/com_weblinks/admin.weblinks.php:249
+msgid "publish"
+msgstr "publicado"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:249
+msgid "unpublish"
+msgstr "não publicado"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:250
+#, php-format
+msgid "Select an item to %s"
+msgstr "Selecione um item para %s"
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_weblinks/toolbar.weblinks.html.php:27
+msgid "Close"
+msgstr "Fechar"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+"Uma pequena imagem que deve ser colocada à esquerda ou à direita de seu item "
+"de menu. As imagens devem estar em images/stories/"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+"Um sufixo de classe CSS que deve ser aplicado. Isso permite estilos "
+"individuais de páginas"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Alignment of the image"
+msgstr "Alinhamento da Imagem"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Back Button"
+msgstr "Botão Voltar"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Category List - Category"
+msgstr "Lista de Categorias - Lista"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Category List - Section"
+msgstr "Lista de Categorias - Seção"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Description"
+msgstr "Descrição"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Description Text"
+msgstr "Texto de Descrição"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr ""
+"Descrição para a página. Se deixada em branco, será usada a configuração "
+"_WEBLINKS_DESC existente em seu arquivo de idioma"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Hide"
+msgstr "Esconder"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon"
+msgstr "Ícone"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon to be used to the left of the url links in Table view"
+msgstr "Ícone para ser usado à esquerda da URL do link na visão de tabela"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Image"
+msgstr "Imagem"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Image Align"
+msgstr "Alinhamento de Imagem"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+"Imagem para página. Deve estar localizada na pasta images/stories/. Por "
+"padrão a imagem web_links.jpg será carregada. Caso não veja a imagem, isso "
+"indica que ela não foi localizada na pasta"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Left"
+msgstr "Esquerda"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Link Descriptions"
+msgstr "Descrições de Links"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Menu Image"
+msgstr "Imagem de Menu"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Page Class Suffix"
+msgstr "Sufixo de classe CSS"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Page Title"
+msgstr "Título da Página"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Right"
+msgstr "Direita"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show"
+msgstr "Mostrar"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr "Mostrar/Esconder um botão Voltar que retorna para a página anterior"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description below"
+msgstr "Mostrar/Esconder a descrição abaixo"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr "Mostrar/Esconder a o texto de descrição dos Links"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Hits column"
+msgstr "Mostrar/Esconder a coluna de acessos"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr ""
+"Mostrar/Esconder a lista de categorias na página de visualização em lista"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr ""
+"Mostrar/Esconder a lista de categorias na página de visualização em tabela"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Table Headings"
+msgstr "Mostrar/Esconder o cabeçalho de tabelas"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the pages Title"
+msgstr "Mostrar/Esconder o título de páginas"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Table Headings"
+msgstr "Cabeçalho de Tabelas"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+"Texto para ser mostrado no topo da página. Se deixado em branco, o nome do "
+"Menu será usado"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "This component shows a listing of Weblinks"
+msgstr "Este componente motra uma lista de links web"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Use Global"
+msgstr "Usar Global"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Weblinks"
+msgstr "Links Web"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "New Window With Browser Navigation"
+msgstr "Nova Janela com Botões de Navegação"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "New Window Without Browser Navigation"
+msgstr "Nova Janela sem Botões de Navegação"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Parent Window With Browser Navigation"
+msgstr "Mesma Janela com Botões de Navegação"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target"
+msgstr "Destino"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target window when the link is clicked"
+msgstr "Janela de Destino quando o link é clicado"
+
+#: components/com_weblinks/weblinks.class.php:70
+msgid "Please provide a valid URL"
+msgstr "Por favor informe uma URL válida"
+
+#: components/com_weblinks/weblinks.class.php:76
+msgid "Your web link must be given a title."
+msgstr "Seu Link Web deve ter um título."
+
+#: components/com_weblinks/weblinks.class.php:91
+msgid "There is already a web link that name, please try again."
+msgstr "Já existe um link web com este note. Por favor tente novamente."
+
+#: components/com_weblinks/weblinks.html.php:41
+#: components/com_weblinks/weblinks.php:17
+msgid "Web Links"
+msgstr "Links Web"
+
+#: components/com_weblinks/weblinks.html.php:109
+msgid "Web Link"
+msgstr "Link Web"
+
+#: components/com_weblinks/weblinks.html.php:264
+msgid "Submit A Web Link"
+msgstr "Enviar um Link Web"
+
+#: components/com_weblinks/weblinks.html.php:289
+msgid "Section:"
+msgstr "Seção:"
+
+#: components/com_weblinks/weblinks.php:98
+msgid ""
+"From the list below choose one of our web link categories, then select a URL "
+"to visit the site."
+msgstr ""
+"Da lista abaixo escolha uma das categorias e depois a URL que deseja "
+"conhecer."
+
+#: components/com_weblinks/weblinks.php:278
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+"Obrigado pelo envio. Sua sugestão será analisada e depois postada no site."
+
+#: components/com_weblinks/weblinks.php:290
+msgid "User Submitted '%'"
+msgstr "Usuário enviou '%'"
+
+#: components/com_weblinks/weblinks.php:291
+#, php-format
+msgid ""
+"Hello %s,\\n\\n\\nA user submitted %s:\\n [ %s ]\\n has been just been "
+"submitted by user:\\n [ %s ]\\n"
+msgstr ""
+"Olá %s,\\n\\n\\nUm usuário enviou %s:\\n [ %s ]\\n foi enviado pelo usuário:"
+"\\n [ %s ]\\n"
+
+#: components/com_weblinks/weblinks.php:292
+#, php-format
+msgid " for %s.\\n\\n\\n\\n"
+msgstr " para %s.\\n\\n\\n\\n"
+
+#: components/com_weblinks/weblinks.php:293
+#, php-format
+msgid "Please go to %s/administrator to view and approve this %s.\\n\\n"
+msgstr "Por favor vá em %s/administrator para ver e aprovar este %s.\\n\\n"
+
+#: components/com_weblinks/weblinks.php:294
+msgid ""
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only\\n"
+msgstr ""
+"Por favor não responda esta mensagem. Ela foi gerada automaticamente e "
+"possui somente caráter informativo\\n"
+
+#: administrator/components/com_users/admin.users.html.php:28
+msgid "User Manager"
+msgstr "Gerenciador de Usuários"
+
+#: administrator/components/com_users/admin.users.html.php:54
+msgid "Name"
+msgstr "Nome"
+
+#: administrator/components/com_users/admin.users.html.php:57
+#: administrator/components/com_users/admin.users.php:157
+msgid "Logged In"
+msgstr "Autenticado"
+
+#: administrator/components/com_users/admin.users.html.php:60
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: administrator/components/com_users/admin.users.html.php:63
+msgid "UserID"
+msgstr "ID de Usuário"
+
+#: administrator/components/com_users/admin.users.html.php:66
+msgid "Group"
+msgstr "Grupo"
+
+#: administrator/components/com_users/admin.users.html.php:69
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: administrator/components/com_users/admin.users.html.php:72
+msgid "Last Visit"
+msgstr "Última Visita"
+
+#: administrator/components/com_users/admin.users.html.php:154
+msgid "You must provide a name."
+msgstr "Você deve informar um nome."
+
+#: administrator/components/com_users/admin.users.html.php:156
+msgid "You must provide a user login name."
+msgstr "Você deve informar um nome de login."
+
+#: administrator/components/com_users/admin.users.html.php:158
+msgid "Your login name contains invalid characters or is too short."
+msgstr "Seu nome de login contém caracteres inválidos ou é muito curto."
+
+#: administrator/components/com_users/admin.users.html.php:160
+msgid "You must provide an email address."
+msgstr "Você deve informar um endereço de e-mail."
+
+#: administrator/components/com_users/admin.users.html.php:162
+msgid "You must assign user to a group."
+msgstr "Você deve atrelar o usuário à um grupo."
+
+#: administrator/components/com_users/admin.users.html.php:164
+msgid "Passwords do not match."
+msgstr "Senhas não coincidem."
+
+#: administrator/components/com_users/admin.users.html.php:166
+msgid ""
+"Please Select another group as `Public Frontend` is not a selectable option"
+msgstr ""
+"Por favor selecione outro grupo como `Public Frontend`. Esta não é uma opção "
+"selecionável"
+
+#: administrator/components/com_users/admin.users.html.php:168
+msgid ""
+"Please Select another group as `Public Backend` is not a selectable option"
+msgstr ""
+"Por favor selecione outro grupo como `Public Backend`. Esta não é uma opção "
+"selecionável"
+
+#: administrator/components/com_users/admin.users.html.php:185
+msgid "Add"
+msgstr "Adicionar"
+
+#: administrator/components/com_users/admin.users.html.php:185
+msgid "User:"
+msgstr "Usuário:"
+
+#: administrator/components/com_users/admin.users.html.php:196
+msgid "User Details"
+msgstr "Detalhes do Usuário"
+
+#: administrator/components/com_users/admin.users.html.php:209
+msgid "Username:"
+msgstr "Nome de Usuário:"
+
+#: administrator/components/com_users/admin.users.html.php:216
+msgid "Email:"
+msgstr "E-mail:"
+
+#: administrator/components/com_users/admin.users.html.php:224
+msgid "New Password:"
+msgstr "Nova Senha:"
+
+#: administrator/components/com_users/admin.users.html.php:232
+msgid "Verify Password:"
+msgstr "Verificar Senha:"
+
+#: administrator/components/com_users/admin.users.html.php:240
+msgid "Group:"
+msgstr "Grupo:"
+
+#: administrator/components/com_users/admin.users.html.php:251
+msgid "Block User"
+msgstr "Bloquear Usuário"
+
+#: administrator/components/com_users/admin.users.html.php:263
+msgid "Receive Submission Emails"
+msgstr "Receber E-mails Submetidos"
+
+#: administrator/components/com_users/admin.users.html.php:275
+msgid "Register Date"
+msgstr "Data de Registro"
+
+#: administrator/components/com_users/admin.users.html.php:283
+msgid "Last Visit Date"
+msgstr "Data de Última Visita"
+
+#: administrator/components/com_users/admin.users.html.php:306
+#: administrator/components/com_users/admin.users.html.php:325
+msgid "Contact Information"
+msgstr "Informação de Contato"
+
+#: administrator/components/com_users/admin.users.html.php:312
+msgid "No Contact details linked to this User:"
+msgstr "Nenhum detalhe de contato atrelado para este usuário:"
+
+#: administrator/components/com_users/admin.users.html.php:314
+msgid "See \"Components -> Contact -> Manage Contacts\" for details."
+msgstr "Veja \"Componentes -> Contato -> Gerenciar Contatos\" para detalhes."
+
+#: administrator/components/com_users/admin.users.html.php:340
+msgid "Position:"
+msgstr "Posição:"
+
+#: administrator/components/com_users/admin.users.html.php:350
+msgid "Telephone:"
+msgstr "Telefone:"
+
+#: administrator/components/com_users/admin.users.html.php:360
+msgid "Fax:"
+msgstr "Fax:"
+
+#: administrator/components/com_users/admin.users.html.php:382
+msgid "Contact"
+msgstr "Contato"
+
+#: administrator/components/com_users/admin.users.html.php:391
+msgid "Change Contact Details"
+msgstr "Alterar Detalhes de Contato"
+
+#: administrator/components/com_users/admin.users.html.php:394
+msgid "Components -> Contact -> Manage Contacts"
+msgstr "Componentes -> Contato -> Gerenciar Contatos"
+
+#: administrator/components/com_users/admin.users.php:150
+msgid "- Select Group -"
+msgstr "- Selecionar Grupo - "
+
+#. get list of Log Status for dropdown filter
+#: administrator/components/com_users/admin.users.php:156
+msgid "- Select Log Status - "
+msgstr "- Selecione Status de Log -"
+
+#: administrator/components/com_users/admin.users.php:158
+msgid "Not Logged In"
+msgstr "Não Está Autenticado"
+
+#: administrator/components/com_users/admin.users.php:186
+msgid "Super Administrator"
+msgstr "Super Administrador"
+
+#: administrator/components/com_users/admin.users.php:188
+msgid "Administrator"
+msgstr "Administrador"
+
+#: administrator/components/com_users/admin.users.php:296
+msgid "New User Details"
+msgstr "Detalhes de Novo Usuário"
+
+#: administrator/components/com_users/admin.users.php:297
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"You have been added as a user to %s by an Administrator.\n"
+"\n"
+"This email contains your username and password to log into the %s\n"
+"\n"
+"Username - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Olá %s,\n"
+"\n"
+"\n"
+"Você foi adicionado como usuário em %s por um Administrador.\n"
+"\n"
+"Este e-mail contém seu nome de usuário e senha para autenticação no %s\n"
+"\n"
+"Nome de Usuário - %s\n"
+"Senha - %s\n"
+"\n"
+"\n"
+"Por favor não responda esta mensagem. Ela foi gerada automaticamente somente "
+"com caráter informativo."
+
+#: administrator/components/com_users/admin.users.php:326
+#, php-format
+msgid "Successfully Saved changes to User: %s"
+msgstr "Alterações Salvas com Sucesso para o Usuário: %s"
+
+#: administrator/components/com_users/admin.users.php:331
+#, php-format
+msgid "Successfully Saved User: %s"
+msgstr "Usuário Salvo com Sucesso: %s"
+
+#: administrator/components/com_users/admin.users.php:361
+msgid "You cannot delete a Super Administrator"
+msgstr "Você não pode apagar um `Super Administrador`"
+
+#: administrator/components/com_users/admin.users.php:363
+msgid "You cannot delete Yourself!"
+msgstr "Você não pode se Apagar!"
+
+#: administrator/components/com_users/admin.users.php:365
+msgid ""
+"You cannot delete another `Administrator` only `Super Administrators` have "
+"this power"
+msgstr ""
+"Você não pode apagar outro `Administrador`. Somente `Super "
+"Administradores`tem este poder"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "block"
+msgstr "bloquear"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "unblock"
+msgstr "desbloquear"
+
+#: administrator/components/com_users/admin.users.php:413
+msgid "Please select a user"
+msgstr "Por favor selecione um usuário"
+
+#: administrator/components/com_users/toolbar.users.html.php:49
+msgid "Force Logout"
+msgstr "Forçar Logout"
+
+#: components/com_user/user.html.php:22
+msgid "Welcome!"
+msgstr "Bem-vindo!"
+
+#: components/com_user/user.html.php:27
+msgid "Welcome to the user section of our site"
+msgstr "Bem-vindo a seção de usuários de nosso site"
+
+#: components/com_user/user.html.php:43
+msgid "Please enter your name."
+msgstr "Por favor, digite seu nome."
+
+#: components/com_user/user.html.php:45
+msgid "Please enter a user name."
+msgstr "Por favor, digite um nome de usuário."
+
+#: components/com_user/user.html.php:47 components/com_user/user.html.php:53
+#, php-format
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+"Por favor, digite um %s válido. Sem espaços, mais que %d caracteres e "
+"contendo somente caracteres entre 0-9,a-z, or A-Z"
+
+#: components/com_user/user.html.php:49
+msgid "Please enter a valid e-mail address."
+msgstr "Por favor, digite um endereço de e-mail válido."
+
+#: components/com_user/user.html.php:51
+msgid "Password and verification do not match, please try again."
+msgstr "Senha e sua verificação não coincidem. Por favor, tente novamente."
+
+#: components/com_user/user.html.php:53 components/com_user/user.html.php:76
+msgid "Password:"
+msgstr "Senha:"
+
+#: components/com_user/user.html.php:61
+msgid "Edit Your Details"
+msgstr "Edite Seus Detalhes"
+
+#: components/com_user/user.html.php:65
+msgid "Your Name:"
+msgstr "Seu Nome:"
+
+#: components/com_user/user.html.php:69
+msgid "e-mail:"
+msgstr "E-mail:"
+
+#: components/com_user/user.html.php:72
+msgid "User Name:"
+msgstr "Nome de Usuário:"
+
+#: components/com_user/user.html.php:99
+msgid "Submission Success!"
+msgstr "Envio com Sucesso!"
+
+#: components/com_user/user.html.php:103
+msgid ""
+"Your item has been submitted to the site administrators. It will be reviewed "
+"before being published on the site."
+msgstr ""
+"Seu item foi submetido para os administradores do site. Eles irão revisar "
+"antes de publicar no site."
+
+#: components/com_user/user.php:29
+msgid "Update"
+msgstr "Atualizar"
+
+#: components/com_user/user.php:56
+msgid "You cannot upload files greater than 15kb in size."
+msgstr "Você não pode enviar arquivos maiores que 15kb."
+
+#: components/com_user/user.php:59
+#, php-format
+msgid "Image %s already exists. Please rename the file and try again."
+msgstr "Imagem %s já existe. Por favor renomeie o arquivo e tente novamente."
+
+#: components/com_user/user.php:65
+#, php-format
+msgid "Failed to copy %s"
+msgstr "Falha na cópia de %s"
+
+#: components/com_user/user.php:87
+msgid "You may only upload a gif or jpg image."
+msgstr "Você somente pode enviar imagens gif ou jpg."
+
+#: components/com_user/user.php:129
+msgid "Passwords do not match"
+msgstr "Senhas não coincidem"
+
+#: components/com_user/user.php:152
+msgid "Your settings have been saved."
+msgstr "Sua configurações foram salvas."
+
+#: components/com_user/user.php:208
+msgid "Checking table"
+msgstr "Verificando tabela"
+
+#: components/com_user/user.php:211
+#, php-format
+msgid "Checked in %d item"
+msgid_plural "Checked in %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_user/user.php:222
+msgid "All items checked out have now been checked in"
+msgstr "Todos os itens verificados estão livres agora"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:34
+msgid "Static Content Manager"
+msgstr "Gerenciador de Conteúdo Estático"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:69
+msgid "Order"
+msgstr "Ordem"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:72
+msgid "Save Order"
+msgstr "Salvar Ordem"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:75
+msgid "Access"
+msgstr "Acesso"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:78
+msgid "ID"
+msgstr "ID"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:81
+msgid "Links"
+msgstr "Links"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:84
+msgid "Author"
+msgstr "Autor"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:87
+msgid "Date"
+msgstr "Data"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:104
+msgid "Expired"
+msgstr "Expira"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:107
+msgid "Unpublished"
+msgstr "Não Publicado"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:112
+msgid "Always"
+msgstr "Sempre"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:112
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:114
+msgid "Start:"
+msgstr "Inicia:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:119
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:121
+msgid "Finish:"
+msgstr "Finaliza:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:119
+msgid "No Expiry"
+msgstr "Não Expira"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:149
+msgid "Edit User"
+msgstr "Editar Usuário"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:177
+msgid "Edit Static Content"
+msgstr "Editar Conteúdo Estático"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:193
+msgid "Publish Information"
+msgstr "Informação de Publicação"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:271
+msgid ""
+"Are you sure you want to reset the Hits to Zero? \\nAny unsaved changes to "
+"this content will be lost."
+msgstr ""
+"Você tem certeza que deseja zerar os cliques? \\nQualquer alteração não "
+"salva para este conteúdo pode ser perdida."
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:281
+msgid "Please select a Menu"
+msgstr "Por favor selecione um menu"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:284
+msgid "Please enter a Name for this menu item"
+msgstr "Por favor, digite um nome para este item de menu"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:300
+msgid "Content item must have a title"
+msgstr "Conteúdo deve ter um Título"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:302
+msgid "Content item must have a name"
+msgstr "Conteúdo deve ter um Nome"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:353
+msgid "Static Content Item:"
+msgstr "Item de Conteúdo Estático:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:364
+msgid "Show Advanced Details"
+msgstr "Mostrar Detalhes Avançados"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:367
+msgid "Hide Advanced Details"
+msgstr "Esconder Detalhes Avançados"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:381
+msgid "Item Details"
+msgstr "Detalhes do Item"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:386
+msgid "Title:"
+msgstr "Título:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:394
+msgid "Title Alias:"
+msgstr "Apelido do Título:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:402
+msgid "Text: (required)"
+msgstr "Texto (obrigatório)"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:423
+msgid "Publishing"
+msgstr "Publicação"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:428
+msgid "Publishing Info"
+msgstr "Infos de Publicação"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:433
+msgid "State:"
+msgstr "Estado:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:449
+msgid "Access Level:"
+msgstr "Nível de Acesso:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:457
+msgid "Author Alias:"
+msgstr "Apelido do Autor:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:465
+msgid "Change Creator:"
+msgstr "Alterar Criador:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:473
+msgid "Override Created Date"
+msgstr "Sobrescrever Data de Criação"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:482
+msgid "Start Publishing:"
+msgstr "Iniciar Publicação:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:491
+msgid "Finish Publishing:"
+msgstr "Finalizar Publicação:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:520
+msgid "Archived"
+msgstr "Arquivado"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:520
+msgid "Draft Unpublished"
+msgstr "Rascunho Não Publicado"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:536
+msgid "Version"
+msgstr "Versão"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:544
+msgid "Created"
+msgstr "Criado"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:547
+msgid "New document"
+msgstr "Novo Documento"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:552
+msgid "Last Modified"
+msgstr "Última Modificação"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:555
+msgid "Not modified"
+msgstr "Não Modificado"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:560
+msgid "Expires"
+msgstr "Expira"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:569
+msgid "Images"
+msgstr "Imagens"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:574
+msgid "MOSImage Control"
+msgstr "Controle de MOSImage"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:579
+msgid "Sub-folder:"
+msgstr "Sub-pasta:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:584
+msgid "Gallery Images"
+msgstr "Galeria de Imagens"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:596
+msgid "Content Images:"
+msgstr "Imagens de Conteúdo:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:610
+msgid "Edit the image selected:"
+msgstr "Editar a imagem selecionada:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:614
+msgid "Source"
+msgstr "Fonte"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:622
+msgid "Align"
+msgstr "Alinhamento"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:630
+msgid "Alt Text"
+msgstr "Texto Alt"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:638
+msgid "Border"
+msgstr "Borda"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:646
+msgid "Caption:"
+msgstr "Cabeçalho:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:654
+msgid "Caption Position:"
+msgstr "Posição do Cabeçalho:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:662
+msgid "Caption Align:"
+msgstr "Alinhamento do Cabeçalho:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:670
+msgid "Width:"
+msgstr "Largura:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:692
+msgid "Parameter Control"
+msgstr "Controle de Parâmetros"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:703
+msgid "Meta Info"
+msgstr "Infos Meta"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:708
+msgid "Meta Data"
+msgstr "Dados Meta"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:719
+msgid "Keywords:"
+msgstr "Palavras-Chave:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:726
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:731
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:760
+msgid "Link to Menu"
+msgstr "Link para Menu"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:736
+msgid "This will create a \"Link - Static Content\" in the menu you select"
+msgstr "Isto irá criar um \"Conteúdo Estático - Link\" no menu selecionado"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:742
+msgid "Select a Menu"
+msgstr "Selecione um Menu"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:750
+msgid "Menu Item Name"
+msgstr "Nome do Item de Menu"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:765
+msgid "Existing Menu Links"
+msgstr "Links de Menu Existentes"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:773
+msgid "None"
+msgstr "Nenhum"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:155
+msgid "Ordering asc"
+msgstr "Ordenamento Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:156
+msgid "Ordering desc"
+msgstr "Ordenamento Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:157
+msgid "ID asc"
+msgstr "ID Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:158
+msgid "ID desc"
+msgstr "ID Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:159
+msgid "Title asc"
+msgstr "Título Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:160
+msgid "Title desc"
+msgstr "Título Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:161
+msgid "Date asc"
+msgstr "Data Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:162
+msgid "Date desc"
+msgstr "Data Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:163
+msgid "Author asc"
+msgstr "Autor Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:164
+msgid "Author desc"
+msgstr "Autor Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:165
+msgid "Published asc"
+msgstr "Publicado Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:166
+msgid "Published desc"
+msgstr "Publicado Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:167
+msgid "Access asc"
+msgstr "Acesso Asc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:168
+msgid "Access desc"
+msgstr "Acesso Desc"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:180
+msgid "- All Authors -"
+msgstr "- Todos os Autores -"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:202
+msgid "The module % is currently being edited by another administrator"
+msgstr "O módulo %s está sendo editado atualmente por outro administrador"
+
+#. build the select list for the image caption position
+#: administrator/components/com_typedcontent/admin.typedcontent.php:277
+msgid "Bottom"
+msgstr "Rodapé"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:278
+msgid "Top"
+msgstr "Topo"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:356
+msgid "Typed Content Item saved"
+msgstr "Item de Tipo de Conteúdo Salvo"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:362
+msgid "Changes to Typed Content Item saved"
+msgstr "Alterações de Item de Tipo de Conteúdo Salvas"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:393
+#, php-format
+msgid "%d Item sent to the Trash"
+msgid_plural "%d Items sent to the Trash"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:409
+msgid "archive"
+msgstr "Arquivar"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:432
+#, php-format
+msgid "%d Item successfully Published"
+msgid_plural "%d Items successfully Published"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:434
+#, php-format
+msgid "%d Item successfully Unpublished"
+msgid_plural "%d Items successfully Unpublished"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:473
+msgid "Successfully Reset Hit"
+msgstr "Acessos reiniciados com sucesso"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:516
+#, php-format
+msgid "%s (Link - Static Content) in menu: %s successfully created"
+msgstr "%s (Conteúdo Estático - Link) no menu: %s criado com sucesso"
+
+#. foreach
+#: administrator/components/com_typedcontent/admin.typedcontent.php:582
+msgid "New ordering saved"
+msgstr "Nova Ordem Salva"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Author Names"
+msgstr "Nomes de Autores"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Created Date and Time"
+msgstr "Data e Hora de Criação"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Email Icon"
+msgstr "Ícone de E-mail"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Item Rating"
+msgstr "Classificação de Item"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Modified Date and Time"
+msgstr "Data e Hora de Modificação"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "PDF Icon"
+msgstr "Ícone de PDF"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Print Icon"
+msgstr "Ícone de Impressão"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr "Mostrar/Esconder o autor do item - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr "Mostrar/Esconder a data de criação - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr "Mostrar/Esconder o botão de e-mail - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr "Mostrar/Esconder a data de modificação - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr "Mostrar/Esconder o botão de PDF - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr "Mostrar/Esconder o botão de impressão - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr "Mostrar/Esconder a classificação do item - somente afeta esta página"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "This shows a single content page"
+msgstr "Isto mostra uma página de conteúdo único"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Typed Content Page"
+msgstr "Página de Conteúdo"
+
+#: administrator/components/com_trash/admin.trash.html.php:55
+msgid "Trash Manager"
+msgstr "Lixeira"
+
+#: administrator/components/com_trash/admin.trash.html.php:61
+#: administrator/components/com_trash/admin.trash.html.php:65
+msgid "Content Items"
+msgstr "Itens de Conteúdo"
+
+#: administrator/components/com_trash/admin.trash.html.php:80
+msgid "Section"
+msgstr "Seção"
+
+#: administrator/components/com_trash/admin.trash.html.php:138
+#: administrator/components/com_trash/admin.trash.html.php:142
+msgid "Menu Items"
+msgstr "Itens de Menu"
+
+#: administrator/components/com_trash/admin.trash.html.php:157
+msgid "Menu"
+msgstr "Menu"
+
+#: administrator/components/com_trash/admin.trash.html.php:160
+msgid "Type"
+msgstr "Tipo"
+
+#: administrator/components/com_trash/admin.trash.html.php:230
+msgid "Delete Items"
+msgstr "Itens Apagados"
+
+#: administrator/components/com_trash/admin.trash.html.php:239
+#: administrator/components/com_trash/admin.trash.html.php:304
+msgid "Number of Items:"
+msgstr "Número de Itens:"
+
+#: administrator/components/com_trash/admin.trash.html.php:245
+msgid "Items being Deleted:"
+msgstr "Itens Removidos:"
+
+#: administrator/components/com_trash/admin.trash.html.php:256
+msgid ""
+"This will <strong><font color=\"#FF0000\">Permanently Delete</font></strong> "
+"<br />these Items from the Database"
+msgstr ""
+"Isto pode <strong><font color=\"#FF0000\">Apagar Permanentemente</font></"
+"strong> <br />estes itens da base de dados"
+
+#: administrator/components/com_trash/admin.trash.html.php:259
+msgid ""
+"Are you sure you want to Deleted the listed items? \\nThis will Permanently "
+"Delete them from the database."
+msgstr ""
+"Você tem certeza que deseja apagar os itens listados? \\nIsto irá Apagá-los "
+"Permanentemente da base de dados."
+
+#: administrator/components/com_trash/admin.trash.html.php:260
+#: administrator/components/com_trash/admin.trash.html.php:261
+#: administrator/components/com_trash/toolbar.trash.html.php:23
+msgid "Delete"
+msgstr "Apaado"
+
+#: administrator/components/com_trash/admin.trash.html.php:295
+msgid "Restore Items"
+msgstr "Itens Restaurados"
+
+#: administrator/components/com_trash/admin.trash.html.php:310
+msgid "Items being Restored:"
+msgstr "Itens para Restaurar:"
+
+#: administrator/components/com_trash/admin.trash.html.php:321
+msgid ""
+"This will <strong><font color=\"#FF0000\">Restore</font></strong> these "
+"Items,<br />they will be returned to their orignial places as Unpublished "
+"items"
+msgstr ""
+"Isto irá <strong><font color=\"#FF0000\">Restaurar</font></strong> estes "
+"itens,<br />que irão retornar para seus locais originais como itens não "
+"publicados"
+
+#: administrator/components/com_trash/admin.trash.html.php:324
+msgid "Are you sure you want to Restore the listed items?."
+msgstr "Você tem certeza que deseja restaurar estes itens?"
+
+#: administrator/components/com_trash/admin.trash.html.php:325
+#: administrator/components/com_trash/admin.trash.html.php:326
+#: administrator/components/com_trash/toolbar.trash.html.php:21
+msgid "Restore"
+msgstr "Restaurar"
+
+#: administrator/components/com_trash/admin.trash.php:182
+#, php-format
+msgid "%s Item successfully Deleted"
+msgid_plural "%s Items successfully Deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/admin.trash.php:256
+#, php-format
+msgid "%s Item successfully Restored"
+msgid_plural "%s Items successfully Restored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/trash.xml
+msgid "This component manages the Trash functionality."
+msgstr "Este componente gerencia a funcionalidade de lixeira."
+
+#: administrator/components/com_trash/trash.xml
+msgid "Trash"
+msgstr "Lixeira"
+
+#: administrator/components/com_templates/admin.templates.html.php:42
+msgid "No preview available"
+msgstr "Sem pré-visualização disponível"
+
+#: administrator/components/com_templates/admin.templates.html.php:55
+msgid "Site"
+msgstr "Site"
+
+#: administrator/components/com_templates/admin.templates.html.php:55
+msgid "Template Manager"
+msgstr "Gerenciador de Templates"
+
+#: administrator/components/com_templates/admin.templates.html.php:58
+msgid "Preview Template"
+msgstr "Pré-visualização de Template"
+
+#: administrator/components/com_templates/admin.templates.html.php:76
+#: administrator/components/com_templates/admin.templates.html.php:82
+#: administrator/components/com_templates/admin.templates.html.php:153
+#: administrator/components/com_templates/toolbar.templates.html.php:22
+msgid "Default"
+msgstr "Padrão"
+
+#: administrator/components/com_templates/admin.templates.html.php:85
+#: administrator/components/com_templates/admin.templates.html.php:166
+msgid "Assigned"
+msgstr "Atrelada"
+
+#: administrator/components/com_templates/admin.templates.html.php:100
+msgid "Author URL"
+msgstr "URl do Autor"
+
+#: administrator/components/com_templates/admin.templates.html.php:223
+msgid "Template HTML Editor"
+msgstr "Editor HTML de Template"
+
+#: administrator/components/com_templates/admin.templates.html.php:226
+#: administrator/components/com_templates/admin.templates.html.php:280
+msgid "Unwriteable"
+msgstr "Somente Leitura"
+
+#: administrator/components/com_templates/admin.templates.html.php:226
+#: administrator/components/com_templates/admin.templates.html.php:280
+msgid "Writeable"
+msgstr "Escrita"
+
+#: administrator/components/com_templates/admin.templates.html.php:235
+#: administrator/components/com_templates/admin.templates.html.php:289
+msgid "Make unwriteable after saving"
+msgstr "Configure como somente leitura depois de salvar"
+
+#: administrator/components/com_templates/admin.templates.html.php:242
+#: administrator/components/com_templates/admin.templates.html.php:296
+msgid "Override write protection while saving"
+msgstr "Sobrescreva proteção de escrita quando salvar"
+
+#: administrator/components/com_templates/admin.templates.html.php:277
+msgid "Template CSS Editor"
+msgstr "Editor CSS de Template"
+
+#: administrator/components/com_templates/admin.templates.html.php:328
+#, php-format
+msgid "Assign template %s to menu items"
+msgstr "Atrelar template %s para os itens de menu"
+
+#: administrator/components/com_templates/admin.templates.html.php:333
+msgid "Page(s):"
+msgstr "Página(s):"
+
+#: administrator/components/com_templates/admin.templates.html.php:361
+msgid "Module Positions"
+msgstr "Posição de Módulos"
+
+#: administrator/components/com_templates/admin.templates.html.php:375
+msgid "Position"
+msgstr "Posição"
+
+#: administrator/components/com_templates/admin.templates.php:229
+msgid "You can not delete template in use."
+msgstr "Você não pode recomer uma template em uso."
+
+#: administrator/components/com_templates/admin.templates.php:256
+#: administrator/components/com_templates/admin.templates.php:321
+#, php-format
+msgid "Operation Failed: Could not open %s"
+msgstr "Operação Falhou: Não é possível abrir %s"
+
+#: administrator/components/com_templates/admin.templates.php:268
+#: administrator/components/com_templates/admin.templates.php:332
+msgid "Operation failed: No template specified."
+msgstr "Operação Falhou: Nenhuma template informada."
+
+#: administrator/components/com_templates/admin.templates.php:271
+#: administrator/components/com_templates/admin.templates.php:336
+msgid "Operation failed: Content empty."
+msgstr "Operação Falhou: Conteúdo vazio."
+
+#: administrator/components/com_templates/admin.templates.php:286
+#, php-format
+msgid "Operation failed: %s is not writable."
+msgstr "Operação Falhou: %s não permite escrita."
+
+#: administrator/components/com_templates/admin.templates.php:301
+#: administrator/components/com_templates/admin.templates.php:366
+msgid "Operation failed: Failed to open file for writing."
+msgstr "Operação Falhou: Falha em abrir o arquivo para escrita."
+
+#: administrator/components/com_templates/admin.templates.php:351
+msgid "Operation failed: The file is not writable."
+msgstr "Operação Falhou: O arquivo não permite escrita."
+
+#: administrator/components/com_templates/admin.templates.php:448
+msgid "Positions saved"
+msgstr "Posições salvas"
+
+#: administrator/components/com_templates/toolbar.templates.html.php:69
+msgid "Save"
+msgstr "Salvar"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:28
+msgid "Syndication Settings"
+msgstr "Configurações da Sindicalização"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:51
+msgid "Manage Syndication Settings"
+msgstr "Gerenciar Configurações da Sindicalização"
+
+#: administrator/components/com_syndicate/admin.syndicate.php:95
+msgid "Settings successfully Saved"
+msgstr "Configurações salvas com sucesso"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "# Items"
+msgstr "# Itens"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 0.3"
+msgstr "ATOM 0.3"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Activate support for Firefox Live Bookmarks functionality"
+msgstr "Ativar suporte para funcionalidade de Live Bookmarks do Firefox"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Alt text for image"
+msgstr "Texto ALT para imagem"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Author Alphabetical"
+msgstr "Autor em ordem alfabética"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Author Reverse-Alphabetical"
+msgstr "Autor em ordem alfabética reversa"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Bookmark file"
+msgstr "Arquivo de Favoritos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache"
+msgstr "Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache Time"
+msgstr "Tempo de Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache file will refresh every x seconds"
+msgstr "Recarregar arquivo do cache a casa X segundos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache the feed files"
+msgstr "Fazer cache dos arquivos de feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Frontpage Ordering"
+msgstr "Ordem na Página Principal"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image Alt"
+msgstr "ALT da Imagem"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image to be included in feed"
+msgstr "Imagem para ser incluída no feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Least Hits"
+msgstr "Menos Vistos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit Text"
+msgstr "Limite de Texto"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit the article text to the value indicated below"
+msgstr "Limite o texto do artigo para o valor indicado abaixo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Live Bookmarks"
+msgstr "Live Bookmarks"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Most Hits"
+msgstr "Mais Vistos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Most recent first"
+msgstr "Mais recentes primeiro"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "No"
+msgstr "Não"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Number of Items to syndicate"
+msgstr "Número de Itens a Sindicalizar"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Off"
+msgstr "Desligado"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Oldest first"
+msgstr "Mais antigos primeiro"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order that the items will be displayed"
+msgstr "Ordem em que os itens deve ser mostrados"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 0.91"
+msgstr "RSS 0.91"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Special file name, if empty the default will be used."
+msgstr "Nome de arquivo especial. Se vazio o padrão será usado."
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndicate"
+msgstr "Sindicalizar"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Description"
+msgstr "Descrição"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Title"
+msgstr "Título do Link"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Text Length"
+msgstr "Tamanho do Texto"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "The word length of the article text - 0 will show no text"
+msgstr "O tamanho da palavra do texto do artigo - 0 para não mostrar o texto"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "This component controls the Syndication settings"
+msgstr "Este componente controla as configurações de Sindicalização"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title Alphabetical"
+msgstr "Título Alfabético"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title Reverse-Alphabetical"
+msgstr "Título em ordem alfabética reversa"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Yes"
+msgstr "Sim"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:35
+msgid "Browser, OS, Domain Statistics"
+msgstr "Navegador, SO, Estatísticas de Domínios"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:41
+msgid "Browsers"
+msgstr "Navegadores"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:45
+msgid "Browser"
+msgstr "Navegador"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:84
+msgid "OS Stats"
+msgstr "Stats de SO"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:88
+msgid "Operating System"
+msgstr "Sistema Operacional"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:127
+msgid "Domain Stats"
+msgstr "Stats de Domínios"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:131
+msgid "Domain"
+msgstr "Domínio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:182
+msgid "Page Impression Statistics"
+msgstr "Estatísticas de Visualizações de Páginas"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:191
+msgid "Page Impressions"
+msgstr "Visualizações de Páginas"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:228
+msgid "Search Engine Text :"
+msgstr "Texto de Ferramenta de Busca:"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:229
+msgid "logging is :"
+msgstr "Login é:"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:230
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:239
+msgid "Search Text"
+msgstr "Texto de Busca"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:240
+msgid "Times Requested"
+msgstr "Vezes Solicitadas"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:241
+msgid "Results Returned"
+msgstr "Resultados Retornados"
+
+#: administrator/components/com_sections/admin.sections.html.php:33
+msgid "Section Manager"
+msgstr "Gerenciador de Seções"
+
+#: administrator/components/com_sections/admin.sections.html.php:47
+msgid "Section Name"
+msgstr "Nome da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:65
+msgid "Section ID"
+msgstr "ID da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:68
+msgid "# Categories"
+msgstr "# Categorias"
+
+#: administrator/components/com_sections/admin.sections.html.php:71
+msgid "# Active"
+msgstr "# Ativas"
+
+#: administrator/components/com_sections/admin.sections.html.php:74
+msgid "# Trash"
+msgstr "# Lixo"
+
+#: administrator/components/com_sections/admin.sections.html.php:175
+msgid "New Section"
+msgstr "Nova Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:194
+msgid "Please select a menu type"
+msgstr "Por favor selecione um tipo de menu"
+
+#: administrator/components/com_sections/admin.sections.html.php:203
+msgid "Section must have a name"
+msgstr "Seção deve ter um nome"
+
+#: administrator/components/com_sections/admin.sections.html.php:205
+msgid "Section must have a title"
+msgstr "Seção deve ter um título"
+
+#: administrator/components/com_sections/admin.sections.html.php:281
+msgid "Section Details"
+msgstr "Detalhes da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:286
+msgid "Scope:"
+msgstr "Escopo:"
+
+#: administrator/components/com_sections/admin.sections.html.php:299
+msgid "A short name to appear in menus"
+msgstr "Um nome pequeno que irá aparecer nos menus"
+
+#: administrator/components/com_sections/admin.sections.html.php:307
+msgid "A long name to be displayed in headings"
+msgstr "Um nome longo para ser mostrado nos cabeçalhos"
+
+#: administrator/components/com_sections/admin.sections.html.php:312
+msgid "Image:"
+msgstr "Imagem:"
+
+#: administrator/components/com_sections/admin.sections.html.php:324
+msgid "Preview"
+msgstr "Pré-Visualização"
+
+#: administrator/components/com_sections/admin.sections.html.php:329
+msgid "Image Position:"
+msgstr "Posição da Imagem:"
+
+#: administrator/components/com_sections/admin.sections.html.php:387
+msgid "This will create a new menu item in the menu you select"
+msgstr "Isto criará um novo item de menu no menu selecionado"
+
+#: administrator/components/com_sections/admin.sections.html.php:401
+msgid "Select Menu Type"
+msgstr "Selecione o Tipo de Menu"
+
+#: administrator/components/com_sections/admin.sections.html.php:451
+msgid "Menu links available when saved"
+msgstr "Links de Menu são visíveis depois de salvos"
+
+#: administrator/components/com_sections/admin.sections.html.php:489
+msgid "Copy Section"
+msgstr "Copiar Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:499
+msgid "Copy to Section:"
+msgstr "Copiar para a Seção:"
+
+#: administrator/components/com_sections/admin.sections.html.php:501
+msgid "The new Section name"
+msgstr "O novo nome da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:505
+msgid "Categories being copied:"
+msgstr "Categorias a serem copiadas:"
+
+#: administrator/components/com_sections/admin.sections.html.php:517
+msgid "Content Items being copied:"
+msgstr "Itens de Conteúdo a serem copiados:"
+
+#: administrator/components/com_sections/admin.sections.html.php:529
+msgid ""
+"This will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the new Section created."
+msgstr ""
+"Isto irá copiar as Categorias listadas\n"
+"\t\t\t<br />\n"
+"\t\t\te todos os itens dentro das categorias (também listados)\n"
+"\t\t\t<br />\n"
+"\t\t\tpara a nova Seção criada."
+
+#: administrator/components/com_sections/admin.sections.php:189
+#, php-format
+msgid "The section %s is currently being edited by another administrator"
+msgstr "A seção %s está sendo editada por outro administrador"
+
+#: administrator/components/com_sections/admin.sections.php:207
+#: administrator/components/com_sections/admin.sections.php:624
+msgid "Section Table"
+msgstr "Tabela de Seção"
+
+#: administrator/components/com_sections/admin.sections.php:211
+#: administrator/components/com_sections/admin.sections.php:231
+#: administrator/components/com_sections/admin.sections.php:629
+msgid "Section Blog"
+msgstr "Blog de Seção"
+
+#: administrator/components/com_sections/admin.sections.php:215
+#: administrator/components/com_sections/admin.sections.php:634
+msgid "Section Blog Archive"
+msgstr "Arquivo de Blog de Seção"
+
+#. build the html select list for section types
+#: administrator/components/com_sections/admin.sections.php:229
+msgid "Select Type"
+msgstr "Selecione o Tipo"
+
+#: administrator/components/com_sections/admin.sections.php:230
+msgid "Section List"
+msgstr "Lista de Seção"
+
+#: administrator/components/com_sections/admin.sections.php:232
+msgid "Section Archive Blog"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:306
+msgid "Changes to Section saved"
+msgstr "Alterações Salvas para a Seção"
+
+#: administrator/components/com_sections/admin.sections.php:312
+msgid "Section saved"
+msgstr "Seção salva"
+
+#: administrator/components/com_sections/admin.sections.php:327
+msgid "Select a section to delete"
+msgstr "Selecione uma seção para apagar"
+
+#: administrator/components/com_sections/admin.sections.php:365
+#, php-format
+msgid "Sections(s): %s cannot be removed as they contain categories"
+msgstr "Seção(ões): %s não podem ser removidas pois contém categorias"
+
+#: administrator/components/com_sections/admin.sections.php:370
+#, php-format
+msgid "Section(s): %s successfully deleted"
+msgstr "Seção(ões): %s apagadas com sucesso"
+
+#: administrator/components/com_sections/admin.sections.php:388
+msgid "Select a section to "
+msgstr "Selecione uma seção para"
+
+#: administrator/components/com_sections/admin.sections.php:396
+msgid "Cannot Publish an Empty Section"
+msgstr "Não é possível publicar uma seção vazia"
+
+#: administrator/components/com_sections/admin.sections.php:467
+msgid "Select an item to move"
+msgstr "Selecione um item para mover"
+
+#: administrator/components/com_sections/admin.sections.php:585
+#, php-format
+msgid "Section %s and all its Categories and Items have been copied as %s"
+msgstr ""
+"Seção %s, todas as suas Categorias e todos os Itens foram copiados para %s"
+
+#: administrator/components/com_sections/admin.sections.php:658
+#, php-format
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr "%s (%s) no menu: %s criado com sucesso"
+
+#: administrator/components/com_sections/toolbar.sections.html.php:66
+msgid "Copy"
+msgstr "Copiar"
+
+#: administrator/components/com_search/search.xml
+#: components/com_search/search.html.php:43
+#: components/com_search/search.php:35 components/com_search/search.php:41
+#: components/com_search/search.php:143
+msgid "Search"
+msgstr "Procurar"
+
+#: administrator/components/com_search/search.xml
+msgid "This component manages the Search functionality."
+msgstr "Este componente gerencia a funcionalidade de pesquisa."
+
+#: components/com_search/search.html.php:37
+#: components/com_search/search.html.php:67
+msgid "Search Keyword"
+msgstr "Termos de Busca"
+
+#: components/com_search/search.html.php:52
+msgid "Ordering"
+msgstr "Ordenamento"
+
+#. number of matches found
+#: components/com_search/search.html.php:98
+#, php-format
+msgid "returned %d match"
+msgid_plural "returned %d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_search/search.php:55
+msgid "Newest first"
+msgstr "Mais novos em primeiro"
+
+#: components/com_search/search.php:57
+msgid "Most popular"
+msgstr "Mais populares"
+
+#: components/com_search/search.php:58
+msgid "Alphabetical"
+msgstr "Alfabética"
+
+#: components/com_search/search.php:59
+msgid "Section/Category"
+msgstr "Seção/Categoria"
+
+#: components/com_search/search.php:69
+msgid "Any words"
+msgstr "Qualquer palavra"
+
+#: components/com_search/search.php:74
+msgid "All words"
+msgstr "Todas as palavras"
+
+#: components/com_search/search.php:79
+msgid "Exact phrase"
+msgstr "Palavra exata"
+
+#. html output
+#. no matches found
+#: components/com_search/search.php:91
+msgid "No results were found"
+msgstr "Nenhum resultado foi encontrado"
+
+#: components/com_search/search.php:96
+msgid "One or more common words were ignored in the search"
+msgstr "Uma ou mais palavras comuns foram ignoradas na sua pesquisa"
+
+#: components/com_registration/registration.html.php:23
+#: components/com_registration/registration.php:40
+msgid "Lost your Password?"
+msgstr "Perdeu sua senha?"
+
+#: components/com_registration/registration.html.php:28
+#, php-format
+msgid ""
+"Please enter your Username and e-mail address then click on the Send "
+"Password button.%s You will receive a new password shortly.  Use the new "
+"password to access the site."
+msgstr ""
+"Digite seu Nome de Usuário e endereço de e-mail e clique no botão Enviar "
+"Senha. %s Você irá receber uma nova senha em breve. Use a nova senha para "
+"acessar o site."
+
+#: components/com_registration/registration.html.php:35
+msgid "E-mail Address:"
+msgstr "Endereço de E-mail:"
+
+#: components/com_registration/registration.html.php:40
+msgid "Send Password"
+msgstr "Enviar Senha"
+
+#: components/com_registration/registration.html.php:66
+msgid ""
+"Please enter a valid password -- more than 6 characters with no spaces and "
+"containing only the characters 0-9, a-z, or A-Z"
+msgstr ""
+"Por favor digite uma senha válida. Sem espaços, mais que 6 caracteres e "
+"contendo somente caracteres dos conjuntos 0-9,a-z, or A-Z"
+
+#: components/com_registration/registration.html.php:68
+msgid "Please verify the password."
+msgstr "Por favor verifique sua senha."
+
+#: components/com_registration/registration.html.php:80
+#: components/com_registration/registration.php:109
+msgid "Registration"
+msgstr "Registro"
+
+#: components/com_registration/registration.html.php:85
+msgid "Fields marked with an asterisk (*) are required."
+msgstr "Campos marcados com asterisco (*) são de preenchimento obrigatórios."
+
+#: components/com_registration/registration.html.php:98
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: components/com_registration/registration.html.php:126
+msgid "Send Registration"
+msgstr "Enviar Registro"
+
+#: components/com_registration/registration.php:62
+msgid "Sorry, no corresponding user was found"
+msgstr "Nenhum usuário correspondente foi encontrado"
+
+#: components/com_registration/registration.php:74
+#, php-format
+msgid ""
+"The user account %s has this email associated with it.\n"
+"\n"
+"A web user from %s has just requested that a new password be sent.\n"
+"\n"
+"\n"
+"Your New Password is: %s\n"
+"\n"
+"\n"
+"If you didn't ask for this, don't worry. You are seeing this message, not "
+"them. \n"
+"If this was an error just login with your new password and then change your "
+"password to what you would like it to be."
+msgstr ""
+"A conta de usuário %s está associada neste e-mail.\n"
+"\n"
+"Um usuário web de %s requisitou que uma nova senha fosse enviada.\n"
+"\n"
+"\n"
+"Sua nova senha é: %s\n"
+"\n"
+"\n"
+"Se você não solicitou isso, não se preocupe. \n"
+"Se foi um erro, autentique-se no site com a nova senha e altere-a para uma "
+"que deseja."
+
+#. eval ("\$message = \"$message\";");
+#: components/com_registration/registration.php:81
+#, php-format
+msgid "%s :: New password for - %s"
+msgstr "%s :: Nova senha para  - %s"
+
+#: components/com_registration/registration.php:97
+msgid "New User Password created and sent!"
+msgstr "Nova senha criada e enviada!"
+
+#. Send notification to all administrators
+#: components/com_registration/registration.php:160
+#: components/com_registration/registration.php:208
+#, php-format
+msgid "Account details for %s at %s"
+msgstr "Detalhes da conta de %s em %s"
+
+#: components/com_registration/registration.php:165
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s. Your account has been created but, as a "
+"precaution, it must be activated by you before you can use it.\n"
+"To activate the account click on the following link or copy and paste it in "
+"your browser:\n"
+"%s\n"
+"\n"
+"After activation you may login to %s using the following username and "
+"password:\n"
+"\n"
+"Username - %s\n"
+"Password - %s"
+msgstr ""
+"Olá %s,\n"
+"\n"
+"Obrigado pelo seu registro em %s. Sua conta foi criada mas como precaução "
+"precisa ser ativada antes de usá-la.\n"
+"Para ativar sua conta, clique no link a seguir ou cipie-o e cole no seu "
+"navegador:\n"
+"%s\n"
+"\n"
+"Depois da ativação voc6e pode se autenticar em %s usando os senguintes nome "
+"de usuário e senha:\n"
+"\n"
+"Nome de Usuário - %s\n"
+"Senha - %s"
+
+#: components/com_registration/registration.php:180
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s.\n"
+"\n"
+"You may now login to %s using the username and password you registered with."
+msgstr ""
+"Olá %s,\n"
+"\n"
+"Obrigado pelo seu registro em %s.\n"
+"\n"
+"Agora você pode se autenticar em %s usando o nome de usuário e senha que "
+"você escolheu no registro."
+
+#: components/com_registration/registration.php:209
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"A new user has registered at %s.\n"
+"This email contains their details:\n"
+"\n"
+"Name - %s\n"
+"e-mail - %s\n"
+"Username - %s\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Olá %s,\n"
+"\n"
+"Um novo usuário se registrou em %s.\n"
+"Este e-mail contém seus detalhes:\n"
+"\n"
+"Nome - %s\n"
+"E-mail - %s\n"
+"Nome de Usuário - %s\n"
+"\n"
+"Por favor não responda este mensagem. Ela foi gerada automaticamente somente "
+"com caráter informativo."
+
+#: components/com_registration/registration.php:239
+#: components/com_registration/registration.php:242
+msgid "Registration Complete"
+msgstr "Registro Completo"
+
+#: components/com_registration/registration.php:240
+msgid ""
+"Your account has been created and an activation link has been sent to the e-"
+"mail address you entered. Note that you must activate the account by "
+"clicking on the activation link before you can login."
+msgstr ""
+"Sua conta foi criada e um link de ativação foi enviado para o endereço de e-"
+"mail informado por você. Note que você deve ativar sua conta clicando neste "
+"link de ativação antes de voc6e se registrar no site."
+
+#: components/com_registration/registration.php:243
+msgid "You may now login."
+msgstr "Agora você pode se autenticar."
+
+#: components/com_registration/registration.php:261
+#: components/com_registration/registration.php:282
+msgid "Invalid Activation Link!"
+msgstr "Link de Ativação Inválido!"
+
+#: components/com_registration/registration.php:262
+#: components/com_registration/registration.php:283
+msgid ""
+"There is no such account in our database or the account has already been "
+"activated."
+msgstr "Não existe esta conta em nosso banco de dados ou ela já foi ativada."
+
+#: components/com_registration/registration.php:275
+msgid "Activation Complete!"
+msgstr "Ativação Completa!"
+
+#: components/com_registration/registration.php:276
+msgid ""
+"Your account has been activated successfully. You can now login using the "
+"username and password you chose during registration."
+msgstr ""
+"Sua conta foi ativada com sucesso. Agora você pode fazer seu login usando o "
+"nome de usuário e senha que você escolheu durante o registro."
+
+#: administrator/components/com_poll/admin.poll.html.php:28
+msgid "Poll Manager"
+msgstr "Gerenciador de Enquetes"
+
+#: administrator/components/com_poll/admin.poll.html.php:41
+msgid "Poll Title"
+msgstr "Título da Enquete"
+
+#: administrator/components/com_poll/admin.poll.html.php:47
+msgid "Options"
+msgstr "Opções"
+
+#: administrator/components/com_poll/admin.poll.html.php:50
+msgid "Lag"
+msgstr "Lag"
+
+#: administrator/components/com_poll/admin.poll.html.php:74
+msgid "Edit Poll"
+msgstr "Editar Enquete"
+
+#: administrator/components/com_poll/admin.poll.html.php:118
+msgid "Poll must have a title"
+msgstr "A enquete deve ter um nome"
+
+#: administrator/components/com_poll/admin.poll.html.php:120
+msgid "Poll must have a non-zero lag time"
+msgstr "A enquete deve ter um valor diferente de zero para o tempo de lag"
+
+#: administrator/components/com_poll/admin.poll.html.php:134
+msgid "Poll:"
+msgstr "Enquete:"
+
+#: administrator/components/com_poll/admin.poll.html.php:159
+msgid "Show on menu items:"
+msgstr "Mostrar nos itens de menu:"
+
+#: administrator/components/com_poll/admin.poll.html.php:166
+msgid "Lag:"
+msgstr "Lag:"
+
+#: administrator/components/com_poll/admin.poll.html.php:175
+msgid "Options:"
+msgstr "Opções"
+
+#: administrator/components/com_poll/admin.poll.php:106
+#, php-format
+msgid "The poll %s is currently being edited by another administrator."
+msgstr "A enquete %s está sendo editada por outro admnistrador"
+
+#: administrator/components/com_poll/poll.class.php:44
+msgid "Your Poll must contain a title."
+msgstr "Sua Enquete deve conter um título."
+
+#: administrator/components/com_poll/poll.class.php:50
+#, fuzzy
+msgid "Your Poll must have a non-zero lag time."
+msgstr "Sua Enquete não "
+
+#: administrator/components/com_poll/poll.class.php:59
+msgid "There is a module already with that name, please try again."
+msgstr "Existe um outro módulo com este nome. Por favor, tente novamente."
+
+#: administrator/components/com_poll/poll.xml
+msgid "Poll"
+msgstr "Enquete"
+
+#: administrator/components/com_poll/poll.xml
+msgid "This component shows Polls/Surveys"
+msgstr "Este componente mostra Enquete/Pesquisas"
+
+#: components/com_poll/poll.html.php:51
+msgid "Select Poll:"
+msgstr "Selecionar Enquete:"
+
+#: components/com_poll/poll.html.php:83
+msgid "There are no results for this poll."
+msgstr "Não existem resultados para esta enquete."
+
+#: components/com_poll/poll.html.php:193
+msgid "Number of Voters"
+msgstr "Número de Votos"
+
+#: components/com_poll/poll.html.php:202
+msgid "First Vote"
+msgstr "Primeiro Voto"
+
+#: components/com_poll/poll.html.php:211
+msgid "Last Vote"
+msgstr "Último Voto"
+
+#: components/com_poll/poll.php:48
+msgid "Cookies must be enabled!"
+msgstr "Cookies devem estar habilitados!"
+
+#: components/com_poll/poll.php:49 components/com_poll/poll.php:56
+#: components/com_poll/poll.php:65 components/com_poll/poll.php:72
+msgid "Continue"
+msgstr "Continuar"
+
+#: components/com_poll/poll.php:64
+msgid "You already voted for this poll today!"
+msgstr "Você já votou nesta enquete hoje!"
+
+#: components/com_poll/poll.php:71
+msgid "No selection has been made, please try again"
+msgstr "Nenhuma seleção foi feita. Tente novamente"
+
+#: components/com_poll/poll.php:93 components/com_poll/poll.php:95
+msgid "Thanks for your vote!"
+msgstr "Obrigado pelo seu voto!"
+
+#: components/com_poll/poll.php:97
+msgid "Results"
+msgstr "Resultados"
+
+#: components/com_poll/poll.php:112 components/com_poll/poll.php:154
+msgid "Select Poll from the list"
+msgstr "Selecionar Enquete da lista"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:29
+msgid "Newsfeed Manager"
+msgstr "Gerenciador de Feeds de Notícias"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:46
+msgid "News Feed"
+msgstr "Feeds de Notícias"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:58
+#: components/com_newsfeeds/newsfeeds.html.php:107
+msgid "# Articles"
+msgstr "# Artigos"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:61
+msgid "Cache time"
+msgstr "Tempo de Cache"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:91
+msgid "Checked Out"
+msgstr "Verificado"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:95
+msgid "Edit Newsfeed"
+msgstr "Editar Feed de Notícias"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please fill in the newsfeed name."
+msgstr "Por favor preencha o nome do feed."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:156
+msgid "Please select a Category."
+msgstr "Por favor selecione uma categoria"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please fill in the newsfeed link."
+msgstr "Por favor preencha o link do feed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:160
+msgid "Please select a category."
+msgstr "Por favor selecione uma categoria"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:162
+msgid "Please fill in the number of articles to display."
+msgstr "Por favor preencha o número de artigos para mostrar"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:164
+msgid "Please fill in the cache refresh time."
+msgstr "Por favor preencha o tempo de atualização"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:175
+msgid "Newsfeed:"
+msgstr "Feed de Notícias:"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:204
+msgid "Link"
+msgstr "Link"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:212
+msgid "Number of Articles"
+msgstr "Número de Artigos"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:220
+msgid "Cache time (in seconds)"
+msgstr "Tempo de Cache (em segundos)"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:203
+#, php-format
+msgid "Select a module to %s"
+msgstr "Selecione um módulo para %s"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Articles Column"
+msgstr "# Coluna de Artigos"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Category Items"
+msgstr "# Itens da Categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+"Permite você limitar a quantidade de texto de descrição visível. 0 mostra "
+"todo o texto."
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category Description"
+msgstr "Descrição da Categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description for page"
+msgstr "Descrição para a Página"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Description"
+msgstr "Descrição do Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Image"
+msgstr "Imagem do Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Item Description"
+msgstr "Descrição do Item"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Link Column"
+msgstr "Coluna do Link"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Name Column"
+msgstr "Nome da Coluna"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Newsfeeds"
+msgstr "Feeds de Notícias"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the # of articles in the feed"
+msgstr "Mostrar/Esconder o N. de artigos no feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr "Mostrar/Esconder a descrição para a lista de outras categorias"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Link column"
+msgstr "Mostrar/Esconder a coluna de link do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Name column"
+msgstr "Mostrar/Esconder a coluna de nome do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr "Mostrar/Esconder a descrição ou texto de introdução de um item"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description text of the feed"
+msgstr "Mostrar/Esconder a descrição do texto do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the image of the feed"
+msgstr "Mostrar/Esconder a imagem do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the number of items in each category"
+msgstr "Mostrar/Esconder o número de itens em cada categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "This component manages RSS/RDF newsfeeds"
+msgstr "Este componente gerencia feeds de notícias RSS/RDF"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Word Count"
+msgstr "Contar Palavras"
+
+#: components/com_newsfeeds/newsfeeds.html.php:98
+msgid "Feed Name"
+msgstr "Nome do Feed"
+
+#: components/com_newsfeeds/newsfeeds.html.php:116
+msgid "Feed Link"
+msgstr "Link do Feed"
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid ""
+"<p>MOStlyDBAdmin is used for easy back up/restore of your database.</p><p>  "
+"It is a revival \r\n"
+"\tof the dbadmin component for use in the Mambo 4.6+ core.  The dbadmin \r\n"
+"\tcomponent stopped working with Mambo 4.5.3h and development appears to "
+"have ceased.</p>\n"
+msgstr ""
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid "MOStlyDBAdmin"
+msgstr ""
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE Editor mambot.</p><p>Please refer to the "
+"changelog and other information in the 'Admin Info' tab in the Admin "
+"component.&nbsp;</p>"
+msgstr ""
+"<p>Componente administrativo para o mambot do Editor MOStlyCE.</p><p>Por "
+"favor veja o changelog e outras informações na tab 'Info Admin' no "
+"administrador do componente.&nbsp;</p>"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid "mostlyce"
+msgstr "mostlyce"
+
+#: administrator/components/com_modules/admin.modules.html.php:34
+msgid "Module Manager"
+msgstr "Gerenciador de Módulos"
+
+#: administrator/components/com_modules/admin.modules.html.php:60
+msgid "Module Name"
+msgstr "Nome do Módulo"
+
+#: administrator/components/com_modules/admin.modules.html.php:87
+msgid "Pages"
+msgstr "Páginas"
+
+#: administrator/components/com_modules/admin.modules.html.php:156
+msgid "Varies"
+msgstr "Várias"
+
+#: administrator/components/com_modules/admin.modules.html.php:158
+msgid "All"
+msgstr "Todas"
+
+#: administrator/components/com_modules/admin.modules.html.php:166
+msgid "User"
+msgstr "Usuário"
+
+#: administrator/components/com_modules/admin.modules.html.php:213
+msgid "Module must have a title"
+msgstr "Módulo deve ter um título"
+
+#: administrator/components/com_modules/admin.modules.html.php:239
+msgid "Module:"
+msgstr "Módulo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:270
+msgid "Show title:"
+msgstr "Mostrar título:"
+
+#: administrator/components/com_modules/admin.modules.html.php:286
+msgid "Module Order:"
+msgstr "Ordem do Módulo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:318
+msgid "ID:"
+msgstr "ID:"
+
+#: administrator/components/com_modules/admin.modules.html.php:351
+msgid "Pages / Items"
+msgstr "Páginas / Itens"
+
+#: administrator/components/com_modules/admin.modules.html.php:356
+msgid "Menu Item Link(s):"
+msgstr "Link(s) de Itens de Menu:"
+
+#: administrator/components/com_modules/admin.modules.html.php:372
+msgid "Custom Output"
+msgstr "Saída Customizada"
+
+#: administrator/components/com_modules/admin.modules.html.php:377
+msgid "Content:"
+msgstr "Conteúdo:"
+
+#: administrator/components/com_modules/admin.modules.php:149
+msgid "- All Positions -"
+msgstr "- Todas as Posições -"
+
+#: administrator/components/com_modules/admin.modules.php:161
+msgid "- All Types -"
+msgstr "- Todos os Tipos -"
+
+#: administrator/components/com_modules/admin.modules.php:211
+#, php-format
+msgid "Module Copied [%s]"
+msgstr "Módulo Copiado [%s]"
+
+#: administrator/components/com_modules/admin.modules.php:268
+#, php-format
+msgid "Successfully Saved changes to Module: %s"
+msgstr "Alterações do Módulo Salvas com Sucesso: %s"
+
+#: administrator/components/com_modules/admin.modules.php:274
+#, php-format
+msgid "Successfully Saved Module: %s"
+msgstr "Módulo Salvo com Sucesso: %s"
+
+#: administrator/components/com_modules/admin.modules.php:295
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr "O módulo %s está sendo editado por outro administrador"
+
+#: administrator/components/com_modules/admin.modules.php:377
+#: administrator/components/com_modules/admin.modules.php:378
+#: administrator/components/com_modules/admin.modules.php:381
+#: administrator/components/com_modules/admin.modules.php:382
+msgid "N/A"
+msgstr "N/A"
+
+#: administrator/components/com_modules/admin.modules.php:417
+msgid "Select a module to delete"
+msgstr "Selecione um módulo para apagar"
+
+#: administrator/components/com_modules/admin.modules.php:440
+msgid ""
+"You cannot delete mod_mainmenu module that displays the \"mainmenu\" as it "
+"is a core Menu"
+msgstr ""
+"Você não pode apagar o módulo mod_mainmenu que mostra o \"mainmenu\" como um "
+"menu do núcleo do sistema"
+
+#: administrator/components/com_modules/admin.modules.php:466
+#, php-format
+msgid ""
+"Module(s): \"%s\" cannot be deleted they can only be un-installed as they "
+"are Mambo modules."
+msgstr ""
+"Módulo(s): \"%s\" não podem ser apagados mas somente desinstalados pois são "
+"módulos do Mambo."
+
+#: administrator/components/com_modules/toolbar.modules.html.php:41
+msgid "You can only preview typed modules."
+msgstr "Você só pode pré-visualizar módulos."
+
+#: administrator/components/com_messages/admin.messages.html.php:24
+msgid "Private Messaging"
+msgstr "Mensagens Privadas"
+
+#: administrator/components/com_messages/admin.messages.html.php:25
+msgid "Search:"
+msgstr "Procurar:"
+
+#: administrator/components/com_messages/admin.messages.html.php:35
+msgid "Subject"
+msgstr "Assunto"
+
+#: administrator/components/com_messages/admin.messages.html.php:36
+msgid "From"
+msgstr "De"
+
+#: administrator/components/com_messages/admin.messages.html.php:39
+#: administrator/components/com_messages/admin.messages.html.php:55
+msgid "Read"
+msgstr "Lido"
+
+#: administrator/components/com_messages/admin.messages.html.php:57
+msgid "Unread"
+msgstr "Não Lido"
+
+#: administrator/components/com_messages/admin.messages.html.php:77
+msgid "Private Messaging Configuration"
+msgstr "Configuração de Mensagens Privadas"
+
+#: administrator/components/com_messages/admin.messages.html.php:82
+msgid "General"
+msgstr "Geral"
+
+#: administrator/components/com_messages/admin.messages.html.php:89
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
+
+#: administrator/components/com_messages/admin.messages.html.php:101
+msgid "Lock Inbox:"
+msgstr "Travar Caixa:"
+
+#: administrator/components/com_messages/admin.messages.html.php:105
+msgid "Mail me on new Message:"
+msgstr "Me informe sobre novas mensagens:"
+
+#: administrator/components/com_messages/admin.messages.html.php:123
+msgid "View Private Message"
+msgstr "Ver Mensagens Privadas"
+
+#: administrator/components/com_messages/admin.messages.html.php:130
+msgid "From:"
+msgstr "De:"
+
+#: administrator/components/com_messages/admin.messages.html.php:134
+msgid "Posted:"
+msgstr "Postado:"
+
+#: administrator/components/com_messages/admin.messages.html.php:138
+#: administrator/components/com_messages/admin.messages.html.php:193
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: administrator/components/com_messages/admin.messages.html.php:142
+#: administrator/components/com_messages/admin.messages.html.php:199
+msgid "Message:"
+msgstr "Mensagem:"
+
+#: administrator/components/com_messages/admin.messages.html.php:169
+msgid "You must provide a subject."
+msgstr "Você deve fornecer um assunto."
+
+#: administrator/components/com_messages/admin.messages.html.php:171
+msgid "You must provide a message."
+msgstr "Você deve escrever uma mensagem."
+
+#: administrator/components/com_messages/admin.messages.html.php:173
+msgid "You must select a recipient."
+msgstr "Você deve selecionar um destinatário."
+
+#: administrator/components/com_messages/admin.messages.html.php:182
+msgid "New Private Message"
+msgstr "Nova Mensagem Privada"
+
+#: administrator/components/com_messages/admin.messages.html.php:189
+msgid "To:"
+msgstr "Para:"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:21
+msgid "Reply"
+msgstr "Responder"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:31
+msgid "Send"
+msgstr "Enviar"
+
+#: components/com_messages/messages.class.php:76
+#: components/com_messages/messages.class.php:77
+msgid "A new private message has arrived"
+msgstr "Uma nova mensagem privada foi recebida"
+
+#: components/com_messages/messages.class.php:84
+msgid "The user has locked their mailbox. Message failed."
+msgstr "O usuário travou sua caixa de mensagens. Envio falhou."
+
+#: administrator/components/com_menus/admin.menus.html.php:29
+#, php-format
+msgid "Menu Manager <small><small>[ %s ]</small></small>"
+msgstr "Gerenciador de Menu <small><small>[ %s ]</small></small>"
+
+#: administrator/components/com_menus/admin.menus.html.php:32
+msgid "Max Levels"
+msgstr "Níveis Máximos"
+
+#: administrator/components/com_menus/admin.menus.html.php:49
+msgid ""
+"You cannot `delete` this menu as it is required for the proper operation of "
+"Mambo"
+msgstr ""
+"Você não pode `remover` este menu. Ele é necessário para a operação do Mambo"
+
+#: administrator/components/com_menus/admin.menus.html.php:52
+msgid ""
+"The 1st Published item in this menu [mainmenu] is the default `Homepage` for "
+"the site"
+msgstr "O primeiro item deste menu [mainmenu] é a página principal do site"
+
+#: administrator/components/com_menus/admin.menus.html.php:70
+msgid "Menu Item"
+msgstr "Item de Menu"
+
+#: administrator/components/com_menus/admin.menus.html.php:88
+msgid "Itemid"
+msgstr "ID do Item"
+
+#: administrator/components/com_menus/admin.menus.html.php:94
+msgid "CID"
+msgstr "CID"
+
+#: administrator/components/com_menus/admin.menus.html.php:184
+msgid "New Menu Item"
+msgstr "Novo Item de Menu"
+
+#. echo _MENU_GROUP;
+#: administrator/components/com_menus/admin.menus.html.php:203
+msgid "Content"
+msgstr "Conteúdo"
+
+#: administrator/components/com_menus/admin.menus.html.php:235
+msgid "Miscellaneous"
+msgstr "Miscelânea"
+
+#: administrator/components/com_menus/admin.menus.html.php:266
+msgid ""
+"Note that some menu types appear in more that one grouping, but they are "
+"still the same menu type."
+msgstr ""
+"Note que alguns tipos de menu aparecem em mais de um grupo, mas eles são os "
+"mesmos tipos de menus."
+
+#: administrator/components/com_menus/admin.menus.html.php:270
+msgid "Components"
+msgstr "Componentes"
+
+#: administrator/components/com_menus/admin.menus.html.php:359
+msgid "Move Menu Items"
+msgstr "Mover Itens de Menu"
+
+#: administrator/components/com_menus/admin.menus.html.php:369
+msgid "Move to Menu:"
+msgstr "Mover para Menu:"
+
+#: administrator/components/com_menus/admin.menus.html.php:376
+msgid "Menu Items being moved:"
+msgstr "Itens de Menu a serem movidos:"
+
+#: administrator/components/com_menus/admin.menus.html.php:419
+msgid "Copy Menu Items"
+msgstr "Copiar Itens de Menu"
+
+#: administrator/components/com_menus/admin.menus.html.php:430
+msgid "Copy to Menu:"
+msgstr "Copiar para Menu:"
+
+#: administrator/components/com_menus/admin.menus.html.php:438
+msgid "Menu Items being copied:"
+msgstr "Itens de Menu a serem copiados:"
+
+#. if
+#: administrator/components/com_menus/admin.menus.php:614
+#, php-format
+msgid "%d Menu Item moved to %s"
+msgid_plural "%d Menu Items moved to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. foreach
+#: administrator/components/com_menus/admin.menus.php:684
+#, php-format
+msgid "%d Menu Item Copied to %s"
+msgid_plural "%d Menu Items Copied to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:35
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:35
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:41
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:42
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:35
+#: administrator/components/com_menus/url/url.menu.html.php:38
+msgid "Link must have a name"
+msgstr "Link deve ter um nome"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:37
+msgid "You must select a Component to link to"
+msgstr "Você deve selecionar um componente para criar um link"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:48
+msgid "Menu Item :: Link - Component Item"
+msgstr "Item de Menu :: Link - Item de Componente"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:72
+msgid "Component to Link:"
+msgstr "Componente para Link:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:79
+#: administrator/components/com_menus/components/components.menu.html.php:100
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:105
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:102
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:104
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:100
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:100
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:107
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:87
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:102
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:105
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:106
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:91
+msgid "Url:"
+msgstr "URL:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:86
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:88
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:94
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:88
+#: administrator/components/com_menus/url/url.menu.html.php:83
+msgid "On Click, Open in:"
+msgstr "Quando clicar, abrir em:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:94
+#: administrator/components/com_menus/components/components.menu.html.php:106
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:113
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:96
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:108
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:110
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:106
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:106
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:115
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:102
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:108
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:103
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:113
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:96
+#: administrator/components/com_menus/separator/separator.menu.html.php:68
+#: administrator/components/com_menus/url/url.menu.html.php:91
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:114
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:99
+msgid "Parent Item:"
+msgstr "Item Pai:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+msgid "Creates a link to an existing Mambo Component"
+msgstr "Cria um link para um componente existente no Mambo"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+msgid "Link - Component Item"
+msgstr "Link - Item de Componente"
+
+#: administrator/components/com_menus/components/components.class.php:35
+#, php-format
+msgid "\"The module %s is currently being edited by another administrator"
+msgstr "\"O Módulo %s está sendo editado por outro administrador"
+
+#: administrator/components/com_menus/components/components.menu.html.php:59
+msgid "Item must have a name"
+msgstr "Item deve ter um nome"
+
+#: administrator/components/com_menus/components/components.menu.html.php:61
+msgid "Please select a Component"
+msgstr "Por favor, selecione um componente"
+
+#: administrator/components/com_menus/components/components.menu.html.php:73
+#, php-format
+msgid "Menu Item :: Component <small><small>%s</small></small>"
+msgstr "Item de Menu :: Componente <small><small>%s</small></small>"
+
+#: administrator/components/com_menus/components/components.menu.html.php:94
+msgid "Component:"
+msgstr "Componente:"
+
+#: administrator/components/com_menus/components/components.menu.html.php:149
+msgid "Parameter list will be available once you save this New menu item"
+msgstr ""
+"Lista de parâmetros estará disponível quando você salvar este item de menu"
+
+#: administrator/components/com_menus/components/components.xml
+msgid "Component"
+msgstr "Componente"
+
+#: administrator/components/com_menus/components/components.xml
+msgid "Displays the frontend interface for a Component"
+msgstr "Apresenta uma interface frontal para um componente"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:39
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:39
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:39
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:39
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:39
+msgid "You must select a category"
+msgstr "Você deve selecionar uma categoria"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:53
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:55
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:56
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:40
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:49
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:40
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:49
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:55
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:52
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:53
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:53
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:35
+msgid "This Menu item must have a title"
+msgstr "Este item de menu deve conter um título"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Contact Category"
+msgstr "Item de Menu :: Tabela - Categoria de Contato"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:90
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:90
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:92
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:90
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:91
+msgid "If you leave this blank the Category name will be automatically used"
+msgstr ""
+"Se você deixar isto em braco, o nome da categoria será automaticamente "
+"utilizado"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Email Column"
+msgstr "Coluna E-mail"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Fax Column"
+msgstr "Coluna Fax"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Other Categories"
+msgstr "Outras Categorias"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Position Column"
+msgstr "Coluna de Posição"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Email column"
+msgstr "Mostra/Esconde a coluna de E-mail"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Fax column"
+msgstr "Mostra/Esconde a coluna de Fax"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Position column"
+msgstr "Mostra/Esconde a coluna de posição"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Telephone column"
+msgstr "Mostra/Esconde a coluna de Telefone"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Shows a Table view of Contact items for a particular Category"
+msgstr ""
+"Mostra uma visualização em tabela de itens para uma categoria particular"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Table - Contact Category"
+msgstr "Tabela - Categoria de Contato"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Telephone Column"
+msgstr "Coluna de Telefone"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "When viewing a Category, Show/Hide the list of other Categories"
+msgstr ""
+"Quando uma categoria é apresentada, Mostra/Esconde a lista de outras "
+"categorias"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:37
+msgid "You must select a Contact to link to"
+msgstr "Você deve selecionar um contato para fazer um link"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:50
+msgid "Menu Item :: Link - Contact Item"
+msgstr "Item de Menu :: Link - Item de Contato"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:74
+msgid "Contact to Link:"
+msgstr "Contato para o Link:"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+msgid "Creates a link to a Published Contact Item"
+msgstr "Criar um link para um Item de Contato publicado"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+msgid "Link - Contact Item"
+msgstr "Link - Item de Contato"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:68
+msgid "Menu Item :: Blog - Content Category Archive"
+msgstr "Item de Menu :: Blog - Arquivo de Conteúdo de Categoria"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Intro"
+msgstr "# Intro"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Leading"
+msgstr "# Leading"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Links"
+msgstr "# Links"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Auto"
+msgstr "Auto"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Blog - Content Category Archive"
+msgstr "Blog - Arquivo de Conteúdo de Categoria"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Columns"
+msgstr "Colunas"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Display {mosimages}."
+msgstr "Mostrar {mosimages}."
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Item Title"
+msgstr "Título do Item"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Linked Titles"
+msgstr "Títulos com Links"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "MOSImages"
+msgstr "MOSImages"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr "Fazer um link com o texto da seção para a página da seção atual"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Make your Item titles linkable"
+msgstr "Fazer seus títulos de Itens clicáveis"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Number of Items to display as Links."
+msgstr "Número de Itens para mostrar como Links"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid ""
+"Number of Items to display as a leading (full width) item. 0 will mean that "
+"no items will be displayed as leading."
+msgstr ""
+"Número de itens para mostrar como um leading (largura completa). 0 não "
+"mostra itens como leading"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Number of Items to display with the introduction text shown."
+msgstr "Número de Itens para apresentar com o texto introdutório"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Order by"
+msgstr "Ordenar por"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Pagination"
+msgstr "Paginação"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Pagination Results"
+msgstr "Resultados de Paginação"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Read More"
+msgstr "Leia Mais"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Section Name Linkable"
+msgstr "Nome de Seção Clicáveis"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide Pagination Results info ( e.g 1-4 of 4 )"
+msgstr "Mostrar/Esconder informações de Resultados de Paginação (ex. 1-4 de 4)"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide Pagination support"
+msgstr "Mostrar/Esconder suporte a paginação"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Read More link"
+msgstr "Mostrar/Esconder link Leia Mais"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr "Mostrar/Esconder o item de seção começado por"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the items title"
+msgstr "Mostrar/Esconder o título do item"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Shows a listing of Content items archived for a particular category"
+msgstr ""
+"Mostrar uma lista de itens de conteúdo arquivados para uma categoria em "
+"particular"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Text to display at the top of the page"
+msgstr "Texto para ser mostrado no topo da página"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "This overrides the ordering of the items."
+msgstr "Isto sobrescreve a ordem dos itens"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "When displaying the intro text, how many columns to use per row"
+msgstr ""
+"Quando mostrar o texto de introdução, quantas colunas devem ser usadas por "
+"linha"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:39
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:39
+msgid "You must select a Section"
+msgstr "Você deve selecionar uma Seção"
+
+#. build the html select list for section
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:45
+#: administrator/components/com_menus/content_blog_section/content_blog_section.class.php:64
+msgid "All Sections"
+msgstr "Todas as Seções"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:70
+msgid "Menu Item :: Blog - Content Section Archive"
+msgstr "Item de Menu :: Blog - Arquivo de Seção de Conteúdo"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:92
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:90
+msgid "If you leave this blank the Section name will be automatically used"
+msgstr ""
+"Se você deixar isto em branco, o nome da seção será automaticamente usado"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Blog - Content Section Archive"
+msgstr "Blog - Arquivo de Conteúdo de Seção"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Name"
+msgstr "Nome da Categoria"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Name Linkable"
+msgstr "Nome de Categoria Clicável"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Order"
+msgstr "Ordem de Categoria"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr "Fazer um link do texto da categoria para a página da categoria atual"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "No, order by Primary Order only"
+msgstr "Não, ordem somente pela ordem primária"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Order items by catgeory"
+msgstr "Ordernar itens por categoria"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Order that the items will be displayed in."
+msgstr "Ordem que os itens podem ser apresentados"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Primary Order"
+msgstr "Ordem Primária"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr "Mostrar/Esconder a categoria do item começado por"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Shows a listing of Content items archived for a particular section"
+msgstr ""
+"Mostrar uma lista de itens de conteúdo arquivados para uma seção em "
+"particular"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:64
+msgid "Menu Item :: Blog - Content Category"
+msgstr "Item de Menu :: Blog - Categoria de Conteúdo"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:95
+msgid "You can select multiple Categories"
+msgstr "Você pode selecionar múltiplas categorias"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid "Blog - Content Category"
+msgstr "Blog - Categoria de Conteúdo"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid ""
+"Displays a page of content items from multiple categories in a blog format"
+msgstr ""
+"Mostra uma página de itens de conteúdo de múltiplas categorias em um formato "
+"de blog"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid "Dscription Image"
+msgstr "Descrição de Imagem"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Item Titles"
+msgstr "Títulos de Item"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Category Description"
+msgstr "Mostrar/Esconder a descrição da categoria"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Show/Hide the Page title"
+msgstr "Mostrar/Esconder o título da página"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:64
+msgid "Menu Item :: Blog - Content Section"
+msgstr "Item de Menu :: Blog :: Seção de Conteúdo"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:95
+msgid "You can select multiple Sections"
+msgstr "Você pode selecionar múltiplas seções"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Blog - Content Section"
+msgstr "Blog - Seção de Conteúdo"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Description Image"
+msgstr "Descrição de Imagem"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid ""
+"Displays a page of content items from multiple sections in a blog format"
+msgstr ""
+"Mostrar uma de itens de conteúdo para seções múltiplas em um formato de blog"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Section Description"
+msgstr "Mostrar/Esconder a descrição da seção"
+
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:68
+msgid "Menu Item :: Table - Content Category"
+msgstr "Item de Menu :: Tabela - Conteúdo da Categoria"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "10"
+msgstr "10"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "15"
+msgstr "15"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "20"
+msgstr "20"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "25"
+msgstr "25"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "30"
+msgstr "30"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "5"
+msgstr "5"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "50"
+msgstr "50"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Author Column"
+msgstr "Coluna de Autor"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Date Column"
+msgstr "Coluna de Data"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Date Format"
+msgstr "Coluna de Formato"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Display Number"
+msgstr "Mostrar Número"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Display Select"
+msgstr "Mostrar Seleção"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Empty Categories"
+msgstr "Categorias Vazias"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Filter"
+msgstr "Filtro"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Filter Field"
+msgstr "Campo de Filtro"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "His"
+msgstr "Cliques"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Hits Column"
+msgstr "Coluna de Cliques"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Navigation Bar"
+msgstr "Barra de Navegação"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Number of items to be displayed by default"
+msgstr "Número de Itens para ser mostrado por padrão"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Order Select"
+msgstr "Ordem de Seleção"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide empty(no items) categories"
+msgstr "Mostrar/Esconder categorias vazias (sem itens)"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Author column"
+msgstr "Mostrar/Esconder a coluna de Autor"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid ""
+"Show/Hide the Category Description, it will appear below the Category Name"
+msgstr ""
+"Mostrar/Esconder a descrição da categoria que é apresentada abaixo do nome "
+"da categoria"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Date column"
+msgstr "Mostrar/Esconder a coluna de data"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Display Select dropdown"
+msgstr "Mostar/Esconder a caixa de seleção"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Filter ability"
+msgstr "Mostrar/Esconder a habilidade de filtro"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Navigation bar"
+msgstr "Mostrar/Esconder a barra de navegação"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Order Select dropdown"
+msgstr "Mostrar/Esconder a caixa de seleção de ordem"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Show/Hide the listing of other Categories"
+msgstr "Mostrar/Esconder a listagem de outras categorias"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Shows a Table view of Content items for a particular Category"
+msgstr "Mostrar uma tabela com itens de conteúdo para uma categoria particular"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Table - Content Category"
+msgstr "Tabela - Categoria de Conteúdo"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid ""
+"The format of the date displayed, using PHPs strftime Command Format - if "
+"left blank it will load the format from your language file"
+msgstr ""
+"O formato de data apresentado, usando o formato strftime do PHP - se deixado "
+"em branco será carregado o formato de seu arquivo de idioma"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Which field shall the filter apply to"
+msgstr "Em qual campo o filtro deve ser aplicado?"
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:66
+msgid "Edit Content Item"
+msgstr "Editar Item de Conteúdo"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:43
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:44
+msgid "You must select a Content to link to"
+msgstr "Você deve selecionar um conteúdo para fazer link"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:56
+msgid "Menu Item :: Link - Content Item"
+msgstr "Item de Menu :: Link - Item de Conteúdo"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:80
+msgid "Content to Link:"
+msgstr "Conteúdo para o link:"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+msgid "Creates a link to a published Content Item in full view"
+msgstr "Criar um link para um item de conteúdo publicado em visão completa"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+msgid "Link - Content Item"
+msgstr "Link - Item de Conteúdo"
+
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:68
+msgid "Menu Item :: Table - Content Section"
+msgstr "Item de Menu :: Tabela - Seção de Conteúdo"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Creates a listing of Content categories for a particular section"
+msgstr "Cria uma lista de categorias de conteúdo para uma seção particular"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Section Title"
+msgstr "Título da Seção"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Category Description Image"
+msgstr "Mostar/Esconder a imagem de descrição da categoria"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/hide the section title"
+msgstr "Mostrar/Esconder o título da seção"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Table - Content Section"
+msgstr "Tabela - Seção de Conteúdo"
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:57
+msgid "Menu Item :: Link - Static Content"
+msgstr "Item de Menu :: Link - Conteúdo Estático"
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:81
+msgid "Static Content:"
+msgstr "Conteúdo Estático:"
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:95
+msgid "On Click, open:"
+msgstr "Quando Clicar, abrir:"
+
+#: administrator/components/com_menus/content_typed/content_typed.xml
+msgid "Creates a link to Static Content Item"
+msgstr "Cria um link para um item de conteúdo estático"
+
+#: administrator/components/com_menus/content_typed/content_typed.xml
+msgid "Link - Static Content"
+msgstr "Link - Conteúdo Estático"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Newsfeed Category"
+msgstr "Item de Menu :: Tabela - Categoria Newsfeed"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in /images"
+msgstr ""
+"Uma pequena imagem para ser colocada a esquerda ou a direita do item de "
+"menu, imagens deve estar em /images"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Articles Column"
+msgstr "Coluna de Artigos"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Articles column"
+msgstr "Mostrar/Esconder a coluna de artigos"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Link column"
+msgstr "Mostrar/Esconder a coluna de link"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Name column"
+msgstr "Mostrar/Esconder o nome da coluna"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Shows a Table view of Newsfeed items for a particular Category"
+msgstr ""
+"Mostra uma visão de tabela de itens de feeds para uma categoria em particular"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Table - Newsfeed Category"
+msgstr "Tabela - Categoria de feeds"
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php:60
+msgid "Item:"
+msgstr "Item:"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:37
+msgid "You must select a Newsfeed to link to"
+msgstr "Você deve selecionar um feed para criar um link"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+msgid "Menu Item :: Link - Newsfeed"
+msgstr "Item de Menu :: Link -  Newsfeed"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:74
+msgid "Newsfeed to Link:"
+msgstr "Newsfeed para link:"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Creates a link to an individual Published Newsfeed"
+msgstr "Cria um link para um feed individual publicado"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Link - Newsfeed"
+msgstr "Link - Newsfeed"
+
+#: administrator/components/com_menus/separator/separator.menu.html.php:44
+msgid "Menu Item :: Separator / Placeholder"
+msgstr "Item de Menu :: Separador/Placeholder"
+
+#: administrator/components/com_menus/separator/separator.menu.html.php:60
+msgid "Pattern/Name:"
+msgstr "Pattern/Nome:"
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Creates a menu placeholder or separator "
+msgstr "Cria um separador ou placeholder de menu"
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Separator / Placeholder"
+msgstr "Separador / Placeholder"
+
+#: administrator/components/com_menus/toolbar.menus.html.php:24
+msgid "Next"
+msgstr "Próximo"
+
+#: administrator/components/com_menus/toolbar.menus.html.php:37
+#: administrator/components/com_menus/toolbar.menus.html.php:182
+msgid "Move"
+msgstr "Mover"
+
+#: administrator/components/com_menus/url/url.menu.html.php:40
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:41
+msgid "You must provide a url."
+msgstr "Você deve informar uma URL:"
+
+#: administrator/components/com_menus/url/url.menu.html.php:51
+msgid "Menu Item :: Link - URL"
+msgstr "Item de Menu :: Link - URL"
+
+#: administrator/components/com_menus/url/url.menu.html.php:75
+msgid "Link:"
+msgstr "Link:"
+
+#: administrator/components/com_menus/url/url.xml
+msgid "Creates url link"
+msgstr "Cria um link para uma URL"
+
+#: administrator/components/com_menus/url/url.xml
+msgid "Link - Url"
+msgstr "Link - URL"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Weblink Category"
+msgstr "Item de Menu :: Tabela - Categoria de Links Web"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Shows a Table view of Weblink items for a particular Weblink Category"
+msgstr ""
+"Mostra uma visão de tabela de links web para uma categoria particular de "
+"links web"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Table - Weblink Category"
+msgstr "Tabela - Categoria de Links Web"
+
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:59
+msgid "Menu Item :: Wrapper"
+msgstr "Item de Menu :: Wrapper"
+
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:83
+msgid "Wrapper Link:"
+msgstr "Wrapper Link:"
+
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Creates an IFrame that will wrap an external page/site into Mambo"
+msgstr "Cria um iframe que pode wrap uma página/site externo dentro do Mambo"
+
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Wrapper"
+msgstr "Wrapper"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:42
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "Menu Manager"
+msgstr "Gerenciador de Menus"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:53
+msgid "Menu Name"
+msgstr "Nome do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:59
+msgid "# Published"
+msgstr "# Publicados"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:62
+msgid "# Unpublished"
+msgstr "# Não Publicados"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:68
+msgid "# Modules"
+msgstr "# Módulos"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:94
+msgid "Edit Menu Name"
+msgstr "Editar Nome do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:99
+msgid "Edit Menu Items"
+msgstr "Editar Itens do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:156
+msgid "Please enter a menu name"
+msgstr "Por favor, digite um nome para o menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:164
+msgid "Please enter a module name for your menu"
+msgstr "Por favor digite um nome para seu menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:182
+msgid "Menu Details"
+msgstr "Detalhes do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:190
+msgid "Menu Name:"
+msgstr "Nome do Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:195
+msgid ""
+"This is the identification name used by mambo to identify this menu within "
+"the code - it must be unique. It is recommended that you do not have any "
+"spaces in your Menu Name"
+msgstr ""
+"Este é um nome de identificação usado pelo Mambo para identificar este menu "
+"dentro do código - ele deve ser único. É recomendado que você não coloque "
+"nenhum espaço nos nomes de menus"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:210
+msgid "Title of the mod_mainmenu module required to show this Menu"
+msgstr "Título do módulo mod_mainmenu necessário para mostrar este menu."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:216
+msgid ""
+"A new mod_mainmenu module, with the Title you have entered above will "
+"automatically be created when you save this menu."
+msgstr ""
+"Um novo módulo mod_mainmenu com o título informado acima será criado "
+"automaticamente quando este menu for salvo."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:218
+msgid ""
+"Parameters for the module created are to be edited through the \"Modules "
+"Manager [site]\": Modules -> Site Modules"
+msgstr ""
+"Os parâmetros do módulo criado podem ser editados em \"Gerenciador de "
+"Módulos [site]\": Módulos -> Módulos do Site"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:266
+#, php-format
+msgid "Delete Menu: %s"
+msgstr "Apagar Menu: %s"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:279
+msgid "Module(s) being Deleted:"
+msgstr "Módulos a serem Apagados:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:301
+msgid "Menu Items being Deleted:"
+msgstr "Itens de Menu a serem Apagados:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:319
+msgid ""
+"This will <span style=\"font-weight:bold;color:#FF0000\">Delete</span> this "
+"Menu, <br />ALL its Menu Items and the Module(s) associated with it"
+msgstr ""
+"Isto irá <span style=\"font-weight:bold;color:#FF0000\">Apagar</span> este "
+"menu, todos os itens de menu dentro dele<br/> e o(s) módulo(s) associados à "
+"ele."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:322
+msgid ""
+"Are you sure you want to Delete this menu? \\nThis will Delete the Menu, its "
+"Items and the Module(s)."
+msgstr ""
+"Você tem certeza que deseja apagar este menu? \\nIsto irá apagar o menu, "
+"seus itens e o Módulo."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:354
+msgid "Please enter a name for the copy of the Menu"
+msgstr "Por favor digite um nome para a cópia do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:357
+msgid "Please enter a name for the new Module"
+msgstr "Por favor digite um nome para o novo Módulo"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:371
+msgid "Copy Menu"
+msgstr "Copiar Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:381
+msgid "New Menu Name:"
+msgstr "Novo Nome de Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:385
+msgid "New Module Name:"
+msgstr "Novo Nome de Módulo:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:392
+msgid "Menu being copied:"
+msgstr "Menu a ser copiado:"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:207
+msgid ""
+"You cannot rename the \"mainmenu\" Menu as this will disrupt the proper "
+"operation of Mambo"
+msgstr ""
+"Você não pode renomear o menu \"mainmenu\" pois isso altera o funcionamento "
+"do Mambo"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:223
+msgid ""
+"A menu already exists with that name - you must enter a unique Menu Name"
+msgstr ""
+"Já existe um menu com este nome - você deve informar um nome de Menu único"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:258
+#, php-format
+msgid "New Menu created [ %s ]"
+msgstr "Novo Menu criado [%s]"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:312
+msgid "Menu Items & Modules updated"
+msgstr "Itens de Menu e Módulos atualizados"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:326
+#: administrator/components/com_menumanager/admin.menumanager.php:376
+msgid "You cannot delete the \"mainmenu\" menu as it is a core menu"
+msgstr ""
+"VocVocê não pode apagar o menu \"mainmenu\" pois ele é um menu obrigatório"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:467
+msgid ""
+"A menu with that name already exists - you must enter a unique Menu Name"
+msgstr ""
+"Já existe um menu com este nome - você deve informar um nome de Menu único"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:527
+#, php-format
+msgid "Copy of Menu `%s` created, consisting of %d item"
+msgid_plural "Copy of Menu `%s` created, consisting of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "This component manages your Menus."
+msgstr "Este componente gerencia seus menus."
+
+#: administrator/components/com_media/admin.media.html.php:84
+#: administrator/components/com_media/media.xml
+msgid "Media Manager"
+msgstr "Gerenciador de Mídia"
+
+#: administrator/components/com_media/admin.media.html.php:91
+msgid "Directory"
+msgstr "Diretório"
+
+#: administrator/components/com_media/admin.media.html.php:115
+msgid "Max size"
+msgstr "Tamanho Máx."
+
+#: administrator/components/com_media/admin.media.html.php:119
+#: administrator/components/com_media/admin.media.html.php:212
+#: administrator/components/com_media/admin.media.html.php:281
+msgid "Code"
+msgstr "Código"
+
+#: administrator/components/com_media/admin.media.html.php:123
+msgid "Create Directory"
+msgstr "Criar Dire'torio"
+
+#: administrator/components/com_media/admin.media.html.php:163
+msgid "No Images Found"
+msgstr "Nenhuma Imagem Encontrada"
+
+#: administrator/components/com_media/admin.media.html.php:174
+#, php-format
+msgid "Configuration Problem: &quot; %s &quot; does not exist."
+msgstr "Problema de Configuração: &quot; %s &quot; não existem."
+
+#: administrator/components/com_media/admin.media.html.php:270
+msgid "Insert your text here"
+msgstr "Digite seu texto aqui"
+
+#: administrator/components/com_media/admin.media.html.php:369
+msgid "\"Delete file \\\"\"+file+\"\\\"?\""
+msgstr "\"Apagar arquivo \\\"\"+file+\"\\\"?\""
+
+#: administrator/components/com_media/admin.media.html.php:377
+msgid ""
+"\"There are \"+numFiles+\" files/folders in \\\"\"+folder+\"\\\".\\n"
+"\\nPlease delete all files/folder in \\\"\"+folder+\"\\\" first.\""
+msgstr ""
+"\"Aqui existem \"+numFiles+\" arquivos/pastas em \\\"\"+folder+\"\\\".\\n"
+"\\nPor favor remova todos os arquivos/pastas em  \\\"\"+folder+\"\\\" "
+"primeiro.\""
+
+#: administrator/components/com_media/admin.media.html.php:381
+msgid "\"Delete folder \\\"\"+folder+\"\\\"?\""
+msgstr "\"Apagar pasta \\\"\"+folder+\"\\\"?\""
+
+#: administrator/components/com_media/admin.media.php:33
+msgid "NO HACKING PLEASE"
+msgstr "NÃO HACKEIE POR FAVOR"
+
+#: administrator/components/com_media/admin.media.php:45
+msgid ""
+"Directory creation not allowed while running in SAFE MODE as this can cause "
+"problems."
+msgstr ""
+"A criação de diretórios não é permitida enquanto o site está rodando em SAFE "
+"MODE pois isso pode causar problemas."
+
+#: administrator/components/com_media/admin.media.php:89
+msgid ""
+"Directory name must only contain alphanumeric characters and no spaces "
+"please."
+msgstr ""
+"Nome de diretórios devem conter somente caracteres alfanuméricos e não pode "
+"conter espaços."
+
+#: administrator/components/com_media/admin.media.php:125
+msgid "Unable to delete: not empty!"
+msgstr "Impossível apagar: não está vazio!"
+
+#: administrator/components/com_media/admin.media.php:157
+msgid "Upload FAILED. File already exists"
+msgstr "Envio FALHOU. Arquivo já existe"
+
+#: administrator/components/com_media/admin.media.php:161
+msgid ""
+"Only files of type gif, png, jpg, bmp, pdf, swf, doc, xls or ppt can be "
+"uploaded"
+msgstr ""
+"Somente arquivos dos tipos gif, png, jpg, bmp, pdf, swf, doc, xls ou ppt "
+"pode ser enviados"
+
+#: administrator/components/com_media/admin.media.php:165
+msgid "Upload FAILED"
+msgstr "Envio FALHOU"
+
+#: administrator/components/com_media/admin.media.php:169
+msgid "Upload complete"
+msgstr "Envio completo"
+
+#: administrator/components/com_media/media.xml
+msgid "This component manages site media"
+msgstr "Este componente gerencia mídia dos sites"
+
+#: administrator/components/com_media/toolbar.media.html.php:25
+msgid "Upload"
+msgstr "Enviar"
+
+#: administrator/components/com_media/toolbar.media.html.php:27
+msgid "Create"
+msgstr "Criar"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:30
+msgid "Please fill in the subject"
+msgstr "Por favor, preencha o assunto"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:32
+msgid "Please select a group"
+msgstr "Por favor selecione um grupo"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:34
+msgid "Please fill in the message"
+msgstr "Por favor preencha a mensagem"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:45
+#: administrator/components/com_massmail/massmail.xml
+msgid "Mass Mail"
+msgstr "E-mail em Massa"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:66
+msgid "Mail to Child Groups:"
+msgstr "E-mail para Grupos Filhos:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:74
+msgid "Send in HTML mode:"
+msgstr "Enviar em modo HTML:"
+
+#: administrator/components/com_massmail/admin.massmail.php:39
+msgid "- All User Groups -"
+msgstr "- Todos os Grupos de Usuários -"
+
+#: administrator/components/com_massmail/admin.massmail.php:69
+msgid "Please fill in the form correctly"
+msgstr "Por favor preencha o formulário corretamente"
+
+#. Build e-mail message format
+#: administrator/components/com_massmail/admin.massmail.php:92
+#, php-format
+msgid ""
+"This is an email from '%s'\n"
+"\n"
+"Message:\n"
+msgstr ""
+"Este é um e-mail de '%s'\n"
+"\n"
+"Mensagem:\n"
+
+#: administrator/components/com_massmail/admin.massmail.php:105
+#, php-format
+msgid "E-mail sent to %d user."
+msgid_plural "E-mail sent to %d users."
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_massmail/massmail.xml
+msgid "This component allows you to send a mass email to certain user groups"
+msgstr ""
+"Este componente permite que você envie e-mails em massa para certos grupos "
+"de usuários"
+
+#: administrator/components/com_massmail/toolbar.massmail.html.php:24
+msgid "Send Mail"
+msgstr "Enviar E-mail"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:34
+msgid "Mambot Manager"
+msgstr "Gerenciador de Mambots"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:55
+msgid "Mambot Name"
+msgstr "Nome do Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:76
+msgid "File"
+msgstr "Arquivo"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:179
+msgid "Mambot must have a name"
+msgstr "O Mambot deve ter um nome"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:181
+msgid "Mambot must have a filename"
+msgstr "O Mambot deve ter um nome de arquivo"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:190
+msgid "Site Mambot:"
+msgstr "Mambot do Site:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:206
+msgid "Mambot Details"
+msgstr "Detalhes do Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:219
+msgid "Folder:"
+msgstr "Pasta:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:227
+msgid "Mambot file:"
+msgstr "Arquivo do Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:235
+msgid "Mambot Order:"
+msgstr "Ordem do Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:285
+msgid "No Parameters"
+msgstr "Sem Parâmetros"
+
+#: administrator/components/com_mambots/admin.mambots.php:184
+#, php-format
+msgid "Successfully Saved changes to Mambot: %s"
+msgstr "Alterações salvas com sucesso para o Mambot: %s"
+
+#: administrator/components/com_mambots/admin.mambots.php:189
+#, php-format
+msgid "Successfully Saved Mambot: %s"
+msgstr "Mambot salvo com sucesso: %s"
+
+#: administrator/components/com_mambots/admin.mambots.php:247
+msgid "This mambot cannot be reordered"
+msgstr "Este mambot não pdoe ser reordenado"
+
+#: administrator/components/com_mambots/admin.mambots.php:269
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+"Novos itens são colocados no fim por padrão. A ordem pode ser alterada "
+"depois que este item for salvo."
+
+#: administrator/components/com_mambots/admin.mambots.php:307
+#, php-format
+msgid "Select a mambot to %s"
+msgstr "Selecione um mambost para %s"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Login Image"
+msgstr "Alinhamento para Imagem de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Logout Image"
+msgstr "Alinhamento para Imagem de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Contact Items"
+msgstr "Itens de Contato"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Login Page"
+msgstr "Imagem para a Página de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Logout Page"
+msgstr "Imagem para a Página de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description"
+msgstr "Descrição de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description Text"
+msgstr "Texto de Descrição de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image"
+msgstr "Imagem de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image Align"
+msgstr "Alinhamento de Imagem de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login JS Message"
+msgstr "Mensagem de Login em Javascript"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Page Title"
+msgstr "Título da Página de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Redirection URL"
+msgstr "URL de Redirecionamento de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description"
+msgstr "Descrição de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description Text"
+msgstr "Texto de Descrição de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image"
+msgstr "Imagem de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image Align"
+msgstr "Alinhamento de Imagem de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout JS Message"
+msgstr "Mensagem de Logout em Javascript"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Page Title"
+msgstr "Título da Página de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Redirection URL"
+msgstr "URL de Redirecionamento de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Parameters for individual Contact Items"
+msgstr "Parâmetros para itens de contato individuais"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Login Description below"
+msgstr "Mostrar/Esconder a Descrição de Login abaixo"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Logout Description below"
+msgstr "Mostrar/Esconder a Descrição de Logout abaixo"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr "Mostrar/Esconder o pop-up em Javascript indicando sucesso no Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr "Mostrar/Esconder o pop-up em Javascript indicando sucesso no Logout"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the login Page, if left blank _LOGIN_DESCRIPTION will be "
+"used"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the logout Page, if left blank _LOGOUT_DESCRIPTION will "
+"be used"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will be redirected to after logout, if let blank will load front "
+"page"
+msgstr ""
+"Para qual página o usuário deve ser redirecionado depois do logout. Se for "
+"deixado em branco será redirecionado para a página principal"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+"Para qual página o usuário deve ser redirecionado depois do login. Se for "
+"deixado em branco será redirecionado para a página principal"
+
+#: components/com_login/login.html.php:58
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: components/com_login/login.html.php:62
+msgid "Password"
+msgstr "Senha"
+
+#: components/com_login/login.html.php:77
+msgid "Remember me"
+msgstr "Lembre-me"
+
+#: components/com_login/login.html.php:81
+msgid "Password Reminder"
+msgstr "Lembrar Senha"
+
+#: components/com_login/login.html.php:87
+msgid "No account yet?"
+msgstr "Sem conta?"
+
+#: components/com_login/login.html.php:89
+msgid "Create one"
+msgstr "Crie Uma"
+
+#: components/com_login/login.html.php:101
+msgid "Login"
+msgstr "Login"
+
+#: components/com_login/login.html.php:109
+msgid "!Warning! Javascript must be enabled for proper operation."
+msgstr "!Atenção! O Javascript deve estar habilitado para efetiva operação."
+
+#: components/com_login/login.html.php:162
+msgid "Logout"
+msgstr "Logout"
+
+#: components/com_login/login.php:38
+msgid "To access the Private areas of this site please Login"
+msgstr "Para cesso as áreas reservadas do site, por favor, autentique-se"
+
+#: components/com_login/login.php:39
+msgid "You are now Logged in to a private area of this site"
+msgstr "Você agora está autenticado em uma área privada deste site"
+
+#: administrator/components/com_languages/actions/publish.action.php:25
+msgid "Configuration succesfully updated!"
+msgstr "Configuração alterada com sucesso!"
+
+#: administrator/components/com_languages/actions/publish.action.php:27
+msgid "Error! Make sure that configuration.php is writeable."
+msgstr ""
+"Erro! Confirme a permissão de escrita em seu arquivo configuration.php."
+
+#: administrator/components/com_languages/phpgettext.includes.php:283
+msgid "Text Domains"
+msgstr "Domínios de Textos"
+
+#: administrator/components/com_languages/phpgettext.includes.php:290
+msgid "Main"
+msgstr "Principal"
+
+#: administrator/components/com_languages/toolbar.languages.php:44
+msgid "Extract"
+msgstr "Extrair"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:9
+msgid "Compile Catalog?"
+msgstr "Compilar Catálogo?"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:10
+msgid "yes"
+msgstr "sim"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:11
+msgid "no"
+msgstr "não"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:22
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:35
+msgid "MsgId"
+msgstr "ID"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:24
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:37
+msgid "MsgId Plural"
+msgstr "ID Plural"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:25
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:54
+msgid "MsgStr"
+msgstr "Str"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:27
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:41
+msgid "Plural form"
+msgstr "Forma de Plural"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:43
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:58
+msgid "Fuzzy Entry"
+msgstr "Entrada Fuzzy"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Catalog dump"
+msgstr "Cópia do Catálogo"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Comments"
+msgstr "Comentários"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Headers"
+msgstr "Cabeçalhos"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Strings"
+msgstr "Strings"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:11
+msgid "PHPGettext Example"
+msgstr "Exemplo de PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:21
+msgid "PHPGettext"
+msgstr "PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:22
+msgid "Gettext for PHP"
+msgstr "Gettext para PHP"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:25
+msgid "Current language is:"
+msgstr "Idioma atual:"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:34
+msgid "Change language"
+msgstr "Alterar idioma"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:41
+msgid "Gettext is enabled!"
+msgstr "Gettext está habilitado!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:43
+msgid "Gettext is disabled!"
+msgstr "Gettext está desabilitado!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:55
+msgid "Disable Gettext"
+msgstr "Desabilitar Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:56
+msgid "Enable Gettext"
+msgstr "Habilitar Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:57
+msgid "Extract Strings"
+msgstr "Extrair Strings"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:58
+msgid "Run Unit Tests"
+msgstr "Executar Testes de Unidades"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:59
+msgid "Clear Tests"
+msgstr "Limpar Testes"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:4
+msgid "Language Manager"
+msgstr "Gerenciador de Idiomas"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:17
+msgid "Languages"
+msgstr "Idiomas"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:32
+msgid "Author Email"
+msgstr "E-mail do Autor"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:10
+msgid "Create Translation for:"
+msgstr "Tradução Criada por:"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:20
+msgid "Delete This Template"
+msgstr "Apagar Esta Template"
+
+#: administrator/components/com_installer/admin.installer.html.php:35
+#: administrator/components/com_installer/admin.installer.php:149
+msgid "Please select a directory"
+msgstr "Por favor, selecione um diretório"
+
+#: administrator/components/com_installer/admin.installer.html.php:56
+msgid "Upload Package File"
+msgstr "Envio de Arquivo de Pacote"
+
+#: administrator/components/com_installer/admin.installer.html.php:61
+msgid "Package File:"
+msgstr "Arquivo de Pacote:"
+
+#: administrator/components/com_installer/admin.installer.html.php:63
+msgid "Upload File &amp; Install"
+msgstr "Enviar Arquivo &amp; Instalar"
+
+#: administrator/components/com_installer/admin.installer.html.php:79
+msgid "Install from directory"
+msgstr "Instalar do Diretório:"
+
+#: administrator/components/com_installer/admin.installer.html.php:84
+msgid "Install directory:"
+msgstr "Diretório de Instalação"
+
+#: administrator/components/com_installer/admin.installer.html.php:86
+msgid "Install"
+msgstr "Instalar"
+
+#: administrator/components/com_installer/admin.installer.html.php:148
+msgid "Continue ..."
+msgstr "Continuar..."
+
+#: administrator/components/com_installer/admin.installer.php:160
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Error"
+msgstr "Erro"
+
+#: administrator/components/com_installer/admin.installer.php:160
+msgid "Install new "
+msgstr "Instalar novo"
+
+#: administrator/components/com_installer/admin.installer.php:160
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Success"
+msgstr "Sucesso!"
+
+#: administrator/components/com_installer/admin.installer.php:180
+msgid "Uninstall "
+msgstr "Desinstalar"
+
+#: administrator/components/com_installer/admin.installer.php:198
+msgid "Failed to change the permissions of the uploaded file."
+msgstr "Falha na alteração de permissões do arquivo enviado."
+
+#: administrator/components/com_installer/admin.installer.php:201
+msgid "Failed to move uploaded file to <code>/media</code> directory."
+msgstr ""
+"Falha na movimentação de arquivo enviado para o diretório <code>/media</code>"
+
+#: administrator/components/com_installer/admin.installer.php:204
+msgid "Upload failed as <code>/media</code> directory is not writable."
+msgstr ""
+"Falha no envio para o diretório <code>/media</code>. Diretório somente "
+"leitura"
+
+#: administrator/components/com_installer/admin.installer.php:207
+msgid "Upload failed as <code>/media</code> directory does not exist."
+msgstr ""
+"Falha no envio para o diretório <code>/media</code>. Diretório não existe"
+
+#: administrator/components/com_installer/admin.installer.php:223
+#: administrator/components/com_installer/admin.installer.php:298
+#: administrator/components/com_installer/admin.installer.php:303
+#: administrator/components/com_installer/admin.installer.php:308
+#: administrator/components/com_installer/admin.installer.php:365
+msgid "Uninstall -  error"
+msgstr "Desinstalação - Erro"
+
+#: administrator/components/com_installer/admin.installer.php:228
+msgid "Is core component - may not be deleted"
+msgstr "Este é um componente do core - não pode ser removido"
+
+#: administrator/components/com_installer/admin.installer.php:229
+#, php-format
+msgid ""
+"Component %s is a core component, and can not be uninstalled.<br />You need "
+"to unpublish it if you don't want to use it"
+msgstr ""
+"Componente %s é um componente do sistema e não pode ser desinstalado.<br /"
+">Você precisa despublicá-lo se não deseja usá-lo"
+
+#: administrator/components/com_installer/admin.installer.php:268
+#, php-format
+msgid ""
+"%s is a core module, and can not be uninstalled.<br />You need to unpublish "
+"it if you don't want to use it"
+msgstr ""
+"%s é um módulo do sistema e não pode ser desinstalado.<br />Você precisa "
+"despublicá-lo se não deseja usá-lo"
+
+#: administrator/components/com_installer/admin.installer.php:303
+msgid "Invalid object id"
+msgstr "Identificador de Objeto Inválido"
+
+#: administrator/components/com_installer/admin.installer.php:308
+msgid "Folder field empty, cannot remove files"
+msgstr "Campo de pasta vazio, não é possível remover arquivos"
+
+#: administrator/components/com_installer/admin.installer.php:365
+msgid "Language id empty, cannot remove files"
+msgstr "Identificador de Idioma vazio, não é possível remover arquivos"
+
+#: administrator/components/com_installer/component/component.html.php:30
+msgid "Installed Components"
+msgstr "Componentes Instalados"
+
+#: administrator/components/com_installer/component/component.html.php:38
+msgid "Currently Installed"
+msgstr "Atualmente Instalado"
+
+#: administrator/components/com_installer/component/component.html.php:41
+msgid "Component Menu Link"
+msgstr "Link de Menu para Componente"
+
+#: administrator/components/com_installer/component/component.html.php:96
+msgid "There are no custom components installed"
+msgstr "Não existem componentes customizados instalados"
+
+#: administrator/components/com_installer/component/component.php:21
+msgid "Install new Component"
+msgstr "Instalar novo componente"
+
+#: administrator/components/com_installer/installer.class.php:57
+#, php-format
+msgid "XML error in %s: no handler %s"
+msgstr "Erro de XML em %s: sem cabeçalho %s"
+
+#: administrator/components/com_installer/installer.class.php:59
+#, php-format
+msgid "XML error in %s: mosinstall has no type"
+msgstr "Erro de XML em %s: mosinstall não possui tipo"
+
+#: administrator/components/com_installer/installer.class.php:64
+#, php-format
+msgid "XML Error in %s: install has no name"
+msgstr "Erro de XML em %s: instalação não possui nome"
+
+#: administrator/components/com_installer/installer.class.php:89
+#, php-format
+msgid "XML error in %s: MENU found, but this is not component XML"
+msgstr "Erro de XML em %s: MENU encontrado mas não é um componente XML"
+
+#: administrator/components/com_installer/installer.class.php:117
+#, php-format
+msgid "XML Error in %s: Mambot does not have a group specified"
+msgstr "Erro de XML em %s: O Mambot não possui um grupo especificado"
+
+#: administrator/components/com_installer/installer.class.php:142
+#, php-format
+msgid "XML error in %s: no installer %s"
+msgstr "Erro de XML em %s: Sem instalador %s"
+
+#: administrator/components/com_installer/installer.class.php:188
+#, php-format
+msgid "Installer error with %s: unable to create admin directory for %s %s"
+msgstr ""
+"Erro de Instalação com %s: não é possível criar um diretório de "
+"administração para %s %s"
+
+#: administrator/components/com_installer/installer.class.php:195
+#, php-format
+msgid "Installer error with %s: unable to create user directory for %s %s"
+msgstr ""
+"Erro de Instalação com %s: não é possível criar um diretório de usuário para "
+"%s %s"
+
+#: administrator/components/com_installer/installer.class.php:221
+#, php-format
+msgid "Installer error with %s: writing component menu SQL error %s"
+msgstr "Erro de Instalação com %s: erro na escrita de menu SQL %s"
+
+#: administrator/components/com_installer/installer.class.php:233
+#: administrator/components/com_installer/installer.class.php:279
+#: administrator/components/com_installer/installer.class.php:316
+#: administrator/components/com_installer/installer.class.php:344
+#, php-format
+msgid "Installer error with %s: %s %s already installed"
+msgstr "Erro de Instalação com %s: %s %s já está instalado"
+
+#: administrator/components/com_installer/installer.class.php:249
+#: administrator/components/com_installer/installer.class.php:301
+#: administrator/components/com_installer/installer.class.php:335
+#, php-format
+msgid "Installer error with %s: %s %s SQL error %s"
+msgstr "Erro de Instalação com %s: %s %s erro SQL %s"
+
+#: administrator/components/com_installer/installer.class.php:270
+#: administrator/components/com_installer/installer.class.php:308
+#, php-format
+msgid "Installer error with %s: no file identified as the %s"
+msgstr "Erro de Instalação com %s: nenhum arquivo identificado com o %s"
+
+#: administrator/components/com_installer/installer.class.php:430
+#, php-format
+msgid "Uninstaller error with %s: no uninstaller %s"
+msgstr "Erro de Desinstalação com %s: sem desinstalador %s"
+
+#: administrator/components/com_installer/installer.class.php:493
+#, php-format
+msgid "Uninstaller error with %s: %s %s SQL error %s"
+msgstr "Erro de Desinstalação com %s: %s %s erro SQL %s"
+
+#: administrator/components/com_installer/installer.class.php:503
+#: administrator/components/com_installer/installer.class.php:525
+#: administrator/components/com_installer/installer.class.php:544
+#, php-format
+msgid "Uninstaller error with %s: %s %s not fully deleted from database"
+msgstr ""
+"Erro de Desinstalação com %s: %s %s não foi completamente removido da base "
+"de dados"
+
+#: administrator/components/com_installer/installer.class.php:516
+#, php-format
+msgid "Uninstaller error with %s: no file identified as the %s"
+msgstr "Erro de Desinstalação com %s: nenhum arquivo identificado com o %s"
+
+#: administrator/components/com_installer/installer.class.php:621
+#, php-format
+msgid "Installer unrecoverable ZIP error %s in %s"
+msgstr "Erro de ZIP irrecuperável de instalação %s em %s"
+
+#: administrator/components/com_installer/installer.class.php:630
+#, php-format
+msgid "Installer unrecoverable TAR error in %s"
+msgstr "Erro de TAR irrecuperável de instalação %s"
+
+#: administrator/components/com_installer/language/language.php:19
+msgid "Back to Language Manager"
+msgstr "Voltar para o Gerenciador de Idiomas"
+
+#: administrator/components/com_installer/language/language.php:20
+msgid "Install new Language - Site"
+msgstr "Instalar Novo Idioma - Site"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:29
+msgid "Installed Mambots"
+msgstr "Mambots Instalados"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:34
+msgid ""
+"Only those Mambots that can be uninstalled are displayed - some Core Mambots "
+"cannot be removed."
+msgstr ""
+"Somente os Mambots que podem ser desinstalados são apresentados - Alguns "
+"Mambots do sistema não podem ser removidos"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:45
+msgid "Mambot"
+msgstr "Mambot"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:124
+msgid "There are no non-core, custom mambots installed."
+msgstr "Não existe mambots do customizados instalados."
+
+#: administrator/components/com_installer/mambot/mambot.php:21
+msgid "Install new Mambots"
+msgstr "Instalar novo Mambot"
+
+#: administrator/components/com_installer/module/module.html.php:27
+msgid "Installed Modules"
+msgstr "Módulos Instalados"
+
+#: administrator/components/com_installer/module/module.html.php:38
+msgid ""
+"Only those Modules that can be uninstalled are displayed - some Core Modules "
+"cannot be removed."
+msgstr ""
+"Somente os Módulos que podem ser desinstalados são apresentados - Alguns "
+"Módulos do sistema não podem ser removidos"
+
+#: administrator/components/com_installer/module/module.html.php:47
+msgid "Module File"
+msgstr "Arquivo de Módulo"
+
+#: administrator/components/com_installer/module/module.html.php:50
+msgid "Client"
+msgstr "Cliente"
+
+#: administrator/components/com_installer/module/module.html.php:101
+msgid "No custom modules installed"
+msgstr "Nenhum módulo customizado instalado"
+
+#: administrator/components/com_installer/module/module.php:21
+msgid "Install new Modules"
+msgstr "Instalar Novos Módulos"
+
+#: administrator/components/com_installer/module/module.php:41
+msgid "Site Modules"
+msgstr "Módulos do Site"
+
+#: administrator/components/com_installer/module/module.php:42
+msgid "Admin Modules"
+msgstr "Módulos do Administrador"
+
+#: administrator/components/com_installer/template/template.php:24
+msgid "Install new Template"
+msgstr "Instalar Novo Modelo"
+
+#: administrator/components/com_installer/template/template.php:26
+msgid "Back to Templates"
+msgstr "Voltar para os Modelos"
+
+#: administrator/components/com_installer/toolbar.installer.html.php:25
+msgid "Uninstall"
+msgstr "Desinstalar"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:28
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:205
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:209
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:210
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:211
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:212
+msgid "OFF"
+msgstr "Desligado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:28
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:206
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:207
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:208
+msgid "ON"
+msgstr "Ligado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:44
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:28
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:28
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:180
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:48
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:302
+msgid "Mambo - Web Installer"
+msgstr "Instalador Web - Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:67
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:52
+msgid "Please read/accept license to continue installation"
+msgstr "Por favor, leia/aceite a licença para continuar com a instalação"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:79
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:63
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:62
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:203
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:110
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:309
+msgid "Mambo Installation"
+msgstr "Instalação do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:86
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:96
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:70
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:69
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:217
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:123
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:316
+msgid "pre-installation check"
+msgstr "Verificação de pré-instalação"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:87
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:71
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:78
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:70
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:218
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:124
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:317
+msgid "license"
+msgstr "Licença"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:88
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:72
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:71
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:219
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:125
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:318
+msgid "step 1"
+msgstr "Passo 1"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:89
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:73
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:72
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:220
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:230
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:126
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:319
+msgid "step 2"
+msgstr "Passo 2"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:90
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:74
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:73
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:221
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:127
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:131
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:320
+msgid "step 3"
+msgstr "Passo 3"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:91
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:75
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:74
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:222
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:128
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:321
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:324
+msgid "step 4"
+msgstr "Passo 4"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:103
+msgid "Pre-installation check for:"
+msgstr "Verificação de pré-instalação para:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:104
+msgid ""
+"\n"
+"If any of these items are highlighted\n"
+"in red then please take actions to correct them. Failure to do so\n"
+"could lead to your Mambo installation not functioning\n"
+"correctly."
+msgstr ""
+"\n"
+"Se qualquer um destes itens estão destacados\n"
+"em vermelho é necessário executar algumas ações para corrigí-los. Falhas "
+"aqui podem fazer com que seu Mambo não funcione\n"
+"corretamente."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:118
+msgid "PHP version"
+msgstr "Versão do PHP"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:126
+msgid "zlib compression support"
+msgstr "suporte à compressão zlib"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:129
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:137
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:145
+msgid "Available"
+msgstr "Disponível"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:129
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:137
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:145
+msgid "Unavailable"
+msgstr "Não Disponível"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:134
+msgid "XML support"
+msgstr "Suporte a XML"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:142
+msgid "MySQL support"
+msgstr "Suporte a MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:159
+msgid ""
+"You can still continue the install as the configuration will be displayed at "
+"the end, just copy & paste this and upload."
+msgstr ""
+"Você ainda pode continuar com a instalação. Como a configuração é mostrada "
+"no final, somente copie e cole e faça o upload do arquivo."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:165
+msgid "Session save path"
+msgstr "Caminho de sessões salvas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:177
+msgid "Recommended settings:"
+msgstr "Configurações recomendadas:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:179
+msgid ""
+"These settings are recommended for PHP in order to ensure full\n"
+"compatibility with Mambo.\n"
+"However, Mambo will still operate if your settings do not quite match the "
+"recommended."
+msgstr ""
+"Estas configurações são recomendadas para completa compatibilidade \n"
+"do PHP com o Mambo.\n"
+"Entretanto o Mambo ainda pode funcionar se estas configurações não estiverem "
+"como recomendado."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:195
+msgid "Directive"
+msgstr "Diretiva"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:198
+msgid "Recommended"
+msgstr "Recomendado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:201
+msgid "Actual"
+msgstr "Atual"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:243
+msgid "Directory and File Permissions:"
+msgstr "Permissões de Arquivos e Diretórios:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:245
+msgid ""
+"In order for Mambo to function\n"
+"correctly it needs to be able to access or write to certain files\n"
+"or directories. If you see \"Unwriteable\" you need to change the\n"
+"permissions on the file or directory to allow Mambo\n"
+"to write to it."
+msgstr ""
+"Para o bom funcionamento do Mambo\n"
+"é necessário permitir o acesso de leitura e escrita em certos arquivos\n"
+" ou diretórios. Se você encontrar \"Somente Leitura\", você precisa alterar "
+"as permissões do arquivo ou diretório para permitir\n"
+"que o Mambo escreva neles."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:83
+msgid "GNU/GPL License:"
+msgstr "Licença GNU/GPL:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:85
+msgid ""
+"<a href=\"http://www.mamboserver.com\">Mambo </a> is Free Software released "
+"under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU/GPL License </"
+"a>.\n"
+"\t\t\t\t<div class=\"error\">*** To continue installing Mambo you must check "
+"the box under the license ***</div>"
+msgstr ""
+"<a href=\"http://www.mamboserver.com\">Mambo </a> é um Software Livre "
+"disponível sob a <a href=\"http://www.gnu.org/copyleft/gpl.html\">Licença "
+"GNU/GPL</a>.\n"
+"\t\t\t\t<div class=\"error\">*** Para continuar instalando o Mambo você deve "
+"clicar na caixa abaixo da licença ***</div>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:100
+msgid "I understand that this software is released under the GNU/GPL License"
+msgstr "Eu entendo que este software está disponível sob a Licença GNU/GPL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:40
+msgid "Please enter a Host name"
+msgstr "Por favor, digite um nome de Host"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:44
+msgid "Please enter a Database User Name"
+msgstr "Por favor, digite um nome de usuário para o Banco de Dados"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:48
+msgid "Please enter a Name for your new Database"
+msgstr "Por favor, digite um nome para sua nova Base de Dados"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:51
+msgid ""
+"Are you sure these settings are correct? \\nMambo will now attempt to "
+"populate a Database with the settings you have supplied"
+msgstr ""
+"Você tem certeza que estas configurações estão corretas? \\nO Mambo pode "
+"agora popular a base de dados com as configurações escolhidas por você"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:82
+msgid "MySQL database configuration:"
+msgstr "Configuração do MySQL:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:83
+msgid ""
+"\n"
+"  \t   \t\t\t<p>Setting up Mambo to run on your server involves 4 simple "
+"steps...</p>\n"
+"  \t   \t\t\t<p>Please enter the hostname of the server Mambo is to be "
+"installed on.</p>\n"
+"\t\t\t\t<p>Enter the MySQL username, password and database name you wish to "
+"use with Mambo.</p>\n"
+"\t\t\t\t<p>Enter the table name prefix to be used by this Mambo instance and "
+"select how\n"
+"\t\t\t\t   to do with in case existing tables from former installations.</"
+"p>\n"
+"\t\t\t\t<p>Install the samples unless you are experianced Mamber wanting to "
+"start with a completely empty site.</p>\n"
+"\t\t\t\t"
+msgstr ""
+"\n"
+"  \t   \t\t\t<p>Configurar o Mambo para rodar em seu servidor envolve 4 "
+"passos simples...</p>\n"
+"  \t   \t\t\t<p>Por favor, digite o nome do host do servidor onde o Mambo "
+"será instalado.</p>\n"
+"\t\t\t\t<p>Digite o nome de usuário do MySQL, a senha e o nome da base de "
+"dados que voc6e deseja usar com o Mambo.</p>\n"
+"\t\t\t\t<p>Digite o prefixo das tabelas para ser usado com esta instância do "
+"Mambo e selecione o que fazer\n"
+"\t\t\t\t   no caso de existirem tabelas de outras instalações.</p>\n"
+"\t\t\t\t<p>Não instale os dados de exemplo a menos que seja um Mamber "
+"experiente ou queira um site completamente limpo e vazio.</p>\n"
+"\t\t\t\t"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:101
+msgid "Host Name"
+msgstr "Nome do Host"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:102
+msgid "This is usually \"localhost\""
+msgstr "Usualmente \"localhost\""
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:105
+msgid "MySQL User Name"
+msgstr "Nome de Usuário do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:106
+msgid "Either something as \"root\" or a username given by the hoster"
+msgstr ""
+"Alguma coisa como \"root\" or um nome de usuário fornecido pelo seu hosting"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:109
+msgid "MySQL Password"
+msgstr "Senha do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:110
+msgid "For site security using a password for the mysql account in mandatory"
+msgstr ""
+"Para segurança do site o uso de uma senha para a conta do MySQL é mandatória"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:113
+msgid "Verify MySQL Password"
+msgstr "Redigite a Senha do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:114
+msgid "Retype password for verification"
+msgstr "Redigite a senha para verificação"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:117
+msgid "MySQL Database Name"
+msgstr "Nome da Base MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:118
+msgid ""
+"Some hosts allow only a certain DB name per site. Use table prefix in this "
+"case for distinct mambo sites."
+msgstr ""
+"Alguns hosts permitem somente uma base de dados por site. Use os prefixos de "
+"tabelas neste caso para separar sites do Mambo."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:121
+msgid "MySQL Table Prefix"
+msgstr "Prefixo das Tabelas do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:122
+msgid "Dont use \"old_\" since this is used for backup tables"
+msgstr "Não use \"old_\" pois é usado para backup de tabelas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:126
+msgid "Drop Existing Tables"
+msgstr "Apagar Tabelas Existentes"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:131
+msgid "Backup Old Tables"
+msgstr "Backup de Tabelas Antigas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:132
+msgid ""
+"Any exiting backup tables from former mambo installations will be replaced"
+msgstr ""
+"Quaisquer tabelas de backup existentes de instalações anteriores do Mambo "
+"podem ser trocadas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:136
+msgid "Install Sample Data"
+msgstr "Instalar Dados de Exemplo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:137
+msgid "Dont uncheck this unless you are experienced with mambo!"
+msgstr "Não desative isso a menos que tenha experiência com o Mambo!"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:35
+msgid "The database details provided are incorrect and/or empty."
+msgstr ""
+"Os detalhes informados para o banco de dados estão incorretos e/ou vazios."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:39
+msgid "The database passwords provided do not match.  Please try again."
+msgstr ""
+"A senha do banco de dados informada não bate. Por favor, tente novamente."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:43
+msgid "The password and username provided are incorrect."
+msgstr "A senha e o nome de usuário informados estão incorretos."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:47
+msgid "The database name provided is empty."
+msgstr "O nome da base de dados informado está vazio."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:62
+msgid "A database error occurred: "
+msgstr "Ocorreu um erro na base de dados: "
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:191
+msgid "Please enter a Site Name"
+msgstr "Por favor, digite um nome para o site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:233
+msgid "Enter the name of your Mambo site:"
+msgstr "Digite o nome do seu site Mambo:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:236
+msgid ""
+"Looks like there have been some errors with inserting data into your "
+"database!<br />\n"
+"  \t\t\tYou cannot continue."
+msgstr ""
+"Existem alguns erros com a inserção de dados em seu banco de dados!<br />\n"
+"  \t\t\tNão é possível continuar."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:239
+msgid "SUCCESS!"
+msgstr "SUCESSO!"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:242
+msgid ""
+"Type in the name for your Mambo site. This\n"
+"\t\t\tname is used in email messages so make it something meaningful."
+msgstr ""
+"Digite um nome para seu site Mambo. Este\n"
+"\t\t\tnome é usado em mensagens de e-mail, então coloque algo de fácil "
+"entendimento."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:253
+msgid "Error log:"
+msgstr "Log de Erros:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:264
+msgid "Site name"
+msgstr "Nome do site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:269
+msgid "e.g. The Home of Mambo"
+msgstr "por ex. A Casa do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:39
+msgid "The sitename has not been provided"
+msgstr "O nome do site não foi informado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:59
+msgid "Please enter Site URL"
+msgstr "Por favor, digite a URL do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:63
+msgid "Please enter the absolute path to your site"
+msgstr "Por favor, digite o caminho absoluto para seu site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:67
+msgid "Please enter an email address to contact your administrator"
+msgstr ""
+"Por favor, digite um endereço de e-mail para contato com seu administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:71
+msgid "Please enter a password for you administrator"
+msgstr "Por favor, digite uma senha para seu administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:136
+msgid "Confirm the site URL, path, admin e-mail and file/directory chmods"
+msgstr ""
+"Confirme a URL do site, caminho, e-mail do administrador e chmods de "
+"arquivos/diretórios"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:137
+msgid ""
+"\n"
+"\t\t\t\t  <p>If URL and Path looks correct then please do not change.\n"
+"\t\t\t\t  If you are not sure then please contact your ISP or administrator. "
+"Usually\n"
+"\t\t\t\t  the values displayed will work for your site.<br/>\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  Enter your e-mail address, this will be the e-mail address of the "
+"site\n"
+"\t\t\t\t  SuperAdministrator.<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  The permission settings will be used while installing mambo "
+"itself, by\n"
+"\t\t\t\t  the mambo addon-installers and by the media manager. If you are "
+"unsure\n"
+"\t\t\t\t  what flags shall be set, leave the default settings at the "
+"moment.\n"
+"\t\t\t\t  You can still change these flags later in the site global "
+"configuration.</p>"
+msgstr ""
+"\n"
+"\t\t\t\t  <p>Se a URl e o caminho informados parecem corretos, não os "
+"altere.\n"
+"\t\t\t\t  Se você não está certo disso, então contate seu provedor ou "
+"administrador. Usualmente\n"
+"\t\t\t\t  os valores mostrados funcionam com seu site.<br/>\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  Digite seu endereço de e-mail. Este pode ser o endereço de e-mail "
+"do \n"
+"\t\t\t\t  administrador do site.<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  As configurações de permissões usadas pelo Mambo são também usadas "
+"por\n"
+"\t\t\t\t  instaladores adicionais e pelo gerenciador de mídia. Se você não "
+"sabe\n"
+"\t\t\t\t  quais são as configurações a serem feitas neste momento,\n"
+"\t\t\t\t  você pode depois alterá-las nas configurações globais do site.</p>"
+
+#. if
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:200
+msgid "File Permissions"
+msgstr "Permissões de Arquivos"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:204
+msgid "Dont CHMOD files (use server defaults)"
+msgstr "Não faça CHMOD nos arquivos (usar padrão do servidor)"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:208
+msgid "CHMOD files to:"
+msgstr "CHMOD de arquivos para:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:217
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:226
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:235
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:275
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:284
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:293
+msgid "read"
+msgstr "leitura"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:219
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:228
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:237
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:277
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:286
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:295
+msgid "write"
+msgstr "escrita"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:221
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:230
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:239
+msgid "execute"
+msgstr "execução"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:233
+msgid "World:"
+msgstr "Todos:"
+
+#. if
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:258
+msgid "Directory Permissions"
+msgstr "Permissões de Diretórios"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:262
+msgid "Dont CHMOD directories (use server defaults)"
+msgstr "Não faça CHMOD nos diretórios (usar padrão do servidor)"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:266
+msgid "CHMOD directories to:"
+msgstr "CHMOD de diretórios para:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:279
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:288
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:297
+msgid "search"
+msgstr "procurar"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:68
+msgid "You must provide a valid admin email address."
+msgstr "Você deve informar um endereço de e-mail válido para o admin."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:94
+msgid "The database details provided are incorrect and/or empty"
+msgstr ""
+"Os detalhes informados para o banco de dados estão incorretos e/ou vazios."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:156
+msgid "This site is down for maintenance.<br /> Please check back again soon."
+msgstr ""
+"Este site está parado para manuntenção.<br/>Por favor, verifique mais tarde."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:157
+msgid ""
+"This site is temporarily unavailable.<br /> Please notify the System "
+"Administrator"
+msgstr ""
+"Este site está temporariamente indisponível.<br/>Por favor, notifique o "
+"administrador do sistema."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:160
+msgid "Mambo - the dynamic portal engine and content management system"
+msgstr ""
+"Mambo - a ferramenta dinâmica de portais e sistema de gerenciamento de "
+"conteúdo"
+
+#. chmod files and directories if desired
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:234
+msgid "Directory and file permissions left unchanged."
+msgstr "Permissões de arquivos e diretórios deixadas intactas."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:273
+msgid "File and directory permissions successfully changed."
+msgstr "Permissões de arquivos e diretórios alteradas com sucesso."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:275
+msgid "File and directory permissions could not be changed.<br/>"
+msgstr "Permissões de arquivos e diretórios não podem ser alteradas.<br/>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:276
+msgid "Please CHMOD mambo files and directories manually."
+msgstr "Por favor, altere o CHMOD de arquivos e diretórios manualmente."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:294
+msgid "The site url has not been provided"
+msgstr "A URL do site não foi informada"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:326
+msgid "View Site"
+msgstr "Ver o Site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:334
+msgid "Administration"
+msgstr "Administração"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:344
+msgid "Congratulations! Mambo is installed"
+msgstr "Parabéns! O Mambo está instalado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:345
+msgid ""
+"\n"
+"\t\t\t\t<p>Click the \"View Site\" button to start Mambo site or "
+"\"Administration\"\n"
+"\t\t\t\t   to take you to administrator login.</p>"
+msgstr ""
+"\n"
+"\t\t\t\t<p>Clique no botão \"Ver o Site\" para iniciar o Mambo ou "
+"\"Administração\"\n"
+"\t\t\t\t   para entrar no logind e administração.</p>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:352
+msgid "PLEASE REMEMBER TO COMPLETELY<br/>REMOVE THE INSTALLATION DIRECTORY"
+msgstr ""
+"POR FAVOR, LEMBRE-SE DE REMOVER COMPLETAMENTE<br/>O DIRETÓRIO DE INSTALAÇÃO "
+"(INSTALLATION)"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:353
+msgid "Administration Login Details"
+msgstr "Detalhes de Login de Administração"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:354
+msgid "Username :"
+msgstr "Nome de Usuário:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:355
+msgid "Password :"
+msgstr "Senha:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:360
+msgid ""
+"\n"
+"\t\t\t\t\t\t\t\tYour configuration file or directory is not writeable,\n"
+"\t\t\t\t\t\t\t\tor there was a problem creating the configuration file. "
+"You'll have to\n"
+"\t\t\t\t\t\t\t\tupload the following code by hand. Click in the textarea to "
+"highlight\n"
+"\t\t\t\t\t\t\t\tall of the code."
+msgstr ""
+"\n"
+"\t\t\t\t\t\t\t\tSuas configuração de arquivos e diretórios é somente "
+"leitura,\n"
+"\t\t\t\t\t\t\t\tou existe um problema na criação do arquivo de configuração. "
+"Você precisa fazer o\n"
+"\t\t\t\t\t\t\t\tupload do seguinte código manualmente. Clique na área de "
+"texto para selecionar\n"
+"\t\t\t\t\t\t\t\ttodo o código."
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:32
+msgid "Frontpage Manager"
+msgstr "Gerenciador de Página Principal"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:162
+msgid "Edit Content"
+msgstr "Editar Conteúdo"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:193
+msgid "Edit Section"
+msgstr "Editar Seção"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:152
+msgid "- All Categories -"
+msgstr "- Todas as Categorias -"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:189
+msgid "Select an item to %a"
+msgstr "Selecionar um item para %a"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage"
+msgstr "Página Principal"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"This component shows all the published content items from your site marked "
+"Show on Frontpage."
+msgstr ""
+"Este componente apresenta todos os itens publicados de seu site marcados "
+"como Mostrar na Página Principal"
+
+#: administrator/components/com_frontpage/toolbar.frontpage.html.php:27
+msgid "Remove"
+msgstr "Remover"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:36
+msgid "Please make a selection from the list to"
+msgstr "Por favor, faça uma seleção da lista para"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:102
+msgid "Please make a selection from the list to publish"
+msgstr "Por favor, faça uma seleção da lista para publicar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:142
+msgid "Please make a selection from the list to unpublish"
+msgstr "Por favor, faça uma seleção da lista para despublicar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:155
+msgid "Archive"
+msgstr "Arquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:162
+msgid "Please make a selection from the list to archive"
+msgstr "Por favor, faça uma seleção da lista para arquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:175
+msgid "Unarchive"
+msgstr "Desarquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:182
+msgid "Please select a news story to unarchive"
+msgstr "Por favor, selecione uma notícia para desarquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:202
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:221
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:240
+msgid "Please select an item from the list to edit"
+msgstr "Por favor, selecione um item da lista para editar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:215
+msgid "Edit HTML"
+msgstr "Editar HTML"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:234
+msgid "Edit CSS"
+msgstr "Editar CSS"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Are you sure you want to delete selected items?"
+msgstr "Você tem certeza que deseja remover o item selecionado?"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Please make a selection from the list to delete"
+msgstr "Por favor, faça uma seleção da lista para remover"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:312
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:313
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:327
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:328
+msgid "save"
+msgstr "salvar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:344
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:363
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:364
+msgid "back"
+msgstr "Voltar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:391
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:392
+msgid "Upload Image"
+msgstr "Enviar Imagem"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr "Por favor, preencha os campos de nome de usuário e senha"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:41
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr ""
+"Autenticação não é permitida. O sistema de verificação de autenticação não "
+"está ativo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr "Sua conta foi bloqueada. Por favor, contate o administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr "Nome de Usuário ou Senha incorretos. Por favor, tente novamente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:147
+msgid "Please enter a password"
+msgstr "Por favor digite uma senha"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:166
+msgid "You cannot login. There are no administrators set up."
+msgstr "Você não pode se autenticar. Não existe um administrador configurado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr ""
+"Nome de Usuário, Senha ou Nível de Acesso incorretos. Por favor, tente "
+"novamente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/cmtclasses.php:348
+msgid "Your Module must contain a title."
+msgstr "Seu módulo deve conter um título"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:95
+msgid "January"
+msgstr "Janeiro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:96
+msgid "February"
+msgstr "Fevereiro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:97
+msgid "March"
+msgstr "Março"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:98
+msgid "April"
+msgstr "Abril"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:99
+msgid "May"
+msgstr "Maio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:100
+msgid "June"
+msgstr "Junho"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:101
+msgid "July"
+msgstr "Julho"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:102
+msgid "August"
+msgstr "Agosto"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:103
+msgid "September"
+msgstr "Setembro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:104
+msgid "October"
+msgstr "Outubro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:105
+msgid "November"
+msgstr "Novembro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:106
+msgid "December"
+msgstr "Dezembro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:195
+msgid "No Sorting"
+msgstr "Sem Ordem"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:196
+msgid "Sort Ascending"
+msgstr "Ascedente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:197
+msgid "Sort Descending"
+msgstr "Decrescente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:222
+msgid "Close Window"
+msgstr "Fechar Janela"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:239
+msgid "Back"
+msgstr "Voltar"
+
+#. Print Preview button - used when viewing page
+#. Print Button - used in pop-up window
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:276
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:278
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:294
+msgid "Print"
+msgstr "Imprimir"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:350
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr ""
+"Este endereço de e-mail está protegido de spam bots. Você precisa ter o "
+"Javascript habilitado para vê-lo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:375
+msgid "Pending"
+msgstr "Pendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:378
+msgid "Published, but is <u>Pending"
+msgstr "Publicado, mas está <u>Pendente</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:381
+msgid "Visible"
+msgstr "Visível"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:384
+msgid "Published and is <u>Current</u>"
+msgstr "Publicado e <u>Atual</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:387
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:393
+msgid "Finished"
+msgstr "Finalizado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:390
+msgid "Published, but has <u>Expired</u>"
+msgstr "Publicado, mas <u>Expirou</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:396
+msgid "Not Published"
+msgstr "Não Publicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:401
+msgid "Click on icon to toggle state."
+msgstr "Clique no ícone para alterar o estado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:441
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:520
+msgid "Go to Menu"
+msgstr "Vai para o Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:448
+msgid "Link Name"
+msgstr "Nome do Link"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:452
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:539
+msgid "Go to Menu Item"
+msgstr "Vá para o Item de Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:460
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:547
+msgid "State"
+msgstr "Estado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:466
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:553
+msgid "Trashed"
+msgstr "Na Lixeira"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:469
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:556
+msgid "UnPublished"
+msgstr "Despublicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:535
+msgid "Item Name"
+msgstr "Nome do Item"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Publish item"
+msgstr "Item Publicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Unpublish Item"
+msgstr "Despublicar Item"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:21
+#, php-format
+msgid "User Submitted '%s'"
+msgstr "Usuário Enviou '%s'"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:23
+msgid " for %.\\n\\n\\n\\n"
+msgstr "para %.\\n\\n\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:50
+msgid "You need to login."
+msgstr "Você precisa se autenticar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:334
+msgid "Mambo Warning"
+msgstr "Aviso do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:67
+#, php-format
+msgid "Results %d - %d of %d"
+msgstr "Resultados %d - %d de %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:79
+#, php-format
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:108
+msgid "Start"
+msgstr "Inciar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+msgid "first page"
+msgstr "primeira página"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:109
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:226
+msgid "Previous"
+msgstr "Anterior"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+msgid "previous page"
+msgstr "página anterior"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+msgid "next page"
+msgstr "próxima página"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:128
+msgid "End"
+msgstr "Fim"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+msgid "end page"
+msgstr "página final"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:67
+msgid "Powered by Mambo"
+msgstr "Provido por Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:68
+msgid "Generated:"
+msgstr "Gerado em:"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:95
+msgid "Written by"
+msgstr "Escrito por:"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:97
+msgid "Contributed by"
+msgstr "Contribuição de"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:103
+msgid "Last Updated"
+msgstr "Última Atualização"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:58
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:183
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:194
+msgid "Page"
+msgstr "Página"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:142
+msgid "Article Index"
+msgstr "Índice de Artigos"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:215
+msgid "Next &gt;&gt;"
+msgstr "Próximo &gt;&gt;"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:224
+msgid "&lt;&lt;Previous"
+msgstr "&gt;&gt;Anterior"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:39
+msgid "User Rating"
+msgstr "Classificação do Usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:47
+msgid "Poor"
+msgstr "Pobre"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:48
+msgid "vote 1 star"
+msgstr "1 estrela"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:49
+msgid "vote 2 star"
+msgstr "2 estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:50
+msgid "vote 3 star"
+msgstr "3 estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:51
+msgid "vote 4 star"
+msgstr "4 estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:52
+msgid "vote 5 star"
+msgstr "5 estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:53
+msgid "Best"
+msgstr "Melhor"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:54
+msgid "Rate"
+msgstr "Classificar"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:70
+msgid "Category List"
+msgstr "Lista de Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:74
+msgid "Category Blog"
+msgstr "Blog de Categoria"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_banners.php:73
+msgid "Advertisement"
+msgstr "Anúncios"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:40
+#, php-format
+msgid "Hi, %s"
+msgstr "Olá, %s"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:65
+msgid "username"
+msgstr "nome de usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:69
+msgid "password"
+msgstr "senha"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_login.php:71
+msgid "Remember Me"
+msgstr "Me Lembre"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_poll.php:83
+msgid "Vote"
+msgstr "Votar"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_search.php:17
+msgid "search..."
+msgstr "pesquisar..."
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:25
+msgid "Time"
+msgstr "Tempo"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:35
+msgid "Members"
+msgstr "Membros"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:39
+msgid "News"
+msgstr "Notícias"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:43
+msgid "WebLinks"
+msgstr "Links Web"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:57
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:59
+msgid "Visitors"
+msgstr "Visitantes"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_templatechooser.php:75
+msgid "Select"
+msgstr "Selecione"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:28
+#, php-format
+msgid "We have %d guest online"
+msgid_plural "We have %d guests online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:32
+#, php-format
+msgid "We have %d member online"
+msgid_plural "We have %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:36
+#, php-format
+msgid "We have %d guest online and "
+msgid_plural "We have %d guests online and "
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:37
+#, php-format
+msgid " %d member online"
+msgid_plural " %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:54
+msgid "No Users Online"
+msgstr "Nenhum usuário on-line"
+
+#: administrator/components/com_content/admin.content.html.php:37
+#: administrator/components/com_content/admin.content.html.php:41
+msgid "Content Items Manager"
+msgstr "Gerenciador de Itens de Conteúdo"
+
+#: administrator/components/com_content/admin.content.html.php:37
+msgid "Section: All"
+msgstr "Seção: Todas"
+
+#: administrator/components/com_content/admin.content.html.php:87
+msgid "Front Page"
+msgstr "Página Principal"
+
+#: administrator/components/com_content/admin.content.html.php:289
+msgid "Please make a selection from the list to send to Trash"
+msgstr "Por favor, selecione um item da lista para enviar para a Lixeira"
+
+#: administrator/components/com_content/admin.content.html.php:290
+msgid ""
+"Are you sure you want to Trash the selected items? \\nThis will not "
+"permanently delete the items."
+msgstr ""
+"Você tem certeza que deseja enviar os itens selecionados para a Lixeira?"
+"\\nIsto não remove os itens permanentemente"
+
+#: administrator/components/com_content/admin.content.html.php:306
+#: administrator/components/com_content/admin.content.html.php:310
+msgid "Archive Manager"
+msgstr "Gerenciador de Arquivos"
+
+#: administrator/components/com_content/admin.content.html.php:523
+msgid "You must select a Section."
+msgstr "Você deve selecionar uma seção"
+
+#: administrator/components/com_content/admin.content.html.php:525
+#: administrator/components/com_content/admin.content.html.php:527
+msgid "You must select a Category."
+msgstr "Você deve selecionar uma categoria"
+
+#: administrator/components/com_content/admin.content.html.php:579
+msgid "Content Item:"
+msgstr "Item de Conteúdo:"
+
+#: administrator/components/com_content/admin.content.html.php:655
+msgid "Intro Text:"
+msgstr "Texto de Introdução:"
+
+#: administrator/components/com_content/admin.content.html.php:655
+msgid "required"
+msgstr "necessário"
+
+#. parameters : areaname, content, hidden field, width, height, rows, cols
+#: administrator/components/com_content/admin.content.html.php:663
+msgid "Main Text:"
+msgstr "Texto Principal:"
+
+#: administrator/components/com_content/admin.content.html.php:663
+msgid "optional"
+msgstr "opcional"
+
+#: administrator/components/com_content/admin.content.html.php:692
+msgid "Show on Frontpage:"
+msgstr "Mostrar na Página Principal:"
+
+#: administrator/components/com_content/admin.content.html.php:768
+msgid "Content ID:"
+msgstr "ID do Conteúdo:"
+
+#: administrator/components/com_content/admin.content.html.php:794
+msgid "Reset Hit Count"
+msgstr "Reiniciar Contador de Acessos"
+
+#: administrator/components/com_content/admin.content.html.php:801
+msgid "Revised"
+msgstr "Revisado"
+
+#: administrator/components/com_content/admin.content.html.php:805
+msgid "times"
+msgstr "vezes"
+
+#: administrator/components/com_content/admin.content.html.php:815
+#: administrator/components/com_content/admin.content.html.php:825
+msgid "By"
+msgstr "Por"
+
+#: administrator/components/com_content/admin.content.html.php:844
+msgid "Gallery Images:"
+msgstr "Galeria de Imagens:"
+
+#: administrator/components/com_content/admin.content.html.php:869
+msgid "up"
+msgstr "acima"
+
+#: administrator/components/com_content/admin.content.html.php:870
+msgid "down"
+msgstr "abaixo"
+
+#: administrator/components/com_content/admin.content.html.php:871
+msgid "remove"
+msgstr "remover"
+
+#: administrator/components/com_content/admin.content.html.php:880
+#: components/com_content/content.html.php:1091
+msgid "Source:"
+msgstr "Fonte:"
+
+#: administrator/components/com_content/admin.content.html.php:888
+msgid "Image Align:"
+msgstr "Alinhamento de Imagem:"
+
+#: administrator/components/com_content/admin.content.html.php:896
+#: components/com_content/content.html.php:1107
+msgid "Alt Text:"
+msgstr "Texto Alt:"
+
+#: administrator/components/com_content/admin.content.html.php:904
+#: components/com_content/content.html.php:1115
+msgid "Border:"
+msgstr "Borda:"
+
+#: administrator/components/com_content/admin.content.html.php:944
+#: components/com_content/content.html.php:1124
+msgid "Apply"
+msgstr "Aplicar"
+
+#: administrator/components/com_content/admin.content.html.php:963
+msgid ""
+"These Parameters only control what you see when you click to view an item "
+"fully"
+msgstr ""
+"Estes parâmetros somente controlam o que você vê quando clica em um item "
+"completo"
+
+#: administrator/components/com_content/admin.content.html.php:999
+msgid "Add Sect/Cat/Title"
+msgstr "Adicionar Seção/Cat/Título"
+
+#: administrator/components/com_content/admin.content.html.php:1015
+msgid "This will create a 'Link - Content Item' in the menu you select"
+msgstr ""
+"Isto irá criar um 'Link - Item de Conteúdo' no menu que você selecionou"
+
+#: administrator/components/com_content/admin.content.html.php:1118
+msgid "Please select something"
+msgstr "Por favor, selecione alguma coisa"
+
+#: administrator/components/com_content/admin.content.html.php:1130
+msgid "Move Items"
+msgstr "Mover Itens"
+
+#: administrator/components/com_content/admin.content.html.php:1139
+msgid "Move to Section/Category:"
+msgstr "Mover para Seção/Categoria:"
+
+#: administrator/components/com_content/admin.content.html.php:1145
+msgid "Items being Moved:"
+msgstr "Itens a serem Movidos:"
+
+#: administrator/components/com_content/admin.content.html.php:1188
+msgid "Please select a Section/Category to copy the items to"
+msgstr "Por favor, selecione uma Seção/Categoria para copiar os itens de"
+
+#: administrator/components/com_content/admin.content.html.php:1199
+msgid "Copy Content Items"
+msgstr "Copiar Itens de Conteúdo"
+
+#: administrator/components/com_content/admin.content.html.php:1208
+msgid "Copy to Section/Category:"
+msgstr "Copiar para Seção/Categoria:"
+
+#: administrator/components/com_content/admin.content.html.php:1214
+msgid "Items being copied:"
+msgstr "Itens a serem copiados:"
+
+#: administrator/components/com_content/admin.content.php:161
+msgid "All Content Items"
+msgstr "Todos os Itens de Conteúdo"
+
+#: administrator/components/com_content/admin.content.php:382
+msgid "You cannot edit an archived item"
+msgstr "Você não pode editar um item arquivado"
+
+#: administrator/components/com_content/admin.content.php:423
+#: administrator/components/com_content/admin.content.php:455
+#: administrator/components/com_content/admin.content.php:594
+msgid "Never"
+msgstr "Nunca"
+
+#: administrator/components/com_content/admin.content.php:470
+msgid "Select Section"
+msgstr "Selecionar Seção"
+
+#: administrator/components/com_content/admin.content.php:483
+#: administrator/components/com_content/admin.content.php:499
+#: administrator/components/com_content/admin.content.php:507
+msgid "Select Category"
+msgstr "Selecionar Categoria"
+
+#: administrator/components/com_content/admin.content.php:677
+msgid "Successfully Saved changes to Item: "
+msgstr "Alterações do item foram salvas com sucesso:"
+
+#: administrator/components/com_content/admin.content.php:682
+msgid "Successfully Saved Item: "
+msgstr "Item salvo com sucesso:"
+
+#: administrator/components/com_content/admin.content.php:723
+#, php-format
+msgid "%d Item successfully Archived"
+msgid_plural "%d Items successfully Archived"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:753
+msgid "Select an item to toggle"
+msgstr "Selecionar um item para alterar"
+
+#: administrator/components/com_content/admin.content.php:886
+#: administrator/components/com_content/admin.content.php:990
+msgid "An error has occurred"
+msgstr "Ocorreu um erro"
+
+#: administrator/components/com_content/admin.content.php:935
+#, php-format
+msgid "%d Item successfully moved to Section: %s, Category: %s"
+msgid_plural "%d Items successfully moved to Section: %s, Category: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:1062
+#, php-format
+msgid "%d Item successfully copied to Section: %s, Category: %s"
+msgid_plural "%d Items successfully copied to Section: %s, Category: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:1079
+msgid "Successfully Reset Hit count"
+msgstr "Contador de Acessos reiniciado com sucesso"
+
+#: administrator/components/com_content/content.xml
+msgid "A text key that an item may be referenced by (like a help reference)"
+msgstr ""
+"Um texto chave que um item pode ser referenciado (como uma referência de "
+"ajuda)"
+
+#: administrator/components/com_content/content.xml
+msgid "Content Page"
+msgstr "Página de Conteúdo"
+
+#: administrator/components/com_content/content.xml
+#: components/com_content/content.html.php:1015
+msgid "Intro Text"
+msgstr "Texto de Introdução"
+
+#: administrator/components/com_content/content.xml
+msgid "Key Reference"
+msgstr "Chave de Referência"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the intro text"
+msgstr "Mostrar/Esconder o texto de introdução"
+
+#: components/com_content/content.html.php:70
+msgid "This Category is currently empty"
+msgstr "Esta Categoria está atualmente vazia"
+
+#: components/com_content/content.html.php:118
+#, php-format
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_content/content.html.php:134
+msgid "Registered Users Only"
+msgstr "Somente para Usuários Registrados"
+
+#: components/com_content/content.html.php:186
+msgid "Display #"
+msgstr "Mostrar #"
+
+#: components/com_content/content.html.php:270
+#: components/com_content/content.html.php:420
+msgid "Register to read more..."
+msgstr "Registre-se para ler mais..."
+
+#: components/com_content/content.html.php:350
+msgid "More..."
+msgstr "Mais..."
+
+#: components/com_content/content.html.php:415
+msgid "Read more..."
+msgstr "Leia mais..."
+
+#: components/com_content/content.html.php:610
+#: components/com_content/content.html.php:612
+#: components/com_content/content.html.php:616
+msgid "PDF"
+msgstr "PDF"
+
+#: components/com_content/content.html.php:635
+#: components/com_content/content.html.php:637
+#: components/com_content/content.html.php:641
+msgid "E-mail"
+msgstr "E-mail"
+
+#: components/com_content/content.html.php:912
+msgid "Please select a category"
+msgstr "Por favor, selecione uma categoria"
+
+#: components/com_content/content.html.php:914
+#: components/com_content/content.html.php:923
+msgid "Content item must have intro text"
+msgstr "Conteúdo deve ter um texto de introdução"
+
+#: components/com_content/content.html.php:939
+msgid "Please either Cancel or Save the current change"
+msgstr "Por favor, clique em cancelar ou salve as alterações"
+
+#. $docinfo = "<strong>".T_('Subject:')."</strong> ";
+#. $docinfo .= $row->title."<br />";
+#: components/com_content/content.html.php:948
+msgid "Expiry Date:"
+msgstr "Data de Expiração:"
+
+#: components/com_content/content.html.php:950
+msgid "Version:"
+msgstr "'Versão:"
+
+#: components/com_content/content.html.php:952
+msgid "Created:"
+msgstr "Criado:"
+
+#: components/com_content/content.html.php:954
+msgid "Last Modified:"
+msgstr "Última Modificação:"
+
+#: components/com_content/content.html.php:956
+msgid "Hits:"
+msgstr "Acessos:"
+
+#: components/com_content/content.html.php:964
+msgid "Item Information"
+msgstr "Informação do Item"
+
+#: components/com_content/content.html.php:965
+msgid "Info"
+msgstr "Info"
+
+#: components/com_content/content.html.php:1015
+#: components/com_content/content.html.php:1021
+msgid "Required"
+msgstr "Necessário"
+
+#: components/com_content/content.html.php:1021
+#: components/com_content/content.html.php:1039
+msgid "Main Text"
+msgstr "Texto Principal"
+
+#: components/com_content/content.html.php:1039
+msgid "Optional"
+msgstr "Opcional"
+
+#: components/com_content/content.html.php:1061
+msgid "Sub-folder"
+msgstr "Sub-pasta"
+
+#: components/com_content/content.html.php:1069
+msgid "Content Images"
+msgstr "Imagens de Conteúdo"
+
+#: components/com_content/content.html.php:1072
+msgid "Edit Image"
+msgstr "Editar Imagem"
+
+#: components/com_content/content.html.php:1078
+msgid "Insert"
+msgstr "Inserir"
+
+#: components/com_content/content.html.php:1083
+msgid "Up"
+msgstr "Acima"
+
+#: components/com_content/content.html.php:1084
+msgid "Down"
+msgstr "Abaixo"
+
+#: components/com_content/content.html.php:1099
+msgid "Align:"
+msgstr "Alinhar:"
+
+#: components/com_content/content.html.php:1132
+#: components/com_content/content.html.php:1135
+msgid "No Image"
+msgstr "Sem Imagem"
+
+#: components/com_content/content.html.php:1201
+msgid "Show on Front Page:"
+msgstr "Mostrar na Página Principal:"
+
+#: components/com_content/content.html.php:1210
+msgid "Metadata"
+msgstr "Metadados"
+
+#: components/com_content/content.html.php:1260
+#: components/com_content/content.php:1444
+msgid ""
+"You must enter valid e-mail addresses for both yourself and your recipient."
+msgstr ""
+"Você deve informar um endereço de e-mail válido para você e o destinatário"
+
+#: components/com_content/content.html.php:1274
+msgid "E-mail this to a friend."
+msgstr "Envie para seu amigo"
+
+#: components/com_content/content.html.php:1282
+msgid "Your friend's E-mail:"
+msgstr "E-mail de seu amigo:"
+
+#: components/com_content/content.html.php:1298
+msgid "Your E-mail:"
+msgstr "Seu e-mail:"
+
+#: components/com_content/content.html.php:1306
+msgid "Message subject:"
+msgstr "Assunto:"
+
+#: components/com_content/content.html.php:1317
+msgid "Send e-mail"
+msgstr "Enviar E-mail"
+
+#: components/com_content/content.html.php:1338
+#, php-format
+msgid "This item has been sent to %s"
+msgstr "Este item foi enviado para %s"
+
+#: components/com_content/content.php:432
+msgid "Date Asc"
+msgstr "Data Asc"
+
+#: components/com_content/content.php:433
+msgid "Date Desc"
+msgstr "Data Desc"
+
+#: components/com_content/content.php:437
+msgid "Title Asc"
+msgstr "Título Asc"
+
+#: components/com_content/content.php:438
+msgid "Title Desc"
+msgstr "Título Desc"
+
+#: components/com_content/content.php:442
+msgid "Hits Asc"
+msgstr "Hits Asc"
+
+#: components/com_content/content.php:443
+msgid "Hits Desc"
+msgstr "Hits Desc"
+
+#: components/com_content/content.php:447
+msgid "Author Asc"
+msgstr "Autor Asc"
+
+#: components/com_content/content.php:448
+msgid "Author Desc"
+msgstr "Autor Desc"
+
+#. if no archives for category, hides search and outputs empty message
+#: components/com_content/content.php:642
+#: components/com_content/content.php:722
+msgid "There are currently no Archived Entries for this Category"
+msgstr "Não existem entradas arquivadas para esta categoria"
+
+#. Search Success message
+#: components/com_content/content.php:820
+#, php-format
+msgid "Here are the Archived entries for %s %s"
+msgstr "Aqui estão as entradas arquivadas para %s %s"
+
+#. Search Failure message for Archives
+#: components/com_content/content.php:954
+#, php-format
+msgid "There are no Archived entries for %s %s"
+msgstr "Não existe entradas arquivadas para %s %s"
+
+#. Generic blog empty display
+#: components/com_content/content.php:958
+msgid "There are no items to display"
+msgstr "Não existem itens para mostrar"
+
+#: components/com_content/content.php:1161
+#, php-format
+msgid "The module [ %s ] is currently being edited by another person."
+msgstr "O módulo [ %s ] está sendo editado por outra pessoa"
+
+#: components/com_content/content.php:1368
+#, php-format
+msgid ""
+"A new content item has been submitted by [ %s ]  titled [ %s ]  from section "
+"[ %s ]  and category  [ %s ]"
+msgstr ""
+"Um novo conteúdo foi enviado por [ %s ] com o título [ %s ] da seção [ %s ] "
+"e categoria [ %s ]"
+
+#: components/com_content/content.php:1368
+msgid "New Item"
+msgstr "Novo Item"
+
+#: components/com_content/content.php:1373
+msgid "Item saved successfully."
+msgstr "Item Salvo com Sucesso"
+
+#: components/com_content/content.php:1435
+#, php-format
+msgid "Item sent by %s"
+msgstr "Item enviado por %s"
+
+#. message text
+#: components/com_content/content.php:1455
+#, php-format
+msgid ""
+" The following page from the \"%s\" website has been sent to you by %s ( %"
+"s ).\n"
+"\n"
+"You can access it at the following url:\n"
+"%s"
+msgstr ""
+"A seguinte página do site \"%s\" foi enviada para você por %s ( %s ).\n"
+"\n"
+"Você pode acessá-la pelo seguinte endereço:\n"
+"%s"
+
+#: administrator/components/com_containers/admin.containers.html.php:45
+msgid "Display number"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:49
+msgid "Show Descendants?"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:64
+msgid "Parent container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:81
+msgid "Mambo "
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:134
+msgid "Top level container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:135
+msgid "Immediate container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:188
+#: administrator/components/com_containers/containers.xml
+msgid "Containers"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:248
+msgid "Edit Container details"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:250
+msgid "Container name"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:251
+msgid "Up to 500 characters"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:252
+msgid "Keywords"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:253
+msgid "Window title"
+msgstr ""
+
+#: administrator/components/com_containers/containers.xml
+msgid "Nested container system for Mambo"
+msgstr ""
+
+#: components/com_containers/containers.class.php:143
+msgid "No parent"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:29
+msgid "Contact Manager"
+msgstr "Gerenciador de Contatos"
+
+#: administrator/components/com_contact/admin.contact.html.php:64
+msgid "Linked to User"
+msgstr "Atrelado ao Usuário"
+
+#: administrator/components/com_contact/admin.contact.html.php:96
+msgid "Edit Contact"
+msgstr "Editar Contato"
+
+#: administrator/components/com_contact/admin.contact.html.php:176
+msgid "Contact:"
+msgstr "Contato:"
+
+#: administrator/components/com_contact/admin.contact.html.php:190
+msgid "Contact Details"
+msgstr "Detalhes do Contato"
+
+#: administrator/components/com_contact/admin.contact.html.php:203
+msgid "Linked to User:"
+msgstr "Atrelado ao Usuário:"
+
+#: administrator/components/com_contact/admin.contact.html.php:219
+msgid "Contact's Position:"
+msgstr "Cargo do Contato:"
+
+#: administrator/components/com_contact/admin.contact.html.php:235
+msgid "Street Address:"
+msgstr "Endereço:"
+
+#: administrator/components/com_contact/admin.contact.html.php:243
+msgid "Town/Suburb:"
+msgstr "Cidade:"
+
+#: administrator/components/com_contact/admin.contact.html.php:251
+msgid "State/County:"
+msgstr "Estado/Província:"
+
+#: administrator/components/com_contact/admin.contact.html.php:259
+msgid "Country:"
+msgstr "País:"
+
+#: administrator/components/com_contact/admin.contact.html.php:267
+msgid "Postal Code/ZIP:"
+msgstr "CEP:"
+
+#: administrator/components/com_contact/admin.contact.html.php:291
+msgid "Miscellaneous Info:"
+msgstr "Outras Informações:"
+
+#: administrator/components/com_contact/admin.contact.html.php:313
+msgid "Site Default:"
+msgstr "Padrão do Site:"
+
+#: administrator/components/com_contact/admin.contact.html.php:337
+msgid "Access:"
+msgstr "Acesso:"
+
+#: administrator/components/com_contact/admin.contact.html.php:356
+msgid "Image Info"
+msgstr "Info da Imagem"
+
+#: administrator/components/com_contact/admin.contact.html.php:394
+msgid ""
+"These Parameters only control what you see when you click to view a Contact "
+"item"
+msgstr ""
+"Estes parâmetros somente controlam o que você vê quando clica para "
+"visualizar um contato"
+
+#: administrator/components/com_contact/admin.contact.php:255
+msgid "Select a record to %s"
+msgstr "Selecione um registro para %s"
+
+#: administrator/components/com_contact/contact.xml
+msgid "This component shows a listing of Contact Information"
+msgstr "Este componente mostra um listagem de informações de contatos"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Address Icon"
+msgstr "Ícone de Endereço"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Country"
+msgstr "País"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Description text"
+msgstr "Texto de Descrição"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Drop Down"
+msgstr "Selecionador"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:109
+msgid "Email"
+msgstr "E-mail"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Copy"
+msgstr "Cópia de E-mail"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Form"
+msgstr "Formulário de E-mail"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email description"
+msgstr "Descrição do E-mail"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:127
+msgid "Fax"
+msgstr "Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Fax Icon"
+msgstr "Ícone de Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Address info"
+msgstr "Ícone para Infos de Endereço"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Email info"
+msgstr "Ícone para Infos de E-mail"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Fax info"
+msgstr "Ícone para Infos de Fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Misc info"
+msgstr "Ícone para Infos de Misc"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Telephone info"
+msgstr "Ícone para Infos de Tekefone"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons"
+msgstr "Ícones"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons/text"
+msgstr "Ícones/Texto"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Icon"
+msgstr "Ícone de Misc"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Info"
+msgstr "Infos de Misc"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Post/Zip Code"
+msgstr "CEP"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Description Text below"
+msgstr "Mostrar/Esconder o texto descritivo abaixo"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Drop Down select list in Contact view"
+msgstr "Mostrar/Esconder a caixa de selecionamento na visualização de contatos"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Vcard"
+msgstr "Mostrar/Esconder o Vcard"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the checkbox to email a copy to the senders address"
+msgstr "Mostrar/Esconder o checkbox para envio de cópia para o usuário"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the country info"
+msgstr "Mostrar/Esconder as informações de país"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"Show/Hide the email info, if you set to show the address will be protected "
+"from spambots by javascript cloaking"
+msgstr ""
+"Mostrar/Esconder o e-mail. Se você mostrar, ele será protegido por um "
+"sistema antispam em Javascript"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the email to form"
+msgstr "Mostrar/Esconder o e-mail para formulário"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the fax info"
+msgstr "Mostrar/Esconder a informação de fax"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the image"
+msgstr "Mostrar/Esconder a imagem"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the misc info"
+msgstr "Mostrar/Esconder a informação adicional"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the name info"
+msgstr "Mostrar/Esconder a informação de nome"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the position info"
+msgstr "Mostrar/Esconder a informação de posicionamento"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the post code info"
+msgstr "Mostrar/Esconder a informação de CEP"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the state info"
+msgstr "Mostrar/Esconder a informação de estado"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the street address info"
+msgstr "Mostrar/Esconder a informação de endereço"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the suburb info"
+msgstr "Mostrar/Esconder a informação de bairro"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the telephone info"
+msgstr "Mostrar/Esconder a informação de telefone"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Street Address"
+msgstr "Endereço"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone"
+msgstr "Telefone"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone Icon"
+msgstr "Ícone de Telefone"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Text"
+msgstr "Texto"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"The Description text for the Email form, if left blank it will use the "
+"_EMAIL_DESCRIPTION language definition"
+msgstr ""
+"Um texto de descrição do formulário de e-mail. Se deixado em branco, o valor "
+"de _EMAIL_DESCRIPTION será carregado do seu arquivo de idioma"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Town/Suburb"
+msgstr "Cidade"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Icons, text or nothing next to the contact information displayed"
+msgstr ""
+"Usar ícones, texto ou nada para a apresentação de informações do contato"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Vcard"
+msgstr "Vcard"
+
+#: components/com_contact/contact.class.php:129
+msgid "Mambo vCard for %s"
+msgstr "Vcard Mambo para %s"
+
+#: components/com_contact/contact.html.php:118
+msgid "Phone"
+msgstr "Telefone"
+
+#: components/com_contact/contact.html.php:263
+#: components/com_contact/contact.php:345
+msgid "Please make sure the form is complete and valid."
+msgstr "Por favor, tenha certeza que o formulário está completo e válido."
+
+#: components/com_contact/contact.html.php:390
+msgid "Select Contact:"
+msgstr "Selecione o contato:"
+
+#: components/com_contact/contact.html.php:634
+msgid "Download information as a"
+msgstr "Copiar as informações como um"
+
+#: components/com_contact/contact.html.php:636
+msgid "VCard"
+msgstr "VCard"
+
+#: components/com_contact/contact.html.php:657
+msgid "Enter your name:"
+msgstr "Digite seu nome:"
+
+#: components/com_contact/contact.html.php:661
+msgid "E-mail address:"
+msgstr "Endereço de E-mail:"
+
+#: components/com_contact/contact.html.php:669
+msgid "Enter your message:"
+msgstr "Digite sua mensagem:"
+
+#: components/com_contact/contact.html.php:677
+msgid "Email a copy of this message to your own address"
+msgstr "Enviar cópia desta mensagem para seu e-mail"
+
+#: components/com_contact/contact.html.php:698
+msgid "There are no Contact Details listed."
+msgstr "Não existem Detalhes de Contatos para Listar"
+
+#: components/com_contact/contact.php:111
+msgid "The Contact list for this Website."
+msgstr "A lista de contatos para este website"
+
+#: components/com_contact/contact.php:233
+msgid "Send an Email to this Contact:"
+msgstr "Envie um e-mail para este contato:"
+
+#: components/com_contact/contact.php:280
+msgid "Address: "
+msgstr "Endereço: "
+
+#: components/com_contact/contact.php:281
+msgid "Email: "
+msgstr "E-mail:"
+
+#: components/com_contact/contact.php:282
+msgid "Telephone: "
+msgstr "Telefone:"
+
+#: components/com_contact/contact.php:283
+msgid "Fax: "
+msgstr "Fax:"
+
+#: components/com_contact/contact.php:284
+msgid "Information: "
+msgstr "Informação:"
+
+#: components/com_contact/contact.php:337
+msgid "Enquiry"
+msgstr ""
+
+#: components/com_contact/contact.php:348
+msgid "This is an enquiry e-mail via %s from:"
+msgstr ""
+
+#: components/com_contact/contact.php:354
+msgid "The following is a copy of the message you sent to %s via %s "
+msgstr "O e-mail abaixo é uma cópia da mensagem que você enviou para %s via %s"
+
+#: components/com_contact/contact.php:356
+msgid "Copy of: %s"
+msgstr "Cópia de: %s"
+
+#: components/com_contact/contact.php:361
+msgid "Thank you for your e-mail"
+msgstr "Obrigado pela sua mensagem"
+
+#: administrator/components/com_config/admin.config.html.php:104
+msgid "Global Configuration"
+msgstr "Configuração Global"
+
+#: administrator/components/com_config/admin.config.html.php:106
+msgid "configuration.php is :"
+msgstr "configuration.php está:"
+
+#: administrator/components/com_config/admin.config.html.php:137
+msgid "Site Offline:"
+msgstr "Site Parado:"
+
+#: administrator/components/com_config/admin.config.html.php:141
+msgid "Offline Message:"
+msgstr "Mensagem Quando Parado:"
+
+#: administrator/components/com_config/admin.config.html.php:143
+msgid "A message that displays if your site is offline"
+msgstr "Uma mensagem que será mostrada se o site estiver parado"
+
+#: administrator/components/com_config/admin.config.html.php:148
+msgid "System Error Message:"
+msgstr "Mensagem de Erro do Sistema:"
+
+#: administrator/components/com_config/admin.config.html.php:150
+msgid "A message that displays if Mambo could not connect to the database"
+msgstr ""
+"Uma mensagem apresentada se o Mambo não conseguir conexão com a base de dados"
+
+#: administrator/components/com_config/admin.config.html.php:155
+msgid "Site Name:"
+msgstr "Nome do Site:"
+
+#: administrator/components/com_config/admin.config.html.php:159
+msgid "Show UnAuthorized Links:"
+msgstr "Mostrar Links Não-Autorizados:"
+
+#: administrator/components/com_config/admin.config.html.php:161
+msgid ""
+"If yes, will show links to content to registered content even if you are not "
+"logged in.  The user will need to login to see the item in full."
+msgstr ""
+"Se sim, mostra links para conteúdos que necessitam autenticação/registro. O "
+"usuário precisará se autenticar para ver o item completo."
+
+#: administrator/components/com_config/admin.config.html.php:166
+msgid "Allow User Registration:"
+msgstr "Permite Registro de Usuários:"
+
+#: administrator/components/com_config/admin.config.html.php:168
+msgid "If yes, allows users to self-register"
+msgstr "Se sim, permite que usuários se registrem"
+
+#: administrator/components/com_config/admin.config.html.php:173
+msgid "Use New Account Activation:"
+msgstr "Usar Ativação de Conta:"
+
+#: administrator/components/com_config/admin.config.html.php:176
+msgid ""
+"If yes, the user will be mailed a link to activate their account before they "
+"can log in."
+msgstr ""
+"Se sim, o usuário recebe um e-mail contento um link para ativar sua conta "
+"antes de usá-la"
+
+#: administrator/components/com_config/admin.config.html.php:181
+msgid "Require Unique Email:"
+msgstr "Requer E-mail Único:"
+
+#: administrator/components/com_config/admin.config.html.php:183
+msgid "If yes, users cannot share the same email address"
+msgstr "Se sim, não é permitido registro com e-mail já existente"
+
+#: administrator/components/com_config/admin.config.html.php:188
+msgid "Debug Site:"
+msgstr "Debug Site:"
+
+#: administrator/components/com_config/admin.config.html.php:190
+msgid "If yes, displays diagnostic information and SQL errors if present"
+msgstr "Se sim, mostra erros de SQL e informações de diagnóstico se existirem"
+
+#: administrator/components/com_config/admin.config.html.php:195
+msgid "WYSIWYG Editor:"
+msgstr "Editor WYSIWYG:"
+
+#: administrator/components/com_config/admin.config.html.php:199
+msgid "List Length:"
+msgstr "Tamanho de Listas:"
+
+#: administrator/components/com_config/admin.config.html.php:201
+msgid "Sets the default length of lists in the administrator for all users"
+msgstr "Configura o tamanho padrão de listas para todos os usuários"
+
+#: administrator/components/com_config/admin.config.html.php:206
+msgid "Favourites Site Icon:"
+msgstr "Ícone de Favoritos:"
+
+#: administrator/components/com_config/admin.config.html.php:210
+msgid ""
+"If left blank or the file cannot be found, the default favicon.ico will be "
+"used."
+msgstr ""
+"Se deixado em branco ou o arquivo não for encontrado, o ícone favicon.ico "
+"padrão será usado"
+
+#: administrator/components/com_config/admin.config.html.php:211
+msgid "Favourite Icon"
+msgstr "Ícone Favorito"
+
+#: administrator/components/com_config/admin.config.html.php:217
+msgid "Locale"
+msgstr "Código"
+
+#: administrator/components/com_config/admin.config.html.php:221
+msgid "Language:"
+msgstr "Idioma:"
+
+#: administrator/components/com_config/admin.config.html.php:225
+msgid "Time Offset:"
+msgstr "Zona de Hora:"
+
+#: administrator/components/com_config/admin.config.html.php:229
+msgid "Current date/time configured to display: %s"
+msgstr "Data/Hora atuais estão configurados para mostrar: %s"
+
+#: administrator/components/com_config/admin.config.html.php:234
+msgid "Country Locale:"
+msgstr "Código do País:"
+
+#: administrator/components/com_config/admin.config.html.php:244
+msgid "These Parameters control Output elements"
+msgstr "Estes parâmetros controlam a saída de elementos"
+
+#: administrator/components/com_config/admin.config.html.php:247
+msgid "Linked Titles:"
+msgstr "Títulos com Links:"
+
+#: administrator/components/com_config/admin.config.html.php:250
+msgid "If yes, the title of content items will be hyperlinked to the item"
+msgstr "Se sim, o título dos itens de conteúdo são links para o conteúdo"
+
+#: administrator/components/com_config/admin.config.html.php:255
+msgid "Read More Link:"
+msgstr "Link Leia Mais:"
+
+#: administrator/components/com_config/admin.config.html.php:258
+msgid ""
+"If set to show, the read-more link will show if main-text has been provided "
+"for the item"
+msgstr ""
+"Se configurado para mostrar, o link leia mais é mostrado se existe texto "
+"principal no conteúdo"
+
+#: administrator/components/com_config/admin.config.html.php:263
+msgid "Item Rating/Voting:"
+msgstr "Classificação/Votação de Item:"
+
+#: administrator/components/com_config/admin.config.html.php:266
+msgid "If set to show, a voting system will be enabled for content items"
+msgstr ""
+"Se configurado para mostrar, um sistema de classificação é habilitado para "
+"os itens de conteúdo"
+
+#: administrator/components/com_config/admin.config.html.php:271
+msgid "Author Names:"
+msgstr "Nomes de Autores:"
+
+#: administrator/components/com_config/admin.config.html.php:274
+msgid ""
+"If set to show, the name of the author will be displayed.  This a global "
+"setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurado para mostrar, o nome do autor será apresentado. Esta é uma "
+"configuração global mas pode ser alterada no menu ou nos itens"
+
+#: administrator/components/com_config/admin.config.html.php:279
+msgid "Created Date and Time:"
+msgstr "Data e Hora de Criação:"
+
+#: administrator/components/com_config/admin.config.html.php:282
+msgid ""
+"If set to show, the date and time an item was created will be displayed. "
+"This a global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurado para mostrar, a data e hora que um item foi criado serão "
+"apresentados. Esta é uma configuração global mas pode ser alterada no menu "
+"ou nos itens"
+
+#: administrator/components/com_config/admin.config.html.php:287
+msgid "Modified Date and Time:"
+msgstr "Data e Hora de Modificação:"
+
+#: administrator/components/com_config/admin.config.html.php:290
+msgid ""
+"If set to show, the date and time an item was last modified will be "
+"displayed.  This a global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurado para mostrar, a data e hora que um item foi modificado serão "
+"apresentados. Esta é uma configuração global mas pode ser alterada no menu "
+"ou nos itens"
+
+#: administrator/components/com_config/admin.config.html.php:298
+msgid ""
+"If set to show, the hits for a particular item will be displayed.  This a "
+"global setting but can be changed at menu and item levels."
+msgstr ""
+"Se configurado para mostrar, os acessos para um item serão apresentados. "
+"Esta é uma configuração global mas pode ser alterada no menu ou nos itens"
+
+#: administrator/components/com_config/admin.config.html.php:303
+msgid "PDF Icon:"
+msgstr "Ícone de PDF:"
+
+#: administrator/components/com_config/admin.config.html.php:308
+msgid "Option not available as /media directory not writable"
+msgstr "Opção não disponível pois o diretório /media é somente leitura"
+
+#: administrator/components/com_config/admin.config.html.php:316
+msgid "Print Icon:"
+msgstr "Ícone de Impressão:"
+
+#: administrator/components/com_config/admin.config.html.php:321
+msgid "Email Icon:"
+msgstr "Ícone de E-mail:"
+
+#: administrator/components/com_config/admin.config.html.php:326
+msgid "Icons:"
+msgstr "Ícones:"
+
+#: administrator/components/com_config/admin.config.html.php:328
+msgid "Print, PDF and Email will utilise Icons or Text"
+msgstr "a"
+
+#: administrator/components/com_config/admin.config.html.php:331
+msgid "Table of Contents on multi-page items:"
+msgstr "Tabela de Conteúdos em itens multi-páginas:"
+
+#: administrator/components/com_config/admin.config.html.php:336
+msgid "Back Button:"
+msgstr "Botão Voltar:"
+
+#: administrator/components/com_config/admin.config.html.php:341
+msgid "Content Item Navigation:"
+msgstr "Navegação de Item de Conteúdo:"
+
+#: administrator/components/com_config/admin.config.html.php:360
+msgid "Hostname:"
+msgstr "Nome do Host:"
+
+#: administrator/components/com_config/admin.config.html.php:364
+msgid "MySQL Username:"
+msgstr "Nome de Usuário do MySQL:"
+
+#: administrator/components/com_config/admin.config.html.php:368
+msgid "MySQL Password:"
+msgstr "Senha de Usuário do MySQL:"
+
+#: administrator/components/com_config/admin.config.html.php:372
+msgid "MySQL Database:"
+msgstr "Base de Dados:"
+
+#: administrator/components/com_config/admin.config.html.php:376
+msgid "MySQL Database Prefix:"
+msgstr "Prefixo de Tabelas:"
+
+#: administrator/components/com_config/admin.config.html.php:379
+msgid ""
+"!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE "
+"PREFIX YOU ARE SETTING !!"
+msgstr ""
+"!! NÃO ALTERE SE VOCÊ NÃO POSSUI UM BANCO DE DADOS COM TABELAS USANDO O "
+"PREFIXO INFORMADO !!"
+
+#: administrator/components/com_config/admin.config.html.php:385
+msgid "Server"
+msgstr "Servidor"
+
+#: administrator/components/com_config/admin.config.html.php:389
+msgid "Absolute Path:"
+msgstr "Caminho Absoluto:"
+
+#: administrator/components/com_config/admin.config.html.php:394
+msgid "Live Site:"
+msgstr "Live Site:"
+
+#: administrator/components/com_config/admin.config.html.php:399
+msgid "Secret Word:"
+msgstr "Palavra Secreta:"
+
+#: administrator/components/com_config/admin.config.html.php:404
+msgid "GZIP Page Compression:"
+msgstr "Compressão GZIP de Páginas:"
+
+#: administrator/components/com_config/admin.config.html.php:407
+msgid "Compress buffered output if supported"
+msgstr "Comprime a saída de dados se suportado"
+
+#: administrator/components/com_config/admin.config.html.php:412
+msgid "Login Session Lifetime:"
+msgstr "Tempo de Vida de Sessão de Usuário:"
+
+#: administrator/components/com_config/admin.config.html.php:416
+msgid "Auto logout after this time of inactivity"
+msgstr "Auto desconectar após este tempo de inatividade"
+
+#: administrator/components/com_config/admin.config.html.php:421
+msgid "Error Reporting:"
+msgstr "Informe de Erro:"
+
+#: administrator/components/com_config/admin.config.html.php:426
+msgid "Register Globals Emulation:"
+msgstr "Emulação de Register Globals:"
+
+#: administrator/components/com_config/admin.config.html.php:430
+msgid ""
+"Register globals emulation. Some components may stop working if this option "
+"is set to Off."
+msgstr ""
+"Emulação de Register Globals. Alguns componentes podem parar de funcionar se "
+"esta opção estiver configurada como OFF"
+
+#: administrator/components/com_config/admin.config.html.php:436
+msgid "Help Server:"
+msgstr "Servidor de Ajuda:"
+
+#: administrator/components/com_config/admin.config.html.php:448
+msgid "File Creation:"
+msgstr "Criação de Arquivos:"
+
+#: administrator/components/com_config/admin.config.html.php:454
+msgid "Dont CHMOD new files (use server defaults)"
+msgstr "Não CHMOD novos arquivos (usar padrão do servidor)"
+
+#: administrator/components/com_config/admin.config.html.php:459
+msgid "CHMOD new files"
+msgstr "CHMOD novos arquivos"
+
+#: administrator/components/com_config/admin.config.html.php:461
+msgid "to:"
+msgstr "para:"
+
+#: administrator/components/com_config/admin.config.html.php:464
+msgid "Select this option to define permission flags for new created files"
+msgstr ""
+"Selecione este opção para definir as permissões para os novos arquivos "
+"criados"
+
+#: administrator/components/com_config/admin.config.html.php:492
+msgid "Apply to existing files"
+msgstr "Aplicar nos arquivos existentes"
+
+#: administrator/components/com_config/admin.config.html.php:495
+msgid ""
+"Checking here will apply the permission flags to <em>all existing files</em> "
+"of the site.<br/>"
+msgstr ""
+"Selecionando aqui irá aplicar as permissões em <em>todos os arquivos "
+"existentes</em> no site<br />"
+
+#: administrator/components/com_config/admin.config.html.php:496
+#: administrator/components/com_config/admin.config.html.php:574
+msgid ""
+"<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>"
+msgstr "<b>USO INAPROPRIADO DESTA OPÇÃO PODE DEIXAR O SITE INOPERANTE!</b>"
+
+#: administrator/components/com_config/admin.config.html.php:527
+msgid "Directory Creation:"
+msgstr "Criação de Diretório:"
+
+#: administrator/components/com_config/admin.config.html.php:533
+msgid "Dont CHMOD new directories (use server defaults)"
+msgstr "Não CHMOD novos diretórios (usar padrão do servidor)"
+
+#: administrator/components/com_config/admin.config.html.php:538
+msgid "CHMOD new directories"
+msgstr "CHMOD novos diretórios"
+
+#: administrator/components/com_config/admin.config.html.php:543
+msgid ""
+"Select this option to define permission flags for new created directories"
+msgstr ""
+"Selecione este opção para definir as permissões para os novos diretórios "
+"criados"
+
+#: administrator/components/com_config/admin.config.html.php:571
+msgid "Apply to existing directories"
+msgstr "Aplicar nos diretórios existentes"
+
+#: administrator/components/com_config/admin.config.html.php:573
+msgid ""
+"Checking here will apply the permission flags to <em>all existing "
+"directories</em> of the site.<br/>"
+msgstr ""
+"Selecionando aqui irá aplicar as permissões em <em>todos os diretórios "
+"existentes</em> no site<br />"
+
+#: administrator/components/com_config/admin.config.html.php:602
+msgid "Global Site Meta Description:"
+msgstr "Descrição Meta Global do Site:"
+
+#: administrator/components/com_config/admin.config.html.php:606
+msgid "Global Site Meta Keywords:"
+msgstr "Palavras-Chave Globais do Site:"
+
+#: administrator/components/com_config/admin.config.html.php:610
+msgid "Show Title Meta Tag:"
+msgstr "Mostrar Tag Meta de Título:"
+
+#: administrator/components/com_config/admin.config.html.php:614
+msgid "Show the title meta tag when viewing content items"
+msgstr "Mostrar a Tag Meta de título quando acessar itens de conteúdo"
+
+#: administrator/components/com_config/admin.config.html.php:618
+msgid "Show Author Meta Tag:"
+msgstr "Mostrar Tag Meta de Autor:"
+
+#: administrator/components/com_config/admin.config.html.php:622
+msgid "Show the author meta tag when viewing content items"
+msgstr "Mostrar a Tag Meta de autor quando acessar itens de conteúdo"
+
+#: administrator/components/com_config/admin.config.html.php:628
+msgid "Mail"
+msgstr "E-mail"
+
+#: administrator/components/com_config/admin.config.html.php:632
+msgid "Mailer:"
+msgstr "Mailer:"
+
+#: administrator/components/com_config/admin.config.html.php:636
+msgid "Mail From:"
+msgstr "De:"
+
+#: administrator/components/com_config/admin.config.html.php:640
+msgid "From Name:"
+msgstr "Nome:"
+
+#: administrator/components/com_config/admin.config.html.php:644
+msgid "Sendmail Path:"
+msgstr "Caminho do Sendmail:"
+
+#: administrator/components/com_config/admin.config.html.php:648
+msgid "SMTP Auth:"
+msgstr "Autenticação SMTP:"
+
+#: administrator/components/com_config/admin.config.html.php:652
+msgid "SMTP User:"
+msgstr "Usuário SMTP:"
+
+#: administrator/components/com_config/admin.config.html.php:656
+msgid "SMTP Pass"
+msgstr "Senha SMTP:"
+
+#: administrator/components/com_config/admin.config.html.php:660
+msgid "SMTP Host:"
+msgstr "Host SMTP:"
+
+#: administrator/components/com_config/admin.config.html.php:673
+msgid "Caching:"
+msgstr "Cache:"
+
+#: administrator/components/com_config/admin.config.html.php:681
+msgid "Cache Folder:"
+msgstr "Pasta de Cache:"
+
+#: administrator/components/com_config/admin.config.html.php:686
+msgid "Current cache is directory is <b>Writeable</b>"
+msgstr "Diretório de cache atual é <b>Escrita</b>"
+
+#: administrator/components/com_config/admin.config.html.php:688
+msgid ""
+"The cache directory is UNWRITEABLE - please set this directory to CHMOD755 "
+"before turning on the cache"
+msgstr ""
+"O diretório de cache está SOMENTE LEITURA - por favor modifique a permissão "
+"deste diretório para CHMOD755 antes de configurar o cache"
+
+#: administrator/components/com_config/admin.config.html.php:694
+msgid "Cache Time:"
+msgstr "Tempo de Cache:"
+
+#: administrator/components/com_config/admin.config.html.php:695
+msgid "seconds"
+msgstr "segundos"
+
+#: administrator/components/com_config/admin.config.html.php:701
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: administrator/components/com_config/admin.config.html.php:705
+msgid "Statistics:"
+msgstr "Estatísticas:"
+
+#: administrator/components/com_config/admin.config.html.php:707
+msgid "Enable/disable collection of site statistics"
+msgstr "Habilita/Desabilita a coleta de estatísticas do site"
+
+#: administrator/components/com_config/admin.config.html.php:710
+msgid "Log Content Hits by Date:"
+msgstr "Logar Acessos de Conteúdo por Data:"
+
+#: administrator/components/com_config/admin.config.html.php:712
+msgid "WARNING : Large amounts of data will be collected"
+msgstr "ATENÇÃO: Uma grande quantidade de dados pode ser coletada"
+
+#: administrator/components/com_config/admin.config.html.php:715
+msgid "Log Search Strings:"
+msgstr "Strings de Pesquisa:"
+
+#: administrator/components/com_config/admin.config.html.php:722
+msgid "SEO"
+msgstr "SEO"
+
+#: administrator/components/com_config/admin.config.html.php:726
+msgid "Search Engine Optimization"
+msgstr "Otimização de Sistema de Busca"
+
+#: administrator/components/com_config/admin.config.html.php:731
+msgid "Search Engine Friendly URLs:"
+msgstr "Sistema de Busca de URL's Amigáveis:"
+
+#: administrator/components/com_config/admin.config.html.php:733
+msgid "Apache only! Rename htaccess.txt to .htaccess before activating"
+msgstr ""
+"Somente Apache! Renomeie o arquivo htaccess.txt para .htaccess antes de "
+"ativar"
+
+#: administrator/components/com_config/admin.config.html.php:736
+msgid "Dynamic Page Titles:"
+msgstr "Títulos Dinâmicos de Páginas:"
+
+#: administrator/components/com_config/admin.config.html.php:738
+msgid "Dynamically changes the page title to reflect current content viewed"
+msgstr "Altera dinamicamente o título da página para refletir o conteúdo atual"
+
+#: administrator/components/com_config/admin.config.php:342
+msgid "System Default"
+msgstr "Padrão do Sistema"
+
+#: administrator/components/com_config/admin.config.php:344
+msgid "Simple"
+msgstr "Simples"
+
+#: administrator/components/com_config/admin.config.php:345
+msgid "Maximum"
+msgstr "Máximo"
+
+#: administrator/components/com_config/admin.config.php:349
+msgid "On"
+msgstr "Ligado"
+
+#: administrator/components/com_config/admin.config.php:354
+msgid "PHP mail function"
+msgstr "Função de Mail PHP"
+
+#: administrator/components/com_config/admin.config.php:355
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: administrator/components/com_config/admin.config.php:356
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#: administrator/components/com_config/admin.config.php:400
+msgid "Remember to rename htaccess.txt to .htaccess"
+msgstr "Lembre-se de renomear o arquivo htaccess.txt para .htaccess"
+
+#: administrator/components/com_config/admin.config.php:428
+msgid "Remember to install the MambelFish component."
+msgstr "Lembre-se de instalar o componente MambelFish"
+
+#: administrator/components/com_config/admin.config.php:485
+msgid "The Configuration Details have been updated"
+msgstr "Os detalhes de configuração foram atualizados"
+
+#: administrator/components/com_config/admin.config.php:539
+msgid "An Error Has Occurred! Unable to open config file to write!"
+msgstr ""
+"Ocorreu um Erro! Não é possível abir o arquivo de configuração para escrita!"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:42
+#, php-format
+msgid "XML ERROR in %s: %s at line %d"
+msgstr "ERRO DE XML em %s: %s na linha %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:48
+#, php-format
+msgid "Unable to open XML file %s"
+msgstr "Impossível abrir arquivo XML %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:51
+#, php-format
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr "Erro XML em %s: - tags não fechadas (%s) no fim do arquivo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:78
+#, php-format
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr "Erro XML em %s: %s não é um elemento contido válido"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:79
+#, php-format
+msgid "XML error in %s: %s not permitted within %s"
+msgstr "Erro XML em %s: %s não é permitido dentro de %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:88
+#, php-format
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr "Erro XML em %s: esperado MOSINSTALL mas foi encontrado %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:94
+#, php-format
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr ""
+"Erro XML em %s: a última tag aberta foi %s, mas foi encontrado o fim de %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:111
+#, php-format
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr "Erro XML em %s: mosinstall não tem um atributo de tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:280
+msgid "Handler not defined for type"
+msgstr "Cabeçalho não definido para o tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:293
+msgid "There are no Parameters for this item"
+msgstr "Não existem parâmetros para este item"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:78
+#, php-format
+msgid "Please make a selection from the list to %s"
+msgstr "Por favor faça uma seleção na lista para %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:190
+msgid "Please select an item to make default"
+msgstr "Por favor selecione um item da lista para torná-lo padrão"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:209
+msgid "Please select an item to assign"
+msgstr "Por favor selecione um item para atribuir"
+
+#. Help Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:508
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:509
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:527
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:314
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:21
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:130
+msgid "Help"
+msgstr "Ajuda"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:503
+msgid "- All Sections -"
+msgstr "- Todas as Seções -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:390
+msgid "- Select Image -"
+msgstr "- Selecione uma Imagem -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:408
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr ""
+"Novos itens são adicionados no início por padrão. A ordem pode ser alterada "
+"depois que o item for salvo."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:435
+msgid "- No User -"
+msgstr "- Sem Usuário -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:454
+msgid "Center"
+msgstr "Centro"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:489
+msgid "You must create a category first."
+msgstr "Você deve criar uma categoria primeiro."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:73
+#, php-format
+msgid "Results %d to %d of %d"
+msgstr "Resultados de %d para %d de %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:75
+msgid "No records found."
+msgstr "Nenhum registro encontrado"
+
+#: includes/cmtclasses.php:143
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:165
+#, php-format
+msgid "Component %s error: attempt to use non-existent method %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:167 includes/cmtclasses.php:173
+#: includes/cmtclasses.php:231
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:210
+#, php-format
+msgid "MOS error in %s: method %s not found in class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:212
+#, php-format
+msgid "MOS error in %s: class not found %s"
+msgstr ""
+
+#: includes/core.classes.php:351
+msgid "Impossible to determine the name of this server"
+msgstr ""
+
+#: includes/mamboHTML.php:384
+msgid "Published, but is <u>Pending</u>"
+msgstr ""
+
+#: includes/mambofunc.php:22
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"A user submitted %s:\n"
+"[ %s ]\n"
+"\n"
+"has been just been submitted by user:\n"
+"[ %s ]\n"
+"\n"
+"\n"
+"for %\n"
+"\n"
+"Please go to %s/administrator to view and approve this %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only."
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:20
+msgid "Global Check-in"
+msgstr "Verificação Global"
+
+#: administrator/components/com_checkin/admin.checkin.php:25
+msgid "Database Table"
+msgstr "Tabela da Base"
+
+#: administrator/components/com_checkin/admin.checkin.php:26
+msgid "# of Items"
+msgstr "# de Itens"
+
+#: administrator/components/com_checkin/admin.checkin.php:27
+msgid "Checked-In"
+msgstr "Verificado"
+
+#: administrator/components/com_checkin/admin.checkin.php:75
+#: administrator/components/com_checkin/admin.checkin.php:82
+msgid "Checked in <strong>%d</strong> item"
+msgid_plural "Checked in <strong>%d</strong> items"
+msgstr[0] "Verificado em <strong>%d</strong> itens"
+msgstr[1] ""
+
+#: administrator/components/com_checkin/admin.checkin.php:93
+msgid "Checked out items have now been all checked in"
+msgstr "Itens verificados e agora todos ok"
+
+#: administrator/components/com_categories/admin.categories.html.php:37
+#: administrator/components/com_categories/admin.categories.html.php:55
+msgid "Category Manager"
+msgstr "Gerenciador de Categorias"
+
+#: administrator/components/com_categories/admin.categories.html.php:37
+msgid "Content: All"
+msgstr "Conteúdo: Todo"
+
+#: administrator/components/com_categories/admin.categories.html.php:105
+msgid "Category ID"
+msgstr "Id da Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:111
+msgid "Active"
+msgstr "Ativa"
+
+#: administrator/components/com_categories/admin.categories.html.php:274
+msgid "Category must have a name"
+msgstr "Categorias devem ter um nome"
+
+#: administrator/components/com_categories/admin.categories.html.php:350
+msgid "Category Details"
+msgstr "Detalhes da Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:355
+msgid "Category Title:"
+msgstr "Título da Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:363
+msgid "Category Name:"
+msgstr "Nome da Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:469
+msgid "Select Menu Typ"
+msgstr "Selecione um Tipo de Menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:555
+msgid "Move Category"
+msgstr "Mover Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:565
+msgid "Move to Section:"
+msgstr "Mover para a Seção:"
+
+#: administrator/components/com_categories/admin.categories.html.php:571
+msgid "Categories being moved:"
+msgstr "Categorias a serem movidas:"
+
+#: administrator/components/com_categories/admin.categories.html.php:582
+msgid "Content Items being moved:"
+msgstr "Itens de conteúdo a serem movidos:"
+
+#: administrator/components/com_categories/admin.categories.html.php:593
+msgid ""
+"This will move the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"Isto irá mover as categorias listadas\n"
+"\t\t\t<br />\n"
+"\t\t\te todos os itens desta categoria (também listados)\n"
+"\t\t\t<br />\n"
+"\t\t\tpara a seção selecionada."
+
+#: administrator/components/com_categories/admin.categories.html.php:628
+msgid "Copy Category"
+msgstr "Copiar Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:666
+msgid ""
+"\n"
+"\t\t\tThis will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"\n"
+"\t\t\tIsto irá copiar as categorias listadas\n"
+"\t\t\t<br />\n"
+"\t\t\te todos os itens contidos nas categorias (também listados)\n"
+"\t\t\t<br />\n"
+"\t\t\tpara a seção selecionada."
+
+#: administrator/components/com_categories/admin.categories.php:142
+msgid "Component: "
+msgstr "Componente:"
+
+#: administrator/components/com_categories/admin.categories.php:251
+msgid "The category %s is currently being edited by another administrator"
+msgstr "A categoria %s está sendo editada por outro administrador"
+
+#: administrator/components/com_categories/admin.categories.php:270
+msgid "Category Table"
+msgstr "Tabela de Categoria"
+
+#: administrator/components/com_categories/admin.categories.php:278
+msgid "Category Blog Archive"
+msgstr "Arquivo de Blog de Categoria"
+
+#: administrator/components/com_categories/admin.categories.php:324
+#: administrator/components/com_categories/admin.categories.php:797
+msgid "Contact Category Table"
+msgstr "Tabela de Contato de Categoria"
+
+#: administrator/components/com_categories/admin.categories.php:327
+#: administrator/components/com_categories/admin.categories.php:802
+msgid "Newsfeed Category Table"
+msgstr "Tabela de Categorias de Feeds de Notícias"
+
+#: administrator/components/com_categories/admin.categories.php:330
+#: administrator/components/com_categories/admin.categories.php:807
+msgid "Weblink Category Table"
+msgstr "Tabela de Categorias de Links Web"
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:782
+msgid "Content Category Table"
+msgstr "Tabela de Categorias de Conteúdo"
+
+#: administrator/components/com_categories/admin.categories.php:333
+#: administrator/components/com_categories/admin.categories.php:787
+msgid "Content Category Blog"
+msgstr "Categoria de Conteúdo de Blog"
+
+#: administrator/components/com_categories/admin.categories.php:334
+msgid "Content Category Archive Blog"
+msgstr "Categoria de Conteúdo de Blog Arquivado"
+
+#: administrator/components/com_categories/admin.categories.php:447
+msgid "Select a category to delete"
+msgstr "Selecione uma categoria para remover"
+
+#: administrator/components/com_categories/admin.categories.php:524
+msgid "Select a category to %s"
+msgstr "Selecionar uma categoria para %s"
+
+#: administrator/components/com_categories/admin.categories.php:741
+msgid "%d Category copied to %s"
+msgid_plural "%d Categories copied to %s"
+msgstr[0] "%d Categorias copiadas para %s"
+msgstr[1] ""
+
+#: administrator/components/com_categories/admin.categories.php:792
+msgid "Content Category Blog Archive"
+msgstr "Categoria de Conteúdo de Blog Arquivado"
+
+#: administrator/components/com_banners/admin.banners.html.php:29
+msgid "Banner Manager"
+msgstr "Gerenciador de Banners"
+
+#: administrator/components/com_banners/admin.banners.html.php:43
+msgid "Banner Name"
+msgstr "Nome do Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:49
+msgid "Impressions Made"
+msgstr "Impressões Feitas"
+
+#: administrator/components/com_banners/admin.banners.html.php:52
+msgid "Impressions Left"
+msgstr "Impressões Faltantes"
+
+#: administrator/components/com_banners/admin.banners.html.php:55
+#: administrator/components/com_banners/admin.banners.html.php:58
+#: administrator/components/com_banners/admin.banners.html.php:256
+msgid "Clicks"
+msgstr "Clqiues"
+
+#: administrator/components/com_banners/admin.banners.html.php:99
+msgid "Edit Banner"
+msgstr "Editar Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:159
+msgid "You must provide a banner name"
+msgstr "Você deve informar um nome para o banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:161
+msgid "Please select a client"
+msgstr "Por favor selecione um cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:163
+msgid "Please select an image."
+msgstr "Por favor selecione uma imagem"
+
+#: administrator/components/com_banners/admin.banners.html.php:165
+msgid "Please fill in the URL for the banner."
+msgstr "Por favor preencha a URL para o banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:176
+msgid "Banner:"
+msgstr "Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:192
+msgid "Banner Name:"
+msgstr "Nome do Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:200
+#: administrator/components/com_banners/admin.banners.html.php:438
+msgid "Client Name:"
+msgstr "Nome do Cliente:"
+
+#: administrator/components/com_banners/admin.banners.html.php:208
+msgid "Impressions Purchased:"
+msgstr "Impressões Adquiridas:"
+
+#: administrator/components/com_banners/admin.banners.html.php:219
+msgid "Unlimited"
+msgstr "Ilimitadas"
+
+#: administrator/components/com_banners/admin.banners.html.php:224
+msgid "Banner URL"
+msgstr "URL do Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:232
+msgid "Show Banner :"
+msgstr "Mostrar Banner :"
+
+#: administrator/components/com_banners/admin.banners.html.php:240
+msgid "Click URL:"
+msgstr "URL para Clique:"
+
+#: administrator/components/com_banners/admin.banners.html.php:248
+msgid "Custom banner code:"
+msgstr "Código Customizado para o Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:258
+msgid "Reset Clicks"
+msgstr "Reiniciar Cliques"
+
+#: administrator/components/com_banners/admin.banners.html.php:270
+msgid "Banner Image:"
+msgstr "Imagem do Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:320
+msgid "Banner Client Manager"
+msgstr "Gerenciador de Clientes de Banners"
+
+#: administrator/components/com_banners/admin.banners.html.php:334
+msgid "Client Name"
+msgstr "Nome do Cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:340
+msgid "No. of Active Banners"
+msgstr "N. de Banners Ativos"
+
+#: administrator/components/com_banners/admin.banners.html.php:366
+msgid "Edit Banner Client"
+msgstr "Editar Cliente do Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:407
+msgid "Please fill in the Client Name."
+msgstr "Por favor preencha o Nome do Cliente."
+
+#: administrator/components/com_banners/admin.banners.html.php:409
+msgid "Please fill in the Contact Name."
+msgstr "Por favor preencha o Nome do Contato."
+
+#: administrator/components/com_banners/admin.banners.html.php:411
+msgid "Please fill in the Contact Email."
+msgstr "Por favor preencha o E-mail do Cliente."
+
+#: administrator/components/com_banners/admin.banners.html.php:421
+msgid "Banner Client:"
+msgstr "Cliente do Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:446
+msgid "Contact Name:"
+msgstr "Nome de Contato:"
+
+#: administrator/components/com_banners/admin.banners.html.php:454
+msgid "Contact Email:"
+msgstr "E-mail de Contato:"
+
+#: administrator/components/com_banners/admin.banners.html.php:462
+msgid "Extra Info:"
+msgstr "Informações Extras:"
+
+#: administrator/components/com_banners/admin.banners.php:165
+msgid "Saved Banner info"
+msgstr "Informações do Banner Salvas"
+
+#: administrator/components/com_banners/admin.banners.php:168
+msgid "Reset Banner clicks"
+msgstr "Reiniciar cliques do Banner"
+
+#: administrator/components/com_banners/admin.banners.php:276
+#, php-format
+msgid "The client [ %s ] is currently being edited by another person."
+msgstr "O cliente [ %s ] está sendo editado por outra pessoa."
+
+#: administrator/components/com_banners/admin.banners.php:334
+msgid "Cannot delete client at this time as they have a banner still running"
+msgstr ""
+"Não é possível apagar o cliente enquanto existem banners sendo executados"
+
+#: administrator/components/com_banners/banners.xml
+msgid "Banners"
+msgstr "Banners"
+
+#: administrator/components/com_banners/banners.xml
+msgid "This component manages banners and banner clients"
+msgstr "Este componente gerencia banners e seus clientes"
+
+#: components/com_banners/banners.class.php:35
+msgid "You must select a name for the client."
+msgstr "Você deve selecionar um nome para o cliente."
+
+#: components/com_banners/banners.class.php:41
+msgid "You must select a contact for the client."
+msgstr "Você deve selecionar um contato para o cliente."
+
+#: components/com_banners/banners.class.php:47
+msgid "You must select a valid email for the client."
+msgstr "Você deve selecionar um e-mail válido para o cliente."
+
+#: components/com_banners/banners.class.php:102
+msgid "You must select a client."
+msgstr "Você deve selecionar um cliente."
+
+#: components/com_banners/banners.class.php:107
+msgid "You must select a name for the banner."
+msgstr "Você deve selecionar um nome para o banner."
+
+#: components/com_banners/banners.class.php:112
+msgid "You must select a image for the banner."
+msgstr "Você deve selecionar uma imagem para o banner."
+
+#: components/com_banners/banners.class.php:116
+msgid "You must select a URL/Custom banner code for the banner."
+msgstr "Você deve selecionar uma URL/Código Customizado para o banner."
+
+#. Should be overridden by inheriting class
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:106
+msgid "XML handler error - no method provided to deal with character data"
+msgstr ""
+"Erro no cabeçalho de XML - nenhum método provido para trabalhar com dados "
+"dos caracteres"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:166
+msgid "Publish"
+msgstr "Publicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:204
+msgid "Assign"
+msgstr "Atribuir"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:223
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:242
+msgid "Unpublish"
+msgstr "Despublicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:65
+msgid "Control Panel"
+msgstr "Painel de Controle"
+
+#. Home Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:65
+msgid "Home"
+msgstr "Home"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site Management"
+msgstr "Gerenciamento do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:292
+msgid "Configuration"
+msgstr "Configuração"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Manage languages"
+msgstr "Gerenciar idiomas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Manage Media Files"
+msgstr "Gereciar Arquivos de Mídia"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:81
+msgid "In New Window"
+msgstr "Em Nova Janela"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:82
+msgid "Inline"
+msgstr "Em Linha"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:83
+msgid "Inline with Positions"
+msgstr "Em Linha com Posições"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Site Statistics"
+msgstr "Estatísticas do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:88
+msgid "Browser, OS, Domain"
+msgstr "Nagvegadores, SO, Domínios"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Change site template"
+msgstr "Alterar template do site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Site Templates"
+msgstr "Templates do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Install Site Templates"
+msgstr "Instalar Templates do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Administrator Templates"
+msgstr "Administrador de Templates"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Change admin template"
+msgstr "Alterar Template do Admin"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Install Administrator Templates"
+msgstr "Instalar Templates do Admin"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Template positions"
+msgstr "Posições de Templates"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Manage Trash"
+msgstr "Gerenciar Lixeira"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "Manage users"
+msgstr "Gerenciar Usuários"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+msgid "Menu Management"
+msgstr "Gerenciamento de Menus"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content Management"
+msgstr "Gerenciamento de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content Managers"
+msgstr "Gerenciadores de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content by Section"
+msgstr "Conteúdo por Seção"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:144
+msgid "Items"
+msgstr "Itens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+msgid "Add/Edit"
+msgstr "Adicionar/Editar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:58
+msgid "Categories"
+msgstr "Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+msgid "Manage Content Items"
+msgstr "Gerenciar Itens de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Manage Typed Content Items"
+msgstr "Gerenciar Tipos de Itens de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Manage Content Sections"
+msgstr "Gerenciar Seções de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Manage Content Categories"
+msgstr "Gerenciar Conteúdo de Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Manage Frontpage Items"
+msgstr "Gerenciar Itens da Página Principal"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Manage Archive Items"
+msgstr "Gerenciar Itens Arquivados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+msgid "Component Management"
+msgstr "Gerenciador de Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install/Uninstall"
+msgstr "Instalar/Remover"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+msgid "Install/Uninstall components"
+msgstr "Instalar/Remover componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components"
+msgstr "Mais Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components..."
+msgstr "Mais Componentes..."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+msgid "Module Management"
+msgstr "Gerenciador de Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Modules"
+msgstr "Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+msgid "Install custom modules"
+msgstr "Instalar Módulos Customizados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Manage Site modules"
+msgstr "Gerenciar Módulos do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Administrator Modules"
+msgstr "Módulos do Administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Manage Administrator modules"
+msgstr "Gerenciador de Módulos do Administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+msgid "Mambot Management"
+msgstr "Gerenciador de Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Mambots"
+msgstr "Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install custom mambot"
+msgstr "Instalar Mambots Customizados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Manage Site Mambots"
+msgstr "Gerenciar Mambots do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Site Mambots"
+msgstr "Mambots do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installer List"
+msgstr "Lista de Instaladores"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installers"
+msgstr "Instaladores"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Templates - Site"
+msgstr "Templates - Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Templates - Admin"
+msgstr "Templates - Admin"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Install Languages"
+msgstr "Instalar Idiomas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Install/Uninstall Components"
+msgstr "Instalar/Remover Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Install/Uninstall Modules"
+msgstr "Instalar/Remover Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Install/Uninstall Mambots"
+msgstr "Instalar/Remover Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messages"
+msgstr "Mensagens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messaging Management"
+msgstr "Gerenciamento de Mensagens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Inbox"
+msgstr "Caixa de Entrada"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Private Messages"
+msgstr "Mensagens Privadas"
+
+#. System Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System"
+msgstr "Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System Management"
+msgstr "Gerenciamento do Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Check-in all checked-out items"
+msgstr "Verificados todos os itens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Global Checkin"
+msgstr "Verificação Global"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:301
+msgid "System Information"
+msgstr "Informações do Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:301
+msgid "View System Information"
+msgstr "Ver Informações do Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean Cache"
+msgstr "Limpar Cache"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean the content items cache"
+msgstr "Limpar os itens de conteúdo do cache"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:27
+msgid "Most Recently Added Content"
+msgstr "Conteúdos Adicioandos Recentemente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:56
+msgid "Currently Logged in Users"
+msgstr "Usuários Atualmente Logados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+msgid "Force Logout User"
+msgstr "Forçar logout do Usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_online.php:22
+msgid "Users Online"
+msgstr "Usuários Online"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:27
+msgid "Most Popular Items"
+msgstr "Itens Mais Populares"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:35
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:144
+msgid "Static Content"
+msgstr "Conteúdo Estático"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:51
+msgid "Sections"
+msgstr "Seções"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:65
+msgid "Media"
+msgstr "Mídia"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:89
+msgid "Menus"
+msgstr "Menus"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:102
+msgid "Users"
+msgstr "Usuários"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:22
+msgid "Content Preview"
+msgstr "Pré-Visualização do Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:40
+msgid "Module Preview"
+msgstr "P're-Visualização de Módulo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:25
+msgid "Poll Preview"
+msgstr "P're-Visualização de Enquete"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:25
+msgid "Please select an image to upload"
+msgstr "Por favor selecione uma imagem para enviar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:31
+msgid "File must only contain alphanumeric characters and no spaces please."
+msgstr ""
+"O nome do arquivo deve conter somente caracteres alfanuméricos e sem espaços"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:36
+#, php-format
+msgid "Image %s already exists."
+msgstr "Imagem %s já existe"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:41
+msgid "The file must be gif, png, jpg, bmp, swf, doc, xls or ppt"
+msgstr "O arquivo deve ser gif, png, jpg, bmp, swf, doc, xls ou ppt"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:48
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:56
+msgid "Upload of $userfile_name failed"
+msgstr "Envio do arquivo $userfile_name falhou"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:52
+msgid "Upload of $userfile_name to $media_path successful"
+msgstr "Envio do arquivo $userfile_name para $media_path correto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:60
+msgid "Upload of $userfile_name to $base_Dir successful"
+msgstr "Envio do arquivo $userfile_name para $base_dir correto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:84
+msgid "File Upload :"
+msgstr "Enviar Arquivo:"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:34
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:88
+msgid "Mambo Logo"
+msgstr "Logo do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:55
+msgid "Welcome to Mambo!"
+msgstr "Bem-Vindo ao Mambo!"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:56
+msgid ""
+"Use a valid username and password to gain access to the administration "
+"console."
+msgstr ""
+"Use um nome de usuário e uma senha válidos para obter acesso a área "
+"administrativa."
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Advanced Mode"
+msgstr "Modo Avançado"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Simple Mode"
+msgstr "Modo Básico"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "selected"
+msgstr "selecionado"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "unselected"
+msgstr "não selecionado"
+
+#: administrator/components/com_admin/admin.admin.html.php:80
+msgid "Information"
+msgstr "Informação"
+
+#: administrator/components/com_admin/admin.admin.html.php:86
+#: administrator/components/com_admin/admin.admin.html.php:480
+msgid "System Info"
+msgstr "Infos do Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:97
+msgid "PHP built On:"
+msgstr "PHP built On:"
+
+#: administrator/components/com_admin/admin.admin.html.php:107
+msgid "Database Version:"
+msgstr "Versão do Banco de Dados:"
+
+#: administrator/components/com_admin/admin.admin.html.php:117
+msgid "PHP Version:"
+msgstr "Versão do PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:127
+msgid "Web Server:"
+msgstr "Servidor Web:"
+
+#: administrator/components/com_admin/admin.admin.html.php:137
+msgid "WebServer to PHP interface:"
+msgstr "Inteface do Servidor Web para PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:147
+msgid "Mambo Version:"
+msgstr "Versão do Mambo:"
+
+#: administrator/components/com_admin/admin.admin.html.php:157
+msgid "User Agent:"
+msgstr "Agente do Usuário:"
+
+#: administrator/components/com_admin/admin.admin.html.php:167
+msgid "Relevant PHP Settings:"
+msgstr "Configurações Relevantes do PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:174
+msgid "Safe Mode:"
+msgstr "Safe Mode:"
+
+#: administrator/components/com_admin/admin.admin.html.php:182
+msgid "Open basedir:"
+msgstr "Open basedir:"
+
+#: administrator/components/com_admin/admin.admin.html.php:190
+msgid "Display Errors:"
+msgstr "Mostrar Erros:"
+
+#: administrator/components/com_admin/admin.admin.html.php:198
+msgid "Short Open Tags:"
+msgstr "Short Open Tags:"
+
+#: administrator/components/com_admin/admin.admin.html.php:206
+msgid "File Uploads:"
+msgstr "Envio de Arquivos:"
+
+#: administrator/components/com_admin/admin.admin.html.php:214
+msgid "Magic Quotes"
+msgstr "Magic Quotes"
+
+#: administrator/components/com_admin/admin.admin.html.php:222
+msgid "Register Globals:"
+msgstr "Register Globals:"
+
+#: administrator/components/com_admin/admin.admin.html.php:230
+msgid "Output Buffering:"
+msgstr "Buffer de Saída:"
+
+#: administrator/components/com_admin/admin.admin.html.php:238
+msgid "Session save path:"
+msgstr "Caminho para salvar sessões:"
+
+#: administrator/components/com_admin/admin.admin.html.php:246
+msgid "Session auto start:"
+msgstr "Início Automático de Sessão:"
+
+#: administrator/components/com_admin/admin.admin.html.php:254
+msgid "XML enabled:"
+msgstr "XML habilitado:"
+
+#: administrator/components/com_admin/admin.admin.html.php:262
+msgid "Zlib enabled:"
+msgstr "Zlib habilitado:"
+
+#: administrator/components/com_admin/admin.admin.html.php:270
+msgid "Disabled Functions:"
+msgstr "Funções Desabilitadas:"
+
+#: administrator/components/com_admin/admin.admin.html.php:297
+msgid "Configuration File:"
+msgstr "Arquivo de Configuração:"
+
+#: administrator/components/com_admin/admin.admin.html.php:323
+msgid "PHP Info"
+msgstr "Infos do PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:328
+msgid "PHP Information"
+msgstr "Informações do PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:350
+msgid "Permissions"
+msgstr "Permissões"
+
+#: administrator/components/com_admin/admin.admin.html.php:358
+msgid ""
+"For all Mambo functions and features to work ALL of the following "
+"directories should be writeable:"
+msgstr ""
+"Para que TODAS as funções e funcionalidades do Mambo funcionem, os seguintes "
+"direórios devem permitir escrita:"
+
+#: administrator/components/com_admin/admin.admin.html.php:443
+msgid "Go"
+msgstr "Vai"
+
+#: administrator/components/com_admin/admin.admin.html.php:444
+msgid "Clear Results"
+msgstr "Limpar Resultados"
+
+#: administrator/components/com_admin/admin.admin.html.php:451
+#: administrator/components/com_admin/admin.admin.html.php:462
+msgid "Glossary"
+msgstr "Glossário"
+
+#: administrator/components/com_admin/admin.admin.html.php:454
+#: administrator/components/com_admin/admin.admin.html.php:465
+msgid "Credits"
+msgstr "Créditos"
+
+#: administrator/components/com_admin/admin.admin.html.php:457
+#: administrator/components/com_admin/admin.admin.html.php:468
+msgid "Support"
+msgstr "Suporte"
+
+#: administrator/components/com_admin/admin.admin.html.php:474
+msgid "License"
+msgstr "Licença"
+
+#: administrator/components/com_admin/admin.admin.html.php:488
+msgid "Index"
+msgstr "Índice"
+
+#: administrator/components/com_admin/admin.admin.html.php:530
+msgid "Site Preview"
+msgstr "Pré-visualização do site"
+
+#: administrator/components/com_admin/admin.admin.html.php:534
+msgid "Open in new window"
+msgstr "Abrir em uma nova janela"
+
+#: administrator/components/com_admin/admin.admin.php:20
+msgid "There is no link associated with this item"
+msgstr "Não existe um link associado com este item"
diff -ruN 4.5.4/language/glossary/pt_BR_utf-8.po 4.6rc2/language/glossary/pt_BR_utf-8.po
--- 4.5.4/language/glossary/pt_BR_utf-8.po	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/glossary/pt_BR_utf-8.po	2006-06-07 03:21:25.000000000 -0500
@@ -0,0 +1,5929 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Mambo 4.6 Portuguese Brazilian\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-31 20:49+0000\n"
+"PO-Revision-Date: 2006-03-17 22:27-0000\n"
+"Last-Translator: Carlos Souza <csouza@mamboprojects.com>\n"
+"Language-Team: No Ritmo do Mambo <webmaster@noritmodomambo.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: BRAZIL\n"
+
+#: administrator/components/com_admin/admin.admin.html.php:29
+msgid "Home"
+msgstr "Início"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Advanced Mode"
+msgstr "Modo Avançado"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Simple Mode"
+msgstr "Modo Básico"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "selected"
+msgstr "selecionado"
+
+#: administrator/components/com_admin/admin.admin.html.php:39
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "unselected"
+msgstr "não selecionado"
+
+#: administrator/components/com_admin/admin.admin.html.php:80
+msgid "Information"
+msgstr "Informação"
+
+#: administrator/components/com_admin/admin.admin.html.php:86
+#: administrator/components/com_admin/admin.admin.html.php:480
+msgid "System Info"
+msgstr "Infos do Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:91
+msgid "System Information"
+msgstr "Informações do Sistema"
+
+#: administrator/components/com_admin/admin.admin.html.php:97
+msgid "PHP built On:"
+msgstr "PHP built On:"
+
+#: administrator/components/com_admin/admin.admin.html.php:107
+msgid "Database Version:"
+msgstr "Versão do Banco de Dados:"
+
+#: administrator/components/com_admin/admin.admin.html.php:117
+msgid "PHP Version:"
+msgstr "Versão do PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:127
+msgid "Web Server:"
+msgstr "Servidor Web:"
+
+#: administrator/components/com_admin/admin.admin.html.php:137
+msgid "WebServer to PHP interface:"
+msgstr "Inteface do Servidor Web para PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:147
+msgid "Mambo Version:"
+msgstr "Versão do Mambo:"
+
+#: administrator/components/com_admin/admin.admin.html.php:157
+msgid "User Agent:"
+msgstr "Agente do Usuário:"
+
+#: administrator/components/com_admin/admin.admin.html.php:167
+msgid "Relevant PHP Settings:"
+msgstr "Configurações Relevantes do PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:174
+msgid "Safe Mode:"
+msgstr "Safe Mode:"
+
+#: administrator/components/com_admin/admin.admin.html.php:182
+msgid "Open basedir:"
+msgstr "Open basedir:"
+
+#: administrator/components/com_admin/admin.admin.html.php:190
+msgid "Display Errors:"
+msgstr "Mostrar Erros:"
+
+#: administrator/components/com_admin/admin.admin.html.php:198
+msgid "Short Open Tags:"
+msgstr "Short Open Tags:"
+
+#: administrator/components/com_admin/admin.admin.html.php:206
+msgid "File Uploads:"
+msgstr "Envio de Arquivos:"
+
+#: administrator/components/com_admin/admin.admin.html.php:214
+msgid "Magic Quotes"
+msgstr "Magic Quotes"
+
+#: administrator/components/com_admin/admin.admin.html.php:222
+msgid "Register Globals:"
+msgstr "Register Globals:"
+
+#: administrator/components/com_admin/admin.admin.html.php:230
+msgid "Output Buffering:"
+msgstr "Buffer de Saída:"
+
+#: administrator/components/com_admin/admin.admin.html.php:238
+msgid "Session save path:"
+msgstr "Caminho para salvar sessões:"
+
+#: administrator/components/com_admin/admin.admin.html.php:246
+msgid "Session auto start:"
+msgstr "Início Automático de Sessão:"
+
+#: administrator/components/com_admin/admin.admin.html.php:254
+msgid "XML enabled:"
+msgstr "XML habilitado:"
+
+#: administrator/components/com_admin/admin.admin.html.php:262
+msgid "Zlib enabled:"
+msgstr "Zlib habilitado:"
+
+#: administrator/components/com_admin/admin.admin.html.php:270
+msgid "Disabled Functions:"
+msgstr "Funções Desabilitadas:"
+
+#: administrator/components/com_admin/admin.admin.html.php:285
+msgid "WYSIWYG Editor:"
+msgstr "Editor WYSIWYG:"
+
+#: administrator/components/com_admin/admin.admin.html.php:297
+msgid "Configuration File:"
+msgstr "Arquivo de Configuração:"
+
+#: administrator/components/com_admin/admin.admin.html.php:323
+msgid "PHP Info"
+msgstr "Infos do PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:328
+msgid "PHP Information"
+msgstr "Informações do PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:350
+msgid "Permissions"
+msgstr "Permissões"
+
+#: administrator/components/com_admin/admin.admin.html.php:354
+msgid "Directory Permissions"
+msgstr "Permissões de Diretórios"
+
+#: administrator/components/com_admin/admin.admin.html.php:358
+msgid ""
+"For all Mambo functions and features to work ALL of the following "
+"directories should be writeable:"
+msgstr ""
+"Para que TODAS as funções e funcionalidades do Mambo funcionem, os seguintes "
+"direórios devem permitir escrita:"
+
+#: administrator/components/com_admin/admin.admin.html.php:432
+msgid "Help"
+msgstr "Ajuda"
+
+#: administrator/components/com_admin/admin.admin.html.php:440
+msgid "Search:"
+msgstr "Pesquisa:"
+
+#: administrator/components/com_admin/admin.admin.html.php:443
+msgid "Go"
+msgstr "Vai"
+
+#: administrator/components/com_admin/admin.admin.html.php:444
+msgid "Clear Results"
+msgstr "Limpar Resultados"
+
+#: administrator/components/com_admin/admin.admin.html.php:451
+#: administrator/components/com_admin/admin.admin.html.php:462
+msgid "Glossary"
+msgstr "Glossário"
+
+#: administrator/components/com_admin/admin.admin.html.php:454
+#: administrator/components/com_admin/admin.admin.html.php:465
+msgid "Credits"
+msgstr "Créditos"
+
+#: administrator/components/com_admin/admin.admin.html.php:457
+#: administrator/components/com_admin/admin.admin.html.php:468
+msgid "Support"
+msgstr "Suporte"
+
+#: administrator/components/com_admin/admin.admin.html.php:474
+msgid "License"
+msgstr "Licença"
+
+#: administrator/components/com_admin/admin.admin.html.php:488
+msgid "Index"
+msgstr "Índice"
+
+#: administrator/components/com_admin/admin.admin.html.php:530
+msgid "Site Preview"
+msgstr "Pré-visualização do site"
+
+#: administrator/components/com_admin/admin.admin.html.php:534
+msgid "Open in new window"
+msgstr "Abrir em uma nova janela"
+
+#: administrator/components/com_admin/admin.admin.php:20
+msgid "There is no link associated with this item"
+msgstr "Não existe um link associado com este item"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:42
+#, php-format
+msgid "XML ERROR in %s: %s at line %d"
+msgstr "ERRO DE XML em %s: %s na linha %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:48
+#, php-format
+msgid "Unable to open XML file %s"
+msgstr "Impossível abrir arquivo XML %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:51
+#, php-format
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr "Erro XML em %s: - tags não fechadas (%s) no fim do arquivo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:78
+#, php-format
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr "Erro XML em %s: %s não é um elemento contido válido"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:79
+#, php-format
+msgid "XML error in %s: %s not permitted within %s"
+msgstr "Erro XML em %s: %s não é permitido dentro de %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:88
+#, php-format
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr "Erro XML em %s: esperado MOSINSTALL mas foi encontrado %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:94
+#, php-format
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr ""
+"Erro XML em %s: a última tag aberta foi %s, mas foi encontrado o fim de %s"
+
+#. Should be overridden by inheriting class
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:106
+msgid "XML handler error - no method provided to deal with character data"
+msgstr ""
+"Erro no cabeçalho de XML - nenhum método provido para trabalhar com dados "
+"dos caracteres"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:111
+#, php-format
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr "Erro XML em %s: mosinstall não tem um atributo de tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:280
+msgid "Handler not defined for type"
+msgstr "Cabeçalho não definido para o tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:293
+msgid "There are no Parameters for this item"
+msgstr "Não existem parâmetros para este item"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:78
+#, php-format
+msgid "Please make a selection from the list to %s"
+msgstr "Por favor faça uma seleção na lista para %s"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:108
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:128
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:55
+msgid "New"
+msgstr "Novo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:166
+msgid "Publish"
+msgstr "Publicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:171
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:102
+msgid "Please make a selection from the list to publish"
+msgstr "Por favor selecione um item da lista para publicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:185
+msgid "Default"
+msgstr "Padrão"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:190
+msgid "Please select an item to make default"
+msgstr "Por favor selecione um item da lista para torná-lo padrão"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:204
+msgid "Assign"
+msgstr "Atribuir"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:209
+msgid "Please select an item to assign"
+msgstr "Por favor selecione um item para atribuir"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:223
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:242
+msgid "Unpublish"
+msgstr "Despublicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:247
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:142
+msgid "Please make a selection from the list to unpublish"
+msgstr "Por favor selecione um item da lista para despublicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:261
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:150
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:155
+msgid "Archive"
+msgstr "Arquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:266
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:162
+msgid "Please make a selection from the list to archive"
+msgstr "Por favor faça uma seleção na lista para desarquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:280
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:175
+msgid "Unarchive"
+msgstr "Desarquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:182
+msgid "Please select a news story to unarchive"
+msgstr "Por favor, selecione uma notícia para desarquivar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:299
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:319
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:195
+msgid "Edit"
+msgstr "Editar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:324
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:343
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:363
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:382
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:402
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:202
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:221
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:240
+msgid "Please select an item from the list to edit"
+msgstr "Por favor selecione um item da lista para editar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:338
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:358
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:215
+msgid "Edit HTML"
+msgstr "Editar HTML"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:377
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:397
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:234
+msgid "Edit CSS"
+msgstr "Editar CSS"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:417
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:438
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:254
+msgid "Delete"
+msgstr "Remover"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:422
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:443
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Are you sure you want to delete selected items?"
+msgstr "Você tem certeza que deseja remover os itens selecionados?"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:422
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:443
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:261
+msgid "Please make a selection from the list to delete"
+msgstr "Por favor selecione um item da lista para remover"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:455
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:79
+msgid "Trash"
+msgstr "Lixeira"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:474
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:475
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:80
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:277
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:278
+msgid "Preview"
+msgstr "Pré-Visualizar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:540
+msgid "Apply"
+msgstr "Aplicar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:560
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:294
+msgid "Save"
+msgstr "Salvar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:611
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:344
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:629
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:239
+msgid "Back"
+msgstr "Voltar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:664
+msgid "Upload"
+msgstr "Enviar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:669
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:670
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:391
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:392
+msgid "Upload Image"
+msgstr "Enviar Imagem"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:86
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:410
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+"Novos itens são adicionados no fim por padrão. A ordem pode ser alterada "
+"depois que o item for salvo."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:181
+msgid "Parent Window With Browser Navigation"
+msgstr "Mesma Janela com Botões de Navegação"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:182
+msgid "New Window With Browser Navigation"
+msgstr "Nova Janela com Botões de Navegação"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:183
+msgid "New Window Without Browser Navigation"
+msgstr "Nova Janela sem Botões de Navegação"
+
+#. prepare an array with 'all' as the first item
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:242
+msgid "All"
+msgstr "Tudo"
+
+#. prepare an array with 'all' as the first item
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:248
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:451
+msgid "None"
+msgstr "Nenhum"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:304
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:503
+msgid "- All Sections -"
+msgstr "- Todas as Seções -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:390
+msgid "- Select Image -"
+msgstr "- Selecione uma Imagem -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:408
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr ""
+"Novos itens são adicionados no início por padrão. A ordem pode ser alterada "
+"depois que o item for salvo."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:435
+msgid "- No User -"
+msgstr "- Sem Usuário -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:454
+msgid "Center"
+msgstr "Centro"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:457
+msgid "Left"
+msgstr "Esquerda"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:460
+msgid "Right"
+msgstr "Direita"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:482
+msgid "- All Categories -"
+msgstr "- Todas as Categorias -"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/mosAdminMenus.php:489
+msgid "You must create a category first."
+msgstr "Você deve criar uma categoria primeiro."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:73
+#, php-format
+msgid "Results %d to %d of %d"
+msgstr "Resultados de %d para %d de %d"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:75
+msgid "No records found."
+msgstr "Nenhum registro encontrado"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:102
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:108
+msgid "Start"
+msgstr "Iniciar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:102
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:105
+msgid "first page"
+msgstr "primeira página"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:103
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:109
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:226
+msgid "Previous"
+msgstr "Anterior"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:103
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:106
+msgid "previous page"
+msgstr "página anterior"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:121
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:124
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:127
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:217
+msgid "Next"
+msgstr "Próxima"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:121
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:124
+msgid "next page"
+msgstr "próxima página"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:122
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:128
+msgid "End"
+msgstr "Fim"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/pageNavigation.php:122
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:125
+msgid "end page"
+msgstr "fim da página"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:65
+msgid "Control Panel"
+msgstr "Painel de Controle"
+
+#. Site Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site"
+msgstr "Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:69
+msgid "Site Management"
+msgstr "Gerenciamento do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:292
+msgid "Configuration"
+msgstr "Configuração"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:72
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:115
+msgid "Global Configuration"
+msgstr "Configuração Global"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Language Manager"
+msgstr "Gerenciador de Idiomas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:76
+msgid "Manage languages"
+msgstr "Gerenciar idiomas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Manage Media Files"
+msgstr "Gereciar Arquivos de Mídia"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:79
+msgid "Media Manager"
+msgstr "Gerenciador de Mídia"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:81
+msgid "In New Window"
+msgstr "Em Nova Janela"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:82
+msgid "Inline"
+msgstr "Em Linha"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:83
+msgid "Inline with Positions"
+msgstr "Em Linha com Posições"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Site Statistics"
+msgstr "Estatísticas do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:85
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:88
+msgid "Browser, OS, Domain"
+msgstr "Nagvegadores, SO, Domínios"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:89
+msgid "Page Impressions"
+msgstr "Visitas à Páginas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:92
+msgid "Search Text"
+msgstr "Texto de Busca"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Change site template"
+msgstr "Alterar template do site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:96
+msgid "Template Manager"
+msgstr "Gerenciador de Templates"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:97
+msgid "Site Templates"
+msgstr "Templates do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+msgid "Install"
+msgstr "Instalar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Install Site Templates"
+msgstr "Instalar Templates do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Administrator Templates"
+msgstr "Administrador de Templates"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:100
+msgid "Change admin template"
+msgstr "Alterar Template do Admin"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Install Administrator Templates"
+msgstr "Instalar Templates do Admin"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Module Positions"
+msgstr "Posições de Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:103
+msgid "Template positions"
+msgstr "Posições de Templates"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Manage Trash"
+msgstr "Gerenciar Lixeira"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:108
+msgid "Trash Manager"
+msgstr "Gerenciador de Lixeira"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "Manage users"
+msgstr "Gerenciar Usuários"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:112
+msgid "User Manager"
+msgstr "Gerenciador de Usuários"
+
+#. Menu Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_stats.php:24
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:438
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:517
+msgid "Menu"
+msgstr "Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:119
+msgid "Menu Management"
+msgstr "Gerenciamento de Menus"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:122
+msgid "Menu Manager"
+msgstr "Gerenciador de Menus"
+
+#. Content Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content"
+msgstr "Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:134
+msgid "Content Management"
+msgstr "Gerenciamento de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content Managers"
+msgstr "Gerenciadores de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:137
+msgid "Content by Section"
+msgstr "Conteúdo por Seção"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:144
+msgid "Items"
+msgstr "Itens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+msgid "Add/Edit"
+msgstr "Adicionar/Editar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:58
+msgid "Categories"
+msgstr "Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:28
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:137
+msgid "All Content Items"
+msgstr "Todos os Itens da Categoria"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:161
+msgid "Manage Content Items"
+msgstr "Gerenciar Itens de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Manage Typed Content Items"
+msgstr "Gerenciar Tipos de Itens de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:162
+msgid "Static Content Manager"
+msgstr "Gerenciador de Conteúdo Estático"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Manage Content Sections"
+msgstr "Gerenciar Seções de Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:164
+msgid "Section Manager"
+msgstr "Gerenciador de Seções"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Category Manager"
+msgstr "Gerenciador de Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:167
+msgid "Manage Content Categories"
+msgstr "Gerenciar Conteúdo de Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Frontpage Manager"
+msgstr "Gerenciador de Página Principal"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:171
+msgid "Manage Frontpage Items"
+msgstr "Gerenciar Itens da Página Principal"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Archive Manager"
+msgstr "Gerenciador de Itens Arquivados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:172
+msgid "Manage Archive Items"
+msgstr "Gerenciar Itens Arquivados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+msgid "Component Management"
+msgstr "Gerenciador de Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:178
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Components"
+msgstr "Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install/Uninstall"
+msgstr "Instalar/Remover"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+msgid "Install/Uninstall components"
+msgstr "Instalar/Remover componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components"
+msgstr "Mais Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:223
+msgid "More Components..."
+msgstr "Mais Componentes..."
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+msgid "Module Management"
+msgstr "Gerenciador de Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:231
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Modules"
+msgstr "Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+msgid "Install custom modules"
+msgstr "Instalar Módulos Customizados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Manage Site modules"
+msgstr "Gerenciar Módulos do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:239
+msgid "Site Modules"
+msgstr "Módulos do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Administrator Modules"
+msgstr "Módulos do Administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:240
+msgid "Manage Administrator modules"
+msgstr "Gerenciador de Módulos do Administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+msgid "Mambot Management"
+msgstr "Gerenciador de Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:250
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Mambots"
+msgstr "Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install custom mambot"
+msgstr "Instalar Mambots Customizados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Manage Site Mambots"
+msgstr "Gerenciar Mambots do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:258
+msgid "Site Mambots"
+msgstr "Mambots do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installer List"
+msgstr "Lista de Instaladores"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:269
+msgid "Installers"
+msgstr "Instaladores"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Templates - Site"
+msgstr "Templates - Site"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Templates - Admin"
+msgstr "Templates - Admin"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Install Languages"
+msgstr "Instalar Idiomas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Languages"
+msgstr "Idiomas"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Install/Uninstall Components"
+msgstr "Instalar/Remover Componentes"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Install/Uninstall Modules"
+msgstr "Instalar/Remover Módulos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Install/Uninstall Mambots"
+msgstr "Instalar/Remover Mambots"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messages"
+msgstr "Mensagens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:290
+msgid "Messaging Management"
+msgstr "Gerenciamento de Mensagens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Inbox"
+msgstr "Caixa de Entrada"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:291
+msgid "Private Messages"
+msgstr "Mensagens Privadas"
+
+#. System Sub-Menu
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System"
+msgstr "Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:297
+msgid "System Management"
+msgstr "Gerenciamento do Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Check-in all checked-out items"
+msgstr "Verificados todos os itens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:300
+msgid "Global Checkin"
+msgstr "Verificação Global"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:301
+msgid "View System Information"
+msgstr "Ver Informações do Sistema"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean Cache"
+msgstr "Limpar Cache"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:304
+msgid "Clean the content items cache"
+msgstr "Limpar os itens de conteúdo do cache"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:27
+msgid "Most Recently Added Content"
+msgstr "Conteúdos Adicioandos Recentemente"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_latest.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:64
+msgid "Edit User"
+msgstr "Editar Usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:56
+msgid "Currently Logged in Users"
+msgstr "Usuários Atualmente Logados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+msgid "Force Logout User"
+msgstr "Forçar logout do Usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_logged.php:84
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:62
+msgid "Logout"
+msgstr "Logout"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_online.php:22
+msgid "Users Online"
+msgstr "Usuários Online"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:27
+msgid "Most Popular Items"
+msgstr "Itens Mais Populares"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:30
+msgid "Created"
+msgstr "Criado"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_popular.php:33
+msgid "Hits"
+msgstr "Acessos"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:35
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:144
+msgid "Static Content"
+msgstr "Conteúdo Estático"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:42
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:152
+msgid "Frontpage"
+msgstr "Página Principal"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:51
+msgid "Sections"
+msgstr "Seções"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:65
+msgid "Media"
+msgstr "Mídia"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:89
+msgid "Menus"
+msgstr "Menus"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_quickicon.php:102
+msgid "Users"
+msgstr "Usuários"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_stats.php:27
+msgid "# Items"
+msgstr "# Itens"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_unread.php:17
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_unread.php:19
+msgid "Mail"
+msgstr "E-mail"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:22
+msgid "Content Preview"
+msgstr "Pré-Visualização do Conteúdo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:60
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:68
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:49
+msgid "Close"
+msgstr "Fechar"
+
+#. Print Preview button - used when viewing page
+#. Print Button - used in pop-up window
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/contentwindow.php:61
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:276
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:278
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:285
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:294
+msgid "Print"
+msgstr "Imprimir"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/modulewindow.php:40
+msgid "Module Preview"
+msgstr "P're-Visualização de Módulo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:25
+msgid "Poll Preview"
+msgstr "P're-Visualização de Enquete"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:46
+msgid "Results"
+msgstr "Resultados"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/pollwindow.php:46
+msgid "Vote"
+msgstr "Votar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:25
+msgid "Please select an image to upload"
+msgstr "Por favor selecione uma imagem para enviar"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:31
+msgid "File must only contain alphanumeric characters and no spaces please."
+msgstr ""
+"O nome do arquivo deve conter somente caracteres alfanuméricos e sem espaços"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:36
+#, php-format
+msgid "Image %s already exists."
+msgstr "Imagem %s já existe"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:41
+msgid "The file must be gif, png, jpg, bmp, swf, doc, xls or ppt"
+msgstr "O arquivo deve ser gif, png, jpg, bmp, swf, doc, xls ou ppt"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:48
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:56
+msgid "Upload of $userfile_name failed"
+msgstr "Envio do arquivo $userfile_name falhou"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:52
+msgid "Upload of $userfile_name to $media_path successful"
+msgstr "Envio do arquivo $userfile_name para $media_path correto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:60
+msgid "Upload of $userfile_name to $base_Dir successful"
+msgstr "Envio do arquivo $userfile_name para $base_dir correto"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:84
+msgid "File Upload :"
+msgstr "Enviar Arquivo:"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:94
+msgid "Max size"
+msgstr "Tamanho Máx"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:34
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:50
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:88
+msgid "Mambo Logo"
+msgstr "Logo do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:19
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/index.php:22
+msgid "Administration"
+msgstr "Administração"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:40
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:49
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin_blue/login.php:40
+msgid "Login"
+msgstr "Login"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:43
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:45
+msgid "Password"
+msgstr "Senha"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:55
+msgid "Welcome to Mambo!"
+msgstr "Bem-Vindo ao Mambo!"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/templates/mambo_admin/login.php:56
+msgid ""
+"Use a valid username and password to gain access to the administration "
+"console."
+msgstr ""
+"Use um nome de usuário e uma senha válidos para obter acesso a área "
+"administrativa."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:36
+msgid "Please make a selection from the list to"
+msgstr "Por favor faça uma seleção na lista para"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:75
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:95
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:473
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:560
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:653
+msgid "Published"
+msgstr "Publicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:115
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:135
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:653
+msgid "Unpublished"
+msgstr "Descuplicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:312
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:313
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:327
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:328
+msgid "save"
+msgstr "salvar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:363
+#: D:/releases/svn/mambo/branches/4.6/includes/HTML_toolbar.php:364
+msgid "back"
+msgstr "voltar"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr "Por favor, complete os campos de nome de usuário e senha."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:41
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr ""
+"Logins não são permitidos. A verificação de autenticação não está ativa."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr ""
+"Sua conta foi bloqueada. Por favor entre em contato com o administrador."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr "Nome de Usuário ou Senha Inválidos. Tente Novamente."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:147
+msgid "Please enter a password"
+msgstr "Digite uma senha"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:166
+msgid "You cannot login. There are no administrators set up."
+msgstr "Você não pode se logar. Não existem administradores configurados."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr "Nome de Usuário, Senha ou Nível de Acesso incorretos. Tente novamente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/cmtclasses.php:348
+msgid "Your Module must contain a title."
+msgstr "Seu Módulo deve conter um título"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:21
+msgid "Unwriteable"
+msgstr "Somente Leitura"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:21
+msgid "Writeable"
+msgstr "Escrita"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:95
+msgid "January"
+msgstr "Janeiro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:96
+msgid "February"
+msgstr "Fevereiro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:97
+msgid "March"
+msgstr "Março"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:98
+msgid "April"
+msgstr "Abril"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:99
+msgid "May"
+msgstr "Maio"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:100
+msgid "June"
+msgstr "Junho"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:101
+msgid "July"
+msgstr "Julho"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:102
+msgid "August"
+msgstr "Agosto"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:103
+msgid "September"
+msgstr "Setembro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:104
+msgid "October"
+msgstr "Outubro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:105
+msgid "November"
+msgstr "Novembro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:106
+msgid "December"
+msgstr "Dezembro"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:121
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:171
+msgid "Yes"
+msgstr "Sim"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:122
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:170
+msgid "No"
+msgstr "Não"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:195
+msgid "No Sorting"
+msgstr "Sem Ordenamento"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:196
+msgid "Sort Ascending"
+msgstr "Ordem Ascendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:197
+msgid "Sort Descending"
+msgstr "Ordem Decrescente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:222
+msgid "Close Window"
+msgstr "Fechar Janela"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:350
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr ""
+"Este endereço de e-mail está protegido de spam bots. Você precisa ter o "
+"Javascript habilitado para vê-lo."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:375
+msgid "Pending"
+msgstr "Pendente"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:378
+msgid "Published, but is <u>Pending"
+msgstr "Publicado mas está <u>Pendente</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:381
+msgid "Visible"
+msgstr "Visível"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:384
+msgid "Published and is <u>Current</u>"
+msgstr "Pendente e é o <u>Corrente</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:387
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:393
+msgid "Finished"
+msgstr "Finalizado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:390
+msgid "Published, but has <u>Expired</u>"
+msgstr "Publicado mas <u>Expirou</u>"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:396
+msgid "Not Published"
+msgstr "Não Publicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:401
+msgid "Click on icon to toggle state."
+msgstr "Clique no ícone para alterar o estado."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:441
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:520
+msgid "Go to Menu"
+msgstr "Vai para o Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:448
+msgid "Link Name"
+msgstr "Nome do Link"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:452
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:539
+msgid "Go to Menu Item"
+msgstr "Vai para o Item de Menu"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:460
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:547
+msgid "State"
+msgstr "Estado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:466
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:553
+msgid "Trashed"
+msgstr "Lixo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:469
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:556
+msgid "UnPublished"
+msgstr "Despublicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:527
+msgid "Type"
+msgstr "Tipo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:535
+msgid "Item Name"
+msgstr "Nome do Item"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:584
+msgid "Checked Out"
+msgstr "Verificado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Publish item"
+msgstr "Item Publicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:654
+msgid "Unpublish Item"
+msgstr "Item Despublicado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:21
+#, php-format
+msgid "User Submitted '%s'"
+msgstr "Usuário Enviou '%s'"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:22
+#, php-format
+msgid ""
+"Hello %s,\\n\\n\\nA user submitted %s:\\n [ %s ]\\n has been just been "
+"submitted by user:\\n [ %s ]\\n"
+msgstr ""
+"Olá %s,\\n\\n\\nUm usuário enviou %s:\\n [ %s ]\\nfoi enviado pelo usuário:"
+"\\n [ %s ]\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:23
+msgid " for %.\\n\\n\\n\\n"
+msgstr "para %.\\n\\n\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:24
+#, php-format
+msgid "Please go to %s/administrator to view and approve this %s.\\n\\n"
+msgstr "Por favor, vá até o %s/administrador para ver e aprovar %s.\\n\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:25
+msgid ""
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only\\n"
+msgstr ""
+"Por favor não responda esta mensagem. Ela é automaticamente gerada e serve "
+"somente para informação\\n"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:48
+msgid "You are not authorized to view this resource."
+msgstr "Você não possui autorização para ver este recurso."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:50
+msgid "You need to login."
+msgstr "Você precisa se autenticar."
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:334
+msgid "Mambo Warning"
+msgstr "Aviso do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:67
+#, php-format
+msgid "Results %d - %d of %d"
+msgstr "Resultados %d - %d de %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pageNavigation.php:79
+#, php-format
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:67
+msgid "Powered by Mambo"
+msgstr "Provido por Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:68
+msgid "Generated:"
+msgstr "Gerado:"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:95
+msgid "Written by"
+msgstr "Escrito por"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:97
+msgid "Contributed by"
+msgstr "Contribuições de"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:103
+msgid "Last Updated"
+msgstr "Última Atualização"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:121
+msgid "OFF"
+msgstr "Desligado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/pdf.php:121
+msgid "ON"
+msgstr "Ligado"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:283
+msgid "Text Domains"
+msgstr "Domínios de Textos"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:290
+msgid "Main"
+msgstr "Principal"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:58
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:183
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:194
+msgid "Page"
+msgstr "Página"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:142
+msgid "Article Index"
+msgstr "Índice de Artigos"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:215
+msgid "Next &gt;&gt;"
+msgstr "Próximo &gt;&gt;"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:224
+msgid "&lt;&lt;Previous"
+msgstr " &gt;&gt;Anterior"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:39
+msgid "User Rating"
+msgstr "Votação do Usuário"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:47
+msgid "Poor"
+msgstr "Pobre"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:48
+msgid "vote 1 star"
+msgstr "Voto 1 Estrela"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:49
+msgid "vote 2 star"
+msgstr "Voto 2 Estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:50
+msgid "vote 3 star"
+msgstr "Voto 3 Estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:51
+msgid "vote 4 star"
+msgstr "Voto 4 Estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:52
+msgid "vote 5 star"
+msgstr "Voto 5 Estrelas"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:53
+msgid "Best"
+msgstr "Melhor"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:54
+msgid "Rate"
+msgstr "Ranking"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:70
+msgid "Category List"
+msgstr "Lista de Categorias"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:74
+msgid "Category Blog"
+msgstr "Lista de Blog"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/contacts.searchbot.php:32
+msgid "Contact"
+msgstr "Contato"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/sections.searchbot.php:66
+msgid "Section List"
+msgstr "Lista de Seção"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/sections.searchbot.php:70
+msgid "Section Blog"
+msgstr "Lista de Blog"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/weblinks.searchbot.php:31
+msgid "Web Links"
+msgstr "Links Web"
+
+#: administrator/modules/mod_fullmenu.php:176
+#: administrator/modules/mod_fullmenu.php:231
+#: administrator/modules/mod_fullmenu.php:250
+msgid "Review/Uninstall"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:267
+msgid "Install Any Plugin"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:267
+msgid "Universal"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:269
+msgid "Install from The Source"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:269
+msgid "The Source"
+msgstr ""
+
+#: administrator/modules/mod_latest.xml
+msgid "Latest News"
+msgstr ""
+
+#: administrator/modules/mod_latest.xml
+msgid ""
+"This module shows a list of the most recently published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/modules/mod_logged.xml
+msgid "Logged in Users"
+msgstr ""
+
+#: administrator/modules/mod_logged.xml
+msgid "This module shows a list of the currently logged in users"
+msgstr ""
+
+#: administrator/modules/mod_popular.xml administrator/modules/mod_stats.xml
+msgid "Popular Items"
+msgstr ""
+
+#: administrator/modules/mod_popular.xml
+msgid ""
+"This module shows a list of the popular published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/modules/mod_stats.xml
+msgid ""
+"This module shows stats of Items that are still current (some may have "
+"expired even though they are the most recent). Items that are displayed on "
+"the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/popups/uploadimage.php:50
+#: administrator/popups/uploadimage.php:58
+#, php-format
+msgid "Upload of %s failed"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:54
+#: administrator/popups/uploadimage.php:62
+#, php-format
+msgid "Upload of %s to %s successful"
+msgstr ""
+
+#: administrator/templates/mambo_admin/templateDetails.xml
+msgid "Mambo Admin"
+msgstr ""
+
+#: administrator/templates/mambo_admin_blue/templateDetails.xml
+msgid "Mambo Admin Blue"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:29
+msgid "Banner Manager"
+msgstr "Gerenciador de Banners"
+
+#: administrator/components/com_banners/admin.banners.html.php:43
+msgid "Banner Name"
+msgstr "Nome do Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:49
+msgid "Impressions Made"
+msgstr "Impressões Feitas"
+
+#: administrator/components/com_banners/admin.banners.html.php:52
+msgid "Impressions Left"
+msgstr "Impressões Faltantes"
+
+#: administrator/components/com_banners/admin.banners.html.php:55
+#: administrator/components/com_banners/admin.banners.html.php:58
+#: administrator/components/com_banners/admin.banners.html.php:256
+msgid "Clicks"
+msgstr "Clqiues"
+
+#: administrator/components/com_banners/admin.banners.html.php:99
+msgid "Edit Banner"
+msgstr "Editar Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:159
+msgid "You must provide a banner name"
+msgstr "Você deve informar um nome para o banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:161
+msgid "Please select a client"
+msgstr "Por favor selecione um cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:163
+msgid "Please select an image."
+msgstr "Por favor selecione uma imagem"
+
+#: administrator/components/com_banners/admin.banners.html.php:165
+msgid "Please fill in the URL for the banner."
+msgstr "Por favor preencha a URL para o banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:176
+msgid "Banner:"
+msgstr "Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:187
+#: administrator/components/com_banners/admin.banners.html.php:433
+msgid "Details"
+msgstr "Detalhes"
+
+#: administrator/components/com_banners/admin.banners.html.php:192
+msgid "Banner Name:"
+msgstr "Nome do Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:200
+#: administrator/components/com_banners/admin.banners.html.php:438
+msgid "Client Name:"
+msgstr "Nome do Cliente:"
+
+#: administrator/components/com_banners/admin.banners.html.php:208
+msgid "Impressions Purchased:"
+msgstr "Impressões Adquiridas:"
+
+#: administrator/components/com_banners/admin.banners.html.php:219
+msgid "Unlimited"
+msgstr "Ilimitadas"
+
+#: administrator/components/com_banners/admin.banners.html.php:224
+msgid "Banner URL"
+msgstr "URL do Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:232
+msgid "Show Banner :"
+msgstr "Mostrar Banner :"
+
+#: administrator/components/com_banners/admin.banners.html.php:240
+msgid "Click URL:"
+msgstr "URL para Clique:"
+
+#: administrator/components/com_banners/admin.banners.html.php:248
+msgid "Custom banner code:"
+msgstr "Código Customizado para o Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:258
+msgid "Reset Clicks"
+msgstr "Reiniciar Cliques"
+
+#: administrator/components/com_banners/admin.banners.html.php:270
+msgid "Banner Image:"
+msgstr "Imagem do Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:320
+msgid "Banner Client Manager"
+msgstr "Gerenciador de Clientes de Banners"
+
+#: administrator/components/com_banners/admin.banners.html.php:334
+msgid "Client Name"
+msgstr "Nome do Cliente"
+
+#: administrator/components/com_banners/admin.banners.html.php:340
+msgid "No. of Active Banners"
+msgstr "N. de Banners Ativos"
+
+#: administrator/components/com_banners/admin.banners.html.php:366
+msgid "Edit Banner Client"
+msgstr "Editar Cliente do Banner"
+
+#: administrator/components/com_banners/admin.banners.html.php:407
+msgid "Please fill in the Client Name."
+msgstr "Por favor preencha o Nome do Cliente."
+
+#: administrator/components/com_banners/admin.banners.html.php:409
+msgid "Please fill in the Contact Name."
+msgstr "Por favor preencha o Nome do Contato."
+
+#: administrator/components/com_banners/admin.banners.html.php:411
+msgid "Please fill in the Contact Email."
+msgstr "Por favor preencha o E-mail do Cliente."
+
+#: administrator/components/com_banners/admin.banners.html.php:421
+msgid "Banner Client:"
+msgstr "Cliente do Banner:"
+
+#: administrator/components/com_banners/admin.banners.html.php:446
+msgid "Contact Name:"
+msgstr "Nome de Contato:"
+
+#: administrator/components/com_banners/admin.banners.html.php:454
+msgid "Contact Email:"
+msgstr "E-mail de Contato:"
+
+#: administrator/components/com_banners/admin.banners.html.php:462
+msgid "Extra Info:"
+msgstr "Informações Extras:"
+
+#: administrator/components/com_banners/admin.banners.php:165
+msgid "Saved Banner info"
+msgstr "Informações do Banner Salvas"
+
+#: administrator/components/com_banners/admin.banners.php:168
+msgid "Reset Banner clicks"
+msgstr "Reiniciar cliques do Banner"
+
+#: administrator/components/com_banners/admin.banners.php:201
+msgid "publish"
+msgstr "publicado"
+
+#: administrator/components/com_banners/admin.banners.php:201
+msgid "unpublish"
+msgstr "não publicado"
+
+#: administrator/components/com_banners/admin.banners.php:202
+#, php-format
+msgid "Select an item to %s"
+msgstr "Selecione um item para %s"
+
+#: administrator/components/com_banners/admin.banners.php:276
+#, php-format
+msgid "The client [ %s ] is currently being edited by another person."
+msgstr "O cliente [ %s ] está sendo editado por outra pessoa."
+
+#: administrator/components/com_banners/admin.banners.php:334
+msgid "Cannot delete client at this time as they have a banner still running"
+msgstr ""
+"Não é possível apagar o cliente enquanto existem banners sendo executados"
+
+#: administrator/components/com_banners/banners.xml
+msgid "Banners"
+msgstr "Banners"
+
+#: administrator/components/com_banners/banners.xml
+msgid "This component manages banners and banner clients"
+msgstr "Este componente gerencia banners e seus clientes"
+
+#: components/com_banners/banners.class.php:35
+msgid "You must select a name for the client."
+msgstr "Você deve selecionar um nome para o cliente."
+
+#: components/com_banners/banners.class.php:41
+msgid "You must select a contact for the client."
+msgstr "Você deve selecionar um contato para o cliente."
+
+#: components/com_banners/banners.class.php:47
+msgid "You must select a valid email for the client."
+msgstr "Você deve selecionar um e-mail válido para o cliente."
+
+#: components/com_banners/banners.class.php:102
+msgid "You must select a client."
+msgstr "Você deve selecionar um cliente."
+
+#: components/com_banners/banners.class.php:107
+msgid "You must select a name for the banner."
+msgstr "Você deve selecionar um nome para o banner."
+
+#: components/com_banners/banners.class.php:112
+msgid "You must select a image for the banner."
+msgstr "Você deve selecionar uma imagem para o banner."
+
+#: components/com_banners/banners.class.php:116
+msgid "You must select a URL/Custom banner code for the banner."
+msgstr "Você deve selecionar uma URL/Código Customizado para o banner."
+
+#: administrator/components/com_banners/admin.banners.html.php:335
+msgid "Client ID"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:37
+msgid "Content: All"
+msgstr "Conteúdo: Todo"
+
+#: administrator/components/com_categories/admin.categories.html.php:72
+msgid "Category Name"
+msgstr "Nome da Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:81
+msgid "Reorder"
+msgstr "Reordenar"
+
+#: administrator/components/com_categories/admin.categories.html.php:87
+msgid "Order"
+msgstr "Ordem"
+
+#: administrator/components/com_categories/admin.categories.html.php:90
+msgid "Save Order"
+msgstr "Salvar Ordem"
+
+#: administrator/components/com_categories/admin.categories.html.php:93
+msgid "Access"
+msgstr "Acesso"
+
+#: administrator/components/com_categories/admin.categories.html.php:99
+msgid "Section"
+msgstr "Seção"
+
+#: administrator/components/com_categories/admin.categories.html.php:105
+msgid "Category ID"
+msgstr "Id da Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:111
+msgid "Active"
+msgstr "Ativa"
+
+#: administrator/components/com_categories/admin.categories.html.php:183
+msgid "Edit Section"
+msgstr "Editar Seção"
+
+#: administrator/components/com_categories/admin.categories.html.php:262
+msgid "Please select a Menu"
+msgstr "Por favor, selecione um Menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:265
+msgid "Please select a menu type"
+msgstr "Por favor selecione um tipo de menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:268
+msgid "Please enter a Name for this menu item"
+msgstr "Por favor digite um nome para este item de menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:274
+msgid "Category must have a name"
+msgstr "Categorias devem ter um nome"
+
+#: administrator/components/com_categories/admin.categories.html.php:322
+msgid "Category:"
+msgstr "Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:336
+msgid "Show Advanced Details"
+msgstr "Mostrar Detalhes Avançados"
+
+#: administrator/components/com_categories/admin.categories.html.php:339
+msgid "Hide Advanced Details"
+msgstr "Esconder Detalhes Avançados"
+
+#: administrator/components/com_categories/admin.categories.html.php:350
+msgid "Category Details"
+msgstr "Detalhes da Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:355
+msgid "Category Title:"
+msgstr "Título da Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:358
+msgid "A short name to appear in menus"
+msgstr "Um nome pequeno usado nos menus"
+
+#: administrator/components/com_categories/admin.categories.html.php:363
+msgid "Category Name:"
+msgstr "Nome da Categoria:"
+
+#: administrator/components/com_categories/admin.categories.html.php:366
+msgid "A long name to be displayed in headings"
+msgstr "Um nome longo para ser usado nos cabeçalhos"
+
+#: administrator/components/com_categories/admin.categories.html.php:371
+msgid "Section:"
+msgstr "Seção:"
+
+#: administrator/components/com_categories/admin.categories.html.php:379
+msgid "Image:"
+msgstr "Imagem:"
+
+#: administrator/components/com_categories/admin.categories.html.php:397
+msgid "Image Position:"
+msgstr "Posição da Imagem:"
+
+#: administrator/components/com_categories/admin.categories.html.php:405
+msgid "Ordering:"
+msgstr "Ordenação:"
+
+#: administrator/components/com_categories/admin.categories.html.php:413
+msgid "Access Level:"
+msgstr "Nível de Acesso:"
+
+#: administrator/components/com_categories/admin.categories.html.php:421
+msgid "Published:"
+msgstr "Publicado:"
+
+#: administrator/components/com_categories/admin.categories.html.php:429
+msgid "Description:"
+msgstr "Descrição:"
+
+#: administrator/components/com_categories/admin.categories.html.php:450
+#: administrator/components/com_categories/admin.categories.html.php:487
+msgid "Link to Menu"
+msgstr "Link para o Menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:455
+msgid "This will create a new menu item in the menu you select"
+msgstr "Isto irá criar um novo item de menu no menu selecionado"
+
+#: administrator/components/com_categories/admin.categories.html.php:461
+msgid "Select a Menu"
+msgstr "Selecione um Menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:469
+msgid "Select Menu Typ"
+msgstr "Selecione um Tipo de Menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:477
+msgid "Menu Item Name"
+msgstr "Nome do Item de Menu"
+
+#: administrator/components/com_categories/admin.categories.html.php:492
+msgid "Existing Menu Links"
+msgstr "Links do Menu Existentes"
+
+#: administrator/components/com_categories/admin.categories.html.php:518
+msgid "Menu links available when saved"
+msgstr "Links dos Menu estarão disponíveis depois de salvos"
+
+#: administrator/components/com_categories/admin.categories.html.php:555
+msgid "Move Category"
+msgstr "Mover Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:565
+msgid "Move to Section:"
+msgstr "Mover para a Seção:"
+
+#: administrator/components/com_categories/admin.categories.html.php:571
+msgid "Categories being moved:"
+msgstr "Categorias a serem movidas:"
+
+#: administrator/components/com_categories/admin.categories.html.php:582
+msgid "Content Items being moved:"
+msgstr "Itens de conteúdo a serem movidos:"
+
+#: administrator/components/com_categories/admin.categories.html.php:593
+msgid ""
+"This will move the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"Isto irá mover as categorias listadas\n"
+"\t\t\t<br />\n"
+"\t\t\te todos os itens desta categoria (também listados)\n"
+"\t\t\t<br />\n"
+"\t\t\tpara a seção selecionada."
+
+#: administrator/components/com_categories/admin.categories.html.php:628
+msgid "Copy Category"
+msgstr "Copiar Categoria"
+
+#: administrator/components/com_categories/admin.categories.html.php:638
+msgid "Copy to Section:"
+msgstr "Copiar para a Seção:"
+
+#: administrator/components/com_categories/admin.categories.html.php:644
+msgid "Categories being copied:"
+msgstr "Categorias a serem copiadas:"
+
+#: administrator/components/com_categories/admin.categories.html.php:655
+msgid "Content Items being copied:"
+msgstr "Itens de Conteúdo a serem copiados:"
+
+#: administrator/components/com_categories/admin.categories.html.php:666
+msgid ""
+"\n"
+"\t\t\tThis will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"\n"
+"\t\t\tIsto irá copiar as categorias listadas\n"
+"\t\t\t<br />\n"
+"\t\t\te todos os itens contidos nas categorias (também listados)\n"
+"\t\t\t<br />\n"
+"\t\t\tpara a seção selecionada."
+
+#: administrator/components/com_categories/admin.categories.php:142
+msgid "Component: "
+msgstr "Componente:"
+
+#: administrator/components/com_categories/admin.categories.php:251
+msgid "The category %s is currently being edited by another administrator"
+msgstr "A categoria %s está sendo editada por outro administrador"
+
+#: administrator/components/com_categories/admin.categories.php:270
+msgid "Category Table"
+msgstr "Tabela de Categoria"
+
+#: administrator/components/com_categories/admin.categories.php:278
+msgid "Category Blog Archive"
+msgstr "Arquivo de Blog de Categoria"
+
+#: administrator/components/com_categories/admin.categories.php:322
+msgid "Select Type"
+msgstr "Selecione o Tipo"
+
+#: administrator/components/com_categories/admin.categories.php:324
+#: administrator/components/com_categories/admin.categories.php:797
+msgid "Contact Category Table"
+msgstr "Tabela de Contato de Categoria"
+
+#: administrator/components/com_categories/admin.categories.php:327
+#: administrator/components/com_categories/admin.categories.php:802
+msgid "Newsfeed Category Table"
+msgstr "Tabela de Categorias de Feeds de Notícias"
+
+#: administrator/components/com_categories/admin.categories.php:330
+#: administrator/components/com_categories/admin.categories.php:807
+msgid "Weblink Category Table"
+msgstr "Tabela de Categorias de Links Web"
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:782
+msgid "Content Category Table"
+msgstr "Tabela de Categorias de Conteúdo"
+
+#: administrator/components/com_categories/admin.categories.php:333
+#: administrator/components/com_categories/admin.categories.php:787
+msgid "Content Category Blog"
+msgstr "Categoria de Conteúdo de Blog"
+
+#: administrator/components/com_categories/admin.categories.php:334
+msgid "Content Category Archive Blog"
+msgstr "Categoria de Conteúdo de Blog Arquivado"
+
+#: administrator/components/com_categories/admin.categories.php:447
+msgid "Select a category to delete"
+msgstr "Selecione uma categoria para remover"
+
+#: administrator/components/com_categories/admin.categories.php:524
+msgid "Select a category to %s"
+msgstr "Selecionar uma categoria para %s"
+
+#: administrator/components/com_categories/admin.categories.php:585
+#: administrator/components/com_categories/admin.categories.php:655
+msgid "Select an item to move"
+msgstr "Selecione um item para mover"
+
+#: administrator/components/com_categories/admin.categories.php:741
+msgid "%d Category copied to %s"
+msgid_plural "%d Categories copied to %s"
+msgstr[0] "%d Categorias copiadas para %s"
+msgstr[1] ""
+
+#: administrator/components/com_categories/admin.categories.php:792
+msgid "Content Category Blog Archive"
+msgstr "Categoria de Conteúdo de Blog Arquivado"
+
+#: administrator/components/com_categories/admin.categories.php:833
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr "%s ( %s ) no menu: %s foi criado com sucesso"
+
+#: administrator/components/com_categories/admin.categories.php:872
+msgid "New ordering saved"
+msgstr "Nova ordem salva"
+
+#: administrator/components/com_categories/toolbar.categories.html.php:80
+msgid "Move"
+msgstr "mover"
+
+#: administrator/components/com_categories/toolbar.categories.html.php:82
+msgid "Copy"
+msgstr "Copiar"
+
+#: administrator/components/com_categories/admin.categories.php:329
+#: administrator/components/com_categories/admin.categories.php:804
+msgid "News Feed Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:809
+msgid "Web Link Category Table"
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:20
+msgid "Global Check-in"
+msgstr "Verificação Global"
+
+#: administrator/components/com_checkin/admin.checkin.php:25
+msgid "Database Table"
+msgstr "Tabela da Base"
+
+#: administrator/components/com_checkin/admin.checkin.php:26
+msgid "# of Items"
+msgstr "# de Itens"
+
+#: administrator/components/com_checkin/admin.checkin.php:27
+msgid "Checked-In"
+msgstr "Verificado"
+
+#: administrator/components/com_checkin/admin.checkin.php:74
+#: administrator/components/com_checkin/admin.checkin.php:81
+msgid "Checking table"
+msgstr "Verificando tabela"
+
+#: administrator/components/com_checkin/admin.checkin.php:75
+#: administrator/components/com_checkin/admin.checkin.php:82
+msgid "Checked in <strong>%d</strong> item"
+msgid_plural "Checked in <strong>%d</strong> items"
+msgstr[0] "Verificado em <strong>%d</strong> itens"
+msgstr[1] ""
+
+#: administrator/components/com_checkin/admin.checkin.php:93
+msgid "Checked out items have now been all checked in"
+msgstr "Itens verificados e agora todos ok"
+
+#: includes/cmtclasses.php:143
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:165
+#, php-format
+msgid "Component %s error: attempt to use non-existent method %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:167 includes/cmtclasses.php:173
+#: includes/cmtclasses.php:231
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:210
+#, php-format
+msgid "MOS error in %s: method %s not found in class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:212
+#, php-format
+msgid "MOS error in %s: class not found %s"
+msgstr ""
+
+#: includes/core.classes.php:351
+msgid "Impossible to determine the name of this server"
+msgstr ""
+
+#: includes/mamboHTML.php:384
+msgid "Published, but is <u>Pending</u>"
+msgstr ""
+
+#: includes/mambofunc.php:22
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"A user submitted %s:\n"
+"[ %s ]\n"
+"\n"
+"has been just been submitted by user:\n"
+"[ %s ]\n"
+"\n"
+"\n"
+"for %\n"
+"\n"
+"Please go to %s/administrator to view and approve this %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only."
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon"
+msgstr "Ícone"
+
+#: administrator/components/com_containers/admin.containers.html.php:45
+msgid "Display number"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:49
+msgid "Show Descendants?"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:64
+msgid "Parent container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:81
+msgid "Mambo "
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:190
+msgid "Title"
+msgstr "Título"
+
+#: administrator/components/com_containers/admin.containers.html.php:134
+msgid "Top level container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:135
+msgid "Immediate container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:188
+#: administrator/components/com_containers/containers.xml
+msgid "Containers"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:248
+msgid "Edit Container details"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:250
+msgid "Container name"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description"
+msgstr "Descrição"
+
+#: administrator/components/com_containers/admin.containers.html.php:251
+msgid "Up to 500 characters"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:252
+msgid "Keywords"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:253
+msgid "Window title"
+msgstr ""
+
+#: administrator/components/com_containers/containers.xml
+msgid "Nested container system for Mambo"
+msgstr ""
+
+#: components/com_containers/containers.class.php:143
+msgid "No parent"
+msgstr ""
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:44
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:28
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:28
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:180
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:48
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:302
+msgid "Mambo - Web Installer"
+msgstr "Instalador Web - Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:67
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:52
+msgid "Please read/accept license to continue installation"
+msgstr "Por favor, leia/aceite a licença para continuar com a instalação"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:79
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:63
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:62
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:203
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:110
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:309
+msgid "Mambo Installation"
+msgstr "Instalação do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:86
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:96
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:70
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:69
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:217
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:123
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:316
+msgid "pre-installation check"
+msgstr "Verificação de pré-instalação"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:87
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:71
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:78
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:70
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:218
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:124
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:317
+msgid "license"
+msgstr "Licença"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:88
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:72
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:71
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:219
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:125
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:318
+msgid "step 1"
+msgstr "Passo 1"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:89
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:73
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:72
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:220
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:230
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:126
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:319
+msgid "step 2"
+msgstr "Passo 2"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:90
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:74
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:73
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:221
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:127
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:131
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:320
+msgid "step 3"
+msgstr "Passo 3"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:91
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:75
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:74
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:222
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:128
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:321
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:324
+msgid "step 4"
+msgstr "Passo 4"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:103
+msgid "Pre-installation check for:"
+msgstr "Verificação de pré-instalação para:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:104
+msgid ""
+"\n"
+"If any of these items are highlighted\n"
+"in red then please take actions to correct them. Failure to do so\n"
+"could lead to your Mambo installation not functioning\n"
+"correctly."
+msgstr ""
+"\n"
+"Se qualquer um destes itens estão destacados\n"
+"em vermelho é necessário executar algumas ações para corrigí-los. Falhas "
+"aqui podem fazer com que seu Mambo não funcione\n"
+"corretamente."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:118
+msgid "PHP version"
+msgstr "Versão do PHP"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:126
+msgid "zlib compression support"
+msgstr "suporte à compressão zlib"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:129
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:137
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:145
+msgid "Available"
+msgstr "Disponível"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:129
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:137
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:145
+msgid "Unavailable"
+msgstr "Não Disponível"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:134
+msgid "XML support"
+msgstr "Suporte a XML"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:142
+msgid "MySQL support"
+msgstr "Suporte a MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:159
+msgid ""
+"You can still continue the install as the configuration will be displayed at "
+"the end, just copy & paste this and upload."
+msgstr ""
+"Você ainda pode continuar com a instalação. Como a configuração é mostrada "
+"no final, somente copie e cole e faça o upload do arquivo."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:165
+msgid "Session save path"
+msgstr "Caminho de sessões salvas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:177
+msgid "Recommended settings:"
+msgstr "Configurações recomendadas:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:179
+msgid ""
+"These settings are recommended for PHP in order to ensure full\n"
+"compatibility with Mambo.\n"
+"However, Mambo will still operate if your settings do not quite match the "
+"recommended."
+msgstr ""
+"Estas configurações são recomendadas para completa compatibilidade \n"
+"do PHP com o Mambo.\n"
+"Entretanto o Mambo ainda pode funcionar se estas configurações não estiverem "
+"como recomendado."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:195
+msgid "Directive"
+msgstr "Diretiva"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:198
+msgid "Recommended"
+msgstr "Recomendado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:201
+msgid "Actual"
+msgstr "Atual"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:243
+msgid "Directory and File Permissions:"
+msgstr "Permissões de Arquivos e Diretórios:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/index.php:245
+msgid ""
+"In order for Mambo to function\n"
+"correctly it needs to be able to access or write to certain files\n"
+"or directories. If you see \"Unwriteable\" you need to change the\n"
+"permissions on the file or directory to allow Mambo\n"
+"to write to it."
+msgstr ""
+"Para o bom funcionamento do Mambo\n"
+"é necessário permitir o acesso de leitura e escrita em certos arquivos\n"
+" ou diretórios. Se você encontrar \"Somente Leitura\", você precisa alterar "
+"as permissões do arquivo ou diretório para permitir\n"
+"que o Mambo escreva neles."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:83
+msgid "GNU/GPL License:"
+msgstr "Licença GNU/GPL:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:85
+msgid ""
+"<a href=\"http://www.mamboserver.com\">Mambo </a> is Free Software released "
+"under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU/GPL License </"
+"a>.\n"
+"\t\t\t\t<div class=\"error\">*** To continue installing Mambo you must check "
+"the box under the license ***</div>"
+msgstr ""
+"<a href=\"http://www.mamboserver.com\">Mambo </a> é um Software Livre "
+"disponível sob a <a href=\"http://www.gnu.org/copyleft/gpl.html\">Licença "
+"GNU/GPL</a>.\n"
+"\t\t\t\t<div class=\"error\">*** Para continuar instalando o Mambo você deve "
+"clicar na caixa abaixo da licença ***</div>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:100
+msgid "I understand that this software is released under the GNU/GPL License"
+msgstr "Eu entendo que este software está disponível sob a Licença GNU/GPL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:40
+msgid "Please enter a Host name"
+msgstr "Por favor, digite um nome de Host"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:44
+msgid "Please enter a Database User Name"
+msgstr "Por favor, digite um nome de usuário para o Banco de Dados"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:48
+msgid "Please enter a Name for your new Database"
+msgstr "Por favor, digite um nome para sua nova Base de Dados"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:51
+msgid ""
+"Are you sure these settings are correct? \\nMambo will now attempt to "
+"populate a Database with the settings you have supplied"
+msgstr ""
+"Você tem certeza que estas configurações estão corretas? \\nO Mambo pode "
+"agora popular a base de dados com as configurações escolhidas por você"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:82
+msgid "MySQL database configuration:"
+msgstr "Configuração do MySQL:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:83
+msgid ""
+"\n"
+"  \t   \t\t\t<p>Setting up Mambo to run on your server involves 4 simple "
+"steps...</p>\n"
+"  \t   \t\t\t<p>Please enter the hostname of the server Mambo is to be "
+"installed on.</p>\n"
+"\t\t\t\t<p>Enter the MySQL username, password and database name you wish to "
+"use with Mambo.</p>\n"
+"\t\t\t\t<p>Enter the table name prefix to be used by this Mambo instance and "
+"select how\n"
+"\t\t\t\t   to do with in case existing tables from former installations.</"
+"p>\n"
+"\t\t\t\t<p>Install the samples unless you are experianced Mamber wanting to "
+"start with a completely empty site.</p>\n"
+"\t\t\t\t"
+msgstr ""
+"\n"
+"  \t   \t\t\t<p>Configurar o Mambo para rodar em seu servidor envolve 4 "
+"passos simples...</p>\n"
+"  \t   \t\t\t<p>Por favor, digite o nome do host do servidor onde o Mambo "
+"será instalado.</p>\n"
+"\t\t\t\t<p>Digite o nome de usuário do MySQL, a senha e o nome da base de "
+"dados que voc6e deseja usar com o Mambo.</p>\n"
+"\t\t\t\t<p>Digite o prefixo das tabelas para ser usado com esta instância do "
+"Mambo e selecione o que fazer\n"
+"\t\t\t\t   no caso de existirem tabelas de outras instalações.</p>\n"
+"\t\t\t\t<p>Não instale os dados de exemplo a menos que seja um Mamber "
+"experiente ou queira um site completamente limpo e vazio.</p>\n"
+"\t\t\t\t"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:101
+msgid "Host Name"
+msgstr "Nome do Host"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:102
+msgid "This is usually \"localhost\""
+msgstr "Usualmente \"localhost\""
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:105
+msgid "MySQL User Name"
+msgstr "Nome de Usuário do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:106
+msgid "Either something as \"root\" or a username given by the hoster"
+msgstr ""
+"Alguma coisa como \"root\" or um nome de usuário fornecido pelo seu hosting"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:109
+msgid "MySQL Password"
+msgstr "Senha do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:110
+msgid "For site security using a password for the mysql account in mandatory"
+msgstr ""
+"Para segurança do site o uso de uma senha para a conta do MySQL é mandatória"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:113
+msgid "Verify MySQL Password"
+msgstr "Redigite a Senha do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:114
+msgid "Retype password for verification"
+msgstr "Redigite a senha para verificação"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:117
+msgid "MySQL Database Name"
+msgstr "Nome da Base MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:118
+msgid ""
+"Some hosts allow only a certain DB name per site. Use table prefix in this "
+"case for distinct mambo sites."
+msgstr ""
+"Alguns hosts permitem somente uma base de dados por site. Use os prefixos de "
+"tabelas neste caso para separar sites do Mambo."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:121
+msgid "MySQL Table Prefix"
+msgstr "Prefixo das Tabelas do MySQL"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:122
+msgid "Dont use \"old_\" since this is used for backup tables"
+msgstr "Não use \"old_\" pois é usado para backup de tabelas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:126
+msgid "Drop Existing Tables"
+msgstr "Apagar Tabelas Existentes"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:131
+msgid "Backup Old Tables"
+msgstr "Backup de Tabelas Antigas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:132
+msgid ""
+"Any exiting backup tables from former mambo installations will be replaced"
+msgstr ""
+"Quaisquer tabelas de backup existentes de instalações anteriores do Mambo "
+"podem ser trocadas"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:136
+msgid "Install Sample Data"
+msgstr "Instalar Dados de Exemplo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:137
+msgid "Dont uncheck this unless you are experienced with mambo!"
+msgstr "Não desative isso a menos que tenha experiência com o Mambo!"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:35
+msgid "The database details provided are incorrect and/or empty."
+msgstr ""
+"Os detalhes informados para o banco de dados estão incorretos e/ou vazios."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:39
+msgid "The database passwords provided do not match.  Please try again."
+msgstr ""
+"A senha do banco de dados informada não bate. Por favor, tente novamente."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:43
+msgid "The password and username provided are incorrect."
+msgstr "A senha e o nome de usuário informados estão incorretos."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:47
+msgid "The database name provided is empty."
+msgstr "O nome da base de dados informado está vazio."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:62
+msgid "A database error occurred: "
+msgstr "Ocorreu um erro na base de dados: "
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:191
+msgid "Please enter a Site Name"
+msgstr "Por favor, digite um nome para o site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:233
+msgid "Enter the name of your Mambo site:"
+msgstr "Digite o nome do seu site Mambo:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:236
+msgid ""
+"Looks like there have been some errors with inserting data into your "
+"database!<br />\n"
+"  \t\t\tYou cannot continue."
+msgstr ""
+"Existem alguns erros com a inserção de dados em seu banco de dados!<br />\n"
+"  \t\t\tNão é possível continuar."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:239
+msgid "SUCCESS!"
+msgstr "SUCESSO!"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:242
+msgid ""
+"Type in the name for your Mambo site. This\n"
+"\t\t\tname is used in email messages so make it something meaningful."
+msgstr ""
+"Digite um nome para seu site Mambo. Este\n"
+"\t\t\tnome é usado em mensagens de e-mail, então coloque algo de fácil "
+"entendimento."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:253
+msgid "Error log:"
+msgstr "Log de Erros:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:264
+msgid "Site name"
+msgstr "Nome do site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install2.php:269
+msgid "e.g. The Home of Mambo"
+msgstr "por ex. A Casa do Mambo"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:39
+msgid "The sitename has not been provided"
+msgstr "O nome do site não foi informado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:59
+msgid "Please enter Site URL"
+msgstr "Por favor, digite a URL do Site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:63
+msgid "Please enter the absolute path to your site"
+msgstr "Por favor, digite o caminho absoluto para seu site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:67
+msgid "Please enter an email address to contact your administrator"
+msgstr ""
+"Por favor, digite um endereço de e-mail para contato com seu administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:71
+msgid "Please enter a password for you administrator"
+msgstr "Por favor, digite uma senha para seu administrador"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:136
+msgid "Confirm the site URL, path, admin e-mail and file/directory chmods"
+msgstr ""
+"Confirme a URL do site, caminho, e-mail do administrador e chmods de "
+"arquivos/diretórios"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:137
+msgid ""
+"\n"
+"\t\t\t\t  <p>If URL and Path looks correct then please do not change.\n"
+"\t\t\t\t  If you are not sure then please contact your ISP or administrator. "
+"Usually\n"
+"\t\t\t\t  the values displayed will work for your site.<br/>\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  Enter your e-mail address, this will be the e-mail address of the "
+"site\n"
+"\t\t\t\t  SuperAdministrator.<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  The permission settings will be used while installing mambo "
+"itself, by\n"
+"\t\t\t\t  the mambo addon-installers and by the media manager. If you are "
+"unsure\n"
+"\t\t\t\t  what flags shall be set, leave the default settings at the "
+"moment.\n"
+"\t\t\t\t  You can still change these flags later in the site global "
+"configuration.</p>"
+msgstr ""
+"\n"
+"\t\t\t\t  <p>Se a URl e o caminho informados parecem corretos, não os "
+"altere.\n"
+"\t\t\t\t  Se você não está certo disso, então contate seu provedor ou "
+"administrador. Usualmente\n"
+"\t\t\t\t  os valores mostrados funcionam com seu site.<br/>\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  Digite seu endereço de e-mail. Este pode ser o endereço de e-mail "
+"do \n"
+"\t\t\t\t  administrador do site.<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  As configurações de permissões usadas pelo Mambo são também usadas "
+"por\n"
+"\t\t\t\t  instaladores adicionais e pelo gerenciador de mídia. Se você não "
+"sabe\n"
+"\t\t\t\t  quais são as configurações a serem feitas neste momento,\n"
+"\t\t\t\t  você pode depois alterá-las nas configurações globais do site.</p>"
+
+#. if
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:200
+msgid "File Permissions"
+msgstr "Permissões de Arquivos"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:204
+msgid "Dont CHMOD files (use server defaults)"
+msgstr "Não faça CHMOD nos arquivos (usar padrão do servidor)"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:208
+msgid "CHMOD files to:"
+msgstr "CHMOD de arquivos para:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:215
+msgid "User:"
+msgstr "Usuário:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:217
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:226
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:235
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:275
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:284
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:293
+msgid "read"
+msgstr "leitura"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:219
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:228
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:237
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:277
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:286
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:295
+msgid "write"
+msgstr "escrita"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:221
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:230
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:239
+msgid "execute"
+msgstr "execução"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:224
+msgid "Group:"
+msgstr "Grupo:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:233
+msgid "World:"
+msgstr "Todos:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:262
+msgid "Dont CHMOD directories (use server defaults)"
+msgstr "Não faça CHMOD nos diretórios (usar padrão do servidor)"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:266
+msgid "CHMOD directories to:"
+msgstr "CHMOD de diretórios para:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:279
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:288
+#: D:/releases/svn/mambo/branches/4.6/installation/install3.php:297
+msgid "search"
+msgstr "procurar"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:68
+msgid "You must provide a valid admin email address."
+msgstr "Você deve informar um endereço de e-mail válido para o admin."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:94
+msgid "The database details provided are incorrect and/or empty"
+msgstr ""
+"Os detalhes informados para o banco de dados estão incorretos e/ou vazios."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:156
+msgid "This site is down for maintenance.<br /> Please check back again soon."
+msgstr ""
+"Este site está parado para manuntenção.<br/>Por favor, verifique mais tarde."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:157
+msgid ""
+"This site is temporarily unavailable.<br /> Please notify the System "
+"Administrator"
+msgstr ""
+"Este site está temporariamente indisponível.<br/>Por favor, notifique o "
+"administrador do sistema."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:160
+msgid "Mambo - the dynamic portal engine and content management system"
+msgstr ""
+"Mambo - a ferramenta dinâmica de portais e sistema de gerenciamento de "
+"conteúdo"
+
+#. chmod files and directories if desired
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:234
+msgid "Directory and file permissions left unchanged."
+msgstr "Permissões de arquivos e diretórios deixadas intactas."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:273
+msgid "File and directory permissions successfully changed."
+msgstr "Permissões de arquivos e diretórios alteradas com sucesso."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:275
+msgid "File and directory permissions could not be changed.<br/>"
+msgstr "Permissões de arquivos e diretórios não podem ser alteradas.<br/>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:276
+msgid "Please CHMOD mambo files and directories manually."
+msgstr "Por favor, altere o CHMOD de arquivos e diretórios manualmente."
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:294
+msgid "The site url has not been provided"
+msgstr "A URL do site não foi informada"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:326
+msgid "View Site"
+msgstr "Ver o Site"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:344
+msgid "Congratulations! Mambo is installed"
+msgstr "Parabéns! O Mambo está instalado"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:345
+msgid ""
+"\n"
+"\t\t\t\t<p>Click the \"View Site\" button to start Mambo site or "
+"\"Administration\"\n"
+"\t\t\t\t   to take you to administrator login.</p>"
+msgstr ""
+"\n"
+"\t\t\t\t<p>Clique no botão \"Ver o Site\" para iniciar o Mambo ou "
+"\"Administração\"\n"
+"\t\t\t\t   para entrar no logind e administração.</p>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:352
+msgid "PLEASE REMEMBER TO COMPLETELY<br/>REMOVE THE INSTALLATION DIRECTORY"
+msgstr ""
+"POR FAVOR, LEMBRE-SE DE REMOVER COMPLETAMENTE<br/>O DIRETÓRIO DE INSTALAÇÃO "
+"(INSTALLATION)"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:353
+msgid "Administration Login Details"
+msgstr "Detalhes de Login de Administração"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:354
+msgid "Username :"
+msgstr "Nome de Usuário:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:355
+msgid "Password :"
+msgstr "Senha:"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:360
+msgid ""
+"\n"
+"\t\t\t\t\t\t\t\tYour configuration file or directory is not writeable,\n"
+"\t\t\t\t\t\t\t\tor there was a problem creating the configuration file. "
+"You'll have to\n"
+"\t\t\t\t\t\t\t\tupload the following code by hand. Click in the textarea to "
+"highlight\n"
+"\t\t\t\t\t\t\t\tall of the code."
+msgstr ""
+"\n"
+"\t\t\t\t\t\t\t\tSuas configuração de arquivos e diretórios é somente "
+"leitura,\n"
+"\t\t\t\t\t\t\t\tou existe um problema na criação do arquivo de configuração. "
+"Você precisa fazer o\n"
+"\t\t\t\t\t\t\t\tupload do seguinte código manualmente. Clique na área de "
+"texto para selecionar\n"
+"\t\t\t\t\t\t\t\ttodo o código."
+
+#: installation/install.php:87
+msgid ""
+"<a href=\"http://www.mamb-foundation.org\">Mambo </a> is Free Software "
+"released under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU/GPL "
+"License </a>.\n"
+"\t\t\t\t<div class=\"error\">*** To continue installing Mambo you must check "
+"the box under the license ***</div>"
+msgstr ""
+
+#: installation/install1.php:112
+msgid "For site security using a password for the mysql account is mandatory"
+msgstr ""
+
+#: installation/install4.php:352
+msgid ""
+"\n"
+"\t\t\t\t<p>Click the \"View Site\" button to start Mambo site or "
+"\"Administration\"\n"
+"\t\t\t\t   to take you to administrator login.  Please take a moment to fill "
+"out the form below.</p>"
+msgstr ""
+
+#: administrator/components/com_languages/actions/publish.action.php:25
+msgid "Configuration succesfully updated!"
+msgstr "Configuração alterada com sucesso!"
+
+#: administrator/components/com_languages/actions/publish.action.php:27
+msgid "Error! Make sure that configuration.php is writeable."
+msgstr ""
+"Erro! Confirme a permissão de escrita em seu arquivo configuration.php."
+
+#: administrator/components/com_languages/toolbar.languages.php:44
+msgid "Extract"
+msgstr "Extrair"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:9
+msgid "Compile Catalog?"
+msgstr "Compilar Catálogo?"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:10
+msgid "yes"
+msgstr "sim"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:11
+msgid "no"
+msgstr "não"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:22
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:35
+msgid "MsgId"
+msgstr "ID"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:24
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:37
+msgid "MsgId Plural"
+msgstr "ID Plural"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:25
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:54
+msgid "MsgStr"
+msgstr "Str"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:27
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:41
+msgid "Plural form"
+msgstr "Forma de Plural"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:43
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:58
+msgid "Fuzzy Entry"
+msgstr "Entrada Fuzzy"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Catalog dump"
+msgstr "Cópia do Catálogo"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Comments"
+msgstr "Comentários"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Headers"
+msgstr "Cabeçalhos"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Strings"
+msgstr "Strings"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:11
+msgid "PHPGettext Example"
+msgstr "Exemplo de PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:21
+msgid "PHPGettext"
+msgstr "PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:22
+msgid "Gettext for PHP"
+msgstr "Gettext para PHP"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:25
+msgid "Current language is:"
+msgstr "Idioma atual:"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:34
+msgid "Change language"
+msgstr "Alterar idioma"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:41
+msgid "Gettext is enabled!"
+msgstr "Gettext está habilitado!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:43
+msgid "Gettext is disabled!"
+msgstr "Gettext está desabilitado!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:55
+msgid "Disable Gettext"
+msgstr "Desabilitar Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:56
+msgid "Enable Gettext"
+msgstr "Habilitar Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:57
+msgid "Extract Strings"
+msgstr "Extrair Strings"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:58
+msgid "Run Unit Tests"
+msgstr "Executar Testes de Unidades"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:59
+msgid "Clear Tests"
+msgstr "Limpar Testes"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:23
+msgid "Version"
+msgstr "Versão"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:26
+msgid "Date"
+msgstr "Data"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:29
+msgid "Author"
+msgstr "Autor"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:32
+msgid "Author Email"
+msgstr "E-mail do Autor"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:10
+msgid "Create Translation for:"
+msgstr "Tradução Criada por:"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:20
+msgid "Delete This Template"
+msgstr "Apagar Esta Template"
+
+#: administrator/components/com_languages/actions/default.action.php:25
+msgid "Default Language succesfully updated!"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:42
+msgid "Translate Strings"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:45
+msgid "Auto Translate"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:67
+msgid "Export"
+msgstr ""
+
+#: components/com_user/user.php:29
+msgid "Update"
+msgstr "Atualizar"
+
+#: administrator/components/com_languages/views/edit.view.php:28
+#: administrator/components/com_languages/views/edit.view.php:43
+#: administrator/components/com_languages/views/templates/langform.tpl.php:106
+#: administrator/components/com_languages/views/templates/langform.tpl.php:153
+#: administrator/components/com_languages/views/templates/languages.tpl.php:21
+msgid "Language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:28
+msgid "New language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:43
+msgid "Edit language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:71
+#, php-format
+msgid "Translate Catalog: %s [%s]"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:21
+msgid "Language File"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:22
+msgid "% Translated"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:23
+msgid "Total Strings"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:24
+msgid "Translated Strings"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:25
+msgid "Fuzzy"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:11
+msgid "You must provide a Language Name."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:13
+msgid "You must provide a Language Identifier."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:15
+msgid "You must provide a locale."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:17
+msgid "You must provide a character encoding."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:19
+msgid "You must provide a date format."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:33
+msgid "New Language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:43
+msgid "Language Identifier"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:46
+msgid ""
+"The identifier for this language. This is used for naming the language xml "
+"file and translations directory."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:50
+msgid "Language Name"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:53
+msgid "The official name for this language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:57
+msgid "Locale"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:60
+msgid ""
+"The locale list for this language. \\nLocale names must be comma separated."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:64
+msgid "Encoding"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:67
+msgid "The character encoding for this language. Ex. utf-8"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:71
+msgid "Direction"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:74
+msgid "Left-to-Right"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:75
+msgid "Right-to-Left"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:77
+msgid "Text direction."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:81
+#: administrator/components/com_languages/views/templates/langform.tpl.php:231
+msgid "Date Format"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:84
+#: administrator/components/com_languages/views/templates/langform.tpl.php:234
+msgid "Date format for strftime()."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:88
+msgid "Plural forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:91
+msgid "Plural forms for gettext."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:23
+msgid "Verified"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:26
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:114
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:121
+msgid "Original"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:29
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:116
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:125
+msgid "Translation"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:32
+msgid "Ref"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:55
+msgid "Translation OK"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:55
+msgid "Verify Translation"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:122
+msgid "Singular"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:123
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:132
+msgid "Plural"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/form.tpl.php:39
+msgid "Mambo Language Editor"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/form.tpl.php:44
+msgid "Select Language"
+msgstr ""
+
+#.
+#: administrator/components/com_languages/views/templates/form.tpl.php:54
+msgid "No content to display."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:10
+msgid "You must choose a language."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:12
+msgid "You must choose a character set."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:33
+#: administrator/components/com_languages/views/templates/langform.tpl.php:109
+msgid "choose language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:40
+#: administrator/components/com_languages/views/templates/langform.tpl.php:120
+msgid "choose territory"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:41
+msgid "choose character set"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:117
+#: administrator/components/com_languages/views/templates/langform.tpl.php:161
+msgid "Territory"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:125
+#: administrator/components/com_languages/views/templates/langform.tpl.php:169
+#: administrator/components/com_languages/views/templates/languages.tpl.php:24
+msgid "Character Set"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:128
+msgid "choose charset"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:175
+msgid "Convert to"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:205
+msgid "Author Url"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:211
+msgid "Text Direction"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:214
+msgid "left to right"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:215
+msgid "right to left"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:220
+msgid "Plural Forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:223
+msgid "plural forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:238
+msgid "Locales"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:241
+msgid ""
+"The locale list for setlocale(). \\nLocale names must be comma separated."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:245
+msgid "Days"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:259
+msgid "Months"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:6
+msgid "You cannot delete English."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:22
+msgid "Country - Region"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+"Uma pequena imagem que deve ser colocada à esquerda ou à direita de seu item "
+"de menu. As imagens devem estar em images/stories/"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+"Um sufixo de classe CSS que deve ser aplicado. Isso permite estilos "
+"individuais de páginas"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Login Image"
+msgstr "Alinhamento para Imagem de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Logout Image"
+msgstr "Alinhamento para Imagem de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Back Button"
+msgstr "Botão Voltar"
+
+#: administrator/components/com_login/login.xml
+msgid "Contact Items"
+msgstr "Itens de Contato"
+
+#: administrator/components/com_login/login.xml
+msgid "Hide"
+msgstr "Esconder"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Login Page"
+msgstr "Imagem para a Página de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Logout Page"
+msgstr "Imagem para a Página de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description"
+msgstr "Descrição de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description Text"
+msgstr "Texto de Descrição de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image"
+msgstr "Imagem de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image Align"
+msgstr "Alinhamento de Imagem de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login JS Message"
+msgstr "Mensagem de Login em Javascript"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Page Title"
+msgstr "Título da Página de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Redirection URL"
+msgstr "URL de Redirecionamento de Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description"
+msgstr "Descrição de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description Text"
+msgstr "Texto de Descrição de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image"
+msgstr "Imagem de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image Align"
+msgstr "Alinhamento de Imagem de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout JS Message"
+msgstr "Mensagem de Logout em Javascript"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Page Title"
+msgstr "Título da Página de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Redirection URL"
+msgstr "URL de Redirecionamento de Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Menu Image"
+msgstr "Imagem de Menu"
+
+#: administrator/components/com_login/login.xml
+msgid "Page Class Suffix"
+msgstr "Sufixo de Classe CSS"
+
+#: administrator/components/com_login/login.xml
+msgid "Page Title"
+msgstr "Título da Página"
+
+#: administrator/components/com_login/login.xml
+msgid "Parameters for individual Contact Items"
+msgstr "Parâmetros para itens de contato individuais"
+
+#: administrator/components/com_login/login.xml
+msgid "Show"
+msgstr "Mostrar"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr "Mostra/Esconde um botão Voltar que retorna para a página anterior"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Login Description below"
+msgstr "Mostrar/Esconder a Descrição de Login abaixo"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Logout Description below"
+msgstr "Mostrar/Esconder a Descrição de Logout abaixo"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr "Mostrar/Esconder o pop-up em Javascript indicando sucesso no Login"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr "Mostrar/Esconder o pop-up em Javascript indicando sucesso no Logout"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the pages Title"
+msgstr "Mostrar/Esconder os Títulos das Páginas"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+"Texto para ser mostrado no topo da página. Se deixado em branco, o nome do "
+"menu pode ser usado"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the login Page, if left blank _LOGIN_DESCRIPTION will be "
+"used"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the logout Page, if left blank _LOGOUT_DESCRIPTION will "
+"be used"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Use Global"
+msgstr "Usar Global"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will be redirected to after logout, if let blank will load front "
+"page"
+msgstr ""
+"Para qual página o usuário deve ser redirecionado depois do logout. Se for "
+"deixado em branco será redirecionado para a página principal"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+"Para qual página o usuário deve ser redirecionado depois do login. Se for "
+"deixado em branco será redirecionado para a página principal"
+
+#: components/com_login/login.html.php:77
+msgid "Remember me"
+msgstr "Lembre-me"
+
+#: components/com_login/login.html.php:81
+msgid "Password Reminder"
+msgstr "Lembrar Senha"
+
+#: components/com_login/login.html.php:87
+msgid "No account yet?"
+msgstr "Sem conta?"
+
+#: components/com_login/login.html.php:89
+msgid "Create one"
+msgstr "Crie Uma"
+
+#: components/com_login/login.html.php:109
+msgid "!Warning! Javascript must be enabled for proper operation."
+msgstr "!Atenção! O Javascript deve estar habilitado para efetiva operação."
+
+#: components/com_login/login.php:38
+msgid "To access the Private areas of this site please Login"
+msgstr "Para cesso as áreas reservadas do site, por favor, autentique-se"
+
+#: components/com_login/login.php:39
+msgid "You are now Logged in to a private area of this site"
+msgstr "Você agora está autenticado em uma área privada deste site"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:34
+#: administrator/components/com_mambots/admin.mambots.php:224
+msgid "Administrator"
+msgstr "Administrador"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:34
+msgid "Mambot Manager"
+msgstr "Gerenciador de Mambots"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:37
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:55
+msgid "Mambot Name"
+msgstr "Nome do Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:76
+msgid "File"
+msgstr "Arquivo"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:179
+msgid "Mambot must have a name"
+msgstr "O Mambot deve ter um nome"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:181
+msgid "Mambot must have a filename"
+msgstr "O Mambot deve ter um nome de arquivo"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:190
+msgid "Site Mambot:"
+msgstr "Mambot do Site:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:206
+msgid "Mambot Details"
+msgstr "Detalhes do Mambot"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:211
+msgid "Name:"
+msgstr "Nome:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:219
+msgid "Folder:"
+msgstr "Pasta:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:227
+msgid "Mambot file:"
+msgstr "Arquivo do Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:235
+msgid "Mambot Order:"
+msgstr "Ordem do Mambot:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:276
+msgid "Parameters"
+msgstr "Parâmetros:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:285
+msgid "No Parameters"
+msgstr "Sem Parâmetros"
+
+#: administrator/components/com_mambots/admin.mambots.php:137
+msgid "- All Types -"
+msgstr "- Todos os Tipos - "
+
+#: administrator/components/com_mambots/admin.mambots.php:184
+#, php-format
+msgid "Successfully Saved changes to Mambot: %s"
+msgstr "Alterações salvas com sucesso para o Mambot: %s"
+
+#: administrator/components/com_mambots/admin.mambots.php:189
+#, php-format
+msgid "Successfully Saved Mambot: %s"
+msgstr "Mambot salvo com sucesso: %s"
+
+#: administrator/components/com_mambots/admin.mambots.php:212
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr "O módulo %s está sendo editado por outro administrador"
+
+#: administrator/components/com_mambots/admin.mambots.php:247
+msgid "This mambot cannot be reordered"
+msgstr "Este mambot não pdoe ser reordenado"
+
+#: administrator/components/com_mambots/admin.mambots.php:290
+msgid "Select a module to delete"
+msgstr "Selecione um módulo para apagar"
+
+#: administrator/components/com_mambots/admin.mambots.php:307
+#, php-format
+msgid "Select a mambot to %s"
+msgstr "Selecione um mambost para %s"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:30
+msgid "Please fill in the subject"
+msgstr "Por favor, preencha o assunto"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:32
+msgid "Please select a group"
+msgstr "Por favor selecione um grupo"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:34
+msgid "Please fill in the message"
+msgstr "Por favor preencha a mensagem"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:45
+#: administrator/components/com_massmail/massmail.xml
+msgid "Mass Mail"
+msgstr "E-mail em Massa"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:66
+msgid "Mail to Child Groups:"
+msgstr "E-mail para Grupos Filhos:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:74
+msgid "Send in HTML mode:"
+msgstr "Enviar em modo HTML:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:82
+msgid "Subject"
+msgstr "Assunto"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:90
+msgid "Message:"
+msgstr "Mensagem:"
+
+#: administrator/components/com_massmail/admin.massmail.php:39
+msgid "- All User Groups -"
+msgstr "- Todos os Grupos de Usuários -"
+
+#: administrator/components/com_massmail/admin.massmail.php:69
+msgid "Please fill in the form correctly"
+msgstr "Por favor preencha o formulário corretamente"
+
+#. Build e-mail message format
+#: administrator/components/com_massmail/admin.massmail.php:92
+#, php-format
+msgid ""
+"This is an email from '%s'\n"
+"\n"
+"Message:\n"
+msgstr ""
+"Este é um e-mail de '%s'\n"
+"\n"
+"Mensagem:\n"
+
+#: administrator/components/com_massmail/admin.massmail.php:105
+#, php-format
+msgid "E-mail sent to %d user."
+msgid_plural "E-mail sent to %d users."
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_massmail/massmail.xml
+msgid "This component allows you to send a mass email to certain user groups"
+msgstr ""
+"Este componente permite que você envie e-mails em massa para certos grupos "
+"de usuários"
+
+#: administrator/components/com_massmail/toolbar.massmail.html.php:24
+msgid "Send Mail"
+msgstr "Enviar E-mail"
+
+#: administrator/components/com_media/admin.media.html.php:91
+msgid "Directory"
+msgstr "Diretório"
+
+#: administrator/components/com_media/admin.media.html.php:119
+#: administrator/components/com_media/admin.media.html.php:212
+#: administrator/components/com_media/admin.media.html.php:281
+msgid "Code"
+msgstr "Código"
+
+#: administrator/components/com_media/admin.media.html.php:123
+msgid "Create Directory"
+msgstr "Criar Dire'torio"
+
+#: administrator/components/com_media/admin.media.html.php:163
+msgid "No Images Found"
+msgstr "Nenhuma Imagem Encontrada"
+
+#: administrator/components/com_media/admin.media.html.php:174
+#, php-format
+msgid "Configuration Problem: &quot; %s &quot; does not exist."
+msgstr "Problema de Configuração: &quot; %s &quot; não existem."
+
+#: administrator/components/com_media/admin.media.html.php:270
+msgid "Insert your text here"
+msgstr "Digite seu texto aqui"
+
+#: administrator/components/com_media/admin.media.html.php:369
+msgid "\"Delete file \\\"\"+file+\"\\\"?\""
+msgstr "\"Apagar arquivo \\\"\"+file+\"\\\"?\""
+
+#: administrator/components/com_media/admin.media.html.php:377
+msgid ""
+"\"There are \"+numFiles+\" files/folders in \\\"\"+folder+\"\\\".\\n"
+"\\nPlease delete all files/folder in \\\"\"+folder+\"\\\" first.\""
+msgstr ""
+"\"Aqui existem \"+numFiles+\" arquivos/pastas em \\\"\"+folder+\"\\\".\\n"
+"\\nPor favor remova todos os arquivos/pastas em  \\\"\"+folder+\"\\\" "
+"primeiro.\""
+
+#: administrator/components/com_media/admin.media.html.php:381
+msgid "\"Delete folder \\\"\"+folder+\"\\\"?\""
+msgstr "\"Apagar pasta \\\"\"+folder+\"\\\"?\""
+
+#: administrator/components/com_media/admin.media.php:33
+msgid "NO HACKING PLEASE"
+msgstr "NÃO HACKEIE POR FAVOR"
+
+#: administrator/components/com_media/admin.media.php:45
+msgid ""
+"Directory creation not allowed while running in SAFE MODE as this can cause "
+"problems."
+msgstr ""
+"A criação de diretórios não é permitida enquanto o site está rodando em SAFE "
+"MODE pois isso pode causar problemas."
+
+#: administrator/components/com_media/admin.media.php:89
+msgid ""
+"Directory name must only contain alphanumeric characters and no spaces "
+"please."
+msgstr ""
+"Nome de diretórios devem conter somente caracteres alfanuméricos e não pode "
+"conter espaços."
+
+#: administrator/components/com_media/admin.media.php:125
+msgid "Unable to delete: not empty!"
+msgstr "Impossível apagar: não está vazio!"
+
+#: administrator/components/com_media/admin.media.php:157
+msgid "Upload FAILED. File already exists"
+msgstr "Envio FALHOU. Arquivo já existe"
+
+#: administrator/components/com_media/admin.media.php:161
+msgid ""
+"Only files of type gif, png, jpg, bmp, pdf, swf, doc, xls or ppt can be "
+"uploaded"
+msgstr ""
+"Somente arquivos dos tipos gif, png, jpg, bmp, pdf, swf, doc, xls ou ppt "
+"pode ser enviados"
+
+#: administrator/components/com_media/admin.media.php:165
+msgid "Upload FAILED"
+msgstr "Envio FALHOU"
+
+#: administrator/components/com_media/admin.media.php:169
+msgid "Upload complete"
+msgstr "Envio completo"
+
+#: administrator/components/com_media/media.xml
+msgid "This component manages site media"
+msgstr "Este componente gerencia mídia dos sites"
+
+#: administrator/components/com_media/toolbar.media.html.php:27
+msgid "Create"
+msgstr "Criar"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:53
+msgid "Menu Name"
+msgstr "Nome do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:56
+msgid "Menu Items"
+msgstr "Itens do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:59
+msgid "# Published"
+msgstr "# Publicados"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:62
+msgid "# Unpublished"
+msgstr "# Não Publicados"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:65
+msgid "# Trash"
+msgstr "# Apagados"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:68
+msgid "# Modules"
+msgstr "# Módulos"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:94
+msgid "Edit Menu Name"
+msgstr "Editar Nome do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:99
+msgid "Edit Menu Items"
+msgstr "Editar Itens do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:156
+msgid "Please enter a menu name"
+msgstr "Por favor, digite um nome para o menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:164
+msgid "Please enter a module name for your menu"
+msgstr "Por favor digite um nome para seu menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:182
+msgid "Menu Details"
+msgstr "Detalhes do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:190
+msgid "Menu Name:"
+msgstr "Nome do Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:195
+msgid ""
+"This is the identification name used by mambo to identify this menu within "
+"the code - it must be unique. It is recommended that you do not have any "
+"spaces in your Menu Name"
+msgstr ""
+"Este é um nome de identificação usado pelo Mambo para identificar este menu "
+"dentro do código - ele deve ser único. É recomendado que você não coloque "
+"nenhum espaço nos nomes de menus"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:210
+msgid "Title of the mod_mainmenu module required to show this Menu"
+msgstr "Título do módulo mod_mainmenu necessário para mostrar este menu."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:216
+msgid ""
+"A new mod_mainmenu module, with the Title you have entered above will "
+"automatically be created when you save this menu."
+msgstr ""
+"Um novo módulo mod_mainmenu com o título informado acima será criado "
+"automaticamente quando este menu for salvo."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:218
+msgid ""
+"Parameters for the module created are to be edited through the \"Modules "
+"Manager [site]\": Modules -> Site Modules"
+msgstr ""
+"Os parâmetros do módulo criado podem ser editados em \"Gerenciador de "
+"Módulos [site]\": Módulos -> Módulos do Site"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:266
+#, php-format
+msgid "Delete Menu: %s"
+msgstr "Apagar Menu: %s"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:279
+msgid "Module(s) being Deleted:"
+msgstr "Módulos a serem Apagados:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:301
+msgid "Menu Items being Deleted:"
+msgstr "Itens de Menu a serem Apagados:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:319
+msgid ""
+"This will <span style=\"font-weight:bold;color:#FF0000\">Delete</span> this "
+"Menu, <br />ALL its Menu Items and the Module(s) associated with it"
+msgstr ""
+"Isto irá <span style=\"font-weight:bold;color:#FF0000\">Apagar</span> este "
+"menu, todos os itens de menu dentro dele<br/> e o(s) módulo(s) associados à "
+"ele."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:322
+msgid ""
+"Are you sure you want to Delete this menu? \\nThis will Delete the Menu, its "
+"Items and the Module(s)."
+msgstr ""
+"Você tem certeza que deseja apagar este menu? \\nIsto irá apagar o menu, "
+"seus itens e o Módulo."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:354
+msgid "Please enter a name for the copy of the Menu"
+msgstr "Por favor digite um nome para a cópia do Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:357
+msgid "Please enter a name for the new Module"
+msgstr "Por favor digite um nome para o novo Módulo"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:371
+msgid "Copy Menu"
+msgstr "Copiar Menu"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:381
+msgid "New Menu Name:"
+msgstr "Novo Nome de Menu:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:385
+msgid "New Module Name:"
+msgstr "Novo Nome de Módulo:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:392
+msgid "Menu being copied:"
+msgstr "Menu a ser copiado:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:402
+msgid "Menu Items being copied:"
+msgstr "Itens de menu a ser copiados:"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:207
+msgid ""
+"You cannot rename the \"mainmenu\" Menu as this will disrupt the proper "
+"operation of Mambo"
+msgstr ""
+"Você não pode renomear o menu \"mainmenu\" pois isso altera o funcionamento "
+"do Mambo"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:223
+msgid ""
+"A menu already exists with that name - you must enter a unique Menu Name"
+msgstr ""
+"Já existe um menu com este nome - você deve informar um nome de Menu único"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:258
+#, php-format
+msgid "New Menu created [ %s ]"
+msgstr "Novo Menu criado [%s]"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:312
+msgid "Menu Items & Modules updated"
+msgstr "Itens de Menu e Módulos atualizados"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:326
+#: administrator/components/com_menumanager/admin.menumanager.php:376
+msgid "You cannot delete the \"mainmenu\" menu as it is a core menu"
+msgstr ""
+"VocVocê não pode apagar o menu \"mainmenu\" pois ele é um menu obrigatório"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:467
+msgid ""
+"A menu with that name already exists - you must enter a unique Menu Name"
+msgstr ""
+"Já existe um menu com este nome - você deve informar um nome de Menu único"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:527
+#, php-format
+msgid "Copy of Menu `%s` created, consisting of %d item"
+msgid_plural "Copy of Menu `%s` created, consisting of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "This component manages your Menus."
+msgstr "Este componente gerencia seus menus."
+
+#: administrator/components/com_messages/admin.messages.html.php:24
+msgid "Private Messaging"
+msgstr "Mensagens Privadas"
+
+#: administrator/components/com_messages/admin.messages.html.php:36
+msgid "From"
+msgstr "De"
+
+#: administrator/components/com_messages/admin.messages.html.php:39
+#: administrator/components/com_messages/admin.messages.html.php:55
+msgid "Read"
+msgstr "Lido"
+
+#: administrator/components/com_messages/admin.messages.html.php:57
+msgid "Unread"
+msgstr "Não Lido"
+
+#: administrator/components/com_messages/admin.messages.html.php:77
+msgid "Private Messaging Configuration"
+msgstr "Configuração de Mensagens Privadas"
+
+#: administrator/components/com_messages/admin.messages.html.php:82
+msgid "General"
+msgstr "Geral"
+
+#: administrator/components/com_messages/admin.messages.html.php:89
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
+
+#: administrator/components/com_messages/admin.messages.html.php:101
+msgid "Lock Inbox:"
+msgstr "Travar Caixa:"
+
+#: administrator/components/com_messages/admin.messages.html.php:105
+msgid "Mail me on new Message:"
+msgstr "Me informe sobre novas mensagens:"
+
+#: administrator/components/com_messages/admin.messages.html.php:123
+msgid "View Private Message"
+msgstr "Ver Mensagens Privadas"
+
+#: administrator/components/com_messages/admin.messages.html.php:130
+msgid "From:"
+msgstr "De:"
+
+#: administrator/components/com_messages/admin.messages.html.php:134
+msgid "Posted:"
+msgstr "Postado:"
+
+#: administrator/components/com_messages/admin.messages.html.php:138
+#: administrator/components/com_messages/admin.messages.html.php:193
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: administrator/components/com_messages/admin.messages.html.php:169
+msgid "You must provide a subject."
+msgstr "Você deve fornecer um assunto."
+
+#: administrator/components/com_messages/admin.messages.html.php:171
+msgid "You must provide a message."
+msgstr "Você deve escrever uma mensagem."
+
+#: administrator/components/com_messages/admin.messages.html.php:173
+msgid "You must select a recipient."
+msgstr "Você deve selecionar um destinatário."
+
+#: administrator/components/com_messages/admin.messages.html.php:182
+msgid "New Private Message"
+msgstr "Nova Mensagem Privada"
+
+#: administrator/components/com_messages/admin.messages.html.php:189
+msgid "To:"
+msgstr "Para:"
+
+#: administrator/components/com_messages/admin.messages.php:198
+msgid "Select an item to delete"
+msgstr "Selecione um item para remover"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:21
+msgid "Reply"
+msgstr "Responder"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:31
+msgid "Send"
+msgstr "Enviar"
+
+#: components/com_messages/messages.class.php:76
+#: components/com_messages/messages.class.php:77
+msgid "A new private message has arrived"
+msgstr "Uma nova mensagem privada foi recebida"
+
+#: components/com_messages/messages.class.php:84
+msgid "The user has locked their mailbox. Message failed."
+msgstr "O usuário travou sua caixa de mensagens. Envio falhou."
+
+#: administrator/components/com_modules/admin.modules.html.php:34
+msgid "Module Manager"
+msgstr "Gerenciador de Módulos"
+
+#: administrator/components/com_modules/admin.modules.html.php:60
+msgid "Module Name"
+msgstr "Nome do Módulo"
+
+#: administrator/components/com_modules/admin.modules.html.php:84
+msgid "Position"
+msgstr "Posição"
+
+#: administrator/components/com_modules/admin.modules.html.php:87
+msgid "Pages"
+msgstr "Páginas"
+
+#: administrator/components/com_modules/admin.modules.html.php:90
+msgid "ID"
+msgstr "ID"
+
+#: administrator/components/com_modules/admin.modules.html.php:156
+msgid "Varies"
+msgstr "Várias"
+
+#: administrator/components/com_modules/admin.modules.html.php:166
+msgid "User"
+msgstr "Usuário"
+
+#: administrator/components/com_modules/admin.modules.html.php:213
+msgid "Module must have a title"
+msgstr "Módulo deve ter um título"
+
+#: administrator/components/com_modules/admin.modules.html.php:239
+msgid "Module:"
+msgstr "Módulo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:261
+msgid "Title:"
+msgstr "Título:"
+
+#: administrator/components/com_modules/admin.modules.html.php:270
+msgid "Show title:"
+msgstr "Mostrar título:"
+
+#: administrator/components/com_modules/admin.modules.html.php:278
+msgid "Position:"
+msgstr "Posição:"
+
+#: administrator/components/com_modules/admin.modules.html.php:286
+msgid "Module Order:"
+msgstr "Ordem do Módulo:"
+
+#: administrator/components/com_modules/admin.modules.html.php:318
+msgid "ID:"
+msgstr "ID:"
+
+#: administrator/components/com_modules/admin.modules.html.php:351
+msgid "Pages / Items"
+msgstr "Páginas / Itens"
+
+#: administrator/components/com_modules/admin.modules.html.php:356
+msgid "Menu Item Link(s):"
+msgstr "Link(s) de Itens de Menu:"
+
+#: administrator/components/com_modules/admin.modules.html.php:372
+msgid "Custom Output"
+msgstr "Saída Customizada"
+
+#: administrator/components/com_modules/admin.modules.html.php:377
+msgid "Content:"
+msgstr "Conteúdo:"
+
+#: administrator/components/com_modules/admin.modules.php:149
+msgid "- All Positions -"
+msgstr "- Todas as Posições -"
+
+#: administrator/components/com_modules/admin.modules.php:211
+#, php-format
+msgid "Module Copied [%s]"
+msgstr "Módulo Copiado [%s]"
+
+#: administrator/components/com_modules/admin.modules.php:268
+#, php-format
+msgid "Successfully Saved changes to Module: %s"
+msgstr "Alterações do Módulo Salvas com Sucesso: %s"
+
+#: administrator/components/com_modules/admin.modules.php:274
+#, php-format
+msgid "Successfully Saved Module: %s"
+msgstr "Módulo Salvo com Sucesso: %s"
+
+#: administrator/components/com_modules/admin.modules.php:377
+#: administrator/components/com_modules/admin.modules.php:378
+#: administrator/components/com_modules/admin.modules.php:381
+#: administrator/components/com_modules/admin.modules.php:382
+msgid "N/A"
+msgstr "N/A"
+
+#: administrator/components/com_modules/admin.modules.php:440
+msgid ""
+"You cannot delete mod_mainmenu module that displays the \"mainmenu\" as it "
+"is a core Menu"
+msgstr ""
+"Você não pode apagar o módulo mod_mainmenu que mostra o \"mainmenu\" como um "
+"menu do núcleo do sistema"
+
+#: administrator/components/com_modules/admin.modules.php:466
+#, php-format
+msgid ""
+"Module(s): \"%s\" cannot be deleted they can only be un-installed as they "
+"are Mambo modules."
+msgstr ""
+"Módulo(s): \"%s\" não podem ser apagados mas somente desinstalados pois são "
+"módulos do Mambo."
+
+#: administrator/components/com_modules/admin.modules.php:482
+#, php-format
+msgid "Select a module to %s"
+msgstr "Selecione um módulo para %s"
+
+#: administrator/components/com_modules/toolbar.modules.html.php:41
+msgid "You can only preview typed modules."
+msgstr "Você só pode pré-visualizar módulos."
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE Editor mambot.</p><p>Please refer to the "
+"changelog and other information in the 'Admin Info' tab in the Admin "
+"component.&nbsp;</p>"
+msgstr ""
+"<p>Componente administrativo para o mambot do Editor MOStlyCE.</p><p>Por "
+"favor veja o changelog e outras informações na tab 'Info Admin' no "
+"administrador do componente.&nbsp;</p>"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid "mostlyce"
+msgstr "mostlyce"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE editor mambot.  Helps customize your "
+"MOStlyCE editor installation.</p>"
+msgstr ""
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid ""
+"<p>MOStlyDBAdmin is used for easy back up/restore of your database.</p><p>  "
+"It is a revival \r\n"
+"\tof the dbadmin component for use in the Mambo 4.6+ core.  The dbadmin \r\n"
+"\tcomponent stopped working with Mambo 4.5.3h and development appears to "
+"have ceased.</p>\n"
+msgstr ""
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid "MOStlyDBAdmin"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:29
+msgid "Newsfeed Manager"
+msgstr "Gerenciador de Feeds de Notícias"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:46
+msgid "News Feed"
+msgstr "Feeds de Notícias"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:55
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:196
+msgid "Category"
+msgstr "Categoria"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:58
+#: components/com_newsfeeds/newsfeeds.html.php:107
+msgid "# Articles"
+msgstr "# Artigos"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:61
+msgid "Cache time"
+msgstr "Tempo de Cache"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:95
+msgid "Edit Newsfeed"
+msgstr "Editar Feed de Notícias"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:114
+msgid "Edit Category"
+msgstr "Editar Categoria"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please fill in the newsfeed name."
+msgstr "Por favor preencha o nome do feed."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:156
+msgid "Please select a Category."
+msgstr "Por favor selecione uma categoria"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please fill in the newsfeed link."
+msgstr "Por favor preencha o link do feed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:160
+msgid "Please select a category."
+msgstr "Por favor selecione uma categoria"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:162
+msgid "Please fill in the number of articles to display."
+msgstr "Por favor preencha o número de artigos para mostrar"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:164
+msgid "Please fill in the cache refresh time."
+msgstr "Por favor preencha o tempo de atualização"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:175
+msgid "Newsfeed:"
+msgstr "Feed de Notícias:"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:188
+msgid "Name"
+msgstr "Nome"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:204
+msgid "Link"
+msgstr "Link"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:212
+msgid "Number of Articles"
+msgstr "Número de Artigos"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:220
+msgid "Cache time (in seconds)"
+msgstr "Tempo de Cache (em segundos)"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:228
+msgid "Ordering"
+msgstr "Ordenamento"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Articles Column"
+msgstr "# Coluna de Artigos"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Category Items"
+msgstr "# Itens da Categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Alignment of the image"
+msgstr "Alinhamento da Imagem"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+"Permite você limitar a quantidade de texto de descrição visível. 0 mostra "
+"todo o texto."
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category Description"
+msgstr "Descrição da Categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category List - Category"
+msgstr "Lista da Categoria - Categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category List - Section"
+msgstr "Lista da Categoria - Seção"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description Text"
+msgstr "Texto de Descrição"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description for page"
+msgstr "Descrição para a Página"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Description"
+msgstr "Descrição do Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Image"
+msgstr "Imagem do Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Image"
+msgstr "Imagem"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Image Align"
+msgstr "Alinhamento da Imagem"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+"Imagem para a página. Deve estar localizada na pasta /images/stories. Por "
+"padrão é usada a imagem web_links.jpg. Se não for escolhida uma imagem, "
+"nenhuma imagem será carregada"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Item Description"
+msgstr "Descrição do Item"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Link Column"
+msgstr "Coluna do Link"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Name Column"
+msgstr "Nome da Coluna"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Newsfeeds"
+msgstr "Feeds de Notícias"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the # of articles in the feed"
+msgstr "Mostrar/Esconder o N. de artigos no feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description below"
+msgstr "Mostrar/Esconder a descrição abaixo"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr "Mostrar/Esconder a descrição para a lista de outras categorias"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Link column"
+msgstr "Mostrar/Esconder a coluna de link do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Name column"
+msgstr "Mostrar/Esconder a coluna de nome do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr ""
+"Mostrar/Esconder a lista de categorias na visualização de página em lista"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr ""
+"Mostrar/Esconder a lista de categorias na visualização de página em tabela"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Table Headings"
+msgstr "Mostrar/Esconder o cabeçalho de tabelas"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr "Mostrar/Esconder a descrição ou texto de introdução de um item"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description text of the feed"
+msgstr "Mostrar/Esconder a descrição do texto do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the image of the feed"
+msgstr "Mostrar/Esconder a imagem do feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the number of items in each category"
+msgstr "Mostrar/Esconder o número de itens em cada categoria"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Table Headings"
+msgstr "Cabeçalhos da Tabela"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "This component manages RSS/RDF newsfeeds"
+msgstr "Este componente gerencia feeds de notícias RSS/RDF"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Word Count"
+msgstr "Contar Palavras"
+
+#: components/com_newsfeeds/newsfeeds.html.php:98
+msgid "Feed Name"
+msgstr "Nome do Feed"
+
+#: components/com_newsfeeds/newsfeeds.html.php:116
+msgid "Feed Link"
+msgstr "Link do Feed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:27
+msgid "News Feed Manager"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:93
+msgid "Edit News Feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:152
+msgid "Please fill in the news feed name."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:156
+msgid "Please fill in the news feed link."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "News Feed:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:28
+msgid "Poll Manager"
+msgstr "Gerenciador de Enquetes"
+
+#: administrator/components/com_poll/admin.poll.html.php:41
+msgid "Poll Title"
+msgstr "Título da Enquete"
+
+#: administrator/components/com_poll/admin.poll.html.php:47
+msgid "Options"
+msgstr "Opções"
+
+#: administrator/components/com_poll/admin.poll.html.php:50
+msgid "Lag"
+msgstr "Lag"
+
+#: administrator/components/com_poll/admin.poll.html.php:74
+msgid "Edit Poll"
+msgstr "Editar Enquete"
+
+#: administrator/components/com_poll/admin.poll.html.php:118
+msgid "Poll must have a title"
+msgstr "A enquete deve ter um nome"
+
+#: administrator/components/com_poll/admin.poll.html.php:120
+msgid "Poll must have a non-zero lag time"
+msgstr "A enquete deve ter um valor diferente de zero para o tempo de lag"
+
+#: administrator/components/com_poll/admin.poll.html.php:134
+msgid "Poll:"
+msgstr "Enquete:"
+
+#: administrator/components/com_poll/admin.poll.html.php:159
+msgid "Show on menu items:"
+msgstr "Mostrar nos itens de menu:"
+
+#: administrator/components/com_poll/admin.poll.html.php:166
+msgid "Lag:"
+msgstr "Lag:"
+
+#: administrator/components/com_poll/admin.poll.html.php:175
+msgid "Options:"
+msgstr "Opções"
+
+#: administrator/components/com_poll/admin.poll.php:106
+#, php-format
+msgid "The poll %s is currently being edited by another administrator."
+msgstr "A enquete %s está sendo editada por outro admnistrador"
+
+#: administrator/components/com_poll/poll.class.php:44
+msgid "Your Poll must contain a title."
+msgstr "Sua Enquete deve conter um título."
+
+#: administrator/components/com_poll/poll.class.php:50
+#, fuzzy
+msgid "Your Poll must have a non-zero lag time."
+msgstr "Sua Enquete não "
+
+#: administrator/components/com_poll/poll.class.php:59
+msgid "There is a module already with that name, please try again."
+msgstr "Existe um outro módulo com este nome. Por favor, tente novamente."
+
+#: administrator/components/com_poll/poll.xml
+msgid "Poll"
+msgstr "Enquete"
+
+#: administrator/components/com_poll/poll.xml
+msgid "This component shows Polls/Surveys"
+msgstr "Este componente mostra Enquete/Pesquisas"
+
+#: components/com_poll/poll.html.php:51
+msgid "Select Poll:"
+msgstr "Selecionar Enquete:"
+
+#: components/com_poll/poll.html.php:83
+msgid "There are no results for this poll."
+msgstr "Não existem resultados para esta enquete."
+
+#: components/com_poll/poll.html.php:193
+msgid "Number of Voters"
+msgstr "Número de Votos"
+
+#: components/com_poll/poll.html.php:202
+msgid "First Vote"
+msgstr "Primeiro Voto"
+
+#: components/com_poll/poll.html.php:211
+msgid "Last Vote"
+msgstr "Último Voto"
+
+#: components/com_poll/poll.php:48
+msgid "Cookies must be enabled!"
+msgstr "Cookies devem estar habilitados!"
+
+#: components/com_poll/poll.php:49 components/com_poll/poll.php:56
+#: components/com_poll/poll.php:65 components/com_poll/poll.php:72
+msgid "Continue"
+msgstr "Continuar"
+
+#: components/com_poll/poll.php:64
+msgid "You already voted for this poll today!"
+msgstr "Você já votou nesta enquete hoje!"
+
+#: components/com_poll/poll.php:71
+msgid "No selection has been made, please try again"
+msgstr "Nenhuma seleção foi feita. Tente novamente"
+
+#: components/com_poll/poll.php:93 components/com_poll/poll.php:95
+msgid "Thanks for your vote!"
+msgstr "Obrigado pelo seu voto!"
+
+#: components/com_poll/poll.php:112 components/com_poll/poll.php:154
+msgid "Select Poll from the list"
+msgstr "Selecionar Enquete da lista"
+
+#: administrator/components/com_poll/admin.poll.html.php:39
+msgid "Poll Question"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:148
+msgid "Question:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:23
+#: components/com_registration/registration.php:40
+msgid "Lost your Password?"
+msgstr "Perdeu sua senha?"
+
+#: components/com_registration/registration.html.php:28
+#, php-format
+msgid ""
+"Please enter your Username and e-mail address then click on the Send "
+"Password button.%s You will receive a new password shortly.  Use the new "
+"password to access the site."
+msgstr ""
+"Digite seu Nome de Usuário e endereço de e-mail e clique no botão Enviar "
+"Senha. %s Você irá receber uma nova senha em breve. Use a nova senha para "
+"acessar o site."
+
+#: components/com_registration/registration.html.php:31
+#: components/com_registration/registration.html.php:94
+msgid "Username:"
+msgstr "Nome de Usuário:"
+
+#: components/com_registration/registration.html.php:35
+msgid "E-mail Address:"
+msgstr "Endereço de E-mail:"
+
+#: components/com_registration/registration.html.php:40
+msgid "Send Password"
+msgstr "Enviar Senha"
+
+#: components/com_registration/registration.html.php:58
+msgid "Please enter your name."
+msgstr "Por favor digite seu nome."
+
+#: components/com_registration/registration.html.php:60
+#: components/com_registration/registration.html.php:62
+msgid "Please enter a user name."
+msgstr "Por favor digite um nome de usuário."
+
+#: components/com_registration/registration.html.php:62
+#: components/com_registration/registration.html.php:72
+#, php-format
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+"Por favor digite um %s válido. Sem espaços, mais que %d caracteres e "
+"contendo somente caracteres dos conjuntos 0-9,a-z, or A-Z"
+
+#: components/com_registration/registration.html.php:64
+msgid "Please enter a valid e-mail address."
+msgstr "Por favor digite um endereço de e-mail válido."
+
+#: components/com_registration/registration.html.php:66
+msgid ""
+"Please enter a valid password -- more than 6 characters with no spaces and "
+"containing only the characters 0-9, a-z, or A-Z"
+msgstr ""
+"Por favor digite uma senha válida. Sem espaços, mais que 6 caracteres e "
+"contendo somente caracteres dos conjuntos 0-9,a-z, or A-Z"
+
+#: components/com_registration/registration.html.php:68
+msgid "Please verify the password."
+msgstr "Por favor verifique sua senha."
+
+#: components/com_registration/registration.html.php:70
+msgid "Password and verification do not match, please try again."
+msgstr "Senha e sua verificação não coincidem. Por favor tente novamente."
+
+#: components/com_registration/registration.html.php:72
+#: components/com_registration/registration.html.php:103
+msgid "Password:"
+msgstr "Senha:"
+
+#: components/com_registration/registration.html.php:80
+#: components/com_registration/registration.php:109
+msgid "Registration"
+msgstr "Registro"
+
+#: components/com_registration/registration.html.php:85
+msgid "Fields marked with an asterisk (*) are required."
+msgstr "Campos marcados com asterisco (*) são de preenchimento obrigatórios."
+
+#: components/com_registration/registration.html.php:98
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: components/com_registration/registration.html.php:108
+msgid "Verify Password:"
+msgstr "Verificar Senha:"
+
+#: components/com_registration/registration.html.php:126
+msgid "Send Registration"
+msgstr "Enviar Registro"
+
+#: components/com_registration/registration.php:62
+msgid "Sorry, no corresponding user was found"
+msgstr "Nenhum usuário correspondente foi encontrado"
+
+#: components/com_registration/registration.php:74
+#, php-format
+msgid ""
+"The user account %s has this email associated with it.\n"
+"\n"
+"A web user from %s has just requested that a new password be sent.\n"
+"\n"
+"\n"
+"Your New Password is: %s\n"
+"\n"
+"\n"
+"If you didn't ask for this, don't worry. You are seeing this message, not "
+"them. \n"
+"If this was an error just login with your new password and then change your "
+"password to what you would like it to be."
+msgstr ""
+"A conta de usuário %s está associada neste e-mail.\n"
+"\n"
+"Um usuário web de %s requisitou que uma nova senha fosse enviada.\n"
+"\n"
+"\n"
+"Sua nova senha é: %s\n"
+"\n"
+"\n"
+"Se você não solicitou isso, não se preocupe. \n"
+"Se foi um erro, autentique-se no site com a nova senha e altere-a para uma "
+"que deseja."
+
+#. eval ("\$message = \"$message\";");
+#: components/com_registration/registration.php:81
+#, php-format
+msgid "%s :: New password for - %s"
+msgstr "%s :: Nova senha para  - %s"
+
+#: components/com_registration/registration.php:97
+msgid "New User Password created and sent!"
+msgstr "Nova senha criada e enviada!"
+
+#. Send notification to all administrators
+#: components/com_registration/registration.php:160
+#: components/com_registration/registration.php:208
+#, php-format
+msgid "Account details for %s at %s"
+msgstr "Detalhes da conta de %s em %s"
+
+#: components/com_registration/registration.php:165
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s. Your account has been created but, as a "
+"precaution, it must be activated by you before you can use it.\n"
+"To activate the account click on the following link or copy and paste it in "
+"your browser:\n"
+"%s\n"
+"\n"
+"After activation you may login to %s using the following username and "
+"password:\n"
+"\n"
+"Username - %s\n"
+"Password - %s"
+msgstr ""
+"Olá %s,\n"
+"\n"
+"Obrigado pelo seu registro em %s. Sua conta foi criada mas como precaução "
+"precisa ser ativada antes de usá-la.\n"
+"Para ativar sua conta, clique no link a seguir ou cipie-o e cole no seu "
+"navegador:\n"
+"%s\n"
+"\n"
+"Depois da ativação voc6e pode se autenticar em %s usando os senguintes nome "
+"de usuário e senha:\n"
+"\n"
+"Nome de Usuário - %s\n"
+"Senha - %s"
+
+#: components/com_registration/registration.php:180
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s.\n"
+"\n"
+"You may now login to %s using the username and password you registered with."
+msgstr ""
+"Olá %s,\n"
+"\n"
+"Obrigado pelo seu registro em %s.\n"
+"\n"
+"Agora você pode se autenticar em %s usando o nome de usuário e senha que "
+"você escolheu no registro."
+
+#: components/com_registration/registration.php:209
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"A new user has registered at %s.\n"
+"This email contains their details:\n"
+"\n"
+"Name - %s\n"
+"e-mail - %s\n"
+"Username - %s\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Olá %s,\n"
+"\n"
+"Um novo usuário se registrou em %s.\n"
+"Este e-mail contém seus detalhes:\n"
+"\n"
+"Nome - %s\n"
+"E-mail - %s\n"
+"Nome de Usuário - %s\n"
+"\n"
+"Por favor não responda este mensagem. Ela foi gerada automaticamente somente "
+"com caráter informativo."
+
+#: components/com_registration/registration.php:239
+#: components/com_registration/registration.php:242
+msgid "Registration Complete"
+msgstr "Registro Completo"
+
+#: components/com_registration/registration.php:240
+msgid ""
+"Your account has been created and an activation link has been sent to the e-"
+"mail address you entered. Note that you must activate the account by "
+"clicking on the activation link before you can login."
+msgstr ""
+"Sua conta foi criada e um link de ativação foi enviado para o endereço de e-"
+"mail informado por você. Note que você deve ativar sua conta clicando neste "
+"link de ativação antes de voc6e se registrar no site."
+
+#: components/com_registration/registration.php:243
+msgid "You may now login."
+msgstr "Agora você pode se autenticar."
+
+#: components/com_registration/registration.php:261
+#: components/com_registration/registration.php:282
+msgid "Invalid Activation Link!"
+msgstr "Link de Ativação Inválido!"
+
+#: components/com_registration/registration.php:262
+#: components/com_registration/registration.php:283
+msgid ""
+"There is no such account in our database or the account has already been "
+"activated."
+msgstr "Não existe esta conta em nosso banco de dados ou ela já foi ativada."
+
+#: components/com_registration/registration.php:275
+msgid "Activation Complete!"
+msgstr "Ativação Completa!"
+
+#: components/com_registration/registration.php:276
+msgid ""
+"Your account has been activated successfully. You can now login using the "
+"username and password you chose during registration."
+msgstr ""
+"Sua conta foi ativada com sucesso. Agora você pode fazer seu login usando o "
+"nome de usuário e senha que você escolheu durante o registro."
+
+#: components/com_registration/registration.php:64
+msgid ""
+"Sorry, no corresponding user was found.  Please make sure you entered a "
+"valid username and a valid email address.  Both are required."
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+#: components/com_search/search.html.php:43
+#: components/com_search/search.php:35 components/com_search/search.php:41
+#: components/com_search/search.php:143
+msgid "Search"
+msgstr "Procurar"
+
+#: administrator/components/com_search/search.xml
+msgid "This component manages the Search functionality."
+msgstr "Este componente gerencia a funcionalidade de pesquisa."
+
+#: components/com_search/search.html.php:37
+#: components/com_search/search.html.php:67
+msgid "Search Keyword"
+msgstr "Termos de Busca"
+
+#. number of matches found
+#: components/com_search/search.html.php:98
+#, php-format
+msgid "returned %d match"
+msgid_plural "returned %d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_search/search.php:55
+msgid "Newest first"
+msgstr "Mais novos em primeiro"
+
+#: components/com_search/search.php:56
+msgid "Oldest first"
+msgstr "Antigos em primeiro"
+
+#: components/com_search/search.php:57
+msgid "Most popular"
+msgstr "Mais populares"
+
+#: components/com_search/search.php:58
+msgid "Alphabetical"
+msgstr "Alfabética"
+
+#: components/com_search/search.php:59
+msgid "Section/Category"
+msgstr "Seção/Categoria"
+
+#: components/com_search/search.php:69
+msgid "Any words"
+msgstr "Qualquer palavra"
+
+#: components/com_search/search.php:74
+msgid "All words"
+msgstr "Todas as palavras"
+
+#: components/com_search/search.php:79
+msgid "Exact phrase"
+msgstr "Palavra exata"
+
+#. html output
+#. no matches found
+#: components/com_search/search.php:91
+msgid "No results were found"
+msgstr "Nenhum resultado foi encontrado"
+
+#: components/com_search/search.php:96
+msgid "One or more common words were ignored in the search"
+msgstr "Uma ou mais palavras comuns foram ignoradas na sua pesquisa"
+
+#: administrator/components/com_sections/admin.sections.html.php:47
+msgid "Section Name"
+msgstr "Nome da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:65
+msgid "Section ID"
+msgstr "ID da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:68
+msgid "# Categories"
+msgstr "# Categorias"
+
+#: administrator/components/com_sections/admin.sections.html.php:71
+msgid "# Active"
+msgstr "# Ativas"
+
+#: administrator/components/com_sections/admin.sections.html.php:175
+msgid "New Section"
+msgstr "Nova Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:203
+msgid "Section must have a name"
+msgstr "Seção deve ter um nome"
+
+#: administrator/components/com_sections/admin.sections.html.php:205
+msgid "Section must have a title"
+msgstr "Seção deve ter um título"
+
+#: administrator/components/com_sections/admin.sections.html.php:281
+msgid "Section Details"
+msgstr "Detalhes da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:286
+msgid "Scope:"
+msgstr "Escopo:"
+
+#: administrator/components/com_sections/admin.sections.html.php:401
+msgid "Select Menu Type"
+msgstr "Selecione o Tipo de Menu"
+
+#: administrator/components/com_sections/admin.sections.html.php:489
+msgid "Copy Section"
+msgstr "Copiar Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:501
+msgid "The new Section name"
+msgstr "O novo nome da Seção"
+
+#: administrator/components/com_sections/admin.sections.html.php:529
+msgid ""
+"This will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the new Section created."
+msgstr ""
+"Isto irá copiar as Categorias listadas\n"
+"\t\t\t<br />\n"
+"\t\t\te todos os itens dentro das categorias (também listados)\n"
+"\t\t\t<br />\n"
+"\t\t\tpara a nova Seção criada."
+
+#: administrator/components/com_sections/admin.sections.php:189
+#, php-format
+msgid "The section %s is currently being edited by another administrator"
+msgstr "A seção %s está sendo editada por outro administrador"
+
+#: administrator/components/com_sections/admin.sections.php:207
+#: administrator/components/com_sections/admin.sections.php:624
+msgid "Section Table"
+msgstr "Tabela de Seção"
+
+#: administrator/components/com_sections/admin.sections.php:215
+#: administrator/components/com_sections/admin.sections.php:634
+msgid "Section Blog Archive"
+msgstr "Arquivo de Blog de Seção"
+
+#: administrator/components/com_sections/admin.sections.php:232
+msgid "Section Archive Blog"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:306
+msgid "Changes to Section saved"
+msgstr "Alterações Salvas para a Seção"
+
+#: administrator/components/com_sections/admin.sections.php:312
+msgid "Section saved"
+msgstr "Seção salva"
+
+#: administrator/components/com_sections/admin.sections.php:327
+msgid "Select a section to delete"
+msgstr "Selecione uma seção para apagar"
+
+#: administrator/components/com_sections/admin.sections.php:365
+#, php-format
+msgid "Sections(s): %s cannot be removed as they contain categories"
+msgstr "Seção(ões): %s não podem ser removidas pois contém categorias"
+
+#: administrator/components/com_sections/admin.sections.php:370
+#, php-format
+msgid "Section(s): %s successfully deleted"
+msgstr "Seção(ões): %s apagadas com sucesso"
+
+#: administrator/components/com_sections/admin.sections.php:388
+msgid "Select a section to "
+msgstr "Selecione uma seção para"
+
+#: administrator/components/com_sections/admin.sections.php:396
+msgid "Cannot Publish an Empty Section"
+msgstr "Não é possível publicar uma seção vazia"
+
+#: administrator/components/com_sections/admin.sections.php:585
+#, php-format
+msgid "Section %s and all its Categories and Items have been copied as %s"
+msgstr ""
+"Seção %s, todas as suas Categorias e todos os Itens foram copiados para %s"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:35
+msgid "Browser, OS, Domain Statistics"
+msgstr "Navegador, SO, Estatísticas de Domínios"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:41
+msgid "Browsers"
+msgstr "Navegadores"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:45
+msgid "Browser"
+msgstr "Navegador"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:84
+msgid "OS Stats"
+msgstr "Stats de SO"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:88
+msgid "Operating System"
+msgstr "Sistema Operacional"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:127
+msgid "Domain Stats"
+msgstr "Stats de Domínios"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:131
+msgid "Domain"
+msgstr "Domínio"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:182
+msgid "Page Impression Statistics"
+msgstr "Estatísticas de Visualizações de Páginas"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:228
+msgid "Search Engine Text :"
+msgstr "Texto de Ferramenta de Busca:"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:229
+msgid "logging is :"
+msgstr "Login é:"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:230
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:230
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:240
+msgid "Times Requested"
+msgstr "Vezes Solicitadas"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:241
+msgid "Results Returned"
+msgstr "Resultados Retornados"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:28
+msgid "Syndication Settings"
+msgstr ""
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:51
+msgid "Manage Syndication Settings"
+msgstr ""
+
+#: administrator/components/com_syndicate/admin.syndicate.php:95
+msgid "Settings successfully Saved"
+msgstr "Configurações salvas com sucesso"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 0.3"
+msgstr "ATOM 0.3"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Activate support for Firefox Live Bookmarks functionality"
+msgstr "Ativar suporte para funcionalidade de Live Bookmarks do Firefox"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Alt text for image"
+msgstr "Texto ALT para imagem"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Author Alphabetical"
+msgstr "Autor em ordem alfabética"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Author Reverse-Alphabetical"
+msgstr "Autor em ordem alfabética reversa"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Bookmark file"
+msgstr "Arquivo de Favoritos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache"
+msgstr "Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache Time"
+msgstr "Tempo de Cache"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache file will refresh every x seconds"
+msgstr "Recarregar arquivo do cache a casa X segundos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache the feed files"
+msgstr "Fazer cache dos arquivos de feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Frontpage Ordering"
+msgstr "Ordem na Página Principal"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image Alt"
+msgstr "ALT da Imagem"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image to be included in feed"
+msgstr "Imagem para ser incluída no feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Least Hits"
+msgstr "Menos Vistos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit Text"
+msgstr "Limite de Texto"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit the article text to the value indicated below"
+msgstr "Limite o texto do artigo para o valor indicado abaixo"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Live Bookmarks"
+msgstr "Live Bookmarks"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Most Hits"
+msgstr "Mais Vistos"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Most recent first"
+msgstr "Mais recentes primeiro"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Number of Items to syndicate"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Off"
+msgstr "Desligado"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order that the items will be displayed"
+msgstr "Ordem em que os itens deve ser mostrados"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 0.91"
+msgstr "RSS 0.91"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Special file name, if empty the default will be used."
+msgstr "Nome de arquivo especial. Se vazio o padrão será usado."
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndicate"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Description"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Title"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Text Length"
+msgstr "Tamanho do Texto"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "The word length of the article text - 0 will show no text"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "This component controls the Syndication settings"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title Alphabetical"
+msgstr "Título Alfabético"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title Reverse-Alphabetical"
+msgstr "Título em ordem alfabética reversa"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 1.0"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:42
+msgid "No preview available"
+msgstr "Sem pré-visualização disponível"
+
+#: administrator/components/com_templates/admin.templates.html.php:58
+msgid "Preview Template"
+msgstr "Pré-visualização de Template"
+
+#: administrator/components/com_templates/admin.templates.html.php:85
+#: administrator/components/com_templates/admin.templates.html.php:166
+msgid "Assigned"
+msgstr "Atrelada"
+
+#: administrator/components/com_templates/admin.templates.html.php:100
+msgid "Author URL"
+msgstr "URl do Autor"
+
+#: administrator/components/com_templates/admin.templates.html.php:223
+msgid "Template HTML Editor"
+msgstr "Editor HTML de Template"
+
+#: administrator/components/com_templates/admin.templates.html.php:235
+#: administrator/components/com_templates/admin.templates.html.php:289
+msgid "Make unwriteable after saving"
+msgstr "Configure como somente leitura depois de salvar"
+
+#: administrator/components/com_templates/admin.templates.html.php:242
+#: administrator/components/com_templates/admin.templates.html.php:296
+msgid "Override write protection while saving"
+msgstr "Sobrescreva proteção de escrita quando salvar"
+
+#: administrator/components/com_templates/admin.templates.html.php:277
+msgid "Template CSS Editor"
+msgstr "Editor CSS de Template"
+
+#: administrator/components/com_templates/admin.templates.html.php:328
+#, php-format
+msgid "Assign template %s to menu items"
+msgstr "Atrelar template %s para os itens de menu"
+
+#: administrator/components/com_templates/admin.templates.html.php:333
+msgid "Page(s):"
+msgstr "Página(s):"
+
+#: administrator/components/com_templates/admin.templates.php:229
+msgid "You can not delete template in use."
+msgstr "Você não pode recomer uma template em uso."
+
+#: administrator/components/com_templates/admin.templates.php:256
+#: administrator/components/com_templates/admin.templates.php:321
+#, php-format
+msgid "Operation Failed: Could not open %s"
+msgstr "Operação Falhou: Não é possível abrir %s"
+
+#: administrator/components/com_templates/admin.templates.php:268
+#: administrator/components/com_templates/admin.templates.php:332
+msgid "Operation failed: No template specified."
+msgstr "Operação Falhou: Nenhuma template informada."
+
+#: administrator/components/com_templates/admin.templates.php:271
+#: administrator/components/com_templates/admin.templates.php:336
+msgid "Operation failed: Content empty."
+msgstr "Operação Falhou: Conteúdo vazio."
+
+#: administrator/components/com_templates/admin.templates.php:286
+#, php-format
+msgid "Operation failed: %s is not writable."
+msgstr "Operação Falhou: %s não permite escrita."
+
+#: administrator/components/com_templates/admin.templates.php:301
+#: administrator/components/com_templates/admin.templates.php:366
+msgid "Operation failed: Failed to open file for writing."
+msgstr "Operação Falhou: Falha em abrir o arquivo para escrita."
+
+#: administrator/components/com_templates/admin.templates.php:351
+msgid "Operation failed: The file is not writable."
+msgstr "Operação Falhou: O arquivo não permite escrita."
+
+#: administrator/components/com_templates/admin.templates.php:448
+msgid "Positions saved"
+msgstr "Posições salvas"
+
+#: administrator/components/com_trash/admin.trash.html.php:61
+#: administrator/components/com_trash/admin.trash.html.php:65
+msgid "Content Items"
+msgstr "Itens de Conteúdo"
+
+#: administrator/components/com_trash/admin.trash.html.php:230
+msgid "Delete Items"
+msgstr "Itens Apagados"
+
+#: administrator/components/com_trash/admin.trash.html.php:239
+#: administrator/components/com_trash/admin.trash.html.php:304
+msgid "Number of Items:"
+msgstr "Número de Itens:"
+
+#: administrator/components/com_trash/admin.trash.html.php:245
+msgid "Items being Deleted:"
+msgstr "Itens Removidos:"
+
+#: administrator/components/com_trash/admin.trash.html.php:256
+msgid ""
+"This will <strong><font color=\"#FF0000\">Permanently Delete</font></strong> "
+"<br />these Items from the Database"
+msgstr ""
+"Isto pode <strong><font color=\"#FF0000\">Apagar Permanentemente</font></"
+"strong> <br />estes itens da base de dados"
+
+#: administrator/components/com_trash/admin.trash.html.php:259
+msgid ""
+"Are you sure you want to Deleted the listed items? \\nThis will Permanently "
+"Delete them from the database."
+msgstr ""
+"Você tem certeza que deseja apagar os itens listados? \\nIsto irá Apagá-los "
+"Permanentemente da base de dados."
+
+#: administrator/components/com_trash/admin.trash.html.php:295
+msgid "Restore Items"
+msgstr "Itens Restaurados"
+
+#: administrator/components/com_trash/admin.trash.html.php:310
+msgid "Items being Restored:"
+msgstr "Itens para Restaurar:"
+
+#: administrator/components/com_trash/admin.trash.html.php:321
+msgid ""
+"This will <strong><font color=\"#FF0000\">Restore</font></strong> these "
+"Items,<br />they will be returned to their orignial places as Unpublished "
+"items"
+msgstr ""
+"Isto irá <strong><font color=\"#FF0000\">Restaurar</font></strong> estes "
+"itens,<br />que irão retornar para seus locais originais como itens não "
+"publicados"
+
+#: administrator/components/com_trash/admin.trash.html.php:324
+msgid "Are you sure you want to Restore the listed items?."
+msgstr "Você tem certeza que deseja restaurar estes itens?"
+
+#: administrator/components/com_trash/admin.trash.html.php:325
+#: administrator/components/com_trash/admin.trash.html.php:326
+#: administrator/components/com_trash/toolbar.trash.html.php:21
+msgid "Restore"
+msgstr "Restaurar"
+
+#: administrator/components/com_trash/admin.trash.php:182
+#, php-format
+msgid "%s Item successfully Deleted"
+msgid_plural "%s Items successfully Deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/admin.trash.php:256
+#, php-format
+msgid "%s Item successfully Restored"
+msgid_plural "%s Items successfully Restored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/trash.xml
+msgid "This component manages the Trash functionality."
+msgstr "Este componente gerencia a funcionalidade de lixeira."
+
+#: components/com_user/user.html.php:22
+msgid "Welcome!"
+msgstr "Bem-vindo!"
+
+#: components/com_user/user.html.php:27
+msgid "Welcome to the user section of our site"
+msgstr "Bem-vindo a seção de usuários de nosso site"
+
+#: components/com_user/user.html.php:61
+msgid "Edit Your Details"
+msgstr "Edite Seus Detalhes"
+
+#: components/com_user/user.html.php:65
+msgid "Your Name:"
+msgstr "Seu Nome:"
+
+#: components/com_user/user.html.php:69
+msgid "e-mail:"
+msgstr "E-mail:"
+
+#: components/com_user/user.html.php:72
+msgid "User Name:"
+msgstr "Nome de Usuário:"
+
+#: components/com_user/user.html.php:99
+msgid "Submission Success!"
+msgstr "Envio com Sucesso!"
+
+#: components/com_user/user.html.php:103
+msgid ""
+"Your item has been submitted to the site administrators. It will be reviewed "
+"before being published on the site."
+msgstr ""
+"Seu item foi submetido para os administradores do site. Eles irão revisar "
+"antes de publicar no site."
+
+#: components/com_user/user.php:56
+msgid "You cannot upload files greater than 15kb in size."
+msgstr "Você não pode enviar arquivos maiores que 15kb."
+
+#: components/com_user/user.php:59
+#, php-format
+msgid "Image %s already exists. Please rename the file and try again."
+msgstr "Imagem %s já existe. Por favor renomeie o arquivo e tente novamente."
+
+#: components/com_user/user.php:65
+#, php-format
+msgid "Failed to copy %s"
+msgstr "Falha na cópia de %s"
+
+#: components/com_user/user.php:87
+msgid "You may only upload a gif or jpg image."
+msgstr "Você somente pode enviar imagens gif ou jpg."
+
+#: components/com_user/user.php:129
+msgid "Passwords do not match"
+msgstr "Senhas não coincidem"
+
+#: components/com_user/user.php:152
+msgid "Your settings have been saved."
+msgstr "Sua configurações foram salvas."
+
+#: components/com_user/user.php:211
+#, php-format
+msgid "Checked in %d item"
+msgid_plural "Checked in %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_user/user.php:222
+msgid "All items checked out have now been checked in"
+msgstr "Todos os itens verificados estão livres agora"
+
+#: administrator/components/com_users/admin.users.html.php:57
+#: administrator/components/com_users/admin.users.php:157
+msgid "Logged In"
+msgstr "Autenticado"
+
+#: administrator/components/com_users/admin.users.html.php:63
+msgid "UserID"
+msgstr "ID de Usuário"
+
+#: administrator/components/com_users/admin.users.html.php:66
+msgid "Group"
+msgstr "Grupo"
+
+#: administrator/components/com_users/admin.users.html.php:69
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: administrator/components/com_users/admin.users.html.php:72
+msgid "Last Visit"
+msgstr "Última Visita"
+
+#: administrator/components/com_users/admin.users.html.php:154
+msgid "You must provide a name."
+msgstr "Você deve informar um nome."
+
+#: administrator/components/com_users/admin.users.html.php:156
+msgid "You must provide a user login name."
+msgstr "Você deve informar um nome de login."
+
+#: administrator/components/com_users/admin.users.html.php:158
+msgid "Your login name contains invalid characters or is too short."
+msgstr "Seu nome de login contém caracteres inválidos ou é muito curto."
+
+#: administrator/components/com_users/admin.users.html.php:160
+msgid "You must provide an email address."
+msgstr "Você deve informar um endereço de e-mail."
+
+#: administrator/components/com_users/admin.users.html.php:162
+msgid "You must assign user to a group."
+msgstr "Você deve atrelar o usuário à um grupo."
+
+#: administrator/components/com_users/admin.users.html.php:164
+msgid "Passwords do not match."
+msgstr "Senhas não coincidem."
+
+#: administrator/components/com_users/admin.users.html.php:166
+msgid ""
+"Please Select another group as `Public Frontend` is not a selectable option"
+msgstr ""
+"Por favor selecione outro grupo como `Public Frontend`. Esta não é uma opção "
+"selecionável"
+
+#: administrator/components/com_users/admin.users.html.php:168
+msgid ""
+"Please Select another group as `Public Backend` is not a selectable option"
+msgstr ""
+"Por favor selecione outro grupo como `Public Backend`. Esta não é uma opção "
+"selecionável"
+
+#: administrator/components/com_users/admin.users.html.php:185
+msgid "Add"
+msgstr "Adicionar"
+
+#: administrator/components/com_users/admin.users.html.php:196
+msgid "User Details"
+msgstr "Detalhes do Usuário"
+
+#: administrator/components/com_users/admin.users.html.php:216
+msgid "Email:"
+msgstr "E-mail:"
+
+#: administrator/components/com_users/admin.users.html.php:224
+msgid "New Password:"
+msgstr "Nova Senha:"
+
+#: administrator/components/com_users/admin.users.html.php:251
+msgid "Block User"
+msgstr "Bloquear Usuário"
+
+#: administrator/components/com_users/admin.users.html.php:263
+msgid "Receive Submission Emails"
+msgstr "Receber E-mails Submetidos"
+
+#: administrator/components/com_users/admin.users.html.php:275
+msgid "Register Date"
+msgstr "Data de Registro"
+
+#: administrator/components/com_users/admin.users.html.php:283
+msgid "Last Visit Date"
+msgstr "Data de Última Visita"
+
+#: administrator/components/com_users/admin.users.html.php:306
+#: administrator/components/com_users/admin.users.html.php:325
+msgid "Contact Information"
+msgstr "Informação de Contato"
+
+#: administrator/components/com_users/admin.users.html.php:312
+msgid "No Contact details linked to this User:"
+msgstr "Nenhum detalhe de contato atrelado para este usuário:"
+
+#: administrator/components/com_users/admin.users.html.php:314
+msgid "See \"Components -> Contact -> Manage Contacts\" for details."
+msgstr "Veja \"Componentes -> Contato -> Gerenciar Contatos\" para detalhes."
+
+#: administrator/components/com_users/admin.users.html.php:350
+msgid "Telephone:"
+msgstr "Telefone:"
+
+#: administrator/components/com_users/admin.users.html.php:360
+msgid "Fax:"
+msgstr "Fax:"
+
+#: administrator/components/com_users/admin.users.html.php:391
+msgid "Change Contact Details"
+msgstr "Alterar Detalhes de Contato"
+
+#: administrator/components/com_users/admin.users.html.php:394
+msgid "Components -> Contact -> Manage Contacts"
+msgstr "Componentes -> Contato -> Gerenciar Contatos"
+
+#: administrator/components/com_users/admin.users.php:150
+msgid "- Select Group -"
+msgstr "- Selecionar Grupo - "
+
+#. get list of Log Status for dropdown filter
+#: administrator/components/com_users/admin.users.php:156
+msgid "- Select Log Status - "
+msgstr "- Selecione Status de Log -"
+
+#: administrator/components/com_users/admin.users.php:158
+msgid "Not Logged In"
+msgstr "Não Está Autenticado"
+
+#: administrator/components/com_users/admin.users.php:186
+msgid "Super Administrator"
+msgstr "Super Administrador"
+
+#: administrator/components/com_users/admin.users.php:296
+msgid "New User Details"
+msgstr "Detalhes de Novo Usuário"
+
+#: administrator/components/com_users/admin.users.php:297
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"You have been added as a user to %s by an Administrator.\n"
+"\n"
+"This email contains your username and password to log into the %s\n"
+"\n"
+"Username - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"Olá %s,\n"
+"\n"
+"\n"
+"Você foi adicionado como usuário em %s por um Administrador.\n"
+"\n"
+"Este e-mail contém seu nome de usuário e senha para autenticação no %s\n"
+"\n"
+"Nome de Usuário - %s\n"
+"Senha - %s\n"
+"\n"
+"\n"
+"Por favor não responda esta mensagem. Ela foi gerada automaticamente somente "
+"com caráter informativo."
+
+#: administrator/components/com_users/admin.users.php:326
+#, php-format
+msgid "Successfully Saved changes to User: %s"
+msgstr "Alterações Salvas com Sucesso para o Usuário: %s"
+
+#: administrator/components/com_users/admin.users.php:331
+#, php-format
+msgid "Successfully Saved User: %s"
+msgstr "Usuário Salvo com Sucesso: %s"
+
+#: administrator/components/com_users/admin.users.php:361
+msgid "You cannot delete a Super Administrator"
+msgstr "Você não pode apagar um `Super Administrador`"
+
+#: administrator/components/com_users/admin.users.php:363
+msgid "You cannot delete Yourself!"
+msgstr "Você não pode se Apagar!"
+
+#: administrator/components/com_users/admin.users.php:365
+msgid ""
+"You cannot delete another `Administrator` only `Super Administrators` have "
+"this power"
+msgstr ""
+"Você não pode apagar outro `Administrador`. Somente `Super "
+"Administradores`tem este poder"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "block"
+msgstr "bloquear"
+
+#: administrator/components/com_users/admin.users.php:386
+msgid "unblock"
+msgstr "desbloquear"
+
+#: administrator/components/com_users/admin.users.php:413
+msgid "Please select a user"
+msgstr "Por favor selecione um usuário"
+
+#: administrator/components/com_users/toolbar.users.html.php:49
+msgid "Force Logout"
+msgstr "Forçar Logout"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:29
+msgid "Weblink Manager"
+msgstr "Gerenciador de Links Web"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:58
+msgid "Approved"
+msgstr "Aprovado"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:98
+msgid "Edit Weblinks"
+msgstr "Editar Links Web"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:176
+#: components/com_weblinks/weblinks.html.php:249
+msgid "Weblink item must have a title"
+msgstr "Links Web devem ter um Título"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:178
+#: components/com_weblinks/weblinks.html.php:251
+msgid "You must select a category."
+msgstr "Você deve selecionar uma categoria."
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:180
+#: components/com_weblinks/weblinks.html.php:253
+msgid "You must have a url."
+msgstr "Você deve informar uma URL."
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "Weblink:"
+msgstr "Link Web:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:225
+#: components/com_weblinks/weblinks.html.php:297
+msgid "URL:"
+msgstr "URL:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:250
+msgid "Approved:"
+msgstr "Aprovado:"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:143
+#: components/com_weblinks/weblinks.php:183
+#, php-format
+msgid "The module %s is currently being edited by another administrator."
+msgstr "O módulo %s está sendo editada por outro administrador"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr ""
+"Descrição para a página. Se deixada em branco, será usada a configuração "
+"_WEBLINKS_DESC existente em seu arquivo de idioma"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon to be used to the left of the url links in Table view"
+msgstr "Ícone para ser usado à esquerda da URL do link na visão de tabela"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Link Descriptions"
+msgstr "Descrições de Links"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr "Mostrar/Esconder a o texto de descrição dos Links"
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Hits column"
+msgstr "Mostrar/Esconder a coluna de acessos"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "This component shows a listing of Weblinks"
+msgstr "Este componente motra uma lista de links web"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Weblinks"
+msgstr "Links Web"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target"
+msgstr "Destino"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target window when the link is clicked"
+msgstr "Janela de Destino quando o link é clicado"
+
+#: components/com_weblinks/weblinks.class.php:70
+msgid "Please provide a valid URL"
+msgstr "Por favor informe uma URL válida"
+
+#: components/com_weblinks/weblinks.class.php:76
+msgid "Your web link must be given a title."
+msgstr "Seu Link Web deve ter um título."
+
+#: components/com_weblinks/weblinks.class.php:91
+msgid "There is already a web link that name, please try again."
+msgstr "Já existe um link web com este note. Por favor tente novamente."
+
+#: components/com_weblinks/weblinks.html.php:109
+msgid "Web Link"
+msgstr "Link Web"
+
+#: components/com_weblinks/weblinks.html.php:264
+msgid "Submit A Web Link"
+msgstr "Enviar um Link Web"
+
+#: components/com_weblinks/weblinks.php:98
+msgid ""
+"From the list below choose one of our web link categories, then select a URL "
+"to visit the site."
+msgstr ""
+"Da lista abaixo escolha uma das categorias e depois a URL que deseja "
+"conhecer."
+
+#: components/com_weblinks/weblinks.php:278
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+"Obrigado pelo envio. Sua sugestão será analisada e depois postada no site."
+
+#: components/com_weblinks/weblinks.php:290
+msgid "User Submitted '%'"
+msgstr "Usuário enviou '%'"
+
+#: components/com_weblinks/weblinks.php:292
+#, php-format
+msgid " for %s.\\n\\n\\n\\n"
+msgstr " para %s.\\n\\n\\n\\n"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:27
+msgid "Web Link Manager"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:188
+msgid "Web Link:"
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:247
+msgid "Web Link item must have a title"
+msgstr ""
+
+#: components/com_wrapper/wrapper.html.php:55
+msgid ""
+"This option will not work correctly.  Unfortunately, your browser does not "
+"support Inline Frames"
+msgstr ""
+"Esta opção pode não funcionar corretamente. Infelizmente, seu navegador não "
+"suporta Frames Inline"
+
+#: administrator/components/com_admin/admin.admin.html.php:491
+msgid "Search Results"
+msgstr ""
diff -ruN 4.5.4/language/glossary/th_TH.utf-8.po 4.6rc2/language/glossary/th_TH.utf-8.po
--- 4.5.4/language/glossary/th_TH.utf-8.po	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/glossary/th_TH.utf-8.po	2006-06-08 04:17:26.000000000 -0500
@@ -0,0 +1,10175 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 09:23+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: components/com_wrapper/wrapper.html.php:53
+msgid ""
+"This option will not work correctly.  Unfortunately, your browser does not "
+"support Inline Frames"
+msgstr "เบราเซอร์ของคุณไม่สามารถแสดงแฟรมได้"
+
+#: administrator/components/com_admin/admin.admin.html.php:27
+msgid "Home"
+msgstr "หน้าหลัก"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Advanced Mode"
+msgstr "โหมดขั้นสูง"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Simple Mode"
+msgstr "โหมดปกติ"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "selected"
+msgstr "ใช้งานอยู่"
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "unselected"
+msgstr "ยังไม่ได้เลือก"
+
+#: administrator/components/com_admin/admin.admin.html.php:80
+msgid "Information"
+msgstr "ข้อมูล"
+
+#: administrator/components/com_admin/admin.admin.html.php:86
+#: administrator/components/com_admin/admin.admin.html.php:482
+msgid "System Info"
+msgstr "ข้อมูลระบบ"
+
+#: administrator/components/com_admin/admin.admin.html.php:91
+msgid "System Information"
+msgstr "ข้อมูลระบบ"
+
+#: administrator/components/com_admin/admin.admin.html.php:97
+msgid "PHP built On:"
+msgstr "PHP ทำงานในระบบ:"
+
+#: administrator/components/com_admin/admin.admin.html.php:107
+msgid "Database Version:"
+msgstr "ฐานข้อมูลเวอร์ชัน:"
+
+#: administrator/components/com_admin/admin.admin.html.php:117
+msgid "PHP Version:"
+msgstr "PHP เวอร์ชัน:"
+
+#: administrator/components/com_admin/admin.admin.html.php:127
+msgid "Web Server:"
+msgstr "เว็บเซิร์ฟเวอร์:"
+
+#: administrator/components/com_admin/admin.admin.html.php:137
+msgid "WebServer to PHP interface:"
+msgstr "จากเว็บเซิร์ฟเวอร์สู่รูปแบบพีเอชพี:"
+
+#: administrator/components/com_admin/admin.admin.html.php:147
+msgid "Mambo Version:"
+msgstr "แมมโบ้เวอร์ชัน:"
+
+#: administrator/components/com_admin/admin.admin.html.php:157
+msgid "User Agent:"
+msgstr "ตัวแทนผู้ใช้:"
+
+#: administrator/components/com_admin/admin.admin.html.php:167
+msgid "Relevant PHP Settings:"
+msgstr "การตั้งค่าใน PHP:"
+
+#: administrator/components/com_admin/admin.admin.html.php:174
+msgid "Safe Mode:"
+msgstr "Safe Mode:"
+
+#: administrator/components/com_admin/admin.admin.html.php:182
+msgid "Open basedir:"
+msgstr "Open basedir:"
+
+#: administrator/components/com_admin/admin.admin.html.php:190
+msgid "Display Errors:"
+msgstr "Display Errors:"
+
+#: administrator/components/com_admin/admin.admin.html.php:198
+msgid "Short Open Tags:"
+msgstr "Short Open Tags:"
+
+#: administrator/components/com_admin/admin.admin.html.php:206
+msgid "File Uploads:"
+msgstr "File Uploads:"
+
+#: administrator/components/com_admin/admin.admin.html.php:214
+msgid "Magic Quotes"
+msgstr "Magic Quotes"
+
+#: administrator/components/com_admin/admin.admin.html.php:222
+msgid "Register Globals:"
+msgstr "Register Globals:"
+
+#: administrator/components/com_admin/admin.admin.html.php:230
+msgid "Output Buffering:"
+msgstr "Output Buffering:"
+
+#: administrator/components/com_admin/admin.admin.html.php:238
+msgid "Session save path:"
+msgstr "Session save path:"
+
+#: administrator/components/com_admin/admin.admin.html.php:246
+msgid "Session auto start:"
+msgstr "Session auto start:"
+
+#: administrator/components/com_admin/admin.admin.html.php:254
+msgid "XML enabled:"
+msgstr "XML enabled:"
+
+#: administrator/components/com_admin/admin.admin.html.php:262
+msgid "Zlib enabled:"
+msgstr "Zlib enabled:"
+
+#: administrator/components/com_admin/admin.admin.html.php:270
+msgid "Disabled Functions:"
+msgstr "Disabled Functions:"
+
+#: administrator/components/com_admin/admin.admin.html.php:285
+msgid "WYSIWYG Editor:"
+msgstr "WYSIWYG Editor:"
+
+#: administrator/components/com_admin/admin.admin.html.php:297
+msgid "Configuration File:"
+msgstr "ไฟล์เก็บค่าคอนฟิค:"
+
+#: administrator/components/com_admin/admin.admin.html.php:323
+msgid "PHP Info"
+msgstr "รายละเอียด PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:328
+msgid "PHP Information"
+msgstr "รายละเอียด PHP"
+
+#: administrator/components/com_admin/admin.admin.html.php:350
+msgid "Permissions"
+msgstr "การยินยอม"
+
+#: administrator/components/com_admin/admin.admin.html.php:354
+msgid "Directory Permissions"
+msgstr "การยินยอมของไดเรกทอรี่่"
+
+#: administrator/components/com_admin/admin.admin.html.php:358
+msgid ""
+"For all Mambo functions and features to work ALL of the following "
+"directories should be writeable:"
+msgstr "แมมโบ้สามารถทำงานได้อย่างสมบูรณ์ก็ต่อเมื่อทุกไดเรกทอรี่่ สามารถเขียนได้:"
+
+#: administrator/components/com_admin/admin.admin.html.php:434
+msgid "Help"
+msgstr "ช่วยเหลือ"
+
+#: administrator/components/com_admin/admin.admin.html.php:442
+msgid "Search:"
+msgstr "ค้นหา:"
+
+#: administrator/components/com_admin/admin.admin.html.php:445
+msgid "Go"
+msgstr "หา"
+
+#: administrator/components/com_admin/admin.admin.html.php:446
+msgid "Clear Results"
+msgstr "ล้างผลลัพธ์"
+
+#: administrator/components/com_admin/admin.admin.html.php:453
+#: administrator/components/com_admin/admin.admin.html.php:464
+msgid "Glossary"
+msgstr "ภาคคำศัพท์"
+
+#: administrator/components/com_admin/admin.admin.html.php:456
+#: administrator/components/com_admin/admin.admin.html.php:467
+msgid "Credits"
+msgstr "เครดิต"
+
+#: administrator/components/com_admin/admin.admin.html.php:459
+#: administrator/components/com_admin/admin.admin.html.php:470
+msgid "Support"
+msgstr "เว็บรองรับ"
+
+#: administrator/components/com_admin/admin.admin.html.php:476
+msgid "License"
+msgstr "ใบอนุญาต"
+
+#: administrator/components/com_admin/admin.admin.html.php:491
+msgid "Search Results"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:493
+msgid "Index"
+msgstr "ดัชนี"
+
+#: administrator/components/com_admin/admin.admin.html.php:536
+msgid "Site Preview"
+msgstr "ดูตัวอย่างเว็บ"
+
+#: administrator/components/com_admin/admin.admin.html.php:540
+msgid "Open in new window"
+msgstr "เปิดหน้าต่างใหม่"
+
+#: administrator/components/com_admin/admin.admin.php:22
+msgid "There is no link associated with this item"
+msgstr "ไม่มีลิงก์สำหรับรายการนี้"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:27
+msgid "News Feed Manager"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:44
+msgid "News Feed"
+msgstr "News Feed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:47
+msgid "Published"
+msgstr "เผยแพร่"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:50
+msgid "Reorder"
+msgstr "การจัดลำดับ"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:53
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:194
+msgid "Category"
+msgstr "ประเภท"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:56
+#: components/com_newsfeeds/newsfeeds.html.php:104
+msgid "# Articles"
+msgstr "จำนวนเนื้อหา"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:59
+msgid "Cache time"
+msgstr "เวลาแคช(วินาที)"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:89
+msgid "Checked Out"
+msgstr "นำออก"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:93
+msgid "Edit News Feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:112
+msgid "Edit Category"
+msgstr "แก้ไขประเภท"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:152
+msgid "Please fill in the news feed name."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please select a Category."
+msgstr "เลือกประเภท."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:156
+msgid "Please fill in the news feed link."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please select a category."
+msgstr "เลือกประเภท."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:160
+msgid "Please fill in the number of articles to display."
+msgstr "โปรดระบุจำนวนเนื้อหาที่ต้องการแสดง."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:162
+msgid "Please fill in the cache refresh time."
+msgstr "โปรดระบุเวลาการล้าง cache."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "Edit"
+msgstr "แก้ไข"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "New"
+msgstr "สร้างใหม่"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "News Feed:"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:181
+msgid "Details"
+msgstr "รายละเอียด"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:186
+msgid "Name"
+msgstr "ชื่อ"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:202
+msgid "Link"
+msgstr "ลิงก์"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:210
+msgid "Number of Articles"
+msgstr "จำนวนของเนื้อหา"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:218
+msgid "Cache time (in seconds)"
+msgstr "เวลา cache (ต่อวินาที)"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:226
+msgid "Ordering"
+msgstr "การจัดเรียง"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:234
+msgid "Published:"
+msgstr "เผยแพร่:"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:19
+msgid "You are not authorized to view this resource."
+msgstr "ขออภัยข้อมูลส่วนนี้สำหรับสมาชิกเท่านั้น."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:204
+msgid "publish"
+msgstr "เผยแพร่"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:204
+msgid "unpublish"
+msgstr "ไม่เผยแพร่"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:205
+#, php-format
+msgid "Select a module to %s"
+msgstr "เลือกโมดูลไปยัง %s"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:238
+msgid "Select an item to delete"
+msgstr "เลือกรายการที่จะลบ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Articles Column"
+msgstr "จำนวนคอลัมน์"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Category Items"
+msgstr "# จำนวนรายการหมวดของเนื้อหา"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+"รูปภาพขนาดเล็กจะวางอยู่ในตำแหน่งซ้ายหรือขวาของรายการเมนู, "
+"โดยรูปภาพนั้นจะต้องเก็บอยู่ในโฟลเดอร์ images/stories/"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr "คำเสริมท้ายคลาส css ของแต่ละหน้า, สิ่งนี้จะทำงานในหน้าที่ต้องการ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Alignment of the image"
+msgstr "การจัดเรียงรูปภาพ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr "ความยามของข้อความที่ต้องการแสดง. ถ้าใส่ 0 จะแสดงทั้งหมด"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Back Button"
+msgstr "ปุ่มย้อนกลับ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category Description"
+msgstr "รายละเอียดหมวดของเนื้อหา"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category List - Category"
+msgstr "รายการหมวด - ประเภท"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category List - Section"
+msgstr "รายการหมวด - หมวด"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description"
+msgstr "รายละเอียด"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description Text"
+msgstr "ข้อความแสดงรายละเอียด"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description for page"
+msgstr "รายละเอียดของเว็บเพจ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Description"
+msgstr "คำอธิบาย Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Image"
+msgstr "รูปภาพ Feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Hide"
+msgstr "ซ่อน"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Image"
+msgstr "รูป"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Image Align"
+msgstr "ตำแหน่งรูปภาพ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+"รูปภาพที่ต้องการแสดงบนหน้าเพจจะต้องถูกเก็บอยู่ในโฟลเดอร์ /images/stories. "
+"โดยปกติระบบจะโหลดรูป web_links.jpg, หากไม่มีรูปภาพในโฟลเดอร์ จะไม่การโหลดรูปใดๆ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Item Description"
+msgstr "รายละเอียด"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Left"
+msgstr "ซ้าย"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Link Column"
+msgstr "ลิงก์คอลัมน์"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Menu Image"
+msgstr "รูปภาพของเมนู"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Name Column"
+msgstr "ชื่อคอลัมน์"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Newsfeeds"
+msgstr "Newsfeeds"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Page Class Suffix"
+msgstr "คำเสริมท้ายคลาสของหน้า"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Page Title"
+msgstr "หัวข้อหน้าเพจ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Right"
+msgstr "ขวา"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show"
+msgstr "แสดง"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr "แสดง/ซ่อน ปุ่มย้อนกลับ เพื่อย้อนกลับไปยังเพจก่อนหน้านี้"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the # of articles in the feed"
+msgstr "แสดง/ซ่อน บทความใน feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description below"
+msgstr "แสดง/ซ่อน รายละเอียดด้านล่างนี้"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr "แสดง/ซ่อน คำอธิบายสำหรับรายการของประเภทอื่นๆ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Link column"
+msgstr "แสดง/ซ่อน Feed ลิงก์คอลัมน์"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Name column"
+msgstr "แสดง/ซ่อน ชื่อของคอลัมน์"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr "แสดง/ซ่อน รายการประเภทของเนื้อหาในหน้ามุมมองแบบลิสรายการ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr "แสดง/ซ่อน รายการประเภทของเนื้อหาในหน้ามุมมองแบบตารางรายการ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Table Headings"
+msgstr "แสดง/ซ่อน หัวข้อตาราง"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr "แสดง/ซ่อน คำอธิบาย หรือข้อความส่วนต้นของรายการ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description text of the feed"
+msgstr "แสดง/ซ่อน คำอธิบายข้อความของการป้อน"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the image of the feed"
+msgstr "แสดง/ซ่อน รูปภาพสำหรับ feed"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the number of items in each category"
+msgstr "แสดง/ซ่อน จำนวนรายการในแต่ละประเภทของเนื้อหา"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the pages Title"
+msgstr "แสดง/ซ่อน หัวข้อหน้าเพจ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Table Headings"
+msgstr "หัวข้อตาราง"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+"ข้อความนี้จะแสดงยังส่วนบนของหน้าเพจ. หากไม่ระบุ ระบบจะกำหนดให้เป็นชื่อของเมนูโดยอัตโนมัติ"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "This component manages RSS/RDF newsfeeds"
+msgstr "นี่คือคอมโพเน้นท์จัดการ RSS/RDF newsfeeds"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Use Global"
+msgstr "ใช้ค่าพื้นฐาน"
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Word Count"
+msgstr "นับจำนวนคำ"
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php:51
+msgid "Close"
+msgstr "ปิด"
+
+#: components/com_newsfeeds/newsfeeds.html.php:37
+msgid "Web Links"
+msgstr "เว็บลิงก์"
+
+#: components/com_newsfeeds/newsfeeds.html.php:95
+msgid "Feed Name"
+msgstr "ชื่อ Feed"
+
+#: components/com_newsfeeds/newsfeeds.html.php:113
+msgid "Feed Link"
+msgstr "ลิงก์ Feed"
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid ""
+"<p>MOStlyDBAdmin is used for easy back up/restore of your database.</p><p>  "
+"It is a revival \r\n"
+"\tof the dbadmin component for use in the Mambo 4.6+ core.  The dbadmin \r\n"
+"\tcomponent stopped working with Mambo 4.5.3h and development appears to "
+"have ceased.</p>\n"
+msgstr ""
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid "MOStlyDBAdmin"
+msgstr ""
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE editor mambot.  Helps customize your "
+"MOStlyCE editor installation.</p>"
+msgstr ""
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid "mostlyce"
+msgstr "mostlyce"
+
+#: administrator/components/com_modules/admin.modules.html.php:32
+#: administrator/components/com_modules/admin.modules.html.php:236
+#: administrator/components/com_modules/admin.modules.php:380
+msgid "Administrator"
+msgstr "ผู้ดูแลระบบ"
+
+#: administrator/components/com_modules/admin.modules.html.php:32
+msgid "Module Manager"
+msgstr "การจัดการโมดูล"
+
+#: administrator/components/com_modules/admin.modules.html.php:32
+#: administrator/components/com_modules/admin.modules.html.php:236
+msgid "Site"
+msgstr "เว็บ"
+
+#: administrator/components/com_modules/admin.modules.html.php:43
+msgid "Filter:"
+msgstr "ค้นหา:"
+
+#: administrator/components/com_modules/admin.modules.html.php:58
+msgid "Module Name"
+msgstr "ชื่อโมดูล"
+
+#: administrator/components/com_modules/admin.modules.html.php:67
+msgid "Order"
+msgstr "ลำดับ"
+
+#: administrator/components/com_modules/admin.modules.html.php:70
+msgid "Save Order"
+msgstr "บันทึกการจัดลำดับ"
+
+#: administrator/components/com_modules/admin.modules.html.php:76
+msgid "Access"
+msgstr "การเข้าถึง"
+
+#: administrator/components/com_modules/admin.modules.html.php:82
+msgid "Position"
+msgstr "ตำแหน่ง"
+
+#: administrator/components/com_modules/admin.modules.html.php:85
+msgid "Pages"
+msgstr "หน้า"
+
+#: administrator/components/com_modules/admin.modules.html.php:88
+msgid "ID"
+msgstr "หมายเลข"
+
+#: administrator/components/com_modules/admin.modules.html.php:91
+msgid "Type"
+msgstr "ประเภท"
+
+#: administrator/components/com_modules/admin.modules.html.php:152
+msgid "None"
+msgstr "ไม่กำหนด"
+
+#: administrator/components/com_modules/admin.modules.html.php:154
+msgid "Varies"
+msgstr "มาก"
+
+#: administrator/components/com_modules/admin.modules.html.php:156
+msgid "All"
+msgstr "ทั้งหมด"
+
+#: administrator/components/com_modules/admin.modules.html.php:164
+msgid "User"
+msgstr "ผู้ใช้"
+
+#: administrator/components/com_modules/admin.modules.html.php:211
+msgid "Module must have a title"
+msgstr "กรุณาใส่หัวข้อของโมดูล"
+
+#: administrator/components/com_modules/admin.modules.html.php:237
+msgid "Module:"
+msgstr "โมดูล:"
+
+#: administrator/components/com_modules/admin.modules.html.php:259
+msgid "Title:"
+msgstr "ชื่อเรื่อง"
+
+#: administrator/components/com_modules/admin.modules.html.php:268
+msgid "Show title:"
+msgstr "แสดงหัวเรื่อง:"
+
+#: administrator/components/com_modules/admin.modules.html.php:276
+msgid "Position:"
+msgstr "ตำแหน่ง:"
+
+#: administrator/components/com_modules/admin.modules.html.php:284
+msgid "Module Order:"
+msgstr "ลำดับโมดูล:"
+
+#: administrator/components/com_modules/admin.modules.html.php:296
+msgid "Access Level:"
+msgstr "ระดับการเข้าถึง:"
+
+#: administrator/components/com_modules/admin.modules.html.php:316
+msgid "ID:"
+msgstr "ID:"
+
+#: administrator/components/com_modules/admin.modules.html.php:324
+msgid "Description:"
+msgstr "คำอธิบาย:"
+
+#: administrator/components/com_modules/admin.modules.html.php:335
+msgid "Parameters"
+msgstr "พารามิเตอร์"
+
+#: administrator/components/com_modules/admin.modules.html.php:349
+msgid "Pages / Items"
+msgstr "หน้า / รายการ"
+
+#: administrator/components/com_modules/admin.modules.html.php:354
+msgid "Menu Item Link(s):"
+msgstr "เมนูรายการลิงก์:"
+
+#: administrator/components/com_modules/admin.modules.html.php:370
+msgid "Custom Output"
+msgstr "เอาต์พุตทั้วไป"
+
+#: administrator/components/com_modules/admin.modules.html.php:375
+msgid "Content:"
+msgstr "เนื้อหา:"
+
+#: administrator/components/com_modules/admin.modules.php:151
+msgid "- All Positions -"
+msgstr "- เลือก ตำแหน่ง -"
+
+#: administrator/components/com_modules/admin.modules.php:163
+msgid "- All Types -"
+msgstr "- เลือก ชนิด -"
+
+#: administrator/components/com_modules/admin.modules.php:213
+#, php-format
+msgid "Module Copied [%s]"
+msgstr "คัดลอกโมดูล [%s]"
+
+#: administrator/components/com_modules/admin.modules.php:270
+#, php-format
+msgid "Successfully Saved changes to Module: %s"
+msgstr "บันทึกการเปลี่ยนแปลงโมดูลสำเร็จ: %s"
+
+#: administrator/components/com_modules/admin.modules.php:276
+#, php-format
+msgid "Successfully Saved Module: %s"
+msgstr "บันทึกโมดูลสำเร็จ: %s"
+
+#: administrator/components/com_modules/admin.modules.php:297
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr "โมดูล %s กำลังถูกแก้ไขโดยผู้ดูแลท่านอื่น"
+
+#: administrator/components/com_modules/admin.modules.php:381
+#: administrator/components/com_modules/admin.modules.php:382
+#: administrator/components/com_modules/admin.modules.php:385
+#: administrator/components/com_modules/admin.modules.php:386
+msgid "N/A"
+msgstr "N/A"
+
+#: administrator/components/com_modules/admin.modules.php:422
+msgid "Select a module to delete"
+msgstr "เลือกโมดูลที่จะลบ"
+
+#: administrator/components/com_modules/admin.modules.php:445
+msgid ""
+"You cannot delete mod_mainmenu module that displays the \"mainmenu\" as it "
+"is a core Menu"
+msgstr "คุณไม่สามารถลบโมดูล mod_mainmenu เนื่องจากใช้แสดง \"เมนูหลัก\" สำหรับหน้าเว็บไซต์"
+
+#: administrator/components/com_modules/admin.modules.php:471
+#, php-format
+msgid ""
+"Module(s): \"%s\" cannot be deleted they can only be un-installed as they "
+"are Mambo modules."
+msgstr "โมดูล: \"%s\" ไม่สามารถลบโมดูลได้ ต้องถอนโมดูลออกก่อน"
+
+#. foreach
+#: administrator/components/com_modules/admin.modules.php:613
+msgid "New ordering saved"
+msgstr "บันทึกการจัดลำดับใหม่แล้ว"
+
+#: administrator/components/com_modules/toolbar.modules.html.php:42
+msgid "Preview"
+msgstr "แสดงตัวอย่าง"
+
+#: administrator/components/com_modules/toolbar.modules.html.php:42
+msgid "You can only preview typed modules."
+msgstr "คุณสามารถเรียกดูโมดูลได้อย่างเดียว."
+
+#: administrator/components/com_modules/toolbar.modules.html.php:82
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: administrator/components/com_messages/admin.messages.html.php:22
+msgid "Private Messaging"
+msgstr "ข้อความส่วนตัว"
+
+#: administrator/components/com_messages/admin.messages.html.php:33
+msgid "Subject"
+msgstr "หัวข้อ"
+
+#: administrator/components/com_messages/admin.messages.html.php:34
+msgid "From"
+msgstr "จาก"
+
+#: administrator/components/com_messages/admin.messages.html.php:36
+msgid "Date"
+msgstr "วันที่"
+
+#: administrator/components/com_messages/admin.messages.html.php:37
+#: administrator/components/com_messages/admin.messages.html.php:53
+msgid "Read"
+msgstr "อ่าน"
+
+#: administrator/components/com_messages/admin.messages.html.php:55
+msgid "Unread"
+msgstr "ไม่ถูกอ่าน"
+
+#: administrator/components/com_messages/admin.messages.html.php:75
+msgid "Private Messaging Configuration"
+msgstr "ตั้งค่า Configuration ของข้อความส่วนตัว"
+
+#: administrator/components/com_messages/admin.messages.html.php:80
+msgid "General"
+msgstr "ทั่วไป"
+
+#: administrator/components/com_messages/admin.messages.html.php:87
+msgid "Are you sure?"
+msgstr "คุณแน่ใจใช่ไหม?"
+
+#: administrator/components/com_messages/admin.messages.html.php:99
+msgid "Lock Inbox:"
+msgstr "ล็อค Inbox:"
+
+#: administrator/components/com_messages/admin.messages.html.php:103
+msgid "Mail me on new Message:"
+msgstr "ส่งอีเมลให้ฉันถ้ามีข้อความใหม่เข้ามา:"
+
+#: administrator/components/com_messages/admin.messages.html.php:121
+msgid "View Private Message"
+msgstr "เรียกดูข้อความส่วนตัว"
+
+#: administrator/components/com_messages/admin.messages.html.php:128
+msgid "From:"
+msgstr "จาก:"
+
+#: administrator/components/com_messages/admin.messages.html.php:132
+msgid "Posted:"
+msgstr "ส่ง:"
+
+#: administrator/components/com_messages/admin.messages.html.php:136
+#: administrator/components/com_messages/admin.messages.html.php:191
+msgid "Subject:"
+msgstr "หัวข้อ:"
+
+#: administrator/components/com_messages/admin.messages.html.php:140
+#: administrator/components/com_messages/admin.messages.html.php:197
+msgid "Message:"
+msgstr "ข้อความ:"
+
+#: administrator/components/com_messages/admin.messages.html.php:167
+msgid "You must provide a subject."
+msgstr "กรุณาใส่ชื่อเรื่อง."
+
+#: administrator/components/com_messages/admin.messages.html.php:169
+msgid "You must provide a message."
+msgstr "กรุณาใส่ข้อความที่จะส่ง."
+
+#: administrator/components/com_messages/admin.messages.html.php:171
+msgid "You must select a recipient."
+msgstr "กรุณาระบุผู้รับปลายทาง."
+
+#: administrator/components/com_messages/admin.messages.html.php:180
+msgid "New Private Message"
+msgstr "ข้อความส่วนตัวใหม่"
+
+#: administrator/components/com_messages/admin.messages.html.php:187
+msgid "To:"
+msgstr "ถึง:"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:19
+msgid "Reply"
+msgstr "ตอบกลับ"
+
+#: administrator/components/com_messages/toolbar.messages.html.php:29
+msgid "Send"
+msgstr "ส่งข้อความ"
+
+#: components/com_messages/messages.class.php:74
+#: components/com_messages/messages.class.php:75
+msgid "A new private message has arrived"
+msgstr "มีข้อความใหม่ส่งถึงคุณ"
+
+#: components/com_messages/messages.class.php:82
+msgid "The user has locked their mailbox. Message failed."
+msgstr "ข้อความไม่สามารถส่งได้เนื่องจาก User ไม่ได้เปิดใช้งานเมลบ๊อกซ์"
+
+#: administrator/components/com_menus/admin.menus.html.php:27
+#, php-format
+msgid "Menu Manager <small><small>[ %s ]</small></small>"
+msgstr "การจัดการเมนู <small><small>[ %s ]</small></small>"
+
+#: administrator/components/com_menus/admin.menus.html.php:30
+msgid "Max Levels"
+msgstr "ระดับสูงสุด"
+
+#: administrator/components/com_menus/admin.menus.html.php:47
+msgid ""
+"You cannot `delete` this menu as it is required for the proper operation of "
+"Mambo"
+msgstr "คุณไม่สามารถ `ลบ` เมนูนี้ได้เพราะจำเป็นต้องมี"
+
+#: administrator/components/com_menus/admin.menus.html.php:50
+msgid ""
+"The 1st Published item in this menu [mainmenu] is the default `Homepage` for "
+"the site"
+msgstr "[mainmenu] เป็นเมนูแรกที่ต้องมี "
+
+#: administrator/components/com_menus/admin.menus.html.php:68
+msgid "Menu Item"
+msgstr "หมวดเมนู"
+
+#: administrator/components/com_menus/admin.menus.html.php:86
+msgid "Itemid"
+msgstr "หมายเลข id"
+
+#: administrator/components/com_menus/admin.menus.html.php:92
+msgid "CID"
+msgstr "CID"
+
+#: administrator/components/com_menus/admin.menus.html.php:182
+msgid "New Menu Item"
+msgstr "สร้างเมนูใหม่"
+
+#. echo _MENU_GROUP;
+#: administrator/components/com_menus/admin.menus.html.php:201
+msgid "Content"
+msgstr "เนื้อหา"
+
+#: administrator/components/com_menus/admin.menus.html.php:233
+msgid "Miscellaneous"
+msgstr "อื่นๆ"
+
+#: administrator/components/com_menus/admin.menus.html.php:264
+msgid ""
+"Note that some menu types appear in more that one grouping, but they are "
+"still the same menu type."
+msgstr "หมายเหตุ:เมนูบางชนิดอาจจะอยู่หลายกลุ่ม แต่ยังคงเป็นเมนูชนิดเดียวกัน."
+
+#: administrator/components/com_menus/admin.menus.html.php:268
+msgid "Components"
+msgstr "คอมโพเน้นท์"
+
+#: administrator/components/com_menus/admin.menus.html.php:300
+msgid "Links"
+msgstr "ลิงก์"
+
+#: administrator/components/com_menus/admin.menus.html.php:357
+msgid "Move Menu Items"
+msgstr "ย้ายหมวดเมนู"
+
+#: administrator/components/com_menus/admin.menus.html.php:367
+msgid "Move to Menu:"
+msgstr "ย้ายไปหมวดเมนู:"
+
+#: administrator/components/com_menus/admin.menus.html.php:374
+msgid "Menu Items being moved:"
+msgstr "กำลังย้ายหมวดเมนู:"
+
+#: administrator/components/com_menus/admin.menus.html.php:417
+msgid "Copy Menu Items"
+msgstr "คัดลอกหมวดเมนู"
+
+#: administrator/components/com_menus/admin.menus.html.php:428
+msgid "Copy to Menu:"
+msgstr "คัดลอกไปเมนู:"
+
+#: administrator/components/com_menus/admin.menus.html.php:436
+msgid "Menu Items being copied:"
+msgstr "คัดลอกรายการเมนู:"
+
+#: administrator/components/com_menus/admin.menus.php:415
+#, php-format
+msgid "Select an item to %s"
+msgstr "เลือกรายการสำหรับ %s"
+
+#: administrator/components/com_content/admin.content.php:805
+msgid "%d Item sent to the Trash"
+msgid_plural "%d Items sent to the Trash"
+msgstr[0] "%d รายการที่จะส่งลงถังรีไซเคิล"
+msgstr[1] "%d รายการที่จะส่งลงถังรีไซเคิล"
+
+#: administrator/components/com_menus/admin.menus.php:529
+#: administrator/components/com_menus/admin.menus.php:634
+msgid "Select an item to move"
+msgstr "เลือกเนื้อหาเพื่อย้าย"
+
+#. if
+#: administrator/components/com_menus/admin.menus.php:614
+#, php-format
+msgid "%d Menu Item moved to %s"
+msgid_plural "%d Menu Items moved to %s"
+msgstr[0] "%d ย้ายเมนูไปที่ %s"
+msgstr[1] "%d ย้ายเมนูไปที่ %s"
+
+#. foreach
+#: administrator/components/com_menus/admin.menus.php:684
+#, php-format
+msgid "%d Menu Item Copied to %s"
+msgid_plural "%d Menu Items Copied to %s"
+msgstr[0] "%d คัดลอกเมนูไปที่ %s"
+msgstr[1] "%d คัดลอกเมนูไปที่ %s"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:35
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:35
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:41
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:42
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:35
+#: administrator/components/com_menus/url/url.menu.html.php:38
+msgid "Link must have a name"
+msgstr "ลิงก์ต้องมีชื่อ"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:37
+msgid "You must select a Component to link to"
+msgstr "คุณต้องเลือกคอมโพเน้นท์ที่จะเชื่อมต่อ"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:48
+#: administrator/components/com_menus/components/components.menu.html.php:72
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:66
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:50
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:68
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:70
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:64
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:64
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:68
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:56
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:68
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:57
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+#: administrator/components/com_menus/separator/separator.menu.html.php:44
+#: administrator/components/com_menus/url/url.menu.html.php:51
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:59
+msgid "Add"
+msgstr "เพิ่ม"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:48
+msgid "Menu Item :: Link - Component Item"
+msgstr "รายการเมนู :: การเชื่อมโยง - รายการคอมโพเน้นท์"
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:64
+#: administrator/components/com_menus/components/components.menu.html.php:87
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:82
+#: administrator/components/com_menus/contact_item_link/contact_item_link.class.php:59
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:66
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:83
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:85
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:79
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:79
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:84
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:72
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:83
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:73
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:82
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:66
+#: administrator/components/com_menus/url/url.menu.html.php:67
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:83
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:75
+msgid "Name:"
+msgstr "ชื่อ:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:72
+msgid "Component to Link:"
+msgstr "คอมโพเน้นท์ที่จะลิงก์:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:79
+#: administrator/components/com_menus/components/components.menu.html.php:99
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:105
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:102
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:104
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:100
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:100
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:107
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:87
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:102
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:105
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:106
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:91
+msgid "Url:"
+msgstr "Url:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:86
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:88
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:94
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:88
+#: administrator/components/com_menus/url/url.menu.html.php:83
+msgid "On Click, Open in:"
+msgstr "เมื่อคลิกแล้วเปิดใน:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:94
+#: administrator/components/com_menus/components/components.menu.html.php:105
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:113
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:96
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:108
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:110
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:106
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:106
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:115
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:102
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:108
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:103
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:113
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:96
+#: administrator/components/com_menus/separator/separator.menu.html.php:68
+#: administrator/components/com_menus/url/url.menu.html.php:91
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:114
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:99
+msgid "Parent Item:"
+msgstr "หน้าต่างเดิม:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:102
+#: administrator/components/com_menus/components/components.menu.html.php:112
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:121
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:104
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:114
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:116
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:112
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:112
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:123
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:110
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:114
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:111
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:121
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:104
+#: administrator/components/com_menus/separator/separator.menu.html.php:76
+#: administrator/components/com_menus/url/url.menu.html.php:99
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:122
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:107
+msgid "Ordering:"
+msgstr "การเรียงลำดับ:"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+msgid "Creates a link to an existing Mambo Component"
+msgstr "สร้างการเชื่อมโยงออกจากคอมโพเน้นท์ของแมมโบ้"
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+msgid "Link - Component Item"
+msgstr "การเชื่อมโยง - รายการคอมโพเน้นท์"
+
+#: administrator/components/com_menus/components/components.class.php:33
+#, php-format
+msgid "\"The module %s is currently being edited by another administrator"
+msgstr "โมดูล %s กำลังถูกแก้ไขโดยผู้ดูแลท่านอื่น"
+
+#: administrator/components/com_menus/components/components.menu.html.php:58
+msgid "Item must have a name"
+msgstr "รายการจะต้องมีชื่อ"
+
+#: administrator/components/com_menus/components/components.menu.html.php:60
+msgid "Please select a Component"
+msgstr "โปรดเลือกคอมโพเน้นท์"
+
+#: administrator/components/com_menus/components/components.menu.html.php:72
+#, php-format
+msgid "Menu Item :: Component <small><small>%s</small></small>"
+msgstr "รายการเมนู :: คอมโพเน้นท์ <small><small>%s</small></small>"
+
+#: administrator/components/com_menus/components/components.menu.html.php:93
+msgid "Component:"
+msgstr "คอมโพเน้นท์:"
+
+#: administrator/components/com_menus/components/components.menu.html.php:148
+msgid "Parameter list will be available once you save this New menu item"
+msgstr "สามารถตั้งค่าพารามิเตอร์หลังจากบันทึกเมนูนี้แล้ว"
+
+#: administrator/components/com_menus/components/components.xml
+msgid "Component"
+msgstr "คอมโพเน้นท์"
+
+#: administrator/components/com_menus/components/components.xml
+msgid "Displays the frontend interface for a Component"
+msgstr "หน้าแรกแสดงเป็นตัวประสานสำหรับคอมโพเน้นท์"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:39
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:39
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:39
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:39
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:39
+msgid "You must select a category"
+msgstr "คุณต้องเลือกประเภท"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:53
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:55
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:56
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:40
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:49
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:40
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:49
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:55
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:52
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:53
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:53
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:35
+msgid "This Menu item must have a title"
+msgstr "เมนูนี้ต้องมีชื่อ"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Contact Category"
+msgstr "รายการเมนู :: ตาราง - ประเภทของผู้ติดต่อ"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:90
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:90
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:92
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:90
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:91
+msgid "If you leave this blank the Category name will be automatically used"
+msgstr "ถ้าคุณเว้นว่างไว้ชื่อประเภทจะถูกใช้แทนโดยอัตโนมัติ"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:97
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:96
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:88
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:99
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:73
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:97
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:98
+msgid "Category:"
+msgstr "ประเภท:"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Email Column"
+msgstr "คอลัมน์ อีเมล"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Fax Column"
+msgstr "คอลัมน์ โทรสาร"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Other Categories"
+msgstr "ประเภทอื่น ๆ"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Position Column"
+msgstr "คอลัมน์ ตำแหน่ง"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Email column"
+msgstr "แสดง/ซ่อน คอลัมน์อีเมล"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Fax column"
+msgstr "แสดง/ซ่อน คอลัมน์โทรสาร"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Position column"
+msgstr "แสดง/ซ่อน คอลัมน์ตำแหน่ง"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Telephone column"
+msgstr "แสดง/ซ่อน คอลัมน์โทรศัพท์"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Shows a Table view of Contact items for a particular Category"
+msgstr "แสดงมุมมองตารางของผู้ติดต่ออย่างละเอียดในแต่ละประเภทของเนื้อหา"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Table - Contact Category"
+msgstr "ตาราง - ประเภทของผู้ติดต่อ"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Telephone Column"
+msgstr "คอลัมน์ โทรศัพท์"
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "When viewing a Category, Show/Hide the list of other Categories"
+msgstr "เมื่อดูประเภท, แสดง/ซ่อน รายการอื่น ๆ"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.class.php:30
+#: administrator/components/com_menus/content_archive_category/content_archive_category.class.php:30
+#: administrator/components/com_menus/content_archive_section/content_archive_section.class.php:29
+#: administrator/components/com_menus/content_blog_category/content_blog_category.class.php:31
+#: administrator/components/com_menus/content_blog_section/content_blog_section.class.php:31
+#: administrator/components/com_menus/content_category/content_category.class.php:31
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:30
+#: administrator/components/com_menus/content_section/content_section.class.php:30
+#: administrator/components/com_menus/content_typed/content_typed.class.php:27
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.class.php:31
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php:30
+#: administrator/components/com_menus/separator/separator.class.php:30
+#: administrator/components/com_menus/url/url.class.php:31
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.class.php:31
+#: administrator/components/com_menus/wrapper/wrapper.class.php:30
+msgid "The module % is currently being edited by another administrator"
+msgstr "โมดูล % กำลังแก้ไขโดยผู้ดูแลท่านอื่นอยู่"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:37
+msgid "You must select a Contact to link to"
+msgstr "คุณจะต้องเลือกการติดต่อที่จะลิงก์"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:50
+msgid "Menu Item :: Link - Contact Item"
+msgstr "รายการเมนู :: การเชื่อมโยง - รายการในบัญชีผู้ติดต่อ"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:74
+msgid "Contact to Link:"
+msgstr "การติดต่อที่จะลิงก์:"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+msgid "Creates a link to a Published Contact Item"
+msgstr "สร้างการเชื่อมโยงหนึ่ง ประกาศรายการในบัญชีผู้ติดต่อ"
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+msgid "Link - Contact Item"
+msgstr "การเชื่อมโยง - รายการในบัญชีผู้ติดต่อ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:68
+msgid "Menu Item :: Blog - Content Category Archive"
+msgstr "รายการเมนู :: บล๊อก - ประเภทเนื้อหาเอกสารสำคัญ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Intro"
+msgstr "จำนวนรายการในส่วนของเนื้อหาแนะนำ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Leading"
+msgstr "จำนวนรายการในส่วนของเนื้อหานำ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Links"
+msgstr "จำนวนรายการลิงก์"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Author Alphabetical"
+msgstr "ผู้เขียนเรียงตามอักษร"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Author Names"
+msgstr "ชื่อผู้เขียน"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Author Reverse-Alphabetical"
+msgstr "ผู้เขียนเรียงตามอักษรย้อนกลับ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Auto"
+msgstr "อัตโนมัติ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Blog - Content Category Archive"
+msgstr "บล๊อก - ประเภทเนื้อหาเอกสารสำคัญ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Columns"
+msgstr "จำนวนคอลัมน์ในส่วนของเนื้อหาแนะนำ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Created Date and Time"
+msgstr "วันที่และเวลาที่สร้างเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Default"
+msgstr "ค่าเริ่มต้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Display {mosimages}."
+msgstr "แสดง {mosimages}."
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Email Icon"
+msgstr "ไอคอนอีเมล"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Item Rating"
+msgstr "อัตราการเข้าชมเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Item Title"
+msgstr "ชื่อเรื่อง"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Least Hits"
+msgstr "มีผู้เข้าชมน้อยที่สุด"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Linked Titles"
+msgstr "ชื่อเนื้อหาเป็นลิงก์"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "MOSImages"
+msgstr "MOSImages"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr "กำหนดให้ส่วนของเนื้อหาเป็นลิงก์ไปยังหน้าของส่วนของเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Make your Item titles linkable"
+msgstr "กำหนดให้หัวข้อเนื้อหาเป็นลิงก์"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Modified Date and Time"
+msgstr "วันที่และเวลาที่แก้ไขเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Most Hits"
+msgstr "มีผู้เข้าชมมากที่สุด"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Most recent first"
+msgstr "ล่าสุดที่มีผู้ชมมาก"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "No"
+msgstr "ไม่"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Number of Items to display as Links."
+msgstr "จำนวนหัวข้อเนื้อหาที่ต้องการให้แสดงรายการแบบลิงก์."
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid ""
+"Number of Items to display as a leading (full width) item. 0 will mean that "
+"no items will be displayed as leading."
+msgstr ""
+"จำนวนของรายการที่ต้องการแสดงในส่วนของเนื้อหานำ (กว้างเต็ม 100%). "
+"หากไม่ต้องการให้มีรายการแสดงในส่วนนี้ให้กำหนดค่านี้เท่ากับศูนย์ 0."
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Number of Items to display with the introduction text shown."
+msgstr "จำนวนรายการในส่วนของเนื้อหาแนะนำ ซึ่งเป็นส่วนที่อยู่ถัดลงมาจากเนื้อหานำ."
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Oldest first"
+msgstr "ให้ความสำคัญแก่เนื้อหาเก่าสุดเป็นอันดับแรก"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Order by"
+msgstr "เรียงลำดับโดย"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "PDF Icon"
+msgstr "ไอคอน PDF"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Pagination"
+msgstr "การใส่เลขหน้า"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Pagination Results"
+msgstr "ผลลัพธ์การใส่เลขหน้า"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Print Icon"
+msgstr "ไอคอนพิมพ์"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Read More"
+msgstr "อ่านต่อ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Section Name"
+msgstr "ชื่อหมวด"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Section Name Linkable"
+msgstr "กำหนดให้ส่วนของเนื้อหาเป็นลิงก์"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide Pagination Results info ( e.g 1-4 of 4 )"
+msgstr "แสดง/ซ่อน ผลลัพธ์การใส่เลขหน้า ( ตัวอย่างเช่น 1-4 จาก 4 )"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide Pagination support"
+msgstr "แสดง/ซ่อน ระบบสนับสนุนการใส่เลขหน้า"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Read More link"
+msgstr "แสดง/ซ่อน ลิงก์อ่านต่อ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr "แสดง/ซ่อน ส่วนของเนื้อหาให้ขึ้นอยู่กับ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr "แสดง/ซ่อน ชื่อผู้แต่ง - มีผลเฉพาะเนื้อหานี้เท่านั้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr "แสดง/ซ่อน วันที่และเวลาที่สร้างเนื้อหา - มีผลเฉพาะเนื้อหานี้เท่านั้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr "แสดง/ซ่อน ปุ่มสำหรับส่งเนื้อหาผ่านทางอีเมล - มีผลเฉพาะเนื้อหานี้เท่านั้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr "แสดง/ซ่อน วันที่และเวลาที่แก้ไขเนื้อหา - มีผลเฉพาะเนื้อหานี้เท่านั้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr "แสดง/ซ่อน ปุ่มสำหรับแปลงเนื้อหาให้เป็นเอกสาร PDF - มีผลเฉพาะเนื้อหานี้เท่านั้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr "แสดง/ซ่อน ปุ่มพิมพ์ - ให้มีผลสำหรับหน้านี้"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr "แสดง/ซ่อน อัตราการเข้าชม - มีผลเฉพาะเนื้อหานี้เท่านั้น"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the items title"
+msgstr "แสดง/ซ่อน หัวข้อเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Shows a listing of Content items archived for a particular category"
+msgstr "แสดงรายการของเนื้อหาเอกสารสำคัญสำหรับแบ่งแยกออกเป็นประเภทอย่างละเอียด"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Text to display at the top of the page"
+msgstr "ข้อความที่ต้องการแสดงในส่วนบนของหน้าเว็บเพจ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "This overrides the ordering of the items."
+msgstr "ผ่านข้ามการเรียงลำดับของรายการในบัญชี."
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Title Alphabetical"
+msgstr "หัวเรื่องเรียงตามอักษร"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Title Reverse-Alphabetical"
+msgstr "หัวเรื่องเรียงตามอักษรย้อนกลับ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "When displaying the intro text, how many columns to use per row"
+msgstr "กำหนดจำนวนคอลัมน์ต่อแถวในส่วนของเนื้อหาแนะนำ"
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Yes"
+msgstr "ใช่"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:39
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:39
+msgid "You must select a Section"
+msgstr "คุณต้องเลือกหมวด"
+
+#. build the html select list for section
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:45
+#: administrator/components/com_menus/content_blog_section/content_blog_section.class.php:62
+msgid "All Sections"
+msgstr "เลือก หมวดหมู่"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:70
+msgid "Menu Item :: Blog - Content Section Archive"
+msgstr "รายการเมนู :: บล๊อก - หมวดเนื้อหาสำคัญ"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:92
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:90
+msgid "If you leave this blank the Section name will be automatically used"
+msgstr "ถ้าคุณเว้นว่างไว้ชื่อหมวดจะถูกใช้แทนโดยอัตโนมัติ"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:98
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:88
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:81
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:96
+msgid "Section:"
+msgstr "หมวด:"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Blog - Content Section Archive"
+msgstr "บล๊อก - หมวดเนื้อหาสำคัญ"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Name"
+msgstr "ชื่อประเภท"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Name Linkable"
+msgstr "กำหนดให้หมวดของเนื้อหาเป็นลิงก์"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Order"
+msgstr "เรียงลำดับตามหมวดของเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr "กำหนดให้หมวดของเนื้อหาเป็นลิงก์ไปยังหน้าของหมวดของเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "No, order by Primary Order only"
+msgstr "เรียงลำดับตามการเรียงลำดับหลักเท่านั้น"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Order items by catgeory"
+msgstr "การเรียงลำดับตามหมวดของเนื้อหา"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Order that the items will be displayed in."
+msgstr "จัดเรียงรายการที่แสดงอยู่."
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Primary Order"
+msgstr "การเรียงลำดับหลัก"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr "แสดง/ซ่อน หมวดของเนื้อหาให้ขึ้นอยู่กับ"
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Shows a listing of Content items archived for a particular section"
+msgstr "แสดงรายการของเนื้อหา ให้ความสำคัญสำหรับประเภทของเนื้อหาอย่างละเอียด"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:64
+msgid "Menu Item :: Blog - Content Category"
+msgstr "รายการเมนู :: บล๊อก - ประเภทเนื้อหา"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:95
+msgid "You can select multiple Categories"
+msgstr "คุณสามารถเลือกหลายประเภท"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid "Blog - Content Category"
+msgstr "บล๊อก - ประเภทเนื้อหา"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Description Image"
+msgstr "คำอธิบายรูปภาพ"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid ""
+"Displays a page of content items from multiple categories in a blog format"
+msgstr "แสดงหน้าของเนื้อหาจากหลาย ๆ ประเภทในรูปแบบบล๊อก"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Item Titles"
+msgstr "หัวข้อเนื้อหา"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Category Description"
+msgstr "แสดง/ซ่อน คำอธิบายของแต่ละประเภท"
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Show/Hide the Page title"
+msgstr "แสดง/ซ่อน หัวข้อของหน้าเว็บเพจ"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:64
+msgid "Menu Item :: Blog - Content Section"
+msgstr "รายการเมนู :: บล๊อก - หมวดเนื้อหา"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:95
+msgid "You can select multiple Sections"
+msgstr "คุณสามารถเลือกหลายหมวด"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Blog - Content Section"
+msgstr "บล๊อก - หมวดเนื้อหา"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid ""
+"Displays a page of content items from multiple sections in a blog format"
+msgstr "แสดงหน้าของเนื้อหาจากหลาย ๆ หมวดในรูปแบบบล๊อก"
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Section Description"
+msgstr "แสดง/ซ่อน หมวดคำอธิบาย"
+
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:68
+msgid "Menu Item :: Table - Content Category"
+msgstr "รายการเมนู :: ตาราง - ประเภทของเนื้อหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "10"
+msgstr "10"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "15"
+msgstr "15"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "20"
+msgstr "20"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "25"
+msgstr "25"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "30"
+msgstr "30"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "5"
+msgstr "5"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "50"
+msgstr "50"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Author"
+msgstr "ผู้เขียน"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Author Column"
+msgstr "คอลัมน์ผู้แต่ง"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Date Column"
+msgstr "คอลัมน์วันที่"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Date Format"
+msgstr "รูปแบบวันที่"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Display Number"
+msgstr "การแสดงตัวเลข"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Display Select"
+msgstr "การแสดงการเลือก"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Empty Categories"
+msgstr "ประเภทเนื้อหาว่างเปล่า"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Filter"
+msgstr "ค้นหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Filter Field"
+msgstr "ขอบเขตการค้นหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "His"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Hits Column"
+msgstr "คอลัมน์นิยม"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Navigation Bar"
+msgstr "แถบนำทางไปยังที่ต่าง ๆ"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Number of items to be displayed by default"
+msgstr "ตัวเลขในรายการจะแสดงเป็นค่าเริ่มต้น"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Order Select"
+msgstr "ลำดับการเลือก"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide empty(no items) categories"
+msgstr "แสดง/ซ่อน ว่างเปล่า(ไม่มีรายการ) ประเภทของเนื้อหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Author column"
+msgstr "แสดง/ซ่อน คอลัมน์ผู้แต่ง"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid ""
+"Show/Hide the Category Description, it will appear below the Category Name"
+msgstr "แสดง/ซ่อน คำอธิบายประเภทของเนื้อหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Date column"
+msgstr "แสดง/ซ่อน คอลัมน์วันที่"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Display Select dropdown"
+msgstr "แสดง/ซ่อน การแสดงการเลือกด้านล่าง"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Filter ability"
+msgstr "แสดง/ซ่อน ความสามารถของการค้นหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Show/Hide the Hits column"
+msgstr "แสดง/ซ่อน จำนวนครั้งที่กดของคอลัมน์"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Navigation bar"
+msgstr "แสดง/ซ่อน แถบนำทางไปยังที่ต่าง ๆ"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Order Select dropdown"
+msgstr "แสดง/ซ่อน ลำดับการเลือกดรอบดาวน์"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Show/Hide the listing of other Categories"
+msgstr "แสดง/ซ่อน รายการของเนื้อหาประเภทอื่น"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Shows a Table view of Content items for a particular Category"
+msgstr "แสดงมุมมองตารางของเนื้อหาสำหรับแบ่งแยกออกเป็นประเภทอย่างละเอียด"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Table - Content Category"
+msgstr "ตาราง - ประเภทของเนื้อหา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid ""
+"The format of the date displayed, using PHPs strftime Command Format - if "
+"left blank it will load the format from your language file"
+msgstr ""
+"รูปแบบวันที่ที่แสดง, ใช้ PHP ใช้ PHPs สตริงค์ของเวลาที่มีรูปแบบน่าเชื่อถือ - "
+"ถ้าด้านซ้ายของมันว่างจะโหลดรูปแบบจากไฟล์ภาษา"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Title"
+msgstr "ชื่อเรื่อง"
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Which field shall the filter apply to"
+msgstr "ซึ่งเป็นขอบเขตของการค้นหาให้ได้ประโยชน์"
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:66
+msgid "Edit Content Item"
+msgstr "แก้ไขรายการเนื้อหา"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:43
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:44
+msgid "You must select a Content to link to"
+msgstr "คุณจะต้องเลือกเนื้อหาที่จะลิงก์"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:56
+msgid "Menu Item :: Link - Content Item"
+msgstr "รายการเมนู :: การเชื่อมโยง - เนื้อหาในรายการ"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:80
+msgid "Content to Link:"
+msgstr "ข้อความที่จะลิงก์:"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+msgid "Creates a link to a published Content Item in full view"
+msgstr "สร้างการเชื่อมโยง ประกาศเนื้อหาในรายการในมุมมองเต็ม"
+
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+msgid "Link - Content Item"
+msgstr "การเชื่อมโยง - เนื้อหาในรายการ"
+
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:68
+msgid "Menu Item :: Table - Content Section"
+msgstr "รายการเมนู :: ตาราง - หมวดเนื้อหา"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Creates a listing of Content categories for a particular section"
+msgstr "สร้างรายการประเภทของเนื้อหาสำหรับหมวดอย่างละเอียด"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Hits"
+msgstr "ผู้ชม"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Section Title"
+msgstr "หมวดของชื่อเรื่อง"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Category Description Image"
+msgstr "แสดง/ซ่อน คำอธิบายรูปภาพแต่ละประเภท"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/hide the section title"
+msgstr "แสดง/ซ่อน หมวดของชื่อเรื่อง"
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Table - Content Section"
+msgstr "ตาราง - หมวดเนื้อหา"
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:57
+msgid "Menu Item :: Link - Static Content"
+msgstr "รายการเมนู :: การเชื่อมโยง -  เนื้อหาสเตติก"
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:81
+msgid "Static Content:"
+msgstr "เนื้อหาสเตติก:"
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:95
+msgid "On Click, open:"
+msgstr "เมื่อคลิกแล้วเปิดใน:"
+
+#: administrator/components/com_menus/content_typed/content_typed.xml
+msgid "Creates a link to Static Content Item"
+msgstr "สร้างรายการเชื่อมโยงถึงการใช้ร่วมกันของรายการในบัญชี"
+
+#: administrator/components/com_menus/content_typed/content_typed.xml
+msgid "Link - Static Content"
+msgstr "การเชื่อมโยง -  เนื้อหาสเตติก"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+msgid "Menu Item :: Table - News Feed Category"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in /images"
+msgstr "รูปขนาดเล็กจะถูกวางด้านซ้ายหรือขวาของเมนูแต่ละอัน, รูปภาพมักจะอยู่ใน /images"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Articles Column"
+msgstr "คอลัมน์เนื้อหา"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Articles column"
+msgstr "แสดง/ซ่อน คอลัมน์เนื้อหา"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Link column"
+msgstr "แสดง/ซ่อน ลิงก์คอลัมน์"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Name column"
+msgstr "แสดง/ซ่อน ชื่อคอลัมน์"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Shows a Table view of News Feed items for a particular Category"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Table - News Feed Category"
+msgstr ""
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php:60
+msgid "Item:"
+msgstr "รายการ:"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:37
+msgid "You must select a News Feed to link to"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+msgid "Menu Item :: Link - News Feed"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:74
+msgid "News Feed to Link:"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Creates a link to an individual Published Newsfeed"
+msgstr "สร้างการเชื่อมโยงถึงแต่ละอันเพื่อเผยแพร่ Newsfeed"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Link - Newsfeed"
+msgstr "การเชื่อมโยง - Newsfeed"
+
+#: administrator/components/com_menus/separator/separator.menu.html.php:44
+msgid "Menu Item :: Separator / Placeholder"
+msgstr "รายการเมนู :: เส้นขั้น / ตำแหน่งว่าง"
+
+#: administrator/components/com_menus/separator/separator.menu.html.php:60
+msgid "Pattern/Name:"
+msgstr "รูปแบบ/ชื่อ:"
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Creates a menu placeholder or separator"
+msgstr ""
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Separator / Placeholder"
+msgstr "เส้นขั้น / ตำแหน่งว่าง"
+
+#: administrator/components/com_menus/toolbar.menus.html.php:22
+msgid "Next"
+msgstr "ต่อไป"
+
+#: administrator/components/com_menus/toolbar.menus.html.php:35
+#: administrator/components/com_menus/toolbar.menus.html.php:100
+msgid "Move"
+msgstr "ย้าย"
+
+#: administrator/components/com_menus/toolbar.menus.html.php:72
+msgid "Back"
+msgstr "ก่อนหน้า"
+
+#: administrator/components/com_menus/url/url.menu.html.php:40
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:41
+msgid "You must provide a url."
+msgstr "คุณต้องให้ url."
+
+#: administrator/components/com_menus/url/url.menu.html.php:51
+msgid "Menu Item :: Link - URL"
+msgstr "รายการเมนู :: การเชื่อมโยง - Url"
+
+#: administrator/components/com_menus/url/url.menu.html.php:75
+msgid "Link:"
+msgstr "ลิงก์:"
+
+#: administrator/components/com_menus/url/url.xml
+msgid "Creates url link"
+msgstr "สร้าง url การเชื่อมโยง"
+
+#: administrator/components/com_menus/url/url.xml
+msgid "Link - Url"
+msgstr "การเชื่อมโยง - Url"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Web Link Category"
+msgstr ""
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Link Descriptions"
+msgstr "คำอธิบายของการเชื่อมโยง"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr "แสดง/ซ่อน คำอธิบายข้อความของการเชื่อมโยง"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Shows a Table view of Weblink items for a particular Weblink Category"
+msgstr "แสดงมุมมองตารางของการเชื่อมโยงประเภทเว็บในรายการสำหรับประเภทการเชื่อมโยงเว็บอย่างละเอียด"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Table - Weblink Category"
+msgstr "ตาราง - การเชื่อมโยงประเภทเว็บ"
+
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:59
+msgid "Menu Item :: Wrapper"
+msgstr "รายการเมนู :: แร็บเปอร์"
+
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:83
+msgid "Wrapper Link:"
+msgstr "ลิงก์แร็บเปอร์:"
+
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Creates an IFrame that will wrap an external page/site into Mambo"
+msgstr "สร้างแบบ  IFrame จะแสดงหน้าเว็บจากภายนอกไว้ในเว็บไซต์แมมโบ้"
+
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Wrapper"
+msgstr "แร็บเปอร์"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:42
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "Menu Manager"
+msgstr "การจัดการเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:53
+msgid "Menu Name"
+msgstr "ชื่อเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:56
+msgid "Menu Items"
+msgstr "รายการเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:59
+msgid "# Published"
+msgstr "# เผยแพร่"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:62
+msgid "# Unpublished"
+msgstr "# ไม่เผยแพร่"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:65
+msgid "# Trash"
+msgstr "# ถังขยะ"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:68
+msgid "# Modules"
+msgstr "# โมดูล"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:94
+msgid "Edit Menu Name"
+msgstr "แก้ไขชื่อเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:99
+msgid "Edit Menu Items"
+msgstr "แก้ไขรายการเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:156
+msgid "Please enter a menu name"
+msgstr "โปรดใส่ชื่อเมนูที่ต้องการ"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:164
+msgid "Please enter a module name for your menu"
+msgstr "โปรดใส่ชื่อโมดูลที่ต้องการ"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:182
+msgid "Menu Details"
+msgstr "รายละเอียดของเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:190
+msgid "Menu Name:"
+msgstr "ชื่อเมนู:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:195
+msgid ""
+"This is the identification name used by mambo to identify this menu within "
+"the code - it must be unique. It is recommended that you do not have any "
+"spaces in your Menu Name"
+msgstr "นี่เป็นการพิสูจน์ชื่อที่ใช้โดยแมมโบ ดังนั้นชื่อไม่ควรมีช่องว่าง และไม่ซ้ำกับชื่ออื่น"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:210
+msgid "Title of the mod_mainmenu module required to show this Menu"
+msgstr "ชื่อของโมดูล mod_mainmenu ต้องการแสดงในเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:216
+msgid ""
+"A new mod_mainmenu module, with the Title you have entered above will "
+"automatically be created when you save this menu."
+msgstr ""
+"โมดูล mod_mainmenu ใหม่, ที่อยู่ในชื่อโมดูลที่คุณกรอกไว้จะถูกบันทึกโดยอัตโนมัติเมื่อคุณบันทึกเมนู."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:218
+msgid ""
+"Parameters for the module created are to be edited through the \"Modules "
+"Manager [site]\": Modules -> Site Modules"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:266
+#, php-format
+msgid "Delete Menu: %s"
+msgstr "ลบเมนู: %s"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:279
+msgid "Module(s) being Deleted:"
+msgstr "โมดูลถูกลบ:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:301
+msgid "Menu Items being Deleted:"
+msgstr "รายการเมนูถูกลบ:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:321
+msgid ""
+"This will <span style=\"font-weight:bold;color:#FF0000\">Delete</span> this "
+"Menu, <br />ALL its Menu Items and the Module(s) associated with it"
+msgstr ""
+"นี่จะเป็นการ <span style=\"font-weight:bold;color:#FF0000\">ลบ</span> เมนูนี้, "
+"<br />โปรดระวัง เมนูนี้อาจเชื่อมโยงกับเมนูอื่นอยู่"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:324
+msgid ""
+"Are you sure you want to Delete this menu? \\nThis will Delete the Menu, its "
+"Items and the Module(s)."
+msgstr "คุณต้องการที่จะลบเมนูนี้หรือไม่? \\nระบบจะลบรายการเมนู และโมดูลของเมนูนี้ทั้งหมด."
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:325
+#: administrator/components/com_menumanager/admin.menumanager.html.php:326
+#: administrator/components/com_menumanager/toolbar.menumanager.html.php:28
+msgid "Delete"
+msgstr "ลบ"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:356
+msgid "Please enter a name for the copy of the Menu"
+msgstr "โปรดใส่ชื่อสำเนาของเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:359
+msgid "Please enter a name for the new Module"
+msgstr "โปรดใส่ชื่อโมดูลใหม่"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:373
+msgid "Copy Menu"
+msgstr "คัดลอกเมนู"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:383
+msgid "New Menu Name:"
+msgstr "ชื่อเมนูใหม่:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:387
+msgid "New Module Name:"
+msgstr "ชื่อโมดูลใหม่:"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:394
+msgid "Menu being copied:"
+msgstr "กำลังคัดลอกเมนู:"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:209
+msgid ""
+"You cannot rename the \"mainmenu\" Menu as this will disrupt the proper "
+"operation of Mambo"
+msgstr "คุณไม่สามารถเปลี่ยนชื่อ \"เมนูหลัก\" เนื่องจากจะทำให้ Mambo ทำงานผิดพลาด"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:225
+msgid ""
+"A menu already exists with that name - you must enter a unique Menu Name"
+msgstr "ชื่อเมนูนี้มีอยู่ในระบบแล้ว - กรุณาตั้งชื่อที่ไม่ซ้ำกับชื่อเมนูที่มีอยู่"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:260
+#, php-format
+msgid "New Menu created [ %s ]"
+msgstr "สร้างเมนูใหม่ [ %s ]"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:314
+msgid "Menu Items & Modules updated"
+msgstr "รายการเมนูและโมดูลถูกปรับปรุง"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:328
+#: administrator/components/com_menumanager/admin.menumanager.php:378
+msgid "You cannot delete the \"mainmenu\" menu as it is a core menu"
+msgstr "คุณไม่สามารถลบ \"เมนูหลัก\" เนื่องจากเป็นเมนูหลักของแมมโบ้"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:469
+msgid ""
+"A menu with that name already exists - you must enter a unique Menu Name"
+msgstr "ชื่อเมนูนี้มีอยู่ในระบบแล้ว - กรุณาตั้งชื่อที่ไม่ซ้ำกับชื่อเมนูที่มีอยู่"
+
+#: administrator/components/com_menumanager/admin.menumanager.php:527
+#, php-format
+msgid "Copy of Menu `%s` created, consisting of %d item"
+msgid_plural "Copy of Menu `%s` created, consisting of %d items"
+msgstr[0] "คัดลอกเมนู `%s` สร้าง, ประกอบกับ %d"
+msgstr[1] "คัดลอกเมนู `%s` สร้าง, ประกอบกับ %d"
+
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "This component manages your Menus."
+msgstr "คอมโพเน้นท์นี้ใช้จัดการเมนูของคุณ."
+
+#: administrator/components/com_menumanager/toolbar.menumanager.html.php:48
+msgid "Save"
+msgstr "บันทึก"
+
+#: administrator/components/com_media/admin.media.html.php:86
+#: administrator/components/com_media/media.xml
+msgid "Media Manager"
+msgstr "การจัดการไฟล์มีเดีย"
+
+#: administrator/components/com_media/admin.media.html.php:93
+msgid "Directory"
+msgstr "ไดเรกทอรี่่"
+
+#: administrator/components/com_media/admin.media.html.php:114
+#: administrator/components/com_media/toolbar.media.html.php:27
+msgid "Upload"
+msgstr "อัพโหลด"
+
+#: administrator/components/com_media/admin.media.html.php:117
+msgid "Max size"
+msgstr "ขนาดสูงสุด"
+
+#: administrator/components/com_media/admin.media.html.php:121
+#: administrator/components/com_media/admin.media.html.php:214
+#: administrator/components/com_media/admin.media.html.php:283
+msgid "Code"
+msgstr "โคด"
+
+#: administrator/components/com_media/admin.media.html.php:125
+msgid "Create Directory"
+msgstr "สร้างไดเรกทอรี่่"
+
+#: administrator/components/com_media/admin.media.html.php:165
+msgid "No Images Found"
+msgstr "ไม่พบรูป"
+
+#: administrator/components/com_media/admin.media.html.php:176
+#, php-format
+msgid "Configuration Problem: &quot; %s &quot; does not exist."
+msgstr "ปัญหาการตั้งค่า: &quot; %s &quot; ไม่มีอยู่."
+
+#: administrator/components/com_media/admin.media.html.php:272
+msgid "Insert your text here"
+msgstr "ใส่ข้อความที่นี่"
+
+#: administrator/components/com_media/admin.media.html.php:371
+msgid "\"Delete file \\\"\"+file+\"\\\"?\""
+msgstr "\"ลบไฟล์ \\\"\"+file+\"\\\"?\""
+
+#: administrator/components/com_media/admin.media.html.php:379
+msgid ""
+"\"There are \"+numFiles+\" files/folders in \\\"\"+folder+\"\\\".\\n"
+"\\nPlease delete all files/folder in \\\"\"+folder+\"\\\" first.\""
+msgstr ""
+"\"มี \"+numFiles+\" ไฟล์/โฟลเดอร์ใน \\\"\"+folder+\"\\\".\\n\\nโปรดลบทุกไฟล์/"
+"โฟลเดอร์ใน \\\"\"+folder+\"\\\" ก่อน.\""
+
+#: administrator/components/com_media/admin.media.html.php:383
+msgid "\"Delete folder \\\"\"+folder+\"\\\"?\""
+msgstr "\"ลบโฟลเดอร์ \\\"\"+folder+\"\\\"?\""
+
+#: administrator/components/com_media/admin.media.php:37
+msgid "NO HACKING PLEASE"
+msgstr "กรุณาอย่าแฮก"
+
+#: administrator/components/com_media/admin.media.php:49
+msgid ""
+"Directory creation not allowed while running in SAFE MODE as this can cause "
+"problems."
+msgstr "การสร้างไดเรกทอรี่่ไม่สามารถทำได้ขณะที่อยู่ในเซพโหมด เนื่องจากจะก่อให้เกิดปัญหาได้."
+
+#: administrator/components/com_media/admin.media.php:93
+msgid ""
+"Directory name must only contain alphanumeric characters and no spaces "
+"please."
+msgstr "ชื่อไดเรกทอรี่ต้องใช้ตัวอักษรตัวเลข และห้ามมีช่องว่าง."
+
+#: administrator/components/com_media/admin.media.php:129
+msgid "Unable to delete: not empty!"
+msgstr "ไม่สามารถลบ: ไม่ว่าง!"
+
+#: administrator/components/com_media/admin.media.php:161
+msgid "Upload FAILED. File already exists"
+msgstr "การอัพโหลดล้มเหลว. มีไฟล์อยู่แล้ว"
+
+#: administrator/components/com_media/admin.media.php:165
+msgid ""
+"Only files of type gif, png, jpg, bmp, pdf, swf, doc, xls or ppt can be "
+"uploaded"
+msgstr "เฉพาะไฟล์ gif, png, jpg, bmp, pdf, swf, doc, xls หรือ ppt จึงจะอัพโหลดได้"
+
+#: administrator/components/com_media/admin.media.php:169
+msgid "Upload FAILED"
+msgstr "การอัพโหลดล้มเหลว"
+
+#: administrator/components/com_media/admin.media.php:173
+msgid "Upload complete"
+msgstr "อัพโหลเรียบร้อย"
+
+#: administrator/components/com_media/media.xml
+msgid "This component manages site media"
+msgstr "คอมโพเน้นท์นี้ใช้จัดการไฟล์มีเดีย"
+
+#: administrator/components/com_media/toolbar.media.html.php:29
+msgid "Create"
+msgstr "สร้าง"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:32
+msgid "Please fill in the subject"
+msgstr "โปรดใส่หัวข้อ"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:34
+msgid "Please select a group"
+msgstr "โปรดเลือกกลุ่ม"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:36
+msgid "Please fill in the message"
+msgstr "โปรดใส่ข้อความ"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:47
+#: administrator/components/com_massmail/massmail.xml
+msgid "Mass Mail"
+msgstr "เมลกลุ่ม"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:60
+msgid "Group:"
+msgstr "กลุ่ม:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:68
+msgid "Mail to Child Groups:"
+msgstr "ส่งเมลไปยังกลุ่มย่อยด้วย:"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:76
+msgid "Send in HTML mode:"
+msgstr "ส่งในรูปแบบ HTML:"
+
+#: administrator/components/com_massmail/admin.massmail.php:41
+msgid "- All User Groups -"
+msgstr "- ผู้ใช้ทุกกลุ่ม -"
+
+#: administrator/components/com_massmail/admin.massmail.php:71
+msgid "Please fill in the form correctly"
+msgstr "โปรดกรอกฟอร์มให้ถูกต้อง"
+
+#. Build e-mail message format
+#: administrator/components/com_massmail/admin.massmail.php:94
+#, php-format
+msgid ""
+"This is an email from '%s'\n"
+"\n"
+"Message:\n"
+msgstr ""
+"ได้รับอีเมลจาก '%s'\n"
+"\n"
+"ข้อความ:\n"
+
+#: administrator/components/com_massmail/admin.massmail.php:105
+#, php-format
+msgid "E-mail sent to %d user."
+msgid_plural "E-mail sent to %d users."
+msgstr[0] "ส่งเมลไป %d สมาชิก."
+msgstr[1] "ส่งเมลไป %d สมาชิก."
+
+#: administrator/components/com_massmail/massmail.xml
+msgid "This component allows you to send a mass email to certain user groups"
+msgstr "คอมโพเน้นท์นี้ยอมให้คุณส่งอีเมลถึงกลุ่มผู้ใช้จำนวนหนึ่ง"
+
+#: administrator/components/com_massmail/toolbar.massmail.html.php:22
+msgid "Send Mail"
+msgstr "ส่งเมล"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:32
+msgid "Mambot Manager"
+msgstr "การจัดการแมมบอท"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:53
+msgid "Mambot Name"
+msgstr "ชื่อแมมบอท"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:74
+msgid "File"
+msgstr "ไฟล์"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:177
+msgid "Mambot must have a name"
+msgstr "แมมบอทจะต้องมีชื่อ"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:179
+msgid "Mambot must have a filename"
+msgstr "แมมบอทจะต้องมีชื่อไฟล์"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:188
+msgid "Site Mambot:"
+msgstr "แมมบอทเว็บ:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:204
+msgid "Mambot Details"
+msgstr "รายละเอียดแมมบอท"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:217
+msgid "Folder:"
+msgstr "โฟลเดอร์:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:225
+msgid "Mambot file:"
+msgstr "ไฟล์แมมบอท:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:233
+msgid "Mambot Order:"
+msgstr "ลำดับแมมบอท:"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:283
+msgid "No Parameters"
+msgstr "ไม่มี การส่งค่าพารามิเตอร์"
+
+#: administrator/components/com_mambots/admin.mambots.php:186
+#, php-format
+msgid "Successfully Saved changes to Mambot: %s"
+msgstr "บันทึกการเปลี่ยนแปลงของแมมบอทเรียบร้อย: %s"
+
+#: administrator/components/com_mambots/admin.mambots.php:191
+#, php-format
+msgid "Successfully Saved Mambot: %s"
+msgstr "การบันทึกแมมบอทเรียบร้อย: %s"
+
+#: administrator/components/com_mambots/admin.mambots.php:249
+msgid "This mambot cannot be reordered"
+msgstr "แมมบอทนี้ไม่สามารถจัดลำดับอีกครั้ง"
+
+#: administrator/components/com_mambots/admin.mambots.php:271
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr "ค่าเริ่มต้นของรายการใหม่อยู่ลำดับสุดท้าย. ลำดับสามารถแก้ไขได้ภายหลังจากบันทึกแล้ว."
+
+#: administrator/components/com_mambots/admin.mambots.php:309
+#, php-format
+msgid "Select a mambot to %s"
+msgstr "เลือกแมมบอทเพื่อ %s"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Login Image"
+msgstr "การจัดเรียงตำแหน่งรูปภาพหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Logout Image"
+msgstr "การจัดเรียงตำแหน่งรูปภาพหน้าออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Contact Items"
+msgstr "รายการข้อมูลการติดต่อ"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Login Page"
+msgstr "รูปภาพหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Logout Page"
+msgstr "รูปภาพหน้าออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description"
+msgstr "รายละเอียดหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description Text"
+msgstr "ข้อความแสดงรายละเอียดหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image"
+msgstr "รูปภาพหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image Align"
+msgstr "ตำแหน่งรูปภาพหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login JS Message"
+msgstr "ข้อความ JS เข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Page Title"
+msgstr "หัวข้อหน้าเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Login Redirection URL"
+msgstr "URLของเพจที่ต้องการเมื่อผ่านการเข้าสู่ระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description"
+msgstr "รายละเอียดการออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description Text"
+msgstr "ข้อความแสดงรายละเอียดการออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image"
+msgstr "รูปภาพหน้าออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image Align"
+msgstr "ตำแหน่งรูปภาพหน้าออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout JS Message"
+msgstr "ข้อความ JS ออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Page Title"
+msgstr "หัวข้อหน้าออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Redirection URL"
+msgstr "URLของเพจที่ต้องการเมื่อผ่านการออกจากระบบ"
+
+#: administrator/components/com_login/login.xml
+msgid "Parameters for individual Contact Items"
+msgstr "พารามิเตอร์สำหรับรายการการติดต่อ"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Login Description below"
+msgstr "แสดง/ซ่อน รายละเอียดหน้าเข้าสู่ระบบด้านล่างนี้"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Logout Description below"
+msgstr "แสดง/ซ่อน รายละเอียดการออกจากระบบด้านล่างนี้"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr "แสดง/ซ่อน พ็อพอัพjavascript ที่แสดงว่าเข้าสู่ระบบสำเร็จ"
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr "แสดง/ซ่อน พ็อพอัพjavascript ที่แสดงว่าออกจากระบบสำเร็จ"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the login Page, if left blank _LOGIN_DESCRIPTION will be "
+"used"
+msgstr ""
+"ข้อความที่ต้องการแสดงในหน้าเข้าสู่ระบบหากไม่ระบุระบบจะโหลดข้อมูลมาจาก _LOGIN_DESCRIPTION"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the logout Page, if left blank _LOGOUT_DESCRIPTION will "
+"be used"
+msgstr ""
+"ข้อความที่ต้องการแสดงในหน้าออกจากระบบ หากไม่ระบุระบบจะโหลดข้อมูลมาจาก "
+"_LOGOUT_DESCRIPTION"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will be redirected to after logout, if let blank will load front "
+"page"
+msgstr ""
+"กำหนดหน้าเพจที่ต้องการหลังจากออกจากระบบ หากไม่ระบุระบบจะเชื่อมกลับไปยังเว็บเพจหน้าแรก"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+"กำหนดหน้าเพจที่ต้องการหลังจากเข้าสู่ระบบเข้าสู่ระบบ, "
+"หากไม่ระบุระบบจะเชื่อมกลับไปยังเว็บเพจหน้าแรก"
+
+#: components/com_login/login.html.php:56
+msgid "Username"
+msgstr "ชื่อสมาชิก"
+
+#: components/com_login/login.html.php:60
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: components/com_login/login.html.php:75
+msgid "Remember me"
+msgstr "จำข้อมูลการล็อกอิน"
+
+#: components/com_login/login.html.php:79
+msgid "Password Reminder"
+msgstr "ลืมรหัสผ่าน?"
+
+#: components/com_login/login.html.php:85
+msgid "No account yet?"
+msgstr "ยังไม่ได้ลงทะเบียน?"
+
+#: components/com_login/login.html.php:87
+msgid "Create one"
+msgstr "ลงทะเบียนใหม่"
+
+#: components/com_login/login.html.php:99
+msgid "Login"
+msgstr "เข้าสู่ระบบ"
+
+#: components/com_login/login.html.php:107
+msgid "!Warning! Javascript must be enabled for proper operation."
+msgstr "!คำเตือน! จาวาสคริป ไม่ได้เปิดใช้งาน."
+
+#: components/com_login/login.html.php:160
+msgid "Logout"
+msgstr "ออกจากระบบ"
+
+#: components/com_login/login.php:40
+msgid "To access the Private areas of this site please Login"
+msgstr "ส่วนนี้สำหรับสมาชิกเท่านั้น"
+
+#: components/com_login/login.php:41
+msgid "You are now Logged in to a private area of this site"
+msgstr "คุณต้องการที่จะออกจากระบบแล้ว!"
+
+#: administrator/components/com_languages/actions/default.action.php:25
+msgid "Default Language succesfully updated!"
+msgstr ""
+
+#: administrator/components/com_languages/actions/default.action.php:27
+#: administrator/components/com_languages/actions/publish.action.php:40
+msgid "Error! Make sure that configuration.php is writeable."
+msgstr "ผิดพลาด! แน่ใจแล้วหรือยังว่า configuration.php สามารถเขียนได้"
+
+#: administrator/components/com_languages/actions/publish.action.php:38
+msgid "Configuration succesfully updated!"
+msgstr "การตั้งค่าได้ถูกปรับปรุงแล้ว!"
+
+#: administrator/components/com_languages/toolbar.languages.php:42
+#: administrator/components/com_languages/toolbar.languages.php:67
+msgid "Translate Strings"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:45
+msgid "Auto Translate"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:69
+msgid "Export"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:94
+msgid "Extract Strings"
+msgstr "แยกสตริง"
+
+#.
+#: administrator/components/com_languages/toolbar.languages.php:96
+msgid "Update"
+msgstr "แก้ไข"
+
+#: administrator/components/com_languages/views/edit.view.php:28
+#: administrator/components/com_languages/views/edit.view.php:43
+#: administrator/components/com_languages/views/templates/langform.tpl.php:106
+#: administrator/components/com_languages/views/templates/langform.tpl.php:153
+#: administrator/components/com_languages/views/templates/languages.tpl.php:21
+msgid "Language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:28
+msgid "New language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:43
+msgid "Edit language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:72
+#, php-format
+msgid "Translate Catalog: %s [%s]"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:21
+msgid "Language File"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:22
+msgid "% Translated"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:23
+msgid "Total Strings"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:24
+msgid "Translated Strings"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:25
+msgid "Fuzzy"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:11
+msgid "You must provide a Language Name."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:13
+msgid "You must provide a Language Identifier."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:15
+msgid "You must provide a locale."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:17
+msgid "You must provide a character encoding."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:19
+msgid "You must provide a date format."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:33
+msgid "New Language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:43
+msgid "Language Identifier"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:46
+msgid ""
+"The identifier for this language. This is used for naming the language xml "
+"file and translations directory."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:50
+msgid "Language Name"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:53
+msgid "The official name for this language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:57
+msgid "Locale"
+msgstr "ภาษา"
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:60
+msgid ""
+"The locale list for this language. \\nLocale names must be comma separated."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:64
+msgid "Encoding"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:67
+msgid "The character encoding for this language. Ex. utf-8"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:71
+msgid "Direction"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:74
+msgid "Left-to-Right"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:75
+msgid "Right-to-Left"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:77
+msgid "Text direction."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:84
+#: administrator/components/com_languages/views/templates/langform.tpl.php:233
+msgid "Date format for strftime()."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:88
+msgid "Plural forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:91
+msgid "Plural forms for gettext."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:18
+msgid "Messages"
+msgstr "ข้อความ"
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:23
+msgid "Verified"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:26
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:114
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:121
+msgid "Original"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:29
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:116
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:125
+msgid "Translation"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:32
+msgid "Ref"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:55
+msgid "Translation OK"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:55
+msgid "Verify Translation"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:86
+msgid "Headers"
+msgstr "หัวข้อ"
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:100
+msgid "Comments"
+msgstr "ข้อความ"
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:122
+msgid "Singular"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:123
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:132
+msgid "Plural"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/form.tpl.php:39
+msgid "Mambo Language Editor"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/form.tpl.php:44
+msgid "Select Language"
+msgstr ""
+
+#.
+#: administrator/components/com_languages/views/templates/form.tpl.php:54
+msgid "No content to display."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:10
+msgid "You must choose a language."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:12
+msgid "You must choose a character set."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:33
+#: administrator/components/com_languages/views/templates/langform.tpl.php:109
+msgid "choose language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:40
+#: administrator/components/com_languages/views/templates/langform.tpl.php:120
+msgid "choose territory"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:41
+msgid "choose character set"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:117
+#: administrator/components/com_languages/views/templates/langform.tpl.php:161
+msgid "Territory"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:125
+#: administrator/components/com_languages/views/templates/langform.tpl.php:169
+#: administrator/components/com_languages/views/templates/languages.tpl.php:24
+msgid "Character Set"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:128
+msgid "choose charset"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:175
+msgid "Convert to"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:199
+#: administrator/components/com_languages/views/templates/table.tpl.php:32
+msgid "Author Email"
+msgstr "อีเมลผู้สร้าง"
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:205
+msgid "Author Url"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:211
+msgid "Text Direction"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:214
+msgid "left to right"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:215
+msgid "right to left"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:220
+msgid "Plural Forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:237
+msgid "Locales"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:240
+msgid ""
+"The locale list for setlocale(). \\nLocale names must be comma separated."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:244
+msgid "Days"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:258
+msgid "Months"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:6
+msgid "You cannot delete English."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:22
+msgid "Country - Region"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:25
+#: administrator/components/com_languages/views/templates/table.tpl.php:23
+msgid "Version"
+msgstr "เวอร์ชัน"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:4
+msgid "Language Manager"
+msgstr "การจัดการภาษา"
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:17
+msgid "Languages"
+msgstr "ภาษา"
+
+#: administrator/components/com_installer/admin.installer.html.php:20
+msgid "Unwriteable"
+msgstr "ไม่สามารถเขียนทับได้"
+
+#: administrator/components/com_installer/admin.installer.html.php:20
+msgid "Writeable"
+msgstr "สามารถเขียนทับได้"
+
+#: administrator/components/com_installer/admin.installer.html.php:37
+#: administrator/components/com_installer/admin.installer.php:154
+msgid "Please select a directory"
+msgstr "โปรดเลือกไดเรกทอรี่่"
+
+#: administrator/components/com_installer/admin.installer.html.php:58
+msgid "Upload Package File"
+msgstr "อัพโหลดแพคเกจไฟล์"
+
+#: administrator/components/com_installer/admin.installer.html.php:63
+msgid "Package File:"
+msgstr "แพคเกจไฟล์:"
+
+#: administrator/components/com_installer/admin.installer.html.php:65
+msgid "Upload File &amp; Install"
+msgstr "อัพโหลดไฟล์ &amp; ติดตั้ง"
+
+#: administrator/components/com_installer/admin.installer.html.php:85
+msgid "Install from directory"
+msgstr "ติดตั้งจากไดเรกทอรี่"
+
+#: administrator/components/com_installer/admin.installer.html.php:90
+msgid "Install directory:"
+msgstr "ติดตั้งไดเรกทอรี่่:"
+
+#: administrator/components/com_installer/admin.installer.html.php:92
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#: administrator/components/com_installer/admin.installer.html.php:112
+msgid "Install from HTTP URL"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:117
+msgid "Install HTTP URL:"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:119
+msgid "Upload URL &amp; Install"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:136
+msgid "Sorry, it seems that The Source is not available"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:190
+msgid "Continue ..."
+msgstr "ทำต่อ ..."
+
+#. *
+#. * @package Mambo Open Source
+#. * @subpackage Installer
+#. * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+#. * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+#. *
+#. * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+#. * that Mambo remained free Open Source software owned and managed by the community.
+#. * Mambo is Free Software
+#.
+#. * ensure this file is being included by a parent file
+#: administrator/components/com_installer/admin.installer.php:14
+msgid "Direct Access to this location is not allowed."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:67
+msgid "There was nothing selected to be uninstalled"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:69
+#, php-format
+msgid "Uninstaller not found for element [%s]"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:78
+#, php-format
+msgid "Installer not found for element [%s]"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:84
+#, php-format
+msgid "Installer not available for element [%s]"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:109
+msgid ""
+"The installer can't continue before file uploads are enabled. Please use the "
+"install from directory method."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:110
+#: administrator/components/com_installer/admin.installer.php:117
+#: administrator/components/com_installer/admin.installer.php:180
+#: administrator/components/com_installer/admin.installer.php:187
+msgid "Installer - Error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:116
+#: administrator/components/com_installer/admin.installer.php:173
+msgid "The installer can't continue before zlib is installed"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:124
+msgid "No file selected"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:125
+msgid "Upload new module - error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:135
+#, php-format
+msgid "Upload %s - Upload Failed"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:140
+#: administrator/components/com_installer/admin.installer.php:193
+#: administrator/components/com_installer/admin.installer.php:198
+msgid "Failed"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:140
+#: administrator/components/com_installer/admin.installer.php:163
+#: administrator/components/com_installer/admin.installer.php:198
+#: administrator/components/com_installer/admin.installer.php:297
+#: administrator/components/com_installer/admin.installer.php:310
+#: administrator/components/com_installer/admin.installer.php:344
+#: administrator/components/com_installer/admin.installer.php:387
+#: administrator/components/com_installer/admin.installer.php:413
+#: administrator/components/com_installer/admin.installer.php:432
+msgid "Success"
+msgstr "สำเร็จ"
+
+#: administrator/components/com_installer/admin.installer.php:140
+#: administrator/components/com_installer/admin.installer.php:193
+#: administrator/components/com_installer/admin.installer.php:198
+#: administrator/components/com_installer/admin.installer.php:201
+msgid "Upload "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:143
+#, php-format
+msgid "Upload %s -  Upload Error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:163
+#: administrator/components/com_installer/admin.installer.php:201
+#: administrator/components/com_installer/admin.installer.php:297
+#: administrator/components/com_installer/admin.installer.php:344
+#: administrator/components/com_installer/admin.installer.php:387
+#: administrator/components/com_installer/admin.installer.php:432
+msgid "Error"
+msgstr "ผิดพลาด"
+
+#: administrator/components/com_installer/admin.installer.php:163
+msgid "Install new "
+msgstr "ติดตั้ง"
+
+#: administrator/components/com_installer/admin.installer.php:179
+msgid "Please select an HTTP URL"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:186
+msgid "The URL did not define a file name"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:220
+#: administrator/components/com_installer/admin.installer.php:253
+msgid "Failed to change the permissions of the uploaded file."
+msgstr "เกิดข้อผิดพลาดในการอัพโหลดไฟล์ ไม่ได้แก้ไขสิทธิ."
+
+#: administrator/components/com_installer/admin.installer.php:223
+msgid "Failed to move uploaded file to <code>/media</code> directory."
+msgstr "ไม่สามารถย้ายไฟล์ไปยัง <code>/media</code> ไดเรกทอรี่."
+
+#: administrator/components/com_installer/admin.installer.php:226
+#: administrator/components/com_installer/admin.installer.php:259
+msgid "Upload failed as <code>/media</code> directory is not writable."
+msgstr "อัพโหลดไม่สำเร็จ <code>/media</code> ไดเรกทอรี่ไม่สามารถเขียนทับได้."
+
+#: administrator/components/com_installer/admin.installer.php:229
+#: administrator/components/com_installer/admin.installer.php:261
+msgid "Upload failed as <code>/media</code> directory does not exist."
+msgstr "อัพโหลดไม่สำเร็จ <code>/media</code> ไม่พบไดเรกทอรี่."
+
+#: administrator/components/com_installer/admin.installer.php:255
+msgid "Failed to open the local file from the URL."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:257
+msgid "Failed to open the specified URL."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:278
+#: administrator/components/com_installer/admin.installer.php:362
+#: administrator/components/com_installer/admin.installer.php:368
+#: administrator/components/com_installer/admin.installer.php:373
+#: administrator/components/com_installer/admin.installer.php:437
+msgid "Uninstall -  error"
+msgstr "การลบ - มีข้อผิดพลาด"
+
+#: administrator/components/com_installer/admin.installer.php:282
+#, php-format
+msgid ""
+"Component %s is a core component, and can not be uninstalled.<br />You need "
+"to unpublish it if you don't want to use it"
+msgstr ""
+"คอมโพเน้นท์ %s คือคอมโพเน้นท์แกนหลัก,  และไม่สามารถถูกลบออกได้.< br /"
+">หากคุณไม่ต้องการใช้มัน คุณสามารถทำให้ไม่เผยแพร่ได้่"
+
+#: administrator/components/com_installer/admin.installer.php:297
+msgid "Uninstall component - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:309
+msgid "Uninstaller could not find XML file, but cleaned database"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:310
+msgid "Uninstall "
+msgstr "การลบ"
+
+#: administrator/components/com_installer/admin.installer.php:310
+msgid "component - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:328
+#, php-format
+msgid ""
+"%s is a core module, and can not be uninstalled.<br />You need to unpublish "
+"it if you don't want to use it"
+msgstr ""
+"%s คือโมดูลแกนหลัก,  และไม่สามารถถูกลบออกได้.< br />หากคุณไม่ต้องการใช้มัน "
+"คุณสามารถทำให้ไม่เผยแพร่ได้่"
+
+#: administrator/components/com_installer/admin.installer.php:344
+msgid "Uninstall module - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:367
+msgid "Invalid object id"
+msgstr "id วัตถุไม่สมบูรณ์"
+
+#: administrator/components/com_installer/admin.installer.php:372
+msgid "Folder field empty, cannot remove files"
+msgstr "ส่วนพื้นในโฟลเดอร์ว่างเปล่า, ไม่สามารถลบไฟล์ได้"
+
+#: administrator/components/com_installer/admin.installer.php:385
+msgid "Uninstaller did its best with no XML file present"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:387
+msgid "Uninstall mambot - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:412
+msgid "Uninstall template - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:432
+msgid "Uninstall language - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:436
+msgid "Language id empty, cannot remove files"
+msgstr "ไม่มีภาษาติดตั้ง, ไม่สามารถลบไฟล์ได้"
+
+#: administrator/components/com_installer/component/component.html.php:28
+msgid "Installed Components"
+msgstr "ติดตั้งคอมโพเน้นท์"
+
+#: administrator/components/com_installer/component/component.html.php:36
+msgid "Currently Installed"
+msgstr "กำลังติดตั้ง"
+
+#: administrator/components/com_installer/component/component.html.php:39
+msgid "Component Menu Link"
+msgstr "เมนูลิงก์ คอมโพเน้นท์"
+
+#: administrator/components/com_installer/component/component.html.php:54
+#: administrator/components/com_installer/mambot/mambot.html.php:67
+#: administrator/components/com_installer/module/module.html.php:63
+msgid "Author URL"
+msgstr "URL ผู้สร้าง"
+
+#: administrator/components/com_installer/component/component.html.php:94
+msgid "There are no custom components installed"
+msgstr "ไม่มีการติดตั้งคอมโพเน้นท์"
+
+#: administrator/components/com_installer/installer.class.php:58
+#, php-format
+msgid "XML error in %s: no handler %s"
+msgstr "พบข้อผิดพลาด XML ใน %s: ไม่สามารถจัดการ %s"
+
+#: administrator/components/com_installer/installer.class.php:60
+#, php-format
+msgid "XML error in %s: mosinstall has no type"
+msgstr "พบข้อผิดพลาด XML ใน %s: mosinstall ไม่รู้จักชนิด"
+
+#: administrator/components/com_installer/installer.class.php:65
+#, php-format
+msgid "XML Error in %s: install has no name"
+msgstr "พบข้อผิดพลาด XML ใน %s: ไม่มีชื่อที่ใช้่ติดตั้ง"
+
+#: administrator/components/com_installer/installer.class.php:92
+#, php-format
+msgid "XML error in %s: MENU found, but this is not component XML"
+msgstr "พบข้อผิดพลาด XML ใน %s: ไม่ค้นพบเมนู, โดยสิ่งนี้ไม่ใช่ส่วนประกอบ XML "
+
+#: administrator/components/com_installer/installer.class.php:129
+#, php-format
+msgid "XML Error in %s: Mambot does not have a group specified"
+msgstr "พบข้อผิดพลาด XML ใน %s: แมมบอทไม่เจอมีกลุ่มที่ต้องการ"
+
+#: administrator/components/com_installer/installer.class.php:160
+#, php-format
+msgid "XML error in %s: no installer %s"
+msgstr "พบข้อผิดพลาด XML ใน %s: ไม่สามารถติดตั้ง %s"
+
+#: administrator/components/com_installer/installer.class.php:178
+#, php-format
+msgid "Installer error with %s: unable to create admin directory for %s %s"
+msgstr "การติดตั้งข้อผิดพลาดด้วย %s: ไม่สามารถจัดการสร้างไดเรกทอรี่ผู้ดูแลเพื่อ %s %s"
+
+#: administrator/components/com_installer/installer.class.php:185
+#, php-format
+msgid "Installer error with %s: unable to create user directory for %s %s"
+msgstr "การติดตั้งข้อผิดพลาดด้วย %s: ไม่สามารถจัดการสร้างไดเรกทอรี่ผู้ใช้เพื่อ %s %s"
+
+#: administrator/components/com_installer/installer.class.php:211
+#, php-format
+msgid "Installer error with %s: writing component menu SQL error %s"
+msgstr "การติดตั้งข้อผิดพลาดด้วย %s: การเขียนเมนูส่วนประกอบ SQL เกิดข้อผิดพลาด %s"
+
+#: administrator/components/com_installer/installer.class.php:223
+#: administrator/components/com_installer/installer.class.php:270
+#: administrator/components/com_installer/installer.class.php:307
+#: administrator/components/com_installer/installer.class.php:335
+#: administrator/components/com_installer/installer.class.php:377
+#, php-format
+msgid "Installer error with %s: %s %s already installed"
+msgstr "การติดตั้งข้อผิดพลาดด้วย %s: %s %s ติดตั้งเสร็จเรียบร้อย"
+
+#: administrator/components/com_installer/installer.class.php:239
+#: administrator/components/com_installer/installer.class.php:292
+#: administrator/components/com_installer/installer.class.php:326
+#: administrator/components/com_installer/installer.class.php:388
+#, php-format
+msgid "Installer error with %s: %s %s SQL error %s"
+msgstr "การติดตั้งข้อผิดพลาดด้วย %s: %s %s SQL เกิดข้อผิดพลาด %s"
+
+#: administrator/components/com_installer/installer.class.php:261
+#: administrator/components/com_installer/installer.class.php:299
+#, php-format
+msgid "Installer error with %s: no file identified as the %s"
+msgstr "การติดตั้งข้อผิดพลาดด้วย %s: ไม่มีไฟล์ที่ระบุเป็น %s"
+
+#: administrator/components/com_installer/installer.class.php:400
+#, php-format
+msgid "Patch install error with %s: cannot write %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:406
+#, php-format
+msgid "Patch install error with %s: cannot delete %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:411
+#, php-format
+msgid "Patch install error with %s: file permissions prevent patch application"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:416
+#, php-format
+msgid "Patch install error with %s: failed to delete %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:422
+#, php-format
+msgid "Patch install error with %s: failed to write %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:426
+#, php-format
+msgid "Patch install error with %s: check was OK, but application failed"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:427
+#, php-format
+msgid "Patch install %s: completed successfully"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:495
+#, php-format
+msgid "Uninstaller error with %s: no uninstaller %s"
+msgstr "การถอนติดตั้งข้อผิดพลาดด้วย %s: ไม่ใช่สามารถถอนการติดตั้ง %s"
+
+#: administrator/components/com_installer/installer.class.php:535
+#, php-format
+msgid "Uninstaller error with %s: %s %s SQL error %s"
+msgstr "การถอนติดตั้งข้อผิดพลาดด้วย %s: %s %s SQL เกิดข้อผิดพลาด %s"
+
+#: administrator/components/com_installer/installer.class.php:545
+#: administrator/components/com_installer/installer.class.php:567
+#: administrator/components/com_installer/installer.class.php:586
+#, php-format
+msgid "Uninstaller error with %s: %s %s not fully deleted from database"
+msgstr "การถอนติดตั้งข้อผิดพลาดด้วย %s: %s %s ไม่สามารถลบจากฐานข้อมูล"
+
+#: administrator/components/com_installer/installer.class.php:558
+#, php-format
+msgid "Uninstaller error with %s: no file identified as the %s"
+msgstr "การถอนติดตั้งข้อผิดพลาดด้วย %s:ไม่มีไฟล์ที่ระบุเป็น %s"
+
+#: administrator/components/com_installer/installer.class.php:663
+#, php-format
+msgid "Installer unrecoverable ZIP error %s in %s"
+msgstr "การติดตั้งไม่ได้ ไม่สามารถทำให้กลับอย่างเดิม ZIP เกิดข้อผิดพลาด %s ใน %s"
+
+#: administrator/components/com_installer/installer.class.php:672
+#, php-format
+msgid "Installer unrecoverable TAR error in %s"
+msgstr "การติดตั้งไม่ได้ ไม่สามารถทำให้กลับอย่างเดิม TAR เกิดข้อผิดพลาดใน %s"
+
+#: administrator/components/com_installer/language/language.php:21
+msgid "Back to Language Manager"
+msgstr "กลับไปที่การจัดการภาษา"
+
+#: administrator/components/com_installer/language/language.php:22
+msgid "Install new Language - Site"
+msgstr "การติดตั้ง ภาษา - เว็บไซต์"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:27
+msgid "Installed Mambots"
+msgstr "แมมบอทที่ติดตั้ง"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:32
+msgid ""
+"Only those Mambots that can be uninstalled are displayed - some Core Mambots "
+"cannot be removed."
+msgstr "เฉพาะแมมบอทเหล่านี้ที่เอาออกได้ - บางแมมบอทหลักไม่สามารถย้ายได้."
+
+#: administrator/components/com_installer/mambot/mambot.html.php:43
+msgid "Mambot"
+msgstr "แมมบอท"
+
+#: administrator/components/com_installer/mambot/mambot.html.php:122
+msgid "There are no non-core, custom mambots installed."
+msgstr "ไม่มีแมมบอทที่เลือกไว้ ติดตั้งอยู่."
+
+#: administrator/components/com_installer/module/module.html.php:25
+msgid "Installed Modules"
+msgstr "ติดตั้งโมดูล"
+
+#: administrator/components/com_installer/module/module.html.php:36
+msgid ""
+"Only those Modules that can be uninstalled are displayed - some Core Modules "
+"cannot be removed."
+msgstr "บางโมดูลเท่านั้น ที่สามารถลบออกจากการแสดงผล - และบางอันไม่สามารถลบออกได้."
+
+#: administrator/components/com_installer/module/module.html.php:45
+msgid "Module File"
+msgstr "ไฟล์โมดูล"
+
+#: administrator/components/com_installer/module/module.html.php:48
+msgid "Client"
+msgstr "กลุ่มลูกค้า"
+
+#: administrator/components/com_installer/module/module.html.php:99
+msgid "No custom modules installed"
+msgstr "ไม่มีโมดูลที่เลือกติดตั้งในระบบ"
+
+#: administrator/components/com_installer/module/module.php:33
+msgid "Site Modules"
+msgstr "โมดูลเว็บ"
+
+#: administrator/components/com_installer/module/module.php:34
+msgid "Admin Modules"
+msgstr "โมดูลของผู้ดูแล"
+
+#: administrator/components/com_installer/template/template.php:26
+msgid "Install new Template"
+msgstr "ติดตั้งเทมเพลตใหม่"
+
+#: administrator/components/com_installer/template/template.php:28
+msgid "Back to Templates"
+msgstr "กลับไปที่เทมเพลต"
+
+#: administrator/components/com_installer/toolbar.installer.html.php:27
+msgid "Uninstall"
+msgstr "ลบ"
+
+#: administrator/components/com_installer/universal/universal.php:25
+msgid ""
+"Install Mambo plugin (component, module, mambot, template, include, "
+"parameter, composite)"
+msgstr ""
+
+#: installation/index.php:30 installation/index.php:207
+#: installation/index.php:211 installation/index.php:212
+#: installation/index.php:213 installation/index.php:214
+msgid "OFF"
+msgstr "ปิด"
+
+#: installation/index.php:30 installation/index.php:208
+#: installation/index.php:209 installation/index.php:210
+msgid "ON"
+msgstr "เปิด"
+
+#: installation/index.php:46 installation/install.php:30
+#: installation/install1.php:30 installation/install2.php:182
+#: installation/install3.php:50 installation/install4.php:309
+msgid "Mambo - Web Installer"
+msgstr "ระบบการติดตั้งแมมโบ้ ::"
+
+#: installation/index.php:69 installation/install.php:54
+msgid "Please read/accept license to continue installation"
+msgstr "กรุณาอ่านและทำความเข้าใจกับลิขสิทธิ์ก่อนการติดตั้งครับ"
+
+#: installation/index.php:81 installation/install.php:65
+#: installation/install1.php:64 installation/install2.php:205
+#: installation/install3.php:112 installation/install4.php:316
+msgid "Mambo Installation"
+msgstr "การติดตั้ง แมมโบ้ลายไทย"
+
+#: installation/index.php:88 installation/index.php:98
+#: installation/install.php:72 installation/install1.php:71
+#: installation/install2.php:219 installation/install3.php:125
+#: installation/install4.php:323
+msgid "pre-installation check"
+msgstr "ตรวจสอบระบบก่อนการติดตั้ง"
+
+#: installation/index.php:89 installation/install.php:73
+#: installation/install.php:80 installation/install1.php:72
+#: installation/install2.php:220 installation/install3.php:126
+#: installation/install4.php:324
+msgid "license"
+msgstr "ลิขสิทธิ์"
+
+#: installation/index.php:90 installation/install.php:74
+#: installation/install1.php:73 installation/install2.php:221
+#: installation/install3.php:127 installation/install4.php:325
+msgid "step 1"
+msgstr "ขั้นที่ ๑"
+
+#: installation/index.php:91 installation/install.php:75
+#: installation/install1.php:74 installation/install2.php:222
+#: installation/install2.php:232 installation/install3.php:128
+#: installation/install4.php:326
+msgid "step 2"
+msgstr "ขั้นที่ ๒"
+
+#: installation/index.php:92 installation/install.php:76
+#: installation/install1.php:75 installation/install2.php:223
+#: installation/install3.php:129 installation/install3.php:133
+#: installation/install4.php:327
+msgid "step 3"
+msgstr "ขั้นที่ ๓"
+
+#: installation/index.php:93 installation/install.php:77
+#: installation/install1.php:76 installation/install2.php:224
+#: installation/install3.php:130 installation/install4.php:328
+#: installation/install4.php:331
+msgid "step 4"
+msgstr "ขั้นที่ ๔"
+
+#: installation/index.php:105
+msgid "Pre-installation check for:"
+msgstr "ตรวจสอบก่อนการติดตั้งสำหรับ:"
+
+#: installation/index.php:106
+msgid ""
+"\n"
+"If any of these items are highlighted\n"
+"in red then please take actions to correct them. Failure to do so\n"
+"could lead to your Mambo installation not functioning\n"
+"correctly."
+msgstr ""
+"\n"
+"หากมีหัวข้อใดถูกไฮไลท์ด้วยสีแดง กรุณาทำการแก้ไขข้อผิดพลาด ก่อนทำการติดตั้งครับ. \n"
+"หากไม่ทำการแก้ไขอาจทำให้ การติดตั้ง Mambo มีปัญหาในภายหลัง หรือทำงานไม่ถูกต้อง."
+
+#: installation/index.php:120
+msgid "PHP version"
+msgstr "PHP เวอร์ชัน"
+
+#: installation/index.php:128
+msgid "zlib compression support"
+msgstr "สนับสนุน  zlib compression"
+
+#: installation/index.php:131 installation/index.php:139
+#: installation/index.php:147
+msgid "Available"
+msgstr "สนับสนุน"
+
+#: installation/index.php:131 installation/index.php:139
+#: installation/index.php:147
+msgid "Unavailable"
+msgstr "ไม่สนับสนุน"
+
+#: installation/index.php:136
+msgid "XML support"
+msgstr "สนับสนุน XML"
+
+#: installation/index.php:144
+msgid "MySQL support"
+msgstr "สนับสนุน MySQL"
+
+#: installation/index.php:161
+msgid ""
+"You can still continue the install as the configuration will be displayed at "
+"the end, just copy & paste this and upload."
+msgstr ""
+"คุณสามารถดำเนินการ ติดตั้งต่อไปได้ครับ เมื่อเสร็จสิ้นกระบวนการ ระบบจะแสดงผลค่าตัวแปรต่าง ๆ "
+"ที่ควรตั้งค่า ให้คุณเพียง copy แล้วนำไปวางไว้ใน text editor ทำการบันทึก "
+"จากนั้นก็อัพโหลดขึ้นเซิร์ฟเวอร์"
+
+#: installation/index.php:167
+msgid "Session save path"
+msgstr "Session save path"
+
+#: installation/index.php:179
+msgid "Recommended settings:"
+msgstr "ค่าแนะนำในการติดตั้ง:"
+
+#: installation/index.php:181
+msgid ""
+"These settings are recommended for PHP in order to ensure full\n"
+"compatibility with Mambo.\n"
+"However, Mambo will still operate if your settings do not quite match the "
+"recommended."
+msgstr ""
+"ค่าต่อไปนี้เป็นค่าแนะนำสำหรับ PHP เพื่อให้ Mambo ทำงานได้ถูกต้อง\n"
+"อย่างไรก็ตามถึงแม้ว่าค่าที่ท่าน ทำการติดตั้งไว้ในเซิร์ฟเวอร์ ของท่านอาจไม่ตรงตามนี้ทุกประการ "
+"Mambo ก็อาจจะยังทำงานได้ครับ."
+
+#: installation/index.php:197
+msgid "Directive"
+msgstr "ฟังก์ชัน"
+
+#: installation/index.php:200
+msgid "Recommended"
+msgstr "ค่าแนะนำ"
+
+#: installation/index.php:203
+msgid "Actual"
+msgstr "ปัจจุบัน"
+
+#: installation/index.php:245
+msgid "Directory and File Permissions:"
+msgstr "สิทธิ์การอนุญาต (Permission) ของไดเรกทอรีและไฟล์:"
+
+#: installation/index.php:247
+msgid ""
+"In order for Mambo to function\n"
+"correctly it needs to be able to access or write to certain files\n"
+"or directories. If you see \"Unwriteable\" you need to change the\n"
+"permissions on the file or directory to allow Mambo\n"
+"to write to it."
+msgstr ""
+"ท่านต้องตั้งค่าไดเรกทอรี หรือไฟล์ให้สามารถเขียนทับไฟล์ได้ \n"
+"เมื่อใดก็ตามที่เห็นคำว่า \"เขียนลงไฟล์ไม่ได้\" ให้ท่านทำการแก้สิทธิ์ ของไฟล์หรือไดเรกทอรีดังกล่าว."
+
+#: installation/install.php:85
+msgid "GNU/GPL License:"
+msgstr "ลิขสิทธิ์ GNU/GPL:"
+
+#: installation/install.php:87
+msgid ""
+"<a href=\"http://www.mamb-foundation.org\">Mambo </a> is Free Software "
+"released under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU/GPL "
+"License </a>.\n"
+"\t\t\t\t<div class=\"error\">*** To continue installing Mambo you must check "
+"the box under the license ***</div>"
+msgstr ""
+
+#: installation/install.php:102
+msgid "I understand that this software is released under the GNU/GPL License"
+msgstr "ข้าพเจ้าตกลงตามเงื่อนไขในลิขสิทธิ์  GNU/GPL"
+
+#: installation/install1.php:42
+msgid "Please enter a Host name"
+msgstr "กรุณาใส่ชื่อโฮสต์ (เช่น Localhost)"
+
+#: installation/install1.php:46
+msgid "Please enter a Database User Name"
+msgstr "กรุณาใส่ชื่อผู้ใช้ฐานข้อมูล (เช่น root )"
+
+#: installation/install1.php:50
+msgid "Please enter a Name for your new Database"
+msgstr "กรุณาใส่ชื่อฐานข้อมูลใหม่ของคุณ"
+
+#: installation/install1.php:53
+msgid ""
+"Are you sure these settings are correct? \\nMambo will now attempt to "
+"populate a Database with the settings you have supplied"
+msgstr ""
+"กรุณาตรวจสอบให้แน่ใจว่าค่าดังกล่าวถูกต้อง \\n Mambo จะทำการสร้างฐานข้อมูลด้วยค่าที่ท่านระบุไว้นี้"
+
+#: installation/install1.php:84
+msgid "MySQL database configuration:"
+msgstr "การตั้งค่าฐานข้อมูล MySQL :"
+
+#: installation/install1.php:85
+msgid ""
+"\n"
+"  \t   \t\t\t<p>Setting up Mambo to run on your server involves 4 simple "
+"steps...</p>\n"
+"  \t   \t\t\t<p>Please enter the hostname of the server Mambo is to be "
+"installed on.</p>\n"
+"\t\t\t\t<p>Enter the MySQL username, password and database name you wish to "
+"use with Mambo.</p>\n"
+"\t\t\t\t<p>Enter the table name prefix to be used by this Mambo instance and "
+"select how\n"
+"\t\t\t\t   to do with in case existing tables from former installations.</"
+"p>\n"
+"\t\t\t\t<p>Install the samples unless you are experianced Mamber wanting to "
+"start with a completely empty site.</p>\n"
+"\t\t\t\t"
+msgstr ""
+"\n"
+"  \t   \t\t\t<p>การติดตั้ง Mambo สามารถทำได้ง่าย ๆ ใน 4 ขั้นตอน...</p>\n"
+"  \t   \t\t\t<p>กรุณาใส่ชื่อโฮสต์ที่ต้องการติดตั้ง  Mambo ทั่วไปแล้วค่านี้จะเป็น  'localhost'."
+"</p>\n"
+"\t\t\t\t<p>ใส่ชื่อผู้ใช้ และรหัสผ่านของฐานข้อมูล MySQL ที่คุณต้องการใช้กับ Mambo</p>\n"
+"\t\t\t\t<p>ใส่คำนำหน้าชื่อ (prefix) ของตารางที่จะใช้งานหากท่าน ทำการติดตั้ง "
+"ซ้ำในฐานข้อมูลชื่อเดิมที่เคยติดตั้งแล้ว</p>\n"
+"\t\t\t\t<p>ให้ติดตั้งตัวอย่างข้อมูล ยกเว้นท่าน มีความเชี่ยวชาญในการใช้งาน แมมโบ้ "
+"หรือต้องการติดตั้ง แมมโบ้ แบบเริ่มต้นโดย ไม่ต้องการตัวอย่างข้อมูล</p>\n"
+"\t\t\t\t"
+
+#: installation/install1.php:103
+msgid "Host Name"
+msgstr "ชื่อโฮสต์"
+
+#: installation/install1.php:104
+msgid "This is usually \"localhost\""
+msgstr "ค่าทั่วไปคือ \"localhost\""
+
+#: installation/install1.php:107
+msgid "MySQL User Name"
+msgstr "ชื่อผู้ใช้ฐานข้อมูล MySQL"
+
+#: installation/install1.php:108
+msgid "Either something as \"root\" or a username given by the hoster"
+msgstr "ชื่อผู้ใช้งานดาต้าเบส อาจจะใส่เป็น \"root\" หรือชื่อผู้ใช้ที่ได้รับ จากผู้ให้บริการโฮสของท่าน"
+
+#: installation/install1.php:111
+msgid "MySQL Password"
+msgstr "รหัสผ่านฐานข้อมูล MySQL"
+
+#: installation/install1.php:112
+msgid "For site security using a password for the mysql account is mandatory"
+msgstr ""
+
+#: installation/install1.php:115
+msgid "Verify MySQL Password"
+msgstr "ยืนยันรหัสผ่าน MySQL อีกครั้ง"
+
+#: installation/install1.php:116
+msgid "Retype password for verification"
+msgstr "ใส่รหัสผ่านอีกครั้งเพื่อเป็นการยืนยัน"
+
+#: installation/install1.php:119
+msgid "MySQL Database Name"
+msgstr "ชื่อฐานข้อมูล MySQL"
+
+#: installation/install1.php:120
+msgid ""
+"Some hosts allow only a certain DB name per site. Use table prefix in this "
+"case for distinct mambo sites."
+msgstr ""
+"โฮสบางแห่งมีเพียงดาเบสเดียวให้ท่านใช้งาน กรณีนี้ท่านสามารถใช้ชื่อนำหน้า (prefix) "
+"ตารางเพื่อติดตั้งมากกว่าหนึ่งไซต์."
+
+#: installation/install1.php:123
+msgid "MySQL Table Prefix"
+msgstr "คำนำหน้า(Prefix) ชื่อตาราง"
+
+#: installation/install1.php:124
+msgid "Dont use \"old_\" since this is used for backup tables"
+msgstr "ห้ามใช้ชื่อนำหน้าเป็น \"old_\" เนื่องจาก แมมโบ้ จะใช้ค่านี้ในการสร้างตารางสำรอง"
+
+#: installation/install1.php:128
+msgid "Drop Existing Tables"
+msgstr "ต้องการลบตารางที่มีอยู่หรือไม่?"
+
+#: installation/install1.php:133
+msgid "Backup Old Tables"
+msgstr "ต้องการสำรองข้อมูลตารางหรือไม่?"
+
+#: installation/install1.php:134
+msgid ""
+"Any exiting backup tables from former mambo installations will be replaced"
+msgstr "ข้อมูลสำรองเดิมจากการติดตั้งแมมโบ้ที่มีอยู่จะถูกลบทิ้ง"
+
+#: installation/install1.php:138
+msgid "Install Sample Data"
+msgstr "ต้องการติดตั้งข้อมูลตัวอย่างหรือไม่?"
+
+#: installation/install1.php:139
+msgid "Dont uncheck this unless you are experienced with mambo!"
+msgstr "กรุณาคลิกเลือกไว้หากท่าน ยังไม่มีความชำนาญในการใช้งาน!"
+
+#: installation/install2.php:37
+msgid "The database details provided are incorrect and/or empty."
+msgstr "รายละเอียดของฐานข้อมูลที่กรอกไม่ถูกต้องหรือว่างไว้ครับ."
+
+#: installation/install2.php:41
+msgid "The database passwords provided do not match.  Please try again."
+msgstr "ท่านใส่รหัสผ่านสองครั้งไม่ตรงกัน. กรุณาใส่ใหม่."
+
+#: installation/install2.php:45
+msgid "The password and username provided are incorrect."
+msgstr "ชื่อผู้ใช้และรหัสผ่านที่กรอกไม่ถูกต้องครับ."
+
+#: installation/install2.php:49
+msgid "The database name provided is empty."
+msgstr "ไม่ได้ใส่ชื่อฐานข้อมูลครับ."
+
+#: installation/install2.php:64
+msgid "A database error occurred: "
+msgstr "ฐานข้อมูลมีข้อผิดพลาดครับ: "
+
+#: installation/install2.php:193
+msgid "Please enter a Site Name"
+msgstr "กรุณาใส่ชื่อเว็บไซต์ด้วยครับ"
+
+#: installation/install2.php:235
+msgid "Enter the name of your Mambo site:"
+msgstr "กรุณาใส่ชื่อเว็บไซต์ของท่าน:"
+
+#: installation/install2.php:238
+msgid ""
+"Looks like there have been some errors with inserting data into your "
+"database!<br />\n"
+"  \t\t\tYou cannot continue."
+msgstr ""
+"มีข้อผิดพลาดในการแทรกข้อมูลลงในฐานข้อมูล!<br />\n"
+"  \t\t\tไม่สามารถทำการติดตั้งต่อได้."
+
+#: installation/install2.php:241
+msgid "SUCCESS!"
+msgstr "สำเร็จแล้วครับ!"
+
+#: installation/install2.php:244
+msgid ""
+"Type in the name for your Mambo site. This\n"
+"\t\t\tname is used in email messages so make it something meaningful."
+msgstr ""
+"พิมพ์ชื่อเว็บไซต์ของท่านที่นี่.\n"
+"\t\t\tระบบจะใช้ชื่อนี้ในการส่งอีเมล."
+
+#: installation/install2.php:255
+msgid "Error log:"
+msgstr "บันทึกข้อผิดพลาด:"
+
+#: installation/install2.php:266
+msgid "Site name"
+msgstr "ชื่อเว็บไซต์"
+
+#: installation/install2.php:271
+msgid "e.g. The Home of Mambo"
+msgstr "เช่น เว็บไซต์การเรียนการสอนวิชาภาษาไทย"
+
+#: installation/install3.php:41
+msgid "The sitename has not been provided"
+msgstr "ไม่ได้ใส่ชื่อเว็บไซต์"
+
+#: installation/install3.php:61
+msgid "Please enter Site URL"
+msgstr "กรุณาใส่ชื่อ URL"
+
+#: installation/install3.php:65
+msgid "Please enter the absolute path to your site"
+msgstr "กรุณาใส่  absolute path ของเว็บไซต์"
+
+#: installation/install3.php:69
+msgid "Please enter an email address to contact your administrator"
+msgstr "กรุณาใส่ที่อยู่อีเมลในการติดต่อกับผู้ดูแลระบบ"
+
+#: installation/install3.php:73
+msgid "Please enter a password for you administrator"
+msgstr "กรุณาใส่รหัสผ่านสำหรับผู้ดูแลระบบ"
+
+#: installation/install3.php:138
+msgid "Confirm the site URL, path, admin e-mail and file/directory chmods"
+msgstr "ยืนยันที่อยู่  URL, path, อีเมลของผู้ดูแลระบบ และสิทธิ์การเข้าถึงไฟล์/ไดเรกทอรี่"
+
+#: installation/install3.php:139
+msgid ""
+"\n"
+"\t\t\t\t  <p>If URL and Path looks correct then please do not change.\n"
+"\t\t\t\t  If you are not sure then please contact your ISP or administrator. "
+"Usually\n"
+"\t\t\t\t  the values displayed will work for your site.<br/>\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  Enter your e-mail address, this will be the e-mail address of the "
+"site\n"
+"\t\t\t\t  SuperAdministrator.<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  The permission settings will be used while installing mambo "
+"itself, by\n"
+"\t\t\t\t  the mambo addon-installers and by the media manager. If you are "
+"unsure\n"
+"\t\t\t\t  what flags shall be set, leave the default settings at the "
+"moment.\n"
+"\t\t\t\t  You can still change these flags later in the site global "
+"configuration.</p>"
+msgstr ""
+"\n"
+"\t\t\t\t  <p>ไม่ต้องเปลี่ยนค่าใด ๆ ถ้าหากที่อยู่ URL และ Path ถูกต้องแล้ว.\n"
+"\t\t\t\t  ถ้าหากไม่มั่นใจ ให้ติดต่อผู้ให้บริการอินเทอร์เน็ท หรือผู้ดูแลระบบของท่าน.\n"
+"\t\t\t\tโดยทั่วไปแล้วค่าที่แสดงอยู่นี้เป็นค่าที่ถูกต้องแล้วและน่าจะทำงานกับเว็บไซต์ของท่านได้.<br/"
+">\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t ใส่อีเมลที่ต้องการใช้สำหรับเว็บไซต์ของท่าน ทั่วไปแล้วคืออีเมลของผู้ดูแลระบบ<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  การยินยอมการตั้งค่าจะถูกใช้ขณะที่แมมโบ้ที่ติดตั้งเอง, โดย\n"
+"\t\t\t\t การติดตั้งส่วนประกอบแมมโบ้เอง และโดยการจัดการมีเดียไฟล์. ถ้าคุณไม่แน่ใจ\n"
+"\t\t\t\t  ในรูปแบบการตั้งค่า, จะออกจากพื้นฐานการตั้งค่านี้.\n"
+"\t\t\t\t  โดยคุณสามารถที่จะเปลี่ยนแปลงการตั้งค่าทั่วไปได้ทีหลังในการตั้งค่าคอนฟิคหลัก.</p>"
+
+#. if
+#: installation/install3.php:202
+msgid "File Permissions"
+msgstr "การเข้าถึงไฟล์"
+
+#: installation/install3.php:206
+msgid "Dont CHMOD files (use server defaults)"
+msgstr "Dont CHMOD files (use server defaults)"
+
+#: installation/install3.php:210
+msgid "CHMOD files to:"
+msgstr "CHMOD files to:"
+
+#: installation/install3.php:217
+msgid "User:"
+msgstr "ผู้ใช้:"
+
+#: installation/install3.php:219 installation/install3.php:228
+#: installation/install3.php:237 installation/install3.php:277
+#: installation/install3.php:286 installation/install3.php:295
+msgid "read"
+msgstr "อ่าน"
+
+#: installation/install3.php:221 installation/install3.php:230
+#: installation/install3.php:239 installation/install3.php:279
+#: installation/install3.php:288 installation/install3.php:297
+msgid "write"
+msgstr "เขียน"
+
+#: installation/install3.php:223 installation/install3.php:232
+#: installation/install3.php:241
+msgid "execute"
+msgstr "ทำงาน"
+
+#: installation/install3.php:235
+msgid "World:"
+msgstr "ทั้งหมด:"
+
+#: installation/install3.php:264
+msgid "Dont CHMOD directories (use server defaults)"
+msgstr "Dont CHMOD directories (use server defaults)"
+
+#: installation/install3.php:268
+msgid "CHMOD directories to:"
+msgstr "CHMOD directories to:"
+
+#: installation/install3.php:281 installation/install3.php:290
+#: installation/install3.php:299
+msgid "search"
+msgstr "ค้นหา"
+
+#: installation/install4.php:70
+msgid "You must provide a valid admin email address."
+msgstr "กรุณาใส่อีเมลที่ถูกต้องด้วยครับ."
+
+#: installation/install4.php:96
+msgid "The database details provided are incorrect and/or empty"
+msgstr "รายละเอียดของฐานข้อมูลไม่ถูกต้องหรือว่างไว้"
+
+#: installation/install4.php:158
+msgid "This site is down for maintenance.<br /> Please check back again soon."
+msgstr "เว็บไซต์กำลังอยู่ในช่วงอัพเดทครับ.<br /> กรุณากลับมาใหม่ครับ."
+
+#: installation/install4.php:159
+msgid ""
+"This site is temporarily unavailable.<br /> Please notify the System "
+"Administrator"
+msgstr "ไม่สามารถเข้าเว็บนี้ได้ครับ.<br />กรุณาแจ้งผู้ดูแลระบบ"
+
+#: installation/install4.php:162
+msgid "Mambo - the dynamic portal engine and content management system"
+msgstr "Mambo - ระบบการจัดการเนื้อหา"
+
+#. chmod files and directories if desired
+#: installation/install4.php:238
+msgid "Directory and file permissions left unchanged."
+msgstr "Directory and file permissions left unchanged."
+
+#: installation/install4.php:280
+msgid "File and directory permissions successfully changed."
+msgstr "ไฟล์ และการยินยอมการเปลี่ยนไดเรกทอรี่สมบูรณ์."
+
+#: installation/install4.php:282
+msgid "File and directory permissions could not be changed.<br/>"
+msgstr "ไฟล์ และการยินยอมการเปลี่ยนไดเรกทอรี่ไม่ถูกเปลี่ยน."
+
+#: installation/install4.php:283
+msgid "Please CHMOD mambo files and directories manually."
+msgstr "กรุณา CHMOD  ไฟล์แมมโบ้และไดเรกทอรี่ด้วยมือตัวเอง."
+
+#: installation/install4.php:301
+msgid "The site url has not been provided"
+msgstr "ไม่ได้ใส่ชื่อเว็บไซต์"
+
+#: installation/install4.php:333
+msgid "View Site"
+msgstr "ดูเว็บไซต์"
+
+#: installation/install4.php:341
+msgid "Administration"
+msgstr "ผู้ดูแลระบบ"
+
+#: installation/install4.php:351
+msgid "Congratulations! Mambo is installed"
+msgstr "ขอแสดงความยินดีด้วยครับ!  การติดตั้อง Mambo สำเร็จแล้ว"
+
+#: installation/install4.php:352
+msgid ""
+"\n"
+"\t\t\t\t<p>Click the \"View Site\" button to start Mambo site or "
+"\"Administration\"\n"
+"\t\t\t\t   to take you to administrator login.  Please take a moment to fill "
+"out the form below.</p>"
+msgstr ""
+
+#: installation/install4.php:359
+msgid "PLEASE REMEMBER TO COMPLETELY<br/>REMOVE THE INSTALLATION DIRECTORY"
+msgstr ""
+"เมื่อทำการติดตั้งเรียบร้อยแล้ว<br/>ให้ท่านลบแฟ้ม INSTALLATION ออกจากเซิร์ฟเวอร์ด้วยครับ"
+
+#: installation/install4.php:360
+msgid "Administration Login Details"
+msgstr "รายละเอียดการเข้าสู่ระบบของผู้ดูแลระบบ"
+
+#: installation/install4.php:361
+msgid "Username :"
+msgstr "ชื่อผู้ใช้ :"
+
+#: installation/install4.php:362
+msgid "Password :"
+msgstr "รหัสผ่าน :"
+
+#: installation/install4.php:367
+msgid ""
+"\n"
+"\t\t\t\t\t\t\t\tYour configuration file or directory is not writeable,\n"
+"\t\t\t\t\t\t\t\tor there was a problem creating the configuration file. "
+"You'll have to\n"
+"\t\t\t\t\t\t\t\tupload the following code by hand. Click in the textarea to "
+"highlight\n"
+"\t\t\t\t\t\t\t\tall of the code."
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:30
+msgid "Frontpage Manager"
+msgstr "การจัดการเนื้อหาหน้าเว็บ"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:79
+msgid "Section"
+msgstr "หมวด"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:107
+msgid "Expired"
+msgstr "หมดอายุ"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:110
+msgid "Unpublished"
+msgstr "ไม่เผยแพร่"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:116
+msgid "Always"
+msgstr "เสมอ"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:116
+#: administrator/components/com_frontpage/admin.frontpage.html.php:118
+msgid "Start:"
+msgstr "เริ่มต้น:"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:123
+#: administrator/components/com_frontpage/admin.frontpage.html.php:125
+msgid "Finish:"
+msgstr "จบ:"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:123
+msgid "No Expiry"
+msgstr "ไม่หมดอายุ"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:137
+msgid "Edit User"
+msgstr "แก้ไขผู้ใช้"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:160
+msgid "Edit Content"
+msgstr "แก้ไขเนื้อหา"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:171
+msgid "Publish Information"
+msgstr "รายละเอียดการเผยแพร่"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:191
+msgid "Edit Section"
+msgstr "แก้ไขหมวด"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:154
+msgid "- All Categories -"
+msgstr "- เลือก ประเภท -"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:173
+msgid "- All Authors -"
+msgstr "- เลือก ผู้แต่ง -"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:190
+msgid "archive"
+msgstr "คลังเนื้อหา"
+
+#: administrator/components/com_frontpage/admin.frontpage.php:191
+msgid "Select an item to %a"
+msgstr "เลือกรายการที่จะ %a"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage"
+msgstr "เนื้อหาหน้าเว็บ"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage Ordering"
+msgstr "การจัดเรียงด้านหน้าเว็บ"
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"This component shows all the published content items from your site marked "
+"Show on Frontpage."
+msgstr "คอมโพเน้นท์นี้ทำหน้าที่แสดงเนื้อหาที่เผยแพร่ทุกเนื้อหาไปยังเว็บเพจหน้าแรก."
+
+#: administrator/components/com_frontpage/toolbar.frontpage.html.php:25
+msgid "Remove"
+msgstr "ย้าย"
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_login.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_random_image.xml modules/mod_related_items.xml
+#: modules/mod_rssfeed.xml modules/mod_search.xml modules/mod_sections.xml
+#: modules/mod_stats.xml modules/mod_templatechooser.xml
+#: modules/mod_whosonline.xml modules/mod_wrapper.xml
+msgid ""
+"A suffix to be applied to the css class of the module (table.moduletable), "
+"this allows individual module styling"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Custom Module"
+msgstr ""
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml
+msgid "Enable Cache"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Enter number of RSS items to display"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Enter the URL of the RSS/RDF feed"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Items"
+msgstr "รายการ"
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_banners.xml
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_login.xml modules/mod_mainmenu.xml modules/mod_mostread.xml
+#: modules/mod_newsflash.xml modules/mod_poll.xml modules/mod_random_image.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml modules/mod_sections.xml modules/mod_stats.xml
+#: modules/mod_templatechooser.xml modules/mod_whosonline.xml
+#: modules/mod_wrapper.xml
+msgid "Module Class Suffix"
+msgstr ""
+
+#: modules/custom.xml
+msgid "RSS URL"
+msgstr ""
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml
+msgid "Select whether to cache the content of this module"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Show the description or intro text of individual news items"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Show the description text for the whole Feed"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Show the image associated with the whole Feed"
+msgstr ""
+
+#: modules/mod_archive.xml
+msgid "Archived Content"
+msgstr ""
+
+#: modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_mostread.xml
+#: modules/mod_sections.xml
+msgid "Count"
+msgstr ""
+
+#: modules/mod_archive.xml
+msgid "The number of items to display (default is 10)"
+msgstr ""
+
+#: modules/mod_archive.xml
+msgid ""
+"This module shows a list of the calendar months, which contain Archived "
+"items. After you have changed the status of a Content Item to 'Archived' "
+"this list will be automatically generated."
+msgstr ""
+
+#: modules/mod_banners.php:75
+msgid "Advertisement"
+msgstr "ป้ายโฆษณา"
+
+#: modules/mod_banners.xml
+msgid ""
+"A suffix to be aapplied to the css class of the module (table.moduletable), "
+"this allows individual module styling"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid "Banner"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid "Banner client"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid "Reference to banner client id. Enter separated by ','!"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid ""
+"The banner module allows to show the active banners out of the component "
+"within your site."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Allows you to control which type of Content to display in the module"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml modules/mod_whosonline.xml
+msgid "Both"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Category ID"
+msgstr "หมายเลขประเภท"
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Content Items only"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Display content item images"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Frontpage Items"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_mainmenu.xml
+#: modules/mod_newsflash.xml
+msgid "Horizontal"
+msgstr ""
+
+#: modules/mod_latestcontent.xml
+msgid "Latest Content"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Module Mode"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Section ID"
+msgstr "หมวดลำดับที่"
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid ""
+"Selects items from a specific Category or set of Categories (to specify more "
+"than one Category, seperate with a comma , )."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid ""
+"Selects items from a specific Secion or set of Sections (to specify more "
+"than one Section, seperate with a comma , )."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Show images"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Show item title"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid ""
+"Show/Hide items designated for the Frontpage - only works when in Content "
+"Items only mode"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Show/Hide the Read More button"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Static Content only"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Style"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+msgid "The number of items to display (default 5)"
+msgstr ""
+
+#: modules/mod_latestcontent.xml
+msgid "The style to display the content"
+msgstr ""
+
+#: modules/mod_latestcontent.xml
+msgid ""
+"This module shows a list of content with intro text in vertical or "
+"horizontal of the most recently published Items that are still current (some "
+"may have expired even though they are the most recent). Items that are "
+"displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_mainmenu.xml
+#: modules/mod_newsflash.xml
+msgid "Vertical"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "hide"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "show"
+msgstr ""
+
+#: modules/mod_latestnews.xml
+msgid "Latest News"
+msgstr ""
+
+#: modules/mod_latestnews.xml
+msgid ""
+"This module shows a list of the most recently published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: modules/mod_login.php:44
+#, php-format
+msgid "Hi, %s"
+msgstr "สวัสดี, %s"
+
+#: modules/mod_login.php:70
+msgid "username"
+msgstr "ชื่อสมาชิก"
+
+#: modules/mod_login.php:74
+msgid "password"
+msgstr "รหัสผ่าน"
+
+#: modules/mod_login.php:76
+msgid "Remember Me"
+msgstr "จำข้อมูลการล็อกอิน"
+
+#: modules/mod_login.xml
+msgid "Greeting"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Login Form"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Login Message"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Logout Message"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Name/Username"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Post-text"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Pre-text"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Show/Hide the simple greeting text"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "This is the Text or HTML that is displayed above the login form"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "This is the Text or HTML that is displayed below the login form"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid ""
+"This module displays a Username and Password login form. It also displays a "
+"link to retrieve a forgotten password. If user registration is enabled, "
+"(refer to the Configuration settings), then another link will be shown to "
+"invite users to self-register."
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "A suffix to be applied to the css class of the menu items"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Alignment of the Menu Icons"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Choose which indent image system to utilise"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Displays a menu."
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "End Spacer"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "End Spacer for Horizontal menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Expand Menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Expand the menu and make its sub-menus items always visible"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Flat List"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the fifth sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the first sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the fourth sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the second sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the sixth sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the third sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 1"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 2"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 3"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 4"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 5"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 6"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Main Menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Mambo default images"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Class Suffix"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Icon Alignment"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Style"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Show Menu Icons"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Show the Menu Icons you have selected for your menu items"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Spacer"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Spacer for Horizontal menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Template"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "The menu style"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "The name of the menu (default is 'mainmenu')"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Use params below"
+msgstr ""
+
+#: modules/mod_mostread.xml
+msgid "Most Read Content"
+msgstr ""
+
+#: modules/mod_mostread.xml modules/mod_sections.xml
+msgid "The number of items to display (default is 5)"
+msgstr ""
+
+#: modules/mod_mostread.xml
+msgid ""
+"This module shows a list of the currently published Items that have been "
+"viewed the most - determined by the number of times the page has been viewed."
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "A content category"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Make the Item titles linkable"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Newsflash"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "No of items to display"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "No. of Items"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Randomly choose one at a time"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid ""
+"The Newsflash module randomly selects one of the published items from a "
+"category upon each page refresh.  It may also dislpay multiple items in "
+"horizontal or vertical configurations."
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "The style to display the category"
+msgstr ""
+
+#: modules/mod_poll.php:85
+msgid "Vote"
+msgstr "โหวต"
+
+#: modules/mod_poll.php:86
+msgid "Results"
+msgstr "ผลลัพธ์"
+
+#: modules/mod_poll.xml
+msgid "Poll"
+msgstr "โพลล์"
+
+#: modules/mod_poll.xml
+msgid ""
+"This module compliments the Polls component. It is used to display the "
+"configured polls. The module differs from other modules in as much as the "
+"Component supports linking between Menu Items and Polls. This means that the "
+"module shows only those Polls, which are configured for a certain Menu Item."
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid ""
+"A URL to redirect to if image is clicked on, eg: http://www.mambo-foundation."
+"org"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Height (px)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image Folder"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image Type"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image height (forces all images to be displayed with the height)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image width (forces all images to be displayed with this width)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Path to the image folder relative to the site url, eg: images/stories"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Random Image"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "This module display a random image from your chosen directory"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Type of image PNG/GIF/JPG etc. (default is JPG)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Width (px)"
+msgstr ""
+
+#: modules/mod_related_items.xml
+msgid "Related Items"
+msgstr ""
+
+#: modules/mod_related_items.xml
+msgid ""
+"This module displays other Content Items that are related to the Item "
+"currently displayed. These are based on the keywords Metadata. All the "
+"keywords of the current Content Item are searched against all the keywords "
+"of all other published items. For example, you may have an Item on 'Breeding "
+"Parrots' and you may have another on 'Hand Raising Black Cockatoos'. If you "
+"include the keyword 'parrot' in both Items, then the Related Items module "
+"will list the 'Breeding Parrots' Item when viewing 'Hand Raising Black "
+"Cockatoos' and vice-versa."
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Atom"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Atom Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Choose the image to be used"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Enter the text to be displayed along with the RSS links"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "OPML"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "OPML Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 0.91"
+msgstr "RSS 0.91"
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 0.91 Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 1.0 Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 2.0 Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide Atom 1.0 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide OPML Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide RSS 0.91 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide RSS 1.0 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide RSS 2.0 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Syndicate"
+msgstr "กระจายข่าว"
+
+#: modules/mod_rssfeed.xml modules/mod_search.xml
+msgid "Text"
+msgstr "ข้อความ"
+
+#: modules/mod_rssfeed.xml
+msgid ""
+"The Syndicate module will display a link whereby people can syndicate your "
+"site for all your latest news. When you click on the RSS icon, you will be "
+"redirected to a new page that will list all the latest news in XML format. "
+"In order to use the Newsfeed in another Mambo site or a Newsfeed reader, you "
+"need to cut and paste the URL."
+msgstr ""
+
+#: modules/mod_search.php:17
+msgid "Search"
+msgstr "ค้นหา"
+
+#: modules/mod_search.php:19
+msgid "search..."
+msgstr "ค้นหา..."
+
+#: modules/mod_search.xml
+msgid "Bottom"
+msgstr "ล่าง"
+
+#: modules/mod_search.xml
+msgid "Box Width"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Button Position"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Button Text"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Display a Search Button"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Position of the button relative to the search box"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Search Button"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Search Module"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Size of the search text box"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid ""
+"The text that appears in the search buttin, if left blank it will load "
+"_SEARCH_TITLE from your language file"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid ""
+"The text that appears in the search text box, if left blank it will load "
+"_SEARCH_BOX from your language file"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "This module will display a search box"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Top"
+msgstr "บน"
+
+#: modules/mod_sections.xml
+msgid "Sections"
+msgstr "หมวด"
+
+#: modules/mod_sections.xml
+msgid ""
+"The Section module shows a list of all Sections configured in your database. "
+"The Sections refer here to the Item Sections only. If the configuration "
+"'Show Unauthorized Links' is set to 'NO', the list will be limited to the "
+"sections the user is allowed to see."
+msgstr ""
+
+#: modules/mod_stats.php:27
+msgid "Time"
+msgstr "เวลา"
+
+#: modules/mod_stats.php:28 modules/mod_stats.php:30
+msgid "Disabled"
+msgstr "ปิดการใช้งาน"
+
+#: modules/mod_stats.php:28 modules/mod_stats.php:30
+msgid "Enabled"
+msgstr "เปิดการใช้งาน"
+
+#: modules/mod_stats.php:37
+msgid "Members"
+msgstr "จำนวนสมาชิก"
+
+#: modules/mod_stats.php:41
+msgid "News"
+msgstr "ข่าว"
+
+#: modules/mod_stats.php:59 modules/mod_stats.php:61
+msgid "Visitors"
+msgstr "ผู้เยี่ยมชม"
+
+#: modules/mod_stats.xml
+msgid "Display hit counter"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Display server information"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Display site information"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Enter the amount of hits to increase counter by"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Hit Counter"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Increase counter"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Server Info"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Site Info"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Statistics"
+msgstr "สถิติ"
+
+#: modules/mod_stats.xml
+msgid ""
+"The Statistics module shows information about your server installation and "
+"statistics on the web site users, number of contents in your database, and "
+"number of web links you provide."
+msgstr ""
+
+#: modules/mod_templatechooser.php:77
+msgid "Select"
+msgstr "เลือก"
+
+#: modules/mod_templatechooser.xml
+msgid "Height"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Max. Name Length"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Show Preview"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Template Chooser"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Template preview is to be shown"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid ""
+"The Template Chooser module allows the user (visitor) to change the template "
+"on the fly from the front-end via a drop down selection list."
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "This is the height of the preview image (default 90)"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "This is the maximum length of the template name to display (default 20)"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "This is the width of the preview image (default 140)"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Width"
+msgstr ""
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:28
+msgid "We have %d guest online"
+msgid_plural "We have %d guests online"
+msgstr[0] "ขณะนี้มี %d บุคคลทั่วไปออนไลน์"
+msgstr[1] "ขณะนี้มี %d บุคคลทั่วไปออนไลน์"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:32
+msgid "We have %d member online"
+msgid_plural "We have %d members online"
+msgstr[0] "ขณะนี้มี %d สมาชิกออนไลน์"
+msgstr[1] "ขณะนี้มี %d สมาชิกออนไลน์"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:36
+msgid "We have %d guest online and "
+msgid_plural "We have %d guests online and "
+msgstr[0] "ขณะนี้มี %d บุคคลทั่วไปออนไลน์ และ"
+msgstr[1] "ขณะนี้มี %d บุคคลทั่วไปออนไลน์ และ"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_whosonline.php:37
+msgid " %d member online"
+msgid_plural " %d members online"
+msgstr[0] " %d สมาชิกออนไลน์"
+msgstr[1] " %d สมาชิกออนไลน์"
+
+#: modules/mod_whosonline.php:57
+msgid "No Users Online"
+msgstr "ไม่มีสมาชิกออนไลน์"
+
+#: modules/mod_whosonline.xml
+msgid "# of Guests/Members"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Display"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Member Names"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Select what shall be shown"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid ""
+"The Who's Online module displays the number of anonymous (that is, Guest) "
+"users and Registered users, (those that are logged in) that are currently "
+"accessing the web site."
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Who's Online"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "This module shows an IFrame window to specified location"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "Url"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "Url to site/file you wish to display within the Iframe"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "Wrapper Module"
+msgstr ""
+
+#: templates/waterandstone/templateDetails.xml
+msgid ""
+"The Water and Stone Grey Template optimized for 1024px width resolution for "
+"use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone/templateDetails.xml
+msgid "waterandstone"
+msgstr ""
+
+#: templates/waterandstone800/templateDetails.xml
+msgid ""
+"The Water and Stone Grey Template optimized for 800px width resolution for "
+"use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800/templateDetails.xml
+msgid "waterandstone800"
+msgstr ""
+
+#: templates/waterandstone800_blue/templateDetails.xml
+msgid ""
+"The Water and Stone Blue Template optimized for 800px x 600px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800_blue/templateDetails.xml
+msgid "waterandstone800_blue"
+msgstr ""
+
+#: templates/waterandstone800_green/templateDetails.xml
+msgid ""
+"The Water and Stone Green Template optimized for 800px x 600px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800_green/templateDetails.xml
+msgid "waterandstone800_green"
+msgstr ""
+
+#: templates/waterandstone800_greenandblack/templateDetails.xml
+msgid ""
+"The Water and Stone Green and Black Template optimized for 800px x 600px "
+"screen resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800_greenandblack/templateDetails.xml
+msgid "waterandstone800_greenandblack"
+msgstr ""
+
+#: templates/waterandstone_blue/templateDetails.xml
+msgid ""
+"The Water and Stone Blue Template optimized for 1024px x 768px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone_blue/templateDetails.xml
+msgid "waterandstone_blue"
+msgstr ""
+
+#: templates/waterandstone_green/templateDetails.xml
+msgid ""
+"The Water and Stone Green Template optimized for 1024px x 768px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone_green/templateDetails.xml
+msgid "waterandstone_green"
+msgstr ""
+
+#: templates/waterandstone_greenandblack/templateDetails.xml
+msgid ""
+"The Water and Stone Green and Black Template optimized for 1024px x 768px "
+"screen resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone_greenandblack/templateDetails.xml
+msgid "waterandstone_greenandblack"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:35
+#: administrator/components/com_content/admin.content.html.php:39
+msgid "Content Items Manager"
+msgstr "การจัดการเนื้อหา"
+
+#: administrator/components/com_content/admin.content.html.php:35
+msgid "Section: All"
+msgstr "หมวด: ทั้งหมด"
+
+#: administrator/components/com_content/admin.content.html.php:85
+msgid "Front Page"
+msgstr "หน้าแรกเว็บ"
+
+#: administrator/components/com_content/admin.content.html.php:287
+msgid "Please make a selection from the list to send to Trash"
+msgstr "โปรดเลือกรายการที่ต้องการลบ"
+
+#: administrator/components/com_content/admin.content.html.php:288
+msgid ""
+"Are you sure you want to Trash the selected items? \\nThis will not "
+"permanently delete the items."
+msgstr "คุณแน่ใจหรือไม่ ว่าจะโยนที่เลือกไว้ทิ้ง? \\n อันนี้จะไม่ได้ลบแบบสมบรูณ์ "
+
+#: administrator/components/com_content/admin.content.html.php:304
+#: administrator/components/com_content/admin.content.html.php:308
+msgid "Archive Manager"
+msgstr "การจัดการคลังเนื้อหา"
+
+#: administrator/components/com_content/admin.content.html.php:498
+msgid "Please select a Menu"
+msgstr "โปรดเลือกเมนู"
+
+#: administrator/components/com_content/admin.content.html.php:501
+msgid "Please enter a Name for this menu item"
+msgstr "กรุณาใส่ชื่อเมนู"
+
+#: administrator/components/com_content/admin.content.html.php:519
+#: components/com_content/content.html.php:908
+msgid "Content item must have a title"
+msgstr "เนื้อหาต้องมีหัวเรื่อง"
+
+#: administrator/components/com_content/admin.content.html.php:521
+msgid "You must select a Section."
+msgstr "คุณต้องเลือกหมวด."
+
+#: administrator/components/com_content/admin.content.html.php:523
+#: administrator/components/com_content/admin.content.html.php:525
+msgid "You must select a Category."
+msgstr "คุณต้องเลือกประเภท."
+
+#: administrator/components/com_content/admin.content.html.php:577
+msgid "Content Item:"
+msgstr "รายการเนื้อหา:"
+
+#: administrator/components/com_content/admin.content.html.php:598
+msgid "Show Advanced Details"
+msgstr "แสดงข้อมูลรายละเอียด"
+
+#: administrator/components/com_content/admin.content.html.php:601
+msgid "Hide Advanced Details"
+msgstr "ซ่อนข้อมูลรายละเอียด"
+
+#: administrator/components/com_content/admin.content.html.php:616
+msgid "Item Details"
+msgstr "รายละเอียดรายการ"
+
+#: administrator/components/com_content/admin.content.html.php:635
+msgid "Title Alias:"
+msgstr "ชื่อแทนหัวเรื่อง:"
+
+#: administrator/components/com_content/admin.content.html.php:653
+msgid "Intro Text:"
+msgstr "ข้อความส่วนต้น"
+
+#: administrator/components/com_content/admin.content.html.php:653
+msgid "required"
+msgstr "ต้องการ"
+
+#. parameters : areaname, content, hidden field, width, height, rows, cols
+#: administrator/components/com_content/admin.content.html.php:661
+msgid "Main Text:"
+msgstr "ข้อความหลัก:"
+
+#: administrator/components/com_content/admin.content.html.php:661
+msgid "optional"
+msgstr "ใส่เพิ่มเติม"
+
+#: administrator/components/com_content/admin.content.html.php:680
+#: components/com_content/content.html.php:1141
+msgid "Publishing"
+msgstr "การเผยแพร่"
+
+#: administrator/components/com_content/admin.content.html.php:685
+msgid "Publishing Info"
+msgstr "รายละเอียดการเผยแพร่"
+
+#: administrator/components/com_content/admin.content.html.php:690
+msgid "Show on Frontpage:"
+msgstr "แสดงในหน้าแรก:"
+
+#: administrator/components/com_content/admin.content.html.php:713
+#: components/com_content/content.html.php:1167
+msgid "Author Alias:"
+msgstr "ชื่อแทนผู้เขียน:"
+
+#: administrator/components/com_content/admin.content.html.php:721
+msgid "Change Creator:"
+msgstr "เปลี่ยนผู้สร้าง:"
+
+#: administrator/components/com_content/admin.content.html.php:733
+msgid "Override Created Date"
+msgstr "แก้ไขวันที่สร้าง"
+
+#: administrator/components/com_content/admin.content.html.php:742
+#: components/com_content/content.html.php:1183
+msgid "Start Publishing:"
+msgstr "เริ่มเผยแพร่:"
+
+#: administrator/components/com_content/admin.content.html.php:751
+#: components/com_content/content.html.php:1192
+msgid "Finish Publishing:"
+msgstr "สิ้นสุดการเผยแพร่:"
+
+#: administrator/components/com_content/admin.content.html.php:766
+msgid "Content ID:"
+msgstr "หมายเลขเนื้อหา:"
+
+#: administrator/components/com_content/admin.content.html.php:777
+#: components/com_content/content.html.php:1149
+msgid "State:"
+msgstr "สถานะ:"
+
+#: administrator/components/com_content/admin.content.html.php:780
+msgid "Archived"
+msgstr "ตั้งเป็นคลังเนื้อหา"
+
+#: administrator/components/com_content/admin.content.html.php:780
+msgid "Draft Unpublished"
+msgstr "ต้นฉบับยังไม่เผยแพร่"
+
+#: administrator/components/com_content/admin.content.html.php:792
+msgid "Reset Hit Count"
+msgstr "เริ่มต้นนับใหม่"
+
+#: administrator/components/com_content/admin.content.html.php:799
+msgid "Revised"
+msgstr "ทบทวน"
+
+#: administrator/components/com_content/admin.content.html.php:803
+msgid "times"
+msgstr "ครั้ง"
+
+#: administrator/components/com_content/admin.content.html.php:809
+msgid "Created"
+msgstr "สร้าง"
+
+#: administrator/components/com_content/admin.content.html.php:813
+#: administrator/components/com_content/admin.content.html.php:823
+msgid "By"
+msgstr "โดย"
+
+#: administrator/components/com_content/admin.content.html.php:819
+msgid "Last Modified"
+msgstr "แก้ไขครั้งสุดท้าย"
+
+#: administrator/components/com_content/admin.content.html.php:829
+#: components/com_content/content.html.php:1056
+msgid "Images"
+msgstr "รูป"
+
+#: administrator/components/com_content/admin.content.html.php:834
+msgid "MOSImage Control"
+msgstr "ควบคุมรูปแมมโบ"
+
+#: administrator/components/com_content/admin.content.html.php:838
+msgid "Sub-folder:"
+msgstr "โฟลเดอร์ย่อย:"
+
+#: administrator/components/com_content/admin.content.html.php:842
+msgid "Gallery Images:"
+msgstr "แกลลอรี่รูปภาพ:"
+
+#: administrator/components/com_content/admin.content.html.php:857
+msgid "Content Images:"
+msgstr "รูปในเนื้อหา:"
+
+#: administrator/components/com_content/admin.content.html.php:867
+msgid "up"
+msgstr "ขึ้น"
+
+#: administrator/components/com_content/admin.content.html.php:868
+msgid "down"
+msgstr "ลง"
+
+#: administrator/components/com_content/admin.content.html.php:869
+msgid "remove"
+msgstr "ย้าย"
+
+#: administrator/components/com_content/admin.content.html.php:874
+msgid "Edit the image selected:"
+msgstr "แก้ไขรูปที่เลือก:"
+
+#: administrator/components/com_content/admin.content.html.php:878
+#: components/com_content/content.html.php:1091
+msgid "Source:"
+msgstr "ที่มา:"
+
+#: administrator/components/com_content/admin.content.html.php:886
+msgid "Image Align:"
+msgstr "จัดวางรูป:"
+
+#: administrator/components/com_content/admin.content.html.php:894
+#: components/com_content/content.html.php:1107
+msgid "Alt Text:"
+msgstr "ข้อความของรูป"
+
+#: administrator/components/com_content/admin.content.html.php:902
+#: components/com_content/content.html.php:1115
+msgid "Border:"
+msgstr "เส้นขอบ:"
+
+#: administrator/components/com_content/admin.content.html.php:910
+msgid "Caption:"
+msgstr "หัวข้อ:"
+
+#: administrator/components/com_content/admin.content.html.php:918
+msgid "Caption Position:"
+msgstr "ตำแหน่งหัวข้อ:"
+
+#: administrator/components/com_content/admin.content.html.php:926
+msgid "Caption Align:"
+msgstr "การจัดวางหัวข้อ:"
+
+#: administrator/components/com_content/admin.content.html.php:934
+msgid "Width:"
+msgstr "กว้าง:"
+
+#: administrator/components/com_content/admin.content.html.php:942
+#: components/com_content/content.html.php:1124
+msgid "Apply"
+msgstr "ใช้งาน"
+
+#: administrator/components/com_content/admin.content.html.php:956
+msgid "Parameter Control"
+msgstr "ควบคุมพารามิเตอร์"
+
+#: administrator/components/com_content/admin.content.html.php:961
+msgid ""
+"These Parameters only control what you see when you click to view an item "
+"fully"
+msgstr "พารามิเตอร์เหล่านี้ควบคุมการแสดงผลเมื่อคุณดูเนื้อหา"
+
+#: administrator/components/com_content/admin.content.html.php:973
+msgid "Meta Info"
+msgstr "รายละเอียดเมต้า"
+
+#: administrator/components/com_content/admin.content.html.php:978
+msgid "Meta Data"
+msgstr "ข้อมูลเมต้า"
+
+#: administrator/components/com_content/admin.content.html.php:990
+#: components/com_content/content.html.php:1223
+msgid "Keywords:"
+msgstr "คำสำคัญ:"
+
+#: administrator/components/com_content/admin.content.html.php:997
+msgid "Add Sect/Cat/Title"
+msgstr "เพิ่มหมวด/ประเภท/หัวเรื่อง"
+
+#: administrator/components/com_content/admin.content.html.php:1003
+#: administrator/components/com_content/admin.content.html.php:1008
+#: administrator/components/com_content/admin.content.html.php:1037
+msgid "Link to Menu"
+msgstr "ลิงก์เมนู"
+
+#: administrator/components/com_content/admin.content.html.php:1013
+msgid "This will create a 'Link - Content Item' in the menu you select"
+msgstr "นี่จะเป็นการสร้างเมนูแบบ เชื่อมต่อ - รายการเนื้อหา ให้กับเมนูที่เลือก"
+
+#: administrator/components/com_content/admin.content.html.php:1019
+msgid "Select a Menu"
+msgstr "เลือกเมนู"
+
+#: administrator/components/com_content/admin.content.html.php:1027
+msgid "Menu Item Name"
+msgstr "ชื่อเมนู"
+
+#: administrator/components/com_content/admin.content.html.php:1042
+msgid "Existing Menu Links"
+msgstr "ออกจากเมนูลิงก์"
+
+#: administrator/components/com_content/admin.content.html.php:1116
+msgid "Please select something"
+msgstr "โปรดเลือกบางอย่าง"
+
+#: administrator/components/com_content/admin.content.html.php:1128
+msgid "Move Items"
+msgstr "ย้ายรายการ"
+
+#: administrator/components/com_content/admin.content.html.php:1137
+msgid "Move to Section/Category:"
+msgstr "ย้ายไปยัง หมวด/ประเภท"
+
+#: administrator/components/com_content/admin.content.html.php:1143
+msgid "Items being Moved:"
+msgstr "รายการกำลังถูกย้าย"
+
+#: administrator/components/com_content/admin.content.html.php:1186
+msgid "Please select a Section/Category to copy the items to"
+msgstr "โปรดเลือก หมวด/ประเภท ที่จะทำสำเนารายการไปไว้"
+
+#: administrator/components/com_content/admin.content.html.php:1197
+msgid "Copy Content Items"
+msgstr "ทำสำเนาเนื้อหา"
+
+#: administrator/components/com_content/admin.content.html.php:1206
+msgid "Copy to Section/Category:"
+msgstr "ทำสำเนาไป หมวด/ประเภท"
+
+#: administrator/components/com_content/admin.content.html.php:1212
+msgid "Items being copied:"
+msgstr "รายการกำลังถูกทำสำเนา"
+
+#: administrator/components/com_content/admin.content.php:164
+msgid "All Content Items"
+msgstr "เนื้อหาทั้งหมด"
+
+#: administrator/components/com_content/admin.content.php:385
+msgid "You cannot edit an archived item"
+msgstr "ไม่สามารถลบคลังเนื้อหา"
+
+#: administrator/components/com_content/admin.content.php:426
+#: administrator/components/com_content/admin.content.php:458
+#: administrator/components/com_content/admin.content.php:598
+msgid "Never"
+msgstr "ไมต้อง"
+
+#: administrator/components/com_content/admin.content.php:477
+msgid "Select Section"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:479
+msgid "Add Section(s) First"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:488
+#: administrator/components/com_content/admin.content.php:503
+#: administrator/components/com_content/admin.content.php:511
+msgid "Select Category"
+msgstr "เลือกประเภท"
+
+#: administrator/components/com_content/admin.content.php:498
+msgid "Add Categories First"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:681
+msgid "Successfully Saved changes to Item: "
+msgstr "ได้ทำการบันทึกการเปลี่ยนแปลงรายการ: "
+
+#: administrator/components/com_content/admin.content.php:686
+msgid "Successfully Saved Item: "
+msgstr "ได้ทำการบันทึกรายการ: "
+
+#: administrator/components/com_content/admin.content.php:723
+msgid "%d Item successfully Archived"
+msgid_plural "%d Items successfully Archived"
+msgstr[0] "%d รายการเอกสารสำคัญสมบูรณ์"
+msgstr[1] "%d รายการเอกสารสำคัญสมบูรณ์"
+
+#: administrator/components/com_content/admin.content.php:725
+msgid "%d Item successfully Published"
+msgid_plural "%d Items successfully Published"
+msgstr[0] "%d รายการเผยแพร่สมบูรณ์"
+msgstr[1] "%d รายการเผยแพร่สมบูรณ์"
+
+#: administrator/components/com_content/admin.content.php:727
+msgid "%d Item successfully Unpublished"
+msgid_plural "%d Items successfully Unpublished"
+msgstr[0] "%d รายการไม่เผยแพร่สมบูรณ์"
+msgstr[1] "%d รายการไม่เผยแพร่สมบูรณ์"
+
+#: administrator/components/com_content/admin.content.php:757
+msgid "Select an item to toggle"
+msgstr "เลือกรายการที่จะเปลี่ยน"
+
+#: administrator/components/com_content/admin.content.php:890
+#: administrator/components/com_content/admin.content.php:994
+msgid "An error has occurred"
+msgstr "มีความผิดพลาดเกิดขึ้น"
+
+#: administrator/components/com_content/admin.content.php:935
+msgid "%d Item successfully moved to Section: %s, Category: %s"
+msgid_plural "%d Items successfully moved to Section: %s, Category: %s"
+msgstr[0] "%d รายการได้ถูกย้ายไปหมวด: %s, ประเภท: %s"
+msgstr[1] "%d รายการได้ถูกย้ายไปหมวด: %s, ประเภท: %s"
+
+#: administrator/components/com_content/admin.content.php:1062
+msgid "%d Item successfully copied to Section: %s, Category: %s"
+msgid_plural "%d Items successfully copied to Section: %s, Category: %s"
+msgstr[0] "%d รายการได้ถูกทำสำเนาไปหมวด: %s, ประเภท: %s"
+msgstr[1] "%d รายการได้ถูกทำสำเนาไปหมวด: %s, ประเภท: %s"
+
+#: administrator/components/com_content/admin.content.php:1083
+msgid "Successfully Reset Hit count"
+msgstr "ได้ตั้งค่าการนับใหม่แล้ว"
+
+#: administrator/components/com_content/admin.content.php:1149
+#, php-format
+msgid "%s (Link - Static Content) in menu: %s successfully created"
+msgstr "%s (ลิงก์ เนื้อหาสเตติก) ในเมนู: %s ถูกสร้างเรียบร้อย"
+
+#: administrator/components/com_content/content.xml
+msgid "Content Page"
+msgstr "หน้าเนื้อหา"
+
+#: administrator/components/com_content/content.xml
+#: components/com_content/content.html.php:1015
+msgid "Intro Text"
+msgstr "ข้อความส่วนต้น"
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the intro text"
+msgstr "แสดง/ซ่อน ข้อความส่วนต้น"
+
+#: administrator/components/com_content/content.xml
+msgid "This shows a single content page"
+msgstr "แสดงเพียงหน้าเดียวของเนื้อหา"
+
+#: administrator/components/com_content/toolbar.content.html.php:45
+msgid "Trash"
+msgstr "ถังรีไซเคิล"
+
+#: components/com_content/content.html.php:70
+msgid "This Category is currently empty"
+msgstr "ไม่มีบทความในประเภทนี้"
+
+#: components/com_content/content.html.php:118
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] "%d รายการ"
+msgstr[1] "%d รายการ"
+
+#: components/com_content/content.html.php:132
+msgid "Registered Users Only"
+msgstr "เฉพาะสมาชิกเท่านั้น"
+
+#: components/com_content/content.html.php:184
+msgid "Display #"
+msgstr "แสดง #"
+
+#: components/com_content/content.html.php:268
+#: components/com_content/content.html.php:420
+msgid "Register to read more..."
+msgstr "ลงทะเบียน เพื่ออ่านข้อมูลได้มากขึ้น..."
+
+#: components/com_content/content.html.php:348
+msgid "More..."
+msgstr "ข้อมูลเพิ่มเติม..."
+
+#: components/com_content/content.html.php:415
+msgid "Read more..."
+msgstr "อ่านข้อมูลเพิ่มเติม..."
+
+#: components/com_content/content.html.php:610
+#: components/com_content/content.html.php:612
+#: components/com_content/content.html.php:616
+msgid "PDF"
+msgstr "PDF"
+
+#: components/com_content/content.html.php:635
+#: components/com_content/content.html.php:637
+#: components/com_content/content.html.php:641
+msgid "E-mail"
+msgstr "อีเมล"
+
+#: components/com_content/content.html.php:716
+msgid "Contributed by"
+msgstr "เขียนโดย"
+
+#: components/com_content/content.html.php:716
+msgid "Written by"
+msgstr "เขียนโดย"
+
+#: components/com_content/content.html.php:788
+msgid "Last Updated"
+msgstr "แก้ไขล่าสุดเมื่อ"
+
+#: components/com_content/content.html.php:828
+msgid "Previous"
+msgstr "ก่อนหน้า"
+
+#: components/com_content/content.html.php:912
+msgid "Please select a category"
+msgstr "กรุณาเลือกประเภทรายการ"
+
+#: components/com_content/content.html.php:914
+#: components/com_content/content.html.php:923
+msgid "Content item must have intro text"
+msgstr "กรุณาใส่ข้อความเกริ่นนำเรื่องด้วยครับ"
+
+#: components/com_content/content.html.php:939
+msgid "Please either Cancel or Save the current change"
+msgstr "กรุณาเลือกว่าจะยกเลิก หรือบันทึกสิ่งที่กำลังแก้ไขอยู่"
+
+#. $docinfo = "<strong>".T_('Subject:')."</strong> ";
+#. $docinfo .= $row->title."<br />";
+#: components/com_content/content.html.php:948
+msgid "Expiry Date:"
+msgstr "วันหมดอายุ:"
+
+#: components/com_content/content.html.php:950
+msgid "Version:"
+msgstr "เวอร์ชัน:"
+
+#: components/com_content/content.html.php:952
+msgid "Created:"
+msgstr "เขียนเมื่อ:"
+
+#: components/com_content/content.html.php:954
+msgid "Last Modified:"
+msgstr "แก้ไขล่าสุดเมื่อ:"
+
+#: components/com_content/content.html.php:956
+msgid "Hits:"
+msgstr "จำนวนครั้งที่เข้าขม:"
+
+#: components/com_content/content.html.php:964
+msgid "Item Information"
+msgstr "รายละเอียดเกี่ยวกับรายการ"
+
+#: components/com_content/content.html.php:965
+msgid "Info"
+msgstr "ข้อมูล"
+
+#: components/com_content/content.html.php:1015
+#: components/com_content/content.html.php:1021
+msgid "Required"
+msgstr "ต้องการ"
+
+#: components/com_content/content.html.php:1021
+#: components/com_content/content.html.php:1039
+msgid "Main Text"
+msgstr "ข้อความหลัก"
+
+#: components/com_content/content.html.php:1039
+msgid "Optional"
+msgstr "ข้อความเพิ่มเติม"
+
+#: components/com_content/content.html.php:1061
+msgid "Sub-folder"
+msgstr "โฟลเดอร์ย่อย"
+
+#: components/com_content/content.html.php:1066
+msgid "Gallery Images"
+msgstr "แกลลอรี่รูปภาพ"
+
+#: components/com_content/content.html.php:1069
+msgid "Content Images"
+msgstr "รูปในเนื้อหา"
+
+#: components/com_content/content.html.php:1072
+msgid "Edit Image"
+msgstr "แก้ไขรูปภาพ"
+
+#: components/com_content/content.html.php:1078
+msgid "Insert"
+msgstr "แทรก"
+
+#: components/com_content/content.html.php:1083
+msgid "Up"
+msgstr "ขึ้น"
+
+#: components/com_content/content.html.php:1084
+msgid "Down"
+msgstr "ลง"
+
+#: components/com_content/content.html.php:1099
+msgid "Align:"
+msgstr "จัดวาง:"
+
+#: components/com_content/content.html.php:1132
+#: components/com_content/content.html.php:1135
+msgid "No Image"
+msgstr "ไม่มีรูปภาพ"
+
+#: components/com_content/content.html.php:1201
+msgid "Show on Front Page:"
+msgstr "แสดงที่หน้าแรก:"
+
+#: components/com_content/content.html.php:1210
+msgid "Metadata"
+msgstr "เมตาดาต้า"
+
+#: components/com_content/content.html.php:1260
+#: components/com_content/content.php:1446
+msgid ""
+"You must enter valid e-mail addresses for both yourself and your recipient."
+msgstr "กรุณาใส่อีเมลที่ถูกต้องของคุณรวมทั้งอีเมลของเพื่อนที่ต้องการส่ง."
+
+#: components/com_content/content.html.php:1274
+msgid "E-mail this to a friend."
+msgstr "ส่งอีเมลข้อมูลนี้ให้เพื่อน."
+
+#: components/com_content/content.html.php:1282
+msgid "Your friend's E-mail:"
+msgstr "อีเมลของเพื่อนคุณ:"
+
+#: components/com_content/content.html.php:1290
+msgid "Your Name:"
+msgstr "ชื่อของคุณ:"
+
+#: components/com_content/content.html.php:1298
+msgid "Your E-mail:"
+msgstr "อีเมลของคุณ:"
+
+#: components/com_content/content.html.php:1306
+msgid "Message subject:"
+msgstr "หัวข้อ:"
+
+#: components/com_content/content.html.php:1317
+msgid "Send e-mail"
+msgstr "ส่งอีเมล"
+
+#: components/com_content/content.html.php:1318
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: components/com_content/content.html.php:1338
+msgid "This item has been sent to %s"
+msgstr "ข้อมูลนี้ได้จัดส่งไปยัง"
+
+#: components/com_content/content.html.php:1342
+msgid "Close Window"
+msgstr "ปิดหน้าต่างนี้"
+
+#: components/com_content/content.php:435
+msgid "Date Asc"
+msgstr "วันที่ เก่าก่อน"
+
+#: components/com_content/content.php:436
+msgid "Date Desc"
+msgstr "วันที่ ใหม่ก่อน"
+
+#: components/com_content/content.php:440
+msgid "Title Asc"
+msgstr "หัวข้อ เก่าก่อน"
+
+#: components/com_content/content.php:441
+msgid "Title Desc"
+msgstr "หัวข้อ ใหม่ก่อน"
+
+#: components/com_content/content.php:445
+msgid "Hits Asc"
+msgstr "ผู้ชม เก่าก่อน"
+
+#: components/com_content/content.php:446
+msgid "Hits Desc"
+msgstr "ผู้ชม ใหม่ก่อน"
+
+#: components/com_content/content.php:450
+msgid "Author Asc"
+msgstr "ผู้เขียน เก่าก่อน"
+
+#: components/com_content/content.php:451
+msgid "Author Desc"
+msgstr "ผู้เขียน ใหม่ก่อน"
+
+#. if no archives for category, hides search and outputs empty message
+#: components/com_content/content.php:648
+#: components/com_content/content.php:729
+msgid "There are currently no Archived Entries for this Category"
+msgstr "ไม่มีเอกสารสำคัญในประเภทนี้กรุณาลองอีกครั้ง"
+
+#. Search Success message
+#: components/com_content/content.php:827
+#, php-format
+msgid "Here are the Archived entries for %s %s"
+msgstr "มีเอกสารสำคัญใน %s %s"
+
+#. Search Failure message for Archives
+#: components/com_content/content.php:961
+#, php-format
+msgid "There are no Archived entries for %s %s"
+msgstr "ไม่มีเอกสารสำคัญใน %s %s"
+
+#. Generic blog empty display
+#: components/com_content/content.php:965
+msgid "There are no items to display"
+msgstr "ไม่มีบทความ"
+
+#: components/com_content/content.php:1169
+#, php-format
+msgid "The module [ %s ] is currently being edited by another person."
+msgstr "โมดูล [ %s ] กำลังถูกแก้ไขโดยผู้ดูแลท่านอื่น."
+
+#: components/com_content/content.php:1374
+#, php-format
+msgid ""
+"A new content item has been submitted by [ %s ]  titled [ %s ]  from section "
+"[ %s ]  and category  [ %s ]"
+msgstr ""
+"มีเนื้อหาใหม่ส่งมา โดย [ %s ]  หัวข้อ [ %s ]  จากหมวด [ %s ]  และประเภท  [ %s ]"
+
+#: components/com_content/content.php:1374
+msgid "New Item"
+msgstr "รายการใหม่"
+
+#: components/com_content/content.php:1379
+msgid "Item saved successfully."
+msgstr "บันทึกรายการเรียบร้อยแล้ว."
+
+#: components/com_content/content.php:1379
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+"ขอขอบคุณสำหรับข้อมูลที่คุณส่งเข้ามา. เจ้าหน้าที่จะทำการตรวจสอบก่อนที่จะนำขึ้นแสดงในเว็บแห่งนี้"
+
+#: components/com_content/content.php:1437
+#, php-format
+msgid "Item sent by %s"
+msgstr "ข้อมูลนี้จัดส่งโดย %s"
+
+#. message text
+#: components/com_content/content.php:1457
+#, php-format
+msgid ""
+" The following page from the \"%s\" website has been sent to you by %s ( %"
+"s ).\n"
+"\n"
+"You can access it at the following url:\n"
+"%s"
+msgstr ""
+"ข้อมูลที่คุณได้รับจากเว็บ \"%s\" ได้ถูกส่งมาให้คุณโดย %s ( %s ).\n"
+"\n"
+" คุณสามารถเข้าถึงมันที่ url ดังต่อไปนี้:\n"
+"%s"
+
+#: components/com_content/content.php:1508
+msgid "You already voted for this poll today!"
+msgstr "คุณได้ลงคะแนนไปแล้วสำหรับแบบสำรวจวันนี้!"
+
+#: components/com_content/content.php:1511
+msgid "Thanks for your vote!"
+msgstr "ขอบคุณสำหรับการลงคะแนน!"
+
+#: administrator/components/com_containers/admin.containers.html.php:26
+msgid "Icon"
+msgstr "ไอคอน"
+
+#: administrator/components/com_containers/admin.containers.html.php:45
+msgid "Display number"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:49
+msgid "Show Descendants?"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:64
+msgid "Parent container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:81
+msgid "Mambo "
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:134
+msgid "Top level container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:135
+msgid "Immediate container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:188
+#: administrator/components/com_containers/containers.xml
+msgid "Containers"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:248
+msgid "Edit Container details"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:250
+msgid "Container name"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:251
+msgid "Up to 500 characters"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:252
+msgid "Keywords"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:253
+msgid "Window title"
+msgstr ""
+
+#: administrator/components/com_containers/containers.xml
+msgid "Nested container system for Mambo"
+msgstr ""
+
+#: components/com_containers/containers.class.php:143
+msgid "No parent"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:27
+msgid "Contact Manager"
+msgstr "การจัดการติดต่อ"
+
+#: administrator/components/com_contact/admin.contact.html.php:62
+msgid "Linked to User"
+msgstr "เชื่อมโยงไปยังผู้ใช้งาน"
+
+#: administrator/components/com_contact/admin.contact.html.php:94
+msgid "Edit Contact"
+msgstr "แก้ไขการติดต่อ"
+
+#: administrator/components/com_contact/admin.contact.html.php:160
+msgid "You must provide a name."
+msgstr "คุณต้องใส่ชื่อ."
+
+#: administrator/components/com_contact/admin.contact.html.php:174
+msgid "Contact:"
+msgstr "ติดต่อกับ:"
+
+#: administrator/components/com_contact/admin.contact.html.php:188
+msgid "Contact Details"
+msgstr "รายละเอียดการติดต่อ"
+
+#: administrator/components/com_contact/admin.contact.html.php:201
+msgid "Linked to User:"
+msgstr "เชื่อมโยงไปยังผู้ใช้งาน:"
+
+#: administrator/components/com_contact/admin.contact.html.php:217
+msgid "Contact's Position:"
+msgstr "ตำแหน่งของผู้ติดต่อ:"
+
+#: administrator/components/com_contact/admin.contact.html.php:225
+msgid "E-mail:"
+msgstr "อีเมล:"
+
+#: administrator/components/com_contact/admin.contact.html.php:233
+msgid "Street Address:"
+msgstr "ที่อยู่ ถนน:"
+
+#: administrator/components/com_contact/admin.contact.html.php:241
+msgid "Town/Suburb:"
+msgstr "ตำบล/อำเภอ:"
+
+#: administrator/components/com_contact/admin.contact.html.php:249
+msgid "State/County:"
+msgstr "จังหวัด:"
+
+#: administrator/components/com_contact/admin.contact.html.php:257
+msgid "Country:"
+msgstr "ประเทศ:"
+
+#: administrator/components/com_contact/admin.contact.html.php:265
+msgid "Postal Code/ZIP:"
+msgstr "รหัสไปรษณีย์:"
+
+#: administrator/components/com_contact/admin.contact.html.php:273
+msgid "Telephone:"
+msgstr "โทรศัพท์:"
+
+#: administrator/components/com_contact/admin.contact.html.php:281
+msgid "Fax:"
+msgstr "แฟกซ์:"
+
+#: administrator/components/com_contact/admin.contact.html.php:289
+msgid "Miscellaneous Info:"
+msgstr "รายละเอียดอื่นๆ:"
+
+#: administrator/components/com_contact/admin.contact.html.php:311
+msgid "Site Default:"
+msgstr "ค่าเริ่มต้นของเว็บ:"
+
+#: administrator/components/com_contact/admin.contact.html.php:335
+msgid "Access:"
+msgstr "การเข้าถึง:"
+
+#: administrator/components/com_contact/admin.contact.html.php:354
+msgid "Image Info"
+msgstr "รายละเอียดรูป"
+
+#: administrator/components/com_contact/admin.contact.html.php:392
+msgid ""
+"These Parameters only control what you see when you click to view a Contact "
+"item"
+msgstr "พารามิเตอร์เหล่านี้ควบคุมการแสดงผลเมื่อคุณดูการติดต่อ"
+
+#: administrator/components/com_contact/admin.contact.php:255
+#, php-format
+msgid "Select a record to %s"
+msgstr "เลือกรายการเพื่อ %s"
+
+#: administrator/components/com_contact/contact.xml
+#: components/com_contact/contact.html.php:443
+msgid "Contact"
+msgstr "การติดต่อ"
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr "รายละเอียดของเว็บเพจ - หากไม่ระบุ ระบบจะโหลดข้อมูลมาจากไฟล์ภาษาโดยอัตโนมัติ"
+
+#: administrator/components/com_contact/contact.xml
+msgid "This component shows a listing of Contact Information"
+msgstr "คอมโพเน้นท์นี้ทำหน้าที่แสดงข้อมูลการติดต่อ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Address Icon"
+msgstr "ไอคอนที่อยู่"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Country"
+msgstr "ประเทศ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Description text"
+msgstr "ข้อความแสดงรายละเอียด"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Drop Down"
+msgstr "ดร๊อบดาวน์"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:106
+msgid "Email"
+msgstr "อีเมล"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Copy"
+msgstr "คัดลอกอีเมล"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Form"
+msgstr "แบบฟอร์มอีเมล"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email description"
+msgstr "รายละเอียดอีเมล"
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:124
+msgid "Fax"
+msgstr "โทรสาร"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Fax Icon"
+msgstr "ไอคอนโทรสาร"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Address info"
+msgstr "ไอคอนของที่อยู่"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Email info"
+msgstr "ไอคอนของอีเมล"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Fax info"
+msgstr "ไอคอนของโทรสาร"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Misc info"
+msgstr "ไอคอนของข้อมูลอื่นๆ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Telephone info"
+msgstr "ไอคอนของโทรศัพท์"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons"
+msgstr "ไอคอน"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons/text"
+msgstr "ไอคอน/ข้อความ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Icon"
+msgstr "ไอคอนข้อมูลอื่นๆ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Info"
+msgstr "ข้อมูลเพิ่มเติม"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Post/Zip Code"
+msgstr "รหัสไปรษณีย์"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Description Text below"
+msgstr "แสดง/ซ่อน ข้อความแสดงรายละเอียดด้านล่าง"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Drop Down select list in Contact view"
+msgstr "แสดง/ซ่อน ดร๊อบดาวน์สำหรับเลือกรายการในข้อมูลการติดต่อ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Vcard"
+msgstr "ซ่อน/แสดง วีการ์ด"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the checkbox to email a copy to the senders address"
+msgstr "แสดง/ซ่อน เช็คบล๊อกสำหรับสำเนาอีเมลกลับไปยังผู้ส่ง"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the country info"
+msgstr "แสดง/ซ่อน ประเทศ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"Show/Hide the email info, if you set to show the address will be protected "
+"from spambots by javascript cloaking"
+msgstr ""
+"แสดง/ซ่อน รายละเอียดของอีเมล, หากกำหนดให้แสดง ที่อยู่จะถูกป้องกันจากระบบสแปมบอทด้วย "
+"javascript cloaking"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the email to form"
+msgstr "แสดง/ซ่อน แบบฟอร์มอีเมล"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the fax info"
+msgstr "แสดง/ซ่อน โทรสาร"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the image"
+msgstr "แสดง/ซ่อน รูปภาพ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the misc info"
+msgstr "แสดง/ซ่อน ข้อมูลเพิ่มเติม"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the name info"
+msgstr "แสดง/ซ่อน ชื่อ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the position info"
+msgstr "แสดง/ซ่อน ตำแหน่ง"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the post code info"
+msgstr "แสดง/ซ่อน รหัสไปรษณีย์"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the state info"
+msgstr "แสดง/ซ่อน จังหวัด"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the street address info"
+msgstr "แสดง/ซ่อน ที่อยู่, ถนน"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the suburb info"
+msgstr "แสดง/ซ่อน ตำบล, อำเภอ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the telephone info"
+msgstr "แสดง/ซ่อน โทรศัพท์"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "State"
+msgstr "สถานะ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Street Address"
+msgstr "ที่อยู่, ถนน"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone"
+msgstr "โทรศัพท์"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone Icon"
+msgstr "ไอคอนโทรศัพท์"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"The Description text for the Email form, if left blank it will use the "
+"_EMAIL_DESCRIPTION language definition"
+msgstr "ข้อความเหล่านี้สำหรับแบบฟอร์มอีเมล, หากไม่ระบุระบบจะดึงมาจาก _EMAIL_DESCRIPTION"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Town/Suburb"
+msgstr "ตำบล, อำเภอ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Icons, text or nothing next to the contact information displayed"
+msgstr "ระบุว่าจะใช้ไอคอน ข้อความ หรือปล่อยว่าง สำหรับการแสดงข้อมูลการติดต่อ"
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Vcard"
+msgstr "วีการ์ด"
+
+#: components/com_contact/contact.class.php:163
+#, php-format
+msgid "Mambo vCard for %s"
+msgstr "วีการ์ดสำหรับ %s"
+
+#: components/com_contact/contact.html.php:115
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#: components/com_contact/contact.html.php:260
+#: components/com_contact/contact.php:51
+msgid "Please make sure the form is complete and valid."
+msgstr "กรุณาตรวจสอบความถูกต้องของข้อมูลทั้งหมด."
+
+#: components/com_contact/contact.html.php:387
+msgid "Select Contact:"
+msgstr "ต้องการติดต่อกับ:"
+
+#: components/com_contact/contact.html.php:631
+msgid "Download information as a"
+msgstr "ดาวน์โหลดข้อมูลเป็น"
+
+#: components/com_contact/contact.html.php:633
+msgid "VCard"
+msgstr "วีการ์ด"
+
+#: components/com_contact/contact.html.php:654
+msgid "Enter your name:"
+msgstr "กรุณาใส่ชื่อคุณ:"
+
+#: components/com_contact/contact.html.php:658
+msgid "E-mail address:"
+msgstr "กรุณาใส่อีเมลของคุณ:"
+
+#: components/com_contact/contact.html.php:666
+msgid "Enter your message:"
+msgstr "ข้อความที่ต้องการติดต่อ:"
+
+#: components/com_contact/contact.html.php:674
+msgid "Email a copy of this message to your own address"
+msgstr "สำเนาข้อความนี้ไปยังอีเมลคุณ"
+
+#: components/com_contact/contact.html.php:695
+msgid "There are no Contact Details listed."
+msgstr "ไม่มีรายละเอียดการติดต่อ."
+
+#: components/com_contact/contact.php:43
+msgid "Enquiry"
+msgstr "ติดต่อ/สอบถาม"
+
+#: components/com_contact/contact.php:348
+msgid "This is an enquiry e-mail via %s from:"
+msgstr "นี่คืออีเมลข้อความ (ติดต่อ/สอบถาม) จาก:"
+
+#: components/com_contact/contact.php:354
+msgid "The following is a copy of the message you sent to %s via %s "
+msgstr "นี้คือสำเนาข้อความของคุณที่ส่งถึงผู้ดูแล %s"
+
+#: components/com_contact/contact.php:62
+#, php-format
+msgid "Copy of: %s"
+msgstr "คัดลอกจาก: %s"
+
+#: components/com_contact/contact.php:67
+msgid "Thank you for your e-mail"
+msgstr "ขอบคุณสำหรับ ข้อความของคุณ"
+
+#: components/com_contact/contact.php:166
+msgid "The Contact list for this Website."
+msgstr "รายการติดต่อสำหรับเว็บไชต์."
+
+#: components/com_contact/contact.php:277
+msgid "Send an Email to this Contact:"
+msgstr "ส่งขอความหาเราได้ที่นี้:"
+
+#. text
+#: components/com_contact/contact.php:298
+msgid "Address: "
+msgstr "บ้านเลขที่: "
+
+#: components/com_contact/contact.php:299
+msgid "Email: "
+msgstr "อีเมล: "
+
+#: components/com_contact/contact.php:300
+msgid "Telephone: "
+msgstr "เบอร์โทรศัพท์: "
+
+#: components/com_contact/contact.php:301
+msgid "Fax: "
+msgstr "โทรสาร: "
+
+#: components/com_contact/contact.php:302
+msgid "Information: "
+msgstr "ข้อมูลเพิ่มเติม: "
+
+#: components/com_contact/contact.php:382
+msgid "Contact Us"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:102
+msgid "Global Configuration"
+msgstr "ตั้งค่าคอนฟิคหลัก"
+
+#: administrator/components/com_config/admin.config.html.php:104
+msgid "configuration.php is :"
+msgstr "configuration.php สถานะ :"
+
+#: administrator/components/com_config/admin.config.html.php:114
+msgid "Make unwriteable after saving"
+msgstr "ทำให้  ไม่สามารถเขียนทับได้ หลังจากทำบันทึก"
+
+#: administrator/components/com_config/admin.config.html.php:121
+msgid "Override write protection while saving"
+msgstr "ยกเลิกการป้องกันการเขียนทับขณะทำการบันทึก"
+
+#: administrator/components/com_config/admin.config.html.php:135
+msgid "Site Offline:"
+msgstr "เว็บออฟไลน์:"
+
+#: administrator/components/com_config/admin.config.html.php:139
+msgid "Offline Message:"
+msgstr "ข้อความออฟไลน์:"
+
+#: administrator/components/com_config/admin.config.html.php:141
+msgid "A message that displays if your site is offline"
+msgstr "ข้อความที่จะแสดงเวลาเว็บออฟไลน์"
+
+#: administrator/components/com_config/admin.config.html.php:146
+msgid "System Error Message:"
+msgstr "ข้อความผิดพลาดของระบบ:"
+
+#: administrator/components/com_config/admin.config.html.php:148
+msgid "A message that displays if Mambo could not connect to the database"
+msgstr "ข้อความที่จะแสดงเมื่อติดต่อฐานข้อมูลไม่ได้"
+
+#: administrator/components/com_config/admin.config.html.php:153
+msgid "Site Name:"
+msgstr "ชื่อเว็บ:"
+
+#: administrator/components/com_config/admin.config.html.php:157
+msgid "Show UnAuthorized Links:"
+msgstr "แสดงลิงก์ที่ไม่มีสิทธิ์:"
+
+#: administrator/components/com_config/admin.config.html.php:159
+msgid ""
+"If yes, will show links to content to registered content even if you are not "
+"logged in.  The user will need to login to see the item in full."
+msgstr ""
+"ถ้าใช่,จะแสดงลิงก์ไปข้อความที่ลงทะเบียนไว้ แม้ว่าคุณจะไม่ได้เข้าสู่ระบบก็ตาม. "
+"ผู้ใช้จะต้องเข้าสู่ระบบเพื่อดูข้อความเต็ม."
+
+#: administrator/components/com_config/admin.config.html.php:164
+msgid "Allow User Registration:"
+msgstr "อนุญาตให้ผู้ใช้ลงทะเบียน:"
+
+#: administrator/components/com_config/admin.config.html.php:166
+msgid "If yes, allows users to self-register"
+msgstr "ถ้าใช่, ผู้ใช้จะสามารถลงทะเบียนได้เอง"
+
+#: administrator/components/com_config/admin.config.html.php:171
+msgid "Use New Account Activation:"
+msgstr "ใช้การยืนยันลงทะเบียน:"
+
+#: administrator/components/com_config/admin.config.html.php:174
+msgid ""
+"If yes, the user will be mailed a link to activate their account before they "
+"can log in."
+msgstr "ถ้าใช่, ผู้ใช้จะได้รับอีเมลที่มีลิงก์เพื่อยืนยันการสมัคร."
+
+#: administrator/components/com_config/admin.config.html.php:179
+msgid "Require Unique Email:"
+msgstr "ห้ามมีอีเมลซ้ำกัน:"
+
+#: administrator/components/com_config/admin.config.html.php:181
+msgid "If yes, users cannot share the same email address"
+msgstr "ถ้าใช่, ผู้ใช้จะไม่สามารถใช้ตำแหน่งที่อยู่อีเมล์เดียวกัน"
+
+#: administrator/components/com_config/admin.config.html.php:186
+msgid "Debug Site:"
+msgstr "แก้ไขข้อผิดพลาดเว็บ:"
+
+#: administrator/components/com_config/admin.config.html.php:188
+msgid "If yes, displays diagnostic information and SQL errors if present"
+msgstr "ถ้าใช่, จะแสดงข้อความวินิจฉัยและความผิดพลาด SQL เมื่อเกิดความผิดพลาด"
+
+#: administrator/components/com_config/admin.config.html.php:197
+msgid "List Length:"
+msgstr "ความยาวรายการ:"
+
+#: administrator/components/com_config/admin.config.html.php:199
+msgid "Sets the default length of lists in the administrator for all users"
+msgstr "ตั้งค่าความยาวของรายการในส่วนควบคุมระบบสำหรับผู้ใช้ทุกคน"
+
+#: administrator/components/com_config/admin.config.html.php:204
+msgid "Favorites Site Icon:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:208
+msgid ""
+"If left blank or the file cannot be found, the default favicon.ico will be "
+"used."
+msgstr "ถ้าปล่อยว่างไว้หรือหาไฟล์ไม่พบจะใช้ favicon.ico เป็นไอคอนพื้นฐาน."
+
+#: administrator/components/com_config/admin.config.html.php:209
+msgid "Favourite Icon"
+msgstr "ไอคอนเว็บไซต์"
+
+#: administrator/components/com_config/admin.config.html.php:219
+msgid "Language:"
+msgstr "ภาษา:"
+
+#: administrator/components/com_config/admin.config.html.php:223
+msgid "Time Offset:"
+msgstr "ค่าเหลื่อมเวลา:"
+
+#: administrator/components/com_config/admin.config.html.php:227
+#, php-format
+msgid "Current date/time configured to display: %s"
+msgstr "ตั้งค่าเวลาปัจจุบันที่จะแสดง: %s"
+
+#: administrator/components/com_config/admin.config.html.php:232
+msgid "Debugging:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:236
+msgid "Use Gettext:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:240
+msgid "Country Locale:"
+msgstr "ประเทศ:"
+
+#: administrator/components/com_config/admin.config.html.php:250
+msgid "These Parameters control Output elements"
+msgstr "พารามิเตอร์เหล่านี้ควบคุมการแสดงผล"
+
+#: administrator/components/com_config/admin.config.html.php:253
+msgid "Linked Titles:"
+msgstr "ชื่อเนื้อหาเป็นลิงก์:"
+
+#: administrator/components/com_config/admin.config.html.php:256
+msgid "If yes, the title of content items will be hyperlinked to the item"
+msgstr "ถ้าใช่, หัวเรื่องของรายการจะแสดงเป็นลิงก์เชื่อมโยงไปยังรายการ"
+
+#: administrator/components/com_config/admin.config.html.php:261
+msgid "Read More Link:"
+msgstr "ลิงก์อ่านต่อ:"
+
+#: administrator/components/com_config/admin.config.html.php:264
+msgid ""
+"If set to show, the read-more link will show if main-text has been provided "
+"for the item"
+msgstr "ถ้าตั้งค่าเป็นแสดง, จะมีข้อความ อ่านต่อคลิกที่นี่ เพื่อเชื่อมโยงไปอ่านเนื้อหาทั้งหมด"
+
+#: administrator/components/com_config/admin.config.html.php:269
+msgid "Item Rating/Voting:"
+msgstr "โหวตให้คะแนน:"
+
+#: administrator/components/com_config/admin.config.html.php:272
+msgid "If set to show, a voting system will be enabled for content items"
+msgstr "ถ้าตั้งค่าเป็นแสดง, จะมีการโหวตให้คะแนนเนื้อหา"
+
+#: administrator/components/com_config/admin.config.html.php:277
+msgid "Author Names:"
+msgstr "ชื่อผู้เขียน:"
+
+#: administrator/components/com_config/admin.config.html.php:280
+msgid ""
+"If set to show, the name of the author will be displayed.  This a global "
+"setting but can be changed at menu and item levels."
+msgstr "ถ้าตั้งค่าเป็นแสดง, จะมีการแสดงชื่อผู้เขียน. สามารถปรับแต่งค่าในเมนูย่อยได้อีกที."
+
+#: administrator/components/com_config/admin.config.html.php:285
+msgid "Created Date and Time:"
+msgstr "วันเวลาที่สร้าง:"
+
+#: administrator/components/com_config/admin.config.html.php:288
+msgid ""
+"If set to show, the date and time an item was created will be displayed. "
+"This a global setting but can be changed at menu and item levels."
+msgstr ""
+"ถ้าตั้งค่าเป็นแสดง, จะมีการแสดงวันเวลาที่สร้าง. สามารถปรับแต่งค่าในเมนูย่อยได้อีกครั้งหนึ่ง."
+
+#: administrator/components/com_config/admin.config.html.php:293
+msgid "Modified Date and Time:"
+msgstr "วันเวลาที่แก้ไข:"
+
+#: administrator/components/com_config/admin.config.html.php:296
+msgid ""
+"If set to show, the date and time an item was last modified will be "
+"displayed.  This a global setting but can be changed at menu and item levels."
+msgstr ""
+"ถ้าตั้งค่าเป็นแสดง, จะมีการแสดงวันเวลาที่แก้ไข. สามารถปรับแต่งค่าในเมนูย่อยได้อีกครั้งหนึ่ง."
+
+#: administrator/components/com_config/admin.config.html.php:304
+msgid ""
+"If set to show, the hits for a particular item will be displayed.  This a "
+"global setting but can be changed at menu and item levels."
+msgstr ""
+"ถ้าตั้งค่าเป็นแสดง, จะมีการแสดงจำนวนครั้งที่เข้าขม. สามารถปรับแต่งค่าในเมนูย่อยได้อีกครั้งหนึ่ง."
+
+#: administrator/components/com_config/admin.config.html.php:309
+msgid "PDF Icon:"
+msgstr "ไอคอน PDF:"
+
+#: administrator/components/com_config/admin.config.html.php:314
+msgid "Option not available as /media directory not writable"
+msgstr "ตัวเลือกนี้ไม่สามารถใช้ได้เนื่องจากโฟลเดอร์ media ไม่สามารถเขียนได้"
+
+#: administrator/components/com_config/admin.config.html.php:322
+msgid "Print Icon:"
+msgstr "ไอคอนพิมพ์:"
+
+#: administrator/components/com_config/admin.config.html.php:327
+msgid "Email Icon:"
+msgstr "ไอคอนอีเมล:"
+
+#: administrator/components/com_config/admin.config.html.php:332
+msgid "Icons:"
+msgstr "ไอคอน:"
+
+#: administrator/components/com_config/admin.config.html.php:334
+msgid "Print, PDF and Email will utilise Icons or Text"
+msgstr "เลือกการใช้ไอคอนหรือตัวหนังสือสำหรับ PDF การพิมพ์หรืออีเมล"
+
+#: administrator/components/com_config/admin.config.html.php:337
+msgid "Table of Contents on multi-page items:"
+msgstr "ตารางสารบัญสำหรับเนื้อหาที่มีหลายหน้า:"
+
+#: administrator/components/com_config/admin.config.html.php:342
+msgid "Back Button:"
+msgstr "ปุ่มย้อนกลับ:"
+
+#: administrator/components/com_config/admin.config.html.php:347
+msgid "Content Item Navigation:"
+msgstr "แผงนำทางเนื้อหา:"
+
+#: administrator/components/com_config/admin.config.html.php:362
+msgid "Database"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:366
+msgid "Hostname:"
+msgstr "ชื่อโฮสต์:"
+
+#: administrator/components/com_config/admin.config.html.php:370
+msgid "MySQL Username:"
+msgstr "ชื่อผู้ใช้ฐานข้อมูล MySQL:"
+
+#: administrator/components/com_config/admin.config.html.php:374
+msgid "MySQL Password:"
+msgstr "รหัสผ่านฐานข้อมูล MySQL:"
+
+#: administrator/components/com_config/admin.config.html.php:378
+msgid "MySQL Database:"
+msgstr "ชื่อฐานข้อมูล MySQL:"
+
+#: administrator/components/com_config/admin.config.html.php:382
+msgid "MySQL Database Prefix:"
+msgstr "คำนำหน้า(Prefix)ชื่อตาราง:"
+
+#: administrator/components/com_config/admin.config.html.php:385
+msgid ""
+"!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE "
+"PREFIX YOU ARE SETTING !!"
+msgstr "!! อย่าเปลี่ยนถ้าคุณไม่แน่ใจในการใช้คำนำหน้าชื่อตารางที่คุณต้องการสร้างขึ้น !!"
+
+#: administrator/components/com_config/admin.config.html.php:391
+msgid "Server"
+msgstr "เซิร์ฟเวอร์"
+
+#: administrator/components/com_config/admin.config.html.php:395
+msgid "Absolute Path:"
+msgstr "ค่าเต็มของพาธ:"
+
+#: administrator/components/com_config/admin.config.html.php:400
+msgid "Live Site:"
+msgstr "ที่อยู่จริง:"
+
+#: administrator/components/com_config/admin.config.html.php:406
+msgid "Secret Word:"
+msgstr "คำลับ:"
+
+#: administrator/components/com_config/admin.config.html.php:412
+msgid "GZIP Page Compression:"
+msgstr "บีบอัดด้วย GZIP:"
+
+#: administrator/components/com_config/admin.config.html.php:415
+msgid "Compress buffered output if supported"
+msgstr "บีบอัดบับเฟอร์ ถ้าสามารถทำได้"
+
+#: administrator/components/com_config/admin.config.html.php:420
+msgid "Login Session Lifetime:"
+msgstr "เวลาเซสชั่นสำหรับการล็อกอิน:"
+
+#: administrator/components/com_config/admin.config.html.php:423
+#: administrator/components/com_config/admin.config.html.php:703
+msgid "seconds"
+msgstr "วินาที"
+
+#: administrator/components/com_config/admin.config.html.php:424
+msgid "Auto logout after this time of inactivity"
+msgstr "ล็อกเอาท์อัตโนมัติหลังจากเวลา"
+
+#: administrator/components/com_config/admin.config.html.php:429
+msgid "Error Reporting:"
+msgstr "รายงานความผิดพลาด:"
+
+#: administrator/components/com_config/admin.config.html.php:434
+msgid "Register Globals Emulation:"
+msgstr "การจำค่าการลงทะเบียน:"
+
+#: administrator/components/com_config/admin.config.html.php:438
+msgid ""
+"Register globals emulation. Some components may stop working if this option "
+"is set to Off."
+msgstr "การจำค่าการลงทะเบียน. คอมโพเน้นท์จำนวนหนึ่งอาจหยุดทำงานเมื่อตั้งค่าตัวเลือกนี้เป็น Off."
+
+#: administrator/components/com_config/admin.config.html.php:444
+msgid "Help Server:"
+msgstr "เซิร์ฟเวอร์ที่ให้ความช่วยเหลือ:"
+
+#. if
+#: administrator/components/com_config/admin.config.html.php:456
+msgid "File Creation:"
+msgstr "การสร้างไฟล์:"
+
+#: administrator/components/com_config/admin.config.html.php:462
+msgid "Dont CHMOD new files (use server defaults)"
+msgstr "ไม่เปลี่ยน CHMOD ไฟล์ใหม่ (ใช้ค่าพื้นฐานเครื่องเซิร์ฟเวอร์)"
+
+#: administrator/components/com_config/admin.config.html.php:467
+msgid "CHMOD new files"
+msgstr "เปลี่ยน CHMOD ไฟล์ใหม่"
+
+#: administrator/components/com_config/admin.config.html.php:469
+msgid "to:"
+msgstr "เพื่อ:"
+
+#: administrator/components/com_config/admin.config.html.php:472
+msgid "Select this option to define permission flags for new created files"
+msgstr "เลือกการตั้งค่านี้เพื่อกำหนดการเข้าถึงสำหรับไฟล์ที่สร้างใหม่"
+
+#: administrator/components/com_config/admin.config.html.php:500
+msgid "Apply to existing files"
+msgstr "ทำกับไฟล์ที่มีอยู่"
+
+#: administrator/components/com_config/admin.config.html.php:503
+msgid ""
+"Checking here will apply the permission flags to <em>all existing files</em> "
+"of the site.<br/>"
+msgstr "เลือกข้อนี้จะเปลี่ยนการเข้าถึงไฟล์ที่มีอยู่ทั้งหมด.<br/>"
+
+#: administrator/components/com_config/admin.config.html.php:504
+#: administrator/components/com_config/admin.config.html.php:582
+msgid ""
+"<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>"
+msgstr "<b>การใช้ตัวเลือกนี้อย่างไม่เหมาะสมอาจทำให้เว็บไม่ทำงาน!</b>"
+
+#. if
+#: administrator/components/com_config/admin.config.html.php:535
+msgid "Directory Creation:"
+msgstr "การสร้างไดเรกทอรี่่:"
+
+#: administrator/components/com_config/admin.config.html.php:541
+msgid "Dont CHMOD new directories (use server defaults)"
+msgstr "ไม่เปลี่ยน (CHMOD) การเข้าถึงไดเรกทอรี่่ใหม่ (ใช้ค่าพื้นฐานเครื่องเซิร์ฟเวอร์)"
+
+#: administrator/components/com_config/admin.config.html.php:546
+msgid "CHMOD new directories"
+msgstr "เปลี่ยน(CHMOD)การเข้าถึงไดเรกทอรี่่ใหม่"
+
+#: administrator/components/com_config/admin.config.html.php:551
+msgid ""
+"Select this option to define permission flags for new created directories"
+msgstr "เลือกข้อนี้เพื่อตั้งค่าการเข้าถึงไดเรกทอรี่่ใหม่"
+
+#: administrator/components/com_config/admin.config.html.php:579
+msgid "Apply to existing directories"
+msgstr "ทำกับไดเรกทอรี่่ที่มีอยู่"
+
+#: administrator/components/com_config/admin.config.html.php:581
+msgid ""
+"Checking here will apply the permission flags to <em>all existing "
+"directories</em> of the site.<br/>"
+msgstr "เลือกข้อนี้จะเปลี่ยนการเข้าถึงไดเรกทอรี่่ที่มีอยู่ทั้งหมด.<br/>"
+
+#: administrator/components/com_config/admin.config.html.php:610
+msgid "Global Site Meta Description:"
+msgstr "รายละเอียดค่าแท็กเมต้าของเว็บ:"
+
+#: administrator/components/com_config/admin.config.html.php:614
+msgid "Global Site Meta Keywords:"
+msgstr "คำสำคัญในแท็กเมต้าของเว็บ:"
+
+#: administrator/components/com_config/admin.config.html.php:618
+msgid "Show Title Meta Tag:"
+msgstr "แสดงชื่อเว็บในแท็กเมต้าของเว็บ:"
+
+#: administrator/components/com_config/admin.config.html.php:622
+msgid "Show the title meta tag when viewing content items"
+msgstr "แสดงชื่อเว็บในแท็กเมต้าของเว็บเมื่ออ่านเนื้อหา"
+
+#: administrator/components/com_config/admin.config.html.php:626
+msgid "Show Author Meta Tag:"
+msgstr "แสดงชื่อผู้เขียนในแท็กเมต้า:"
+
+#: administrator/components/com_config/admin.config.html.php:630
+msgid "Show the author meta tag when viewing content items"
+msgstr "แสดงชื่อผู้เขียนในแท็กเมต้าของเว็บเมื่ออ่านเนื้อหา"
+
+#: administrator/components/com_config/admin.config.html.php:636
+msgid "Mail"
+msgstr "เมล"
+
+#: administrator/components/com_config/admin.config.html.php:640
+msgid "Mailer:"
+msgstr "ตัวส่งเมล:"
+
+#: administrator/components/com_config/admin.config.html.php:644
+msgid "Mail From:"
+msgstr "ส่งเมลจาก:"
+
+#: administrator/components/com_config/admin.config.html.php:648
+msgid "From Name:"
+msgstr "จากชื่อ:"
+
+#: administrator/components/com_config/admin.config.html.php:652
+msgid "Sendmail Path:"
+msgstr "พาธการส่งเมล:"
+
+#: administrator/components/com_config/admin.config.html.php:656
+msgid "SMTP Auth:"
+msgstr "SMTP Auth:"
+
+#: administrator/components/com_config/admin.config.html.php:660
+msgid "SMTP User:"
+msgstr "SMTP User:"
+
+#: administrator/components/com_config/admin.config.html.php:664
+msgid "SMTP Pass"
+msgstr "SMTP Pass"
+
+#: administrator/components/com_config/admin.config.html.php:668
+msgid "SMTP Host:"
+msgstr "SMTP Host:"
+
+#: administrator/components/com_config/admin.config.html.php:674
+msgid "Cache"
+msgstr "หน่วยความจำชั่วคราว"
+
+#: administrator/components/com_config/admin.config.html.php:681
+msgid "Caching:"
+msgstr "มีการเก็บแคช:"
+
+#: administrator/components/com_config/admin.config.html.php:689
+msgid "Cache Folder:"
+msgstr "โฟลเดอร์แคช:"
+
+#: administrator/components/com_config/admin.config.html.php:694
+msgid "Current cache is directory is <b>Writeable</b>"
+msgstr "ไดเรกทอรี่่ที่เก็บแคชในตอนนี้คือ <b>สามารถเขียนได้</b>"
+
+#: administrator/components/com_config/admin.config.html.php:696
+msgid ""
+"The cache directory is UNWRITEABLE - please set this directory to CHMOD755 "
+"before turning on the cache"
+msgstr "ไดเรกทอรี่่ที่เก็บแคช ไม่สามารถเขียนได้ - กรุณาตั้งค่าเป็น CHMOD755 ก่อนที่จะใช้แคช"
+
+#: administrator/components/com_config/admin.config.html.php:702
+msgid "Cache Time:"
+msgstr "ระยะเวลาแคช:"
+
+#: administrator/components/com_config/admin.config.html.php:713
+msgid "Statistics:"
+msgstr "สถิติ:"
+
+#: administrator/components/com_config/admin.config.html.php:715
+msgid "Enable/disable collection of site statistics"
+msgstr "ตั้งค่าการเก็บสถิติของเว็บ"
+
+#: administrator/components/com_config/admin.config.html.php:718
+msgid "Log Content Hits by Date:"
+msgstr "เก็บจำนวนการเข้าชมแต่ละวัน:"
+
+#: administrator/components/com_config/admin.config.html.php:720
+msgid "WARNING : Large amounts of data will be collected"
+msgstr "คำเตือน: จะมีการเก็บข้อมูลจำนวนมาก"
+
+#: administrator/components/com_config/admin.config.html.php:723
+msgid "Log Search Strings:"
+msgstr "เก็บคำค้นหา:"
+
+#: administrator/components/com_config/admin.config.html.php:730
+msgid "SEO"
+msgstr "SEO"
+
+#: administrator/components/com_config/admin.config.html.php:734
+msgid "Search Engine Optimization"
+msgstr "ปรับแต่งสำหรับเครื่องมือค้นหาเว็บ"
+
+#: administrator/components/com_config/admin.config.html.php:739
+msgid "Search Engine Friendly URLs:"
+msgstr "ชื่อ URL แบบง่ายเหมาะกับเครื่องมือค้นหาเว็บ:"
+
+#: administrator/components/com_config/admin.config.html.php:741
+msgid "Apache only! Rename htaccess.txt to .htaccess before activating"
+msgstr "สำหรับอาปาเช่เท่านั้น! ให้เปลี่ยนชื่อ htaccess.txt เป็น .htaccess ก่อนจะใช้งาน"
+
+#: administrator/components/com_config/admin.config.html.php:744
+msgid "Dynamic Page Titles:"
+msgstr "ชื่อเว็บเปลี่ยนได้ตามเนื้อหา:"
+
+#: administrator/components/com_config/admin.config.html.php:746
+msgid "Dynamically changes the page title to reflect current content viewed"
+msgstr "ชื่อเว็บเปลี่ยนได้ตามเนื้อหาที่แสดงผล"
+
+#: administrator/components/com_config/admin.config.php:346
+msgid "System Default"
+msgstr "ค่าปกติของระบบ"
+
+#: administrator/components/com_config/admin.config.php:348
+msgid "Simple"
+msgstr "ง่าย"
+
+#: administrator/components/com_config/admin.config.php:349
+msgid "Maximum"
+msgstr "มากสุด"
+
+#: administrator/components/com_config/admin.config.php:353
+#: administrator/components/com_config/admin.config.php:357
+msgid "On"
+msgstr "เปิด"
+
+#: administrator/components/com_config/admin.config.php:354
+#: administrator/components/com_config/admin.config.php:358
+msgid "Off"
+msgstr "ปิด"
+
+#: administrator/components/com_config/admin.config.php:366
+msgid "PHP mail function"
+msgstr "ใช้การส่งเมลของ PHP"
+
+#: administrator/components/com_config/admin.config.php:367
+msgid "Sendmail"
+msgstr "ส่งเมล"
+
+#: administrator/components/com_config/admin.config.php:368
+msgid "SMTP Server"
+msgstr "SMTP เซิร์ฟเวอร์"
+
+#: administrator/components/com_config/admin.config.php:412
+msgid "Remember to rename htaccess.txt to .htaccess"
+msgstr "อย่าลืมเปลี่ยนชื่อ htaccess.txt เป็น .htaccess "
+
+#: administrator/components/com_config/admin.config.php:445
+msgid "Remember to install the MambelFish component."
+msgstr "อย่าลืมติดตั้ง MambelFish คอมโพเน้นท์."
+
+#. if
+#: administrator/components/com_config/admin.config.php:502
+msgid "The Configuration Details have been updated"
+msgstr "The Configuration Details have been updated"
+
+#: administrator/components/com_config/admin.config.php:558
+msgid "An Error Has Occurred! Unable to open config file to write!"
+msgstr "มีความผิดพลาด! ไม่สามารถเปิดไฟล์ระบบเพื่อเขียนได้!"
+
+#: administrator/includes/admin.php:45
+#, php-format
+msgid "XML ERROR in %s: %s at line %d"
+msgstr "XML ผิดพลาด ใน %s: %s ที่บรรทัด %d"
+
+#: administrator/includes/admin.php:51
+#, php-format
+msgid "Unable to open XML file %s"
+msgstr "ไม่สามารถเปิด XML ไฟล์ %s"
+
+#: administrator/includes/admin.php:54
+#, php-format
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr "XML ผิดพลาด ใน %s - ไม่สามารถปิดคำ (%s) ที่สิ้นสุดไฟล์"
+
+#: administrator/includes/admin.php:84
+#, php-format
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr "XML ผิดพลาด ใน %s: %s หรือส่วนประกอบที่มีอยู่ไม่สมบูรณ์"
+
+#: administrator/includes/admin.php:85
+#, php-format
+msgid "XML error in %s: %s not permitted within %s"
+msgstr "XML ผิดพลาด ใน %s: %s ไม่ถูกยินยอมภายใน %s"
+
+#: administrator/includes/admin.php:95
+#, php-format
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr "XML ผิดพลาด ใน %s: ซึ่ง MOSINSTALL ไม่สามารถค้นพบ %s"
+
+#: administrator/includes/admin.php:101
+#, php-format
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr "XML ผิดพลาด ใน %s: ล่าสุดที่ถูกเปิดไว้ %s, ไม่สามารถค้นพบในส่วนสุดท้ายของ %s"
+
+#: administrator/includes/admin.php:121
+#, php-format
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr "XML ผิดพลาด ใน %s: mosinstall ไม่สามารถกระทำภายใต้เงื่อนไขที่มีให้"
+
+#: administrator/includes/admin.php:273
+msgid "Handler not defined for type"
+msgstr "ผู้ดูแลไม่ได้กำหนดสำหรับชนิดนี้"
+
+#: administrator/includes/admin.php:286
+msgid "There are no Parameters for this item"
+msgstr "ไม่ได้ตั้งค่า พารามิเตอร์ สำหรับไอเทม"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:43
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:78
+msgid "Please make a selection from the list to %s"
+msgstr "โปรดเลือกประเภทเพื่อ"
+
+#: administrator/includes/menubar.html.php:154 includes/HTML_toolbar.php:103
+msgid "Please make a selection from the list to publish"
+msgstr "โปรดเลือกรายการเพื่อเผยแพร่"
+
+#: administrator/includes/menubar.html.php:164
+msgid "Please select an item to make default"
+msgstr "โปรดเลือกรายการเพื่อกำหนดเป็นค่าเริ่มต้น"
+
+#: administrator/includes/menubar.html.php:174
+msgid "Please select an item to assign"
+msgstr "โปรดเลือกเรื่องเพื่อกำหนด"
+
+#: administrator/includes/menubar.html.php:193 includes/HTML_toolbar.php:143
+msgid "Please make a selection from the list to unpublish"
+msgstr "โปรดเลือกรายการเพื่อยุติการเผยแพร่"
+
+#: administrator/includes/menubar.html.php:203 includes/HTML_toolbar.php:163
+msgid "Please make a selection from the list to archive"
+msgstr "โปรดเลือกรายการเพื่อจัดเก็บเป็นคลังเนื้อหา"
+
+#: administrator/includes/menubar.html.php:213 includes/HTML_toolbar.php:183
+msgid "Please select a news story to unarchive"
+msgstr "โปรดเลือกรายการเพื่อยกเลิกเป็นคลังเนื้อหา"
+
+#: administrator/includes/menubar.html.php:223
+#: administrator/includes/menubar.html.php:234
+#: administrator/includes/menubar.html.php:244
+#: administrator/includes/menubar.html.php:255
+#: administrator/includes/menubar.html.php:265
+#: administrator/includes/menubar.html.php:276 includes/HTML_toolbar.php:203
+#: includes/HTML_toolbar.php:222 includes/HTML_toolbar.php:241
+msgid "Please select an item from the list to edit"
+msgstr "โปรดเลือกรายการเพื่อแก้ไข"
+
+#: administrator/includes/menubar.html.php:287
+#: administrator/includes/menubar.html.php:299 includes/HTML_toolbar.php:262
+msgid "Please make a selection from the list to delete"
+msgstr "โปรดเลือกรายการเพื่อลบ"
+
+#: administrator/includes/menubar.html.php:480
+#: administrator/includes/menubar.html.php:481 includes/HTML_toolbar.php:392
+#: includes/HTML_toolbar.php:393
+msgid "Upload Image"
+msgstr "อัพโหลด รูปภาพ"
+
+#: administrator/includes/mosAdminMenus.php:162
+msgid "Parent Window With Browser Navigation"
+msgstr "หน้าต่างเดียวกันกับโปรแกรมเบราว์เซอร์"
+
+#: administrator/includes/mosAdminMenus.php:163
+msgid "New Window With Browser Navigation"
+msgstr "หน้าต่างใหม่กับโปรแกรมเบราว์เซอร์"
+
+#: administrator/includes/mosAdminMenus.php:164
+msgid "New Window Without Browser Navigation"
+msgstr "หน้าต่างใหม่แยกออกจากโปรแกรมเบราว์เซอร์"
+
+#: administrator/includes/mosAdminMenus.php:285
+#: administrator/includes/mosAdminMenus.php:476
+msgid "- All Sections -"
+msgstr "- เลือก หมวดหมู่ -"
+
+#: administrator/includes/mosAdminMenus.php:371
+msgid "- Select Image -"
+msgstr "- เลือก รูปภาพ -"
+
+#: administrator/includes/mosAdminMenus.php:389
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr "ข้อมูลใหม่มาก่อน. รายการที่เลือกนี้จะทำงานหลังจากมีการบันทึก."
+
+#: administrator/includes/mosAdminMenus.php:416
+msgid "- No User -"
+msgstr "- ไม่มี สมาชิก -"
+
+#: administrator/includes/mosAdminMenus.php:435
+msgid "Center"
+msgstr "ตรงกลาง"
+
+#: administrator/includes/mosAdminMenus.php:465
+msgid "You must create a category first."
+msgstr "ท่านจะต้องทำการสร้างหมวดย่อยก่อน."
+
+#: administrator/includes/pageNavigation.php:74
+#, php-format
+msgid "Results %d to %d of %d"
+msgstr "ผลลัพธ์ %d ถึง %d จาก %d"
+
+#: administrator/includes/pageNavigation.php:76
+msgid "No records found."
+msgstr "ไม่มีในบันทึก."
+
+#: administrator/includes/pageNavigation.php:103
+#: administrator/includes/pageNavigation.php:106
+#: includes/pageNavigation.php:106 includes/pageNavigation.php:109
+msgid "Start"
+msgstr "เริ่ม"
+
+#: administrator/includes/pageNavigation.php:103
+#: includes/pageNavigation.php:106
+msgid "first page"
+msgstr "หน้าแรก"
+
+#: administrator/includes/pageNavigation.php:104
+#: includes/pageNavigation.php:107
+msgid "previous page"
+msgstr "หน้าก่อนหน้า"
+
+#: administrator/includes/pageNavigation.php:122
+#: includes/pageNavigation.php:125
+msgid "next page"
+msgstr "หน้าต่อไป"
+
+#: administrator/includes/pageNavigation.php:123
+#: administrator/includes/pageNavigation.php:126
+#: includes/pageNavigation.php:126 includes/pageNavigation.php:129
+msgid "End"
+msgstr "สุดท้าย"
+
+#: administrator/includes/pageNavigation.php:123
+#: includes/pageNavigation.php:126
+msgid "end page"
+msgstr "หน้าสุดท้าย"
+
+#: includes/HTML_toolbar.php:37
+msgid "Please make a selection from the list to"
+msgstr "โปรดเลือกประเภทเพื่อ"
+
+#: includes/HTML_toolbar.php:156
+msgid "Archive"
+msgstr "คลังเนื้อหา"
+
+#: includes/HTML_toolbar.php:176
+msgid "Unarchive"
+msgstr "ยกเลิกคลังเนื้อหา"
+
+#: includes/HTML_toolbar.php:216
+msgid "Edit HTML"
+msgstr "แก้ไข HTML"
+
+#: includes/HTML_toolbar.php:235
+msgid "Edit CSS"
+msgstr "แก้ไข CSS"
+
+#: includes/HTML_toolbar.php:262
+msgid "Are you sure you want to delete selected items?"
+msgstr "คุณแน่ใจไหมที่จะลบรายการนี้?"
+
+#: includes/HTML_toolbar.php:313 includes/HTML_toolbar.php:314
+#: includes/HTML_toolbar.php:328 includes/HTML_toolbar.php:329
+msgid "save"
+msgstr "บันทึก"
+
+#: includes/HTML_toolbar.php:364 includes/HTML_toolbar.php:365
+msgid "back"
+msgstr "ก่อนหน้า"
+
+#: includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr "กรุณาใส่ข้อมูลผู้ใช้และรหัสผ่านให้ครบถ้วน."
+
+#: includes/authenticator.php:42
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr "การเข้าใช้ไม่ถูกยินยอม.  คุณยังไม่ถูกอนุญาตให้เข้าใช้งาน."
+
+#: includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr "ล็อกอินของคุณ ถูกระงับการใช้งาน. กรุณาติดต่อผู้ดูแลระบบ."
+
+#: includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr "ชื่อผู้ใช้หรือรหัสผ่าน ไม่ถูกต้อง  กรุณาลองใหม่."
+
+#: includes/authenticator.php:151
+msgid "Please enter a password"
+msgstr "กรุณาใส่รหัสผ่าน"
+
+#: includes/authenticator.php:167
+msgid "You cannot login. There are no administrators set up."
+msgstr "คุณไม่สามารถล็อกอินได้. เนื่องจากผู้ดูแลระบบยังไม่ได้จัดเตรียมข้อมูลไว้."
+
+#: includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr "ชื่อ, รหัสผ่าน, หรือ ระดับของผู้ใช้งานซ้ำหรือผิดพลาด.  ลองใหม่อีกครั้ง"
+
+#: includes/cmtclasses.php:143
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:165
+#, php-format
+msgid "Component %s error: attempt to use non-existent method %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:167 includes/cmtclasses.php:173
+#: includes/cmtclasses.php:231
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:210
+#, php-format
+msgid "MOS error in %s: method %s not found in class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:212
+#, php-format
+msgid "MOS error in %s: class not found %s"
+msgstr ""
+
+#: includes/cmtclasses.php:533
+msgid "Your Module must contain a title."
+msgstr "โมดูลต้องมีหัวเรื่อง."
+
+#: includes/core.classes.php:351
+msgid "Impossible to determine the name of this server"
+msgstr ""
+
+#: includes/mamboHTML.php:103
+msgid "January"
+msgstr "มกราคม"
+
+#: includes/mamboHTML.php:104
+msgid "February"
+msgstr "กุมภาพันธ์"
+
+#: includes/mamboHTML.php:105
+msgid "March"
+msgstr "มีนาคม"
+
+#: includes/mamboHTML.php:106
+msgid "April"
+msgstr "เมษายน"
+
+#: includes/mamboHTML.php:107
+msgid "May"
+msgstr "พฤษภาคม"
+
+#: includes/mamboHTML.php:108
+msgid "June"
+msgstr "มิถุนายน"
+
+#: includes/mamboHTML.php:109
+msgid "July"
+msgstr "กรกฏาคม"
+
+#: includes/mamboHTML.php:110
+msgid "August"
+msgstr "สิงหาคม"
+
+#: includes/mamboHTML.php:111
+msgid "September"
+msgstr "กันยายน"
+
+#: includes/mamboHTML.php:112
+msgid "October"
+msgstr "ตุลาคม"
+
+#: includes/mamboHTML.php:113
+msgid "November"
+msgstr "พฤษจิกายน"
+
+#: includes/mamboHTML.php:114
+msgid "December"
+msgstr "ธันวาคม"
+
+#: includes/mamboHTML.php:202
+msgid "No Sorting"
+msgstr "ไม่ เรียงลำดับ"
+
+#: includes/mamboHTML.php:203
+msgid "Sort Ascending"
+msgstr "เรียงจากน้อยไปมาก"
+
+#: includes/mamboHTML.php:204
+msgid "Sort Descending"
+msgstr "เรียงจากมากมาน้อย"
+
+#. Print Preview button - used when viewing page
+#. Print Button - used in pop-up window
+#: includes/mamboHTML.php:282 includes/mamboHTML.php:284
+#: includes/mamboHTML.php:291 includes/mamboHTML.php:300
+msgid "Print"
+msgstr "พิมพ์"
+
+#: includes/mamboHTML.php:356
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr "อีเมลนี้จะถูกป้องกันจากสแปมบอท, แต่คุณต้องเปิดการใช้งานจาวาสคริปก่อน"
+
+#: includes/mamboHTML.php:381
+msgid "Pending"
+msgstr "รอ"
+
+#: includes/mamboHTML.php:384
+msgid "Published, but is <u>Pending</u>"
+msgstr "รอการเผยแพร่"
+
+#: includes/mamboHTML.php:387
+msgid "Visible"
+msgstr "มองเห็นได้"
+
+#: includes/mamboHTML.php:390
+msgid "Published and is <u>Current</u>"
+msgstr "เผยแพร่แล้ว"
+
+#: includes/mamboHTML.php:393 includes/mamboHTML.php:399
+msgid "Finished"
+msgstr "เสร็จสิ้น"
+
+#: includes/mamboHTML.php:396
+msgid "Published, but has <u>Expired</u>"
+msgstr "เผยแพร่แล้วแต่หมดอายุ"
+
+#: includes/mamboHTML.php:402
+msgid "Not Published"
+msgstr "ไม่เผยแพร่"
+
+#: includes/mamboHTML.php:407
+msgid "Click on icon to toggle state."
+msgstr "คลิกที่ไอคอนเพื่อเปลี่ยนสถานะ"
+
+#: includes/mamboHTML.php:444 includes/mamboHTML.php:523
+msgid "Menu"
+msgstr "เมนู"
+
+#: includes/mamboHTML.php:447 includes/mamboHTML.php:526
+msgid "Go to Menu"
+msgstr "ไปที่เมนู"
+
+#: includes/mamboHTML.php:454
+msgid "Link Name"
+msgstr "ชื่อลิงก์"
+
+#: includes/mamboHTML.php:458 includes/mamboHTML.php:545
+msgid "Go to Menu Item"
+msgstr "ไปที่รายการเมนู"
+
+#: includes/mamboHTML.php:472 includes/mamboHTML.php:559
+msgid "Trashed"
+msgstr "ลบ"
+
+#: includes/mamboHTML.php:475 includes/mamboHTML.php:562
+msgid "UnPublished"
+msgstr "ไม่เผยแพร่"
+
+#: includes/mamboHTML.php:541
+msgid "Item Name"
+msgstr "ชื่อรายการ"
+
+#: includes/mamboHTML.php:658
+msgid "Publish item"
+msgstr "เผยแพร่รายการ"
+
+#: includes/mamboHTML.php:658
+msgid "Unpublish Item"
+msgstr "ไม่เผยแพร่รายการ"
+
+#: includes/mambofunc.php:21
+#, php-format
+msgid "User Submitted '%s'"
+msgstr "สมาชิกส่ง '%s' มายังเว็บ"
+
+#: includes/mambofunc.php:22
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"A user submitted %s:\n"
+"[ %s ]\n"
+"\n"
+"has been just been submitted by user:\n"
+"[ %s ]\n"
+"\n"
+"\n"
+"for %\n"
+"\n"
+"Please go to %s/administrator to view and approve this %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only."
+msgstr ""
+
+#: includes/mambofunc.php:52
+msgid "You need to login."
+msgstr "คุณต้องการล็อกอินเข้าใช้งาน ?"
+
+#: includes/mambofunc.php:338
+msgid "Mambo Warning"
+msgstr "คำเตือนจากแมมโบ้"
+
+#: includes/pageNavigation.php:68
+#, php-format
+msgid "Results %d - %d of %d"
+msgstr "ผลลัพธ์ %d - %d จาก %d"
+
+#: includes/pageNavigation.php:80
+#, php-format
+msgid "Page %d of %d"
+msgstr "หน้า %d จาก %d"
+
+#: includes/pdf.php:66
+msgid "Powered by Mambo"
+msgstr "ขับเคลื่อนโดยแมมโบ้"
+
+#: includes/pdf.php:67
+msgid "Generated:"
+msgstr "ถูกสร้างขึ้น:"
+
+#: includes/phpgettext/phpgettext.includes.php:290
+msgid "Main"
+msgstr "หลัก"
+
+#: administrator/components/com_checkin/admin.checkin.php:22
+msgid "Global Check-in"
+msgstr "เช็คอินทั้งหมด"
+
+#: administrator/components/com_checkin/admin.checkin.php:27
+msgid "Database Table"
+msgstr "ตารางฐานข้อมูล"
+
+#: administrator/components/com_checkin/admin.checkin.php:28
+msgid "# of Items"
+msgstr "# จำนวนรายการ"
+
+#: administrator/components/com_checkin/admin.checkin.php:29
+msgid "Checked-In"
+msgstr "เช็คอิน"
+
+#: administrator/components/com_checkin/admin.checkin.php:76
+#: administrator/components/com_checkin/admin.checkin.php:83
+msgid "Checking table"
+msgstr "ตารางเช็คอิน"
+
+#: administrator/components/com_checkin/admin.checkin.php:75
+#: administrator/components/com_checkin/admin.checkin.php:82
+msgid "Checked in <strong>%d</strong> item"
+msgid_plural "Checked in <strong>%d</strong> items"
+msgstr[0] "เช็คอิน <strong>%d</strong> รายการ"
+msgstr[1] "เช็คอิน <strong>%d</strong> รายการ"
+
+#: administrator/components/com_checkin/admin.checkin.php:95
+msgid "Checked out items have now been all checked in"
+msgstr "รายการที่เช็คเอาท์ได้ถูกเช็คอินทั้งหมดแล้ว"
+
+#: administrator/components/com_categories/admin.categories.html.php:35
+#: administrator/components/com_categories/admin.categories.html.php:53
+msgid "Category Manager"
+msgstr "เพิ่ม/แก้ไข ประเภทของเนื้อหา"
+
+#: administrator/components/com_categories/admin.categories.html.php:35
+msgid "Content: All"
+msgstr "เนื้อหา: ทั้งหมด"
+
+#: administrator/components/com_categories/admin.categories.html.php:109
+msgid "Active"
+msgstr "จำนวนเนื้อหา"
+
+#: administrator/components/com_categories/admin.categories.html.php:263
+msgid "Please select a menu type"
+msgstr "กรุณาเลือกเมนู"
+
+#: administrator/components/com_categories/admin.categories.html.php:272
+msgid "Category must have a name"
+msgstr "กรุณาใส่ชื่อประเภท"
+
+#: administrator/components/com_categories/admin.categories.html.php:348
+msgid "Category Details"
+msgstr "รายละเอียดประเภท"
+
+#: administrator/components/com_categories/admin.categories.html.php:353
+msgid "Category Title:"
+msgstr "หัวข้อประเภท:"
+
+#: administrator/components/com_categories/admin.categories.html.php:356
+msgid "A short name to appear in menus"
+msgstr "ชื่อที่ใช้สั้นเกินไป"
+
+#: administrator/components/com_categories/admin.categories.html.php:361
+msgid "Category Name:"
+msgstr "ชื่อหมวด:"
+
+#: administrator/components/com_categories/admin.categories.html.php:364
+msgid "A long name to be displayed in headings"
+msgstr "ชื่อที่ใช้ยาวเกินไป"
+
+#: administrator/components/com_categories/admin.categories.html.php:377
+msgid "Image:"
+msgstr "รูป:"
+
+#: administrator/components/com_categories/admin.categories.html.php:395
+msgid "Image Position:"
+msgstr "ตำแหน่งรูปภาพ:"
+
+#: administrator/components/com_categories/admin.categories.html.php:453
+msgid "This will create a new menu item in the menu you select"
+msgstr "จะสร้างเมนูใหม่ในเมนูที่คุณเลือก"
+
+#: administrator/components/com_categories/admin.categories.html.php:467
+msgid "Select Menu Typ"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:516
+msgid "Menu links available when saved"
+msgstr "เมนูลิงก์ใช้งานได้ เมื่อถูกบันทึก"
+
+#: administrator/components/com_categories/admin.categories.html.php:553
+msgid "Move Category"
+msgstr "ย้ายประเภท"
+
+#: administrator/components/com_categories/admin.categories.html.php:563
+msgid "Move to Section:"
+msgstr "ย้ายไปหมวด:"
+
+#: administrator/components/com_categories/admin.categories.html.php:569
+msgid "Categories being moved:"
+msgstr "กำลังย้ายประเภท:"
+
+#: administrator/components/com_categories/admin.categories.html.php:580
+msgid "Content Items being moved:"
+msgstr "เนื้อหาที่ถูกย้าย:"
+
+#: administrator/components/com_categories/admin.categories.html.php:591
+msgid ""
+"This will move the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"นี่จะเป็นการย้ายประเภท\n"
+"\t\t\t<br />\n"
+"\t\t\tและเนื้อหาทั้งหมดในประเภทนี้ด้วย\n"
+"\t\t\t<br />\n"
+"\t\t\tไปยังหมวดที่เลือกไว้."
+
+#: administrator/components/com_categories/admin.categories.html.php:626
+msgid "Copy Category"
+msgstr "คัดลอกประเภท"
+
+#: administrator/components/com_categories/admin.categories.html.php:636
+msgid "Copy to Section:"
+msgstr "คัดลอกไปหมวด:"
+
+#: administrator/components/com_categories/admin.categories.html.php:642
+msgid "Categories being copied:"
+msgstr "กำลังคัดลอกประเภท:"
+
+#: administrator/components/com_categories/admin.categories.html.php:653
+msgid "Content Items being copied:"
+msgstr "กำลังคัดลอกเนื้อหา:"
+
+#: administrator/components/com_categories/admin.categories.html.php:664
+msgid ""
+"\n"
+"\t\t\tThis will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+"\n"
+"\t\t\tนี่จะเป็นการคัดลอกประเภท\n"
+"\t\t\t<br />\n"
+"\t\t\tและเนื้อหาทั้งหมดในประเภทนี้ด้วย\n"
+"\t\t\t<br />\n"
+"\t\t\tไปยังหมวดที่เลือกไว้."
+
+#: administrator/components/com_categories/admin.categories.php:144
+msgid "Component: "
+msgstr "คอมโพเน้นท์: "
+
+#: administrator/components/com_categories/admin.categories.php:253
+#, php-format
+msgid "The category %s is currently being edited by another administrator"
+msgstr "ประเภท %s กำลังแก้ไขโดยผู้ดูแลท่านอื่นอยู่"
+
+#: administrator/components/com_categories/admin.categories.php:272
+msgid "Category Table"
+msgstr "ตารางประเภท"
+
+#: administrator/components/com_categories/admin.categories.php:276
+msgid "Category Blog"
+msgstr "บล็อกประเภท"
+
+#: administrator/components/com_categories/admin.categories.php:280
+msgid "Category Blog Archive"
+msgstr "ประเภทของบล็อกคลังเนื้อหา"
+
+#. build the html select list for category types
+#: administrator/components/com_categories/admin.categories.php:324
+msgid "Select Type"
+msgstr "เลือกชนิด"
+
+#: administrator/components/com_categories/admin.categories.php:326
+#: administrator/components/com_categories/admin.categories.php:799
+msgid "Contact Category Table"
+msgstr "ตารางประเภทการติดต่อ"
+
+#: administrator/components/com_categories/admin.categories.php:329
+#: administrator/components/com_categories/admin.categories.php:804
+msgid "News Feed Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:809
+msgid "Web Link Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:334
+#: administrator/components/com_categories/admin.categories.php:784
+msgid "Content Category Table"
+msgstr "ตารางประเภท"
+
+#: administrator/components/com_categories/admin.categories.php:335
+#: administrator/components/com_categories/admin.categories.php:789
+msgid "Content Category Blog"
+msgstr "บล็อกประเภทเนื้อหา"
+
+#: administrator/components/com_categories/admin.categories.php:336
+msgid "Content Category Archive Blog"
+msgstr "บล็อกประเภทคลังเนื้อหา"
+
+#: administrator/components/com_categories/admin.categories.php:449
+msgid "Select a category to delete"
+msgstr "เลือกประเภทที่จะลบ"
+
+#: administrator/components/com_categories/admin.categories.php:526
+#, php-format
+msgid "Select a category to %s"
+msgstr "เลือกประเภทเพื่อ %s"
+
+#: administrator/components/com_categories/admin.categories.php:741
+msgid "%d Category copied to %s"
+msgid_plural "%d Categories copied to %s"
+msgstr[0] "ประเภทถูกทำสำเนาไปยัง"
+msgstr[1] "ประเภทถูกทำสำเนาไปยัง"
+
+#: administrator/components/com_categories/admin.categories.php:794
+msgid "Content Category Blog Archive"
+msgstr "บล็อกประเภทคลังเนื้อหา"
+
+#: administrator/components/com_categories/admin.categories.php:835
+#, php-format
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr "%s ( %s ) ในเมนู: %s สร้างเรียบร้อย"
+
+#: administrator/components/com_banners/admin.banners.html.php:27
+msgid "Banner Manager"
+msgstr "การจัดการป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:41
+msgid "Banner Name"
+msgstr "ชื่อป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:47
+msgid "Impressions Made"
+msgstr "แสดงไปแล้ว"
+
+#: administrator/components/com_banners/admin.banners.html.php:50
+msgid "Impressions Left"
+msgstr "จำนวนครั้งที่เหลือ"
+
+#: administrator/components/com_banners/admin.banners.html.php:53
+#: administrator/components/com_banners/admin.banners.html.php:56
+#: administrator/components/com_banners/admin.banners.html.php:254
+msgid "Clicks"
+msgstr "คลิก"
+
+#: administrator/components/com_banners/admin.banners.html.php:97
+msgid "Edit Banner"
+msgstr "แก้ไขป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:157
+msgid "You must provide a banner name"
+msgstr "กรุณาตั้งชื่อป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:159
+msgid "Please select a client"
+msgstr "กรุณาเลือกลูกค้า"
+
+#: administrator/components/com_banners/admin.banners.html.php:161
+msgid "Please select an image."
+msgstr "กรุณาเลือกรูปภาพ."
+
+#: administrator/components/com_banners/admin.banners.html.php:163
+msgid "Please fill in the URL for the banner."
+msgstr "กรุณาใส่  URL สำหรับป้ายโฆษณา."
+
+#: administrator/components/com_banners/admin.banners.html.php:174
+msgid "Banner:"
+msgstr "ป้ายโฆษณา:"
+
+#: administrator/components/com_banners/admin.banners.html.php:190
+msgid "Banner Name:"
+msgstr "ชื่อป้ายโฆษณา:"
+
+#: administrator/components/com_banners/admin.banners.html.php:198
+#: administrator/components/com_banners/admin.banners.html.php:442
+msgid "Client Name:"
+msgstr "ชื่อลูกค้าโฆษณา:"
+
+#: administrator/components/com_banners/admin.banners.html.php:206
+msgid "Impressions Purchased:"
+msgstr "จำนวนครั้งที่แสดง:"
+
+#: administrator/components/com_banners/admin.banners.html.php:217
+msgid "Unlimited"
+msgstr "ไม่จำกัดจำนวนครั้ง"
+
+#: administrator/components/com_banners/admin.banners.html.php:222
+msgid "Banner URL"
+msgstr "ที่อยู่ URL ของป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:230
+msgid "Show Banner :"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:238
+msgid "Click URL:"
+msgstr "คลิก URL:"
+
+#: administrator/components/com_banners/admin.banners.html.php:246
+msgid "Custom banner code:"
+msgstr "โค้ดในการเรียกป้ายโฆษณา:"
+
+#: administrator/components/com_banners/admin.banners.html.php:256
+msgid "Reset Clicks"
+msgstr "เริ่มจำนวนคลิกใหม่"
+
+#: administrator/components/com_banners/admin.banners.html.php:268
+msgid "Banner Image:"
+msgstr "ไฟล์รูปป้ายโฆษณา:"
+
+#: administrator/components/com_banners/admin.banners.html.php:318
+msgid "Banner Client Manager"
+msgstr "การจัดการลูกค้าป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:332
+msgid "Client Name"
+msgstr "ชื่อลูกค้าโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:335
+msgid "Client ID"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:341
+msgid "No. of Active Banners"
+msgstr "จำนวนแบนเนอร์ที่ทำการแสดง"
+
+#: administrator/components/com_banners/admin.banners.html.php:367
+msgid "Edit Banner Client"
+msgstr "แก้ไขลูกค้าป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.html.php:411
+msgid "Please fill in the Client Name."
+msgstr "กรุณาระบุชื่อกลุ่มแบนเนอร์."
+
+#: administrator/components/com_banners/admin.banners.html.php:413
+msgid "Please fill in the Contact Name."
+msgstr "กรุณาใส่ชื่อผู้ติดต่อ."
+
+#: administrator/components/com_banners/admin.banners.html.php:415
+msgid "Please fill in the Contact Email."
+msgstr "กรุณาใส่อีเมลของผู้ติดต่อ."
+
+#: administrator/components/com_banners/admin.banners.html.php:425
+msgid "Banner Client:"
+msgstr "ชื่อผู้ซื้อป้ายโฆษณา:"
+
+#: administrator/components/com_banners/admin.banners.html.php:450
+msgid "Contact Name:"
+msgstr "ชื่อผู้ติดต่อ:"
+
+#: administrator/components/com_banners/admin.banners.html.php:458
+msgid "Contact Email:"
+msgstr "อีเมลผู้ติดต่อ:"
+
+#: administrator/components/com_banners/admin.banners.html.php:466
+msgid "Extra Info:"
+msgstr "ข้อมูลเพิ่มเติม:"
+
+#: administrator/components/com_banners/admin.banners.php:167
+msgid "Saved Banner info"
+msgstr "บันทึกข้อมูลป้ายโฆษณา"
+
+#: administrator/components/com_banners/admin.banners.php:170
+msgid "Reset Banner clicks"
+msgstr "เริ่มจำนวนคลิกป้ายโฆษณาใหม่"
+
+#: administrator/components/com_banners/admin.banners.php:278
+#, php-format
+msgid "The client [ %s ] is currently being edited by another person."
+msgstr "ลูกค้ารายนี้ [ %s ] กำลังมีการแก้ไขโดยผู้ดูแลท่านอื่นอยู่."
+
+#: administrator/components/com_banners/admin.banners.php:336
+msgid "Cannot delete client at this time as they have a banner still running"
+msgstr "ไม่สามารถลบลูกค้าได้เนื่องจากยังมีแถบป้ายโฆษณาของลูกค้าอยู่"
+
+#: administrator/components/com_banners/banners.xml
+msgid "Banners"
+msgstr "ป้ายโฆษณา"
+
+#: administrator/components/com_banners/banners.xml
+msgid "This component manages banners and banner clients"
+msgstr "นี่คือคอมโพเน้นท์จัดการป้ายโฆษณาและลูกค้าป้ายโฆษณา"
+
+#: components/com_banners/banners.class.php:33
+msgid "You must select a name for the client."
+msgstr "กรุณาใส่ชื่อลูกค้าป้ายโฆษณาด้วยครับ."
+
+#: components/com_banners/banners.class.php:39
+msgid "You must select a contact for the client."
+msgstr "คุณไม่ได้ใส่รายละเอียดการติดต่อลูกค้า."
+
+#: components/com_banners/banners.class.php:45
+msgid "You must select a valid email for the client."
+msgstr "กรุณาใส่อีเมลสำหรับติดต่อลูกค้า."
+
+#: components/com_banners/banners.class.php:100
+msgid "You must select a client."
+msgstr "คุณไม่ได้เลือกหมวดลูกค้า."
+
+#: components/com_banners/banners.class.php:105
+msgid "You must select a name for the banner."
+msgstr "กรุณาใส่ชื่อให้ป้ายโฆษณา."
+
+#: components/com_banners/banners.class.php:110
+msgid "You must select a image for the banner."
+msgstr "กรุณาใส่รูปให้ป้ายโฆษณา."
+
+#: components/com_banners/banners.class.php:114
+msgid "You must select a URL/Custom banner code for the banner."
+msgstr "กรุณาใส่การเชื่อมโยง(URL)."
+
+#: administrator/modules/mod_fullmenu.php:66
+msgid "Control Panel"
+msgstr "แผงควบคุม"
+
+#: administrator/modules/mod_fullmenu.php:70
+msgid "Site Management"
+msgstr "การบริหารจัดการเว็บ"
+
+#: administrator/modules/mod_fullmenu.php:73
+#: administrator/modules/mod_fullmenu.php:279
+msgid "Configuration"
+msgstr "ตั้งค่าคอนฟิค"
+
+#: administrator/modules/mod_fullmenu.php:77
+msgid "Manage languages"
+msgstr "เปลี่ยนภาษา"
+
+#: administrator/modules/mod_fullmenu.php:80
+msgid "Manage Media Files"
+msgstr "การจัดการไฟล์มีเดีย"
+
+#: administrator/modules/mod_fullmenu.php:82
+msgid "In New Window"
+msgstr "ในหน้าต่างใหม่"
+
+#: administrator/modules/mod_fullmenu.php:83
+msgid "Inline"
+msgstr "ในหน้าต่างนี้"
+
+#: administrator/modules/mod_fullmenu.php:84
+msgid "Inline with Positions"
+msgstr "ในหน้าต่างนี้และแสดงตำแหน่งของโมดูล"
+
+#: administrator/modules/mod_fullmenu.php:86
+msgid "Site Statistics"
+msgstr "สถิติเว็บ"
+
+#: administrator/modules/mod_fullmenu.php:89
+msgid "Browser, OS, Domain"
+msgstr "บราวเซอร์, โอเอส, โดเมน"
+
+#: administrator/modules/mod_fullmenu.php:90
+msgid "Page Impressions"
+msgstr "สถิติการเข้าชมหน้าเพจ"
+
+#: administrator/modules/mod_fullmenu.php:93
+msgid "Search Text"
+msgstr "สถิติคำค้น"
+
+#: administrator/modules/mod_fullmenu.php:97
+#: administrator/modules/mod_fullmenu.php:98
+msgid "Change site template"
+msgstr "เปลี่ยนเทมเพลตเว็บไซต์"
+
+#: administrator/modules/mod_fullmenu.php:97
+msgid "Template Manager"
+msgstr "การจัดการเทมเพลต"
+
+#: administrator/modules/mod_fullmenu.php:98
+msgid "Site Templates"
+msgstr "เทมเพลตเว็บไซต์"
+
+#: administrator/modules/mod_fullmenu.php:99
+msgid "Administrator Templates"
+msgstr "เทมเพลตผู้ดูแล"
+
+#: administrator/modules/mod_fullmenu.php:99
+msgid "Change admin template"
+msgstr "เปลี่ยนเทมเพลตผู้ดูแล"
+
+#: administrator/modules/mod_fullmenu.php:100
+msgid "Module Positions"
+msgstr "ตำแหน่งโมดูล"
+
+#: administrator/modules/mod_fullmenu.php:100
+msgid "Template positions"
+msgstr "ตำแหน่งเทมเพลต"
+
+#: administrator/modules/mod_fullmenu.php:105
+msgid "Manage Trash"
+msgstr "การจัดการถังรีไชเคิล"
+
+#: administrator/modules/mod_fullmenu.php:105
+msgid "Trash Manager"
+msgstr "การจัดการถังรีไชเคิล"
+
+#: administrator/modules/mod_fullmenu.php:109
+msgid "Manage users"
+msgstr "การจัดการสมาชิก"
+
+#: administrator/modules/mod_fullmenu.php:109
+msgid "User Manager"
+msgstr "การจัดการสมาชิก"
+
+#: administrator/modules/mod_fullmenu.php:116
+msgid "Menu Management"
+msgstr "การจัดการเมนู"
+
+#: administrator/modules/mod_fullmenu.php:131
+msgid "Content Management"
+msgstr "การจัดการเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:134
+msgid "Content Managers"
+msgstr "การจัดการเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:134
+msgid "Content by Section"
+msgstr "เนื้อหาตามหมวด"
+
+#: administrator/modules/mod_fullmenu.php:144
+msgid "Add/Edit"
+msgstr "เพิ่ม/แก้ไข"
+
+#: administrator/modules/mod_fullmenu.php:144
+#: administrator/modules/mod_quickicon.php:60
+msgid "Categories"
+msgstr "ประเภท"
+
+#: administrator/modules/mod_fullmenu.php:158
+msgid "Manage Content Items"
+msgstr "การจัดการรายการเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:159
+msgid "Manage Typed Content Items"
+msgstr "การจัดการรายการในเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:159
+msgid "Static Content Manager"
+msgstr "เนื้อหาสเตติก"
+
+#: administrator/modules/mod_fullmenu.php:161
+msgid "Manage Content Sections"
+msgstr "การจัดการส่วนหลักของเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:161
+msgid "Section Manager"
+msgstr "เพิ่ม/แก้ไข หมวดของเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:164
+msgid "Manage Content Categories"
+msgstr "การจัดการประเภทของเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:168
+msgid "Manage Frontpage Items"
+msgstr "การจัดการรายการหน้าเว็บ"
+
+#: administrator/modules/mod_fullmenu.php:169
+msgid "Manage Archive Items"
+msgstr "การจัดการรายการในคลังเนื้อหา"
+
+#: administrator/modules/mod_fullmenu.php:175
+msgid "Component Management"
+msgstr "การจัดการคอมโพเน้นท์"
+
+#: administrator/modules/mod_fullmenu.php:176
+msgid "Install/Uninstall components"
+msgstr "ติดตั้ง/ลบ คอมโพเน้นท์"
+
+#: administrator/modules/mod_fullmenu.php:176
+#: administrator/modules/mod_fullmenu.php:231
+#: administrator/modules/mod_fullmenu.php:250
+msgid "Review/Uninstall"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:220
+msgid "More Components"
+msgstr "คอมโพเน้นท์อื่นๆ"
+
+#: administrator/modules/mod_fullmenu.php:220
+msgid "More Components..."
+msgstr "คอมโพเน้นท์อื่น ๆ เพิ่มเติม..."
+
+#: administrator/modules/mod_fullmenu.php:228
+msgid "Module Management"
+msgstr "การจัดการโมดูล"
+
+#: administrator/modules/mod_fullmenu.php:228
+msgid "Modules"
+msgstr "โมดูล"
+
+#: administrator/modules/mod_fullmenu.php:231
+msgid "Install custom modules"
+msgstr "ติดตั้งโมดูล"
+
+#: administrator/modules/mod_fullmenu.php:236
+msgid "Manage Site modules"
+msgstr "การจัดการโมดูลเว็บ"
+
+#: administrator/modules/mod_fullmenu.php:237
+msgid "Administrator Modules"
+msgstr "โมดูลของผู้ดูแล"
+
+#: administrator/modules/mod_fullmenu.php:237
+msgid "Manage Administrator modules"
+msgstr "การจัดการโมดูลของผู้ดูแล"
+
+#: administrator/modules/mod_fullmenu.php:247
+msgid "Mambot Management"
+msgstr "การจัดการแมมบอท"
+
+#: administrator/modules/mod_fullmenu.php:247
+msgid "Mambots"
+msgstr "แมมบอท"
+
+#: administrator/modules/mod_fullmenu.php:250
+msgid "Install custom mambot"
+msgstr "ติดตั้งแมมบอท"
+
+#: administrator/modules/mod_fullmenu.php:255
+msgid "Manage Site Mambots"
+msgstr "การจัดการแมมบอทเว็บ"
+
+#: administrator/modules/mod_fullmenu.php:255
+msgid "Site Mambots"
+msgstr "แมมบอทเว็บ"
+
+#: administrator/modules/mod_fullmenu.php:266
+msgid "Installer List"
+msgstr "รายการที่จะติดตั้ง"
+
+#: administrator/modules/mod_fullmenu.php:266
+msgid "Installers"
+msgstr "ติดตั้ง"
+
+#: administrator/modules/mod_fullmenu.php:267
+msgid "Install Any Plugin"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:267
+msgid "Universal"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:269
+msgid "Install from The Source"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:269
+msgid "The Source"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:277
+msgid "Messaging Management"
+msgstr "การจัดการส่งข้อความ"
+
+#: administrator/modules/mod_fullmenu.php:278
+msgid "Inbox"
+msgstr "กล่องข้อความเข้า"
+
+#: administrator/modules/mod_fullmenu.php:278
+msgid "Private Messages"
+msgstr "ข้อความส่วนบุคคล"
+
+#. System Sub-Menu
+#: administrator/modules/mod_fullmenu.php:284
+msgid "System"
+msgstr "ระบบ"
+
+#: administrator/modules/mod_fullmenu.php:284
+msgid "System Management"
+msgstr "การจัดการระบบ"
+
+#: administrator/modules/mod_fullmenu.php:287
+msgid "Check-in all checked-out items"
+msgstr "เช็คอินรายการเช็คเอาท์ทั้งหมด"
+
+#: administrator/modules/mod_fullmenu.php:287
+msgid "Global Checkin"
+msgstr "ตรวจสอบรายละเอียดทั้งหมด"
+
+#: administrator/modules/mod_fullmenu.php:288
+msgid "View System Information"
+msgstr "แสดงข้อมูลระบบ"
+
+#: administrator/modules/mod_fullmenu.php:291
+msgid "Clean Cache"
+msgstr "ลบแคช"
+
+#: administrator/modules/mod_fullmenu.php:291
+msgid "Clean the content items cache"
+msgstr "ล้างแคชของเนื้อหาทั้งหมด"
+
+#: administrator/modules/mod_latest.php:29
+msgid "Most Recently Added Content"
+msgstr "เนื้อหาที่มีการเพิ่มมาล่าสุด"
+
+#: administrator/modules/mod_logged.php:58
+msgid "Currently Logged in Users"
+msgstr "ผู้ใช้งานที่ล็อกอินอยู่"
+
+#: administrator/modules/mod_logged.php:86
+msgid "Force Logout User"
+msgstr "เคลียร์ผู้ใช้งานออกจากระบบ"
+
+#: administrator/modules/mod_logged.xml
+msgid "Logged in Users"
+msgstr ""
+
+#: administrator/modules/mod_logged.xml
+msgid "This module shows a list of the currently logged in users"
+msgstr ""
+
+#: administrator/modules/mod_online.php:24
+msgid "Users Online"
+msgstr "ผู้ใช้งานออนไลน์"
+
+#: administrator/modules/mod_popular.php:29
+msgid "Most Popular Items"
+msgstr "มีคนให้ความสนใจมากที่สุด"
+
+#: administrator/modules/mod_popular.xml administrator/modules/mod_stats.xml
+msgid "Popular Items"
+msgstr ""
+
+#: administrator/modules/mod_popular.xml
+msgid ""
+"This module shows a list of the popular published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:37
+#: administrator/modules/mod_quickicon.php:146
+msgid "Static Content"
+msgstr "เนื้อหาสเตติก"
+
+#: administrator/modules/mod_quickicon.php:67
+msgid "Media"
+msgstr "ไฟล์มีเดีย"
+
+#: administrator/modules/mod_quickicon.php:91
+msgid "Menus"
+msgstr "เมนู"
+
+#: administrator/modules/mod_quickicon.php:104
+msgid "Users"
+msgstr "สมาชิก"
+
+#: administrator/modules/mod_stats.php:25
+msgid "# Items"
+msgstr "จำนวนรายการ"
+
+#: administrator/modules/mod_stats.xml
+msgid ""
+"This module shows stats of Items that are still current (some may have "
+"expired even though they are the most recent). Items that are displayed on "
+"the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/popups/contentwindow.php:24
+msgid "Content Preview"
+msgstr "แสดงเนื้อหา"
+
+#: administrator/popups/modulewindow.php:23
+msgid "Module Preview"
+msgstr "แสดงโมดูล"
+
+#: administrator/popups/pollwindow.php:27
+msgid "Poll Preview"
+msgstr "แสดงแบบสำรวจ"
+
+#: administrator/popups/uploadimage.php:27
+msgid "Please select an image to upload"
+msgstr "กรุณาเลือกรูปที่ต้องการอับโหลดก่อน"
+
+#: administrator/popups/uploadimage.php:33
+msgid "File must only contain alphanumeric characters and no spaces please."
+msgstr "ไม่สามารถใส่อักขระพิเศษหรือเว้นวรรคได้"
+
+#: administrator/popups/uploadimage.php:38
+#, php-format
+msgid "Image %s already exists."
+msgstr "รูป %s มีอยู่แล้ว"
+
+#: administrator/popups/uploadimage.php:43
+msgid "The file must be gif, png, jpg, bmp, swf, doc, xls or ppt"
+msgstr "ไฟล์ที่ใช้ได้คือ gif, png, jpg, bmp, swf, doc, xls หรือ ppt"
+
+#: administrator/popups/uploadimage.php:50
+#: administrator/popups/uploadimage.php:58
+#, php-format
+msgid "Upload of %s failed"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:54
+#: administrator/popups/uploadimage.php:62
+#, php-format
+msgid "Upload of %s to %s successful"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:86
+msgid "File Upload :"
+msgstr "อัพโหลดไฟล์ :"
+
+#: administrator/templates/mambo_admin/index.php:55
+#: administrator/templates/mambo_admin/login.php:36
+#: administrator/templates/mambo_admin_blue/index.php:55
+#: administrator/templates/mambo_admin_blue/index.php:93
+msgid "Mambo Logo"
+msgstr "Mambo Logo"
+
+#: administrator/templates/mambo_admin/login.php:57
+msgid "Welcome to Mambo!"
+msgstr "ระบบบริหารจัดการเว็บไซต์!"
+
+#: administrator/templates/mambo_admin/login.php:58
+msgid ""
+"Use a valid username and password to gain access to the administration "
+"console."
+msgstr "กรุณาใส่รายละเอียดเพื่อล็อกอิน หากคุณไม่มีหน้าที่เกี่ยวข้อง กรุณาปิดหน้าต่างนี้ด้วยครับ."
+
+#: administrator/templates/mambo_admin/templateDetails.xml
+msgid "Mambo Admin"
+msgstr ""
+
+#: administrator/templates/mambo_admin_blue/templateDetails.xml
+msgid "Mambo Admin Blue"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:27
+msgid "Web Link Manager"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:56
+msgid "Approved"
+msgstr "อนุมัติ"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:96
+msgid "Edit Weblinks"
+msgstr "แก้ไขเว็บน่าสนใจ"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:174
+msgid "Weblink item must have a title"
+msgstr "คุณไม่ได้ใส่หัวเรื่อง"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:176
+#: components/com_weblinks/weblinks.html.php:249
+msgid "You must select a category."
+msgstr "คุณไม่ได้เลือกหมวด."
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:178
+#: components/com_weblinks/weblinks.html.php:251
+msgid "You must have a url."
+msgstr "คุณไม่ได้ใส่ URL."
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:188
+msgid "Web Link:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:223
+#: components/com_weblinks/weblinks.html.php:295
+msgid "URL:"
+msgstr "URL:"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:248
+msgid "Approved:"
+msgstr "อนุมัติ:"
+
+#: administrator/components/com_weblinks/admin.weblinks.php:145
+#: components/com_weblinks/weblinks.php:184
+#, php-format
+msgid "The module %s is currently being edited by another administrator."
+msgstr "โมดูล %s กำลังมีการแก้ไขโดยผู้ดูแลท่านอื่น."
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon to be used to the left of the url links in Table view"
+msgstr "ไอคอนจะถูกใช้อยู่ทางด้านซ้ายของที่อยู่ของการเชื่อมต่อในแต่ละหน้าของการแสดงผล"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "This component shows a listing of Weblinks"
+msgstr "คอมโพเน้นท์ สำหรับแสดงรายการของการเชื่อมโยงเว็บ"
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Weblinks"
+msgstr "เว็บลิงก์"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target"
+msgstr "ที่หมาย"
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target window when the link is clicked"
+msgstr "ที่หมายของหน้าต่างวินโดว์เมื่อคลิกที่การเชื่อมต่อ"
+
+#: components/com_weblinks/weblinks.class.php:70
+msgid "Please provide a valid URL"
+msgstr "กรุณาใส่ URL ที่ถูกต้อง"
+
+#: components/com_weblinks/weblinks.class.php:76
+msgid "Your web link must be given a title."
+msgstr "เว็บลิงก์ของคุณต้องมีหัวเรื่อง."
+
+#: components/com_weblinks/weblinks.class.php:91
+msgid "There is already a web link that name, please try again."
+msgstr "ชื่อเว็บนี้มีอยู่แแล้ว, กรุณาลองใหม่."
+
+#: components/com_weblinks/weblinks.html.php:107
+msgid "Web Link"
+msgstr "รวมเว็บน่าสนใจ"
+
+#: components/com_weblinks/weblinks.html.php:247
+msgid "Web Link item must have a title"
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:262
+msgid "Submit A Web Link"
+msgstr "ส่งข้อมูลแนะนำเว็บ"
+
+#: components/com_weblinks/weblinks.php:99
+msgid ""
+"From the list below choose one of our web link categories, then select a URL "
+"to visit the site."
+msgstr "จากรายการข้างล่างท่านสามารถเลือกประเภทเว็บ และเลือก URL เพื่อเข้าชมเว็บ."
+
+#: components/com_weblinks/weblinks.php:291
+msgid "User Submitted '%'"
+msgstr "สมาชิกส่งข้อมูลมายังเว็บ '%'"
+
+#: components/com_weblinks/weblinks.php:292
+#, php-format
+msgid ""
+"Hello %s,\\n\\n\\nA user submitted %s:\\n [ %s ]\\n has been just been "
+"submitted by user:\\n [ %s ]\\n"
+msgstr "สวัสดี %s,nnnมีสมาชิกได้ส่ง %s:n [ %s ]n โดย คุณ:n [ %s ]n"
+
+#: components/com_weblinks/weblinks.php:293
+#, php-format
+msgid " for %s.\\n\\n\\n\\n"
+msgstr " สำหรับ %s.\\n\\n\\n\\n"
+
+#: components/com_weblinks/weblinks.php:294
+#, php-format
+msgid "Please go to %s/administrator to view and approve this %s.\\n\\n"
+msgstr "กรุณาเข้าไปยัง %s/administrator เพื่อตรวจสอบและอนุมัติ %s.nn"
+
+#: components/com_weblinks/weblinks.php:295
+msgid ""
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only\\n"
+msgstr "ข้อความนี้ถูกส่งเข้ามาด้วยระบบอัตโนมัติ เพื่อแจ้งให้คุณทราบเท่านั้น ไม่จำเป็นต้องตอบกลับn"
+
+#: administrator/components/com_users/admin.users.html.php:55
+#: administrator/components/com_users/admin.users.php:159
+msgid "Logged In"
+msgstr "ล็อกอิน"
+
+#: administrator/components/com_users/admin.users.html.php:61
+msgid "UserID"
+msgstr "ชื่อผู้ใช้งาน"
+
+#: administrator/components/com_users/admin.users.html.php:64
+msgid "Group"
+msgstr "กลุ่ม"
+
+#: administrator/components/com_users/admin.users.html.php:67
+msgid "E-Mail"
+msgstr "อีเมล"
+
+#: administrator/components/com_users/admin.users.html.php:70
+msgid "Last Visit"
+msgstr "เข้าใช้ล่าสุด"
+
+#: administrator/components/com_users/admin.users.html.php:154
+msgid "You must provide a user login name."
+msgstr "กรุณาใส่ชื่อผู้ใช้."
+
+#: administrator/components/com_users/admin.users.html.php:156
+msgid "Your login name contains invalid characters or is too short."
+msgstr "ชื่อที่ใช้ล็อกอิน สั้นเกินไป."
+
+#: administrator/components/com_users/admin.users.html.php:158
+msgid "You must provide an email address."
+msgstr "กรุณาใส่อีเมล."
+
+#: administrator/components/com_users/admin.users.html.php:160
+msgid "You must assign user to a group."
+msgstr "ใส่กลุ่มผู้ใช้."
+
+#: administrator/components/com_users/admin.users.html.php:162
+msgid "Passwords do not match."
+msgstr "รหัสผ่านไม่ถูกต้อง."
+
+#: administrator/components/com_users/admin.users.html.php:164
+msgid ""
+"Please Select another group as `Public Frontend` is not a selectable option"
+msgstr "คุณเลือกกลุ่มไม่ถูกต้อง กรุณาเลือกกลุ่มอื่นที่เป็น `Public Frontend`"
+
+#: administrator/components/com_users/admin.users.html.php:166
+msgid ""
+"Please Select another group as `Public Backend` is not a selectable option"
+msgstr "คุณเลือกกลุ่มไม่ถูกต้อง กรุณาเลือกกลุ่มอื่นที่เป็น `Public Backend`"
+
+#: administrator/components/com_users/admin.users.html.php:194
+msgid "User Details"
+msgstr "รายละเอียดผู้ใช้งาน"
+
+#: administrator/components/com_users/admin.users.html.php:207
+msgid "Username:"
+msgstr "ชื่อสำหรับล็อกอิน:"
+
+#: administrator/components/com_users/admin.users.html.php:214
+msgid "Email:"
+msgstr "อีเมล:"
+
+#: administrator/components/com_users/admin.users.html.php:222
+msgid "New Password:"
+msgstr "รหัสผ่านใหม่:"
+
+#: administrator/components/com_users/admin.users.html.php:230
+msgid "Verify Password:"
+msgstr "ยืนยันรหัสผ่าน:"
+
+#: administrator/components/com_users/admin.users.html.php:249
+msgid "Block User"
+msgstr "ระงับการใช้งาน"
+
+#: administrator/components/com_users/admin.users.html.php:261
+msgid "Receive Submission Emails"
+msgstr "ส่งอีเมลตอบรับ"
+
+#: administrator/components/com_users/admin.users.html.php:273
+msgid "Register Date"
+msgstr "วันที่สมัคร"
+
+#: administrator/components/com_users/admin.users.html.php:281
+msgid "Last Visit Date"
+msgstr "วันที่เข้าใช้ล่าสุด"
+
+#: administrator/components/com_users/admin.users.html.php:304
+#: administrator/components/com_users/admin.users.html.php:323
+msgid "Contact Information"
+msgstr "ข้อมูลการติดต่อ"
+
+#: administrator/components/com_users/admin.users.html.php:310
+msgid "No Contact details linked to this User:"
+msgstr "ไม่มีรายละเอียดการติดต่อของผู้ใช้งาน:"
+
+#: administrator/components/com_users/admin.users.html.php:312
+msgid "See \"Components -> Contact -> Manage Contacts\" for details."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:389
+msgid "Change Contact Details"
+msgstr "เปลี่ยนแปลงรายละเอียดข้อมูลติดต่อ"
+
+#: administrator/components/com_users/admin.users.html.php:392
+msgid "Components -> Contact -> Manage Contacts"
+msgstr "คอมโพเน้นท์ -> การติดต่อ -> จัดการการติดต่อ"
+
+#: administrator/components/com_users/admin.users.php:152
+msgid "- Select Group -"
+msgstr "- เลือกกลุ่ม -"
+
+#. get list of Log Status for dropdown filter
+#: administrator/components/com_users/admin.users.php:158
+msgid "- Select Log Status - "
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:160
+msgid "Not Logged In"
+msgstr "ไม่ได้เข้าสู่ระบบ"
+
+#: administrator/components/com_users/admin.users.php:188
+msgid "Super Administrator"
+msgstr "ผู้ดูแลระบบ สูงสุด"
+
+#: administrator/components/com_users/admin.users.php:308
+msgid "New User Details"
+msgstr "รายละเอียดสมาชิกใหม่"
+
+#: administrator/components/com_users/admin.users.php:309
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"You have been added as a user to %s by an Administrator.\n"
+"\n"
+"This email contains your username and password to log into the %s\n"
+"\n"
+"Username - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"สวัสดีคุณ %s,\n"
+"\n"
+"\n"
+"คุณได้เพิ่มสมาชิกในเว็บ %s โดยผู้ดูแลระบบ.\n"
+"\n"
+"ในอีเมลฉบับนี้คุณจะได้รับชื่อผู้ใช้ รหัสผ่าน สำหรับ log ล็อกอินเข้าใช้งาน %s\n"
+"\n"
+"ชื่อผู้ใช้ - %s\n"
+"รหัสผ่าน - %s\n"
+"\n"
+"\n"
+"ข้อความนี้เป็นข้อความอัตโนมัติจากระบบ คุณไม่ต้องตอบกลับ"
+
+#: administrator/components/com_users/admin.users.php:338
+#, php-format
+msgid "Successfully Saved changes to User: %s"
+msgstr "บันทึกการเปลี่ยนแปลงชื่อผู้ใช้: %s เรียบร้อยแล้ว"
+
+#: administrator/components/com_users/admin.users.php:343
+#, php-format
+msgid "Successfully Saved User: %s"
+msgstr "บันทึกชื่อผู้ใช้: %s เรียบร้อยแล้ว"
+
+#: administrator/components/com_users/admin.users.php:374
+msgid "You cannot delete a Super Administrator"
+msgstr "คุณไม่สามารถลบผู้ดูแลระบบได้"
+
+#: administrator/components/com_users/admin.users.php:376
+msgid "You cannot delete Yourself!"
+msgstr "คุณไม่สามารถลบตัวเองได้!"
+
+#: administrator/components/com_users/admin.users.php:378
+msgid ""
+"You cannot delete another `Administrator` only `Super Administrators` have "
+"this power"
+msgstr "คุณไม่สามารถลบ `ผู้ดูแลระบบ` นอกจากคุณจะเป็นระดับ `ผู้ดูแลระบบ สูงสุด`"
+
+#: administrator/components/com_users/admin.users.php:412
+msgid "block"
+msgstr "ระงับ"
+
+#: administrator/components/com_users/admin.users.php:412
+msgid "unblock"
+msgstr "ยกเลิก"
+
+#: administrator/components/com_users/admin.users.php:448
+msgid "Please select a user"
+msgstr "กรุณาเลือกชื่อผู้ใช้"
+
+#: administrator/components/com_users/toolbar.users.html.php:48
+msgid "Force Logout"
+msgstr "เอาออกจากระบบ"
+
+#: components/com_user/user.html.php:20
+msgid "Welcome!"
+msgstr "ยินดีต้อนรับ!"
+
+#: components/com_user/user.html.php:25
+msgid "Welcome to the user section of our site"
+msgstr "ขอต้อนรับเข้าสู่ ส่วนของสมาชิก"
+
+#: components/com_user/user.html.php:41
+msgid "Please enter your name."
+msgstr "กรุณาใส่ชื่อ ของคุณ."
+
+#: components/com_user/user.html.php:43
+msgid "Please enter a user name."
+msgstr "กรุณาใส่ชื่อสำหรับล็อกอิน."
+
+#: components/com_user/user.html.php:45 components/com_user/user.html.php:51
+#, php-format
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+"กรุณาใส่ข้อมูล %s.  ห้ามใช้ช่องว่าง (space), จำนวนไม่ต่ำกว่า %d ตัวอักษร และเป็นอักษร 0-9,a-"
+"z,A-Z "
+
+#: components/com_user/user.html.php:47
+msgid "Please enter a valid e-mail address."
+msgstr "กรุณาใส่อีเมลของคุณ."
+
+#: components/com_user/user.html.php:49
+msgid "Password and verification do not match, please try again."
+msgstr "คุณใส่รหัส 2 ครั้งไม่เหมือนกัน, กรุณาใส่อีกครั้ง."
+
+#: components/com_user/user.html.php:51 components/com_user/user.html.php:74
+msgid "Password:"
+msgstr "รหัสผ่าน:"
+
+#: components/com_user/user.html.php:59
+msgid "Edit Your Details"
+msgstr "แก้ไขข้อมูลของคุณ"
+
+#: components/com_user/user.html.php:67
+msgid "e-mail:"
+msgstr "อีเมล:"
+
+#: components/com_user/user.html.php:70
+msgid "User Name:"
+msgstr "ชื่อในการล็อกอิน:"
+
+#: components/com_user/user.html.php:97
+msgid "Submission Success!"
+msgstr "การส่งข้อมูลเสร็จเรียบร้อย!"
+
+#: components/com_user/user.html.php:101
+msgid ""
+"Your item has been submitted to the site administrators. It will be reviewed "
+"before being published on the site."
+msgstr ""
+"ข้อมูลของคุณถูกจัดส่งให้กับผู้ดูแลเว็บเป็นที่เรียบร้อย. เราจะตรวจสอบ "
+"และนำขึ้นแสดงบนเว็บไซต์แห่งนี้โดยเร็ว."
+
+#: components/com_user/user.php:57
+msgid "You cannot upload files greater than 15kb in size."
+msgstr "กรุณาใส่ภาพขนาดไม่เกิน 15kb."
+
+#: components/com_user/user.php:60
+#, php-format
+msgid "Image %s already exists. Please rename the file and try again."
+msgstr "รูป %s นี้มีอยู่แล้ว. กรุณาเปลี่ยนชื่อแล้วส่งขึ้นมาใหม่อีกครั้ง."
+
+#: components/com_user/user.php:66
+#, php-format
+msgid "Failed to copy %s"
+msgstr "การคัดลอก %s ไม่สำเร็จ"
+
+#: components/com_user/user.php:88
+msgid "You may only upload a gif or jpg image."
+msgstr "รูปภาพควรจะเป็นภาพที่มีนามสกุล gif, หรือ jpg."
+
+#: components/com_user/user.php:130
+msgid "Passwords do not match"
+msgstr "รหัสผ่านไม่เหมือนกันกรุณาตรวจสอบ"
+
+#: components/com_user/user.php:153
+msgid "Your settings have been saved."
+msgstr "ได้บันทึกข้อมูลของคุณแล้ว."
+
+#: components/com_user/user.php:211
+#, php-format
+msgid "Checked in %d item"
+msgid_plural "Checked in %d items"
+msgstr[0] "ตรวจสอบ %d ข้อมูลรายการ"
+msgstr[1] "ตรวจสอบ %d ข้อมูลรายการ"
+
+#: components/com_user/user.php:223
+msgid "All items checked out have now been checked in"
+msgstr "ตรวจสอบ ว่า นำเข้าหมดแล้ว"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:175
+msgid "Edit Static Content"
+msgstr "แก้ไขเนื้อหาสเตติก"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:269
+msgid ""
+"Are you sure you want to reset the Hits to Zero? \\nAny unsaved changes to "
+"this content will be lost."
+msgstr ""
+"คุณแน่ใจหรือไม่ ที่จะตั้งค่าจำนวนครั้งให้เป็นศูนย์ \\nการเปลี่ยนแปลงที่ยังไม่ได้บันทึกจะหายไปด้วย."
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:300
+msgid "Content item must have a name"
+msgstr "เนื้อหาต้องมีชื่อเรื่อง"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:351
+msgid "Static Content Item:"
+msgstr "รายการเนื้อหาสเตติก:"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:400
+msgid "Text: (required)"
+msgstr "ข้อความส่วนต้น: (ต้องการ)"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:545
+msgid "New document"
+msgstr "เนื้อหาใหม่"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:553
+msgid "Not modified"
+msgstr "ไม่แก้ไข"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:558
+msgid "Expires"
+msgstr "หมดอายุ"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:612
+msgid "Source"
+msgstr "ที่มา"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:620
+msgid "Align"
+msgstr "จัดวาง"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:628
+msgid "Alt Text"
+msgstr "ข้อความของรูป"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:636
+msgid "Border"
+msgstr "เส้นขอบ"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:734
+msgid "This will create a \"Link - Static Content\" in the menu you select"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:157
+msgid "Ordering asc"
+msgstr "การจัดเรียง เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:158
+msgid "Ordering desc"
+msgstr "การจัดเรียง ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:159
+msgid "ID asc"
+msgstr "ID เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:160
+msgid "ID desc"
+msgstr "ID ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:161
+msgid "Title asc"
+msgstr "หัวข้อ เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:162
+msgid "Title desc"
+msgstr "หัวข้อ ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:163
+msgid "Date asc"
+msgstr "วันที่ เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:164
+msgid "Date desc"
+msgstr "วันที่ ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:165
+msgid "Author asc"
+msgstr "ผู้เขียน เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:166
+msgid "Author desc"
+msgstr "ผู้เขียน ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:167
+msgid "Published asc"
+msgstr "เผยแพร่ เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:168
+msgid "Published desc"
+msgstr "เผยแพร่ ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:169
+msgid "Access asc"
+msgstr "การเข้าถึง เก่าก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:170
+msgid "Access desc"
+msgstr "การเข้าถึง ใหม่ก่อน"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:358
+msgid "Typed Content Item saved"
+msgstr "ประเภทเนื้อหาบันทึกสำเร็จ"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:364
+msgid "Changes to Typed Content Item saved"
+msgstr "บันทึกการแก้ไขประเภทเนื้อหาสำเร็จ"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:475
+msgid "Successfully Reset Hit"
+msgstr "ได้ตั้งค่าการนับใหม่แล้ว"
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Typed Content Page"
+msgstr "หน้าประเภทเนื้อหา"
+
+#: administrator/components/com_trash/admin.trash.html.php:67
+#: administrator/components/com_trash/admin.trash.html.php:71
+msgid "Content Items"
+msgstr "รายการเนื้อหา"
+
+#: administrator/components/com_trash/admin.trash.html.php:247
+msgid "Delete Items"
+msgstr "ลบรายการ"
+
+#: administrator/components/com_trash/admin.trash.html.php:256
+#: administrator/components/com_trash/admin.trash.html.php:321
+msgid "Number of Items:"
+msgstr "หมายเลข:"
+
+#: administrator/components/com_trash/admin.trash.html.php:262
+msgid "Items being Deleted:"
+msgstr "กำลังลบ"
+
+#: administrator/components/com_trash/admin.trash.html.php:273
+msgid ""
+"This will <strong><font color=\"#FF0000\">Permanently Delete</font></strong> "
+"<br />these Items from the Database"
+msgstr ""
+"ทำการ<strong><font color=\"#FF0000\">ลบถาวร</font></strong> <br /"
+">ไม่มีรายการในฐานข้อมูล"
+
+#: administrator/components/com_trash/admin.trash.html.php:276
+msgid ""
+"Are you sure you want to Deleted the listed items? \\nThis will Permanently "
+"Delete them from the database."
+msgstr "คุณแน่ใจที่จะลบใช่หรือไม่? \\nลบออกจากฐานข้อมูลเรียบร้อยแล้ว."
+
+#: administrator/components/com_trash/admin.trash.html.php:312
+msgid "Restore Items"
+msgstr "คืนค่ารายการ"
+
+#: administrator/components/com_trash/admin.trash.html.php:327
+msgid "Items being Restored:"
+msgstr "คืนค่าสำเร็จ:"
+
+#: administrator/components/com_trash/admin.trash.html.php:338
+msgid ""
+"This will <strong><font color=\"#FF0000\">Restore</font></strong> these "
+"Items,<br />they will be returned to their orignial places as Unpublished "
+"items"
+msgstr ""
+"ทำการ <strong><font color=\"#FF0000\">คืนค่า</font></strong><br /"
+">กลับไปเป็นค่าปกติ ไม่มีการเผยแพร่"
+
+#: administrator/components/com_trash/admin.trash.html.php:341
+msgid "Are you sure you want to Restore the listed items?."
+msgstr "คุณต้องการคืนค่ารายการนี้ใช่หรือไม่?."
+
+#: administrator/components/com_trash/admin.trash.html.php:342
+#: administrator/components/com_trash/admin.trash.html.php:343
+#: administrator/components/com_trash/toolbar.trash.html.php:19
+msgid "Restore"
+msgstr "คืนค่า"
+
+#: administrator/components/com_trash/admin.trash.php:182
+#, php-format
+msgid "%s Item successfully Deleted"
+msgid_plural "%s Items successfully Deleted"
+msgstr[0] "%s ทำการลบรายการสมบูรณ์"
+msgstr[1] "%s ทำการลบรายการสมบูรณ์"
+
+#: administrator/components/com_trash/admin.trash.php:256
+#, php-format
+msgid "%s Item successfully Restored"
+msgid_plural "%s Items successfully Restored"
+msgstr[0] "%s ทำการคืนค่ารายการสมบูรณ์"
+msgstr[1] "%s ทำการคืนค่ารายการสมบูรณ์"
+
+#: administrator/components/com_trash/trash.xml
+msgid "This component manages the Trash functionality."
+msgstr "คอมโพเน้นท์นี้จัดการของไร้ค่าซึ่งสามารถนำกลับไปใช้งานได้."
+
+#: administrator/components/com_templates/admin.templates.html.php:40
+msgid "No preview available"
+msgstr "ไม่สามารถแสดงได้"
+
+#: administrator/components/com_templates/admin.templates.html.php:56
+msgid "Preview Template"
+msgstr "แสดงเทมเพลต"
+
+#: administrator/components/com_templates/admin.templates.html.php:83
+#: administrator/components/com_templates/admin.templates.html.php:164
+msgid "Assigned"
+msgstr "กำหนดเทมเพลต"
+
+#: administrator/components/com_templates/admin.templates.html.php:221
+msgid "Template HTML Editor"
+msgstr "แก้ไข HTML เทมเพลต"
+
+#: administrator/components/com_templates/admin.templates.html.php:275
+msgid "Template CSS Editor"
+msgstr "แก้ไข CSS เทมเพลต"
+
+#: administrator/components/com_templates/admin.templates.html.php:326
+#, php-format
+msgid "Assign template %s to menu items"
+msgstr "กำหนดเทมเพลต %s ไปรายการเมนู"
+
+#: administrator/components/com_templates/admin.templates.html.php:331
+msgid "Page(s):"
+msgstr "หน้า:"
+
+#: administrator/components/com_templates/admin.templates.php:231
+msgid "You can not delete template in use."
+msgstr "ไม่สามารถลบได้ เนื่องจากเทมเพลตถูกใช้งาน."
+
+#: administrator/components/com_templates/admin.templates.php:258
+#: administrator/components/com_templates/admin.templates.php:323
+#, php-format
+msgid "Operation Failed: Could not open %s"
+msgstr "ผิดพลาด: ไม่สามารถเปิด %s"
+
+#: administrator/components/com_templates/admin.templates.php:270
+#: administrator/components/com_templates/admin.templates.php:334
+msgid "Operation failed: No template specified."
+msgstr "ผิดพลาด: ระบุเทมเพลตไม่ได้."
+
+#: administrator/components/com_templates/admin.templates.php:273
+#: administrator/components/com_templates/admin.templates.php:338
+msgid "Operation failed: Content empty."
+msgstr "ผิดพลาด: ไม่มีเนื้อหา."
+
+#: administrator/components/com_templates/admin.templates.php:288
+#, php-format
+msgid "Operation failed: %s is not writable."
+msgstr "ผิดพลาด: %s ไม่สามารถเขียนได้."
+
+#: administrator/components/com_templates/admin.templates.php:303
+#: administrator/components/com_templates/admin.templates.php:368
+msgid "Operation failed: Failed to open file for writing."
+msgstr "ผิดพลาด: เปิดไฟล์สำหรับเขียนทับไม่ได้."
+
+#: administrator/components/com_templates/admin.templates.php:353
+msgid "Operation failed: The file is not writable."
+msgstr "ผิดพลาด: ไฟล์ไม่สามารถเขียนได้."
+
+#: administrator/components/com_templates/admin.templates.php:450
+msgid "Positions saved"
+msgstr "บันทึกสำเร็จ"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:26
+msgid "Syndication Settings"
+msgstr "ตั้งค่าการกระจายข่าวสาร"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:49
+msgid "Manage Syndication Settings"
+msgstr "จัดการการตั้งค่าการกระจายข่าวสาร"
+
+#: administrator/components/com_syndicate/admin.syndicate.php:97
+msgid "Settings successfully Saved"
+msgstr "การตั้งค่าถูกบันทึกเรียบร้อย"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 1.0"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Activate support for Firefox Live Bookmarks functionality"
+msgstr "กระตุ้นให้รองรับสำหรับ Firefox โดยอัตโนมัติ"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Alt text for image"
+msgstr "ข้อความที่กำหนดให้อธิบายรูปภาพ"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Bookmark file"
+msgstr "ไฟล์ Bookmark"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache Time"
+msgstr "เวลาของหน่วยความจำชั่วคราว"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache file will refresh every x seconds"
+msgstr "ไฟล์หน่วยความจำชั่วคราวจะทำใหม่ทุก ๆ x วินาที"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache the feed files"
+msgstr "แคชของ feed ไฟล์"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image Alt"
+msgstr "ข้อความภาพ"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image to be included in feed"
+msgstr "รูปภาพที่ถูกแสดงอยู่ใน feed"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit Text"
+msgstr "จำกัดข้อความ"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit the article text to the value indicated below"
+msgstr "จำกัดข้อความในเนื้อหาแสดงถึงค่าข้างล่าง"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Live Bookmarks"
+msgstr "Live Bookmarks"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Number of Items to syndicate"
+msgstr "จำนวนรายการที่ต้องการทำการกระจายข่าว"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order that the items will be displayed"
+msgstr "รายการในบัญชีถูกเรียงตามลำดับในการแสดงผล"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Special file name, if empty the default will be used."
+msgstr "ชื่อไฟล์แบบพิเศษ, ถ้าว่างเปล่า ค่าเริ่มต้นจะถูกใช้."
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Description"
+msgstr "รายละเอียดกระจายข่าว"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Title"
+msgstr "ชื่อเรื่องกระจายข่าว"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Text Length"
+msgstr "ความยาวของข้อความ"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "The word length of the article text - 0 will show no text"
+msgstr "ความยาวของคำในเนื้อหา - หากเป็น 0 จะไม่แสดงข้อความอีก"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "This component controls the Syndication settings"
+msgstr "คอมโพเน้นท์นี้ใช้ควบคุมการทำงานของการกระจายข่าว"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:33
+msgid "Browser, OS, Domain Statistics"
+msgstr "เบราว์เซอร์, โอเอส, สถิติ โดเมน"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:39
+msgid "Browsers"
+msgstr "เบราว์เซอร์"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:43
+msgid "Browser"
+msgstr "เบราว์เซอร์"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:82
+msgid "OS Stats"
+msgstr "สถิติ ระบบปฏิบัติการ"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:86
+msgid "Operating System"
+msgstr "ระบบปฏิบัติการ"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:125
+msgid "Domain Stats"
+msgstr "สถิติ โดเมน"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:129
+msgid "Domain"
+msgstr "โดเมน"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:180
+msgid "Page Impression Statistics"
+msgstr "สถิติหน้าที่ถูกสนใจ"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:226
+msgid "Search Engine Text :"
+msgstr "สถิติของคำหรือข้อความที่ใช้ค้นหา :"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:227
+msgid "logging is :"
+msgstr "สถิติผู้เข้าระบบ :"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:238
+msgid "Times Requested"
+msgstr "จำนวนครั้งที่ค้นหา"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:239
+msgid "Results Returned"
+msgstr "ค้นพบทั้งหมด"
+
+#: administrator/components/com_sections/admin.sections.html.php:66
+msgid "# Categories"
+msgstr "จำนวนประเภท"
+
+#: administrator/components/com_sections/admin.sections.html.php:69
+msgid "# Active"
+msgstr "# จำนวนเนื้อหา"
+
+#: administrator/components/com_sections/admin.sections.html.php:173
+msgid "New Section"
+msgstr "หมวดใหม่"
+
+#: administrator/components/com_sections/admin.sections.html.php:201
+msgid "Section must have a name"
+msgstr "กรุณาใส่ชื่อหมวด"
+
+#: administrator/components/com_sections/admin.sections.html.php:203
+msgid "Section must have a title"
+msgstr "กรุณาใส่ชื่อเรื่องหมวด"
+
+#: administrator/components/com_sections/admin.sections.html.php:279
+msgid "Section Details"
+msgstr "รายละเอียดหมวด"
+
+#: administrator/components/com_sections/admin.sections.html.php:284
+msgid "Scope:"
+msgstr "ขอบเขต:"
+
+#: administrator/components/com_sections/admin.sections.html.php:399
+msgid "Select Menu Type"
+msgstr "เลือกรูปแบบเมนู"
+
+#: administrator/components/com_sections/admin.sections.html.php:487
+msgid "Copy Section"
+msgstr "คัดลอกหมวด"
+
+#: administrator/components/com_sections/admin.sections.html.php:499
+msgid "The new Section name"
+msgstr "ชื่อหมวดใหม่"
+
+#: administrator/components/com_sections/admin.sections.html.php:535
+msgid ""
+"This will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the new Section created."
+msgstr ""
+"นี่จะเป็นการคัดลอกประเภท\n"
+"\t\t\t<br />\n"
+"\t\t\tและรายการทั้งหมดในประเภท (ทุกอย่าง)\n"
+"\t\t\t<br />\n"
+"\t\t\tไปในหมวดใหม่."
+
+#: administrator/components/com_sections/admin.sections.php:191
+#, php-format
+msgid "The section %s is currently being edited by another administrator"
+msgstr "หมวด %s กำลังแก้ไขโดยผู้ดูแลท่านอื่นอยู่"
+
+#: administrator/components/com_sections/admin.sections.php:209
+#: administrator/components/com_sections/admin.sections.php:626
+msgid "Section Table"
+msgstr "ตารางหมวด"
+
+#: administrator/components/com_sections/admin.sections.php:213
+#: administrator/components/com_sections/admin.sections.php:233
+#: administrator/components/com_sections/admin.sections.php:631
+msgid "Section Blog"
+msgstr "บล็อกหมวด"
+
+#: administrator/components/com_sections/admin.sections.php:217
+#: administrator/components/com_sections/admin.sections.php:636
+msgid "Section Blog Archive"
+msgstr "บล็อกหมวดคลังเนื้อหา"
+
+#: administrator/components/com_sections/admin.sections.php:232
+msgid "Section List"
+msgstr "รายการหมวด"
+
+#: administrator/components/com_sections/admin.sections.php:234
+msgid "Section Archive Blog"
+msgstr "บล็อกหมวดคลังเนื้อหา"
+
+#: administrator/components/com_sections/admin.sections.php:308
+msgid "Changes to Section saved"
+msgstr "หมวดที่แก้ไขถูกบันทึกแล้ว"
+
+#: administrator/components/com_sections/admin.sections.php:314
+msgid "Section saved"
+msgstr "บันทึกหมวด"
+
+#: administrator/components/com_sections/admin.sections.php:329
+msgid "Select a section to delete"
+msgstr "เลือกหมวดที่ต้องการลบ"
+
+#: administrator/components/com_sections/admin.sections.php:367
+#, php-format
+msgid "Sections(s): %s cannot be removed as they contain categories"
+msgstr "หมวด: %s ไม่สามารถลบได้ เนื่องจากมีประเภทเชื่อมโยงอยู่"
+
+#: administrator/components/com_sections/admin.sections.php:372
+#, php-format
+msgid "Section(s): %s successfully deleted"
+msgstr "หมวด: %s ลบได้สำเร็จ"
+
+#: administrator/components/com_sections/admin.sections.php:390
+msgid "Select a section to "
+msgstr "เลือกหมวดไปยัง "
+
+#: administrator/components/com_sections/admin.sections.php:398
+msgid "Cannot Publish an Empty Section"
+msgstr "ไม่สามารถเผยแพร่ได้ ไม่มีเนื้อหาในหมวด"
+
+#: administrator/components/com_sections/admin.sections.php:587
+#, php-format
+msgid "Section %s and all its Categories and Items have been copied as %s"
+msgstr "หมวด %s และ ประเภท/รายการทั้งหมดถูกคัดลอก %s"
+
+#: administrator/components/com_search/search.xml
+msgid "This component manages the Search functionality."
+msgstr "คอมโพเน้นท์นี้จัดการการค้นหาซึ่งสามารถทำงานได้ดี"
+
+#: components/com_search/search.html.php:35
+#: components/com_search/search.html.php:65
+msgid "Search Keyword"
+msgstr "คำที่ใช้ค้นหา"
+
+#. number of matches found
+#: components/com_search/search.html.php:98
+#, php-format
+msgid "returned %d match"
+msgid_plural "returned %d matches"
+msgstr[0] "พบ %d ข้อความ"
+msgstr[1] "พบ %d ข้อความ"
+
+#: components/com_search/search.php:56
+msgid "Newest first"
+msgstr "ใหม่ก่อน"
+
+#: components/com_search/search.php:58
+msgid "Most popular"
+msgstr "สุดฮอต"
+
+#: components/com_search/search.php:59
+msgid "Alphabetical"
+msgstr "ตามลำดับอักษร"
+
+#: components/com_search/search.php:60
+msgid "Section/Category"
+msgstr "หมวดหมู่ /ประเภท"
+
+#: components/com_search/search.php:70
+msgid "Any words"
+msgstr "บางคำ"
+
+#: components/com_search/search.php:75
+msgid "All words"
+msgstr "ทุกคำ"
+
+#: components/com_search/search.php:80
+msgid "Exact phrase"
+msgstr "ทุกตัวอักษร"
+
+#. html output
+#. no matches found
+#: components/com_search/search.php:92
+msgid "No results were found"
+msgstr "ไม่พบข้อมูล"
+
+#: components/com_search/search.php:97
+msgid "One or more common words were ignored in the search"
+msgstr "หนึ่งหรือหลายคำในนี้ไม่สามารถค้นหาได้"
+
+#: components/com_registration/registration.html.php:21
+#: components/com_registration/registration.php:42
+msgid "Lost your Password?"
+msgstr "ลืมรหัสผ่าน?"
+
+#: components/com_registration/registration.html.php:26
+#, php-format
+msgid ""
+"Please enter your Username and e-mail address then click on the Send "
+"Password button.%s You will receive a new password shortly.  Use the new "
+"password to access the site."
+msgstr ""
+"กรุณาใส่  ชื่อสำหรับล็อกอิน และอีเมล ของคุณ แล้วคลิกที่ปุ่ม ส่งรหัสผ่านคุณจะได้รับรหัสผ่านทางอีเมล  "
+"และให้ใช้รหัสใหม่ที่ได้รับนี้ ในการล็อกอินเข้าใช้งาน"
+
+#: components/com_registration/registration.html.php:33
+msgid "E-mail Address:"
+msgstr "อีเมล:"
+
+#: components/com_registration/registration.html.php:38
+msgid "Send Password"
+msgstr "ส่งรหัสผ่าน"
+
+#: components/com_registration/registration.html.php:64
+msgid ""
+"Please enter a valid password -- more than 6 characters with no spaces and "
+"containing only the characters 0-9, a-z, or A-Z"
+msgstr "ใส่รหัสผ่านไม่ต้องเว้นวรรค, ตัวอักษรต้องมากกว่า 6 ตัว และเป็นอักษร 0-9,a-z,A-Z"
+
+#: components/com_registration/registration.html.php:66
+msgid "Please verify the password."
+msgstr "ยืนยันรหัสผ่านอีกครั้ง."
+
+#: components/com_registration/registration.html.php:78
+#: components/com_registration/registration.php:111
+msgid "Registration"
+msgstr "ลงทะเบียน"
+
+#: components/com_registration/registration.html.php:83
+msgid "Fields marked with an asterisk (*) are required."
+msgstr "กรุณาใส่ข้อมูลใน (*) ให้ครบถ้วน."
+
+#: components/com_registration/registration.html.php:124
+msgid "Send Registration"
+msgstr "ส่ง การลงทะเบียน"
+
+#: components/com_registration/registration.php:64
+msgid ""
+"Sorry, no corresponding user was found.  Please make sure you entered a "
+"valid username and a valid email address.  Both are required."
+msgstr ""
+
+#: components/com_registration/registration.php:76
+#, php-format
+msgid ""
+"The user account %s has this email associated with it.\n"
+"\n"
+"A web user from %s has just requested that a new password be sent.\n"
+"\n"
+"\n"
+"Your New Password is: %s\n"
+"\n"
+"\n"
+"If you didn't ask for this, don't worry. You are seeing this message, not "
+"them. \n"
+"If this was an error just login with your new password and then change your "
+"password to what you would like it to be."
+msgstr ""
+"สมาชิกที่ใช้ชื่อ %s ในการสมัครเป็นสมาชิก.\n"
+"\n"
+"ของเว็บ %s ได้ลืมรหัสในการล็อกอินและได้ขอให้จัดส่งรหัสผ่านใหม่.\n"
+"\n"
+"\n"
+"รหัสใหม่ของคุณคือ: %s\n"
+"\n"
+"\n"
+"หากคุณไม่ได้ขอให้ระบบจัดส่งอีเมลนี้มาให้ไม่ต้องเป็นกังวล. \n"
+"เพราะรหัสผ่านจะถูกส่งมาทางอีเมลของคุณเท่านั้น จะไม่มีคนอื่นทราบ คุณสามารถใช้ รหัสผ่านนี้ล็อกอิน "
+"และเปลี่ยนเป็นรหัสที่คุณต้องการได้เอง."
+
+#. eval ("\$message = \"$message\";");
+#: components/com_registration/registration.php:83
+#, php-format
+msgid "%s :: New password for - %s"
+msgstr "%s :: รหัสประจำตัวสำหรับ - %s"
+
+#: components/com_registration/registration.php:99
+msgid "New User Password created and sent!"
+msgstr "รหัสใหม่ได้บันทึกและถูกส่งไปแล้ว!"
+
+#. Send notification to all administrators
+#: components/com_registration/registration.php:162
+#: components/com_registration/registration.php:210
+#, php-format
+msgid "Account details for %s at %s"
+msgstr "รายละเอียดสมาชิกใหม่ %s ใน %s"
+
+#: components/com_registration/registration.php:167
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s. Your account has been created but, as a "
+"precaution, it must be activated by you before you can use it.\n"
+"To activate the account click on the following link or copy and paste it in "
+"your browser:\n"
+"%s\n"
+"\n"
+"After activation you may login to %s using the following username and "
+"password:\n"
+"\n"
+"Username - %s\n"
+"Password - %s"
+msgstr ""
+"สวัสดีคุณ %s,\n"
+"\n"
+"ขอบคุณที่สมัครสมาชิก %s. คุณสามารถเข้าใช้งานได้ทันทีที่คุณยืนยันหากต้องการยืนยัน คลิ๊ก link หรือ "
+"copy แล้ววาง ในช่อง address ในเบราซ์เซอร์ของคุณ:\n"
+"%s\n"
+"\n"
+"หลังจากยืนยันแล้วกรุณาล็อกอินเข้าสู่ %s โดยใช้ ชื่อผู้ใช้ และรหัสผ่านตามนี้:\n"
+"\n"
+"ชื่อผู้ใช้ - %s\n"
+"รหัสผ่าน - %s"
+
+#: components/com_registration/registration.php:182
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s.\n"
+"\n"
+"You may now login to %s using the username and password you registered with."
+msgstr ""
+"สวัสดีคุณ %s,\n"
+"\n"
+"ขอบคุณที่สมัครสมาชิก %s.\n"
+"\n"
+"คุณสามารถล็อกอินเข้าใช้งาน %s ด้วย ชื่อผู้ใช้ และ รหัสผ่าน ที่คุณได้ลงทะเบียนไว้."
+
+#: components/com_registration/registration.php:211
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"A new user has registered at %s.\n"
+"This email contains their details:\n"
+"\n"
+"Name - %s\n"
+"e-mail - %s\n"
+"Username - %s\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+"สวัสดี %s,\n"
+"\n"
+"มีสมาชิกใหม่ลงทะเบียนมายัง %s.\n"
+"ด้านล่างนี้คือ รายละเอียดของสมาชิก:\n"
+"\n"
+"ชื่อ - %s\n"
+"อีเมล - %s\n"
+"ชื่อผู้ใช้ - %s\n"
+"\n"
+"ข้อความนี้เป็นข้อความอัตโนมัติจากระบบ  คุณไม่จำเป็นต้องตอบกลับ"
+
+#: components/com_registration/registration.php:241
+#: components/com_registration/registration.php:244
+msgid "Registration Complete"
+msgstr "ลงทะเบียนเสร็จแล้วครับ!"
+
+#: components/com_registration/registration.php:242
+msgid ""
+"Your account has been created and an activation link has been sent to the e-"
+"mail address you entered. Note that you must activate the account by "
+"clicking on the activation link before you can login."
+msgstr "คุณต้องยืนยันตัวคุณก่อนโดยเข้าไปเปิดอีเมลที่ลงทะเบียนไว้แล้วคลิ๊กลิ้งค์เพื่อยีนยันจากนันสามารถเข้าใช้งานได้."
+
+#: components/com_registration/registration.php:245
+msgid "You may now login."
+msgstr "คุณสามารถเข้าใช้ได้ทันที."
+
+#: components/com_registration/registration.php:263
+#: components/com_registration/registration.php:284
+msgid "Invalid Activation Link!"
+msgstr "การยืนยันไม่ผ่าน"
+
+#: components/com_registration/registration.php:264
+#: components/com_registration/registration.php:285
+msgid ""
+"There is no such account in our database or the account has already been "
+"activated."
+msgstr "ไม่มีชื่อผู้ใช้นี้อยู่ในฐานข้อมูล."
+
+#: components/com_registration/registration.php:277
+msgid "Activation Complete!"
+msgstr "การลงทะเบียนเสร็จสมบูรณ์!"
+
+#: components/com_registration/registration.php:278
+msgid ""
+"Your account has been activated successfully. You can now login using the "
+"username and password you chose during registration."
+msgstr ""
+"การยืนยันเสร็จสมบูรณ์คุณสามารถล็อกอินเข้าใช้งานด้วย ชื่อผู้ใช้ และ รหัสผ่าน ที่คุณได้ลงทะเบียนไว้"
+
+#: administrator/components/com_poll/admin.poll.html.php:26
+msgid "Poll Manager"
+msgstr "การจัดการโพลล์"
+
+#: administrator/components/com_poll/admin.poll.html.php:39
+msgid "Poll Question"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:45
+msgid "Options"
+msgstr "ตัวเลือก"
+
+#: administrator/components/com_poll/admin.poll.html.php:48
+msgid "Lag"
+msgstr "เวลา"
+
+#: administrator/components/com_poll/admin.poll.html.php:72
+msgid "Edit Poll"
+msgstr "แก้ไขโพลล์"
+
+#: administrator/components/com_poll/admin.poll.html.php:116
+msgid "Poll must have a title"
+msgstr "กรุณาใส่หัวข้อโพลล์"
+
+#: administrator/components/com_poll/admin.poll.html.php:118
+msgid "Poll must have a non-zero lag time"
+msgstr "การตั้งค่าโพลล์ต้องใส่เลขมากกว่า 0"
+
+#: administrator/components/com_poll/admin.poll.html.php:132
+msgid "Poll:"
+msgstr "โพลล์:"
+
+#: administrator/components/com_poll/admin.poll.html.php:148
+msgid "Question:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:157
+msgid "Show on menu items:"
+msgstr "แสดงรายการเมนู"
+
+#: administrator/components/com_poll/admin.poll.html.php:164
+msgid "Lag:"
+msgstr "เวลา:"
+
+#: administrator/components/com_poll/admin.poll.html.php:173
+msgid "Options:"
+msgstr "ตัวเลือก:"
+
+#: administrator/components/com_poll/admin.poll.php:108
+#, php-format
+msgid "The poll %s is currently being edited by another administrator."
+msgstr "โพลล์ %s กำลังแก้ไขโดยผู้ดูแลท่านอื่นอยู่"
+
+#: administrator/components/com_poll/poll.class.php:42
+msgid "Your Poll must contain a title."
+msgstr "กรุณาใส่หัวข้อโพลล์."
+
+#: administrator/components/com_poll/poll.class.php:48
+msgid "Your Poll must have a non-zero lag time."
+msgstr "การตั้งค่าโพลล์ต้องใส่เลขมากกว่า 0"
+
+#: administrator/components/com_poll/poll.class.php:57
+msgid "There is a module already with that name, please try again."
+msgstr "โมดูลมีอยู่ในระบบแล้ว กรุณาลองใหม่."
+
+#: administrator/components/com_poll/poll.xml
+msgid "This component shows Polls/Surveys"
+msgstr "คอมดพเน้นท์นี้สำหรับแสดงการสำรวจ/โพลล์"
+
+#: components/com_poll/poll.html.php:49
+msgid "Select Poll:"
+msgstr "เลือก โพลล์:"
+
+#: components/com_poll/poll.html.php:81
+msgid "There are no results for this poll."
+msgstr "ยังไม่มีผลลัพธ์สำหรับโพลล์นี้."
+
+#: components/com_poll/poll.html.php:191
+msgid "Number of Voters"
+msgstr "จำนวนผู้ลงคะแนน"
+
+#: components/com_poll/poll.html.php:200
+msgid "First Vote"
+msgstr "ลงคะแนนครั้งแรก"
+
+#: components/com_poll/poll.html.php:209
+msgid "Last Vote"
+msgstr "ลงคะแนนครั้งล่าสุด"
+
+#: components/com_poll/poll.php:49
+msgid "Cookies must be enabled!"
+msgstr "คุณต้องกำหนดให้ Cookies ทำงานด้วย!"
+
+#: components/com_poll/poll.php:50 components/com_poll/poll.php:57
+#: components/com_poll/poll.php:66 components/com_poll/poll.php:73
+msgid "Continue"
+msgstr "ต่อไป"
+
+#: components/com_poll/poll.php:72
+msgid "No selection has been made, please try again"
+msgstr "คุยยังไม่ได้เลือกตัวเลือกที่ให้มา โปรดเลือกอีกครั้ง"
+
+#: components/com_poll/poll.php:113 components/com_poll/poll.php:155
+msgid "Select Poll from the list"
+msgstr "เลือกรายการแบบสำรวจ"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/admin.php:106
+msgid "XML handler error - no method provided to deal with character data"
+msgstr "XML ในส่วนจัดการข้อผิดพลาด - ไม่ใช่วิธีภายใต้เงื่อนไขที่เกี่ยวกับข้อมูลตัวอักษร"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:147
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:166
+msgid "Publish"
+msgstr "เผยแพร่"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:204
+msgid "Assign"
+msgstr "ระบุ"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:223
+#: D:/releases/svn/mambo/branches/4.6/administrator/includes/menubar.html.php:242
+msgid "Unpublish"
+msgstr "ไม่เผยแพร่"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:98
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Install Site Templates"
+msgstr "ติดตั้งเทมเพลตเว็บไซต์"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:101
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Install Administrator Templates"
+msgstr "ติดตั้งเทมเพลตผู้ดูแล"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:179
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:234
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:253
+msgid "Install/Uninstall"
+msgstr "ติดตั้ง/ลบ"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:272
+msgid "Templates - Site"
+msgstr "เทมเพลต - เว็บไซต์"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:273
+msgid "Templates - Admin"
+msgstr "เทมเพลต - ผู้ดูแลระบบ"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:277
+msgid "Install Languages"
+msgstr "ติดตั้งภาษา"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:281
+msgid "Install/Uninstall Components"
+msgstr "ติดตั้ง/ลบ คอมโพเน้นท์"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:282
+msgid "Install/Uninstall Modules"
+msgstr "ติดตั้ง/ลบ โมดูล"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/modules/mod_fullmenu.php:283
+msgid "Install/Uninstall Mambots"
+msgstr "ติดตั้ง/ลบ แมมบอท"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:48
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:56
+msgid "Upload of $userfile_name failed"
+msgstr "อับโหลด %s ไม่สำเร็จ"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:52
+msgid "Upload of $userfile_name to $media_path successful"
+msgstr "อับโหลด $userfile_name ไปยัง $media_path เสร็จแล้ว"
+
+#: D:/releases/svn/mambo/branches/4.6/administrator/popups/uploadimage.php:60
+msgid "Upload of $userfile_name to $base_Dir successful"
+msgstr "อับโหลด $userfile_name ไปยัง $base_Dir เรียบร้อย"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mamboHTML.php:378
+msgid "Published, but is <u>Pending"
+msgstr "รอการเผยแพร่"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/mambofunc.php:23
+msgid " for %.\\n\\n\\n\\n"
+msgstr " เข้ามาในเว็บ %.nnnn"
+
+#: D:/releases/svn/mambo/branches/4.6/includes/phpgettext/phpgettext.includes.php:283
+msgid "Text Domains"
+msgstr "ชื่อโดเมน"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:58
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:183
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:194
+msgid "Page"
+msgstr "หน้า"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:142
+msgid "Article Index"
+msgstr "ดัชนีบทความ"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:215
+msgid "Next &gt;&gt;"
+msgstr "ถัดไป &gt;&gt;"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mospaging.php:224
+msgid "&lt;&lt;Previous"
+msgstr "&lt;&lt;ก่อนหน้า"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:39
+msgid "User Rating"
+msgstr "ระดับผู้ใช้"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:47
+msgid "Poor"
+msgstr "แย่จัง"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:48
+msgid "vote 1 star"
+msgstr "โหวต 1 ดาว"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:49
+msgid "vote 2 star"
+msgstr "โหวต 2 ดาว"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:50
+msgid "vote 3 star"
+msgstr "โหวต 3 ดาว"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:51
+msgid "vote 4 star"
+msgstr "โหวต 4 ดาว"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:52
+msgid "vote 5 star"
+msgstr "โหวต 5 ดาว"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:53
+msgid "Best"
+msgstr "ดีมาก"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/content/mosvote.php:54
+msgid "Rate"
+msgstr "ให้คะแนน"
+
+#: D:/releases/svn/mambo/branches/4.6/mambots/search/categories.searchbot.php:70
+msgid "Category List"
+msgstr "รายการหมวด"
+
+#: administrator/components/com_banners/admin.banners.html.php:232
+msgid "Show Banner:"
+msgstr "แสดงป้ายโฆษณา:"
+
+#: administrator/components/com_categories/admin.categories.php:327
+#: administrator/components/com_categories/admin.categories.php:802
+msgid "Newsfeed Category Table"
+msgstr "ตารางประเภทการให้ข่าว"
+
+#: administrator/components/com_categories/admin.categories.php:330
+#: administrator/components/com_categories/admin.categories.php:807
+msgid "Weblink Category Table"
+msgstr "ตารางประเภทเว็บลิงก์"
+
+#: administrator/components/com_config/admin.config.html.php:206
+msgid "Favourites Site Icon:"
+msgstr "ไอคอนของเว็บไซต์:"
+
+#: administrator/components/com_content/content.xml
+msgid "A text key that an item may be referenced by (like a help reference)"
+msgstr "ข้อความหรือคำที่สามารถใช้อ้างอิงมายังเนื้อหานี้"
+
+#: administrator/components/com_content/content.xml
+msgid "Key Reference"
+msgstr "คีย์ที่ใช้อ้างอิง"
+
+#: D:/releases/svn/mambo/branches/4.6/modules/mod_stats.php:43
+msgid "WebLinks"
+msgstr "เว็บลิงก์"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install.php:85
+msgid ""
+"<a href=\"http://www.mamboserver.com\">Mambo </a> is Free Software released "
+"under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU/GPL License </"
+"a>.\n"
+"\t\t\t\t<div class=\"error\">*** To continue installing Mambo you must check "
+"the box under the license ***</div>"
+msgstr ""
+"<a href=\"http://www.mamboserver.com\">แมมโบ้</a>เป็นซอฟท์แวร์เสรีภายใต้<a href="
+"\"http://www.gnu.org/copyleft/gpl.html\">ลิขสิทธิ์ GNU/GPL</a> พัฒนาภาษาไทย <a "
+"href='http://www.mambohub.com'>MamboHub.com</a>.\n"
+"\t\t\t\t<div class=\"error\">*** เช็คที่กล่องสี่เหลี่ยมหากต้องการติดตั้ง Mambo "
+"ภายใต้ลิขสิทธิ์นี้ ***</div>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install1.php:110
+msgid "For site security using a password for the mysql account in mandatory"
+msgstr "<strong>เพื่อความปลอดภัย กรุณากำหนดรหัสผ่าน</strong>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:345
+msgid ""
+"\n"
+"\t\t\t\t<p>Click the \"View Site\" button to start Mambo site or "
+"\"Administration\"\n"
+"\t\t\t\t   to take you to administrator login.</p>"
+msgstr ""
+"\n"
+"\t\t\t\t<p>คลิกที่ปุ่ม \"ดูเว็บไซต์\" เพื่อเข้าไปยังเว็บ Mambo ของท่าน หรือคลิกที่ \"ผู้ดูแลระบบ"
+"\"\n"
+"\t\t\t\t เพื่อเข้าไปยังหน้าล็อกอินเข้าจัดการระบบ</p>"
+
+#: D:/releases/svn/mambo/branches/4.6/installation/install4.php:360
+msgid ""
+"\t\t\t\t\t\t\t\tYour configuration file or directory is not writeable,\n"
+"\t\t\t\t\t\t\t\tor there was a problem creating the configuration file. "
+"You'll have to\n"
+"\t\t\t\t\t\t\t\tupload the following code by hand. Click in the textarea to "
+"highlight\n"
+"\t\t\t\t\t\t\t\tall of the code."
+msgstr ""
+"ไม่สามารถเขียนไฟล์ configuration ได้ หรือมีปัญหาในการสร้างไฟล์ดังกล่าว,\n"
+"\t\t\t\t\t\t\t\tให้ท่านทำการก้อปปี้โค้ดข้างล่างนี้ไว้ใน txt editor \n"
+"\t\t\t\t\t\t\t\tจากนั้นให้บันทึกและอัพโหลดขึ้นเซิร์ฟเวอร์ คลิกที่ textarea "
+"เพื่อทำการไฮไลท์โค้ดทั้งหมด."
+
+#: administrator/components/com_installer/admin.installer.php:228
+msgid "Is core component - may not be deleted"
+msgstr "นี่เป็นคอมโพเน้นท์แกนหลัก - ที่ไม่สามารถลบได้"
+
+#: administrator/components/com_installer/component/component.php:21
+msgid "Install new Component"
+msgstr "ติดตั้งคอมโพเน้นท์ใหม่"
+
+#: administrator/components/com_installer/mambot/mambot.php:21
+msgid "Install new Mambots"
+msgstr "ติดตั้งแมมบอทใหม่"
+
+#: administrator/components/com_installer/module/module.php:21
+msgid "Install new Modules"
+msgstr "ติดตั้งโมดูลใหม่"
+
+#: administrator/components/com_languages/toolbar.languages.php:44
+msgid "Extract"
+msgstr "แยกไฟล์"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:9
+msgid "Compile Catalog?"
+msgstr "ตรวจสอบสมุดรายชื่อ?"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:10
+msgid "yes"
+msgstr "ใช่"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:11
+msgid "no"
+msgstr "ไม่"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:22
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:35
+msgid "MsgId"
+msgstr "MsgId"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:24
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:37
+msgid "MsgId Plural"
+msgstr "พหูพจน์ MsgId"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:25
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:38
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:54
+msgid "MsgStr"
+msgstr "MsgStr"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:27
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:41
+msgid "Plural form"
+msgstr "รูปแบบพหูพจน์"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:43
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:58
+msgid "Fuzzy Entry"
+msgstr "รายการที่ว่างเปล่า"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Catalog dump"
+msgstr "สมุดรายชื่อทิ้งขยะ"
+
+#: administrator/components/com_languages/views/templates/edit.gt.tpl.php:91
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:98
+msgid "Strings"
+msgstr "สตริง"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:11
+msgid "PHPGettext Example"
+msgstr "ตัวอย่าง PHPGettext "
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:21
+msgid "PHPGettext"
+msgstr "PHPGettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:22
+msgid "Gettext for PHP"
+msgstr "Gettext สำหรับ PHP"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:25
+msgid "Current language is:"
+msgstr "ภาษาปัจจุบัน:"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:34
+msgid "Change language"
+msgstr "เปลี่ยนภาษา"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:41
+msgid "Gettext is enabled!"
+msgstr "Gettext ถูกทำให้ใช้งานได้!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:43
+msgid "Gettext is disabled!"
+msgstr "Gettext ถูกระงับ!"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:55
+msgid "Disable Gettext"
+msgstr "ระงับ Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:56
+msgid "Enable Gettext"
+msgstr "ทำให้ใช้งาน Gettext"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:58
+msgid "Run Unit Tests"
+msgstr "หน่วยทดสอบทำงาน"
+
+#: administrator/components/com_languages/views/templates/main.gt.tpl.php:59
+msgid "Clear Tests"
+msgstr "ล้างผลทดสอบ"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:10
+msgid "Create Translation for:"
+msgstr "สร้างการแปลสำหรับ:"
+
+#: administrator/components/com_languages/views/templates/view.gt.tpl.php:20
+msgid "Delete This Template"
+msgstr "ลบแม่แบบนี้"
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:223
+msgid "plural forms"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid "Dscription Image"
+msgstr "คำอธิบายรูปภาพ"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Newsfeed Category"
+msgstr "รายการเมนู :: ตาราง - ประเภทของข่าวสาร"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Shows a Table view of Newsfeed items for a particular Category"
+msgstr "แสดงมุมมองตารางของข่าวสารรายการในบัญชีสำหรับประเภทอย่างละเอียด"
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Table - Newsfeed Category"
+msgstr "ตาราง - ประเภทของข่าวสาร"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:37
+msgid "You must select a Newsfeed to link to"
+msgstr "คุณจะต้องเลือก News Feeds ที่จะลิงก์"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+msgid "Menu Item :: Link - Newsfeed"
+msgstr "รายการเมนู :: การเชื่อมโยง - Newsfeed"
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:74
+msgid "Newsfeed to Link:"
+msgstr "News Feeds ที่จะลิงก์:"
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Creates a menu placeholder or separator "
+msgstr "สร้างเมนูตำแหน่งที่ หรือ ตัวแยก"
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Weblink Category"
+msgstr "รายการเมนู :: ตาราง - การเชื่อมโยงประเภทเว็บ"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE Editor mambot.</p><p>Please refer to the "
+"changelog and other information in the 'Admin Info' tab in the Admin "
+"component.&nbsp;</p>"
+msgstr ""
+"<p>การจัดการคอมโพเน้นท์ของ MOStlyCE Editor แมมบอท.</p><p>กรุณาตรวจสอบ "
+"ล็อคการเปลี่ยนแปลง และข้อมูลอื่นๆ ในแท็ปในการจัดการ 'คำแนะนำเกี่ยวกับผู้ดูแล' คอมโพเน้นท์."
+"&nbsp;</p>"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:29
+msgid "Newsfeed Manager"
+msgstr "การจัดการ Newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:95
+msgid "Edit Newsfeed"
+msgstr "แก้ไข Newsfeed"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please fill in the newsfeed name."
+msgstr "โปรดใส่ชื่อ newsfeed."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please fill in the newsfeed link."
+msgstr "โปรดใส่ลิงก์ของ newsfeed."
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:175
+msgid "Newsfeed:"
+msgstr "Newsfeed:"
+
+#: administrator/components/com_poll/admin.poll.html.php:41
+msgid "Poll Title"
+msgstr "ชื่อเรื่องโพลล์"
+
+#: components/com_registration/registration.php:62
+msgid "Sorry, no corresponding user was found"
+msgstr "ขออภัย, ไม่พบผู้ใช้นี้ในทะเบียน"
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 0.3"
+msgstr "ATOM 0.3"
+
+#: administrator/components/com_users/admin.users.php:156
+msgid "- Select Log Status -"
+msgstr "- เลือกสถานะล็อค -"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:29
+msgid "Weblink Manager"
+msgstr "การจัดการเว็บน่าสนใจ"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "Weblink:"
+msgstr "เว็บลิงก์:"
diff -ruN 4.5.4/language/locales.xml 4.6rc2/language/locales.xml
--- 4.5.4/language/locales.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/locales.xml	2006-03-19 14:41:39.000000000 -0600
@@ -0,0 +1,672 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locales>
+	<locale name="afrikaans" title="Afrikaans" territory="South Africa" text_direction="ltr" iso639="af" iso3166_2="ZA" iso3166_3="ZAF" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="ZA" iso3166_3="ZAF">South Africa</territory>
+		</territories>
+		<days sun="So" mon="Ma" tue="Di" wed="Wo" thu="Do" fri="Fr" sat="Sa"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Mei" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Okt" nov="Nov" dec="Des"></months>
+	</locale>
+	<locale name="albanian" title="Albanian" territory="Albania" text_direction="ltr" iso639="sq" iso3166_2="AL" iso3166_3="ALB" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d %B, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="AL" iso3166_3="ALB">Albania</territory>
+		</territories>
+		<days sun="Djl" mon="Hën" tue="Mar" wed="Mër" thu="Enj" fri="Pre" sat="Sht"></days>
+		<months jan="Jan" feb="Shk" mar="Mar" apr="Pri" may="Maj" jun="Qer" jul="Kor" aug="Gsh" sep="Sht" oct="Tet" nov="Nën" dec="Dhj"></months>
+	</locale>
+	<locale name="arabic" title="Arabic" territory="" text_direction="rtl" iso639="ar" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d %B %Y الساعة %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1256</charset>
+			<charset>iso-8859-6</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="DZ" iso3166_3="DZA">Algeria</territory>
+			<territory iso3166_2="BH" iso3166_3="BHR">Bahrain</territory>
+			<territory iso3166_2="EG" iso3166_3="EGY">Egypt</territory>
+			<territory iso3166_2="IN" iso3166_3="IND">India</territory>
+			<territory iso3166_2="IQ" iso3166_3="IRQ">Iraq</territory>
+			<territory iso3166_2="JO" iso3166_3="JOR">Jordan</territory>
+			<territory iso3166_2="KW" iso3166_3="KWT">Kuwait</territory>
+			<territory iso3166_2="LB" iso3166_3="LBN">Lebanon</territory>
+			<territory iso3166_2="LY" iso3166_3="LBY">Libyan Arab Jamahiriya</territory>
+			<territory iso3166_2="MA" iso3166_3="MAR">Morocco</territory>
+			<territory iso3166_2="OM" iso3166_3="OMN">Oman</territory>
+			<territory iso3166_2="QA" iso3166_3="QAT">Qatar</territory>
+			<territory iso3166_2="SA" iso3166_3="SAU">Saudi Arabia</territory>
+			<territory iso3166_2="SD" iso3166_3="SDN">Sudan</territory>
+			<territory iso3166_2="SY" iso3166_3="SYR">Syrian Arab Republic</territory>
+			<territory iso3166_2="TN" iso3166_3="TUN">Tunisia</territory>
+			<territory iso3166_2="AE" iso3166_3="ARE">United Arab Emirates</territory>
+			<territory iso3166_2="YE" iso3166_3="YEM">Yemen</territory>
+		</territories>
+		<days sun="الأحد" mon="الإثنين" tue="الثلاثاء" wed="الأربعاء" thu="الخميس" fri="الجمعة" sat="السبت"></days>
+		<months jan="يناير" feb="فبراير" mar="مارس" apr="أبريل" may="مايو" jun="يونيو" jul="يوليو" aug="أغسطس" sep="سبتمبر" oct="أكتوبر" nov="نوفمبر" dec="ديسمبر"></months>
+	</locale>
+	<locale name="basque" title="Basque" territory="Spain" text_direction="ltr" iso639="eu" iso3166_2="ES" iso3166_3="ESP" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%Y-%m-%d, %H:%M:%S</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="ES" iso3166_3="ESP">Spain</territory>
+		</territories>
+		<days sun="Iga" mon="Astel" tue="Astea" wed="Astez" thu="Oste" fri="Osti" sat="Lar"></days>
+		<months jan="Urt" feb="Ots" mar="Mar" apr="Api" may="Mai" jun="Eka" jul="Uzt" aug="Abu" sep="Ira" oct="Urr" nov="Aza" dec="Abe"></months>
+	</locale>
+	<locale name="bulgarian" title="Bulgarian" territory="Bulgaria" text_direction="ltr" iso639="bg" iso3166_2="BG" iso3166_3="BGR" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%e %B %Y в %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>koi8-r</charset>
+			<charset>windows-1251</charset>
+			<charset>cp1251</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="BG" iso3166_3="BGR">Bulgaria</territory>
+		</territories>
+		<days sun="нд" mon="пн" tue="вт" wed="ср" thu="чт" fri="пт" sat="сб"></days>
+		<months jan="януари" feb="февруари" mar="март" apr="април" may="май" jun="юни" jul="юли" aug="август" sep="септември" oct="окомври" nov="ноември" dec="декември"></months>
+	</locale>
+	<locale name="catalan" title="Catalan" territory="Spain" text_direction="ltr" iso639="ca" iso3166_2="ES" iso3166_3="ESP" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d-%m-%Y a les %H:%M:%S</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="ES" iso3166_3="ESP">Spain</territory>
+		</territories>
+		<days sun="Diu" mon="Dll" tue="Dma" wed="Dcr" thu="Djs" fri="Div" sat="Dis"></days>
+		<months jan="Gen" feb="Feb" mar="Mar" apr="Abr" may="Mai" jun="Jun" jul="Jul" aug="Ago" sep="Set" oct="Oct" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="chinese" title="Chinese" territory="" text_direction="ltr" iso639="zh" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%Y 年 %m 月 %d 日 %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>gb2312</charset>
+			<charset>gb18030</charset>
+			<charset>gbk</charset>
+			<charset>big5-hkscs</charset>
+			<charset>big5</charset>
+			<charset>euc-tw</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="CN" iso3166_3="CHN">China</territory>
+			<territory iso3166_2="HK" iso3166_3="HKG">Hong Kong</territory>
+			<territory iso3166_2="TW" iso3166_3="TWN">Taiwan</territory>
+		</territories>
+		<days sun="周日" mon="周一" tue="周二" wed="周三" thu="周四" fri="周五" sat="周六"></days>
+		<months jan="一月" feb="二月" mar="三月" apr="四月" may="五月" jun="六月" jul="七月" aug="八月" sep="九月" oct="十月" nov="十一月" dec="十二月"></months>
+	</locale>
+	<locale name="croatian" title="Croatian" territory="Croatia" text_direction="ltr" iso639="hr" iso3166_2="HR" iso3166_3="HRV" charset="utf-8">
+		<plural_form nplurals="3" plural="n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format>%d. %B %Y. u %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-2</charset>
+			<charset>windows-1250</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="HR" iso3166_3="HRV">Croatia</territory>
+		</territories>
+		<days sun="Ned" mon="Pon" tue="Uto" wed="Sri" thu="Čet" fri="Pet" sat="Sub"></days>
+		<months jan="Sij" feb="Vel" mar="Ožu" apr="Tra" may="Svi" jun="Lip" jul="Srp" aug="Kol" sep="Ruj" oct="Lis" nov="Stu" dec="Pro"></months>
+	</locale>
+	<locale name="czech" title="Czech" territory="Czech Republic" text_direction="ltr" iso639="cs" iso3166_2="CZ" iso3166_3="CZE" charset="utf-8">
+		<plural_form nplurals="3" plural="n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format>%a %d. %b %Y, %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-2</charset>
+			<charset>windows-1250</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="CZ" iso3166_3="CZE">Czech Republic</territory>
+		</territories>
+		<days sun="Neděle" mon="Pondělí" tue="Úterý" wed="Středa" thu="Čtvrtek" fri="Pátek" sat="Sobota"></days>
+		<months jan="ledna" feb="února" mar="března" apr="dubna" may="května" jun="června" jul="července" aug="srpna" sep="září" oct="října" nov="listopadu" dec="prosince"></months>
+	</locale>
+	<locale name="danish" title="Danish" territory="Denmark" text_direction="ltr" iso639="da" iso3166_2="DK" iso3166_3="DNK" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d/%m %Y kl. %H:%M:%S</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="DK" iso3166_3="DNK">Denmark</territory>
+		</territories>
+		<days sun="søn" mon="man" tue="tir" wed="ons" thu="tor" fri="fre" sat="lør"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Maj" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Okt" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="dutch" title="Dutch" territory="" text_direction="ltr" iso639="nl" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d %B %Y om %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="BE" iso3166_3="BEL">Belgium</territory>
+			<territory iso3166_2="NL" iso3166_3="NLD">Netherlands</territory>
+		</territories>
+		<days sun="Zo" mon="Ma" tue="Di" wed="Wo" thu="Do" fri="Vr" sat="Za"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Mei" jun="Jun" jul="Jul" aug="Aug" sep="Sept" oct="Oct" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="english" title="English" territory="" text_direction="ltr" iso639="en" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="AU" iso3166_3="AUS">Australia</territory>
+			<territory iso3166_2="BW" iso3166_3="BWA">Botswana</territory>
+			<territory iso3166_2="CA" iso3166_3="CAN">Canada</territory>
+			<territory iso3166_2="DK" iso3166_3="DNK">Denmark</territory>
+			<territory iso3166_2="HK" iso3166_3="HKG">Hong Kong</territory>
+			<territory iso3166_2="IN" iso3166_3="IND">India</territory>
+			<territory iso3166_2="IE" iso3166_3="IRL">Ireland</territory>
+			<territory iso3166_2="NZ" iso3166_3="NZL">New Zealand</territory>
+			<territory iso3166_2="PH" iso3166_3="PHL">Philippines</territory>
+			<territory iso3166_2="SG" iso3166_3="SGP">Singapore</territory>
+			<territory iso3166_2="ZA" iso3166_3="ZAF">South Africa</territory>
+			<territory iso3166_2="GB" iso3166_3="GBR">United Kingdom</territory>
+			<territory iso3166_2="US" iso3166_3="USA">United States</territory>
+			<territory iso3166_2="ZW" iso3166_3="ZWE">Zimbabwe</territory>
+		</territories>
+		<days sun="Sun" mon="Mon" tue="Tue" wed="Wed" thu="Thu" fri="Fri" sat="Sat"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="May" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Oct" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="estonian" title="Estonian" territory="Estonia" text_direction="ltr" iso639="et" iso3166_2="EE" iso3166_3="EST" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d.%m.%Y kell %H:%M:%S</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="EE" iso3166_3="EST">Estonia</territory>
+		</territories>
+		<days sun="Püh" mon="Esm" tue="Tei" wed="Kol" thu="Nel" fri="Ree" sat="Lau"></days>
+		<months jan="Jan" feb="Veb" mar="Mär" apr="Apr" may="Mai" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Okt" nov="Nov" dec="Det"></months>
+	</locale>
+	<locale name="finnish" title="Finnish" territory="Finland" text_direction="ltr" iso639="fi" iso3166_2="FI" iso3166_3="FIN" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d.%m.%Y klo %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="FI" iso3166_3="FIN">Finland</territory>
+		</territories>
+		<days sun="Su" mon="Ma" tue="Ti" wed="Ke" thu="To" fri="Pe" sat="La"></days>
+		<months jan="Tammi" feb="Helmi" mar="Maalis" apr="Huhti" may="Touko" jun="Kesä" jul="Heinä" aug="Elo" sep="Syys" oct="Loka" nov="Marras" dec="Joulu"></months>
+	</locale>
+	<locale name="french" title="French" territory="" text_direction="ltr" iso639="fr" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n&gt;1" expression="nplurals=2; plural=n&gt;1;"></plural_form>
+		<date_format>%A %d %B %Y à %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="BE" iso3166_3="BEL">Belgium</territory>
+			<territory iso3166_2="CA" iso3166_3="CAN">Canada</territory>
+			<territory iso3166_2="FR" iso3166_3="FRA">France</territory>
+			<territory iso3166_2="LU" iso3166_3="LUX">Luxembourg</territory>
+			<territory iso3166_2="CH" iso3166_3="CHE">Switzerland</territory>
+		</territories>
+		<days sun="Dimanche" mon="Lundi" tue="Mardi" wed="Mercredi" thu="Jeudi" fri="Vendredi" sat="Samedi"></days>
+		<months jan="Janvier" feb="Février" mar="Mars" apr="Avril" may="Mai" jun="Juin" jul="Juillet" aug="Août" sep="Septembre" oct="Octobre" nov="Novembre" dec="Décembre"></months>
+	</locale>
+	<locale name="galician" title="Galician" territory="Spain" text_direction="ltr" iso639="gl" iso3166_2="ES" iso3166_3="ESP" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="ES" iso3166_3="ESP">Spain</territory>
+		</territories>
+		<days sun="Sun" mon="Mon" tue="Tue" wed="Wed" thu="Thu" fri="Fri" sat="Sat"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="May" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Oct" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="georgian" title="Georgian" territory="Georgia" text_direction="ltr" iso639="ka" iso3166_2="GE" iso3166_3="GEO" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>georgian-ps</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="GE" iso3166_3="GEO">Georgia</territory>
+		</territories>
+		<days sun="Sun" mon="Mon" tue="Tue" wed="Wed" thu="Thu" fri="Fri" sat="Sat"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="May" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Oct" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="german" title="German" territory="" text_direction="ltr" iso639="de" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d. %B %Y um %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="AT" iso3166_3="AUT">Austria</territory>
+			<territory iso3166_2="BE" iso3166_3="BEL">Belgium</territory>
+			<territory iso3166_2="DE" iso3166_3="DEU">Germany</territory>
+			<territory iso3166_2="LU" iso3166_3="LUX">Luxembourg</territory>
+			<territory iso3166_2="CH" iso3166_3="CHE">Switzerland</territory>
+		</territories>
+		<days sun="So" mon="Mo" tue="Di" wed="Mi" thu="Do" fri="Fr" sat="Sa"></days>
+		<months jan="Januar" feb="Februar" mar="März" apr="April" may="Mai" jun="Juni" jul="Juli" aug="August" sep="September" oct="Oktober" nov="November" dec="Dezember"></months>
+	</locale>
+	<locale name="greek" title="Greek" territory="Greece" text_direction="ltr" iso639="el" iso3166_2="GR" iso3166_3="GRC" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d %B %Y, στις %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-7</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="GR" iso3166_3="GRC">Greece</territory>
+		</territories>
+		<days sun="Κυρ" mon="Δευ" tue="Τρι" wed="Τετ" thu="Πεμ" fri="Παρ" sat="Σαβ"></days>
+		<months jan="Ιαν" feb="Φεβ" mar="Μάρ" apr="Απρ" may="Μάι" jun="Ιούν" jul="Ιούλ" aug="Αυγ" sep="Σεπ" oct="Οκτ" nov="Νοε" dec="Δεκ"></months>
+	</locale>
+	<locale name="hebrew" title="Hebrew" territory="Israel" text_direction="rtl" iso639="iw" iso3166_2="IL" iso3166_3="ISR" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-8-i</charset>
+			<charset>iso-8859-8</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="IL" iso3166_3="ISR">Israel</territory>
+		</territories>
+		<days sun="ראשון" mon="שני" tue="שלישי" wed="רביעי" thu="חמישי" fri="שישי" sat="שבת"></days>
+		<months jan="ינואר" feb="פברואר" mar="מרץ" apr="אפריל" may="מאי" jun="יוני" jul="יולי" aug="אוגוסט" sep="ספטמבר" oct="אוקטובר" nov="נובמבר" dec="דצמבר"></months>
+	</locale>
+	<locale name="hindi" title="Hindi" territory="India" text_direction="rtl" iso639="hi" iso3166_2="IN" iso3166_3="IND" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d %B, %Y को %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="IN" iso3166_3="IND">India</territory>
+		</territories>
+		<days sun="रवी" mon="सोम" tue="मन्गल" wed="बुध" thu="गुरु" fri="शुक्र" sat="शनि"></days>
+		<months jan="जनवरी" feb="फरवरी" mar="मार्च" apr="अप्रैल" may="मई" jun="जून" jul="जुलाई" aug="अगस्त" sep=" सितम्बर" oct="अक्तूबर" nov="नवम्बर" dec="दिसमबर"></months>
+	</locale>
+	<locale name="hungarian" title="Hungarian" territory="Hungary" text_direction="ltr" iso639="hu" iso3166_2="HU" iso3166_3="HUN" charset="utf-8">
+		<plural_form nplurals="1" plural="0" expression="nplurals=1; plural=0;"></plural_form>
+		<date_format>%Y. %B %d. %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-2</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="HU" iso3166_3="HUN">Hungary</territory>
+		</territories>
+		<days sun="V" mon="H" tue="K" wed="Sze" thu="Cs" fri="P" sat="Szo"></days>
+		<months jan="Jan" feb="Feb" mar="Márc" apr="Ápr" may="Máj" jun="Jún" jul="Júl" aug="Aug" sep="Szept" oct="Okt" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="indonesian" title="Indonesian" territory="Indonesia" text_direction="ltr" iso639="in" iso3166_2="ID" iso3166_3="IDN" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d. %B %Y jam %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="ID" iso3166_3="IDN">Indonesia</territory>
+		</territories>
+		<days sun="Minggu" mon="Senin" tue="Selasa" wed="Rabu" thu="Kamis" fri="Jumat" sat="Sabtu"></days>
+		<months jan="Januari" feb="Februari" mar="Maret" apr="April" may="Mei" jun="Juni" jul="Juli" aug="Agustus" sep="September" oct="Oktober" nov="Nopember" dec="Desember"></months>
+	</locale>
+	<locale name="italian" title="Italian" territory="" text_direction="ltr" iso639="it" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d %B, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="IT" iso3166_3="ITA">Italy</territory>
+			<territory iso3166_2="CH" iso3166_3="CHE">Switzerland</territory>
+		</territories>
+		<days sun="Dom" mon="Lun" tue="Mar" wed="Mer" thu="Gio" fri="Ven" sat="Sab"></days>
+		<months jan="Gen" feb="Feb" mar="Mar" apr="Apr" may="Mag" jun="Giu" jul="Lug" aug="Ago" sep="Set" oct="Ott" nov="Nov" dec="Dic"></months>
+	</locale>
+	<locale name="japanese" title="Japanese" territory="Japan" text_direction="ltr" iso639="ja" iso3166_2="JP" iso3166_3="JPN" charset="utf-8">
+		<plural_form nplurals="1" plural="0" expression="nplurals=1; plural=0;"></plural_form>
+		<date_format>%Y 年 %B %d 日 %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>euc</charset>
+			<charset>sjis</charset>
+			<charset>euc-jp</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="JP" iso3166_3="JPN">Japan</territory>
+		</territories>
+		<days sun="日" mon="月" tue="火" wed="水" thu="木" fri="金" sat="土"></days>
+		<months jan="1月" feb="2月" mar="3月" apr="4月" may="5月" jun="6月" jul="7月" aug="8月" sep="9月" oct="10月" nov="11月" dec="12月"></months>
+	</locale>
+	<locale name="korean" title="Korean" territory="Korea" text_direction="ltr" iso639="ko" iso3166_2="KR" iso3166_3="KOR" charset="utf-8">
+		<plural_form nplurals="1" plural="0" expression="nplurals=1; plural=0;"></plural_form>
+		<date_format>%y-%m-%d %H:%M </date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>euc-kr</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="KR" iso3166_3="KOR">Korea</territory>
+		</territories>
+		<days sun="일" mon="월" tue="화" wed="수" thu="목" fri="금" sat="토"></days>
+		<months jan="해오름달" feb="시샘달" mar="물오름달" apr="잎새달" may="푸른달" jun="누리달" jul="견우직녀달" aug="타오름달" sep="열매달" oct="하늘연달" nov="미틈달" dec="매듭달"></months>
+	</locale>
+	<locale name="latvian" title="Latvian" territory="Latvia" text_direction="ltr" iso639="lv" iso3166_2="LV" iso3166_3="LVA" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d.%m.%Y %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1257</charset>
+			<charset>iso-8859-13</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="LV" iso3166_3="LVA">Latvia</territory>
+		</territories>
+		<days sun="Sv" mon="P" tue="O" wed="T" thu="C" fri="Pk" sat="S"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Mai" jun="Jūn" jul="Jūl" aug="Aug" sep="Sep" oct="Okt" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="lithuanian" title="Lithuanian" territory="Lithuania" text_direction="ltr" iso639="lt" iso3166_2="LT" iso3166_3="LTU" charset="utf-8">
+		<plural_form nplurals="3" plural="n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format> %Y m. %B %d d.  %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1257</charset>
+			<charset>iso-8859-13</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="LT" iso3166_3="LTU">Lithuania</territory>
+		</territories>
+		<days sun="Sekmadienis" mon="Pirmadienis" tue="Antradienis" wed="Trečiadienis" thu="Ketvirtadienis" fri="Penktadienis" sat="Šeštadienis"></days>
+		<months jan="Sausio" feb="Vasario" mar="Kovo" apr="Balandžio" may="Gegužio" jun="Birželio" jul="Liepos" aug="Rugpjūčio" sep="Rugsėjo" oct="Spalio" nov="Lapkričio" dec="Gruodžio"></months>
+	</locale>
+	<locale name="malay" title="Malay" territory="Malaysia" text_direction="ltr" iso639="ms" iso3166_2="MY" iso3166_3="MYS" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="MY" iso3166_3="MYS">Malaysia</territory>
+		</territories>
+		<days sun="Aha" mon="Isn" tue="Sel" wed="Rab" thu="Kha" fri="Jum" sat="Sab"></days>
+		<months jan="Jan" feb="Feb" mar="Mac" apr="Apr" may="Mei" jun="Jun" jul="Jul" aug="Ogos" sep="Sept" oct="Okt" nov="Nov" dec="Dis"></months>
+	</locale>
+	<locale name="norwegian" title="Norwegian" territory="Norway" text_direction="ltr" iso639="no" iso3166_2="NO" iso3166_3="NOR" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d. %B, %Y klokka %H:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="NO" iso3166_3="NOR">Norway</territory>
+		</territories>
+		<days sun="Søn" mon="Man" tue="Tir" wed="Ons" thu="Tor" fri="Fre" sat="Lør"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Mai" jun="Jun" jul="Jul" aug="Aug" sep="Sep" oct="Okt" nov="Nov" dec="Des"></months>
+	</locale>
+	<locale name="persian" title="Persian" territory="Iran" text_direction="rtl" iso639="fa" iso3166_2="IR" iso3166_3="IRN" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d %B %Y ساعت %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1256</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="IR" iso3166_3="IRN">Iran</territory>
+		</territories>
+		<days sun="يكشنبه" mon="دوشنبه" tue="سه‌شنبه" wed="چهارشنبه" thu="پنج‌شنبه" fri="جمعه" sat="شنبه"></days>
+		<months jan="ژانويه" feb="فوريه" mar="مارس" apr="آوريل" may="مي" jun="ژوئن" jul="جولاي" aug="آگوست" sep="سپتامبر" oct="اكتبر" nov="نوامبر" dec="دسامبر"></months>
+	</locale>
+	<locale name="polish" title="Polish" territory="Poland" text_direction="ltr" iso639="pl" iso3166_2="PL" iso3166_3="POL" charset="utf-8">
+		<plural_form nplurals="3" plural="n==1 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n==1 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format>%d %B %Y, %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-2</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="PL" iso3166_3="POL">Poland</territory>
+		</territories>
+		<days sun="Nie" mon="Pon" tue="Wto" wed="Śro" thu="Czw" fri="Pią" sat="Sob"></days>
+		<months jan="Sty" feb="Lut" mar="Mar" apr="Kwi" may="Maj" jun="Cze" jul="Lip" aug="Sie" sep="Wrz" oct="Paź" nov="Lis" dec="Gru"></months>
+	</locale>
+	<locale name="portuguese" title="Portuguese" territory="" text_direction="ltr" iso639="pt" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d-%B-%Y às %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="BR" iso3166_3="BRA">Brazil</territory>
+			<territory iso3166_2="PT" iso3166_3="PRT">Portugal</territory>
+		</territories>
+		<days sun="Dom" mon="Seg" tue="Ter" wed="Qua" thu="Qui" fri="Sex" sat="Sab"></days>
+		<months jan="Jan" feb="Fev" mar="Mar" apr="Abr" may="Mai" jun="Jun" jul="Jul" aug="Ago" sep="Set" oct="Out" nov="Nov" dec="Dez"></months>
+	</locale>
+	<locale name="romanian" title="Romanian" territory="Romania" text_direction="ltr" iso639="ro" iso3166_2="RO" iso3166_3="ROU" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-2</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="RO" iso3166_3="ROU">Romania</territory>
+		</territories>
+		<days sun="Du" mon="Lu" tue="Ma" wed="Mi" thu="Jo" fri="Vi" sat="Sa"></days>
+		<months jan="Ian" feb="Feb" mar="Mar" apr="Apr" may="Mai" jun="Iun" jul="Iul" aug="Aug" sep="Sep" oct="Oct" nov="Noi" dec="Dec"></months>
+	</locale>
+	<locale name="russian" title="Russian" territory="" text_direction="ltr" iso639="ru" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="3" plural="n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format>%B %d %Y г., %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>cp-866</charset>
+			<charset>koi8-r</charset>
+			<charset>windows-1251</charset>
+			<charset>iso-8859-5</charset>
+			<charset>koi8-u</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="RU" iso3166_3="RUS">Russia</territory>
+			<territory iso3166_2="UA" iso3166_3="UKR">Ukraine</territory>
+		</territories>
+		<days sun="Вс" mon="Пн" tue="Вт" wed="Ср" thu="Чт" fri="Пт" sat="Сб"></days>
+		<months jan="Янв" feb="Фев" mar="Мар" apr="Апр" may="Май" jun="Июн" jul="Июл" aug="Авг" sep="Сен" oct="Окт" nov="Ноя" dec="Дек"></months>
+	</locale>
+	<locale name="serbian_cyrillic" title="Serbian Cyrillic" territory="" text_direction="ltr" iso639="sr" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d. %B %Y. у %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1251</charset>
+		</codesets>
+		<territories>
+		</territories>
+		<days sun="Нед" mon="Пон" tue="Уто" wed="Сре" thu="Чет" fri="Пет" sat="Суб"></days>
+		<months jan="јан" feb="феб" mar="мар" apr="апр" may="мај" jun="јун" jul="јул" aug="авг" sep="сеп" oct="окт" nov="нов" dec="дец"></months>
+	</locale>
+	<locale name="serbian_latin" title="Serbian Latin" territory="" text_direction="ltr" iso639="sr" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d. %B %Y. u %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1250</charset>
+		</codesets>
+		<territories>
+		</territories>
+		<days sun="Ned" mon="Pon" tue="Uto" wed="Sre" thu="Čet" fri="Pet" sat="Sub"></days>
+		<months jan="jan" feb="feb" mar="mar" apr="apr" may="maj" jun="jun" jul="jul" aug="avg" sep="sep" oct="okt" nov="nov" dec="dec"></months>
+	</locale>
+	<locale name="slovak" title="Slovak" territory="Slovak" text_direction="ltr" iso639="sk" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="3" plural="n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format>%d.%B, %Y - %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-2</charset>
+			<charset>windows-1250</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="" iso3166_3="">Slovak</territory>
+		</territories>
+		<days sun="Ne" mon="Po" tue="Út" wed="St" thu="Št" fri="Pi" sat="So"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Máj" jun="Jún" jul="Júl" aug="Aug" sep="Sep" oct="Okt" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="slovenian" title="Slovenian" territory="Slovenia" text_direction="ltr" iso639="sl" iso3166_2="SI" iso3166_3="SVN" charset="utf-8">
+		<plural_form nplurals="4" plural="n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3" expression="nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;"></plural_form>
+		<date_format>%d %B %Y ob %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-2</charset>
+			<charset>windows-1250</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="SI" iso3166_3="SVN">Slovenia</territory>
+		</territories>
+		<days sun="Ned" mon="Pon" tue="Tor" wed="Sre" thu="Čet" fri="Pet" sat="Sob"></days>
+		<months jan="Jan" feb="Feb" mar="Mar" apr="Apr" may="Maj" jun="Jun" jul="Jul" aug="Avg" sep="Sep" oct="Okt" nov="Nov" dec="Dec"></months>
+	</locale>
+	<locale name="spanish" title="Spanish" territory="" text_direction="ltr" iso639="es" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d-%m-%Y a las %H:%M:%S</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="AR" iso3166_3="ARG">Argentina</territory>
+			<territory iso3166_2="BO" iso3166_3="BOL">Bolivia</territory>
+			<territory iso3166_2="CL" iso3166_3="CHL">Chile</territory>
+			<territory iso3166_2="CO" iso3166_3="COL">Colombia</territory>
+			<territory iso3166_2="CR" iso3166_3="CRI">Costa Rica</territory>
+			<territory iso3166_2="DO" iso3166_3="DOM">Dominican Republic</territory>
+			<territory iso3166_2="EC" iso3166_3="ECU">Ecuador</territory>
+			<territory iso3166_2="SV" iso3166_3="SLV">El Salvador</territory>
+			<territory iso3166_2="GT" iso3166_3="GTM">Guatemala</territory>
+			<territory iso3166_2="HN" iso3166_3="HND">Honduras</territory>
+			<territory iso3166_2="MX" iso3166_3="MEX">Mexico</territory>
+			<territory iso3166_2="NI" iso3166_3="NIC">Nicaragua</territory>
+			<territory iso3166_2="PA" iso3166_3="PAN">Panama</territory>
+			<territory iso3166_2="PY" iso3166_3="PRY">Paraguay</territory>
+			<territory iso3166_2="PE" iso3166_3="PER">Peru</territory>
+			<territory iso3166_2="PR" iso3166_3="PRI">Puerto Rico</territory>
+			<territory iso3166_2="ES" iso3166_3="ESP">Spain</territory>
+			<territory iso3166_2="US" iso3166_3="USA">United States</territory>
+			<territory iso3166_2="UY" iso3166_3="URY">Uruguay</territory>
+			<territory iso3166_2="VE" iso3166_3="VEN">Venezuela</territory>
+		</territories>
+		<days sun="Dom" mon="Lun" tue="Mar" wed="Mie" thu="Jue" fri="Vie" sat="Sab"></days>
+		<months jan="Ene" feb="Feb" mar="Mar" apr="Abr" may="May" jun="Jun" jul="Jul" aug="Ago" sep="Sep" oct="Oct" nov="Nov" dec="Dic"></months>
+	</locale>
+	<locale name="swedish" title="Swedish" territory="" text_direction="ltr" iso639="sv" iso3166_2="" iso3166_3="" charset="utf-8">
+		<plural_form nplurals="2" plural="n != 1" expression="nplurals=2; plural=n != 1;"></plural_form>
+		<date_format>%d %B %Y kl %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-1</charset>
+			<charset>iso-8859-15</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="FI" iso3166_3="FIN">Finland</territory>
+			<territory iso3166_2="SE" iso3166_3="SWE">Sweden</territory>
+		</territories>
+		<days sun="Sön" mon="Mån" tue="Tis" wed="Ons" thu="Tors" fri="Fre" sat="Lör"></days>
+		<months jan="januari" feb="februari" mar="mars" apr="april" may="maj" jun="juni" jul="juli" aug="augusti" sep="september" oct="oktober" nov="november" dec="december"></months>
+	</locale>
+	<locale name="thai" title="Thai" territory="Thailand" text_direction="ltr" iso639="th" iso3166_2="TH" iso3166_3="THA" charset="utf-8">
+		<plural_form nplurals="" plural="" expression=""></plural_form>
+		<date_format>%d %B %Y  %Rน.</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>tis-620</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="TH" iso3166_3="THA">Thailand</territory>
+		</territories>
+		<days sun="อา." mon="จ." tue="อ." wed="พ." thu="พฤ." fri="ศ." sat="ส."></days>
+		<months jan="ม.ค." feb="ก.พ." mar="มี.ค." apr="เม.ย." may="พ.ค." jun="มิ.ย." jul="ก.ค." aug="ส.ค." sep="ก.ย." oct="ต.ค." nov="พ.ย." dec="ธ.ค."></months>
+	</locale>
+	<locale name="turkish" title="Turkish" territory="Turkey" text_direction="ltr" iso639="tr" iso3166_2="TR" iso3166_3="TUR" charset="utf-8">
+		<plural_form nplurals="1" plural="0" expression="nplurals=1; plural=0;"></plural_form>
+		<date_format>%B %d, %Y at %I:%M %p</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>iso-8859-9</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="TR" iso3166_3="TUR">Turkey</territory>
+		</territories>
+		<days sun="Pazar" mon="Pazartesi" tue="Salı" wed="Çarşamba" thu="Perşembe" fri="Cuma" sat="Cumartesi"></days>
+		<months jan="Ocak" feb="Şubat" mar="Mart" apr="Nisan" may="Mayıs" jun="Haziran" jul="Temmuz" aug="Ağustos" sep="Eylül" oct="Ekim" nov="Kasım" dec="Aralık"></months>
+	</locale>
+	<locale name="ukrainian" title="Ukrainian" territory="Ukraine" text_direction="ltr" iso639="uk" iso3166_2="UA" iso3166_3="UKR" charset="utf-8">
+		<plural_form nplurals="3" plural="n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2" expression="nplurals=3; plural=n%10==1 &amp;&amp; n%100!=11 ? 0 : n%10&gt;=2 &amp;&amp; n%10&lt;=4 &amp;&amp; (n%100&lt;10 || n%100&gt;=20) ? 1 : 2;"></plural_form>
+		<date_format>%B %d %Y р., %H:%M</date_format>
+		<codesets>
+			<charset>utf-8</charset>
+			<charset>windows-1251</charset>
+			<charset>koi8-u</charset>
+		</codesets>
+		<territories>
+			<territory iso3166_2="UA" iso3166_3="UKR">Ukraine</territory>
+		</territories>
+		<days sun="Нд" mon="Пн" tue="Вт" wed="Ср" thu="Чт" fri="Пт" sat="Сб"></days>
+		<months jan="Січ" feb="Лют" mar="Бер" apr="Квт" may="Трв" jun="Чрв" jul="Лип" aug="Сер" sep="Вер" oct="Жов" nov="Лис" dec="Гру"></months>
+	</locale>
+</locales>
diff -ruN 4.5.4/language/untranslated/admin.pot 4.6rc2/language/untranslated/admin.pot
--- 4.5.4/language/untranslated/admin.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/admin.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_admin/admin.admin.html.php:27
+msgid "Home"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Advanced Mode"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "Simple Mode"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "selected"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:37
+#: administrator/components/com_admin/admin.admin.html.php:41
+msgid "unselected"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:80
+msgid "Information"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:86
+#: administrator/components/com_admin/admin.admin.html.php:482
+msgid "System Info"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:91
+msgid "System Information"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:97
+msgid "PHP built On:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:107
+msgid "Database Version:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:117
+msgid "PHP Version:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:127
+msgid "Web Server:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:137
+msgid "WebServer to PHP interface:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:147
+msgid "Mambo Version:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:157
+msgid "User Agent:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:167
+msgid "Relevant PHP Settings:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:174
+msgid "Safe Mode:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:182
+msgid "Open basedir:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:190
+msgid "Display Errors:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:198
+msgid "Short Open Tags:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:206
+msgid "File Uploads:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:214
+msgid "Magic Quotes"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:222
+msgid "Register Globals:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:230
+msgid "Output Buffering:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:238
+msgid "Session save path:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:246
+msgid "Session auto start:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:254
+msgid "XML enabled:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:262
+msgid "Zlib enabled:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:270
+msgid "Disabled Functions:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:285
+msgid "WYSIWYG Editor:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:297
+msgid "Configuration File:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:323
+msgid "PHP Info"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:328
+msgid "PHP Information"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:350
+msgid "Permissions"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:354
+msgid "Directory Permissions"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:358
+msgid ""
+"For all Mambo functions and features to work ALL of the following "
+"directories should be writeable:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:434
+msgid "Help"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:442
+msgid "Search:"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:445
+msgid "Go"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:446
+msgid "Clear Results"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:453
+#: administrator/components/com_admin/admin.admin.html.php:464
+msgid "Glossary"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:456
+#: administrator/components/com_admin/admin.admin.html.php:467
+msgid "Credits"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:459
+#: administrator/components/com_admin/admin.admin.html.php:470
+msgid "Support"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:476
+msgid "License"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:491
+msgid "Search Results"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:493
+msgid "Index"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:536
+msgid "Site Preview"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.html.php:540
+msgid "Open in new window"
+msgstr ""
+
+#: administrator/components/com_admin/admin.admin.php:22
+msgid "There is no link associated with this item"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/administrator.pot 4.6rc2/language/untranslated/administrator.pot
--- 4.5.4/language/untranslated/administrator.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/administrator.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,852 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/includes/admin.php:45
+#, php-format
+msgid "XML ERROR in %s: %s at line %d"
+msgstr ""
+
+#: administrator/includes/admin.php:51
+#, php-format
+msgid "Unable to open XML file %s"
+msgstr ""
+
+#: administrator/includes/admin.php:54
+#, php-format
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr ""
+
+#: administrator/includes/admin.php:84
+#, php-format
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr ""
+
+#: administrator/includes/admin.php:85
+#, php-format
+msgid "XML error in %s: %s not permitted within %s"
+msgstr ""
+
+#: administrator/includes/admin.php:95
+#, php-format
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr ""
+
+#: administrator/includes/admin.php:101
+#, php-format
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr ""
+
+#: administrator/includes/admin.php:121
+#, php-format
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr ""
+
+#: administrator/includes/admin.php:273
+msgid "Handler not defined for type"
+msgstr ""
+
+#: administrator/includes/admin.php:286
+msgid "There are no Parameters for this item"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:44
+#, php-format
+msgid "Please make a selection from the list to %s"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:154
+msgid "Please make a selection from the list to publish"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:164
+msgid "Please select an item to make default"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:174
+msgid "Please select an item to assign"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:193
+msgid "Please make a selection from the list to unpublish"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:203
+msgid "Please make a selection from the list to archive"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:213
+msgid "Please select a news story to unarchive"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:223
+#: administrator/includes/menubar.html.php:234
+#: administrator/includes/menubar.html.php:244
+#: administrator/includes/menubar.html.php:255
+#: administrator/includes/menubar.html.php:265
+#: administrator/includes/menubar.html.php:276
+msgid "Please select an item from the list to edit"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:287
+#: administrator/includes/menubar.html.php:299
+msgid "Please make a selection from the list to delete"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:315
+#: administrator/includes/menubar.html.php:316
+#: administrator/modules/mod_fullmenu.php:81
+msgid "Preview"
+msgstr ""
+
+#. Help Sub-Menu
+#. if (!file_exists($rootpath.'/help/'.$ref)) return false;
+#. }
+#: administrator/includes/menubar.html.php:346
+#: administrator/includes/menubar.html.php:347
+#: administrator/includes/menubar.html.php:371
+#: administrator/modules/mod_fullmenu.php:301
+#: administrator/modules/mod_quickicon.php:23
+#: administrator/modules/mod_quickicon.php:132
+msgid "Help"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:384
+msgid "Apply"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:394
+msgid "Save"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:443
+msgid "Back"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:478
+msgid "Upload"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:480
+#: administrator/includes/menubar.html.php:481
+msgid "Upload Image"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:65
+#: administrator/includes/mosAdminMenus.php:391
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:162
+msgid "Parent Window With Browser Navigation"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:163
+msgid "New Window With Browser Navigation"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:164
+msgid "New Window Without Browser Navigation"
+msgstr ""
+
+#. prepare an array with 'all' as the first item
+#: administrator/includes/mosAdminMenus.php:223
+msgid "All"
+msgstr ""
+
+#. prepare an array with 'all' as the first item
+#: administrator/includes/mosAdminMenus.php:229
+#: administrator/includes/mosAdminMenus.php:432
+msgid "None"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:285
+#: administrator/includes/mosAdminMenus.php:476
+msgid "- All Sections -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:371
+msgid "- Select Image -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:389
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:416
+msgid "- No User -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:435
+msgid "Center"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:438
+msgid "Left"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:441
+msgid "Right"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:464
+msgid "- All Categories -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:465
+msgid "You must create a category first."
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:74
+#, php-format
+msgid "Results %d to %d of %d"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:76
+msgid "No records found."
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:103
+#: administrator/includes/pageNavigation.php:106
+msgid "Start"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:103
+msgid "first page"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:104
+#: administrator/includes/pageNavigation.php:107
+msgid "Previous"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:104
+msgid "previous page"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:122
+#: administrator/includes/pageNavigation.php:125
+msgid "Next"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:122
+msgid "next page"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:123
+#: administrator/includes/pageNavigation.php:126
+msgid "End"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:123
+msgid "end page"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:66
+msgid "Control Panel"
+msgstr ""
+
+#. Home Sub-Menu
+#: administrator/modules/mod_fullmenu.php:66
+msgid "Home"
+msgstr ""
+
+#. Site Sub-Menu
+#: administrator/modules/mod_fullmenu.php:70
+msgid "Site"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:70
+msgid "Site Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:73
+#: administrator/modules/mod_fullmenu.php:279
+msgid "Configuration"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:73
+#: administrator/modules/mod_quickicon.php:117
+msgid "Global Configuration"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:77
+msgid "Language Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:77
+msgid "Manage languages"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:80
+msgid "Manage Media Files"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:80
+msgid "Media Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:82
+msgid "In New Window"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:83
+msgid "Inline"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:84
+msgid "Inline with Positions"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:86
+msgid "Site Statistics"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:86
+msgid "Statistics"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:89
+msgid "Browser, OS, Domain"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:90
+msgid "Page Impressions"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:93
+msgid "Search Text"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:97
+#: administrator/modules/mod_fullmenu.php:98
+msgid "Change site template"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:97
+msgid "Template Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:98
+msgid "Site Templates"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:99
+msgid "Administrator Templates"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:99
+msgid "Change admin template"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:100
+msgid "Module Positions"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:100
+msgid "Template positions"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:105
+msgid "Manage Trash"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:105
+msgid "Trash Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:109
+msgid "Manage users"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:109
+msgid "User Manager"
+msgstr ""
+
+#. Menu Sub-Menu
+#: administrator/modules/mod_fullmenu.php:116
+#: administrator/modules/mod_stats.php:22
+msgid "Menu"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:116
+msgid "Menu Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:119
+msgid "Menu Manager"
+msgstr ""
+
+#. Content Sub-Menu
+#: administrator/modules/mod_fullmenu.php:131
+msgid "Content"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:131
+msgid "Content Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:134
+msgid "Content Managers"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:134
+msgid "Content by Section"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:141
+msgid "Items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:144
+msgid "Add/Edit"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:144
+#: administrator/modules/mod_quickicon.php:60
+msgid "Categories"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:147
+msgid "Archive"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:158
+#: administrator/modules/mod_quickicon.php:30
+#: administrator/modules/mod_quickicon.php:139
+msgid "All Content Items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:158
+msgid "Manage Content Items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:159
+msgid "Manage Typed Content Items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:159
+msgid "Static Content Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:161
+msgid "Manage Content Sections"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:161
+msgid "Section Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:164
+msgid "Category Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:164
+msgid "Manage Content Categories"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:168
+msgid "Frontpage Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:168
+msgid "Manage Frontpage Items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:169
+msgid "Archive Manager"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:169
+msgid "Manage Archive Items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:175
+msgid "Component Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:175
+msgid "Components"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:176
+msgid "Install/Uninstall components"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:176
+#: administrator/modules/mod_fullmenu.php:231
+#: administrator/modules/mod_fullmenu.php:250
+msgid "Review/Uninstall"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:220
+msgid "More Components"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:220
+msgid "More Components..."
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:228
+msgid "Module Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:228
+msgid "Modules"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:231
+msgid "Install custom modules"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:236
+msgid "Manage Site modules"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:236
+msgid "Site Modules"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:237
+msgid "Administrator Modules"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:237
+msgid "Manage Administrator modules"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:247
+msgid "Mambot Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:247
+msgid "Mambots"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:250
+msgid "Install custom mambot"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:255
+msgid "Manage Site Mambots"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:255
+msgid "Site Mambots"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:266
+msgid "Installer List"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:266
+msgid "Installers"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:267
+msgid "Install Any Plugin"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:267
+msgid "Universal"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:269
+msgid "Install from The Source"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:269
+msgid "The Source"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:277
+msgid "Messages"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:277
+msgid "Messaging Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:278
+msgid "Inbox"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:278
+msgid "Private Messages"
+msgstr ""
+
+#. System Sub-Menu
+#: administrator/modules/mod_fullmenu.php:284
+msgid "System"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:284
+msgid "System Management"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:287
+msgid "Check-in all checked-out items"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:287
+msgid "Global Checkin"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:288
+msgid "System Information"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:288
+msgid "View System Information"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:291
+msgid "Clean Cache"
+msgstr ""
+
+#: administrator/modules/mod_fullmenu.php:291
+msgid "Clean the content items cache"
+msgstr ""
+
+#: administrator/modules/mod_latest.php:29
+msgid "Most Recently Added Content"
+msgstr ""
+
+#: administrator/modules/mod_latest.php:47
+#: administrator/modules/mod_logged.php:66
+msgid "Edit User"
+msgstr ""
+
+#: administrator/modules/mod_latest.xml
+msgid "Latest News"
+msgstr ""
+
+#: administrator/modules/mod_latest.xml
+msgid ""
+"This module shows a list of the most recently published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/modules/mod_logged.php:58
+msgid "Currently Logged in Users"
+msgstr ""
+
+#: administrator/modules/mod_logged.php:86
+msgid "Force Logout User"
+msgstr ""
+
+#: administrator/modules/mod_logged.php:86
+#: administrator/templates/mambo_admin_blue/index.php:67
+msgid "Logout"
+msgstr ""
+
+#: administrator/modules/mod_logged.xml
+msgid "Logged in Users"
+msgstr ""
+
+#: administrator/modules/mod_logged.xml
+msgid "This module shows a list of the currently logged in users"
+msgstr ""
+
+#: administrator/modules/mod_online.php:24
+msgid "Users Online"
+msgstr ""
+
+#: administrator/modules/mod_popular.php:29
+msgid "Most Popular Items"
+msgstr ""
+
+#: administrator/modules/mod_popular.php:32
+msgid "Created"
+msgstr ""
+
+#: administrator/modules/mod_popular.php:35
+msgid "Hits"
+msgstr ""
+
+#: administrator/modules/mod_popular.xml administrator/modules/mod_stats.xml
+msgid "Popular Items"
+msgstr ""
+
+#: administrator/modules/mod_popular.xml
+msgid ""
+"This module shows a list of the popular published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:37
+#: administrator/modules/mod_quickicon.php:146
+msgid "Static Content"
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:44
+#: administrator/modules/mod_quickicon.php:154
+msgid "Frontpage"
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:53
+msgid "Sections"
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:67
+msgid "Media"
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:81
+msgid "Trash"
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:91
+msgid "Menus"
+msgstr ""
+
+#: administrator/modules/mod_quickicon.php:104
+msgid "Users"
+msgstr ""
+
+#: administrator/modules/mod_stats.php:25
+msgid "# Items"
+msgstr ""
+
+#: administrator/modules/mod_stats.xml
+msgid ""
+"This module shows stats of Items that are still current (some may have "
+"expired even though they are the most recent). Items that are displayed on "
+"the Front Page Component are not included in the list."
+msgstr ""
+
+#: administrator/modules/mod_unread.php:19
+#: administrator/modules/mod_unread.php:21
+msgid "Mail"
+msgstr ""
+
+#: administrator/popups/contentwindow.php:24
+msgid "Content Preview"
+msgstr ""
+
+#: administrator/popups/contentwindow.php:62
+#: administrator/popups/modulewindow.php:51
+#: administrator/popups/pollwindow.php:51
+msgid "Close"
+msgstr ""
+
+#: administrator/popups/contentwindow.php:63
+msgid "Print"
+msgstr ""
+
+#: administrator/popups/modulewindow.php:23
+msgid "Module Preview"
+msgstr ""
+
+#: administrator/popups/pollwindow.php:27
+msgid "Poll Preview"
+msgstr ""
+
+#: administrator/popups/pollwindow.php:48
+msgid "Results"
+msgstr ""
+
+#: administrator/popups/pollwindow.php:48
+msgid "Vote"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:27
+msgid "Please select an image to upload"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:33
+msgid "File must only contain alphanumeric characters and no spaces please."
+msgstr ""
+
+#: administrator/popups/uploadimage.php:38
+#, php-format
+msgid "Image %s already exists."
+msgstr ""
+
+#: administrator/popups/uploadimage.php:43
+msgid "The file must be gif, png, jpg, bmp, swf, doc, xls or ppt"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:50
+#: administrator/popups/uploadimage.php:58
+#, php-format
+msgid "Upload of %s failed"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:54
+#: administrator/popups/uploadimage.php:62
+#, php-format
+msgid "Upload of %s to %s successful"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:86
+msgid "File Upload :"
+msgstr ""
+
+#: administrator/popups/uploadimage.php:96
+msgid "Max size"
+msgstr ""
+
+#: administrator/templates/mambo_admin/index.php:55
+#: administrator/templates/mambo_admin/login.php:36
+#: administrator/templates/mambo_admin_blue/index.php:55
+#: administrator/templates/mambo_admin_blue/index.php:93
+msgid "Mambo Logo"
+msgstr ""
+
+#: administrator/templates/mambo_admin/login.php:21
+#: administrator/templates/mambo_admin_blue/index.php:24
+msgid "Administration"
+msgstr ""
+
+#: administrator/templates/mambo_admin/login.php:42
+#: administrator/templates/mambo_admin/login.php:51
+#: administrator/templates/mambo_admin_blue/login.php:42
+msgid "Login"
+msgstr ""
+
+#: administrator/templates/mambo_admin/login.php:45
+msgid "Username"
+msgstr ""
+
+#: administrator/templates/mambo_admin/login.php:47
+msgid "Password"
+msgstr ""
+
+#: administrator/templates/mambo_admin/login.php:57
+msgid "Welcome to Mambo!"
+msgstr ""
+
+#: administrator/templates/mambo_admin/login.php:58
+msgid ""
+"Use a valid username and password to gain access to the administration "
+"console."
+msgstr ""
+
+#: administrator/templates/mambo_admin/templateDetails.xml
+msgid "Mambo Admin"
+msgstr ""
+
+#: administrator/templates/mambo_admin_blue/templateDetails.xml
+msgid "Mambo Admin Blue"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/banners.pot 4.6rc2/language/untranslated/banners.pot
--- 4.5.4/language/untranslated/banners.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/banners.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,260 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_banners/admin.banners.html.php:27
+msgid "Banner Manager"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:41
+msgid "Banner Name"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:44
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:47
+msgid "Impressions Made"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:50
+msgid "Impressions Left"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:53
+#: administrator/components/com_banners/admin.banners.html.php:56
+#: administrator/components/com_banners/admin.banners.html.php:254
+msgid "Clicks"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:97
+msgid "Edit Banner"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:157
+msgid "You must provide a banner name"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:159
+msgid "Please select a client"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:161
+msgid "Please select an image."
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:163
+msgid "Please fill in the URL for the banner."
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:174
+msgid "Banner:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:176
+#: administrator/components/com_banners/admin.banners.html.php:427
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:176
+#: administrator/components/com_banners/admin.banners.html.php:427
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:185
+#: administrator/components/com_banners/admin.banners.html.php:437
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:190
+msgid "Banner Name:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:198
+#: administrator/components/com_banners/admin.banners.html.php:442
+msgid "Client Name:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:206
+msgid "Impressions Purchased:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:217
+msgid "Unlimited"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:222
+msgid "Banner URL"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:230
+msgid "Show Banner :"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:238
+msgid "Click URL:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:246
+msgid "Custom banner code:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:256
+msgid "Reset Clicks"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:268
+msgid "Banner Image:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:318
+msgid "Banner Client Manager"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:332
+msgid "Client Name"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:335
+msgid "Client ID"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:338
+msgid "Contact"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:341
+msgid "No. of Active Banners"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:367
+msgid "Edit Banner Client"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:411
+msgid "Please fill in the Client Name."
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:413
+msgid "Please fill in the Contact Name."
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:415
+msgid "Please fill in the Contact Email."
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:425
+msgid "Banner Client:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:450
+msgid "Contact Name:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:458
+msgid "Contact Email:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.html.php:466
+msgid "Extra Info:"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#. make the select list for the image positions
+#: administrator/components/com_banners/admin.banners.php:154
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:155
+msgid "Yes"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:167
+msgid "Saved Banner info"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:170
+msgid "Reset Banner clicks"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:203
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:203
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:204
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:278
+#, php-format
+msgid "The client [ %s ] is currently being edited by another person."
+msgstr ""
+
+#: administrator/components/com_banners/admin.banners.php:336
+msgid "Cannot delete client at this time as they have a banner still running"
+msgstr ""
+
+#: administrator/components/com_banners/banners.xml
+msgid "Banners"
+msgstr ""
+
+#: administrator/components/com_banners/banners.xml
+msgid "This component manages banners and banner clients"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_banners/toolbar.banners.html.php:29
+#: administrator/components/com_banners/toolbar.banners.html.php:69
+msgid "Close"
+msgstr ""
+
+#: components/com_banners/banners.class.php:33
+msgid "You must select a name for the client."
+msgstr ""
+
+#: components/com_banners/banners.class.php:39
+msgid "You must select a contact for the client."
+msgstr ""
+
+#: components/com_banners/banners.class.php:45
+msgid "You must select a valid email for the client."
+msgstr ""
+
+#: components/com_banners/banners.class.php:100
+msgid "You must select a client."
+msgstr ""
+
+#: components/com_banners/banners.class.php:105
+msgid "You must select a name for the banner."
+msgstr ""
+
+#: components/com_banners/banners.class.php:110
+msgid "You must select a image for the banner."
+msgstr ""
+
+#: components/com_banners/banners.class.php:114
+msgid "You must select a URL/Custom banner code for the banner."
+msgstr ""
diff -ruN 4.5.4/language/untranslated/categories.pot 4.6rc2/language/untranslated/categories.pot
--- 4.5.4/language/untranslated/categories.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/categories.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,363 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_categories/admin.categories.html.php:35
+#: administrator/components/com_categories/admin.categories.html.php:53
+msgid "Category Manager"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:35
+msgid "Content: All"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:70
+msgid "Category Name"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:73
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:79
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:85
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:88
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:91
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:97
+msgid "Section"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:103
+msgid "Category ID"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:109
+msgid "Active"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:112
+msgid "Trash"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:181
+msgid "Edit Section"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:241
+msgid "Content"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:245
+#: administrator/components/com_categories/admin.categories.php:142
+msgid "Contact"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:260
+msgid "Please select a Menu"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:263
+msgid "Please select a menu type"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:266
+msgid "Please enter a Name for this menu item"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:272
+msgid "Category must have a name"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:320
+msgid "Category:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:322
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:322
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:334
+msgid "Show Advanced Details"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:337
+msgid "Hide Advanced Details"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:348
+msgid "Category Details"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:353
+msgid "Category Title:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:356
+msgid "A short name to appear in menus"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:361
+msgid "Category Name:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:364
+msgid "A long name to be displayed in headings"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:369
+msgid "Section:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:377
+msgid "Image:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:389
+msgid "Preview"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:395
+msgid "Image Position:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:403
+msgid "Ordering:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:411
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:419
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:427
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:448
+#: administrator/components/com_categories/admin.categories.html.php:485
+msgid "Link to Menu"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:453
+msgid "This will create a new menu item in the menu you select"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:459
+msgid "Select a Menu"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:467
+msgid "Select Menu Typ"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:475
+msgid "Menu Item Name"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:490
+msgid "Existing Menu Links"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:498
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:516
+msgid "Menu links available when saved"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:553
+msgid "Move Category"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:563
+msgid "Move to Section:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:569
+msgid "Categories being moved:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:580
+msgid "Content Items being moved:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:591
+msgid ""
+"This will move the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:626
+msgid "Copy Category"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:636
+msgid "Copy to Section:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:642
+msgid "Categories being copied:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:653
+msgid "Content Items being copied:"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.html.php:664
+msgid ""
+"\n"
+"\t\t\tThis will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the selected Section."
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:144
+msgid "Component: "
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:253
+#, php-format
+msgid "The category %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:272
+msgid "Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:276
+msgid "Category Blog"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:280
+msgid "Category Blog Archive"
+msgstr ""
+
+#. build the html select list for category types
+#: administrator/components/com_categories/admin.categories.php:324
+msgid "Select Type"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:326
+#: administrator/components/com_categories/admin.categories.php:799
+msgid "Contact Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:329
+#: administrator/components/com_categories/admin.categories.php:804
+msgid "News Feed Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:332
+#: administrator/components/com_categories/admin.categories.php:809
+msgid "Web Link Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:334
+#: administrator/components/com_categories/admin.categories.php:784
+msgid "Content Category Table"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:335
+#: administrator/components/com_categories/admin.categories.php:789
+msgid "Content Category Blog"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:336
+msgid "Content Category Archive Blog"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:449
+msgid "Select a category to delete"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:525
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:525
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:526
+#, php-format
+msgid "Select a category to %s"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:587
+#: administrator/components/com_categories/admin.categories.php:657
+msgid "Select an item to move"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:743
+#, php-format
+msgid "%d Category copied to %s"
+msgid_plural "%d Categories copied to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_categories/admin.categories.php:794
+msgid "Content Category Blog Archive"
+msgstr ""
+
+#: administrator/components/com_categories/admin.categories.php:835
+#, php-format
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr ""
+
+#. foreach
+#: administrator/components/com_categories/admin.categories.php:861
+msgid "New ordering saved"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_categories/toolbar.categories.html.php:30
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_categories/toolbar.categories.html.php:93
+msgid "Move"
+msgstr ""
+
+#: administrator/components/com_categories/toolbar.categories.html.php:95
+msgid "Copy"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/checkin.pot 4.6rc2/language/untranslated/checkin.pot
--- 4.5.4/language/untranslated/checkin.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/checkin.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_checkin/admin.checkin.php:17
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:22
+msgid "Global Check-in"
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:27
+msgid "Database Table"
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:28
+msgid "# of Items"
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:29
+msgid "Checked-In"
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:76
+#: administrator/components/com_checkin/admin.checkin.php:83
+msgid "Checking table"
+msgstr ""
+
+#: administrator/components/com_checkin/admin.checkin.php:77
+#: administrator/components/com_checkin/admin.checkin.php:84
+#, php-format
+msgid "Checked in <strong>%d</strong> item"
+msgid_plural "Checked in <strong>%d</strong> items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_checkin/admin.checkin.php:95
+msgid "Checked out items have now been all checked in"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/common.pot 4.6rc2/language/untranslated/common.pot
--- 4.5.4/language/untranslated/common.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/common.pot	2006-06-07 03:35:31.000000000 -0500
@@ -0,0 +1,642 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-07 09:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/includes/admin.php:45
+#, php-format
+msgid "XML ERROR in %s: %s at line %d"
+msgstr ""
+
+#: administrator/includes/admin.php:51
+#, php-format
+msgid "Unable to open XML file %s"
+msgstr ""
+
+#: administrator/includes/admin.php:54
+#, php-format
+msgid "XML error in %s - unclosed tag(s) (%s) at end of file"
+msgstr ""
+
+#: administrator/includes/admin.php:84
+#, php-format
+msgid "XML error in %s: %s is not a valid containing element"
+msgstr ""
+
+#: administrator/includes/admin.php:85
+#, php-format
+msgid "XML error in %s: %s not permitted within %s"
+msgstr ""
+
+#: administrator/includes/admin.php:95
+#, php-format
+msgid "XML error in %s: expected MOSINSTALL but found %s"
+msgstr ""
+
+#: administrator/includes/admin.php:101
+#, php-format
+msgid "XML error in %s: last open tag was %s, but found end of %s"
+msgstr ""
+
+#: administrator/includes/admin.php:121
+#, php-format
+msgid "XML error in %s: mosinstall does not have type attribute"
+msgstr ""
+
+#: administrator/includes/admin.php:273
+msgid "Handler not defined for type"
+msgstr ""
+
+#: administrator/includes/admin.php:286
+msgid "There are no Parameters for this item"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:44
+#, php-format
+msgid "Please make a selection from the list to %s"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:154 includes/HTML_toolbar.php:103
+msgid "Please make a selection from the list to publish"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:164
+msgid "Please select an item to make default"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:174
+msgid "Please select an item to assign"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:193 includes/HTML_toolbar.php:143
+msgid "Please make a selection from the list to unpublish"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:203 includes/HTML_toolbar.php:163
+msgid "Please make a selection from the list to archive"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:213 includes/HTML_toolbar.php:183
+msgid "Please select a news story to unarchive"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:223
+#: administrator/includes/menubar.html.php:234
+#: administrator/includes/menubar.html.php:244
+#: administrator/includes/menubar.html.php:255
+#: administrator/includes/menubar.html.php:265
+#: administrator/includes/menubar.html.php:276 includes/HTML_toolbar.php:203
+#: includes/HTML_toolbar.php:222 includes/HTML_toolbar.php:241
+msgid "Please select an item from the list to edit"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:287
+#: administrator/includes/menubar.html.php:299 includes/HTML_toolbar.php:262
+msgid "Please make a selection from the list to delete"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:315
+#: administrator/includes/menubar.html.php:316 includes/HTML_toolbar.php:278
+#: includes/HTML_toolbar.php:279
+msgid "Preview"
+msgstr ""
+
+#. if (!file_exists($rootpath.'/help/'.$ref)) return false;
+#. }
+#: administrator/includes/menubar.html.php:346
+#: administrator/includes/menubar.html.php:347
+#: administrator/includes/menubar.html.php:371
+msgid "Help"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:384
+msgid "Apply"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:394 includes/HTML_toolbar.php:295
+msgid "Save"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:443 includes/mamboHTML.php:246
+msgid "Back"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:478
+msgid "Upload"
+msgstr ""
+
+#: administrator/includes/menubar.html.php:480
+#: administrator/includes/menubar.html.php:481 includes/HTML_toolbar.php:392
+#: includes/HTML_toolbar.php:393
+msgid "Upload Image"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:65
+#: administrator/includes/mosAdminMenus.php:391
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:162
+msgid "Parent Window With Browser Navigation"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:163
+msgid "New Window With Browser Navigation"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:164
+msgid "New Window Without Browser Navigation"
+msgstr ""
+
+#. prepare an array with 'all' as the first item
+#: administrator/includes/mosAdminMenus.php:223
+msgid "All"
+msgstr ""
+
+#. prepare an array with 'all' as the first item
+#: administrator/includes/mosAdminMenus.php:229
+#: administrator/includes/mosAdminMenus.php:432
+msgid "None"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:285
+#: administrator/includes/mosAdminMenus.php:476
+msgid "- All Sections -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:371
+msgid "- Select Image -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:389
+msgid ""
+"New items default to the first place. Ordering can be changed after this "
+"item is saved."
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:416
+msgid "- No User -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:435
+msgid "Center"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:438
+msgid "Left"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:441
+msgid "Right"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:464
+msgid "- All Categories -"
+msgstr ""
+
+#: administrator/includes/mosAdminMenus.php:465
+msgid "You must create a category first."
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:74
+#, php-format
+msgid "Results %d to %d of %d"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:76
+msgid "No records found."
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:103
+#: administrator/includes/pageNavigation.php:106
+#: includes/pageNavigation.php:106 includes/pageNavigation.php:109
+msgid "Start"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:103
+#: includes/pageNavigation.php:106
+msgid "first page"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:104
+#: administrator/includes/pageNavigation.php:107
+#: includes/pageNavigation.php:107 includes/pageNavigation.php:110
+msgid "Previous"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:104
+#: includes/pageNavigation.php:107
+msgid "previous page"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:122
+#: administrator/includes/pageNavigation.php:125
+#: includes/pageNavigation.php:125 includes/pageNavigation.php:128
+msgid "Next"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:122
+#: includes/pageNavigation.php:125
+msgid "next page"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:123
+#: administrator/includes/pageNavigation.php:126
+#: includes/pageNavigation.php:126 includes/pageNavigation.php:129
+msgid "End"
+msgstr ""
+
+#: administrator/includes/pageNavigation.php:123
+#: includes/pageNavigation.php:126
+msgid "end page"
+msgstr ""
+
+#: includes/HTML_toolbar.php:37
+msgid "Please make a selection from the list to"
+msgstr ""
+
+#: includes/HTML_toolbar.php:56
+msgid "New"
+msgstr ""
+
+#: includes/HTML_toolbar.php:76 includes/HTML_toolbar.php:96
+#: includes/mamboHTML.php:479 includes/mamboHTML.php:566
+#: includes/mamboHTML.php:657
+msgid "Published"
+msgstr ""
+
+#: includes/HTML_toolbar.php:116 includes/HTML_toolbar.php:136
+#: includes/mamboHTML.php:657
+msgid "Unpublished"
+msgstr ""
+
+#: includes/HTML_toolbar.php:156
+msgid "Archive"
+msgstr ""
+
+#: includes/HTML_toolbar.php:176
+msgid "Unarchive"
+msgstr ""
+
+#: includes/HTML_toolbar.php:196
+msgid "Edit"
+msgstr ""
+
+#: includes/HTML_toolbar.php:216
+msgid "Edit HTML"
+msgstr ""
+
+#: includes/HTML_toolbar.php:235
+msgid "Edit CSS"
+msgstr ""
+
+#: includes/HTML_toolbar.php:255
+msgid "Delete"
+msgstr ""
+
+#: includes/HTML_toolbar.php:262
+msgid "Are you sure you want to delete selected items?"
+msgstr ""
+
+#: includes/HTML_toolbar.php:313 includes/HTML_toolbar.php:314
+#: includes/HTML_toolbar.php:328 includes/HTML_toolbar.php:329
+msgid "save"
+msgstr ""
+
+#: includes/HTML_toolbar.php:345
+msgid "Cancel"
+msgstr ""
+
+#: includes/HTML_toolbar.php:364 includes/HTML_toolbar.php:365
+msgid "back"
+msgstr ""
+
+#: includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr ""
+
+#: includes/authenticator.php:42
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr ""
+
+#: includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr ""
+
+#: includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr ""
+
+#: includes/authenticator.php:151
+msgid "Please enter a password"
+msgstr ""
+
+#: includes/authenticator.php:167
+msgid "You cannot login. There are no administrators set up."
+msgstr ""
+
+#: includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr ""
+
+#: includes/cmtclasses.php:143
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:165
+#, php-format
+msgid "Component %s error: attempt to use non-existent method %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:167 includes/cmtclasses.php:173
+#: includes/cmtclasses.php:231
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:210
+#, php-format
+msgid "MOS error in %s: method %s not found in class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:212
+#, php-format
+msgid "MOS error in %s: class not found %s"
+msgstr ""
+
+#: includes/cmtclasses.php:533
+msgid "Your Module must contain a title."
+msgstr ""
+
+#: includes/core.classes.php:351
+msgid "Impossible to determine the name of this server"
+msgstr ""
+
+#: includes/mamboHTML.php:29
+msgid "Unwriteable"
+msgstr ""
+
+#: includes/mamboHTML.php:29
+msgid "Writeable"
+msgstr ""
+
+#: includes/mamboHTML.php:103
+msgid "January"
+msgstr ""
+
+#: includes/mamboHTML.php:104
+msgid "February"
+msgstr ""
+
+#: includes/mamboHTML.php:105
+msgid "March"
+msgstr ""
+
+#: includes/mamboHTML.php:106
+msgid "April"
+msgstr ""
+
+#: includes/mamboHTML.php:107
+msgid "May"
+msgstr ""
+
+#: includes/mamboHTML.php:108
+msgid "June"
+msgstr ""
+
+#: includes/mamboHTML.php:109
+msgid "July"
+msgstr ""
+
+#: includes/mamboHTML.php:110
+msgid "August"
+msgstr ""
+
+#: includes/mamboHTML.php:111
+msgid "September"
+msgstr ""
+
+#: includes/mamboHTML.php:112
+msgid "October"
+msgstr ""
+
+#: includes/mamboHTML.php:113
+msgid "November"
+msgstr ""
+
+#: includes/mamboHTML.php:114
+msgid "December"
+msgstr ""
+
+#: includes/mamboHTML.php:129 includes/mamboHTML.php:179
+msgid "Yes"
+msgstr ""
+
+#: includes/mamboHTML.php:130 includes/mamboHTML.php:178
+msgid "No"
+msgstr ""
+
+#: includes/mamboHTML.php:202
+msgid "No Sorting"
+msgstr ""
+
+#: includes/mamboHTML.php:203
+msgid "Sort Ascending"
+msgstr ""
+
+#: includes/mamboHTML.php:204
+msgid "Sort Descending"
+msgstr ""
+
+#: includes/mamboHTML.php:229
+msgid "Close Window"
+msgstr ""
+
+#. Print Preview button - used when viewing page
+#. Print Button - used in pop-up window
+#: includes/mamboHTML.php:282 includes/mamboHTML.php:284
+#: includes/mamboHTML.php:291 includes/mamboHTML.php:300
+msgid "Print"
+msgstr ""
+
+#: includes/mamboHTML.php:356
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr ""
+
+#: includes/mamboHTML.php:381
+msgid "Pending"
+msgstr ""
+
+#: includes/mamboHTML.php:384
+msgid "Published, but is <u>Pending</u>"
+msgstr ""
+
+#: includes/mamboHTML.php:387
+msgid "Visible"
+msgstr ""
+
+#: includes/mamboHTML.php:390
+msgid "Published and is <u>Current</u>"
+msgstr ""
+
+#: includes/mamboHTML.php:393 includes/mamboHTML.php:399
+msgid "Finished"
+msgstr ""
+
+#: includes/mamboHTML.php:396
+msgid "Published, but has <u>Expired</u>"
+msgstr ""
+
+#: includes/mamboHTML.php:402
+msgid "Not Published"
+msgstr ""
+
+#: includes/mamboHTML.php:407
+msgid "Click on icon to toggle state."
+msgstr ""
+
+#: includes/mamboHTML.php:444 includes/mamboHTML.php:523
+msgid "Menu"
+msgstr ""
+
+#: includes/mamboHTML.php:447 includes/mamboHTML.php:526
+msgid "Go to Menu"
+msgstr ""
+
+#: includes/mamboHTML.php:454
+msgid "Link Name"
+msgstr ""
+
+#: includes/mamboHTML.php:458 includes/mamboHTML.php:545
+msgid "Go to Menu Item"
+msgstr ""
+
+#: includes/mamboHTML.php:466 includes/mamboHTML.php:553
+msgid "State"
+msgstr ""
+
+#: includes/mamboHTML.php:472 includes/mamboHTML.php:559
+msgid "Trashed"
+msgstr ""
+
+#: includes/mamboHTML.php:475 includes/mamboHTML.php:562
+msgid "UnPublished"
+msgstr ""
+
+#: includes/mamboHTML.php:533
+msgid "Type"
+msgstr ""
+
+#: includes/mamboHTML.php:541
+msgid "Item Name"
+msgstr ""
+
+#: includes/mamboHTML.php:590
+msgid "Checked Out"
+msgstr ""
+
+#: includes/mamboHTML.php:658
+msgid "Publish item"
+msgstr ""
+
+#: includes/mamboHTML.php:658
+msgid "Unpublish Item"
+msgstr ""
+
+#: includes/mambofunc.php:21
+#, php-format
+msgid "User Submitted '%s'"
+msgstr ""
+
+#: includes/mambofunc.php:22
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"A user submitted %s:\n"
+"[ %s ]\n"
+"\n"
+"has been just been submitted by user:\n"
+"[ %s ]\n"
+"\n"
+"\n"
+"for %\n"
+"\n"
+"Please go to %s/administrator to view and approve this %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only."
+msgstr ""
+
+#: includes/mambofunc.php:50
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: includes/mambofunc.php:52
+msgid "You need to login."
+msgstr ""
+
+#: includes/mambofunc.php:338
+msgid "Mambo Warning"
+msgstr ""
+
+#: includes/pageNavigation.php:68
+#, php-format
+msgid "Results %d - %d of %d"
+msgstr ""
+
+#: includes/pageNavigation.php:80
+#, php-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: includes/pdf.php:66
+msgid "Powered by Mambo"
+msgstr ""
+
+#: includes/pdf.php:67
+msgid "Generated:"
+msgstr ""
+
+#: includes/pdf.php:94
+msgid "Written by"
+msgstr ""
+
+#: includes/pdf.php:96
+msgid "Contributed by"
+msgstr ""
+
+#: includes/pdf.php:102
+msgid "Last Updated"
+msgstr ""
+
+#: includes/pdf.php:120
+msgid "OFF"
+msgstr ""
+
+#: includes/pdf.php:120
+msgid "ON"
+msgstr ""
+
+#: includes/phpgettext/phpgettext.includes.php:290
+msgid "Main"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/config.pot 4.6rc2/language/untranslated/config.pot
--- 4.5.4/language/untranslated/config.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/config.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,697 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_config/admin.config.html.php:102
+msgid "Global Configuration"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:104
+msgid "configuration.php is :"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:105
+msgid "Unwriteable"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:105
+msgid "Writeable"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:114
+msgid "Make unwriteable after saving"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:121
+msgid "Override write protection while saving"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:131
+msgid "Site"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:135
+msgid "Site Offline:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:139
+msgid "Offline Message:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:141
+msgid "A message that displays if your site is offline"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:146
+msgid "System Error Message:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:148
+msgid "A message that displays if Mambo could not connect to the database"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:153
+msgid "Site Name:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:157
+msgid "Show UnAuthorized Links:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:159
+msgid ""
+"If yes, will show links to content to registered content even if you are not "
+"logged in.  The user will need to login to see the item in full."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:164
+msgid "Allow User Registration:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:166
+msgid "If yes, allows users to self-register"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:171
+msgid "Use New Account Activation:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:174
+msgid ""
+"If yes, the user will be mailed a link to activate their account before they "
+"can log in."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:179
+msgid "Require Unique Email:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:181
+msgid "If yes, users cannot share the same email address"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:186
+msgid "Debug Site:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:188
+msgid "If yes, displays diagnostic information and SQL errors if present"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:193
+msgid "WYSIWYG Editor:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:197
+msgid "List Length:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:199
+msgid "Sets the default length of lists in the administrator for all users"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:204
+msgid "Favorites Site Icon:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:208
+msgid ""
+"If left blank or the file cannot be found, the default favicon.ico will be "
+"used."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:209
+msgid "Favourite Icon"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:215
+msgid "Locale"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:219
+msgid "Language:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:223
+msgid "Time Offset:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:227
+#, php-format
+msgid "Current date/time configured to display: %s"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:232
+msgid "Debugging:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:236
+msgid "Use Gettext:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:240
+msgid "Country Locale:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:246
+msgid "Content"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:250
+msgid "These Parameters control Output elements"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:253
+msgid "Linked Titles:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:256
+msgid "If yes, the title of content items will be hyperlinked to the item"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:261
+msgid "Read More Link:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:264
+msgid ""
+"If set to show, the read-more link will show if main-text has been provided "
+"for the item"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:269
+msgid "Item Rating/Voting:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:272
+msgid "If set to show, a voting system will be enabled for content items"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:277
+msgid "Author Names:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:280
+msgid ""
+"If set to show, the name of the author will be displayed.  This a global "
+"setting but can be changed at menu and item levels."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:285
+msgid "Created Date and Time:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:288
+msgid ""
+"If set to show, the date and time an item was created will be displayed. "
+"This a global setting but can be changed at menu and item levels."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:293
+msgid "Modified Date and Time:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:296
+msgid ""
+"If set to show, the date and time an item was last modified will be "
+"displayed.  This a global setting but can be changed at menu and item levels."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:301
+msgid "Hits:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:304
+msgid ""
+"If set to show, the hits for a particular item will be displayed.  This a "
+"global setting but can be changed at menu and item levels."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:309
+msgid "PDF Icon:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:314
+msgid "Option not available as /media directory not writable"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:322
+msgid "Print Icon:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:327
+msgid "Email Icon:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:332
+msgid "Icons:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:334
+msgid "Print, PDF and Email will utilise Icons or Text"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:337
+msgid "Table of Contents on multi-page items:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:342
+msgid "Back Button:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:347
+msgid "Content Item Navigation:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:362
+msgid "Database"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:366
+msgid "Hostname:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:370
+msgid "MySQL Username:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:374
+msgid "MySQL Password:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:378
+msgid "MySQL Database:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:382
+msgid "MySQL Database Prefix:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:385
+msgid ""
+"!! DO NOT CHANGE UNLESS YOU HAVE A DATABASE BUILT USING TABLES WITH THE "
+"PREFIX YOU ARE SETTING !!"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:391
+msgid "Server"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:395
+msgid "Absolute Path:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:400
+msgid "Live Site:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:406
+msgid "Secret Word:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:412
+msgid "GZIP Page Compression:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:415
+msgid "Compress buffered output if supported"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:420
+msgid "Login Session Lifetime:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:423
+#: administrator/components/com_config/admin.config.html.php:703
+msgid "seconds"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:424
+msgid "Auto logout after this time of inactivity"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:429
+msgid "Error Reporting:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:434
+msgid "Register Globals Emulation:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:438
+msgid ""
+"Register globals emulation. Some components may stop working if this option "
+"is set to Off."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:444
+msgid "Help Server:"
+msgstr ""
+
+#. if
+#: administrator/components/com_config/admin.config.html.php:456
+msgid "File Creation:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:458
+msgid "File Permissions"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:462
+msgid "Dont CHMOD new files (use server defaults)"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:467
+msgid "CHMOD new files"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:469
+msgid "to:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:472
+msgid "Select this option to define permission flags for new created files"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:481
+#: administrator/components/com_config/admin.config.html.php:560
+msgid "User:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:483
+#: administrator/components/com_config/admin.config.html.php:492
+#: administrator/components/com_config/admin.config.html.php:512
+#: administrator/components/com_config/admin.config.html.php:562
+#: administrator/components/com_config/admin.config.html.php:571
+#: administrator/components/com_config/admin.config.html.php:589
+msgid "read"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:485
+#: administrator/components/com_config/admin.config.html.php:494
+#: administrator/components/com_config/admin.config.html.php:514
+#: administrator/components/com_config/admin.config.html.php:564
+#: administrator/components/com_config/admin.config.html.php:573
+#: administrator/components/com_config/admin.config.html.php:591
+msgid "write"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:487
+#: administrator/components/com_config/admin.config.html.php:496
+#: administrator/components/com_config/admin.config.html.php:516
+msgid "execute"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:490
+#: administrator/components/com_config/admin.config.html.php:569
+msgid "Group:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:500
+msgid "Apply to existing files"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:503
+msgid ""
+"Checking here will apply the permission flags to <em>all existing files</em> "
+"of the site.<br/>"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:504
+#: administrator/components/com_config/admin.config.html.php:582
+msgid ""
+"<b>INAPPROPRIATE USAGE OF THIS OPTION MAY RENDER THE SITE INOPERATIVE!</b>"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:510
+#: administrator/components/com_config/admin.config.html.php:587
+msgid "World:"
+msgstr ""
+
+#. if
+#: administrator/components/com_config/admin.config.html.php:535
+msgid "Directory Creation:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:537
+msgid "Directory Permissions"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:541
+msgid "Dont CHMOD new directories (use server defaults)"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:546
+msgid "CHMOD new directories"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:551
+msgid ""
+"Select this option to define permission flags for new created directories"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:566
+#: administrator/components/com_config/admin.config.html.php:575
+#: administrator/components/com_config/admin.config.html.php:593
+msgid "search"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:579
+msgid "Apply to existing directories"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:581
+msgid ""
+"Checking here will apply the permission flags to <em>all existing "
+"directories</em> of the site.<br/>"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:606
+msgid "Metadata"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:610
+msgid "Global Site Meta Description:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:614
+msgid "Global Site Meta Keywords:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:618
+msgid "Show Title Meta Tag:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:622
+msgid "Show the title meta tag when viewing content items"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:626
+msgid "Show Author Meta Tag:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:630
+msgid "Show the author meta tag when viewing content items"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:636
+msgid "Mail"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:640
+msgid "Mailer:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:644
+msgid "Mail From:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:648
+msgid "From Name:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:652
+msgid "Sendmail Path:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:656
+msgid "SMTP Auth:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:660
+msgid "SMTP User:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:664
+msgid "SMTP Pass"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:668
+msgid "SMTP Host:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:674
+msgid "Cache"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:681
+msgid "Caching:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:689
+msgid "Cache Folder:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:694
+msgid "Current cache is directory is <b>Writeable</b>"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:696
+msgid ""
+"The cache directory is UNWRITEABLE - please set this directory to CHMOD755 "
+"before turning on the cache"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:702
+msgid "Cache Time:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:709
+msgid "Statistics"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:713
+msgid "Statistics:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:715
+msgid "Enable/disable collection of site statistics"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:718
+msgid "Log Content Hits by Date:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:720
+msgid "WARNING : Large amounts of data will be collected"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:723
+msgid "Log Search Strings:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:730
+msgid "SEO"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:734
+msgid "Search Engine Optimization"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:739
+msgid "Search Engine Friendly URLs:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:741
+msgid "Apache only! Rename htaccess.txt to .htaccess before activating"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:744
+msgid "Dynamic Page Titles:"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.html.php:746
+msgid "Dynamically changes the page title to reflect current content viewed"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:17
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:326
+#: administrator/components/com_config/admin.config.php:331
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:327
+#: administrator/components/com_config/admin.config.php:332
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:346
+msgid "System Default"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:347
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:348
+msgid "Simple"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:349
+msgid "Maximum"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:353
+#: administrator/components/com_config/admin.config.php:357
+msgid "On"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:354
+#: administrator/components/com_config/admin.config.php:358
+msgid "Off"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:361
+#: administrator/components/com_config/admin.config.php:399
+msgid "Yes"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:362
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:366
+msgid "PHP mail function"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:367
+msgid "Sendmail"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:368
+msgid "SMTP Server"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:412
+msgid "Remember to rename htaccess.txt to .htaccess"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:445
+msgid "Remember to install the MambelFish component."
+msgstr ""
+
+#. if
+#: administrator/components/com_config/admin.config.php:502
+msgid "The Configuration Details have been updated"
+msgstr ""
+
+#: administrator/components/com_config/admin.config.php:558
+msgid "An Error Has Occurred! Unable to open config file to write!"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/contact.pot 4.6rc2/language/untranslated/contact.pot
--- 4.5.4/language/untranslated/contact.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/contact.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,701 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_contact/admin.contact.html.php:27
+msgid "Contact Manager"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:30
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:50
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:91
+msgid "Name"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:53
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:56
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:59
+#: components/com_contact/contact.html.php:39
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:62
+msgid "Linked to User"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:94
+msgid "Edit Contact"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:113
+msgid "Edit Category"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:118
+msgid "Edit User"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:160
+msgid "You must provide a name."
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:162
+msgid "Please select a Category."
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:174
+msgid "Contact:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:176
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:176
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:188
+msgid "Contact Details"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:193
+msgid "Category:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:201
+msgid "Linked to User:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:209
+msgid "Name:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:217
+msgid "Contact's Position:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:225
+msgid "E-mail:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:233
+msgid "Street Address:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:241
+msgid "Town/Suburb:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:249
+msgid "State/County:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:257
+msgid "Country:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:265
+msgid "Postal Code/ZIP:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:273
+msgid "Telephone:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:281
+msgid "Fax:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:289
+msgid "Miscellaneous Info:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:306
+msgid "Publishing Info"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:311
+msgid "Site Default:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:319
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:327
+msgid "Ordering:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:335
+msgid "Access:"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:349
+msgid "Images"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:354
+msgid "Image Info"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:359
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Image"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:375
+msgid "Preview"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:382
+#: administrator/components/com_contact/admin.contact.html.php:387
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.html.php:392
+msgid ""
+"These Parameters only control what you see when you click to view a Contact "
+"item"
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.php:19
+#: components/com_contact/contact.php:216
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_contact/admin.contact.php:255
+#, php-format
+msgid "Select a record to %s"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "# Category Items"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Alignment of the image"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category Description"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category List - Category"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Category List - Section"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: components/com_contact/contact.html.php:443
+msgid "Contact"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Description Text"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Email Column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Fax Column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Image Align"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Left"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Position Column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Right"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Description below"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Email column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Fax column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Position column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Table Headings"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the Telephone column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the number of items in each category"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Table Headings"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "Telephone Column"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+msgid "This component shows a listing of Contact Information"
+msgstr ""
+
+#: administrator/components/com_contact/contact.xml
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Address Icon"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Contact Items"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Country"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Description text"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Drop Down"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:106
+msgid "Email"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Copy"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Form"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email Icon"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Email description"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:124
+msgid "Fax"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Fax Icon"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Address info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Email info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Fax info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Misc info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icon for the Telephone info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Icons/text"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Icon"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Misc Info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Parameters for individual Contact Items"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+#: components/com_contact/contact.html.php:97
+msgid "Position"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Post/Zip Code"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Print Icon"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Description Text below"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Drop Down select list in Contact view"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the Vcard"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the checkbox to email a copy to the senders address"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the country info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"Show/Hide the email info, if you set to show the address will be protected "
+"from spambots by javascript cloaking"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the email to form"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the fax info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the image"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the misc info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the name info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the position info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the post code info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the state info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the street address info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the suburb info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Show/Hide the telephone info"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "State"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Street Address"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Telephone Icon"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Text"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid ""
+"The Description text for the Email form, if left blank it will use the "
+"_EMAIL_DESCRIPTION language definition"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Town/Suburb"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Use Icons, text or nothing next to the contact information displayed"
+msgstr ""
+
+#: administrator/components/com_contact/contact_items.xml
+msgid "Vcard"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_contact/toolbar.contact.html.php:28
+msgid "Close"
+msgstr ""
+
+#: components/com_contact/contact.class.php:163
+#, php-format
+msgid "Mambo vCard for %s"
+msgstr ""
+
+#: components/com_contact/contact.html.php:115
+msgid "Phone"
+msgstr ""
+
+#: components/com_contact/contact.html.php:260
+#: components/com_contact/contact.php:51
+msgid "Please make sure the form is complete and valid."
+msgstr ""
+
+#: components/com_contact/contact.html.php:387
+msgid "Select Contact:"
+msgstr ""
+
+#: components/com_contact/contact.html.php:631
+msgid "Download information as a"
+msgstr ""
+
+#: components/com_contact/contact.html.php:633
+msgid "VCard"
+msgstr ""
+
+#: components/com_contact/contact.html.php:654
+msgid "Enter your name:"
+msgstr ""
+
+#: components/com_contact/contact.html.php:658
+msgid "E-mail address:"
+msgstr ""
+
+#: components/com_contact/contact.html.php:662
+msgid "Message subject:"
+msgstr ""
+
+#: components/com_contact/contact.html.php:666
+msgid "Enter your message:"
+msgstr ""
+
+#: components/com_contact/contact.html.php:674
+msgid "Email a copy of this message to your own address"
+msgstr ""
+
+#: components/com_contact/contact.html.php:678
+msgid "Send"
+msgstr ""
+
+#: components/com_contact/contact.html.php:695
+msgid "There are no Contact Details listed."
+msgstr ""
+
+#: components/com_contact/contact.php:43
+msgid "Enquiry"
+msgstr ""
+
+#: components/com_contact/contact.php:54
+#, php-format
+msgid "This is an enquiry e-mail via %s from:"
+msgstr ""
+
+#: components/com_contact/contact.php:60
+#, php-format
+msgid "The following is a copy of the message you sent to %s via %s "
+msgstr ""
+
+#: components/com_contact/contact.php:62
+#, php-format
+msgid "Copy of: %s"
+msgstr ""
+
+#: components/com_contact/contact.php:67
+msgid "Thank you for your e-mail"
+msgstr ""
+
+#: components/com_contact/contact.php:166
+msgid "The Contact list for this Website."
+msgstr ""
+
+#: components/com_contact/contact.php:277
+msgid "Send an Email to this Contact:"
+msgstr ""
+
+#. text
+#: components/com_contact/contact.php:298
+msgid "Address: "
+msgstr ""
+
+#: components/com_contact/contact.php:299
+msgid "Email: "
+msgstr ""
+
+#: components/com_contact/contact.php:300
+msgid "Telephone: "
+msgstr ""
+
+#: components/com_contact/contact.php:301
+msgid "Fax: "
+msgstr ""
+
+#: components/com_contact/contact.php:302
+msgid "Information: "
+msgstr ""
+
+#: components/com_contact/contact.php:382
+msgid "Contact Us"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/containers.pot 4.6rc2/language/untranslated/containers.pot
--- 4.5.4/language/untranslated/containers.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/containers.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_containers/admin.containers.html.php:26
+msgid "Icon"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:45
+msgid "Display number"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:47
+msgid "Search:"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:49
+msgid "Show Descendants?"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:64
+msgid "Parent container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:81
+msgid "Mambo "
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:94
+#: administrator/components/com_containers/admin.containers.html.php:137
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:122
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:126
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:127
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:130
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:134
+msgid "Top level container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:135
+msgid "Immediate container"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:188
+#: administrator/components/com_containers/containers.xml
+msgid "Containers"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:248
+msgid "Edit Container details"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:250
+msgid "Container name"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:251
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:251
+msgid "Up to 500 characters"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:252
+msgid "Keywords"
+msgstr ""
+
+#: administrator/components/com_containers/admin.containers.html.php:253
+msgid "Window title"
+msgstr ""
+
+#: administrator/components/com_containers/containers.xml
+msgid "Nested container system for Mambo"
+msgstr ""
+
+#: components/com_containers/containers.class.php:143
+msgid "No parent"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/content.pot 4.6rc2/language/untranslated/content.pot
--- 4.5.4/language/untranslated/content.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/content.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,1196 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_content/admin.content.html.php:35
+#: administrator/components/com_content/admin.content.html.php:39
+msgid "Content Items Manager"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:35
+msgid "Section: All"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:39
+#: administrator/components/com_content/admin.content.html.php:304
+#: administrator/components/com_content/admin.content.html.php:308
+#: administrator/components/com_content/admin.content.html.php:585
+#: administrator/components/com_content/admin.content.html.php:627
+msgid "Section:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:62
+#: administrator/components/com_content/admin.content.html.php:331
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:79
+#: administrator/components/com_content/admin.content.html.php:348
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:82
+#: administrator/components/com_content/admin.content.html.php:134
+#: administrator/components/com_content/admin.content.html.php:137
+#: administrator/components/com_content/admin.content.html.php:780
+#: components/com_content/content.php:1259
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:85
+msgid "Front Page"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:88
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:91
+#: administrator/components/com_content/admin.content.html.php:351
+#: components/com_content/content.html.php:173
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:94
+#: administrator/components/com_content/admin.content.html.php:354
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:97
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:100
+msgid "ID"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:106
+msgid "Section"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:112
+#: administrator/components/com_content/admin.content.html.php:357
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:115
+#: administrator/components/com_content/admin.content.html.php:360
+#: components/com_content/content.html.php:218
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:118
+#: administrator/components/com_content/admin.content.html.php:363
+#: components/com_content/content.html.php:204
+msgid "Date"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:140
+msgid "Expired"
+msgstr ""
+
+#. make the select list for the states
+#: administrator/components/com_content/admin.content.html.php:143
+#: components/com_content/content.html.php:594
+#: components/com_content/content.php:1258
+msgid "Unpublished"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:148
+msgid "Always"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:148
+msgid "Start:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:155
+#: administrator/components/com_content/admin.content.html.php:157
+msgid "Finish:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:155
+msgid "No Expiry"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:166
+#: administrator/components/com_content/admin.content.html.php:378
+msgid "Edit User"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:194
+msgid "Edit Content"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:205
+msgid "Publish Information"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:214
+#: administrator/components/com_content/content.xml
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:214
+#: administrator/components/com_content/content.xml
+msgid "Yes"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:236
+msgid "Edit Section"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:244
+#: administrator/components/com_content/admin.content.html.php:404
+msgid "Edit Category"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:287
+msgid "Please make a selection from the list to send to Trash"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:288
+msgid ""
+"Are you sure you want to Trash the selected items? \\nThis will not "
+"permanently delete the items."
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:304
+msgid "All"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:304
+#: administrator/components/com_content/admin.content.html.php:308
+msgid "Archive Manager"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:498
+msgid "Please select a Menu"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:501
+msgid "Please enter a Name for this menu item"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:519
+#: components/com_content/content.html.php:908
+msgid "Content item must have a title"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:521
+msgid "You must select a Section."
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:523
+#: administrator/components/com_content/admin.content.html.php:525
+msgid "You must select a Category."
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:577
+msgid "Content Item:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:579
+#: components/com_content/content.html.php:587
+#: components/com_content/content.html.php:589
+#: components/com_content/content.html.php:962
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:579
+#: components/com_content/content.html.php:320
+#: components/com_content/content.html.php:321
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:598
+msgid "Show Advanced Details"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:601
+msgid "Hide Advanced Details"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:616
+msgid "Item Details"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:621
+#: components/com_content/content.html.php:986
+msgid "Title:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:635
+msgid "Title Alias:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:641
+#: components/com_content/content.html.php:999
+msgid "Category:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:653
+msgid "Intro Text:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:653
+msgid "required"
+msgstr ""
+
+#. parameters : areaname, content, hidden field, width, height, rows, cols
+#: administrator/components/com_content/admin.content.html.php:661
+msgid "Main Text:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:661
+msgid "optional"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:680
+#: components/com_content/content.html.php:1141
+msgid "Publishing"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:685
+msgid "Publishing Info"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:690
+msgid "Show on Frontpage:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:698
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:706
+#: components/com_content/content.html.php:1159
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:713
+#: components/com_content/content.html.php:1167
+msgid "Author Alias:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:721
+msgid "Change Creator:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:727
+#: components/com_content/content.html.php:1175
+msgid "Ordering:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:733
+msgid "Override Created Date"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:742
+#: components/com_content/content.html.php:1183
+msgid "Start Publishing:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:751
+#: components/com_content/content.html.php:1192
+msgid "Finish Publishing:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:766
+msgid "Content ID:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:777
+#: components/com_content/content.html.php:1149
+msgid "State:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:780
+msgid "Archived"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:780
+msgid "Draft Unpublished"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:786
+#: components/com_content/content.html.php:225
+msgid "Hits"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:792
+msgid "Reset Hit Count"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:799
+msgid "Revised"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:803
+msgid "times"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:809
+msgid "Created"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:813
+#: administrator/components/com_content/admin.content.html.php:823
+msgid "By"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:819
+msgid "Last Modified"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:829
+#: components/com_content/content.html.php:1056
+msgid "Images"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:834
+msgid "MOSImage Control"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:838
+msgid "Sub-folder:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:842
+msgid "Gallery Images:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:852
+#: components/com_content/content.html.php:962
+msgid "Add"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:857
+msgid "Content Images:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:867
+msgid "up"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:868
+msgid "down"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:869
+msgid "remove"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:874
+msgid "Edit the image selected:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:878
+#: components/com_content/content.html.php:1091
+msgid "Source:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:886
+msgid "Image Align:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:894
+#: components/com_content/content.html.php:1107
+msgid "Alt Text:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:902
+#: components/com_content/content.html.php:1115
+msgid "Border:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:910
+msgid "Caption:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:918
+msgid "Caption Position:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:926
+msgid "Caption Align:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:934
+msgid "Width:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:942
+#: components/com_content/content.html.php:1124
+msgid "Apply"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:951
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:956
+msgid "Parameter Control"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:961
+msgid ""
+"These Parameters only control what you see when you click to view an item "
+"fully"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:973
+msgid "Meta Info"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:978
+msgid "Meta Data"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:983
+#: components/com_content/content.html.php:1215
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:990
+#: components/com_content/content.html.php:1223
+msgid "Keywords:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:997
+msgid "Add Sect/Cat/Title"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1003
+#: administrator/components/com_content/admin.content.html.php:1008
+#: administrator/components/com_content/admin.content.html.php:1037
+msgid "Link to Menu"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1013
+msgid "This will create a 'Link - Content Item' in the menu you select"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1019
+msgid "Select a Menu"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1027
+msgid "Menu Item Name"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1042
+msgid "Existing Menu Links"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1050
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1116
+msgid "Please select something"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1128
+msgid "Move Items"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1137
+msgid "Move to Section/Category:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1143
+msgid "Items being Moved:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1186
+msgid "Please select a Section/Category to copy the items to"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1197
+msgid "Copy Content Items"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1206
+msgid "Copy to Section/Category:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.html.php:1212
+msgid "Items being copied:"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:164
+msgid "All Content Items"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:245
+#: administrator/components/com_content/admin.content.php:354
+msgid "- All Authors -"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:385
+msgid "You cannot edit an archived item"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:410
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:426
+#: administrator/components/com_content/admin.content.php:458
+#: administrator/components/com_content/admin.content.php:598
+msgid "Never"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:477
+msgid "Select Section"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:479
+msgid "Add Section(s) First"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:488
+#: administrator/components/com_content/admin.content.php:503
+#: administrator/components/com_content/admin.content.php:511
+msgid "Select Category"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:498
+msgid "Add Categories First"
+msgstr ""
+
+#. build the select list for the image caption position
+#: administrator/components/com_content/admin.content.php:553
+msgid "Bottom"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:554
+msgid "Top"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:681
+msgid "Successfully Saved changes to Item: "
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:686
+msgid "Successfully Saved Item: "
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:705
+msgid "archive"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:705
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:705
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:706
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:727
+#, php-format
+msgid "%d Item successfully Archived"
+msgid_plural "%d Items successfully Archived"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:729
+#, php-format
+msgid "%d Item successfully Published"
+msgid_plural "%d Items successfully Published"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:731
+#, php-format
+msgid "%d Item successfully Unpublished"
+msgid_plural "%d Items successfully Unpublished"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:757
+msgid "Select an item to toggle"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:792
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:809
+#, php-format
+msgid "%d Item sent to the Trash"
+msgid_plural "%d Items sent to the Trash"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:851
+#: administrator/components/com_content/admin.content.php:951
+msgid "Select an item to move"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:890
+#: administrator/components/com_content/admin.content.php:994
+msgid "An error has occurred"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:939
+#, php-format
+msgid "%d Item successfully moved to Section: %s, Category: %s"
+msgid_plural "%d Items successfully moved to Section: %s, Category: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:1066
+#, php-format
+msgid "%d Item successfully copied to Section: %s, Category: %s"
+msgid_plural "%d Items successfully copied to Section: %s, Category: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_content/admin.content.php:1083
+msgid "Successfully Reset Hit count"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:1114
+msgid "- All Categories -"
+msgstr ""
+
+#: administrator/components/com_content/admin.content.php:1149
+#, php-format
+msgid "%s (Link - Static Content) in menu: %s successfully created"
+msgstr ""
+
+#. foreach
+#: administrator/components/com_content/admin.content.php:1191
+msgid "New ordering saved"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Author Names"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Category Name"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Category Name Linkable"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Content Page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Created Date and Time"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Email Icon"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+#: components/com_content/content.html.php:1015
+msgid "Intro Text"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Item Rating"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Linked Titles"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Make your Item titles linkable"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Modified Date and Time"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "PDF Icon"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Print Icon"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Section Name"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Section Name Linkable"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the intro text"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Show/Hide the items title"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "This shows a single content page"
+msgstr ""
+
+#: administrator/components/com_content/content.xml
+msgid "Use Global"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_content/toolbar.content.html.php:28
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_content/toolbar.content.html.php:45
+msgid "Trash"
+msgstr ""
+
+#: administrator/components/com_content/toolbar.content.html.php:53
+#: administrator/components/com_content/toolbar.content.html.php:63
+msgid "Save"
+msgstr ""
+
+#: administrator/components/com_content/toolbar.content.html.php:81
+msgid "Move"
+msgstr ""
+
+#: administrator/components/com_content/toolbar.content.html.php:83
+msgid "Copy"
+msgstr ""
+
+#: components/com_content/content.html.php:70
+msgid "This Category is currently empty"
+msgstr ""
+
+#: components/com_content/content.html.php:116
+#, php-format
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_content/content.html.php:132
+msgid "Registered Users Only"
+msgstr ""
+
+#: components/com_content/content.html.php:162
+msgid "Filter"
+msgstr ""
+
+#: components/com_content/content.html.php:184
+msgid "Display #"
+msgstr ""
+
+#: components/com_content/content.html.php:211
+msgid "Item Title"
+msgstr ""
+
+#: components/com_content/content.html.php:268
+#: components/com_content/content.html.php:420
+msgid "Register to read more..."
+msgstr ""
+
+#: components/com_content/content.html.php:348
+msgid "More..."
+msgstr ""
+
+#: components/com_content/content.html.php:415
+msgid "Read more..."
+msgstr ""
+
+#: components/com_content/content.html.php:610
+#: components/com_content/content.html.php:612
+#: components/com_content/content.html.php:616
+msgid "PDF"
+msgstr ""
+
+#: components/com_content/content.html.php:635
+#: components/com_content/content.html.php:637
+#: components/com_content/content.html.php:641
+msgid "E-mail"
+msgstr ""
+
+#: components/com_content/content.html.php:716
+msgid "Contributed by"
+msgstr ""
+
+#: components/com_content/content.html.php:716
+msgid "Written by"
+msgstr ""
+
+#: components/com_content/content.html.php:788
+msgid "Last Updated"
+msgstr ""
+
+#: components/com_content/content.html.php:828
+msgid "Previous"
+msgstr ""
+
+#: components/com_content/content.html.php:844
+msgid "Next"
+msgstr ""
+
+#: components/com_content/content.html.php:912
+msgid "Please select a category"
+msgstr ""
+
+#: components/com_content/content.html.php:914
+#: components/com_content/content.html.php:923
+msgid "Content item must have intro text"
+msgstr ""
+
+#: components/com_content/content.html.php:939
+msgid "Please either Cancel or Save the current change"
+msgstr ""
+
+#. $docinfo = "<strong>".T_('Subject:')."</strong> ";
+#. $docinfo .= $row->title."<br />";
+#: components/com_content/content.html.php:948
+msgid "Expiry Date:"
+msgstr ""
+
+#: components/com_content/content.html.php:950
+msgid "Version:"
+msgstr ""
+
+#: components/com_content/content.html.php:952
+msgid "Created:"
+msgstr ""
+
+#: components/com_content/content.html.php:954
+msgid "Last Modified:"
+msgstr ""
+
+#: components/com_content/content.html.php:956
+msgid "Hits:"
+msgstr ""
+
+#: components/com_content/content.html.php:963
+msgid "Content"
+msgstr ""
+
+#: components/com_content/content.html.php:964
+msgid "Item Information"
+msgstr ""
+
+#: components/com_content/content.html.php:965
+msgid "Info"
+msgstr ""
+
+#: components/com_content/content.html.php:1015
+#: components/com_content/content.html.php:1021
+msgid "Required"
+msgstr ""
+
+#: components/com_content/content.html.php:1021
+#: components/com_content/content.html.php:1039
+msgid "Main Text"
+msgstr ""
+
+#: components/com_content/content.html.php:1039
+msgid "Optional"
+msgstr ""
+
+#: components/com_content/content.html.php:1061
+msgid "Sub-folder"
+msgstr ""
+
+#: components/com_content/content.html.php:1066
+msgid "Gallery Images"
+msgstr ""
+
+#: components/com_content/content.html.php:1069
+msgid "Content Images"
+msgstr ""
+
+#: components/com_content/content.html.php:1072
+msgid "Edit Image"
+msgstr ""
+
+#: components/com_content/content.html.php:1078
+msgid "Insert"
+msgstr ""
+
+#: components/com_content/content.html.php:1083
+msgid "Up"
+msgstr ""
+
+#: components/com_content/content.html.php:1084
+msgid "Down"
+msgstr ""
+
+#: components/com_content/content.html.php:1085
+msgid "Remove"
+msgstr ""
+
+#: components/com_content/content.html.php:1099
+msgid "Align:"
+msgstr ""
+
+#: components/com_content/content.html.php:1132
+#: components/com_content/content.html.php:1135
+msgid "No Image"
+msgstr ""
+
+#: components/com_content/content.html.php:1201
+msgid "Show on Front Page:"
+msgstr ""
+
+#: components/com_content/content.html.php:1210
+msgid "Metadata"
+msgstr ""
+
+#: components/com_content/content.html.php:1260
+#: components/com_content/content.php:1446
+msgid ""
+"You must enter valid e-mail addresses for both yourself and your recipient."
+msgstr ""
+
+#: components/com_content/content.html.php:1274
+msgid "E-mail this to a friend."
+msgstr ""
+
+#: components/com_content/content.html.php:1282
+msgid "Your friend's E-mail:"
+msgstr ""
+
+#: components/com_content/content.html.php:1290
+msgid "Your Name:"
+msgstr ""
+
+#: components/com_content/content.html.php:1298
+msgid "Your E-mail:"
+msgstr ""
+
+#: components/com_content/content.html.php:1306
+msgid "Message subject:"
+msgstr ""
+
+#: components/com_content/content.html.php:1317
+msgid "Send e-mail"
+msgstr ""
+
+#: components/com_content/content.html.php:1318
+msgid "Cancel"
+msgstr ""
+
+#: components/com_content/content.html.php:1338
+#, php-format
+msgid "This item has been sent to %s"
+msgstr ""
+
+#: components/com_content/content.html.php:1342
+msgid "Close Window"
+msgstr ""
+
+#: components/com_content/content.php:435
+msgid "Date Asc"
+msgstr ""
+
+#: components/com_content/content.php:436
+msgid "Date Desc"
+msgstr ""
+
+#: components/com_content/content.php:440
+msgid "Title Asc"
+msgstr ""
+
+#: components/com_content/content.php:441
+msgid "Title Desc"
+msgstr ""
+
+#: components/com_content/content.php:445
+msgid "Hits Asc"
+msgstr ""
+
+#: components/com_content/content.php:446
+msgid "Hits Desc"
+msgstr ""
+
+#: components/com_content/content.php:450
+msgid "Author Asc"
+msgstr ""
+
+#: components/com_content/content.php:451
+msgid "Author Desc"
+msgstr ""
+
+#: components/com_content/content.php:454
+msgid "Ordering"
+msgstr ""
+
+#. if no archives for category, hides search and outputs empty message
+#: components/com_content/content.php:648
+#: components/com_content/content.php:729
+msgid "There are currently no Archived Entries for this Category"
+msgstr ""
+
+#. Search Success message
+#: components/com_content/content.php:827
+#, php-format
+msgid "Here are the Archived entries for %s %s"
+msgstr ""
+
+#. Search Failure message for Archives
+#: components/com_content/content.php:961
+#, php-format
+msgid "There are no Archived entries for %s %s"
+msgstr ""
+
+#. Generic blog empty display
+#: components/com_content/content.php:965
+msgid "There are no items to display"
+msgstr ""
+
+#: components/com_content/content.php:1169
+#, php-format
+msgid "The module [ %s ] is currently being edited by another person."
+msgstr ""
+
+#: components/com_content/content.php:1374
+#, php-format
+msgid ""
+"A new content item has been submitted by [ %s ]  titled [ %s ]  from section "
+"[ %s ]  and category  [ %s ]"
+msgstr ""
+
+#: components/com_content/content.php:1374
+msgid "New Item"
+msgstr ""
+
+#: components/com_content/content.php:1379
+msgid "Item saved successfully."
+msgstr ""
+
+#: components/com_content/content.php:1379
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+
+#: components/com_content/content.php:1437
+#, php-format
+msgid "Item sent by %s"
+msgstr ""
+
+#. message text
+#: components/com_content/content.php:1457
+#, php-format
+msgid ""
+" The following page from the \"%s\" website has been sent to you by %s ( %"
+"s ).\n"
+"\n"
+"You can access it at the following url:\n"
+"%s"
+msgstr ""
+
+#: components/com_content/content.php:1508
+msgid "You already voted for this poll today!"
+msgstr ""
+
+#: components/com_content/content.php:1511
+msgid "Thanks for your vote!"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/frontend.pot 4.6rc2/language/untranslated/frontend.pot
--- 4.5.4/language/untranslated/frontend.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/frontend.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,1633 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: includes/HTML_toolbar.php:37
+msgid "Please make a selection from the list to"
+msgstr ""
+
+#: includes/HTML_toolbar.php:56
+msgid "New"
+msgstr ""
+
+#: includes/HTML_toolbar.php:76 includes/HTML_toolbar.php:96
+#: includes/mamboHTML.php:479 includes/mamboHTML.php:566
+#: includes/mamboHTML.php:657
+msgid "Published"
+msgstr ""
+
+#: includes/HTML_toolbar.php:103
+msgid "Please make a selection from the list to publish"
+msgstr ""
+
+#: includes/HTML_toolbar.php:116 includes/HTML_toolbar.php:136
+#: includes/mamboHTML.php:657
+msgid "Unpublished"
+msgstr ""
+
+#: includes/HTML_toolbar.php:143
+msgid "Please make a selection from the list to unpublish"
+msgstr ""
+
+#: includes/HTML_toolbar.php:156
+msgid "Archive"
+msgstr ""
+
+#: includes/HTML_toolbar.php:163
+msgid "Please make a selection from the list to archive"
+msgstr ""
+
+#: includes/HTML_toolbar.php:176
+msgid "Unarchive"
+msgstr ""
+
+#: includes/HTML_toolbar.php:183
+msgid "Please select a news story to unarchive"
+msgstr ""
+
+#: includes/HTML_toolbar.php:196
+msgid "Edit"
+msgstr ""
+
+#: includes/HTML_toolbar.php:203 includes/HTML_toolbar.php:222
+#: includes/HTML_toolbar.php:241
+msgid "Please select an item from the list to edit"
+msgstr ""
+
+#: includes/HTML_toolbar.php:216
+msgid "Edit HTML"
+msgstr ""
+
+#: includes/HTML_toolbar.php:235
+msgid "Edit CSS"
+msgstr ""
+
+#: includes/HTML_toolbar.php:255
+msgid "Delete"
+msgstr ""
+
+#: includes/HTML_toolbar.php:262
+msgid "Are you sure you want to delete selected items?"
+msgstr ""
+
+#: includes/HTML_toolbar.php:262
+msgid "Please make a selection from the list to delete"
+msgstr ""
+
+#: includes/HTML_toolbar.php:278 includes/HTML_toolbar.php:279
+msgid "Preview"
+msgstr ""
+
+#: includes/HTML_toolbar.php:295
+msgid "Save"
+msgstr ""
+
+#: includes/HTML_toolbar.php:313 includes/HTML_toolbar.php:314
+#: includes/HTML_toolbar.php:328 includes/HTML_toolbar.php:329
+msgid "save"
+msgstr ""
+
+#: includes/HTML_toolbar.php:345
+msgid "Cancel"
+msgstr ""
+
+#: includes/HTML_toolbar.php:364 includes/HTML_toolbar.php:365
+msgid "back"
+msgstr ""
+
+#: includes/HTML_toolbar.php:392 includes/HTML_toolbar.php:393
+msgid "Upload Image"
+msgstr ""
+
+#: includes/authenticator.php:35
+msgid "Please complete the username and password fields."
+msgstr ""
+
+#: includes/authenticator.php:42
+msgid "Logins are not permitted.  There is no authentication check active."
+msgstr ""
+
+#: includes/authenticator.php:72
+msgid "Your login has been blocked. Please contact the administrator."
+msgstr ""
+
+#: includes/authenticator.php:103
+msgid "Incorrect username or password. Please try again."
+msgstr ""
+
+#: includes/authenticator.php:151
+msgid "Please enter a password"
+msgstr ""
+
+#: includes/authenticator.php:167
+msgid "You cannot login. There are no administrators set up."
+msgstr ""
+
+#: includes/authenticator.php:172
+msgid "Incorrect Username, Password, or Access Level.  Please try again"
+msgstr ""
+
+#: includes/cmtclasses.php:143
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:165
+#, php-format
+msgid "Component %s error: attempt to use non-existent method %s in %s"
+msgstr ""
+
+#: includes/cmtclasses.php:167 includes/cmtclasses.php:173
+#: includes/cmtclasses.php:231
+#, php-format
+msgid "Component %s error: attempt to use non-existent class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:210
+#, php-format
+msgid "MOS error in %s: method %s not found in class %s"
+msgstr ""
+
+#: includes/cmtclasses.php:212
+#, php-format
+msgid "MOS error in %s: class not found %s"
+msgstr ""
+
+#: includes/cmtclasses.php:533
+msgid "Your Module must contain a title."
+msgstr ""
+
+#: includes/core.classes.php:351
+msgid "Impossible to determine the name of this server"
+msgstr ""
+
+#: includes/mamboHTML.php:29
+msgid "Unwriteable"
+msgstr ""
+
+#: includes/mamboHTML.php:29
+msgid "Writeable"
+msgstr ""
+
+#: includes/mamboHTML.php:103
+msgid "January"
+msgstr ""
+
+#: includes/mamboHTML.php:104
+msgid "February"
+msgstr ""
+
+#: includes/mamboHTML.php:105
+msgid "March"
+msgstr ""
+
+#: includes/mamboHTML.php:106
+msgid "April"
+msgstr ""
+
+#: includes/mamboHTML.php:107
+msgid "May"
+msgstr ""
+
+#: includes/mamboHTML.php:108
+msgid "June"
+msgstr ""
+
+#: includes/mamboHTML.php:109
+msgid "July"
+msgstr ""
+
+#: includes/mamboHTML.php:110
+msgid "August"
+msgstr ""
+
+#: includes/mamboHTML.php:111
+msgid "September"
+msgstr ""
+
+#: includes/mamboHTML.php:112
+msgid "October"
+msgstr ""
+
+#: includes/mamboHTML.php:113
+msgid "November"
+msgstr ""
+
+#: includes/mamboHTML.php:114
+msgid "December"
+msgstr ""
+
+#: includes/mamboHTML.php:129 includes/mamboHTML.php:179 modules/custom.xml
+#: modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_login.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml modules/mod_stats.xml
+msgid "Yes"
+msgstr ""
+
+#: includes/mamboHTML.php:130 includes/mamboHTML.php:178 modules/custom.xml
+#: modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_login.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml modules/mod_stats.xml
+msgid "No"
+msgstr ""
+
+#: includes/mamboHTML.php:202
+msgid "No Sorting"
+msgstr ""
+
+#: includes/mamboHTML.php:203
+msgid "Sort Ascending"
+msgstr ""
+
+#: includes/mamboHTML.php:204
+msgid "Sort Descending"
+msgstr ""
+
+#: includes/mamboHTML.php:229
+msgid "Close Window"
+msgstr ""
+
+#: includes/mamboHTML.php:246
+msgid "Back"
+msgstr ""
+
+#. Print Preview button - used when viewing page
+#. Print Button - used in pop-up window
+#: includes/mamboHTML.php:282 includes/mamboHTML.php:284
+#: includes/mamboHTML.php:291 includes/mamboHTML.php:300
+msgid "Print"
+msgstr ""
+
+#: includes/mamboHTML.php:356
+msgid ""
+"This email address is being protected from spam bots, you need Javascript "
+"enabled to view it"
+msgstr ""
+
+#: includes/mamboHTML.php:381
+msgid "Pending"
+msgstr ""
+
+#: includes/mamboHTML.php:384
+msgid "Published, but is <u>Pending</u>"
+msgstr ""
+
+#: includes/mamboHTML.php:387
+msgid "Visible"
+msgstr ""
+
+#: includes/mamboHTML.php:390
+msgid "Published and is <u>Current</u>"
+msgstr ""
+
+#: includes/mamboHTML.php:393 includes/mamboHTML.php:399
+msgid "Finished"
+msgstr ""
+
+#: includes/mamboHTML.php:396
+msgid "Published, but has <u>Expired</u>"
+msgstr ""
+
+#: includes/mamboHTML.php:402
+msgid "Not Published"
+msgstr ""
+
+#: includes/mamboHTML.php:407
+msgid "Click on icon to toggle state."
+msgstr ""
+
+#: includes/mamboHTML.php:444 includes/mamboHTML.php:523
+msgid "Menu"
+msgstr ""
+
+#: includes/mamboHTML.php:447 includes/mamboHTML.php:526
+msgid "Go to Menu"
+msgstr ""
+
+#: includes/mamboHTML.php:454
+msgid "Link Name"
+msgstr ""
+
+#: includes/mamboHTML.php:458 includes/mamboHTML.php:545
+msgid "Go to Menu Item"
+msgstr ""
+
+#: includes/mamboHTML.php:466 includes/mamboHTML.php:553
+msgid "State"
+msgstr ""
+
+#: includes/mamboHTML.php:472 includes/mamboHTML.php:559
+msgid "Trashed"
+msgstr ""
+
+#: includes/mamboHTML.php:475 includes/mamboHTML.php:562
+msgid "UnPublished"
+msgstr ""
+
+#: includes/mamboHTML.php:533
+msgid "Type"
+msgstr ""
+
+#: includes/mamboHTML.php:541
+msgid "Item Name"
+msgstr ""
+
+#: includes/mamboHTML.php:590
+msgid "Checked Out"
+msgstr ""
+
+#: includes/mamboHTML.php:658
+msgid "Publish item"
+msgstr ""
+
+#: includes/mamboHTML.php:658
+msgid "Unpublish Item"
+msgstr ""
+
+#: includes/mambofunc.php:21
+#, php-format
+msgid "User Submitted '%s'"
+msgstr ""
+
+#: includes/mambofunc.php:22
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"A user submitted %s:\n"
+"[ %s ]\n"
+"\n"
+"has been just been submitted by user:\n"
+"[ %s ]\n"
+"\n"
+"\n"
+"for %\n"
+"\n"
+"Please go to %s/administrator to view and approve this %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only."
+msgstr ""
+
+#: includes/mambofunc.php:50
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: includes/mambofunc.php:52
+msgid "You need to login."
+msgstr ""
+
+#: includes/mambofunc.php:338
+msgid "Mambo Warning"
+msgstr ""
+
+#: includes/pageNavigation.php:68
+#, php-format
+msgid "Results %d - %d of %d"
+msgstr ""
+
+#: includes/pageNavigation.php:80
+#, php-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: includes/pageNavigation.php:106 includes/pageNavigation.php:109
+msgid "Start"
+msgstr ""
+
+#: includes/pageNavigation.php:106
+msgid "first page"
+msgstr ""
+
+#: includes/pageNavigation.php:107 includes/pageNavigation.php:110
+msgid "Previous"
+msgstr ""
+
+#: includes/pageNavigation.php:107
+msgid "previous page"
+msgstr ""
+
+#: includes/pageNavigation.php:125 includes/pageNavigation.php:128
+msgid "Next"
+msgstr ""
+
+#: includes/pageNavigation.php:125
+msgid "next page"
+msgstr ""
+
+#: includes/pageNavigation.php:126 includes/pageNavigation.php:129
+msgid "End"
+msgstr ""
+
+#: includes/pageNavigation.php:126
+msgid "end page"
+msgstr ""
+
+#: includes/pdf.php:66
+msgid "Powered by Mambo"
+msgstr ""
+
+#: includes/pdf.php:67
+msgid "Generated:"
+msgstr ""
+
+#: includes/pdf.php:94
+msgid "Written by"
+msgstr ""
+
+#: includes/pdf.php:96
+msgid "Contributed by"
+msgstr ""
+
+#: includes/pdf.php:102
+msgid "Last Updated"
+msgstr ""
+
+#: includes/pdf.php:120
+msgid "OFF"
+msgstr ""
+
+#: includes/pdf.php:120
+msgid "ON"
+msgstr ""
+
+#: includes/phpgettext/phpgettext.includes.php:290
+msgid "Main"
+msgstr ""
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_login.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_random_image.xml modules/mod_related_items.xml
+#: modules/mod_rssfeed.xml modules/mod_search.xml modules/mod_sections.xml
+#: modules/mod_stats.xml modules/mod_templatechooser.xml
+#: modules/mod_whosonline.xml modules/mod_wrapper.xml
+msgid ""
+"A suffix to be applied to the css class of the module (table.moduletable), "
+"this allows individual module styling"
+msgstr ""
+
+#: modules/custom.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Custom Module"
+msgstr ""
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml
+msgid "Enable Cache"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Enter number of RSS items to display"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Enter the URL of the RSS/RDF feed"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Feed Description"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Feed Image"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Item Description"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Items"
+msgstr ""
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_banners.xml
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_login.xml modules/mod_mainmenu.xml modules/mod_mostread.xml
+#: modules/mod_newsflash.xml modules/mod_poll.xml modules/mod_random_image.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml modules/mod_sections.xml modules/mod_stats.xml
+#: modules/mod_templatechooser.xml modules/mod_whosonline.xml
+#: modules/mod_wrapper.xml
+msgid "Module Class Suffix"
+msgstr ""
+
+#: modules/custom.xml
+msgid "RSS URL"
+msgstr ""
+
+#: modules/custom.xml modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_mainmenu.xml
+#: modules/mod_mostread.xml modules/mod_newsflash.xml modules/mod_poll.xml
+#: modules/mod_related_items.xml modules/mod_rssfeed.xml
+#: modules/mod_search.xml
+msgid "Select whether to cache the content of this module"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Show the description or intro text of individual news items"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Show the description text for the whole Feed"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Show the image associated with the whole Feed"
+msgstr ""
+
+#: modules/custom.xml
+msgid "Word Count"
+msgstr ""
+
+#: modules/mod_archive.xml
+msgid "Archived Content"
+msgstr ""
+
+#: modules/mod_archive.xml modules/mod_latestcontent.xml
+#: modules/mod_latestnews.xml modules/mod_mostread.xml
+#: modules/mod_sections.xml
+msgid "Count"
+msgstr ""
+
+#: modules/mod_archive.xml
+msgid "The number of items to display (default is 10)"
+msgstr ""
+
+#: modules/mod_archive.xml
+msgid ""
+"This module shows a list of the calendar months, which contain Archived "
+"items. After you have changed the status of a Content Item to 'Archived' "
+"this list will be automatically generated."
+msgstr ""
+
+#: modules/mod_banners.php:75
+msgid "Advertisement"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid ""
+"A suffix to be aapplied to the css class of the module (table.moduletable), "
+"this allows individual module styling"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid "Banner"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid "Banner client"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid "Reference to banner client id. Enter separated by ','!"
+msgstr ""
+
+#: modules/mod_banners.xml
+msgid ""
+"The banner module allows to show the active banners out of the component "
+"within your site."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Allows you to control which type of Content to display in the module"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml modules/mod_whosonline.xml
+msgid "Both"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Category ID"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Content Items only"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Display content item images"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Frontpage Items"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_login.xml
+#: modules/mod_newsflash.xml modules/mod_rssfeed.xml
+#: modules/mod_templatechooser.xml
+msgid "Hide"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_mainmenu.xml
+#: modules/mod_newsflash.xml
+msgid "Horizontal"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Item Title"
+msgstr ""
+
+#: modules/mod_latestcontent.xml
+msgid "Latest Content"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Module Mode"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Read More"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Section ID"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid ""
+"Selects items from a specific Category or set of Categories (to specify more "
+"than one Category, seperate with a comma , )."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid ""
+"Selects items from a specific Secion or set of Sections (to specify more "
+"than one Section, seperate with a comma , )."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_login.xml
+#: modules/mod_newsflash.xml modules/mod_rssfeed.xml
+#: modules/mod_templatechooser.xml
+msgid "Show"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Show images"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Show item title"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid ""
+"Show/Hide items designated for the Frontpage - only works when in Content "
+"Items only mode"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Show/Hide the Read More button"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "Static Content only"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_newsflash.xml
+msgid "Style"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+msgid "The number of items to display (default 5)"
+msgstr ""
+
+#: modules/mod_latestcontent.xml
+msgid "The style to display the content"
+msgstr ""
+
+#: modules/mod_latestcontent.xml
+msgid ""
+"This module shows a list of content with intro text in vertical or "
+"horizontal of the most recently published Items that are still current (some "
+"may have expired even though they are the most recent). Items that are "
+"displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_mainmenu.xml
+#: modules/mod_newsflash.xml
+msgid "Vertical"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "hide"
+msgstr ""
+
+#: modules/mod_latestcontent.xml modules/mod_latestnews.xml
+#: modules/mod_mostread.xml
+msgid "show"
+msgstr ""
+
+#: modules/mod_latestnews.xml
+msgid "Latest News"
+msgstr ""
+
+#: modules/mod_latestnews.xml
+msgid ""
+"This module shows a list of the most recently published Items that are still "
+"current (some may have expired even though they are the most recent). Items "
+"that are displayed on the Front Page Component are not included in the list."
+msgstr ""
+
+#: modules/mod_login.php:44
+#, php-format
+msgid "Hi, %s"
+msgstr ""
+
+#: modules/mod_login.php:49
+msgid "Logout"
+msgstr ""
+
+#: modules/mod_login.php:68 modules/mod_login.xml
+msgid "Username"
+msgstr ""
+
+#: modules/mod_login.php:70
+msgid "username"
+msgstr ""
+
+#: modules/mod_login.php:72
+msgid "Password"
+msgstr ""
+
+#: modules/mod_login.php:74
+msgid "password"
+msgstr ""
+
+#: modules/mod_login.php:76
+msgid "Remember Me"
+msgstr ""
+
+#: modules/mod_login.php:77
+msgid "Remember me"
+msgstr ""
+
+#: modules/mod_login.php:80
+msgid "Login"
+msgstr ""
+
+#: modules/mod_login.php:86
+msgid "Password Reminder"
+msgstr ""
+
+#: modules/mod_login.php:95
+msgid "No account yet?"
+msgstr ""
+
+#: modules/mod_login.php:97
+msgid "Create one"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Greeting"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Login Form"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Login Message"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Login Redirection URL"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Logout Message"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Logout Redirection URL"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Name"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Name/Username"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Post-text"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Pre-text"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "Show/Hide the simple greeting text"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "This is the Text or HTML that is displayed above the login form"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid "This is the Text or HTML that is displayed below the login form"
+msgstr ""
+
+#: modules/mod_login.xml
+msgid ""
+"This module displays a Username and Password login form. It also displays a "
+"link to retrieve a forgotten password. If user registration is enabled, "
+"(refer to the Configuration settings), then another link will be shown to "
+"invite users to self-register."
+msgstr ""
+
+#: modules/mod_login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "A suffix to be applied to the css class of the menu items"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Alignment of the Menu Icons"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Choose which indent image system to utilise"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Displays a menu."
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "End Spacer"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "End Spacer for Horizontal menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Expand Menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Expand the menu and make its sub-menus items always visible"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Flat List"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the fifth sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the first sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the fourth sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the second sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the sixth sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Image for the third sub-level"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 1"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 2"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 3"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 4"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 5"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Indent Image 6"
+msgstr ""
+
+#: modules/mod_mainmenu.xml modules/mod_search.xml
+msgid "Left"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Main Menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Mambo default images"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Class Suffix"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Icon Alignment"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Name"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Menu Style"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "None"
+msgstr ""
+
+#: modules/mod_mainmenu.xml modules/mod_search.xml
+msgid "Right"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Show Menu Icons"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Show the Menu Icons you have selected for your menu items"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Spacer"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Spacer for Horizontal menu"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Template"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "The menu style"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "The name of the menu (default is 'mainmenu')"
+msgstr ""
+
+#: modules/mod_mainmenu.xml
+msgid "Use params below"
+msgstr ""
+
+#: modules/mod_mostread.xml
+msgid "Most Read Content"
+msgstr ""
+
+#: modules/mod_mostread.xml modules/mod_sections.xml
+msgid "The number of items to display (default is 5)"
+msgstr ""
+
+#: modules/mod_mostread.xml
+msgid ""
+"This module shows a list of the currently published Items that have been "
+"viewed the most - determined by the number of times the page has been viewed."
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "A content category"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Category"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Linked Titles"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Make the Item titles linkable"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Newsflash"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "No of items to display"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "No. of Items"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Randomly choose one at a time"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid ""
+"The Newsflash module randomly selects one of the published items from a "
+"category upon each page refresh.  It may also dislpay multiple items in "
+"horizontal or vertical configurations."
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "The style to display the category"
+msgstr ""
+
+#: modules/mod_newsflash.xml
+msgid "Use Global"
+msgstr ""
+
+#: modules/mod_poll.php:85
+msgid "Vote"
+msgstr ""
+
+#: modules/mod_poll.php:86
+msgid "Results"
+msgstr ""
+
+#: modules/mod_poll.xml
+msgid "Poll"
+msgstr ""
+
+#: modules/mod_poll.xml
+msgid ""
+"This module compliments the Polls component. It is used to display the "
+"configured polls. The module differs from other modules in as much as the "
+"Component supports linking between Menu Items and Polls. This means that the "
+"module shows only those Polls, which are configured for a certain Menu Item."
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid ""
+"A URL to redirect to if image is clicked on, eg: http://www.mambo-foundation."
+"org"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Height (px)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image Folder"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image Type"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image height (forces all images to be displayed with the height)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Image width (forces all images to be displayed with this width)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Link"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Path to the image folder relative to the site url, eg: images/stories"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Random Image"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "This module display a random image from your chosen directory"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Type of image PNG/GIF/JPG etc. (default is JPG)"
+msgstr ""
+
+#: modules/mod_random_image.xml
+msgid "Width (px)"
+msgstr ""
+
+#: modules/mod_related_items.xml
+msgid "Related Items"
+msgstr ""
+
+#: modules/mod_related_items.xml
+msgid ""
+"This module displays other Content Items that are related to the Item "
+"currently displayed. These are based on the keywords Metadata. All the "
+"keywords of the current Content Item are searched against all the keywords "
+"of all other published items. For example, you may have an Item on 'Breeding "
+"Parrots' and you may have another on 'Hand Raising Black Cockatoos'. If you "
+"include the keyword 'parrot' in both Items, then the Related Items module "
+"will list the 'Breeding Parrots' Item when viewing 'Hand Raising Black "
+"Cockatoos' and vice-versa."
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Atom"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Atom Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Choose the image to be used"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Enter the text to be displayed along with the RSS links"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "OPML"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "OPML Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 0.91"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 0.91 Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 1.0"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 1.0 Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 2.0"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "RSS 2.0 Image"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide Atom 1.0 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide OPML Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide RSS 0.91 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide RSS 1.0 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Show/Hide RSS 2.0 Link"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid "Syndicate"
+msgstr ""
+
+#: modules/mod_rssfeed.xml modules/mod_search.xml
+msgid "Text"
+msgstr ""
+
+#: modules/mod_rssfeed.xml
+msgid ""
+"The Syndicate module will display a link whereby people can syndicate your "
+"site for all your latest news. When you click on the RSS icon, you will be "
+"redirected to a new page that will list all the latest news in XML format. "
+"In order to use the Newsfeed in another Mambo site or a Newsfeed reader, you "
+"need to cut and paste the URL."
+msgstr ""
+
+#: modules/mod_search.php:17
+msgid "Search"
+msgstr ""
+
+#: modules/mod_search.php:19
+msgid "search..."
+msgstr ""
+
+#: modules/mod_search.php:22
+msgid "search"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Bottom"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Box Width"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Button Position"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Button Text"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Display a Search Button"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Position of the button relative to the search box"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Search Button"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Search Module"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Size of the search text box"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid ""
+"The text that appears in the search buttin, if left blank it will load "
+"_SEARCH_TITLE from your language file"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid ""
+"The text that appears in the search text box, if left blank it will load "
+"_SEARCH_BOX from your language file"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "This module will display a search box"
+msgstr ""
+
+#: modules/mod_search.xml
+msgid "Top"
+msgstr ""
+
+#: modules/mod_sections.xml
+msgid "Sections"
+msgstr ""
+
+#: modules/mod_sections.xml
+msgid ""
+"The Section module shows a list of all Sections configured in your database. "
+"The Sections refer here to the Item Sections only. If the configuration "
+"'Show Unauthorized Links' is set to 'NO', the list will be limited to the "
+"sections the user is allowed to see."
+msgstr ""
+
+#: modules/mod_stats.php:27
+msgid "Time"
+msgstr ""
+
+#: modules/mod_stats.php:28 modules/mod_stats.php:30
+msgid "Disabled"
+msgstr ""
+
+#: modules/mod_stats.php:28 modules/mod_stats.php:30
+msgid "Enabled"
+msgstr ""
+
+#: modules/mod_stats.php:37
+msgid "Members"
+msgstr ""
+
+#: modules/mod_stats.php:41
+msgid "News"
+msgstr ""
+
+#: modules/mod_stats.php:45
+msgid "Web Links"
+msgstr ""
+
+#: modules/mod_stats.php:59 modules/mod_stats.php:61
+msgid "Visitors"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Display hit counter"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Display server information"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Display site information"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Enter the amount of hits to increase counter by"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Hit Counter"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Increase counter"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Server Info"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Site Info"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid "Statistics"
+msgstr ""
+
+#: modules/mod_stats.xml
+msgid ""
+"The Statistics module shows information about your server installation and "
+"statistics on the web site users, number of contents in your database, and "
+"number of web links you provide."
+msgstr ""
+
+#: modules/mod_templatechooser.php:77
+msgid "Select"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Height"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Max. Name Length"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Show Preview"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Template Chooser"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Template preview is to be shown"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid ""
+"The Template Chooser module allows the user (visitor) to change the template "
+"on the fly from the front-end via a drop down selection list."
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "This is the height of the preview image (default 90)"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "This is the maximum length of the template name to display (default 20)"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "This is the width of the preview image (default 140)"
+msgstr ""
+
+#: modules/mod_templatechooser.xml
+msgid "Width"
+msgstr ""
+
+#: modules/mod_whosonline.php:30
+#, php-format
+msgid "We have %d guest online"
+msgid_plural "We have %d guests online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: modules/mod_whosonline.php:34
+#, php-format
+msgid "We have %d member online"
+msgid_plural "We have %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: modules/mod_whosonline.php:38
+#, php-format
+msgid "We have %d guest online and "
+msgid_plural "We have %d guests online and "
+msgstr[0] ""
+msgstr[1] ""
+
+#: modules/mod_whosonline.php:39
+#, php-format
+msgid " %d member online"
+msgid_plural " %d members online"
+msgstr[0] ""
+msgstr[1] ""
+
+#: modules/mod_whosonline.php:57
+msgid "No Users Online"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "# of Guests/Members"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Display"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Member Names"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Select what shall be shown"
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid ""
+"The Who's Online module displays the number of anonymous (that is, Guest) "
+"users and Registered users, (those that are logged in) that are currently "
+"accessing the web site."
+msgstr ""
+
+#: modules/mod_whosonline.xml
+msgid "Who's Online"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "This module shows an IFrame window to specified location"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "Url"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "Url to site/file you wish to display within the Iframe"
+msgstr ""
+
+#: modules/mod_wrapper.xml
+msgid "Wrapper Module"
+msgstr ""
+
+#: templates/waterandstone/templateDetails.xml
+msgid ""
+"The Water and Stone Grey Template optimized for 1024px width resolution for "
+"use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone/templateDetails.xml
+msgid "waterandstone"
+msgstr ""
+
+#: templates/waterandstone800/templateDetails.xml
+msgid ""
+"The Water and Stone Grey Template optimized for 800px width resolution for "
+"use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800/templateDetails.xml
+msgid "waterandstone800"
+msgstr ""
+
+#: templates/waterandstone800_blue/templateDetails.xml
+msgid ""
+"The Water and Stone Blue Template optimized for 800px x 600px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800_blue/templateDetails.xml
+msgid "waterandstone800_blue"
+msgstr ""
+
+#: templates/waterandstone800_green/templateDetails.xml
+msgid ""
+"The Water and Stone Green Template optimized for 800px x 600px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800_green/templateDetails.xml
+msgid "waterandstone800_green"
+msgstr ""
+
+#: templates/waterandstone800_greenandblack/templateDetails.xml
+msgid ""
+"The Water and Stone Green and Black Template optimized for 800px x 600px "
+"screen resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone800_greenandblack/templateDetails.xml
+msgid "waterandstone800_greenandblack"
+msgstr ""
+
+#: templates/waterandstone_blue/templateDetails.xml
+msgid ""
+"The Water and Stone Blue Template optimized for 1024px x 768px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone_blue/templateDetails.xml
+msgid "waterandstone_blue"
+msgstr ""
+
+#: templates/waterandstone_green/templateDetails.xml
+msgid ""
+"The Water and Stone Green Template optimized for 1024px x 768px screen "
+"resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone_green/templateDetails.xml
+msgid "waterandstone_green"
+msgstr ""
+
+#: templates/waterandstone_greenandblack/templateDetails.xml
+msgid ""
+"The Water and Stone Green and Black Template optimized for 1024px x 768px "
+"screen resolution for use with any type of website with easy customization"
+msgstr ""
+
+#: templates/waterandstone_greenandblack/templateDetails.xml
+msgid "waterandstone_greenandblack"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/frontpage.pot 4.6rc2/language/untranslated/frontpage.pot
--- 4.5.4/language/untranslated/frontpage.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/frontpage.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,457 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:30
+msgid "Frontpage Manager"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:44
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:61
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:64
+#: administrator/components/com_frontpage/admin.frontpage.html.php:101
+#: administrator/components/com_frontpage/admin.frontpage.html.php:104
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:67
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:70
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:73
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:76
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:79
+msgid "Section"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:82
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:85
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:107
+msgid "Expired"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:110
+msgid "Unpublished"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:116
+msgid "Always"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:116
+#: administrator/components/com_frontpage/admin.frontpage.html.php:118
+msgid "Start:"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:123
+#: administrator/components/com_frontpage/admin.frontpage.html.php:125
+msgid "Finish:"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:123
+msgid "No Expiry"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:137
+msgid "Edit User"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:160
+msgid "Edit Content"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:171
+msgid "Publish Information"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:191
+msgid "Edit Section"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.html.php:196
+msgid "Edit Category"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:20
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:154
+msgid "- All Categories -"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:173
+msgid "- All Authors -"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:190
+msgid "archive"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:190
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:190
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:191
+msgid "Select an item to %a"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:218
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_frontpage/admin.frontpage.php:296
+msgid "New ordering saved"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Intro"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Leading"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "# Links"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Alphabetical"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Names"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Author Reverse-Alphabetical"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Auto"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Category Name"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Category Name Linkable"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Category Order"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Columns"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Created Date and Time"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Default"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Display {mosimages}."
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Email Icon"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Frontpage Ordering"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Item Rating"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Item Titles"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Least Hits"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Linked Titles"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "MOSImages"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Make your Item titles linkable"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Modified Date and Time"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Most Hits"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Most recent first"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "No, order by Primary Order only"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Number of Items to display as Links."
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"Number of Items to display as a leading (full width) item. 0 will mean that "
+"no items will be displayed as leading."
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Number of Items to display with the introduction text shown."
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Oldest first"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Order items by catgeory"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Order that the items will be displayed in."
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Ordering"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "PDF Icon"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Pagination"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Pagination Results"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Primary Order"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Print Icon"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Read More"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Section Name"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Section Name Linkable"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide Pagination Results info ( e.g 1-4 of 4 )"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide Pagination support"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Page title"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Read More link"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Show/Hide the items title"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Text to display at the top of the page"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid ""
+"This component shows all the published content items from your site marked "
+"Show on Frontpage."
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Title Alphabetical"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Title Reverse-Alphabetical"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "When displaying the intro text, how many columns to use per row"
+msgstr ""
+
+#: administrator/components/com_frontpage/frontpage.xml
+msgid "Yes"
+msgstr ""
+
+#: administrator/components/com_frontpage/toolbar.frontpage.html.php:25
+msgid "Remove"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/installation.pot 4.6rc2/language/untranslated/installation.pot
--- 4.5.4/language/untranslated/installation.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/installation.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,577 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: installation/index.php:30 installation/index.php:207
+#: installation/index.php:211 installation/index.php:212
+#: installation/index.php:213 installation/index.php:214
+msgid "OFF"
+msgstr ""
+
+#: installation/index.php:30 installation/index.php:208
+#: installation/index.php:209 installation/index.php:210
+msgid "ON"
+msgstr ""
+
+#: installation/index.php:37 installation/index.php:161
+#: installation/index.php:171 installation/install.php:22
+msgid "Unwriteable"
+msgstr ""
+
+#: installation/index.php:37 installation/index.php:157
+#: installation/index.php:159 installation/index.php:171
+#: installation/install.php:22
+msgid "Writeable"
+msgstr ""
+
+#: installation/index.php:46 installation/install.php:30
+#: installation/install1.php:30 installation/install2.php:182
+#: installation/install3.php:50 installation/install4.php:309
+msgid "Mambo - Web Installer"
+msgstr ""
+
+#: installation/index.php:69 installation/install.php:54
+msgid "Please read/accept license to continue installation"
+msgstr ""
+
+#: installation/index.php:81 installation/install.php:65
+#: installation/install1.php:64 installation/install2.php:205
+#: installation/install3.php:112 installation/install4.php:316
+msgid "Mambo Installation"
+msgstr ""
+
+#: installation/index.php:88 installation/index.php:98
+#: installation/install.php:72 installation/install1.php:71
+#: installation/install2.php:219 installation/install3.php:125
+#: installation/install4.php:323
+msgid "pre-installation check"
+msgstr ""
+
+#: installation/index.php:89 installation/install.php:73
+#: installation/install.php:80 installation/install1.php:72
+#: installation/install2.php:220 installation/install3.php:126
+#: installation/install4.php:324
+msgid "license"
+msgstr ""
+
+#: installation/index.php:90 installation/install.php:74
+#: installation/install1.php:73 installation/install2.php:221
+#: installation/install3.php:127 installation/install4.php:325
+msgid "step 1"
+msgstr ""
+
+#: installation/index.php:91 installation/install.php:75
+#: installation/install1.php:74 installation/install2.php:222
+#: installation/install2.php:232 installation/install3.php:128
+#: installation/install4.php:326
+msgid "step 2"
+msgstr ""
+
+#: installation/index.php:92 installation/install.php:76
+#: installation/install1.php:75 installation/install2.php:223
+#: installation/install3.php:129 installation/install3.php:133
+#: installation/install4.php:327
+msgid "step 3"
+msgstr ""
+
+#: installation/index.php:93 installation/install.php:77
+#: installation/install1.php:76 installation/install2.php:224
+#: installation/install3.php:130 installation/install4.php:328
+#: installation/install4.php:331
+msgid "step 4"
+msgstr ""
+
+#: installation/index.php:101 installation/install2.php:229
+#: installation/install3.php:135
+msgid "Next"
+msgstr ""
+
+#: installation/index.php:105
+msgid "Pre-installation check for:"
+msgstr ""
+
+#: installation/index.php:106
+msgid ""
+"\n"
+"If any of these items are highlighted\n"
+"in red then please take actions to correct them. Failure to do so\n"
+"could lead to your Mambo installation not functioning\n"
+"correctly."
+msgstr ""
+
+#: installation/index.php:120
+msgid "PHP version"
+msgstr ""
+
+#: installation/index.php:123
+msgid "No"
+msgstr ""
+
+#: installation/index.php:123
+msgid "Yes"
+msgstr ""
+
+#: installation/index.php:128
+msgid "zlib compression support"
+msgstr ""
+
+#: installation/index.php:131 installation/index.php:139
+#: installation/index.php:147
+msgid "Available"
+msgstr ""
+
+#: installation/index.php:131 installation/index.php:139
+#: installation/index.php:147
+msgid "Unavailable"
+msgstr ""
+
+#: installation/index.php:136
+msgid "XML support"
+msgstr ""
+
+#: installation/index.php:144
+msgid "MySQL support"
+msgstr ""
+
+#: installation/index.php:161
+msgid ""
+"You can still continue the install as the configuration will be displayed at "
+"the end, just copy & paste this and upload."
+msgstr ""
+
+#: installation/index.php:167
+msgid "Session save path"
+msgstr ""
+
+#: installation/index.php:179
+msgid "Recommended settings:"
+msgstr ""
+
+#: installation/index.php:181
+msgid ""
+"These settings are recommended for PHP in order to ensure full\n"
+"compatibility with Mambo.\n"
+"However, Mambo will still operate if your settings do not quite match the "
+"recommended."
+msgstr ""
+
+#: installation/index.php:197
+msgid "Directive"
+msgstr ""
+
+#: installation/index.php:200
+msgid "Recommended"
+msgstr ""
+
+#: installation/index.php:203
+msgid "Actual"
+msgstr ""
+
+#: installation/index.php:245
+msgid "Directory and File Permissions:"
+msgstr ""
+
+#: installation/index.php:247
+msgid ""
+"In order for Mambo to function\n"
+"correctly it needs to be able to access or write to certain files\n"
+"or directories. If you see \"Unwriteable\" you need to change the\n"
+"permissions on the file or directory to allow Mambo\n"
+"to write to it."
+msgstr ""
+
+#: installation/install.php:85
+msgid "GNU/GPL License:"
+msgstr ""
+
+#: installation/install.php:87
+msgid ""
+"<a href=\"http://www.mamb-foundation.org\">Mambo </a> is Free Software "
+"released under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU/GPL "
+"License </a>.\n"
+"\t\t\t\t<div class=\"error\">*** To continue installing Mambo you must check "
+"the box under the license ***</div>"
+msgstr ""
+
+#: installation/install.php:102
+msgid "I understand that this software is released under the GNU/GPL License"
+msgstr ""
+
+#: installation/install1.php:42
+msgid "Please enter a Host name"
+msgstr ""
+
+#: installation/install1.php:46
+msgid "Please enter a Database User Name"
+msgstr ""
+
+#: installation/install1.php:50
+msgid "Please enter a Name for your new Database"
+msgstr ""
+
+#: installation/install1.php:53
+msgid ""
+"Are you sure these settings are correct? \\nMambo will now attempt to "
+"populate a Database with the settings you have supplied"
+msgstr ""
+
+#: installation/install1.php:84
+msgid "MySQL database configuration:"
+msgstr ""
+
+#: installation/install1.php:85
+msgid ""
+"\n"
+"  \t   \t\t\t<p>Setting up Mambo to run on your server involves 4 simple "
+"steps...</p>\n"
+"  \t   \t\t\t<p>Please enter the hostname of the server Mambo is to be "
+"installed on.</p>\n"
+"\t\t\t\t<p>Enter the MySQL username, password and database name you wish to "
+"use with Mambo.</p>\n"
+"\t\t\t\t<p>Enter the table name prefix to be used by this Mambo instance and "
+"select how\n"
+"\t\t\t\t   to do with in case existing tables from former installations.</"
+"p>\n"
+"\t\t\t\t<p>Install the samples unless you are experianced Mamber wanting to "
+"start with a completely empty site.</p>\n"
+"\t\t\t\t"
+msgstr ""
+
+#: installation/install1.php:103
+msgid "Host Name"
+msgstr ""
+
+#: installation/install1.php:104
+msgid "This is usually \"localhost\""
+msgstr ""
+
+#: installation/install1.php:107
+msgid "MySQL User Name"
+msgstr ""
+
+#: installation/install1.php:108
+msgid "Either something as \"root\" or a username given by the hoster"
+msgstr ""
+
+#: installation/install1.php:111
+msgid "MySQL Password"
+msgstr ""
+
+#: installation/install1.php:112
+msgid "For site security using a password for the mysql account is mandatory"
+msgstr ""
+
+#: installation/install1.php:115
+msgid "Verify MySQL Password"
+msgstr ""
+
+#: installation/install1.php:116
+msgid "Retype password for verification"
+msgstr ""
+
+#: installation/install1.php:119
+msgid "MySQL Database Name"
+msgstr ""
+
+#: installation/install1.php:120
+msgid ""
+"Some hosts allow only a certain DB name per site. Use table prefix in this "
+"case for distinct mambo sites."
+msgstr ""
+
+#: installation/install1.php:123
+msgid "MySQL Table Prefix"
+msgstr ""
+
+#: installation/install1.php:124
+msgid "Dont use \"old_\" since this is used for backup tables"
+msgstr ""
+
+#: installation/install1.php:128
+msgid "Drop Existing Tables"
+msgstr ""
+
+#: installation/install1.php:133
+msgid "Backup Old Tables"
+msgstr ""
+
+#: installation/install1.php:134
+msgid ""
+"Any exiting backup tables from former mambo installations will be replaced"
+msgstr ""
+
+#: installation/install1.php:138
+msgid "Install Sample Data"
+msgstr ""
+
+#: installation/install1.php:139
+msgid "Dont uncheck this unless you are experienced with mambo!"
+msgstr ""
+
+#: installation/install2.php:37
+msgid "The database details provided are incorrect and/or empty."
+msgstr ""
+
+#: installation/install2.php:41
+msgid "The database passwords provided do not match.  Please try again."
+msgstr ""
+
+#: installation/install2.php:45
+msgid "The password and username provided are incorrect."
+msgstr ""
+
+#: installation/install2.php:49
+msgid "The database name provided is empty."
+msgstr ""
+
+#: installation/install2.php:64
+msgid "A database error occurred: "
+msgstr ""
+
+#: installation/install2.php:193
+msgid "Please enter a Site Name"
+msgstr ""
+
+#: installation/install2.php:235
+msgid "Enter the name of your Mambo site:"
+msgstr ""
+
+#: installation/install2.php:238
+msgid ""
+"Looks like there have been some errors with inserting data into your "
+"database!<br />\n"
+"  \t\t\tYou cannot continue."
+msgstr ""
+
+#: installation/install2.php:241
+msgid "SUCCESS!"
+msgstr ""
+
+#: installation/install2.php:244
+msgid ""
+"Type in the name for your Mambo site. This\n"
+"\t\t\tname is used in email messages so make it something meaningful."
+msgstr ""
+
+#: installation/install2.php:255
+msgid "Error log:"
+msgstr ""
+
+#: installation/install2.php:266
+msgid "Site name"
+msgstr ""
+
+#: installation/install2.php:271
+msgid "e.g. The Home of Mambo"
+msgstr ""
+
+#: installation/install3.php:41
+msgid "The sitename has not been provided"
+msgstr ""
+
+#: installation/install3.php:61
+msgid "Please enter Site URL"
+msgstr ""
+
+#: installation/install3.php:65
+msgid "Please enter the absolute path to your site"
+msgstr ""
+
+#: installation/install3.php:69
+msgid "Please enter an email address to contact your administrator"
+msgstr ""
+
+#: installation/install3.php:73
+msgid "Please enter a password for you administrator"
+msgstr ""
+
+#: installation/install3.php:138
+msgid "Confirm the site URL, path, admin e-mail and file/directory chmods"
+msgstr ""
+
+#: installation/install3.php:139
+msgid ""
+"\n"
+"\t\t\t\t  <p>If URL and Path looks correct then please do not change.\n"
+"\t\t\t\t  If you are not sure then please contact your ISP or administrator. "
+"Usually\n"
+"\t\t\t\t  the values displayed will work for your site.<br/>\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  Enter your e-mail address, this will be the e-mail address of the "
+"site\n"
+"\t\t\t\t  SuperAdministrator.<br />\n"
+"\t\t\t\t  <br/>\n"
+"\t\t\t\t  The permission settings will be used while installing mambo "
+"itself, by\n"
+"\t\t\t\t  the mambo addon-installers and by the media manager. If you are "
+"unsure\n"
+"\t\t\t\t  what flags shall be set, leave the default settings at the "
+"moment.\n"
+"\t\t\t\t  You can still change these flags later in the site global "
+"configuration.</p>"
+msgstr ""
+
+#. if
+#: installation/install3.php:202
+msgid "File Permissions"
+msgstr ""
+
+#: installation/install3.php:206
+msgid "Dont CHMOD files (use server defaults)"
+msgstr ""
+
+#: installation/install3.php:210
+msgid "CHMOD files to:"
+msgstr ""
+
+#: installation/install3.php:217
+msgid "User:"
+msgstr ""
+
+#: installation/install3.php:219 installation/install3.php:228
+#: installation/install3.php:237 installation/install3.php:277
+#: installation/install3.php:286 installation/install3.php:295
+msgid "read"
+msgstr ""
+
+#: installation/install3.php:221 installation/install3.php:230
+#: installation/install3.php:239 installation/install3.php:279
+#: installation/install3.php:288 installation/install3.php:297
+msgid "write"
+msgstr ""
+
+#: installation/install3.php:223 installation/install3.php:232
+#: installation/install3.php:241
+msgid "execute"
+msgstr ""
+
+#: installation/install3.php:226
+msgid "Group:"
+msgstr ""
+
+#: installation/install3.php:235
+msgid "World:"
+msgstr ""
+
+#. if
+#: installation/install3.php:260
+msgid "Directory Permissions"
+msgstr ""
+
+#: installation/install3.php:264
+msgid "Dont CHMOD directories (use server defaults)"
+msgstr ""
+
+#: installation/install3.php:268
+msgid "CHMOD directories to:"
+msgstr ""
+
+#: installation/install3.php:281 installation/install3.php:290
+#: installation/install3.php:299
+msgid "search"
+msgstr ""
+
+#: installation/install4.php:70
+msgid "You must provide a valid admin email address."
+msgstr ""
+
+#: installation/install4.php:96
+msgid "The database details provided are incorrect and/or empty"
+msgstr ""
+
+#: installation/install4.php:158
+msgid "This site is down for maintenance.<br /> Please check back again soon."
+msgstr ""
+
+#: installation/install4.php:159
+msgid ""
+"This site is temporarily unavailable.<br /> Please notify the System "
+"Administrator"
+msgstr ""
+
+#: installation/install4.php:162
+msgid "Mambo - the dynamic portal engine and content management system"
+msgstr ""
+
+#. chmod files and directories if desired
+#: installation/install4.php:238
+msgid "Directory and file permissions left unchanged."
+msgstr ""
+
+#: installation/install4.php:280
+msgid "File and directory permissions successfully changed."
+msgstr ""
+
+#: installation/install4.php:282
+msgid "File and directory permissions could not be changed.<br/>"
+msgstr ""
+
+#: installation/install4.php:283
+msgid "Please CHMOD mambo files and directories manually."
+msgstr ""
+
+#: installation/install4.php:301
+msgid "The site url has not been provided"
+msgstr ""
+
+#: installation/install4.php:333
+msgid "View Site"
+msgstr ""
+
+#: installation/install4.php:341
+msgid "Administration"
+msgstr ""
+
+#: installation/install4.php:351
+msgid "Congratulations! Mambo is installed"
+msgstr ""
+
+#: installation/install4.php:352
+msgid ""
+"\n"
+"\t\t\t\t<p>Click the \"View Site\" button to start Mambo site or "
+"\"Administration\"\n"
+"\t\t\t\t   to take you to administrator login.  Please take a moment to fill "
+"out the form below.</p>"
+msgstr ""
+
+#: installation/install4.php:359
+msgid "PLEASE REMEMBER TO COMPLETELY<br/>REMOVE THE INSTALLATION DIRECTORY"
+msgstr ""
+
+#: installation/install4.php:360
+msgid "Administration Login Details"
+msgstr ""
+
+#: installation/install4.php:361
+msgid "Username :"
+msgstr ""
+
+#: installation/install4.php:362
+msgid "Password :"
+msgstr ""
+
+#: installation/install4.php:367
+msgid ""
+"\n"
+"\t\t\t\t\t\t\t\tYour configuration file or directory is not writeable,\n"
+"\t\t\t\t\t\t\t\tor there was a problem creating the configuration file. "
+"You'll have to\n"
+"\t\t\t\t\t\t\t\tupload the following code by hand. Click in the textarea to "
+"highlight\n"
+"\t\t\t\t\t\t\t\tall of the code."
+msgstr ""
diff -ruN 4.5.4/language/untranslated/installer.pot 4.6rc2/language/untranslated/installer.pot
--- 4.5.4/language/untranslated/installer.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/installer.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,573 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_installer/admin.installer.html.php:20
+msgid "Unwriteable"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:20
+msgid "Writeable"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:37
+#: administrator/components/com_installer/admin.installer.php:154
+msgid "Please select a directory"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:58
+msgid "Upload Package File"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:63
+msgid "Package File:"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:65
+msgid "Upload File &amp; Install"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:85
+msgid "Install from directory"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:90
+msgid "Install directory:"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:92
+msgid "Install"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:112
+msgid "Install from HTTP URL"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:117
+msgid "Install HTTP URL:"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:119
+msgid "Upload URL &amp; Install"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:136
+msgid "Sorry, it seems that The Source is not available"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.html.php:190
+msgid "Continue ..."
+msgstr ""
+
+#. *
+#. * @package Mambo Open Source
+#. * @subpackage Installer
+#. * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+#. * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+#. *
+#. * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+#. * that Mambo remained free Open Source software owned and managed by the community.
+#. * Mambo is Free Software
+#.
+#. * ensure this file is being included by a parent file
+#: administrator/components/com_installer/admin.installer.php:14
+msgid "Direct Access to this location is not allowed."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:23
+#: administrator/components/com_installer/component/component.php:18
+#: administrator/components/com_installer/language/language.php:18
+#: administrator/components/com_installer/mambot/mambot.php:18
+#: administrator/components/com_installer/module/module.php:18
+#: administrator/components/com_installer/template/template.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:67
+msgid "There was nothing selected to be uninstalled"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:69
+#, php-format
+msgid "Uninstaller not found for element [%s]"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:78
+#, php-format
+msgid "Installer not found for element [%s]"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:84
+#, php-format
+msgid "Installer not available for element [%s]"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:109
+msgid ""
+"The installer can't continue before file uploads are enabled. Please use the "
+"install from directory method."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:110
+#: administrator/components/com_installer/admin.installer.php:117
+#: administrator/components/com_installer/admin.installer.php:180
+#: administrator/components/com_installer/admin.installer.php:187
+msgid "Installer - Error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:116
+#: administrator/components/com_installer/admin.installer.php:173
+msgid "The installer can't continue before zlib is installed"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:124
+msgid "No file selected"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:125
+msgid "Upload new module - error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:135
+#, php-format
+msgid "Upload %s - Upload Failed"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:140
+#: administrator/components/com_installer/admin.installer.php:193
+#: administrator/components/com_installer/admin.installer.php:198
+msgid "Failed"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:140
+#: administrator/components/com_installer/admin.installer.php:163
+#: administrator/components/com_installer/admin.installer.php:198
+#: administrator/components/com_installer/admin.installer.php:297
+#: administrator/components/com_installer/admin.installer.php:310
+#: administrator/components/com_installer/admin.installer.php:344
+#: administrator/components/com_installer/admin.installer.php:387
+#: administrator/components/com_installer/admin.installer.php:413
+#: administrator/components/com_installer/admin.installer.php:432
+msgid "Success"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:140
+#: administrator/components/com_installer/admin.installer.php:193
+#: administrator/components/com_installer/admin.installer.php:198
+#: administrator/components/com_installer/admin.installer.php:201
+msgid "Upload "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:143
+#, php-format
+msgid "Upload %s -  Upload Error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:163
+#: administrator/components/com_installer/admin.installer.php:201
+#: administrator/components/com_installer/admin.installer.php:297
+#: administrator/components/com_installer/admin.installer.php:344
+#: administrator/components/com_installer/admin.installer.php:387
+#: administrator/components/com_installer/admin.installer.php:432
+msgid "Error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:163
+msgid "Install new "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:179
+msgid "Please select an HTTP URL"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:186
+msgid "The URL did not define a file name"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:220
+#: administrator/components/com_installer/admin.installer.php:253
+msgid "Failed to change the permissions of the uploaded file."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:223
+msgid "Failed to move uploaded file to <code>/media</code> directory."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:226
+#: administrator/components/com_installer/admin.installer.php:259
+msgid "Upload failed as <code>/media</code> directory is not writable."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:229
+#: administrator/components/com_installer/admin.installer.php:261
+msgid "Upload failed as <code>/media</code> directory does not exist."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:255
+msgid "Failed to open the local file from the URL."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:257
+msgid "Failed to open the specified URL."
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:278
+#: administrator/components/com_installer/admin.installer.php:362
+#: administrator/components/com_installer/admin.installer.php:368
+#: administrator/components/com_installer/admin.installer.php:373
+#: administrator/components/com_installer/admin.installer.php:437
+msgid "Uninstall -  error"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:282
+#, php-format
+msgid ""
+"Component %s is a core component, and can not be uninstalled.<br />You need "
+"to unpublish it if you don't want to use it"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:297
+msgid "Uninstall component - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:309
+msgid "Uninstaller could not find XML file, but cleaned database"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:310
+msgid "Uninstall "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:310
+msgid "component - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:328
+#, php-format
+msgid ""
+"%s is a core module, and can not be uninstalled.<br />You need to unpublish "
+"it if you don't want to use it"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:344
+msgid "Uninstall module - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:367
+msgid "Invalid object id"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:372
+msgid "Folder field empty, cannot remove files"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:385
+msgid "Uninstaller did its best with no XML file present"
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:387
+msgid "Uninstall mambot - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:412
+msgid "Uninstall template - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:432
+msgid "Uninstall language - "
+msgstr ""
+
+#: administrator/components/com_installer/admin.installer.php:436
+msgid "Language id empty, cannot remove files"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:28
+msgid "Installed Components"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:36
+msgid "Currently Installed"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:39
+msgid "Component Menu Link"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:42
+#: administrator/components/com_installer/mambot/mambot.html.php:55
+#: administrator/components/com_installer/module/module.html.php:51
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:45
+#: administrator/components/com_installer/mambot/mambot.html.php:58
+#: administrator/components/com_installer/module/module.html.php:54
+msgid "Version"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:48
+#: administrator/components/com_installer/mambot/mambot.html.php:61
+#: administrator/components/com_installer/module/module.html.php:57
+msgid "Date"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:51
+#: administrator/components/com_installer/mambot/mambot.html.php:64
+#: administrator/components/com_installer/module/module.html.php:60
+msgid "Author Email"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:54
+#: administrator/components/com_installer/mambot/mambot.html.php:67
+#: administrator/components/com_installer/module/module.html.php:63
+msgid "Author URL"
+msgstr ""
+
+#: administrator/components/com_installer/component/component.html.php:94
+msgid "There are no custom components installed"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:58
+#, php-format
+msgid "XML error in %s: no handler %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:60
+#, php-format
+msgid "XML error in %s: mosinstall has no type"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:65
+#, php-format
+msgid "XML Error in %s: install has no name"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:92
+#, php-format
+msgid "XML error in %s: MENU found, but this is not component XML"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:129
+#, php-format
+msgid "XML Error in %s: Mambot does not have a group specified"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:160
+#, php-format
+msgid "XML error in %s: no installer %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:178
+#, php-format
+msgid "Installer error with %s: unable to create admin directory for %s %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:185
+#, php-format
+msgid "Installer error with %s: unable to create user directory for %s %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:211
+#, php-format
+msgid "Installer error with %s: writing component menu SQL error %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:223
+#: administrator/components/com_installer/installer.class.php:270
+#: administrator/components/com_installer/installer.class.php:307
+#: administrator/components/com_installer/installer.class.php:335
+#: administrator/components/com_installer/installer.class.php:377
+#, php-format
+msgid "Installer error with %s: %s %s already installed"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:239
+#: administrator/components/com_installer/installer.class.php:292
+#: administrator/components/com_installer/installer.class.php:326
+#: administrator/components/com_installer/installer.class.php:388
+#, php-format
+msgid "Installer error with %s: %s %s SQL error %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:261
+#: administrator/components/com_installer/installer.class.php:299
+#, php-format
+msgid "Installer error with %s: no file identified as the %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:400
+#, php-format
+msgid "Patch install error with %s: cannot write %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:406
+#, php-format
+msgid "Patch install error with %s: cannot delete %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:411
+#, php-format
+msgid "Patch install error with %s: file permissions prevent patch application"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:416
+#, php-format
+msgid "Patch install error with %s: failed to delete %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:422
+#, php-format
+msgid "Patch install error with %s: failed to write %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:426
+#, php-format
+msgid "Patch install error with %s: check was OK, but application failed"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:427
+#, php-format
+msgid "Patch install %s: completed successfully"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:495
+#, php-format
+msgid "Uninstaller error with %s: no uninstaller %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:535
+#, php-format
+msgid "Uninstaller error with %s: %s %s SQL error %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:545
+#: administrator/components/com_installer/installer.class.php:567
+#: administrator/components/com_installer/installer.class.php:586
+#, php-format
+msgid "Uninstaller error with %s: %s %s not fully deleted from database"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:558
+#, php-format
+msgid "Uninstaller error with %s: no file identified as the %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:663
+#, php-format
+msgid "Installer unrecoverable ZIP error %s in %s"
+msgstr ""
+
+#: administrator/components/com_installer/installer.class.php:672
+#, php-format
+msgid "Installer unrecoverable TAR error in %s"
+msgstr ""
+
+#: administrator/components/com_installer/language/language.php:21
+msgid "Back to Language Manager"
+msgstr ""
+
+#: administrator/components/com_installer/language/language.php:22
+msgid "Install new Language - Site"
+msgstr ""
+
+#: administrator/components/com_installer/mambot/mambot.html.php:27
+msgid "Installed Mambots"
+msgstr ""
+
+#: administrator/components/com_installer/mambot/mambot.html.php:32
+msgid ""
+"Only those Mambots that can be uninstalled are displayed - some Core Mambots "
+"cannot be removed."
+msgstr ""
+
+#: administrator/components/com_installer/mambot/mambot.html.php:43
+msgid "Mambot"
+msgstr ""
+
+#: administrator/components/com_installer/mambot/mambot.html.php:46
+msgid "Type"
+msgstr ""
+
+#: administrator/components/com_installer/mambot/mambot.html.php:122
+msgid "There are no non-core, custom mambots installed."
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:25
+msgid "Installed Modules"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:28
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:36
+msgid ""
+"Only those Modules that can be uninstalled are displayed - some Core Modules "
+"cannot be removed."
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:45
+msgid "Module File"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:48
+msgid "Client"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:75
+#: administrator/components/com_installer/template/template.php:26
+msgid "Administrator"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:75
+#: administrator/components/com_installer/template/template.php:26
+msgid "Site"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.html.php:99
+msgid "No custom modules installed"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.php:32
+msgid "All"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.php:33
+msgid "Site Modules"
+msgstr ""
+
+#: administrator/components/com_installer/module/module.php:34
+msgid "Admin Modules"
+msgstr ""
+
+#: administrator/components/com_installer/template/template.php:26
+msgid "Install new Template"
+msgstr ""
+
+#: administrator/components/com_installer/template/template.php:28
+msgid "Back to Templates"
+msgstr ""
+
+#: administrator/components/com_installer/toolbar.installer.html.php:27
+msgid "Uninstall"
+msgstr ""
+
+#: administrator/components/com_installer/universal/universal.php:25
+msgid ""
+"Install Mambo plugin (component, module, mambot, template, include, "
+"parameter, composite)"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/languages.pot 4.6rc2/language/untranslated/languages.pot
--- 4.5.4/language/untranslated/languages.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/languages.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,394 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_languages/actions/default.action.php:25
+msgid "Default Language succesfully updated!"
+msgstr ""
+
+#: administrator/components/com_languages/actions/default.action.php:27
+#: administrator/components/com_languages/actions/publish.action.php:40
+msgid "Error! Make sure that configuration.php is writeable."
+msgstr ""
+
+#: administrator/components/com_languages/actions/publish.action.php:38
+msgid "Configuration succesfully updated!"
+msgstr ""
+
+#: administrator/components/com_languages/admin.languages.php:19
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:42
+#: administrator/components/com_languages/toolbar.languages.php:71
+msgid "Manage Translations"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:45
+msgid "Auto Translate"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:68
+msgid "Scan Sources"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:73
+msgid "Export"
+msgstr ""
+
+#: administrator/components/com_languages/toolbar.languages.php:98
+msgid "Update"
+msgstr ""
+
+#: administrator/components/com_languages/views/catalogs.view.php:22
+#, php-format
+msgid "Manage Translations: %s"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:28
+#: administrator/components/com_languages/views/edit.view.php:43
+#: administrator/components/com_languages/views/templates/langform.tpl.php:106
+#: administrator/components/com_languages/views/templates/langform.tpl.php:153
+#: administrator/components/com_languages/views/templates/languages.tpl.php:21
+msgid "Language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:28
+msgid "New language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:43
+msgid "Edit language"
+msgstr ""
+
+#: administrator/components/com_languages/views/edit.view.php:72
+#, php-format
+msgid "Translate Catalog: %s [%s]"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:23
+msgid "Language File"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:24
+msgid "% Translated"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:25
+msgid "Total Strings"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:26
+msgid "Translated Strings"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/catalogs.tpl.php:27
+msgid "Fuzzy"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:11
+msgid "You must provide a Language Name."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:13
+msgid "You must provide a Language Identifier."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:15
+msgid "You must provide a locale."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:17
+msgid "You must provide a character encoding."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:19
+msgid "You must provide a date format."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:33
+msgid "New Language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:40
+#: administrator/components/com_languages/views/templates/langform.tpl.php:147
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:43
+msgid "Language Identifier"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:46
+msgid ""
+"The identifier for this language. This is used for naming the language xml "
+"file and translations directory."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:50
+msgid "Language Name"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:53
+msgid "The official name for this language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:57
+msgid "Locale"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:60
+msgid ""
+"The locale list for this language. \\nLocale names must be comma separated."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:64
+msgid "Encoding"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:67
+msgid "The character encoding for this language. Ex. utf-8"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:71
+msgid "Direction"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:74
+msgid "Left-to-Right"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:75
+msgid "Right-to-Left"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:77
+msgid "Text direction."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:81
+#: administrator/components/com_languages/views/templates/langform.tpl.php:230
+msgid "Date Format"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:84
+#: administrator/components/com_languages/views/templates/langform.tpl.php:233
+msgid "Date format for strftime()."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:88
+msgid "Plural forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/edit.tpl.php:91
+msgid "Plural forms for gettext."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:18
+msgid "Messages"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:23
+msgid "Verified"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:26
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:114
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:121
+msgid "Original"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:29
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:116
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:125
+msgid "Translation"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:32
+msgid "Ref"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:55
+msgid "Translation OK"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:55
+msgid "Verify Translation"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:86
+msgid "Headers"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:100
+msgid "Comments"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:122
+msgid "Singular"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:123
+#: administrator/components/com_languages/views/templates/editcatalog.tpl.php:132
+msgid "Plural"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/form.tpl.php:39
+msgid "Mambo Language Editor"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/form.tpl.php:44
+msgid "Select Language"
+msgstr ""
+
+#.
+#: administrator/components/com_languages/views/templates/form.tpl.php:54
+msgid "No content to display."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:10
+msgid "You must choose a language."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:12
+msgid "You must choose a character set."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:33
+#: administrator/components/com_languages/views/templates/langform.tpl.php:109
+msgid "choose language"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:40
+#: administrator/components/com_languages/views/templates/langform.tpl.php:120
+msgid "choose territory"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:41
+msgid "choose character set"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:117
+#: administrator/components/com_languages/views/templates/langform.tpl.php:161
+msgid "Territory"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:125
+#: administrator/components/com_languages/views/templates/langform.tpl.php:169
+#: administrator/components/com_languages/views/templates/languages.tpl.php:24
+msgid "Character Set"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:128
+msgid "choose charset"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:175
+msgid "Convert to"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:187
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:193
+#: administrator/components/com_languages/views/templates/table.tpl.php:29
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:199
+#: administrator/components/com_languages/views/templates/table.tpl.php:32
+msgid "Author Email"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:205
+msgid "Author Url"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:211
+msgid "Text Direction"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:214
+msgid "left to right"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:215
+msgid "right to left"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:220
+msgid "Plural Forms"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:237
+msgid "Locales"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:240
+msgid ""
+"The locale list for setlocale(). \\nLocale names must be comma separated."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:244
+msgid "Days"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/langform.tpl.php:258
+msgid "Months"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:6
+msgid "You cannot delete English."
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:22
+msgid "Country - Region"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:23
+#: administrator/components/com_languages/views/templates/table.tpl.php:20
+msgid "Default"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:25
+#: administrator/components/com_languages/views/templates/table.tpl.php:23
+msgid "Version"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:26
+#: administrator/components/com_languages/views/templates/table.tpl.php:26
+msgid "Date"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:44
+#: administrator/components/com_languages/views/templates/table.tpl.php:44
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/languages.tpl.php:44
+#: administrator/components/com_languages/views/templates/table.tpl.php:44
+msgid "Yes"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:4
+msgid "Language Manager"
+msgstr ""
+
+#: administrator/components/com_languages/views/templates/table.tpl.php:17
+msgid "Languages"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/login.pot 4.6rc2/language/untranslated/login.pot
--- 4.5.4/language/untranslated/login.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/login.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,243 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Login Image"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Alignment for Logout Image"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Contact Items"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Login Page"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Image for the Logout Page"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Left"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login Description Text"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login Image Align"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login JS Message"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login Page Title"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Login Redirection URL"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Description Text"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Image Align"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout JS Message"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Page Title"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Logout Redirection URL"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Parameters for individual Contact Items"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Right"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Login Description below"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the Logout Description below"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Login Success"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the javascript Pop-up indicating Logout Success"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the login Page, if left blank _LOGIN_DESCRIPTION will be "
+"used"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"Text to display on the logout Page, if left blank _LOGOUT_DESCRIPTION will "
+"be used"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will be redirected to after logout, if let blank will load front "
+"page"
+msgstr ""
+
+#: administrator/components/com_login/login.xml
+msgid ""
+"What page will the login redirect to after login, if let blank will load "
+"front page"
+msgstr ""
+
+#: components/com_login/login.html.php:56
+msgid "Username"
+msgstr ""
+
+#: components/com_login/login.html.php:60
+msgid "Password"
+msgstr ""
+
+#: components/com_login/login.html.php:75
+msgid "Remember me"
+msgstr ""
+
+#: components/com_login/login.html.php:79
+msgid "Password Reminder"
+msgstr ""
+
+#: components/com_login/login.html.php:85
+msgid "No account yet?"
+msgstr ""
+
+#: components/com_login/login.html.php:87
+msgid "Create one"
+msgstr ""
+
+#: components/com_login/login.html.php:99
+msgid "Login"
+msgstr ""
+
+#: components/com_login/login.html.php:107
+msgid "!Warning! Javascript must be enabled for proper operation."
+msgstr ""
+
+#: components/com_login/login.html.php:160
+msgid "Logout"
+msgstr ""
+
+#: components/com_login/login.php:40
+msgid "To access the Private areas of this site please Login"
+msgstr ""
+
+#: components/com_login/login.php:41
+msgid "You are now Logged in to a private area of this site"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/mambots.pot 4.6rc2/language/untranslated/mambots.pot
--- 4.5.4/language/untranslated/mambots.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/mambots.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,186 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_mambots/admin.mambots.html.php:32
+#: administrator/components/com_mambots/admin.mambots.php:226
+msgid "Administrator"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:32
+msgid "Mambot Manager"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:32
+msgid "Site"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:35
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:53
+msgid "Mambot Name"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:56
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:59
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:62
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:65
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:68
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:71
+msgid "Type"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:74
+msgid "File"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:177
+msgid "Mambot must have a name"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:179
+msgid "Mambot must have a filename"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:188
+msgid "Site Mambot:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:190
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:190
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:204
+msgid "Mambot Details"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:209
+msgid "Name:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:217
+msgid "Folder:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:225
+msgid "Mambot file:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:233
+msgid "Mambot Order:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:241
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:249
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:262
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:274
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.html.php:283
+msgid "No Parameters"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:19
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:139
+msgid "- All Types -"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:186
+#, php-format
+msgid "Successfully Saved changes to Mambot: %s"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:191
+#, php-format
+msgid "Successfully Saved Mambot: %s"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:214
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:249
+msgid "This mambot cannot be reordered"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:271
+msgid ""
+"New items default to the last place. Ordering can be changed after this item "
+"is saved."
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:292
+msgid "Select a module to delete"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:308
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:308
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_mambots/admin.mambots.php:309
+#, php-format
+msgid "Select a mambot to %s"
+msgstr ""
+
+#. foreach
+#: administrator/components/com_mambots/admin.mambots.php:427
+msgid "New ordering saved"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_mambots/toolbar.mambots.html.php:27
+msgid "Close"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/massmail.pot 4.6rc2/language/untranslated/massmail.pot
--- 4.5.4/language/untranslated/massmail.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/massmail.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,95 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_massmail/admin.massmail.html.php:32
+msgid "Please fill in the subject"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:34
+msgid "Please select a group"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:36
+msgid "Please fill in the message"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:47
+#: administrator/components/com_massmail/massmail.xml
+msgid "Mass Mail"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:55
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:60
+msgid "Group:"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:68
+msgid "Mail to Child Groups:"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:76
+msgid "Send in HTML mode:"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:84
+msgid "Subject"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.html.php:92
+msgid "Message:"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.php:41
+msgid "- All User Groups -"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.php:71
+msgid "Please fill in the form correctly"
+msgstr ""
+
+#. Build e-mail message format
+#: administrator/components/com_massmail/admin.massmail.php:94
+#, php-format
+msgid ""
+"This is an email from '%s'\n"
+"\n"
+"Message:\n"
+msgstr ""
+
+#: administrator/components/com_massmail/admin.massmail.php:107
+#, php-format
+msgid "E-mail sent to %d user."
+msgid_plural "E-mail sent to %d users."
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_massmail/massmail.xml
+msgid "This component allows you to send a mass email to certain user groups"
+msgstr ""
+
+#: administrator/components/com_massmail/toolbar.massmail.html.php:22
+msgid "Send Mail"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/media.pot 4.6rc2/language/untranslated/media.pot
--- 4.5.4/language/untranslated/media.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/media.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,128 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_media/admin.media.html.php:86
+#: administrator/components/com_media/media.xml
+msgid "Media Manager"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:93
+msgid "Directory"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:114
+#: administrator/components/com_media/toolbar.media.html.php:27
+msgid "Upload"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:117
+msgid "Max size"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:121
+#: administrator/components/com_media/admin.media.html.php:214
+#: administrator/components/com_media/admin.media.html.php:283
+msgid "Code"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:125
+msgid "Create Directory"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:165
+msgid "No Images Found"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:176
+#, php-format
+msgid "Configuration Problem: &quot; %s &quot; does not exist."
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:216
+#: administrator/components/com_media/admin.media.html.php:253
+#: administrator/components/com_media/admin.media.html.php:285
+msgid "Delete"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:272
+msgid "Insert your text here"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:371
+msgid "\"Delete file \\\"\"+file+\"\\\"?\""
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:379
+msgid ""
+"\"There are \"+numFiles+\" files/folders in \\\"\"+folder+\"\\\".\\n"
+"\\nPlease delete all files/folder in \\\"\"+folder+\"\\\" first.\""
+msgstr ""
+
+#: administrator/components/com_media/admin.media.html.php:383
+msgid "\"Delete folder \\\"\"+folder+\"\\\"?\""
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:19
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:37
+msgid "NO HACKING PLEASE"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:49
+msgid ""
+"Directory creation not allowed while running in SAFE MODE as this can cause "
+"problems."
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:93
+msgid ""
+"Directory name must only contain alphanumeric characters and no spaces "
+"please."
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:129
+msgid "Unable to delete: not empty!"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:161
+msgid "Upload FAILED. File already exists"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:165
+msgid ""
+"Only files of type gif, png, jpg, bmp, pdf, swf, doc, xls or ppt can be "
+"uploaded"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:169
+msgid "Upload FAILED"
+msgstr ""
+
+#: administrator/components/com_media/admin.media.php:173
+msgid "Upload complete"
+msgstr ""
+
+#: administrator/components/com_media/media.xml
+msgid "This component manages site media"
+msgstr ""
+
+#: administrator/components/com_media/toolbar.media.html.php:29
+msgid "Create"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/menumanager.pot 4.6rc2/language/untranslated/menumanager.pot
--- 4.5.4/language/untranslated/menumanager.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/menumanager.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,207 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:42
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "Menu Manager"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:53
+msgid "Menu Name"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:56
+msgid "Menu Items"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:59
+msgid "# Published"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:62
+msgid "# Unpublished"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:65
+msgid "# Trash"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:68
+msgid "# Modules"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:94
+msgid "Edit Menu Name"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:99
+msgid "Edit Menu Items"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:156
+msgid "Please enter a menu name"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:164
+msgid "Please enter a module name for your menu"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:182
+msgid "Menu Details"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:190
+msgid "Menu Name:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:195
+msgid ""
+"This is the identification name used by mambo to identify this menu within "
+"the code - it must be unique. It is recommended that you do not have any "
+"spaces in your Menu Name"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:210
+msgid "Title of the mod_mainmenu module required to show this Menu"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:216
+msgid ""
+"A new mod_mainmenu module, with the Title you have entered above will "
+"automatically be created when you save this menu."
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:218
+msgid ""
+"Parameters for the module created are to be edited through the \"Modules "
+"Manager [site]\": Modules -> Site Modules"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:266
+#, php-format
+msgid "Delete Menu: %s"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:279
+msgid "Module(s) being Deleted:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:301
+msgid "Menu Items being Deleted:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:321
+msgid ""
+"This will <span style=\"font-weight:bold;color:#FF0000\">Delete</span> this "
+"Menu, <br />ALL its Menu Items and the Module(s) associated with it"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:324
+msgid ""
+"Are you sure you want to Delete this menu? \\nThis will Delete the Menu, its "
+"Items and the Module(s)."
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:325
+#: administrator/components/com_menumanager/admin.menumanager.html.php:326
+#: administrator/components/com_menumanager/toolbar.menumanager.html.php:28
+msgid "Delete"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:356
+msgid "Please enter a name for the copy of the Menu"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:359
+msgid "Please enter a name for the new Module"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:373
+msgid "Copy Menu"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:383
+msgid "New Menu Name:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:387
+msgid "New Module Name:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:394
+msgid "Menu being copied:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.html.php:404
+msgid "Menu Items being copied:"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:209
+msgid ""
+"You cannot rename the \"mainmenu\" Menu as this will disrupt the proper "
+"operation of Mambo"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:225
+msgid ""
+"A menu already exists with that name - you must enter a unique Menu Name"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:260
+#, php-format
+msgid "New Menu created [ %s ]"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:314
+msgid "Menu Items & Modules updated"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:328
+#: administrator/components/com_menumanager/admin.menumanager.php:378
+msgid "You cannot delete the \"mainmenu\" menu as it is a core menu"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:469
+msgid ""
+"A menu with that name already exists - you must enter a unique Menu Name"
+msgstr ""
+
+#: administrator/components/com_menumanager/admin.menumanager.php:529
+#, php-format
+msgid "Copy of Menu `%s` created, consisting of %d item"
+msgid_plural "Copy of Menu `%s` created, consisting of %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menumanager/menumanager.xml
+msgid "This component manages your Menus."
+msgstr ""
+
+#: administrator/components/com_menumanager/toolbar.menumanager.html.php:26
+#: administrator/components/com_menumanager/toolbar.menumanager.html.php:61
+msgid "Copy"
+msgstr ""
+
+#: administrator/components/com_menumanager/toolbar.menumanager.html.php:48
+msgid "Save"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/menus.pot 4.6rc2/language/untranslated/menus.pot
--- 4.5.4/language/untranslated/menus.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/menus.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,1840 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_menus/admin.menus.html.php:27
+#, php-format
+msgid "Menu Manager <small><small>[ %s ]</small></small>"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:30
+msgid "Max Levels"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:36
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:47
+msgid ""
+"You cannot `delete` this menu as it is required for the proper operation of "
+"Mambo"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:50
+msgid ""
+"The 1st Published item in this menu [mainmenu] is the default `Homepage` for "
+"the site"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:68
+msgid "Menu Item"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:71
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:74
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:77
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:80
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:83
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:86
+msgid "Itemid"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:89
+msgid "Type"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:92
+msgid "CID"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:182
+msgid "New Menu Item"
+msgstr ""
+
+#. echo _MENU_GROUP;
+#: administrator/components/com_menus/admin.menus.html.php:201
+msgid "Content"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:233
+msgid "Miscellaneous"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:264
+msgid ""
+"Note that some menu types appear in more that one grouping, but they are "
+"still the same menu type."
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:268
+msgid "Components"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:300
+msgid "Links"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:357
+msgid "Move Menu Items"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:367
+msgid "Move to Menu:"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:374
+msgid "Menu Items being moved:"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:417
+msgid "Copy Menu Items"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:428
+msgid "Copy to Menu:"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.html.php:436
+msgid "Menu Items being copied:"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.php:414
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.php:414
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.php:415
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#: administrator/components/com_menus/admin.menus.php:458
+#, php-format
+msgid "%d Item sent to the Trash"
+msgid_plural "%d Items sent to the Trash"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_menus/admin.menus.php:529
+#: administrator/components/com_menus/admin.menus.php:634
+msgid "Select an item to move"
+msgstr ""
+
+#. if
+#: administrator/components/com_menus/admin.menus.php:623
+#, php-format
+msgid "%d Menu Item moved to %s"
+msgid_plural "%d Menu Items moved to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. foreach
+#: administrator/components/com_menus/admin.menus.php:693
+#, php-format
+msgid "%d Menu Item Copied to %s"
+msgid_plural "%d Menu Items Copied to %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. foreach
+#: administrator/components/com_menus/admin.menus.php:741
+msgid "New ordering saved"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.class.php:28
+#: administrator/components/com_menus/contact_category_table/contact_category_table.class.php:31
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:35
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:35
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:41
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:42
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:35
+#: administrator/components/com_menus/url/url.menu.html.php:38
+msgid "Link must have a name"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:37
+msgid "You must select a Component to link to"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:48
+#: administrator/components/com_menus/components/components.menu.html.php:72
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:66
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:50
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:68
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:70
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:64
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:64
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:68
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:56
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:68
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:57
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+#: administrator/components/com_menus/separator/separator.menu.html.php:44
+#: administrator/components/com_menus/url/url.menu.html.php:51
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:59
+msgid "Add"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:48
+#: administrator/components/com_menus/components/components.menu.html.php:72
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:66
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:50
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:68
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:70
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:64
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:64
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:68
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:56
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:68
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:57
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+#: administrator/components/com_menus/separator/separator.menu.html.php:44
+#: administrator/components/com_menus/url/url.menu.html.php:51
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:59
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:48
+msgid "Menu Item :: Link - Component Item"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:59
+#: administrator/components/com_menus/components/components.menu.html.php:83
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:77
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:61
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:79
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:81
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:75
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:75
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:79
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:67
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:79
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:68
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:77
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:61
+#: administrator/components/com_menus/separator/separator.menu.html.php:55
+#: administrator/components/com_menus/url/url.menu.html.php:62
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:77
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:70
+msgid "Details"
+msgstr ""
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:64
+#: administrator/components/com_menus/components/components.menu.html.php:87
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:82
+#: administrator/components/com_menus/contact_item_link/contact_item_link.class.php:59
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:66
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:83
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:85
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:79
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:79
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:84
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:72
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:83
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:73
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:82
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:66
+#: administrator/components/com_menus/url/url.menu.html.php:67
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:83
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:75
+msgid "Name:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:72
+msgid "Component to Link:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:79
+#: administrator/components/com_menus/components/components.menu.html.php:99
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:105
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:102
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:104
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:100
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:100
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:107
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:87
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:102
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:105
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:106
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:91
+msgid "Url:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:86
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:88
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:94
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:88
+#: administrator/components/com_menus/url/url.menu.html.php:83
+msgid "On Click, Open in:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:94
+#: administrator/components/com_menus/components/components.menu.html.php:105
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:113
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:96
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:108
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:110
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:106
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:106
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:115
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:102
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:108
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:103
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:113
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:96
+#: administrator/components/com_menus/separator/separator.menu.html.php:68
+#: administrator/components/com_menus/url/url.menu.html.php:91
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:114
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:99
+msgid "Parent Item:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:102
+#: administrator/components/com_menus/components/components.menu.html.php:112
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:121
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:104
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:114
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:116
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:112
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:112
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:123
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:110
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:114
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:111
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:121
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:104
+#: administrator/components/com_menus/separator/separator.menu.html.php:76
+#: administrator/components/com_menus/url/url.menu.html.php:99
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:122
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:107
+msgid "Ordering:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:110
+#: administrator/components/com_menus/components/components.menu.html.php:118
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:129
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:112
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:120
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:122
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:118
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:118
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:131
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:118
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:120
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:119
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:129
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:112
+#: administrator/components/com_menus/separator/separator.menu.html.php:84
+#: administrator/components/com_menus/url/url.menu.html.php:107
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:130
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:115
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:117
+#: administrator/components/com_menus/components/components.menu.html.php:124
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:137
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:119
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:126
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:128
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:124
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:124
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:139
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:125
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:126
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:126
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:137
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:119
+#: administrator/components/com_menus/separator/separator.menu.html.php:91
+#: administrator/components/com_menus/url/url.menu.html.php:115
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:138
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:123
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.menu.html.php:131
+#: administrator/components/com_menus/components/components.menu.html.php:138
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:152
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:133
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:140
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:142
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:138
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:138
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:154
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:139
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:140
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:140
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:152
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:133
+#: administrator/components/com_menus/separator/separator.menu.html.php:105
+#: administrator/components/com_menus/url/url.menu.html.php:127
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:153
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:138
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/content_typed/content_typed.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/separator/separator.xml
+#: administrator/components/com_menus/url/url.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+msgid "Creates a link to an existing Mambo Component"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+msgid "Link - Component Item"
+msgstr ""
+
+#: administrator/components/com_menus/component_item_link/component_item_link.xml
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/content_typed/content_typed.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/separator/separator.xml
+#: administrator/components/com_menus/url/url.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.class.php:33
+#, php-format
+msgid "\"The module %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.menu.html.php:58
+msgid "Item must have a name"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.menu.html.php:60
+msgid "Please select a Component"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.menu.html.php:72
+#, php-format
+msgid "Menu Item :: Component <small><small>%s</small></small>"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.menu.html.php:93
+msgid "Component:"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.menu.html.php:148
+msgid "Parameter list will be available once you save this New menu item"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.xml
+msgid "Component"
+msgstr ""
+
+#: administrator/components/com_menus/components/components.xml
+msgid "Displays the frontend interface for a Component"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:39
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:39
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:39
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:39
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:39
+msgid "You must select a category"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:53
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:55
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:56
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:40
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:49
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:40
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:49
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:55
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:52
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:53
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:53
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:35
+msgid "This Menu item must have a title"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Contact Category"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:90
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:90
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:92
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:90
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:91
+msgid "If you leave this blank the Category name will be automatically used"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.menu.html.php:97
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:96
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:88
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:99
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:73
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:97
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:98
+msgid "Category:"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "# Category Items"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Category Description"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Email Column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Fax Column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Other Categories"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Position Column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Email column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Fax column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Position column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Show/Hide the Table Headings"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Show/Hide the Telephone column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the number of items in each category"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Shows a Table view of Contact items for a particular Category"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Table - Contact Category"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Table Headings"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+msgid "Telephone Column"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_menus/contact_category_table/contact_category_table.xml
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "When viewing a Category, Show/Hide the list of other Categories"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.class.php:30
+#: administrator/components/com_menus/content_archive_category/content_archive_category.class.php:30
+#: administrator/components/com_menus/content_archive_section/content_archive_section.class.php:29
+#: administrator/components/com_menus/content_blog_category/content_blog_category.class.php:31
+#: administrator/components/com_menus/content_blog_section/content_blog_section.class.php:31
+#: administrator/components/com_menus/content_category/content_category.class.php:31
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:30
+#: administrator/components/com_menus/content_section/content_section.class.php:30
+#: administrator/components/com_menus/content_typed/content_typed.class.php:27
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.class.php:31
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php:30
+#: administrator/components/com_menus/separator/separator.class.php:30
+#: administrator/components/com_menus/url/url.class.php:31
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.class.php:31
+#: administrator/components/com_menus/wrapper/wrapper.class.php:30
+msgid "The module % is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.class.php:67
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php:68
+msgid "Position:"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:37
+msgid "You must select a Contact to link to"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:50
+msgid "Menu Item :: Link - Contact Item"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.menu.html.php:74
+msgid "Contact to Link:"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+msgid "Creates a link to a Published Contact Item"
+msgstr ""
+
+#: administrator/components/com_menus/contact_item_link/contact_item_link.xml
+msgid "Link - Contact Item"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.menu.html.php:68
+msgid "Menu Item :: Blog - Content Category Archive"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Intro"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Leading"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "# Links"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Author Alphabetical"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Author Names"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Author Reverse-Alphabetical"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Auto"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Blog - Content Category Archive"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Columns"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Created Date and Time"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Default"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Display {mosimages}."
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Email Icon"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Item Rating"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Item Title"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Least Hits"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Linked Titles"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "MOSImages"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Make the Section text a link to the actual section page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Make your Item titles linkable"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Modified Date and Time"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Most Hits"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Most recent first"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Number of Items to display as Links."
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid ""
+"Number of Items to display as a leading (full width) item. 0 will mean that "
+"no items will be displayed as leading."
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Number of Items to display with the introduction text shown."
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Oldest first"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Order by"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Ordering"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "PDF Icon"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Pagination"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Pagination Results"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Print Icon"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Read More"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Section Name"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Section Name Linkable"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide Pagination Results info ( e.g 1-4 of 4 )"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide Pagination support"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Read More link"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Show/Hide the Section the item belongs to"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the items title"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+msgid "Shows a listing of Content items archived for a particular category"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Text to display at the top of the page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "This overrides the ordering of the items."
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Title Alphabetical"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Title Reverse-Alphabetical"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "When displaying the intro text, how many columns to use per row"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_category/content_archive_category.xml
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Yes"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:39
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:39
+msgid "You must select a Section"
+msgstr ""
+
+#. build the html select list for section
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:45
+#: administrator/components/com_menus/content_blog_section/content_blog_section.class.php:62
+msgid "All Sections"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:70
+msgid "Menu Item :: Blog - Content Section Archive"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:92
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:90
+msgid "If you leave this blank the Section name will be automatically used"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.menu.html.php:98
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:88
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:81
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:96
+msgid "Section:"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Blog - Content Section Archive"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Name"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Name Linkable"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Category Order"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Make the Category text a link to the actual Category page"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "No, order by Primary Order only"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Order items by catgeory"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Order that the items will be displayed in."
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Primary Order"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Category the item belongs to"
+msgstr ""
+
+#: administrator/components/com_menus/content_archive_section/content_archive_section.xml
+msgid "Shows a listing of Content items archived for a particular section"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:64
+msgid "Menu Item :: Blog - Content Category"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.menu.html.php:95
+msgid "You can select multiple Categories"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid "Blog - Content Category"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Description Image"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+msgid ""
+"Displays a page of content items from multiple categories in a blog format"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Item Titles"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Category Description"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_category/content_blog_category.xml
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Show/Hide the Page title"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:64
+msgid "Menu Item :: Blog - Content Section"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.menu.html.php:95
+msgid "You can select multiple Sections"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Blog - Content Section"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid ""
+"Displays a page of content items from multiple sections in a blog format"
+msgstr ""
+
+#: administrator/components/com_menus/content_blog_section/content_blog_section.xml
+msgid "Show/Hide the Section Description"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.menu.html.php:68
+msgid "Menu Item :: Table - Content Category"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "10"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "15"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "20"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "25"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "30"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "5"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "50"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Author Column"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Date Column"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Date Format"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Display Number"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Display Select"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Empty Categories"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Filter"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Filter Field"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "His"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Hits Column"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Navigation Bar"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Number of items to be displayed by default"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Order Select"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide empty(no items) categories"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Author column"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid ""
+"Show/Hide the Category Description, it will appear below the Category Name"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Date column"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Display Select dropdown"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Filter ability"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Show/Hide the Hits column"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Navigation bar"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Order Select dropdown"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Show/Hide the listing of other Categories"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Shows a Table view of Content items for a particular Category"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+msgid "Table - Content Category"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid ""
+"The format of the date displayed, using PHPs strftime Command Format - if "
+"left blank it will load the format from your language file"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_menus/content_category/content_category.xml
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Which field shall the filter apply to"
+msgstr ""
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/content_item_link/content_item_link.class.php:66
+msgid "Edit Content Item"
+msgstr ""
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:43
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:44
+msgid "You must select a Content to link to"
+msgstr ""
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:56
+msgid "Menu Item :: Link - Content Item"
+msgstr ""
+
+#: administrator/components/com_menus/content_item_link/content_item_link.menu.html.php:80
+msgid "Content to Link:"
+msgstr ""
+
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+msgid "Creates a link to a published Content Item in full view"
+msgstr ""
+
+#: administrator/components/com_menus/content_item_link/content_item_link.xml
+msgid "Link - Content Item"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.menu.html.php:68
+msgid "Menu Item :: Table - Content Section"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Category List - Category"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Category List - Section"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Creates a listing of Content categories for a particular section"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Hits"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Section Title"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the Category Description Image"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Show/hide the section title"
+msgstr ""
+
+#: administrator/components/com_menus/content_section/content_section.xml
+msgid "Table - Content Section"
+msgstr ""
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:57
+msgid "Menu Item :: Link - Static Content"
+msgstr ""
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:81
+msgid "Static Content:"
+msgstr ""
+
+#: administrator/components/com_menus/content_typed/content_typed.menu.html.php:95
+msgid "On Click, open:"
+msgstr ""
+
+#: administrator/components/com_menus/content_typed/content_typed.xml
+msgid "Creates a link to Static Content Item"
+msgstr ""
+
+#: administrator/components/com_menus/content_typed/content_typed.xml
+msgid "Link - Static Content"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.menu.html.php:66
+msgid "Menu Item :: Table - News Feed Category"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in /images"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Articles Column"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Link Column"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Name Column"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Articles column"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Link column"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Show/Hide the Name column"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Shows a Table view of News Feed items for a particular Category"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_category_table/newsfeed_category_table.xml
+msgid "Table - News Feed Category"
+msgstr ""
+
+#. outputs item name, category & section instead of the select list
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.class.php:60
+msgid "Item:"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:37
+msgid "You must select a News Feed to link to"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:50
+msgid "Menu Item :: Link - News Feed"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.menu.html.php:74
+msgid "News Feed to Link:"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Creates a link to an individual Published Newsfeed"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Feed Description"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Feed Image"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Item Description"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Link - Newsfeed"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Show/Hide the description text of the feed"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Show/Hide the image of the feed"
+msgstr ""
+
+#: administrator/components/com_menus/newsfeed_link/newsfeed_link.xml
+msgid "Word Count"
+msgstr ""
+
+#: administrator/components/com_menus/separator/separator.menu.html.php:44
+msgid "Menu Item :: Separator / Placeholder"
+msgstr ""
+
+#: administrator/components/com_menus/separator/separator.menu.html.php:60
+msgid "Pattern/Name:"
+msgstr ""
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Creates a menu placeholder or separator"
+msgstr ""
+
+#: administrator/components/com_menus/separator/separator.xml
+msgid "Separator / Placeholder"
+msgstr ""
+
+#: administrator/components/com_menus/toolbar.menus.html.php:22
+msgid "Next"
+msgstr ""
+
+#: administrator/components/com_menus/toolbar.menus.html.php:35
+#: administrator/components/com_menus/toolbar.menus.html.php:100
+msgid "Move"
+msgstr ""
+
+#: administrator/components/com_menus/toolbar.menus.html.php:48
+#: administrator/components/com_menus/toolbar.menus.html.php:102
+msgid "Copy"
+msgstr ""
+
+#: administrator/components/com_menus/toolbar.menus.html.php:72
+msgid "Back"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_menus/toolbar.menus.html.php:81
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_menus/url/url.menu.html.php:40
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:41
+msgid "You must provide a url."
+msgstr ""
+
+#: administrator/components/com_menus/url/url.menu.html.php:51
+msgid "Menu Item :: Link - URL"
+msgstr ""
+
+#: administrator/components/com_menus/url/url.menu.html.php:75
+msgid "Link:"
+msgstr ""
+
+#: administrator/components/com_menus/url/url.xml
+msgid "Creates url link"
+msgstr ""
+
+#: administrator/components/com_menus/url/url.xml
+msgid "Link - Url"
+msgstr ""
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.menu.html.php:66
+msgid "Menu Item :: Table - Web Link Category"
+msgstr ""
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Link Descriptions"
+msgstr ""
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr ""
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Shows a Table view of Weblink items for a particular Weblink Category"
+msgstr ""
+
+#: administrator/components/com_menus/weblink_category_table/weblink_category_table.xml
+msgid "Table - Weblink Category"
+msgstr ""
+
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:59
+msgid "Menu Item :: Wrapper"
+msgstr ""
+
+#: administrator/components/com_menus/wrapper/wrapper.menu.html.php:83
+msgid "Wrapper Link:"
+msgstr ""
+
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Creates an IFrame that will wrap an external page/site into Mambo"
+msgstr ""
+
+#: administrator/components/com_menus/wrapper/wrapper.xml
+msgid "Wrapper"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/messages.pot 4.6rc2/language/untranslated/messages.pot
--- 4.5.4/language/untranslated/messages.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/messages.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,129 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_messages/admin.messages.html.php:22
+msgid "Private Messaging"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:23
+msgid "Search:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:33
+msgid "Subject"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:34
+msgid "From"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:36
+msgid "Date"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:37
+#: administrator/components/com_messages/admin.messages.html.php:53
+msgid "Read"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:55
+msgid "Unread"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:75
+msgid "Private Messaging Configuration"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:80
+msgid "General"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:87
+msgid "Are you sure?"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:99
+msgid "Lock Inbox:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:103
+msgid "Mail me on new Message:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:121
+msgid "View Private Message"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:128
+msgid "From:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:132
+msgid "Posted:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:136
+#: administrator/components/com_messages/admin.messages.html.php:191
+msgid "Subject:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:140
+#: administrator/components/com_messages/admin.messages.html.php:197
+msgid "Message:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:167
+msgid "You must provide a subject."
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:169
+msgid "You must provide a message."
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:171
+msgid "You must select a recipient."
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:180
+msgid "New Private Message"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.html.php:187
+msgid "To:"
+msgstr ""
+
+#: administrator/components/com_messages/admin.messages.php:200
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_messages/toolbar.messages.html.php:19
+msgid "Reply"
+msgstr ""
+
+#: administrator/components/com_messages/toolbar.messages.html.php:29
+msgid "Send"
+msgstr ""
+
+#: components/com_messages/messages.class.php:74
+#: components/com_messages/messages.class.php:75
+msgid "A new private message has arrived"
+msgstr ""
+
+#: components/com_messages/messages.class.php:82
+msgid "The user has locked their mailbox. Message failed."
+msgstr ""
diff -ruN 4.5.4/language/untranslated/modules.pot 4.6rc2/language/untranslated/modules.pot
--- 4.5.4/language/untranslated/modules.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/modules.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,255 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_modules/admin.modules.html.php:32
+#: administrator/components/com_modules/admin.modules.html.php:236
+#: administrator/components/com_modules/admin.modules.php:380
+msgid "Administrator"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:32
+msgid "Module Manager"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:32
+#: administrator/components/com_modules/admin.modules.html.php:236
+msgid "Site"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:43
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:58
+msgid "Module Name"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:61
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:64
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:67
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:70
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:76
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:82
+msgid "Position"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:85
+msgid "Pages"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:88
+msgid "ID"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:91
+msgid "Type"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:152
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:154
+msgid "Varies"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:156
+msgid "All"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:164
+msgid "User"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:211
+msgid "Module must have a title"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:237
+msgid "Module:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:239
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:239
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:254
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:259
+msgid "Title:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:268
+msgid "Show title:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:276
+msgid "Position:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:284
+msgid "Module Order:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:296
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:304
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:316
+msgid "ID:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:324
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:335
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:349
+msgid "Pages / Items"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:354
+msgid "Menu Item Link(s):"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:370
+msgid "Custom Output"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.html.php:375
+msgid "Content:"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:151
+msgid "- All Positions -"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:163
+msgid "- All Types -"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:213
+#, php-format
+msgid "Module Copied [%s]"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:270
+#, php-format
+msgid "Successfully Saved changes to Module: %s"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:276
+#, php-format
+msgid "Successfully Saved Module: %s"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:297
+#, php-format
+msgid "The module %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:381
+#: administrator/components/com_modules/admin.modules.php:382
+#: administrator/components/com_modules/admin.modules.php:385
+#: administrator/components/com_modules/admin.modules.php:386
+msgid "N/A"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:422
+msgid "Select a module to delete"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:445
+msgid ""
+"You cannot delete mod_mainmenu module that displays the \"mainmenu\" as it "
+"is a core Menu"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:471
+#, php-format
+msgid ""
+"Module(s): \"%s\" cannot be deleted they can only be un-installed as they "
+"are Mambo modules."
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:486
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:486
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_modules/admin.modules.php:487
+#, php-format
+msgid "Select a module to %s"
+msgstr ""
+
+#. foreach
+#: administrator/components/com_modules/admin.modules.php:613
+msgid "New ordering saved"
+msgstr ""
+
+#: administrator/components/com_modules/toolbar.modules.html.php:42
+msgid "Preview"
+msgstr ""
+
+#: administrator/components/com_modules/toolbar.modules.html.php:42
+msgid "You can only preview typed modules."
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_modules/toolbar.modules.html.php:51
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_modules/toolbar.modules.html.php:82
+msgid "Copy"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/mostlyce.pot 4.6rc2/language/untranslated/mostlyce.pot
--- 4.5.4/language/untranslated/mostlyce.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/mostlyce.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid ""
+"<p>Admin component for the MOStlyCE editor mambot.  Helps customize your "
+"MOStlyCE editor installation.</p>"
+msgstr ""
+
+#: administrator/components/com_mostlyce/mostlyce.xml
+msgid "mostlyce"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/mostlydbadmin.pot 4.6rc2/language/untranslated/mostlydbadmin.pot
--- 4.5.4/language/untranslated/mostlydbadmin.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/mostlydbadmin.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_mostlydbadmin/admin.mostlydbadmin.php:17
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid ""
+"<p>MOStlyDBAdmin is used for easy back up/restore of your database.</p><p>  "
+"It is a revival \r\n"
+"\tof the dbadmin component for use in the Mambo 4.6+ core.  The dbadmin \r\n"
+"\tcomponent stopped working with Mambo 4.5.3h and development appears to "
+"have ceased.</p>\n"
+msgstr ""
+
+#: administrator/components/com_mostlydbadmin/mostlydbadmin.xml
+msgid "MOStlyDBAdmin"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/newsfeeds.pot 4.6rc2/language/untranslated/newsfeeds.pot
--- 4.5.4/language/untranslated/newsfeeds.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/newsfeeds.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,363 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:27
+msgid "News Feed Manager"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:44
+msgid "News Feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:47
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:50
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:53
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:194
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:56
+#: components/com_newsfeeds/newsfeeds.html.php:104
+msgid "# Articles"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:59
+msgid "Cache time"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:89
+msgid "Checked Out"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:93
+msgid "Edit News Feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:112
+msgid "Edit Category"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:152
+msgid "Please fill in the news feed name."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:154
+msgid "Please select a Category."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:156
+msgid "Please fill in the news feed link."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:158
+msgid "Please select a category."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:160
+msgid "Please fill in the number of articles to display."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:162
+msgid "Please fill in the cache refresh time."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:173
+msgid "News Feed:"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:181
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:186
+msgid "Name"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:202
+msgid "Link"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:210
+msgid "Number of Articles"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:218
+msgid "Cache time (in seconds)"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:226
+msgid "Ordering"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.html.php:234
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:19
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:204
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:204
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:205
+#, php-format
+msgid "Select a module to %s"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/admin.newsfeeds.php:238
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Articles Column"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "# Category Items"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Alignment of the image"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Allows you to limit the amount of visible item description text. 0 will show "
+"all the text"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category Description"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category List - Category"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Category List - Section"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description Text"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Description for page"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Description"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Feed Image"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Image"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Image Align"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Item Description"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Left"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Link Column"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Name Column"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Newsfeeds"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Right"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the # of articles in the feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description below"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Description for the list of other catgeories"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Link column"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Feed Name column"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the Table Headings"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description or intro text of an item"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the description text of the feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the image of the feed"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the number of items in each category"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Table Headings"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "This component manages RSS/RDF newsfeeds"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_newsfeeds/newsfeeds.xml
+msgid "Word Count"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_newsfeeds/toolbar.newsfeeds.html.php:51
+msgid "Close"
+msgstr ""
+
+#: components/com_newsfeeds/newsfeeds.html.php:37
+msgid "Web Links"
+msgstr ""
+
+#: components/com_newsfeeds/newsfeeds.html.php:95
+msgid "Feed Name"
+msgstr ""
+
+#: components/com_newsfeeds/newsfeeds.html.php:113
+msgid "Feed Link"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/poll.pot 4.6rc2/language/untranslated/poll.pot
--- 4.5.4/language/untranslated/poll.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/poll.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,241 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_poll/admin.poll.html.php:26
+msgid "Poll Manager"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:39
+msgid "Poll Question"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:42
+#: administrator/components/com_poll/admin.poll.html.php:60
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:45
+msgid "Options"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:48
+msgid "Lag"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:60
+msgid "Unpublished"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:72
+msgid "Edit Poll"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:116
+msgid "Poll must have a title"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:118
+msgid "Poll must have a non-zero lag time"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:132
+msgid "Poll:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:134
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:134
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:143
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:148
+msgid "Question:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:157
+msgid "Show on menu items:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:164
+msgid "Lag:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.html.php:173
+msgid "Options:"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.php:19
+#: components/com_poll/poll.php:56
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.php:108
+#, php-format
+msgid "The poll %s is currently being edited by another administrator."
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.php:217
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.php:217
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_poll/admin.poll.php:218
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#: administrator/components/com_poll/poll.class.php:42
+msgid "Your Poll must contain a title."
+msgstr ""
+
+#: administrator/components/com_poll/poll.class.php:48
+msgid "Your Poll must have a non-zero lag time."
+msgstr ""
+
+#: administrator/components/com_poll/poll.class.php:57
+msgid "There is a module already with that name, please try again."
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Poll"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "This component shows Polls/Surveys"
+msgstr ""
+
+#: administrator/components/com_poll/poll.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_poll/toolbar.poll.html.php:42
+msgid "Preview"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_poll/toolbar.poll.html.php:49
+msgid "Close"
+msgstr ""
+
+#: components/com_poll/poll.html.php:49
+msgid "Select Poll:"
+msgstr ""
+
+#: components/com_poll/poll.html.php:81
+msgid "There are no results for this poll."
+msgstr ""
+
+#: components/com_poll/poll.html.php:191
+msgid "Number of Voters"
+msgstr ""
+
+#: components/com_poll/poll.html.php:200
+msgid "First Vote"
+msgstr ""
+
+#: components/com_poll/poll.html.php:209
+msgid "Last Vote"
+msgstr ""
+
+#: components/com_poll/poll.php:49
+msgid "Cookies must be enabled!"
+msgstr ""
+
+#: components/com_poll/poll.php:50 components/com_poll/poll.php:57
+#: components/com_poll/poll.php:66 components/com_poll/poll.php:73
+msgid "Continue"
+msgstr ""
+
+#: components/com_poll/poll.php:65
+msgid "You already voted for this poll today!"
+msgstr ""
+
+#: components/com_poll/poll.php:72
+msgid "No selection has been made, please try again"
+msgstr ""
+
+#: components/com_poll/poll.php:94 components/com_poll/poll.php:96
+msgid "Thanks for your vote!"
+msgstr ""
+
+#: components/com_poll/poll.php:98
+msgid "Results"
+msgstr ""
+
+#: components/com_poll/poll.php:113 components/com_poll/poll.php:155
+msgid "Select Poll from the list"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/registration.pot 4.6rc2/language/untranslated/registration.pot
--- 4.5.4/language/untranslated/registration.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/registration.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,230 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: components/com_registration/registration.html.php:21
+#: components/com_registration/registration.php:42
+msgid "Lost your Password?"
+msgstr ""
+
+#: components/com_registration/registration.html.php:26
+#, php-format
+msgid ""
+"Please enter your Username and e-mail address then click on the Send "
+"Password button.%s You will receive a new password shortly.  Use the new "
+"password to access the site."
+msgstr ""
+
+#: components/com_registration/registration.html.php:29
+#: components/com_registration/registration.html.php:92
+msgid "Username:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:33
+msgid "E-mail Address:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:38
+msgid "Send Password"
+msgstr ""
+
+#: components/com_registration/registration.html.php:56
+msgid "Please enter your name."
+msgstr ""
+
+#: components/com_registration/registration.html.php:58
+#: components/com_registration/registration.html.php:60
+msgid "Please enter a user name."
+msgstr ""
+
+#: components/com_registration/registration.html.php:60
+#: components/com_registration/registration.html.php:70
+#, php-format
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+
+#: components/com_registration/registration.html.php:62
+msgid "Please enter a valid e-mail address."
+msgstr ""
+
+#: components/com_registration/registration.html.php:64
+msgid ""
+"Please enter a valid password -- more than 6 characters with no spaces and "
+"containing only the characters 0-9, a-z, or A-Z"
+msgstr ""
+
+#: components/com_registration/registration.html.php:66
+msgid "Please verify the password."
+msgstr ""
+
+#: components/com_registration/registration.html.php:68
+msgid "Password and verification do not match, please try again."
+msgstr ""
+
+#: components/com_registration/registration.html.php:70
+#: components/com_registration/registration.html.php:101
+msgid "Password:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:78
+#: components/com_registration/registration.php:111
+msgid "Registration"
+msgstr ""
+
+#: components/com_registration/registration.html.php:83
+msgid "Fields marked with an asterisk (*) are required."
+msgstr ""
+
+#: components/com_registration/registration.html.php:86
+msgid "Name:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:96
+msgid "E-mail:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:106
+msgid "Verify Password:"
+msgstr ""
+
+#: components/com_registration/registration.html.php:124
+msgid "Send Registration"
+msgstr ""
+
+#: components/com_registration/registration.php:64
+msgid ""
+"Sorry, no corresponding user was found.  Please make sure you entered a "
+"valid username and a valid email address.  Both are required."
+msgstr ""
+
+#: components/com_registration/registration.php:76
+#, php-format
+msgid ""
+"The user account %s has this email associated with it.\n"
+"\n"
+"A web user from %s has just requested that a new password be sent.\n"
+"\n"
+"\n"
+"Your New Password is: %s\n"
+"\n"
+"\n"
+"If you didn't ask for this, don't worry. You are seeing this message, not "
+"them. \n"
+"If this was an error just login with your new password and then change your "
+"password to what you would like it to be."
+msgstr ""
+
+#. eval ("\$message = \"$message\";");
+#: components/com_registration/registration.php:83
+#, php-format
+msgid "%s :: New password for - %s"
+msgstr ""
+
+#: components/com_registration/registration.php:99
+msgid "New User Password created and sent!"
+msgstr ""
+
+#. Send notification to all administrators
+#: components/com_registration/registration.php:162
+#: components/com_registration/registration.php:210
+#, php-format
+msgid "Account details for %s at %s"
+msgstr ""
+
+#: components/com_registration/registration.php:167
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s. Your account has been created but, as a "
+"precaution, it must be activated by you before you can use it.\n"
+"To activate the account click on the following link or copy and paste it in "
+"your browser:\n"
+"%s\n"
+"\n"
+"After activation you may login to %s using the following username and "
+"password:\n"
+"\n"
+"Username - %s\n"
+"Password - %s"
+msgstr ""
+
+#: components/com_registration/registration.php:182
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"Thank you for registering at %s.\n"
+"\n"
+"You may now login to %s using the username and password you registered with."
+msgstr ""
+
+#: components/com_registration/registration.php:211
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"A new user has registered at %s.\n"
+"This email contains their details:\n"
+"\n"
+"Name - %s\n"
+"e-mail - %s\n"
+"Username - %s\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+
+#: components/com_registration/registration.php:241
+#: components/com_registration/registration.php:244
+msgid "Registration Complete"
+msgstr ""
+
+#: components/com_registration/registration.php:242
+msgid ""
+"Your account has been created and an activation link has been sent to the e-"
+"mail address you entered. Note that you must activate the account by "
+"clicking on the activation link before you can login."
+msgstr ""
+
+#: components/com_registration/registration.php:245
+msgid "You may now login."
+msgstr ""
+
+#: components/com_registration/registration.php:263
+#: components/com_registration/registration.php:284
+msgid "Invalid Activation Link!"
+msgstr ""
+
+#: components/com_registration/registration.php:264
+#: components/com_registration/registration.php:285
+msgid ""
+"There is no such account in our database or the account has already been "
+"activated."
+msgstr ""
+
+#: components/com_registration/registration.php:277
+msgid "Activation Complete!"
+msgstr ""
+
+#: components/com_registration/registration.php:278
+msgid ""
+"Your account has been activated successfully. You can now login using the "
+"username and password you chose during registration."
+msgstr ""
diff -ruN 4.5.4/language/untranslated/rss.pot 4.6rc2/language/untranslated/rss.pot
--- 4.5.4/language/untranslated/rss.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/rss.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,19 @@
+# Mambo Open Source.
+# Copyright (C) 2005 - 2006 Mambo Foundation Inc.
+# This file is distributed under the same license as the Mambo package.
+# Translation Team <translation@mambo-foundation.org>, 2006#
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Mambo 4.6\n"
+"Report-Msgid-Bugs-To: translation@mambo-foundation.org\n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: 2006-06-08 10:21+0100\n"
+"Last-Translator: Translation <translation@mambo-foundation.org>\n"
+"Language-Team: Translation <translation@mambo-foundation.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
diff -ruN 4.5.4/language/untranslated/search.pot 4.6rc2/language/untranslated/search.pot
--- 4.5.4/language/untranslated/search.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/search.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,142 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_search/search.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+#: components/com_search/search.html.php:41
+#: components/com_search/search.php:36 components/com_search/search.php:42
+#: components/com_search/search.php:144
+msgid "Search"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "This component manages the Search functionality."
+msgstr ""
+
+#: administrator/components/com_search/search.xml
+msgid "Use Global"
+msgstr ""
+
+#: components/com_search/search.html.php:35
+#: components/com_search/search.html.php:65
+msgid "Search Keyword"
+msgstr ""
+
+#: components/com_search/search.html.php:50
+msgid "Ordering"
+msgstr ""
+
+#. number of matches found
+#: components/com_search/search.html.php:96
+#, php-format
+msgid "returned %d match"
+msgid_plural "returned %d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_search/search.php:56
+msgid "Newest first"
+msgstr ""
+
+#: components/com_search/search.php:57
+msgid "Oldest first"
+msgstr ""
+
+#: components/com_search/search.php:58
+msgid "Most popular"
+msgstr ""
+
+#: components/com_search/search.php:59
+msgid "Alphabetical"
+msgstr ""
+
+#: components/com_search/search.php:60
+msgid "Section/Category"
+msgstr ""
+
+#: components/com_search/search.php:70
+msgid "Any words"
+msgstr ""
+
+#: components/com_search/search.php:75
+msgid "All words"
+msgstr ""
+
+#: components/com_search/search.php:80
+msgid "Exact phrase"
+msgstr ""
+
+#. html output
+#. no matches found
+#: components/com_search/search.php:92
+msgid "No results were found"
+msgstr ""
+
+#: components/com_search/search.php:97
+msgid "One or more common words were ignored in the search"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/sections.pot 4.6rc2/language/untranslated/sections.pot
--- 4.5.4/language/untranslated/sections.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/sections.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,327 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_sections/admin.sections.html.php:31
+msgid "Section Manager"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:45
+msgid "Section Name"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:48
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:51
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:54
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:57
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:60
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:63
+msgid "Section ID"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:66
+msgid "# Categories"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:69
+msgid "# Active"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:72
+msgid "# Trash"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:173
+msgid "New Section"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:189
+msgid "Please select a Menu"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:192
+msgid "Please select a menu type"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:195
+msgid "Please enter a Name for this menu item"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:201
+msgid "Section must have a name"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:203
+msgid "Section must have a title"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:251
+msgid "Section:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:253
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:253
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:265
+msgid "Show Advanced Details"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:268
+msgid "Hide Advanced Details"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:279
+msgid "Section Details"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:284
+msgid "Scope:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:294
+msgid "Title:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:297
+msgid "A short name to appear in menus"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:302
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:302
+msgid "Name:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:302
+msgid "Section"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:305
+msgid "A long name to be displayed in headings"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:310
+msgid "Image:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:322
+msgid "Preview"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:327
+msgid "Image Position:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:335
+msgid "Ordering:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:343
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:351
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:359
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:380
+#: administrator/components/com_sections/admin.sections.html.php:417
+msgid "Link to Menu"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:385
+msgid "This will create a new menu item in the menu you select"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:391
+msgid "Select a Menu"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:399
+msgid "Select Menu Type"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:407
+msgid "Menu Item Name"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:422
+msgid "Existing Menu Links"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:430
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:449
+msgid "Menu links available when saved"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:487
+msgid "Copy Section"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:497
+msgid "Copy to Section:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:499
+msgid "The new Section name"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:503
+msgid "Categories being copied:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:519
+msgid "Content Items being copied:"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.html.php:535
+msgid ""
+"This will copy the Categories listed\n"
+"\t\t\t<br />\n"
+"\t\t\tand all the items within the category (also listed)\n"
+"\t\t\t<br />\n"
+"\t\t\tto the new Section created."
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:191
+#, php-format
+msgid "The section %s is currently being edited by another administrator"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:209
+#: administrator/components/com_sections/admin.sections.php:626
+msgid "Section Table"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:213
+#: administrator/components/com_sections/admin.sections.php:233
+#: administrator/components/com_sections/admin.sections.php:631
+msgid "Section Blog"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:217
+#: administrator/components/com_sections/admin.sections.php:636
+msgid "Section Blog Archive"
+msgstr ""
+
+#. build the html select list for section types
+#: administrator/components/com_sections/admin.sections.php:231
+msgid "Select Type"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:232
+msgid "Section List"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:234
+msgid "Section Archive Blog"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:308
+msgid "Changes to Section saved"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:314
+msgid "Section saved"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:329
+msgid "Select a section to delete"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:367
+#, php-format
+msgid "Sections(s): %s cannot be removed as they contain categories"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:372
+#, php-format
+msgid "Section(s): %s successfully deleted"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:389
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:389
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:390
+msgid "Select a section to "
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:398
+msgid "Cannot Publish an Empty Section"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:469
+msgid "Select an item to move"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:587
+#, php-format
+msgid "Section %s and all its Categories and Items have been copied as %s"
+msgstr ""
+
+#: administrator/components/com_sections/admin.sections.php:660
+#, php-format
+msgid "%s ( %s ) in menu: %s successfully created"
+msgstr ""
+
+#. foreach
+#: administrator/components/com_sections/admin.sections.php:687
+msgid "New ordering saved"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_sections/toolbar.sections.html.php:32
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_sections/toolbar.sections.html.php:65
+msgid "Copy"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/statistics.pot 4.6rc2/language/untranslated/statistics.pot
--- 4.5.4/language/untranslated/statistics.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/statistics.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_statistics/admin.statistics.html.php:33
+msgid "Browser, OS, Domain Statistics"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:39
+msgid "Browsers"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:43
+msgid "Browser"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:82
+msgid "OS Stats"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:86
+msgid "Operating System"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:125
+msgid "Domain Stats"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:129
+msgid "Domain"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:180
+msgid "Page Impression Statistics"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:188
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:189
+msgid "Page Impressions"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:226
+msgid "Search Engine Text :"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:227
+msgid "logging is :"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:228
+msgid "Disabled"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:228
+msgid "Enabled"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:237
+msgid "Search Text"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:238
+msgid "Times Requested"
+msgstr ""
+
+#: administrator/components/com_statistics/admin.statistics.html.php:239
+msgid "Results Returned"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/syndicate.pot 4.6rc2/language/untranslated/syndicate.pot
--- 4.5.4/language/untranslated/syndicate.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/syndicate.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,209 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:26
+msgid "Syndication Settings"
+msgstr ""
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:34
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_syndicate/admin.syndicate.html.php:49
+msgid "Manage Syndication Settings"
+msgstr ""
+
+#: administrator/components/com_syndicate/admin.syndicate.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_syndicate/admin.syndicate.php:97
+msgid "Settings successfully Saved"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "# Items"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "ATOM 1.0"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Activate support for Firefox Live Bookmarks functionality"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Alt text for image"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Author Alphabetical"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Author Reverse-Alphabetical"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Bookmark file"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache Time"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache file will refresh every x seconds"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Cache the feed files"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Default"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Frontpage Ordering"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image Alt"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Image to be included in feed"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Least Hits"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit Text"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Limit the article text to the value indicated below"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Live Bookmarks"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Most Hits"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Most recent first"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "No"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Number of Items to syndicate"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Off"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Oldest first"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Order that the items will be displayed"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 0.91"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 1.0"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "RSS 2.0"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Special file name, if empty the default will be used."
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndicate"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Description"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Syndication Title"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Text Length"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "The word length of the article text - 0 will show no text"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "This component controls the Syndication settings"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title Alphabetical"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Title Reverse-Alphabetical"
+msgstr ""
+
+#: administrator/components/com_syndicate/syndicate.xml
+msgid "Yes"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/templates.pot 4.6rc2/language/untranslated/templates.pot
--- 4.5.4/language/untranslated/templates.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/templates.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,168 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_templates/admin.templates.html.php:40
+msgid "No preview available"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:53
+msgid "Administrator"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:53
+msgid "Site"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:53
+msgid "Template Manager"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:56
+msgid "Preview Template"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:68
+msgid "Name"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:74
+#: administrator/components/com_templates/admin.templates.html.php:80
+#: administrator/components/com_templates/admin.templates.html.php:151
+#: administrator/components/com_templates/toolbar.templates.html.php:20
+msgid "Default"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:83
+#: administrator/components/com_templates/admin.templates.html.php:164
+msgid "Assigned"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:89
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:92
+msgid "Version"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:95
+msgid "Date"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:98
+msgid "Author URL"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:135
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:221
+msgid "Template HTML Editor"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:224
+#: administrator/components/com_templates/admin.templates.html.php:278
+msgid "Unwriteable"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:224
+#: administrator/components/com_templates/admin.templates.html.php:278
+msgid "Writeable"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:233
+#: administrator/components/com_templates/admin.templates.html.php:287
+msgid "Make unwriteable after saving"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:240
+#: administrator/components/com_templates/admin.templates.html.php:294
+msgid "Override write protection while saving"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:275
+msgid "Template CSS Editor"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:326
+#, php-format
+msgid "Assign template %s to menu items"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:331
+msgid "Page(s):"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:359
+msgid "Module Positions"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:373
+msgid "Position"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.html.php:376
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:18
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:231
+msgid "You can not delete template in use."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:258
+#: administrator/components/com_templates/admin.templates.php:323
+#, php-format
+msgid "Operation Failed: Could not open %s"
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:270
+#: administrator/components/com_templates/admin.templates.php:334
+msgid "Operation failed: No template specified."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:273
+#: administrator/components/com_templates/admin.templates.php:338
+msgid "Operation failed: Content empty."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:288
+#, php-format
+msgid "Operation failed: %s is not writable."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:303
+#: administrator/components/com_templates/admin.templates.php:368
+msgid "Operation failed: Failed to open file for writing."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:353
+msgid "Operation failed: The file is not writable."
+msgstr ""
+
+#: administrator/components/com_templates/admin.templates.php:450
+msgid "Positions saved"
+msgstr ""
+
+#: administrator/components/com_templates/toolbar.templates.html.php:69
+msgid "Save"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/trash.pot 4.6rc2/language/untranslated/trash.pot
--- 4.5.4/language/untranslated/trash.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/trash.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,140 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_trash/admin.trash.html.php:61
+msgid "Trash Manager"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:67
+#: administrator/components/com_trash/admin.trash.html.php:71
+msgid "Content Items"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:83
+#: administrator/components/com_trash/admin.trash.html.php:171
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:86
+msgid "Section"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:89
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:92
+#: administrator/components/com_trash/admin.trash.html.php:180
+msgid "ID"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:155
+#: administrator/components/com_trash/admin.trash.html.php:159
+msgid "Menu Items"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:174
+msgid "Menu"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:177
+msgid "Type"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:247
+msgid "Delete Items"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:256
+#: administrator/components/com_trash/admin.trash.html.php:321
+msgid "Number of Items:"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:262
+msgid "Items being Deleted:"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:273
+msgid ""
+"This will <strong><font color=\"#FF0000\">Permanently Delete</font></strong> "
+"<br />these Items from the Database"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:276
+msgid ""
+"Are you sure you want to Deleted the listed items? \\nThis will Permanently "
+"Delete them from the database."
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:277
+#: administrator/components/com_trash/admin.trash.html.php:278
+#: administrator/components/com_trash/toolbar.trash.html.php:21
+msgid "Delete"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:312
+msgid "Restore Items"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:327
+msgid "Items being Restored:"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:338
+msgid ""
+"This will <strong><font color=\"#FF0000\">Restore</font></strong> these "
+"Items,<br />they will be returned to their orignial places as Unpublished "
+"items"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:341
+msgid "Are you sure you want to Restore the listed items?."
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.html.php:342
+#: administrator/components/com_trash/admin.trash.html.php:343
+#: administrator/components/com_trash/toolbar.trash.html.php:19
+msgid "Restore"
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.php:16
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_trash/admin.trash.php:182
+#, php-format
+msgid "%s Item successfully Deleted"
+msgid_plural "%s Items successfully Deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/admin.trash.php:256
+#, php-format
+msgid "%s Item successfully Restored"
+msgid_plural "%s Items successfully Restored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_trash/trash.xml
+msgid "This component manages the Trash functionality."
+msgstr ""
+
+#: administrator/components/com_trash/trash.xml
+msgid "Trash"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/typedcontent.pot 4.6rc2/language/untranslated/typedcontent.pot
--- 4.5.4/language/untranslated/typedcontent.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/typedcontent.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,592 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:32
+msgid "Static Content Manager"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:35
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:61
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:64
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:96
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:99
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:518
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:67
+msgid "Order"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:70
+msgid "Save Order"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:73
+msgid "Access"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:76
+msgid "ID"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:79
+msgid "Links"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:82
+msgid "Author"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:85
+msgid "Date"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:102
+msgid "Expired"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:105
+msgid "Unpublished"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:110
+msgid "Always"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:110
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:112
+msgid "Start:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:117
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:119
+msgid "Finish:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:117
+msgid "No Expiry"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:147
+msgid "Edit User"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:175
+msgid "Edit Static Content"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:191
+msgid "Publish Information"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:269
+msgid ""
+"Are you sure you want to reset the Hits to Zero? \\nAny unsaved changes to "
+"this content will be lost."
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:279
+msgid "Please select a Menu"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:282
+msgid "Please enter a Name for this menu item"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:298
+msgid "Content item must have a title"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:300
+msgid "Content item must have a name"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:351
+msgid "Static Content Item:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:353
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:353
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:362
+msgid "Show Advanced Details"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:365
+msgid "Hide Advanced Details"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:379
+msgid "Item Details"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:384
+msgid "Title:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:392
+msgid "Title Alias:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:400
+msgid "Text: (required)"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:421
+msgid "Publishing"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:426
+msgid "Publishing Info"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:431
+msgid "State:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:439
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:447
+msgid "Access Level:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:455
+msgid "Author Alias:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:463
+msgid "Change Creator:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:471
+msgid "Override Created Date"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:480
+msgid "Start Publishing:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:489
+msgid "Finish Publishing:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:518
+msgid "Archived"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:518
+msgid "Draft Unpublished"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:523
+msgid "Hits"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:534
+msgid "Version"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:542
+msgid "Created"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:545
+msgid "New document"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:550
+msgid "Last Modified"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:553
+msgid "Not modified"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:558
+msgid "Expires"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:567
+msgid "Images"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:572
+msgid "MOSImage Control"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:577
+msgid "Sub-folder:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:582
+msgid "Gallery Images"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:594
+msgid "Content Images:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:608
+msgid "Edit the image selected:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:612
+msgid "Source"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:620
+msgid "Align"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:628
+msgid "Alt Text"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:636
+msgid "Border"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:644
+msgid "Caption:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:652
+msgid "Caption Position:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:660
+msgid "Caption Align:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:668
+msgid "Width:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:685
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:690
+msgid "Parameter Control"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:701
+msgid "Meta Info"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:706
+msgid "Meta Data"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:711
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:717
+msgid "Keywords:"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:724
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:729
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:758
+msgid "Link to Menu"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:734
+msgid "This will create a \"Link - Static Content\" in the menu you select"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:740
+msgid "Select a Menu"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:748
+msgid "Menu Item Name"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:763
+msgid "Existing Menu Links"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.html.php:771
+msgid "None"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:157
+msgid "Ordering asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:158
+msgid "Ordering desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:159
+msgid "ID asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:160
+msgid "ID desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:161
+msgid "Title asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:162
+msgid "Title desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:163
+msgid "Date asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:164
+msgid "Date desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:165
+msgid "Author asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:166
+msgid "Author desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:167
+msgid "Published asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:168
+msgid "Published desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:169
+msgid "Access asc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:170
+msgid "Access desc"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:182
+msgid "- All Authors -"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:204
+msgid "The module % is currently being edited by another administrator"
+msgstr ""
+
+#. build the select list for the image caption position
+#: administrator/components/com_typedcontent/admin.typedcontent.php:279
+msgid "Bottom"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:280
+msgid "Top"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:358
+msgid "Typed Content Item saved"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:364
+msgid "Changes to Typed Content Item saved"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:378
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:395
+#, php-format
+msgid "%d Item sent to the Trash"
+msgid_plural "%d Items sent to the Trash"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:411
+msgid "archive"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:411
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:411
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:412
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:434
+#, php-format
+msgid "%d Item successfully Published"
+msgid_plural "%d Items successfully Published"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:436
+#, php-format
+msgid "%d Item successfully Unpublished"
+msgid_plural "%d Items successfully Unpublished"
+msgstr[0] ""
+msgstr[1] ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:475
+msgid "Successfully Reset Hit"
+msgstr ""
+
+#: administrator/components/com_typedcontent/admin.typedcontent.php:518
+#, php-format
+msgid "%s (Link - Static Content) in menu: %s successfully created"
+msgstr ""
+
+#. foreach
+#: administrator/components/com_typedcontent/admin.typedcontent.php:572
+msgid "New ordering saved"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Author Names"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Created Date and Time"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Email Icon"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Item Rating"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Modified Date and Time"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "PDF Icon"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Print Icon"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item author - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item creation date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item email button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item modification date - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item pdf button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item print button - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the item rating - only affects this page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "This shows a single content page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Typed Content Page"
+msgstr ""
+
+#: administrator/components/com_typedcontent/typedcontent.xml
+msgid "Use Global"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/user.pot 4.6rc2/language/untranslated/user.pot
--- 4.5.4/language/untranslated/user.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/user.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,132 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: components/com_user/user.html.php:20
+msgid "Welcome!"
+msgstr ""
+
+#: components/com_user/user.html.php:25
+msgid "Welcome to the user section of our site"
+msgstr ""
+
+#: components/com_user/user.html.php:41
+msgid "Please enter your name."
+msgstr ""
+
+#: components/com_user/user.html.php:43
+msgid "Please enter a user name."
+msgstr ""
+
+#: components/com_user/user.html.php:45 components/com_user/user.html.php:51
+#, php-format
+msgid ""
+"Please enter a valid %s.  No spaces, more than %d characters and containing "
+"only the characters 0-9,a-z, or A-Z"
+msgstr ""
+
+#: components/com_user/user.html.php:45
+msgid "Username:"
+msgstr ""
+
+#: components/com_user/user.html.php:47
+msgid "Please enter a valid e-mail address."
+msgstr ""
+
+#: components/com_user/user.html.php:49
+msgid "Password and verification do not match, please try again."
+msgstr ""
+
+#: components/com_user/user.html.php:51 components/com_user/user.html.php:74
+msgid "Password:"
+msgstr ""
+
+#: components/com_user/user.html.php:59
+msgid "Edit Your Details"
+msgstr ""
+
+#: components/com_user/user.html.php:63
+msgid "Your Name:"
+msgstr ""
+
+#: components/com_user/user.html.php:67
+msgid "e-mail:"
+msgstr ""
+
+#: components/com_user/user.html.php:70
+msgid "User Name:"
+msgstr ""
+
+#: components/com_user/user.html.php:78
+msgid "Verify Password:"
+msgstr ""
+
+#: components/com_user/user.html.php:97
+msgid "Submission Success!"
+msgstr ""
+
+#: components/com_user/user.html.php:101
+msgid ""
+"Your item has been submitted to the site administrators. It will be reviewed "
+"before being published on the site."
+msgstr ""
+
+#: components/com_user/user.php:30
+msgid "Update"
+msgstr ""
+
+#: components/com_user/user.php:57
+msgid "You cannot upload files greater than 15kb in size."
+msgstr ""
+
+#: components/com_user/user.php:60
+#, php-format
+msgid "Image %s already exists. Please rename the file and try again."
+msgstr ""
+
+#: components/com_user/user.php:66
+#, php-format
+msgid "Failed to copy %s"
+msgstr ""
+
+#: components/com_user/user.php:88
+msgid "You may only upload a gif or jpg image."
+msgstr ""
+
+#: components/com_user/user.php:130
+msgid "Passwords do not match"
+msgstr ""
+
+#: components/com_user/user.php:153
+msgid "Your settings have been saved."
+msgstr ""
+
+#: components/com_user/user.php:209
+msgid "Checking table"
+msgstr ""
+
+#: components/com_user/user.php:212
+#, php-format
+msgid "Checked in %d item"
+msgid_plural "Checked in %d items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: components/com_user/user.php:223
+msgid "All items checked out have now been checked in"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/users.pot 4.6rc2/language/untranslated/users.pot
--- 4.5.4/language/untranslated/users.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/users.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,284 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_users/admin.users.html.php:26
+msgid "User Manager"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:29
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:52
+msgid "Name"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:55
+#: administrator/components/com_users/admin.users.php:159
+msgid "Logged In"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:58
+msgid "Enabled"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:61
+msgid "UserID"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:64
+msgid "Group"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:67
+msgid "E-Mail"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:70
+msgid "Last Visit"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:152
+msgid "You must provide a name."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:154
+msgid "You must provide a user login name."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:156
+msgid "Your login name contains invalid characters or is too short."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:158
+msgid "You must provide an email address."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:160
+msgid "You must assign user to a group."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:162
+msgid "Passwords do not match."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:164
+msgid ""
+"Please Select another group as `Public Frontend` is not a selectable option"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:166
+msgid ""
+"Please Select another group as `Public Backend` is not a selectable option"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:183
+msgid "Add"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:183
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:183
+msgid "User:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:194
+msgid "User Details"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:199
+#: administrator/components/com_users/admin.users.html.php:328
+msgid "Name:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:207
+msgid "Username:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:214
+msgid "Email:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:222
+msgid "New Password:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:230
+msgid "Verify Password:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:238
+msgid "Group:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:249
+msgid "Block User"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:261
+msgid "Receive Submission Emails"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:273
+msgid "Register Date"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:281
+msgid "Last Visit Date"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:304
+#: administrator/components/com_users/admin.users.html.php:323
+msgid "Contact Information"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:310
+msgid "No Contact details linked to this User:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:312
+msgid "See \"Components -> Contact -> Manage Contacts\" for details."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:338
+msgid "Position:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:348
+msgid "Telephone:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:358
+msgid "Fax:"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:380
+msgid "Contact"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:389
+msgid "Change Contact Details"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.html.php:392
+msgid "Components -> Contact -> Manage Contacts"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:17
+#: administrator/components/com_users/admin.users.php:183
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:152
+msgid "- Select Group -"
+msgstr ""
+
+#. get list of Log Status for dropdown filter
+#: administrator/components/com_users/admin.users.php:158
+msgid "- Select Log Status - "
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:160
+msgid "Not Logged In"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:188
+msgid "Super Administrator"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:190
+msgid "Administrator"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:308
+msgid "New User Details"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:309
+#, php-format
+msgid ""
+"Hello %s,\n"
+"\n"
+"\n"
+"You have been added as a user to %s by an Administrator.\n"
+"\n"
+"This email contains your username and password to log into the %s\n"
+"\n"
+"Username - %s\n"
+"Password - %s\n"
+"\n"
+"\n"
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:338
+#, php-format
+msgid "Successfully Saved changes to User: %s"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:343
+#, php-format
+msgid "Successfully Saved User: %s"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:362
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:374
+msgid "You cannot delete a Super Administrator"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:376
+msgid "You cannot delete Yourself!"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:378
+msgid ""
+"You cannot delete another `Administrator` only `Super Administrators` have "
+"this power"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:412
+msgid "block"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:412
+msgid "unblock"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:413
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#: administrator/components/com_users/admin.users.php:448
+msgid "Please select a user"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_users/toolbar.users.html.php:30
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_users/toolbar.users.html.php:48
+msgid "Force Logout"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/weblinks.pot 4.6rc2/language/untranslated/weblinks.pot
--- 4.5.4/language/untranslated/weblinks.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/weblinks.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:27
+msgid "Web Link Manager"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:30
+msgid "Filter:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:50
+msgid "Title"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:53
+msgid "Published"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:56
+msgid "Approved"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:59
+msgid "Reorder"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:62
+msgid "Category"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:65
+#: administrator/components/com_weblinks/weblinks.xml
+#: components/com_weblinks/weblinks.html.php:113
+msgid "Hits"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:96
+msgid "Edit Weblinks"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:129
+msgid "Edit Category"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:174
+msgid "Weblink item must have a title"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:176
+#: components/com_weblinks/weblinks.html.php:249
+msgid "You must select a category."
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:178
+#: components/com_weblinks/weblinks.html.php:251
+msgid "You must have a url."
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:188
+msgid "Web Link:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "Edit"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:190
+msgid "New"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:202
+msgid "Details"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:207
+#: components/com_weblinks/weblinks.html.php:279
+msgid "Name:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:215
+msgid "Category:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:223
+#: components/com_weblinks/weblinks.html.php:295
+msgid "URL:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:231
+#: components/com_weblinks/weblinks.html.php:303
+msgid "Description:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:240
+msgid "Ordering:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:248
+msgid "Approved:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:256
+msgid "Published:"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.html.php:268
+msgid "Parameters"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.php:19
+msgid "You are not authorized to view this resource."
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.php:145
+#: components/com_weblinks/weblinks.php:184
+#, php-format
+msgid "The module %s is currently being edited by another administrator."
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.php:225
+msgid "Select an item to delete"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.php:251
+msgid "publish"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.php:251
+msgid "unpublish"
+msgstr ""
+
+#: administrator/components/com_weblinks/admin.weblinks.php:252
+#, php-format
+msgid "Select an item to %s"
+msgstr ""
+
+#. for existing content items the button is renamed `close`
+#: administrator/components/com_weblinks/toolbar.weblinks.html.php:25
+msgid "Close"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"A small image to be placed to the left or right of your menu item, images "
+"must be in images/stories/"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"A suffix to be applied to the css classes of the page, this allows "
+"individual page styling"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Alignment of the image"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Back Button"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Category List - Category"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Category List - Section"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Description"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Description Text"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Description for page, if left blank it will load _WEBLINKS_DESC from your "
+"language file"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Hide"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Icon to be used to the left of the url links in Table view"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Image"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Image Align"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Image for page, must be located in the /images/stories folder. Default will "
+"load web_links.jpg, No image will mean an image is not loaded"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Left"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Link Descriptions"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Menu Image"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Page Class Suffix"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Page Title"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Right"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide a Back Button, that returns you to the previously view page"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description below"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Description text of the Links"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Hits column"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the List of Categories in List view page"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the List of Categories in Table view page"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the Table Headings"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Show/Hide the pages Title"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Table Headings"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid ""
+"Text to display at the top of the page. If left blank, the Menu name will be "
+"used instead"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "This component shows a listing of Weblinks"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+msgid "Use Global"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks.xml
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Weblinks"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "New Window With Browser Navigation"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "New Window Without Browser Navigation"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Parent Window With Browser Navigation"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target"
+msgstr ""
+
+#: administrator/components/com_weblinks/weblinks_item.xml
+msgid "Target window when the link is clicked"
+msgstr ""
+
+#: components/com_weblinks/weblinks.class.php:70
+msgid "Please provide a valid URL"
+msgstr ""
+
+#: components/com_weblinks/weblinks.class.php:76
+msgid "Your web link must be given a title."
+msgstr ""
+
+#: components/com_weblinks/weblinks.class.php:91
+msgid "There is already a web link that name, please try again."
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:39
+#: components/com_weblinks/weblinks.php:18
+msgid "Web Links"
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:107
+msgid "Web Link"
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:247
+msgid "Web Link item must have a title"
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:262
+msgid "Submit A Web Link"
+msgstr ""
+
+#: components/com_weblinks/weblinks.html.php:287
+msgid "Section:"
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:99
+msgid ""
+"From the list below choose one of our web link categories, then select a URL "
+"to visit the site."
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:279
+msgid ""
+"Thanks for your submission; it will be reviewed before being posted to the "
+"site."
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:291
+msgid "User Submitted '%'"
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:292
+#, php-format
+msgid ""
+"Hello %s,\\n\\n\\nA user submitted %s:\\n [ %s ]\\n has been just been "
+"submitted by user:\\n [ %s ]\\n"
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:293
+#, php-format
+msgid " for %s.\\n\\n\\n\\n"
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:294
+#, php-format
+msgid "Please go to %s/administrator to view and approve this %s.\\n\\n"
+msgstr ""
+
+#: components/com_weblinks/weblinks.php:295
+msgid ""
+"Please do not respond to this message as it is automatically generated and "
+"is for information purposes only\\n"
+msgstr ""
diff -ruN 4.5.4/language/untranslated/wrapper.pot 4.6rc2/language/untranslated/wrapper.pot
--- 4.5.4/language/untranslated/wrapper.pot	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/language/untranslated/wrapper.pot	2006-06-10 12:37:53.000000000 -0500
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 10:21+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: components/com_wrapper/wrapper.html.php:53
+msgid ""
+"This option will not work correctly.  Unfortunately, your browser does not "
+"support Inline Frames"
+msgstr ""
diff -ruN 4.5.4/mainbody.php 4.6rc2/mainbody.php
--- 4.5.4/mainbody.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mainbody.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mainbody.php,v 1.1 2005/07/22 01:57:42 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/mambots/authenticator/index.html 4.6rc2/mambots/authenticator/index.html
--- 4.5.4/mambots/authenticator/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/authenticator/index.html	2006-04-19 03:17:21.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/authenticator/mosvaliduserbot.php 4.6rc2/mambots/authenticator/mosvaliduserbot.php
--- 4.5.4/mambots/authenticator/mosvaliduserbot.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/authenticator/mosvaliduserbot.php	2006-02-07 12:03:58.000000000 -0600
@@ -0,0 +1,19 @@
+<?php
+
+class mosValidUserBot {
+	
+	function register () {
+		return 'requiredLogin';
+	}
+
+	function perform ($loginobject) {
+		$username = $loginobject->getUser();
+		$passwd = md5($loginobject->getPassword());
+		$remember = $loginobject->getRemember();
+		$authenticator =& mamboAuthenticator::getInstance();
+		$checkuser = $authenticator->authenticateUser($message, $username, $passwd, $remember);
+		return $message;
+	}
+}
+
+?>
diff -ruN 4.5.4/mambots/authenticator/mosvaliduserbot.xml 4.6rc2/mambots/authenticator/mosvaliduserbot.xml
--- 4.5.4/mambots/authenticator/mosvaliduserbot.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/authenticator/mosvaliduserbot.xml	2006-01-14 12:19:40.000000000 -0600
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall version="4.5.1" type="mambot" group="authenticator">
+  <name>User Authenticator</name>
+  <author>Martin Brampton</author>
+  <creationDate>5 January 2006</creationDate>
+  <copyright>Copyright 2006 Mambo Foundation</copyright>
+  <license>GNU/GPL</license>
+  <authorEmail>martin@mambo-foundation.org</authorEmail>
+  <authorUrl>www.mambo-foundation.org</authorUrl>
+  <version>4.5.4</version>
+  <description>Standard Mambo user credential validation</description>
+  <files>
+    <filename mambot="mosvaliduserbot">mosvaliduserbot.php</filename>
+  </files>
+  <params />
+</mosinstall>
diff -ruN 4.5.4/mambots/content/geshi.php 4.6rc2/mambots/content/geshi.php
--- 4.5.4/mambots/content/geshi.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/geshi.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,15 +1,54 @@
 <?php
 /**
-* @version $Id: geshi.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
+class geshiXML {
+	var $parser;
+	var $opentags = array();
+	var $opencount;
+	var $accept = array();
+	var $pre = false;
+	var $pattrs = array();
+
+	function geshiXML () {
+		$this->parser = xml_parser_create();
+		$startfunc = array (&$this, 'start_element');
+		$endfunc = array (&$this, 'end_element');
+		$charfunc = array (&$this, 'character_data');
+		xml_set_element_handler ($this->parser, $startfunc, $endfunc);
+		xml_set_character_data_handler ($this->parser, $charfunc);
+	}
+
+	function parse ($arguments) {
+		xml_parse($this->parser, $arguments, true);
+		xml_parser_free($parser);
+		return $this->pattrs;
+	}
+
+	function start_element ($parser, $element_name, $element_attrs) {
+		if ($element_name == 'PRE') $pattrs = $element_attrs;
+	}
+
+	function end_element ($parser, $element_name) {
+		return;
+	}
+
+	function character_data ($parser, $data) {
+		return;
+	}
+
+}
+
 $_MAMBOTS->registerFunction( 'onPrepareContent', 'botGeshi' );
 
 /**
@@ -18,20 +57,25 @@
 * Replaces <pre>...</pre> tags with highlighted text
 */
 function botGeshi( $published, &$row, &$params, $page=0 ) {
-	require_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/domit/xml_saxy_shared.php' );
 
 	// define the regular expression for the bot
 	$regex = "#<pre\s*(.*?)>(.*?)</pre>#s";
 
+	if (is_callable(array($row, 'getText'))) $localtext = $row->getText();
+	else $localtext = $row->text;
 	if (!$published) {
-		$row->text = preg_replace( $regex, '', $row->text );
+		$localtext = preg_replace( $regex, '', $localtext );
+		if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+		else $row->text = $localtext;
 		return;
 	}
 
 	$GLOBALS['_MAMBOT_GESHI_PARAMS'] =& $params;
 
 	// perform the replacement
-	$row->text = preg_replace_callback( $regex, 'botGeshi_replacer', $row->text );
+	$localtext = preg_replace_callback( $regex, 'botGeshi_replacer', $localtext );
+	if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+	else $row->text = $localtext;
 
 	return true;
 }
@@ -43,8 +87,8 @@
 function botGeshi_replacer( &$matches ) {
 	$params =& $GLOBALS['_MAMBOT_GESHI_PARAMS'];
 	include_once( dirname( __FILE__ ) . '/geshi/geshi.php' );
-
-	$args = SAXY_Parser_Base::parseAttributes( $matches[1] );
+	$parser =& new geshiXML();
+	$args = $parser->parse($matches[1]);
 	$text = $matches[2];
 
 	$lang = mosGetParam( $args, 'lang', 'php' );
@@ -77,4 +121,6 @@
 
 	return $text;
 }
-?>
\ No newline at end of file
+
+
+?>
diff -ruN 4.5.4/mambots/content/geshi.xml 4.6rc2/mambots/content/geshi.xml
--- 4.5.4/mambots/content/geshi.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/geshi.xml	2006-02-24 14:55:29.000000000 -0600
@@ -3,7 +3,7 @@
 	<name>GeSHi</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
 	<authorUrl>qbnz.com/highlighter</authorUrl>
 	<version>1.0.4</version>
diff -ruN 4.5.4/mambots/content/legacybots.php 4.6rc2/mambots/content/legacybots.php
--- 4.5.4/mambots/content/legacybots.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/legacybots.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: legacybots.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
diff -ruN 4.5.4/mambots/content/legacybots.xml 4.6rc2/mambots/content/legacybots.xml
--- 4.5.4/mambots/content/legacybots.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/legacybots.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>legacybots</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Support for outdated Mambo 4.5 mambots</description>
 	<files>
diff -ruN 4.5.4/mambots/content/moscode.php 4.6rc2/mambots/content/moscode.php
--- 4.5.4/mambots/content/moscode.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/moscode.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: moscode.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -22,14 +24,20 @@
 	// define the regular expression for the bot
 	$regex = "#{moscode}(.*?){/moscode}#s";
 
+	if (is_callable(array($row, 'getText'))) $localtext = $row->getText();
+	else $localtext = $row->text;
 	if (!$published) {
-		$row->text = preg_replace( $regex, '', $row->text );
+		$localtext = preg_replace( $regex, '', $localtext );
+		if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+		else $row->text = $localtext;
 		return;
 	}
 
 
 	// perform the replacement
-	$row->text = preg_replace_callback( $regex, 'botMosCode_replacer', $row->text );
+	$localtext = preg_replace_callback( $regex, 'botMosCode_replacer', $localtext );
+	if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+	else $row->text = $localtext;
 
 	return true;
 }
@@ -68,4 +76,4 @@
 
 	return $text;
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/mambots/content/moscode.xml 4.6rc2/mambots/content/moscode.xml
--- 4.5.4/mambots/content/moscode.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/moscode.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>moscode</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Displays formatted code in content items</description>
 	<files>
diff -ruN 4.5.4/mambots/content/mosemailcloak.php 4.6rc2/mambots/content/mosemailcloak.php
--- 4.5.4/mambots/content/mosemailcloak.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosemailcloak.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mosemailcloak.php,v 1.2 2005/07/22 03:30:14 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -15,25 +17,19 @@
 /**
 * Mambot that Cloaks all emails in content from spambots via javascript
 */
-function botMosEmailCloak( $published, &$row, &$params, $page=0 ) {
+function botMosEmailCloak( $published, &$row, &$cparams, $page=0, $params ) {
 	global $database;
 	
-	// load mambot params info
-	$query = "SELECT id FROM #__mambots WHERE element = 'mosemailcloak' AND folder = 'content'";
-	$database->setQuery( $query );
- 	$id 		= $database->loadResult();
- 	$mambot 	= new mosMambot( $database );
-  	$mambot->load( $id );
- 	$params 	=& new mosParameters( $mambot->params );
  	$mode		= $params->def( 'mode', 1 );
-	
  	$search 	= "([[:alnum:]_\.\-]+)(\@[[:alnum:]\.\-]+\.+)([[:alnum:]\.\-]+)";
  	$search_text 	= "([[:alnum:][:space:][:punct:]][^<>]+)";
  
 	// search for derivativs of link code <a href="mailto:email@amail.com">email@amail.com</a>
 	// extra handling for inclusion of title and target attributes either side of href attribute
 	$searchlink	= "(<a [[:alnum:] _\"\'=\@\.\-]*href=[\"\']mailto:". $search ."[\"\'][[:alnum:] _\"\'=\@\.\-]*>)". $search ."</a>";
-	while( eregi( $searchlink, $row->text, $regs ) ) {
+	if (is_callable(array($row, 'getText'))) $localtext = $row->getText();
+	else $localtext = $row->text;
+	while( eregi( $searchlink, $localtext, $regs ) ) {
 		$mail 		= $regs[2] . $regs[3] . $regs[4];
 		$mail_text 	= $regs[5] . $regs[6] . $regs[7];
 		
@@ -45,31 +41,34 @@
 		}		
 		
 		// replace the found address with the js cloacked email
-		$row->text 	= str_replace( $regs[0], $replacement, $row->text );		
+		$localtext 	= str_replace( $regs[0], $replacement, $localtext );
 	}
 	
 	// search for derivativs of link code <a href="mailto:email@amail.com">anytext</a>
 	// extra handling for inclusion of title and target attributes either side of href attribute
 	$searchlink	= "(<a [[:alnum:] _\"\'=\@\.\-]*href=[\"\']mailto:". $search ."[\"\'][[:alnum:] _\"\'=\@\.\-]*)>". $search_text ."</a>";
-	while( eregi( $searchlink, $row->text, $regs ) ) {
+	while( eregi( $searchlink, $localtext, $regs ) ) {
 		$mail 		= $regs[2] . $regs[3] . $regs[4];
 		$mail_text 	= $regs[5];
 		
 		$replacement 	= mosHTML::emailCloaking( $mail, $mode, $mail_text, 0 );
 		
 		// replace the found address with the js cloacked email
-		$row->text 	= str_replace( $regs[0], $replacement, $row->text );
+		$localtext 	= str_replace( $regs[0], $replacement, $localtext );
 	}
 
 	// search for plain text email@amail.com
-	while( eregi( $search, $row->text, $regs ) ) {
+	while( eregi( $search, $localtext, $regs ) ) {
 		$mail = $regs[0];
 
 		$replacement = mosHTML::emailCloaking( $mail, $mode );
 		
 		// replace the found address with the js cloacked email
-		$row->text = str_replace( $regs[0], $replacement, $row->text );
+		$localtext = str_replace( $regs[0], $replacement, $localtext );
 	}
 
+	if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+	else $row->text = $localtext;
+
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/mambots/content/mosemailcloak.xml 4.6rc2/mambots/content/mosemailcloak.xml
--- 4.5.4/mambots/content/mosemailcloak.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosemailcloak.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mosemailcloak</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Cloaks all emails in content from spambots using javascript</description>
 	<files>
diff -ruN 4.5.4/mambots/content/mosimage.php 4.6rc2/mambots/content/mosimage.php
--- 4.5.4/mambots/content/mosimage.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosimage.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mosimage.php,v 1.2 2005/10/16 00:10:03 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -14,14 +16,16 @@
 
 /**
 */
-function botMosImage( $published, &$row, &$params, $page=0 ) {
+function botMosImage( $published, &$row, &$cparams, $page=0, $params ) {
 	global $database;
 	
  	// expression to search for
 	$regex = '/{mosimage\s*.*?}/i';
   	
 	// find all instances of mambot and put in $matches
-	preg_match_all( $regex, $row->text, $matches );
+	if (is_callable(array($row, 'getText'))) $localtext = $row->getText();
+	else $localtext = $row->text;
+	preg_match_all( $regex, $localtext, $matches );
 	
  	// Number of mambots
 	$count = count( $matches[0] );
@@ -29,13 +33,6 @@
  	// mambot only processes if there are any instances of the mambot in the text
  	if ( $count ) {
 		// load mambot params info
-		$query = "SELECT id FROM #__mambots WHERE element = 'mosimage' AND folder = 'content'";
-		$database->setQuery( $query );
-	 	$id 	= $database->loadResult();
-	 	$mambot = new mosMambot( $database );
-	  	$mambot->load( $id );
-	 	$params =& new mosParameters( $mambot->params ); 	
-	 	
 	 	$params->def( 'padding' );
 	 	$params->def( 'margin' );
 	 	$params->def( 'link', 0 );
@@ -49,7 +46,9 @@
 		//$GLOBALS['botMosImageArray'] 	=& $combine;
 	
 		// perform the replacement
-		$row->text = preg_replace_callback( $regex, 'botMosImage_replacer', $row->text );
+		$localtext = preg_replace_callback( $regex, 'botMosImage_replacer', $localtext );
+		if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+		else $row->text = $localtext;
 	
 		// clean up globals
 		unset( $GLOBALS['botMosImageCount'] );
@@ -66,12 +65,16 @@
 	$images 		= array();
 
 	// split on \n the images fields into an array
-	$row->images 	= explode( "\n", $row->images );
-	$total 			= count( $row->images );
+	if (is_callable(array($row, 'getImages'))) $localimages = $row->getImages();
+	else $localimages = $row->images;
+	$rimages = explode( "\n", $localimages);
+	$total 			= count( $rimages );
+	if (is_callable(array($row, 'saveImages'))) $row->saveImages($rimages);
+	else $row->images = $rimages;
 	
 	$start = 0;
 	for ( $i = $start; $i < $total; $i++ ) {
-		$img = trim( $row->images[$i] );
+		$img = trim( $rimages[$i] );
 
 		// split on pipe the attributes of the image
 		if ( $img ) {
diff -ruN 4.5.4/mambots/content/mosimage.xml 4.6rc2/mambots/content/mosimage.xml
--- 4.5.4/mambots/content/mosimage.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosimage.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mosimage</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Replaces {mosimage} tag in content with specified images</description>
 	<files>
diff -ruN 4.5.4/mambots/content/mosloadposition.php 4.6rc2/mambots/content/mosloadposition.php
--- 4.5.4/mambots/content/mosloadposition.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosloadposition.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mosloadposition.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -15,35 +17,34 @@
 /**
 * Mambot that loads module positions within content
 */
-function botMosLoadPosition( $published, &$row, &$params, $page=0 ) {
+function botMosLoadPosition( $published, &$row, &$cparams, $page=0, $params ) {
 	global $database;
 	
  	// expression to search for
  	$regex = '/{mosloadposition\s*.*?}/i';
   	
+	if (is_callable(array($row, 'getText'))) $localtext = $row->getText();
+	else $localtext = $row->text;
  	// find all instances of mambot and put in $matches
-	preg_match_all( $regex, $row->text, $matches );
+	preg_match_all( $regex, $localtext, $matches );
 	
 	// Number of mambots
  	$count = count( $matches[0] );
 
  	// mambot only processes if there are any instances of the mambot in the text
  	if ( $count ) {
-		// load mambot params info
-		$query = "SELECT id FROM #__mambots WHERE element = 'mosloadmodule' AND folder = 'content'";
-		$database->setQuery( $query );
-	 	$id 	= $database->loadResult();
-	 	$mambot = new mosMambot( $database );
-	  	$mambot->load( $id );
-	 	$params =& new mosParameters( $mambot->params ); 
 	 		
 	 	$style	= $params->def( 'style', -2 );
 
- 		processPositions( $row, $matches, $count, $regex, $style );
-	} 	
+ 		processPositions( $localtext, $matches, $count, $regex, $style );
+	}
+	// Save the results of processing
+	if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+	else $row->text = $localtext;
+
 }
 
-function processPositions ( &$row, &$matches, $count, $regex, $style ) {
+function processPositions ( &$text, &$matches, $count, $regex, $style ) {
 	global $database;
 	
 	$query = "SELECT position"
@@ -62,14 +63,14 @@
 		foreach ( $positions as $position ) {
 	 		if ( $position == @$load ) {		 			
 				$modules	= loadPosition( $load, $style );					
-				$row->text 	= preg_replace( '{'. $matches[0][$i] .'}', $modules, $row->text );
+				$text 	= preg_replace( '{'. $matches[0][$i] .'}', $modules, $text );
 				break;			
 	 		}	 			
  		}
  	}
 
   	// removes tags without matching module positions
-	$row->text = preg_replace( $regex, '', $row->text );
+	$text = preg_replace( $regex, '', $text );
 }
 
 function loadPosition( $position, $style=-2 ) {
diff -ruN 4.5.4/mambots/content/mosloadposition.xml 4.6rc2/mambots/content/mosloadposition.xml
--- 4.5.4/mambots/content/mosloadposition.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosloadposition.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mosloadposition</name>
 	<author>Mambo Project</author>
 	<creationDate>January 2005</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Loads module positions within Content, Syntax: {mosloadposition user1}</description>
 	<files>
diff -ruN 4.5.4/mambots/content/mospaging.php 4.6rc2/mambots/content/mospaging.php
--- 4.5.4/mambots/content/mospaging.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mospaging.php	2006-04-13 00:11:44.000000000 -0500
@@ -1,16 +1,18 @@
 <?php
 /**
-* @version $Id: mospaging.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-$_MAMBOTS->registerFunction( 'onPrepareContent', 'botMosPaging' );
+$this->registerFunction( 'onPrepareContent', 'botMosPaging' );
 
 /**
 * Page break mambot
@@ -26,13 +28,15 @@
 * <code>{mospagebreak heading=The first page&title=The page title}</code>
 *
 */
-function botMosPaging( $published, &$row, &$params, $page=0 ) {
+function botMosPaging( $published, &$row, &$cparams, $page=0, $params ) {
 	global $mainframe, $Itemid, $database;
 
+	if (strtolower(get_class($row)) != 'mosextendedcontent') return;
+
  	// expression to search for
  	$regex = '/{(mospagebreak)\s*(.*?)}/i';
 
- 	if (!$published || $params->get( 'intro_only' )|| $params->get( 'popup' )) {
+ 	if (!$published || $cparams->get( 'intro_only' )|| $cparams->get( 'popup' )) {
 		$row->text = preg_replace( $regex, '', $row->text );
 		return;
 	}
@@ -50,19 +54,12 @@
 	// we have found at least one mambot, therefore at least 2 pages
 	if ($n > 1) {
 		// load mambot params info
-		$query = "SELECT id FROM #__mambots WHERE element = 'mospaging' AND folder = 'content'";
-		$database->setQuery( $query );
-	 	$id 	= $database->loadResult();
-	 	$mambot = new mosMambot( $database );
-	  	$mambot->load( $id );
-	 	$params =& new mosParameters( $mambot->params );
-
 	 	$title	= $params->def( 'title', 1 );
 
 	 	// adds heading or title to <site> Title
 	 	if ( $title ) {
 			$page_text = $page + 1;
-			$row->page_title = _PN_PAGE .' '. $page_text;
+			$row->page_title = T_('Page') .' '. $page_text;
 			if ( !$page ) {
 				// processing for first page
 				parse_str( $matches[0][2], $args );
@@ -146,7 +143,7 @@
 	<table cellpadding="0" cellspacing="0" class="contenttoc" align="right">
 	<tr>
 		<th>'
-		. _TOC_JUMPTO .
+		. T_('Article Index') .
 		'</th>
 	</tr>
 	';
@@ -187,7 +184,7 @@
 				<tr>
 					<td>
 					<a href="'. $link .'" class="toclink">'
-					. _PN_PAGE .' '. $i .
+					. T_('Page') .' '. $i .
 					'</a>
 					</td>
 				</tr>
@@ -198,7 +195,7 @@
 			<tr>
 				<td>
 				<a href="'. $link .'" class="toclink">'
-				. _PN_PAGE .' '. $i .
+				. T_('Page') .' '. $i .
 				'</a>
 				</td>
 			</tr>
@@ -219,18 +216,18 @@
 		$link_next = $link .'&amp;limit=1&amp;limitstart='. ( $page + 1 );
 		$link_next = sefRelToAbs( $link_next );
 
-		$next = '<a href="'. $link_next .'">' ._CMN_NEXT . _CMN_NEXT_ARROW .'</a>';
+		$next = '<a href="'. $link_next .'">' .T_('Next &gt;&gt;').'</a>';
 	} else {
-		$next = _CMN_NEXT;
+		$next = T_('Next');
 	}
 
 	if ( $page > 0 ) {
 		$link_prev = $link .'&amp;limit=1&amp;limitstart='. ( $page - 1 );
 		$link_prev = sefRelToAbs( $link_prev );
 
-		$prev = '<a href="'. $link_prev .'">'. _CMN_PREV_ARROW . _CMN_PREV .'</a>';
+		$prev = '<a href="'. $link_prev .'">'. T_('&lt;&lt;Previous') .'</a>';
 	} else {
-		$prev = _CMN_PREV;
+		$prev = T_('Previous');
 	}
 
 	$row->text .= '<div>' . $prev . ' - ' . $next .'</div>';
diff -ruN 4.5.4/mambots/content/mospaging.xml 4.6rc2/mambots/content/mospaging.xml
--- 4.5.4/mambots/content/mospaging.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mospaging.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mospaging</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Add a Table of Contents functionality to a paginated item. Syntax: {mospagebreak} or {mospagebreak title=The page title} or {mospagebreak heading=The first page} or {mospagebreak title=The page title&heading=The first page} or {mospagebreak heading=The first page&title=The page title}</description>
 	<files>
diff -ruN 4.5.4/mambots/content/mossef.php 4.6rc2/mambots/content/mossef.php
--- 4.5.4/mambots/content/mossef.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mossef.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,16 +1,18 @@
 <?php
 /**
-* @version $Id: mossef.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-$_MAMBOTS->registerFunction( 'onPrepareContent', 'botMosSef' );
+$this->registerFunction( 'onPrepareContent', 'botMosSef' );
 
 /**
 * Converting internal relative links to SEF URLs
@@ -21,11 +23,16 @@
 function botMosSef( $published, &$row, &$params, $page=0 ) {
 	global $mosConfig_absolute_path, $mosConfig_live_site;
 
+	if (is_callable(array($row, 'getText'))) $localtext = $row->getText();
+	else $localtext = $row->text;
 	// define the regular expression for the bot
 	$regex = "#href=\"(.*?)\"#s";
 
 	// perform the replacement
-	$row->text = preg_replace_callback( $regex, 'botMosSef_replacer', $row->text );
+	$localtext = preg_replace_callback( $regex, 'botMosSef_replacer', $localtext );
+
+	if (is_callable(array($row, 'saveText'))) $row->saveText($localtext);
+	else $row->text = $localtext;
 
 	return true;
 }
@@ -43,4 +50,4 @@
 		return "href=\"".sefRelToAbs($matches[1])."\"";
 	}
 }
-?>
\ No newline at end of file
+?>
diff -ruN 4.5.4/mambots/content/mossef.xml 4.6rc2/mambots/content/mossef.xml
--- 4.5.4/mambots/content/mossef.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mossef.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mossef</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Adds SEF support to links in content items.  It operates directly on the html and does not require a special tag.</description>
 	<files>
diff -ruN 4.5.4/mambots/content/mosvote.php 4.6rc2/mambots/content/mosvote.php
--- 4.5.4/mambots/content/mosvote.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosvote.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,56 +1,65 @@
 <?php
 /**
-* @version $Id: mosvote.php,v 1.1 2005/07/22 01:57:49 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-$_MAMBOTS->registerFunction( 'onBeforeDisplayContent', 'botVoting' );
+$this->registerFunction( 'onBeforeDisplayContent', 'botVoting' );
 
 function botVoting( &$row, &$params, $page=0 ) {
 	global $mosConfig_live_site, $mosConfig_absolute_path, $cur_template;
 	global $Itemid;
-	$id = $row->id;
+	if (get_class($row) != 'mosExtendedContent') return;
+	if (is_callable(array($row,'getId'))) $id = $row->getId();
+	else $id = $row->id;
 	$option = 'com_content';
 	$task = mosGetParam( $_REQUEST, 'task', '' );
 
 	$html = '';
 	if ($params->get( 'rating' ) && !$params->get( 'popup' )){
+		if (is_callable(array($row,'getRating'))) $rating = $row->getRating();
+		else $rating = $row->rating;
+		if (is_callable(array($row,'getRatingCount'))) $rating_count = $row->getRatingCount();
+		else $rating_count = $row->rating_count;
 		$html .= '<form method="post" action="' . sefRelToAbs( 'index.php' ) . '">';
 		$img = '';
 		
 		// look for images in template if available
-		$starImageOn = mosAdminMenus::ImageCheck( 'rating_star.png', '/images/M_images/' );
-		$starImageOff = mosAdminMenus::ImageCheck( 'rating_star_blank.png', '/images/M_images/' );
+		$mainframe =& mosMainFrame::getInstance();
+		$starImageOn = $mainframe->ImageCheck( 'rating_star.png', '/images/M_images/' );
+		$starImageOff = $mainframe->ImageCheck( 'rating_star_blank.png', '/images/M_images/' );
 
-		for ($i=0; $i < $row->rating; $i++) {
+		for ($i=0; $i < $rating; $i++) {
 			$img .= $starImageOn;
 		}
-		for ($i=$row->rating; $i < 5; $i++) {
+		for ($i=$rating; $i < 5; $i++) {
 			$img .= $starImageOff;
 		}
 		$html .= '<span class="content_rating">';
-		$html .= _USER_RATING . ':' . $img . '&nbsp;/&nbsp;';
-		$html .= intval( $row->rating_count );
+		$html .= T_('User Rating') . ':' . $img . '&nbsp;/&nbsp;';
+		$html .= intval( $rating_count );
 		$html .= "</span>\n<br />\n";
 		$url = @$_SERVER['REQUEST_URI'];
 		$url = ampReplace( $url );
 		
 		if (!$params->get( 'intro_only' ) && $task != "blogsection") {
 			$html .= '<span class="content_vote">';
-			$html .= _VOTE_POOR;
-			$html .= '<input type="radio" alt="vote 1 star" name="user_rating" value="1" />';
-			$html .= '<input type="radio" alt="vote 2 star" name="user_rating" value="2" />';
-			$html .= '<input type="radio" alt="vote 3 star" name="user_rating" value="3" />';
-			$html .= '<input type="radio" alt="vote 4 star" name="user_rating" value="4" />';
-			$html .= '<input type="radio" alt="vote 5 star" name="user_rating" value="5" checked="checked" />';
-			$html .= _VOTE_BEST;
-			$html .= '&nbsp;<input class="button" type="submit" name="submit_vote" value="'. _RATE_BUTTON .'" />';
+			$html .= T_('Poor');
+			$html .= '<input type="radio" alt="'.T_('vote 1 star').'" name="user_rating" value="1" />';
+			$html .= '<input type="radio" alt="'.T_('vote 2 star').'" name="user_rating" value="2" />';
+			$html .= '<input type="radio" alt="'.T_('vote 3 star').'" name="user_rating" value="3" />';
+			$html .= '<input type="radio" alt="'.T_('vote 4 star').'" name="user_rating" value="4" />';
+			$html .= '<input type="radio" alt="'.T_('vote 5 star').'" name="user_rating" value="5" checked="checked" />';
+			$html .= T_('Best');
+			$html .= '&nbsp;<input class="button" type="submit" name="submit_vote" value="'. T_('Rate') .'" />';
 			$html .= '<input type="hidden" name="task" value="vote" />';
 			$html .= '<input type="hidden" name="pop" value="0" />';
 			$html .= '<input type="hidden" name="option" value="com_content" />';
diff -ruN 4.5.4/mambots/content/mosvote.xml 4.6rc2/mambots/content/mosvote.xml
--- 4.5.4/mambots/content/mosvote.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/content/mosvote.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mosvote</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Add the Voting functionality to Items</description>
 	<files>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/about.html 4.6rc2/mambots/editors/mostlyce/docs/about.html
--- 4.5.4/mambots/editors/mostlyce/docs/about.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/about.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>About</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>About</h1>
+</div>
+
+<div class="content">
+	<h2>General information</h2>
+	<div class="section">
+		<p>TinyMCE is a powerful WYSIWYG editor control for web browsers such as MSIE or Mozilla that enables the user to edit HTML contents in a more user friendly way. The editor control is very flexible and it's built for integration purposes for example usage within systems like Intranets, CMS, LMS and so forth.</p>
+		<p>
+		TinyMCE is developed by <a href="http://www.moxiecode.com">Moxiecode Systems AB</a> and is currently released under the &quot;LGPL&quot; license, read the license agreement for details.
+		</p>
+		<h2>Features</h2>
+		<p>
+			<ul>
+				<li>Easy to integrate, takes only a couple lines of code.</li>
+				<li>Theme and template support.</li>
+				<li>Easy to extend with custom code. (Plugins and callbacks)</li>
+				<li>Customizable HTML output. Block elements and force attributes.</li>
+				<li>International language support (Language packs).</li>
+				<li>Multiple browser support, currently Mozilla (PC, Mac and Linux), MSIE (PC) and FireFox (PC, Mac and Linux) and some limited Safari support.</li>
+			</ul>
+		</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/compatiblity_chart.html 4.6rc2/mambots/editors/mostlyce/docs/compatiblity_chart.html
--- 4.5.4/mambots/editors/mostlyce/docs/compatiblity_chart.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/compatiblity_chart.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,84 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Compatiblity Chart</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Compatiblity Chart</h1>
+</div>
+
+<div class="content">
+	<h2>Browser support</h2>
+	<div class="section">
+		<p>TinyMCE uses advanced JavaScript and tries to be as smart as possible when it comes to different browsers, the main focus is on Microsoft Internet Explorer and Mozilla/Firefox. The table was reset to only show the browsers we ourselves can test on. It works with many older versions of Mozilla and Firefox. <strong>Just cause a browser is not listed on this page doesn't mean it does not work, try out the examples on our website.</strong></p>
+
+		<p>Since MacOS X 10.4 is more or less Linux we are not testing much on Linux any more, use the Sourceforge bug report system to submit bugs on the very latest browsers only.</p>
+		<p>
+			<table border="1" cellspacing="0" cellpadding="4">
+				<tr>
+					<td>&nbsp;</td>
+					<td>Windows XP</td>
+					<td>MacOS X 10.4</td>
+				</tr>
+				<tr>
+					<td>MSIE 6</td>
+					<td>OK</td>
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td>MSIE 5.5 SP2</td>
+					<td>OK</td>
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td>MSIE 5.0</td>
+					<td>OK</td>
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td>Mozilla 1.7.x</td>
+					<td>OK</td>
+					<td>OK</td>
+				</tr>
+				<tr>
+					<td>Firefox 1.0.x</td>
+					<td>OK</td>
+					<td>OK</td>
+				</tr>
+				<tr>
+					<td>Firefox 1.5b2</td>
+					<td>OK</td>
+					<td>OK</td>
+				</tr>
+				<tr>
+					<td>Safari 2.0 (412)</td>
+					<td>&nbsp;</td>
+					<td>OK(1)</td>
+				</tr>
+				<tr>
+					<td>Opera 9 Preview 1</td>
+					<td>OK(1)</td>
+					<td>OK(1)</td>
+				</tr>
+			</table>
+		</p>
+		<p>
+		<ul>
+			<li>(1) - Partialy working</li>
+			<li>(2) - Buggy browser version</li>
+		</ul>
+		</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/credits.html 4.6rc2/mambots/editors/mostlyce/docs/credits.html
--- 4.5.4/mambots/editors/mostlyce/docs/credits.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/credits.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Credits</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Credits</h1>
+</div>
+
+<div class="content">
+	<h2>Contributors</h2>
+	<div class="section">
+		<p>These are the people, companies or organizations that have contributed in some way to the TinyMCE project. If you feel we are missing someone please inform us right away and we will correct this in future versions of TinyMCE.</p>
+		<p>
+		Please note that some of these have contributed with complete language packs and some have updated parts of language packs or similar.
+		</p>
+	</div>
+	<div class="separator"></div>
+		<div class="section">
+			<p>
+			<ul>
+				<li class="list_subtitle">Code / Solutions / Features</li>
+				<ul>
+					<li>Digital Ventures</li>
+					<li>donadoni</li>
+					<li>Michael Keck</li>
+					<li>Victor Nilsson</li>
+					<li>Jrgen Baute</li>
+					<li>"Neirda"</li>
+					<li>"speednet"</li>
+					<li>Virtuelcom</li>
+					<li>"SlyD"</li>
+					<li>Ernst de Moor</li>
+					<li>"jamesw"</li>
+					<li>Vincent FIACK</li>
+					<li>Aptest</li>
+				</ul>
+				<li class="list_subtitle">Language packs</li>
+				<ul>
+					<li>Marcin Szymon Sznyra</li>
+					<li>"revyag"</li>
+					<li>Jim Kou</li>
+					<li>"Krokogras"</li>
+					<li>Hani Suleiman</li>
+					<li>Jan Moelgaard</li>
+					<li>Christopher Mller</li>
+					<li>Virtuelcom</li>
+					<li>Pavel Novk</li>
+					<li>Simon Rupf</li>
+					<li>"Fabrix Xm"</li>
+					<li>Mats Lfstrm, York Consulting AB</li>
+					<li>Morteza Zafari</li>
+					<li>Laurent Dran</li>
+					<li>Tobias Heer</li>
+					<li>"Innozent"</li>
+					<li>"cube316"</li>
+					<li>Jos Pedro Pereira</li>
+					<li>"Martin"</li>
+					<li>Sten Aksel Heien</li>
+					<li>Setzer Gabbiani</li>
+					<li>Jacaranda Bill</li>
+					<li>Pat Boens</li>
+					<li>Roman Filippov</li>
+					<li>Arnoud van Delden</li>
+				</ul>
+			</ul>
+			</p>
+			<p>There are also a few corporations that have contributed in various ways to have features developed by payed support.
+			</p>
+		</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/css/index.html 4.6rc2/mambots/editors/mostlyce/docs/css/index.html
--- 4.5.4/mambots/editors/mostlyce/docs/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/css/screen.css 4.6rc2/mambots/editors/mostlyce/docs/css/screen.css
--- 4.5.4/mambots/editors/mostlyce/docs/css/screen.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/css/screen.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,168 @@
+body {
+	background-color: #FFFFFF;
+	font-family: Verdana, Arial, helvetica, sans-serif;
+	font-size: 12px;
+}
+
+.header {
+	border: #E0E0E0 solid 1px;
+}
+
+.footer {
+	border: #E0E0E0 solid 1px;
+	height: 20px;
+}
+
+h1 {
+	font-size: 18px;
+	font-weight: bold;
+	padding: 0;
+	margin: 4px;
+}
+
+h2 {
+	font-size: 14px;
+	font-weight: bold;
+	padding: 0;
+	margin: 0;
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+h3 {
+	font-size: 11px;
+	font-weight: bold;
+	padding: 0;
+	margin: 0;
+	margin-bottom: 3px;
+}
+
+.section {
+	margin-left: 15px;
+}
+
+.column {
+	margin-right: 20px;
+	float: left
+}
+
+.separator {
+	border-bottom: 1px solid #E6EBF1;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+p {
+}
+
+.helpindex {
+	margin-left: 20px;
+	padding-left: 0;
+}
+
+
+.optionlist {
+	margin: 0;
+	padding: 0;
+	margin-bottom: 10px;
+}
+
+.optionlist li {
+	padding: 0;
+	margin: 0;
+	margin-top: 3px;
+	margin-bottom: 3px;
+	margin-left: 10px;
+	list-style-type: none;
+}
+
+.helpindex li {
+	margin-top: 3px;
+}
+
+.content {
+	margin: 10px;
+}
+
+.example {
+	background-color: #E6EBF1;
+	margin-left: 10px;
+}
+
+code, pre {
+	margin: 0;
+	padding: 0;
+	background-color: #E6EBF1;
+}
+
+.copyright {
+	margin: 3px;
+	float: left;
+}
+
+.helpindexlink {
+	margin: 3px;
+	float: right;
+}
+
+a:visited {
+	color: #666666;
+	text-decoration: underline;
+}
+
+a:active {
+	color: #666666;
+	text-decoration: underline;
+}
+
+a:hover {
+	color: #666666;
+	text-decoration: underline;
+}
+
+a {
+	color: #666666;
+	text-decoration: underline;
+}
+
+.list_subtitle {
+	padding-top: 5px;
+}
+
+.note {
+	margin-top: 5px;
+	margin-left: 10px;
+	font-size: 10px;
+}
+
+.marked {
+	color: red;
+	font-weight: bold;
+}
+
+thead {
+	background-color: #E6EBF1;	
+}
+
+.btable {
+}
+
+.btable th {
+	border: 1px solid gray;
+	vertical-align: top;
+}
+
+.btable td {
+	border: 1px solid gray;
+	vertical-align: top;
+}
+
+.plist {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+
+.plist li {
+	padding-bottom: 3px;
+}
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/customization_language_packs.html 4.6rc2/mambots/editors/mostlyce/docs/customization_language_packs.html
--- 4.5.4/mambots/editors/mostlyce/docs/customization_language_packs.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/customization_language_packs.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Customization - Creating a language pack</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Customization - Creating a language pack</h1>
+</div>
+
+<div class="content">
+	<h2>Making language packs</h2>
+	<p>Language packs are simply JavaScript name/value arrays placed in the &quot;<ISO-639-1 code>.js&quot; files in the &quot;lang&quot; directory. Remember to allways use the &quot;lang_&quot; prefix for these value names so that they don't override other variables in the templates. The example below shows how the cut, copy and paste texts are lang packed. Notice there are three kinds of language packs the first one is the general one shared by all themes these are located in the &quot;jscripts/tiny_mce/langs&quot; directory the secound ones are theme specific language packs these are contained in &quot;jscripts/tiny_mce/themes/&lt;some theme&gt;/langs&quot; and the last one is plugin specific language packs located in each plugin.
+	</p>
+	<p>
+	<div class="example">
+<pre>
+tinyMCE.addToLang('',{
+cut_desc : 'Cut (Ctrl+X)',
+copy_desc : 'Copy (Ctrl+C)',
+paste_desc : 'Paste (Ctrl+P)'
+);
+</pre>
+	</div>
+	</p>
+	<p>
+	Remember the last translation line should not have a , character at the end. The first parameter to the addToLang is the prefix to add before each variable, this was added to reduce the overall size of the language packs to reduce the overall download time.
+	</p>
+	<h3>Files to edit</h3>
+	<p>
+	When translating TinyMCE, these are the files that currently needs to be translated:
+	</p>
+	<p>
+	/tinymce/jscripts/tiny_mce/langs/en.js<br />
+	/tinymce/jscripts/tiny_mce/plugins/&lt;plugin&gt;/langs/en.js<br />
+	/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js<br />
+	</p>
+	<p>
+	Notice some language variables may include a name/url of a gif image or simmilar, for example the button for bold has a "F" character in the Swedish language pack. There are also relative window sizes located in the language packs, for example is the link dialog needs to be bigger inorder to fit a specific translation you can alter the width of the window by modifying these variables.
+	</p>
+	<h3>Contributing your language pack</h3>
+	<p>
+	Go to the <a href="http://sourceforge.net/tracker/?atid=635684&group_id=103281&func=browse">sourceforge patch page</a> and upload a zip containing all the language files in the correct directory structure.<br /><br />
+	Please translate all the plugins, even if you aren't using them.<br />
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/customization_plugins.html 4.6rc2/mambots/editors/mostlyce/docs/customization_plugins.html
--- 4.5.4/mambots/editors/mostlyce/docs/customization_plugins.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/customization_plugins.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,227 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Customization - Creating a plugin</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Customization - Creating a plugin</h1>
+</div>
+
+<div class="content">
+	
+<h2>Creating your own plugins</h2>
+<p>
+Creating you own plugins for the TinyMCE application is fairly easy if you know the basics of HTML, CSS and Javascript. The most easy way is to copy the &quot;_template&quot; directory or one of the other core plugins and work from there. The &quot;_template&quot; directory is a tutorial plugin that shows how to create a plugin. After you copy the template you need to change the red sections marked below to the name of your plugin this is needed so that plugins don't overlap in other words it gives the plugin a unique name.
+</p>
+<p>If you want you may add plugin specific options/settings but remember to namespace them in the following format &quot;&lt;your plugin&gt;_&lt;option&gt;&quot; for example &quot;yourplugin_someoption&quot;.</p>
+<p>Specific callback functions that you don't need or doesn't do anything can be removed.</p>
+
+<div class="separator"></div>
+<h3>Plugin directory structure</h3>
+<p>
+<table class="btable">
+<thead>
+	<th>File/Directory</td>	
+	<th>Description</td>	
+</thead>
+<tbody>
+	<tr><td>css</td><td>Plugin specific CSS files</td></tr>
+	<tr><td>docs</td><td>Plugin specific documentation</td></tr>
+	<tr><td>images</td><td>Plugin specific images</td></tr>
+	<tr><td>jscripts</td><td>Plugin specific jscripts for HTML dialogs</td></tr>
+	<tr><td>langs</td><td>Plugin specific language files</td></tr>
+	<tr><td>editor_plugin.js</td><td>Editor plugin file (compressed).</td></tr>
+	<tr><td>editor_plugin_src.js</td><td>Editor plugin file (source).</td></tr>
+	<tr><td>somedialog.htm</td><td>Plugin specific dialog HTML file.</td></tr>
+</table>
+</p>
+<div class="separator"></div>
+<h3>Plugin example source</h3>
+<p>
+The example below shows a simple empty plugin and all possible callbacks.
+</p>
+<p>
+<div class="example">
+<pre>
+var TinyMCE_<span class="marked">SomeName</span>Plugin = {
+	/**
+	 * Returns information about the plugin as a name/value array.
+	 * The current keys are longname, author, authorurl, infourl and version.
+	 *
+	 * @returns Name/value array containing information about the plugin.
+	 * @type Array 
+	 */
+	getInfo : function() {
+		return {
+			longname : 'Your plugin',
+			author : 'Your name',
+			authorurl : 'http://www.yoursite.com',
+			infourl : 'http://www.yoursite.com/docs/template.html',
+			version : "1.0"
+		};
+	},
+
+	/**
+	 * Gets executed when a TinyMCE editor instance is initialized.
+	 *
+	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
+	 */
+	initInstance : function(inst) {
+		// You can take out plugin specific parameters
+		alert("Initialization parameter:" + tinyMCE.getParam("<span class="marked">somename</span>_someparam", false));
+
+		// Register custom keyboard shortcut
+		inst.addShortcut('ctrl', 't', 'lang_<span class="marked">somename</span>_desc', 'mceSomeCommand');
+	},
+
+	/**
+	 * Returns the HTML code for a specific control or empty string if this plugin doesn't have that control.
+	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$pluginurl} will be replaced
+	 * with the URL of the plugin. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs.
+	 *
+	 * @param {string} cn Editor control/button name to get HTML for.
+	 * @return HTML code for a specific control or empty string.
+	 * @type string
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "<span class="marked">SomeControl</span>":
+				return tinyMCE.getButtonHTML(cn, 'lang_<span class="marked">someplugin</span>_<span class="marked">button</span>_desc', '{$pluginurl}/images/<span class="marked">someimage</span>.gif', '<span class="marked">mceSomeCommand</span>');
+		}
+
+		return "";
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "advhr":
+				return tinyMCE.getButtonHTML(cn, 'lang_insert_advhr_desc', '{$pluginurl}/images/advhr.gif', 'mceAdvancedHr');
+		}
+
+		return "";
+	},
+
+
+	/**
+	 * Executes a specific command, this function handles plugin commands.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
+	 * @param {HTMLElement} element Body or root element for the editor instance.
+	 * @param {string} command Command name to be executed.
+	 * @param {string} user_interface True/false if a user interface should be presented.
+	 * @param {mixed} value Custom value argument, can be anything.
+	 * @return true/false if the command was executed by this plugin or not.
+	 * @type
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
+			case "mce<span class="marked">SomeCommand</span>":
+				// Do your custom command logic here.
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	/**
+	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
+	 * button controls depending on where the user are and what they have selected. This method gets executed
+	 * alot and should be as performance tuned as possible.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was changed.
+	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
+	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
+	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
+	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
+	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
+	 */
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	},
+
+	/**
+	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
+	 * @param {HTMLElement} body HTML body element of editor instance.
+	 * @param {HTMLDocument} doc HTML document instance.
+	 */
+	setupContent : function(editor_id, body, doc) {
+	},
+
+	/**
+	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
+	 * added.
+	 *
+	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
+	 */
+	onChange : function(inst) {
+	},
+
+	/**
+	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
+	 * doesn't listen on all types of events so custom event handling may be required for
+	 * some purposes.
+	 *
+	 * @param {Event} e HTML editor event reference.
+	 * @return true - pass to next handler in chain, false - stop chain execution
+	 * @type boolean
+	 */
+	handleEvent : function(e) {
+		return true;
+	},
+
+	/**
+	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
+	 * The type parameter contains what type of event that was performed and what format the content is in.
+	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
+	 *
+	 * @param {string} type Cleanup event type.
+	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
+	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
+	 * @return New content or the input content depending on action.
+	 * @type string
+	 */
+	cleanup : function(type, content, inst) {
+		return content;
+	},
+
+	// Private plugin internal methods
+
+	/**
+	 * This is just a internal plugin method, prefix all internal methods with a _ character.
+	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
+	 *
+	 * @param {string} a Some arg1.
+	 * @param {string} b Some arg2.
+	 * @return Some return.
+	 * @type string
+	 */
+	_someInternalFunction : function(a, b) {
+		return 1;
+	}
+};
+
+// Adds the plugin class to the list of available TinyMCE plugins
+tinyMCE.addPlugin("<span class="marked">someplugin</span>", TinyMCE_<span class="marked">SomePlugin</span>Plugin);
+</pre>
+</div>
+</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/customization_themes.html 4.6rc2/mambots/editors/mostlyce/docs/customization_themes.html
--- 4.5.4/mambots/editors/mostlyce/docs/customization_themes.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/customization_themes.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,262 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Customization - Creating a theme</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Customization - Creating a theme</h1>
+</div>
+
+<div class="content">
+<h2>Creating your own Themes</h2>
+<p>
+Creating you own themes for the TinyMCE application is fairly easy if you know the basics of HTML, CSS and Javascript. The most easy way is to copy the &quot;simple&quot; or the &quot;advanced&quot; template and rename it as your own name to for example &quot;mytheme&quot;. After you copy the template you need to change the red sections marked below to &quot;mytheme&quot; this is needed so that themes don't overlap in other words it gives the theme a unique name. Then just alter the HTML code as you see fit but notice some elements needs to be there so check the docs below on each function also remember that your custom themes needs to be located in tiny_mce's &quot;themes&quot; directory. If you want you may add theme specific options/settings but remember to namespace them in the following format &quot;theme_&lt;your theme&gt;_&lt;option&gt;&quot;.
+</p>
+<div class="separator"></div>
+<h3>Theme directory structure</h3>
+<p>
+<table class="btable">
+<thead>
+	<th>File/Directory</td>	
+	<th>Description</td>	
+</thead>
+<tbody>
+	<tr><td>css</td><td>Theme specific CSS files</td></tr>
+	<tr><td>docs</td><td>Theme specific documentation</td></tr>
+	<tr><td>images</td><td>Theme specific images</td></tr>
+	<tr><td>jscripts</td><td>Theme specific jscripts for HTML dialogs</td></tr>
+	<tr><td>langs</td><td>Theme specific language files</td></tr>
+	<tr><td>editor_template.js</td><td>Editor theme template file (compressed).</td></tr>
+	<tr><td>editor_template_src.js</td><td>Editor theme template file (source).</td></tr>
+	<tr><td>somedialog.htm</td><td>Theme specific dialog HTML file.</td></tr>
+</table>
+</p>
+<div class="separator"></div>
+<h3>Theme example source</h3>
+<p>
+The example below shows a simple empty theme and all possible callbacks.
+</p>
+<p>
+<div class="example">
+<pre>
+var TinyMCE_<span class="marked">SomeName</span>Theme = {
+	/**
+	 * Returns information about the theme as a name/value array.
+	 * The current keys are longname, author, authorurl, infourl and version.
+	 *
+	 * @returns Name/value array containing information about the theme.
+	 * @type Array 
+	 */
+	getInfo : function() {
+		return {
+			longname : 'Your Theme',
+			author : 'Your name',
+			authorurl : 'http://www.yoursite.com',
+			infourl : 'http://www.yoursite.com/docs/template.html',
+			version : "1.0"
+		};
+	},
+
+	/**
+	 * Gets executed when a TinyMCE editor instance is initialized.
+	 *
+	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
+	 */
+	initInstance : function(inst) {
+		// You can take out theme specific parameters
+		alert("Initialization parameter:" + tinyMCE.getParam("<span class="marked">somename</span>_someparam", false));
+
+		// Register custom keyboard shortcut
+		inst.addShortcut('ctrl', 't', 'lang_<span class="marked">somename</span>_desc', 'mceSomeCommand');
+	},
+
+	/**
+	 * Returns the HTML code for a specific control or empty string if this theme doesn't have that control.
+	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$themeurl} will be replaced
+	 * with the URL of the theme. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs.
+	 *
+	 * @param {string} cn Editor control/button name to get HTML for.
+	 * @return HTML code for a specific control or empty string.
+	 * @type string
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "<span class="marked">SomeControl</span>":
+				return tinyMCE.getButtonHTML(cn, 'lang_<span class="marked">sometheme</span>_<span class="marked">button</span>_desc', '{$themeurl}/images/<span class="marked">someimage</span>.gif', '<span class="marked">mceSomeCommand</span>');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Returns the HTML code that should be inserted for a specific editor instance.
+	 * This function should return a name/value array with three items html, delta_width, delta_height.
+	 * The html item should contain the HTML code to insert as a editor instance.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$themeurl} will be replaced
+	 * with the URL of the theme. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs. Any element with the id {$editor_id} will be replaced with the editor iframe element.
+	 * The {$width} and {$height} variables will be replaced with the editors outside dimension values.
+	 * The delta_width/height is the relative width/height in pixels to add or remove from the iframe dimensions.
+	 *
+	 * @param {Array} settings Name/Value array instance settings.
+	 * @param {string} editor_id TinMYCE editor control instance id.
+	 * @return Name/Value array of editor template data.
+	 * @type Array
+	 */
+	getEditorTemplate : function(settings, editor_id) {
+		var html = "";
+
+		// Build toolbar and editor instance
+		html += "..";
+
+		return {
+			html : html,
+			delta_width : 0,
+			delta_height : 0
+		};
+	},
+
+	/**
+	 * Executes a specific command, this function handles theme commands.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
+	 * @param {HTMLElement} element Body or root element for the editor instance.
+	 * @param {string} command Command name to be executed.
+	 * @param {string} user_interface True/false if a user interface should be presented.
+	 * @param {mixed} value Custom value argument, can be anything.
+	 * @return true/false if the command was executed by this theme or not.
+	 * @type
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
+			case "mce<span class="marked">SomeCommand</span>":
+				// Do your custom command logic here.
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	/**
+	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
+	 * button controls depending on where the user are and what they have selected. This method gets executed
+	 * alot and should be as performance tuned as possible.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was changed.
+	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
+	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
+	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
+	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
+	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
+	 */
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	},
+
+	/**
+	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
+	 * @param {HTMLElement} body HTML body element of editor instance.
+	 * @param {HTMLDocument} doc HTML document instance.
+	 */
+	setupContent : function(editor_id, body, doc) {
+	},
+
+	/**
+	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
+	 * added.
+	 *
+	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
+	 */
+	onChange : function(inst) {
+	},
+
+	/**
+	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
+	 * doesn't listen on all types of events so custom event handling may be required for
+	 * some purposes.
+	 *
+	 * @param {Event} e HTML editor event reference.
+	 * @return true - pass to next handler in chain, false - stop chain execution
+	 * @type boolean
+	 */
+	handleEvent : function(e) {
+		return true;
+	},
+
+	/**
+	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
+	 * The type parameter contains what type of event that was performed and what format the content is in.
+	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
+	 *
+	 * @param {string} type Cleanup event type.
+	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
+	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
+	 * @return New content or the input content depending on action.
+	 * @type string
+	 */
+	cleanup : function(type, content, inst) {
+		return content;
+	},
+
+	// Private theme internal methods
+
+	/**
+	 * This is just a internal theme method, prefix all internal methods with a _ character.
+	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
+	 *
+	 * @param {string} a Some arg1.
+	 * @param {string} b Some arg2.
+	 * @return Some return.
+	 * @type string
+	 */
+	_someInternalFunction : function(a, b) {
+		return 1;
+	}
+};
+
+// Adds the theme class to the list of available TinyMCE themes
+tinyMCE.addTheme("<span class="marked">sometheme</span>", TinyMCE_<span class="marked">SomeTheme</span>Theme);
+</pre>
+</div>
+</p>
+<div class="separator"></div>
+
+<h3>Creating popup HTML files</h3>
+<p>
+When creating a popup you need to include the &quot;tiny_mce_popup.js&quot; this enables you to retrive the tinyMCE global instance in all popup windows. All variables and language definitions gets replaced in the page when it loads. So language variables such as {$lang_something} can be places in the HTML code, if you need to get a language string in JavaScript simply use the tinyMCE.getLang function.
+</p>
+<h3>Example of simple popup file:</h3>
+<div class="example">
+<pre>
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;{$lang_theme_sample_title}&lt;/title&gt;
+&lt;script language=&quot;javascript&quot; src=&quot;../../tiny_mce_popup.js&quot;&gt;&lt;/script&gt;
+&lt;script language=&quot;javascript&quot;&gt;
+     // getWindowArg returns any arguments passed to the window
+     alert(tinyMCE.getWindowArg('some_arg'));
+&lt;/script&gt;
+&lt;body&gt;
+     &lt;strong&gt;{$lang_theme_sample_desc}&lt;/strong&gt;
+&lt;/body&gt;
+</pre>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/faq.html 4.6rc2/mambots/editors/mostlyce/docs/faq.html
--- 4.5.4/mambots/editors/mostlyce/docs/faq.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/faq.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,220 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Frequently Asked Questions</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Frequently Asked Questions</h1>
+</div>
+
+<div class="content">
+	<p>Here are some common answers to common questions. If you need more help you can always visit the <a href="http://tinymce.moxiecode.com/">TinyMCE Forum</a> on the TinyMCE web site.</p>
+	<p>
+		<ul class="plist">
+			<li><a href="#broken">TinyMCE is broken, what should I do?</a></li>
+			<li><a href="#paths">Why is my paths incorrect, I want absolute/relative URLs?</a></li>
+			<li><a href="#strip">Why does TinyMCE strip aways attributes or tags from my source?</a></li>
+			<li><a href="#font">How do I change the default font size/face color of the editor?</a></li>
+			<li><a href="#remove">How do I remove/add buttons/controls to TinyMCE?</a></li>
+			<li><a href="#quotes">Why does my HTML output include lots of \&quot; like &lt;a href=\&quot;mylink.htm\&quot;&gt;link&lt;/a&gt;?</a></li>
+			<li><a href="#load">TinyMCE takes ages to load, is there a way to make it load quicker?</a></li>
+			<li><a href="#hidden">TinyMCE stops working when placed in tabs or hidden divs?</a></li>
+			<li><a href="#commercial">Can I use TinyMCE in my commercial application?</a></li>
+			<li><a href="#commercial2">Are there any restrictions to using TinyMCE in my commercial application?</a></li>
+			<li><a href="#lgpl">I don't like LGPL, is there a commercial license available for me?</a></li>
+			<li><a href="#support">Do you provide support?</a></li>
+			<li><a href="#who">Who made this software?</a></li>
+		</ul>
+	</p>
+
+	<div class="separator"></div>
+
+	<a name="broken"></a>
+	<h2>TinyMCE is broken, what should I do?</h2>
+	<div class="section">
+		<p>There are a few things you should check before posting questions about your problem at the forum or sourceforge.</p>
+		<p>
+			<ul>
+				<li>Does TinyMCE work on the <a href="http://tinymce.moxiecode.com/example_full.php?example=true">TinyMCE website</a>. Then you know that TinyMCE works with your browser.</li>
+				<li>Try to disable any other JavaScripts on the page, some scripts interfere with internal functions that TinyMCE uses. Those scripts are probably poorly written.</li>
+				<li>Check that you havn't missed removing the last , character in your initialization code and that all the other rows have a trailing , character.</li>
+				<li>Verify that the path/URL to TinyMCE is correct, you can use the excellent tool <a href="http://www.fiddlertool.com/fiddler/">Fiddler</a> for this and other HTTP debugging.</li>
+				<li>Do not cross domain load TinyMCE or any other script unless you really really must, since this will invoke various browser security features. In other words, try placing everything on the same server.</li>
+				<li>Don't place textareas within paragraph elements since this is not valid HTML and it will break MSIE and TinyMCE.</li>
+			</ul>
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="paths"></a>
+	<h2>Why is my paths incorrect, I want absolute/relative URLs?</h2>
+	<div class="section">
+		<p>
+			These are the diffrent configuration scenarios for URLs within TinyMCE:
+			<table class="btable">
+				<thead>
+					<th>Output</th>
+					<th>Config</th>
+					<th>Description</th>
+				</thead>
+				<tbody>
+					<tr>
+						<td><strong>http://www.site.com/path1/path2/file.htm</strong> will be converted to <strong>path2/file.htm</strong></td>
+						<td nowrap="nowrap">
+<a href="option_relative_urls.html">relative_urls</a> : true,<br />
+<a href="option_document_base_url.html">document_base_url</a> : &quot;http://www.site.com/path1/&quot;<br />
+</td>
+						<td>This will convert all URLs within the same domain to relative URLs.<br /> <strong>The URLs will be relative from the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
+					</tr>
+
+					<tr>
+						<td><strong>path2/file.htm</strong> will be converted to <strong>/path1/path2/file.htm</strong></td>
+						<td nowrap="nowrap">
+<a href="option_relative_urls.html">relative_urls</a> : false,<br />
+<a href="option_remove_script_host.html">remove_script_host</a> : true,<br />
+<a href="option_document_base_url.html">document_base_url</a> : &quot;http://www.site.com/path1/&quot;<br />
+</td>
+						<td>This will convert all relative URLs to absolute URLs.<br /> <strong>The URLs will be absolute based on the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
+					</tr>
+
+					<tr>
+						<td><strong>path2/file.htm</strong> will be converted to <strong>http://www.site.com/path1/path2/file.htm</strong></td>
+						<td nowrap="nowrap">
+<a href="option_relative_urls.html">relative_urls</a> : false,<br />
+<a href="option_remove_script_host.html">remove_script_host</a> : false,<br />
+<a href="option_document_base_url.html">document_base_url</a> : &quot;http://www.site.com/path1/&quot;<br />
+</td>
+						<td>This will convert all relative URLs to absolute URLs.<br /> <strong>The URLs will be absolute based on the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
+					</tr>
+
+					<tr>
+						<td><strong>path2/file.htm</strong> or <strong>http://www.site.com/path1/path2/file.htm</strong> will not be converted at all.</td>
+						<td nowrap="nowrap">
+<a href="option_convert_urls.html">convert_urls</a> : false<br />
+</td>
+						<td>This option will preserve the URLs as they are in a separate attribute while editing, <strong>since browsers tend to auto convert URLs</strong>.</td>
+					</tr>
+
+				</tbody>
+			</table>
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="strip"></a>
+	<h2>Why does TinyMCE strip aways attributes or tags from my source?</h2>
+	<div class="section">
+		<p>You need to check out the &quot;<a href="option_valid_elements.html">valid_elements</a>&quot; and &quot;<a href="option_extended_valid_elements.html">extended_valid_elements</a>&quot; option in the configuration. By default, TinyMCE only allows certain tags and attributes. TinyMCE also tries to follow the XHTML specification as much as possible (and so should you), this can cause some unexpected source changes, there are however configuration options to battle this issue, study the configuration options in details.</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="font"></a>
+	<h2>How do I change the default font size/face color of the editor?</h2>
+	<div class="section">
+		<p>
+			We recommend that you have a look at the <a href="option_content_css.html">content_css</a> option, this enables you to switch the CSS file TinyMCE uses for it's editing area with a file with your CSS rules for font size and so forth.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="remove"></a>
+	<h2>How do I remove/add buttons/controls to TinyMCE?</h2>
+	<div class="section">
+		<p>
+			There are quite a few options for this but a reference of all available buttons/control names can be found in the <a href="reference_buttons.html">button/control reference</a>.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="quotes"></a>
+	<h2>Why does my HTML output include lots of \&quot; like &lt;a href=\&quot;mylink.htm\&quot;&gt;link&lt;/a&gt;?</h2>
+	<div class="section">
+		<p>This is probably because you are using PHP and it has a feature that's called magic quotes that is enabled by default. You can read more about this at the <a href="http://se2.php.net/magic_quotes/">PHP website</a> or use the <a href="http://www.php.net/manual/en/function.stripslashes.php">stripslashes</a> function.</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="load"></a>
+	<h2>TinyMCE takes ages to load, is there a way to make it load quicker?</h2>
+	<div class="section">
+		<p>
+			If you use PHP on your server you can use tiny_mce_gzip.php instead of tiny_mce.js in page script call. This PHP file bundles all .js files together into two HTTP requests instead of one for each plugin, language file and theme and it also GZip compresses these files.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="hidden"></a>
+	<h2>TinyMCE stops working when placed in tabs or hidden divs?</h2>
+	<div class="section">
+		<p>Since Gecko based browsers Mozilla/Firefox has a bug where it looses designMode on iframes that are hidden a special option is needed that re-enables the design mode when reappearing after being hidden. Enable this option to resolve the issue: &quot;<a href="option_auto_reset_designmode.html">auto_reset_designmode</a>&quot;.</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="commercial"></a>
+	<h2>Can I use TinyMCE in my commercial application?</h2>
+	<div class="section">
+		<p>Yes you can, the LGPL license is a Free Software License. You can read the whole license <a href="license.html">here</a> or visit Free Software Foundation web site <a href="http://www.fsf.org/" target="_blank">here</a></p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="commercial2"></a>
+	<h2>Are there any restrictions to using TinyMCE in my commercial application?</h2>
+	<div class="section">
+		<p>
+			Yes, all copyright notices must be intact. Moxiecode Systems are still the copyright holders of the source code, so you can not use the code for other applications. Any modifications or add-ons you make to the source has to be contributes back to the TinyMCE community.
+		</p>
+		<p>
+			If you start to make a lot of revenue from using TinyMCE, please remember the time and dedication that has been put into this by other developers, respect this and give credit to those who deserve it.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="lgpl"></a>
+	<h2>I don't like LGPL, is there a commercial license available for me?</h2>
+	<div class="section">
+		<p>
+			Yes, we can draw up a license for you that enables you to remove copyright restrictions or anything else you would like to have in this license agreement. Contact us through email, sales (at) moxiecode (dot) com.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="support"></a>
+	<h2>Do you provide support?</h2>
+	<div class="section">
+		<p>
+			We do not provide any non-commercial support outside the forum on the <a href="http://tinymce.moxiecode.com/">TinyMCE</a> web site. If you require commercial support, contact us by email, sales (at) moxiecode (dot) com.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="who"></a>
+	<h2>Who made this software?</h2>
+	<div class="section">
+		<p>
+			The author of TinyMCE is <a href="http://www.moxiecode.com/" target="_blank">Moxiecode Systems</a>, parts of code has also been contributed by others, <a href="credits.html">here</a> are the credits list.
+		</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/images/index.html 4.6rc2/mambots/editors/mostlyce/docs/images/index.html
--- 4.5.4/mambots/editors/mostlyce/docs/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/docs/images/moxiecode.gif and 4.6rc2/mambots/editors/mostlyce/docs/images/moxiecode.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/index.html 4.6rc2/mambots/editors/mostlyce/docs/index.html
--- 4.5.4/mambots/editors/mostlyce/docs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/index.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>TinyMCE Documentation - Index</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>TinyMCE Documentation</h1>
+</div>
+
+<div class="content">
+	<ul class="helpindex">
+		<li><a href="about.html">About TinyMCE</a></li>
+		<li><a href="installing.html">Installation instructions</a></li>
+		<li class="list_subtitle"><strong>Reference</strong></li>
+		<ul>
+			<li><a href="reference_configuration.html">Configuration</a></li>
+			<li><a href="reference_buttons.html">Button/control reference</a></li>
+			<li><a href="reference_javascript_functions.html">JavaScript functions</a></li>
+			<li><a href="reference_plugins.html">Plugins</a></li>
+		</ul>
+		<li class="list_subtitle"><strong>Customization</strong></li>
+		<ul style="padding-bottom: 5px;">
+			<li><a href="customization_plugins.html">Creating a plugin</a></li>
+			<li><a href="customization_language_packs.html">Creating a language pack</a></li>
+			<li><a href="customization_themes.html">Creating a theme</a></li>
+		</ul>
+		<li><a href="compatiblity_chart.html">Compatiblity chart</a></li>
+		<li><a href="faq.html">Frequently asked questions</a></li>
+		<li><a href="credits.html">Credits</a></li>
+		<li><a href="license.html">License (LGPL)</a></li>
+	</ul>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/installation_example_00.html 4.6rc2/mambots/editors/mostlyce/docs/installation_example_00.html
--- 4.5.4/mambots/editors/mostlyce/docs/installation_example_00.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/installation_example_00.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 00</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "simple"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 00</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<form method="post">
+		<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/installation_example_01.html 4.6rc2/mambots/editors/mostlyce/docs/installation_example_01.html
--- 4.5.4/mambots/editors/mostlyce/docs/installation_example_01.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/installation_example_01.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 01</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 01</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
+	<form method="post">
+		<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/installation_example_02.html 4.6rc2/mambots/editors/mostlyce/docs/installation_example_02.html
--- 4.5.4/mambots/editors/mostlyce/docs/installation_example_02.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/installation_example_02.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 02</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	plugins : "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu",
+	theme_advanced_buttons1_add_before : "save,separator",
+	theme_advanced_buttons1_add : "fontselect,fontsizeselect",
+	theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor",
+	theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator",
+	theme_advanced_buttons3_add_before : "tablecontrols,separator",
+	theme_advanced_buttons3_add : "emotions,iespell,flash,advhr,separator,print",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	plugin_insertdate_dateFormat : "%Y-%m-%d",
+	plugin_insertdate_timeFormat : "%H:%M:%S",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+	external_link_list_url : "example_data/example_link_list.js",
+	external_image_list_url : "example_data/example_image_list.js",
+	flash_external_list_url : "example_data/example_flash_list.js"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 02</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
+	<form method="post">
+		<textarea name="content" cols="85" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/installation_example_03.html 4.6rc2/mambots/editors/mostlyce/docs/installation_example_03.html
--- 4.5.4/mambots/editors/mostlyce/docs/installation_example_03.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/installation_example_03.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 02</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright, justifyfull,bullist,numlist,undo,redo,link,unlink",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 02</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
+	<form method="post">
+		<textarea name="content" cols="85" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/installing.html 4.6rc2/mambots/editors/mostlyce/docs/installing.html
--- 4.5.4/mambots/editors/mostlyce/docs/installing.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/installing.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation instructions</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation instructions</h1>
+</div>
+
+<div class="content">
+	<p>Installing TinyMCE is very simple, follow the instructions here. We give a few examples of to integrate TinyMCE, also look at the extensive <a href="reference_configuration.html">options</a> for configuration.</p>
+
+	<div class="separator"></div>
+
+	<h2>Requirements</h2>
+	<div class="section">
+		<p>TinyMCE has no direct requirements except for <a href="compatiblity_chart.html">browser compatibility</a> and of course JavaScript needs to be turned on. There is NO backend code distributed with TinyMCE.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Downloading</h2>
+	<div class="section">
+		<p>For download instructions check our <a href="http://tinymce.moxiecode.com">web site.</a></p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Extracting the archives</h2>
+	<div class="section">
+		<p>On windows you could use <a href="http://www.winzip.com">WinZip</a> or something similar. And on other operating systems such as Linux you simply extract the archive with the tar command. You can find a example on how to extract the archived file on Linux below.</p>
+		<p>
+			You should extract TinyMCE in your wwwroot or site domain root folder
+		</p>
+		<h3>Extract example using a shell:</h3>
+		<div class="example">
+<pre>
+$ cd wwwroot
+$ gzip -d tinymce_1_44.tar.gz
+$ tar xvf tinymce_1_44.tar
+</pre>
+		</div>
+		<p>
+			<h3>A folder structure looking like this is created:</h3>
+		<div class="example">
+<pre>
+/tinymce/
+/tinymce/docs/
+/tinymce/docs/zh_cn/
+/tinymce/examples/
+/tinymce/examples/zh_cn/
+/tinymce/jscripts/
+/tinymce/jscripts/tiny_mce/
+/tinymce/jscripts/tiny_mce/langs/
+/tinymce/jscripts/tiny_mce/plugins/
+/tinymce/jscripts/tiny_mce/plugins/&lt;plugin folders&gt;
+/tinymce/jscripts/tiny_mce/themes/
+/tinymce/jscripts/tiny_mce/themes/advanced/
+/tinymce/jscripts/tiny_mce/themes/default/
+/tinymce/jscripts/tiny_mce/themes/simple/
+</pre>
+		</div>
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Making changes on your web site</h2>
+	<div class="section">
+		<p>Once you have extracted the archive you will need to edit the pages to include the configuration and javascript for TinyMCE. Please note that you should probably only include the TinyMCE javascript on the pages that need it, not all the pages of the web site. Remember to change the URL to the .js below to match your installation path.</p>
+		<p>
+		<h3>The most basic page integration (converts all textarea elements into editors):</h3>
+		<div class="example">
+<pre>
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;TinyMCE Test&lt;/title&gt;
+<strong>&lt;script language=&quot;javascript&quot; type=&quot;text/javascript&quot; src=&quot;../jscripts/tiny_mce/tiny_mce.js&quot;&gt;&lt;/script&gt;
+&lt;script language=&quot;javascript&quot; type=&quot;text/javascript&quot;&gt;
+tinyMCE.init({
+	mode : &quot;textareas&quot;
+});
+&lt;/script&gt;</strong>
+&lt;/head&gt;
+&lt;body&gt;
+&lt;form method=&quot;post&quot;&gt;
+	&lt;textarea name=&quot;content&quot; cols=&quot;50&quot; rows=&quot;15&quot;&gt;This is some content that will be editable with TinyMCE.&lt;/textarea&gt;
+&lt;/form&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre>
+		</div>
+		</p>
+		<p>
+			Here are a few different example of how you could integrate TinyMCE.
+		</p>
+		<p>
+			<ul>
+				<li><a href="installation_example_00.html">Example 00</a> - Simple Theme</li>
+				<li><a href="installation_example_01.html">Example 01</a> - Advanced Theme</li>
+				<li><a href="installation_example_02.html">Example 02</a> - Advanced Theme Full</li>
+				<li><a href="installation_example_03.html">Example 03</a> - Advanced Theme Simplified</li>
+			</ul>
+		</p>
+		<p>
+			If you have any problems, you should check the forum on the <a href="http://tinymce.moxiecode.com/" target="_blank">TinyMCE web site.</a></p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/license.html 4.6rc2/mambots/editors/mostlyce/docs/license.html
--- 4.5.4/mambots/editors/mostlyce/docs/license.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/license.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,465 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>TinyMCE License (LGPL)</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>TinyMCE License (LGPL)</h1>
+</div>
+
+<div class="content">
+<p>
+Visit the <a href="faq.html">FAQ</a> for general answers surrounding TinyMCE. Or visit <a href="http://www.fsf.org" target="_blank">http://www.fsf.org</a> for more information about Open-Source licenses.
+</p>
+<pre>
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+</pre>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_accessibility_focus.html 4.6rc2/mambots/editors/mostlyce/docs/option_accessibility_focus.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_accessibility_focus.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_accessibility_focus.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: accessibility_focus</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: accessibility_focus</h1>
+</div>
+
+<div class="content">
+	<p>
+		If this option is set to true some accessibility focus will available to all buttons, you will be able to tab through them all. If you set this option to false, focus will be placed inside the text area when you tab through the interface.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the accessibility_focus option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>accessibility_focus : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_accessibility_warnings.html 4.6rc2/mambots/editors/mostlyce/docs/option_accessibility_warnings.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_accessibility_warnings.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_accessibility_warnings.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: accessibility_warnings</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: accessibility_warnings</h1>
+</div>
+
+<div class="content">
+	<p>
+		If this option is set to true some accessibility warnings will be presented to the user if they miss specifying that information. This option is set to true default, since we should all try to make this world a better place for disabled people. But if you are annoyed with the warnings, set this option to false.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the accessibility_warnings option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>accessibility_warnings : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_add_form_submit_trigger.html 4.6rc2/mambots/editors/mostlyce/docs/option_add_form_submit_trigger.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_add_form_submit_trigger.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_add_form_submit_trigger.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: add_form_submit_trigger</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: add_form_submit_trigger</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to turn on/off the onsubmit event listener. This feature adds a onsubmit event listener on all forms on the page, if a form is submitted a tinyMCE.triggerSave() JavaScript calls gets executed, this function moves HTML content from the editor iframe and to the hidden form element. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the add_form_submit_trigger option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>add_form_submit_trigger : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_add_unload_trigger.html 4.6rc2/mambots/editors/mostlyce/docs/option_add_unload_trigger.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_add_unload_trigger.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_add_unload_trigger.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: add_unload_trigger</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: add_unload_trigger</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true, page contents will be stored away is the page is unloaded for example is the user navigates away from the page and then navigated back to it by pressing the back button. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the add_unload_trigger option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>add_unload_trigger : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_apply_source_formatting.html 4.6rc2/mambots/editors/mostlyce/docs/option_apply_source_formatting.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_apply_source_formatting.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_apply_source_formatting.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: apply_source_formatting</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: apply_source_formatting</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to tell TinyMCE to apply some source formatting to the output HTML code. This function is disabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the apply_source_formatting option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>apply_source_formatting : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_ask.html 4.6rc2/mambots/editors/mostlyce/docs/option_ask.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_ask.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_ask.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: ask</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: ask</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add a confirmation dialog when focusing textareas. This dialog asks if the focused textarea should be converted into a editor instance or not. It will only ask once since it would get annoying otherwice. The default value of this option is &quot;false&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the ask option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>ask : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_auto_focus.html 4.6rc2/mambots/editors/mostlyce/docs/option_auto_focus.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_auto_focus.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_auto_focus.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: auto_focus</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: auto_focus</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to auto focus a editor instance. The value of this option should be a editor instance id. Editor instance ids are specified as &quot;mce_editor_&lt;index&gt;&quot; where index is a value starting from 0. So if there are 3 editor instances on a page these would have the following ids mce_editor_0, mce_editor_1 and mce_editor_2.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the auto_focus option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>auto_focus : "mce_editor_2"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_auto_reset_designmode.html 4.6rc2/mambots/editors/mostlyce/docs/option_auto_reset_designmode.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_auto_reset_designmode.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_auto_reset_designmode.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: auto_reset_designmode</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: auto_reset_designmode</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is very useful if TinyMCE is used in a DHTML tab system or other divs that are hidden and displayed by some JavaScript. Since Mozilla has a bug when using display:none, the designMode state gets lost. To prevent this from happening you should enable this option. The default value of this option is &quot;true&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the auto_reset_designmode option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>auto_reset_designmode : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_auto_resize.html 4.6rc2/mambots/editors/mostlyce/docs/option_auto_resize.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_auto_resize.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_auto_resize.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: auto_resize</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: auto_resize</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to get the TinyMCE editor area to resize to the bounderies of the contents. This option is very experimental and is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the auto_resize option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>auto_resize : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_browsers.html 4.6rc2/mambots/editors/mostlyce/docs/option_browsers.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_browsers.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_browsers.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: browsers</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: browsers</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of supported browsers. This enables you to for example disable the editor while running on Safari. The default value of this option is: msie,gecko,safari,opera and since the support for Safari is very limited a warning message will appear until a better version is released. The possible values of this option is msie, gecko and safari.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the browsers option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>browsers : "msie,gecko,opera"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_button_tile_map.html 4.6rc2/mambots/editors/mostlyce/docs/option_button_tile_map.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_button_tile_map.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_button_tile_map.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: button_tile_map</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: button_tile_map</h1>
+</div>
+
+<div class="content">
+	<p>
+		If this option is set to true TinyMCE will use tiled images instead of individual images for most of the editor controls. This produces faster loading time since only one GIF image needs to be loaded instead of a GIF for each individual button. This option is set to false by default since it doesn't work with some DOCTYPE declarations.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the button_tile_map option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>button_tile_map : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_cleanup.html 4.6rc2/mambots/editors/mostlyce/docs/option_cleanup.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_cleanup.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_cleanup.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: cleanup</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: cleanup</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to turn on/off the built in cleanup functionality. TinyMCE is equipped with powerful cleanup functionality that enables you to specify what elements and attributes are allowed and how HTML contents should be generated. This option is set to true by default, but if you want to disable it you may set it to false. <strong>Notice: It's not recommended to disable this feature.</strong>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the cleanup option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>cleanup : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_cleanup_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_cleanup_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_cleanup_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_cleanup_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: cleanup_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: cleanup_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add custom cleanup logic to TinyMCE. This function is called when the cleanup process is executed this process occures when the editor saves/submits content, user hits the cleanup button and when the HTML editor dialog is presented. The format of this function is: customCleanup(type, value). Where type can be &quot;get_from_editor&quot; when the contents is extracted from TinyMCE for example when the user submits the form. The &quot;insert_to_editor&quot; type value gets passed when new contents is inserted into the editor on initialization or when the HTML editor dialog commits new content. The &quot;get_from_editor_dom&quot; value is executed when cleanup process has a valid DOM tree and is extracted from the editor. The &quot;insert_to_editor_dom&quot; gets passed when the editor has a valid DOM tree and contents has been inserted into the editor. The example below illustrated all these types.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the cleanup_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomCleanup</strong>(type, value) {
+	switch (type) {
+		case "get_from_editor":
+			alert("Value HTML string: " + value);
+
+			// Do custom cleanup code here
+
+			break;
+
+		case "insert_to_editor":
+			alert("Value HTML string: " + value);
+
+			// Do custom cleanup code here
+
+			break;
+
+		case "get_from_editor_dom":
+			alert("Value DOM Element " + value);
+
+			// Do custom cleanup code here
+
+			break;
+
+		case "insert_to_editor_dom":
+			alert("Value DOM Element: " + value);
+
+			// Do custom cleanup code here
+
+			break;
+	}
+
+	return value;
+}
+
+tinyMCE.init({
+	...
+	<strong>cleanup_callback : "myCustomCleanup"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_cleanup_on_startup.html 4.6rc2/mambots/editors/mostlyce/docs/option_cleanup_on_startup.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_cleanup_on_startup.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_cleanup_on_startup.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: cleanup_on_startup</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: cleanup_on_startup</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true, TinyMCE will perform a HTML cleanup call when the editor loads. This option is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the cleanup_on_startup option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>cleanup_on_startup : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_content_css.html 4.6rc2/mambots/editors/mostlyce/docs/option_content_css.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_content_css.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_content_css.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: content_css</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: content_css</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a custom CSS file that extends the theme content CSS. This CSS file is the one used within the editor (the editable area). The default location of this CSS file is within the current theme. This option can also be a comma separated list of URLs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the content_css option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>content_css : "/mycontent.css"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_convert_fonts_to_spans.html 4.6rc2/mambots/editors/mostlyce/docs/option_convert_fonts_to_spans.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_convert_fonts_to_spans.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_convert_fonts_to_spans.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: convert_fonts_to_spans</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: convert_fonts_to_spans</h1>
+</div>
+
+<div class="content">
+	<p>If you set this option to true, all TinyMCE will convert all font elements to span elements and generate span elements instead of font elements. This option should be used inorder to get more W3C compatible code, since font elements are deprecated. How sizes gets converted can be controlled by the <a href="option_font_size_classes.html">font_size_classes</a> and <a href="option_font_size_style_values.html">font_size_style_values</a> options.</p>
+	<p>
+		More information about this subject can be found in this article: <a href="http://www.microsoft.com/typography/web/designer/face7.htm">What's wrong with FONT FACE</a>
+	</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the convert_fonts_to_spans option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>convert_fonts_to_spans : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_convert_newlines_to_brs.html 4.6rc2/mambots/editors/mostlyce/docs/option_convert_newlines_to_brs.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_convert_newlines_to_brs.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_convert_newlines_to_brs.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: convert_newlines_to_brs</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: convert_newlines_to_brs</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true newline characters codes gets converted in to br elements. This option is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the convert_newlines_to_brs option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>convert_newlines_to_brs : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_convert_urls.html 4.6rc2/mambots/editors/mostlyce/docs/option_convert_urls.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_convert_urls.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_convert_urls.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: convert_urls</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: convert_urls</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to control if TinyMCE is to be clever and restore urls to their original values. URLs are auto converted/messed up by default since the built in browser logic works this way, there is no way to get the real URL unless you store it away. If you set this option to false it will try to keep these URLs intact. This option is set to true by default that means URLs will be forced absolute or relative depending on the state of <a href="option_relative_urls.html">relative_urls</a>.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the convert_urls option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>convert_urls : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_custom_shortcuts.html 4.6rc2/mambots/editors/mostlyce/docs/option_custom_shortcuts.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_custom_shortcuts.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_custom_shortcuts.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_shortcuts</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_shortcuts</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to disable/enable the custom keyboard shortcuts plugins and themes may register. The value of this
+		option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_shortcuts option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_shortcuts : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo.html 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is a true/false option that enables you to disable/enable the custom undo/redo logic within TinyMCE. This option is enabled by default, if you disable it some operations may not be undoable.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo_keyboard_shortcuts.html 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo_keyboard_shortcuts.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo_keyboard_shortcuts.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo_keyboard_shortcuts.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo_keyboard_shortcuts</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo_keyboard_shortcuts</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to disable/enable the usage of keyboard shortcuts for undo/redo. This feature is enabled by default. Keyboard shortcurs are Ctrl+Z for undo, Ctrl+Y for redo.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo_keyboard_shortcuts option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo_keyboard_shortcuts : "false"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo_levels.html 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo_levels.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo_levels.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo_levels.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo_levels</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo_levels</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain the number of undo levels to keep in memory. This is set to -1 by default and such a value tells TinyMCE to use a unlimited number of undo levels. But this steals lots of memory so for low end systems a value of 10 may be better.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo_levels option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo_levels : 10</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo_restore_selection.html 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo_restore_selection.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_custom_undo_redo_restore_selection.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_custom_undo_redo_restore_selection.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo_restore_selection</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo_restore_selection</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the possibility to turn on/off the restoration of the cursor/selection when a undo/redo event occurs. This option is enabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo_restore_selection option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo_restore_selection : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_debug.html 4.6rc2/mambots/editors/mostlyce/docs/option_debug.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_debug.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_debug.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: debug</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: debug</h1>
+</div>
+
+<div class="content">
+	<p>
+		If the value of this option is set to &quot;true&quot; some debugging information will appear such as a list of what CSS files are used. The default value of this option is false.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the debug option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>debug : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_dialog_type.html 4.6rc2/mambots/editors/mostlyce/docs/option_dialog_type.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_dialog_type.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_dialog_type.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: dialog_type</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: dialog_type</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify how dialogs/popups should be opened, possible values are &quot;window&quot; and &quot;modal&quot;, where the window option opens a normal window and the dialog option opens a modal dialog. This option is set to &quot;window&quot; by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the dialog_type option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>dialog_type : "modal"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_directionality.html 4.6rc2/mambots/editors/mostlyce/docs/option_directionality.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_directionality.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_directionality.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: directionality</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: directionality</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option specifies the default writing direction, some languages writes from right to left instead of left to right. The default value of this option is &quot:ltr&quot; but if you want to use from right to left mode specify &quot;rtl&quot; instead.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the directionality option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>directionality : "rtl"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_display_tab_class.html 4.6rc2/mambots/editors/mostlyce/docs/option_display_tab_class.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_display_tab_class.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_display_tab_class.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: display_tab_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: display_tab_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the display_tab_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>display_tab_class : "showTab"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_docs_language.html 4.6rc2/mambots/editors/mostlyce/docs/option_docs_language.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_docs_language.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_docs_language.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: docs_language</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: docs_language</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a language code of the editor documentation to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of &quot;tinymce/jscripts/tiny_mce/theme/&lt;theme used&gt;/docs&quot;. The default value of this option is the value specified in the  &quot;language&quot; option or &quot;en&quot; for English.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the docs_language option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>docs_language : "sv"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_doctype.html 4.6rc2/mambots/editors/mostlyce/docs/option_doctype.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_doctype.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_doctype.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: doctype</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: doctype</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to specify the doctype that is used while editing content within TinyMCE, this defaults to <!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.0 Transitional//EN&quot;>.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the doctype option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>doctype : &quot;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;&quot;</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_document_base_url.html 4.6rc2/mambots/editors/mostlyce/docs/option_document_base_url.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_document_base_url.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_document_base_url.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: document_base_url</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: document_base_url</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to specify the URL from where all URLs will be relative to this option is only used when the <a href="option_relative_urls.html">relative_urls</a> option is set to true. The value of this option is set to the current document by default.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the document_base_url option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>document_base_url : "/somedir/somfile.html"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_editor_css.html 4.6rc2/mambots/editors/mostlyce/docs/option_editor_css.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_editor_css.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_editor_css.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: editor_css</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: editor_css</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the CSS to be used for the editor toolbars/user interface of TinyMCE this option is set to a CSS file found in the currently used theme by default. This CSS contains layout information about panels and buttons used by TinyMCE.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the editor_css option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>editor_css : "/myeditor.css"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_editor_deselector.html 4.6rc2/mambots/editors/mostlyce/docs/option_editor_deselector.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_editor_deselector.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_editor_deselector.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: editor_deselector</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: editor_deselector</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a CSS class name that will be deselect textareas from being converted into editor instances. If this option isn't set to a value this option will not have any effect and the <a href="option_mode.html">mode</a> option will choose textareas instead. The default value of this option is &quot;mceNoEditor&quot; so if mceNoEditor is added to the class attribute of a textarea it will be excluded for convertion.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the editor_deselector option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>editor_deselector : "mceNoEditor"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage in the HTML:</h3>
+	<div class="example">
+<pre>
+&lt;textarea id=&quot;myarea1&quot; class=&quot;<strong>mceNoEditor</strong>&quot;&gt;This will be a NOT be a editor.&lt;/textarea&gt;
+
+&lt;textarea id=&quot;myarea2&quot;&gt;This will be a editor.&lt;/textarea&gt;
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_editor_selector.html 4.6rc2/mambots/editors/mostlyce/docs/option_editor_selector.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_editor_selector.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_editor_selector.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: editor_selector</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: editor_selector</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a CSS class name that will be required on the text areas that is to be converted. This enables you to select specific text areas for convertion by adding this CSS class name to the class attribute of the text area. If this option isn't set to a value this option will not have any effect and the <a href="option_mode.html">mode</a> option will choose textareas instead. If you want all editors to be converted and just specific editors to be excluded check the <a href="option_editor_deselector.html">editor_deselector</a> option.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the editor_selector option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>editor_selector : "mceEditor"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage in the HTML:</h3>
+	<div class="example">
+<pre>
+&lt;textarea id=&quot;myarea1&quot; class=&quot;<strong>mceEditor</strong>&quot;&gt;This will be a editor.&lt;/textarea&gt;
+
+&lt;textarea id=&quot;myarea2&quot;&gt;This will NOT be a editor.&lt;/textarea&gt;
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of element id's to convert into editor instances. This option is only used if <a href="option_mode.html">mode</a> is set to &quot;exact&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>elements : "elm1,elm2"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_encoding.html 4.6rc2/mambots/editors/mostlyce/docs/option_encoding.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_encoding.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_encoding.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: encoding</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: encoding</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to get XML escaped contents out of TinyMCE. Posted content will be converted to a XML string escaping characters such as &lt; &gt; &quot; &amp; to &amp;lt; &amp;gt; &amp;quot; &amp;amp;. This option is set nothing by default and is there for disabled.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the encoding option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>encoding : "xml"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_entities.html 4.6rc2/mambots/editors/mostlyce/docs/option_entities.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_entities.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_entities.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: entities</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: entities</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option contains a comma separated list of entity names that is used instead of characters. Odd items are the character code and even items are the name of the character code. The default value of this option is placed in the example below.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the entities option / default value:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>entities : "160,nbsp,38,amp,34,quot,162,cent,8364,euro,163,pound,165,yen,169,copy,174,reg,8482,trade,8240,permil,181,micro,183,middot,8226,bull,8230,hellip,8242,prime,8243,Prime,167,sect,182,para,223,szlig,8249,lsaquo,8250,rsaquo,171,laquo,187,raquo,8216,lsquo,8217,rsquo,8220,ldquo,8221,rdquo,8218,sbquo,8222,bdquo,60,lt,62,gt,8804,le,8805,ge,8211,ndash,8212,mdash,175,macr,8254,oline,164,curren,166,brvbar,168,uml,161,iexcl,191,iquest,710,circ,732,tilde,176,deg,8722,minus,177,plusmn,247,divide,8260,frasl,215,times,185,sup1,178,sup2,179,sup3,188,frac14,189,frac12,190,frac34,402,fnof,8747,int,8721,sum,8734,infin,8730,radic,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8712,isin,8713,notin,8715,ni,8719,prod,8743,and,8744,or,172,not,8745,cap,8746,cup,8706,part,8704,forall,8707,exist,8709,empty,8711,nabla,8727,lowast,8733,prop,8736,ang,180,acute,184,cedil,170,ordf,186,ordm,8224,dagger,8225,Dagger,192,Agrave,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,202,Ecirc,203,Euml,204,Igrave,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,212,Ocirc,213,Otilde,214,Ouml,216,Oslash,338,OElig,217,Ugrave,219,Ucirc,220,Uuml,376,Yuml,222,THORN,224,agrave,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,234,ecirc,235,euml,236,igrave,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,244,ocirc,245,otilde,246,ouml,248,oslash,339,oelig,249,ugrave,251,ucirc,252,uuml,254,thorn,255,yuml,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,8501,alefsym,982,piv,8476,real,977,thetasym,978,upsih,8472,weierp,8465,image,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8756,there4,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,173,shy,233,eacute,237,iacute,243,oacute,250,uacute,193,Aacute,225,aacute,201,Eacute,205,Iacute,211,Oacute,218,Uacute,221,Yacute,253,yacute"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_entity_encoding.html 4.6rc2/mambots/editors/mostlyce/docs/option_entity_encoding.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_entity_encoding.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_entity_encoding.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: entity_encoding</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: entity_encoding</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option controls how entities/characters gets processed by TinyMCE. The value can be set to numeric, named or raw. Where numeric is numeric representation such as &quot;&amp;#160;&quot; named is entity names such as &quot;&amp;nbsp;&quot; and raw is &quot;&nbsp;&quot;. The default value of this option is named, if named is used the <a href="option_entities.html">entities</a> option will be used to convert the codes into names.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the entity_encoding option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>entity_encoding : "raw"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_event_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_event_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_event_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_event_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: event_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: event_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of elements thay may have event attributes such as onclick and simmilar. This option is needed since some browsers execute these events while editing content. This option is set to &quot;a,img&quot; default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the event_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>event_elements : "a,img,span"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_execcommand_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_execcommand_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_execcommand_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_execcommand_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: execcommand_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: execcommand_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option allows you to add a custom callback function for execCommand handling. This enables you to override internal
+		command functions in TinyMCE. The example below shows how the mceLink and mceImage are overriden.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the execcommand_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomExecCommandHandler</strong>(editor_id, elm, command, user_interface, value) {
+	var linkElm, imageElm, inst;
+
+	switch (command) {
+		case "mceLink":
+			inst = tinyMCE.getInstanceById(editor_id);
+			linkElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "a");
+
+			if (linkElm)
+				alert("Link dialog has been overriden. Found link href: " + tinyMCE.getAttrib(linkElm, "href"));
+			else
+				alert("Link dialog has been overriden.");
+
+			return true;
+
+		case "mceImage":
+			inst = tinyMCE.getInstanceById(editor_id);
+			imageElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "img");
+
+			if (imageElm)
+				alert("Image dialog has been overriden. Found image src: " + tinyMCE.getAttrib(imageElm, "src"));
+			else
+				alert("Image dialog has been overriden.");
+
+			return true;
+	}
+
+	return false; // Pass to next handler in chain
+}
+
+tinyMCE.init({
+	...
+	<strong>execcommand_callback : "myCustomExecCommandHandler"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_extended_valid_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_extended_valid_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_extended_valid_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_extended_valid_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: extended_valid_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: extended_valid_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is very similar to <a href="option_valid_elements.html">valid_elements</a> the only diffrance between this option and valid_elements is that this one gets added to the existing rule set. This can be very useful if the existing rule set is fine but you want to add some specific elements that also should be valid.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the extended_valid_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>extended_valid_elements : "img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_external_image_list_url.html 4.6rc2/mambots/editors/mostlyce/docs/option_external_image_list_url.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_external_image_list_url.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_external_image_list_url.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: external_image_list_url</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: external_image_list_url</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to have a external list of images this list of images can be generated by a server side page and then inserted into the image dialog windows of TinyMCE. The images can be to internal site images or external URLs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the external_image_list_url option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>external_image_list_url : "myexternallist.js"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of a external link list file: (myexternallist.js)</h3>
+	<div class="example">
+<pre>
+var tinyMCEImageList = new Array(
+	// Name, URL
+	["Logo 1", "logo.jpg"],
+	["Logo 2 Over", "logo_over.jpg"]
+);
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_external_link_list_url.html 4.6rc2/mambots/editors/mostlyce/docs/option_external_link_list_url.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_external_link_list_url.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_external_link_list_url.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: external_link_list_url</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: external_link_list_url</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to have a external list of links this list of links can be generated by a server side page and then inserted into the link dialog windows of TinyMCE. The links can be to internal site documents or external URLs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the external_link_list_url option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>external_link_list_url : "myexternallist.js"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of a external link list file: (myexternallist.js)</h3>
+	<div class="example">
+<pre>
+var tinyMCELinkList = new Array(
+	// Name, URL
+	["Moxiecode", "http://www.moxiecode.com"],
+	["Freshmeat", "http://www.freshmeat.com"],
+	["Sourceforge", "http://www.sourceforge.com"]
+);
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_file_browser_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_file_browser_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_file_browser_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_file_browser_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: file_browser_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: file_browser_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add your own file browser/image browser to TinyMCE. This function is executed each time a user clicks on the &quot;browse&quot; buttons in various dialogs. The format of this callback function is: fileBrowser(field_name, url, type, win) where field_name is the id/name of the form element that the browser should insert it's URL into. The url parameter contains the URL value that is currently inside the field. The type parameter contains what type of browser to present this value can be file, image or flash depending on what dialog is calling the function. The win parameter contains a reference to the dialog/window that executes the function.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the file_browser_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomFileBrowser</strong>(field_name, url, type, win) {
+	// Do custom browser logic
+	win.document.forms[0].elements[field_name].value = 'my browser value';
+}
+
+tinyMCE.init({
+	...
+	<strong>file_browser_callback : "myCustomFileBrowser"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_fix_content_duplication.html 4.6rc2/mambots/editors/mostlyce/docs/option_fix_content_duplication.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_fix_content_duplication.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_fix_content_duplication.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: fix_content_duplication</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: fix_content_duplication</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is available since MSIE has a serious bug where the DOM tree sometimes can include the same node twice. This produces duplication of content when the cleanup process runs. This option is enabled by default and removes any duplicated nodes.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the fix_content_duplication option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>fix_content_duplication : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_fix_list_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_fix_list_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_fix_list_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_fix_list_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: fix_list_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: fix_list_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify that list elements UL/OL is to be converted to valid XHTML. This option is disabled by default.<br /><br />
+	<div class="example">
+<pre>
+This invalid list:
+&lt;ol&gt;
+	&lt;li&gt;a&lt;/li&gt;
+	&lt;ol&gt;
+		&lt;li&gt;b&lt;/li&gt;
+		&lt;li&gt;c&lt;/li&gt;
+	&lt;/ol&gt;
+	&lt;li&gt;e&lt;/li&gt;
+&lt;/ol>
+
+Gets converted into this valid list:
+&lt;ol&gt;
+	&lt;li&gt;a
+		&lt;ol&gt;
+			&lt;li>b&lt;/li&gt;
+			&lt;li>c&lt;/li&gt;
+		&lt;/ol&gt;
+	&lt;/li&gt;
+	&lt;li&gt;e&lt;/li&gt;
+&lt;/ol&gt;
+</pre>
+	</div>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the fix_list_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>fix_list_elements : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_fix_table_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_fix_table_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_fix_table_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_fix_table_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: fix_table_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: fix_table_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify that list table elements should be moved outside paragraphs or other block elements. If you enable this option block elements will be split into two chunks when a table is found within it, see the example below for details. This option is disabled by default.<br /><br />
+	<div class="example">
+<pre>
+This invalid table:
+&lt;p&gt;
+a
+&lt;table&gt;
+	&lt;tr>&lt;td&gt;b&lt;/td&gt;&lt;/tr&gt;
+	&lt;tr>&lt;td&gt;c&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+d
+&lt;/p&gt;
+
+Gets converted into this valid XHTML:
+&lt;p&gt;
+a
+&lt;/p&gt;
+&lt;table&gt;
+	&lt;tr>&lt;td&gt;b&lt;/td&gt;&lt;/tr&gt;
+	&lt;tr>&lt;td&gt;c&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+&lt;p&gt;
+d
+&lt;/p&gt;
+</pre>
+	</div>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the fix_table_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>fix_table_elements : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_focus_alert.html 4.6rc2/mambots/editors/mostlyce/docs/option_focus_alert.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_focus_alert.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_focus_alert.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: focus_alert</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: focus_alert</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify if a &quot;Editor is not focused&quot; alert message should appear if the user calls tinyMCE.execCommand and havn't selected a editor instance before. This message will normaly not appear unless some integration has been made. Using tinyMCE.execInstanceCommand prevents this from happening since it auto focuses the editor specified. The default value of this option is &quot;true&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the focus_alert option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>focus_alert : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_font_size_classes.html 4.6rc2/mambots/editors/mostlyce/docs/option_font_size_classes.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_font_size_classes.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_font_size_classes.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: font_size_classes</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: font_size_classes</h1>
+</div>
+
+<div class="content">
+	<p>Comma separated list of class names that is to be used when the user selects font sizes, this option is only used when the <a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a> option is enabled. This list of classes should be 7 items. This option is not used by default, but can be useful if you want to have custom classes for each font size for browser compatiblity.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the font_size_classes option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>font_size_classes : "fontSize1,fontSize2,fontSize3,fontSize4,fontSize5,fontSize6,fontSize7"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_font_size_style_values.html 4.6rc2/mambots/editors/mostlyce/docs/option_font_size_style_values.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_font_size_style_values.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_font_size_style_values.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: font_size_style_values</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: font_size_style_values</h1>
+</div>
+
+<div class="content">
+	<p>Comma separated list of style values that is to be used when the user selects font sizes, this option is only used when the <a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a> option is enabled. This list of style values should be 7 items. This option is not used by default, but can be useful if you want to have custom CSS values for each font size for browser compatiblity. Defaults to: xx-small,x-small,small,medium,large,x-large,xx-large.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the font_size_style_values option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_force_br_newlines.html 4.6rc2/mambots/editors/mostlyce/docs/option_force_br_newlines.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_force_br_newlines.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_force_br_newlines.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: force_br_newlines</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: force_br_newlines</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true, TinyMCE will force BR elements on newlines instead of inserting paragraphs. This option is set to false by default since paragraphs is a much better concept. You can style P elements to be one row by adding p { margin: 0; padding: 0; } to your CSS, P tags where invented for a reason and should be used. <strong>BR elements should only be used when you really have to (mostly never)</strong>.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the force_br_newlines option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>force_br_newlines : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_force_hex_style_colors.html 4.6rc2/mambots/editors/mostlyce/docs/option_force_hex_style_colors.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_force_hex_style_colors.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_force_hex_style_colors.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: force_hex_style_colors</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: force_hex_style_colors</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to control TinyMCE to force the color format to use hexa decimal instead of rgb strings. It converts for example &quot;color: rgb(255, 255, 0)&quot; to &quot;#FFFF00&quot;. This option is set to true by default since otherwice MSIE and Firefox would differ in this behavior.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the force_hex_style_colors option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>force_hex_style_colors : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_force_p_newlines.html 4.6rc2/mambots/editors/mostlyce/docs/option_force_p_newlines.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_force_p_newlines.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_force_p_newlines.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: force_p_newlines</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: force_p_newlines</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to disable/enable the creation of paragraphs on return/enter in Mozilla/Firefox. The default value of this option is true.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the force_p_newlines option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>force_p_newlines : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_handle_event_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_handle_event_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_handle_event_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_handle_event_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: handle_event_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: handle_event_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a function name to be executed each time TinyMCE intercepts and handles a event such as keydown, mousedown and so forth. The format of this function is: handleEvent(event), where inst is the editor instance object reference. If the handle event function returns false it will terminate the internal event handling.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the handle_event_callback option:</h3>
+	<div class="example">
+<pre>
+// Remember to enable the possibility to switch status messages in the browser before trying the example below
+
+function <strong>myHandleEvent</strong>(e) {
+	window.status = "event:" + e.type;
+
+	return true; // Continue handling
+}
+
+tinyMCE.init({
+	...
+	<strong>handle_event_callback : &quot;myHandleEvent&quot;</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_height.html 4.6rc2/mambots/editors/mostlyce/docs/option_height.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_height.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_height.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: height</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: height</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the ability to specify the height of the editor in pixels or percent. This height can be very userful to specify if the editor is used in hidden tabs or if the editor area should be bigger than the replaced element. The default value of this option is set to the height of the HTML element TinyMCE replaces for example the pixel height of a textarea.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the height option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>height : "480"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_hidden_tab_class.html 4.6rc2/mambots/editors/mostlyce/docs/option_hidden_tab_class.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_hidden_tab_class.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_hidden_tab_class.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: hidden_tab_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: hidden_tab_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the hidden_tab_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>hidden_tab_class : "hideTab"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_init_instance_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_init_instance_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_init_instance_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_init_instance_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: init_instance_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: init_instance_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a function name to be executed each time a editor instance is initialized. The format of this function is: initInstance(inst) where inst is the editor instance object reference.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the init_instance_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomInitInstance</strong>(inst) {
+	alert("Editor: " + inst.editorId + " is now initialized.");
+}
+
+tinyMCE.init({
+	...
+	<strong>init_instance_callback : "myCustomInitInstance"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_inline_styles.html 4.6rc2/mambots/editors/mostlyce/docs/option_inline_styles.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_inline_styles.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_inline_styles.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: inline_styles</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: inline_styles</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you enable the inline styles feature by setting this option to true. Most of the attributes gets converted into CSS style attributes instead. This will make the editor output more XHTML strict compatible.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the inline_styles option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>inline_styles : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_insertimage_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_insertimage_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_insertimage_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_insertimage_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: insertimage_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1><span class="marked">(deprecated)</span> Option: insertimage_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This callback was removed in 2.0.3, use <a href="option_execcommand_callback.html">execcommand_callback</a> instead this also enables you to override other things than the image and link dialogs.
+	</p>
+	<p>
+		This option enables you to override the built in functionality for inserting images. This option should contain a function name to be executed when a new image is inserted into TinyMCE. The format of this callback function is: insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action). Where most of these options are self explained the action can be &quot;update&quot; or &quot;insert&quot; depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the insertimage_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomInsertImage</strong>(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action) {
+	var result = new Array();
+
+	// Do some custom logic
+	result['src'] = "logo.jpg";
+	result['alt'] = "test description";
+	result['border'] = "2";
+	result['hspace'] = "5";
+	result['vspace'] = "5";
+	result['width'] = width;
+	result['height'] = height;
+	result['align'] = "right";
+	result['title'] = "Some title";
+	result['onmouseover'] = "";
+	result['onmouseout'] = "";
+
+	return data;
+}
+
+tinyMCE.init({
+	...
+	<strong>insertimage_callback : "myCustomInsertImage"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_insertlink_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_insertlink_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_insertlink_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_insertlink_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: insertlink_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1><span class="marked">(deprecated)</span> Option: insertlink_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This callback was removed in 2.0.3, use <a href="option_execcommand_callback.html">execcommand_callback</a> instead this also enables you to override other things than the image and link dialogs.
+	</p>
+	<p>
+		This option enables you to override the built in functionality for inserting links. This option should contain a function name to be executed when a new link is inserted into TinyMCE. The format of this callback function is: insertLink(href, target, title, onclick, action). Where most of these options are self explained the action can be &quot;update&quot; or &quot;insert&quot; depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the insertlink_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomInsertLink</strong>(href, target, title, onclick, action) {
+	var result = new Array();
+
+	// Do some custom logic
+	result['href'] = "some_page.htm";
+	result['target'] = "_self";
+	result['title'] = "Some link title";
+	result['onclick'] = "";
+
+	return data;
+}
+
+tinyMCE.init({
+	...
+	<strong>insertlink_callback : "myCustomInsertLink"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_invalid_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_invalid_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_invalid_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_invalid_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: invalid_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: invalid_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of element names to exclude from the content. Elements in this list will removed when TinyMCE executes a cleanup.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the invalid_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>invalid_elements : "strong,em"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_language.html 4.6rc2/mambots/editors/mostlyce/docs/option_language.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_language.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_language.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: language</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: language</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a language code of the language pack to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of &quot;tinymce/jscripts/tiny_mce/langs&quot;. The default value of this option is &quot;en&quot; for English.
+	</p>
+
+	<p>
+		If TinyMCE doesn't have a language pack for your language you could always write your own and contribute this back to this project by uploading it as a Patch at <a href="http://sourceforge.net/projects/tinymce/">SourceForge</a>. A description on how to create language packs can be found in <a href="customization_language_packs.html">Language packs</a> section.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the language option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>language : "en"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_merge_styles_invalid_parents.html 4.6rc2/mambots/editors/mostlyce/docs/option_merge_styles_invalid_parents.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_merge_styles_invalid_parents.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_merge_styles_invalid_parents.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: merge_styles_invalid_parents</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: merge_styles_invalid_parents</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to specify a regexp with elements you want to exclude from parent mergeing. By default style information are attached to the parent element of a selection if all childrent/the whole element contents is selected. For example if you select a whole strong element and select a font size, the font-size style will be applied to the strong element and not with a wrapping style element. But sometimes you want to force a span element, this is where this option comes in to place. This option is set to nothing by default and applies to the font size/face/color and class drop drown lists.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the merge_styles_invalid_parents option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	// Excludes table cells and strong elements from any parent merge operation
+	<strong>merge_styles_invalid_parents : "^TD|STRONG$"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_mode.html 4.6rc2/mambots/editors/mostlyce/docs/option_mode.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_mode.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_mode.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: mode</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: mode</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option specifies how elements is to be converted into TinyMCE WYSIWYG editor instances. This option can be set to any of the values below.
+	</p>
+
+	<p>
+		<h3>textareas</h3>
+		Converts all textarea elements to editors when the page loads.
+	</p>
+
+	<p>
+		<h3>specific_textareas</h3>
+		Converts all textarea elements with the a <a href="option_textarea_trigger.html">textarea_trigger</a> attribute set to &quot;true&quot;.
+	</p>
+
+	<p>
+		<h3>exact</h3>
+		exact - Converts only explicit elements, these are listed in the <a href="option_elements.html">elements</a> option. These elements can be any kind for example textareas or divs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the mode option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>mode : "exact",</strong>
+	elements : "elm1,elm2"
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_nowrap.html 4.6rc2/mambots/editors/mostlyce/docs/option_nowrap.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_nowrap.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_nowrap.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: nowrap</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: nowrap</h1>
+</div>
+
+<div class="content">
+	<p>
+		This nowrap option enables you to control how whitespace is to be wordwrapped within the editor. This option is set to false by default, but if you enable it by setting it to true editor contents will never wrap.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the nowrap option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>nowrap : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_object_resizing.html 4.6rc2/mambots/editors/mostlyce/docs/option_object_resizing.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_object_resizing.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_object_resizing.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: object_resizing</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: object_resizing</h1>
+</div>
+
+<div class="content">
+	<p>
+		This true/false option gives you the ability to turn on/off the inline resizing controls of tables and images in Firefox/Mozilla. These are enabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the object_resizing option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>object_resizing : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_onchange_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_onchange_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_onchange_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_onchange_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: onchange_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: onchange_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a function name to be executed each time contents is modified by TinyMCE. This function is called each time a undo level is added to TinyMCE. The format of this function is: onchange(inst), where inst is the editor instance object reference.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the onchange_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomOnChangeHandler</strong>(inst) {
+	alert("Some one modified something");
+	alert("The HTML is now:" + inst.getBody().innerHTML);
+}
+
+tinyMCE.init({
+	...
+	<strong>onchange_callback : "myCustomOnChangeHandler"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_oninit.html 4.6rc2/mambots/editors/mostlyce/docs/option_oninit.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_oninit.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_oninit.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: oninit</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: oninit</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a function name to be executed when all editor instances has finished it's initialization. This is much like the onload event of a HTML page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the oninit option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomOnInit</strong>() {
+	alert("We are ready to rumble!!");
+}
+
+tinyMCE.init({
+	...
+	<strong>oninit : "myCustomOnInit"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_onpageload.html 4.6rc2/mambots/editors/mostlyce/docs/option_onpageload.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_onpageload.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_onpageload.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: onpageload</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: onpageload</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a function name to be executed when the page is loaded but before the TinyMCE instances are created.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the onpageload option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomOnPageLoad</strong>() {
+	alert("We are nearly ready to rumble!!");
+}
+
+tinyMCE.init({
+	...
+	<strong>onpageload : "myCustomOnPageLoad"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_plugins.html 4.6rc2/mambots/editors/mostlyce/docs/option_plugins.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_plugins.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_plugins.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: plugins</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: plugins</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of plugins. Plugins are loaded from the &quot;tinymce/jscripts/tiny_mce/plugins&quot; directory and the plugin name matches the name of the directory. TinyMCE is shipped with some core plugins these are described in greater detail in the <a href="reference_plugins.html">Plugins reference</a>.
+	</p>
+	<p>
+		TinyMCE also supports the ability to have plugins added from a external resource, these plugins needs to be self registrering and loaded after the tinyMCE.init call. You should also prefix these plugins with a &quot;-&quot; character so that TinyMCE doesn't try to load it from the TinyMCE plugins directory.
+	</p>
+
+	<p>
+		There are many third party plugins for TinyMCE some of these may be found under &quot;Plugins&quot; at <a href="http://sourceforge.net/projects/tinymce/">SourceForge</a> and if you have developed one of your own please contribute it to this project by uploading it to SourceForge.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the plugins option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>plugins : &quot;table,contextmenu,paste,-externalplugin&quot;</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_popups_css.html 4.6rc2/mambots/editors/mostlyce/docs/option_popups_css.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_popups_css.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_popups_css.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: popups_css</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: popups_css</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the CSS to be used in all popup/dialog windows within TinyMCE this option is set to a CSS file found in the currently used theme by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the popups_css option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>popups_css : "/mypopup.css"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_preformatted.html 4.6rc2/mambots/editors/mostlyce/docs/option_preformatted.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_preformatted.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_preformatted.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: preformatted</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: preformatted</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you enable this feature, whitespace such as tabs and spaces will be preserved. Much like the bahavior of a PRE element. This can be handy when integrating TinyMCE with webmail clients. This option is disabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the preformatted option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>preformatted : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_relative_urls.html 4.6rc2/mambots/editors/mostlyce/docs/option_relative_urls.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_relative_urls.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_relative_urls.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: relative_urls</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: relative_urls</h1>
+</div>
+
+<div class="content">
+	<p>If this option is set to true, all URLs returned from the MCFileManager will be relative from the specified <a href="option_document_base_url.html">document_base_url</a> if it's set to false all URLs will be converted to absolute URLs. This feature can not be disabled since MSIE and FF modifies the URLs of DOM objects by them self so TinyMCE tries to solve this problem by reconverting them. This option is set to true by default.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the relative_urls option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>relative_urls : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_remove_linebreaks.html 4.6rc2/mambots/editors/mostlyce/docs/option_remove_linebreaks.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_remove_linebreaks.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_remove_linebreaks.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: remove_linebreaks</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: remove_linebreaks</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option controls if linebreak characters should be removed from output HTML or not. This option is enabled by default since many backend systems use newline to &lt;br /&gt; convertion since they used to be plain old textarea based. With this option enables all HTML content will be placed on one line.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the remove_linebreaks option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>remove_linebreaks : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_remove_script_host.html 4.6rc2/mambots/editors/mostlyce/docs/option_remove_script_host.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_remove_script_host.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_remove_script_host.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: remove_script_host</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: remove_script_host</h1>
+</div>
+
+<div class="content">
+	<p>If this option is enabled the protocol and host part of the URLs returned from the MCFileManager will be removed. This option is only used if the <a href="option_relative_urls.html">relative_urls</a> option is set to false. This option is set to true by default.</p>
+	<p>URL:s will be returned in this format: &quot;/somedir/somefile.htm&quot; instead of the default mode: &quot;http://www.somesite.com/somedir/somefile.htm&quot;.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the remove_script_host option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>remove_script_host : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_save_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_save_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_save_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_save_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: save_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: save_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add custom logic to be executed when the contents is extracted/saved. This custom logic can then modify the contents before it's submited to a serverside page. This can be useful if you want to do your own regexp cleanups and so forth. The format of this function is: saveContent(element_id, html, body). Where element id is the form element/div id of the editor and HTML is the HTML contents after the built in cleanup process has executed. This function should return the new HTML contents.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the save_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomSaveContent</strong>(element_id, html, body) {
+	// Do some custom HTML cleanup
+	html = html.replace(/a/g,'b');
+
+	return html;
+}
+
+tinyMCE.init({
+	...
+	<strong>save_callback : "myCustomSaveContent"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_setupcontent_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_setupcontent_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_setupcontent_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_setupcontent_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: setupcontent_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: setupcontent_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to execute custom setup content logic when the editor initializes. The format of this callback is:
+		setupContent(editor_id, body, doc). Where editor_id is the TinyMCE editor instance id the editor instance object reference can be retrived by using tinyMCE.getInstanceById(editor_id). The body parameter is a reference to the iframes body element and doc is the iframes document element. This option is not used if it's not specified.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the setupcontent_callback option:</h3>
+	<div class="example">
+<pre>
+function myCustomSetupContent(editor_id, body, doc) {
+	body.innerHTML = "my new content" + body.innerHTML;
+}
+
+tinyMCE.init({
+	...
+	<strong>setupcontent_callback : "myCustomSetupContent"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_strict_loading_mode.html 4.6rc2/mambots/editors/mostlyce/docs/option_strict_loading_mode.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_strict_loading_mode.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_strict_loading_mode.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Option: strict_loading_mode</title>
+	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: strict_loading_mode</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option will force TinyMCE to load script using a DOM insert method instead of document.write on Gecko browsers. Since this results in asynchronous script loading a build in synchronized will ensure that themes, plugins and language packs files are loaded in the correct order. This will on the otherhand make the initialization procedure of TinyMCE a bit slower thats why this isn't the default behavior. So this option is set to true by default if the document content type is application/xhtml+xml.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the strict_loading_mode option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>strict_loading_mode : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_submit_patch.html 4.6rc2/mambots/editors/mostlyce/docs/option_submit_patch.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_submit_patch.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_submit_patch.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: submit_patch</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: submit_patch</h1>
+</div>
+
+<div class="content">
+	<p>
+		This toggle option enables you to turn on/off the auto patching of the submit function in forms. TinyMCE will auto move contents from the iframe to the hidden textarea field if for example a JavaScript uses a form[0].submit() call. This is the same as using the tinyMCE.triggerSave() call. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the submit_patch option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>submit_patch : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_table_inline_editing.html 4.6rc2/mambots/editors/mostlyce/docs/option_table_inline_editing.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_table_inline_editing.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_table_inline_editing.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: table_inline_editing</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: table_inline_editing</h1>
+</div>
+
+<div class="content">
+	<p>
+		This true/false option gives you the ability to turn on/off the inline table editing controls in Firefox/Mozilla. These controls are somewhat buggy and not redesignable so they are disabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the table_inline_editing option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>table_inline_editing : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_textarea_trigger.html 4.6rc2/mambots/editors/mostlyce/docs/option_textarea_trigger.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_textarea_trigger.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_textarea_trigger.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: textarea_trigger</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: textarea_trigger</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the name of the attribute to check if it's value is true/false. If the <a href="option_mode.html">mode</a> option is set to &quot;specific_textareas&quot;, only specific textareas with a attribute by the name of the value of this option gets converted and only if it's set to true. This option defaults to &quot;mce_editable&quot;.
+	</p>
+
+	<p>
+		If the mode is set to textareas and the textarea trigger attribute value is set to false, these textareas will not be converted.
+	</p>
+
+	<p>
+		<strong>Notice: This option is deprecated.</strong>
+		We strongly recommend you to use the <a href="option_editor_selector.html">editor_selector</a>/<a href="option_editor_deselector.html">editor_deselector</a> options instead since they validate with W3C specifications.<strong>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the textarea_trigger option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>textarea_trigger : "convert_this"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify what theme to use when rendering the TinyMCE WYSIWYG editor instances. This name matches the directories located in &quot;tinymce/jscripts/tiny_mce/themes&quot;. The default value of this option is &quot;advanced&quot;. TinyMCE has three built in themes and these are described in greater detail below.
+	</p>
+
+	<p>
+		<h3>advanced</h3>
+		This is the advanced theme of TinyMCE, this theme enables users to add/remove buttons and panels and is a lot more flexible than the simple or default theme. For more information about this themes specific options check the &quot;Advanced theme&quot; configuration section.
+	</p>
+
+	<p>
+		<h3>simple</h3>
+		This is the most simple theme for TinyMCE it contains only the basic functions.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme : "advanced",</strong>
+	theme_advanced_buttons3_add_before : "tablecontrols,separator"
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_blockformats.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_blockformats.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_blockformats.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_blockformats.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_blockformats</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_blockformats</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of block formats the default value of this option is &quot;p,div,address,pre,h1,h2,h3,h4,h5,h6&quot;. This option is only available if the advanced theme is used.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_blockformats option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6,div,blockquote,dt,dd,code,samp"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_buttons&lt;1-n&gt;</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_buttons&lt;1-n&gt;</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of button/control names to insert into the toolbar. The number 1-n is the row number to insert the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+	<p>
+		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_buttons&lt;1-n&gt; option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_buttons1 : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
+	<strong>theme_advanced_buttons2 : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
+	<strong>theme_advanced_buttons3 : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_buttons&lt;1-n_add&gt;</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_buttons&lt;1-n_add&gt;</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of button/control names to add to the end of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+	<p>
+		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_buttons&lt;1-n&gt;_add option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_buttons1_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
+	<strong>theme_advanced_buttons2_add : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
+	<strong>theme_advanced_buttons3_add : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add_before.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add_before.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add_before.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_buttons_n_add_before.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_buttons&lt;1-n_add_before&gt;</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_buttons&lt;1-n_add_before&gt;</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of button/control names to add to the beginning of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+	<p>
+		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_buttons&lt;1-n&gt;_add_before option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_buttons1_add_before : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
+	<strong>theme_advanced_buttons2_add_before : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
+	<strong>theme_advanced_buttons3_add_before : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_container.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_container.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_container.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_container.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_container_&lt;container&gt;</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_container_&lt;container&gt;</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain buttons/control that you wich to insert into the container, the button names available is the same as in the <a href="option_theme_advanced_buttons_n.html">theme_advanced_buttons_&lt;1-3&gt;</a> option but two extra controls available when this layout option is used these are &quot;mceEditor&quot; and &quot;mceElementpath&quot;. The &lt;container&gt; part of this option should be replaced with a name within the <a href="option_theme_advanced_containers.html">theme_advanced_containers</a> list. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_container_&lt;container&gt; option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_container_somecontainer1 : "bold,italic",</strong>
+	<strong>theme_advanced_container_somecontainer2 : "strikethrough,cut"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_container_align.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_container_align.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_container_align.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_container_align.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_container_align</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_container_&lt;container&gt;_align</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is used to set the alignment of a specific containerer. The &lt;container&gt; part of this option should be replaced with a name within the <a href="option_theme_advanced_containers.html">theme_advanced_containers</a> list. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_container_&lt;container&gt;_align option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_container_somecontainer1_align : "left"</strong>
+	<strong>theme_advanced_container_somecontainer2_align : "right"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_container_class.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_container_class.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_container_class.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_container_class.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_container_&lt;container&gt;_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_container_&lt;container&gt;_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is used to set the class of a specific container. The &lt;container&gt; part of this option should be replaced with a name within the <a href="option_theme_advanced_containers.html">theme_advanced_containers</a> list. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_container_&lt;container&gt;_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_container_somecontainer1_class : "someclass",</strong>
+	<strong>theme_advanced_container_somecontainer2_class : "someotherclass"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_containers.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_containers.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_containers.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_containers.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_containers</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_containers</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of container/panel names. These names are then matched agains the other container options. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_containers option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_containers : "mycontainer1,mycontainer2"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_align.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_align.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_align.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_align.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_containers_default_align</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_containers_default_align</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain the default container/panel alignment this can be a value of &quot;left&quot;, &quot;center&quot; or  &quot;right&quot;. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_containers_default_align option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_containers_default_align : "left"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_class.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_class.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_class.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_containers_default_class.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_containers_default_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_containers_default_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain the default container/panel class name. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_containers_default_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_containers_default_class : "myPanelClass"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_custom_layout.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_custom_layout.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_custom_layout.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_custom_layout.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_custom_layout</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_custom_layout</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is used to specify a custom layout manager function. The format of this function is: customLayout(template) where template is the template array within the advanced theme, this function should return a new template array containing the editor HTML in a key called html. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of &quot;RowLayout&quot;.
+
+		CustomLayout
+		
+		template
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_custom_layout option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomLayout</strong>(template) {
+	// Make custom layout
+	template['html'] = "make new layout";
+
+	return template;
+}
+
+tinyMCE.init({
+	...
+	<strong>theme_advanced_custom_layout : "myCustomLayout"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_disable.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_disable.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_disable.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_disable.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_disable</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_disable</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of controls to disable from any toolbar row/panel in TinyMCE.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_disable option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_disable : "bold,italic"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_fonts.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_fonts.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_fonts.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_fonts.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_fonts</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_fonts</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a semicolon separated list of font titles and font families separated by =. The titles are the ones that get presented to the user in the fonts drop down list and and the font family names is the string that gets inserted into the font face or fontFamily CSS style.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_fonts option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_fonts : "Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_layout_manager.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_layout_manager.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_layout_manager.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_layout_manager.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_layout_manager</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_layout_manager</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to switch button and panel layout functionality. There are three diffrent layout manager options
+		SimpleLayout that is the default layout manager, RowLayout that is the more advanced manager and finaly CustomLayout that executes a custom layout manager function. Each of these layout managers have diffrent options and can be configurated in diffrent ways. This option is only available if the advanced theme is used.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_layout_manager option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_layout_manager : "RowLayout"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_link_targets.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_link_targets.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_link_targets.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_link_targets.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_link_targets</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_link_targets</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a semicolon separated list of link target titles and target names separated by =. The titles are the ones that get presented to the user in the link target drop down list and and the target names is the target that gets inserted as a target attribute.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_link_targets option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_link_targets : "Some frame=someframe;Some other frame=otherframe"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_path.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_path.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_path.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_path.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_path</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_path</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the ability to enable/disable the element path. This option is only useful if the <a href="option_theme_advanced_statusbar_location.html">theme_advanced_statusbar_location</a> option is set to &quot;top&quot; or &quot;bottom&quot;. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_path option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_path : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_path_location.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_path_location.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_path_location.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_path_location.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_path_location</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_path_location</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify where the element path should be located. This option can be set to &quot;top&quot;, &quot;bottom&quot; or &quot;none&quot;. The default value is set to &quot;none&quot;. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_path_location option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_path_location : "bottom"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_resize_horizontal.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_resize_horizontal.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_resize_horizontal.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_resize_horizontal.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Option: theme_advanced_resize_horizontal</title>
+	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_resize_horizontal</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the ability to enable/disable the horizontal resizing. This option is only useful if the <a href="option_theme_advanced_statusbar_location.html">theme_advanced_statusbar_location</a> option is set to &quot;top&quot; or &quot;bottom&quot; and when the <a href="option_theme_advanced_resizing.html">theme_advanced_resizing</a> is set to true. This option is set to true by default, that makes resizing horizontal and vertical.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_resize_horizontal option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_resize_horizontal : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_resizing.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_resizing.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_resizing.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_resizing.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_resizing</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_resizing</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the ability to enable/disable the resizing button. This option is only useful if the <a href="option_theme_advanced_statusbar_location.html">theme_advanced_statusbar_location</a> option is set to &quot;top&quot; or &quot;bottom&quot;. This option is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_resizing option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_resizing : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_resizing_use_cookie.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_resizing_use_cookie.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_resizing_use_cookie.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_resizing_use_cookie.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_resizing_use_cookie</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_resizing_use_cookie</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to disable the storage of editor size in a cookie. By default the editors size is stored and retrived from a cookie.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_resizing_use_cookie option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_resizing_use_cookie : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_height.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_height.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_height.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_height.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_source_editor_height</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_source_editor_height</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is used to define the height of the source editor dialog. This option is set to 400 by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_source_editor_height option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_source_editor_height : "600"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_width.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_width.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_width.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_width.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_source_editor_width</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_source_editor_width</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is used to define the width of the source editor dialog. This option is set to 500 by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_source_editor_width option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_source_editor_width : "700"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_wrap.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_wrap.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_wrap.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_source_editor_wrap.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_source_editor_wrap</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_source_editor_wrap</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to force word wrap for the source editor, this option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_source_editor_wrap option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_source_editor_wrap : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_statusbar_location.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_statusbar_location.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_statusbar_location.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_statusbar_location.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_statusbar_location</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_statusbar_location</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify where the element statusbar with the path and resize tool should be located. This option can be set to &quot;top&quot;, &quot;bottom&quot; or &quot;none&quot;. The default value is set to &quot;none&quot;. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_statusbar_location option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_statusbar_location : "bottom"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_styles.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_styles.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_styles.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_styles.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_styles</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_styles</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted. If this option isn't defined TinyMCE auto imports the classes from the content CSS.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_styles option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_align.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_align.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_align.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_align.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_toolbar_align</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_toolbar_align</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the alignment of the toolbar, this value can be left, right or center the default value is center. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_toolbar_align option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_toolbar_align : "left"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_location.html 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_location.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_location.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_theme_advanced_toolbar_location.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_toolbar_location</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_toolbar_location</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify where the toolbar should be located. This option can be set to &quot;top&quot; or &quot;bottom&quot;. The default value is set to &quot;bottom&quot;. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of &quot;SimpleLayout&quot;.
+	</p>
+	<p>
+		There is a special &quot;external&quot; location, this option adds the toolbar to a DIV element and sets the class of this DIV to &quot;mceToolbarExternal&quot;. This enables you to freely specify the location of the toolbar.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_toolbar_location option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_toolbar_location : "top"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_trim_span_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_trim_span_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_trim_span_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_trim_span_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<title>Option: trim_span_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: trim_span_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option controls if spans without attributes will be removed or not. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the trim_span_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>trim_span_elements : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_urlconverter_callback.html 4.6rc2/mambots/editors/mostlyce/docs/option_urlconverter_callback.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_urlconverter_callback.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_urlconverter_callback.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: urlconverter_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: urlconverter_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enable you to add your own URL converter logic. This option should contain a JavaScript function name. The format of this converter function is: URLConverter(url, node, on_save). There URL is the URL string to convert, node is the element that contains the URL that is to be converted this parameter may be set to null if there is no element for the URL and on_save is set to true when contents is to be extracted from the editor for example when the user submits the HTML form. This function should return the converted URL as a string. This option is set to a internal TinyMCE function &quot;TinyMCE.prototype.convertURL&quot; by default. You may call this function from your extention inorder to use the built in convert options.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the urlconverter_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomURLConverter</strong>(url, node, on_save) {
+	// Do some custom URL convertion
+	url = url.substring(3);
+
+	// Return new URL
+	return url;
+}
+
+tinyMCE.init({
+	...
+	<strong>urlconverter_callback : "myCustomURLConverter"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_valid_elements.html 4.6rc2/mambots/editors/mostlyce/docs/option_valid_elements.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_valid_elements.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_valid_elements.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,348 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: valid_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: valid_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list element convertion chunks. Each chunk contains information about how one element and it's attributes should be treated. The default rule set for this option is specified below.
+	</p>
+	<p>
+		
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Control characters:</td></thead>
+			 <tbody>
+				 <tr><td><strong>,</strong></td><td>Separates element chunk definitions.</td></tr>
+				 <tr><td><strong>/</strong></td><td>Separates element synonymous. The first element is the one that will be outputted.</td></tr>
+				 <tr><td><strong>|</strong></td><td>Separates attribute definitions.</td></tr>
+				 <tr><td><strong>[</strong></td><td>Starts a new attribute list for a element definition.</td></tr>
+				 <tr><td><strong>]</strong></td><td>Ends a attribute list for a element definition.</td></tr>
+				 <tr><td><strong>=</strong></td><td>Makes the attribute to default to the specified value. For example &quot;target=_blank&quot;</td></tr>
+				 <tr><td><strong>:</strong></td><td>Makes the attribute to be forced to the specified value. For example &quot;border:0&quot;</td></tr>
+				 <tr><td><strong>&lt;</strong></td><td>Verifies the value of a attribute. For example &quot;target&lt;_blank?_self&quot;</td></tr>
+				 <tr><td><strong>?</strong></td><td>Separates attribute verification values, see above.</td></tr>
+				 <tr><td><strong>+</strong></td><td>Makes the element open if no child nodes exists. Example: +a.</td></tr>
+				 <tr><td><strong>-</strong></td><td>Enables removal of empty elements such as &gt;strong /&lt;. Example: -strong.</td></tr>
+				 <tr><td><strong>#</strong></td><td>Enables padding of empty elements, this will padd with &amp;nbsp; if they are empty. Example: #p.</td></tr>
+			</tbody>
+		</table>
+		Wildcards such as *,+,? may be used in element or attribute name matching. 
+	</p>
+	<p>
+		Special variables:<br />
+		<strong>{$uid}</strong> Results in a unique ID. For example &quot;p[id:{$uid}]&quot;.<br />
+		<br />
+		Use *[*] to include all elements and all attributes this can be very useful when used with the <a href="option_invalid_elements.html">invalid_elements</a> option.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the valid_elements option:</h3>
+	<p>
+		This example string tells TinyMCE to remove all elements that are not a "a, strong, div or br" element, convert b elements to strong elements, default target to "_blank" and keep the href, target and align attributes of the elements.
+	</p>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>valid_elements : "a[href|target=_blank],strong/b,div[align],br"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Default rule set:</h3>
+	<p>
+		This is the default string used by TinyMCE to cleanup the HTML contents.
+	</p>
+	<div class="example">
+<pre>
++a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Full XHTML rule set:</h3>
+	<p>
+		The following will validate that the page complies fully with the XHTML specification. 
+	</p>
+	<div class="example">
+<pre>
+valid_elements : &quot;&quot;
++&quot;a[accesskey|charset|class|coords|dir&lt;ltr?rtl|href|hreflang|id|lang|name&quot;
+  +&quot;|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|rel|rev&quot;
+  +&quot;|shape&lt;circle?default?poly?rect|style|tabindex|title|target|type],&quot;
++&quot;abbr[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;acronym[class|dir&lt;ltr?rtl|id|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;address[class|align|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;applet[align&lt;bottom?left?middle?right?top|alt|archive|class|code|codebase&quot;
+  +&quot;|height|hspace|id|name|object|style|title|vspace|width],&quot;
++&quot;area[accesskey|alt|class|coords|dir&lt;ltr?rtl|href|id|lang|nohref&lt;nohref&quot;
+  +&quot;|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup&quot;
+  +&quot;|shape&lt;circle?default?poly?rect|style|tabindex|title|target],&quot;
++&quot;base[href|target],&quot;
++&quot;basefont[color|face|id|size],&quot;
++&quot;bdo[class|dir&lt;ltr?rtl|id|lang|style|title],&quot;
++&quot;big[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;blockquote[dir|style|cite|class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick&quot;
+  +&quot;|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout&quot;
+  +&quot;|onmouseover|onmouseup|style|title],&quot;
++&quot;body[alink|background|bgcolor|class|dir&lt;ltr?rtl|id|lang|link|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|onunload|style|title|text|vlink],&quot;
++&quot;br[class|clear&lt;all?left?none?right|id|style|title],&quot;
++&quot;button[accesskey|class|dir&lt;ltr?rtl|disabled&lt;disabled|id|lang|name|onblur&quot;
+  +&quot;|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onmousedown&quot;
+  +&quot;|onmousemove|onmouseout|onmouseover|onmouseup|style|tabindex|title|type&quot;
+  +&quot;|value],&quot;
++&quot;caption[align&lt;bottom?left?right?top|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;center[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;cite[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;code[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;col[align&lt;center?char?justify?left?right|char|charoff|class|dir&lt;ltr?rtl|id&quot;
+  +&quot;|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown&quot;
+  +&quot;|onmousemove|onmouseout|onmouseover|onmouseup|span|style|title&quot;
+  +&quot;|valign&lt;baseline?bottom?middle?top|width],&quot;
++&quot;colgroup[align&lt;center?char?justify?left?right|char|charoff|class|dir&lt;ltr?rtl&quot;
+  +&quot;|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown&quot;
+  +&quot;|onmousemove|onmouseout|onmouseover|onmouseup|span|style|title&quot;
+  +&quot;|valign&lt;baseline?bottom?middle?top|width],&quot;
++&quot;dd[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;del[cite|class|datetime|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;dfn[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;dir[class|compact&lt;compact|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;div[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;dl[class|compact&lt;compact|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;dt[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;em/i[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;fieldset[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;font[class|color|dir&lt;ltr?rtl|face|id|lang|size|style|title],&quot;
++&quot;form[accept|accept-charset|action|class|dir&lt;ltr?rtl|enctype|id|lang&quot;
+  +&quot;|method&lt;get?post|name|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onsubmit&quot;
+  +&quot;|style|title|target],&quot;
++&quot;frame[class|frameborder|id|longdesc|marginheight|marginwidth|name&quot;
+  +&quot;|noresize&lt;noresize|scrolling&lt;auto?no?yes|src|style|title],&quot;
++&quot;frameset[class|cols|id|onload|onunload|rows|style|title],&quot;
++&quot;h1[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;h2[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;h3[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;h4[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;h5[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;h6[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;head[dir&lt;ltr?rtl|lang|profile],&quot;
++&quot;hr[align&lt;center?left?right|class|dir&lt;ltr?rtl|id|lang|noshade&lt;noshade|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|size|style|title|width],&quot;
++&quot;html[dir&lt;ltr?rtl|lang|version],&quot;
++&quot;iframe[align&lt;bottom?left?middle?right?top|class|frameborder|height|id&quot;
+  +&quot;|longdesc|marginheight|marginwidth|name|scrolling&lt;auto?no?yes|src|style&quot;
+  +&quot;|title|width],&quot;
++&quot;img[align&lt;bottom?left?middle?right?top|alt|border|class|dir&lt;ltr?rtl|height&quot;
+  +&quot;|hspace|id|ismap&lt;ismap|lang|longdesc|name|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|src|style|title|usemap|vspace|width],&quot;
++&quot;input[accept|accesskey|align&lt;bottom?left?middle?right?top|alt&quot;
+  +&quot;|checked&lt;checked|class|dir&lt;ltr?rtl|disabled&lt;disabled|id|ismap&lt;ismap|lang&quot;
+  +&quot;|maxlength|name|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onselect&quot;
+  +&quot;|readonly&lt;readonly|size|src|style|tabindex|title&quot;
+  +&quot;|type&lt;button?checkbox?file?hidden?image?password?radio?reset?submit?text&quot;
+  +&quot;|usemap|value],&quot;
++&quot;ins[cite|class|datetime|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;isindex[class|dir&lt;ltr?rtl|id|lang|prompt|style|title],&quot;
++&quot;kbd[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;label[accesskey|class|dir&lt;ltr?rtl|for|id|lang|onblur|onclick|ondblclick&quot;
+  +&quot;|onfocus|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout&quot;
+  +&quot;|onmouseover|onmouseup|style|title],&quot;
++&quot;legend[align&lt;bottom?left?right?top|accesskey|class|dir&lt;ltr?rtl|id|lang&quot;
+  +&quot;|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;li[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title|type&quot;
+  +&quot;|value],&quot;
++&quot;link[charset|class|dir&lt;ltr?rtl|href|hreflang|id|lang|media|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|rel|rev|style|title|target|type],&quot;
++&quot;map[class|dir&lt;ltr?rtl|id|lang|name|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;menu[class|compact&lt;compact|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;meta[content|dir&lt;ltr?rtl|http-equiv|lang|name|scheme],&quot;
++&quot;noframes[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;noscript[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;object[align&lt;bottom?left?middle?right?top|archive|border|class|classid&quot;
+  +&quot;|codebase|codetype|data|declare|dir&lt;ltr?rtl|height|hspace|id|lang|name&quot;
+  +&quot;|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|standby|style|tabindex|title|type|usemap&quot;
+  +&quot;|vspace|width],&quot;
++&quot;ol[class|compact&lt;compact|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|start|style|title|type],&quot;
++&quot;optgroup[class|dir&lt;ltr?rtl|disabled&lt;disabled|id|label|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;option[class|dir&lt;ltr?rtl|disabled&lt;disabled|id|label|lang|onclick|ondblclick&quot;
+  +&quot;|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout&quot;
+  +&quot;|onmouseover|onmouseup|selected&lt;selected|style|title|value],&quot;
++&quot;p[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;param[id|name|type|value|valuetype&lt;DATA?OBJECT?REF],&quot;
++&quot;pre/listing/plaintext/xmp[align|class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick&quot;
+  +&quot;|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout&quot;
+  +&quot;|onmouseover|onmouseup|style|title|width],&quot;
++&quot;q[cite|class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;s[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;samp[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;script[charset|defer|language|src|type],&quot;
++&quot;select[class|dir&lt;ltr?rtl|disabled&lt;disabled|id|lang|multiple&lt;multiple|name&quot;
+  +&quot;|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|size|style&quot;
+  +&quot;|tabindex|title],&quot;
++&quot;small[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;span[align&lt;center?justify?left?right|class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;strike[class|class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title],&quot;
++&quot;strong/b[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;style[dir&lt;ltr?rtl|lang|media|title|type],&quot;
++&quot;sub[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;sup[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title],&quot;
++&quot;table[align&lt;center?left?right|bgcolor|border|cellpadding|cellspacing|class&quot;
+  +&quot;|dir&lt;ltr?rtl|frame|height|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|rules&quot;
+  +&quot;|style|summary|title|width],&quot;
++&quot;tbody[align&lt;center?char?justify?left?right|char|class|charoff|dir&lt;ltr?rtl|id&quot;
+  +&quot;|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown&quot;
+  +&quot;|onmousemove|onmouseout|onmouseover|onmouseup|style|title&quot;
+  +&quot;|valign&lt;baseline?bottom?middle?top],&quot;
++&quot;td[abbr|align&lt;center?char?justify?left?right|axis|bgcolor|char|charoff|class&quot;
+  +&quot;|colspan|dir&lt;ltr?rtl|headers|height|id|lang|nowrap&lt;nowrap|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|rowspan|scope&lt;col?colgroup?row?rowgroup&quot;
+  +&quot;|style|title|valign&lt;baseline?bottom?middle?top|width],&quot;
++&quot;textarea[accesskey|class|cols|dir&lt;ltr?rtl|disabled&lt;disabled|id|lang|name&quot;
+  +&quot;|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onselect&quot;
+  +&quot;|readonly&lt;readonly|rows|style|tabindex|title],&quot;
++&quot;tfoot[align&lt;center?char?justify?left?right|char|charoff|class|dir&lt;ltr?rtl|id&quot;
+  +&quot;|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown&quot;
+  +&quot;|onmousemove|onmouseout|onmouseover|onmouseup|style|title&quot;
+  +&quot;|valign&lt;baseline?bottom?middle?top],&quot;
++&quot;th[abbr|align&lt;center?char?justify?left?right|axis|bgcolor|char|charoff|class&quot;
+  +&quot;|colspan|dir&lt;ltr?rtl|headers|height|id|lang|nowrap&lt;nowrap|onclick&quot;
+  +&quot;|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove&quot;
+  +&quot;|onmouseout|onmouseover|onmouseup|rowspan|scope&lt;col?colgroup?row?rowgroup&quot;
+  +&quot;|style|title|valign&lt;baseline?bottom?middle?top|width],&quot;
++&quot;thead[align&lt;center?char?justify?left?right|char|charoff|class|dir&lt;ltr?rtl|id&quot;
+  +&quot;|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown&quot;
+  +&quot;|onmousemove|onmouseout|onmouseover|onmouseup|style|title&quot;
+  +&quot;|valign&lt;baseline?bottom?middle?top],&quot;
++&quot;title[dir&lt;ltr?rtl|lang],&quot;
++&quot;tr[abbr|align&lt;center?char?justify?left?right|bgcolor|char|charoff|class&quot;
+  +&quot;|rowspan|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title|valign&lt;baseline?bottom?middle?top],&quot;
++&quot;tt[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;u[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup&quot;
+  +&quot;|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],&quot;
++&quot;ul[class|compact&lt;compact|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown&quot;
+  +&quot;|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover&quot;
+  +&quot;|onmouseup|style|title|type],&quot;
++&quot;var[class|dir&lt;ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress&quot;
+  +&quot;|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style&quot;
+  +&quot;|title]&quot;
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_verify_css_classes.html 4.6rc2/mambots/editors/mostlyce/docs/option_verify_css_classes.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_verify_css_classes.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_verify_css_classes.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: verify_css_classes</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1><span class="marked">(Removed)</span>Option: verify_css_classes</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you enable this function, class names placed in class attributes will be verified agains the content CSS. So elements with a class attribute containing a class that doesn't exist in the CSS will be removed.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the verify_css_classes option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>verify_css_classes : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_verify_html.html 4.6rc2/mambots/editors/mostlyce/docs/option_verify_html.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_verify_html.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_verify_html.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: verify_html</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: verify_html</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enabled or disables the element cleanup functionality. If you set this option to false, all element cleanup will be skipped but other cleanup functionality such as URL convertion will still be executed.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the verify_html option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>verify_html : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_visual.html 4.6rc2/mambots/editors/mostlyce/docs/option_visual.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_visual.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_visual.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: visual</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: visual</h1>
+</div>
+
+<div class="content">
+	<p>
+		This true/false option gives you the ability to turn on/off the visual aid for border less tables. If a the border of a table is set to 0 TinyMCE adds a dotted line around the table by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the visual option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>visual : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_visual_table_class.html 4.6rc2/mambots/editors/mostlyce/docs/option_visual_table_class.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_visual_table_class.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_visual_table_class.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: visual_table_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: visual_table_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify what CSS class to use for presenting visual aids for border less tables. The default value of this option is set to &quot;mceVisualAid&quot;.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the visual_table_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>visual_table_class : "myCustomVisualAidTableClass"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/option_width.html 4.6rc2/mambots/editors/mostlyce/docs/option_width.html
--- 4.5.4/mambots/editors/mostlyce/docs/option_width.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/option_width.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: width</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: width</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the ability to specify the width of the editor in pixels or percent. This width can be very useful to specify if the editor is used in hidden tabs or if the editor area should be bigger than the replaced element. The default value of this option is set to the width of the HTML element TinyMCE replaces for example the pixel width of a textarea.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the width option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>width : "640"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_advhr.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_advhr.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_advhr.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_advhr.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: advhr</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: advhr</h1>
+</div>
+
+<div class="content">
+	<p>This is a more advanced hr dialog contributed by Michael Keck. This hr plugin supports noshade, width and size.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the advhr directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;advhr&quot;.</li>
+		<li>Add this &quot;hr[class|width|size|noshade]&quot; to extended_valid_elements option.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;advhr&quot;,
+	theme_advanced_buttons1_add : &quot;advhr&quot;,
+	extended_valid_elements : &quot;hr[class|width|size|noshade]&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_advimage.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_advimage.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_advimage.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_advimage.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: advimage</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: advimage</h1>
+</div>
+
+<div class="content">
+	<p>This is a more advanced image dialog mostly based on code contributed by Michael Keck. This one supports mouseover/out image swapping.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the advimage directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;advimage&quot;.</li>
+		<li>Add this &quot;a[name|href|target|title|onclick]&quot; to extended_valid_elements option.</li>
+	</ul>
+	</p>
+
+	<p>
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Advimage plugin options</td></thead>
+			 <tbody>
+				 <tr><td><strong>advimage_styles</strong></td><td>This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted.</td></tr>
+				 <tr><td><strong>advimage_update_dimensions_onchange</strong></td><td>This option enables you to control if the image dimensions should be updated with new data if the image src field is changed. This option is enabled by default.</td></tr>
+			</tbody>
+		</table>
+		<br />
+	</p>
+
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;preview&quot;
+});
+</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_advlink.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_advlink.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_advlink.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_advlink.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: advlink</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: advlink</h1>
+</div>
+
+<div class="content">
+	<p>This is a more advanced link dialog mostly based on code contributed by Michael Keck. This link plugin supports popup windows and targets.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the advlink directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;advlink&quot;.</li>
+		<li>Add this &quot;a[name|href|target|title|onclick]&quot; to extended_valid_elements option.</li>
+	</ul>
+
+	<p>
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Advlink plugin options</td></thead>
+			 <tbody>
+				 <tr><td><strong>advlink_styles</strong></td><td>This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted.</td></tr>
+			</tbody>
+		</table>
+		<br />
+	</p>
+
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;advlink&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_autosave.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_autosave.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_autosave.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_autosave.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: autosave</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: autosave</h1>
+</div>
+
+<div class="content">
+	<p>This plugin gives the user a warning if they made modifications to a editor instance but didn't submit them. This plugin will most likely be extended in the future to provide AJAX auto save support.</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>autosave</strong>&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_contextmenu.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_contextmenu.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_contextmenu.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_contextmenu.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: contextmenu</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: contextmenu</h1>
+</div>
+
+<div class="content">
+	<p></p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the contextmenu directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;contextmenu&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;contextmenu&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_directionality.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_directionality.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_directionality.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_directionality.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: directionality</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: directionality</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds directionality icons to TinyMCE that enables TinyMCE to better handle languages that is written from right to left.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;directionality&quot;.</li>
+		<li>Add the ltr, rtl button names to button list, example: theme_advanced_buttons3_add : &quot;ltr,rtl&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>directionality</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>ltr,rtl</strong>&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_emotions.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_emotions.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_emotions.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_emotions.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: emotions</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: emotions</h1>
+</div>
+
+<div class="content">
+	<p>The emotions plugin is able to insert smiley images into the TinyMCE editable area.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the emotions directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;emotions&quot;.</li>
+		<li>Add the emotions button name to button list, example: theme_advanced_buttons3_add : &quot;emotions&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;emotions&quot;,
+	theme_advanced_buttons3_add : &quot;emotions&quot;
+});</pre>
+	</div>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Copyright notice</h3>
+	<p>
+	These emotions where taken from Mozilla Thunderbird. I hope they don't get angry if I use them here after all this is a open source project aswell and I realy love their product.
+	</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_flash.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_flash.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_flash.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_flash.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: flash</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: flash</h1>
+</div>
+
+<div class="content">
+	<p>This is the &quot;Insert Flash&quot; Dialog, it enables users to insert flash movies into TinyMCE.</p>
+	<p>You can control the wmode, quality and menu by setting the flash_wmode, flash_quality and flash_menu options.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the flash directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;flash&quot;.</li>
+		<li>Add this &quot;img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]&quot; to extended_valid_elements option.</li>
+		<li>Add the flash button name to button list, example: theme_advanced_buttons3_add : &quot;flash&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;flash&quot;,
+	extended_valid_elements : &quot;img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]&quot;
+	flash_external_list_url : &quot;example_flash_list.js&quot;, // Optional URL to a list of SWF movies
+	flash_wmode : &quot;transparent&quot;,
+	flash_quality : &quot;high&quot;,
+	flash_menu : &quot;false&quot;
+});</pre>
+	</div>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Additional note</h3>
+	<p>
+	The flash plugin has been heavily modified (the original is editor_plugin_original.js) since the original did not play nicely with html content that already contained existing flash tags and in fact stripped out the object
+	tags for existing flash html. The rewrite corrects this as well attempts
+	to preserve the existing flash tags where possible. The tinyMCE.init call
+	should be be something like: 
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;flash&quot;,
+	extended_valid_elements : &quot;img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]&quot;
+});</pre>
+	</div>
+	</p>
+	<p>Note the extra obj,param,embed attributes for the img tag. These attributes
+	are used to serialize data from existing flash tags so that they can be
+	properly restored. Editing a flash tag with the plugin will cause this
+	information to be lost (sorry!) but still produces a working flash nevertheless.	
+	</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_fullpage.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_fullpage.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_fullpage.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_fullpage.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: fullpage</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: fullpage</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds fullpage editing support. This enables you to edit whole documents with both head and body.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;fullpage&quot;.</li>
+		<li>Add the fullpage button name to button list, example: theme_advanced_buttons3_add : &quot;fullpage&quot;.</li>
+	</ul>
+	</p>
+
+	<p>
+	<h3>Options</h3>
+	</p>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>[fullpage_doctypes]</td>
+		<td>This is a name/value list of possible document types. The value format of this option is name=value,name=value. These document types will be presented in the document type selection list. The default value of this option is: XHTML 1.0 Transitional=&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;,XHTML 1.0 Frameset=&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Frameset//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd&quot;&gt;,XHTML 1.0 Strict=&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;,XHTML 1.1=&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.1//EN&quot; &quot;http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd&quot;&gt;&quot;&gt;,HTML 4.01 Transitional=&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;,HTML 4.01 Strict=&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;,HTML 4.01 Frameset=&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01 Frameset//EN&quot; &quot;http://www.w3.org/TR/html4/frameset.dtd&quot;&gt;.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_fonts]</td>
+		<td>This option enables you specify what font family style values that can be added to the body element. The value format of this option is name=value;name=value. The default value of this option is:	Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings
+		</td>
+	</tr>
+	<tr>
+		<td>[fullpage_fontsizes]</td>
+		<td>This is a comma separated list of possible font sizes for the style attribute of the body element. This option defaults to: 10px,11px,12px,13px,14px,15px,16px.</td>
+	</tr>
+<!--	<tr>
+		<td>[fullpage_media_types]</td>
+		<td>This is a name/value list of possible media types. The default value of this option is: all=all,screen=screen,print=print,tty=tty,tv=tv,projection=projection,handheld=handheld,braille=braille,aural=aural.</td>
+	</tr> -->
+	<tr>
+		<td>[fullpage_encodings]</td>
+		<td>This option enables you to specify what the document character encoding sets the user may select from. The default value of this option is: Western european (iso-8859-1)=iso-8859-1,Central European (iso-8859-2)=iso-8859-2,Unicode (UTF-8)=utf-8,Chinese traditional (Big5)=big5,Cyrillic (iso-8859-5)=iso-8859-5,Japanese (iso-2022-jp)=iso-2022-jp,Greek (iso-8859-7)=iso-8859-7,Korean (iso-2022-kr)=iso-2022-kr,ASCII (us-ascii)=us-ascii
+		</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_doctype]</td>
+		<td>This option enables you to specify the default doctype for the output HTML.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_encoding]</td>
+		<td>This option enables you to specify the default encoding for the output HTML.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_title]</td>
+		<td>This option enables you to specify the default title for the output HTML.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_font_size]</td>
+		<td>This option enables you to specify the default font size for body element.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_font_family]</td>
+		<td>This option enables you to specify the default font family for body element.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_text_color]</td>
+		<td>This option enables you to specify the default text color for body element.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_langcode]</td>
+		<td>This option enables you to specify the default langcode for the output HTML.</td>
+	</tr>
+	<tr>
+		<td>[fullpage_default_xml_pi]</td>
+		<td>This option enables you to specify if a XML declaration should be added or not true/false option.</td>
+	</tr>
+	</table>
+	</p>
+	<p>
+	<h3>Initialization Example</h3>
+	</p>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>fullpage</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>fullpage</strong>&quot;,
+	fullpage_fontsizes : '13px,14px,15px,18pt,xx-large',
+	fullpage_default_xml_pi : false,
+	fullpage_default_langcode : 'en',
+	fullpage_default_title : "My document title"
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_fullscreen.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_fullscreen.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_fullscreen.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_fullscreen.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: fullscreen</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: fullscreen</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds fullscreen editing mode to TinyMCE.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;fullscreen&quot;.</li>
+		<li>Add the fullscreen button name to button list, example: theme_advanced_buttons3_add : &quot;fullscreen&quot;.</li>
+	</ul>
+	</p>
+
+	<p>
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Fullscreen plugin options</td></thead>
+			 <tbody>
+				  <tr><td><strong>fullscreen_settings</strong></td><td>This option gives you the ability to have diffrent settings applied when the editor is in fullscreen mode for example more tools.</td></tr>
+			</tbody>
+		</table>
+		<br />
+	</p>
+
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>fullscreen</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>fullscreen</strong>&quot;,
+	fullscreen_settings : {
+		theme_advanced_path_location : "top"
+	}
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_iespell.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_iespell.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_iespell.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_iespell.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: iespell</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: iespell</h1>
+</div>
+
+<div class="content">
+	<p></p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the iespell directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;iespell&quot;.</li>
+		<li>Add the iespell button name to button list, example: theme_advanced_buttons3_add : &quot;iespell&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;iespell&quot;,
+	theme_advanced_buttons3_add : &quot;iespell&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_inlinepopups.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_inlinepopups.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_inlinepopups.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_inlinepopups.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: inlinepopups</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: inlinepopups</h1>
+</div>
+
+<div class="content">
+	<p>This plugin makes all dialogs to open as floating DIV layers instead of popup windows. This option can be very useful inorder to get around popup blockers. This plugin should be treated as experimental since it's not 100% compatible yet.</p>
+
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;inlinepopups&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_insertdatetime.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_insertdatetime.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_insertdatetime.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_insertdatetime.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,107 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: insertdatetime</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: insertdatetime</h1>
+</div>
+
+<div class="content">
+	<p></p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the iespell directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;iespell&quot;.</li>
+		<li>Add the insertdate or inserttime button name to button list, example: theme_advanced_buttons3_add : &quot;insertdate,inserttime&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;insertdatetime&quot;,
+	theme_advanced_buttons3_add : &quot;insertdate,inserttime&quot;
+    plugin_insertdate_dateFormat : &quot;%Y-%m-%d&quot;,
+    plugin_insertdate_timeFormat : &quot;%H:%M:%S&quot;
+});</pre>
+	</div>
+	</p>
+	<p>
+	<h3>Options</h3>
+	</p>
+	<p>
+	plugin_insertdate_dateFormat - Format that the date is output as. Defaults to: "%Y-%m-%d".<br />
+	plugin_insertdate_timeFormat - Format that the time is output as. Defaults to: "%H:%M:%S".
+	</p>
+	<p>Replacement variables</p>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>%y</td>
+		<td>year as a decimal number without a century (range 00 to 99)</td>
+	</tr>
+	<tr>
+		<td>%Y</td>
+		<td>year as a decimal number including the century</td>
+	</tr>
+	<tr>
+		<td>%d</td>
+		<td>day of the month as a decimal number (range 01 to 31)</td>
+	</tr>
+	<tr>
+		<td>%m</td>
+		<td>month as a decimal number (range 01 to 12)</td>
+	</tr>
+	<tr>
+		<td>%D</td>
+		<td>same as %m/%d/%y</td>
+	</tr>
+	<tr>
+		<td>%r</td>
+		<td>time in a.m. and p.m. notation</td>
+	</tr>
+	<tr>
+		<td>%H</td>
+		<td>hour as a decimal number using a 24-hour clock (range 00 to 23)</td>
+	</tr>
+	<tr>
+		<td>%I</td>
+		<td>hour as a decimal number using a 12-hour clock (range 01 to 12)</td>
+	</tr>
+	<tr>
+		<td>%M</td>
+		<td>minute as a decimal number (range 00-59)</td>
+	</tr>
+	<tr>
+		<td>%S</td>
+		<td>second as a decimal number (range 00-59)</td>
+	</tr>
+	<tr>
+		<td>%p</td>
+		<td>either &quot;am&quot; or &quot;pm&quot; according to the given time value</td>
+	</tr>
+	<tr>
+		<td>%%</td>
+		<td>a literal &quot;%&quot; character</td>
+	</tr>
+	</table>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_layer.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_layer.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_layer.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_layer.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: layer</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: layer</h1>
+</div>
+
+<div class="content">
+	<p>Adds a layer suport to TinyMCE by making it possible to create/remove and z-index block elements.</p>
+
+	<p>These are the possible button control that this plugin contains: insertlayer,moveforward,movebackward,absolute</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;layer&quot;.</li>
+		<li>Add the insertlayer,moveforward,movebackward,absolute button names to button list, example: theme_advanced_buttons3_add : &quot;insertlayer,moveforward,movebackward,absolute&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>layer</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>insertlayer,moveforward,movebackward,absolute</strong>&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_noneditable.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_noneditable.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_noneditable.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_noneditable.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: noneditable</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: noneditable</h1>
+</div>
+
+<div class="content">
+	<p>Adds non editable elements support for MSIE and Mozilla/FF. Any element with the &quot;mceItemNonEditable&quot; class will be blocked from modifications and treated as a single character. This class name is configurable using the &quot;noneditable_noneditable_class&quot;. Any elements with the MSIE specific attribute &quot;contenteditable&quot; will be converted into classes instead.</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>noneditable</strong>&quot;,
+	noneditable_leave_contenteditable : true
+});</pre>
+	</div>
+	</p>
+
+	<p>
+	<h3>Options</h3>
+	<table border="1" cellspacing="0" cellpadding="4">
+		<tr>
+			<td>[noneditable_editable_class]</td>
+			<td>Class name to be used for editable elements, this would be the the same as contenteditable=true, forcing a element to be editable. This option defaults to: &quot;mceItemEditable&quot;. Notice that classes with the mceItem prefix is invisible within TinyMCE.</td>
+		</tr>
+		<tr>
+			<td>[noneditable_noneditable_class]</td>
+			<td>Class name to be used for non editable elements, this would be the same as contenteditable=false. This option defaults to: &quot;mceItemNonEditable&quot;. Notice that classes with the mceItem prefix is invisible within TinyMCE.</td>
+		</tr>
+		<tr>
+			<td>[noneditable_leave_contenteditable]</td>
+			<td>If the value of this option is set to true, all contenteditable attributes will be left intact. This option is set to false by default, since this attribute is not a valid W3C attribute and the class approach is better.</td>
+		</tr>
+	</table>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_paste.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_paste.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_paste.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_paste.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,139 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: paste</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: paste</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds paste as plain text and paste from Word icons to TinyMCE. This plugin was developed by Ryan Demmer and modified by the TinyMCE crew to be more general and some extra features where added.</p>
+	<p>
+	On 25 May 2005, this plugin was modified by speednet: IE now pastes directly into the editor, bypassing the extra steps of opening the Insert box, selecting options, and clicking Insert. Speednet also added the Select All command, which highlights all the content in the editor when the user clicks the toolbar button (Other miscellaneous cleanup also).
+	</p>
+	<p>On 28 October 2005, this plugin was modified by monkeybrain: Added the paste_strip_class_attributes option.</p>
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the paste directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;paste&quot;.</li>
+		<li>Add the button names to button list, example: theme_advanced_buttons3_add : &quot;pastetext,pasteword,selectall&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;paste&quot;,
+	theme_advanced_buttons3_add : &quot;pastetext,pasteword,selectall&quot;,
+	paste_create_paragraphs : false,
+	paste_create_linebreaks : false,
+	paste_use_dialog : true,
+	paste_auto_cleanup_on_paste : true,
+	paste_convert_middot_lists : false,
+	paste_unindented_list_class : "unindentedList",
+	paste_convert_headers_to_strong : true,
+	paste_insert_word_content_callback : "convertWord"
+});
+
+function convertWord(type, content) {
+	switch (type) {
+		// Gets executed before the built in logic performes it's cleanups
+		case "before":
+			content = content.toLowerCase(); // Some dummy logic
+			break;
+
+		// Gets executed after the built in logic performes it's cleanups
+		case "after":
+			content = content.toLowerCase(); // Some dummy logic
+			break;
+	}
+
+	return content;
+}
+</pre>
+	</div>
+	</p>
+	<p>
+	<h3>Options</h3>
+	</p>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>[paste_create_paragraphs]</td>
+		<td>If enabled double linefeeds are converted to paragraph elements when using the plain text dialog. This is enabled by default.</td>
+	</tr>
+  	<tr>
+ 		<td>[paste_create_linebreaks]</td>
+ 		<td>If enabled single linefeeds are converted to hard line break elements when using the plain text dialog. This is enabled by default.</td>
+ 	</tr>
+	<tr>
+		<td>[paste_use_dialog]</td>
+		<td>MSIE specific option, if you set this to true both Mozilla and MSIE will present a paste dialog. If you set it to false pasting in MSIE will be done directly. This option is set to false by default.</td>
+	</tr>
+	<tr>
+		<td>[paste_auto_cleanup_on_paste]</td>
+		<td>MSIE specific option. If you enable this feature, a word paste will be executed when the user copy/paste content to the editor. This feature is disabled by default.</td>
+	</tr>
+	<tr>
+		<td>[paste_convert_middot_lists]</td>
+		<td>If this feature is enabled middot lists are converted into UL lists, these will be assign a special class.</td>
+	</tr>
+	<tr>
+		<td>[paste_unindented_list_class]</td>
+		<td>This option enables you to specify what class to assign to the UL list of middot converted lists. Middot lists are unindented in MS Office. This option defaults to &quot;unIndentedList&quot;.</td>
+	</tr>
+	<tr>
+		<td>[paste_convert_headers_to_strong]</td>
+		<td>This feature converts H1-6 elements to strong elements on paste, this is feature is disabled by default.</td>
+	</tr>
+	<tr>
+		<td>[paste_remove_spans]</td>
+		<td>This enables you to control if the word parse operation should remove or keep span elements, they will be removed by default.</td>
+	</tr>
+	<tr>
+		<td>[paste_remove_styles]</td>
+		<td>This enables you to control if the word parse operation should remove or keep style attributes, they will be removed by default.</td>
+	</tr>
+	<tr>
+		<td>[paste_replace_list]</td>
+		<td>Comma separated list of search/replace chunks. Where even items is the regexp that is to be used for the search and odd values are the contents that are to be replaced.
+		<p>This option defaults to: &quot;\u2122,&lt;sup&gt;TM&lt;/sup&gt;,\u2026,...,\u201c|\u201d,&quot;,\u2019,\',\u2013|\u2014|\u2015|\u2212,-&quot; this list replaces some  custom MS 1250 characters.
+		</p>
+		The \uXXXX values is the hex values of the Unicode characters. Trick use javascript:alert('&lt;unicode char&gt;'.charCodeAt(0).toString(16)); to retive these numbers.</td>
+	</tr>
+	<tr>
+		<td>[paste_strip_class_attributes]</td>
+		<td>This feature allows you to control whether or not class attributes are stripped when using pasteword.  Valid values are:
+			<ul>
+				<li>all - will strip all class attributes from the pasted content.  This is the default value.</li>
+				<li>none - will not strip any class attributes from the pasted content.</li>
+				<li>mso - will strip out all of the class attribute values that start with "Mso", but retain all others.</li>
+			</ul>
+		</td>
+	</tr>
+	<tr>
+		<td>[paste_insert_word_content_callback]</td>
+		<td>This option enables you to specify a callback function. This callback is executed when the user pastes word content, the return value of this function will be the new content string. Check the example above for more details.
+		</td>
+	</tr>
+	</table>
+	</p>
+
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_preview.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_preview.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_preview.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_preview.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: preview</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: preview</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds a preview button to TinyMCE, pressing the button opens a popup showing the current content.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the preview directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;preview&quot;.</li>
+		<li>Add the button name to button list, example: theme_advanced_buttons3_add : &quot;preview&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;preview&quot;,
+	theme_advanced_buttons3_add : &quot;preview&quot;,
+	plugin_preview_width : &quot;500&quot;,
+	plugin_preview_height : &quot;600&quot;
+});</pre>
+	</div>
+	</p>
+	<p>
+	<h3>Options</h3>
+	</p>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>[plugin_preview_width]</td>
+		<td>Preview window width. Defaults to 550.</td>
+	</tr>
+	<tr>
+		<td>[plugin_preview_height]</td>
+		<td>Preview window height. Defaults to 600.</td>
+	</tr>
+	<tr>
+		<td>[plugin_preview_pageurl]</td>
+		<td>Custom preview page URL relative from theme use "../../plugins/preview/example.html" for a example.</td>
+	</tr>
+	</table>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_print.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_print.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_print.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_print.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: paste</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: print</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds a print button to TinyMCE.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Copy the print directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;print&quot;.</li>
+		<li>Add the button name to button list, example: theme_advanced_buttons3_add : &quot;print&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;print&quot;,
+	theme_advanced_buttons3_add : &quot;print&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_save.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_save.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_save.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_save.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: save</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: save</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds a save button to TinyMCE this save button will submit the form that the editor is within.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;save&quot;.</li>
+		<li>Add the ltr, rtl button names to button list, example: theme_advanced_buttons3_add : &quot;save&quot;.</li>
+	</ul>
+	</p>
+
+	<p>
+	<h3>Options</h3>
+	</p>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>[save_enablewhendirty]</td>
+		<td>If you set this option to true, the edit button will be disabled/dimmed until modifications are made. This is disabled by default.</td>
+	</tr>
+	<tr>
+		<td>[onchange_callback]</td>
+		<td>This option enables you to add a custom function to be called when the save button/command is invoked. This is not used by default.</td>
+	</tr>
+	</table>
+	</p>
+
+	<p>
+	<h3>Initialization Example</h3>
+	</p>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>save</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>save</strong>&quot;,
+	save_enablewhendirty : true,
+	onchange_callback : "mysave"
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_searchreplace.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_searchreplace.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_searchreplace.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_searchreplace.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: searchreplace</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: searchreplace</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds search/replace dialogs to TinyMCE.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;searchreplace&quot;.</li>
+		<li>Add the ltr, rtl button names to button list, example: theme_advanced_buttons3_add : &quot;search,replace&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>searchreplace</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>search,replace</strong>&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_spellchecker.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_spellchecker.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_spellchecker.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_spellchecker.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: spellchecker</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: spellchecker</h1>
+</div>
+
+<div class="content">
+	<p>This plugin adds spellchecker functionality to TinyMCE by providing a new button that performs a AJAX call to a backend PHP page that uses pspell.</p>
+	<h3>Installation Instructions</h3>
+	<p>
+	<ol>
+		<li>Download the spellchecker plugin from the <a href="http://tinymce.moxiecode.com/download.php">TinyMCE website</a>.</li>
+		<li>Copy the spellchecker directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).</li>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;spellchecker&quot;.</li>
+		<li>Add the button name to button list, example: theme_advanced_buttons3_add : &quot;spellchecker&quot;.</li>
+	</ol>
+	</p>
+	<h3>Spellchecker plugins/modes</h3>
+	<p>
+		TinyMCE Spellchecker currently supports 3 modes. These are available as configurable PHP classes.
+		<ul>
+			<li>TinyPspell - Run pspell within PHP. (PHP needs to be compiled with pspell support)</li>
+			<li>TinyPspellShell - Run pspell as a command line shell application.</li>
+			<li>TinyGoogleSpell - Use HTTP proxy bridge to connect to a Google XML Web Service.</li>
+		</ul>
+		Use this as the value for the the languages option when you are using the GoogleSpell class: +English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv
+	<br /><br /></p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;spellchecker&quot;,
+	theme_advanced_buttons3_add : &quot;spellchecker&quot;,
+	spellchecker_languages : &quot;+English=en,Swedish=sv&quot;,
+	spellchecker_word_separator_chars : &quot;\\s!\"#$%&amp;()*+,-./:;&lt;=&gt;?@[\]&circ;_{|}&copy;&laquo;&reg;&raquo;\u201d\u201c&quot;
+});
+</pre>
+	</div>
+	</p>
+	<p>
+	<h3>Options</h3>
+	</p>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>[spellchecker_languages]</td>
+		<td>Enables you to specify what languages your pspell installation can handle. The value of this option should be a comma separated name value list in the following format name1=value1,name2=value,name3=value where name is the string to present in the menu and the value is a ISO language code like sv or en. If you add a + character infront of the name it will be the default value for the spellchecker. The default value for this option is: +English=en.</td>
+	</tr>
+  	<tr>
+ 		<td>[spellchecker_word_separator_chars]</td>
+ 		<td>This option enables you to specify the word separator characters. The default value for this option is: \\s!"#$%&()*+,-./:;<=>?@[\]^_{|}\u201d\u201c.</td>
+ 	</tr>
+	</table>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_style.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_style.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_style.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_style.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,303 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: style</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: style</h1>
+</div>
+
+<div class="content">
+	<p>Adds CSS style editing support to TinyMCE, this will enable you to edit allmost any CSS style property in a visual way.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;style&quot;.</li>
+		<li>Add the styleprops butto names to button list, example: theme_advanced_buttons3_add : &quot;styleprops&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>style</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>styleprops</strong>&quot;
+});</pre>
+	</div>
+	</p>
+	<br />
+
+	<h3>Options</h3>
+	<p>
+	<table border="1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td>[style_font]</td>
+		<td>Semicolon separated list of select box option name/values. Default: Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;Times New Roman, Times, serif=Times New Roman, Times, serif;Courier New, Courier, mono=Courier New, Courier, mono;Times New Roman, Times, serif=Times New Roman, Times, serif;Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif</td>
+	</tr>
+	<tr>
+		<td>[style_font_size]</td>
+		<td>Semicolon separated list of select box option name/values. In format key1=value1;key2=value2;..</td>
+	</tr>
+	<tr>
+		<td>[style_font_size_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_text_case]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_font_weight]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_font_style]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_font_variant]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_font_line_height]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_font_line_height_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_background_attachment]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_background_repeat]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_background_hpos_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_background_vpos_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_background_hpos]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_background_vpos]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_wordspacing]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_wordspacing_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_letterspacing]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_letterspacing_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_vertical_alignment]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_text_align]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_whitespace]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_display]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_text_indent_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_box_width_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_box_height_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_float]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_clear]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_padding_left_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_padding_top_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_padding_bottom_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_padding_right_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_margin_left_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_margin_top_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_margin_bottom_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_margin_right_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_style_top]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_style_right]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_style_bottom]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_style_left]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_top]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_right]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_bottom]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_left]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_top_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_right_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_bottom_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_border_width_left_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_list_type]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_list_position]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_type]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_visibility]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_width_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_height_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_overflow]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_placement_top_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_placement_right_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_placement_bottom_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_placement_left_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_clip_top_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_clip_right_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_clip_bottom_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	<tr>
+		<td>[style_positioning_clip_left_measurement]</td>
+		<td>Semicolon separated list of select box option name/values.</td>
+	</tr>
+	</table>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_table.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_table.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_table.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_table.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: table</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: table</h1>
+</div>
+
+<div class="content">
+	<p>
+		This plugin adds table management functionality to TinyMCE.
+	</p>
+
+	<p>
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Table controls/buttons</td></thead>
+			 <tbody>
+				  <tr><td><strong>tablecontrols</strong></td><td>All table control below and some separators between them.</td></tr>
+				  <tr><td><strong>table</strong></td><td>Insert table control.</td></tr>
+				  <tr><td><strong>row_props</strong></td><td>Edit row properties (tr).</td></tr>
+				  <tr><td><strong>cell_props</strong></td><td>Edit cell properties (td).</td></tr>
+				  <tr><td><strong>delete_col</strong></td><td>Delete column control.</td></tr>
+				  <tr><td><strong>delete_row</strong></td><td>Delete row control.</td></tr>
+				  <tr><td><strong>col_after</strong></td><td>Column after control.</td></tr>
+				  <tr><td><strong>col_before</strong></td><td>Column before control.</td></tr>
+				  <tr><td><strong>row_after</strong></td><td>Row after control.</td></tr>
+				  <tr><td><strong>row_before</strong></td><td>Row before control.</td></tr>
+				  <tr><td><strong>row_after</strong></td><td>Row after control.</td></tr>
+				  <tr><td><strong>row_before</strong></td><td>Row before control.</td></tr>
+				  <tr><td><strong>split_cells</strong></td><td>Splits a merged cell into rows and columns.</td></tr>
+				  <tr><td><strong>merge_cells</strong></td><td>Mergers selected cells into one cell.</td></tr>
+			</tbody>
+		</table>
+	</p>
+
+	<p>
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Table commands to use with execCommand</td></thead>
+			 <tbody>
+				<tr><td><strong>mceInsertTable</strong></td><td>Inserts a new table at cursor location the default size is 2x2. If the value parameter is specified it should contain a name/value array, this array has the following options cols, rows, border, cellspacing, cellpadding. The default border is set to: 0.</td></tr>
+				<tr><td><strong>mceTableInsertRowBefore</strong></td><td>Inserts a row before/above the current cursor location.</td></tr>
+				<tr><td><strong>mceTableInsertRowAfter</strong></td><td>Inserts a row after/under the current cursor location.</td></tr>
+				<tr><td><strong>mceTableDeleteRow</strong></td><td>Deletes the row at the current cursor location.</td></tr>
+				<tr><td><strong>mceTableInsertColBefore</strong></td><td>Inserts a column before the current cursor location.</td></tr>
+				<tr><td><strong>mceTableInsertColAfter</strong></td><td>Inserts a column after the current cursor location.</td></tr>
+				<tr><td><strong>mceTableDeleteCol</strong></td><td>Deletes the column at the current cursor location.</td></tr>
+			</tbody>
+		</table>
+	</p>
+
+	<p>
+		<table border="1" cellspacing="0" cellpadding="4">
+			 <thead><td colspan="2">Options</td></thead>
+			 <tbody>
+				<tr><td><strong>table_styles</strong></td><td>This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted.</td></tr>
+				<tr><td><strong>table_cell_styles</strong></td><td>This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted.</td></tr>
+				<tr><td><strong>table_row_styles</strong></td><td>This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted.</td></tr>
+				<tr><td><strong>table_cell_limit</strong></td><td>Enables you to specify the max number of cells for a table.</td></tr>
+				<tr><td><strong>table_row_limit</strong></td><td>Enables you to specify the max number of rows for a table.</td></tr>
+				<tr><td><strong>table_col_limit</strong></td><td>Enables you to specify the max number of columns for a table.</td></tr>
+			</tbody>
+		</table>
+		<br />
+	</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;directionality&quot;.</li>
+		<li>Add the ltr, rtl button names to button list, example: theme_advanced_buttons3_add : &quot;ltr,rtl&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>table</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>tablecontrols</strong>&quot;,
+	table_styles : "Header 1=header1;Header 2=header2;Header 3=header3",
+	table_cell_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Cell=tableCel1",
+	table_row_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1",
+	table_cell_limit : 100,
+	table_row_limit : 5,
+	table_col_limit : 5
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/plugin_zoom.html 4.6rc2/mambots/editors/mostlyce/docs/plugin_zoom.html
--- 4.5.4/mambots/editors/mostlyce/docs/plugin_zoom.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/plugin_zoom.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugin: zoom</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugin: zoom</h1>
+</div>
+
+<div class="content">
+	<p>Adds a zoom drop list in MSIE5.5+, this plugin was mostly created to show how to add custom droplists as plugins.</p>
+
+	<h3>Installation Instructions</h3>
+	<p>
+	<ul>
+		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;zoom&quot;.</li>
+		<li>Add the ltr, rtl button names to button list, example: theme_advanced_buttons3_add : &quot;zoom&quot;.</li>
+	</ul>
+	</p>
+	<h3>Initialization Example</h3>
+	<p>
+	<div class="example">
+	<pre>
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;,
+	plugins : &quot;<strong>zoom</strong>&quot;,
+	theme_advanced_buttons3_add : &quot;<strong>zoom</strong>&quot;
+});</pre>
+	</div>
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/reference_buttons.html 4.6rc2/mambots/editors/mostlyce/docs/reference_buttons.html
--- 4.5.4/mambots/editors/mostlyce/docs/reference_buttons.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/reference_buttons.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>List of all buttons/controls available, and their plugin requirements.</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>List of all buttons/controls available, and their plugin requirements.</h1>
+</div>
+
+<div class="content">
+	<p>
+		This is a list of all the avalible buttons that you can configure, the requirements are also listed as some buttons require you to include  the plugin first. Check each plugin for more information, some plugins have seperate configurations. Use the <a href="option_theme_advanced_buttons_n.html">theme_advanced_buttons&lt;1-n&gt;</a>, <a href="option_theme_advanced_buttons_n_add.html">theme_advanced_buttons&lt;1-n&gt;_add</a> or <a href="option_theme_advanced_buttons_n_add_before.html">theme_advanced_buttons&lt;1-n&gt;_add_before</a> options to add new buttons and to disable buttons use the <a href="option_theme_advanced_disable.html">theme_advanced_disable</a> option.
+	</p>
+	<div class="separator"></div>
+
+	<p>
+	<h3>Default buttons available in the advanced theme</h3>
+	bold<br />
+	italic<br />
+	underline<br />
+	strikethrough<br />
+	justifyleft<br />
+	justifycenter<br />
+	justifyright<br />
+	justifyfull<br />
+	bullist<br />
+	numlist<br />
+	outdent<br />
+	indent<br />
+	cut<br />
+	copy<br />
+	paste<br />
+	undo<br />
+	redo<br />
+	link<br />
+	unlink<br />
+	image<br />
+	cleanup<br />
+	help<br />
+	code<br />
+	hr<br />
+	removeformat<br />
+	formatselect<br />
+	fontselect<br />
+	fontsizeselect<br />
+	styleselect<br />
+	sub<br />
+	sup<br />
+	forecolor<br />
+	backcolor<br />
+	charmap<br />
+	visualaid<br />
+	anchor<br />
+	newdocument<br />
+	separator<br />
+	</p>
+	<p>
+	<h3>Plugins with the button name same as plugin name</h3>
+	<a href="plugin_save.html">save</a><br />
+	<a href="plugin_emotions.html">emotions</a><br />
+	<a href="plugin_flash.html">flash</a><br />
+	<a href="plugin_iespell.html">iespell</a><br />
+	<a href="plugin_preview.html">preview</a><br />
+	<a href="plugin_print.html">print</a><br />
+	<a href="plugin_zoom.html">zoom</a><br />
+	<a href="plugin_fullscreen.html">fullscreen</a><br />
+	<a href="plugin_advhr.html">advhr</a><br />
+	<a href="plugin_fullpage.html">fullpage</a><br />
+	<a href="plugin_spellchecker.html">spellchecker</a><br />
+	<br />
+	</p>
+	<p>
+	<h3>Plugins with custom buttons</h3>
+	<ul>
+
+		<li>advlink</li>
+			<ul>
+				<li>Will override the "link" button</li>
+			</ul>
+		<li>advimage</li>
+			<ul>
+				<li>Will override the "image" button</li>
+			</ul>
+		<li><a href="plugin_paste.html">paste</a></li>
+			<ul>
+				<li>pastetext</li>
+				<li>pasteword</li>
+				<li>selectall</li>
+			</ul>
+		<li><a href="plugin_searchreplace.html">searchreplace</a></li>
+			<ul>
+				<li>search</li>
+				<li>replace</li>
+			</ul>
+		<li><a href="plugin_insertdatetime.html">insertdatetime</a></li>
+			<ul>
+				<li>insertdate</li>
+				<li>inserttime</li>
+			</ul>
+		<li><a href="plugin_table.html">table</a></li>
+			<ul>
+				<li>tablecontrols</li>
+				<li>table</li>
+				<li>row_props</li>
+				<li>cell_props</li>
+				<li>delete_col</li>
+				<li>delete_row</li>
+				<li>col_after</li>
+				<li>col_before</li>
+				<li>row_after</li>
+				<li>row_before</li>
+				<li>row_after</li>
+				<li>row_before</li>
+				<li>split_cells</li>
+				<li>merge_cells</li>
+			</ul>
+		<li><a href="plugin_directionality.html">directionality</a></li>
+			<ul>
+				<li>ltr</li>
+				<li>rtl</li>
+			</ul>
+		<li><a href="plugin_layer.html">layer</a></li>
+			<ul>
+				<li>moveforward</li>
+				<li>movebackward</li>
+				<li>absolute</li>
+				<li>insertlayer</li>
+			</ul>
+		<li><a href="plugin_style.html">style</a></li>
+			<ul>
+				<li>styleprops</li>
+			</ul>
+	</ul>
+	</p>
+</div>
+
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/reference_configuration.html 4.6rc2/mambots/editors/mostlyce/docs/reference_configuration.html
--- 4.5.4/mambots/editors/mostlyce/docs/reference_configuration.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/reference_configuration.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,228 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Configuration reference</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Configuration reference</h1>
+</div>
+
+<div class="content">
+	<p>This document is the index/reference page for all available core configuration options in TinyMCE.</p>
+
+	<div class="separator"></div>
+
+	<h2>Configuration options</h2>
+	<div class="section">
+		<p>All configuration options below is to be placed within the init JavaScript call.<br /><br />
+
+		<div class="column">
+			<h3>General</h3>
+			<ul class="optionlist">
+				<li><a href="option_mode.html">mode</a></li>
+				<li><a href="option_theme.html">theme</a></li>
+				<li><a href="option_plugins.html">plugins</a></li>
+				<li><a href="option_language.html">language</a></li>
+				<li><a href="option_ask.html">ask</a></li>
+				<li><a href="option_textarea_trigger.html">textarea_trigger</a></li>
+				<li><a href="option_editor_selector.html">editor_selector</a></li>
+				<li><a href="option_editor_deselector.html">editor_deselector</a></li>
+				<li><a href="option_elements.html">elements</a></li>
+				<li><a href="option_docs_language.html">docs_language</a></li>
+				<li><a href="option_debug.html">debug</a></li>
+				<li><a href="option_focus_alert.html">focus_alert</a></li>
+				<li><a href="option_directionality.html">directionality</a></li>
+				<li><a href="option_auto_reset_designmode.html">auto_reset_designmode</a></li>
+				<li><a href="option_auto_focus.html">auto_focus</a></li>
+				<li><a href="option_nowrap.html">nowrap</a></li>
+				<li><a href="option_button_tile_map.html">button_tile_map</a></li>
+				<li><a href="option_auto_resize.html">auto_resize</a></li>
+				<li><a href="option_browsers.html">browsers</a></li>
+				<li><a href="option_dialog_type.html">dialog_type</a></li>
+				<li><a href="option_accessibility_warnings.html">accessibility_warnings</a></li>
+				<li><a href="option_accessibility_focus.html">accessibility_focus</a></li>
+				<li><a href="option_event_elements.html">event_elements</a></li>
+				<li><a href="option_table_inline_editing.html">table_inline_editing</a></li>
+				<li><a href="option_object_resizing.html">object_resizing</a></li>
+				<li><a href="option_custom_shortcuts.html">custom_shortcuts</a></li>
+				<li><a href="option_strict_loading_mode.html">strict_loading_mode</a></li>
+			</ul>
+
+			<h3>Cleanup/Output</h3>
+			<ul class="optionlist">
+				<li><a href="option_cleanup.html">cleanup</a></li>
+				<li><a href="option_valid_elements.html">valid_elements</a></li>
+				<li><a href="option_extended_valid_elements.html">extended_valid_elements</a></li>
+				<li><a href="option_invalid_elements.html">invalid_elements</a></li>
+				<li><a href="option_verify_css_classes.html">verify_css_classes</a></li>
+				<li><a href="option_verify_html.html">verify_html</a></li>
+				<li><a href="option_preformatted.html">preformatted</a></li>
+				<li><a href="option_encoding.html">encoding</a></li>
+				<li><a href="option_cleanup_on_startup.html">cleanup_on_startup</a></li>
+				<li><a href="option_fix_content_duplication.html">fix_content_duplication</a></li>
+				<li><a href="option_inline_styles.html">inline_styles</a></li>
+				<li><a href="option_convert_newlines_to_brs.html">convert_newlines_to_brs</a></li>
+				<li><a href="option_force_br_newlines.html">force_br_newlines</a></li>
+				<li><a href="option_force_p_newlines.html">force_p_newlines</a></li>
+				<li><a href="option_entities.html">entities</a></li>
+				<li><a href="option_entity_encoding.html">entity_encoding</a></li>
+				<li><a href="option_remove_linebreaks.html">remove_linebreaks</a></li>
+				<li><a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a></li>
+				<li><a href="option_font_size_classes.html">font_size_classes</a></li>
+				<li><a href="option_font_size_style_values.html">font_size_style_values</a></li>
+				<li><a href="option_merge_styles_invalid_parents.html">merge_styles_invalid_parents</a></li>
+				<li><a href="option_force_hex_style_colors.html">force_hex_style_colors</a></li>
+				<li><a href="option_apply_source_formatting.html">apply_source_formatting</a></li>
+				<li><a href="option_trim_span_elements.html">trim_span_elements</a></li>
+				<li><a href="option_doctype.html">doctype</a></li>
+				<li><a href="option_fix_list_elements.html">fix_list_elements</a></li>
+				<li><a href="option_fix_table_elements.html">fix_table_elements</a></li>
+			</ul>
+
+			</div>
+			<div class="column">
+
+			<h3>URL</h3>
+			<ul class="optionlist">
+				<li><a href="option_convert_urls.html">convert_urls</a></li>
+				<li><a href="option_relative_urls.html">relative_urls</a></li>
+				<li><a href="option_remove_script_host.html">remove_script_host</a></li>
+				<li><a href="option_document_base_url.html">document_base_url</a></li>
+			</ul>
+
+			<h3>Callbacks</h3>
+			<ul class="optionlist">
+				<li><a href="option_urlconverter_callback.html">urlconverter_callback</a></li>
+				<li><a href="option_insertlink_callback.html">insertlink_callback</a></li>
+				<li><a href="option_insertimage_callback.html">insertimage_callback</a></li>
+				<li><a href="option_setupcontent_callback.html">setupcontent_callback</a></li>
+				<li><a href="option_save_callback.html">save_callback</a></li>
+				<li><a href="option_onchange_callback.html">onchange_callback</a></li>
+				<li><a href="option_init_instance_callback.html">init_instance_callback</a></li>
+				<li><a href="option_file_browser_callback.html">file_browser_callback</a></li>
+				<li><a href="option_cleanup_callback.html">cleanup_callback</a></li>
+				<li><a href="option_handle_event_callback.html">handle_event_callback</a></li>
+				<li><a href="option_execcommand_callback.html">execcommand_callback</a></li>
+				<li><a href="option_oninit.html">oninit</a></li>
+				<li><a href="option_onpageload.html">onpageload</a></li>
+			</ul>
+
+			<h3>Layout</h3>
+			<ul class="optionlist">
+				<li><a href="option_content_css.html">content_css</a></li>
+				<li><a href="option_popups_css.html">popups_css</a></li>
+				<li><a href="option_editor_css.html">editor_css</a></li>
+				<li><a href="option_width.html">width</a></li>
+				<li><a href="option_height.html">height</a></li>
+			</ul>
+
+			<h3>Visual aids</h3>
+			<ul class="optionlist">
+				<li><a href="option_visual.html">visual</a></li>
+				<li><a href="option_visual_table_class.html">visual_table_class</a></li>
+			</ul>
+
+			<h3>Undo/Redo</h3>
+			<ul class="optionlist">
+				<li><a href="option_custom_undo_redo.html">custom_undo_redo</a></li>
+				<li><a href="option_custom_undo_redo_levels.html">custom_undo_redo_levels</a></li>
+				<li><a href="option_custom_undo_redo_keyboard_shortcuts.html">custom_undo_redo_keyboard_shortcuts</a></li>
+				<li><a href="option_custom_undo_redo_restore_selection.html">custom_undo_redo_restore_selection</a></li>
+			</ul>
+
+			<h3>File lists</h3>
+			<ul class="optionlist">
+				<li><a href="option_external_link_list_url.html">external_link_list_url</a></li>
+				<li><a href="option_external_image_list_url.html">external_image_list_url</a></li>
+			</ul>
+
+			<h3>Tab specific</h3>
+			<ul class="optionlist">
+				<li><a href="option_display_tab_class.html">display_tab_class</a></li>
+				<li><a href="option_hidden_tab_class.html">hidden_tab_class</a></li>
+			</ul>
+
+			</div>
+			<div class="column">
+
+			<h3>Triggers/Patches</h3>
+			<ul class="optionlist">
+				<li><a href="option_add_form_submit_trigger.html">add_form_submit_trigger</a></li>
+				<li><a href="option_add_unload_trigger.html">add_unload_trigger</a></li>
+				<li><a href="option_submit_patch.html">submit_patch</a></li>
+			</ul>
+
+			<h3>Advanced theme</h3>
+			<ul class="optionlist">
+				<li><a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a></li>
+				<li><a href="option_theme_advanced_blockformats.html">theme_advanced_blockformats</a></li>
+				<li><a href="option_theme_advanced_styles.html">theme_advanced_styles</a></li>
+				<li><a href="option_theme_advanced_source_editor_width.html">theme_advanced_source_editor_width</a></li>
+				<li><a href="option_theme_advanced_source_editor_height.html">theme_advanced_source_editor_height</a></li>
+				<li><a href="option_theme_advanced_source_editor_wrap.html">theme_advanced_source_editor_wrap</a></li>
+				<li><a href="option_theme_advanced_toolbar_location.html">theme_advanced_toolbar_location</a></li>
+				<li><a href="option_theme_advanced_toolbar_align.html">theme_advanced_toolbar_align</a></li>
+				<li><a href="option_theme_advanced_statusbar_location.html">theme_advanced_statusbar_location</a></li>
+				<li><a href="option_theme_advanced_buttons_n.html">theme_advanced_buttons&lt;1-n&gt;</a></li>
+				<li><a href="option_theme_advanced_buttons_n_add.html">theme_advanced_buttons&lt;1-n&gt;_add</a></li>
+				<li><a href="option_theme_advanced_buttons_n_add_before.html">theme_advanced_buttons&lt;1-n&gt;_add_before</a></li>
+				<li><a href="option_theme_advanced_disable.html">theme_advanced_disable</a></li>
+				<li><a href="option_theme_advanced_containers.html">theme_advanced_containers</a></li>
+				<li><a href="option_theme_advanced_containers_default_class.html">theme_advanced_containers_default_class</a></li>
+				<li><a href="option_theme_advanced_containers_default_align.html">theme_advanced_containers_default_align</a></li>
+				<li><a href="option_theme_advanced_container.html">theme_advanced_container_&lt;container&gt;</a></li>
+				<li><a href="option_theme_advanced_container_class.html">theme_advanced_container_&lt;container&gt;_class</a></li>
+				<li><a href="option_theme_advanced_container_align.html">theme_advanced_container_&lt;container&gt;_align</a></li>
+				<li><a href="option_theme_advanced_custom_layout.html">theme_advanced_custom_layout</a></li>
+				<li><a href="option_theme_advanced_link_targets.html">theme_advanced_link_targets</a></li>
+				<li><a href="option_theme_advanced_resizing.html">theme_advanced_resizing</a></li>
+				<li><a href="option_theme_advanced_resizing_use_cookie.html">theme_advanced_resizing_use_cookie</a></li>
+				<li><a href="option_theme_advanced_resize_horizontal.html">theme_advanced_resize_horizontal</a></li>
+				<li><a href="option_theme_advanced_path.html">theme_advanced_path</a></li>
+				<li><a href="option_theme_advanced_fonts.html">theme_advanced_fonts</a></li>
+			</ul>
+		</div>
+
+		<br style="clear: both" />
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Initialization of TinyMCE</h2>
+	<div class="section">
+		<p>Inorder to initialize the TinyMCE the following code must be placed within HEAD element of a document. The following example is configurated to convert all TEXTAREA elements to into editors when the page loads, there are other <a href="option_mode.html">modes</a> as well.</p>
+		<h3>Example of TinyMCE configuration:</h3>
+		<div class="example">
+<pre>
+&lt;html&gt;
+&lt;head&gt;
+<strong>&lt;script language=&quot;javascript&quot; type=&quot;text/javascript&quot; src=&quot;../jscripts/tiny_mce/tiny_mce.js&quot;&gt;&lt;/script&gt;
+&lt;script language=&quot;javascript&quot; type=&quot;text/javascript&quot;&gt;
+tinyMCE.init({
+	theme : &quot;advanced&quot;,
+	mode : &quot;textareas&quot;
+});
+&lt;/script&gt;</strong>
+&lt;/head&gt;
+</pre>
+		</div>
+		<div class="note">
+			Note: Remember to remove the last &quot;,&quot; character in the options list.
+		</div>
+	</div>
+
+
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/reference_javascript_functions.html 4.6rc2/mambots/editors/mostlyce/docs/reference_javascript_functions.html
--- 4.5.4/mambots/editors/mostlyce/docs/reference_javascript_functions.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/reference_javascript_functions.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,597 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Javascript Functions</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Javascript Functions</h1>
+</div>
+
+<div class="content">
+<p>This is for advanced users, TinyMCE has a global instance with some public functions that can be called from the page.</p>
+<h3>tinyMCE.triggerSave([skip_cleanup], [skip_callback]);</h3>
+<p>
+Makes a cleanup and moves the contents from the editor to the form field. This method is automaticly called by tinyMCE by adding a trigger on the forms submit method.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>[skip_cleanup]</td>
+	<td>Disables the cleanup process of trigger save. Defaults to false. (Optional)</td>
+</tr>
+<tr>
+	<td>[skip_callback]</td>
+	<td>Disables the execution of the <a href="option_save_callback.html">save_callback</a> function. Defaults to false. (Optional)</td>
+</tr>
+</tbody>
+</table>
+
+skip_callback
+</p>
+<p>
+Returns: Nothing
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.updateContent(form_element_name);</h3>
+<p>
+Moves the contents from the form element to the editor, this does the opposite of triggerSave(). This method can be used when you want to change the contents of the editor dynamicly.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>form_element_name</td>
+	<td>The name of the form element to get contents from.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: Nothing
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.execInstanceCommand(editor_id, command, [user_interface], [value]);</h3>
+<p>
+This method executes a command by name on the editor instance specified by the editor_id parameter.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>editor_id</td>
+	<td>ID of editor instance or element id/name of the replaced element.</td>
+</tr>
+<tr>
+	<td>command</td>
+	<td>Command to execute check the execCommand function for details.</td>
+</tr>
+<tr>
+	<td>[user_interface]</td>
+	<td>Is a user interface to be used or not.</td>
+</tr>
+<tr>
+	<td>[value]</td>
+	<td>Value to pass with command for example a URL..</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: Nothing 
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.execCommand(command, [user_interface], [value]);</h3>
+<p>
+This method executes a command by name on the selected editor instance.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>command</td>
+	<td>Command to execute for example &quot;Bold&quot; or &quot;Italic&quot;. These are defined by Mozilla <a href="http://www.mozilla.org/editor/midas-spec.html">Midas specification</a> or <a href="http://msdn.microsoft.com/workshop/author/dhtml/reference/commandids.asp">Microsoft specification</a>. But there are a some TinyMCE specific commands many other commands are available within plugins and themes.<br /><br />
+	<table border="0" cellspacing="0" cellpadding="2">
+	<tr>
+		<td>mceLink</td>
+		<td>Opens the insert link dialog and inserts a link.</td>
+	</tr>
+	<tr>
+		<td>mceImage</td>
+		<td>Opens the insert image dialog and inserts a image.</td>
+	</tr>
+	<tr>
+		<td>mceCleanup</td>
+		<td>Removed unwanted elements and attributes from the HTML code.</td>
+	</tr>
+	<tr>
+		<td>mceHelp</td>
+		<td>Opens the manual pages.</td>
+	</tr>
+	<tr>
+		<td>mceAddControl</td>
+		<td>Adds a editor control to the element id/name specified as value.</td>
+	</tr>
+	<tr>
+		<td>mceRemoveControl</td>
+		<td>Removes a specific control by editor_id name. The value is the editor_id to remove, editor ids are in the following format: &quot;mce_editor_&lt;index&gt;&quot;. DOM element ids and form element names can allso be used.</td>
+	</tr>
+	<tr>
+		<td>mceFocus</td>
+		<td>Focuses the editor by the id placed in value. Editor id's are in the format "mce_editor_<index>". DOM element ids and form element names can allso be used.</td>
+	</tr>
+	<tr>
+		<td>mceSetCSSClass</td>
+		<td>Sets the CSS class attribute or creates a new span of the selection. The value is the css class name to assign to selected element or new span element.</td>
+	</tr>
+	<tr>
+		<td>mceInsertContent</td>
+		<td>Inserts contents of value parameter to current cursor position.</td>
+	</tr>
+	<tr>
+		<td>mceReplaceContent</td>
+		<td>Replaces the current selection with the HTML code in value. The {$selection} variable gets replaced with the currently selected text contents.</td>
+	</tr>
+	<tr>
+		<td>mceSetAttribute</td>
+		<td>Sets a attribute of the currenly selected element. The value of this command should be a name/value array with the following parameters.<br /><br />
+		name - Attribute name to set.<br />
+		value - Attrbute value to set.<br />
+		[targets] - Target elements to add attribute on. Default: p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address.<br /><br />
+		Example of usage:<br />
+		tinyMCE.execCommand('mceSetAttribute',false,{name:'align',value:'right'});<br />
+		</td>
+	</tr>
+	<tr>
+		<td>mceToggleVisualAid</td>
+		<td>Toggles visual aid/guidelines mode on/off.</td>
+	</tr>
+	<tr>
+		<td>mceAnchor</td>
+		<td>Inserts a named anchor element, the value is the name of the anchor.</td>
+	</tr>
+	<tr>
+		<td>mceResetDesignMode</td>
+		<td>Resets the designMode state of all editor instances, this command is useful on Firefox if the editor is placed in tabs or shown/hidden with style.display="none/block". Call this command after the editor displayed again.</td>
+	</tr>
+	<tr>
+		<td>mceSelectNode</td>
+		<td>Selects the node/element passed as value. This command will also scroll to the elements location within the editor.</td>
+	</tr>
+	<tr>
+		<td>mceSelectNodeDepth</td>
+		<td>Selects the node/element by depth relative from the current node. So a value of 0 will select the currently focused node. This command will also scroll to the elements location within the editor.</td>
+	</tr>
+	<tr>
+		<td>mceRemoveNode</td>
+		<td>Removes the specified node and places the contents of the node in the same location. Specify the node reference to remove in the value parameter or null if the currently selected node is to be removed.</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td></td>
+	</tr>
+	</tbody>
+</table>
+	</td>
+</tr>
+<tr>
+	<td>[user_interface]</td>
+	<td>Tells if the command is to display a user interface or not. True/False option.</td>
+</tr>
+<tr>
+	<td>[value]</td>
+	<td>Value to pass for the command for example to insertLink it's the URL of the link.</td>
+</tr>
+</tbody>
+</table>
+
+</p>
+<p>
+Returns: Nothing
+</p>
+<p>
+Example:
+</p>
+<p>
+<div class="example">
+<pre>
+&lt;a href=&quot;javascript:tinymce.execCommand('Bold');&quot;&gt;[Do bold]&lt;/a&gt;
+</pre>
+</div>
+</p>
+<div class="separator"></div>
+<h3><span class="marked">(Deprecated)</span> tinyMCE.insertLink(href, target);</h3>
+<p>This method is deprecated and removed as of 2.0.3. Use tinyMCE.execCommand('mceInsertContent',false,'custom html'); instead and tinyMCE.getInstanceById('&lt;inst&gt;').selection.getFocusElement() to retrive/update the selected element.</p>
+<p>But if you realy need the old function it's marked internal but is available in the advanced theme and you can call it by using tinyMCE.themes['advanced']._insertLink(href, target);. But the recommended way is to modify your code to use the logic above.</p>
+<p>This method inserts a link a the cursor position of the selected editor instance or updates the selected link with new data. This method should be called upon "ok" in the insertLink popup when you create custom themes.
+</p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>href</td>
+	<td>HREF/URL of the link.</td>
+</tr>
+<tr>
+	<td>target</td>
+	<td>Target of the link.</td>
+</tr>
+</tbody>
+</table>
+<p>
+Returns: Nothing
+</p>
+<div class="separator"></div>
+<h3><span class="marked">(Deprecated)</span> tinyMCE.insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout);</h4>
+<p>This method is deprecated and removed as of 2.0.3. Use tinyMCE.execCommand('mceInsertContent',false,'custom html'); instead or if you realy need the old function it's marked internal but is available in the advanced theme and you can call it by using tinyMCE.themes['advanced']._insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout);. But the recommended way is to modify your code to use the logic above.</p>
+<p>
+This method inserts a image a the cursor position of the selected editor instance or updates the selected image with new data. This method should be called upon "ok" in the insertImage popup when you create custom themes.
+</p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>src</td>
+	<td>Image src url.</td>
+</tr>
+<tr>
+	<td>alt</td>
+	<td>Alternative text of img element.</td>
+</tr>
+<tr>
+	<td>border</td>
+	<td>Border of image element.</td>
+</tr>
+<tr>
+	<td>hspace</td>
+	<td>Horizontal spacing of image element.</td>
+</tr>
+<tr>
+	<td>vspace</td>
+	<td>Vertical spacing of image element.</td>
+</tr>
+<tr>
+	<td>width</td>
+	<td>Width of image element.</td>
+</tr>
+<tr>
+	<td>height</td>
+	<td>Height of image element.</td>
+</tr>
+<tr>
+	<td>align</td>
+	<td>Alignment of image element.</td>
+</tr>
+<tr>
+	<td>title</td>
+	<td>Link title of image element.</td>
+</tr>
+<tr>
+	<td>onmouseover</td>
+	<td>On mouse over event handler of image element.</td>
+</tr>
+<tr>
+	<td>onmouseout</td>
+	<td>On mouse out event handler of image element.</td>
+</tr>
+</tbody>
+</table>
+<p>
+Returns: Nothing
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.triggerNodeChange();</h3>
+<p>This method is to be called when external changes is made to the editor. This method will then call the "handleNodeChangeCallback" callback in the theme.
+</p>
+<p>
+Parameters:
+</p>
+<p>
+None
+</p>
+<p>
+Returns: Nothing
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.getContent();</h3>
+<p>
+This method returns the HTML contents of the currently selected editor or null if no editor was selected.
+</p>
+<p>
+Parameters:
+</p>
+<p>
+None
+</p>
+<p>
+Returns: HTML contents of the currently selected editor or null. 
+</p>
+<div class="separator"></div>
+<h3>Syntax: tinyMCE.setContent(html);</h3>
+
+<p>This method sets the HTML contents of the currently selected editor.</p>
+
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>html</td>
+	<td>HTML Source code to set.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: None.
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.getInstanceById(editor_id);</h3>
+<p>
+This method returns a editor instance by editor id.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>editor_id</td>
+	<td>Editor instance to retrive.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: TinyMCE Editor instance (TinyMCE_Control). 
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.importThemeLanguagePack([theme]);</h3>
+<p>
+This method imports/loads theme specific language packs. This may be called from custom themes.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>[theme]</td>
+	<td>Name of the current theme. This is a optional parameter it defaults to the global "theme" setting. This parameter is useful within theme plugins.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: None.
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.importPluginLanguagePack(plugin, valid_languages);</h3>
+<p>
+This method imports/loads plugin specific language packs. This may be called from custom plugins.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>plugin</td>
+	<td>Name of the current plugin.</td>
+</tr>
+<tr>
+	<td>valid_languages</td>
+	<td>Comma separated list of supported languagepacks.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: None.
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.applyTemplate(html);</h3>
+<p>
+This method replaces settings and lang variables in the theme.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>html</td>
+	<td>HTML code to apply theme variable substitution on.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: New converted, HTML code. 
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.openWindow(template, [args]);</h3>
+<p>This method opens a new window by the template data assigned, it will get the width, height and html data from template parameters. The args array contains variable names to be substituted.</p>
+<p>
+There are some custom window arguments:
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>mce_replacevariables</td>
+	<td>Enables/Disables the language/variable replacement of the document HTML. Enabled by default.</td>
+</tr>
+<tr>
+	<td>mce_windowresize</td>
+	<td>Enables/Disables the auto resize feature of popupwindows. Enabled by default.</td>
+</tr>
+</tbody>
+</table>
+</p>
+
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>template</td>
+	<td>Name/Value array with width, height, html and file keys in it.</td>
+</tr>
+<tr>
+	<td>[args]</td>
+	<td>Name/Value array with variable names to replace. Variables in the template file key value (URL) gets replaced with the argument list.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: None.
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.getWindowArg(name, [default_value]);</h3>
+<p>
+This method returns a window argument defined by name. This function is to be used in theme popup windows to retrive dialog parameters.
+</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>name</td>
+	<td>Name of window argument to get.</td>
+</tr>
+<tr>
+	<td>[default_value]</td>
+	<td>Default value to be returned if window argument is missing.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: Window argument value.
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.setWindowArg(name, value);</h3>
+<p>This method sets a window argument by name. This can for example be useful if plugin are to call other plugins.</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>name</td>
+	<td>Name of window argument to set.</td>
+</tr>
+<tr>
+	<td>value</td>
+	<td>Value to set in window argument.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: Window argument value.
+</p>
+<div class="separator"></div>
+<h3>tinyMCE.getParam(name, [default_value], [strip_whitespace]);</h3>
+<p>This method returns a TinyMCE configuration parameter.</p>
+<p>
+<table border="1" cellspacing="0" cellpadding="4">
+<thead>
+<tr>
+	<td colspan="2">Parameters:</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>name</td>
+	<td>Name of window argument to get.</td>
+</tr>
+<tr>
+	<td>[default_value]</td>
+	<td>Default value to be returned if window argument is missing.</td>
+</tr>
+<tr>
+	<td>[strip_whitespace]</td>
+	<td>If true all whitespace will be removed from return value, default: false.</td>
+</tr>
+</tbody>
+</table>
+</p>
+<p>
+Returns: TinyMCE configuration parameter.
+</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/docs/reference_plugins.html 4.6rc2/mambots/editors/mostlyce/docs/reference_plugins.html
--- 4.5.4/mambots/editors/mostlyce/docs/reference_plugins.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/docs/reference_plugins.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Plugins Reference</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Plugins reference</h1>
+</div>
+
+<div class="content">
+	<p>Here are some information about the different plugins.</p>
+
+	<div class="separator"></div>
+
+	<h2>Plugins</h2>
+	<div class="section">
+		<p>To use a plugin, you need to use the advanced theme and add the plugin name in the &quot;<a href="option_plugin.html">plugin</a>&quot; comma seperated line. You also need to add the button to the interface, read more about the advanced plugin to configure this.</p>
+		<p>
+		<div class="column">
+			<ul class="optionlist">
+				<li><a href="plugin_advhr.html">advhr</a></li>
+				<li><a href="plugin_advimage.html">advimage</a></li>
+				<li><a href="plugin_advlink.html">advlink</a></li>
+				<li><a href="plugin_contextmenu.html">contextmenu</a></li>
+				<li><a href="plugin_emotions.html">emotions</a></li>
+				<li><a href="plugin_flash.html">flash</a></li>
+				<li><a href="plugin_autosave.html">autosave</a></li>
+				<li><a href="plugin_style.html">style</a></li>
+				<li><a href="plugin_layer.html">layer</a></li>
+			</ul>
+		</div>		
+		<div class="column">
+			<ul class="optionlist">
+				<li><a href="plugin_iespell.html">iespell</a></li>
+				<li><a href="plugin_insertdatetime.html">insertdatetime</a></li>
+				<li><a href="plugin_paste.html">paste</a></li>
+				<li><a href="plugin_preview.html">preview</a></li>
+				<li><a href="plugin_print.html">print</a></li>
+				<li><a href="plugin_save.html">save</a></li>
+				<li><a href="plugin_noneditable.html">noneditable</a></li>
+				<li><a href="plugin_spellchecker.html">spellchecker</a></li>
+			</ul>
+		</div>
+		<div class="column">
+			<ul class="optionlist">
+				<li><a href="plugin_searchreplace.html">searchreplace</a></li>
+				<li><a href="plugin_table.html">table</a></li>
+				<li><a href="plugin_zoom.html">zoom</a></li>
+				<li><a href="plugin_directionality.html">directionality</a></li>
+				<li><a href="plugin_fullscreen.html">fullscreen</a></li>
+				<li><a href="plugin_fullpage.html">fullpage</a></li>
+				<li><a href="plugin_inlinepopups.html">inlinepopups</a></li>
+				<li><a href="plugin_fullpage.html">fullpage</a></li>
+			</ul>
+		</div>
+		<br style="clear: both" />
+		</p>
+		<p>
+		Please notice that the plugins can require some configuration, click on the plugin link to read more about that plugin.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/index.html 4.6rc2/mambots/editors/mostlyce/index.html
--- 4.5.4/mambots/editors/mostlyce/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/index.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/auth_plugin.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/auth_plugin.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/auth_plugin.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/auth_plugin.php	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+<?php
+/**
+ * General Authorization script for MOStlyCE plugins (originally written for mosCE).
+ * @author $Author: Ryan Demmer (Changed for MOStlyCE by Chad Auld)
+ * @version $Id: auth_plugin.php
+ * @package MOStlyCE
+ * @Portions from remository.php
+ */
+
+// Don't allow direct linking
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+class authPlugin
+{
+    function authPlugin()
+    {
+    	$my = mamboCore::get('currentUser');
+        $this->usertype = $my->usertype;
+        $this->username = $my->username;
+        $this->grp = $my->gid;
+        $this->mainframe = mosMainFrame::getInstance();
+    }
+    function getUserName()
+    {
+        return $this->username;
+    }
+    function getUserType()
+    {
+        return $this->usertype;
+    }
+    function isAdmin()
+    {
+        return ( strtolower( $this->usertype ) == 'superadministrator' || strtolower( $this->usertype ) == 'super administrator' || $this->grp == 16 ) ? true : false;
+    }
+}
+
+?>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/blank.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/blank.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/blank.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/blank.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,9 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>blank_page</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body class="mceContentBody">
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/index.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/info/editor_info_english.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/info/editor_info_english.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/info/editor_info_english.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/info/editor_info_english.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,27 @@
+<big><span style="font-weight: bold;">MOStlyCE</span></big><br>
+    MOStlyCE Content Editor - a wysiwyg editor for Mambo, based on Moxiecode's TinyMCE! and mosCE<br>
+    <br>
+    <span style="font-weight: bold;">Features:<br>
+    </span>
+    <ul>
+    <li>All the features of TinyMCE 2.0.6.1 by Moxiecode <a href="http://tinymce.moxiecode.com">http://tinymce.moxiecode.com</a></li>
+    <li>Originally based on mosCE 1.0.3 Final</li>
+    <li>Editor compression</li>
+    <li>Font styling, tables, emotions, search & replace, etc</li> 
+    <li>Familiar MS Word like editing</li>
+    <li>Ability to enable / disable certain plugins as needed</li>
+    </ul>
+    <br>
+
+    <span style="font-weight: bold;">Installation:<br>
+    </span><ul>
+        <li>You may need to chmod MOStlyCE folders to 755 and files to 644 in mambots/editors/mostlyce<br>
+        if you receive internal server errors with the Image Manager.</li>
+        <li>Warning : mostlyce_config.php must remain writable!</li>
+        <li>If you want to use a custom_css file for the editor, make a copy of your site template CSS,<br>
+        rename it to editor_content.css (or whatever you specify in the paramters) and place it in your<br>
+        template css folder. Activate the 'Overide Theme CSS' in paramters.</li>
+        </ul></span>
+      <br />
+
+        
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/info/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/info/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/info/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/info/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,41 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+bold_desc : 'Bold (Ctrl+B)',
+italic_desc : 'Italic (Ctrl+I)',
+underline_desc : 'Underline (Ctrl+U)',
+striketrough_desc : 'Strikethrough',
+justifyleft_desc : 'Align left',
+justifycenter_desc : 'Align center',
+justifyright_desc : 'Align right',
+justifyfull_desc : 'Align full',
+bullist_desc : 'Unordered list',
+numlist_desc : 'Ordered list',
+outdent_desc : 'Outdent',
+indent_desc : 'Indent',
+undo_desc : 'Undo (Ctrl+Z)',
+redo_desc : 'Redo (Ctrl+Y)',
+link_desc : 'Insert/edit link',
+unlink_desc : 'Unlink',
+image_desc : 'Insert/edit image',
+cleanup_desc : 'Cleanup messy code',
+focus_alert : 'A editor instance must be focused before using this command.',
+edit_confirm : 'Do you want to use the WYSIWYG mode for this textarea?',
+insert_link_title : 'Insert/edit link',
+insert : 'Insert',
+update : 'Update',
+cancel : 'Cancel',
+insert_link_url : 'Link URL',
+insert_link_target : 'Target',
+insert_link_target_same : 'Open link in the same window',
+insert_link_target_blank : 'Open link in a new window',
+insert_image_title : 'Insert/edit image',
+insert_image_src : 'Image URL',
+insert_image_alt : 'Image description',
+help_desc : 'Help',
+bold_img : "bold.gif",
+italic_img : "italic.gif",
+underline_img : "underline.gif",
+clipboard_msg : 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?',
+popup_blocked : 'Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/langs/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/langs/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/langs/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/langs/readme.txt	2006-06-20 01:05:22.000000000 -0500
@@ -0,0 +1,7 @@
+Language packs are from version 2.0.5 removed from the core but can be downloadable from the TinyMCE website.
+http://tinymce.moxiecode.com/download.php
+
+The language pack codes are based on ISO-639-1
+http://www.loc.gov/standards/iso639-2/englangn.html
+
+Try using entires if possible. &aring; etc.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/license.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/license.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/license.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/license.txt	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,437 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php	2006-06-22 23:17:06.000000000 -0500
@@ -0,0 +1,41 @@
+<?php 
+$editor_themes = 'advanced';
+$editor_compression = 'false';
+$editor_lang = 'en';
+$editor_lang_list = 'en';
+$editor_width = '500';
+$editor_height = '450';
+$editor_css_override = '0';
+$editor_custom_css = 'editor_content.css';
+$editor_newlines = 'p';
+$editor_convert_urls = 'true';
+$editor_script_acl = 'true';
+$editor_script_elms = 'src|type|language';
+$editor_iframe_acl = 'true';
+$editor_iframe_elms = 'src|width|height|class|border|align|scrolling';
+$editor_xtd_elms = '';
+$editor_direction = 'ltr';
+$editor_extra_plugins = '';
+$editor_font_tools_acl = 'true';
+$editor_plugin_datetime_acl = 'true';
+$editor_plugin_dateformat = '%m/%d/%Y';
+$editor_plugin_timeformat = '%I:%M%p';
+$editor_plugin_emotions_acl = 'true';
+$editor_plugin_print = 'true';
+$editor_plugin_searchreplace = 'true';
+$editor_plugin_flash_acl = 'true';
+$editor_plugin_table_acl = 'true';
+$editor_plugin_spellchecker = 'false';
+$editor_plugin_layer = 'true';
+$editor_layout_row1 = 'newdocument,separator,undo,redo,separator,selectall,cut,copy,paste,pastetext,pasteword,
+separator,removeformat,cleanup,separator,bold,italic,underline,strikethrough,sub,sup,separator,justifyleft,
+justifycenter,justifyright,justifyfull';
+$editor_layout_row2 = 'outdent,indent,separator,bullist,numlist,separator,charmap,hr,separator,
+tablecontrols,separator,visualaid';
+$editor_layout_row3 = 'styleselect,formatselect,separator,fontselect,fontsizeselect,
+forecolor,backcolor,separator,insertdate,inserttime';
+$editor_layout_row4 = 'help,separator,fullscreen,preview,separator,print,separator,emotions,flash,separator,link,unlink,
+anchor,separator,image,separator,ltr,rtl,separator,
+code,search,replace,spellchecker,separator,insertlayer,moveforward,movebackward,absolute';
+$editor_tmpl_dir = '/files';
+?>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_functions.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_functions.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_functions.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_functions.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,10 @@
+function MamboSave(editor_id, html, body)
+{
+    if(convert_urls){
+        base_url = tinyMCE.settings['mambo_base_url'];
+        html = tinyMCE.regexpReplace(html, 'href\s*=\s*"?'+base_url+'', 'href="', 'gi');
+        html = tinyMCE.regexpReplace(html, 'src\s*=\s*"?'+base_url+'', 'src="', 'gi');
+        html = tinyMCE.regexpReplace(html, 'value\s*=\s*"?'+base_url+'', 'value="', 'gi');
+        }
+    return html;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('template','en,tr,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,pl');var TinyMCE_TemplatePlugin={getInfo:function(){return{longname:'Template plugin',author:'Your name',authorurl:'http://www.yoursite.com',infourl:'http://www.yoursite.com/docs/template.html',version:"1.0"};},initInstance:function(inst){alert("Initialization parameter:"+tinyMCE.getParam("template_someparam",false));inst.addShortcut('ctrl','t','lang_template_desc','mceTemplate');},getControlHTML:function(cn){switch(cn){case"template":return tinyMCE.getButtonHTML(cn,'lang_template_desc','{$pluginurl}/images/template.gif','mceTemplate',true);}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceTemplate":if(user_interface){var template=new Array();template['file']='../../plugins/template/popup.htm';template['width']=300;template['height']=200;tinyMCE.openWindow(template,{editor_id:editor_id,some_custom_arg:"somecustomdata"});tinyMCE.triggerNodeChange(false);}else{alert("execCommand: mceTemplate gets called from popup.");}return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(node.parentNode.nodeName=="STRONG"||node.parentNode.nodeName=="B"){tinyMCE.switchClass(editor_id+'_template','mceButtonSelected');return true;}tinyMCE.switchClass(editor_id+'_template','mceButtonNormal');},setupContent:function(editor_id,body,doc){},onChange:function(inst){},handleEvent:function(e){top.status="template plugin event: "+e.type;return true;},cleanup:function(type,content,inst){switch(type){case"get_from_editor":alert("[FROM] Value HTML string: "+content);break;case"insert_to_editor":alert("[TO] Value HTML string: "+content);break;case"get_from_editor_dom":alert("[FROM] Value DOM Element "+content.innerHTML);break;case"insert_to_editor_dom":alert("[TO] Value DOM Element: "+content.innerHTML);break;}return content;},_someInternalFunction:function(a,b){return 1;}};tinyMCE.addPlugin("template",TinyMCE_TemplatePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,238 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.12 $
+ * $Date: 2006/02/22 20:06:23 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('template', 'en,tr,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,pl'); // <- Add a comma separated list of all supported languages
+
+/****
+ * Steps for creating a plugin from this template:
+ *
+ * 1. Change all "template" to the name of your plugin.
+ * 2. Remove all the callbacks in this file that you don't need.
+ * 3. Remove the popup.htm file if you don't need any popups.
+ * 4. Add your custom logic to the callbacks you needed.
+ * 5. Write documentation in a readme.txt file on how to use the plugin.
+ * 6. Upload it under the "Plugins" section at sourceforge.
+ *
+ ****/
+
+// Singleton class
+var TinyMCE_TemplatePlugin = {
+	/**
+	 * Returns information about the plugin as a name/value array.
+	 * The current keys are longname, author, authorurl, infourl and version.
+	 *
+	 * @returns Name/value array containing information about the plugin.
+	 * @type Array 
+	 */
+	getInfo : function() {
+		return {
+			longname : 'Template plugin',
+			author : 'Your name',
+			authorurl : 'http://www.yoursite.com',
+			infourl : 'http://www.yoursite.com/docs/template.html',
+			version : "1.0"
+		};
+	},
+
+	/**
+	 * Gets executed when a TinyMCE editor instance is initialized.
+	 *
+	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
+	 */
+	initInstance : function(inst) {
+		// You can take out plugin specific parameters
+		alert("Initialization parameter:" + tinyMCE.getParam("template_someparam", false));
+
+		// Register custom keyboard shortcut
+		inst.addShortcut('ctrl', 't', 'lang_template_desc', 'mceTemplate');
+	},
+
+	/**
+	 * Returns the HTML code for a specific control or empty string if this plugin doesn't have that control.
+	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$pluginurl} will be replaced
+	 * with the URL of the plugin. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs.
+	 *
+	 * @param {string} cn Editor control/button name to get HTML for.
+	 * @return HTML code for a specific control or empty string.
+	 * @type string
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "template":
+				return tinyMCE.getButtonHTML(cn, 'lang_template_desc', '{$pluginurl}/images/template.gif', 'mceTemplate', true);
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes a specific command, this function handles plugin commands.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
+	 * @param {HTMLElement} element Body or root element for the editor instance.
+	 * @param {string} command Command name to be executed.
+	 * @param {string} user_interface True/false if a user interface should be presented.
+	 * @param {mixed} value Custom value argument, can be anything.
+	 * @return true/false if the command was executed by this plugin or not.
+	 * @type
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
+			case "mceTemplate":
+				// Show UI/Popup
+				if (user_interface) {
+					// Open a popup window and send in some custom data in a window argument
+					var template = new Array();
+
+					template['file'] = '../../plugins/template/popup.htm'; // Relative to theme
+					template['width'] = 300;
+					template['height'] = 200;
+
+					tinyMCE.openWindow(template, {editor_id : editor_id, some_custom_arg : "somecustomdata"});
+
+					// Let TinyMCE know that something was modified
+					tinyMCE.triggerNodeChange(false);
+				} else {
+					// Do a command this gets called from the template popup
+					alert("execCommand: mceTemplate gets called from popup.");
+				}
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	/**
+	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
+	 * button controls depending on where the user are and what they have selected. This method gets executed
+	 * alot and should be as performance tuned as possible.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was changed.
+	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
+	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
+	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
+	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
+	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
+	 */
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		// Select template button if parent node is a strong or b
+		if (node.parentNode.nodeName == "STRONG" || node.parentNode.nodeName == "B") {
+			tinyMCE.switchClass(editor_id + '_template', 'mceButtonSelected');
+			return true;
+		}
+
+		// Deselect template button
+		tinyMCE.switchClass(editor_id + '_template', 'mceButtonNormal');
+	},
+
+	/**
+	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
+	 * @param {HTMLElement} body HTML body element of editor instance.
+	 * @param {HTMLDocument} doc HTML document instance.
+	 */
+	setupContent : function(editor_id, body, doc) {
+	},
+
+	/**
+	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
+	 * added.
+	 *
+	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
+	 */
+	onChange : function(inst) {
+	},
+
+	/**
+	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
+	 * doesn't listen on all types of events so custom event handling may be required for
+	 * some purposes.
+	 *
+	 * @param {Event} e HTML editor event reference.
+	 * @return true - pass to next handler in chain, false - stop chain execution
+	 * @type boolean
+	 */
+	handleEvent : function(e) {
+		// Display event type in statusbar
+		top.status = "template plugin event: " + e.type;
+
+		return true; // Pass to next handler
+	},
+
+	/**
+	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
+	 * The type parameter contains what type of event that was performed and what format the content is in.
+	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
+	 *
+	 * @param {string} type Cleanup event type.
+	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
+	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
+	 * @return New content or the input content depending on action.
+	 * @type string
+	 */
+	cleanup : function(type, content, inst) {
+		switch (type) {
+			case "get_from_editor":
+				alert("[FROM] Value HTML string: " + content);
+
+				// Do custom cleanup code here
+
+				break;
+
+			case "insert_to_editor":
+				alert("[TO] Value HTML string: " + content);
+
+				// Do custom cleanup code here
+
+				break;
+
+			case "get_from_editor_dom":
+				alert("[FROM] Value DOM Element " + content.innerHTML);
+
+				// Do custom cleanup code here
+
+				break;
+
+			case "insert_to_editor_dom":
+				alert("[TO] Value DOM Element: " + content.innerHTML);
+
+				// Do custom cleanup code here
+
+				break;
+		}
+
+		return content;
+	},
+
+	// Private plugin internal methods
+
+	/**
+	 * This is just a internal plugin method, prefix all internal methods with a _ character.
+	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
+	 *
+	 * @param {string} a Some arg1.
+	 * @param {string} b Some arg2.
+	 * @return Some return.
+	 * @type string
+	 */
+	_someInternalFunction : function(a, b) {
+		return 1;
+	}
+};
+
+// Adds the plugin class to the list of available TinyMCE plugins
+tinyMCE.addPlugin("template", TinyMCE_TemplatePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/images/template.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/images/template.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,8 @@
+// UK lang variables
+
+/* Remember to namespace the language parameters lang_<your plugin>_<some name> */
+
+tinyMCE.addToLang('',{
+template_title : 'This is just a template popup',
+template_desc : 'This is just a template button'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/popup.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/popup.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/popup.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/popup.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,48 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_template_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript">
+	<!--
+		function init() {
+			var inst = tinyMCE.selectedInstance;
+			var elm = inst.getFocusElement();
+
+			alert("Got a window argument from plugin: " + tinyMCE.getWindowArg('some_custom_arg'));
+
+			// Set the form item value to the selected node element name
+			document.forms[0].nodename.value = elm.nodeName;
+		}
+
+		function insertSomething() {
+			// Execute the mceTemplate command without UI this time
+			tinyMCEPopup.execCommand('mceTemplate');
+
+			// Close the dialog
+			tinyMCEPopup.close();
+		}
+	//-->
+	</script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');"> 
+	<form onsubmit="insert();return false;">
+		<h3>{$lang_template_title}</h3>
+
+		<!-- Gets filled with the selected elements name -->
+		<div style="margin-top: 10px; margin-bottom: 10px">
+			The selected element name: <input type="text" name="nodename" />
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertSomething();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body> 
+</html> 
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/_template/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+This is a template/tutorial plugin that where created to help you in the development of own plugins for TinyMCE.
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/advhr.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/advhr.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/advhr.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,23 @@
+input.radio {
+	border: 1px none #000000;
+	background-color: transparent;
+	vertical-align: middle;
+}
+
+.panel_wrapper div.current {
+	height: 80px;
+}
+
+#width {
+	width: 50px;
+	vertical-align: middle;
+}
+
+#width2 {
+	width: 50px;
+	vertical-align: middle;
+}
+
+#size {
+	width: 100px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('advhr','en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_AdvancedHRPlugin={getInfo:function(){return{longname:'Advanced HR',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_advhr.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion}},getControlHTML:function(cn){switch(cn){case"advhr":return tinyMCE.getButtonHTML(cn,'lang_insert_advhr_desc','{$pluginurl}/images/advhr.gif','mceAdvancedHr');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceAdvancedHr":var template=new Array();template['file']='../../plugins/advhr/rule.htm';template['width']=250;template['height']=160;template['width']+=tinyMCE.getLang('lang_advhr_delta_width',0);template['height']+=tinyMCE.getLang('lang_advhr_delta_height',0);var size="",width="",noshade="";if(tinyMCE.selectedElement!=null&&tinyMCE.selectedElement.nodeName.toLowerCase()=="hr"){tinyMCE.hrElement=tinyMCE.selectedElement;if(tinyMCE.hrElement){size=tinyMCE.hrElement.getAttribute('size')?tinyMCE.hrElement.getAttribute('size'):"";width=tinyMCE.hrElement.getAttribute('width')?tinyMCE.hrElement.getAttribute('width'):"";noshade=tinyMCE.hrElement.getAttribute('noshade')?tinyMCE.hrElement.getAttribute('noshade'):"";}tinyMCE.openWindow(template,{editor_id:editor_id,size:size,width:width,noshade:noshade,mceDo:'update'});}else{if(tinyMCE.isMSIE){tinyMCE.execInstanceCommand(editor_id,'mceInsertContent',false,'<hr />');}else{tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",size:size,width:width,noshade:noshade,mceDo:'insert'});}}return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(node==null)return;do{if(node.nodeName=="HR"){tinyMCE.switchClass(editor_id+'_advhr','mceButtonSelected');return true;}}while((node=node.parentNode));tinyMCE.switchClass(editor_id+'_advhr','mceButtonNormal');return true;}};tinyMCE.addPlugin("advhr",TinyMCE_AdvancedHRPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,92 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.19 $
+ * $Date: 2006/02/10 16:29:37 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('advhr', 'en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_AdvancedHRPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Advanced HR',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_advhr.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		}
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "advhr":
+				return tinyMCE.getButtonHTML(cn, 'lang_insert_advhr_desc', '{$pluginurl}/images/advhr.gif', 'mceAdvancedHr');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the mceAdvanceHr command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceAdvancedHr":
+				var template = new Array();
+
+				template['file']   = '../../plugins/advhr/rule.htm'; // Relative to theme
+				template['width']  = 250;
+				template['height'] = 160;
+
+				template['width']  += tinyMCE.getLang('lang_advhr_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_advhr_delta_height', 0);
+
+				var size = "", width = "", noshade = "";
+				if (tinyMCE.selectedElement != null && tinyMCE.selectedElement.nodeName.toLowerCase() == "hr") {
+					tinyMCE.hrElement = tinyMCE.selectedElement;
+
+					if (tinyMCE.hrElement) {
+						size    = tinyMCE.hrElement.getAttribute('size') ? tinyMCE.hrElement.getAttribute('size') : "";
+						width   = tinyMCE.hrElement.getAttribute('width') ? tinyMCE.hrElement.getAttribute('width') : "";
+						noshade = tinyMCE.hrElement.getAttribute('noshade') ? tinyMCE.hrElement.getAttribute('noshade') : "";
+					}
+
+					tinyMCE.openWindow(template, {editor_id : editor_id, size : size, width : width, noshade : noshade, mceDo : 'update'});
+				} else {
+					if (tinyMCE.isMSIE) {
+						tinyMCE.execInstanceCommand(editor_id, 'mceInsertContent', false,'<hr />');
+					} else {
+						tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes", size : size, width : width, noshade : noshade, mceDo : 'insert'});
+					}
+				}
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (node == null)
+			return;
+
+		do {
+			if (node.nodeName == "HR") {
+				tinyMCE.switchClass(editor_id + '_advhr', 'mceButtonSelected');
+				return true;
+			}
+		} while ((node = node.parentNode));
+
+		tinyMCE.switchClass(editor_id + '_advhr', 'mceButtonNormal');
+
+		return true;
+	}
+};
+
+tinyMCE.addPlugin("advhr", TinyMCE_AdvancedHRPlugin);
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/images/advhr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/images/advhr.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/rule.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/rule.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/rule.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/rule.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,41 @@
+function init() {
+	var formObj = document.forms[0];
+	formObj.width.value  = tinyMCE.getWindowArg('width');
+	formObj.size.value   = tinyMCE.getWindowArg('size');
+	formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('mceDo'),'Insert',true);
+	if (tinyMCE.getWindowArg('noshade')) {
+		formObj.noshade.checked = true;
+	}
+	if (tinyMCE.getWindowArg('width').lastIndexOf('%')!=-1) {
+		formObj.width2.value = "%";
+		formObj.width.value  = formObj.width.value.substring(0,formObj.width.value.length-1);
+	}
+}
+
+function insertHR() {
+	var formObj = document.forms[0];
+	var width   = formObj.width.value;
+	var size    = formObj.size.value;
+	var html = '<hr';
+	if (size!='' && size!=0) {
+		html += ' size="' + size + '"';
+	}
+	if (width!='' && width!=0) {
+		html += ' width="' + width;
+		if (formObj.width2.value=='%') {
+			html += '%';
+		}
+		html += '"';
+	}
+	if (formObj.noshade.checked==true) {
+		html += ' noshade="noshade"';
+	}
+	html += ' />';
+
+	tinyMCEPopup.execCommand("mceInsertContent", true, html);
+	tinyMCEPopup.close();
+}
+
+function cancelAction() {
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,8 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+insert_advhr_desc : 'Horizontale rule',
+insert_advhr_width : 'Width',
+insert_advhr_size : 'Height',
+insert_advhr_noshade : 'No shadow'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/langs/index.html	2006-06-20 01:05:22.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/rule.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/rule.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/rule.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advhr/rule.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,61 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_insert_advhr_desc}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/rule.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<link href="css/advhr.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');">
+<form onsubmit="insertHR();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_insert_advhr_desc}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<table border="0" cellpadding="4" cellspacing="0">
+                    <tr>
+                        <td><label for="width">{$lang_insert_advhr_width}</label></td>
+                        <td nowrap="nowrap">
+                            <input id="width" name="width" type="text" value="" />
+                            <select name="width2" id="width2">
+                                <option value="">px</option>
+                                <option value="%">%</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label for="size">{$lang_insert_advhr_size}</label></td>
+                        <td><select id="size" name="size">
+                            <option value="">Normal</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                        </select></td>
+                    </tr>
+                    <tr>
+                        <td><label for="noshade">{$lang_insert_advhr_noshade}</label></td>
+                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
+                    </tr>
+            </table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertHR();" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/advimage.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/advimage.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/advimage.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,66 @@
+/* CSS file for advimage plugin popup */
+
+.mceImageList {
+	width: 280px;
+}
+
+.mceActionPanel {
+	margin-top: 7px;
+}
+
+.alignPreview {
+	border: 1px solid black;
+	width: 140px;
+	height: 140px;
+	overflow: hidden;
+	padding: 5px;
+}
+
+.checkbox {
+	border: 0;
+}
+
+.panel_wrapper div.current {
+	height: 305px;
+}
+
+#prev {
+	margin: 0;
+	border: 1px
+	solid black;
+	width: 99%;
+	height: 150px;
+	overflow: auto;
+}
+
+#align, #classlist {
+	width: 150px;
+}
+
+#width, #height {
+	vertical-align: middle;
+	width: 50px;
+	text-align: center;
+}
+
+#vspace, #hspace, #border {
+	vertical-align: middle;
+	width: 30px;
+	text-align: center;
+}
+
+#classlist {
+	width: 180px;
+}
+
+input {
+	width: 280px;
+}
+
+#constrain, #onmousemovecheck {
+	width: auto;
+}
+
+#id, #dir, #lang, #usemap, #longdesc {
+	width: 200px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('advimage','en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,es,is,zh_tw,zh_tw_utf8,sk,da');var TinyMCE_AdvancedImagePlugin={getInfo:function(){return{longname:'Advanced image',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_advimage.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"image":return tinyMCE.getButtonHTML(cn,'lang_image_desc','{$themeurl}/images/image.gif','mceAdvImage');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceAdvImage":var template=new Array();template['file']='../../plugins/advimage/image.htm';template['width']=480;template['height']=380;template['width']+=tinyMCE.getLang('lang_advimage_delta_width',0);template['height']+=tinyMCE.getLang('lang_advimage_delta_height',0);var inst=tinyMCE.getInstanceById(editor_id);var elm=inst.getFocusElement();if(elm!=null&&tinyMCE.getAttrib(elm,'class').indexOf('mceItem')!=-1)return true;tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;}return false;},cleanup:function(type,content){switch(type){case"insert_to_editor_dom":var imgs=content.getElementsByTagName("img");for(var i=0;i<imgs.length;i++){var onmouseover=tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i],'onmouseover'));var onmouseout=tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i],'onmouseout'));if((src=this._getImageSrc(onmouseover))!=""){if(tinyMCE.getParam('convert_urls'))src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],src);imgs[i].setAttribute('onmouseover',"this.src='"+src+"';");}if((src=this._getImageSrc(onmouseout))!=""){if(tinyMCE.getParam('convert_urls'))src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],src);imgs[i].setAttribute('onmouseout',"this.src='"+src+"';");}}break;case"get_from_editor_dom":var imgs=content.getElementsByTagName("img");for(var i=0;i<imgs.length;i++){var onmouseover=tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i],'onmouseover'));var onmouseout=tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i],'onmouseout'));if((src=this._getImageSrc(onmouseover))!=""){if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, null, true);");imgs[i].setAttribute('onmouseover',"this.src='"+src+"';");}if((src=this._getImageSrc(onmouseout))!=""){if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, null, true);");imgs[i].setAttribute('onmouseout',"this.src='"+src+"';");}}break;}return content;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(node==null)return;do{if(node.nodeName=="IMG"&&tinyMCE.getAttrib(node,'class').indexOf('mceItem')==-1){tinyMCE.switchClass(editor_id+'_advimage','mceButtonSelected');return true;}}while((node=node.parentNode));tinyMCE.switchClass(editor_id+'_advimage','mceButtonNormal');return true;},_getImageSrc:function(s){var sr,p=-1;if(!s)return"";if((p=s.indexOf('this.src='))!=-1){sr=s.substring(p+10);sr=sr.substring(0,sr.indexOf('\''));return sr;}return"";}};tinyMCE.addPlugin("advimage",TinyMCE_AdvancedImagePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,150 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.30 $
+ * $Date: 2006/02/10 16:29:37 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('advimage', 'en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,es,is,zh_tw,zh_tw_utf8,sk,da');
+
+var TinyMCE_AdvancedImagePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Advanced image',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_advimage.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "image":
+				return tinyMCE.getButtonHTML(cn, 'lang_image_desc', '{$themeurl}/images/image.gif', 'mceAdvImage');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		switch (command) {
+			case "mceAdvImage":
+				var template = new Array();
+
+				template['file']   = '../../plugins/advimage/image.htm';
+				template['width']  = 480;
+				template['height'] = 380;
+
+				// Language specific width and height addons
+				template['width']  += tinyMCE.getLang('lang_advimage_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_advimage_delta_height', 0);
+
+				var inst = tinyMCE.getInstanceById(editor_id);
+				var elm = inst.getFocusElement();
+
+				if (elm != null && tinyMCE.getAttrib(elm, 'class').indexOf('mceItem') != -1)
+					return true;
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+
+				return true;
+		}
+
+		return false;
+	},
+
+	cleanup : function(type, content) {
+		switch (type) {
+			case "insert_to_editor_dom":
+				var imgs = content.getElementsByTagName("img");
+				for (var i=0; i<imgs.length; i++) {
+					var onmouseover = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseover'));
+					var onmouseout = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseout'));
+
+					if ((src = this._getImageSrc(onmouseover)) != "") {
+						if (tinyMCE.getParam('convert_urls'))
+							src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
+
+						imgs[i].setAttribute('onmouseover', "this.src='" + src + "';");
+					}
+
+					if ((src = this._getImageSrc(onmouseout)) != "") {
+						if (tinyMCE.getParam('convert_urls'))
+							src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
+
+						imgs[i].setAttribute('onmouseout', "this.src='" + src + "';");
+					}
+				}
+				break;
+
+			case "get_from_editor_dom":
+				var imgs = content.getElementsByTagName("img");
+				for (var i=0; i<imgs.length; i++) {
+					var onmouseover = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseover'));
+					var onmouseout = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseout'));
+
+					if ((src = this._getImageSrc(onmouseover)) != "") {
+						if (tinyMCE.getParam('convert_urls'))
+							src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, null, true);");
+
+						imgs[i].setAttribute('onmouseover', "this.src='" + src + "';");
+					}
+
+					if ((src = this._getImageSrc(onmouseout)) != "") {
+						if (tinyMCE.getParam('convert_urls'))
+							src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, null, true);");
+
+						imgs[i].setAttribute('onmouseout', "this.src='" + src + "';");
+					}
+				}
+				break;
+		}
+
+		return content;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (node == null)
+			return;
+
+		do {
+			if (node.nodeName == "IMG" && tinyMCE.getAttrib(node, 'class').indexOf('mceItem') == -1) {
+				tinyMCE.switchClass(editor_id + '_advimage', 'mceButtonSelected');
+				return true;
+			}
+		} while ((node = node.parentNode));
+
+		tinyMCE.switchClass(editor_id + '_advimage', 'mceButtonNormal');
+
+		return true;
+	},
+
+	/**
+	 * Returns the image src from a scripted mouse over image str.
+	 *
+	 * @param {string} s String to get real src from.
+	 * @return Image src from a scripted mouse over image str.
+	 * @type string
+	 */
+	_getImageSrc : function(s) {
+		var sr, p = -1;
+
+		if (!s)
+			return "";
+
+		if ((p = s.indexOf('this.src=')) != -1) {
+			sr = s.substring(p + 10);
+			sr = sr.substring(0, sr.indexOf('\''));
+
+			return sr;
+		}
+
+		return "";
+	}
+};
+
+tinyMCE.addPlugin("advimage", TinyMCE_AdvancedImagePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/image.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/image.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/image.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/image.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,240 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_insert_image_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/functions.js"></script>
+	<link href="css/advimage.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="advimage" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+    <form onsubmit="insertAction();return false;" action="#"> 
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_advimage_tab_general}</a></span></li>
+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{$lang_advimage_tab_appearance}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{$lang_advimage_tab_advanced}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+						<legend>{$lang_advimage_general}</legend>
+
+						<table class="properties">
+							<tr>
+								<td class="column1"><label id="srclabel" for="src">{$lang_insert_image_src}</label></td>
+								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
+									<tr> 
+									  <td><input name="src" type="text" id="src" value="" onchange="showPreviewImage(this.value);" /></td> 
+									  <td id="srcbrowsercontainer">&nbsp;</td>
+									</tr>
+								  </table></td>
+							</tr>
+							<tr id="imagelistsrcrow">
+								<td class="column1"><label for="imagelistsrc">{$lang_image_list}</label></td>
+								<td colspan="2" id="imagelistsrccontainer">&nbsp;</td>
+							</tr>
+							<tr> 
+								<td class="column1"><label id="altlabel" for="alt">{$lang_insert_image_alt}</label></td> 
+								<td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> 
+							</tr> 
+							<tr> 
+								<td class="column1"><label id="titlelabel" for="title">{$lang_advimage_title}</label></td> 
+								<td colspan="2"><input id="title" name="title" type="text" value="" /></td> 
+							</tr>
+						</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_advimage_preview}</legend>
+					<div id="prev"></div>
+				</fieldset>
+			</div>
+
+			<div id="appearance_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_advimage_tab_appearance}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr> 
+							<td class="column1"><label id="alignlabel" for="align">{$lang_insert_image_align}</label></td> 
+							<td><select id="align" name="align" onchange="changeAppearance();"> 
+									<option value="">{$lang_insert_image_align_default}</option> 
+									<option value="baseline">{$lang_insert_image_align_baseline}</option> 
+									<option value="top">{$lang_insert_image_align_top}</option> 
+									<option value="middle">{$lang_insert_image_align_middle}</option> 
+									<option value="bottom">{$lang_insert_image_align_bottom}</option> 
+									<option value="texttop">{$lang_insert_image_align_texttop}</option> 
+									<option value="absmiddle">{$lang_insert_image_align_absmiddle}</option> 
+									<option value="absbottom">{$lang_insert_image_align_absbottom}</option> 
+									<option value="left">{$lang_insert_image_align_left}</option> 
+									<option value="right">{$lang_insert_image_align_right}</option> 
+								</select> 
+							</td>
+							<td rowspan="6" valign="top">
+								<div class="alignPreview">
+									<img id="alignSampleImg" src="images/sample.gif" alt="{$lang_advimage_example_img}" />
+									Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam
+									nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum
+									edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam
+									erat volutpat.
+								</div>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="widthlabel" for="width">{$lang_insert_image_dimensions}</label></td>
+							<td nowrap="nowrap">
+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" onchange="changeHeight();" /> x 
+								<input name="height" type="text" id="height" value="" size="5" maxlength="5" onchange="changeWidth();" /> px
+							</td>
+						</tr>
+
+						<tr>
+							<td>&nbsp;</td>
+							<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
+										<td><label id="constrainlabel" for="constrain">{$lang_advimage_constrain_proportions}</label></td>
+									</tr>
+								</table></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="vspacelabel" for="vspace">{$lang_insert_image_vspace}</label></td> 
+							<td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3" onchange="changeAppearance();updateStyle();" />
+							</td>
+						</tr>
+
+						<tr> 
+							<td class="column1"><label id="hspacelabel" for="hspace">{$lang_insert_image_hspace}</label></td> 
+							<td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3" onchange="changeAppearance();updateStyle();" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="borderlabel" for="border">{$lang_insert_image_border}</label></td> 
+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changeAppearance();updateStyle();" /></td> 
+						</tr>
+
+						<tr>
+							<td><label id="classlabel" for="classlist">{$lang_class_name}</label></td>
+							<td colspan="2">
+								 <select id="classlist" name="classlist">
+									<option value="" selected>{$lang_not_set}</option>
+								 </select>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="stylelabel" for="style">{$lang_advimage_style}</label></td> 
+							<td colspan="2"><input id="style" name="style" type="text" value="" onchange="styleUpdated();" /></td> 
+						</tr>
+
+						<!-- <tr>
+							<td class="column1"><label id="classeslabel" for="classes">{$lang_advimage_classes}</label></td> 
+							<td colspan="2"><input id="classes" name="classes" type="text" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td> 
+						</tr> -->
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_advimage_swap_image}</legend>
+
+					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="changeMouseMove();" />
+					<label id="onmousemovechecklabel" for="onmousemovecheck">{$lang_advimage_alt_image}</label>
+
+					<table border="0" cellpadding="4" cellspacing="0" width="100%">
+							<tr>
+								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{$lang_advimage_mouseover}</label></td> 
+								<td><table border="0" cellspacing="0" cellpadding="0"> 
+									<tr> 
+									  <td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 
+									  <td id="onmouseoversrccontainer">&nbsp;</td>
+									</tr>
+								  </table></td>
+							</tr>
+							<tr id="imagelistoverrow">
+								<td class="column1"><label for="imagelistover">{$lang_image_list}</label></td>
+								<td id="imagelistovercontainer">&nbsp;</td>
+							</tr>
+							<tr> 
+								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{$lang_advimage_mouseout}</label></td> 
+								<td class="column2"><table border="0" cellspacing="0" cellpadding="0"> 
+									<tr> 
+									  <td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 
+									  <td id="onmouseoutsrccontainer">&nbsp;</td>
+									</tr> 
+								  </table></td> 
+							</tr>
+							<tr id="imagelistoutrow">
+								<td class="column1"><label for="imagelistout">{$lang_image_list}</label></td>
+								<td id="imagelistoutcontainer">&nbsp;</td>
+							</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_advimage_misc}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label id="idlabel" for="id">{$lang_advimage_id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="dirlabel" for="dir">{$lang_advimage_langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" onchange="changeAppearance();"> 
+										<option value="">{$lang_not_set}</option> 
+										<option value="ltr">{$lang_advimage_ltr}</option> 
+										<option value="rtl">{$lang_advimage_rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="langlabel" for="lang">{$lang_advimage_langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="usemaplabel" for="usemap">{$lang_advimage_image_map}</label></td> 
+							<td>
+								<input id="usemap" name="usemap" type="text" value="" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="longdesclabel" for="longdesc">{$lang_advimage_long_desc}</label></td>
+							<td><table border="0" cellspacing="0" cellpadding="0">
+									<tr>
+									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>
+									  <td id="longdesccontainer">&nbsp;</td>
+									</tr>
+								</table></td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertAction();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();" />
+			</div>
+		</div>
+    </form>
+</body> 
+</html> 
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/images/sample.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/images/sample.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/functions.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/functions.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/functions.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/functions.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,545 @@
+/* Functions for the advimage plugin popup */
+
+var preloadImg = null;
+var orgImageWidth, orgImageHeight;
+
+function preinit() {
+	// Initialize
+	tinyMCE.setWindowArg('mce_windowresize', false);
+
+	// Import external list url javascript
+	var url = tinyMCE.getParam("external_image_list_url");
+	if (url != null) {
+		// Fix relative
+		if (url.charAt(0) != '/' && url.indexOf('://') == -1)
+			url = tinyMCE.documentBasePath + "/" + url;
+
+		document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
+	}
+}
+
+function convertURL(url, node, on_save) {
+	return eval("tinyMCEPopup.windowOpener." + tinyMCE.settings['urlconverter_callback'] + "(url, node, on_save);");
+}
+
+function getImageSrc(str) {
+	var pos = -1;
+
+	if (!str)
+		return "";
+
+	if ((pos = str.indexOf('this.src=')) != -1) {
+		var src = str.substring(pos + 10);
+
+		src = src.substring(0, src.indexOf('\''));
+
+		if (tinyMCE.getParam('convert_urls'))
+			src = convertURL(src, null, true);
+
+		return src;
+	}
+
+	return "";
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var elm = inst.getFocusElement();
+	var action = "insert";
+	var html = "";
+
+	// Image list src
+	html = getImageListHTML('imagelistsrc','src','onSelectMainImage');
+	if (html == "")
+		document.getElementById("imagelistsrcrow").style.display = 'none';
+	else
+		document.getElementById("imagelistsrccontainer").innerHTML = html;
+
+	// Image list oversrc
+	html = getImageListHTML('imagelistover','onmouseoversrc');
+	if (html == "")
+		document.getElementById("imagelistoverrow").style.display = 'none';
+	else
+		document.getElementById("imagelistovercontainer").innerHTML = html;
+
+	// Image list outsrc
+	html = getImageListHTML('imagelistout','onmouseoutsrc');
+	if (html == "")
+		document.getElementById("imagelistoutrow").style.display = 'none';
+	else
+		document.getElementById("imagelistoutcontainer").innerHTML = html;
+
+	// Src browser
+	html = getBrowserHTML('srcbrowser','src','image','advimage');
+	document.getElementById("srcbrowsercontainer").innerHTML = html;
+
+	// Over browser
+	html = getBrowserHTML('oversrcbrowser','onmouseoversrc','image','advimage');
+	document.getElementById("onmouseoversrccontainer").innerHTML = html;
+
+	// Out browser
+	html = getBrowserHTML('outsrcbrowser','onmouseoutsrc','image','advimage');
+	document.getElementById("onmouseoutsrccontainer").innerHTML = html;
+
+	// Longdesc browser
+	html = getBrowserHTML('longdescbrowser','longdesc','file','advimage');
+	document.getElementById("longdesccontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('srcbrowser'))
+		document.getElementById('src').style.width = '260px';
+
+	if (isVisible('oversrcbrowser'))
+		document.getElementById('onmouseoversrc').style.width = '260px';
+
+	if (isVisible('outsrcbrowser'))
+		document.getElementById('onmouseoutsrc').style.width = '260px';
+
+	if (isVisible('longdescbrowser'))
+		document.getElementById('longdesc').style.width = '180px';
+
+	// Check action
+	if (elm != null && elm.nodeName == "IMG")
+		action = "update";
+
+	formObj.insert.value = tinyMCE.getLang('lang_' + action, 'Insert', true); 
+
+	if (action == "update") {
+		var src = tinyMCE.getAttrib(elm, 'src');
+		var onmouseoversrc = getImageSrc(tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmouseover')));
+		var onmouseoutsrc = getImageSrc(tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmouseout')));
+
+		src = convertURL(src, elm, true);
+
+		// Use mce_src if found
+		var mceRealSrc = tinyMCE.getAttrib(elm, 'mce_src');
+		if (mceRealSrc != "") {
+			src = mceRealSrc;
+
+			if (tinyMCE.getParam('convert_urls'))
+				src = convertURL(src, elm, true);
+		}
+
+		if (onmouseoversrc != "" && tinyMCE.getParam('convert_urls'))
+			onmouseoversrc = convertURL(onmouseoversrc, elm, true);
+
+		if (onmouseoutsrc != "" && tinyMCE.getParam('convert_urls'))
+			onmouseoutsrc = convertURL(onmouseoutsrc, elm, true);
+
+		// Setup form data
+		var style = tinyMCE.parseStyle(tinyMCE.getAttrib(elm, "style"));
+
+		// Store away old size
+		orgImageWidth = trimSize(getStyle(elm, 'width'))
+		orgImageHeight = trimSize(getStyle(elm, 'height'));
+
+		formObj.src.value    = src;
+		formObj.alt.value    = tinyMCE.getAttrib(elm, 'alt');
+		formObj.title.value  = tinyMCE.getAttrib(elm, 'title');
+		formObj.border.value = trimSize(getStyle(elm, 'border', 'borderWidth'));
+		formObj.vspace.value = tinyMCE.getAttrib(elm, 'vspace');
+		formObj.hspace.value = tinyMCE.getAttrib(elm, 'hspace');
+		formObj.width.value  = orgImageWidth;
+		formObj.height.value = orgImageHeight;
+		formObj.onmouseoversrc.value = onmouseoversrc;
+		formObj.onmouseoutsrc.value  = onmouseoutsrc;
+		formObj.id.value  = tinyMCE.getAttrib(elm, 'id');
+		formObj.dir.value  = tinyMCE.getAttrib(elm, 'dir');
+		formObj.lang.value  = tinyMCE.getAttrib(elm, 'lang');
+		formObj.longdesc.value  = tinyMCE.getAttrib(elm, 'longdesc');
+		formObj.usemap.value  = tinyMCE.getAttrib(elm, 'usemap');
+		formObj.style.value  = tinyMCE.serializeStyle(style);
+
+		// Select by the values
+		if (tinyMCE.isMSIE)
+			selectByValue(formObj, 'align', getStyle(elm, 'align', 'styleFloat'));
+		else
+			selectByValue(formObj, 'align', getStyle(elm, 'align', 'cssFloat'));
+
+		addClassesToList('classlist', 'advimage_styles');
+
+		selectByValue(formObj, 'classlist', tinyMCE.getAttrib(elm, 'class'));
+		selectByValue(formObj, 'imagelistsrc', src);
+		selectByValue(formObj, 'imagelistover', onmouseoversrc);
+		selectByValue(formObj, 'imagelistout', onmouseoutsrc);
+
+		updateStyle();
+		showPreviewImage(src, true);
+		changeAppearance();
+
+		window.focus();
+	} else
+		addClassesToList('classlist', 'advimage_styles');
+
+	// If option enabled default contrain proportions to checked
+	if (tinyMCE.getParam("advimage_constrain_proportions", true))
+		formObj.constrain.checked = true;
+
+	// Check swap image if valid data
+	if (formObj.onmouseoversrc.value != "" || formObj.onmouseoutsrc.value != "")
+		setSwapImageDisabled(false);
+	else
+		setSwapImageDisabled(true);
+}
+
+function setSwapImageDisabled(state) {
+	var formObj = document.forms[0];
+
+	formObj.onmousemovecheck.checked = !state;
+
+	setBrowserDisabled('overbrowser', state);
+	setBrowserDisabled('outbrowser', state);
+
+	if (formObj.imagelistover)
+		formObj.imagelistover.disabled = state;
+
+	if (formObj.imagelistout)
+		formObj.imagelistout.disabled = state;
+
+	formObj.onmouseoversrc.disabled = state;
+	formObj.onmouseoutsrc.disabled  = state;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value != "") {
+		elm.setAttribute(attrib, value);
+
+		if (attrib == "style")
+			attrib = "style.cssText";
+
+		if (attrib == "longdesc")
+			attrib = "longDesc";
+
+		if (attrib == "width") {
+			attrib = "style.width";
+			value = value + "px";
+		}
+
+		if (attrib == "height") {
+			attrib = "style.height";
+			value = value + "px";
+		}
+
+		if (attrib == "class")
+			attrib = "className";
+
+		eval('elm.' + attrib + "=value;");
+	} else
+		elm.removeAttribute(attrib);
+}
+
+function makeAttrib(attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value == "")
+		return "";
+
+	// XML encode it
+	value = value.replace(/&/g, '&amp;');
+	value = value.replace(/\"/g, '&quot;');
+	value = value.replace(/</g, '&lt;');
+	value = value.replace(/>/g, '&gt;');
+
+	return ' ' + attrib + '="' + value + '"';
+}
+
+function insertAction() {
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var elm = inst.getFocusElement();
+	var formObj = document.forms[0];
+	var src = formObj.src.value;
+	var onmouseoversrc = formObj.onmouseoversrc.value;
+	var onmouseoutsrc = formObj.onmouseoutsrc.value;
+
+	if (tinyMCE.getParam("accessibility_warnings")) {
+		if (formObj.alt.value == "") {
+			var answer = confirm(tinyMCE.getLang('lang_advimage_missing_alt', '', true));
+			if (answer == true) {
+				formObj.alt.value = " ";
+			}
+		} else {
+			var answer = true;
+		}
+
+		if (!answer)
+			return;
+	}
+
+	if (onmouseoversrc && onmouseoversrc != "")
+		onmouseoversrc = "this.src='" + convertURL(onmouseoversrc, tinyMCE.imgElement) + "';";
+
+	if (onmouseoutsrc && onmouseoutsrc != "")
+		onmouseoutsrc = "this.src='" + convertURL(onmouseoutsrc, tinyMCE.imgElement) + "';";
+
+	if (elm != null && elm.nodeName == "IMG") {
+		setAttrib(elm, 'src', convertURL(src, tinyMCE.imgElement));
+		setAttrib(elm, 'mce_src', src);
+		setAttrib(elm, 'alt');
+		setAttrib(elm, 'title');
+		setAttrib(elm, 'border');
+		setAttrib(elm, 'vspace');
+		setAttrib(elm, 'hspace');
+		setAttrib(elm, 'width');
+		setAttrib(elm, 'height');
+		setAttrib(elm, 'onmouseover', onmouseoversrc);
+		setAttrib(elm, 'onmouseout', onmouseoutsrc);
+		setAttrib(elm, 'id');
+		setAttrib(elm, 'dir');
+		setAttrib(elm, 'lang');
+		setAttrib(elm, 'longdesc');
+		setAttrib(elm, 'usemap');
+		setAttrib(elm, 'style');
+		setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
+		setAttrib(elm, 'align', getSelectValue(formObj, 'align'));
+
+		//tinyMCEPopup.execCommand("mceRepaint");
+
+		// Repaint if dimensions changed
+		if (formObj.width.value != orgImageWidth || formObj.height.value != orgImageHeight)
+			inst.repaint();
+
+		// Refresh in old MSIE
+		if (tinyMCE.isMSIE5)
+			elm.outerHTML = elm.outerHTML;
+	} else {
+		var html = "<img";
+
+		html += makeAttrib('src', convertURL(src, tinyMCE.imgElement));
+		html += makeAttrib('mce_src', src);
+		html += makeAttrib('alt');
+		html += makeAttrib('title');
+		html += makeAttrib('border');
+		html += makeAttrib('vspace');
+		html += makeAttrib('hspace');
+		html += makeAttrib('width');
+		html += makeAttrib('height');
+		html += makeAttrib('onmouseover', onmouseoversrc);
+		html += makeAttrib('onmouseout', onmouseoutsrc);
+		html += makeAttrib('id');
+		html += makeAttrib('dir');
+		html += makeAttrib('lang');
+		html += makeAttrib('longdesc');
+		html += makeAttrib('usemap');
+		html += makeAttrib('style');
+		html += makeAttrib('class', getSelectValue(formObj, 'classlist'));
+		html += makeAttrib('align', getSelectValue(formObj, 'align'));
+		html += " />";
+
+		tinyMCEPopup.execCommand("mceInsertContent", false, html);
+	}
+
+	tinyMCE._setEventsEnabled(inst.getBody(), false);
+	tinyMCEPopup.close();
+}
+
+function cancelAction() {
+	tinyMCEPopup.close();
+}
+
+function changeAppearance() {
+	var formObj = document.forms[0];
+	var img = document.getElementById('alignSampleImg');
+
+	if (img) {
+		img.align = formObj.align.value;
+		img.border = formObj.border.value;
+		img.hspace = formObj.hspace.value;
+		img.vspace = formObj.vspace.value;
+	}
+}
+
+function changeMouseMove() {
+	var formObj = document.forms[0];
+
+	setSwapImageDisabled(!formObj.onmousemovecheck.checked);
+}
+
+function updateStyle() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	if (tinyMCE.getParam('inline_styles', false)) {
+		st['width'] = formObj.width.value == '' ? '' : formObj.width.value + "px";
+		st['height'] = formObj.height.value == '' ? '' : formObj.height.value + "px";
+		st['border-width'] = formObj.border.value == '' ? '' : formObj.border.value + "px";
+		st['margin-top'] = formObj.vspace.value == '' ? '' : formObj.vspace.value + "px";
+		st['margin-bottom'] = formObj.vspace.value == '' ? '' : formObj.vspace.value + "px";
+		st['margin-left'] = formObj.hspace.value == '' ? '' : formObj.hspace.value + "px";
+		st['margin-right'] = formObj.hspace.value == '' ? '' : formObj.hspace.value + "px";
+	} else {
+		st['width'] = st['height'] = st['border-width'] = null;
+
+		if (st['margin-top'] == st['margin-bottom'])
+			st['margin-top'] = st['margin-bottom'] = null;
+
+		if (st['margin-left'] == st['margin-right'])
+			st['margin-left'] = st['margin-right'] = null;
+	}
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function styleUpdated() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	if (st['width'])
+		formObj.width.value = st['width'].replace('px', '');
+
+	if (st['height'])
+		formObj.height.value = st['height'].replace('px', '');
+
+	if (st['margin-top'] && st['margin-top'] == st['margin-bottom'])
+		formObj.vspace.value = st['margin-top'].replace('px', '');
+
+	if (st['margin-left'] && st['margin-left'] == st['margin-right'])
+		formObj.hspace.value = st['margin-left'].replace('px', '');
+
+	if (st['border-width'])
+		formObj.border.value = st['border-width'].replace('px', '');
+}
+
+function changeHeight() {
+	var formObj = document.forms[0];
+
+	if (!formObj.constrain.checked || !preloadImg) {
+		updateStyle();
+		return;
+	}
+
+	if (formObj.width.value == "" || formObj.height.value == "")
+		return;
+
+	var temp = (formObj.width.value / preloadImg.width) * preloadImg.height;
+	formObj.height.value = temp.toFixed(0);
+	updateStyle();
+}
+
+function changeWidth() {
+	var formObj = document.forms[0];
+
+	if (!formObj.constrain.checked || !preloadImg) {
+		updateStyle();
+		return;
+	}
+
+	if (formObj.width.value == "" || formObj.height.value == "")
+		return;
+
+	var temp = (formObj.height.value / preloadImg.height) * preloadImg.width;
+	formObj.width.value = temp.toFixed(0);
+	updateStyle();
+}
+
+function onSelectMainImage(target_form_element, name, value) {
+	var formObj = document.forms[0];
+
+	formObj.alt.value = name;
+	formObj.title.value = name;
+
+	resetImageData();
+	showPreviewImage(formObj.elements[target_form_element].value, false);
+}
+
+function showPreviewImage(src, start) {
+	var formObj = document.forms[0];
+
+	selectByValue(document.forms[0], 'imagelistsrc', src);
+
+	var elm = document.getElementById('prev');
+	var src = src == "" ? src : tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
+
+	if (!start && tinyMCE.getParam("advimage_update_dimensions_onchange", true))
+		resetImageData();
+
+	if (src == "")
+		elm.innerHTML = "";
+	else
+		elm.innerHTML = '<img src="' + src + '" border="0" />'
+
+	getImageData(src);
+}
+
+function getImageData(src) {
+	preloadImg = new Image();
+
+	tinyMCE.addEvent(preloadImg, "load", updateImageData);
+	tinyMCE.addEvent(preloadImg, "error", resetImageData);
+
+	preloadImg.src = src;
+}
+
+function updateImageData() {
+	var formObj = document.forms[0];
+
+	if (formObj.width.value == "")
+		formObj.width.value = preloadImg.width;
+
+	if (formObj.height.value == "")
+		formObj.height.value = preloadImg.height;
+
+	updateStyle();
+}
+
+function resetImageData() {
+	var formObj = document.forms[0];
+	formObj.width.value = formObj.height.value = "";	
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function getImageListHTML(elm_id, target_form_element, onchange_func) {
+	if (typeof(tinyMCEImageList) == "undefined" || tinyMCEImageList.length == 0)
+		return "";
+
+	var html = "";
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
+	html += ' class="mceImageList" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;';
+
+	if (typeof(onchange_func) != "undefined")
+		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
+
+	html += '"><option value="">---</option>';
+
+	for (var i=0; i<tinyMCEImageList.length; i++)
+		html += '<option value="' + tinyMCEImageList[i][1] + '">' + tinyMCEImageList[i][0] + '</option>';
+
+	html += '</select>';
+
+	return html;
+
+	// tinyMCE.debug('-- image list start --', html, '-- image list end --');
+}
+
+// While loading
+preinit();
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,27 @@
+// UK lang variables
+
+tinyMCE.addToLang('advimage',{
+tab_general : 'General',
+tab_appearance : 'Appearance',
+tab_advanced : 'Advanced',
+general : 'General',
+title : 'Title',
+preview : 'Preview',
+constrain_proportions : 'Constrain proportions',
+langdir : 'Language direction',
+langcode : 'Language code',
+long_desc : 'Long description link',
+style : 'Style',
+classes : 'Classes',
+ltr : 'Left to right',
+rtl : 'Right to left',
+id : 'Id',
+image_map : 'Image map',
+swap_image : 'Swap image',
+alt_image : 'Alternative image',
+mouseover : 'for mouse over',
+mouseout : 'for mouse out',
+misc : 'Miscellaneous',
+example_img : 'Appearance&nbsp;preview&nbsp;image',
+missing_alt : 'Are you sure you want to continue without including an Image Description? Without  it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advimage/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/advlink.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/advlink.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/advlink.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,35 @@
+/* CSS file for advimage plugin popup */
+
+.mceLinkList, .mceAnchorList, #targetlist {
+	width: 280px;
+}
+
+.mceActionPanel {
+	margin-top: 7px;
+}
+
+.panel_wrapper div.current {
+	height: 320px;
+}
+
+#classlist, #title, #href {
+	width: 280px;
+}
+
+#popupurl, #popupname {
+	width: 200px;
+}
+
+#popupwidth, #popupheight, #popupleft, #popuptop {
+	width: 30px;
+	vertical-align: middle;
+	text-align: center;
+}
+
+#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {
+	width: 200px;
+}
+
+#events_panel input {
+	width: 200px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('advlink','en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,es,is,zh_tw,zh_tw_utf8,sk,da');var TinyMCE_AdvancedLinkPlugin={getInfo:function(){return{longname:'Advanced link',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_advlink.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){inst.addShortcut('ctrl','k','lang_advlink_desc','mceAdvLink');},getControlHTML:function(cn){switch(cn){case"link":return tinyMCE.getButtonHTML(cn,'lang_link_desc','{$themeurl}/images/link.gif','mceAdvLink');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceAdvLink":var anySelection=false;var inst=tinyMCE.getInstanceById(editor_id);var focusElm=inst.getFocusElement();var selectedText=inst.selection.getSelectedText();if(tinyMCE.selectedElement)anySelection=(tinyMCE.selectedElement.nodeName.toLowerCase()=="img")||(selectedText&&selectedText.length>0);if(anySelection||(focusElm!=null&&focusElm.nodeName=="A")){var template=new Array();template['file']='../../plugins/advlink/link.htm';template['width']=480;template['height']=400;template['width']+=tinyMCE.getLang('lang_advlink_delta_width',0);template['height']+=tinyMCE.getLang('lang_advlink_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});}return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(node==null)return;do{if(node.nodeName=="A"&&tinyMCE.getAttrib(node,'href')!=""){tinyMCE.switchClass(editor_id+'_advlink','mceButtonSelected');return true;}}while((node=node.parentNode));if(any_selection){tinyMCE.switchClass(editor_id+'_advlink','mceButtonNormal');return true;}tinyMCE.switchClass(editor_id+'_advlink','mceButtonDisabled');return true;}};tinyMCE.addPlugin("advlink",TinyMCE_AdvancedLinkPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,90 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.24 $
+ * $Date: 2006/02/10 16:29:38 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('advlink', 'en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,es,is,zh_tw,zh_tw_utf8,sk,da');
+
+var TinyMCE_AdvancedLinkPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Advanced link',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_advlink.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		inst.addShortcut('ctrl', 'k', 'lang_advlink_desc', 'mceAdvLink');
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "link":
+				return tinyMCE.getButtonHTML(cn, 'lang_link_desc', '{$themeurl}/images/link.gif', 'mceAdvLink');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		switch (command) {
+			case "mceAdvLink":
+				var anySelection = false;
+				var inst = tinyMCE.getInstanceById(editor_id);
+				var focusElm = inst.getFocusElement();
+				var selectedText = inst.selection.getSelectedText();
+
+				if (tinyMCE.selectedElement)
+					anySelection = (tinyMCE.selectedElement.nodeName.toLowerCase() == "img") || (selectedText && selectedText.length > 0);
+
+				if (anySelection || (focusElm != null && focusElm.nodeName == "A")) {
+					var template = new Array();
+
+					template['file']   = '../../plugins/advlink/link.htm';
+					template['width']  = 480;
+					template['height'] = 400;
+
+					// Language specific width and height addons
+					template['width']  += tinyMCE.getLang('lang_advlink_delta_width', 0);
+					template['height'] += tinyMCE.getLang('lang_advlink_delta_height', 0);
+
+					tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+				}
+
+				return true;
+		}
+
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (node == null)
+			return;
+
+		do {
+			if (node.nodeName == "A" && tinyMCE.getAttrib(node, 'href') != "") {
+				tinyMCE.switchClass(editor_id + '_advlink', 'mceButtonSelected');
+				return true;
+			}
+		} while ((node = node.parentNode));
+
+		if (any_selection) {
+			tinyMCE.switchClass(editor_id + '_advlink', 'mceButtonNormal');
+			return true;
+		}
+
+		tinyMCE.switchClass(editor_id + '_advlink', 'mceButtonDisabled');
+
+		return true;
+	}
+};
+
+tinyMCE.addPlugin("advlink", TinyMCE_AdvancedLinkPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/functions.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/functions.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/functions.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/functions.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,568 @@
+/* Functions for the advlink plugin popup */
+
+var templates = {
+	"window.open" : "window.open('${url}','${target}','${options}')"
+};
+
+function preinit() {
+	// Initialize
+	tinyMCE.setWindowArg('mce_windowresize', false);
+
+	// Import external list url javascript
+	var url = tinyMCE.getParam("external_link_list_url");
+	if (url != null) {
+		// Fix relative
+		if (url.charAt(0) != '/' && url.indexOf('://') == -1)
+			url = tinyMCE.documentBasePath + "/" + url;
+
+		document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
+	}
+}
+
+function changeClass() {
+	var formObj = document.forms[0];
+	formObj.classes.value = getSelectValue(formObj, 'classlist');
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var elm = inst.getFocusElement();
+	var action = "insert";
+	var html;
+
+	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
+	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
+	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');
+	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');
+	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
+
+	// Link list
+	html = getLinkListHTML('linklisthref','href');
+	if (html == "")
+		document.getElementById("linklisthrefrow").style.display = 'none';
+	else
+		document.getElementById("linklisthrefcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('hrefbrowser'))
+		document.getElementById('href').style.width = '260px';
+
+	if (isVisible('popupurlbrowser'))
+		document.getElementById('popupurl').style.width = '180px';
+
+	elm = tinyMCE.getParentElement(elm, "a");
+	if (elm != null && elm.nodeName == "A")
+		action = "update";
+
+	formObj.insert.value = tinyMCE.getLang('lang_' + action, 'Insert', true); 
+
+	setPopupControlsDisabled(true);
+
+	if (action == "update") {
+		var href = tinyMCE.getAttrib(elm, 'href');
+
+		href = convertURL(href, elm, true);
+
+		// Use mce_href if found
+		var mceRealHref = tinyMCE.getAttrib(elm, 'mce_href');
+		if (mceRealHref != "") {
+			href = mceRealHref;
+
+			if (tinyMCE.getParam('convert_urls'))
+				href = convertURL(href, elm, true);
+		}
+
+		var onclick = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onclick'));
+
+		// Setup form data
+		setFormValue('href', href);
+		setFormValue('title', tinyMCE.getAttrib(elm, 'title'));
+		setFormValue('id', tinyMCE.getAttrib(elm, 'id'));
+		setFormValue('style', tinyMCE.serializeStyle(tinyMCE.parseStyle(tinyMCE.getAttrib(elm, "style"))));
+		setFormValue('rel', tinyMCE.getAttrib(elm, 'rel'));
+		setFormValue('rev', tinyMCE.getAttrib(elm, 'rev'));
+		setFormValue('charset', tinyMCE.getAttrib(elm, 'charset'));
+		setFormValue('hreflang', tinyMCE.getAttrib(elm, 'hreflang'));
+		setFormValue('dir', tinyMCE.getAttrib(elm, 'dir'));
+		setFormValue('lang', tinyMCE.getAttrib(elm, 'lang'));
+		setFormValue('tabindex', tinyMCE.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+		setFormValue('accesskey', tinyMCE.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+		setFormValue('type', tinyMCE.getAttrib(elm, 'type'));
+		setFormValue('onfocus', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onfocus')));
+		setFormValue('onblur', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onblur')));
+		setFormValue('onclick', onclick);
+		setFormValue('ondblclick', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'ondblclick')));
+		setFormValue('onmousedown', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmousedown')));
+		setFormValue('onmouseup', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmouseup')));
+		setFormValue('onmouseover', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmouseover')));
+		setFormValue('onmousemove', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmousemove')));
+		setFormValue('onmouseout', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onmouseout')));
+		setFormValue('onkeypress', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onkeypress')));
+		setFormValue('onkeydown', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onkeydown')));
+		setFormValue('onkeyup', tinyMCE.cleanupEventStr(tinyMCE.getAttrib(elm, 'onkeyup')));
+		setFormValue('target', tinyMCE.getAttrib(elm, 'target'));
+		setFormValue('classes', tinyMCE.getAttrib(elm, 'class'));
+
+		// Parse onclick data
+		if (onclick != null && onclick.indexOf('window.open') != -1)
+			parseWindowOpen(onclick);
+		else
+			parseFunction(onclick);
+
+		// Select by the values
+		selectByValue(formObj, 'dir', tinyMCE.getAttrib(elm, 'dir'));
+		selectByValue(formObj, 'rel', tinyMCE.getAttrib(elm, 'rel'));
+		selectByValue(formObj, 'rev', tinyMCE.getAttrib(elm, 'rev'));
+		selectByValue(formObj, 'linklisthref', href);
+
+		if (href.charAt(0) == '#')
+			selectByValue(formObj, 'anchorlist', href);
+
+		addClassesToList('classlist', 'advlink_styles');
+
+		selectByValue(formObj, 'classlist', tinyMCE.getAttrib(elm, 'class'), true);
+		selectByValue(formObj, 'targetlist', tinyMCE.getAttrib(elm, 'target'), true);
+	} else
+		addClassesToList('classlist', 'advlink_styles');
+
+	window.focus();
+}
+
+function setFormValue(name, value) {
+	document.forms[0].elements[name].value = value;
+}
+
+function convertURL(url, node, on_save) {
+	return eval("tinyMCEPopup.windowOpener." + tinyMCE.settings['urlconverter_callback'] + "(url, node, on_save);");
+}
+
+function parseWindowOpen(onclick) {
+	var formObj = document.forms[0];
+
+	// Preprocess center code
+	if (onclick.indexOf('return false;') != -1) {
+		formObj.popupreturn.checked = true;
+		onclick = onclick.replace('return false;', '');
+	} else
+		formObj.popupreturn.checked = false;
+
+	var onClickData = parseLink(onclick);
+
+	if (onClickData != null) {
+		formObj.ispopup.checked = true;
+		setPopupControlsDisabled(false);
+
+		var onClickWindowOptions = parseOptions(onClickData['options']);
+		var url = onClickData['url'];
+
+		if (tinyMCE.getParam('convert_urls'))
+			url = convertURL(url, null, true);
+
+		formObj.popupname.value = onClickData['target'];
+		formObj.popupurl.value = url;
+		formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');
+		formObj.popupheight.value = getOption(onClickWindowOptions, 'height');
+
+		formObj.popupleft.value = getOption(onClickWindowOptions, 'left');
+		formObj.popuptop.value = getOption(onClickWindowOptions, 'top');
+
+		if (formObj.popupleft.value.indexOf('screen') != -1)
+			formObj.popupleft.value = "c";
+
+		if (formObj.popuptop.value.indexOf('screen') != -1)
+			formObj.popuptop.value = "c";
+
+		formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";
+		formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";
+		formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";
+		formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";
+		formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";
+		formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";
+		formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";
+
+		buildOnClick();
+	}
+}
+
+function parseFunction(onclick) {
+	var formObj = document.forms[0];
+	var onClickData = parseLink(onclick);
+
+	// TODO: Add stuff here
+}
+
+function getOption(opts, name) {
+	return typeof(opts[name]) == "undefined" ? "" : opts[name];
+}
+
+function setPopupControlsDisabled(state) {
+	var formObj = document.forms[0];
+
+	formObj.popupname.disabled = state;
+	formObj.popupurl.disabled = state;
+	formObj.popupwidth.disabled = state;
+	formObj.popupheight.disabled = state;
+	formObj.popupleft.disabled = state;
+	formObj.popuptop.disabled = state;
+	formObj.popuplocation.disabled = state;
+	formObj.popupscrollbars.disabled = state;
+	formObj.popupmenubar.disabled = state;
+	formObj.popupresizable.disabled = state;
+	formObj.popuptoolbar.disabled = state;
+	formObj.popupstatus.disabled = state;
+	formObj.popupreturn.disabled = state;
+	formObj.popupdependent.disabled = state;
+
+	setBrowserDisabled('popupurlbrowser', state);
+}
+
+function parseLink(link) {
+	link = link.replace(new RegExp('&#39;', 'g'), "'");
+
+	var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");
+
+	// Is function name a template function
+	var template = templates[fnName];
+	if (template) {
+		// Build regexp
+		var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));
+		var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";
+		var replaceStr = "";
+		for (var i=0; i<variableNames.length; i++) {
+			// Is string value
+			if (variableNames[i].indexOf("'${") != -1)
+				regExp += "'(.*)'";
+			else // Number value
+				regExp += "([0-9]*)";
+
+			replaceStr += "$" + (i+1);
+
+			// Cleanup variable name
+			variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");
+
+			if (i != variableNames.length-1) {
+				regExp += "\\s*,\\s*";
+				replaceStr += "<delim>";
+			} else
+				regExp += ".*";
+		}
+
+		regExp += "\\);?";
+
+		// Build variable array
+		var variables = new Array();
+		variables["_function"] = fnName;
+		var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');
+		for (var i=0; i<variableNames.length; i++)
+			variables[variableNames[i]] = variableValues[i];
+
+		return variables;
+	}
+
+	return null;
+}
+
+function parseOptions(opts) {
+	if (opts == null || opts == "")
+		return new Array();
+
+	// Cleanup the options
+	opts = opts.toLowerCase();
+	opts = opts.replace(/;/g, ",");
+	opts = opts.replace(/[^0-9a-z=,]/g, "");
+
+	var optionChunks = opts.split(',');
+	var options = new Array();
+
+	for (var i=0; i<optionChunks.length; i++) {
+		var parts = optionChunks[i].split('=');
+
+		if (parts.length == 2)
+			options[parts[0]] = parts[1];
+	}
+
+	return options;
+}
+
+function buildOnClick() {
+	var formObj = document.forms[0];
+
+	if (!formObj.ispopup.checked) {
+		formObj.onclick.value = "";
+		return;
+	}
+
+	var onclick = "window.open('";
+	var url = formObj.popupurl.value;
+
+	if (tinyMCE.getParam('convert_urls'))
+		url = convertURL(url, null, true);
+
+	onclick += url + "','";
+	onclick += formObj.popupname.value + "','";
+
+	if (formObj.popuplocation.checked)
+		onclick += "location=yes,";
+
+	if (formObj.popupscrollbars.checked)
+		onclick += "scrollbars=yes,";
+
+	if (formObj.popupmenubar.checked)
+		onclick += "menubar=yes,";
+
+	if (formObj.popupresizable.checked)
+		onclick += "resizable=yes,";
+
+	if (formObj.popuptoolbar.checked)
+		onclick += "toolbar=yes,";
+
+	if (formObj.popupstatus.checked)
+		onclick += "status=yes,";
+
+	if (formObj.popupdependent.checked)
+		onclick += "dependent=yes,";
+
+	if (formObj.popupwidth.value != "")
+		onclick += "width=" + formObj.popupwidth.value + ",";
+
+	if (formObj.popupheight.value != "")
+		onclick += "height=" + formObj.popupheight.value + ",";
+
+	if (formObj.popupleft.value != "") {
+		if (formObj.popupleft.value != "c")
+			onclick += "left=" + formObj.popupleft.value + ",";
+		else
+			onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";
+	}
+
+	if (formObj.popuptop.value != "") {
+		if (formObj.popuptop.value != "c")
+			onclick += "top=" + formObj.popuptop.value + ",";
+		else
+			onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";
+	}
+
+	if (onclick.charAt(onclick.length-1) == ',')
+		onclick = onclick.substring(0, onclick.length-1);
+
+	onclick += "');";
+
+	if (formObj.popupreturn.checked)
+		onclick += "return false;";
+
+	// tinyMCE.debug(onclick);
+
+	formObj.onclick.value = onclick;
+
+	if (formObj.href.value == "")
+		formObj.href.value = url;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value != "") {
+		elm.setAttribute(attrib.toLowerCase(), value);
+
+		if (attrib == "style")
+			attrib = "style.cssText";
+
+		if (attrib.substring(0, 2) == 'on')
+			value = 'return true;' + value;
+
+		if (attrib == "class")
+			attrib = "className";
+
+		eval('elm.' + attrib + "=value;");
+	} else
+		elm.removeAttribute(attrib);
+}
+
+function getAnchorListHTML(id, target) {
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var nodes = inst.getBody().getElementsByTagName("a");
+
+	var html = "";
+
+	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+	html += '<option value="">---</option>';
+
+	for (var i=0; i<nodes.length; i++) {
+		if ((name = tinyMCE.getAttrib(nodes[i], "name")) != "")
+			html += '<option value="#' + name + '">' + name + '</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+function insertAction() {
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var elm = inst.getFocusElement();
+
+	elm = tinyMCE.getParentElement(elm, "a");
+
+	tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+	// Create new anchor elements
+	if (elm == null) {
+		if (tinyMCE.isSafari)
+			tinyMCEPopup.execCommand("mceInsertContent", false, '<a href="#mce_temp_url#">' + inst.selection.getSelectedHTML() + '</a>');
+		else
+			tinyMCEPopup.execCommand("createlink", false, "#mce_temp_url#");
+
+		var elementArray = tinyMCE.getElementsByAttributeValue(inst.getBody(), "a", "href", "#mce_temp_url#");
+		for (var i=0; i<elementArray.length; i++) {
+			var elm = elementArray[i];
+
+			// Move cursor behind the new anchor
+			if (tinyMCE.isGecko) {
+				var sp = inst.getDoc().createTextNode(" ");
+
+				if (elm.nextSibling)
+					elm.parentNode.insertBefore(sp, elm.nextSibling);
+				else
+					elm.parentNode.appendChild(sp);
+
+				// Set range after link
+				var rng = inst.getDoc().createRange();
+				rng.setStartAfter(elm);
+				rng.setEndAfter(elm);
+
+				// Update selection
+				var sel = inst.getSel();
+				sel.removeAllRanges();
+				sel.addRange(rng);
+			}
+
+			setAllAttribs(elm);
+		}
+	} else
+		setAllAttribs(elm);
+
+	tinyMCE._setEventsEnabled(inst.getBody(), false);
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAllAttribs(elm) {
+	var formObj = document.forms[0];
+	var href = formObj.href.value;
+	var target = getSelectValue(formObj, 'targetlist');
+
+	// Make anchors absolute
+	if (href.charAt(0) == '#' && tinyMCE.getParam('convert_urls'))
+		href = tinyMCE.settings['document_base_url'] + href;
+
+	setAttrib(elm, 'href', convertURL(href, elm));
+	setAttrib(elm, 'mce_href', href);
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'target', target == '_self' ? '' : target);
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
+	setAttrib(elm, 'rel');
+	setAttrib(elm, 'rev');
+	setAttrib(elm, 'charset');
+	setAttrib(elm, 'hreflang');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'type');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+	if (tinyMCE.isMSIE5)
+		elm.outerHTML = elm.outerHTML;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function getLinkListHTML(elm_id, target_form_element, onchange_func) {
+	if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)
+		return "";
+
+	var html = "";
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
+	html += ' class="mceLinkList" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;';
+
+	if (typeof(onchange_func) != "undefined")
+		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
+
+	html += '"><option value="">---</option>';
+
+	for (var i=0; i<tinyMCELinkList.length; i++)
+		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
+
+	html += '</select>';
+
+	return html;
+
+	// tinyMCE.debug('-- image list start --', html, '-- image list end --');
+}
+
+function getTargetListHTML(elm_id, target_form_element) {
+	var targets = tinyMCE.getParam('theme_advanced_link_targets', '').split(';');
+	var html = '';
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+
+	html += '<option value="_self">' + tinyMCE.getLang('lang_advlink_target_same') + '</option>';
+	html += '<option value="_blank">' + tinyMCE.getLang('lang_advlink_target_blank') + ' (_blank)</option>';
+	html += '<option value="_parent">' + tinyMCE.getLang('lang_advlink_target_parent') + ' (_parent)</option>';
+	html += '<option value="_top">' + tinyMCE.getLang('lang_advlink_target_top') + ' (_top)</option>';
+
+	for (var i=0; i<targets.length; i++) {
+		var key, value;
+
+		if (targets[i] == "")
+			continue;
+
+		key = targets[i].split('=')[0];
+		value = targets[i].split('=')[1];
+
+		html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+// While loading
+preinit();
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,46 @@
+// UK lang variables
+
+tinyMCE.addToLang('advlink',{
+general_tab : 'General',
+popup_tab : 'Popup',
+events_tab : 'Events',
+advanced_tab : 'Advanced',
+general_props : 'General properties',
+popup_props : 'Popup properties',
+event_props : 'Events',
+advanced_props : 'Advanced properties',
+popup_opts : 'Options',
+anchor_names : 'Anchors',
+target_same : 'Open in this window / frame',
+target_parent : 'Open in parent window / frame',
+target_top : 'Open in top frame (replaces all frames)',
+target_blank : 'Open in new window',
+popup : 'Javascript popup',
+popup_url : 'Popup URL',
+popup_name : 'Window name',
+popup_return : 'Insert \'return false\'',
+popup_scrollbars : 'Show scrollbars',
+popup_statusbar : 'Show status bar',
+popup_toolbar : 'Show toolbars',
+popup_menubar : 'Show menu bar',
+popup_location : 'Show location bar',
+popup_resizable : 'Make window resizable',
+popup_dependent : 'Dependent (Mozilla/Firefox only)',
+popup_size : 'Size',
+popup_position : 'Position (X/Y)',
+id : 'Id',
+style: 'Style',
+classes : 'Classes',
+target_name : 'Target name',
+langdir : 'Language direction',
+target_langcode : 'Target language',
+langcode : 'Language code',
+encoding : 'Target character encoding',
+mime : 'Target MIME type',
+rel : 'Relationship page to target',
+rev : 'Relationship target to page',
+tabindex : 'Tabindex',
+accesskey : 'Accesskey',
+ltr : 'Left to right',
+rtl : 'Right to left'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/link.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/link.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/link.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/link.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,334 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_insert_link_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/functions.js"></script>
+	<link href="css/advlink.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="advlink" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+    <form onsubmit="insertAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_advlink_general_tab}</a></span></li>
+				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{$lang_advlink_popup_tab}</a></span></li>
+				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{$lang_advlink_events_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{$lang_advlink_advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{$lang_advlink_general_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+						  <td nowrap="nowrap"><label id="hreflabel" for="href">{$lang_insert_link_url}</label></td>
+						  <td><table border="0" cellspacing="0" cellpadding="0">
+								<tr>
+								  <td><input id="href" name="href" type="text" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>
+								  <td id="hrefbrowsercontainer">&nbsp;</td>
+								</tr>
+							  </table></td>
+						</tr>
+						<tr id="linklisthrefrow">
+							<td class="column1"><label for="linklisthref">{$lang_link_list}</label></td>
+							<td colspan="2" id="linklisthrefcontainer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="anchorlist">{$lang_advlink_anchor_names}</label></td>
+							<td colspan="2" id="anchorlistcontainer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td><label id="targetlistlabel" for="targetlist">{$lang_insert_link_target}</label></td>
+							<td id="targetlistcontainer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label id="titlelabel" for="title">{$lang_theme_insert_link_titlefield}</label></td>
+							<td><input id="title" name="title" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td><label id="classlabel" for="classlist">{$lang_class_name}</label></td>
+							<td>
+								 <select id="classlist" name="classlist" onchange="changeClass();">
+									<option value="" selected>{$lang_not_set}</option>
+								 </select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="popup_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_advlink_popup_props}</legend>
+
+					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />
+					<label id="ispopuplabel" for="ispopup">{$lang_advlink_popup}</label>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td nowrap="nowrap"><label for="popupurl">{$lang_advlink_popup_url}</label>&nbsp;</td>
+							<td>
+								<table border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" name="popupurl" id="popupurl" value="" onchange="buildOnClick();" /></td>
+										<td id="popupurlbrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="popupname">{$lang_advlink_popup_name}</label>&nbsp;</td>
+							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label>{$lang_advlink_popup_size}</label>&nbsp;</td>
+							<td nowrap="nowrap">
+								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x
+								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap" id="labelleft"><label>{$lang_advlink_popup_position}</label>&nbsp;</td>
+							<td nowrap="nowrap">
+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                
+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)
+							</td>
+						</tr>
+					</table>
+
+					<fieldset>
+						<legend>{$lang_advlink_popup_opts}</legend>
+
+						<table border="0" cellpadding="0" cellspacing="4">
+							<tr>
+								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popuplocationlabel" for="popuplocation">{$lang_advlink_popup_location}</label></td>
+								<td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{$lang_advlink_popup_scrollbars}</label></td>
+							</tr>
+							<tr>
+								<td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{$lang_advlink_popup_menubar}</label></td>
+								<td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupresizablelabel" for="popupresizable">{$lang_advlink_popup_resizable}</label></td>
+							</tr>
+							<tr>
+								<td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{$lang_advlink_popup_toolbar}</label></td>
+								<td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupdependentlabel" for="popupdependent">{$lang_advlink_popup_dependent}</label></td>
+							</tr>
+							<tr>
+								<td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupstatuslabel" for="popupstatus">{$lang_advlink_popup_statusbar}</label></td>
+								<td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>
+								<td nowrap="nowrap"><label id="popupreturnlabel" for="popupreturn">{$lang_advlink_popup_return}</label></td>
+							</tr>
+						</table>
+					</fieldset>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+			<fieldset>
+					<legend>{$lang_advlink_advanced_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label id="idlabel" for="id">{$lang_advlink_id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td><label id="stylelabel" for="style">{$lang_advlink_style}</label></td>
+							<td><input type="text" id="style" name="style" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="classeslabel" for="classes">{$lang_advlink_classes}</label></td>
+							<td><input type="text" id="classes" name="classes" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="targetlabel" for="target">{$lang_advlink_target_name}</label></td>
+							<td><input type="text" id="target" name="target" value="" onchange="selectByValue(this.form,'targetlist',this.value,true);" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="dirlabel" for="dir">{$lang_advlink_langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir"> 
+										<option value="">{$lang_not_set}</option> 
+										<option value="ltr">{$lang_advlink_ltr}</option> 
+										<option value="rtl">{$lang_advlink_rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td><label id="hreflanglabel" for="hreflang">{$lang_advlink_target_langcode}</label></td>
+							<td><input type="text" id="hreflang" name="hreflang" value="" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="langlabel" for="lang">{$lang_advlink_langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td><label id="charsetlabel" for="charset">{$lang_advlink_encoding}</label></td>
+							<td><input type="text" id="charset" name="charset" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="typelabel" for="type">{$lang_advlink_mime}</label></td>
+							<td><input type="text" id="type" name="type" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="rellabel" for="rel">{$lang_advlink_rel}</label></td>
+							<td><select id="rel" name="rel"> 
+									<option value="">{$lang_not_set}</option> 
+									<option value="alternate">Alternate</option> 
+									<option value="designates">Designates</option> 
+									<option value="stylesheet">Stylesheet</option> 
+									<option value="start">Start</option> 
+									<option value="next">Next</option> 
+									<option value="prev">Prev</option> 
+									<option value="contents">Contents</option> 
+									<option value="index">Index</option> 
+									<option value="glossary">Glossary</option> 
+									<option value="copyright">Copyright</option> 
+									<option value="chapter">Chapter</option> 
+									<option value="subsection">Subsection</option> 
+									<option value="appendix">Appendix</option> 
+									<option value="help">Help</option> 
+									<option value="bookmark">Bookmark</option> 
+								</select> 
+							</td>
+						</tr>
+
+						<tr>
+							<td><label id="revlabel" for="rev">{$lang_advlink_rev}</label></td>
+							<td><select id="rev" name="rev"> 
+									<option value="">{$lang_not_set}</option> 
+									<option value="alternate">Alternate</option> 
+									<option value="designates">Designates</option> 
+									<option value="stylesheet">Stylesheet</option> 
+									<option value="start">Start</option> 
+									<option value="next">Next</option> 
+									<option value="prev">Prev</option> 
+									<option value="contents">Contents</option> 
+									<option value="index">Index</option> 
+									<option value="glossary">Glossary</option> 
+									<option value="copyright">Copyright</option> 
+									<option value="chapter">Chapter</option> 
+									<option value="subsection">Subsection</option> 
+									<option value="appendix">Appendix</option> 
+									<option value="help">Help</option> 
+									<option value="bookmark">Bookmark</option> 
+								</select> 
+							</td>
+						</tr>
+
+						<tr>
+							<td><label id="tabindexlabel" for="tabindex">{$lang_advlink_tabindex}</label></td>
+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="accesskeylabel" for="accesskey">{$lang_advlink_accesskey}</label></td>
+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="events_panel" class="panel">
+			<fieldset>
+					<legend>{$lang_advlink_event_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="onfocus">onfocus</label></td> 
+							<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onblur">onblur</label></td> 
+							<td><input id="onblur" name="onblur" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onclick">onclick</label></td> 
+							<td><input id="onclick" name="onclick" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="ondblclick">ondblclick</label></td> 
+							<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onmousedown">onmousedown</label></td> 
+							<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onmouseup">onmouseup</label></td> 
+							<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onmouseover">onmouseover</label></td> 
+							<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onmousemove">onmousemove</label></td> 
+							<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onmouseout">onmouseout</label></td> 
+							<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onkeypress">onkeypress</label></td> 
+							<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onkeydown">onkeydown</label></td> 
+							<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="onkeyup">onkeyup</label></td> 
+							<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertAction();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+    </form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/advlink/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('autosave','en,tr,sv,cs,he,nb,hu,de,da,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,pl,pt_br');var TinyMCE_AutoSavePlugin={getInfo:function(){return{longname:'Auto save',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_autosave.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},_beforeUnloadHandler:function(){var n,inst,anyDirty=false,msg=tinyMCE.getLang("lang_autosave_unload_msg");if(tinyMCE.getParam("fullscreen_is_enabled"))return;for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;if(inst.isDirty())return msg;}return;}};window.onbeforeunload=TinyMCE_AutoSavePlugin._beforeUnloadHandler;tinyMCE.addPlugin("autosave",TinyMCE_AutoSavePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,48 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.11 $
+ * $Date: 2006/03/22 12:21:21 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('autosave', 'en,tr,sv,cs,he,nb,hu,de,da,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,pl,pt_br');
+
+var TinyMCE_AutoSavePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Auto save',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_autosave.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	// Private plugin internal methods
+
+	_beforeUnloadHandler : function() {
+		var n, inst, anyDirty = false, msg = tinyMCE.getLang("lang_autosave_unload_msg");
+
+		if (tinyMCE.getParam("fullscreen_is_enabled"))
+			return;
+
+		for (n in tinyMCE.instances) {
+			inst = tinyMCE.instances[n];
+
+			if (!tinyMCE.isInstance(inst))
+				continue;
+
+			if (inst.isDirty())
+				return msg;
+		}
+
+		return;
+	}
+};
+
+window.onbeforeunload = TinyMCE_AutoSavePlugin._beforeUnloadHandler;
+
+tinyMCE.addPlugin("autosave", TinyMCE_AutoSavePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,5 @@
+// EN lang variables
+
+tinyMCE.addToLang('',{
+autosave_unload_msg : 'The changes you made will be lost if you navigate away from this page.'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/autosave/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,12 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.10 $
+ * $Date: 2006/02/10 16:29:38 $
+ *
+ * Experimental plugin for new Cleanup routine, this logic will be moved into the core ones it's stable enougth.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Dummy file since cleanup is now moved to core */
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/cleanup/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Dummy plugin since cleanup is now moved into core.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/contextmenu.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/contextmenu.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/contextmenu.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/contextmenu.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,74 @@
+.contextMenuIEPopup {
+	padding: 0;
+	margin: 0;
+	border: 0;
+	overflow: hidden;
+}
+
+.contextMenu {
+	position: absolute;
+	cursor: default;
+	z-index: 1000;
+	border: 1px solid #D4D0C8;
+	background-color: #FFFFFF;
+}
+
+.contextMenuItem, .contextMenuItemOver {
+}
+
+.contextMenuSeparator {
+	width: 100%;
+	background-color: #D4D0C8;
+	border: 0;
+}
+
+.contextMenuImage, .contextMenuItemDisabled {
+	border: 0;
+}
+
+.contextMenuIcon {
+	background-color: #F0F0EE;
+}
+
+.contextMenuItemOver .contextMenuIcon {
+	background-color: #B6BDD2;
+}
+
+.contextMenuIcon {
+	background-color: #F0F0EE;
+}
+
+.contextMenuItemDisabled img {
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
+	-moz-opacity:0.3;
+	opacity: 0.3;
+}
+
+.contextMenuText {
+	font-family: Tahoma, Verdana, Arial, Helvetica;
+	font-size: 11px;
+	line-height: 20px;
+}
+
+.contextMenuItemDisabled {
+	color: #AAAAAA;
+}
+
+.contextMenuText a {
+	display: block;
+	line-height: 20px;
+	width: 100%;
+	text-decoration: none;
+	color: black;
+	font-weight: normal;
+	margin: 0;
+	padding: 0;
+}
+
+.contextMenuText a:hover {
+	background-color: #B6BDD2;
+	text-decoration: none !important;
+	font-weight: normal;
+	margin: 0;
+	padding: 0;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+if(!tinyMCE.settings['contextmenu_skip_plugin_css']){tinyMCE.loadCSS(tinyMCE.baseURL+"/plugins/contextmenu/css/contextmenu.css");}var TinyMCE_ContextMenuPlugin={_contextMenu:null,getInfo:function(){return{longname:'Context menus',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_contextmenu.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE5_0&&tinyMCE.isOpera)return;TinyMCE_ContextMenuPlugin._contextMenu=new TinyMCE_ContextMenu({commandhandler:"TinyMCE_ContextMenuPlugin._commandHandler",spacer_image:tinyMCE.baseURL+"/plugins/contextmenu/images/spacer.gif"});tinyMCE.addEvent(inst.getDoc(),"click",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(inst.getDoc(),"keypress",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(inst.getDoc(),"keydown",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"click",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"keypress",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"keydown",TinyMCE_ContextMenuPlugin._hideContextMenu);if(tinyMCE.isGecko){tinyMCE.addEvent(inst.getDoc(),"contextmenu",function(e){TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE?inst.contentWindow.event:e,inst);});}else tinyMCE.addEvent(inst.getDoc(),"contextmenu",TinyMCE_ContextMenuPlugin._onContextMenu);},_onContextMenu:function(e){var elm=tinyMCE.isMSIE?e.srcElement:e.target;var targetInst,body;if((body=tinyMCE.getParentElement(elm,"body"))!=null){for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;if(body==inst.getBody()){targetInst=inst;break;}}return TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE?targetInst.contentWindow.event:e,targetInst);}},_showContextMenu:function(e,inst){function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";}var x,y,elm,contextMenu;var pos=tinyMCE.getAbsPosition(inst.iframeElement);x=tinyMCE.isMSIE?e.screenX:pos.absLeft+(e.pageX-inst.getBody().scrollLeft);y=tinyMCE.isMSIE?e.screenY:pos.absTop+(e.pageY-inst.getBody().scrollTop);elm=tinyMCE.isMSIE?e.srcElement:e.target;contextMenu=this._contextMenu;contextMenu.inst=inst;window.setTimeout(function(){var theme=tinyMCE.getParam("theme");contextMenu.clearAll();var sel=inst.selection.getSelectedText().length!=0||elm.nodeName=="IMG";contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/cut.gif","$lang_cut_desc","Cut","",!sel);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/copy.gif","$lang_copy_desc","Copy","",!sel);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_paste_desc","Paste","",false);if(sel||(elm?(elm.nodeName=='A')||(elm.nodeName=='IMG'):false)){contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/themes/advanced/images/link.gif","$lang_link_desc",inst.hasPlugin("advlink")?"mceAdvLink":"mceLink");contextMenu.addItem(tinyMCE.baseURL+"/themes/advanced/images/unlink.gif","$lang_unlink_desc","unlink","",(elm?(elm.nodeName!='A')&&(elm.nodeName!='IMG'):true));}elm=tinyMCE.getParentElement(elm,"img,table,td"+(inst.hasPlugin("advhr")?',hr':''));if(elm){switch(elm.nodeName){case"IMG":contextMenu.addSeparator();if(tinyMCE.getAttrib(elm,'class').indexOf('mceItemFlash')!=-1)contextMenu.addItem(tinyMCE.baseURL+"/plugins/flash/images/flash.gif","$lang_flash_props","mceFlash");else contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/image.gif","$lang_image_props_desc",inst.hasPlugin("advimage")?"mceAdvImage":"mceImage");break;case"HR":contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/advhr/images/advhr.gif","$lang_insert_advhr_desc","mceAdvancedHr");break;case"TABLE":case"TD":if(inst.hasPlugin("table")){var colspan=(elm.nodeName=="TABLE")?"":getAttrib(elm,"colspan");var rowspan=(elm.nodeName=="TABLE")?"":getAttrib(elm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/cut.gif","$lang_table_cut_row_desc","mceTableCutRow");contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/copy.gif","$lang_table_copy_row_desc","mceTableCopyRow");contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_table_paste_row_before_desc","mceTablePasteRowBefore","",inst.tableRowClipboard==null);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_table_paste_row_after_desc","mceTablePasteRowAfter","",inst.tableRowClipboard==null);contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_desc","mceInsertTable","insert");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_props_desc","mceInsertTable");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_cell_props.gif","$lang_table_cell_desc","mceTableCellProps");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete.gif","$lang_table_del","mceTableDelete");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_row_props.gif","$lang_table_row_desc","mceTableRowProps");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_row_before.gif","$lang_table_row_before_desc","mceTableInsertRowBefore");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_row_after.gif","$lang_table_row_after_desc","mceTableInsertRowAfter");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete_row.gif","$lang_table_delete_row_desc","mceTableDeleteRow");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_col_before.gif","$lang_table_col_before_desc","mceTableInsertColBefore");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_col_after.gif","$lang_table_col_after_desc","mceTableInsertColAfter");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete_col.gif","$lang_table_delete_col_desc","mceTableDeleteCol");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_split_cells.gif","$lang_table_split_cells_desc","mceTableSplitCells","",(colspan=="1"&&rowspan=="1"));contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_merge_cells.gif","$lang_table_merge_cells_desc","mceTableMergeCells","",false);}break;}}else{if(inst.hasPlugin("table")){contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_desc","mceInsertTable","insert");}}contextMenu.show(x,y);},10);tinyMCE.cancelEvent(e);return false;},_hideContextMenu:function(){if(TinyMCE_ContextMenuPlugin._contextMenu)TinyMCE_ContextMenuPlugin._contextMenu.hide();},_commandHandler:function(command,value){var cm=TinyMCE_ContextMenuPlugin._contextMenu;cm.hide();var ui=false;if(command=="mceInsertTable"||command=="mceTableCellProps"||command=="mceTableRowProps"||command=="mceTableMergeCells")ui=true;if(command=="Paste")value=null;if(tinyMCE.getParam("dialog_type")=="modal"&&tinyMCE.isMSIE){window.setTimeout(function(){cm.inst.execCommand(command,ui,value);},100);}else cm.inst.execCommand(command,ui,value);}};tinyMCE.addPlugin("contextmenu",TinyMCE_ContextMenuPlugin);function TinyMCE_ContextMenu(settings){function defParam(key,def_val){settings[key]=typeof(settings[key])!="undefined"?settings[key]:def_val;}var self=this;this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.contextMenuDiv=document.createElement("div");this.contextMenuDiv.className="contextMenu";this.contextMenuDiv.setAttribute("class","contextMenu");this.contextMenuDiv.style.display="none";this.contextMenuDiv.style.position='absolute';this.contextMenuDiv.style.zindex=1000;this.contextMenuDiv.style.left='0';this.contextMenuDiv.style.top='0';this.contextMenuDiv.unselectable="on";document.body.appendChild(this.contextMenuDiv);defParam("commandhandler","");defParam("spacer_image","images/spacer.gif");this.items=new Array();this.settings=settings;this.html="";if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera){this.pop=window.createPopup();doc=this.pop.document;doc.open();doc.write('<html><head><link href="'+tinyMCE.baseURL+'/plugins/contextmenu/css/contextmenu.css" rel="stylesheet" type="text/css" /></head><body unselectable="yes" class="contextMenuIEPopup"></body></html>');doc.close();}};TinyMCE_ContextMenu.prototype={clearAll:function(){this.html="";this.contextMenuDiv.innerHTML="";},addSeparator:function(){this.html+='<tr class="contextMenuItem"><td class="contextMenuIcon"><img src="'+this.settings['spacer_image']+'" width="20" height="1" class="contextMenuImage" /></td><td><img class="contextMenuSeparator" width="1" height="1" src="'+this.settings['spacer_image']+'" /></td></tr>';},addItem:function(icon,title,command,value,disabled){if(title.charAt(0)=='$')title=tinyMCE.getLang(title.substring(1));var onMouseDown='';var html='';if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0)onMouseDown='contextMenu.execCommand(\''+command+'\', \''+value+'\');return false;';else onMouseDown=this.settings['commandhandler']+'(\''+command+'\', \''+value+'\');return false;';if(icon=="")icon=this.settings['spacer_image'];if(!disabled)html+='<tr class="contextMenuItem">';else html+='<tr class="contextMenuItemDisabled">';html+='<td class="contextMenuIcon"><img src="'+icon+'" width="20" height="20" class="contextMenuImage" /></td>';html+='<td><div class="contextMenuText">';html+='<a href="javascript:void(0);" onclick="'+onMouseDown+'" onmousedown="return false;">&#160;';html+=title;html+='&#160;</a>';html+='</div></td>';html+='</tr>';this.html+=html;},show:function(x,y){var vp,width,height;if(this.html=="")return;var html='';html+='<a href="#"></a><table border="0" cellpadding="0" cellspacing="0">';html+=this.html;html+='</table>';this.contextMenuDiv.innerHTML=html;this.contextMenuDiv.style.display="block";width=this.contextMenuDiv.offsetWidth;height=this.contextMenuDiv.offsetHeight;this.contextMenuDiv.style.display="none";if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera){this.pop.document.body.innerHTML='<div class="contextMenu">'+html+"</div>";this.pop.document.tinyMCE=tinyMCE;this.pop.document.contextMenu=this;this.pop.show(x,y,width,height);}else{vp=this.getViewPort();this.contextMenuDiv.style.left=(x>vp.width-width?vp.width-width:x)+'px';this.contextMenuDiv.style.top=(y>vp.height-height?vp.height-height:y)+'px';this.contextMenuDiv.style.display="block";}},getViewPort:function(){return{width:document.documentElement.offsetWidth||document.body.offsetWidth,height:self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight};},hide:function(){if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera)this.pop.hide();else this.contextMenuDiv.style.display="none";},execCommand:function(command,value){eval(this.settings['commandhandler']+"(command, value);");}};
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,356 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.31 $
+ * $Date: 2006/05/03 10:46:41 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+//tinyMCE.importPluginLanguagePack('contextmenu', 'en,tr,zh_cn,cs,fa,fr_ca,fr,de,nb');
+if (!tinyMCE.settings['contextmenu_skip_plugin_css']) {
+	tinyMCE.loadCSS(tinyMCE.baseURL + "/plugins/contextmenu/css/contextmenu.css");
+}
+
+var TinyMCE_ContextMenuPlugin = {
+	// Private fields
+	_contextMenu : null,
+
+	getInfo : function() {
+		return {
+			longname : 'Context menus',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_contextmenu.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		// Is not working on MSIE 5.0 or Opera no contextmenu event
+		if (tinyMCE.isMSIE5_0 && tinyMCE.isOpera)
+			return;
+
+		TinyMCE_ContextMenuPlugin._contextMenu = new TinyMCE_ContextMenu({
+			commandhandler : "TinyMCE_ContextMenuPlugin._commandHandler",
+			spacer_image : tinyMCE.baseURL + "/plugins/contextmenu/images/spacer.gif"
+		});
+
+		// Add hide event handles
+		tinyMCE.addEvent(inst.getDoc(), "click", TinyMCE_ContextMenuPlugin._hideContextMenu);
+		tinyMCE.addEvent(inst.getDoc(), "keypress", TinyMCE_ContextMenuPlugin._hideContextMenu);
+		tinyMCE.addEvent(inst.getDoc(), "keydown", TinyMCE_ContextMenuPlugin._hideContextMenu);
+		tinyMCE.addEvent(document, "click", TinyMCE_ContextMenuPlugin._hideContextMenu);
+		tinyMCE.addEvent(document, "keypress", TinyMCE_ContextMenuPlugin._hideContextMenu);
+		tinyMCE.addEvent(document, "keydown", TinyMCE_ContextMenuPlugin._hideContextMenu);
+
+		// Attach contextmenu event
+		if (tinyMCE.isGecko) {
+			tinyMCE.addEvent(inst.getDoc(), "contextmenu", function(e) {TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE ? inst.contentWindow.event : e, inst);});
+		} else
+			tinyMCE.addEvent(inst.getDoc(), "contextmenu", TinyMCE_ContextMenuPlugin._onContextMenu);
+	},
+
+	// Private plugin internal methods
+
+	_onContextMenu : function(e) {
+		var elm = tinyMCE.isMSIE ? e.srcElement : e.target;
+		var targetInst, body;
+
+		// Find instance
+		if ((body = tinyMCE.getParentElement(elm, "body")) != null) {
+			for (var n in tinyMCE.instances) {
+				var inst = tinyMCE.instances[n];
+				if (!tinyMCE.isInstance(inst))
+					continue;
+
+				if (body == inst.getBody()) {
+					targetInst = inst;
+					break;
+				}
+			}
+
+			return TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE ? targetInst.contentWindow.event : e, targetInst);
+		}
+	},
+
+	_showContextMenu : function(e, inst) {
+		function getAttrib(elm, name) {
+			return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+		}
+
+		var x, y, elm, contextMenu;
+		var pos = tinyMCE.getAbsPosition(inst.iframeElement);
+
+		x = tinyMCE.isMSIE ? e.screenX : pos.absLeft + (e.pageX - inst.getBody().scrollLeft);
+		y = tinyMCE.isMSIE ? e.screenY : pos.absTop + (e.pageY - inst.getBody().scrollTop);
+		elm = tinyMCE.isMSIE ? e.srcElement : e.target;
+
+		contextMenu = this._contextMenu;
+		contextMenu.inst = inst;
+
+		// Mozilla needs some time
+		window.setTimeout(function () {
+			var theme = tinyMCE.getParam("theme");
+
+			contextMenu.clearAll();
+			var sel = inst.selection.getSelectedText().length != 0 || elm.nodeName == "IMG";
+
+			// Default items
+			contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/cut.gif", "$lang_cut_desc", "Cut", "", !sel);
+			contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/copy.gif", "$lang_copy_desc", "Copy", "", !sel);
+			contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/paste.gif", "$lang_paste_desc", "Paste", "", false);
+
+			if (sel || (elm ? (elm.nodeName == 'A') || (elm.nodeName == 'IMG') : false)) {
+				contextMenu.addSeparator();
+				contextMenu.addItem(tinyMCE.baseURL + "/themes/advanced/images/link.gif", "$lang_link_desc", inst.hasPlugin("advlink") ? "mceAdvLink" : "mceLink");
+				contextMenu.addItem(tinyMCE.baseURL + "/themes/advanced/images/unlink.gif", "$lang_unlink_desc", "unlink", "", (elm ? (elm.nodeName != 'A') && (elm.nodeName != 'IMG') : true));
+			}
+
+			// Get element
+			elm = tinyMCE.getParentElement(elm, "img,table,td" + (inst.hasPlugin("advhr") ? ',hr' : ''));
+			if (elm) {
+				switch (elm.nodeName) {
+					case "IMG":
+						contextMenu.addSeparator();
+
+						// If flash
+						if (tinyMCE.getAttrib(elm, 'class').indexOf('mceItemFlash') != -1)
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/flash/images/flash.gif", "$lang_flash_props", "mceFlash");
+						else
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/image.gif", "$lang_image_props_desc", inst.hasPlugin("advimage") ? "mceAdvImage" : "mceImage");
+						break;
+
+					case "HR":
+						contextMenu.addSeparator();
+						contextMenu.addItem(tinyMCE.baseURL + "/plugins/advhr/images/advhr.gif", "$lang_insert_advhr_desc", "mceAdvancedHr");
+						break;
+
+					case "TABLE":
+					case "TD":
+						// Is table plugin loaded
+						if (inst.hasPlugin("table")) {
+							var colspan = (elm.nodeName == "TABLE") ? "" : getAttrib(elm, "colspan");
+							var rowspan = (elm.nodeName == "TABLE") ? "" : getAttrib(elm, "rowspan");
+
+							colspan = colspan == "" ? "1" : colspan;
+							rowspan = rowspan == "" ? "1" : rowspan;
+
+							contextMenu.addSeparator();
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/cut.gif", "$lang_table_cut_row_desc", "mceTableCutRow");
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/copy.gif", "$lang_table_copy_row_desc", "mceTableCopyRow");
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/paste.gif", "$lang_table_paste_row_before_desc", "mceTablePasteRowBefore", "", inst.tableRowClipboard == null);
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/paste.gif", "$lang_table_paste_row_after_desc", "mceTablePasteRowAfter", "", inst.tableRowClipboard == null);
+
+	/*						contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/justifyleft.gif", "$lang_justifyleft_desc", "JustifyLeft", "", false);
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/justifycenter.gif", "$lang_justifycenter_desc", "JustifyCenter", "", false);
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/justifyright.gif", "$lang_justifyright_desc", "JustifyRight", "", false);
+							contextMenu.addItem(tinyMCE.baseURL + "/themes/" + theme + "/images/justifyfull.gif", "$lang_justifyfull_desc", "JustifyFull", "", false);*/
+							contextMenu.addSeparator();
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table.gif", "$lang_table_desc", "mceInsertTable", "insert");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table.gif", "$lang_table_props_desc", "mceInsertTable");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_cell_props.gif", "$lang_table_cell_desc", "mceTableCellProps");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_delete.gif", "$lang_table_del", "mceTableDelete");
+							contextMenu.addSeparator();
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_row_props.gif", "$lang_table_row_desc", "mceTableRowProps");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_insert_row_before.gif", "$lang_table_row_before_desc", "mceTableInsertRowBefore");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_insert_row_after.gif", "$lang_table_row_after_desc", "mceTableInsertRowAfter");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_delete_row.gif", "$lang_table_delete_row_desc", "mceTableDeleteRow");
+							contextMenu.addSeparator();
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_insert_col_before.gif", "$lang_table_col_before_desc", "mceTableInsertColBefore");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_insert_col_after.gif", "$lang_table_col_after_desc", "mceTableInsertColAfter");
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_delete_col.gif", "$lang_table_delete_col_desc", "mceTableDeleteCol");
+							contextMenu.addSeparator();
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_split_cells.gif", "$lang_table_split_cells_desc", "mceTableSplitCells", "", (colspan == "1" && rowspan == "1"));
+							contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table_merge_cells.gif", "$lang_table_merge_cells_desc", "mceTableMergeCells", "", false);
+						}
+						break;
+				}
+			}  else {
+				// Add table specific
+				if (inst.hasPlugin("table")) {
+					contextMenu.addSeparator();
+					contextMenu.addItem(tinyMCE.baseURL + "/plugins/table/images/table.gif", "$lang_table_desc", "mceInsertTable", "insert");
+				}
+			}
+
+			contextMenu.show(x, y);
+		}, 10);
+
+		// Cancel default handeling
+		tinyMCE.cancelEvent(e);
+		return false;
+	},
+
+	_hideContextMenu : function() {
+		if (TinyMCE_ContextMenuPlugin._contextMenu)
+			TinyMCE_ContextMenuPlugin._contextMenu.hide();
+	},
+
+	_commandHandler : function(command, value) {
+		var cm = TinyMCE_ContextMenuPlugin._contextMenu;
+
+		cm.hide();
+
+		// UI must be true on these
+		var ui = false;
+		if (command == "mceInsertTable" || command == "mceTableCellProps" || command == "mceTableRowProps" || command == "mceTableMergeCells")
+			ui = true;
+
+		if (command == "Paste")
+			value = null;
+
+		if (tinyMCE.getParam("dialog_type") == "modal" && tinyMCE.isMSIE) {
+			// Cell properties will generate access denied error is this isn't done?!
+			window.setTimeout(function() {
+				cm.inst.execCommand(command, ui, value);
+			}, 100);
+		} else
+			cm.inst.execCommand(command, ui, value);
+	}
+};
+
+tinyMCE.addPlugin("contextmenu", TinyMCE_ContextMenuPlugin);
+
+// Context menu class
+
+function TinyMCE_ContextMenu(settings) {
+	// Default value function
+	function defParam(key, def_val) {
+		settings[key] = typeof(settings[key]) != "undefined" ? settings[key] : def_val;
+	}
+
+	var self = this;
+
+	this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+
+	// Setup contextmenu div
+	this.contextMenuDiv = document.createElement("div");
+	this.contextMenuDiv.className = "contextMenu";
+	this.contextMenuDiv.setAttribute("class", "contextMenu");
+	this.contextMenuDiv.style.display = "none";
+	this.contextMenuDiv.style.position = 'absolute';
+	this.contextMenuDiv.style.zindex = 1000;
+	this.contextMenuDiv.style.left = '0';
+	this.contextMenuDiv.style.top = '0';
+	this.contextMenuDiv.unselectable = "on";
+
+	document.body.appendChild(this.contextMenuDiv);
+
+	// Setup default values
+	defParam("commandhandler", "");
+	defParam("spacer_image", "images/spacer.gif");
+
+	this.items = new Array();
+	this.settings = settings;
+	this.html = "";
+
+	// IE Popup
+	if (tinyMCE.isMSIE && !tinyMCE.isMSIE5_0 && !tinyMCE.isOpera) {
+		this.pop = window.createPopup();
+		doc = this.pop.document;
+		doc.open();
+		doc.write('<html><head><link href="' + tinyMCE.baseURL + '/plugins/contextmenu/css/contextmenu.css" rel="stylesheet" type="text/css" /></head><body unselectable="yes" class="contextMenuIEPopup"></body></html>');
+		doc.close();
+	}
+};
+
+TinyMCE_ContextMenu.prototype = {
+	clearAll : function() {
+		this.html = "";
+		this.contextMenuDiv.innerHTML = "";
+	},
+
+	addSeparator : function() {
+		this.html += '<tr class="contextMenuItem"><td class="contextMenuIcon"><img src="' + this.settings['spacer_image'] + '" width="20" height="1" class="contextMenuImage" /></td><td><img class="contextMenuSeparator" width="1" height="1" src="' + this.settings['spacer_image'] + '" /></td></tr>';
+	},
+
+	addItem : function(icon, title, command, value, disabled) {
+		if (title.charAt(0) == '$')
+			title = tinyMCE.getLang(title.substring(1));
+
+		var onMouseDown = '';
+		var html = '';
+
+		if (tinyMCE.isMSIE && !tinyMCE.isMSIE5_0)
+			onMouseDown = 'contextMenu.execCommand(\'' + command + '\', \'' + value + '\');return false;';
+		else
+			onMouseDown = this.settings['commandhandler'] + '(\'' + command + '\', \'' + value + '\');return false;';
+
+		if (icon == "")
+			icon = this.settings['spacer_image'];
+
+		if (!disabled)
+			html += '<tr class="contextMenuItem">';
+		else
+			html += '<tr class="contextMenuItemDisabled">';
+
+		html += '<td class="contextMenuIcon"><img src="' + icon + '" width="20" height="20" class="contextMenuImage" /></td>';
+		html += '<td><div class="contextMenuText">';
+		html += '<a href="javascript:void(0);" onclick="' + onMouseDown + '" onmousedown="return false;">&#160;';
+
+		// Add text
+		html += title;
+
+		html += '&#160;</a>';
+		html += '</div></td>';
+		html += '</tr>';
+
+		// Add to main
+		this.html += html;
+	},
+
+	show : function(x, y) {
+		var vp, width, height;
+
+		if (this.html == "")
+			return;
+
+		var html = '';
+
+		html += '<a href="#"></a><table border="0" cellpadding="0" cellspacing="0">';
+		html += this.html;
+		html += '</table>';
+
+		this.contextMenuDiv.innerHTML = html;
+
+		// Get dimensions
+		this.contextMenuDiv.style.display = "block";
+		width = this.contextMenuDiv.offsetWidth;
+		height = this.contextMenuDiv.offsetHeight;
+		this.contextMenuDiv.style.display = "none";
+
+		if (tinyMCE.isMSIE && !tinyMCE.isMSIE5_0 && !tinyMCE.isOpera) {
+			// Setup popup and show
+			this.pop.document.body.innerHTML = '<div class="contextMenu">' + html + "</div>";
+			this.pop.document.tinyMCE = tinyMCE;
+			this.pop.document.contextMenu = this;
+			this.pop.show(x, y, width, height);
+		} else {
+			vp = this.getViewPort();
+
+			this.contextMenuDiv.style.left = (x > vp.width - width ? vp.width - width : x) + 'px';
+			this.contextMenuDiv.style.top = (y > vp.height - height ? vp.height - height : y) + 'px';
+			this.contextMenuDiv.style.display = "block";
+		}
+	},
+
+	getViewPort : function() {
+		return {
+			width : document.documentElement.offsetWidth || document.body.offsetWidth,
+			height : self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
+		};
+	},
+
+	hide : function() {
+		if (tinyMCE.isMSIE && !tinyMCE.isMSIE5_0 && !tinyMCE.isOpera)
+			this.pop.hide();
+		else
+			this.contextMenuDiv.style.display = "none";
+	},
+
+	execCommand : function(command, value) {
+		eval(this.settings['commandhandler'] + "(command, value);");
+	}
+};
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/spacer.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/spacer.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/contextmenu/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('directionality','en,tr,sv,fr_ca,zh_cn,cs,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br');var TinyMCE_DirectionalityPlugin={getInfo:function(){return{longname:'Directionality',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"ltr":return tinyMCE.getButtonHTML(cn,'lang_directionality_ltr_desc','{$pluginurl}/images/ltr.gif','mceDirectionLTR');case"rtl":return tinyMCE.getButtonHTML(cn,'lang_directionality_rtl_desc','{$pluginurl}/images/rtl.gif','mceDirectionRTL');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceDirectionLTR":var inst=tinyMCE.getInstanceById(editor_id);var elm=tinyMCE.getParentElement(inst.getFocusElement(),"p,div,td,h1,h2,h3,h4,h5,h6,pre,address");if(elm)elm.setAttribute("dir","ltr");tinyMCE.triggerNodeChange(false);return true;case"mceDirectionRTL":var inst=tinyMCE.getInstanceById(editor_id);var elm=tinyMCE.getParentElement(inst.getFocusElement(),"p,div,td,h1,h2,h3,h4,h5,h6,pre,address");if(elm)elm.setAttribute("dir","rtl");tinyMCE.triggerNodeChange(false);return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";}if(node==null)return;var elm=tinyMCE.getParentElement(node,"p,div,td,h1,h2,h3,h4,h5,h6,pre,address");if(!elm){tinyMCE.switchClass(editor_id+'_ltr','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_rtl','mceButtonDisabled');return true;}tinyMCE.switchClass(editor_id+'_ltr','mceButtonNormal');tinyMCE.switchClass(editor_id+'_rtl','mceButtonNormal');var dir=getAttrib(elm,"dir");if(dir=="ltr"||dir=="")tinyMCE.switchClass(editor_id+'_ltr','mceButtonSelected');else tinyMCE.switchClass(editor_id+'_rtl','mceButtonSelected');return true;}};tinyMCE.addPlugin("directionality",TinyMCE_DirectionalityPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,92 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.16 $
+ * $Date: 2006/02/10 21:34:28 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('directionality', 'en,tr,sv,fr_ca,zh_cn,cs,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br');
+
+var TinyMCE_DirectionalityPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Directionality',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "ltr":
+				return tinyMCE.getButtonHTML(cn, 'lang_directionality_ltr_desc', '{$pluginurl}/images/ltr.gif', 'mceDirectionLTR');
+
+			case "rtl":
+				return tinyMCE.getButtonHTML(cn, 'lang_directionality_rtl_desc', '{$pluginurl}/images/rtl.gif', 'mceDirectionRTL');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceDirectionLTR":
+				var inst = tinyMCE.getInstanceById(editor_id);
+				var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+
+				if (elm)
+					elm.setAttribute("dir", "ltr");
+
+				tinyMCE.triggerNodeChange(false);
+				return true;
+
+			case "mceDirectionRTL":
+				var inst = tinyMCE.getInstanceById(editor_id);
+				var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+
+				if (elm)
+					elm.setAttribute("dir", "rtl");
+
+				tinyMCE.triggerNodeChange(false);
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		function getAttrib(elm, name) {
+			return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+		}
+
+		if (node == null)
+			return;
+
+		var elm = tinyMCE.getParentElement(node, "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+		if (!elm) {
+			tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonDisabled');
+			tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonDisabled');
+			return true;
+		}
+
+		tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonNormal');
+
+		var dir = getAttrib(elm, "dir");
+		if (dir == "ltr" || dir == "")
+			tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonSelected');
+		else
+			tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonSelected');
+
+		return true;
+	}
+};
+
+tinyMCE.addPlugin("directionality", TinyMCE_DirectionalityPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/ltr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/ltr.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/rtl.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/images/rtl.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,6 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+directionality_ltr_desc : 'Direction left to right',
+directionality_rtl_desc : 'Direction right to left'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/directionality/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('emotions','en,tr,sv,zh_cn,cs,fa,fr_ca,fr,de,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_EmotionsPlugin={getInfo:function(){return{longname:'Emotions',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_emotions.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"emotions":return tinyMCE.getButtonHTML(cn,'lang_emotions_desc','{$pluginurl}/images/emotions.gif','mceEmotion');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceEmotion":var template=new Array();template['file']='../../plugins/emotions/emotions.htm';template['width']=160;template['height']=160;template['width']+=tinyMCE.getLang('lang_emotions_delta_width',0);template['height']+=tinyMCE.getLang('lang_emotions_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;}return false;}};tinyMCE.addPlugin('emotions',TinyMCE_EmotionsPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,65 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.23 $
+ * $Date: 2006/02/10 16:29:38 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('emotions', 'en,tr,sv,zh_cn,cs,fa,fr_ca,fr,de,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,zh_tw,zh_tw_utf8,sk');
+
+// Plucin static class
+var TinyMCE_EmotionsPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Emotions',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_emotions.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	/**
+	 * Returns the HTML contents of the emotions control.
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "emotions":
+				return tinyMCE.getButtonHTML(cn, 'lang_emotions_desc', '{$pluginurl}/images/emotions.gif', 'mceEmotion');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the mceEmotion command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceEmotion":
+				var template = new Array();
+
+				template['file'] = '../../plugins/emotions/emotions.htm'; // Relative to theme
+				template['width'] = 160;
+				template['height'] = 160;
+
+				// Language specific width and height addons
+				template['width'] += tinyMCE.getLang('lang_emotions_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_emotions_delta_height', 0);
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+// Register plugin
+tinyMCE.addPlugin('emotions', TinyMCE_EmotionsPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/emotions.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/emotions.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/emotions.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/emotions.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,40 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_emotions_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/functions.js"></script>
+	<base target="_self" />
+</head>
+<body style="display: none">
+	<div align="center">
+		<div class="title">{$lang_emotions_title}:<br /><br /></div>
+
+		<table border="0" cellspacing="0" cellpadding="4">
+		  <tr>
+			<td><a href="javascript:insertEmotion('smiley-cool.gif','lang_emotions_cool');"><img src="images/smiley-cool.gif" width="18" height="18" border="0" alt="{$lang_emotions_cool}" title="{$lang_emotions_cool}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-cry.gif','lang_emotions_cry');"><img src="images/smiley-cry.gif" width="18" height="18" border="0" alt="{$lang_emotions_cry}" title="{$lang_emotions_cry}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-embarassed.gif','lang_emotions_embarassed');"><img src="images/smiley-embarassed.gif" width="18" height="18" border="0" alt="{$lang_emotions_embarassed}" title="{$lang_emotions_embarassed}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-foot-in-mouth.gif','lang_emotions_foot_in_mouth');"><img src="images/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{$lang_emotions_foot_in_mouth}" title="{$lang_emotions_foot_in_mouth}" /></a></td>
+		  </tr>
+		  <tr>
+			<td><a href="javascript:insertEmotion('smiley-frown.gif','lang_emotions_frown');"><img src="images/smiley-frown.gif" width="18" height="18" border="0" alt="{$lang_emotions_frown}" title="{$lang_emotions_frown}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-innocent.gif','lang_emotions_innocent');"><img src="images/smiley-innocent.gif" width="18" height="18" border="0" alt="{$lang_emotions_innocent}" title="{$lang_emotions_innocent}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-kiss.gif','lang_emotions_kiss');"><img src="images/smiley-kiss.gif" width="18" height="18" border="0" alt="{$lang_emotions_kiss}" title="{$lang_emotions_kiss}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-laughing.gif','lang_emotions_laughing');"><img src="images/smiley-laughing.gif" width="18" height="18" border="0" alt="{$lang_emotions_laughing}" title="{$lang_emotions_laughing}" /></a></td>
+		  </tr>
+		  <tr>
+			<td><a href="javascript:insertEmotion('smiley-money-mouth.gif','lang_emotions_money_mouth');"><img src="images/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{$lang_emotions_money_mouth}" title="{$lang_emotions_money_mouth}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-sealed.gif','lang_emotions_sealed');"><img src="images/smiley-sealed.gif" width="18" height="18" border="0" alt="{$lang_emotions_sealed}" title="{$lang_emotions_sealed}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-smile.gif','lang_emotions_smile');"><img src="images/smiley-smile.gif" width="18" height="18" border="0" alt="{$lang_emotions_smile}" title="{$lang_emotions_smile}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-surprised.gif','lang_emotions_surprised');"><img src="images/smiley-surprised.gif" width="18" height="18" border="0" alt="{$lang_emotions_surprised}" title="{$lang_emotions_surprised}" /></a></td>
+		  </tr>
+		  <tr>
+			<td><a href="javascript:insertEmotion('smiley-tongue-out.gif','lang_emotions_tongue_out');"><img src="images/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{$lang_emotions_tongue-out}" title="{$lang_emotions_tongue_out}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-undecided.gif','lang_emotions_undecided');"><img src="images/smiley-undecided.gif" width="18" height="18" border="0" alt="{$lang_emotions_undecided}" title="{$lang_emotions_undecided}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-wink.gif','lang_emotions_wink');"><img src="images/smiley-wink.gif" width="18" height="18" border="0" alt="{$lang_emotions_wink}" title="{$lang_emotions_wink}" /></a></td>
+			<td><a href="javascript:insertEmotion('smiley-yell.gif','lang_emotions_yell');"><img src="images/smiley-yell.gif" width="18" height="18" border="0" alt="{$lang_emotions_yell}" title="{$lang_emotions_yell}" /></a></td>
+		  </tr>
+		</table>
+	</div>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/emotions.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/emotions.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/readme.txt	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,2 @@
+These emotions where taken from Mozilla Thunderbird.
+I hope they don't get angry if I use them here after all this is a open source project aswell.
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-cool.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-cool.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-cry.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-cry.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-embarassed.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-embarassed.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-frown.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-frown.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-innocent.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-innocent.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-kiss.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-kiss.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-laughing.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-laughing.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-sealed.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-sealed.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-smile.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-smile.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-surprised.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-surprised.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-undecided.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-undecided.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-wink.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-wink.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-yell.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-yell.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,21 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+}
+
+function insertEmotion(file_name, title) {
+	title = tinyMCE.getLang(title);
+
+	if (title == null)
+		title = "";
+
+	// XML encode
+	title = title.replace(/&/g, '&amp;');
+	title = title.replace(/\"/g, '&quot;');
+	title = title.replace(/</g, '&lt;');
+	title = title.replace(/>/g, '&gt;');
+
+	var html = '<img src="' + tinyMCE.baseURL + "/plugins/emotions/images/" + file_name + '" mce_src="' + tinyMCE.baseURL + "/plugins/emotions/images/" + file_name + '" border="0" alt="' + title + '" title="' + title + '" />';
+
+	tinyMCE.execCommand('mceInsertContent', false, html);
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,22 @@
+// UK lang variables
+
+tinyMCE.addToLang('emotions',{
+title : 'Insert emotion',
+desc : 'Emotions',
+cool : 'Cool',
+cry : 'Cry',
+embarassed : 'Embarassed',
+foot_in_mouth : 'Foot in mouth',
+frown : 'Frown',
+innocent : 'Innocent',
+kiss : 'Kiss',
+laughing : 'Laughing',
+money_mouth : 'Money mouth',
+sealed : 'Sealed',
+smile : 'Smile',
+surprised : 'Surprised',
+tongue_out : 'Tongue out',
+undecided : 'Undecided',
+wink : 'Wink',
+yell : 'Yell'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/emotions/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/content.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/content.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/content.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/content.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,7 @@
+.mceItemFlash {
+	border: 1px dotted #cc0000;
+	background-image: url('../images/flash.gif');
+	background-position: center;
+	background-repeat: no-repeat;
+	background-color: #ffffcc;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/flash.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/flash.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/flash.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/flash.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,11 @@
+.panel_wrapper div.current {
+	height: 100px;
+}
+
+#width, #height {
+	width: 50px;
+}
+
+#file {
+	width: 250px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('flash','en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,zh_tw,zh_tw_utf8,sk,pt_br');var TinyMCE_FlashPlugin={getInfo:function(){return{longname:'Flash',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_flash.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(!tinyMCE.settings['flash_skip_plugin_css'])tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/plugins/flash/css/content.css");},getControlHTML:function(cn){switch(cn){case"flash":return tinyMCE.getButtonHTML(cn,'lang_flash_desc','{$pluginurl}/images/flash.gif','mceFlash');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceFlash":var name="",swffile="",swfwidth="",swfheight="",action="insert";var template=new Array();var inst=tinyMCE.getInstanceById(editor_id);var focusElm=inst.getFocusElement();template['file']='../../plugins/flash/flash.htm';template['width']=430;template['height']=175;template['width']+=tinyMCE.getLang('lang_flash_delta_width',0);template['height']+=tinyMCE.getLang('lang_flash_delta_height',0);if(focusElm!=null&&focusElm.nodeName.toLowerCase()=="img"){name=tinyMCE.getAttrib(focusElm,'class');if(name.indexOf('mceItemFlash')==-1)return true;swffile=tinyMCE.getAttrib(focusElm,'alt');if(tinyMCE.getParam('convert_urls'))swffile=eval(tinyMCE.settings['urlconverter_callback']+"(swffile, null, true);");swfwidth=tinyMCE.getAttrib(focusElm,'width');swfheight=tinyMCE.getAttrib(focusElm,'height');action="update";}tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",swffile:swffile,swfwidth:swfwidth,swfheight:swfheight,action:action});return true;}return false;},cleanup:function(type,content){switch(type){case"insert_to_editor_dom":if(tinyMCE.getParam('convert_urls')){var imgs=content.getElementsByTagName("img");for(var i=0;i<imgs.length;i++){if(tinyMCE.getAttrib(imgs[i],"class")=="mceItemFlash"){var src=tinyMCE.getAttrib(imgs[i],"alt");if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, null, true);");imgs[i].setAttribute('alt',src);imgs[i].setAttribute('title',src);}}}break;case"get_from_editor_dom":var imgs=content.getElementsByTagName("img");for(var i=0;i<imgs.length;i++){if(tinyMCE.getAttrib(imgs[i],"class")=="mceItemFlash"){var src=tinyMCE.getAttrib(imgs[i],"alt");if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, null, true);");imgs[i].setAttribute('alt',src);imgs[i].setAttribute('title',src);}}break;case"insert_to_editor":var startPos=0;var embedList=new Array();content=content.replace(new RegExp('<[ ]*embed','gi'),'<embed');content=content.replace(new RegExp('<[ ]*/embed[ ]*>','gi'),'</embed>');content=content.replace(new RegExp('<[ ]*object','gi'),'<object');content=content.replace(new RegExp('<[ ]*/object[ ]*>','gi'),'</object>');while((startPos=content.indexOf('<embed',startPos+1))!=-1){var endPos=content.indexOf('>',startPos);var attribs=TinyMCE_FlashPlugin._parseAttributes(content.substring(startPos+6,endPos));embedList[embedList.length]=attribs;}var index=0;while((startPos=content.indexOf('<object',startPos))!=-1){if(index>=embedList.length)break;var attribs=embedList[index];endPos=content.indexOf('</object>',startPos);endPos+=9;var contentAfter=content.substring(endPos);content=content.substring(0,startPos);content+='<img width="'+attribs["width"]+'" height="'+attribs["height"]+'"';content+=' src="'+(tinyMCE.getParam("theme_href")+'/images/spacer.gif')+'" title="'+attribs["src"]+'"';content+=' alt="'+attribs["src"]+'" class="mceItemFlash" />'+content.substring(endPos);content+=contentAfter;index++;startPos++;}var index=0;while((startPos=content.indexOf('<embed',startPos))!=-1){if(index>=embedList.length)break;var attribs=embedList[index];endPos=content.indexOf('>',startPos);endPos+=9;var contentAfter=content.substring(endPos);content=content.substring(0,startPos);content+='<img width="'+attribs["width"]+'" height="'+attribs["height"]+'"';content+=' src="'+(tinyMCE.getParam("theme_href")+'/images/spacer.gif')+'" title="'+attribs["src"]+'"';content+=' alt="'+attribs["src"]+'" class="mceItemFlash" />'+content.substring(endPos);content+=contentAfter;index++;startPos++;}break;case"get_from_editor":var startPos=-1;while((startPos=content.indexOf('<img',startPos+1))!=-1){var endPos=content.indexOf('/>',startPos);var attribs=TinyMCE_FlashPlugin._parseAttributes(content.substring(startPos+4,endPos));if(attribs['class']!="mceItemFlash")continue;endPos+=2;var embedHTML='';var wmode=tinyMCE.getParam("flash_wmode","");var quality=tinyMCE.getParam("flash_quality","high");var menu=tinyMCE.getParam("flash_menu","false");embedHTML+='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"';embedHTML+=' codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0"';embedHTML+=' width="'+attribs["width"]+'" height="'+attribs["height"]+'">';embedHTML+='<param name="movie" value="'+attribs["title"]+'" />';embedHTML+='<param name="quality" value="'+quality+'" />';embedHTML+='<param name="menu" value="'+menu+'" />';embedHTML+='<param name="wmode" value="'+wmode+'" />';embedHTML+='<embed src="'+attribs["title"]+'" wmode="'+wmode+'" quality="'+quality+'" menu="'+menu+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" width="'+attribs["width"]+'" height="'+attribs["height"]+'"></embed></object>';chunkBefore=content.substring(0,startPos);chunkAfter=content.substring(endPos);content=chunkBefore+embedHTML+chunkAfter;}break;}return content;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(node==null)return;do{if(node.nodeName=="IMG"&&tinyMCE.getAttrib(node,'class').indexOf('mceItemFlash')==0){tinyMCE.switchClass(editor_id+'_flash','mceButtonSelected');return true;}}while((node=node.parentNode));tinyMCE.switchClass(editor_id+'_flash','mceButtonNormal');return true;},_parseAttributes:function(attribute_string){var attributeName="";var attributeValue="";var withInName;var withInValue;var attributes=new Array();var whiteSpaceRegExp=new RegExp('^[ \n\r\t]+','g');if(attribute_string==null||attribute_string.length<2)return null;withInName=withInValue=false;for(var i=0;i<attribute_string.length;i++){var chr=attribute_string.charAt(i);if((chr=='"'||chr=="'")&&!withInValue)withInValue=true;else if((chr=='"'||chr=="'")&&withInValue){withInValue=false;var pos=attributeName.lastIndexOf(' ');if(pos!=-1)attributeName=attributeName.substring(pos+1);attributes[attributeName.toLowerCase()]=attributeValue.substring(1);attributeName="";attributeValue="";}else if(!whiteSpaceRegExp.test(chr)&&!withInName&&!withInValue)withInName=true;if(chr=='='&&withInName)withInName=false;if(withInName)attributeName+=chr;if(withInValue)attributeValue+=chr;}return attributes;}};tinyMCE.addPlugin("flash",TinyMCE_FlashPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,287 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.34 $
+ * $Date: 2006/02/10 16:29:39 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('flash', 'en,tr,de,sv,zh_cn,cs,fa,fr_ca,fr,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,zh_tw,zh_tw_utf8,sk,pt_br');
+
+var TinyMCE_FlashPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Flash',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_flash.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		if (!tinyMCE.settings['flash_skip_plugin_css'])
+			tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/flash/css/content.css");
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "flash":
+				return tinyMCE.getButtonHTML(cn, 'lang_flash_desc', '{$pluginurl}/images/flash.gif', 'mceFlash');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceFlash":
+				var name = "", swffile = "", swfwidth = "", swfheight = "", action = "insert";
+				var template = new Array();
+				var inst = tinyMCE.getInstanceById(editor_id);
+				var focusElm = inst.getFocusElement();
+
+				template['file']   = '../../plugins/flash/flash.htm'; // Relative to theme
+				template['width']  = 430;
+				template['height'] = 175;
+
+				template['width'] += tinyMCE.getLang('lang_flash_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_flash_delta_height', 0);
+
+				// Is selection a image
+				if (focusElm != null && focusElm.nodeName.toLowerCase() == "img") {
+					name = tinyMCE.getAttrib(focusElm, 'class');
+
+					if (name.indexOf('mceItemFlash') == -1) // Not a Flash
+						return true;
+
+					// Get rest of Flash items
+					swffile = tinyMCE.getAttrib(focusElm, 'alt');
+
+					if (tinyMCE.getParam('convert_urls'))
+						swffile = eval(tinyMCE.settings['urlconverter_callback'] + "(swffile, null, true);");
+
+					swfwidth = tinyMCE.getAttrib(focusElm, 'width');
+					swfheight = tinyMCE.getAttrib(focusElm, 'height');
+					action = "update";
+				}
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes", swffile : swffile, swfwidth : swfwidth, swfheight : swfheight, action : action});
+			return true;
+	   }
+
+	   // Pass to next handler in chain
+	   return false;
+	},
+
+	cleanup : function(type, content) {
+		switch (type) {
+			case "insert_to_editor_dom":
+				// Force relative/absolute
+				if (tinyMCE.getParam('convert_urls')) {
+					var imgs = content.getElementsByTagName("img");
+					for (var i=0; i<imgs.length; i++) {
+						if (tinyMCE.getAttrib(imgs[i], "class") == "mceItemFlash") {
+							var src = tinyMCE.getAttrib(imgs[i], "alt");
+
+							if (tinyMCE.getParam('convert_urls'))
+								src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, null, true);");
+
+							imgs[i].setAttribute('alt', src);
+							imgs[i].setAttribute('title', src);
+						}
+					}
+				}
+				break;
+
+			case "get_from_editor_dom":
+				var imgs = content.getElementsByTagName("img");
+				for (var i=0; i<imgs.length; i++) {
+					if (tinyMCE.getAttrib(imgs[i], "class") == "mceItemFlash") {
+						var src = tinyMCE.getAttrib(imgs[i], "alt");
+
+						if (tinyMCE.getParam('convert_urls'))
+							src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, null, true);");
+
+						imgs[i].setAttribute('alt', src);
+						imgs[i].setAttribute('title', src);
+					}
+				}
+				break;
+
+			case "insert_to_editor":
+				var startPos = 0;
+				var embedList = new Array();
+
+				// Fix the embed and object elements
+				content = content.replace(new RegExp('<[ ]*embed','gi'),'<embed');
+				content = content.replace(new RegExp('<[ ]*/embed[ ]*>','gi'),'</embed>');
+				content = content.replace(new RegExp('<[ ]*object','gi'),'<object');
+				content = content.replace(new RegExp('<[ ]*/object[ ]*>','gi'),'</object>');
+
+				// Parse all embed tags
+				while ((startPos = content.indexOf('<embed', startPos+1)) != -1) {
+					var endPos = content.indexOf('>', startPos);
+					var attribs = TinyMCE_FlashPlugin._parseAttributes(content.substring(startPos + 6, endPos));
+					embedList[embedList.length] = attribs;
+				}
+
+				// Parse all object tags and replace them with images from the embed data
+				var index = 0;
+				while ((startPos = content.indexOf('<object', startPos)) != -1) {
+					if (index >= embedList.length)
+						break;
+
+					var attribs = embedList[index];
+
+					// Find end of object
+					endPos = content.indexOf('</object>', startPos);
+					endPos += 9;
+
+					// Insert image
+					var contentAfter = content.substring(endPos);
+					content = content.substring(0, startPos);
+					content += '<img width="' + attribs["width"] + '" height="' + attribs["height"] + '"';
+					content += ' src="' + (tinyMCE.getParam("theme_href") + '/images/spacer.gif') + '" title="' + attribs["src"] + '"';
+					content += ' alt="' + attribs["src"] + '" class="mceItemFlash" />' + content.substring(endPos);
+					content += contentAfter;
+					index++;
+
+					startPos++;
+				}
+
+				// Parse all embed tags and replace them with images from the embed data
+				var index = 0;
+				while ((startPos = content.indexOf('<embed', startPos)) != -1) {
+					if (index >= embedList.length)
+						break;
+
+					var attribs = embedList[index];
+
+					// Find end of embed
+					endPos = content.indexOf('>', startPos);
+					endPos += 9;
+
+					// Insert image
+					var contentAfter = content.substring(endPos);
+					content = content.substring(0, startPos);
+					content += '<img width="' + attribs["width"] + '" height="' + attribs["height"] + '"';
+					content += ' src="' + (tinyMCE.getParam("theme_href") + '/images/spacer.gif') + '" title="' + attribs["src"] + '"';
+					content += ' alt="' + attribs["src"] + '" class="mceItemFlash" />' + content.substring(endPos);
+					content += contentAfter;
+					index++;
+
+					startPos++;
+				}
+
+				break;
+
+			case "get_from_editor":
+				// Parse all img tags and replace them with object+embed
+				var startPos = -1;
+
+				while ((startPos = content.indexOf('<img', startPos+1)) != -1) {
+					var endPos = content.indexOf('/>', startPos);
+					var attribs = TinyMCE_FlashPlugin._parseAttributes(content.substring(startPos + 4, endPos));
+
+					// Is not flash, skip it
+					if (attribs['class'] != "mceItemFlash")
+						continue;
+
+					endPos += 2;
+
+					var embedHTML = '';
+					var wmode = tinyMCE.getParam("flash_wmode", "");
+					var quality = tinyMCE.getParam("flash_quality", "high");
+					var menu = tinyMCE.getParam("flash_menu", "false");
+
+					// Insert object + embed
+					embedHTML += '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"';
+					embedHTML += ' codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0"';
+					embedHTML += ' width="' + attribs["width"] + '" height="' + attribs["height"] + '">';
+					embedHTML += '<param name="movie" value="' + attribs["title"] + '" />';
+					embedHTML += '<param name="quality" value="' + quality + '" />';
+					embedHTML += '<param name="menu" value="' + menu + '" />';
+					embedHTML += '<param name="wmode" value="' + wmode + '" />';
+					embedHTML += '<embed src="' + attribs["title"] + '" wmode="' + wmode + '" quality="' + quality + '" menu="' + menu + '" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" width="' + attribs["width"] + '" height="' + attribs["height"] + '"></embed></object>';
+
+					// Insert embed/object chunk
+					chunkBefore = content.substring(0, startPos);
+					chunkAfter = content.substring(endPos);
+					content = chunkBefore + embedHTML + chunkAfter;
+				}
+				break;
+		}
+
+		// Pass through to next handler in chain
+		return content;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (node == null)
+			return;
+
+		do {
+			if (node.nodeName == "IMG" && tinyMCE.getAttrib(node, 'class').indexOf('mceItemFlash') == 0) {
+				tinyMCE.switchClass(editor_id + '_flash', 'mceButtonSelected');
+				return true;
+			}
+		} while ((node = node.parentNode));
+
+		tinyMCE.switchClass(editor_id + '_flash', 'mceButtonNormal');
+
+		return true;
+	},
+
+	// Private plugin internal functions
+
+	_parseAttributes : function(attribute_string) {
+		var attributeName = "";
+		var attributeValue = "";
+		var withInName;
+		var withInValue;
+		var attributes = new Array();
+		var whiteSpaceRegExp = new RegExp('^[ \n\r\t]+', 'g');
+
+		if (attribute_string == null || attribute_string.length < 2)
+			return null;
+
+		withInName = withInValue = false;
+
+		for (var i=0; i<attribute_string.length; i++) {
+			var chr = attribute_string.charAt(i);
+
+			if ((chr == '"' || chr == "'") && !withInValue)
+				withInValue = true;
+			else if ((chr == '"' || chr == "'") && withInValue) {
+				withInValue = false;
+
+				var pos = attributeName.lastIndexOf(' ');
+				if (pos != -1)
+					attributeName = attributeName.substring(pos+1);
+
+				attributes[attributeName.toLowerCase()] = attributeValue.substring(1);
+
+				attributeName = "";
+				attributeValue = "";
+			} else if (!whiteSpaceRegExp.test(chr) && !withInName && !withInValue)
+				withInName = true;
+
+			if (chr == '=' && withInName)
+				withInName = false;
+
+			if (withInName)
+				attributeName += chr;
+
+			if (withInValue)
+				attributeValue += chr;
+		}
+
+		return attributes;
+	}
+};
+
+tinyMCE.addPlugin("flash", TinyMCE_FlashPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/flash.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/flash.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/flash.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/flash.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,70 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_flash_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/flash.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<link href="css/flash.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+    <form onsubmit="insertFlash();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_flash_general}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{$lang_flash_general}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+							<tr>
+							<td nowrap="nowrap"><label for="file">{$lang_flash_file}</label></td>
+							  <td nowrap="nowrap">
+									<table border="0" cellspacing="0" cellpadding="0">
+									  <tr>
+										<td><input id="file" name="file" type="text" value="" onfocus="this.select();" /></td>
+										<td id="filebrowsercontainer">&nbsp;</td>
+									  </tr>
+									</table>
+								</td>
+							</tr>
+							<tr id="linklistrow">
+								<td><label for="linklist">{$lang_flash_list}</label></td>
+								<td id="linklistcontainer">&nbsp;</td>
+							</tr>
+							<tr>
+								<td nowrap="nowrap"><label>{$lang_flash_size}</label></td>
+								<td nowrap="nowrap">
+									<input type="text" id="width" name="width" value="" onfocus="this.select();" />
+									<select name="width2" id="width2" style="width: 50px">
+										<option value="">px</option>
+										<option value="%">%</option>
+									</select>&nbsp;x&nbsp;<input id="height" name="height" type="text"  value="" onfocus="this.select();" />
+									<select name="height2" id="height2" style="width: 50px">
+										<option value="">px</option>
+										<option value="%">%</option>
+									</select>
+								</td>
+							</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertFlash();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/images/flash.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/images/flash.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/flash.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/flash.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/flash.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/flash.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,107 @@
+var url = tinyMCE.getParam("flash_external_list_url");
+if (url != null) {
+	// Fix relative
+	if (url.charAt(0) != '/' && url.indexOf('://') == -1)
+		url = tinyMCE.documentBasePath + "/" + url;
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById("filebrowsercontainer").innerHTML = getBrowserHTML('filebrowser','file','flash','flash');
+
+	// Image list outsrc
+	var html = getFlashListHTML('filebrowser','file','flash','flash');
+	if (html == "")
+		document.getElementById("linklistrow").style.display = 'none';
+	else
+		document.getElementById("linklistcontainer").innerHTML = html;
+
+	var formObj = document.forms[0];
+	var swffile   = tinyMCE.getWindowArg('swffile');
+	var swfwidth  = '' + tinyMCE.getWindowArg('swfwidth');
+	var swfheight = '' + tinyMCE.getWindowArg('swfheight');
+
+	if (swfwidth.indexOf('%')!=-1) {
+		formObj.width2.value = "%";
+		formObj.width.value  = swfwidth.substring(0,swfwidth.length-1);
+	} else {
+		formObj.width2.value = "px";
+		formObj.width.value  = swfwidth;
+	}
+
+	if (swfheight.indexOf('%')!=-1) {
+		formObj.height2.value = "%";
+		formObj.height.value  = swfheight.substring(0,swfheight.length-1);
+	} else {
+		formObj.height2.value = "px";
+		formObj.height.value  = swfheight;
+	}
+
+	formObj.file.value = swffile;
+	formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true);
+
+	selectByValue(formObj, 'linklist', swffile);
+
+	// Handle file browser
+	if (isVisible('filebrowser'))
+		document.getElementById('file').style.width = '230px';
+
+	// Auto select flash in list
+	if (typeof(tinyMCEFlashList) != "undefined" && tinyMCEFlashList.length > 0) {
+		for (var i=0; i<formObj.linklist.length; i++) {
+			if (formObj.linklist.options[i].value == tinyMCE.getWindowArg('swffile'))
+				formObj.linklist.options[i].selected = true;
+		}
+	}
+}
+
+function getFlashListHTML() {
+	if (typeof(tinyMCEFlashList) != "undefined" && tinyMCEFlashList.length > 0) {
+		var html = "";
+
+		html += '<select id="linklist" name="linklist" style="width: 250px" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.file.value=this.options[this.selectedIndex].value;">';
+		html += '<option value="">---</option>';
+
+		for (var i=0; i<tinyMCEFlashList.length; i++)
+			html += '<option value="' + tinyMCEFlashList[i][1] + '">' + tinyMCEFlashList[i][0] + '</option>';
+
+		html += '</select>';
+
+		return html;
+	}
+
+	return "";
+}
+
+function insertFlash() {
+	var formObj = document.forms[0];
+	var html      = '';
+	var file      = formObj.file.value;
+	var width     = formObj.width.value;
+	var height    = formObj.height.value;
+	if (formObj.width2.value=='%') {
+		width = width + '%';
+	}
+	if (formObj.height2.value=='%') {
+		height = height + '%';
+	}
+
+	if (width == "")
+		width = 100;
+
+	if (height == "")
+		height = 100;
+
+	html += ''
+		+ '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" mce_src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" '
+		+ 'width="' + width + '" height="' + height + '" '
+		+ 'border="0" alt="' + file + '" title="' + file + '" class="mceItemFlash" />';
+
+	tinyMCEPopup.execCommand("mceInsertContent", true, html);
+	tinyMCE.selectedInstance.repaint();
+
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,11 @@
+// UK lang variables
+
+tinyMCE.addToLang('flash',{
+title : 'Insert / edit Flash Movie',
+desc : 'Insert / edit Flash Movie',
+file : 'Flash-File (.swf)',
+size : 'Size',
+list : 'Flash files',
+props : 'Flash properties',
+general : 'General'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/flash/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/blank.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/blank.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/blank.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/blank.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,9 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>blank_page</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body onload="parent.setupIframe(document);">
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,172 @@
+/* Hide the advanced tab */
+#advanced_tab {
+	display: none;
+}
+
+#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright {
+	width: 280px;
+}
+
+#doctype, #docencoding {
+	width: 200px;
+}
+
+#langcode {
+	width: 30px;
+}
+
+#bgimage {
+	width: 220px;	
+}
+
+#fontface {
+	width: 240px;
+}
+
+#leftmargin, #rightmargin, #topmargin, #bottommargin {
+	width: 50px;
+}
+
+.panel_wrapper div.current {
+	height: 400px;
+}
+
+#stylesheet, #style {
+	width: 240px;
+}
+
+/* Head list classes */
+
+.headlistwrapper {
+	width: 100%;
+}
+
+.addbutton, .removebutton, .moveupbutton, .movedownbutton {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: default;
+	display: block;
+	width: 20px;
+	height: 20px;
+}
+
+.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.addbutton {
+	background-image: url('../images/add.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.removebutton {
+	background-image: url('../images/remove.gif');
+	float: left;
+}
+
+.moveupbutton {
+	background-image: url('../images/move_up.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.movedownbutton {
+	background-image: url('../images/move_down.gif');
+	float: left;
+}
+
+.selected {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.toolbar {
+	width: 100%;
+}
+
+#headlist {
+	width: 100%;
+	margin-top: 3px;
+	font-size: 11px;
+}
+
+#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element {
+	display: none;
+}
+
+#addmenu {
+	position: absolute;
+	border: 1px solid gray;
+	display: none;
+	z-index: 100;
+	background-color: white;
+}
+
+#addmenu a {
+	display: block;
+	width: 100%;
+	line-height: 20px;
+	text-decoration: none;
+	background-color: white;
+}
+
+#addmenu a:hover {
+	background-color: #B6BDD2;
+	color: black;
+}
+
+#addmenu span {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+#updateElementPanel {
+	display: none;
+}
+
+#script_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#style_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#link_element  .panel_wrapper div.current {
+	height: 140px;
+}
+
+#element_script_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_comment_value {
+	width: 100%;
+	height: 120px;
+}
+
+#element_style_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title {
+	width: 250px;
+}
+
+.updateElementButton {
+	margin-top: 3px;
+}
+
+/* MSIE specific styles */
+
+* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton {
+	width: 22px;
+	height: 22px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('fullpage','en,tr,sv');var TinyMCE_FullPagePlugin={getInfo:function(){return{longname:'Fullpage',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_fullpage.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"fullpage":return tinyMCE.getButtonHTML(cn,'lang_fullpage_desc','{$pluginurl}/images/fullpage.gif','mceFullPageProperties');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceFullPageProperties":var template=new Array();template['file']='../../plugins/fullpage/fullpage.htm';template['width']=430;template['height']=485+(tinyMCE.isOpera?5:0);template['width']+=tinyMCE.getLang('lang_fullpage_delta_width',0);template['height']+=tinyMCE.getLang('lang_fullpage_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceFullPageUpdate":TinyMCE_FullPagePlugin._addToHead(tinyMCE.getInstanceById(editor_id));return true;}return false;},cleanup:function(type,content,inst){switch(type){case"insert_to_editor":var tmp=content.toLowerCase();var pos=tmp.indexOf('<body'),pos2;if(pos!=-1){pos=tmp.indexOf('>',pos);pos2=tmp.lastIndexOf('</body>');inst.fullpageTopContent=content.substring(0,pos+1);content=content.substring(pos+1,pos2);}else{if(!inst.fullpageTopContent){var docType=tinyMCE.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-/'+'/W3C//DTD XHTML 1.0 Transitional/'+'/EN" "http:/'+'/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');var enc=tinyMCE.getParam("fullpage_default_encoding",'utf-8');var title=tinyMCE.getParam("fullpage_default_title",'Untitled document');var lang=tinyMCE.getParam("fullpage_default_langcode",'en');var pi=tinyMCE.getParam("fullpage_default_xml_pi",true);var ff=tinyMCE.getParam("fullpage_default_font_family","");var fz=tinyMCE.getParam("fullpage_default_font_size","");var ds=tinyMCE.getParam("fullpage_default_style","");var dtc=tinyMCE.getParam("fullpage_default_text_color","");title=title.replace(/&/g,'&amp;');title=title.replace(/\"/g,'&quot;');title=title.replace(/</g,'&lt;');title=title.replace(/>/g,'&gt;');tmp='';if(pi)tmp+='<?xml version="1.0" encoding="'+enc+'"?>\n';tmp+=docType+'\n';tmp+='<html xmlns="http:/'+'/www.w3.org/1999/xhtml" lang="'+lang+'" xml:lang="'+lang+'">\n';tmp+='<head>\n';tmp+='\t<title>'+title+'</title>\n';tmp+='\t<meta http-equiv="Content-Type" content="text/html; charset='+enc+'" />\n';tmp+='</head>\n';tmp+='<body';if(ff!=''||fz!=''){tmp+=' style="';if(ds!='')tmp+=ds+";";if(ff!='')tmp+='font-family: '+ff+";";if(fz!='')tmp+='font-size: '+fz+";";tmp+='"';}if(dtc!='')tmp+=' text="'+dtc+'"';tmp+='>\n';inst.fullpageTopContent=tmp;}}this._addToHead(inst);break;case"get_from_editor":if(inst.fullpageTopContent)content=inst.fullpageTopContent+content+"\n</body>\n</html>";break;}return content;},_addToHead:function(inst){var doc=inst.getDoc();var head=doc.getElementsByTagName("head")[0];var body=doc.body;var h=inst.fullpageTopContent;var e=doc.createElement("body");var nl,i,le,tmp;h=h.replace(/(\r|\n)/gi,'');h=h.replace(/<\?[^\>]*\>/gi,'');h=h.replace(/<\/?(!DOCTYPE|head|html)[^\>]*\>/gi,'');h=h.replace(/<script(.*?)<\/script>/gi,'');h=h.replace(/<title(.*?)<\/title>/gi,'');h=h.replace(/<(meta|base)[^>]*>/gi,'');h=h.replace(/<link([^>]*)\/>/gi,'<pre mce_type="link" $1></pre>');h=h.replace(/<body/gi,'<div mce_type="body"');h+='</div>';e.innerHTML=h;body.vLink=body.aLink=body.link=body.text='';body.style.cssText='';nl=head.getElementsByTagName('link');for(i=0;i<nl.length;i++){if(tinyMCE.getAttrib(nl[i],'mce_head')=="true")nl[i].parentNode.removeChild(nl[i]);}nl=e.getElementsByTagName('pre');for(i=0;i<nl.length;i++){tmp=tinyMCE.getAttrib(nl[i],'media');if(tinyMCE.getAttrib(nl[i],'mce_type')=="link"&&(tmp==""||tmp=="screen"||tmp=="all")&&tinyMCE.getAttrib(nl[i],'rel')=="stylesheet"){le=doc.createElement("link");le.rel="stylesheet";le.href=tinyMCE.getAttrib(nl[i],'href');le.setAttribute("mce_head","true");head.appendChild(le);}}nl=e.getElementsByTagName('div');if(nl.length>0){body.style.cssText=tinyMCE.getAttrib(nl[0],'style');if((tmp=tinyMCE.getAttrib(nl[0],'leftmargin'))!=''&&body.style.marginLeft=='')body.style.marginLeft=tmp+"px";if((tmp=tinyMCE.getAttrib(nl[0],'rightmargin'))!=''&&body.style.marginRight=='')body.style.marginRight=tmp+"px";if((tmp=tinyMCE.getAttrib(nl[0],'topmargin'))!=''&&body.style.marginTop=='')body.style.marginTop=tmp+"px";if((tmp=tinyMCE.getAttrib(nl[0],'bottommargin'))!=''&&body.style.marginBottom=='')body.style.marginBottom=tmp+"px";body.dir=tinyMCE.getAttrib(nl[0],'dir');body.vLink=tinyMCE.getAttrib(nl[0],'vlink');body.aLink=tinyMCE.getAttrib(nl[0],'alink');body.link=tinyMCE.getAttrib(nl[0],'link');body.text=tinyMCE.getAttrib(nl[0],'text');if((tmp=tinyMCE.getAttrib(nl[0],'background'))!='')body.style.backgroundImage=tmp;if((tmp=tinyMCE.getAttrib(nl[0],'bgcolor'))!='')body.style.backgroundColor=tmp;}}};tinyMCE.addPlugin("fullpage",TinyMCE_FullPagePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,229 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.12 $
+ * $Date: 2006/02/23 16:16:34 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('fullpage', 'en,tr,sv');
+
+var TinyMCE_FullPagePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Fullpage',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_fullpage.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "fullpage":
+				return tinyMCE.getButtonHTML(cn, 'lang_fullpage_desc', '{$pluginurl}/images/fullpage.gif', 'mceFullPageProperties');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceFullPageProperties":
+				var template = new Array();
+
+				template['file']   = '../../plugins/fullpage/fullpage.htm';
+				template['width']  = 430;
+				template['height'] = 485 + (tinyMCE.isOpera ? 5 : 0);
+
+				template['width'] += tinyMCE.getLang('lang_fullpage_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_fullpage_delta_height', 0);
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+			return true;
+
+			case "mceFullPageUpdate":
+				TinyMCE_FullPagePlugin._addToHead(tinyMCE.getInstanceById(editor_id));
+				return true;
+	   }
+
+	   // Pass to next handler in chain
+	   return false;
+	},
+
+	cleanup : function(type, content, inst) {
+		switch (type) {
+			case "insert_to_editor":
+				var tmp = content.toLowerCase();
+				var pos = tmp.indexOf('<body'), pos2;
+
+				// Split page in header and body chunks
+				if (pos != -1) {
+					pos = tmp.indexOf('>', pos);
+					pos2 = tmp.lastIndexOf('</body>');
+					inst.fullpageTopContent = content.substring(0, pos + 1);
+					content = content.substring(pos + 1, pos2);
+					// tinyMCE.debug(inst.fullpageTopContent, content);
+				} else {
+					if (!inst.fullpageTopContent) {
+						var docType = tinyMCE.getParam("fullpage_default_doctype", '<!DOCTYPE html PUBLIC "-/'+'/W3C//DTD XHTML 1.0 Transitional/'+'/EN" "http:/'+'/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+						var enc = tinyMCE.getParam("fullpage_default_encoding", 'utf-8');
+						var title = tinyMCE.getParam("fullpage_default_title", 'Untitled document');
+						var lang = tinyMCE.getParam("fullpage_default_langcode", 'en');
+						var pi = tinyMCE.getParam("fullpage_default_xml_pi", true);
+						var ff = tinyMCE.getParam("fullpage_default_font_family", "");
+						var fz = tinyMCE.getParam("fullpage_default_font_size", "");
+						var ds = tinyMCE.getParam("fullpage_default_style", "");
+						var dtc = tinyMCE.getParam("fullpage_default_text_color", "");
+
+						// Xml encode it
+						title = title.replace(/&/g, '&amp;');
+						title = title.replace(/\"/g, '&quot;');
+						title = title.replace(/</g, '&lt;');
+						title = title.replace(/>/g, '&gt;');
+
+						tmp = '';
+
+						// Make default chunk
+						if (pi)
+							tmp += '<?xml version="1.0" encoding="' + enc + '"?>\n';
+
+						tmp += docType + '\n';
+						tmp += '<html xmlns="http:/'+'/www.w3.org/1999/xhtml" lang="' + lang + '" xml:lang="' + lang + '">\n';
+						tmp += '<head>\n';
+						tmp += '\t<title>' + title + '</title>\n';
+						tmp += '\t<meta http-equiv="Content-Type" content="text/html; charset=' + enc + '" />\n';
+						tmp += '</head>\n';
+						tmp += '<body';
+
+						if (ff != '' || fz != '') {
+							tmp += ' style="';
+
+							if (ds != '')
+								tmp += ds + ";";
+
+							if (ff != '')
+								tmp += 'font-family: ' + ff + ";";
+
+							if (fz != '')
+								tmp += 'font-size: ' + fz + ";";
+
+							tmp += '"';
+						}
+
+						if (dtc != '')
+							tmp += ' text="' + dtc + '"';
+
+						tmp += '>\n';
+
+						inst.fullpageTopContent = tmp;
+					}
+				}
+
+				this._addToHead(inst);
+
+				break;
+
+			case "get_from_editor":
+				if (inst.fullpageTopContent)
+					content = inst.fullpageTopContent + content + "\n</body>\n</html>";
+
+				break;
+		}
+
+		// Pass through to next handler in chain
+		return content;
+	},
+
+	// Private plugin internal methods
+
+	_addToHead : function(inst) {
+		var doc = inst.getDoc();
+		var head = doc.getElementsByTagName("head")[0];
+		var body = doc.body;
+		var h = inst.fullpageTopContent;
+		var e = doc.createElement("body");
+		var nl, i, le, tmp;
+
+		// Remove stuff we don't want
+		h = h.replace(/(\r|\n)/gi, '');
+		h = h.replace(/<\?[^\>]*\>/gi, '');
+		h = h.replace(/<\/?(!DOCTYPE|head|html)[^\>]*\>/gi, '');
+		h = h.replace(/<script(.*?)<\/script>/gi, '');
+		h = h.replace(/<title(.*?)<\/title>/gi, '');
+		h = h.replace(/<(meta|base)[^>]*>/gi, '');
+
+		// Make link and style elements into pre
+		h = h.replace(/<link([^>]*)\/>/gi, '<pre mce_type="link" $1></pre>');
+		//h = h.replace(/<style([^>]*)>(.*?)<\/style>/gi, '<pre mce_type="style" $1>$2</pre>');
+
+		// Make body a div
+		h = h.replace(/<body/gi, '<div mce_type="body"');
+		h += '</div>';
+
+		// Now crapy MSIE can parse it
+		e.innerHTML = h;
+
+		// Reset all body attributes
+		body.vLink = body.aLink = body.link = body.text = '';
+		body.style.cssText = '';
+
+		// Delete all old links
+		nl = head.getElementsByTagName('link');
+		for (i=0; i<nl.length; i++) {
+			if (tinyMCE.getAttrib(nl[i], 'mce_head') == "true")
+				nl[i].parentNode.removeChild(nl[i]);
+		}
+
+		// Add link elements
+		nl = e.getElementsByTagName('pre');
+		for (i=0; i<nl.length; i++) {
+			tmp = tinyMCE.getAttrib(nl[i], 'media');
+			if (tinyMCE.getAttrib(nl[i], 'mce_type') == "link" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCE.getAttrib(nl[i], 'rel') == "stylesheet") {
+				le = doc.createElement("link");
+
+				le.rel = "stylesheet";
+				le.href = tinyMCE.getAttrib(nl[i], 'href');
+				le.setAttribute("mce_head", "true");
+
+				head.appendChild(le);
+			}
+		}
+
+		// Add body attributes
+		nl = e.getElementsByTagName('div');
+		if (nl.length > 0) {
+			body.style.cssText = tinyMCE.getAttrib(nl[0], 'style');
+
+			if ((tmp = tinyMCE.getAttrib(nl[0], 'leftmargin')) != '' && body.style.marginLeft == '')
+				body.style.marginLeft = tmp + "px";
+
+			if ((tmp = tinyMCE.getAttrib(nl[0], 'rightmargin')) != '' && body.style.marginRight == '')
+				body.style.marginRight = tmp + "px";
+
+			if ((tmp = tinyMCE.getAttrib(nl[0], 'topmargin')) != '' && body.style.marginTop == '')
+				body.style.marginTop = tmp + "px";
+
+			if ((tmp = tinyMCE.getAttrib(nl[0], 'bottommargin')) != '' && body.style.marginBottom == '')
+				body.style.marginBottom = tmp + "px";
+
+			body.dir = tinyMCE.getAttrib(nl[0], 'dir');
+			body.vLink = tinyMCE.getAttrib(nl[0], 'vlink');
+			body.aLink = tinyMCE.getAttrib(nl[0], 'alink');
+			body.link = tinyMCE.getAttrib(nl[0], 'link');
+			body.text = tinyMCE.getAttrib(nl[0], 'text');
+
+			if ((tmp = tinyMCE.getAttrib(nl[0], 'background')) != '')
+				body.style.backgroundImage = tmp;
+
+			if ((tmp = tinyMCE.getAttrib(nl[0], 'bgcolor')) != '')
+				body.style.backgroundColor = tmp;
+		}
+	}
+};
+
+tinyMCE.addPlugin("fullpage", TinyMCE_FullPagePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,577 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_fullpage_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mclayer.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/fullpage.js"></script>
+	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="advlink" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+    <form onsubmit="updateAction();return false;" name="fullpage" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{$lang_fullpage_meta_tab}</a></span></li>
+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{$lang_fullpage_appearance_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{$lang_fullpage_advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="meta_panel" class="panel current">
+				<fieldset>
+					<legend>{$lang_fullpage_meta_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td nowrap="nowrap"><label for="metatitle">{$lang_fullpage_meta_title}</label>&nbsp;</td>
+							<td><input type="text" id="metatitle" name="metatitle" value="" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metakeywords">{$lang_fullpage_meta_keywords}</label>&nbsp;</td>
+							<td><textarea id="metakeywords" name="metakeywords" rows="3"></textarea></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metadescription">{$lang_fullpage_meta_description}</label>&nbsp;</td>
+							<td><textarea id="metadescription" name="metadescription" rows="3"></textarea></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metaauthor">{$lang_fullpage_author}</label>&nbsp;</td>
+							<td><input type="text" id="metaauthor" name="metaauthor" value="" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metacopyright">{$lang_fullpage_copyright}</label>&nbsp;</td>
+							<td><input type="text" id="metacopyright" name="metacopyright" value="" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metarobots">{$lang_fullpage_meta_robots}</label>&nbsp;</td>
+							<td>
+<select id="metarobots" name="metarobots">
+			<option value="">{$lang_not_set}</option> 
+			<option value="index,follow">{$lang_fullpage_meta_index_follow}</option>
+			<option value="index,nofollow">{$lang_fullpage_meta_index_nofollow}</option>
+			<option value="noindex,follow">{$lang_fullpage_meta_noindex_follow}</option>
+			<option value="noindex,nofollow">{$lang_fullpage_meta_noindex_nofollow}</option>
+</select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_fullpage_langprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="docencoding">{$lang_fullpage_encoding}</label></td> 
+							<td>
+								<select id="docencoding" name="docencoding"> 
+										<option value="">{$lang_not_set}</option>
+								</select>
+							</td> 
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="doctypes">{$lang_fullpage_doctypes}</label>&nbsp;</td>
+							<td>
+								<select id="doctypes" name="doctypes">
+										<option value="">{$lang_not_set}</option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="langcode">{$lang_fullpage_langcode}</label>&nbsp;</td>
+							<td><input type="text" id="langcode" name="langcode" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="langdir">{$lang_fullpage_langdir}</label></td> 
+							<td>
+								<select id="langdir" name="langdir"> 
+										<option value="">{$lang_not_set}</option> 
+										<option value="ltr">{$lang_fullpage_ltr}</option> 
+										<option value="rtl">{$lang_fullpage_rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="xml_pi">{$lang_fullpage_xml_pi}</label>&nbsp;</td>
+							<td><input type="checkbox" id="xml_pi" name="xml_pi" class="checkbox" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="appearance_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_fullpage_appearance_textprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="fontface">{$lang_fullpage_fontface}</label></td> 
+							<td>
+								<select id="fontface" name="fontface" onchange="changedStyleField(this);">
+										<option value="">{$lang_not_set}</option>
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="fontsize">{$lang_fullpage_fontsize}</label></td> 
+							<td>
+								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">
+										<option value="">{$lang_not_set}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="textcolor">{$lang_fullpage_textcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>
+										<td id="textcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_fullpage_appearance_bgprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="bgimage">{$lang_fullpage_bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>
+										<td id="bgimage_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="bgcolor">{$lang_fullpage_bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_fullpage_appearance_marginprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="leftmargin">{$lang_fullpage_left_margin}</label></td> 
+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td class="column1"><label for="rightmargin">{$lang_fullpage_right_margin}</label></td> 
+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="topmargin">{$lang_fullpage_top_margin}</label></td> 
+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td class="column1"><label for="bottommargin">{$lang_fullpage_bottom_margin}</label></td> 
+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_fullpage_appearance_linkprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="link_color">{$lang_fullpage_link_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>
+										<td id="link_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+
+							<td class="column1"><label for="visited_color">{$lang_fullpage_visited_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>
+										<td id="visited_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="active_color">{$lang_fullpage_active_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>
+										<td id="active_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+
+							<td>&nbsp;</td>
+							<td>&nbsp;</td>
+
+<!--							<td class="column1"><label for="hover_color">{$lang_fullpage_hover_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>
+										<td id="hover_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> -->
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{$lang_fullpage_appearance_style}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="stylesheet">{$lang_fullpage_stylesheet}</label></td> 
+							<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="stylesheet" name="stylesheet" type="text" value="" /></td>
+										<td id="stylesheet_browsercontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="style">{$lang_fullpage_style}</label></td> 
+							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<div id="addmenu">
+					<table border="0" cellpadding="0" cellspacing="0">
+						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{$lang_fullpage_add_title}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{$lang_fullpage_add_meta}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{$lang_fullpage_add_script}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{$lang_fullpage_add_style}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{$lang_fullpage_add_link}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{$lang_fullpage_add_base}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{$lang_fullpage_add_comment}</span></a></td></tr>
+					</table>
+				</div>
+
+				<fieldset>
+					<legend>{$lang_fullpage_head_elements}</legend>
+
+					<div class="headlistwrapper">
+						<div class="toolbar">
+							<div style="float: left">
+								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{$lang_fullpage_add}"></a>
+								<a href="#" onmousedown="return false;" class="removebutton" title="{$lang_fullpage_remove}"></a>
+							</div>
+							<div style="float: right">
+								<a href="#" onmousedown="return false;" class="moveupbutton" title="{$lang_fullpage_moveup}"></a>
+								<a href="#" onmousedown="return false;" class="movedownbutton" title="{$lang_fullpage_movedown}"></a>
+							</div>
+							<br style="clear: both" />
+						</div>
+						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">
+							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>
+							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>
+							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>
+							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>
+							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>
+							<option value="base_5">&lt;base href="." /&gt;</option>
+							<option value="comment_6">&lt;!-- ... --&gt;</option>
+							<option value="link_7">&lt;link href="." /&gt;</option>
+						</select>
+					</div>
+				</fieldset>
+
+				<fieldset id="meta_element">
+					<legend>{$lang_fullpage_meta_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_meta_type">{$lang_fullpage_type}</label></td> 
+							<td><select id="element_meta_type">
+										<option value="name">name</option>
+										<option value="http-equiv">http-equiv</option>
+								</select></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_meta_name">{$lang_fullpage_name}</label></td> 
+							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_meta_content">{$lang_fullpage_content}</label></td> 
+							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="title_element">
+					<legend>{$lang_fullpage_title_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_title">{$lang_fullpage_meta_title}</label></td> 
+							<td><input id="element_title" name="element_title" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="script_element">
+					<legend>{$lang_fullpage_script_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{$lang_fullpage_properties}</a></span></li>
+							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{$lang_fullpage_value}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="script_props_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_script_type">{$lang_fullpage_type}</label></td> 
+									<td><select id="element_script_type">
+										<option value="text/javascript">text/javascript</option>
+										<option value="text/jscript">text/jscript</option>
+										<option value="text/vbscript">text/vbscript</option>
+										<option value="text/vbs">text/vbs</option>
+										<option value="text/ecmascript">text/ecmascript</option>
+										<option value="text/xml">text/xml</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_src">{$lang_fullpage_src}</label></td> 
+									<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>
+										<td id="script_src_pickcontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_charset">{$lang_fullpage_charset}</label></td> 
+									<td><select id="element_script_charset"><option value="">{$lang_not_set}</option></select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_defer">{$lang_fullpage_defer}</label></td> 
+									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="script_value_panel" class="panel">
+							<textarea id="element_script_value"></textarea>
+						</div>
+					</div>
+
+					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="style_element">
+					<legend>{$lang_fullpage_style_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{$lang_fullpage_properties}</a></span></li>
+							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{$lang_fullpage_value}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="style_props_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_style_type">{$lang_fullpage_type}</label></td> 
+									<td><select id="element_style_type">
+										<option value="text/css">text/css</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_style_media">{$lang_fullpage_media}</label></td> 
+									<td><select id="element_style_media"></select></td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="style_value_panel" class="panel">
+							<textarea id="element_style_value"></textarea>
+						</div>
+					</div>
+
+					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="base_element">
+					<legend>{$lang_fullpage_base_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_base_href">{$lang_fullpage_href}</label></td> 
+							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_base_target">{$lang_fullpage_target}</label></td> 
+							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="link_element">
+					<legend>{$lang_fullpage_link_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{$lang_fullpage_general_props}</a></span></li>
+							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{$lang_fullpage_advanced_props}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="link_general_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_link_href">{$lang_fullpage_href}</label></td> 
+									<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>
+										<td id="link_href_pickcontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_title">{$lang_fullpage_meta_title}</label></td> 
+									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_type">{$lang_fullpage_type}</label></td> 
+									<td><select id="element_link_type" name="element_link_type">
+										<option value="text/css">text/css</option>
+										<option value="text/javascript">text/javascript</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_media">{$lang_fullpage_media}</label></td> 
+									<td><select id="element_link_media" name="element_link_media"></select></td>
+								</tr>
+								<tr>
+									<td><label for="element_style_rel">{$lang_fullpage_rel}</label></td>
+									<td><select id="element_style_rel" name="element_style_rel"> 
+											<option value="">{$lang_not_set}</option> 
+											<option value="stylesheet">Stylesheet</option>
+											<option value="alternate">Alternate</option>
+											<option value="designates">Designates</option>
+											<option value="start">Start</option>
+											<option value="next">Next</option>
+											<option value="prev">Prev</option>
+											<option value="contents">Contents</option>
+											<option value="index">Index</option>
+											<option value="glossary">Glossary</option>
+											<option value="copyright">Copyright</option>
+											<option value="chapter">Chapter</option>
+											<option value="subsection">Subsection</option>
+											<option value="appendix">Appendix</option>
+											<option value="help">Help</option>
+											<option value="bookmark">Bookmark</option>
+										</select> 
+									</td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="link_advanced_panel" class="panel">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_link_charset">{$lang_fullpage_charset}</label></td> 
+									<td><select id="element_link_charset"><option value="">{$lang_not_set}</option></select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_hreflang">{$lang_fullpage_hreflang}</label></td> 
+									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_target">{$lang_fullpage_target}</label></td> 
+									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td><label for="element_style_rev">{$lang_fullpage_rev}</label></td>
+									<td><select id="element_style_rev" name="element_style_rev"> 
+											<option value="">{$lang_not_set}</option> 
+											<option value="alternate">Alternate</option> 
+											<option value="designates">Designates</option> 
+											<option value="stylesheet">Stylesheet</option> 
+											<option value="start">Start</option> 
+											<option value="next">Next</option> 
+											<option value="prev">Prev</option> 
+											<option value="contents">Contents</option> 
+											<option value="index">Index</option> 
+											<option value="glossary">Glossary</option> 
+											<option value="copyright">Copyright</option> 
+											<option value="chapter">Chapter</option> 
+											<option value="subsection">Subsection</option> 
+											<option value="appendix">Appendix</option> 
+											<option value="help">Help</option> 
+											<option value="bookmark">Bookmark</option> 
+										</select> 
+									</td>
+								</tr>
+							</table>
+						</div>
+					</div>
+
+					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="comment_element">
+					<legend>{$lang_fullpage_comment_element}</legend>
+
+					<textarea id="element_comment_value"></textarea>
+
+					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{$lang_update}" onclick="updateElement();" />
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="update" value="{$lang_update}" onclick="updateAction();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+    </form>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/add.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/add.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/fullpage.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/fullpage.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/move_down.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/move_down.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/move_up.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/move_up.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/remove.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/images/remove.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/fullpage.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/fullpage.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/fullpage.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/fullpage.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,580 @@
+//
+
+var defaultDocTypes = 
+	'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +
+	'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +
+	'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +
+	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">">,' +
+	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
+	'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +
+	'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';
+
+var defaultEncodings = 
+	'Western european (iso-8859-1)=iso-8859-1,' +
+	'Central European (iso-8859-2)=iso-8859-2,' +
+	'Unicode (UTF-8)=utf-8,' +
+	'Chinese traditional (Big5)=big5,' +
+	'Cyrillic (iso-8859-5)=iso-8859-5,' +
+	'Japanese (iso-2022-jp)=iso-2022-jp,' +
+	'Greek (iso-8859-7)=iso-8859-7,' +
+	'Korean (iso-2022-kr)=iso-2022-kr,' +
+	'ASCII (us-ascii)=us-ascii';
+
+var defaultMediaTypes = 
+	'all=all,' +
+	'screen=screen,' +
+	'print=print,' +
+	'tty=tty,' +
+	'tv=tv,' +
+	'projection=projection,' +
+	'handheld=handheld,' +
+	'braille=braille,' +
+	'aural=aural';
+
+var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
+
+var addMenuLayer = new MCLayer("addmenu");
+var lastElementType = null;
+var topDoc;
+
+function init() {
+	var f = document.forms['fullpage'];
+	var i, p, doctypes, encodings, mediaTypes, fonts;
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+
+	// Setup doctype select box
+	doctypes = tinyMCE.getParam("fullpage_doctypes", defaultDocTypes).split(',');
+	for (i=0; i<doctypes.length; i++) {
+		p = doctypes[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'doctypes', p[0], p[1]);
+	}
+
+	// Setup fonts select box
+	fonts = tinyMCE.getParam("fullpage_fonts", defaultFontNames).split(';');
+	for (i=0; i<fonts.length; i++) {
+		p = fonts[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'fontface', p[0], p[1]);
+	}
+
+	// Setup fontsize select box
+	fonts = tinyMCE.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
+	for (i=0; i<fonts.length; i++)
+		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);
+
+	// Setup mediatype select boxs
+	mediaTypes = tinyMCE.getParam("fullpage_media_types", defaultMediaTypes).split(',');
+	for (i=0; i<mediaTypes.length; i++) {
+		p = mediaTypes[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'element_style_media', p[0], p[1]);
+			addSelectValue(f, 'element_link_media', p[0], p[1]);
+		}
+	}
+
+	// Setup encodings select box
+	encodings = tinyMCE.getParam("fullpage_encodings", defaultEncodings).split(',');
+	for (i=0; i<encodings.length; i++) {
+		p = encodings[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'docencoding', p[0], p[1]);
+			addSelectValue(f, 'element_script_charset', p[0], p[1]);
+			addSelectValue(f, 'element_link_charset', p[0], p[1]);
+		}
+	}
+
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
+	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');
+	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
+	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
+	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
+	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
+	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');
+	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');
+	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
+
+	// Resize some elements
+	if (isVisible('stylesheetbrowser'))
+		document.getElementById('stylesheet').style.width = '220px';
+
+	if (isVisible('link_href_browser'))
+		document.getElementById('element_link_href').style.width = '230px';
+
+	if (isVisible('bgimage_browser'))
+		document.getElementById('bgimage').style.width = '210px';
+
+	// Create iframe
+	var iframe = document.createElement('iframe');
+
+	iframe.id = 'tempFrame';
+	iframe.style.display = 'none';
+	iframe.src = tinyMCE.baseURL + "/plugins/fullpage/blank.htm";
+
+	document.body.appendChild(iframe);
+
+	tinyMCEPopup.resizeToInnerSize();
+}
+
+function setupIframe(doc) {
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var hc = inst.fullpageTopContent;
+	var f = document.forms[0];
+	var xmlVer, xmlEnc, docType;
+	var nodes, i, x, name, value, tmp, l;
+
+	// Keep it from not loading/executing stuff
+	hc = hc.replace(/<script>/gi, '<script type="text/javascript">');
+	hc = hc.replace(/\ssrc=/gi, " mce_src=");
+	hc = hc.replace(/\shref=/gi, " mce_href=");
+	hc = hc.replace(/\stype=/gi, " mce_type=");
+	hc = hc.replace(/<script/gi, '<script type="text/unknown" ');
+
+	// Add end to make it DOM parseable
+	hc += '</body></html>';
+
+	topDoc = doc;
+	doc.open();
+	doc.write(hc);
+	doc.close();
+
+	// ------- Setup options for genral tab
+
+	// Parse xml and doctype
+	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, hc, 1);
+	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, hc, 1);
+	docType = getReItem(/<\!DOCTYPE.*?>/gi, hc, 0);
+	f.langcode.value = getReItem(/lang="(.*?)"/gi, hc, 1);
+
+	// Get title
+	f.metatitle.value = tinyMCE.entityDecode(getReItem(/<title>(.*?)<\/title>/gi, hc, 1));
+
+	// Check for meta encoding
+	nodes = doc.getElementsByTagName("meta");
+	for (i=0; i<nodes.length; i++) {
+		name = tinyMCE.getAttrib(nodes[i], 'name');
+		value = tinyMCE.getAttrib(nodes[i], 'content');
+		httpEquiv = tinyMCE.getAttrib(nodes[i], 'httpEquiv');
+
+		switch (name.toLowerCase()) {
+			case "keywords":
+				f.metakeywords.value = value;
+				break;
+
+			case "description":
+				f.metadescription.value = value;
+				break;
+
+			case "author":
+				f.metaauthor.value = value;
+				break;
+
+			case "copyright":
+				f.metacopyright.value = value;
+				break;
+
+			case "robots":
+				selectByValue(f, 'metarobots', value, true, true);
+				break;
+		}
+
+		switch (httpEquiv.toLowerCase()) {
+			case "content-type":
+				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, value, 1);
+
+				// Override XML encoding
+				if (tmp != "")
+					xmlEnc = tmp;
+
+				break;
+		}
+	}
+
+	selectByValue(f, 'doctypes', docType, true, true);
+	selectByValue(f, 'docencoding', xmlEnc, true, true);
+	selectByValue(f, 'langdir', tinyMCE.getAttrib(doc.body, 'dir'), true, true);
+
+	if (xmlVer != '')
+		f.xml_pi.checked = true;
+
+	// ------- Setup options for appearance tab
+
+	// Get primary stylesheet
+	nodes = doc.getElementsByTagName("link");
+	for (i=0; i<nodes.length; i++) {
+		l = nodes[i];
+		tmp = tinyMCE.getAttrib(l, 'media');
+
+		if (tinyMCE.getAttrib(l, 'mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCE.getAttrib(l, 'rel') == "stylesheet") {
+			f.stylesheet.value = tinyMCE.getAttrib(l, 'mce_href');
+			break;
+		}
+	}
+
+	// Get from style elements
+	nodes = doc.getElementsByTagName("style");
+	for (i=0; i<nodes.length; i++) {
+		tmp = parseStyleElement(nodes[i]);
+
+		for (x=0; x<tmp.length; x++) {
+		//	if (tmp[x].rule.indexOf('a:hover') != -1 && tmp[x].data['color'])
+		//		f.hover_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])
+				f.visited_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])
+				f.link_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])
+				f.active_color.value = tmp[x].data['color'];
+		}
+	}
+
+	// Get from body attribs
+
+/*	f.leftmargin.value = tinyMCE.getAttrib(doc.body, "leftmargin");
+	f.rightmargin.value = tinyMCE.getAttrib(doc.body, "rightmargin");
+	f.topmargin.value = tinyMCE.getAttrib(doc.body, "topmargin");
+	f.bottommargin.value = tinyMCE.getAttrib(doc.body, "bottommargin");*/
+	f.textcolor.value = convertRGBToHex(tinyMCE.getAttrib(doc.body, "text"));
+	f.active_color.value = convertRGBToHex(tinyMCE.getAttrib(doc.body, "alink"));
+	f.link_color.value = convertRGBToHex(tinyMCE.getAttrib(doc.body, "link"));
+	f.visited_color.value = convertRGBToHex(tinyMCE.getAttrib(doc.body, "vlink"));
+	f.bgcolor.value = convertRGBToHex(tinyMCE.getAttrib(doc.body, "bgcolor"));
+	f.bgimage.value = convertRGBToHex(tinyMCE.getAttrib(doc.body, "background"));
+
+	// Get from style info
+	var style = tinyMCE.parseStyle(tinyMCE.getAttrib(doc.body, 'style'));
+
+	if (style['font-family'])
+		selectByValue(f, 'fontface', style['font-family'], true, true);
+	else
+		selectByValue(f, 'fontface', tinyMCE.getParam("fullpage_default_fontface", ""), true, true);
+
+	if (style['font-size'])
+		selectByValue(f, 'fontsize', style['font-size'], true, true);
+	else
+		selectByValue(f, 'fontsize', tinyMCE.getParam("fullpage_default_fontsize", ""), true, true);
+
+	if (style['color'])
+		f.textcolor.value = convertRGBToHex(style['color']);
+
+	if (style['background-image'])
+		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	if (style['background-color'])
+		f.bgcolor.value = convertRGBToHex(style['background-color']);
+
+	if (style['margin']) {
+		tmp = style['margin'].replace(/[^0-9 ]/g, '');
+		tmp = tmp.split(/ +/);
+		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';
+		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];
+		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];
+		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];
+	}
+
+	if (style['margin-left'])
+		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');
+
+	if (style['margin-right'])
+		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');
+
+	if (style['margin-top'])
+		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');
+
+	if (style['margin-bottom'])
+		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');
+
+	f.style.value = tinyMCE.serializeStyle(style);
+
+	updateColor('textcolor_pick', 'textcolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+	updateColor('visited_color_pick', 'visited_color');
+	updateColor('active_color_pick', 'active_color');
+	updateColor('link_color_pick', 'link_color');
+	//updateColor('hover_color_pick', 'hover_color');
+}
+
+function updateAction() {
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var f = document.forms[0];
+	var nl, i, h, v, s, head, html, l, tmp, addlink = true;
+
+	head = topDoc.getElementsByTagName('head')[0];
+
+	// Fix scripts without a type
+	nl = topDoc.getElementsByTagName('script');
+	for (i=0; i<nl.length; i++) {
+		if (tinyMCE.getAttrib(nl[i], 'mce_type') == '')
+			nl[i].setAttribute('mce_type', 'text/javascript');
+	}
+
+	// Get primary stylesheet
+	nl = topDoc.getElementsByTagName("link");
+	for (i=0; i<nl.length; i++) {
+		l = nl[i];
+
+		tmp = tinyMCE.getAttrib(l, 'media');
+
+		if (tinyMCE.getAttrib(l, 'mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCE.getAttrib(l, 'rel') == "stylesheet") {
+			addlink = false;
+
+			if (f.stylesheet.value == '')
+				l.parentNode.removeChild(l);
+			else
+				l.setAttribute('mce_href', f.stylesheet.value);
+
+			break;
+		}
+	}
+
+	// Add new link
+	if (f.stylesheet.value != '') {
+		l = topDoc.createElement('link');
+
+		l.setAttribute('mce_type', 'text/css');
+		l.setAttribute('mce_href', f.stylesheet.value);
+		l.setAttribute('rel', 'stylesheet');
+
+		head.appendChild(l);
+	}
+
+	setMeta(head, 'keywords', f.metakeywords.value);
+	setMeta(head, 'description', f.metadescription.value);
+	setMeta(head, 'author', f.metaauthor.value);
+	setMeta(head, 'copyright', f.metacopyright.value);
+	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));
+	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));
+
+	topDoc.body.dir = getSelectValue(f, 'langdir');
+	topDoc.body.style.cssText = f.style.value;
+
+	topDoc.body.setAttribute('vLink', f.visited_color.value);
+	topDoc.body.setAttribute('link', f.link_color.value);
+	topDoc.body.setAttribute('text', f.textcolor.value);
+	topDoc.body.setAttribute('aLink', f.active_color.value);
+
+	topDoc.body.style.fontFamily = getSelectValue(f, 'fontface');
+	topDoc.body.style.fontSize = getSelectValue(f, 'fontsize');
+	topDoc.body.style.backgroundColor = f.bgcolor.value;
+
+	if (f.leftmargin.value != '')
+		topDoc.body.style.marginLeft = f.leftmargin.value + 'px';
+
+	if (f.rightmargin.value != '')
+		topDoc.body.style.marginRight = f.rightmargin.value + 'px';
+
+	if (f.bottommargin.value != '')
+		topDoc.body.style.marginBottom = f.bottommargin.value + 'px';
+
+	if (f.topmargin.value != '')
+		topDoc.body.style.marginTop = f.topmargin.value + 'px';
+
+	html = topDoc.getElementsByTagName('html')[0];
+	html.setAttribute('lang', f.langcode.value);
+	html.setAttribute('xml:lang', f.langcode.value);
+
+	if (f.bgimage.value != '')
+		topDoc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";
+	else
+		topDoc.body.style.backgroundImage = '';
+
+	inst.cleanup.addRuleStr('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml:lang|xmlns],body[style|dir|vlink|link|text|alink],head');
+
+	h = inst.cleanup.serializeNodeAsHTML(topDoc.documentElement);
+
+	h = h.substring(0, h.lastIndexOf('</body>'));
+
+	if (h.indexOf('<title>') == -1)
+		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + inst.cleanup.xmlEncode(f.metatitle.value) + '</title>');
+	else
+		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + inst.cleanup.xmlEncode(f.metatitle.value) + '</title>');
+
+	if ((v = getSelectValue(f, 'doctypes')) != '')
+		h = v + '\n' + h;
+
+	if (f.xml_pi.checked) {
+		s = '<?xml version="1.0"';
+
+		if ((v = getSelectValue(f, 'docencoding')) != '')
+			s += ' encoding="' + v + '"';
+
+		s += '?>\n';
+		h = s + h;
+	}
+
+	inst.fullpageTopContent = h;
+
+	tinyMCEPopup.execCommand('mceFullPageUpdate', false, '');
+	tinyMCEPopup.close();
+}
+
+function setMeta(he, k, v) {
+	var nl, i, m;
+
+	nl = he.getElementsByTagName('meta');
+	for (i=0; i<nl.length; i++) {
+		if (k == 'Content-Type' && tinyMCE.getAttrib(nl[i], 'http-equiv') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', "text/html; charset=" + v);
+
+			return;
+		}
+
+		if (tinyMCE.getAttrib(nl[i], 'name') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', v);
+			return;
+		}
+	}
+
+	if (v == '')
+		return;
+
+	m = topDoc.createElement('meta');
+
+	if (k == 'Content-Type')
+		m.httpEquiv = k;
+	else
+		m.setAttribute('name', k);
+
+	m.setAttribute('content', v);
+	he.appendChild(m);
+}
+
+function parseStyleElement(e) {
+	var v = e.innerHTML;
+	var p, i, r;
+
+	v = v.replace(/<!--/gi, '');
+	v = v.replace(/-->/gi, '');
+	v = v.replace(/[\n\r]/gi, '');
+	v = v.replace(/\s+/gi, ' ');
+
+	r = new Array();
+	p = v.split(/{|}/);
+
+	for (i=0; i<p.length; i+=2) {
+		if (p[i] != "")
+			r[r.length] = {rule : tinyMCE.trim(p[i]), data : tinyMCE.parseStyle(p[i+1])};
+	}
+
+	return r;
+}
+
+function serializeStyleElement(d) {
+	var i, s, st;
+
+	s = '<!--\n';
+
+	for (i=0; i<d.length; i++) {
+		s += d[i].rule + ' {\n';
+
+		st = tinyMCE.serializeStyle(d[i].data);
+
+		if (st != '')
+			st += ';';
+
+		s += st.replace(/;/g, ';\n');
+		s += '}\n';
+
+		if (i != d.length - 1)
+			s += '\n';
+	}
+
+	s += '\n-->';
+
+	return s;
+}
+
+function getReItem(r, s, i) {
+	var c = r.exec(s);
+
+	if (c && c.length > i)
+		return c[i];
+
+	return '';
+}
+
+function changedStyleField(field) {
+	//alert(field.id);
+}
+
+function showAddMenu() {
+	var re = document.getElementById('addbutton');
+
+	addMenuLayer.moveRelativeTo(re, 'tr');
+	if (addMenuLayer.isMSIE)
+		addMenuLayer.moveBy(2, 0);
+
+	addMenuLayer.show();
+	addMenuLayer.setAutoHide(true, hideAddMenu);
+	addMenuLayer.addCSSClass(re, 'selected');
+}
+
+function hideAddMenu(l, e, mx, my) {
+	var re = document.getElementById('addbutton');
+	addMenuLayer.removeCSSClass(re, 'selected');
+}
+
+function addHeadElm(type) {
+	var le = document.getElementById('headlist');
+	var re = document.getElementById('addbutton');
+	var te = document.getElementById(type + '_element');
+
+	if (lastElementType)
+		lastElementType.style.display = 'none';
+
+	te.style.display = 'block';
+
+	lastElementType = te;
+
+	addMenuLayer.hide();
+	addMenuLayer.removeCSSClass(re, 'selected');
+
+	document.getElementById(type + '_updateelement').value = tinyMCE.getLang('lang_insert', 'Insert', true);
+
+	le.size = 10;
+}
+
+function updateHeadElm(item) {
+	var type = item.substring(0, item.indexOf('_'));
+	var le = document.getElementById('headlist');
+	var re = document.getElementById('addbutton');
+	var te = document.getElementById(type + '_element');
+
+	if (lastElementType)
+		lastElementType.style.display = 'none';
+
+	te.style.display = 'block';
+
+	lastElementType = te;
+
+	addMenuLayer.hide();
+	addMenuLayer.removeCSSClass(re, 'selected');
+
+	document.getElementById(type + '_updateelement').value = tinyMCE.getLang('lang_update', 'Update', true);
+
+	le.size = 10;
+}
+
+function cancelElementUpdate() {
+	var le = document.getElementById('headlist');
+
+	if (lastElementType)
+		lastElementType.style.display = 'none';
+
+	le.size = 26;
+}
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,92 @@
+// UK lang variables
+
+tinyMCE.addToLang('fullpage',{
+	title : 'Document properties',
+	desc : 'Document properties',
+	meta_tab : 'General',
+	appearance_tab : 'Appearance',
+	advanced_tab : 'Advanced',
+	meta_props : 'Meta information',
+	langprops : 'Language and encoding',
+	meta_title : 'Title',
+	meta_keywords : 'Keywords',
+	meta_description : 'Description',
+	meta_robots : 'Robots',
+	doctypes : 'Doctype',
+	langcode : 'Language code',
+	langdir : 'Language direction',
+	ltr : 'Left to right',
+	rtl : 'Right to left',
+	xml_pi : 'XML declaration',
+	encoding : 'Character encoding',
+	appearance_bgprops : 'Background properties',
+	appearance_marginprops : 'Body margins',
+	appearance_linkprops : 'Link colors',
+	appearance_textprops : 'Text properties',
+	bgcolor : 'Background color',
+	bgimage : 'Background image',
+	left_margin : 'Left margin',
+	right_margin : 'Right margin',
+	top_margin : 'Top margin',
+	bottom_margin : 'Bottom margin',
+	text_color : 'Text color',
+	font_size : 'Font size',
+	font_face : 'Font face',
+	link_color : 'Link color',
+	hover_color : 'Hover color',
+	visited_color : 'Visited color',
+	active_color : 'Active color',
+	textcolor : 'Color',
+	fontsize : 'Font size',
+	fontface : 'Font family',
+	meta_index_follow : 'Index and follow the links',
+	meta_index_nofollow : 'Index and don\'t follow the links',
+	meta_noindex_follow : 'Do not index but follow the links',
+	meta_noindex_nofollow : 'Do not index and don\'t follow the links',
+	appearance_style : 'Stylesheet and style properties',
+	stylesheet : 'Stylesheet',
+	style : 'Style',
+	author : 'Author',
+	copyright : 'Copyright',
+	add : 'Add new element',
+	remove : 'Remove selected element',
+	moveup : 'Move selected element up',
+	movedown : 'Move selected element down',
+	head_elements : 'Head elements',
+	info : 'Information',
+	info_text : '',
+	add_title : 'Title element',
+	add_meta : 'Meta element',
+	add_script : 'Script element',
+	add_style : 'Style element',
+	add_link : 'Link element',
+	add_base : 'Base element',
+	add_comment : 'Comment node',
+	title_element : 'Title element',
+	script_element : 'Script element',
+	style_element : 'Style element',
+	base_element : 'Base element',
+	link_element : 'Link element',
+	meta_element : 'Meta element',
+	comment_element : 'Comment',
+	src : 'Src',
+	language : 'Language',
+	href : 'Href',
+	target : 'Target',
+	rel : 'Rel',
+	type : 'Type',
+	charset : 'Charset',
+	defer : 'Defer',
+	media : 'Media',
+	properties : 'Properties',
+	name : 'Name',
+	value : 'Value',
+	content : 'Content',
+	rel : 'Rel',
+	rev : 'Rev',
+	hreflang : 'Href lang',
+	general_props : 'General',
+	advanced_props : 'Advanced',
+	delta_width : 0,
+	delta_height : 0
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('fullscreen','en,tr,sv,cs,fr_ca,zh_cn,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br');var TinyMCE_FullScreenPlugin={getInfo:function(){return{longname:'Fullscreen',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_fullscreen.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"fullscreen":return tinyMCE.getButtonHTML(cn,'lang_fullscreen_desc','{$pluginurl}/images/fullscreen.gif','mceFullScreen');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceFullScreen":if(tinyMCE.getParam('fullscreen_is_enabled')){window.opener.tinyMCE.execInstanceCommand(tinyMCE.getParam('fullscreen_editor_id'),'mceSetContent',false,tinyMCE.getContent(editor_id));top.close();}else{tinyMCE.setWindowArg('editor_id',editor_id);var win=window.open(tinyMCE.baseURL+"/plugins/fullscreen/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(tinyMCE.getParam('fullscreen_is_enabled'))tinyMCE.switchClass(editor_id+'_fullscreen','mceButtonSelected');return true;}};tinyMCE.addPlugin("fullscreen",TinyMCE_FullScreenPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,63 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.16 $
+ * $Date: 2006/03/14 17:33:39 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('fullscreen', 'en,tr,sv,cs,fr_ca,zh_cn,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br');
+
+var TinyMCE_FullScreenPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Fullscreen',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_fullscreen.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "fullscreen":
+				return tinyMCE.getButtonHTML(cn, 'lang_fullscreen_desc', '{$pluginurl}/images/fullscreen.gif', 'mceFullScreen');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceFullScreen":
+				if (tinyMCE.getParam('fullscreen_is_enabled')) {
+					// In fullscreen mode
+					window.opener.tinyMCE.execInstanceCommand(tinyMCE.getParam('fullscreen_editor_id'), 'mceSetContent', false, tinyMCE.getContent(editor_id));
+					top.close();
+				} else {
+					tinyMCE.setWindowArg('editor_id', editor_id);
+
+					var win = window.open(tinyMCE.baseURL + "/plugins/fullscreen/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
+					try { win.resizeTo(screen.availWidth, screen.availHeight); } catch (e) {}
+				}
+		
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (tinyMCE.getParam('fullscreen_is_enabled'))
+			tinyMCE.switchClass(editor_id + '_fullscreen', 'mceButtonSelected');
+
+		return true;
+	}
+};
+
+tinyMCE.addPlugin("fullscreen", TinyMCE_FullScreenPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,91 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_fullscreen_title}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<script language="javascript" type="text/javascript" src="../../tiny_mce.js"></script>
+	<script language="javascript" type="text/javascript">
+		function patchCallback(settings, key) {
+			if (settings[key])
+				settings[key] = "window.opener." + settings[key];
+		}
+
+		var settings = new Array();
+
+		// Clone array
+		for (var name in window.opener.tinyMCE.settings)
+			settings[name] = window.opener.tinyMCE.settings[name];
+
+		// Override options for fullscreen
+		for (var name in window.opener.tinyMCE.settings.fullscreen_settings)
+			settings[name] = window.opener.tinyMCE.settings.fullscreen_settings[name];
+
+		// Patch callbacks, make them point to window.opener
+		patchCallback(settings, 'urlconverter_callback');
+		patchCallback(settings, 'insertlink_callback');
+		patchCallback(settings, 'insertimage_callback');
+		patchCallback(settings, 'setupcontent_callback');
+		patchCallback(settings, 'save_callback');
+		patchCallback(settings, 'onchange_callback');
+		patchCallback(settings, 'init_instance_callback');
+		patchCallback(settings, 'file_browser_callback');
+		patchCallback(settings, 'cleanup_callback');
+		patchCallback(settings, 'execcommand_callback');
+		patchCallback(settings, 'oninit');
+
+		// Set options
+		settings['mode'] = 'exact';
+		settings['elements'] = 'fullscreenarea';
+		settings['ask'] = false;
+		settings['setupcontent_callback'] = 'setupContent';
+		settings['fullscreen_is_enabled'] = true;
+		settings['fullscreen_editor_id'] = window.opener.tinyMCE.getWindowArg("editor_id");
+		settings['theme_advanced_resizing'] = false;
+
+		// Init
+		tinyMCE.init(settings);
+		tinyMCE.documentBasePath = window.opener.tinyMCE.documentBasePath;
+
+		function setupContent(editor_id, body, doc) {
+			var inst = tinyMCE.getInstanceById(editor_id);
+			var content = window.opener.tinyMCE.getContent(tinyMCE.getParam('fullscreen_editor_id'));
+
+			// Setup title
+			var divElm = document.createElement("div");
+			divElm.innerHTML = tinyMCELang['lang_fullscreen_title'];
+			document.title = divElm.innerHTML;
+
+			// Get content
+			inst.execCommand('mceSetContent', false, content);
+		}
+
+		function unloadHandler(e) {
+			moveContent();
+		}
+
+		function moveContent() {
+			var doc = tinyMCE.isMSIE ? window.frames['mce_editor_0'].window.document : document.getElementById('mce_editor_0').contentDocument;
+			window.opener.tinyMCE.setInnerHTML(window.opener.tinyMCE.selectedInstance.getBody(), doc.body.innerHTML);
+		}
+
+		// Add onunload
+		tinyMCE.addEvent(window, "beforeunload", unloadHandler);
+
+		function doParentSubmit() {
+			moveContent();
+
+			if (window.opener.tinyMCE.selectedInstance.formElement.form)
+				window.opener.tinyMCE.selectedInstance.formElement.form.submit();
+
+			window.close();
+
+			return false;
+		}
+	</script>
+	<base target="_self" />
+</head>
+<body style="margin: 0; overflow: hidden; height: 100%" scrolling="no" scroll="no">
+<form onsubmit="doParentSubmit();" style="height: 100%">
+<textarea id="fullscreenarea" style="width: 100%; height: 100%"></textarea>
+</form>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/fullscreen.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/fullscreen.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,6 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+fullscreen_title : 'Fullscreen mode',
+fullscreen_desc : 'Toggle fullscreen mode'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/fullscreen/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>blank_page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<script language="javascript">
+function init() {
+	document.designMode = 'on';
+}
+</script>
+</head>
+<body onload="init();">
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,34 @@
+// Tiny MCE Template Plugin
+
+/* Import plugin specific language pack */ 
+tinyMCE.importPluginLanguagePack('htmltemplate', 'en');
+
+function TinyMCE_htmltemplate_getControlHTML(control_name) {
+	switch (control_name) { 
+		case "htmltemplate":
+			return '<img id="{$editor_id}htmltemplate" src="{$pluginurl}/images/htmltemplate.gif" title="{$lang_htmltemplate_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceHTMLTemplate\');" />';
+	} 
+	return ''; 
+} 
+function TinyMCE_htmltemplate_execCommand(editor_id, element, command, user_interface, value) {
+	switch (command) {
+  		case "mceHTMLTemplate":
+				var template = new Array();
+				template['file']	= '../../plugins/htmltemplate/htmltemplate.php'; // Relative to theme
+				template['width']  = 450;
+				template['height'] = 420;
+				var HTMLtemplate = "";
+				tinyMCE.openWindow(template, {editor_id : editor_id, HTMLtemplate: HTMLtemplate, resizable : "yes", scrollbars : "no", mceDo : 'insert'});
+		 	return true;
+	}
+
+	// Pass to next handler in chain
+	return false;
+}
+function TinyMCE_htmltemplate__insertContent(content) {
+
+	// Insert cleaned content
+		tinyMCE.execCommand("mceAddUndoLevel");
+		tinyMCE.execCommand("mceInsertContent", false, content);
+}
+
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,257 @@
+<?php
+define( '_VALID_MOS', 1 );
+
+$base_path = '../../../../../../../';
+if (!empty($_SERVER['SCRIPT_FILENAME']) && $pos = strpos($_SERVER['SCRIPT_FILENAME'], 'mambots/editors/mostlyce/jscripts/tiny_mce'))
+{
+  $base_path = substr($_SERVER['SCRIPT_FILENAME'], 0, $pos);
+}
+include ( $base_path."configuration.php" );
+include_once ( $mosConfig_absolute_path."/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php" );
+
+//From mambo.files.php
+/**
+* Utility function to read the files in a directory
+* @param string The file system path
+* @param string A filter for the names
+* @param boolean Recurse search into sub-directories
+* @param boolean True if to prepend the full path to the file name
+* @return array
+*/
+function listFiles( $path, $filter='.', $recurse=false, $fullpath=false  ) {
+    $arr = array();
+    if (!is_dir( $path )) {
+        return $arr;
+    }
+
+    // read the source directory
+    $handle = opendir( $path );
+    $path .= DIRECTORY_SEPARATOR;
+    while ($file = readdir( $handle )) {
+        $dir = $path . $file;
+        $isDir = is_dir( $dir );
+        if ($file <> '.' && $file <> '..') {
+            if ($isDir) {
+                if ($recurse) {
+                    $arr2 = listFiles( $dir, $filter, $recurse, $fullpath );
+                    $arr = array_merge( $arr, $arr2 );
+                }
+            } else {
+                if (preg_match( "/$filter/", $file )) {
+                    if ($fullpath) {
+                        $arr[] = $path . $file;
+                    } else {
+                        $arr[] = $file;
+                    }
+                }
+            }
+        }
+    }
+    closedir( $handle );
+    asort( $arr );
+    return $arr;
+}
+
+$tmplRegex 	= '\.(html|htm)$';
+$path = $mosConfig_absolute_path.$editor_tmpl_dir;
+
+if( is_dir( $path ) ){
+    $d = listFiles( $path, $tmplRegex );
+    foreach ( $d as $file ) {
+        $filepath = $path.$file;
+        if (eregi($tmplRegex, $file)) {
+            $temp = array(
+                'name' 		=> $file,
+                'path' 		=> $filepath,
+                'url' 		=> str_replace( '\\', '/', $editor_tmpl_dir ) . '/' . $file,
+            );
+        }
+        $files[] = $temp;
+    }
+}else{
+  echo "<span style=\"color: red; font-weight: bold;\">Directory $path not found!</span>";
+}
+
+$javascript = "onChange=\"selectTmpl(this.value)\"";
+$list['tmpl'] = "<select name=\"tmplFile\" $javascript style=\"width:200px\">";
+$list['tmpl'] .= "<option value=\"\" selected>--Select Template--</option>";
+
+if( !empty( $files ) ){
+    foreach ( $files as $tmpl ) {
+        $list['tmpl'] .= "<option value=\"".$tmpl['url']."\">".$tmpl['name']."</option>";
+    }
+}
+$list['tmpl'] .= "</select>";
+
+?>
+<html>
+<head>
+<title>{$lang_htmltemplate_desc}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Cache-Control" content="no-store, no-cache, must-revalidate" />
+<meta http-equiv="Expires" content="Fri, Oct 24 1976 00:00:00 GMT" />
+<script type="text/javascript" src="../../tiny_mce.js"></script>
+<style type="text/css">
+.show {
+  display : block;
+}
+.hide {
+  display : none;
+}
+</style>
+<script type="text/javascript">
+<!--
+// Adapted from TinyMCE Paste plugin - Ryan Demmer 18/09/2005
+
+// Because we can't load tiny_mce_popup.js.
+// Get tinyMCE window
+var site_url = "<?php echo $mosConfig_live_site;?>";
+var win = window.opener ? window.opener : window.dialogArguments;
+
+var tinyMCE = null;
+var tinyMCELang = null;
+
+// Use top window if not defined
+if (!win)
+	win = top;
+
+// Setup window opener
+window.opener = win;
+
+var tinyMCE = win.tinyMCE;
+var tinyMCELang = win.tinyMCELang;
+
+if (!tinyMCE)
+	alert("tinyMCE object reference not found from popup.");
+
+// Setup dir
+if (tinyMCELang['lang_dir'])
+	document.dir = tinyMCELang['lang_dir'];
+
+// Setup title
+var re = new RegExp('{|\\\$|}', 'g');
+var title = document.title.replace(re, "");
+
+if (typeof tinyMCELang[title] != "undefined") {
+	var divElm = document.createElement("div");
+	divElm.innerHTML = tinyMCELang[title];
+	document.title = divElm.innerHTML;
+}
+// Fixes some charcode issues
+function fixContent(html) {
+    html = html.replace(new RegExp('<(p|hr|table|tr|td|ol|ul|object|embed|li|blockquote)', 'gi'),'\n<$1');
+    html = html.replace(new RegExp('<\/(p|ol|ul|li|table|tr|td|blockquote|object)>', 'gi'),'</$1>\n');
+    html = tinyMCE.regexpReplace(html, '<br />','<br />\n','gi');
+    html = tinyMCE.regexpReplace(html, '\n\n','\n','gi');
+    return html;
+}
+function insertContent() {
+	if (win) {
+        if(document.getElementById('htmlsrc').checked){
+            if(tinyMCE.isMSIE){
+                html = document.getElementById('frmData').contentWindow.document.body.innerText;
+                document.getElementById('frmData').contentWindow.document.body.innerHTML = html;
+            }else{
+                html = document.getElementById('frmData').contentWindow.document.body.ownerDocument.createRange();
+                html.selectNodeContents(document.getElementById('frmData').contentWindow.document.body);
+                document.getElementById('frmData').contentWindow.document.body.innerHTML = html.toString();
+            }
+        }
+        var html = document.getElementById("frmData").contentWindow.document.body.innerHTML;
+
+		if (html == ''){
+			window.close();
+			return false;
+		}
+		win.TinyMCE_htmltemplate__insertContent(html);
+		window.close();
+	}
+}
+
+function onLoadInit() {
+	document.body.innerHTML = tinyMCE.applyTemplate(document.body.innerHTML, tinyMCE.windowArgs);
+	document.getElementById("frmData").contentWindow.document.designMode='on';
+    document.getElementById("frmData").src = "blank.htm";
+	resizeInputs();
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	if (!tinyMCE.isMSIE) {
+		wHeight = self.innerHeight - 100;
+		wWidth = self.innerWidth - 25;
+	}
+	else {
+		wHeight = document.body.clientHeight - 100;
+		wWidth = document.body.clientWidth - 25;
+	}
+
+	document.getElementById('frmData').style.height = Math.abs(wHeight) + 'px';
+	document.getElementById('frmData').style.width  = Math.abs(wWidth) + 'px';
+}
+function selectTmpl(option)
+{
+    var tplsrc = site_url+option;
+    document.getElementById('frmData').src = tplsrc;
+}
+function viewsource(source)
+{
+  var html;
+  if (source) {
+    if(tinyMCE.isMSIE){
+        html = document.getElementById('frmData').contentWindow.document.body.innerHTML;
+        document.getElementById('frmData').contentWindow.document.body.innerText = html;
+    }else{
+        html = document.createTextNode(document.getElementById('frmData').contentWindow.document.body.innerHTML);
+        document.getElementById('frmData').contentWindow.document.body.innerHTML = "";
+        html = document.getElementById('frmData').contentWindow.document.importNode(html,false);
+    	document.getElementById('frmData').contentWindow.document.body.appendChild(html);
+    }
+  } else {
+    if(tinyMCE.isMSIE){
+        html = document.getElementById('frmData').contentWindow.document.body.innerText;
+        document.getElementById('frmData').contentWindow.document.body.innerHTML = html;
+    }else{
+        html = document.getElementById('frmData').contentWindow.document.body.ownerDocument.createRange();
+        html.selectNodeContents(document.getElementById('frmData').contentWindow.document.body);
+        document.getElementById('frmData').contentWindow.document.body.innerHTML = html.toString();
+    }
+  }
+}
+
+// Output Popup CSS class
+document.write('<link href="' + tinyMCE.getParam("popups_css") + '" rel="stylesheet" type="text/css">');
+
+//--></script>
+
+</head>
+<body scroll="no" onload="onLoadInit();" onresize="resizeInputs();">
+<form name="source" onsubmit="saveContent();">
+    <table border="0" cellpadding="0" cellspacing="2" align="center">
+        <tr>
+            <td colspan="2" class="title">{$lang_htmltemplate_desc}</td>
+        </tr>
+        <tr>
+            <td colspan="2">{$lang_htmltemplate_title}</td>
+        </tr>
+        <tr>
+            <td><?php echo $list['tmpl']; ?>
+            <td align="left">
+            <input type="checkbox" id="htmlsrc" onclick="viewsource(this.checked)" style="vertical-align:middle;">View HTML Source</input>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <iframe id="frmData" name="frmData" src="blank.htm" height="250" width="400" frameborder="0" style="font-family:'Courier New',Courier,mono; font-size:8px; background-color:#FFFFFF;" dir="ltr" wrap="soft"></iframe>
+            </td>
+        </tr>
+        <tr>
+            <td width="50%" align="left"><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertContent();" /></td>
+            <td width="50%" align="right"><input type="button" id="cancel" value="{$lang_cancel}" onclick="window.close();" /></td>
+        </tr>
+    </table>
+</form>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/htmltemplate.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/htmltemplate.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,3 @@
+// UK lang variables
+tinyMCELang['lang_htmltemplate_desc'] = 'Insert HTML Template';
+tinyMCELang['lang_htmltemplate_title'] = 'Select HTML Template to insert.';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('iespell','en,tr,cs,el,fr_ca,it,ko,sv,zh_cn,fr,de,pl,pt_br,nl,da,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_IESpellPlugin={getInfo:function(){return{longname:'IESpell (MSIE Only)',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_iespell.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){if(cn=="iespell"&&(tinyMCE.isMSIE&&!tinyMCE.isOpera))return tinyMCE.getButtonHTML(cn,'lang_iespell_desc','{$pluginurl}/images/iespell.gif','mceIESpell');return"";},execCommand:function(editor_id,element,command,user_interface,value){if(command=="mceIESpell"){try{var ieSpell=new ActiveXObject("ieSpell.ieSpellExtension");ieSpell.CheckDocumentNode(tinyMCE.getInstanceById(editor_id).contentDocument.documentElement);}catch(e){if(e.number==-2146827859){if(confirm(tinyMCE.getLang("lang_iespell_download","",true)))window.open('http://www.iespell.com/download.php','ieSpellDownload','');}else alert("Error Loading ieSpell: Exception "+e.number);}return true;}return false;}};tinyMCE.addPlugin("iespell",TinyMCE_IESpellPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,60 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.20 $
+ * $Date: 2006/02/10 16:29:39 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('iespell', 'en,tr,cs,el,fr_ca,it,ko,sv,zh_cn,fr,de,pl,pt_br,nl,da,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_IESpellPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'IESpell (MSIE Only)',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_iespell.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	/**
+	 * Returns the HTML contents of the iespell control.
+	 */
+	getControlHTML : function(cn) {
+		// Is it the iespell control and is the brower MSIE.
+		if (cn == "iespell" && (tinyMCE.isMSIE && !tinyMCE.isOpera))
+			return tinyMCE.getButtonHTML(cn, 'lang_iespell_desc', '{$pluginurl}/images/iespell.gif', 'mceIESpell');
+
+		return "";
+	},
+
+	/**
+	 * Executes the mceIESpell command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle ieSpellCommand
+		if (command == "mceIESpell") {
+			try {
+				var ieSpell = new ActiveXObject("ieSpell.ieSpellExtension");
+				ieSpell.CheckDocumentNode(tinyMCE.getInstanceById(editor_id).contentDocument.documentElement);
+			} catch (e) {
+				if (e.number == -2146827859) {
+					if (confirm(tinyMCE.getLang("lang_iespell_download", "", true)))
+						window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');
+				} else
+					alert("Error Loading ieSpell: Exception " + e.number);
+			}
+
+			return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("iespell", TinyMCE_IESpellPlugin);
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/images/iespell.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/images/iespell.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,7 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+iespell_desc : 'Run spell checking',
+iespell_download : "ieSpell not detected. Click OK to go to download page."
+});
+
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/iespell/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/inlinepopup.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/inlinepopup.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/inlinepopup.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/inlinepopup.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,69 @@
+/* Window classes */
+
+.mceWindow {
+	position: absolute;
+	left: 0;
+	top: 0;
+	border: 1px solid black;
+	background-color: #D4D0C8;
+}
+
+.mceWindowHead {
+	background-color: #334F8D;
+	width: 100%;
+	height: 18px;
+	cursor: move;
+	overflow: hidden;
+}
+
+.mceWindowBody {
+	clear: both;
+	background-color: white;
+}
+
+.mceWindowStatusbar {
+	background-color: #D4D0C8;
+	height: 12px;
+	border-top: 1px solid black;
+}
+
+.mceWindowTitle {
+	float: left;
+	font-family: "MS Sans Serif";
+	font-size: 9pt;
+	font-weight: bold;
+	line-height: 18px;
+	color: white;
+	margin-left: 2px;
+	overflow: hidden;
+}
+
+.mceWindowHeadTools {
+	margin-right: 2px;
+}
+
+.mceWindowClose, .mceWindowMinimize, .mceWindowMaximize {
+	display: block;
+	float: right;
+	overflow: hidden;
+	margin-top: 2px;
+}
+
+.mceWindowClose {
+	margin-left: 2px;
+}
+
+.mceWindowMinimize {
+}
+
+.mceWindowMaximize {
+}
+
+.mceWindowResize {
+	display: block;
+	float: right;
+	overflow: hidden;
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+var TinyMCE_InlinePopupsPlugin={getInfo:function(){return{longname:'Inline Popups',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_inlinepopups.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};}};tinyMCE.addPlugin("inlinepopups",TinyMCE_InlinePopupsPlugin);TinyMCE_Engine.prototype.orgOpenWindow=TinyMCE_Engine.prototype.openWindow;TinyMCE_Engine.prototype.openWindow=function(template,args){if(args['inline']!="yes"||tinyMCE.isOpera||tinyMCE.getParam("plugins").indexOf('inlinepopups')==-1){mcWindows.selectedWindow=null;args['mce_inside_iframe']=false;this.orgOpenWindow(template,args);return;}var url,resizable,scrollbars;args['mce_inside_iframe']=true;tinyMCE.windowArgs=args;if(template['file'].charAt(0)!='/'&&template['file'].indexOf('://')==-1)url=tinyMCE.baseURL+"/themes/"+tinyMCE.getParam("theme")+"/"+template['file'];else url=template['file'];if(!(width=parseInt(template['width'])))width=320;if(!(height=parseInt(template['height'])))height=200;resizable=(args&&args['resizable'])?args['resizable']:"no";scrollbars=(args&&args['scrollbars'])?args['scrollbars']:"no";height+=18;for(var name in args){if(typeof(args[name])=='function')continue;url=tinyMCE.replaceVar(url,name,escape(args[name]));}var elm=document.getElementById(this.selectedInstance.editorId+'_parent');var pos=tinyMCE.getAbsPosition(elm);pos.absLeft+=Math.round((elm.firstChild.clientWidth/2)-(width/2));pos.absTop+=Math.round((elm.firstChild.clientHeight/2)-(height/2));mcWindows.open(url,mcWindows.idCounter++,"modal=yes,width="+width+",height="+height+",resizable="+resizable+",scrollbars="+scrollbars+",statusbar="+resizable+",left="+pos.absLeft+",top="+pos.absTop);};TinyMCE_Engine.prototype.orgCloseWindow=TinyMCE_Engine.prototype.closeWindow;TinyMCE_Engine.prototype.closeWindow=function(win){if(mcWindows.selectedWindow!=null)mcWindows.selectedWindow.close();else this.orgCloseWindow(win);};TinyMCE_Engine.prototype.setWindowTitle=function(win_ref,title){for(var n in mcWindows.windows){var win=mcWindows.windows[n];if(typeof(win)=='function')continue;if(win_ref.name==win.id+"_iframe")window.frames[win.id+"_iframe"].document.getElementById(win.id+'_title').innerHTML=title;}};function TinyMCE_Windows(){this.settings=new Array();this.windows=new Array();this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.isGecko=navigator.userAgent.indexOf('Gecko')!=-1;this.isSafari=navigator.userAgent.indexOf('Safari')!=-1;this.isMac=navigator.userAgent.indexOf('Mac')!=-1;this.isMSIE5_0=this.isMSIE&&(navigator.userAgent.indexOf('MSIE 5.0')!=-1);this.action="none";this.selectedWindow=null;this.lastSelectedWindow=null;this.zindex=100;this.mouseDownScreenX=0;this.mouseDownScreenY=0;this.mouseDownLayerX=0;this.mouseDownLayerY=0;this.mouseDownWidth=0;this.mouseDownHeight=0;this.idCounter=0;};TinyMCE_Windows.prototype.init=function(settings){this.settings=settings;if(this.isMSIE)this.addEvent(document,"mousemove",mcWindows.eventDispatcher);else this.addEvent(window,"mousemove",mcWindows.eventDispatcher);this.addEvent(document,"mouseup",mcWindows.eventDispatcher);this.doc=document;};TinyMCE_Windows.prototype.getParam=function(name,default_value){var value=null;value=(typeof(this.settings[name])=="undefined")?default_value:this.settings[name];if(value=="true"||value=="false")return(value=="true");return value;};TinyMCE_Windows.prototype.eventDispatcher=function(e){e=typeof(e)=="undefined"?window.event:e;if(mcWindows.selectedWindow==null)return;if(mcWindows.isGecko&&e.type=="mousedown"){var elm=e.currentTarget;for(var n in mcWindows.windows){var win=mcWindows.windows[n];if(win.headElement==elm||win.resizeElement==elm){win.focus();break;}}}switch(e.type){case"mousemove":mcWindows.selectedWindow.onMouseMove(e);break;case"mouseup":mcWindows.selectedWindow.onMouseUp(e);break;case"mousedown":mcWindows.selectedWindow.onMouseDown(e);break;case"focus":mcWindows.selectedWindow.onFocus(e);break;}};TinyMCE_Windows.prototype.addEvent=function(obj,name,handler){if(this.isMSIE)obj.attachEvent("on"+name,handler);else obj.addEventListener(name,handler,true);};TinyMCE_Windows.prototype.cancelEvent=function(e){if(this.isMSIE){e.returnValue=false;e.cancelBubble=true;}else e.preventDefault();};TinyMCE_Windows.prototype.parseFeatures=function(opts){opts=opts.toLowerCase();opts=opts.replace(/;/g,",");opts=opts.replace(/[^0-9a-z=,]/g,"");var optionChunks=opts.split(',');var options=new Array();options['left']="10";options['top']="10";options['width']="300";options['height']="300";options['resizable']="yes";options['minimizable']="yes";options['maximizable']="yes";options['close']="yes";options['movable']="yes";options['statusbar']="yes";options['scrollbars']="auto";options['modal']="no";if(opts=="")return options;for(var i=0;i<optionChunks.length;i++){var parts=optionChunks[i].split('=');if(parts.length==2)options[parts[0]]=parts[1];}options['left']=parseInt(options['left']);options['top']=parseInt(options['top']);options['width']=parseInt(options['width']);options['height']=parseInt(options['height']);return options;};TinyMCE_Windows.prototype.open=function(url,name,features){this.lastSelectedWindow=this.selectedWindow;var win=new TinyMCE_Window();var winDiv,html="",id;var imgPath=this.getParam("images_path");features=this.parseFeatures(features);id="mcWindow_"+name;win.deltaHeight=18;if(features['statusbar']=="yes"){win.deltaHeight+=13;if(this.isMSIE)win.deltaHeight+=1;}width=parseInt(features['width']);height=parseInt(features['height'])-win.deltaHeight;if(this.isMSIE)width-=2;win.id=id;win.url=url;win.name=name;win.features=features;this.windows[name]=win;iframeWidth=width;iframeHeight=height;html+='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';html+='<html>';html+='<head>';html+='<title>Wrapper iframe</title>';html+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';html+='<link href="'+this.getParam("css_file")+'" rel="stylesheet" type="text/css" />';html+='</head>';html+='<body onload="parent.mcWindows.onLoad(\''+name+'\');">';html+='<div id="'+id+'_container" class="mceWindow">';html+='<div id="'+id+'_head" class="mceWindowHead" onmousedown="parent.mcWindows.windows[\''+name+'\'].focus();">';html+='  <div id="'+id+'_title" class="mceWindowTitle"';html+='  onselectstart="return false;" unselectable="on" style="-moz-user-select: none !important;"></div>';html+='    <div class="mceWindowHeadTools">';html+='      <a href="javascript:parent.mcWindows.windows[\''+name+'\'].close();" target="_self" onmousedown="return false;" class="mceWindowClose"><img border="0" src="'+imgPath+'/window_close.gif" /></a>';html+='    </div>';html+='</div><div id="'+id+'_body" class="mceWindowBody" style="width: '+width+'px; height: '+height+'px;">';html+='<iframe id="'+id+'_iframe" name="'+id+'_iframe" frameborder="0" width="'+iframeWidth+'" height="'+iframeHeight+'" src="'+url+'" class="mceWindowBodyIframe" scrolling="'+features['scrollbars']+'"></iframe></div>';if(features['statusbar']=="yes"){html+='<div id="'+id+'_statusbar" class="mceWindowStatusbar" onmousedown="parent.mcWindows.windows[\''+name+'\'].focus();">';if(features['resizable']=="yes"){if(this.isGecko)html+='<div id="'+id+'_resize" class="mceWindowResize"><div style="background-image: url(\''+imgPath+'/window_resize.gif\'); width: 12px; height: 12px;"></div></div>';else html+='<div id="'+id+'_resize" class="mceWindowResize"><img onmousedown="parent.mcWindows.windows[\''+name+'\'].focus();" border="0" src="'+imgPath+'/window_resize.gif" /></div>';}html+='</div>';}html+='</div>';html+='</body>';html+='</html>';this.createFloatingIFrame(id,features['left'],features['top'],features['width'],features['height'],html);};TinyMCE_Windows.prototype.setDocumentLock=function(state){if(state){var elm=document.getElementById('mcWindowEventBlocker');if(elm==null){elm=document.createElement("div");elm.id="mcWindowEventBlocker";elm.style.position="absolute";elm.style.left="0";elm.style.top="0";document.body.appendChild(elm);}elm.style.display="none";var imgPath=this.getParam("images_path");var width=document.body.clientWidth;var height=document.body.clientHeight;elm.style.width=width;elm.style.height=height;elm.innerHTML='<img src="'+imgPath+'/spacer.gif" width="'+width+'" height="'+height+'" />';elm.style.zIndex=mcWindows.zindex-1;elm.style.display="block";}else{var elm=document.getElementById('mcWindowEventBlocker');if(mcWindows.windows.length==0)elm.parentNode.removeChild(elm);else elm.style.zIndex=mcWindows.zindex-1;}};TinyMCE_Windows.prototype.onLoad=function(name){var win=mcWindows.windows[name];var id="mcWindow_"+name;var wrapperIframe=window.frames[id+"_iframe"].frames[0];var wrapperDoc=window.frames[id+"_iframe"].document;var doc=window.frames[id+"_iframe"].document;var winDiv=document.getElementById("mcWindow_"+name+"_div");var realIframe=window.frames[id+"_iframe"].frames[0];win.id="mcWindow_"+name;win.winElement=winDiv;win.bodyElement=doc.getElementById(id+'_body');win.iframeElement=doc.getElementById(id+'_iframe');win.headElement=doc.getElementById(id+'_head');win.titleElement=doc.getElementById(id+'_title');win.resizeElement=doc.getElementById(id+'_resize');win.containerElement=doc.getElementById(id+'_container');win.left=win.features['left'];win.top=win.features['top'];win.frame=window.frames[id+'_iframe'].frames[0];win.wrapperFrame=window.frames[id+'_iframe'];win.wrapperIFrameElement=document.getElementById(id+"_iframe");mcWindows.addEvent(win.headElement,"mousedown",mcWindows.eventDispatcher);if(win.resizeElement!=null)mcWindows.addEvent(win.resizeElement,"mousedown",mcWindows.eventDispatcher);if(mcWindows.isMSIE){mcWindows.addEvent(realIframe.document,"mousemove",mcWindows.eventDispatcher);mcWindows.addEvent(realIframe.document,"mouseup",mcWindows.eventDispatcher);}else{mcWindows.addEvent(realIframe,"mousemove",mcWindows.eventDispatcher);mcWindows.addEvent(realIframe,"mouseup",mcWindows.eventDispatcher);mcWindows.addEvent(realIframe,"focus",mcWindows.eventDispatcher);}for(var i=0;i<window.frames.length;i++){if(!window.frames[i]._hasMouseHandlers){if(mcWindows.isMSIE){mcWindows.addEvent(window.frames[i].document,"mousemove",mcWindows.eventDispatcher);mcWindows.addEvent(window.frames[i].document,"mouseup",mcWindows.eventDispatcher);}else{mcWindows.addEvent(window.frames[i],"mousemove",mcWindows.eventDispatcher);mcWindows.addEvent(window.frames[i],"mouseup",mcWindows.eventDispatcher);}window.frames[i]._hasMouseHandlers=true;}}if(mcWindows.isMSIE){mcWindows.addEvent(win.frame.document,"mousemove",mcWindows.eventDispatcher);mcWindows.addEvent(win.frame.document,"mouseup",mcWindows.eventDispatcher);}else{mcWindows.addEvent(win.frame,"mousemove",mcWindows.eventDispatcher);mcWindows.addEvent(win.frame,"mouseup",mcWindows.eventDispatcher);mcWindows.addEvent(win.frame,"focus",mcWindows.eventDispatcher);}var func=this.getParam("on_open_window","");if(func!="")eval(func+"(win);");win.focus();if(win.features['modal']=="yes")mcWindows.setDocumentLock(true);};TinyMCE_Windows.prototype.createFloatingIFrame=function(id_prefix,left,top,width,height,html){var iframe=document.createElement("iframe");var div=document.createElement("div");width=parseInt(width);height=parseInt(height)+1;div.setAttribute("id",id_prefix+"_div");div.setAttribute("width",width);div.setAttribute("height",(height));div.style.position="absolute";div.style.left=left+"px";div.style.top=top+"px";div.style.width=width+"px";div.style.height=(height)+"px";div.style.backgroundColor="white";div.style.display="none";if(this.isGecko){iframeWidth=width+2;iframeHeight=height+2;}else{iframeWidth=width;iframeHeight=height+1;}iframe.setAttribute("id",id_prefix+"_iframe");iframe.setAttribute("name",id_prefix+"_iframe");iframe.setAttribute("border","0");iframe.setAttribute("frameBorder","0");iframe.setAttribute("marginWidth","0");iframe.setAttribute("marginHeight","0");iframe.setAttribute("leftMargin","0");iframe.setAttribute("topMargin","0");iframe.setAttribute("width",iframeWidth);iframe.setAttribute("height",iframeHeight);iframe.setAttribute("scrolling","no");iframe.style.width=iframeWidth+"px";iframe.style.height=iframeHeight+"px";iframe.style.backgroundColor="white";div.appendChild(iframe);document.body.appendChild(div);div.innerHTML=div.innerHTML;if(this.isSafari){window.setTimeout(function(){doc=window.frames[id_prefix+'_iframe'].document;doc.open();doc.write(html);doc.close();},10);}else{doc=window.frames[id_prefix+'_iframe'].window.document;doc.open();doc.write(html);doc.close();}div.style.display="block";return div;};function TinyMCE_Window(){};TinyMCE_Window.prototype.focus=function(){if(this!=mcWindows.selectedWindow){this.winElement.style.zIndex=++mcWindows.zindex;mcWindows.lastSelectedWindow=mcWindows.selectedWindow;mcWindows.selectedWindow=this;}};TinyMCE_Window.prototype.minimize=function(){};TinyMCE_Window.prototype.maximize=function(){};TinyMCE_Window.prototype.startResize=function(){mcWindows.action="resize";};TinyMCE_Window.prototype.startMove=function(e){mcWindows.action="move";};TinyMCE_Window.prototype.close=function(){if(this.frame&&this.frame['tinyMCEPopup'])this.frame['tinyMCEPopup'].restoreSelection();if(mcWindows.lastSelectedWindow!=null)mcWindows.lastSelectedWindow.focus();var mcWindowsNew=new Array();for(var n in mcWindows.windows){var win=mcWindows.windows[n];if(typeof(win)=='function')continue;if(win.name!=this.name)mcWindowsNew[n]=win;}mcWindows.windows=mcWindowsNew;var e=mcWindows.doc.getElementById(this.id+"_iframe");e.parentNode.removeChild(e);var e=mcWindows.doc.getElementById(this.id+"_div");e.parentNode.removeChild(e);mcWindows.setDocumentLock(false);};TinyMCE_Window.prototype.onMouseMove=function(e){var scrollX=0;var scrollY=0;var dx=e.screenX-mcWindows.mouseDownScreenX;var dy=e.screenY-mcWindows.mouseDownScreenY;switch(mcWindows.action){case"resize":width=mcWindows.mouseDownWidth+(e.screenX-mcWindows.mouseDownScreenX);height=mcWindows.mouseDownHeight+(e.screenY-mcWindows.mouseDownScreenY);width=width<100?100:width;height=height<100?100:height;this.wrapperIFrameElement.style.width=width+2;this.wrapperIFrameElement.style.height=height+2;this.wrapperIFrameElement.width=width+2;this.wrapperIFrameElement.height=height+2;this.winElement.style.width=width;this.winElement.style.height=height;height=height-this.deltaHeight;this.containerElement.style.width=width;this.iframeElement.style.width=width;this.iframeElement.style.height=height;this.bodyElement.style.width=width;this.bodyElement.style.height=height;this.headElement.style.width=width;mcWindows.cancelEvent(e);break;case"move":this.left=mcWindows.mouseDownLayerX+(e.screenX-mcWindows.mouseDownScreenX);this.top=mcWindows.mouseDownLayerY+(e.screenY-mcWindows.mouseDownScreenY);this.winElement.style.left=this.left+"px";this.winElement.style.top=this.top+"px";mcWindows.cancelEvent(e);break;}};function debug(msg){document.getElementById('debug').value+=msg+"\n";}TinyMCE_Window.prototype.onMouseUp=function(e){mcWindows.action="none";};TinyMCE_Window.prototype.onFocus=function(e){var winRef=e.currentTarget;for(var n in mcWindows.windows){var win=mcWindows.windows[n];if(typeof(win)=='function')continue;if(winRef.name==win.id+"_iframe"){win.focus();return;}}};TinyMCE_Window.prototype.onMouseDown=function(e){var elm=mcWindows.isMSIE?this.wrapperFrame.event.srcElement:e.target;var scrollX=0;var scrollY=0;mcWindows.mouseDownScreenX=e.screenX;mcWindows.mouseDownScreenY=e.screenY;mcWindows.mouseDownLayerX=this.left;mcWindows.mouseDownLayerY=this.top;mcWindows.mouseDownWidth=parseInt(this.winElement.style.width);mcWindows.mouseDownHeight=parseInt(this.winElement.style.height);if(this.resizeElement!=null&&elm==this.resizeElement.firstChild)this.startResize(e);else this.startMove(e);mcWindows.cancelEvent(e);};var mcWindows=new TinyMCE_Windows();mcWindows.init({images_path:tinyMCE.baseURL+"/plugins/inlinepopups/images",css_file:tinyMCE.baseURL+"/plugins/inlinepopups/css/inlinepopup.css"});
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,662 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.8 $
+ * $Date: 2006/02/06 20:02:38 $
+ *
+ * Moxiecode DHTML Windows script.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+// Patch openWindow, closeWindow TinyMCE functions
+
+var TinyMCE_InlinePopupsPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Inline Popups',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_inlinepopups.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	}
+};
+
+tinyMCE.addPlugin("inlinepopups", TinyMCE_InlinePopupsPlugin);
+
+// Patch openWindow, closeWindow TinyMCE functions
+
+TinyMCE_Engine.prototype.orgOpenWindow = TinyMCE_Engine.prototype.openWindow;
+
+TinyMCE_Engine.prototype.openWindow = function(template, args) {
+	// Does the caller support inline
+	if (args['inline'] != "yes" || tinyMCE.isOpera || tinyMCE.getParam("plugins").indexOf('inlinepopups') == -1) {
+		mcWindows.selectedWindow = null;
+		args['mce_inside_iframe'] = false;
+		this.orgOpenWindow(template, args);
+		return;
+	}
+
+	var url, resizable, scrollbars;
+
+	args['mce_inside_iframe'] = true;
+	tinyMCE.windowArgs = args;
+
+	if (template['file'].charAt(0) != '/' && template['file'].indexOf('://') == -1)
+		url = tinyMCE.baseURL + "/themes/" + tinyMCE.getParam("theme") + "/" + template['file'];
+	else
+		url = template['file'];
+
+	if (!(width = parseInt(template['width'])))
+		width = 320;
+
+	if (!(height = parseInt(template['height'])))
+		height = 200;
+
+	resizable = (args && args['resizable']) ? args['resizable'] : "no";
+	scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no";
+
+	height += 18;
+
+	// Replace all args as variables in URL
+	for (var name in args) {
+		if (typeof(args[name]) == 'function')
+			continue;
+
+		url = tinyMCE.replaceVar(url, name, escape(args[name]));
+	}
+
+	var elm = document.getElementById(this.selectedInstance.editorId + '_parent');
+	var pos = tinyMCE.getAbsPosition(elm);
+
+	// Center div in editor area
+	pos.absLeft += Math.round((elm.firstChild.clientWidth / 2) - (width / 2));
+	pos.absTop += Math.round((elm.firstChild.clientHeight / 2) - (height / 2));
+
+	mcWindows.open(url, mcWindows.idCounter++, "modal=yes,width=" + width+ ",height=" + height + ",resizable=" + resizable + ",scrollbars=" + scrollbars + ",statusbar=" + resizable + ",left=" + pos.absLeft + ",top=" + pos.absTop);
+};
+
+TinyMCE_Engine.prototype.orgCloseWindow = TinyMCE_Engine.prototype.closeWindow;
+
+TinyMCE_Engine.prototype.closeWindow = function(win) {
+	if (mcWindows.selectedWindow != null)
+		mcWindows.selectedWindow.close();
+	else
+		this.orgCloseWindow(win);
+};
+
+TinyMCE_Engine.prototype.setWindowTitle = function(win_ref, title) {
+	for (var n in mcWindows.windows) {
+		var win = mcWindows.windows[n];
+		if (typeof(win) == 'function')
+			continue;
+
+		if (win_ref.name == win.id + "_iframe")
+			window.frames[win.id + "_iframe"].document.getElementById(win.id + '_title').innerHTML = title;
+	}
+};
+
+// * * * * * TinyMCE_Windows classes below
+
+// Windows handler
+function TinyMCE_Windows() {
+	this.settings = new Array();
+	this.windows = new Array();
+	this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	this.isGecko = navigator.userAgent.indexOf('Gecko') != -1;
+	this.isSafari = navigator.userAgent.indexOf('Safari') != -1;
+	this.isMac = navigator.userAgent.indexOf('Mac') != -1;
+	this.isMSIE5_0 = this.isMSIE && (navigator.userAgent.indexOf('MSIE 5.0') != -1);
+	this.action = "none";
+	this.selectedWindow = null;
+	this.lastSelectedWindow = null;
+	this.zindex = 100;
+	this.mouseDownScreenX = 0;
+	this.mouseDownScreenY = 0;
+	this.mouseDownLayerX = 0;
+	this.mouseDownLayerY = 0;
+	this.mouseDownWidth = 0;
+	this.mouseDownHeight = 0;
+	this.idCounter = 0;
+};
+
+TinyMCE_Windows.prototype.init = function(settings) {
+	this.settings = settings;
+
+	if (this.isMSIE)
+		this.addEvent(document, "mousemove", mcWindows.eventDispatcher);
+	else
+		this.addEvent(window, "mousemove", mcWindows.eventDispatcher);
+
+	this.addEvent(document, "mouseup", mcWindows.eventDispatcher);
+
+	this.doc = document;
+};
+
+TinyMCE_Windows.prototype.getParam = function(name, default_value) {
+	var value = null;
+
+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	return value;
+};
+
+TinyMCE_Windows.prototype.eventDispatcher = function(e) {
+	e = typeof(e) == "undefined" ? window.event : e;
+
+	if (mcWindows.selectedWindow == null)
+		return;
+
+	// Switch focus
+	if (mcWindows.isGecko && e.type == "mousedown") {
+		var elm = e.currentTarget;
+
+		for (var n in mcWindows.windows) {
+			var win = mcWindows.windows[n];
+
+			if (win.headElement == elm || win.resizeElement == elm) {
+				win.focus();
+				break;
+			}
+		}
+	}
+
+	switch (e.type) {
+		case "mousemove":
+			mcWindows.selectedWindow.onMouseMove(e);
+			break;
+
+		case "mouseup":
+			mcWindows.selectedWindow.onMouseUp(e);
+			break;
+
+		case "mousedown":
+			mcWindows.selectedWindow.onMouseDown(e);
+			break;
+
+		case "focus":
+			mcWindows.selectedWindow.onFocus(e);
+			break;
+	}
+};
+
+TinyMCE_Windows.prototype.addEvent = function(obj, name, handler) {
+	if (this.isMSIE)
+		obj.attachEvent("on" + name, handler);
+	else
+		obj.addEventListener(name, handler, true);
+};
+
+TinyMCE_Windows.prototype.cancelEvent = function(e) {
+	if (this.isMSIE) {
+		e.returnValue = false;
+		e.cancelBubble = true;
+	} else
+		e.preventDefault();
+};
+
+TinyMCE_Windows.prototype.parseFeatures = function(opts) {
+	// Cleanup the options
+	opts = opts.toLowerCase();
+	opts = opts.replace(/;/g, ",");
+	opts = opts.replace(/[^0-9a-z=,]/g, "");
+
+	var optionChunks = opts.split(',');
+	var options = new Array();
+
+	options['left'] = "10";
+	options['top'] = "10";
+	options['width'] = "300";
+	options['height'] = "300";
+	options['resizable'] = "yes";
+	options['minimizable'] = "yes";
+	options['maximizable'] = "yes";
+	options['close'] = "yes";
+	options['movable'] = "yes";
+	options['statusbar'] = "yes";
+	options['scrollbars'] = "auto";
+	options['modal'] = "no";
+
+	if (opts == "")
+		return options;
+
+	for (var i=0; i<optionChunks.length; i++) {
+		var parts = optionChunks[i].split('=');
+
+		if (parts.length == 2)
+			options[parts[0]] = parts[1];
+	}
+
+	options['left'] = parseInt(options['left']);
+	options['top'] = parseInt(options['top']);
+	options['width'] = parseInt(options['width']);
+	options['height'] = parseInt(options['height']);
+
+	return options;
+};
+
+TinyMCE_Windows.prototype.open = function(url, name, features) {
+	this.lastSelectedWindow = this.selectedWindow;
+
+	var win = new TinyMCE_Window();
+	var winDiv, html = "", id;
+	var imgPath = this.getParam("images_path");
+
+	features = this.parseFeatures(features);
+
+	// Create div
+	id = "mcWindow_" + name;
+	win.deltaHeight = 18;
+
+	if (features['statusbar'] == "yes") {
+		win.deltaHeight += 13;
+
+		if (this.isMSIE)
+			win.deltaHeight += 1;
+	}
+
+	width = parseInt(features['width']);
+	height = parseInt(features['height'])-win.deltaHeight;
+
+	if (this.isMSIE)
+		width -= 2;
+
+	// Setup first part of window
+	win.id = id;
+	win.url = url;
+	win.name = name;
+	win.features = features;
+	this.windows[name] = win;
+
+	iframeWidth = width;
+	iframeHeight = height;
+
+	// Create inner content
+	html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
+	html += '<html>';
+	html += '<head>';
+	html += '<title>Wrapper iframe</title>';
+	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
+	html += '<link href="' + this.getParam("css_file") + '" rel="stylesheet" type="text/css" />';
+	html += '</head>';
+	html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
+
+	html += '<div id="' + id + '_container" class="mceWindow">';
+	html += '<div id="' + id + '_head" class="mceWindowHead" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
+	html += '  <div id="' + id + '_title" class="mceWindowTitle"';
+	html += '  onselectstart="return false;" unselectable="on" style="-moz-user-select: none !important;"></div>';
+	html += '    <div class="mceWindowHeadTools">';
+	html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].close();" target="_self" onmousedown="return false;" class="mceWindowClose"><img border="0" src="' + imgPath + '/window_close.gif" /></a>';
+//	html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].maximize();" target="_self" onmousedown="return false;" class="mceWindowMaximize"></a>';
+//	html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].minimize();" target="_self" onmousedown="return false;" class="mceWindowMinimize"></a>';
+	html += '    </div>';
+	html += '</div><div id="' + id + '_body" class="mceWindowBody" style="width: ' + width + 'px; height: ' + height + 'px;">';
+	html += '<iframe id="' + id + '_iframe" name="' + id + '_iframe" frameborder="0" width="' + iframeWidth + '" height="' + iframeHeight + '" src="' + url + '" class="mceWindowBodyIframe" scrolling="' + features['scrollbars'] + '"></iframe></div>';
+
+	if (features['statusbar'] == "yes") {
+		html += '<div id="' + id + '_statusbar" class="mceWindowStatusbar" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
+
+		if (features['resizable'] == "yes") {
+			if (this.isGecko)
+				html += '<div id="' + id + '_resize" class="mceWindowResize"><div style="background-image: url(\'' + imgPath + '/window_resize.gif\'); width: 12px; height: 12px;"></div></div>';
+			else
+				html += '<div id="' + id + '_resize" class="mceWindowResize"><img onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();" border="0" src="' + imgPath + '/window_resize.gif" /></div>';
+		}
+
+		html += '</div>';
+	}
+
+	html += '</div>';
+
+	html += '</body>';
+	html += '</html>';
+
+	// Create iframe
+	this.createFloatingIFrame(id, features['left'], features['top'], features['width'], features['height'], html);
+};
+
+// Blocks the document events by placing a image over the whole document
+TinyMCE_Windows.prototype.setDocumentLock = function(state) {
+	if (state) {
+		var elm = document.getElementById('mcWindowEventBlocker');
+		if (elm == null) {
+			elm = document.createElement("div");
+
+			elm.id = "mcWindowEventBlocker";
+			elm.style.position = "absolute";
+			elm.style.left = "0";
+			elm.style.top = "0";
+
+			document.body.appendChild(elm);
+		}
+
+		elm.style.display = "none";
+
+		var imgPath = this.getParam("images_path");
+		var width = document.body.clientWidth;
+		var height = document.body.clientHeight;
+
+		elm.style.width = width;
+		elm.style.height = height;
+		elm.innerHTML = '<img src="' + imgPath + '/spacer.gif" width="' + width + '" height="' + height + '" />';
+
+		elm.style.zIndex = mcWindows.zindex-1;
+		elm.style.display = "block";
+	} else {
+		var elm = document.getElementById('mcWindowEventBlocker');
+
+		if (mcWindows.windows.length == 0)
+			elm.parentNode.removeChild(elm);
+		else
+			elm.style.zIndex = mcWindows.zindex-1;
+	}
+};
+
+// Gets called when wrapper iframe is initialized
+TinyMCE_Windows.prototype.onLoad = function(name) {
+	var win = mcWindows.windows[name];
+	var id = "mcWindow_" + name;
+	var wrapperIframe = window.frames[id + "_iframe"].frames[0];
+	var wrapperDoc = window.frames[id + "_iframe"].document;
+	var doc = window.frames[id + "_iframe"].document;
+	var winDiv = document.getElementById("mcWindow_" + name + "_div");
+	var realIframe = window.frames[id + "_iframe"].frames[0];
+
+	// Set window data
+	win.id = "mcWindow_" + name;
+	win.winElement = winDiv;
+	win.bodyElement = doc.getElementById(id + '_body');
+	win.iframeElement = doc.getElementById(id + '_iframe');
+	win.headElement = doc.getElementById(id + '_head');
+	win.titleElement = doc.getElementById(id + '_title');
+	win.resizeElement = doc.getElementById(id + '_resize');
+	win.containerElement = doc.getElementById(id + '_container');
+	win.left = win.features['left'];
+	win.top = win.features['top'];
+	win.frame = window.frames[id + '_iframe'].frames[0];
+	win.wrapperFrame = window.frames[id + '_iframe'];
+	win.wrapperIFrameElement = document.getElementById(id + "_iframe");
+
+	// Add event handlers
+	mcWindows.addEvent(win.headElement, "mousedown", mcWindows.eventDispatcher);
+
+	if (win.resizeElement != null)
+		mcWindows.addEvent(win.resizeElement, "mousedown", mcWindows.eventDispatcher);
+
+	if (mcWindows.isMSIE) {
+		mcWindows.addEvent(realIframe.document, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(realIframe.document, "mouseup", mcWindows.eventDispatcher);
+	} else {
+		mcWindows.addEvent(realIframe, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(realIframe, "mouseup", mcWindows.eventDispatcher);
+		mcWindows.addEvent(realIframe, "focus", mcWindows.eventDispatcher);
+	}
+
+	for (var i=0; i<window.frames.length; i++) {
+		if (!window.frames[i]._hasMouseHandlers) {
+			if (mcWindows.isMSIE) {
+				mcWindows.addEvent(window.frames[i].document, "mousemove", mcWindows.eventDispatcher);
+				mcWindows.addEvent(window.frames[i].document, "mouseup", mcWindows.eventDispatcher);
+			} else {
+				mcWindows.addEvent(window.frames[i], "mousemove", mcWindows.eventDispatcher);
+				mcWindows.addEvent(window.frames[i], "mouseup", mcWindows.eventDispatcher);
+			}
+
+			window.frames[i]._hasMouseHandlers = true;
+		}
+	}
+
+	if (mcWindows.isMSIE) {
+		mcWindows.addEvent(win.frame.document, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(win.frame.document, "mouseup", mcWindows.eventDispatcher);
+	} else {
+		mcWindows.addEvent(win.frame, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(win.frame, "mouseup", mcWindows.eventDispatcher);
+		mcWindows.addEvent(win.frame, "focus", mcWindows.eventDispatcher);
+	}
+
+	// Dispatch open window event
+	var func = this.getParam("on_open_window", "");
+	if (func != "")
+		eval(func + "(win);");
+
+	win.focus();
+
+	if (win.features['modal'] == "yes")
+		mcWindows.setDocumentLock(true);
+};
+
+TinyMCE_Windows.prototype.createFloatingIFrame = function(id_prefix, left, top, width, height, html) {
+	var iframe = document.createElement("iframe");
+	var div = document.createElement("div");
+
+	width = parseInt(width);
+	height = parseInt(height)+1;
+
+	// Create wrapper div
+	div.setAttribute("id", id_prefix + "_div");
+	div.setAttribute("width", width);
+	div.setAttribute("height", (height));
+	div.style.position = "absolute";
+	div.style.left = left + "px";
+	div.style.top = top + "px";
+	div.style.width = width + "px";
+	div.style.height = (height) + "px";
+	div.style.backgroundColor = "white";
+	div.style.display = "none";
+
+	if (this.isGecko) {
+		iframeWidth = width + 2;
+		iframeHeight = height + 2;
+	} else {
+		iframeWidth = width;
+		iframeHeight = height + 1;
+	}
+
+	// Create iframe
+	iframe.setAttribute("id", id_prefix + "_iframe");
+	iframe.setAttribute("name", id_prefix + "_iframe");
+	iframe.setAttribute("border", "0");
+	iframe.setAttribute("frameBorder", "0");
+	iframe.setAttribute("marginWidth", "0");
+	iframe.setAttribute("marginHeight", "0");
+	iframe.setAttribute("leftMargin", "0");
+	iframe.setAttribute("topMargin", "0");
+	iframe.setAttribute("width", iframeWidth);
+	iframe.setAttribute("height", iframeHeight);
+//	iframe.setAttribute("src", "../jscripts/tiny_mce/blank.htm");
+	// iframe.setAttribute("allowtransparency", "false");
+	iframe.setAttribute("scrolling", "no");
+	iframe.style.width = iframeWidth + "px";
+	iframe.style.height = iframeHeight + "px";
+	iframe.style.backgroundColor = "white";
+	div.appendChild(iframe);
+
+	document.body.appendChild(div);
+
+	// Fixed MSIE 5.0 issue
+	div.innerHTML = div.innerHTML;
+
+	if (this.isSafari) {
+		// Give Safari some time to setup
+		window.setTimeout(function() {
+			doc = window.frames[id_prefix + '_iframe'].document;
+			doc.open();
+			doc.write(html);
+			doc.close();
+		}, 10);
+	} else {
+		doc = window.frames[id_prefix + '_iframe'].window.document;
+		doc.open();
+		doc.write(html);
+		doc.close();
+	}
+
+	div.style.display = "block";
+
+	return div;
+};
+
+// Window instance
+function TinyMCE_Window() {
+};
+
+TinyMCE_Window.prototype.focus = function() {
+	if (this != mcWindows.selectedWindow) {
+		this.winElement.style.zIndex = ++mcWindows.zindex;
+		mcWindows.lastSelectedWindow = mcWindows.selectedWindow;
+		mcWindows.selectedWindow = this;
+	}
+};
+
+TinyMCE_Window.prototype.minimize = function() {
+};
+
+TinyMCE_Window.prototype.maximize = function() {
+	
+};
+
+TinyMCE_Window.prototype.startResize = function() {
+	mcWindows.action = "resize";
+};
+
+TinyMCE_Window.prototype.startMove = function(e) {
+	mcWindows.action = "move";
+};
+
+TinyMCE_Window.prototype.close = function() {
+	if (this.frame && this.frame['tinyMCEPopup'])
+		this.frame['tinyMCEPopup'].restoreSelection();
+
+	if (mcWindows.lastSelectedWindow != null)
+		mcWindows.lastSelectedWindow.focus();
+
+	var mcWindowsNew = new Array();
+	for (var n in mcWindows.windows) {
+		var win = mcWindows.windows[n];
+		if (typeof(win) == 'function')
+			continue;
+
+		if (win.name != this.name)
+			mcWindowsNew[n] = win;
+	}
+
+	mcWindows.windows = mcWindowsNew;
+
+//	alert(mcWindows.doc.getElementById(this.id + "_iframe"));
+
+	var e = mcWindows.doc.getElementById(this.id + "_iframe");
+	e.parentNode.removeChild(e);
+
+	var e = mcWindows.doc.getElementById(this.id + "_div");
+	e.parentNode.removeChild(e);
+
+	mcWindows.setDocumentLock(false);
+};
+
+TinyMCE_Window.prototype.onMouseMove = function(e) {
+	var scrollX = 0;//this.doc.body.scrollLeft;
+	var scrollY = 0;//this.doc.body.scrollTop;
+
+	// Calculate real X, Y
+	var dx = e.screenX - mcWindows.mouseDownScreenX;
+	var dy = e.screenY - mcWindows.mouseDownScreenY;
+
+	switch (mcWindows.action) {
+		case "resize":
+			width = mcWindows.mouseDownWidth + (e.screenX - mcWindows.mouseDownScreenX);
+			height = mcWindows.mouseDownHeight + (e.screenY - mcWindows.mouseDownScreenY);
+
+			width = width < 100 ? 100 : width;
+			height = height < 100 ? 100 : height;
+
+			this.wrapperIFrameElement.style.width = width+2;
+			this.wrapperIFrameElement.style.height = height+2;
+			this.wrapperIFrameElement.width = width+2;
+			this.wrapperIFrameElement.height = height+2;
+			this.winElement.style.width = width;
+			this.winElement.style.height = height;
+
+			height = height - this.deltaHeight;
+
+			this.containerElement.style.width = width;
+
+			this.iframeElement.style.width = width;
+			this.iframeElement.style.height = height;
+			this.bodyElement.style.width = width;
+			this.bodyElement.style.height = height;
+			this.headElement.style.width = width;
+			//this.statusElement.style.width = width;
+
+			mcWindows.cancelEvent(e);
+			break;
+
+		case "move":
+			this.left = mcWindows.mouseDownLayerX + (e.screenX - mcWindows.mouseDownScreenX);
+			this.top = mcWindows.mouseDownLayerY + (e.screenY - mcWindows.mouseDownScreenY);
+			this.winElement.style.left = this.left + "px";
+			this.winElement.style.top = this.top + "px";
+
+			mcWindows.cancelEvent(e);
+			break;
+	}
+};
+
+function debug(msg) {
+	document.getElementById('debug').value += msg + "\n";
+}
+
+TinyMCE_Window.prototype.onMouseUp = function(e) {
+	mcWindows.action = "none";
+};
+
+TinyMCE_Window.prototype.onFocus = function(e) {
+	// Gecko only handler
+	var winRef = e.currentTarget;
+
+	for (var n in mcWindows.windows) {
+		var win = mcWindows.windows[n];
+		if (typeof(win) == 'function')
+			continue;
+
+		if (winRef.name == win.id + "_iframe") {
+			win.focus();
+			return;
+		}
+	}
+};
+
+TinyMCE_Window.prototype.onMouseDown = function(e) {
+	var elm = mcWindows.isMSIE ? this.wrapperFrame.event.srcElement : e.target;
+
+	var scrollX = 0;//this.doc.body.scrollLeft;
+	var scrollY = 0;//this.doc.body.scrollTop;
+
+	mcWindows.mouseDownScreenX = e.screenX;
+	mcWindows.mouseDownScreenY = e.screenY;
+	mcWindows.mouseDownLayerX = this.left;
+	mcWindows.mouseDownLayerY = this.top;
+	mcWindows.mouseDownWidth = parseInt(this.winElement.style.width);
+	mcWindows.mouseDownHeight = parseInt(this.winElement.style.height);
+
+	if (this.resizeElement != null && elm == this.resizeElement.firstChild)
+		this.startResize(e);
+	else
+		this.startMove(e);
+
+	mcWindows.cancelEvent(e);
+};
+
+// Global instance
+var mcWindows = new TinyMCE_Windows();
+
+// Initialize windows
+mcWindows.init({
+	images_path : tinyMCE.baseURL + "/plugins/inlinepopups/images",
+	css_file : tinyMCE.baseURL + "/plugins/inlinepopups/css/inlinepopup.css"
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/spacer.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/spacer.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_close.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_close.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_maximize.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_maximize.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_minimize.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_minimize.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_resize.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_resize.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/mcwindows.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/mcwindows.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/mcwindows.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/mcwindows.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,455 @@
+/**
+ * $RCSfile: mcwindows.js,v $
+ * $Revision: 1.2 $
+ * $Date: 2005/10/18 13:59:43 $
+ *
+ * Moxiecode DHTML Windows script.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004, Moxiecode Systems AB, All rights reserved.
+ */
+
+// Windows handler
+function MCWindows() {
+	this.settings = new Array();
+	this.windows = new Array();
+	this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	this.isGecko = navigator.userAgent.indexOf('Gecko') != -1;
+	this.isSafari = navigator.userAgent.indexOf('Safari') != -1;
+	this.isMac = navigator.userAgent.indexOf('Mac') != -1;
+	this.isMSIE5_0 = this.isMSIE && (navigator.userAgent.indexOf('MSIE 5.0') != -1);
+	this.action = "none";
+	this.selectedWindow = null;
+	this.zindex = 100;
+	this.mouseDownScreenX = 0;
+	this.mouseDownScreenY = 0;
+	this.mouseDownLayerX = 0;
+	this.mouseDownLayerY = 0;
+	this.mouseDownWidth = 0;
+	this.mouseDownHeight = 0;
+};
+
+MCWindows.prototype.init = function(settings) {
+	this.settings = settings;
+
+	if (this.isMSIE)
+		this.addEvent(document, "mousemove", mcWindows.eventDispatcher);
+	else
+		this.addEvent(window, "mousemove", mcWindows.eventDispatcher);
+
+	this.addEvent(document, "mouseup", mcWindows.eventDispatcher);
+};
+
+MCWindows.prototype.getParam = function(name, default_value) {
+	var value = null;
+
+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	return value;
+};
+
+MCWindows.prototype.eventDispatcher = function(e) {
+	e = typeof(e) == "undefined" ? window.event : e;
+
+	if (mcWindows.selectedWindow == null)
+		return;
+
+	// Switch focus
+	if (mcWindows.isGecko && e.type == "mousedown") {
+		var elm = e.currentTarget;
+
+		for (var n in mcWindows.windows) {
+			var win = mcWindows.windows[n];
+			if (typeof(win) == 'function')
+				continue;
+
+			if (win.headElement == elm || win.resizeElement == elm) {
+				win.focus();
+				break;
+			}
+		}
+	}
+
+	switch (e.type) {
+		case "mousemove":
+			mcWindows.selectedWindow.onMouseMove(e);
+			break;
+
+		case "mouseup":
+			mcWindows.selectedWindow.onMouseUp(e);
+			break;
+
+		case "mousedown":
+			mcWindows.selectedWindow.onMouseDown(e);
+			break;
+
+		case "focus":
+			mcWindows.selectedWindow.onFocus(e);
+			break;
+	}
+}
+
+MCWindows.prototype.addEvent = function(obj, name, handler) {
+	if (this.isMSIE)
+		obj.attachEvent("on" + name, handler);
+	else
+		obj.addEventListener(name, handler, true);
+};
+
+MCWindows.prototype.cancelEvent = function(e) {
+	if (this.isMSIE) {
+		e.returnValue = false;
+		e.cancelBubble = true;
+	} else
+		e.preventDefault();
+};
+
+MCWindows.prototype.parseFeatures = function(opts) {
+	// Cleanup the options
+	opts = opts.toLowerCase();
+	opts = opts.replace(/;/g, ",");
+	opts = opts.replace(/[^0-9a-z=,]/g, "");
+
+	var optionChunks = opts.split(',');
+	var options = new Array();
+
+	options['left'] = 10;
+	options['top'] = 10;
+	options['width'] = 300;
+	options['height'] = 300;
+	options['resizable'] = true;
+	options['minimizable'] = true;
+	options['maximizable'] = true;
+	options['close'] = true;
+	options['movable'] = true;
+
+	if (opts == "")
+		return options;
+
+	for (var i=0; i<optionChunks.length; i++) {
+		var parts = optionChunks[i].split('=');
+
+		if (parts.length == 2)
+			options[parts[0]] = parts[1];
+	}
+
+	return options;
+};
+
+MCWindows.prototype.open = function(url, name, features) {
+	var win = new MCWindow();
+	var winDiv, html = "", id;
+
+	features = this.parseFeatures(features);
+
+	// Create div
+	id = "mcWindow_" + name;
+
+	width = parseInt(features['width']);
+	height = parseInt(features['height'])-12-19;
+
+	if (this.isMSIE)
+		width -= 2;
+
+	// Setup first part of window
+	win.id = id;
+	win.url = url;
+	win.name = name;
+	win.features = features;
+	this.windows[name] = win;
+
+	iframeWidth = width;
+	iframeHeight = height;
+
+	// Create inner content
+	html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
+	html += '<html>';
+	html += '<head>';
+	html += '<title>Wrapper iframe</title>';
+	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
+	html += '<link href="../jscripts/tiny_mce/themes/advanced/css/editor_ui.css" rel="stylesheet" type="text/css" />';
+	html += '</head>';
+	html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
+
+	html += '<div id="' + id + '_container" class="mceWindow">';
+	html += '<div id="' + id + '_head" class="mceWindowHead" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
+	html += '  <div id="' + id + '_title" class="mceWindowTitle"';
+	html += '  onselectstart="return false;" unselectable="on" style="-moz-user-select: none !important;">No name window</div>';
+	html += '    <div class="mceWindowHeadTools">';
+	html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].close();" onmousedown="return false;" class="mceWindowClose"><img border="0" src="../jscripts/tiny_mce/themes/advanced/images/window_close.gif" /></a>';
+//	html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].maximize();" onmousedown="return false;" class="mceWindowMaximize"></a>';
+//	html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].minimize();" onmousedown="return false;" class="mceWindowMinimize"></a>';
+	html += '    </div>';
+	html += '</div><div id="' + id + '_body" class="mceWindowBody" style="width: ' + width + 'px; height: ' + height + 'px;">';
+	html += '<iframe id="' + id + '_iframe" name="' + id + '_iframe" onfocus="parent.mcWindows.windows[\'' + name + '\'].focus();" frameborder="0" width="' + iframeWidth + '" height="' + iframeHeight + '" src="' + url + '" class="mceWindowBodyIframe"></iframe></div>';
+	html += '<div id="' + id + '_statusbar" class="mceWindowStatusbar" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
+	html += '<div id="' + id + '_resize" class="mceWindowResize"><img onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();" border="0" src="../jscripts/tiny_mce/themes/advanced/images/window_resize.gif" /></div>';
+	html += '</div>';
+	html += '</div>';
+
+	html += '</body>';
+	html += '</html>';
+
+	// Create iframe
+	this.createFloatingIFrame(id, features['left'], features['top'], features['width'], features['height'], html);
+};
+
+// Gets called when wrapper iframe is initialized
+MCWindows.prototype.onLoad = function(name) {
+	var win = mcWindows.windows[name];
+	var id = "mcWindow_" + name;
+	var wrapperIframe = window.frames[id + "_iframe"].frames[0];
+	var wrapperDoc = window.frames[id + "_iframe"].document;
+	var doc = window.frames[id + "_iframe"].document;
+	var winDiv = document.getElementById("mcWindow_" + name + "_div");
+	var realIframe = window.frames[id + "_iframe"].frames[0];
+
+	// Set window data
+	win.id = "mcWindow_" + name + "_iframe";
+	win.winElement = winDiv;
+	win.bodyElement = doc.getElementById(id + '_body');
+	win.iframeElement = doc.getElementById(id + '_iframe');
+	win.headElement = doc.getElementById(id + '_head');
+	win.titleElement = doc.getElementById(id + '_title');
+	win.resizeElement = doc.getElementById(id + '_resize');
+	win.containerElement = doc.getElementById(id + '_container');
+	win.left = win.features['left'];
+	win.top = win.features['top'];
+	win.frame = window.frames[id + '_iframe'].frames[0];
+	win.wrapperFrame = window.frames[id + '_iframe'];
+	win.wrapperIFrameElement = document.getElementById(id + "_iframe");
+
+	// Add event handlers
+	mcWindows.addEvent(win.headElement, "mousedown", mcWindows.eventDispatcher);
+	mcWindows.addEvent(win.resizeElement, "mousedown", mcWindows.eventDispatcher);
+
+	if (mcWindows.isMSIE) {
+		mcWindows.addEvent(realIframe.document, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(realIframe.document, "mouseup", mcWindows.eventDispatcher);
+	} else {
+		mcWindows.addEvent(realIframe, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(realIframe, "mouseup", mcWindows.eventDispatcher);
+		mcWindows.addEvent(realIframe, "focus", mcWindows.eventDispatcher);
+	}
+
+	for (var i=0; i<window.frames.length; i++) {
+		if (!window.frames[i]._hasMouseHandlers) {
+			if (mcWindows.isMSIE) {
+				mcWindows.addEvent(window.frames[i].document, "mousemove", mcWindows.eventDispatcher);
+				mcWindows.addEvent(window.frames[i].document, "mouseup", mcWindows.eventDispatcher);
+			} else {
+				mcWindows.addEvent(window.frames[i], "mousemove", mcWindows.eventDispatcher);
+				mcWindows.addEvent(window.frames[i], "mouseup", mcWindows.eventDispatcher);
+			}
+
+			window.frames[i]._hasMouseHandlers = true;
+		}
+	}
+
+	if (mcWindows.isMSIE) {
+		mcWindows.addEvent(win.frame.document, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(win.frame.document, "mouseup", mcWindows.eventDispatcher);
+	} else {
+		mcWindows.addEvent(win.frame, "mousemove", mcWindows.eventDispatcher);
+		mcWindows.addEvent(win.frame, "mouseup", mcWindows.eventDispatcher);
+		mcWindows.addEvent(win.frame, "focus", mcWindows.eventDispatcher);
+	}
+
+	this.selectedWindow = win;
+};
+
+MCWindows.prototype.createFloatingIFrame = function(id_prefix, left, top, width, height, html) {
+	var iframe = document.createElement("iframe");
+	var div = document.createElement("div");
+
+	width = parseInt(width);
+	height = parseInt(height)+1;
+
+	// Create wrapper div
+	div.setAttribute("id", id_prefix + "_div");
+	div.setAttribute("width", width);
+	div.setAttribute("height", (height));
+	div.style.position = "absolute";
+	div.style.left = left + "px";
+	div.style.top = top + "px";
+	div.style.width = width + "px";
+	div.style.height = (height) + "px";
+	div.style.backgroundColor = "white";
+	div.style.display = "none";
+
+	if (this.isGecko) {
+		iframeWidth = width + 2;
+		iframeHeight = height + 2;
+	} else {
+		iframeWidth = width;
+		iframeHeight = height + 1;
+	}
+
+	// Create iframe
+	iframe.setAttribute("id", id_prefix + "_iframe");
+	iframe.setAttribute("name", id_prefix + "_iframe");
+	iframe.setAttribute("border", "0");
+	iframe.setAttribute("frameBorder", "0");
+	iframe.setAttribute("marginWidth", "0");
+	iframe.setAttribute("marginHeight", "0");
+	iframe.setAttribute("leftMargin", "0");
+	iframe.setAttribute("topMargin", "0");
+	iframe.setAttribute("width", iframeWidth);
+	iframe.setAttribute("height", iframeHeight);
+//	iframe.setAttribute("src", "../jscripts/tiny_mce/blank.htm");
+	// iframe.setAttribute("allowtransparency", "false");
+	iframe.setAttribute("scrolling", "no");
+	iframe.style.width = iframeWidth + "px";
+	iframe.style.height = iframeHeight + "px";
+	iframe.style.backgroundColor = "white";
+	div.appendChild(iframe);
+
+	document.body.appendChild(div);
+
+	// Fixed MSIE 5.0 issue
+	div.innerHTML = div.innerHTML;
+
+	if (this.isSafari) {
+		// Give Safari some time to setup
+		window.setTimeout(function() {
+			doc = window.frames[id_prefix + '_iframe'].document;
+			doc.open();
+			doc.write(html);
+			doc.close();
+		}, 10);
+	} else {
+		doc = window.frames[id_prefix + '_iframe'].window.document
+		doc.open();
+		doc.write(html);
+		doc.close();
+	}
+
+	div.style.display = "block";
+
+	return div;
+};
+
+// Window instance
+function MCWindow() {
+};
+
+MCWindow.prototype.focus = function() {
+	this.winElement.style.zIndex = mcWindows.zindex++;
+	mcWindows.selectedWindow = this;
+};
+
+MCWindow.prototype.minimize = function() {
+};
+
+MCWindow.prototype.maximize = function() {
+	
+};
+
+MCWindow.prototype.startResize = function() {
+	mcWindows.action = "resize";
+};
+
+MCWindow.prototype.startMove = function(e) {
+	mcWindows.action = "move";
+};
+
+MCWindow.prototype.close = function() {
+	document.body.removeChild(this.winElement);
+	mcWindows.windows[this.name] = null;
+};
+
+MCWindow.prototype.onMouseMove = function(e) {
+	var scrollX = 0;//this.doc.body.scrollLeft;
+	var scrollY = 0;//this.doc.body.scrollTop;
+
+	// Calculate real X, Y
+	var dx = e.screenX - mcWindows.mouseDownScreenX;
+	var dy = e.screenY - mcWindows.mouseDownScreenY;
+
+	switch (mcWindows.action) {
+		case "resize":
+			width = mcWindows.mouseDownWidth + (e.screenX - mcWindows.mouseDownScreenX);
+			height = mcWindows.mouseDownHeight + (e.screenY - mcWindows.mouseDownScreenY);
+
+			width = width < 100 ? 100 : width;
+			height = height < 100 ? 100 : height;
+
+			this.wrapperIFrameElement.style.width = width+2;
+			this.wrapperIFrameElement.style.height = height+2;
+			this.wrapperIFrameElement.width = width+2;
+			this.wrapperIFrameElement.height = height+2;
+			this.winElement.style.width = width;
+			this.winElement.style.height = height;
+
+			height = height-12-19;
+
+			this.containerElement.style.width = width;
+
+			this.iframeElement.style.width = width;
+			this.iframeElement.style.height = height;
+			this.bodyElement.style.width = width;
+			this.bodyElement.style.height = height;
+			this.headElement.style.width = width;
+			//this.statusElement.style.width = width;
+
+			mcWindows.cancelEvent(e);
+			break;
+
+		case "move":
+			this.left = mcWindows.mouseDownLayerX + (e.screenX - mcWindows.mouseDownScreenX);
+			this.top = mcWindows.mouseDownLayerY + (e.screenY - mcWindows.mouseDownScreenY);
+			this.winElement.style.left = this.left + "px";
+			this.winElement.style.top = this.top + "px";
+
+			mcWindows.cancelEvent(e);
+			break;
+	}
+};
+
+MCWindow.prototype.onMouseUp = function(e) {
+	mcWindows.action = "none";
+};
+
+MCWindow.prototype.onFocus = function(e) {
+	// Gecko only handler
+	var winRef = e.currentTarget;
+
+	for (var n in mcWindows.windows) {
+		var win = mcWindows.windows[n];
+		if (typeof(win) == 'function')
+			continue;
+
+		if (winRef.name == win.id) {
+			win.focus();
+			return;
+		}
+	}
+};
+
+MCWindow.prototype.onMouseDown = function(e) {
+	var elm = mcWindows.isMSIE ? this.wrapperFrame.event.srcElement : e.target;
+
+	var scrollX = 0;//this.doc.body.scrollLeft;
+	var scrollY = 0;//this.doc.body.scrollTop;
+
+	mcWindows.mouseDownScreenX = e.screenX;
+	mcWindows.mouseDownScreenY = e.screenY;
+	mcWindows.mouseDownLayerX = this.left;
+	mcWindows.mouseDownLayerY = this.top;
+	mcWindows.mouseDownWidth = parseInt(this.winElement.style.width);
+	mcWindows.mouseDownHeight = parseInt(this.winElement.style.height);
+
+	if (elm == this.resizeElement.firstChild)
+		this.startResize(e);
+	else
+		this.startMove(e);
+
+	mcWindows.cancelEvent(e);
+};
+
+// Global instance
+var mcWindows = new MCWindows();
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('insertdatetime','en,tr,cs,el,fr_ca,it,ko,sv,zh_cn,fa,fr,de,pl,pt_br,nl,da,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl');var TinyMCE_InsertDateTimePlugin={getInfo:function(){return{longname:'Insert date/time',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_insertdatetime.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"insertdate":return tinyMCE.getButtonHTML(cn,'lang_insertdate_desc','{$pluginurl}/images/insertdate.gif','mceInsertDate');case"inserttime":return tinyMCE.getButtonHTML(cn,'lang_inserttime_desc','{$pluginurl}/images/inserttime.gif','mceInsertTime');}return"";},execCommand:function(editor_id,element,command,user_interface,value){function addZeros(value,len){value=""+value;if(value.length<len){for(var i=0;i<(len-value.length);i++)value="0"+value;}return value;}function getDateTime(date,format){format=tinyMCE.regexpReplace(format,"%D","%m/%d/%y");format=tinyMCE.regexpReplace(format,"%r","%I:%M:%S %p");format=tinyMCE.regexpReplace(format,"%Y",""+date.getFullYear());format=tinyMCE.regexpReplace(format,"%y",""+date.getYear());format=tinyMCE.regexpReplace(format,"%m",addZeros(date.getMonth()+1,2));format=tinyMCE.regexpReplace(format,"%d",addZeros(date.getDate(),2));format=tinyMCE.regexpReplace(format,"%H",""+addZeros(date.getHours(),2));format=tinyMCE.regexpReplace(format,"%M",""+addZeros(date.getMinutes(),2));format=tinyMCE.regexpReplace(format,"%S",""+addZeros(date.getSeconds(),2));format=tinyMCE.regexpReplace(format,"%I",""+((date.getHours()+11)%12+1));format=tinyMCE.regexpReplace(format,"%p",""+(date.getHours()<12?"AM":"PM"));format=tinyMCE.regexpReplace(format,"%B",""+tinyMCE.getLang("lang_inserttime_months_long")[date.getMonth()]);format=tinyMCE.regexpReplace(format,"%b",""+tinyMCE.getLang("lang_inserttime_months_short")[date.getMonth()]);format=tinyMCE.regexpReplace(format,"%A",""+tinyMCE.getLang("lang_inserttime_day_long")[date.getDay()]);format=tinyMCE.regexpReplace(format,"%a",""+tinyMCE.getLang("lang_inserttime_day_short")[date.getDay()]);format=tinyMCE.regexpReplace(format,"%%","%");return format;}switch(command){case"mceInsertDate":tinyMCE.execInstanceCommand(editor_id,'mceInsertContent',false,getDateTime(new Date(),tinyMCE.getParam("plugin_insertdate_dateFormat",tinyMCE.getLang('lang_insertdate_def_fmt'))));return true;case"mceInsertTime":tinyMCE.execInstanceCommand(editor_id,'mceInsertContent',false,getDateTime(new Date(),tinyMCE.getParam("plugin_insertdate_timeFormat",tinyMCE.getLang('lang_inserttime_def_fmt'))));return true;}return false;}};tinyMCE.addPlugin("insertdatetime",TinyMCE_InsertDateTimePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,93 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.22 $
+ * $Date: 2006/02/10 16:29:39 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('insertdatetime', 'en,tr,cs,el,fr_ca,it,ko,sv,zh_cn,fa,fr,de,pl,pt_br,nl,da,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl');
+
+var TinyMCE_InsertDateTimePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Insert date/time',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_insertdatetime.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	/**
+	 * Returns the HTML contents of the insertdate, inserttime controls.
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "insertdate":
+				return tinyMCE.getButtonHTML(cn, 'lang_insertdate_desc', '{$pluginurl}/images/insertdate.gif', 'mceInsertDate');
+
+			case "inserttime":
+				return tinyMCE.getButtonHTML(cn, 'lang_inserttime_desc', '{$pluginurl}/images/inserttime.gif', 'mceInsertTime');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the mceInsertDate command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		/* Adds zeros infront of value */
+		function addZeros(value, len) {
+			value = "" + value;
+
+			if (value.length < len) {
+				for (var i=0; i<(len-value.length); i++)
+					value = "0" + value;
+			}
+
+			return value;
+		}
+
+		/* Returns the date object in the specified format */
+		function getDateTime(date, format) {
+			format = tinyMCE.regexpReplace(format, "%D", "%m/%d/%y");
+			format = tinyMCE.regexpReplace(format, "%r", "%I:%M:%S %p");
+			format = tinyMCE.regexpReplace(format, "%Y", "" + date.getFullYear());
+			format = tinyMCE.regexpReplace(format, "%y", "" + date.getYear());
+			format = tinyMCE.regexpReplace(format, "%m", addZeros(date.getMonth()+1, 2));
+			format = tinyMCE.regexpReplace(format, "%d", addZeros(date.getDate(), 2));
+			format = tinyMCE.regexpReplace(format, "%H", "" + addZeros(date.getHours(), 2));
+			format = tinyMCE.regexpReplace(format, "%M", "" + addZeros(date.getMinutes(), 2));
+			format = tinyMCE.regexpReplace(format, "%S", "" + addZeros(date.getSeconds(), 2));
+			format = tinyMCE.regexpReplace(format, "%I", "" + ((date.getHours() + 11) % 12 + 1));
+			format = tinyMCE.regexpReplace(format, "%p", "" + (date.getHours() < 12 ? "AM" : "PM"));
+			format = tinyMCE.regexpReplace(format, "%B", "" + tinyMCE.getLang("lang_inserttime_months_long")[date.getMonth()]);
+			format = tinyMCE.regexpReplace(format, "%b", "" + tinyMCE.getLang("lang_inserttime_months_short")[date.getMonth()]);
+			format = tinyMCE.regexpReplace(format, "%A", "" + tinyMCE.getLang("lang_inserttime_day_long")[date.getDay()]);
+			format = tinyMCE.regexpReplace(format, "%a", "" + tinyMCE.getLang("lang_inserttime_day_short")[date.getDay()]);
+			format = tinyMCE.regexpReplace(format, "%%", "%");
+
+			return format;
+		}
+
+		// Handle commands
+		switch (command) {
+			case "mceInsertDate":
+				tinyMCE.execInstanceCommand(editor_id, 'mceInsertContent', false, getDateTime(new Date(), tinyMCE.getParam("plugin_insertdate_dateFormat", tinyMCE.getLang('lang_insertdate_def_fmt'))));
+				return true;
+
+			case "mceInsertTime":
+				tinyMCE.execInstanceCommand(editor_id, 'mceInsertContent', false, getDateTime(new Date(), tinyMCE.getParam("plugin_insertdate_timeFormat", tinyMCE.getLang('lang_inserttime_def_fmt'))));
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("insertdatetime", TinyMCE_InsertDateTimePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/insertdate.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/insertdate.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/inserttime.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/inserttime.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,12 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+insertdate_def_fmt : '%Y-%m-%d',
+inserttime_def_fmt : '%H:%M:%S',
+insertdate_desc : 'Insert date',
+inserttime_desc : 'Insert time',
+inserttime_months_long : new Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"),
+inserttime_months_short : new Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"),
+inserttime_day_long : new Array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"),
+inserttime_day_short : new Array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('layer','en');var TinyMCE_LayerPlugin={getInfo:function(){return{longname:'Layer',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_layer.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE&&!tinyMCE.isOpera)inst.getDoc().execCommand('2D-Position');},handleEvent:function(e){var inst=tinyMCE.selectedInstance,self=TinyMCE_LayerPlugin;var w=inst.getWin(),le=inst._lastStyleElm,e;if(tinyMCE.isGecko){e=self._getParentLayer(inst.getFocusElement());if(e){if(!inst._lastStyleElm){e.style.overflow='auto';inst._lastStyleElm=e;}}else if(le){le=inst._lastStyleElm;le.style.width=le.scrollWidth+'px';le.style.height=le.scrollHeight+'px';le.style.overflow='';inst._lastStyleElm=null;}}return true;},handleVisualAid:function(el,deep,state,inst){var nl=inst.getDoc().getElementsByTagName("div"),i;for(i=0;i<nl.length;i++){if(new RegExp('absolute|relative|static','gi').test(nl[i].style.position)){if(state)tinyMCE.addCSSClass(nl[i],'mceVisualAid');else tinyMCE.removeCSSClass(nl[i],'mceVisualAid');}}},getControlHTML:function(cn){switch(cn){case"moveforward":return tinyMCE.getButtonHTML(cn,'lang_layer_forward_desc','{$pluginurl}/images/forward.gif','mceMoveForward',true);case"movebackward":return tinyMCE.getButtonHTML(cn,'lang_layer_backward_desc','{$pluginurl}/images/backward.gif','mceMoveBackward',true);case"absolute":return tinyMCE.getButtonHTML(cn,'lang_layer_absolute_desc','{$pluginurl}/images/absolute.gif','mceMakeAbsolute',true);case"insertlayer":return tinyMCE.getButtonHTML(cn,'lang_layer_insertlayer_desc','{$pluginurl}/images/insert_layer.gif','mceInsertLayer',true);}return"";},execCommand:function(editor_id,element,command,user_interface,value){var self=TinyMCE_LayerPlugin;switch(command){case"mceInsertLayer":self._insertLayer();return true;case"mceMoveForward":self._move(1);return true;case"mceMoveBackward":self._move(-1);return true;case"mceMakeAbsolute":self._toggleAbsolute();return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){var inst=tinyMCE.getInstanceById(editor_id),self=TinyMCE_LayerPlugin;var le=self._getParentLayer(inst.getFocusElement());var p=tinyMCE.getParentElement(inst.getFocusElement(),'div,p,img');tinyMCE.switchClass(editor_id+'_absolute','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_moveforward','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_movebackward','mceButtonDisabled');if(p)tinyMCE.switchClass(editor_id+'_absolute','mceButtonNormal');if(le&&le.style.position.toLowerCase()=="absolute"){tinyMCE.switchClass(editor_id+'_absolute','mceButtonSelected');tinyMCE.switchClass(editor_id+'_moveforward','mceButtonNormal');tinyMCE.switchClass(editor_id+'_movebackward','mceButtonNormal');}},_move:function(d){var inst=tinyMCE.selectedInstance,self=TinyMCE_LayerPlugin,i,z=new Array();var le=self._getParentLayer(inst.getFocusElement()),ci=-1,fi=-1;var nl=tinyMCE.selectNodes(inst.getBody(),function(n){return n.nodeType==1&&new RegExp('absolute|relative|static','gi').test(n.style.position);});for(i=0;i<nl.length;i++){z[i]=nl[i].style.zIndex?parseInt(nl[i].style.zIndex):0;if(ci<0&&nl[i]==le)ci=i;}if(d<0){for(i=0;i<z.length;i++){if(z[i]<z[ci]){fi=i;break;}}if(fi>-1){nl[ci].style.zIndex=z[fi];nl[fi].style.zIndex=z[ci];}else{if(z[ci]>0)nl[ci].style.zIndex=z[ci]-1;}}else{for(i=0;i<z.length;i++){if(z[i]>z[ci]){fi=i;break;}}if(fi>-1){nl[ci].style.zIndex=z[fi];nl[fi].style.zIndex=z[ci];}else nl[ci].style.zIndex=z[ci]+1;}inst.repaint();},_getParentLayer:function(n){return tinyMCE.getParentNode(n,function(n){return n.nodeType==1&&new RegExp('absolute|relative|static','gi').test(n.style.position);});},_insertLayer:function(){var inst=tinyMCE.selectedInstance;var e=tinyMCE.getParentElement(inst.getFocusElement());var p=tinyMCE.getAbsPosition(e);var d=inst.getDoc();var ne=d.createElement('div');var h=inst.selection.getSelectedHTML();ne.style.position='absolute';ne.style.left=p.absLeft+'px';ne.style.top=(p.absTop>20?p.absTop:20)+'px';ne.style.width='100px';ne.style.height='100px';ne.className='mceVisualAid';if(!h)h=tinyMCE.getLang('lang_layer_content');ne.innerHTML=h;d.body.appendChild(ne);},_toggleAbsolute:function(){var inst=tinyMCE.selectedInstance,self=TinyMCE_LayerPlugin;var le=self._getParentLayer(inst.getFocusElement());if(le==null)le=tinyMCE.getParentElement(inst.getFocusElement(),'div,p,img');if(le){if(le.style.position.toLowerCase()=="absolute"){le.style.position="";le.style.left="";le.style.top="";}else{le.style.position="absolute";if(le.style.left=="")le.style.left=20+'px';if(le.style.top=="")le.style.top=20+'px';if(le.style.width=="")le.style.width=le.width?(le.width+'px'):'100px';if(le.style.height=="")le.style.height=le.height?(le.height+'px'):'100px';tinyMCE.handleVisualAid(inst.getBody(),true,inst.visualAid,inst);}inst.repaint();tinyMCE.triggerNodeChange();}}};tinyMCE.addPlugin("layer",TinyMCE_LayerPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,252 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.2 $
+ * $Date: 2006/05/03 14:12:12 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('layer', 'en');
+
+var TinyMCE_LayerPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Layer',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_layer.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			inst.getDoc().execCommand('2D-Position');
+	},
+
+	handleEvent : function(e) {
+		var inst = tinyMCE.selectedInstance, self = TinyMCE_LayerPlugin;
+		var w = inst.getWin(), le = inst._lastStyleElm, e;
+
+		if (tinyMCE.isGecko) {
+			e = self._getParentLayer(inst.getFocusElement());
+
+			if (e) {
+				if (!inst._lastStyleElm) {
+					e.style.overflow = 'auto';
+					inst._lastStyleElm = e;
+				}
+			} else if (le) {
+				le = inst._lastStyleElm;
+				le.style.width = le.scrollWidth + 'px';
+				le.style.height = le.scrollHeight + 'px';
+				le.style.overflow = '';
+				inst._lastStyleElm = null;
+			}
+		}
+
+		return true;
+	},
+
+	handleVisualAid : function(el, deep, state, inst) {
+		var nl = inst.getDoc().getElementsByTagName("div"), i;
+
+		for (i=0; i<nl.length; i++) {
+			if (new RegExp('absolute|relative|static', 'gi').test(nl[i].style.position)) {
+				if (state)
+					tinyMCE.addCSSClass(nl[i], 'mceVisualAid');
+				else
+					tinyMCE.removeCSSClass(nl[i], 'mceVisualAid');					
+			}
+		}
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "moveforward":
+				return tinyMCE.getButtonHTML(cn, 'lang_layer_forward_desc', '{$pluginurl}/images/forward.gif', 'mceMoveForward', true);
+
+			case "movebackward":
+				return tinyMCE.getButtonHTML(cn, 'lang_layer_backward_desc', '{$pluginurl}/images/backward.gif', 'mceMoveBackward', true);
+
+			case "absolute":
+				return tinyMCE.getButtonHTML(cn, 'lang_layer_absolute_desc', '{$pluginurl}/images/absolute.gif', 'mceMakeAbsolute', true);
+
+			case "insertlayer":
+				return tinyMCE.getButtonHTML(cn, 'lang_layer_insertlayer_desc', '{$pluginurl}/images/insert_layer.gif', 'mceInsertLayer', true);
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		var self = TinyMCE_LayerPlugin;
+
+		// Handle commands
+		switch (command) {
+			case "mceInsertLayer":
+				self._insertLayer();
+				return true;
+
+			case "mceMoveForward":
+				self._move(1);
+				return true;
+
+			case "mceMoveBackward":
+				self._move(-1);
+				return true;
+
+			case "mceMakeAbsolute":
+				self._toggleAbsolute();
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		var inst = tinyMCE.getInstanceById(editor_id), self = TinyMCE_LayerPlugin;
+		var le = self._getParentLayer(inst.getFocusElement());
+		var p = tinyMCE.getParentElement(inst.getFocusElement(), 'div,p,img');
+
+		tinyMCE.switchClass(editor_id + '_absolute', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_moveforward', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_movebackward', 'mceButtonDisabled');
+
+		if (p)
+			tinyMCE.switchClass(editor_id + '_absolute', 'mceButtonNormal');
+
+		if (le && le.style.position.toLowerCase() == "absolute") {
+			tinyMCE.switchClass(editor_id + '_absolute', 'mceButtonSelected');
+			tinyMCE.switchClass(editor_id + '_moveforward', 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_movebackward', 'mceButtonNormal');
+		}
+	},
+
+	// Private plugin specific methods
+
+	_move : function(d) {
+		var inst = tinyMCE.selectedInstance, self = TinyMCE_LayerPlugin, i, z = new Array();
+		var le = self._getParentLayer(inst.getFocusElement()), ci = -1, fi = -1;
+		var nl = tinyMCE.selectNodes(inst.getBody(), function(n) {
+			return n.nodeType == 1 && new RegExp('absolute|relative|static', 'gi').test(n.style.position);
+		});
+
+		// Find z-indexes
+		for (i=0; i<nl.length; i++) {
+			z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
+
+			if (ci < 0 && nl[i] == le)
+				ci = i;
+		}
+
+		if (d < 0) {
+			// Move back
+
+			// Try find a lower one
+			for (i=0; i<z.length; i++) {
+				if (z[i] < z[ci]) {
+					fi = i;
+					break;
+				}
+			}
+
+			if (fi > -1) {
+				nl[ci].style.zIndex = z[fi];
+				nl[fi].style.zIndex = z[ci];
+			} else {
+				if (z[ci] > 0)
+					nl[ci].style.zIndex = z[ci] - 1;
+			}
+		} else {
+			// Move forward
+
+			// Try find a higher one
+			for (i=0; i<z.length; i++) {
+				if (z[i] > z[ci]) {
+					fi = i;
+					break;
+				}
+			}
+
+			if (fi > -1) {
+				nl[ci].style.zIndex = z[fi];
+				nl[fi].style.zIndex = z[ci];
+			} else
+				nl[ci].style.zIndex = z[ci] + 1;
+		}
+
+		inst.repaint();
+	},
+
+	_getParentLayer : function(n) {
+		return tinyMCE.getParentNode(n, function(n) {
+			return n.nodeType == 1 && new RegExp('absolute|relative|static', 'gi').test(n.style.position);
+		});
+	},
+
+	_insertLayer : function() {
+		var inst = tinyMCE.selectedInstance;
+		var e = tinyMCE.getParentElement(inst.getFocusElement());
+		var p = tinyMCE.getAbsPosition(e);
+		var d = inst.getDoc();
+		var ne = d.createElement('div');
+		var h = inst.selection.getSelectedHTML();
+
+		// Move div
+		ne.style.position = 'absolute';
+		ne.style.left = p.absLeft + 'px';
+		ne.style.top = (p.absTop > 20 ? p.absTop : 20) + 'px';
+		ne.style.width = '100px';
+		ne.style.height = '100px';
+		ne.className = 'mceVisualAid';
+
+		if (!h)
+			h = tinyMCE.getLang('lang_layer_content');
+
+		ne.innerHTML = h;
+
+		// Add it
+		d.body.appendChild(ne);
+	},
+
+	_toggleAbsolute : function() {
+		var inst = tinyMCE.selectedInstance, self = TinyMCE_LayerPlugin;
+		var le = self._getParentLayer(inst.getFocusElement());
+
+		if (le == null)
+			le = tinyMCE.getParentElement(inst.getFocusElement(), 'div,p,img');
+
+		if (le) {
+			if (le.style.position.toLowerCase() == "absolute") {
+				le.style.position = "";
+				le.style.left = "";
+				le.style.top = "";
+			} else {
+				le.style.position = "absolute";
+
+				if (le.style.left == "")
+					le.style.left = 20 + 'px';
+
+				if (le.style.top == "")
+					le.style.top = 20 + 'px';
+
+				if (le.style.width == "")
+					le.style.width = le.width ? (le.width + 'px') : '100px';
+
+				if (le.style.height == "")
+					le.style.height = le.height ? (le.height + 'px') : '100px';
+
+				tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+			}
+
+			inst.repaint();
+			tinyMCE.triggerNodeChange();
+		}
+	}
+};
+
+tinyMCE.addPlugin("layer", TinyMCE_LayerPlugin);
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/absolute.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/absolute.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/backward.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/backward.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/forward.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/forward.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/insert_layer.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/images/insert_layer.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/en.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,9 @@
+// UK lang variables
+
+tinyMCE.addToLang('layer',{
+insertlayer_desc : 'Insert new layer',
+forward_desc : 'Move forward',
+backward_desc : 'Move backward',
+absolute_desc : 'Toggle absolute positioning',
+content : 'New layer...'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/layer/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,28 @@
+/* Import theme specific language pack */
+tinyMCE.importPluginLanguagePack('mambo', tinyMCE.settings['lang_list']);
+
+function TinyMCE_mambo_getControlHTML(control_name) {
+    switch (control_name) {
+        case "mosimage":
+            return '<img id="{$editor_id}_mosimage" src="{$pluginurl}/images/mosimage.gif" title="{$lang_insert_mosimage_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execCommand(\'mceInsertContent\',false,\'{mosimage}\')" />';
+        case "mospagebreak":
+            return '<img id="{$editor_id}_mospagebreak" src="{$pluginurl}/images/mospagebreak.gif" title="{$lang_insert_mospagebreak_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceMosPageBreak\');" />';
+    }
+    return "";
+}
+
+function TinyMCE_mambo_execCommand(editor_id, element, command, user_interface, value) {
+    // Handle commands
+    switch (command) {
+        case "mceMosPageBreak":
+            var template = new Array();
+            template['file']   = '../../plugins/mambo/mospagebreak.htm'; // Relative to theme
+            template['width']  = 300;
+            template['height'] = 260;
+            var title = "", atext = "", ctext = "", btext = "";
+            tinyMCE.openWindow(template, {editor_id : editor_id, title : title, atext : atext, ctext : ctext, btext : btext, mceDo : 'insert'});
+       return true;
+   }
+   // Pass to next handler in chain
+   return false;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/mosimage.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/mosimage.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/mospagebreak.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/images/mospagebreak.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/de.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/de.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/de.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/de.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,10 @@
+// DE lang variables
+// Edited 2005 by Nico Kruber
+
+tinyMCELang['lang_insert_mosimage_desc']        = 'MosImage einfgen';
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'MosPageBreak einfgen';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'Einstellung fr MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Seiten-Titel';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Inhaltsverzeichnis';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Heading';
+tinyMCELang['lang_insert_mambo_title']          = 'Mambo Elemente Plugin';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,9 @@
+// UK lang variables
+
+tinyMCELang['lang_insert_mosimage_desc']   			= 'Insert MosImage'
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'Insert MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'Settings for MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Page Title';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Table of Contents';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Heading';
+tinyMCELang['lang_insert_mambo_title']     			= 'Mambo elements plugin';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fi.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fi.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fi.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fi.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,15 @@
+/**
+* @version $Id: fi.js,v 1.1 2005/09/16 19:39:58 msuominen Exp $
+* Finnish language file for mosCE 1.0
+* Creator: Finnish Joomla! translation team
+* Homepage: http://www.joomlaportal.fi
+* Author: Markku Suominen <admin@joomlaportal.fi> 
+*/
+
+tinyMCELang['lang_insert_mosimage_desc']   			= 'Lis MosImage'
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'Lis MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'MosPageBreak asetukset';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Sivun otsikko';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Sisllysluettelo';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Otsikko';
+tinyMCELang['lang_insert_mambo_title']     			= 'Mambo plugin-elementti';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fr.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fr.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fr.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fr.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,9 @@
+// UK lang variables
+
+tinyMCELang['lang_insert_mosimage_desc']   			= 'Insrer une MosImage'
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'Insrer un MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'Rglage pour MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Titre de la page';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Table des matires';
+tinyMCELang['lang_insert_mambo_title']     			= 'Elements de plugin Mambo';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Heading';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/nl.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/nl.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/nl.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/nl.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,9 @@
+// nl lang variables
+
+tinyMCELang['lang_insert_mosimage_desc']   			= 'Invoegen MosImage'
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'Invoegen MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'Instellingen voor MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Pagina titel';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Inhoudsopgave';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Kopregel';
+tinyMCELang['lang_insert_mambo_title']     			= 'Mambo elementen plugin';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pl.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pl.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pl.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pl.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,15 @@
+// ***********************************************************************
+// ** Title.........:    TinyMCE_EXP_1.2 polish lang. Image Manager Dialog, Image Manager
+// ** Version.......:    1.0
+// ** Author........:    Stefan Wajda <zwiastun@zwiastun.net>, Diabl0/MAO Group, http://www.mao.pl
+// ** Filename......:    pl.js (polish language file)
+// ** Last changed..:    8 Feb 2005
+// ***********************************************************************/
+
+tinyMCELang['lang_insert_mosimage_desc']   			= 'Wstaw grafik'
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'Wstaw podzia strony';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'Ustawienia podziau stron';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Tytu strony';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Spis treci';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Heading';
+tinyMCELang['lang_insert_mambo_title']     			= 'Wtyczki Mambo';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pt_br.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pt_br.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pt_br.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pt_br.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,9 @@
+// PT_BR lang variables
+
+tinyMCELang['lang_insert_mosimage_desc']   			= 'Inserir MosImage'
+tinyMCELang['lang_insert_mospagebreak_desc']    = 'Inserir MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'Configuraes do MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'Ttulo da pgina';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'Tabela de Contedos';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Heading';
+tinyMCELang['lang_insert_mambo_title']     			= 'Plugin de elementos do Mambo';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/th.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/th.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/th.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/langs/th.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,10 @@
+// TH lang variables Thai contributed by www.mambohub.com
+//  Additional by Akarawuth T., Supachai T.
+
+tinyMCELang['lang_insert_mosimage_desc']   			= ' MosImage'
+tinyMCELang['lang_insert_mospagebreak_desc']    = ' MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_title']   = 'õ駤Ѻ MosPageBreak';
+tinyMCELang['lang_insert_mospagebreak_atext']   = 'ͧ˹';
+tinyMCELang['lang_insert_mospagebreak_ctext']   = 'ҧͧ';
+tinyMCELang['lang_insert_mospagebreak_btext']   = 'Ǣ';
+tinyMCELang['lang_insert_mambo_title']     			= 'ǹСͺԹ';
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/mospagebreak.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/mospagebreak.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/mospagebreak.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/mambo/mospagebreak.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>{$lang_insert_mambo_title}</title>
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+<!--
+// created 2005-1-29 by Meint Post (meint.post@bigfoot.com)
+    function init() {
+        var formObj = document.forms[0];
+        formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('mceDo'));
+        window.focus();
+    }
+    function insertCD() {
+        var formObj = document.forms[0];
+        if (window.opener) {
+
+            for (i = 0; i < formObj.mosversion.length; i++)
+                {
+                    if (formObj.mosversion[i].checked == true)
+                    {
+                        if (formObj.mosversion[i].value == '451')
+                        {
+                            var mosVersion = '451';
+                        }
+                        if (formObj.mosversion[i].value == '452')
+                        {
+                            var mosVersion = '452';
+                        }
+
+                    }
+            }
+
+            if (mosVersion == '451'){
+                var atext = formObj.atext.value;
+                atext = tinyMCE.regexpReplace(atext, "<", "&lt;");
+                atext = tinyMCE.regexpReplace(atext, ">", "&gt;");
+                var html = '{mospagebreak';
+                if (atext) {
+                	html += ' title="' + atext + '"';
+                }
+    						for (i = 0; i < formObj.ctext.length; i++)
+                {
+    							if (formObj.ctext[i].checked == true)
+    							{
+    								if (formObj.ctext[i].value == '1')
+    								{
+    									html += ' toc="1"';
+    								}
+
+    							}
+    						}
+                html += '}';
+            }
+            
+            if (mosVersion == '452'){
+                var ttext = formObj.ttext.value;
+                ttext = tinyMCE.regexpReplace(ttext, "<", "&lt;");
+                ttext = tinyMCE.regexpReplace(ttext, ">", "&gt;");
+                var htext = formObj.htext.value;
+                htext = tinyMCE.regexpReplace(htext, "<", "&lt;");
+                htext = tinyMCE.regexpReplace(htext, ">", "&gt;");
+                var html = '{mospagebreak ';
+                if (ttext) {
+                	html += 'title=' + ttext + '';
+                }
+                if (ttext && htext) {
+                    html += '&';
+                }
+                if (htext) {
+                    html += 'heading=' + htext + '';
+                }
+                html += '}';
+            }
+            tinyMCE.execCommand("mceInsertContent",true,html);
+            top.close();
+        }
+    }
+
+    function cancelAction() {
+        top.close();
+    }
+
+//-->
+</script>
+</head>
+
+<body onload="init();">
+    <form onsubmit="insertCD();return false;">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+            <tr>
+                <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+                    <tr>
+                        <td colspan="3" class="title">{$lang_insert_mospagebreak_desc}</td>
+                    </tr>
+                    <tr>
+                        <td align="left"><input type="radio" name="mosversion" id="mosversion" value="451"></td>
+                        <td align="left">Mambo 4.5.1</td>
+                    </tr>
+                    <tr>
+                        <td align="right" colspan="2">{$lang_insert_mospagebreak_atext}:</td>
+                        <td nowrap="nowrap">
+                            <input name="atext" type="text" id="atext" value="" style="width: 100px; vertical-align: middle;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="right" colspan="2">{$lang_insert_mospagebreak_ctext}:</td>
+                        <td nowrap="nowrap">
+                            <input name="ctext" type="radio" id="ctext" value="0" checked="checked" />No
+                            <input name="ctext" type="radio" id="ctext" value="1" />Yes
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="left"><input type="radio" name="mosversion" id="mosversion" value="452" checked="checked"></td>
+                        <td align="left">Mambo 4.5.2 or greater</td>
+                    </tr>
+                    <tr>
+                        <td align="right" colspan="2">{$lang_insert_mospagebreak_atext}:</td>
+                        <td nowrap="nowrap">
+                            <input name="ttext" type="text" id="ttext" value="" style="width: 100px; vertical-align: middle;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td align="right" colspan="2">{$lang_insert_mospagebreak_btext}:</td>
+                        <td nowrap="nowrap">
+                            <input name="htext" type="text" id="htext" value="" style="width: 100px; vertical-align: middle;" />
+                        </td>
+                    </tr>
+                </table>
+                <input type="button" name="insert" value="{$lang_insert}" onclick="insertCD();" id="insert" />
+                <input type="button" name="cancel" value="{$lang_cancel}" onclick="cancelAction();" id="cancel" />
+                </td>
+            </tr>
+        </table>
+    </form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/noneditable.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/noneditable.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/noneditable.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/css/noneditable.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,17 @@
+/* This is the CSS file for the noneditable elements plugin */
+
+.mceEditable {
+	/*border: 1px dotted #0000cc;*/
+	-moz-user-focus: none;
+	-moz-user-input: auto;
+	-moz-user-modify: auto;
+	-moz-user-select: text;
+}
+
+.mceNonEditable {
+	/*border: 1px dotted #cc0000;*/
+	-moz-user-focus: ignore;
+	/*-moz-user-input: disabled;*/
+	-moz-user-modify: read-only;
+	-moz-user-select: all;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+var TinyMCE_NonEditablePlugin={getInfo:function(){return{longname:'Non editable elements',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_noneditable.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/plugins/noneditable/css/noneditable.css");if(tinyMCE.isMSIE5_0)tinyMCE.settings['plugins']=tinyMCE.settings['plugins'].replace(/noneditable/gi,'Noneditable');if(tinyMCE.isGecko){tinyMCE.addEvent(inst.getDoc(),"keyup",TinyMCE_NonEditablePlugin._fixKeyUp);}},cleanup:function(type,content,inst){switch(type){case"insert_to_editor_dom":var nodes=tinyMCE.getNodeTree(content,new Array(),1);var editClass=tinyMCE.getParam("noneditable_editable_class","mceEditable");var nonEditClass=tinyMCE.getParam("noneditable_noneditable_class","mceNonEditable");for(var i=0;i<nodes.length;i++){var elm=nodes[i];var editable=tinyMCE.getAttrib(elm,"contenteditable");if(new RegExp("true|false","gi").test(editable))TinyMCE_NonEditablePlugin._setEditable(elm,editable=="true");if(tinyMCE.isMSIE){var className=elm.className?elm.className:"";if(className.indexOf(editClass)!=-1)elm.contentEditable=true;if(className.indexOf(nonEditClass)!=-1)elm.contentEditable=false;}}break;case"insert_to_editor":if(tinyMCE.isMSIE){var editClass=tinyMCE.getParam("noneditable_editable_class","mceEditable");var nonEditClass=tinyMCE.getParam("noneditable_noneditable_class","mceNonEditable");content=content.replace(new RegExp("class=\"(.*)("+editClass+")([^\"]*)\"","gi"),'class="$1$2$3" contenteditable="true"');content=content.replace(new RegExp("class=\"(.*)("+nonEditClass+")([^\"]*)\"","gi"),'class="$1$2$3" contenteditable="false"');}break;case"get_from_editor_dom":if(tinyMCE.getParam("noneditable_leave_contenteditable",false)){var nodes=tinyMCE.getNodeTree(content,new Array(),1);for(var i=0;i<nodes.length;i++)nodes[i].removeAttribute("contenteditable");}break;}return content;},_fixKeyUp:function(e){var inst=tinyMCE.selectedInstance;var sel=inst.getSel();var rng=inst.getRng();var an=sel.anchorNode;if((e.keyCode==38||e.keyCode==37||e.keyCode==40||e.keyCode==39)&&(elm=TinyMCE_NonEditablePlugin._isNonEditable(an))!=null){rng=inst.getDoc().createRange();rng.selectNode(elm);rng.collapse(true);sel.removeAllRanges();sel.addRange(rng);tinyMCE.cancelEvent(e);}},_isNonEditable:function(elm){var editClass=tinyMCE.getParam("noneditable_editable_class","mceEditable");var nonEditClass=tinyMCE.getParam("noneditable_noneditable_class","mceNonEditable");if(!elm)return;do{var className=elm.className?elm.className:"";if(className.indexOf(editClass)!=-1)return null;if(className.indexOf(nonEditClass)!=-1)return elm;}while(elm=elm.parentNode);return null;},_setEditable:function(elm,state){var editClass=tinyMCE.getParam("noneditable_editable_class","mceEditable");var nonEditClass=tinyMCE.getParam("noneditable_noneditable_class","mceNonEditable");var className=elm.className?elm.className:"";if(className.indexOf(editClass)!=-1||className.indexOf(nonEditClass)!=-1)return;if((className=tinyMCE.getAttrib(elm,"class"))!="")className+=" ";className+=state?editClass:nonEditClass;elm.setAttribute("class",className);elm.className=className;}};tinyMCE.addPlugin("noneditable",TinyMCE_NonEditablePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,164 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.7 $
+ * $Date: 2006/02/06 20:02:38 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+var TinyMCE_NonEditablePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Non editable elements',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_noneditable.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/noneditable/css/noneditable.css");
+
+		// Ugly hack
+		if (tinyMCE.isMSIE5_0)
+			tinyMCE.settings['plugins'] = tinyMCE.settings['plugins'].replace(/noneditable/gi, 'Noneditable');
+
+		if (tinyMCE.isGecko) {
+			tinyMCE.addEvent(inst.getDoc(), "keyup", TinyMCE_NonEditablePlugin._fixKeyUp);
+	//		tinyMCE.addEvent(inst.getDoc(), "keypress", TinyMCE_NonEditablePlugin._selectAll);
+	//		tinyMCE.addEvent(inst.getDoc(), "mouseup", TinyMCE_NonEditablePlugin._selectAll);
+		}
+	},
+
+	cleanup : function(type, content, inst) {
+		switch (type) {
+			case "insert_to_editor_dom":
+				var nodes = tinyMCE.getNodeTree(content, new Array(), 1);
+				var editClass = tinyMCE.getParam("noneditable_editable_class", "mceEditable");
+				var nonEditClass = tinyMCE.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+				for (var i=0; i<nodes.length; i++) {
+					var elm = nodes[i];
+
+					// Convert contenteditable to classes
+					var editable = tinyMCE.getAttrib(elm, "contenteditable");
+					if (new RegExp("true|false","gi").test(editable))
+						TinyMCE_NonEditablePlugin._setEditable(elm, editable == "true");
+
+					if (tinyMCE.isMSIE) {
+						var className = elm.className ? elm.className : "";
+
+						if (className.indexOf(editClass) != -1)
+							elm.contentEditable = true;
+
+						if (className.indexOf(nonEditClass) != -1)
+							elm.contentEditable = false;
+					}
+				}
+
+				break;
+
+			case "insert_to_editor":
+				if (tinyMCE.isMSIE) {
+					var editClass = tinyMCE.getParam("noneditable_editable_class", "mceEditable");
+					var nonEditClass = tinyMCE.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+					content = content.replace(new RegExp("class=\"(.*)(" + editClass + ")([^\"]*)\"", "gi"), 'class="$1$2$3" contenteditable="true"');
+					content = content.replace(new RegExp("class=\"(.*)(" + nonEditClass + ")([^\"]*)\"", "gi"), 'class="$1$2$3" contenteditable="false"');
+				}
+
+				break;
+
+			case "get_from_editor_dom":
+				if (tinyMCE.getParam("noneditable_leave_contenteditable", false)) {
+					var nodes = tinyMCE.getNodeTree(content, new Array(), 1);
+
+					for (var i=0; i<nodes.length; i++)
+						nodes[i].removeAttribute("contenteditable");
+				}
+
+				break;
+		}
+
+		return content;
+	},
+
+	// Private internal plugin methods
+
+	_fixKeyUp : function(e) {
+		var inst = tinyMCE.selectedInstance;
+		var sel = inst.getSel();
+		var rng = inst.getRng();
+		var an = sel.anchorNode;
+
+		// Move cursor outside non editable fields
+		if ((e.keyCode == 38 || e.keyCode == 37 || e.keyCode == 40 || e.keyCode == 39) && (elm = TinyMCE_NonEditablePlugin._isNonEditable(an)) != null) {
+			rng = inst.getDoc().createRange();
+			rng.selectNode(elm);
+			rng.collapse(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			tinyMCE.cancelEvent(e);
+		}
+	},
+/*
+	_selectAll : function(e) {
+		var inst = tinyMCE.selectedInstance;
+		var sel = inst.getSel();
+		var doc = inst.getDoc();
+
+		if ((elm = TinyMCE_NonEditablePlugin._isNonEditable(sel.focusNode)) != null) {
+			inst.selection.selectNode(elm, false);
+			tinyMCE.cancelEvent(e);
+			return;
+		}
+
+		if ((elm = TinyMCE_NonEditablePlugin._isNonEditable(sel.anchorNode)) != null) {
+			inst.selection.selectNode(elm, false);
+			tinyMCE.cancelEvent(e);
+			return;
+		}
+	},*/
+
+	_isNonEditable : function(elm) {
+		var editClass = tinyMCE.getParam("noneditable_editable_class", "mceEditable");
+		var nonEditClass = tinyMCE.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+		if (!elm)
+			return;
+
+		do {
+			var className = elm.className ? elm.className : "";
+
+			if (className.indexOf(editClass) != -1)
+				return null;
+
+			if (className.indexOf(nonEditClass) != -1)
+				return elm;
+		} while (elm = elm.parentNode);
+
+		return null;
+	},
+
+	_setEditable : function(elm, state) {
+		var editClass = tinyMCE.getParam("noneditable_editable_class", "mceEditable");
+		var nonEditClass = tinyMCE.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+		var className = elm.className ? elm.className : "";
+
+		if (className.indexOf(editClass) != -1 || className.indexOf(nonEditClass) != -1)
+			return;
+
+		if ((className = tinyMCE.getAttrib(elm, "class")) != "")
+			className += " ";
+
+		className += state ? editClass : nonEditClass;
+
+		elm.setAttribute("class", className);
+		elm.className = className;
+	}
+};
+
+tinyMCE.addPlugin("noneditable", TinyMCE_NonEditablePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/noneditable/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/blank.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/blank.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/blank.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/blank.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,19 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>blank_page</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<script language="javascript">
+		function init() {
+			document.body.contentEditable = true;
+			document.designMode = 'on';
+			parent.initIframe(document);
+			window.focus();
+		}
+	</script>
+	<link href="css/blank.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body onload="init();">
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/blank.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/blank.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/blank.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/blank.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,13 @@
+body {
+	background-color: #FFFFFF;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/pasteword.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/pasteword.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/pasteword.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/css/pasteword.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,3 @@
+.sourceIframe {
+	border: 1px solid #808080;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('paste','en,tr,sv,cs,zh_cn,fr_ca,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl,nl,fr,pt_br');var TinyMCE_PastePlugin={getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE&&tinyMCE.getParam("paste_auto_cleanup_on_paste",false))tinyMCE.addEvent(inst.getBody(),"paste",TinyMCE_PastePlugin._handlePasteEvent);},getControlHTML:function(cn){switch(cn){case"pastetext":return tinyMCE.getButtonHTML(cn,'lang_paste_text_desc','{$pluginurl}/images/pastetext.gif','mcePasteText',true);case"pasteword":return tinyMCE.getButtonHTML(cn,'lang_paste_word_desc','{$pluginurl}/images/pasteword.gif','mcePasteWord',true);case"selectall":return tinyMCE.getButtonHTML(cn,'lang_selectall_desc','{$pluginurl}/images/selectall.gif','mceSelectAll',true);}return'';},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mcePasteText":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false))TinyMCE_PastePlugin._insertText(clipboardData.getData("Text"),true);else{var template=new Array();template['file']='../../plugins/paste/pastetext.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertText(value['html'],value['linebreaks']);return true;case"mcePasteWord":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false)){var html=TinyMCE_PastePlugin._clipboardHTML();if(html&&html.length>0)TinyMCE_PastePlugin._insertWordContent(html);}else{var template=new Array();template['file']='../../plugins/paste/pasteword.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertWordContent(value);return true;case"mceSelectAll":tinyMCE.execInstanceCommand(editor_id,'selectall');return true;}return false;},_handlePasteEvent:function(e){switch(e.type){case"paste":var html=TinyMCE_PastePlugin._clipboardHTML();var r,inst=tinyMCE.selectedInstance;if(inst&&(r=inst.getRng())&&r.text.length>0)tinyMCE.execCommand('delete');if(html&&html.length>0)tinyMCE.execCommand('mcePasteWord',false,html);tinyMCE.cancelEvent(e);return false;}return true;},_insertText:function(content,bLinebreaks){if(content&&content.length>0){if(bLinebreaks){if(tinyMCE.getParam("paste_create_paragraphs",true)){var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);content=tinyMCE.regexpReplace(content,"\r\n\r\n","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\r\r","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\n\n","</p><p>","gi");if((pos=content.indexOf('</p><p>'))!=-1){tinyMCE.execCommand("Delete");var node=tinyMCE.selectedInstance.getFocusElement();var breakElms=new Array();do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="</p>";before+=content.substring(0,pos);for(var i=0;i<breakElms.length;i++){before+="</"+breakElms[i].nodeName+">";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="<p>";content=before+content.substring(pos+7)+after;}}if(tinyMCE.getParam("paste_create_linebreaks",true)){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}}tinyMCE.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);var cb;if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('before', content)");var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>','gi'),'<p><b>$1</b></p>');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)<BR>","gi"),"<p>"+middot+"$1</p>");content=content.replace(new RegExp('<SPAN style="mso-list: Ignore">','gi'),"<span>"+bull);content=content.replace(/<o:p><\/o:p>/gi,"");content=content.replace(new RegExp('<br style="page-break-before: always;.*>','gi'),'-- page break --');content=content.replace(new RegExp('<(!--)([^>]*)(--)>','g'),"");if(tinyMCE.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(tinyMCE.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(tinyMCE.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+TinyMCE_PastePlugin._reEscape(""+document.location)+'','gi'),'href="'+tinyMCE.settings['document_base_url']);content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!tinyMCE.settings['force_p_newlines']){content=content.replace('','','gi');content=content.replace('</p>','<br /><br />','gi');}if(!tinyMCE.isMSIE&&!tinyMCE.settings['force_p_newlines']){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(tinyMCE.getParam("paste_convert_middot_lists",true)){var div=document.createElement("div");div.innerHTML=content;var className=tinyMCE.getParam("paste_unindented_list_class","unIndentedList");while(TinyMCE_PastePlugin._convertMiddots(div,"--list--"));while(TinyMCE_PastePlugin._convertMiddots(div,middot,className));while(TinyMCE_PastePlugin._convertMiddots(div,bull));content=div.innerHTML;}if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi,'<p>&nbsp;&nbsp;</p>');content=content.replace(/<h[1-6]>/gi,'<p><b>');content=content.replace(/<\/h[1-6]>/gi,'</b></p>');content=content.replace(/<b>&nbsp;<\/b>/gi,'<b>&nbsp;&nbsp;</b>');content=content.replace(/^(&nbsp;)*/gi,'');}content=content.replace(/--list--/gi,"");if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('after', content)");tinyMCE.execCommand("mceInsertContent",false,content);window.setTimeout('tinyMCE.execCommand("mceCleanup");',1);}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i<s.length;i++){var c=s.charAt(i);if(l.indexOf(c)!=-1)o+='\\'+c;else o+=c;}return o;},_convertMiddots:function(div,search,class_name){var mdot=String.fromCharCode(183);var bull=String.fromCharCode(8226);var nodes=div.getElementsByTagName("p");var prevul;for(var i=0;i<nodes.length;i++){var p=nodes[i];if(p.innerHTML.indexOf(search)==0){var ul=document.createElement("ul");if(class_name)ul.className=class_name;var li=document.createElement("li");li.innerHTML=p.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');ul.appendChild(li);var np=p.nextSibling;while(np){if(np.nodeType==3&&new RegExp('^\\s$','m').test(np.nodeValue)){np=np.nextSibling;continue;}if(search==mdot){if(np.nodeType==1&&new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)){if(!prevul){prevul=ul;ul=document.createElement("ul");prevul.appendChild(ul);}np.innerHTML=np.innerHTML.replace(/^o/,'');}else{if(prevul){ul=prevul;prevul=null;}if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}}else{if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}var cp=np.nextSibling;var li=document.createElement("li");li.innerHTML=np.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');np.parentNode.removeChild(np);ul.appendChild(li);np=cp;}p.parentNode.replaceChild(ul,p);return true;}}return false;},_clipboardHTML:function(){var div=document.getElementById('_TinyMCE_clipboardHTML');if(!div){var div=document.createElement('DIV');div.id='_TinyMCE_clipboardHTML';with(div.style){visibility='hidden';overflow='hidden';position='absolute';width=1;height=1;}document.body.appendChild(div);}div.innerHTML='';var rng=document.body.createTextRange();rng.moveToElementText(div);rng.execCommand('Paste');var html=div.innerHTML;div.innerHTML='';return html;}};tinyMCE.addPlugin("paste",TinyMCE_PastePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,388 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.37 $
+ * $Date: 2006/03/27 10:07:08 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */ 
+tinyMCE.importPluginLanguagePack('paste', 'en,tr,sv,cs,zh_cn,fr_ca,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl,nl,fr,pt_br');
+
+var TinyMCE_PastePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Paste text/word',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		if (tinyMCE.isMSIE && tinyMCE.getParam("paste_auto_cleanup_on_paste", false))
+			tinyMCE.addEvent(inst.getBody(), "paste", TinyMCE_PastePlugin._handlePasteEvent);
+	},
+
+	getControlHTML : function(cn) { 
+		switch (cn) { 
+			case "pastetext":
+				return tinyMCE.getButtonHTML(cn, 'lang_paste_text_desc', '{$pluginurl}/images/pastetext.gif', 'mcePasteText', true);
+
+			case "pasteword":
+				return tinyMCE.getButtonHTML(cn, 'lang_paste_word_desc', '{$pluginurl}/images/pasteword.gif', 'mcePasteWord', true);
+
+			case "selectall":
+				return tinyMCE.getButtonHTML(cn, 'lang_selectall_desc', '{$pluginurl}/images/selectall.gif', 'mceSelectAll', true);
+		} 
+
+		return ''; 
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) { 
+		switch (command) { 
+			case "mcePasteText": 
+				if (user_interface) {
+					if ((tinyMCE.isMSIE && !tinyMCE.isOpera) && !tinyMCE.getParam('paste_use_dialog', false))
+						TinyMCE_PastePlugin._insertText(clipboardData.getData("Text"), true); 
+					else { 
+						var template = new Array(); 
+						template['file']	= '../../plugins/paste/pastetext.htm'; // Relative to theme 
+						template['width']  = 450; 
+						template['height'] = 400; 
+						var plain_text = ""; 
+						tinyMCE.openWindow(template, {editor_id : editor_id, plain_text: plain_text, resizable : "yes", scrollbars : "no", inline : "yes", mceDo : 'insert'}); 
+					}
+				} else
+					TinyMCE_PastePlugin._insertText(value['html'], value['linebreaks']);
+
+				return true;
+
+			case "mcePasteWord": 
+				if (user_interface) {
+					if ((tinyMCE.isMSIE && !tinyMCE.isOpera) && !tinyMCE.getParam('paste_use_dialog', false)) {
+						var html = TinyMCE_PastePlugin._clipboardHTML();
+
+						if (html && html.length > 0)
+							TinyMCE_PastePlugin._insertWordContent(html);
+					} else { 
+						var template = new Array(); 
+						template['file']	= '../../plugins/paste/pasteword.htm'; // Relative to theme 
+						template['width']  = 450; 
+						template['height'] = 400; 
+						var plain_text = ""; 
+						tinyMCE.openWindow(template, {editor_id : editor_id, plain_text: plain_text, resizable : "yes", scrollbars : "no", inline : "yes", mceDo : 'insert'});
+					}
+				} else
+					TinyMCE_PastePlugin._insertWordContent(value);
+
+				return true;
+
+			case "mceSelectAll":
+				tinyMCE.execInstanceCommand(editor_id, 'selectall'); 
+				return true; 
+
+		} 
+
+		// Pass to next handler in chain 
+		return false; 
+	},
+
+	// Private plugin internal methods
+
+	_handlePasteEvent : function(e) {
+		switch (e.type) {
+			case "paste":
+				var html = TinyMCE_PastePlugin._clipboardHTML();
+				var r, inst = tinyMCE.selectedInstance;
+
+				// Removes italic, strong etc, the if was needed due to bug #1437114
+				if (inst && (r = inst.getRng()) && r.text.length > 0)
+					tinyMCE.execCommand('delete');
+
+				if (html && html.length > 0)
+					tinyMCE.execCommand('mcePasteWord', false, html);
+
+				tinyMCE.cancelEvent(e);
+				return false;
+		}
+
+		return true;
+	},
+
+	_insertText : function(content, bLinebreaks) { 
+		if (content && content.length > 0) {
+			if (bLinebreaks) { 
+				// Special paragraph treatment 
+				if (tinyMCE.getParam("paste_create_paragraphs", true)) {
+					var rl = tinyMCE.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
+					for (var i=0; i<rl.length; i+=2)
+						content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
+
+					content = tinyMCE.regexpReplace(content, "\r\n\r\n", "</p><p>", "gi"); 
+					content = tinyMCE.regexpReplace(content, "\r\r", "</p><p>", "gi"); 
+					content = tinyMCE.regexpReplace(content, "\n\n", "</p><p>", "gi"); 
+
+					// Has paragraphs 
+					if ((pos = content.indexOf('</p><p>')) != -1) { 
+						tinyMCE.execCommand("Delete"); 
+
+						var node = tinyMCE.selectedInstance.getFocusElement(); 
+
+						// Get list of elements to break 
+						var breakElms = new Array(); 
+
+						do { 
+							if (node.nodeType == 1) { 
+								// Don't break tables and break at body 
+								if (node.nodeName == "TD" || node.nodeName == "BODY") 
+									break; 
+		
+								breakElms[breakElms.length] = node; 
+							} 
+						} while(node = node.parentNode); 
+
+						var before = "", after = "</p>"; 
+						before += content.substring(0, pos); 
+
+						for (var i=0; i<breakElms.length; i++) { 
+							before += "</" + breakElms[i].nodeName + ">"; 
+							after += "<" + breakElms[(breakElms.length-1)-i].nodeName + ">"; 
+						} 
+
+						before += "<p>"; 
+						content = before + content.substring(pos+7) + after; 
+					} 
+				} 
+
+				if (tinyMCE.getParam("paste_create_linebreaks", true)) {
+					content = tinyMCE.regexpReplace(content, "\r\n", "<br />", "gi"); 
+					content = tinyMCE.regexpReplace(content, "\r", "<br />", "gi"); 
+					content = tinyMCE.regexpReplace(content, "\n", "<br />", "gi"); 
+				}
+			} 
+		
+			tinyMCE.execCommand("mceInsertRawHTML", false, content); 
+		}
+	},
+
+	_insertWordContent : function(content) { 
+		if (content && content.length > 0) {
+			// Cleanup Word content
+			var bull = String.fromCharCode(8226);
+			var middot = String.fromCharCode(183);
+			var cb;
+
+			if ((cb = tinyMCE.getParam("paste_insert_word_content_callback", "")) != "")
+				content = eval(cb + "('before', content)");
+
+			var rl = tinyMCE.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
+			for (var i=0; i<rl.length; i+=2)
+				content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
+
+			if (tinyMCE.getParam("paste_convert_headers_to_strong", false)) {
+				content = content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>', 'gi'), '<p><b>$1</b></p>');
+			}
+
+			content = content.replace(new RegExp('tab-stops: list [0-9]+.0pt">', 'gi'), '">' + "--list--");
+			content = content.replace(new RegExp(bull + "(.*?)<BR>", "gi"), "<p>" + middot + "$1</p>");
+			content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
+			content = content.replace(/<o:p><\/o:p>/gi, "");
+			content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
+			content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), "");  // Word comments
+
+			if (tinyMCE.getParam("paste_remove_spans", true))
+				content = content.replace(/<\/?span[^>]*>/gi, "");
+
+			if (tinyMCE.getParam("paste_remove_styles", true))
+				content = content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)', 'gi'), "<$1$3");
+
+			content = content.replace(/<\/?font[^>]*>/gi, "");
+
+			// Strips class attributes.
+			switch (tinyMCE.getParam("paste_strip_class_attributes", "all")) {
+				case "all":
+					content = content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3");
+					break;
+
+				case "mso":
+					content = content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)', 'gi'), "<$1$3");
+					break;
+			}
+
+			content = content.replace(new RegExp('href="?' + TinyMCE_PastePlugin._reEscape("" + document.location) + '', 'gi'), 'href="' + tinyMCE.settings['document_base_url']);
+			content = content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
+			content = content.replace(/<\\?\?xml[^>]*>/gi, "");
+			content = content.replace(/<\/?\w+:[^>]*>/gi, "");
+			content = content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi, ""); // Remove pagebreaks
+			content = content.replace(/-- page break --/gi, ""); // Remove pagebreaks
+
+	//		content = content.replace(/\/?&nbsp;*/gi, ""); &nbsp;
+	//		content = content.replace(/<p>&nbsp;<\/p>/gi, '');
+
+			if (!tinyMCE.settings['force_p_newlines']) {
+				content = content.replace('', '' ,'gi');
+				content = content.replace('</p>', '<br /><br />' ,'gi');
+			}
+
+			if (!tinyMCE.isMSIE && !tinyMCE.settings['force_p_newlines']) {
+				content = content.replace(/<\/?p[^>]*>/gi, "");
+			}
+
+			content = content.replace(/<\/?div[^>]*>/gi, "");
+
+			// Convert all middlot lists to UL lists
+			if (tinyMCE.getParam("paste_convert_middot_lists", true)) {
+				var div = document.createElement("div");
+				div.innerHTML = content;
+
+				// Convert all middot paragraphs to li elements
+				var className = tinyMCE.getParam("paste_unindented_list_class", "unIndentedList");
+
+				while (TinyMCE_PastePlugin._convertMiddots(div, "--list--")) ; // bull
+				while (TinyMCE_PastePlugin._convertMiddots(div, middot, className)) ; // Middot
+				while (TinyMCE_PastePlugin._convertMiddots(div, bull)) ; // bull
+
+				content = div.innerHTML;
+			}
+
+			// Replace all headers with strong and fix some other issues
+			if (tinyMCE.getParam("paste_convert_headers_to_strong", false)) {
+				content = content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi, '<p>&nbsp;&nbsp;</p>');
+				content = content.replace(/<h[1-6]>/gi, '<p><b>');
+				content = content.replace(/<\/h[1-6]>/gi, '</b></p>');
+				content = content.replace(/<b>&nbsp;<\/b>/gi, '<b>&nbsp;&nbsp;</b>');
+				content = content.replace(/^(&nbsp;)*/gi, '');
+			}
+
+			content = content.replace(/--list--/gi, ""); // Remove --list--
+
+			if ((cb = tinyMCE.getParam("paste_insert_word_content_callback", "")) != "")
+				content = eval(cb + "('after', content)");
+
+			// Insert cleaned content
+			tinyMCE.execCommand("mceInsertContent", false, content);
+			window.setTimeout('tinyMCE.execCommand("mceCleanup");', 1); // Do normal cleanup detached from this thread
+		}
+	},
+
+	_reEscape : function(s) {
+		var l = "?.\\*[](){}+^$:";
+		var o = "";
+
+		for (var i=0; i<s.length; i++) {
+			var c = s.charAt(i);
+
+			if (l.indexOf(c) != -1)
+				o += '\\' + c;
+			else
+				o += c;
+		}
+
+		return o;
+	},
+
+	_convertMiddots : function(div, search, class_name) {
+		var mdot = String.fromCharCode(183);
+		var bull = String.fromCharCode(8226);
+
+		var nodes = div.getElementsByTagName("p");
+		var prevul;
+		for (var i=0; i<nodes.length; i++) {
+			var p = nodes[i];
+
+			// Is middot
+			if (p.innerHTML.indexOf(search) == 0) {
+				var ul = document.createElement("ul");
+
+				if (class_name)
+					ul.className = class_name;
+
+				// Add the first one
+				var li = document.createElement("li");
+				li.innerHTML = p.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
+				ul.appendChild(li);
+
+				// Add the rest
+				var np = p.nextSibling;
+				while (np) {
+			        // If the node is whitespace, then
+			        // ignore it and continue on.
+			        if (np.nodeType == 3 && new RegExp('^\\s$', 'm').test(np.nodeValue)) {
+			                np = np.nextSibling;
+			                continue;
+			        }
+
+					if (search == mdot) {
+					        if (np.nodeType == 1 && new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)) {
+					                // Second level of nesting
+					                if (!prevul) {
+					                        prevul = ul;
+					                        ul = document.createElement("ul");
+					                        prevul.appendChild(ul);
+					                }
+					                np.innerHTML = np.innerHTML.replace(/^o/, '');
+					        } else {
+					                // Pop the stack if we're going back up to the first level
+					                if (prevul) {
+					                        ul = prevul;
+					                        prevul = null;
+					                }
+					                // Not element or middot paragraph
+					                if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
+					                        break;
+					        }
+					} else {
+					        // Not element or middot paragraph
+					        if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
+					                break;
+				        }
+
+					var cp = np.nextSibling;
+					var li = document.createElement("li");
+					li.innerHTML = np.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
+					np.parentNode.removeChild(np);
+					ul.appendChild(li);
+					np = cp;
+				}
+
+				p.parentNode.replaceChild(ul, p);
+
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	_clipboardHTML : function() {
+		var div = document.getElementById('_TinyMCE_clipboardHTML');
+
+		if (!div) {
+			var div = document.createElement('DIV');
+			div.id = '_TinyMCE_clipboardHTML';
+
+			with (div.style) {
+				visibility = 'hidden';
+				overflow = 'hidden';
+				position = 'absolute';
+				width = 1;
+				height = 1;
+			}
+
+			document.body.appendChild(div);
+		}
+
+		div.innerHTML = '';
+		var rng = document.body.createTextRange();
+		rng.moveToElementText(div);
+		rng.execCommand('Paste');
+		var html = div.innerHTML;
+		div.innerHTML = '';
+		return html;
+	}
+};
+
+tinyMCE.addPlugin("paste", TinyMCE_PastePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/pastetext.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/pastetext.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/pasteword.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/pasteword.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/selectall.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/images/selectall.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pastetext.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pastetext.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pastetext.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pastetext.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,34 @@
+function saveContent() {
+	if (document.forms[0].htmlSource.value == '') {
+		tinyMCEPopup.close();
+		return false;
+	}
+
+	tinyMCEPopup.execCommand('mcePasteText', false, {
+		html : document.forms[0].htmlSource.value,
+		linebreaks : document.forms[0].linebreaks.checked
+	});
+
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	resizeInputs();
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	if (!tinyMCE.isMSIE) {
+		wHeight = self.innerHeight-80;
+		wWidth = self.innerWidth-17;
+	} else {
+		wHeight = document.body.clientHeight-80;
+		wWidth = document.body.clientWidth-17;
+	}
+
+	document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px';
+	document.forms[0].htmlSource.style.width  = Math.abs(wWidth) + 'px';
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pasteword.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pasteword.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pasteword.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pasteword.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,46 @@
+function saveContent() {
+	var html = document.getElementById("frmData").contentWindow.document.body.innerHTML;
+
+	if (html == ''){
+		tinyMCEPopup.close();
+		return false;
+	}
+
+	tinyMCEPopup.execCommand('mcePasteWord', false, html);
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Fix for endless reloading in FF
+	window.setTimeout('createIFrame();', 10);
+}
+
+function createIFrame() {
+	document.getElementById('iframecontainer').innerHTML = '<iframe id="frmData" name="frmData" class="sourceIframe" src="blank.htm" height="280" width="400" frameborder="0" style="background-color:#FFFFFF; width:100%;" dir="ltr" wrap="soft"></iframe>';
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function initIframe(doc) {
+	var dir = tinyMCE.selectedInstance.settings['directionality'];
+	doc.body.dir = dir;
+	resizeInputs();
+}
+
+function resizeInputs() {
+	if (!tinyMCE.isMSIE) {
+		wHeight = self.innerHeight - 80;
+		wWidth = self.innerWidth - 18;
+	} else {
+		wHeight = document.body.clientHeight - 80;
+		wWidth = document.body.clientWidth - 18;
+	}
+
+	var elm = document.getElementById('frmData');
+	if (elm) {
+		elm.style.height = Math.abs(wHeight) + 'px';
+		elm.style.width  = Math.abs(wWidth) + 'px';
+	}
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,10 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+paste_text_desc : 'Paste as Plain Text',
+paste_text_title : 'Use CTRL+V on your keyboard to paste the text into the window.',
+paste_text_linebreaks : 'Keep linebreaks',
+paste_word_desc : 'Paste from Word',
+paste_word_title : 'Use CTRL+V on your keyboard to paste the text into the window.',
+selectall_desc : 'Select All'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pastetext.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pastetext.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pastetext.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pastetext.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,34 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_paste_text_desc}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/pastetext.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('onLoadInit();');" onresize="resizeInputs();" style="display: none">
+<form name="source" onsubmit="saveContent();">
+	<div style="float: left" class="title">{$lang_paste_text_desc}</div>
+
+	<div style="float: right">
+		<input type="checkbox" name="linebreaks" id="linebreaks" class="wordWrapCode" checked="checked" /><label for="linebreaks">{$lang_paste_text_linebreaks}</label>
+	</div>
+
+	<br style="clear: both" />
+
+	<div>{$lang_paste_text_title}</div>
+
+	<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft"></textarea>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" name="insert" value="{$lang_insert}" onclick="saveContent();" id="insert" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+		</div>
+	</div>
+</form>
+</body> 
+</html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pasteword.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pasteword.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pasteword.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/pasteword.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,29 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>{$lang_paste_word_desc}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/pasteword.js"></script>
+	<link href="css/pasteword.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('onLoadInit();');" onresize="resizeInputs();" style="display: none">
+	<form name="source" onsubmit="saveContent();" action="#">
+		<div class="title">{$lang_paste_word_desc}</div>
+
+		<div>{$lang_paste_word_title}</div>
+
+		<div id="iframecontainer"></div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="saveContent();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/paste/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('preview','en,tr,cs,de,el,fr_ca,it,ko,pt,sv,zh_cn,fa,fr,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_PreviewPlugin={getInfo:function(){return{longname:'Preview',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_preview.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"preview":return tinyMCE.getButtonHTML(cn,'lang_preview_desc','{$pluginurl}/images/preview.gif','mcePreview');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mcePreview":var previewPage=tinyMCE.getParam("plugin_preview_pageurl",null);var previewWidth=tinyMCE.getParam("plugin_preview_width","550");var previewHeight=tinyMCE.getParam("plugin_preview_height","600");if(previewPage){var template=new Array();template['file']=previewPage;template['width']=previewWidth;template['height']=previewHeight;tinyMCE.openWindow(template,{editor_id:editor_id,resizable:"yes",scrollbars:"yes",inline:"yes",content:tinyMCE.getContent(),content_css:tinyMCE.getParam("content_css")});}else{var win=window.open("","mcePreview","menubar=no,toolbar=no,scrollbars=yes,resizable=yes,left=20,top=20,width="+previewWidth+",height="+previewHeight);var html="";var c=tinyMCE.getContent();var pos=c.indexOf('<body'),pos2;if(pos!=-1){pos=c.indexOf('>',pos);pos2=c.lastIndexOf('</body>');c=c.substring(pos+1,pos2);}html+=tinyMCE.getParam('doctype');html+='<html xmlns="http://www.w3.org/1999/xhtml">';html+='<head>';html+='<title>'+tinyMCE.getLang('lang_preview_desc')+'</title>';html+='<base href="'+tinyMCE.settings['base_href']+'" />';html+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';html+='<link href="'+tinyMCE.getParam("content_css")+'" rel="stylesheet" type="text/css" />';html+='</head>';html+='<body dir="'+tinyMCE.getParam("directionality")+'">';html+=c;html+='</body>';html+='</html>';win.document.write(html);win.document.close();}return true;}return false;}};tinyMCE.addPlugin("preview",TinyMCE_PreviewPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,92 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.23 $
+ * $Date: 2006/03/20 12:03:44 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('preview', 'en,tr,cs,de,el,fr_ca,it,ko,pt,sv,zh_cn,fa,fr,pl,pt_br,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_PreviewPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Preview',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_preview.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	/**
+	 * Returns the HTML contents of the preview control.
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "preview":
+				return tinyMCE.getButtonHTML(cn, 'lang_preview_desc', '{$pluginurl}/images/preview.gif', 'mcePreview');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the mcePreview command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mcePreview":
+				var previewPage = tinyMCE.getParam("plugin_preview_pageurl", null);
+				var previewWidth = tinyMCE.getParam("plugin_preview_width", "550");
+				var previewHeight = tinyMCE.getParam("plugin_preview_height", "600");
+
+				// Use a custom preview page
+				if (previewPage) {
+					var template = new Array();
+
+					template['file'] = previewPage;
+					template['width'] = previewWidth;
+					template['height'] = previewHeight;
+
+					tinyMCE.openWindow(template, {editor_id : editor_id, resizable : "yes", scrollbars : "yes", inline : "yes", content : tinyMCE.getContent(), content_css : tinyMCE.getParam("content_css")});
+				} else {
+					var win = window.open("", "mcePreview", "menubar=no,toolbar=no,scrollbars=yes,resizable=yes,left=20,top=20,width=" + previewWidth + ",height="  + previewHeight);
+					var html = "";
+					var c = tinyMCE.getContent();
+					var pos = c.indexOf('<body'), pos2;
+
+					if (pos != -1) {
+						pos = c.indexOf('>', pos);
+						pos2 = c.lastIndexOf('</body>');
+						c = c.substring(pos + 1, pos2);
+					}
+
+					html += tinyMCE.getParam('doctype');
+					html += '<html xmlns="http://www.w3.org/1999/xhtml">';
+					html += '<head>';
+					html += '<title>' + tinyMCE.getLang('lang_preview_desc') + '</title>';
+					html += '<base href="' + tinyMCE.settings['base_href'] + '" />';
+					html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+					html += '<link href="' + tinyMCE.getParam("content_css") + '" rel="stylesheet" type="text/css" />';
+					html += '</head>';
+					html += '<body dir="' + tinyMCE.getParam("directionality") + '">';
+					html += c;
+					html += '</body>';
+					html += '</html>';
+
+					win.document.write(html);
+					win.document.close();
+				}
+
+				return true;
+		}
+
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("preview", TinyMCE_PreviewPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/example.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/example.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/example.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/example.html	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,13 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<title>Example of a custom preview page</title>
+<link href="{$content_css}" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+Editor contents: <br />
+{$content}
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/images/preview.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/images/preview.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,5 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+preview_desc : 'Preview'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/preview/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('print','en,tr,sv,zh_cn,fa,fr_ca,fr,de,pl,pt_br,cs,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_PrintPlugin={getInfo:function(){return{longname:'Print',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_print.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"print":return tinyMCE.getButtonHTML(cn,'lang_print_desc','{$pluginurl}/images/print.gif','mcePrint');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mcePrint":tinyMCE.getInstanceById(editor_id).contentWindow.print();return true;}return false;}};tinyMCE.addPlugin("print",TinyMCE_PrintPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,49 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.19 $
+ * $Date: 2006/02/10 16:29:40 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import theme	specific language pack */
+tinyMCE.importPluginLanguagePack('print', 'en,tr,sv,zh_cn,fa,fr_ca,fr,de,pl,pt_br,cs,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_PrintPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Print',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_print.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	getControlHTML : function(cn)	{
+		switch (cn) {
+			case "print":
+				return tinyMCE.getButtonHTML(cn, 'lang_print_desc', '{$pluginurl}/images/print.gif', 'mcePrint');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes	the	search/replace commands.
+	 */
+	execCommand : function(editor_id, element, command,	user_interface,	value) {
+		// Handle commands
+		switch (command) {
+			case "mcePrint":
+				tinyMCE.getInstanceById(editor_id).contentWindow.print();
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("print", TinyMCE_PrintPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/images/print.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/images/print.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,5 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+print_desc : 'Print'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/print/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+This is the location you place TinyMCE plugins.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('save','en,tr,sv,zh_cn,cs,fa,fr_ca,fr,de,pl,pt_br,nl,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,da,es,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_SavePlugin={getInfo:function(){return{longname:'Save',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_save.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){inst.addShortcut('ctrl','s','lang_save_desc','mceSave');},getControlHTML:function(cn){switch(cn){case"save":return tinyMCE.getButtonHTML(cn,'lang_save_desc','{$pluginurl}/images/save.gif','mceSave');}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceSave":if(tinyMCE.getParam("fullscreen_is_enabled"))return true;var inst=tinyMCE.selectedInstance;var formObj=inst.formElement.form;if(tinyMCE.getParam("save_enablewhendirty")&&!inst.isDirty())return true;if(formObj){tinyMCE.triggerSave();var os;if((os=tinyMCE.getParam("save_onsavecallback"))){if(eval(os+'(inst);')){inst.startContent=tinyMCE.trim(inst.getBody().innerHTML);tinyMCE.triggerNodeChange(false,true);}return true;}for(var i=0;i<formObj.elements.length;i++){var elementId=formObj.elements[i].name?formObj.elements[i].name:formObj.elements[i].id;if(elementId.indexOf('mce_editor_')==0)formObj.elements[i].disabled=true;}tinyMCE.isNotDirty=true;if(formObj.onsubmit==null||formObj.onsubmit()!=false)inst.formElement.form.submit();}else alert("Error: No form element found.");return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){if(tinyMCE.getParam("fullscreen_is_enabled")){tinyMCE.switchClass(editor_id+'_save','mceButtonDisabled');return true;}if(tinyMCE.getParam("save_enablewhendirty")){var inst=tinyMCE.getInstanceById(editor_id);if(inst.isDirty()){tinyMCE.switchClass(editor_id+'_save','mceButtonNormal');return true;}tinyMCE.switchClass(editor_id+'_save','mceButtonDisabled');}return true;}};tinyMCE.addPlugin("save",TinyMCE_SavePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,117 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.26 $
+ * $Date: 2006/02/13 15:09:28 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('save', 'en,tr,sv,zh_cn,cs,fa,fr_ca,fr,de,pl,pt_br,nl,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,da,es,cy,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_SavePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Save',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_save.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		inst.addShortcut('ctrl', 's', 'lang_save_desc', 'mceSave');
+	},
+
+	/**
+	 * Returns the HTML contents of the save control.
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "save":
+				return tinyMCE.getButtonHTML(cn, 'lang_save_desc', '{$pluginurl}/images/save.gif', 'mceSave');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the save command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceSave":
+				if (tinyMCE.getParam("fullscreen_is_enabled"))
+					return true;
+
+				var inst = tinyMCE.selectedInstance;
+				var formObj = inst.formElement.form;
+
+				if (tinyMCE.getParam("save_enablewhendirty") && !inst.isDirty())
+					return true;
+
+				if (formObj) {
+					tinyMCE.triggerSave();
+
+					// Use callback instead
+					var os;
+					if ((os = tinyMCE.getParam("save_onsavecallback"))) {
+						if (eval(os + '(inst);')) {
+							inst.startContent = tinyMCE.trim(inst.getBody().innerHTML);
+							/*inst.undoLevels = new Array();
+							inst.undoIndex = 0;
+							inst.typingUndoIndex = -1;
+							inst.undoRedo = true;
+							inst.undoLevels[inst.undoLevels.length] = inst.startContent;*/
+							tinyMCE.triggerNodeChange(false, true);
+						}
+
+						return true;
+					}
+
+					// Disable all UI form elements that TinyMCE created
+					for (var i=0; i<formObj.elements.length; i++) {
+						var elementId = formObj.elements[i].name ? formObj.elements[i].name : formObj.elements[i].id;
+
+						if (elementId.indexOf('mce_editor_') == 0)
+							formObj.elements[i].disabled = true;
+					}
+
+					tinyMCE.isNotDirty = true;
+
+					if (formObj.onsubmit == null || formObj.onsubmit() != false)
+						inst.formElement.form.submit();
+				} else
+					alert("Error: No form element found.");
+
+				return true;
+		}
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (tinyMCE.getParam("fullscreen_is_enabled")) {
+			tinyMCE.switchClass(editor_id + '_save', 'mceButtonDisabled');
+			return true;
+		}
+
+		if (tinyMCE.getParam("save_enablewhendirty")) {
+			var inst = tinyMCE.getInstanceById(editor_id);
+
+			if (inst.isDirty()) {
+				tinyMCE.switchClass(editor_id + '_save', 'mceButtonNormal');
+				return true;
+			}
+
+			tinyMCE.switchClass(editor_id + '_save', 'mceButtonDisabled');
+		}
+
+		return true;
+	}
+};
+
+tinyMCE.addPlugin("save", TinyMCE_SavePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/images/save.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/images/save.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,5 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+save_desc : 'Save'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/save/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('searchreplace','en,tr,sv,zh_cn,fa,fr_ca,fr,de,pl,pt_br,cs,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_SearchReplacePlugin={getInfo:function(){return{longname:'Search/Replace',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_searchreplace.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){inst.addShortcut('ctrl','f','lang_searchreplace_search_desc','mceSearch',true);},getControlHTML:function(cn){switch(cn){case"search":return tinyMCE.getButtonHTML(cn,'lang_searchreplace_search_desc','{$pluginurl}/images/search.gif','mceSearch',true);case"replace":return tinyMCE.getButtonHTML(cn,'lang_searchreplace_replace_desc','{$pluginurl}/images/replace.gif','mceSearchReplace',true);}return"";},execCommand:function(editor_id,element,command,user_interface,value){var instance=tinyMCE.getInstanceById(editor_id);function defValue(key,default_value){value[key]=typeof(value[key])=="undefined"?default_value:value[key];}function replaceSel(search_str,str,back){instance.execCommand('mceInsertContent',false,str);}if(!value)value=new Array();defValue("editor_id",editor_id);defValue("searchstring","");defValue("replacestring",null);defValue("replacemode","none");defValue("casesensitive",false);defValue("backwards",false);defValue("wrap",false);defValue("wholeword",false);defValue("inline","yes");switch(command){case"mceResetSearch":tinyMCE.lastSearchRng=null;return true;case"mceSearch":if(user_interface){var template=new Array();if(value['replacestring']!=null){template['file']='../../plugins/searchreplace/replace.htm';template['width']=320;template['height']=100+(tinyMCE.isNS7?20:0);template['width']+=tinyMCE.getLang('lang_searchreplace_replace_delta_width',0);template['height']+=tinyMCE.getLang('lang_searchreplace_replace_delta_height',0);}else{template['file']='../../plugins/searchreplace/search.htm';template['width']=310;template['height']=105+(tinyMCE.isNS7?25:0);template['width']+=tinyMCE.getLang('lang_searchreplace_search_delta_width',0);template['height']+=tinyMCE.getLang('lang_searchreplace_replace_delta_height',0);}instance.execCommand('SelectAll');if(tinyMCE.isMSIE){var r=instance.selection.getRng();r.collapse(true);r.select();}else instance.selection.getSel().collapseToStart();tinyMCE.openWindow(template,value);}else{var win=tinyMCE.getInstanceById(editor_id).contentWindow;var doc=tinyMCE.getInstanceById(editor_id).contentWindow.document;var body=tinyMCE.getInstanceById(editor_id).contentWindow.document.body;if(body.innerHTML==""){alert(tinyMCE.getLang('lang_searchreplace_notfound'));return true;}if(value['replacemode']=="current"){replaceSel(value['string'],value['replacestring'],value['backwards']);value['replacemode']="none";tinyMCE.execInstanceCommand(editor_id,'mceSearch',user_interface,value,false);return true;}if(tinyMCE.isMSIE){var rng=tinyMCE.lastSearchRng?tinyMCE.lastSearchRng:doc.selection.createRange();var flags=0;if(value['wholeword'])flags=flags|2;if(value['casesensitive'])flags=flags|4;if(!rng.findText){alert('This operation is currently not supported by this browser.');return true;}if(value['replacemode']=="all"){while(rng.findText(value['string'],value['backwards']?-1:1,flags)){rng.scrollIntoView();rng.select();rng.collapse(false);replaceSel(value['string'],value['replacestring'],value['backwards']);}alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));return true;}if(rng.findText(value['string'],value['backwards']?-1:1,flags)){rng.scrollIntoView();rng.select();rng.collapse(value['backwards']);tinyMCE.lastSearchRng=rng;}else alert(tinyMCE.getLang('lang_searchreplace_notfound'));}else{if(value['replacemode']=="all"){while(win.find(value['string'],value['casesensitive'],value['backwards'],value['wrap'],value['wholeword'],false,false))replaceSel(value['string'],value['replacestring'],value['backwards']);alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));return true;}if(!win.find(value['string'],value['casesensitive'],value['backwards'],value['wrap'],value['wholeword'],false,false))alert(tinyMCE.getLang('lang_searchreplace_notfound'));}}return true;case"mceSearchReplace":value['replacestring']="";tinyMCE.execInstanceCommand(editor_id,'mceSearch',user_interface,value,false);return true;}return false;}};tinyMCE.addPlugin("searchreplace",TinyMCE_SearchReplacePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,185 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.27 $
+ * $Date: 2006/02/13 15:09:28 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import theme	specific language pack */
+tinyMCE.importPluginLanguagePack('searchreplace', 'en,tr,sv,zh_cn,fa,fr_ca,fr,de,pl,pt_br,cs,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_SearchReplacePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Search/Replace',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_searchreplace.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		inst.addShortcut('ctrl', 'f', 'lang_searchreplace_search_desc', 'mceSearch', true);
+	},
+
+	getControlHTML : function(cn)	{
+		switch (cn) {
+			case "search":
+				return tinyMCE.getButtonHTML(cn, 'lang_searchreplace_search_desc', '{$pluginurl}/images/search.gif', 'mceSearch', true);
+			case "replace":
+				return tinyMCE.getButtonHTML(cn, 'lang_searchreplace_replace_desc', '{$pluginurl}/images/replace.gif', 'mceSearchReplace', true);
+		}
+		return "";
+	},
+
+	/**
+	 * Executes	the	search/replace commands.
+	 */
+	execCommand : function(editor_id, element, command,	user_interface,	value) {
+		var instance = tinyMCE.getInstanceById(editor_id);
+
+		function defValue(key, default_value) {
+			value[key] = typeof(value[key]) == "undefined" ? default_value : value[key];
+		}
+
+		function replaceSel(search_str, str, back) {
+			instance.execCommand('mceInsertContent', false, str);
+		}
+
+		if (!value)
+			value = new Array();
+
+		// Setup defualt values
+		defValue("editor_id", editor_id);
+		defValue("searchstring", "");
+		defValue("replacestring", null);
+		defValue("replacemode", "none");
+		defValue("casesensitive", false);
+		defValue("backwards", false);
+		defValue("wrap", false);
+		defValue("wholeword", false);
+		defValue("inline", "yes");
+
+		// Handle commands
+		switch (command) {
+			case "mceResetSearch":
+				tinyMCE.lastSearchRng = null;
+				return true;
+
+			case "mceSearch":
+				if (user_interface) {
+					// Open search dialog
+					var template = new Array();
+
+					if (value['replacestring'] != null) {
+						template['file'] = '../../plugins/searchreplace/replace.htm'; // Relative to theme
+						template['width'] = 320;
+						template['height'] = 100 + (tinyMCE.isNS7 ? 20 : 0);
+						template['width'] += tinyMCE.getLang('lang_searchreplace_replace_delta_width', 0);
+						template['height'] += tinyMCE.getLang('lang_searchreplace_replace_delta_height', 0);
+					} else {
+						template['file'] = '../../plugins/searchreplace/search.htm'; // Relative to theme
+						template['width'] = 310;
+						template['height'] = 105 + (tinyMCE.isNS7 ? 25 : 0);
+						template['width'] += tinyMCE.getLang('lang_searchreplace_search_delta_width', 0);
+						template['height'] += tinyMCE.getLang('lang_searchreplace_replace_delta_height', 0);
+					}
+
+					instance.execCommand('SelectAll');
+
+					if (tinyMCE.isMSIE) {
+						var r = instance.selection.getRng();
+						r.collapse(true);
+						r.select();
+					} else
+						instance.selection.getSel().collapseToStart();
+
+					tinyMCE.openWindow(template, value);
+				} else {
+					var win = tinyMCE.getInstanceById(editor_id).contentWindow;
+					var doc = tinyMCE.getInstanceById(editor_id).contentWindow.document;
+					var body = tinyMCE.getInstanceById(editor_id).contentWindow.document.body;
+
+					// Whats the point
+					if (body.innerHTML == "") {
+						alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+						return true;
+					}
+
+					// Handle replace current
+					if (value['replacemode'] == "current") {
+						replaceSel(value['string'], value['replacestring'], value['backwards']);
+
+						// Search next one
+						value['replacemode'] = "none";
+						tinyMCE.execInstanceCommand(editor_id, 'mceSearch', user_interface, value, false);
+
+						return true;
+					}
+
+					if (tinyMCE.isMSIE) {
+						var rng = tinyMCE.lastSearchRng ? tinyMCE.lastSearchRng : doc.selection.createRange();
+						var flags = 0;
+
+						if (value['wholeword'])
+							flags = flags | 2;
+
+						if (value['casesensitive'])
+							flags = flags | 4;
+
+						if (!rng.findText) {
+							alert('This operation is currently not supported by this browser.');
+							return true;
+						}
+
+						// Handle replace all mode
+						if (value['replacemode'] == "all") {
+							while (rng.findText(value['string'], value['backwards'] ? -1 : 1, flags)) {
+								rng.scrollIntoView();
+								rng.select();
+								rng.collapse(false);
+								replaceSel(value['string'], value['replacestring'], value['backwards']);
+							}
+
+							alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));
+							return true;
+						}
+
+						if (rng.findText(value['string'], value['backwards'] ? -1 : 1, flags)) {
+							rng.scrollIntoView();
+							rng.select();
+							rng.collapse(value['backwards']);
+							tinyMCE.lastSearchRng = rng;
+						} else
+							alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+					} else {
+						if (value['replacemode'] == "all") {
+							while (win.find(value['string'], value['casesensitive'], value['backwards'], value['wrap'], value['wholeword'], false, false))
+								replaceSel(value['string'], value['replacestring'], value['backwards']);
+
+							alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));
+							return true;
+						}
+
+						if (!win.find(value['string'], value['casesensitive'], value['backwards'], value['wrap'], value['wholeword'], false, false))
+							alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+					}
+				}
+				return true;
+
+			case "mceSearchReplace":
+				value['replacestring'] = "";
+
+				tinyMCE.execInstanceCommand(editor_id, 'mceSearch', user_interface, value, false);
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("searchreplace", TinyMCE_SearchReplacePlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/replace.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/replace.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/search.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/search.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/replace.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/replace.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/replace.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/replace.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,40 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+
+	formObj.searchstring.value = tinyMCE.getWindowArg("searchstring");
+	formObj.replacestring.value = tinyMCE.getWindowArg("replacestring");
+	formObj.casesensitivebox.checked = tinyMCE.getWindowArg("casesensitive");
+//	formObj.backwards[0].checked = tinyMCE.getWindowArg("backwards");
+//	formObj.backwards[1].checked = !tinyMCE.getWindowArg("backwards");
+//		formObj.wrapatend.checked = tinyMCE.getWindowArg("wrap");
+//		formObj.wholeword.checked = tinyMCE.getWindowArg("wholeword");
+
+	tinyMCEPopup.execCommand("mceResetSearch", false, {dummy : ""}, false);
+}
+
+function searchNext(replacemode) {
+	var formObj = document.forms[0];
+
+	// Whats the point?
+	if (formObj.searchstring.value == "" || formObj.searchstring.value == formObj.replacestring.value)
+		return;
+
+	// Do search
+	tinyMCEPopup.execCommand('mceSearch', false, { 
+		string : formObj.searchstring.value,
+		replacestring : formObj.replacestring.value,
+		replacemode : replacemode,
+		casesensitive : formObj.casesensitivebox.checked,
+		backwards : false
+//			wrap : formObj.wrapatend.checked,
+//			wholeword : formObj.wholeword.checked
+		}, false);
+
+	window.focus();
+}
+
+function cancelAction() {
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/search.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/search.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/search.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/search.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,36 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+
+	formObj.searchstring.value = tinyMCE.getWindowArg("searchstring");
+	formObj.casesensitivebox.checked = tinyMCE.getWindowArg("casesensitive");
+	formObj.backwards[0].checked = tinyMCE.getWindowArg("backwards");
+	formObj.backwards[1].checked = !tinyMCE.getWindowArg("backwards");
+//		formObj.wrapatend.checked = tinyMCE.getWindowArg("wrap");
+//		formObj.wholeword.checked = tinyMCE.getWindowArg("wholeword");
+
+	tinyMCEPopup.execCommand("mceResetSearch", false, {dummy : ""}, false);
+}
+
+function searchNext() {
+	var formObj = document.forms[0];
+
+	if (formObj.searchstring.value == "")
+		return;
+
+	// Do search
+	tinyMCEPopup.execCommand('mceSearch', false, { 
+		string : formObj.searchstring.value,
+		casesensitive : formObj.casesensitivebox.checked,
+		backwards : formObj.backwards[0].checked
+//			wrap : formObj.wrapatend.checked,
+//			wholeword : formObj.wholeword.checked
+		}, false);
+
+	window.focus();
+}
+
+function cancelAction() {
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,21 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+searchreplace_search_desc : 'Find',
+searchreplace_searchnext_desc : 'Find again',
+searchreplace_replace_desc : 'Find/Replace',
+searchreplace_notfound : 'The search has been completed. The search string could not be found.',
+searchreplace_search_title : 'Find',
+searchreplace_replace_title : 'Find/Replace',
+searchreplace_allreplaced : 'All occurrences of the search string were replaced.',
+searchreplace_findwhat : 'Find what',
+searchreplace_replacewith : 'Replace with',
+searchreplace_direction : 'Direction',
+searchreplace_up : 'Up',
+searchreplace_down : 'Down',
+searchreplace_case : 'Match case',
+searchreplace_findnext : 'Find&nbsp;next',
+searchreplace_replace : 'Replace',
+searchreplace_replaceall : 'Replace&nbsp;all',
+searchreplace_cancel : 'Cancel'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/replace.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/replace.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/replace.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/replace.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_searchreplace_replace_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/replace.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none; margin: 4px;">
+<form onsubmit="searchNext('none');return false;" action="#">
+  <table border="0" cellspacing="0" cellpadding="2">
+	  <tr>
+		<td><label for="searchstring">{$lang_searchreplace_findwhat}</label></td>
+		<td><input type="text" id="searchstring" name="searchstring" style="width: 200px" /></td>
+	  </tr>
+	  <tr>
+		<td><label for="replacestring">{$lang_searchreplace_replacewith}</label></td>
+		<td><input type="text" id="replacestring" name="replacestring" style="width: 200px" /></td>
+	  </tr>
+        <tr>
+          <td colspan="2"><!--<table border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td><label>{$lang_searchreplace_direction}</label></td>
+              <td><input id="backwardsu" name="backwards" class="radio" type="radio" value="true" /></td>
+              <td><label for="backwardsu">{$lang_searchreplace_up}</label></td>
+              <td><input id="backwardsd" name="backwards" class="radio" type="radio" value="false" /></td>
+              <td><label for="backwardsd">{$lang_searchreplace_down}</label></td>
+            </tr>
+          </table>--></td>
+        </tr>
+        <tr>
+<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td><input id="casesensitivebox" name="casesensitivebox" class="checkbox" type="checkbox" value="true" /></td>
+    <td><label for="casesensitivebox">{$lang_searchreplace_case}</label></td>
+  </tr>
+</table></td>
+</tr>
+      </table>
+  <table border="0" width="300" cellspacing="0" cellpadding="4">
+    <tr>
+      <td><input id="insertBtn" name="insertBtn" type="button" value="{$lang_searchreplace_findnext}" onclick="searchNext('none');" /></td>
+      <td><input name="replaceBtn" type="button" id="replaceBtn" value="{$lang_searchreplace_replace}" onclick="searchNext('current');" /></td>
+      <td><input name="replaceBtn" type="button" id="replaceAllBtn" value="{$lang_searchreplace_replaceall}" onclick="searchNext('all');" /></td>
+     <td align="right"><input name="cancelBtn" type="button" id="cancelBtn" value="{$lang_searchreplace_cancel}" onclick="cancelAction();" /></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/search.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/search.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/search.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/searchreplace/search.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,42 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_searchreplace_search_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/search.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none; margin: 4px;">
+<form onsubmit="searchNext();return false;" action="#">
+  <table border="0" cellspacing="0" cellpadding="2">
+        <tr>
+          <td><label for="searchstring">{$lang_searchreplace_findwhat}</label>&nbsp;<input type="text" id="searchstring" name="searchstring" style="width: 200px" /></td>
+        </tr>
+        <tr>
+          <td><table border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td><label>{$lang_searchreplace_direction}</label></td>
+              <td><input id="backwardsu" name="backwards" class="radio" type="radio" value="true" /></td>
+              <td><label for="backwardsu">{$lang_searchreplace_up}</label></td>
+              <td><input id="backwardsd" name="backwards" class="radio" type="radio" value="false" /></td>
+              <td><label for="backwardsd">{$lang_searchreplace_down}</label></td>
+            </tr>
+          </table></td>
+        </tr>
+        <tr>
+<td><table border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td><input id="casesensitivebox" name="casesensitivebox" class="checkbox" type="checkbox" value="true" /></td>
+    <td><label for="casesensitivebox">{$lang_searchreplace_case}</label></td>
+  </tr>
+</table></td>
+</tr>
+      </table>
+  <table border="0" width="300" cellspacing="0" cellpadding="4">
+    <tr>
+      <td><input id="insert" name="insert" type="submit" value="{$lang_searchreplace_findnext}" /></td>
+      <td align="right"><input id="cancel" name="cancel" type="button" value="{$lang_searchreplace_cancel}" onclick="cancelAction();" /></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/changelog 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/changelog
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/changelog	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/changelog	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,5 @@
+Version 1.0.1 (2006-05-05)
+	Since sourceforge has a serious bug when it comes to replacing files with the same name this release was necessary.
+	Goggle spellchecker class was added.
+Version 1.0 (2006-05-03)
+	Official first release.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/HttpClient.class.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/HttpClient.class.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/HttpClient.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/HttpClient.class.php	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,339 @@
+<?php
+
+/* Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
+   Manual: http://scripts.incutio.com/httpclient/
+*/
+
+class HttpClient {
+    // Request vars
+    var $host;
+    var $port;
+    var $path;
+    var $method;
+    var $postdata = '';
+    var $cookies = array();
+    var $referer;
+    var $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+    var $accept_encoding = 'gzip';
+    var $accept_language = 'en-us';
+    var $user_agent = 'Incutio HttpClient v0.9';
+    // Options
+    var $timeout = 20;
+    var $use_gzip = true;
+    var $persist_cookies = true;  // If true, received cookies are placed in the $this->cookies array ready for the next request
+                                  // Note: This currently ignores the cookie path (and time) completely. Time is not important, 
+                                  //       but path could possibly lead to security problems.
+    var $persist_referers = true; // For each request, sends path of last request as referer
+    var $debug = false;
+    var $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
+    var $max_redirects = 5;
+    var $headers_only = false;    // If true, stops receiving once headers have been read.
+    // Basic authorization variables
+    var $username;
+    var $password;
+    // Response vars
+    var $status;
+    var $headers = array();
+    var $content = '';
+    var $errormsg;
+    // Tracker variables
+    var $redirect_count = 0;
+    var $cookie_host = '';
+    function HttpClient($host, $port=80) {
+        $this->host = $host;
+        $this->port = $port;
+    }
+    function get($path, $data = false) {
+        $this->path = $path;
+        $this->method = 'GET';
+        if ($data) {
+            $this->path .= '?'.$this->buildQueryString($data);
+        }
+        return $this->doRequest();
+    }
+    function post($path, $data) {
+        $this->path = $path;
+        $this->method = 'POST';
+        $this->postdata = $this->buildQueryString($data);
+    	return $this->doRequest();
+    }
+    function buildQueryString($data) {
+        $querystring = '';
+        if (is_array($data)) {
+            // Change data in to postable data
+    		foreach ($data as $key => $val) {
+    			if (is_array($val)) {
+    				foreach ($val as $val2) {
+    					$querystring .= urlencode($key).'='.urlencode($val2).'&';
+    				}
+    			} else {
+    				$querystring .= urlencode($key).'='.urlencode($val).'&';
+    			}
+    		}
+    		$querystring = substr($querystring, 0, -1); // Eliminate unnecessary &
+    	} else {
+    	    $querystring = $data;
+    	}
+    	return $querystring;
+    }
+    function doRequest() {
+        // Performs the actual HTTP request, returning true or false depending on outcome
+		if (!$fp = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout)) {
+		    // Set error message
+            switch($errno) {
+				case -3:
+					$this->errormsg = 'Socket creation failed (-3)';
+				case -4:
+					$this->errormsg = 'DNS lookup failure (-4)';
+				case -5:
+					$this->errormsg = 'Connection refused or timed out (-5)';
+				default:
+					$this->errormsg = 'Connection failed ('.$errno.')';
+			    $this->errormsg .= ' '.$errstr;
+			    $this->debug($this->errormsg);
+			}
+			return false;
+        }
+        socket_set_timeout($fp, $this->timeout);
+        $request = $this->buildRequest();
+        $this->debug('Request', $request);
+        fwrite($fp, $request);
+    	// Reset all the variables that should not persist between requests
+    	$this->headers = array();
+    	$this->content = '';
+    	$this->errormsg = '';
+    	// Set a couple of flags
+    	$inHeaders = true;
+    	$atStart = true;
+    	// Now start reading back the response
+    	while (!feof($fp)) {
+    	    $line = fgets($fp, 4096);
+    	    if ($atStart) {
+    	        // Deal with first line of returned data
+    	        $atStart = false;
+    	        if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
+    	            $this->errormsg = "Status code line invalid: ".htmlentities($line);
+    	            $this->debug($this->errormsg);
+    	            return false;
+    	        }
+    	        $http_version = $m[1]; // not used
+    	        $this->status = $m[2];
+    	        $status_string = $m[3]; // not used
+    	        $this->debug(trim($line));
+    	        continue;
+    	    }
+    	    if ($inHeaders) {
+    	        if (trim($line) == '') {
+    	            $inHeaders = false;
+    	            $this->debug('Received Headers', $this->headers);
+    	            if ($this->headers_only) {
+    	                break; // Skip the rest of the input
+    	            }
+    	            continue;
+    	        }
+    	        if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
+    	            // Skip to the next header
+    	            continue;
+    	        }
+    	        $key = strtolower(trim($m[1]));
+    	        $val = trim($m[2]);
+    	        // Deal with the possibility of multiple headers of same name
+    	        if (isset($this->headers[$key])) {
+    	            if (is_array($this->headers[$key])) {
+    	                $this->headers[$key][] = $val;
+    	            } else {
+    	                $this->headers[$key] = array($this->headers[$key], $val);
+    	            }
+    	        } else {
+    	            $this->headers[$key] = $val;
+    	        }
+    	        continue;
+    	    }
+    	    // We're not in the headers, so append the line to the contents
+    	    $this->content .= $line;
+        }
+        fclose($fp);
+        // If data is compressed, uncompress it
+        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip') {
+            $this->debug('Content is gzip encoded, unzipping it');
+            $this->content = substr($this->content, 10); // See http://www.php.net/manual/en/function.gzencode.php
+            $this->content = gzinflate($this->content);
+        }
+        // If $persist_cookies, deal with any cookies
+        if ($this->persist_cookies && isset($this->headers['set-cookie']) && $this->host == $this->cookie_host) {
+            $cookies = $this->headers['set-cookie'];
+            if (!is_array($cookies)) {
+                $cookies = array($cookies);
+            }
+            foreach ($cookies as $cookie) {
+                if (preg_match('/([^=]+)=([^;]+);/', $cookie, $m)) {
+                    $this->cookies[$m[1]] = $m[2];
+                }
+            }
+            // Record domain of cookies for security reasons
+            $this->cookie_host = $this->host;
+        }
+        // If $persist_referers, set the referer ready for the next request
+        if ($this->persist_referers) {
+            $this->debug('Persisting referer: '.$this->getRequestURL());
+            $this->referer = $this->getRequestURL();
+        }
+        // Finally, if handle_redirects and a redirect is sent, do that
+        if ($this->handle_redirects) {
+            if (++$this->redirect_count >= $this->max_redirects) {
+                $this->errormsg = 'Number of redirects exceeded maximum ('.$this->max_redirects.')';
+                $this->debug($this->errormsg);
+                $this->redirect_count = 0;
+                return false;
+            }
+            $location = isset($this->headers['location']) ? $this->headers['location'] : '';
+            $uri = isset($this->headers['uri']) ? $this->headers['uri'] : '';
+            if ($location || $uri) {
+                $url = parse_url($location.$uri);
+                // This will FAIL if redirect is to a different site
+                return $this->get($url['path']);
+            }
+        }
+        return true;
+    }
+    function buildRequest() {
+        $headers = array();
+        $headers[] = "{$this->method} {$this->path} HTTP/1.0"; // Using 1.1 leads to all manner of problems, such as "chunked" encoding
+        $headers[] = "Host: {$this->host}";
+        $headers[] = "User-Agent: {$this->user_agent}";
+        $headers[] = "Accept: {$this->accept}";
+        if ($this->use_gzip) {
+            $headers[] = "Accept-encoding: {$this->accept_encoding}";
+        }
+        $headers[] = "Accept-language: {$this->accept_language}";
+        if ($this->referer) {
+            $headers[] = "Referer: {$this->referer}";
+        }
+    	// Cookies
+    	if ($this->cookies) {
+    	    $cookie = 'Cookie: ';
+    	    foreach ($this->cookies as $key => $value) {
+    	        $cookie .= "$key=$value; ";
+    	    }
+    	    $headers[] = $cookie;
+    	}
+    	// Basic authentication
+    	if ($this->username && $this->password) {
+    	    $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
+    	}
+    	// If this is a POST, set the content type and length
+    	if ($this->postdata) {
+    	    $headers[] = 'Content-Type: application/x-www-form-urlencoded';
+    	    $headers[] = 'Content-Length: '.strlen($this->postdata);
+    	}
+    	$request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
+    	return $request;
+    }
+    function getStatus() {
+        return $this->status;
+    }
+    function getContent() {
+        return $this->content;
+    }
+    function getHeaders() {
+        return $this->headers;
+    }
+    function getHeader($header) {
+        $header = strtolower($header);
+        if (isset($this->headers[$header])) {
+            return $this->headers[$header];
+        } else {
+            return false;
+        }
+    }
+    function getError() {
+        return $this->errormsg;
+    }
+    function getCookies() {
+        return $this->cookies;
+    }
+    function getRequestURL() {
+        $url = 'http://'.$this->host;
+        if ($this->port != 80) {
+            $url .= ':'.$this->port;
+        }            
+        $url .= $this->path;
+        return $url;
+    }
+    // Setter methods
+    function setUserAgent($string) {
+        $this->user_agent = $string;
+    }
+    function setAuthorization($username, $password) {
+        $this->username = $username;
+        $this->password = $password;
+    }
+    function setCookies($array) {
+        $this->cookies = $array;
+    }
+    // Option setting methods
+    function useGzip($boolean) {
+        $this->use_gzip = $boolean;
+    }
+    function setPersistCookies($boolean) {
+        $this->persist_cookies = $boolean;
+    }
+    function setPersistReferers($boolean) {
+        $this->persist_referers = $boolean;
+    }
+    function setHandleRedirects($boolean) {
+        $this->handle_redirects = $boolean;
+    }
+    function setMaxRedirects($num) {
+        $this->max_redirects = $num;
+    }
+    function setHeadersOnly($boolean) {
+        $this->headers_only = $boolean;
+    }
+    function setDebug($boolean) {
+        $this->debug = $boolean;
+    }
+    // "Quick" static methods
+    function quickGet($url) {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        if (isset($bits['query'])) {
+            $path .= '?'.$bits['query'];
+        }
+        $client = new HttpClient($host, $port);
+        if (!$client->get($path)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    function quickPost($url, $data) {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        $client = new HttpClient($host, $port);
+        if (!$client->post($path, $data)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    function debug($msg, $object = false) {
+        if ($this->debug) {
+            print '<div style="border: 1px solid red; padding: 0.5em; margin: 0.5em;"><strong>HttpClient Debug:</strong> '.$msg;
+            if ($object) {
+                ob_start();
+        	    print_r($object);
+        	    $content = htmlentities(ob_get_contents());
+        	    ob_end_clean();
+        	    print '<pre>'.$content.'</pre>';
+        	}
+        	print '</div>';
+        }
+    }   
+}
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyGoogleSpell.class.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyGoogleSpell.class.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyGoogleSpell.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyGoogleSpell.class.php	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,73 @@
+<?php
+/* * 
+ * Tiny Spelling Interface for TinyMCE Spell Checking.
+ *
+ * Copyright  2006 Moxiecode Systems AB
+ */
+
+require_once("HttpClient.class.php");
+
+class TinyGoogleSpell {
+	var $lang;
+
+	function TinyGoogleSpell(&$config, $lang, $mode, $spelling, $jargon, $encoding) {
+		$this->lang = $lang;
+	}
+
+	// Returns array with bad words or false if failed.
+	function checkWords($word_array) {
+		$words = array();
+		$wordstr = implode(' ', $word_array);
+
+		$matches = $this->_getMatches($wordstr);
+
+		for ($i=0; $i<count($matches); $i++)
+			$words[] = substr($wordstr, $matches[$i][1], $matches[$i][2]);
+
+		return $words;
+	}
+
+	// Returns array with suggestions or false if failed.
+	function getSuggestion($word) {
+		$sug = array();
+
+		$matches = $this->_getMatches($word);
+
+		if (count($matches) > 0)
+			$sug = explode("\t", $matches[0][4]);
+
+		return $sug;
+	}
+
+	function _getMatches($word_list) {
+		$xml = "";
+
+		// Setup HTTP Client
+		$client = new HttpClient('www.google.com');
+		$client->setUserAgent('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR');
+		$client->setHandleRedirects(false);
+		$client->setDebug(false);
+
+		// Setup XML request
+		$xml .= '<?xml version="1.0" encoding="utf-8" ?>';
+		$xml .= '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">';
+		$xml .= '<text>' . htmlentities($word_list) . '</text></spellrequest>';
+
+		// Execute HTTP Post to Google
+		if (!$client->post('/tbproxy/spell?lang=' . $this->lang, $xml)) {
+			$this->errorMsg[] = 'An error occurred: ' . $client->getError();
+			return array();
+		}
+
+		// Grab and parse content
+		$xml = $client->getContent();
+		preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $xml, $matches, PREG_SET_ORDER);
+
+		return $matches;
+	}
+}
+
+// Setup classname, should be the same as the name of the spellchecker class
+$spellCheckerConfig['class'] = "TinyGoogleSpell";
+
+?>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspell.class.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspell.class.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspell.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspell.class.php	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,64 @@
+<?php
+/* * 
+ * Tiny Spelling Interface for TinyMCE Spell Checking.
+ *
+ * Copyright  2006 Moxiecode Systems AB
+ *
+ */
+
+class TinyPSpell {
+	var $lang;
+	var $mode;
+	var $string;
+	var $plink;
+	var $errorMsg;
+
+	var $jargon;
+	var $spelling;
+	var $encoding;
+
+	function TinyPSpell(&$config, $lang, $mode, $spelling, $jargon, $encoding) {
+		$this->lang = $lang;
+		$this->mode = $mode;
+		$this->plink = false;
+		$this->errorMsg = array();
+
+		if (!function_exists("pspell_new")) {
+			$this->errorMsg[] = "PSpell not found.";
+			return;
+		}
+
+		$this->plink = pspell_new($this->lang, $this->spelling, $this->jargon, $this->encoding, $this->mode);
+	}
+
+	// Returns array with bad words or false if failed.
+	function checkWords($wordArray) {
+		if (!$this->plink) {
+			$this->errorMsg[] = "No PSpell link found for checkWords.";
+			return array();
+		}
+
+		$wordError = array();
+		foreach($wordArray as $word) {
+			if(!pspell_check($this->plink, trim($word)))
+				$wordError[] = $word;
+		}
+
+		return $wordError;
+	}
+
+	// Returns array with suggestions or false if failed.
+	function getSuggestion($word) {
+		if (!$this->plink) {
+			$this->errorMsg[] = "No PSpell link found for getSuggestion.";
+			return array();
+		}
+
+		return pspell_suggest($this->plink, $word);
+	}
+}
+
+// Setup classname, should be the same as the name of the spellchecker class
+$spellCheckerConfig['class'] = "TinyPspell";
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspellShell.class.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspellShell.class.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspellShell.class.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspellShell.class.php	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,100 @@
+<?php
+/* * 
+ * Tiny Spelling Interface for TinyMCE Spell Checking.
+ *
+ * Copyright  2006 Moxiecode Systems AB
+ *
+ */
+
+class TinyPspellShell {
+	var $lang;
+	var $mode;
+	var $string;
+	var $error;
+	var $errorMsg;
+
+	var $cmd;
+	var $tmpfile;
+
+	var $jargon;
+	var $spelling;
+	var $encoding;
+
+	function TinyPspellShell(&$config, $lang, $mode, $spelling, $jargon, $encoding) {
+		$this->lang = $lang;
+		$this->mode = $mode;
+		$this->error = false;
+		$this->errorMsg = array();
+
+		$this->tmpfile = tempnam($config['tinypspellshell.tmp'], "tinyspell");
+    	$this->cmd = "cat ". $this->tmpfile ." | " . $config['tinypspellshell.aspell'] . " -a --lang=". $this->lang;
+	}
+
+	// Returns array with bad words or false if failed.
+	function checkWords($wordArray) {
+		if ($fh = fopen($this->tmpfile, "w")) {
+			fwrite($fh, "!\n");
+			foreach($wordArray as $key => $value)
+				fwrite($fh, "^" . $value . "\n");
+
+			fclose($fh);
+		} else {
+			$this->errorMsg[] = "PSpell not found.";
+			return array();
+		}
+
+		$data = shell_exec($this->cmd);
+		$returnData = array();
+		$dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY);
+
+		foreach($dataArr as $dstr) {
+			$matches = array();
+
+			// Skip this line.
+			if (strpos($dstr, "@") === 0)
+				continue;
+
+			preg_match("/\& (.*) .* .*: .*/i", $dstr, $matches);
+
+			if (!empty($matches[1]))
+				$returnData[] = $matches[1];
+		}
+
+		return $returnData;
+	}
+
+	// Returns array with suggestions or false if failed.
+	function getSuggestion($word) {
+		if ($fh = fopen($this->tmpfile, "w")) {
+			fwrite($fh, "!\n");
+			fwrite($fh, "^$word\n");
+			fclose($fh);
+		} else
+			die("Error opening tmp file.");
+
+		$data = shell_exec($this->cmd);
+		$returnData = array();
+		$dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY);
+
+		foreach($dataArr as $dstr) {
+			$matches = array();
+
+			// Skip this line.
+			if (strpos($dstr, "@") === 0)
+				continue;
+
+			preg_match("/\& .* .* .*: (.*)/i", $dstr, $matches);
+
+			if (!empty($matches[1])) {
+				// For some reason, the exec version seems to add commas?
+				$returnData[] = str_replace(",", "", $matches[1]);
+			}
+		}
+		return $returnData;
+	}
+}
+
+// Setup classname, should be the same as the name of the spellchecker class
+$spellCheckerConfig['class'] = "TinyPspellShell";
+
+?>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/config.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/config.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/config.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/config.php	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,24 @@
+<?php
+	$spellCheckerConfig = array();
+
+	// Spellchecker class use
+	// require_once("classes/TinyPspellShell.class.php"); // Command line pspell
+	require_once("classes/TinyGoogleSpell.class.php"); // Google web service
+	// require_once("classes/TinyPspell.class.php"); // Internal PHP version
+
+	// General settings
+	$spellCheckerConfig['enabled'] = true;
+
+	// Default settings
+	$spellCheckerConfig['default.language'] = 'en';
+	$spellCheckerConfig['default.mode'] = PSPELL_FAST;
+
+	// Normaly not required to configure
+	$spellCheckerConfig['default.spelling'] = "";
+	$spellCheckerConfig['default.jargon'] = "";
+	$spellCheckerConfig['default.encoding'] = "";
+
+	// Pspell shell specific settings
+	$spellCheckerConfig['tinypspellshell.aspell'] = '/usr/bin/aspell';
+	$spellCheckerConfig['tinypspellshell.tmp'] = '/tmp';
+?>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/content.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/content.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/content.css	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,5 @@
+.mceItemHiddenSpellWord {
+	background: url('../images/wline.gif') repeat-x bottom left;
+	bo2rder-bottom: 1px dashed red;
+	cursor: default;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/spellchecker.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/spellchecker.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/spellchecker.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/spellchecker.css	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,34 @@
+.mceMsgBox {
+	border: 1px solid gray;
+	padding: 8px;
+}
+
+.mceMsgBox span {
+	vertical-align: top;
+	color: #555555;
+}
+
+/* Misc */
+
+.mceBlockBox {
+	display: none;
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 100;
+	filter:progid:DXImageTransform.Microsoft.Alpha(style=0, opacity=60);
+	-moz-opacity:0.6;
+	opacity: 0.6;
+	background-color: white;
+}
+
+.mceMsgBox {
+	display: none;
+	z-index: 101;
+	position: absolute;
+	left: 0;
+	top: 0;
+	font-family: Arial, Verdana, Tahoma, Helvetica;
+	font-weight: bold;
+	font-size: 11px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,2 @@
+tinyMCE.importPluginLanguagePack('spellchecker','en,sv,nn,nb');var TinyMCE_SpellCheckerPlugin={_contextMenu:new TinyMCE_Menu(),_menu:new TinyMCE_Menu(),_counter:0,getInfo:function(){return{longname:'Spellchecker',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_spellchecker.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},handleEvent:function(e){var elm=tinyMCE.isMSIE?e.srcElement:e.target;var inst=tinyMCE.selectedInstance,args='';var self=TinyMCE_SpellCheckerPlugin;var cm=self._contextMenu;var p,p2,x,y,sx,sy,h,elm;if((e.type=="click"||e.type=="contextmenu")&&elm){do{if(tinyMCE.getAttrib(elm,'class')=="mceItemHiddenSpellWord"){inst.spellCheckerElm=elm;args+='id='+inst.editorId+"|"+(++self._counter);args+='&cmd=suggest&check='+escape(elm.innerHTML);args+='&lang='+escape(inst.spellCheckerLang);elm=inst.spellCheckerElm;p=tinyMCE.getAbsPosition(inst.iframeElement);p2=tinyMCE.getAbsPosition(elm);h=parseInt(elm.offsetHeight);sx=inst.getBody().scrollLeft;sy=inst.getBody().scrollTop;x=p.absLeft+p2.absLeft-sx;y=p.absTop+p2.absTop-sy+h;cm.clear();cm.addTitle(tinyMCE.getLang('lang_spellchecker_wait','',true));cm.show();cm.moveTo(x,y);inst.selection.selectNode(elm,false,false);self._sendAjax(self.baseURL+"/tinyspell.php",self._ajaxResponse,'post',args);tinyMCE.cancelEvent(e);return false;}}while((elm=elm.parentNode));}return true;},initInstance:function(inst){var self=TinyMCE_SpellCheckerPlugin,m=self._menu,cm=self._contextMenu,e;tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/plugins/spellchecker/css/content.css");if(!tinyMCE.hasMenu('spellcheckercontextmenu')){tinyMCE.importCSS(document,tinyMCE.baseURL+"/plugins/spellchecker/css/spellchecker.css");cm.init({drop_menu:false});tinyMCE.addMenu('spellcheckercontextmenu',cm);}if(!tinyMCE.hasMenu('spellcheckermenu')){m.init({});tinyMCE.addMenu('spellcheckermenu',m);}inst.spellCheckerLang='en';self._buildSettingsMenu(inst,null);e=self._getBlockBoxLayer(inst).create('div','mceBlockBox',document.getElementById(inst.editorId+'_parent'));self._getMsgBoxLayer(inst).create('div','mceMsgBox',document.getElementById(inst.editorId+'_parent'));},_getMsgBoxLayer:function(inst){if(!inst.spellCheckerMsgBoxL)inst.spellCheckerMsgBoxL=new TinyMCE_Layer(inst.editorId+'_spellcheckerMsgBox',false);return inst.spellCheckerMsgBoxL;},_getBlockBoxLayer:function(inst){if(!inst.spellCheckerBoxL)inst.spellCheckerBoxL=new TinyMCE_Layer(inst.editorId+'_spellcheckerBlockBox',false);return inst.spellCheckerBoxL;},_buildSettingsMenu:function(inst,lang){var i,ar=tinyMCE.getParam('spellchecker_languages','+English=en').split(','),p;var self=TinyMCE_SpellCheckerPlugin,m=self._menu,c;m.clear();m.addTitle(tinyMCE.getLang('lang_spellchecker_langs','',true));for(i=0;i<ar.length;i++){if(ar[i]!=''){p=ar[i].split('=');c='mceMenuCheckItem';if(p[0].charAt(0)=='+'){p[0]=p[0].substring(1);if(lang==null){c='mceMenuSelectedItem';inst.spellCheckerLang=p[1];}}if(lang==p[1])c='mceMenuSelectedItem';m.add({text:p[0],js:"tinyMCE.execInstanceCommand('"+inst.editorId+"','mceSpellCheckerSetLang',false,'"+p[1]+"');",class_name:c});}}},setupContent:function(editor_id,body,doc){TinyMCE_SpellCheckerPlugin._removeWords(doc);},getControlHTML:function(cn){switch(cn){case"spellchecker":return TinyMCE_SpellCheckerPlugin._getMenuButtonHTML(cn,'lang_spellchecker_desc','{$pluginurl}/images/spellchecker.gif','lang_spellchecker_desc','mceSpellCheckerMenu','mceSpellCheck');}return"";},_getMenuButtonHTML:function(id,lang,img,mlang,mid,cmd,ui,val){var h='',m,x;cmd='tinyMCE.hideMenus();tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+cmd+'\'';if(typeof(ui)!="undefined"&&ui!=null)cmd+=','+ui;if(typeof(val)!="undefined"&&val!=null)cmd+=",'"+val+"'";cmd+=');';if(tinyMCE.getParam('button_tile_map')&&(!tinyMCE.isMSIE||tinyMCE.isOpera)&&(m=tinyMCE.buttonMap[id])!=null&&(tinyMCE.getParam("language")=="en"||img.indexOf('$lang')==-1)){x=0-(m*20)==0?'0':0-(m*20);h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';h+='<img src="{$themeurl}/images/spacer.gif" style="background-position: '+x+'px 0" title="{$'+lang+'}" />';h+='<img src="{$themeurl}/images/button_menu.gif" title="{$'+lang+'}" class="mceMenuButton" onclick="'+mcmd+'return false;" />';h+='</a>';}else{if(tinyMCE.isMSIE&&!tinyMCE.isOpera)h+='<span id="{$editor_id}_'+id+'" class="mceMenuButton" onmouseover="tinyMCE.plugins.spellchecker._menuButtonEvent(\'over\',this);" onmouseout="tinyMCE.plugins.spellchecker._menuButtonEvent(\'out\',this);">';else h+='<span id="{$editor_id}_'+id+'" class="mceMenuButton">';h+='<a href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceMenuButtonNormal" target="_self">';h+='<img src="'+img+'" title="{$'+lang+'}" /></a>';h+='<a href="#" onclick="tinyMCE.plugins.spellchecker._toggleMenu(\'{$editor_id}\',\''+mid+'\');return false;" onmousedown="return false;"><img src="{$themeurl}/images/button_menu.gif" title="{$'+lang+'}" class="mceMenuButton" />';h+='</a></span>';}return h;},_menuButtonEvent:function(e,o){if(o.className=='mceMenuButtonFocus')return;if(e=='over')o.className=o.className+' mceMenuHover';else o.className=o.className.replace(/\s.*$/,'');},_toggleMenu:function(editor_id,id){var self=TinyMCE_SpellCheckerPlugin;var e=document.getElementById(editor_id+'_spellchecker');var inst=tinyMCE.getInstanceById(editor_id);if(self._menu.isVisible()){tinyMCE.hideMenus();return;}tinyMCE.lastMenuBtnClass=e.className.replace(/\s.*$/,'');tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButtonFocus');self._menu.moveRelativeTo(e,'bl');self._menu.moveBy(tinyMCE.isMSIE&&!tinyMCE.isOpera?0:1,-1);if(tinyMCE.isOpera)self._menu.moveBy(0,-2);self._onMenuEvent(inst,self._menu,'show');self._menu.show();tinyMCE.lastSelectedMenuBtn=editor_id+'_spellchecker';},_onMenuEvent:function(inst,m,n){TinyMCE_SpellCheckerPlugin._buildSettingsMenu(inst,inst.spellCheckerLang);},execCommand:function(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id),self=TinyMCE_SpellCheckerPlugin,args='',co,bb,mb,nl,i,e;switch(command){case"mceSpellCheck":if(!inst.spellcheckerOn){inst.spellCheckerBookmark=inst.selection.getBookmark();args+='id='+inst.editorId+"|"+(++self._counter);args+='&cmd=spell&check='+escape(self._getWordList(inst.getBody())).replace(/%20/g,'+');args+='&lang='+escape(inst.spellCheckerLang);co=document.getElementById(inst.editorId+'_parent').firstChild;bb=self._getBlockBoxLayer(inst);bb.moveRelativeTo(co,'tl');bb.resizeTo(co.offsetWidth,co.offsetHeight);bb.show();mb=self._getMsgBoxLayer(inst);e=mb.getElement();e.innerHTML='<span>'+tinyMCE.getLang('lang_spellchecker_swait','',true)+'</span>';mb.show();mb.moveRelativeTo(co,'cc');if(tinyMCE.isMSIE&&!tinyMCE.isOpera){nl=co.getElementsByTagName('select');for(i=0;i<nl.length;i++)nl[i].disabled=true;}inst.spellcheckerOn=true;tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButtonSelected');self._sendAjax(self.baseURL+"/tinyspell.php",self._ajaxResponse,'post',args);}else{self._removeWords(inst.getDoc());inst.spellcheckerOn=false;tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButton');}return true;case"mceSpellCheckReplace":if(inst.spellCheckerElm)tinyMCE.setOuterHTML(inst.spellCheckerElm,value);self._checkDone(inst);self._contextMenu.hide();self._menu.hide();return true;case"mceSpellCheckIgnore":if(inst.spellCheckerElm)self._removeWord(inst.spellCheckerElm);self._checkDone(inst);self._contextMenu.hide();self._menu.hide();return true;case"mceSpellCheckIgnoreAll":if(inst.spellCheckerElm)self._removeWords(inst.getDoc(),inst.spellCheckerElm.innerHTML);self._checkDone(inst);self._contextMenu.hide();self._menu.hide();return true;case"mceSpellCheckerSetLang":tinyMCE.hideMenus();inst.spellCheckerLang=value;self._removeWords(inst.getDoc());inst.spellcheckerOn=false;tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButton');return true;}return false;},cleanup:function(type,content,inst){switch(type){case"get_from_editor_dom":TinyMCE_SpellCheckerPlugin._removeWords(content);inst.spellcheckerOn=false;break;}return content;},_displayUI:function(inst){var self=TinyMCE_SpellCheckerPlugin;var bb=self._getBlockBoxLayer(inst);var mb=self._getMsgBoxLayer(inst);var nl,i;var co=document.getElementById(inst.editorId+'_parent').firstChild;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){nl=co.getElementsByTagName('select');for(i=0;i<nl.length;i++)nl[i].disabled=false;}bb.hide();mb.hide();},_ajaxResponse:function(xml){var el=xml?xml.documentElement:null;var inst=tinyMCE.selectedInstance,self=TinyMCE_SpellCheckerPlugin;var cmd=el?el.getAttribute("cmd"):null,err,id=el?el.getAttribute("id"):null;if(id)inst=tinyMCE.getInstanceById(id.substring(0,id.indexOf('|')));self._displayUI(inst);if(cmd=="suggest"&&id!=inst.editorId+"|"+self._counter)return;if(!el){inst.spellcheckerOn=false;tinyMCE.switchClass(inst.editorId+'_spellchecker','mceMenuButton');alert("Could not execute AJAX call, server didn't return valid a XML.");return;}err=el.getAttribute("error");if(err=="true"){inst.spellcheckerOn=false;tinyMCE.switchClass(inst.editorId+'_spellchecker','mceMenuButton');alert(el.getAttribute("msg"));return;}switch(cmd){case"spell":if(xml.documentElement.firstChild){self._markWords(inst.getDoc(),inst.getBody(),el.firstChild.nodeValue.split(' '));inst.selection.moveToBookmark(inst.spellCheckerBookmark);}else alert(tinyMCE.getLang('lang_spellchecker_no_mpell','',true));self._checkDone(inst);break;case"suggest":self._buildMenu(el.firstChild?el.firstChild.nodeValue.split(' '):null,10);self._contextMenu.show();break;}},_getWordSeparators:function(){var i,re='',ch=tinyMCE.getParam('spellchecker_word_separator_chars','\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}\u201d\u201c');for(i=0;i<ch.length;i++)re+='\\'+ch.charAt(i);return re;},_getWordList:function(n){var i,x,s,nv='',nl=tinyMCE.getNodeTree(n,new Array(),3),wl=new Array();var re=TinyMCE_SpellCheckerPlugin._getWordSeparators();for(i=0;i<nl.length;i++)nv+=nl[i].nodeValue+" ";nv=nv.replace(new RegExp('([0-9]|['+re+'])','g'),' ');nv=tinyMCE.trim(nv.replace(/(\s+)/g,' '));nl=nv.split(/\s+/);for(i=0;i<nl.length;i++){s=false;for(x=0;x<wl.length;x++){if(wl[x]==nl[i]){s=true;break;}}if(!s)wl[wl.length]=nl[i];}return wl.join(' ');},_removeWords:function(doc,word){var i,c,nl=doc.getElementsByTagName("span");var self=TinyMCE_SpellCheckerPlugin;var inst=tinyMCE.selectedInstance,b=inst?inst.selection.getBookmark():null;word=typeof(word)=='undefined'?null:word;for(i=nl.length-1;i>=0;i--){c=tinyMCE.getAttrib(nl[i],'class');if((c=='mceItemHiddenSpellWord'||c=='mceItemHidden')&&(word==null||nl[i].innerHTML==word))self._removeWord(nl[i]);}if(b)inst.selection.moveToBookmark(b);},_checkDone:function(inst){var i,w=0,nl=inst.getDoc().getElementsByTagName("span")
+var self=TinyMCE_SpellCheckerPlugin;for(i=nl.length-1;i>=0;i--){c=tinyMCE.getAttrib(nl[i],'class');if(c=='mceItemHiddenSpellWord')w++;}if(w==0){self._removeWords(inst.getDoc());inst.spellcheckerOn=false;tinyMCE.switchClass(inst.editorId+'_spellchecker','mceMenuButton');}},_removeWord:function(e){tinyMCE.setOuterHTML(e,e.innerHTML);},_markWords:function(doc,n,wl){var i,nv,nn,nl=tinyMCE.getNodeTree(n,new Array(),3);var r1,r2,r3,r4,r5,w='';var re=TinyMCE_SpellCheckerPlugin._getWordSeparators();for(i=0;i<wl.length;i++)w+=wl[i]+((i==wl.length-1)?'':'|');r1=new RegExp('(['+re+'])('+w+')(['+re+'])','g');r2=new RegExp('^('+w+')','g');r3=new RegExp('('+w+')(['+re+']?)$','g');r4=new RegExp('^('+w+')(['+re+']?)$','g');r5=new RegExp('('+w+')(['+re+'])','g');for(i=0;i<nl.length;i++){nv=nl[i].nodeValue;if(r1.test(nv)||r2.test(nv)||r3.test(nv)||r4.test(nv)){nv=tinyMCE.xmlEncode(nv);nv=nv.replace(r5,'<span class="mceItemHiddenSpellWord">$1</span>$2');nv=nv.replace(r3,'<span class="mceItemHiddenSpellWord">$1</span>$2');nn=doc.createElement('span');nn.className="mceItemHidden";nn.innerHTML=nv;nl[i].parentNode.replaceChild(nn,nl[i]);}}},_buildMenu:function(sg,max){var i,self=TinyMCE_SpellCheckerPlugin,cm=self._contextMenu;cm.clear();if(sg!=null){cm.addTitle(tinyMCE.getLang('lang_spellchecker_sug','',true));for(i=0;i<sg.length&&i<max;i++)cm.addItem(sg[i],'tinyMCE.execCommand("mceSpellCheckReplace",false,"'+sg[i]+'");');cm.addSeparator();cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_word','',true),'tinyMCE.execCommand(\'mceSpellCheckIgnore\');');cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_words','',true),'tinyMCE.execCommand(\'mceSpellCheckIgnoreAll\');');}else cm.addTitle(tinyMCE.getLang('lang_spellchecker_no_sug','',true));cm.update();},_getAjaxHTTP:function(){try{return new ActiveXObject('Msxml2.XMLHTTP')}catch(e){try{return new ActiveXObject('Microsoft.XMLHTTP')}catch(e){return new XMLHttpRequest();}}},_sendAjax:function(u,f,m,a){var x=TinyMCE_SpellCheckerPlugin._getAjaxHTTP();x.open(m,u,true);x.onreadystatechange=function(){if(x.readyState==4)f(x.responseXML);};if(m=='post')x.setRequestHeader('Content-type','application/x-www-form-urlencoded');x.send(a);}};tinyMCE.addPlugin('spellchecker',TinyMCE_SpellCheckerPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,573 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.4 $
+ * $Date: 2006/03/24 17:24:50 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+tinyMCE.importPluginLanguagePack('spellchecker', 'en,sv,nn,nb');
+
+// Plucin static class
+var TinyMCE_SpellCheckerPlugin = {
+	_contextMenu : new TinyMCE_Menu(),
+	_menu : new TinyMCE_Menu(),
+	_counter : 0,
+
+	getInfo : function() {
+		return {
+			longname : 'Spellchecker',
+			author : 'Moxiecode Systems AB',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_spellchecker.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	handleEvent : function(e) {
+		var elm = tinyMCE.isMSIE ? e.srcElement : e.target;
+		var inst = tinyMCE.selectedInstance, args = '';
+		var self = TinyMCE_SpellCheckerPlugin;
+		var cm = self._contextMenu;
+		var p, p2, x, y, sx, sy, h, elm;
+
+		// Handle click on word
+		if ((e.type == "click" || e.type == "contextmenu") && elm) {
+			do {
+				if (tinyMCE.getAttrib(elm, 'class') == "mceItemHiddenSpellWord") {
+					inst.spellCheckerElm = elm;
+
+					// Setup arguments
+					args += 'id=' + inst.editorId + "|" + (++self._counter);
+					args += '&cmd=suggest&check=' + escape(elm.innerHTML);
+					args += '&lang=' + escape(inst.spellCheckerLang);
+
+					elm = inst.spellCheckerElm;
+					p = tinyMCE.getAbsPosition(inst.iframeElement);
+					p2 = tinyMCE.getAbsPosition(elm);
+					h = parseInt(elm.offsetHeight);
+					sx = inst.getBody().scrollLeft;
+					sy = inst.getBody().scrollTop;
+					x = p.absLeft + p2.absLeft - sx;
+					y = p.absTop + p2.absTop - sy + h;
+
+					cm.clear();
+					cm.addTitle(tinyMCE.getLang('lang_spellchecker_wait', '', true));
+					cm.show();
+					cm.moveTo(x, y);
+
+					inst.selection.selectNode(elm, false, false);
+
+					self._sendAjax(self.baseURL + "/tinyspell.php", self._ajaxResponse, 'post', args);
+
+					tinyMCE.cancelEvent(e);
+					return false;
+				}
+			} while ((elm = elm.parentNode));
+		}
+
+		return true;
+	},
+
+	initInstance : function(inst) {
+		var self = TinyMCE_SpellCheckerPlugin, m = self._menu, cm = self._contextMenu, e;
+
+		tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/spellchecker/css/content.css");
+
+		if (!tinyMCE.hasMenu('spellcheckercontextmenu')) {
+			tinyMCE.importCSS(document, tinyMCE.baseURL + "/plugins/spellchecker/css/spellchecker.css");
+
+			cm.init({drop_menu : false});
+			tinyMCE.addMenu('spellcheckercontextmenu', cm);
+		}
+
+		if (!tinyMCE.hasMenu('spellcheckermenu')) {
+			m.init({});
+			tinyMCE.addMenu('spellcheckermenu', m);
+		}
+
+        inst.spellCheckerLang = 'en';
+		self._buildSettingsMenu(inst, null);
+
+		e = self._getBlockBoxLayer(inst).create('div', 'mceBlockBox', document.getElementById(inst.editorId + '_parent'));
+		self._getMsgBoxLayer(inst).create('div', 'mceMsgBox', document.getElementById(inst.editorId + '_parent'));
+	},
+
+	_getMsgBoxLayer : function(inst) {
+		if (!inst.spellCheckerMsgBoxL)
+			inst.spellCheckerMsgBoxL = new TinyMCE_Layer(inst.editorId + '_spellcheckerMsgBox', false);
+
+		return inst.spellCheckerMsgBoxL;
+	},
+
+	_getBlockBoxLayer : function(inst) {
+		if (!inst.spellCheckerBoxL)
+			inst.spellCheckerBoxL = new TinyMCE_Layer(inst.editorId + '_spellcheckerBlockBox', false);
+
+		return inst.spellCheckerBoxL;
+	},
+
+	_buildSettingsMenu : function(inst, lang) {
+		var i, ar = tinyMCE.getParam('spellchecker_languages', '+English=en').split(','), p;
+		var self = TinyMCE_SpellCheckerPlugin, m = self._menu, c;
+
+		m.clear();
+		m.addTitle(tinyMCE.getLang('lang_spellchecker_langs', '', true));
+
+		for (i=0; i<ar.length; i++) {
+			if (ar[i] != '') {
+				p = ar[i].split('=');
+				c = 'mceMenuCheckItem';
+
+				if (p[0].charAt(0) == '+') {
+					p[0] = p[0].substring(1);
+
+					if (lang == null) {
+						c = 'mceMenuSelectedItem';
+						inst.spellCheckerLang = p[1];
+					}
+				}
+
+				if (lang == p[1])
+					c = 'mceMenuSelectedItem';
+
+				m.add({text : p[0], js : "tinyMCE.execInstanceCommand('" + inst.editorId + "','mceSpellCheckerSetLang',false,'" + p[1] + "');", class_name : c});
+			}
+		}
+	},
+
+	setupContent : function(editor_id, body, doc) {
+		TinyMCE_SpellCheckerPlugin._removeWords(doc);
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "spellchecker":
+				return TinyMCE_SpellCheckerPlugin._getMenuButtonHTML(cn, 'lang_spellchecker_desc', '{$pluginurl}/images/spellchecker.gif', 'lang_spellchecker_desc', 'mceSpellCheckerMenu', 'mceSpellCheck');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Returns the HTML code for a normal button control.
+	 *
+	 * @param {string} id Button control id, this will be the suffix for the element id, the prefix is the editor id.
+	 * @param {string} lang Language variable key name to insert as the title/alt of the button image.
+	 * @param {string} img Image URL to insert, {$themeurl} and {$pluginurl} will be replaced.
+	 * @param {string} mlang Language variable key name to insert as the title/alt of the menu button image.
+	 * @param {string} mid Menu by id to display when the menu button is pressed.
+	 * @param {string} cmd Command to execute when the user clicks the button.
+	 * @param {string} ui Optional user interface boolean for command.
+	 * @param {string} val Optional value for command.
+	 * @return HTML code for a normal button based in input information.
+	 * @type string
+	 */
+	_getMenuButtonHTML : function(id, lang, img, mlang, mid, cmd, ui, val) {
+		var h = '', m, x;
+
+		cmd = 'tinyMCE.hideMenus();tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + cmd + '\'';
+
+		if (typeof(ui) != "undefined" && ui != null)
+			cmd += ',' + ui;
+
+		if (typeof(val) != "undefined" && val != null)
+			cmd += ",'" + val + "'";
+
+		cmd += ');';
+
+		// Use tilemaps when enabled and found and never in MSIE since it loads the tile each time from cache if cahce is disabled
+		if (tinyMCE.getParam('button_tile_map') && (!tinyMCE.isMSIE || tinyMCE.isOpera) && (m = tinyMCE.buttonMap[id]) != null && (tinyMCE.getParam("language") == "en" || img.indexOf('$lang') == -1)) {
+			// Tiled button
+			x = 0 - (m * 20) == 0 ? '0' : 0 - (m * 20);
+			h += '<a id="{$editor_id}_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';
+			h += '<img src="{$themeurl}/images/spacer.gif" style="background-position: ' + x + 'px 0" title="{$' + lang + '}" />';
+			h += '<img src="{$themeurl}/images/button_menu.gif" title="{$' + lang + '}" class="mceMenuButton" onclick="' + mcmd + 'return false;" />';
+			h += '</a>';
+		} else {
+			if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+				h += '<span id="{$editor_id}_' + id + '" class="mceMenuButton" onmouseover="tinyMCE.plugins.spellchecker._menuButtonEvent(\'over\',this);" onmouseout="tinyMCE.plugins.spellchecker._menuButtonEvent(\'out\',this);">';
+			else
+				h += '<span id="{$editor_id}_' + id + '" class="mceMenuButton">';
+
+			h += '<a href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceMenuButtonNormal" target="_self">';
+			h += '<img src="' + img + '" title="{$' + lang + '}" /></a>';
+			h += '<a href="#" onclick="tinyMCE.plugins.spellchecker._toggleMenu(\'{$editor_id}\',\'' + mid + '\');return false;" onmousedown="return false;"><img src="{$themeurl}/images/button_menu.gif" title="{$' + lang + '}" class="mceMenuButton" />';
+			h += '</a></span>';
+		}
+
+		return h;
+	},
+
+	_menuButtonEvent : function(e, o) {
+		if (o.className == 'mceMenuButtonFocus')
+			return;
+
+		if (e == 'over')
+			o.className = o.className + ' mceMenuHover';
+		else
+			o.className = o.className.replace(/\s.*$/, '');
+	},
+
+	_toggleMenu : function(editor_id, id) {
+		var self = TinyMCE_SpellCheckerPlugin;
+		var e = document.getElementById(editor_id + '_spellchecker');
+		var inst = tinyMCE.getInstanceById(editor_id);
+
+		if (self._menu.isVisible()) {
+			tinyMCE.hideMenus();
+			return;
+		}
+
+		tinyMCE.lastMenuBtnClass = e.className.replace(/\s.*$/, '');
+		tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButtonFocus');
+
+		self._menu.moveRelativeTo(e, 'bl');
+		self._menu.moveBy(tinyMCE.isMSIE && !tinyMCE.isOpera ? 0 : 1, -1);
+
+		if (tinyMCE.isOpera)
+			self._menu.moveBy(0, -2);
+
+        self._onMenuEvent(inst, self._menu, 'show');
+
+		self._menu.show();
+
+		tinyMCE.lastSelectedMenuBtn = editor_id + '_spellchecker';
+	},
+
+	_onMenuEvent : function(inst, m, n) {
+		TinyMCE_SpellCheckerPlugin._buildSettingsMenu(inst, inst.spellCheckerLang);
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		var inst = tinyMCE.getInstanceById(editor_id), self = TinyMCE_SpellCheckerPlugin, args = '', co, bb, mb, nl, i, e;
+
+		// Handle commands
+		switch (command) {
+			case "mceSpellCheck":
+				if (!inst.spellcheckerOn) {
+					inst.spellCheckerBookmark = inst.selection.getBookmark();
+
+					// Setup arguments
+					args += 'id=' + inst.editorId + "|" + (++self._counter);
+					args += '&cmd=spell&check=' + escape(self._getWordList(inst.getBody())).replace(/%20/g, '+');
+					args += '&lang=' + escape(inst.spellCheckerLang);
+
+					co = document.getElementById(inst.editorId + '_parent').firstChild;
+					bb = self._getBlockBoxLayer(inst);
+					bb.moveRelativeTo(co, 'tl');
+					bb.resizeTo(co.offsetWidth, co.offsetHeight);
+					bb.show();
+
+					// Setup message box
+					mb = self._getMsgBoxLayer(inst);
+					e = mb.getElement();
+					e.innerHTML = '<span>' + tinyMCE.getLang('lang_spellchecker_swait', '', true) + '</span>';
+					mb.show();
+					mb.moveRelativeTo(co, 'cc');
+
+					if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+						nl = co.getElementsByTagName('select');
+						for (i=0; i<nl.length; i++)
+							nl[i].disabled = true;
+					}
+
+					inst.spellcheckerOn = true;
+					tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButtonSelected');
+
+					self._sendAjax(self.baseURL + "/tinyspell.php", self._ajaxResponse, 'post', args);
+				} else {
+					self._removeWords(inst.getDoc());
+					inst.spellcheckerOn = false;
+					tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButton');
+				}
+
+				return true;
+
+			case "mceSpellCheckReplace":
+				if (inst.spellCheckerElm)
+					tinyMCE.setOuterHTML(inst.spellCheckerElm, value);
+
+				self._checkDone(inst);
+				self._contextMenu.hide();
+				self._menu.hide();
+
+				return true;
+
+			case "mceSpellCheckIgnore":
+				if (inst.spellCheckerElm)
+					self._removeWord(inst.spellCheckerElm);
+
+				self._checkDone(inst);
+				self._contextMenu.hide();
+				self._menu.hide();
+				return true;
+
+			case "mceSpellCheckIgnoreAll":
+				if (inst.spellCheckerElm)
+					self._removeWords(inst.getDoc(), inst.spellCheckerElm.innerHTML);
+
+				self._checkDone(inst);
+				self._contextMenu.hide();
+				self._menu.hide();
+				return true;
+
+			case "mceSpellCheckerSetLang":
+				tinyMCE.hideMenus();
+				inst.spellCheckerLang = value;
+				self._removeWords(inst.getDoc());
+				inst.spellcheckerOn = false;
+				tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButton');
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	cleanup : function(type, content, inst) {
+		switch (type) {
+			case "get_from_editor_dom":
+				TinyMCE_SpellCheckerPlugin._removeWords(content);
+				inst.spellcheckerOn = false;
+				break;
+		}
+
+		return content;
+	},
+
+	// Private plugin specific methods
+
+	_displayUI : function(inst) {
+		var self = TinyMCE_SpellCheckerPlugin;
+		var bb = self._getBlockBoxLayer(inst);
+		var mb = self._getMsgBoxLayer(inst);
+		var nl, i;
+		var co = document.getElementById(inst.editorId + '_parent').firstChild;
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+			nl = co.getElementsByTagName('select');
+			for (i=0; i<nl.length; i++)
+				nl[i].disabled = false;
+		}
+
+		bb.hide();
+		mb.hide();
+	},
+
+	_ajaxResponse : function(xml) {
+		var el = xml ? xml.documentElement : null;
+		var inst = tinyMCE.selectedInstance, self = TinyMCE_SpellCheckerPlugin;
+		var cmd = el ? el.getAttribute("cmd") : null, err, id = el ? el.getAttribute("id") : null;
+
+		if (id)
+			inst = tinyMCE.getInstanceById(id.substring(0, id.indexOf('|')));
+
+		self._displayUI(inst);
+
+		// Ignore suggestions for other ajax responses
+		if (cmd == "suggest" && id != inst.editorId + "|" + self._counter)
+			return;
+
+		if (!el) {
+			inst.spellcheckerOn = false;
+			tinyMCE.switchClass(inst.editorId + '_spellchecker', 'mceMenuButton');
+			alert("Could not execute AJAX call, server didn't return valid a XML.");
+			return;
+		}
+
+		err = el.getAttribute("error");
+
+		if (err == "true") {
+			inst.spellcheckerOn = false;
+			tinyMCE.switchClass(inst.editorId + '_spellchecker', 'mceMenuButton');
+			alert(el.getAttribute("msg"));
+			return;
+		}
+
+		switch (cmd) {
+			case "spell":
+				if (xml.documentElement.firstChild) {
+					self._markWords(inst.getDoc(), inst.getBody(), el.firstChild.nodeValue.split(' '));
+					inst.selection.moveToBookmark(inst.spellCheckerBookmark);
+				} else
+					alert(tinyMCE.getLang('lang_spellchecker_no_mpell', '', true));
+
+				self._checkDone(inst);
+
+				break;
+
+			case "suggest":
+				self._buildMenu(el.firstChild ? el.firstChild.nodeValue.split(' ') : null, 10);
+				self._contextMenu.show();
+				break;
+		}
+	},
+
+	_getWordSeparators : function() {
+		var i, re = '', ch = tinyMCE.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}\u201d\u201c');
+
+		for (i=0; i<ch.length; i++)
+			re += '\\' + ch.charAt(i);
+
+		return re;
+	},
+
+	_getWordList : function(n) {
+		var i, x, s, nv = '', nl = tinyMCE.getNodeTree(n, new Array(), 3), wl = new Array();
+		var re = TinyMCE_SpellCheckerPlugin._getWordSeparators();
+
+		for (i=0; i<nl.length; i++)
+			nv += nl[i].nodeValue + " ";
+
+		nv = nv.replace(new RegExp('([0-9]|[' + re + '])', 'g'), ' ');
+		nv = tinyMCE.trim(nv.replace(/(\s+)/g, ' '));
+
+		nl = nv.split(/\s+/);
+		for (i=0; i<nl.length; i++) {
+			s = false;
+			for (x=0; x<wl.length; x++) {
+				if (wl[x] == nl[i]) {
+					s = true;
+					break;
+				}
+			}
+
+			if (!s)
+				wl[wl.length] = nl[i];
+		}
+
+		return wl.join(' ');
+	},
+
+	_removeWords : function(doc, word) {
+		var i, c, nl = doc.getElementsByTagName("span");
+		var self = TinyMCE_SpellCheckerPlugin;
+		var inst = tinyMCE.selectedInstance, b = inst ? inst.selection.getBookmark() : null;
+
+		word = typeof(word) == 'undefined' ? null : word;
+
+		for (i=nl.length-1; i>=0; i--) {
+			c = tinyMCE.getAttrib(nl[i], 'class');
+
+			if ((c == 'mceItemHiddenSpellWord' || c == 'mceItemHidden') && (word == null || nl[i].innerHTML == word))
+				self._removeWord(nl[i]);
+		}
+
+		if (b)
+			inst.selection.moveToBookmark(b);
+	},
+
+	_checkDone : function(inst) {
+		var i, w = 0, nl = inst.getDoc().getElementsByTagName("span")
+		var self = TinyMCE_SpellCheckerPlugin;
+
+		for (i=nl.length-1; i>=0; i--) {
+			c = tinyMCE.getAttrib(nl[i], 'class');
+
+			if (c == 'mceItemHiddenSpellWord')
+				w++;
+		}
+
+		if (w == 0) {
+			self._removeWords(inst.getDoc());
+			inst.spellcheckerOn = false;
+			tinyMCE.switchClass(inst.editorId + '_spellchecker', 'mceMenuButton');
+		}
+	},
+
+	_removeWord : function(e) {
+		tinyMCE.setOuterHTML(e, e.innerHTML);
+	},
+
+	_markWords : function(doc, n, wl) {
+		var i, nv, nn, nl = tinyMCE.getNodeTree(n, new Array(), 3);
+		var r1, r2, r3, r4, r5, w = '';
+		var re = TinyMCE_SpellCheckerPlugin._getWordSeparators();
+
+		for (i=0; i<wl.length; i++)
+			w += wl[i] + ((i == wl.length-1) ? '' : '|');
+
+		r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
+		r2 = new RegExp('^(' + w + ')', 'g');
+		r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
+		r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
+		r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
+
+		for (i=0; i<nl.length; i++) {
+			nv = nl[i].nodeValue;
+			if (r1.test(nv) || r2.test(nv) || r3.test(nv) || r4.test(nv)) {
+				nv = tinyMCE.xmlEncode(nv);
+				nv = nv.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+				nv = nv.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+
+				nn = doc.createElement('span');
+				nn.className = "mceItemHidden";
+				nn.innerHTML = nv;
+
+				// Remove old text node
+				nl[i].parentNode.replaceChild(nn, nl[i]);
+			}
+		}
+	},
+
+	_buildMenu : function(sg, max) {
+		var i, self = TinyMCE_SpellCheckerPlugin, cm = self._contextMenu;
+
+		cm.clear();
+
+		if (sg != null) {
+			cm.addTitle(tinyMCE.getLang('lang_spellchecker_sug', '', true));
+
+			for (i=0; i<sg.length && i<max; i++)
+				cm.addItem(sg[i], 'tinyMCE.execCommand("mceSpellCheckReplace",false,"' + sg[i] + '");');
+
+			cm.addSeparator();
+			cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_word', '', true), 'tinyMCE.execCommand(\'mceSpellCheckIgnore\');');
+			cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_words', '', true), 'tinyMCE.execCommand(\'mceSpellCheckIgnoreAll\');');
+		} else
+			cm.addTitle(tinyMCE.getLang('lang_spellchecker_no_sug', '', true));
+
+		cm.update();
+	},
+
+	_getAjaxHTTP : function() {
+		try {
+			return new ActiveXObject('Msxml2.XMLHTTP')
+		} catch (e) {
+			try {
+				return new ActiveXObject('Microsoft.XMLHTTP')
+			} catch (e) {
+				return new XMLHttpRequest();
+			}
+		}
+	},
+
+	/**
+	 * Perform AJAX call.
+	 *
+	 * @param {string} u URL of AJAX service.
+	 * @param {function} f Function to call when response arrives.
+	 * @param {string} m Request method post or get.
+	 * @param {Array} a Array with arguments to send.
+	 */
+	_sendAjax : function(u, f, m, a) {
+		var x = TinyMCE_SpellCheckerPlugin._getAjaxHTTP();
+
+		x.open(m, u, true);
+
+		x.onreadystatechange = function() {
+			if (x.readyState == 4)
+				f(x.responseXML);
+		};
+
+		if (m == 'post')
+			x.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+
+		x.send(a);
+	}
+};
+
+// Register plugin
+tinyMCE.addPlugin('spellchecker', TinyMCE_SpellCheckerPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/spellchecker.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/spellchecker.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/wline.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/wline.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/en.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,14 @@
+// UK lang variables
+
+tinyMCE.addToLang('spellchecker',{
+	desc : 'Toggle spellchecker',
+	menu : 'Spellchecker settings',
+	ignore_word : 'Ignore word',
+	ignore_words : 'Ignore all',
+	langs : 'Languages',
+	wait : 'Please wait...',
+	swait : 'Spellchecking, please wait...',
+	sug : 'Suggestions',
+	no_sug : 'No suggestions',
+	no_mpell : 'No misspellings found.'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/tinyspell.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/tinyspell.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/tinyspell.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/spellchecker/tinyspell.php	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,133 @@
+<?php
+/**
+ * $RCSfile: tinyspell.php,v $
+ * $Revision: 1.1 $
+ * $Date: 2006/03/14 17:33:47 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+	require_once("config.php");
+
+	$id = sanitize($_POST['id'], "loose");
+
+	if (!$spellCheckerConfig['enabled']) {
+		header('Content-type: text/xml; charset=utf-8');
+		echo '<?xml version="1.0" encoding="utf-8" ?><res id="' . $id . '" error="true" msg="You must enable the spellchecker by modifying the config.php file." />';
+		die;
+	}
+
+	// Basic config
+	$defaultLanguage = $spellCheckerConfig['default.language'];
+	$defaultMode = $spellCheckerConfig['default.mode'];
+
+	// Normaly not required to configure
+	$defaultSpelling = $spellCheckerConfig['default.spelling'];
+	$defaultJargon = $spellCheckerConfig['default.jargon'];
+	$defaultEncoding = $spellCheckerConfig['default.encoding'];
+	$outputType = "xml"; // Do not change
+
+	// Get input parameters.
+
+	$check = $_POST['check'];
+	$cmd = sanitize($_POST['cmd']);
+	$lang = sanitize($_POST['lang'], "strict");
+	$mode = sanitize($_POST['mode'], "strict");
+	$spelling = sanitize($_POST['spelling'], "strict");
+	$jargon = sanitize($_POST['jargon'], "strict");
+	$encoding = sanitize($_POST['encoding'], "strict");
+	$sg = sanitize($_POST['sg'], "bool");
+	$words = array();
+
+	$validRequest = true;
+
+	if (empty($check))
+		$validRequest = false;
+
+	if (empty($lang))
+		$lang = $defaultLanguage;
+
+	if (empty($mode))
+		$mode = $defaultMode;
+
+	if (empty($spelling))
+		$spelling = $defaultSpelling;
+
+	if (empty($jargon))
+		$jargon = $defaultJargon;
+
+	if (empty($encoding))
+		$encoding = $defaultEncoding;
+
+	function sanitize($str, $type="strict") {
+		switch ($type) {
+			case "strict":
+				$str = preg_replace("/[^a-zA-Z0-9_\-]/i", "", $str);
+			break;
+			case "loose":
+				$str = preg_replace("/</i", "&gt;", $str);
+				$str = preg_replace("/>/i", "&lt;", $str);
+			break;
+			case "bool":
+				if ($str == "true" || $str == true)
+					$str = true;
+				else
+					$str = false;
+			break;
+		}
+
+		return $str;
+	}
+
+	$result = array();
+	$tinyspell = new $spellCheckerConfig['class']($spellCheckerConfig, $lang, $mode, $spelling, $jargon, $encoding);
+
+	if (count($tinyspell->errorMsg) == 0) {
+		switch($cmd) {
+			case "spell":
+				// Space for non-exec version and \n for the exec version.
+				$words = preg_split("/ |\n/", $check, -1, PREG_SPLIT_NO_EMPTY);
+				$result = $tinyspell->checkWords($words);
+			break;
+			case "suggest":
+				$result = $tinyspell->getSuggestion($check);
+			break;
+			default:
+				// Just use this for now.
+				$tinyspell->errorMsg[] = "No command.";
+				$outputType = $outputType . "error";
+			break;
+		}
+	} else
+		$outputType = $outputType . "error";
+
+	if (!$result)
+		$result = array();
+
+	// Output data
+	switch($outputType) {
+		case "xml":
+			header('Content-type: text/xml; charset=utf-8');
+			echo '<?xml version="1.0" encoding="utf-8" ?>';
+			echo "\n";
+			if (count($result) == 0)
+				echo '<res id="' . $id . '" cmd="'. $cmd .'" />';
+			else
+				echo '<res id="' . $id . '" cmd="'. $cmd .'">'. utf8_encode(implode(" ", $result)) .'</res>';
+
+		break;
+		case "xmlerror";
+			header('Content-type: text/xml; charset=utf-8');
+			echo '<?xml version="1.0" encoding="utf-8" ?>';
+			echo "\n";
+			echo '<res id="' . $id . '" cmd="'. $cmd .'" error="true" msg="'. implode(" ", $tinyspell->errorMsg) .'" />';
+		break;
+		case "html":
+			var_dump($result);
+		break;
+		case "htmlerror":
+			echo "Error";
+		break;
+	}
+?> 
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/props.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/props.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/props.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/css/props.css	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,63 @@
+#text_font {
+	width: 250px;
+}
+
+#text_size {
+	width: 70px;
+}
+
+.mceAddSelectValue {
+	background-color: #DDDDDD;
+}
+
+select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {
+	width: 70px;
+}
+
+#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {
+	width: 70px;
+}
+
+#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {
+	width: 70px;
+}
+
+#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {
+	width: 70px;
+}
+
+.panel_wrapper div.current {
+	padding-top: 10px;
+	height: 230px;
+}
+
+.delim {
+	b2ackground-color: #DDDDDD;
+	border-left: 1px solid gray;
+}
+
+.tdelim {
+	border-bottom: 1px solid gray;	
+}
+
+#block_display {
+	width: 145px;
+}
+
+#list_type {
+	width: 115px;
+}
+
+.disabled {
+	background-color: #EEEEEE;
+}
+
+#apply {
+	font-weight: bold;
+	width: 78px;
+	height: 21px;
+	border: 0;
+	background-image: url('../images/apply_button_bg.gif');
+	cursor: pointer;
+}
+
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('style','en');var TinyMCE_StylePlugin={getInfo:function(){return{longname:'Style',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_style.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"styleprops":return tinyMCE.getButtonHTML(cn,'lang_style_styleinfo_desc','{$pluginurl}/images/style_info.gif','mceStyleProps',true);}return"";},execCommand:function(editor_id,element,command,user_interface,value){var e,inst;switch(command){case"mceStyleProps":TinyMCE_StylePlugin._styleProps();return true;case"mceSetElementStyle":inst=tinyMCE.getInstanceById(editor_id);e=inst.selection.getFocusElement();if(e){e.style.cssText=value;inst.repaint();}return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){},_styleProps:function(){var e=tinyMCE.selectedInstance.selection.getFocusElement();if(!e)return;tinyMCE.openWindow({file:'../../plugins/style/props.htm',width:480+tinyMCE.getLang('lang_style_props_delta_width',0),height:320+tinyMCE.getLang('lang_style_props_delta_height',0)},{editor_id:tinyMCE.selectedInstance.editorId,inline:"yes",style_text:e.style.cssText});}};tinyMCE.addPlugin("style",TinyMCE_StylePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,81 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.1 $
+ * $Date: 2006/05/03 10:46:42 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('style', 'en');
+
+var TinyMCE_StylePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Style',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_style.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "styleprops":
+				return tinyMCE.getButtonHTML(cn, 'lang_style_styleinfo_desc', '{$pluginurl}/images/style_info.gif', 'mceStyleProps', true);
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		var e, inst;
+
+		// Handle commands
+		switch (command) {
+			case "mceStyleProps":
+				TinyMCE_StylePlugin._styleProps();
+				return true;
+
+			case "mceSetElementStyle":
+				inst = tinyMCE.getInstanceById(editor_id);
+				e = inst.selection.getFocusElement();
+
+				if (e) {
+					e.style.cssText = value;
+					inst.repaint();
+				}
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	},
+
+	// Private plugin specific methods
+
+	_styleProps : function() {
+		var e = tinyMCE.selectedInstance.selection.getFocusElement();
+
+		if (!e)
+			return;
+
+		tinyMCE.openWindow({
+			file : '../../plugins/style/props.htm',
+			width : 480 + tinyMCE.getLang('lang_style_props_delta_width', 0),
+			height : 320 + tinyMCE.getLang('lang_style_props_delta_height', 0)
+		}, {
+			editor_id : tinyMCE.selectedInstance.editorId,
+			inline : "yes",
+			style_text : e.style.cssText
+		});
+	}
+};
+
+tinyMCE.addPlugin("style", TinyMCE_StylePlugin);
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/apply_button_bg.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/apply_button_bg.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/style_info.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/images/style_info.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/props.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/props.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/props.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/jscripts/props.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,630 @@
+var defaultFonts = "" + 
+	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Courier New, Courier, mono=Courier New, Courier, mono;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 
+	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 
+	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
+
+var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
+var defaultMeasurement = "+pixels=px;points=pt;in;cm;mm;picas;ems;exs;%";
+var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";
+var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";
+var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
+var defaultTextStyle = "normal;italic;oblique";
+var defaultVariant = "normal;small-caps";
+var defaultLineHeight = "normal";
+var defaultAttachment = "fixed;scroll";
+var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
+var defaultPosH = "left;center;right";
+var defaultPosV = "top;center;bottom";
+var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
+var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
+var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
+var defaultBorderWidth = "thin;medium;thick";
+var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
+
+function init() {
+	var ce = document.getElementById('container');
+
+	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
+	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
+	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
+	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
+	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
+	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
+
+	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
+	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
+	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
+	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
+	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
+	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
+	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
+	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
+	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
+
+	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
+	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
+
+	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
+	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
+	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
+	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
+	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
+	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
+	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
+
+	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
+	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
+	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
+
+	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
+
+	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
+	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
+
+	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
+	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
+
+	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
+
+	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
+
+	TinyMCE_EditableSelects.init();
+	setupFormData();
+	showDisabledControls();
+}
+
+function setupFormData() {
+	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
+
+	// Setup text fields
+
+	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
+	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
+	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
+	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
+	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
+	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
+	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
+	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
+	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
+	f.text_color.value = ce.style.color;
+	updateColor('text_color_pick', 'text_color');
+	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
+	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
+	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
+	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
+
+	// Setup background fields
+
+	f.background_color.value = ce.style.backgroundColor;
+	updateColor('background_color_pick', 'background_color');
+	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
+	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
+	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
+	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
+	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
+	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
+
+	// Setup block fields
+
+	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
+	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
+	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
+	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
+	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
+	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
+	f.block_text_indent.value = getNum(ce.style.textIndent);
+	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
+	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
+	selectByValue(f, 'block_display', ce.style.display, true, true);
+
+	// Setup box fields
+
+	f.box_width.value = getNum(ce.style.width);
+	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
+
+	f.box_height.value = getNum(ce.style.height);
+	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
+
+	if (tinyMCE.isGecko)
+		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
+	else
+		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
+
+	selectByValue(f, 'box_clear', ce.style.clear, true, true);
+
+	setupBox(f, ce, 'box_padding', 'padding', '');
+	setupBox(f, ce, 'box_margin', 'margin', '');
+
+	// Setup border fields
+
+	setupBox(f, ce, 'border_style', 'border', 'Style');
+	setupBox(f, ce, 'border_width', 'border', 'Width');
+	setupBox(f, ce, 'border_color', 'border', 'Color');
+
+	updateColor('border_color_top_pick', 'border_color_top');
+	updateColor('border_color_right_pick', 'border_color_right');
+	updateColor('border_color_bottom_pick', 'border_color_bottom');
+	updateColor('border_color_left_pick', 'border_color_left');
+
+	// Setup list fields
+
+	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
+	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
+	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	// Setup box fields
+
+	selectByValue(f, 'positioning_type', ce.style.position, true, true);
+	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
+	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
+	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
+
+	f.positioning_width.value = getNum(ce.style.width);
+	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
+
+	f.positioning_height.value = getNum(ce.style.height);
+	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
+
+	setupBox(f, ce, 'positioning_placement', '', '', new Array('top', 'right', 'bottom', 'left'));
+
+	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
+	s = s.replace(/,/g, ' ');
+
+	if (!hasEqualValues(new Array(getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)))) {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = getNum(getVal(s, 1));
+		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
+		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
+		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
+		f.positioning_clip_left.value = getNum(getVal(s, 3));
+		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
+	} else {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
+	}
+
+//	setupBox(f, ce, '', 'border', 'Color');
+}
+
+function getMeasurement(s) {
+	return s.replace(/^([0-9]+)(.*)$/, "$2");
+}
+
+function getNum(s) {
+	if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))
+		return s.replace(/[^0-9]/g, '');
+
+	return s;
+}
+
+function inStr(s, n) {
+	return new RegExp(n, 'gi').test(s);
+}
+
+function getVal(s, i) {
+	var a = tinyMCE.explode(' ', s);
+
+	if (a.length > 1)
+		return a[i];
+
+	return "";
+}
+
+function setValue(f, n, v) {
+	if (f.elements[n].type == "text")
+		f.elements[n].value = v;
+	else
+		selectByValue(f, n, v, true, true);
+}
+
+function setupBox(f, ce, fp, pr, sf, b) {
+	if (typeof(b) == "undefined")
+		b = new Array('Top', 'Right', 'Bottom', 'Left');
+
+	if (isSame(ce, pr, sf, b)) {
+		f.elements[fp + "_same"].checked = true;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		f.elements[fp + "_right"].value = "";
+		f.elements[fp + "_right"].disabled = true;
+		f.elements[fp + "_bottom"].value = "";
+		f.elements[fp + "_bottom"].disabled = true;
+		f.elements[fp + "_left"].value = "";
+		f.elements[fp + "_left"].disabled = true;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = true;
+			f.elements[fp + "_bottom_measurement"].disabled = true;
+			f.elements[fp + "_right_measurement"].disabled = true;
+		}
+	} else {
+		f.elements[fp + "_same"].checked = false;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
+		f.elements[fp + "_right"].disabled = false;
+
+		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
+		f.elements[fp + "_bottom"].disabled = false;
+
+		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
+		f.elements[fp + "_left"].disabled = false;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
+			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
+			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = false;
+			f.elements[fp + "_bottom_measurement"].disabled = false;
+			f.elements[fp + "_right_measurement"].disabled = false;
+		}
+	}
+}
+
+function isSame(e, pr, sf, b) {
+	var a = new Array(), i, x;
+
+	if (typeof(b) == "undefined")
+		b = new Array('Top', 'Right', 'Bottom', 'Left');
+
+	if (typeof(sf) == "undefined" || sf == null)
+		sf = "";
+
+	a[0] = e.style[pr + b[0] + sf];
+	a[1] = e.style[pr + b[1] + sf];
+	a[2] = e.style[pr + b[2] + sf];
+	a[3] = e.style[pr + b[3] + sf];
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+};
+
+function hasEqualValues(a) {
+	var i, x;
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function applyAction() {
+	var ce = document.getElementById('container');
+
+	generateCSS();
+
+	tinyMCEPopup.execCommand('mceSetElementStyle', false, tinyMCE.serializeStyle(tinyMCE.parseStyle(ce.style.cssText)));
+}
+
+function updateAction() {
+	applyAction();
+	tinyMCEPopup.close();
+}
+
+function generateCSS() {
+	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
+
+	ce.style.cssText = "";
+
+	// Build text styles
+	ce.style.fontFamily = f.text_font.value;
+	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? f.text_size_measurement.value : "");
+	ce.style.fontStyle = f.text_style.value;
+	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
+	ce.style.textTransform = f.text_case.value;
+	ce.style.fontWeight = f.text_weight.value;
+	ce.style.fontVariant = f.text_variant.value;
+	ce.style.color = f.text_color.value;
+
+	s = "";
+	s += f.text_underline.checked ? " underline" : "";
+	s += f.text_overline.checked ? " overline" : "";
+	s += f.text_linethrough.checked ? " line-through" : "";
+	s += f.text_blink.checked ? " blink" : "";
+	s = s.length > 0 ? s.substring(1) : s;
+
+	if (f.text_none.checked)
+		s = "none";
+
+	ce.style.textDecoration = s;
+
+	// Build background styles
+
+	ce.style.backgroundColor = f.background_color.value;
+	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
+	ce.style.backgroundRepeat = f.background_repeat.value;
+	ce.style.backgroundAttachment = f.background_attachment.value;
+
+	if (f.background_hpos.value != "") {
+		s = "";
+		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
+		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
+		ce.style.backgroundPosition = s;
+	}
+
+	// Build block styles
+
+	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
+	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
+	ce.style.verticalAlign = f.block_vertical_alignment.value;
+	ce.style.textAlign = f.block_text_align.value;
+	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
+	ce.style.whiteSpace = f.block_whitespace.value;
+	ce.style.display = f.block_display.value;
+
+	// Build box styles
+
+	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
+	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
+	ce.style.styleFloat = f.box_float.value;
+
+	if (tinyMCE.isGecko)
+		ce.style.cssFloat = f.box_float.value;
+
+	ce.style.clear = f.box_clear.value;
+
+	if (!f.box_padding_same.checked) {
+		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
+		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
+		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
+		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
+	} else
+		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		
+
+	if (!f.box_margin_same.checked) {
+		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
+		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
+		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
+		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
+	} else
+		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		
+
+	// Build border styles
+
+	if (!f.border_style_same.checked) {
+		ce.style.borderTopStyle = f.border_style_top.value;
+		ce.style.borderRightStyle = f.border_style_right.value;
+		ce.style.borderBottomStyle = f.border_style_bottom.value;
+		ce.style.borderLeftStyle = f.border_style_left.value;
+	} else
+		ce.style.borderStyle = f.border_style_top.value;
+
+	if (!f.border_width_same.checked) {
+		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
+		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
+		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
+	} else
+		ce.style.borderWidth = f.border_width_top.value;
+
+	if (!f.border_color_same.checked) {
+		ce.style.borderTopColor = f.border_color_top.value;
+		ce.style.borderRightColor = f.border_color_right.value;
+		ce.style.borderBottomColor = f.border_color_bottom.value;
+		ce.style.borderLeftColor = f.border_color_left.value;
+	} else
+		ce.style.borderColor = f.border_color_top.value;
+
+	// Build list styles
+
+	ce.style.listStyleType = f.list_type.value;
+	ce.style.listStylePosition = f.list_position.value;
+	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
+
+	// Build positioning styles
+
+	ce.style.position = f.positioning_type.value;
+	ce.style.visibility = f.positioning_visibility.value;
+
+	if (ce.style.width == "")
+		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
+
+	if (ce.style.height == "")
+		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
+
+	ce.style.zIndex = f.positioning_zindex.value;
+	ce.style.overflow = f.positioning_overflow.value;
+
+	if (!f.positioning_placement_same.checked) {
+		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
+		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
+		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
+	} else {
+		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.top = s;
+		ce.style.right = s;
+		ce.style.bottom = s;
+		ce.style.left = s;
+	}
+
+	if (!f.positioning_clip_same.checked) {
+		s = "rect(";
+		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
+		s += ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	} else {
+		s = "rect(";
+		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
+		s += t + " ";
+		s += t + " ";
+		s += t + " ";
+		s += t + ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	}
+
+	ce.style.cssText = tinyMCE.serializeStyle(tinyMCE.parseStyle(ce.style.cssText));
+}
+
+function isNum(s) {
+	return new RegExp('[0-9]+', 'g').test(s);
+}
+
+function showDisabledControls() {
+	var f = document.forms, i, a;
+
+	for (i=0; i<f.length; i++) {
+		for (a=0; a<f[i].elements.length; a++) {
+			if (f[i].elements[a].disabled)
+				tinyMCE.addCSSClass(f[i].elements[a], "disabled");
+			else
+				tinyMCE.removeCSSClass(f[i].elements[a], "disabled");
+		}
+	}
+}
+
+function fillSelect(f, s, param, dval, sep, em) {
+	var i, ar, p, se;
+
+	f = document.forms[f];
+	sep = typeof(sep) == "undefined" ? ";" : sep;
+
+	if (em)
+		addSelectValue(f, s, "", "");
+
+	ar = tinyMCE.getParam(param, dval).split(sep);
+	for (i=0; i<ar.length; i++) {
+		se = false;
+
+		if (ar[i].charAt(0) == '+') {
+			ar[i] = ar[i].substring(1);
+			se = true;
+		}
+
+		p = ar[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, s, p[0], p[1]);
+
+			if (se)
+				selectByValue(f, s, p[1]);
+		} else {
+			addSelectValue(f, s, p[0], p[0]);
+
+			if (se)
+				selectByValue(f, s, p[0]);
+		}
+	}
+}
+
+function toggleSame(ce, pre) {
+	var el = document.forms[0].elements, i;
+
+	if (ce.checked) {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = true;
+		el[pre + "_bottom"].disabled = true;
+		el[pre + "_left"].disabled = true;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = true;
+			el[pre + "_bottom_measurement"].disabled = true;
+			el[pre + "_left_measurement"].disabled = true;
+		}
+	} else {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = false;
+		el[pre + "_bottom"].disabled = false;
+		el[pre + "_left"].disabled = false;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = false;
+			el[pre + "_bottom_measurement"].disabled = false;
+			el[pre + "_left_measurement"].disabled = false;
+		}
+	}
+
+	showDisabledControls();
+}
+
+function synch(fr, to) {
+	var f = document.forms[0];
+
+	f.elements[to].value = f.elements[fr].value;
+
+	if (f.elements[fr + "_measurement"])
+		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/en.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,60 @@
+// UK lang variables
+
+tinyMCE.addToLang('style',{
+title : 'Edit CSS Style',
+styleinfo_desc : 'Edit CSS Style',
+text_tab : 'Text',
+background_tab : 'Background',
+block_tab : 'Block',
+box_tab : 'Box',
+border_tab : 'Border',
+list_tab : 'List',
+positioning_tab : 'Positioning',
+text_props : 'Text',
+text_font : 'Font',
+text_size : 'Size',
+text_weight : 'Weight',
+text_style : 'Style',
+text_variant : 'Variant',
+text_lineheight : 'Line height',
+text_case : 'Case',
+text_color : 'Color',
+text_decoration : 'Decoration',
+background_color : 'Background color',
+background_image : 'Background image',
+background_repeat : 'Repeat',
+background_attachment : 'Attachment',
+background_hpos : 'Horizontal position',
+background_vpos : 'Vertical position',
+block_wordspacing : 'Word spacing',
+block_letterspacing : 'Letter spacing',
+block_vertical_alignment : 'Vertical alignment',
+block_text_align : 'Text align',
+block_text_indent : 'Text indent',
+block_whitespace : 'Whitespace',
+block_display : 'Display',
+box_width : 'Width',
+box_height : 'Height',
+box_float : 'Float',
+box_clear : 'Clear',
+padding : 'Padding',
+same : 'Same for all',
+top : 'Top',
+right : 'Right',
+bottom : 'Bottom',
+left : 'Left',
+margin : 'Margin',
+style : 'Style',
+width : 'Width',
+height : 'Height',
+color : 'Color',
+list_type : 'Type',
+bullet_image : 'Bullet image',
+position : 'Position',
+positioning_type : 'Type',
+visibility : 'Visibility',
+zindex : 'Z-index',
+overflow : 'Overflow',
+placement : 'Placement',
+clip : 'Clip'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/props.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/props.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/props.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/props.htm	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,580 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_style_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/props.js"></script>
+	<link href="css/props.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="styleprops" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+	<form onsubmit="updateAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onmousedown="return false;">{$lang_style_text_tab}</a></span></li>
+				<li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onmousedown="return false;">{$lang_style_background_tab}</a></span></li>
+				<li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onmousedown="return false;">{$lang_style_block_tab}</a></span></li>
+				<li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onmousedown="return false;">{$lang_style_box_tab}</a></span></li>
+				<li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onmousedown="return false;">{$lang_style_border_tab}</a></span></li>
+				<li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onmousedown="return false;">{$lang_style_list_tab}</a></span></li>
+				<li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onmousedown="return false;">{$lang_style_positioning_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="text_panel" class="panel current">
+				<table border="0" width="100%">
+					<tr>
+						<td><label for="text_font">{$lang_style_text_font}</label></td>
+						<td colspan="3">
+							<select id="text_font" name="text_font" class="mceEditableSelect" onchange="alert(this.options[this.selectedIndex].value);"></select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="text_size">{$lang_style_text_size}</label></td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+								<td>&nbsp;<select id="text_size_measurement" name="text_size_measurement"></select>
+							</tr></table>
+						</td>
+						<td><label for="text_weight">{$lang_style_text_weight}</label></td>
+						<td>
+							<select id="text_weight" name="text_weight"></select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="text_style">{$lang_style_text_style}</label></td>
+						<td>
+							<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+						</td>
+						<td><label for="text_variant">{$lang_style_text_variant}</label></td>
+						<td>
+							<select id="text_variant" name="text_variant"></select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="text_lineheight">{$lang_style_text_lineheight}</label></td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0"><tr><td>
+							<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+							</td><td>&nbsp;<select id="text_lineheight_measurement" name="text_lineheight_measurement"></select>
+							</tr></table>
+						</td>
+						<td><label for="text_case">{$lang_style_text_case}</label></td>
+						<td>
+							<select id="text_case" name="text_case"></select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="text_color">{$lang_style_text_color}</label></td>
+						<td colspan="2">
+							<table border="0" cellpadding="0" cellspacing="0">
+								<tr>
+									<td><input id="text_color" name="text_color" type="text" value="" size="9" onchange="updateColor('text_color_pick','text_color');" /></td>
+									<td id="text_color_pickcontainer">&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td>{$lang_style_text_decoration}</td>
+						<td colspan="2">
+							<table border="0" cellspacing="0" cellpadding="0">
+								<tr><td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td><td><label for="text_underline">underline</label></td></tr>
+								<tr><td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td><td><label for="text_overline">overline</label></td></tr>
+								<tr><td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td><td><label for="text_linethrough">line-through</label></td></tr>
+								<tr><td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td><td><label for="text_blink">blink</label></td></tr>
+								<tr><td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td><td><label for="text_none">none</label></td></tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+			</div>
+
+			<div id="background_panel" class="panel">
+				<table border="0">
+					<tr>
+						<td><label for="background_color">{$lang_style_background_color}</label></td>
+						<td>
+							<table border="0" cellpadding="0" cellspacing="0">
+								<tr>
+									<td><input id="background_color" name="background_color" type="text" value="" size="9" onchange="updateColor('background_color_pick','background_color');" /></td>
+									<td id="background_color_pickcontainer">&nbsp;</td>
+								</tr>
+							</table>
+						</td>	
+					</tr>
+
+					<tr>
+						<td><label for="background_image">{$lang_style_background_image}</label></td>
+						<td><input id="background_image" name="background_image" type="text" /></td>	
+					</tr>
+
+					<tr>
+						<td><label for="background_repeat">{$lang_style_background_repeat}</label></td>
+						<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>	
+					</tr>
+
+					<tr>
+						<td><label for="background_attachment">{$lang_style_background_attachment}</label></td>
+						<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>	
+					</tr>
+
+					<tr>
+						<td><label for="background_hpos">{$lang_style_background_hpos}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+								<td>&nbsp;<select id="background_hpos_measurement" name="background_hpos_measurement"></select>
+							</tr></table>
+						</td>
+					</tr>
+
+					<tr>
+						<td><label for="background_vpos">{$lang_style_background_vpos}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+								<td>&nbsp;<select id="background_vpos_measurement" name="background_vpos_measurement"></select>
+							</tr></table>
+						</td>
+					</tr>
+				</table>
+			</div>
+
+			<div id="block_panel" class="panel">
+				<table border="0">
+					<tr>
+						<td><label for="block_wordspacing">{$lang_style_block_wordspacing}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+								<td>&nbsp;<select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select>
+							</tr></table>
+						</td>
+					</tr>
+
+					<tr>
+						<td><label for="block_letterspacing">{$lang_style_block_letterspacing}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+								<td>&nbsp;<select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select>
+							</tr></table>
+						</td>
+					</tr>
+
+					<tr>
+						<td><label for="block_vertical_alignment">{$lang_style_block_vertical_alignment}</label></td>
+						<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>	
+					</tr>
+
+					<tr>
+						<td><label for="block_text_align">{$lang_style_block_text_align}</label></td>
+						<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>	
+					</tr>
+
+					<tr>
+						<td><label for="block_text_indent">{$lang_style_block_text_indent}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+								<td>&nbsp;<select id="block_text_indent_measurement" name="block_text_indent_measurement"></select>
+							</tr></table>
+						</td>
+					</tr>
+
+					<tr>
+						<td><label for="block_whitespace">{$lang_style_block_whitespace}</label></td>
+						<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>	
+					</tr>
+
+					<tr>
+						<td><label for="block_display">{$lang_style_block_display}</label></td>
+						<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>	
+					</tr>
+				</table>
+			</div>
+
+			<div id="box_panel" class="panel">
+				<table border="0">
+					<tr>
+						<td><label for="box_width">{$lang_style_box_width}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onchange="synch('box_width','positioning_width');" /></td>
+								<td>&nbsp;<select id="box_width_measurement" name="box_width_measurement"></select>
+							</tr></table>
+						</td>
+						<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{$lang_style_box_float}</label></td>
+						<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>							
+					</tr>
+
+					<tr>
+						<td><label for="box_height">{$lang_style_box_height}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onchange="synch('box_height','positioning_height');" /></td>
+								<td>&nbsp;<select id="box_height_measurement" name="box_height_measurement"></select>
+							</tr></table>
+						</td>
+						<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{$lang_style_box_clear}</label></td>
+						<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>							
+					</tr>					
+				</table>
+				<div style="float: left; width: 49%">
+					<fieldset>
+						<legend>{$lang_style_padding}</legend>
+
+						<table border="0">
+							<tr>
+								<td>&nbsp;</td>
+								<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onclick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{$lang_style_same}</label></td>
+							</tr>
+							<tr>
+								<td><label for="box_padding_top">{$lang_style_top}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
+										<td>&nbsp;<select id="box_padding_top_measurement" name="box_padding_top_measurement"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td><label for="box_padding_right">{$lang_style_right}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
+										<td>&nbsp;<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td><label for="box_padding_bottom">{$lang_style_bottom}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+										<td>&nbsp;<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td><label for="box_padding_left">{$lang_style_left}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
+										<td>&nbsp;<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+						</table>
+					</fieldset>
+				</div>
+				<div style="float: right; width: 49%">
+					<fieldset>
+						<legend>{$lang_style_margin}</legend>
+
+						<table border="0">
+							<tr>
+								<td>&nbsp;</td>
+								<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onclick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{$lang_style_same}</label></td>
+							</tr>
+							<tr>
+								<td><label for="box_margin_top">{$lang_style_top}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
+										<td>&nbsp;<select id="box_margin_top_measurement" name="box_margin_top_measurement"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td><label for="box_margin_right">{$lang_style_right}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
+										<td>&nbsp;<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td><label for="box_margin_bottom">{$lang_style_bottom}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+										<td>&nbsp;<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td><label for="box_margin_left">{$lang_style_left}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
+										<td>&nbsp;<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+						</table>
+					</fieldset>
+				</div>
+				<br style="clear: both" />
+			</div>
+
+			<div id="border_panel" class="panel">
+				<table border="0" cellspacing="0" cellp2adding="0" width="100%">
+					<tr>
+						<td class="tdelim">&nbsp;</td>
+						<td class="tdelim delim">&nbsp;</td>
+						<td class="tdelim">{$lang_style_style}</td>
+						<td class="tdelim delim">&nbsp;</td>
+						<td class="tdelim">{$lang_style_width}</td>
+						<td class="tdelim delim">&nbsp;</td>
+						<td class="tdelim">{$lang_style_color}</td>
+					</tr>
+
+					<tr>
+						<td>&nbsp;</td>
+						<td class="delim">&nbsp;</td>
+						<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onclick="toggleSame(this,'border_style');" /> <label for="border_style_same">{$lang_style_same}</label></td>
+						<td class="delim">&nbsp;</td>
+						<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onclick="toggleSame(this,'border_width');" /> <label for="border_width_same">{$lang_style_same}</label></td>
+						<td class="delim">&nbsp;</td>
+						<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onclick="toggleSame(this,'border_color');" /> <label for="border_color_same">{$lang_style_same}</label></td>
+					</tr>
+
+					<tr>
+						<td>{$lang_style_top}</td>
+						<td class="delim">&nbsp;</td>
+						<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+						<td class="delim">&nbsp;</td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+								<td>&nbsp;<select id="border_width_top_measurement" name="border_width_top_measurement"></select>
+							</tr></table>
+						</td>
+						<td class="delim">&nbsp;</td>
+						<td><table border="0" cellpadding="0" cellspacing="0">
+								<tr>
+									<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onchange="updateColor('border_color_top_pick','border_color_top');" /></td>
+									<td id="border_color_top_pickcontainer">&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+
+					<tr>
+						<td>{$lang_style_right}</td>
+						<td class="delim">&nbsp;</td>
+						<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td class="delim">&nbsp;</td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+								<td>&nbsp;<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select>
+							</tr></table>
+						</td>
+						<td class="delim">&nbsp;</td>
+						<td><table border="0" cellpadding="0" cellspacing="0">
+								<tr>
+									<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onchange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+									<td id="border_color_right_pickcontainer">&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+
+					<tr>
+						<td>{$lang_style_bottom}</td>
+						<td class="delim">&nbsp;</td>
+						<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td class="delim">&nbsp;</td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+								<td>&nbsp;<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select>
+							</tr></table>
+						</td>
+						<td class="delim">&nbsp;</td>
+						<td><table border="0" cellpadding="0" cellspacing="0">
+								<tr>
+									<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onchange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+									<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+
+					<tr>
+						<td>{$lang_style_left}</td>
+						<td class="delim">&nbsp;</td>
+						<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td class="delim">&nbsp;</td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+								<td>&nbsp;<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select>
+							</tr></table>
+						</td>
+						<td class="delim">&nbsp;</td>
+						<td><table border="0" cellpadding="0" cellspacing="0">
+								<tr>
+									<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onchange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+									<td id="border_color_left_pickcontainer">&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+			</div>
+
+			<div id="list_panel" class="panel">
+				<table border="0">
+					<tr>
+						<td><label for="list_type">{$lang_style_list_type}</label></td>
+						<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>	
+					</tr>
+
+					<tr>
+						<td><label for="list_bullet_image">{$lang_style_bullet_image}</label></td>
+						<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>	
+					</tr>
+
+					<tr>
+						<td><label for="list_position">{$lang_style_position}</label></td>
+						<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>	
+					</tr>
+				</table>
+			</div>
+
+			<div id="positioning_panel" class="panel">
+				<table border="0">
+					<tr>
+						<td><label for="positioning_type">{$lang_style_positioning_type}</label></td>
+						<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
+						<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{$lang_style_visibility}</label></td>
+						<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>							
+					</tr>
+
+					<tr>
+						<td><label for="positioning_width">{$lang_style_width}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><input type="text" id="positioning_width" name="positioning_width" onchange="synch('positioning_width','box_width');" /></td>
+								<td>&nbsp;<select id="positioning_width_measurement" name="positioning_width_measurement"></select>
+							</tr></table>
+						</td>
+						<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{$lang_style_zindex}</label></td>
+						<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>							
+					</tr>
+
+					<tr>
+						<td><label for="positioning_height">{$lang_style_height}</label></td>
+						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+								<td><input type="text" id="positioning_height" name="positioning_height" onchange="synch('positioning_height','box_height');" /></td>
+								<td>&nbsp;<select id="positioning_height_measurement" name="positioning_height_measurement"></select>
+							</tr></table>
+						</td>
+						<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{$lang_style_overflow}</label></td>
+						<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>							
+					</tr>					
+				</table>
+
+				<div style="float: left; width: 49%">
+					<fieldset>
+						<legend>{$lang_style_placement}</legend>
+
+						<table border="0">
+							<tr>
+								<td>&nbsp;</td>
+								<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onclick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{$lang_style_same}</label></td>
+							</tr>
+							<tr>
+								<td>{$lang_style_top}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
+										<td>&nbsp;<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td>{$lang_style_right}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
+										<td>&nbsp;<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td>{$lang_style_bottom}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
+										<td>&nbsp;<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td>{$lang_style_left}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
+										<td>&nbsp;<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+						</table>
+					</fieldset>
+				</div>
+				<div style="float: right; width: 49%">
+					<fieldset>
+						<legend>{$lang_style_clip}</legend>
+
+						<table border="0">
+							<tr>
+								<td>&nbsp;</td>
+								<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onclick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{$lang_style_same}</label></td>
+							</tr>
+							<tr>
+								<td>{$lang_style_top}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
+										<td>&nbsp;<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td>{$lang_style_right}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
+										<td>&nbsp;<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" ></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td>{$lang_style_bottom}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
+										<td>&nbsp;<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+							<tr>
+								<td>{$lang_style_left}</td>
+								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
+										<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
+										<td>&nbsp;<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select>
+									</tr></table>
+								</td>
+							</tr>
+						</table>
+					</fieldset>
+				</div>
+				<br style="clear: both" />
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<div style="float: left"><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="updateAction();" /></div>
+				<div style="float: left">&nbsp;<input type="button" id="apply" name="apply" value="Apply" onclick="applyAction();" class="updateButton" /></div>
+				<br style="clear: both" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+
+	<div style="display: none">
+		<div id="container"></div>
+	</div>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/style/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/cell.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/cell.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/cell.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/cell.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,182 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_table_cell_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/cell.js"></script>
+	<link href="css/cell.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="tablecell" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+	<form onsubmit="updateAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_table_general_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{$lang_table_advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{$lang_table_general_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="align">{$lang_table_align}</label></td>
+							<td>
+								<select id="align" name="align">
+									<option value="">{$lang_not_set}</option>
+									<option value="center">{$lang_table_align_middle}</option>
+									<option value="left">{$lang_table_align_left}</option>
+									<option value="right">{$lang_table_align_right}</option>
+								</select>
+							</td>
+		
+							<td><label for="celltype">{$lang_table_cell_type}</label></td>
+							<td>
+								<select id="celltype" name="celltype">
+									<option value="td">{$lang_table_td}</option>
+									<option value="th">{$lang_table_th}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="valign">{$lang_table_valign}</label></td>
+							<td>
+								<select id="valign" name="valign">
+									<option value="">{$lang_not_set}</option>
+									<option value="top">{$lang_table_align_top}</option>
+									<option value="middle">{$lang_table_align_middle}</option>
+									<option value="bottom">{$lang_table_align_bottom}</option>
+								</select>
+							</td>
+
+							<td><label for="scope">{$lang_table_scope}</label></td>
+							<td>
+								<select id="scope" name="scope">
+									<option value="">{$lang_not_set}</option>
+									<option value="col">{$lang_table_col}</option>
+									<option value="row">{$lang_table_row}</option>
+									<option value="rowgroup">{$lang_table_rowgroup}</option>
+									<option value="colgroup">{$lang_table_colgroup}</option>
+								</select>
+							</td>
+
+						</tr>
+
+						<tr>
+							<td><label for="width">{$lang_table_width}</label></td>
+							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+
+							<td><label for="height">{$lang_table_height}</label></td>
+							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+						</tr>
+
+						<tr id="styleSelectRow">
+							<td><label for="class">{$lang_class_name}</label></td>
+							<td colspan="3">
+								<select id="class" name="class">
+									<option value="" selected="selected">{$lang_not_set}</option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_table_advanced_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="id">{$lang_table_id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{$lang_table_style}</label></td>
+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="dir">{$lang_table_langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" style="width: 200px"> 
+										<option value="">{$lang_not_set}</option> 
+										<option value="ltr">{$lang_table_ltr}</option> 
+										<option value="rtl">{$lang_table_rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="lang">{$lang_table_langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{$lang_table_bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bordercolor">{$lang_table_bordercolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
+										<td id="bordercolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor">{$lang_table_bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div>
+				<select id="action" name="action">
+					<option value="cell">{$lang_table_cell_cell}</option>
+					<option value="row">{$lang_table_cell_row}</option>
+					<option value="all">{$lang_table_cell_all}</option>
+				</select>
+			</div>
+
+			<div style="float: left">
+				<div><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="updateAction();" /></div>
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/cell.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/cell.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/cell.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/cell.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,17 @@
+/* CSS file for cell dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#class {
+	width: 150px;
+}
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/row.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/row.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/row.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/row.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,25 @@
+/* CSS file for row dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#rowtype,#align,#valign,#class,#height {
+	width: 150px;
+}
+
+#height {
+	width: 50px;	
+}
+
+.col2 {
+	padding-left: 20px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/table.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/table.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/table.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/css/table.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,13 @@
+/* CSS file for table dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 220px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#class {
+	width: 150px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importPluginLanguagePack('table','en,tr,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,nb,pl,pt,pt_br,sv,tw,zh_cn,fr,de,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_TablePlugin={getInfo:function(){return{longname:'Tables',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_table.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isGecko){var doc=inst.getDoc();tinyMCE.addEvent(doc,"mouseup",TinyMCE_TablePlugin._mouseDownHandler);}inst.tableRowClipboard=null;},getControlHTML:function(control_name){var controls=new Array(['table','table.gif','lang_table_desc','mceInsertTable',true],['delete_col','table_delete_col.gif','lang_table_delete_col_desc','mceTableDeleteCol'],['delete_row','table_delete_row.gif','lang_table_delete_row_desc','mceTableDeleteRow'],['col_after','table_insert_col_after.gif','lang_table_col_after_desc','mceTableInsertColAfter'],['col_before','table_insert_col_before.gif','lang_table_col_before_desc','mceTableInsertColBefore'],['row_after','table_insert_row_after.gif','lang_table_row_after_desc','mceTableInsertRowAfter'],['row_before','table_insert_row_before.gif','lang_table_row_before_desc','mceTableInsertRowBefore'],['row_props','table_row_props.gif','lang_table_row_desc','mceTableRowProps',true],['cell_props','table_cell_props.gif','lang_table_cell_desc','mceTableCellProps',true],['split_cells','table_split_cells.gif','lang_table_split_cells_desc','mceTableSplitCells',true],['merge_cells','table_merge_cells.gif','lang_table_merge_cells_desc','mceTableMergeCells',true]);for(var i=0;i<controls.length;i++){var but=controls[i];var cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+');return false;';if(but[0]==control_name)return tinyMCE.getButtonHTML(control_name,but[2],'{$pluginurl}/images/'+but[1],but[3],(but.length>4?but[4]:false));}if(control_name=="tablecontrols"){var html="";html+=tinyMCE.getControlHTML("table");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_props");html+=tinyMCE.getControlHTML("cell_props");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_before");html+=tinyMCE.getControlHTML("row_after");html+=tinyMCE.getControlHTML("delete_row");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("col_before");html+=tinyMCE.getControlHTML("col_after");html+=tinyMCE.getControlHTML("delete_col");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("split_cells");html+=tinyMCE.getControlHTML("merge_cells");return html;}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceInsertTable":case"mceTableRowProps":case"mceTableCellProps":case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":case"mceTableDelete":var inst=tinyMCE.getInstanceById(editor_id);inst.execCommand('mceBeginUndoLevel');TinyMCE_TablePlugin._doExecCommand(editor_id,element,command,user_interface,value);inst.execCommand('mceEndUndoLevel');return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){var colspan="1",rowspan="1";var inst=tinyMCE.getInstanceById(editor_id);tinyMCE.switchClass(editor_id+'_table','mceButtonNormal');tinyMCE.switchClass(editor_id+'_row_props','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_cell_props','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_row_before','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_row_after','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_delete_row','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_col_before','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_col_after','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_delete_col','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_split_cells','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_merge_cells','mceButtonDisabled');if(tdElm=tinyMCE.getParentElement(node,"td,th")){tinyMCE.switchClass(editor_id+'_cell_props','mceButtonSelected');tinyMCE.switchClass(editor_id+'_row_before','mceButtonNormal');tinyMCE.switchClass(editor_id+'_row_after','mceButtonNormal');tinyMCE.switchClass(editor_id+'_delete_row','mceButtonNormal');tinyMCE.switchClass(editor_id+'_col_before','mceButtonNormal');tinyMCE.switchClass(editor_id+'_col_after','mceButtonNormal');tinyMCE.switchClass(editor_id+'_delete_col','mceButtonNormal');colspan=tinyMCE.getAttrib(tdElm,"colspan");rowspan=tinyMCE.getAttrib(tdElm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;if(colspan!="1"||rowspan!="1")tinyMCE.switchClass(editor_id+'_split_cells','mceButtonNormal');}if(tinyMCE.getParentElement(node,"tr"))tinyMCE.switchClass(editor_id+'_row_props','mceButtonSelected');if(tinyMCE.getParentElement(node,"table")){tinyMCE.switchClass(editor_id+'_table','mceButtonSelected');tinyMCE.switchClass(editor_id+'_merge_cells','mceButtonNormal');}},_mouseDownHandler:function(e){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var focusElm=tinyMCE.selectedInstance.getFocusElement();if(elm.nodeName=="BODY"&&(focusElm.nodeName=="TD"||focusElm.nodeName=="TH"||(focusElm.parentNode&&focusElm.parentNode.nodeName=="TD")||(focusElm.parentNode&&focusElm.parentNode.nodeName=="TH"))){window.setTimeout(function(){var tableElm=tinyMCE.getParentElement(focusElm,"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);},10);}},_doExecCommand:function(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id);var focusElm=inst.getFocusElement();var trElm=tinyMCE.getParentElement(focusElm,"tr");var tdElm=tinyMCE.getParentElement(focusElm,"td,th");var tableElm=tinyMCE.getParentElement(focusElm,"table");var doc=inst.contentWindow.document;var tableBorder=tableElm?tableElm.getAttribute("border"):"";if(trElm&&tdElm==null)tdElm=trElm.cells[0];function inArray(ar,v){for(var i=0;i<ar.length;i++){if(ar[i].length>0&&inArray(ar[i],v))return true;if(ar[i]==v)return true;}return false;}function makeTD(){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}function getColRowSpan(td){var colspan=tinyMCE.getAttrib(td,"colspan");var rowspan=tinyMCE.getAttrib(td,"rowspan");colspan=colspan==""?1:parseInt(colspan);rowspan=rowspan==""?1:parseInt(rowspan);return{colspan:colspan,rowspan:rowspan};}function getCellPos(grid,td){for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){if(grid[y][x]==td)return{cellindex:x,rowindex:y};}}return null;}function getCell(grid,row,col){if(grid[row]&&grid[row][col])return grid[row][col];return null;}function getTableGrid(table){var grid=new Array();var rows=table.rows;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].cells.length;x++){var td=rows[y].cells[x];var sd=getColRowSpan(td);for(xstart=x;grid[y]&&grid[y][xstart];xstart++);for(var y2=y;y2<y+sd['rowspan'];y2++){if(!grid[y2])grid[y2]=new Array();for(var x2=xstart;x2<xstart+sd['colspan'];x2++){grid[y2][x2]=td;}}}}return grid;}function trimRow(table,tr,td,new_tr){var grid=getTableGrid(table);var cpos=getCellPos(grid,td);if(new_tr.cells.length!=tr.childNodes.length){var cells=tr.childNodes;var lastElm=null;for(var x=0;td=getCell(grid,cpos.rowindex,x);x++){var remove=true;var sd=getColRowSpan(td);if(inArray(cells,td)){new_tr.childNodes[x]._delete=true;}else if((lastElm==null||td!=lastElm)&&sd.colspan>1){for(var i=x;i<x+td.colSpan;i++)new_tr.childNodes[i]._delete=true;}if((lastElm==null||td!=lastElm)&&sd.rowspan>1)td.rowSpan=sd.rowspan+1;lastElm=td;}deleteMarked(tableElm);}}function prevElm(node,name){while((node=node.previousSibling)!=null){if(node.nodeName==name)return node;}return null;}function nextElm(node,names){var namesAr=names.split(',');while((node=node.nextSibling)!=null){for(var i=0;i<namesAr.length;i++){if(node.nodeName.toLowerCase()==namesAr[i].toLowerCase())return node;}}return null;}function deleteMarked(tbl){if(tbl.rows==0)return;var tr=tbl.rows[0];do{var next=nextElm(tr,"TR");if(tr._delete){tr.parentNode.removeChild(tr);continue;}var td=tr.cells[0];if(td.cells>1){do{var nexttd=nextElm(td,"TD,TH");if(td._delete)td.parentNode.removeChild(td);}while((td=nexttd)!=null);}}while((tr=next)!=null);}function addRows(td_elm,tr_elm,rowspan){td_elm.rowSpan=1;var trNext=nextElm(tr_elm,"TR");for(var i=1;i<rowspan&&trNext;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";if(tinyMCE.isMSIE)trNext.insertBefore(newTD,trNext.cells(td_elm.cellIndex));else trNext.insertBefore(newTD,trNext.cells[td_elm.cellIndex]);trNext=nextElm(trNext,"TR");}}function copyRow(doc,table,tr){var grid=getTableGrid(table);var newTR=tr.cloneNode(false);var cpos=getCellPos(grid,tr.cells[0]);var lastCell=null;var tableBorder=tinyMCE.getAttrib(table,"border");var tdElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){var newTD=null;if(lastCell!=tdElm){for(var i=0;i<tr.cells.length;i++){if(tdElm==tr.cells[i]){newTD=tdElm.cloneNode(true);break;}}}if(newTD==null){newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}newTD.colSpan=1;newTD.rowSpan=1;newTR.appendChild(newTD);lastCell=tdElm;}return newTR;}switch(command){case"mceTableRowProps":if(trElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/row.htm';template['width']=380;template['height']=295;template['width']+=tinyMCE.getLang('lang_table_rowprops_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_rowprops_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes"});}return true;case"mceTableCellProps":if(tdElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/cell.htm';template['width']=380;template['height']=295;template['width']+=tinyMCE.getLang('lang_table_cellprops_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_cellprops_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes"});}return true;case"mceInsertTable":if(user_interface){var template=new Array();template['file']='../../plugins/table/table.htm';template['width']=380;template['height']=295;template['width']+=tinyMCE.getLang('lang_table_table_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_table_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes",action:value});}return true;case"mceTableDelete":var table=tinyMCE.getParentElement(inst.getFocusElement(),"table");if(table){table.parentNode.removeChild(table);inst.repaint();}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":if(!tableElm)return true;if(tableElm!=trElm.parentNode)tableElm=trElm.parentNode;if(tableElm&&trElm){switch(command){case"mceTableInsertRowBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTableCutRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);inst.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);break;case"mceTablePasteRowBefore":if(!trElm||!tdElm)return true;var newTR=inst.tableRowClipboard.cloneNode(true);var prevTR=prevElm(trElm,"TR");if(prevTR!=null)trimRow(tableElm,prevTR,prevTR.cells[0],newTR);trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTablePasteRowAfter":if(!trElm||!tdElm)return true;var nextTR=nextElm(trElm,"TR");var newTR=inst.tableRowClipboard.cloneNode(true);trimRow(tableElm,trElm,tdElm,newTR);if(nextTR==null)trElm.parentNode.appendChild(newTR);else nextTR.parentNode.insertBefore(newTR,nextTR);break;case"mceTableInsertRowAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}if(newTR.hasChildNodes()){var nextTR=nextElm(trElm,"TR");if(nextTR)nextTR.parentNode.insertBefore(newTR,nextTR);else tableElm.appendChild(newTR);}break;case"mceTableDeleteRow":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);if(grid.length==1){tableElm.parentNode.removeChild(tableElm);return true;}var cells=trElm.cells;var nextTR=nextElm(trElm,"TR");for(var x=0;x<cells.length;x++){if(cells[x].rowSpan>1){var newTD=cells[x].cloneNode(true);var sd=getColRowSpan(cells[x]);newTD.rowSpan=sd.rowspan-1;var nextTD=nextTR.cells[x];if(nextTD==null)nextTR.appendChild(newTD);else nextTR.insertBefore(newTD,nextTD);}}var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd.rowspan>1){tdElm.rowSpan=sd.rowspan-1;}else{trElm=tdElm.parentNode;if(trElm.parentNode)trElm._delete=true;}lastTDElm=tdElm;}}deleteMarked(tableElm);cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;inst.selection.selectNode(getCell(grid,cpos.rowindex,0),true,true);break;case"mceTableInsertColBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement(tdElm.nodeName);newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;tdElm.parentNode.insertBefore(newTD,tdElm);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case"mceTableInsertColAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement(tdElm.nodeName);newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;var nextTD=nextElm(tdElm,"TD,TH");if(nextTD==null)tdElm.parentNode.appendChild(newTD);else nextTD.parentNode.insertBefore(newTD,nextTD);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case"mceTableDeleteCol":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;if(grid.length>1&&grid[0].length<=1){tableElm.parentNode.removeChild(tableElm);return true;}for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']>1)tdElm.colSpan=sd['colspan']-1;else{if(tdElm.parentNode)tdElm.parentNode.removeChild(tdElm);}lastTDElm=tdElm;}}cpos.cellindex--;if(cpos.cellindex<0)cpos.cellindex=0;inst.selection.selectNode(getCell(grid,0,cpos.cellindex),true,true);break;case"mceTableSplitCells":if(!trElm||!tdElm)return true;var spandata=getColRowSpan(tdElm);var colspan=spandata["colspan"];var rowspan=spandata["rowspan"];if(colspan>1||rowspan>1){tdElm.colSpan=1;for(var i=1;i<colspan;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";trElm.insertBefore(newTD,nextElm(tdElm,"TD,TH"));if(rowspan>1)addRows(newTD,trElm,rowspan);}addRows(tdElm,trElm,rowspan);}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");break;case"mceTableMergeCells":var rows=new Array();var sel=inst.getSel();var grid=getTableGrid(tableElm);if(tinyMCE.isMSIE||sel.rangeCount==1){if(user_interface){var template=new Array();var sp=getColRowSpan(tdElm);template['file']='../../plugins/table/merge_cells.htm';template['width']=250;template['height']=105+(tinyMCE.isNS7?25:0);template['width']+=tinyMCE.getLang('lang_table_merge_cells_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_merge_cells_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes",action:"update",numcols:sp.colspan,numrows:sp.rowspan});return true;}else{var numRows=parseInt(value['numrows']);var numCols=parseInt(value['numcols']);var cpos=getCellPos(grid,tdElm);if((""+numRows)=="NaN")numRows=1;if((""+numCols)=="NaN")numCols=1;var tRows=tableElm.rows;for(var y=cpos.rowindex;y<grid.length;y++){var rowCells=new Array();for(var x=cpos.cellindex;x<grid[y].length;x++){var td=getCell(grid,y,x);if(td&&!inArray(rows,td)&&!inArray(rowCells,td)){var cp=getCellPos(grid,td);if(cp.cellindex<cpos.cellindex+numCols&&cp.rowindex<cpos.rowindex+numRows)rowCells[rowCells.length]=td;}}if(rowCells.length>0)rows[rows.length]=rowCells;}}}else{var cells=new Array();var sel=inst.getSel();var lastTR=null;var curRow=null;var x1=-1,y1=-1,x2,y2;if(sel.rangeCount<2)return true;for(var i=0;i<sel.rangeCount;i++){var rng=sel.getRangeAt(i);var tdElm=rng.startContainer.childNodes[rng.startOffset];if(!tdElm)break;if(tdElm.nodeName=="TD")cells[cells.length]=tdElm;}var tRows=tableElm.rows;for(var y=0;y<tRows.length;y++){var rowCells=new Array();for(var x=0;x<tRows[y].cells.length;x++){var td=tRows[y].cells[x];for(var i=0;i<cells.length;i++){if(td==cells[i]){rowCells[rowCells.length]=td;}}}if(rowCells.length>0)rows[rows.length]=rowCells;}var curRow=new Array();var lastTR=null;for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){grid[y][x]._selected=false;for(var i=0;i<cells.length;i++){if(grid[y][x]==cells[i]){if(x1==-1){x1=x;y1=y;}x2=x;y2=y;grid[y][x]._selected=true;}}}}for(var y=y1;y<=y2;y++){for(var x=x1;x<=x2;x++){if(!grid[y][x]._selected){alert("Invalid selection for merge.");return true;}}}}var rowSpan=1,colSpan=1;var lastRowSpan=-1;for(var y=0;y<rows.length;y++){var rowColSpan=0;for(var x=0;x<rows[y].length;x++){var sd=getColRowSpan(rows[y][x]);rowColSpan+=sd['colspan'];if(lastRowSpan!=-1&&sd['rowspan']!=lastRowSpan){alert("Invalid selection for merge.");return true;}lastRowSpan=sd['rowspan'];}if(rowColSpan>colSpan)colSpan=rowColSpan;lastRowSpan=-1;}var lastColSpan=-1;for(var x=0;x<rows[0].length;x++){var colRowSpan=0;for(var y=0;y<rows.length;y++){var sd=getColRowSpan(rows[y][x]);colRowSpan+=sd['rowspan'];if(lastColSpan!=-1&&sd['colspan']!=lastColSpan){alert("Invalid selection for merge.");return true;}lastColSpan=sd['colspan'];}if(colRowSpan>rowSpan)rowSpan=colRowSpan;lastColSpan=-1;}tdElm=rows[0][0];tdElm.rowSpan=rowSpan;tdElm.colSpan=colSpan;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].length;x++){var html=rows[y][x].innerHTML;var chk=tinyMCE.regexpReplace(html,"[ \t\r\n]","");if(chk!="<br/>"&&chk!="<br>"&&chk!="&nbsp;"&&(x+y>0))tdElm.innerHTML+=html;if(rows[y][x]!=tdElm&&!rows[y][x]._deleted){var cpos=getCellPos(grid,rows[y][x]);var tr=rows[y][x].parentNode;tr.removeChild(rows[y][x]);rows[y][x]._deleted=true;if(!tr.hasChildNodes()){tr.parentNode.removeChild(tr);var lastCell=null;for(var x=0;cellElm=getCell(grid,cpos.rowindex,x);x++){if(cellElm!=lastCell&&cellElm.rowSpan>1)cellElm.rowSpan--;lastCell=cellElm;}if(tdElm.rowSpan>1)tdElm.rowSpan--;}}}}break;}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);tinyMCE.triggerNodeChange();inst.repaint();}return true;}return false;}};tinyMCE.addPlugin("table",TinyMCE_TablePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,1054 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.38 $
+ * $Date: 2006/02/11 18:53:51 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('table', 'en,tr,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,nb,pl,pt,pt_br,sv,tw,zh_cn,fr,de,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,is,zh_tw,zh_tw_utf8,sk');
+
+var TinyMCE_TablePlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Tables',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_table.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		if (tinyMCE.isGecko) {
+			var doc = inst.getDoc();
+			tinyMCE.addEvent(doc, "mouseup", TinyMCE_TablePlugin._mouseDownHandler);
+		}
+
+		inst.tableRowClipboard = null;
+	},
+
+	/**
+	 * Returns the HTML contents of the table control.
+	 */
+	getControlHTML : function(control_name) {
+		var controls = new Array(
+			['table', 'table.gif', 'lang_table_desc', 'mceInsertTable', true],
+			['delete_col', 'table_delete_col.gif', 'lang_table_delete_col_desc', 'mceTableDeleteCol'],
+			['delete_row', 'table_delete_row.gif', 'lang_table_delete_row_desc', 'mceTableDeleteRow'],
+			['col_after', 'table_insert_col_after.gif', 'lang_table_col_after_desc', 'mceTableInsertColAfter'],
+			['col_before', 'table_insert_col_before.gif', 'lang_table_col_before_desc', 'mceTableInsertColBefore'],
+			['row_after', 'table_insert_row_after.gif', 'lang_table_row_after_desc', 'mceTableInsertRowAfter'],
+			['row_before', 'table_insert_row_before.gif', 'lang_table_row_before_desc', 'mceTableInsertRowBefore'],
+			['row_props', 'table_row_props.gif', 'lang_table_row_desc', 'mceTableRowProps', true],
+			['cell_props', 'table_cell_props.gif', 'lang_table_cell_desc', 'mceTableCellProps', true],
+			['split_cells', 'table_split_cells.gif', 'lang_table_split_cells_desc', 'mceTableSplitCells', true],
+			['merge_cells', 'table_merge_cells.gif', 'lang_table_merge_cells_desc', 'mceTableMergeCells', true]);
+
+		// Render table control
+		for (var i=0; i<controls.length; i++) {
+			var but = controls[i];
+			var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');return false;';
+
+			if (but[0] == control_name)
+				return tinyMCE.getButtonHTML(control_name, but[2], '{$pluginurl}/images/'+ but[1], but[3], (but.length > 4 ? but[4] : false));
+		}
+
+		// Special tablecontrols
+		if (control_name == "tablecontrols") {
+			var html = "";
+
+			html += tinyMCE.getControlHTML("table");
+			html += tinyMCE.getControlHTML("separator");
+			html += tinyMCE.getControlHTML("row_props");
+			html += tinyMCE.getControlHTML("cell_props");
+			html += tinyMCE.getControlHTML("separator");
+			html += tinyMCE.getControlHTML("row_before");
+			html += tinyMCE.getControlHTML("row_after");
+			html += tinyMCE.getControlHTML("delete_row");
+			html += tinyMCE.getControlHTML("separator");
+			html += tinyMCE.getControlHTML("col_before");
+			html += tinyMCE.getControlHTML("col_after");
+			html += tinyMCE.getControlHTML("delete_col");
+			html += tinyMCE.getControlHTML("separator");
+			html += tinyMCE.getControlHTML("split_cells");
+			html += tinyMCE.getControlHTML("merge_cells");
+
+			return html;
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the table commands.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Is table command
+		switch (command) {
+			case "mceInsertTable":
+			case "mceTableRowProps":
+			case "mceTableCellProps":
+			case "mceTableSplitCells":
+			case "mceTableMergeCells":
+			case "mceTableInsertRowBefore":
+			case "mceTableInsertRowAfter":
+			case "mceTableDeleteRow":
+			case "mceTableInsertColBefore":
+			case "mceTableInsertColAfter":
+			case "mceTableDeleteCol":
+			case "mceTableCutRow":
+			case "mceTableCopyRow":
+			case "mceTablePasteRowBefore":
+			case "mceTablePasteRowAfter":
+			case "mceTableDelete":
+				var inst = tinyMCE.getInstanceById(editor_id);
+
+				inst.execCommand('mceBeginUndoLevel');
+				TinyMCE_TablePlugin._doExecCommand(editor_id, element, command, user_interface, value);
+				inst.execCommand('mceEndUndoLevel');
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		var colspan = "1", rowspan = "1";
+
+		var inst = tinyMCE.getInstanceById(editor_id);
+
+		// Reset table controls
+		tinyMCE.switchClass(editor_id + '_table', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_row_props', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_cell_props', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_row_before', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_row_after', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_delete_row', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_col_before', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_col_after', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_delete_col', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_split_cells', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_merge_cells', 'mceButtonDisabled');
+
+		// Within a td element
+		if (tdElm = tinyMCE.getParentElement(node, "td,th")) {
+			tinyMCE.switchClass(editor_id + '_cell_props', 'mceButtonSelected');
+			tinyMCE.switchClass(editor_id + '_row_before', 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_row_after', 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_delete_row', 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_col_before', 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_col_after', 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_delete_col', 'mceButtonNormal');
+
+			colspan = tinyMCE.getAttrib(tdElm, "colspan");
+			rowspan = tinyMCE.getAttrib(tdElm, "rowspan");
+
+			colspan = colspan == "" ? "1" : colspan;
+			rowspan = rowspan == "" ? "1" : rowspan;
+
+			if (colspan != "1" || rowspan != "1")
+				tinyMCE.switchClass(editor_id + '_split_cells', 'mceButtonNormal');
+		}
+
+		// Within a tr element
+		if (tinyMCE.getParentElement(node, "tr"))
+			tinyMCE.switchClass(editor_id + '_row_props', 'mceButtonSelected');
+
+		// Within table
+		if (tinyMCE.getParentElement(node, "table")) {
+			tinyMCE.switchClass(editor_id + '_table', 'mceButtonSelected');
+			tinyMCE.switchClass(editor_id + '_merge_cells', 'mceButtonNormal');
+		}
+	},
+
+	// Private plugin internal methods
+
+	_mouseDownHandler : function(e) {
+		var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+		var focusElm = tinyMCE.selectedInstance.getFocusElement();
+
+		// If press on special Mozilla create TD/TR thingie
+		if (elm.nodeName == "BODY" && (focusElm.nodeName == "TD" || focusElm.nodeName == "TH" || (focusElm.parentNode && focusElm.parentNode.nodeName == "TD") ||(focusElm.parentNode && focusElm.parentNode.nodeName == "TH") )) {
+			window.setTimeout(function() {
+				var tableElm = tinyMCE.getParentElement(focusElm, "table");
+				tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
+			}, 10);
+		}
+	},
+
+	/**
+	 * Executes the table commands.
+	 */
+	_doExecCommand : function(editor_id, element, command, user_interface, value) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+		var focusElm = inst.getFocusElement();
+		var trElm = tinyMCE.getParentElement(focusElm, "tr");
+		var tdElm = tinyMCE.getParentElement(focusElm, "td,th");
+		var tableElm = tinyMCE.getParentElement(focusElm, "table");
+		var doc = inst.contentWindow.document;
+		var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
+
+		// Get first TD if no TD found
+		if (trElm && tdElm == null)
+			tdElm = trElm.cells[0];
+
+		// ------- Inner functions ---------
+		function inArray(ar, v) {
+			for (var i=0; i<ar.length; i++) {
+				// Is array
+				if (ar[i].length > 0 && inArray(ar[i], v))
+					return true;
+
+				// Found value
+				if (ar[i] == v)
+					return true;
+			}
+
+			return false;
+		}
+
+		function makeTD() {
+			var newTD = doc.createElement("td");
+			newTD.innerHTML = "&nbsp;";
+		}
+
+		function getColRowSpan(td) {
+			var colspan = tinyMCE.getAttrib(td, "colspan");
+			var rowspan = tinyMCE.getAttrib(td, "rowspan");
+
+			colspan = colspan == "" ? 1 : parseInt(colspan);
+			rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+
+			return {colspan : colspan, rowspan : rowspan};
+		}
+
+		function getCellPos(grid, td) {
+			for (var y=0; y<grid.length; y++) {
+				for (var x=0; x<grid[y].length; x++) {
+					if (grid[y][x] == td)
+						return {cellindex : x, rowindex : y};
+				}
+			}
+
+			return null;
+		}
+
+		function getCell(grid, row, col) {
+			if (grid[row] && grid[row][col])
+				return grid[row][col];
+
+			return null;
+		}
+
+		function getTableGrid(table) {
+			var grid = new Array();
+			var rows = table.rows;
+
+			for (var y=0; y<rows.length; y++) {
+				for (var x=0; x<rows[y].cells.length; x++) {
+					var td = rows[y].cells[x];
+					var sd = getColRowSpan(td);
+
+					// All ready filled
+					for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+
+					// Fill box
+					for (var y2=y; y2<y+sd['rowspan']; y2++) {
+						if (!grid[y2])
+							grid[y2] = new Array();
+
+						for (var x2=xstart; x2<xstart+sd['colspan']; x2++) {
+							grid[y2][x2] = td;
+						}
+					}
+				}
+			}
+
+			return grid;
+		}
+
+		function trimRow(table, tr, td, new_tr) {
+			var grid = getTableGrid(table);
+			var cpos = getCellPos(grid, td);
+
+			// Time to crop away some
+			if (new_tr.cells.length != tr.childNodes.length) {
+				var cells = tr.childNodes;
+				var lastElm = null;
+
+				for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
+					var remove = true;
+					var sd = getColRowSpan(td);
+
+					// Remove due to rowspan
+					if (inArray(cells, td)) {
+						new_tr.childNodes[x]._delete = true;
+					} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
+						for (var i=x; i<x+td.colSpan; i++)
+							new_tr.childNodes[i]._delete = true;
+					}
+
+					if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
+						td.rowSpan = sd.rowspan + 1;
+
+					lastElm = td;
+				}
+
+				deleteMarked(tableElm);
+			}
+		}
+
+		function prevElm(node, name) {
+			while ((node = node.previousSibling) != null) {
+				if (node.nodeName == name)
+					return node;
+			}
+
+			return null;
+		}
+
+		function nextElm(node, names) {
+			var namesAr = names.split(',');
+
+			while ((node = node.nextSibling) != null) {
+				for (var i=0; i<namesAr.length; i++) {
+					if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
+						return node;
+				}
+			}
+
+			return null;
+		}
+
+		function deleteMarked(tbl) {
+			if (tbl.rows == 0)
+				return;
+
+			var tr = tbl.rows[0];
+			do {
+				var next = nextElm(tr, "TR");
+
+				// Delete row
+				if (tr._delete) {
+					tr.parentNode.removeChild(tr);
+					continue;
+				}
+
+				// Delete cells
+				var td = tr.cells[0];
+				if (td.cells > 1) {
+					do {
+						var nexttd = nextElm(td, "TD,TH");
+
+						if (td._delete)
+							td.parentNode.removeChild(td);
+					} while ((td = nexttd) != null);
+				}
+			} while ((tr = next) != null);
+		}
+
+		function addRows(td_elm, tr_elm, rowspan) {
+			// Add rows
+			td_elm.rowSpan = 1;
+			var trNext = nextElm(tr_elm, "TR");
+			for (var i=1; i<rowspan && trNext; i++) {
+				var newTD = doc.createElement("td");
+				newTD.innerHTML = "&nbsp;";
+
+				if (tinyMCE.isMSIE)
+					trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
+				else
+					trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+
+				trNext = nextElm(trNext, "TR");
+			}
+		}
+
+		function copyRow(doc, table, tr) {
+			var grid = getTableGrid(table);
+			var newTR = tr.cloneNode(false);
+			var cpos = getCellPos(grid, tr.cells[0]);
+			var lastCell = null;
+			var tableBorder = tinyMCE.getAttrib(table, "border");
+			var tdElm = null;
+
+			for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+				var newTD = null;
+
+				if (lastCell != tdElm) {
+					for (var i=0; i<tr.cells.length; i++) {
+						if (tdElm == tr.cells[i]) {
+							newTD = tdElm.cloneNode(true);
+							break;
+						}
+					}
+				}
+
+				if (newTD == null) {
+					newTD = doc.createElement("td");
+					newTD.innerHTML = "&nbsp;";
+				}
+
+				// Reset col/row span
+				newTD.colSpan = 1;
+				newTD.rowSpan = 1;
+
+				newTR.appendChild(newTD);
+
+				lastCell = tdElm;
+			}
+
+			return newTR;
+		}
+
+		// ---- Commands -----
+
+		// Handle commands
+		switch (command) {
+			case "mceTableRowProps":
+				if (trElm == null)
+					return true;
+
+				if (user_interface) {
+					// Setup template
+					var template = new Array();
+
+					template['file'] = '../../plugins/table/row.htm';
+					template['width'] = 380;
+					template['height'] = 295;
+
+					// Language specific width and height addons
+					template['width'] += tinyMCE.getLang('lang_table_rowprops_delta_width', 0);
+					template['height'] += tinyMCE.getLang('lang_table_rowprops_delta_height', 0);
+
+					// Open window
+					tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes"});
+				}
+
+				return true;
+
+			case "mceTableCellProps":
+				if (tdElm == null)
+					return true;
+
+				if (user_interface) {
+					// Setup template
+					var template = new Array();
+
+					template['file'] = '../../plugins/table/cell.htm';
+					template['width'] = 380;
+					template['height'] = 295;
+
+					// Language specific width and height addons
+					template['width'] += tinyMCE.getLang('lang_table_cellprops_delta_width', 0);
+					template['height'] += tinyMCE.getLang('lang_table_cellprops_delta_height', 0);
+
+					// Open window
+					tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes"});
+				}
+
+				return true;
+
+			case "mceInsertTable":
+				if (user_interface) {
+					// Setup template
+					var template = new Array();
+
+					template['file'] = '../../plugins/table/table.htm';
+					template['width'] = 380;
+					template['height'] = 295;
+
+					// Language specific width and height addons
+					template['width'] += tinyMCE.getLang('lang_table_table_delta_width', 0);
+					template['height'] += tinyMCE.getLang('lang_table_table_delta_height', 0);
+
+					// Open window
+					tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : value});
+				}
+
+				return true;
+
+			case "mceTableDelete":
+				var table = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+				if (table) {
+					table.parentNode.removeChild(table);
+					inst.repaint();
+				}
+				return true;
+
+			case "mceTableSplitCells":
+			case "mceTableMergeCells":
+			case "mceTableInsertRowBefore":
+			case "mceTableInsertRowAfter":
+			case "mceTableDeleteRow":
+			case "mceTableInsertColBefore":
+			case "mceTableInsertColAfter":
+			case "mceTableDeleteCol":
+			case "mceTableCutRow":
+			case "mceTableCopyRow":
+			case "mceTablePasteRowBefore":
+			case "mceTablePasteRowAfter":
+				// No table just return (invalid command)
+				if (!tableElm)
+					return true;
+
+				// Table has a tbody use that reference
+				// Changed logic by ApTest 2005.07.12 (www.aptest.com)
+				// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
+				if (tableElm != trElm.parentNode)
+					tableElm = trElm.parentNode;
+
+				if (tableElm && trElm) {
+					switch (command) {
+						case "mceTableInsertRowBefore":
+							if (!trElm || !tdElm)
+								return true;
+
+							var grid = getTableGrid(tableElm);
+							var cpos = getCellPos(grid, tdElm);
+							var newTR = doc.createElement("tr");
+							var lastTDElm = null;
+
+							cpos.rowindex--;
+							if (cpos.rowindex < 0)
+								cpos.rowindex = 0;
+
+							// Create cells
+							for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+								if (tdElm != lastTDElm) {
+									var sd = getColRowSpan(tdElm);
+
+									if (sd['rowspan'] == 1) {
+										var newTD = doc.createElement("td");
+
+										newTD.innerHTML = "&nbsp;";
+										newTD.colSpan = tdElm.colSpan;
+
+										newTR.appendChild(newTD);
+									} else
+										tdElm.rowSpan = sd['rowspan'] + 1;
+
+									lastTDElm = tdElm;
+								}
+							}
+
+							trElm.parentNode.insertBefore(newTR, trElm);
+						break;
+
+						case "mceTableCutRow":
+							if (!trElm || !tdElm)
+								return true;
+
+							inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+							inst.execCommand("mceTableDeleteRow");
+							break;
+
+						case "mceTableCopyRow":
+							if (!trElm || !tdElm)
+								return true;
+
+							inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+							break;
+
+						case "mceTablePasteRowBefore":
+							if (!trElm || !tdElm)
+								return true;
+
+							var newTR = inst.tableRowClipboard.cloneNode(true);
+
+							var prevTR = prevElm(trElm, "TR");
+							if (prevTR != null)
+								trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
+
+							trElm.parentNode.insertBefore(newTR, trElm);
+							break;
+
+						case "mceTablePasteRowAfter":
+							if (!trElm || !tdElm)
+								return true;
+							
+							var nextTR = nextElm(trElm, "TR");
+							var newTR = inst.tableRowClipboard.cloneNode(true);
+
+							trimRow(tableElm, trElm, tdElm, newTR);
+
+							if (nextTR == null)
+								trElm.parentNode.appendChild(newTR);
+							else
+								nextTR.parentNode.insertBefore(newTR, nextTR);
+
+							break;
+
+						case "mceTableInsertRowAfter":
+							if (!trElm || !tdElm)
+								return true;
+
+							var grid = getTableGrid(tableElm);
+							var cpos = getCellPos(grid, tdElm);
+							var newTR = doc.createElement("tr");
+							var lastTDElm = null;
+
+							// Create cells
+							for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+								if (tdElm != lastTDElm) {
+									var sd = getColRowSpan(tdElm);
+
+									if (sd['rowspan'] == 1) {
+										var newTD = doc.createElement("td");
+
+										newTD.innerHTML = "&nbsp;";
+										newTD.colSpan = tdElm.colSpan;
+
+										newTR.appendChild(newTD);
+									} else
+										tdElm.rowSpan = sd['rowspan'] + 1;
+
+									lastTDElm = tdElm;
+								}
+							}
+
+							if (newTR.hasChildNodes()) {
+								var nextTR = nextElm(trElm, "TR");
+								if (nextTR)
+									nextTR.parentNode.insertBefore(newTR, nextTR);
+								else
+									tableElm.appendChild(newTR);
+							}
+						break;
+
+						case "mceTableDeleteRow":
+							if (!trElm || !tdElm)
+								return true;
+		
+							var grid = getTableGrid(tableElm);
+							var cpos = getCellPos(grid, tdElm);
+
+							// Only one row, remove whole table
+							if (grid.length == 1) {
+								tableElm.parentNode.removeChild(tableElm);
+								return true;
+							}
+
+							// Move down row spanned cells
+							var cells = trElm.cells;
+							var nextTR = nextElm(trElm, "TR");
+							for (var x=0; x<cells.length; x++) {
+								if (cells[x].rowSpan > 1) {
+									var newTD = cells[x].cloneNode(true);
+									var sd = getColRowSpan(cells[x]);
+
+									newTD.rowSpan = sd.rowspan - 1;
+
+									var nextTD = nextTR.cells[x];
+
+									if (nextTD == null)
+										nextTR.appendChild(newTD);
+									else
+										nextTR.insertBefore(newTD, nextTD);
+								}
+							}
+
+							// Delete cells
+							var lastTDElm = null;
+							for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+								if (tdElm != lastTDElm) {
+									var sd = getColRowSpan(tdElm);
+
+									if (sd.rowspan > 1) {
+										tdElm.rowSpan = sd.rowspan - 1;
+									} else {
+										trElm = tdElm.parentNode;
+
+										if (trElm.parentNode)
+											trElm._delete = true;
+									}
+
+									lastTDElm = tdElm;
+								}
+							}
+
+							deleteMarked(tableElm);
+
+							cpos.rowindex--;
+							if (cpos.rowindex < 0)
+								cpos.rowindex = 0;
+
+							inst.selection.selectNode(getCell(grid, cpos.rowindex, 0), true, true);
+						break;
+
+						case "mceTableInsertColBefore":
+							if (!trElm || !tdElm)
+								return true;
+
+							var grid = getTableGrid(tableElm);
+							var cpos = getCellPos(grid, tdElm);
+							var lastTDElm = null;
+
+							for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+								if (tdElm != lastTDElm) {
+									var sd = getColRowSpan(tdElm);
+
+									if (sd['colspan'] == 1) {
+										var newTD = doc.createElement(tdElm.nodeName);
+
+										newTD.innerHTML = "&nbsp;";
+										newTD.rowSpan = tdElm.rowSpan;
+
+										tdElm.parentNode.insertBefore(newTD, tdElm);
+									} else
+										tdElm.colSpan++;
+
+									lastTDElm = tdElm;
+								}
+							}
+						break;
+
+						case "mceTableInsertColAfter":
+							if (!trElm || !tdElm)
+								return true;
+
+							var grid = getTableGrid(tableElm);
+							var cpos = getCellPos(grid, tdElm);
+							var lastTDElm = null;
+
+							for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+								if (tdElm != lastTDElm) {
+									var sd = getColRowSpan(tdElm);
+
+									if (sd['colspan'] == 1) {
+										var newTD = doc.createElement(tdElm.nodeName);
+
+										newTD.innerHTML = "&nbsp;";
+										newTD.rowSpan = tdElm.rowSpan;
+
+										var nextTD = nextElm(tdElm, "TD,TH");
+										if (nextTD == null)
+											tdElm.parentNode.appendChild(newTD);
+										else
+											nextTD.parentNode.insertBefore(newTD, nextTD);
+									} else
+										tdElm.colSpan++;
+
+									lastTDElm = tdElm;
+								}
+							}
+						break;
+
+						case "mceTableDeleteCol":
+							if (!trElm || !tdElm)
+								return true;
+
+							var grid = getTableGrid(tableElm);
+							var cpos = getCellPos(grid, tdElm);
+							var lastTDElm = null;
+
+							// Only one col, remove whole table
+							if (grid.length > 1 && grid[0].length <= 1) {
+								tableElm.parentNode.removeChild(tableElm);
+								return true;
+							}
+
+							// Delete cells
+							for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+								if (tdElm != lastTDElm) {
+									var sd = getColRowSpan(tdElm);
+
+									if (sd['colspan'] > 1)
+										tdElm.colSpan = sd['colspan'] - 1;
+									else {
+										if (tdElm.parentNode)
+											tdElm.parentNode.removeChild(tdElm);
+									}
+
+									lastTDElm = tdElm;
+								}
+							}
+
+							cpos.cellindex--;
+							if (cpos.cellindex < 0)
+								cpos.cellindex = 0;
+
+							inst.selection.selectNode(getCell(grid, 0, cpos.cellindex), true, true);
+						break;
+
+					case "mceTableSplitCells":
+						if (!trElm || !tdElm)
+							return true;
+
+						var spandata = getColRowSpan(tdElm);
+
+						var colspan = spandata["colspan"];
+						var rowspan = spandata["rowspan"];
+
+						// Needs splitting
+						if (colspan > 1 || rowspan > 1) {
+							// Generate cols
+							tdElm.colSpan = 1;
+							for (var i=1; i<colspan; i++) {
+								var newTD = doc.createElement("td");
+
+								newTD.innerHTML = "&nbsp;";
+
+								trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));
+
+								if (rowspan > 1)
+									addRows(newTD, trElm, rowspan);
+							}
+
+							addRows(tdElm, trElm, rowspan);
+						}
+
+						// Apply visual aids
+						tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+						break;
+
+					case "mceTableMergeCells":
+						var rows = new Array();
+						var sel = inst.getSel();
+						var grid = getTableGrid(tableElm);
+
+						if (tinyMCE.isMSIE || sel.rangeCount == 1) {
+							if (user_interface) {
+								// Setup template
+								var template = new Array();
+								var sp = getColRowSpan(tdElm);
+
+								template['file'] = '../../plugins/table/merge_cells.htm';
+								template['width'] = 250;
+								template['height'] = 105 + (tinyMCE.isNS7 ? 25 : 0);
+
+								// Language specific width and height addons
+								template['width'] += tinyMCE.getLang('lang_table_merge_cells_delta_width', 0);
+								template['height'] += tinyMCE.getLang('lang_table_merge_cells_delta_height', 0);
+
+								// Open window
+								tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : "update", numcols : sp.colspan, numrows : sp.rowspan});
+
+								return true;
+							} else {
+								var numRows = parseInt(value['numrows']);
+								var numCols = parseInt(value['numcols']);
+								var cpos = getCellPos(grid, tdElm);
+
+								if (("" + numRows) == "NaN")
+									numRows = 1;
+
+								if (("" + numCols) == "NaN")
+									numCols = 1;
+
+								// Get rows and cells
+								var tRows = tableElm.rows;
+								for (var y=cpos.rowindex; y<grid.length; y++) {
+									var rowCells = new Array();
+
+									for (var x=cpos.cellindex; x<grid[y].length; x++) {
+										var td = getCell(grid, y, x);
+
+										if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
+											var cp = getCellPos(grid, td);
+
+											// Within range
+											if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
+												rowCells[rowCells.length] = td;
+										}
+									}
+
+									if (rowCells.length > 0)
+										rows[rows.length] = rowCells;
+								}
+
+								//return true;
+							}
+						} else {
+							var cells = new Array();
+							var sel = inst.getSel();
+							var lastTR = null;
+							var curRow = null;
+							var x1 = -1, y1 = -1, x2, y2;
+
+							// Only one cell selected, whats the point?
+							if (sel.rangeCount < 2)
+								return true;
+
+							// Get all selected cells
+							for (var i=0; i<sel.rangeCount; i++) {
+								var rng = sel.getRangeAt(i);
+								var tdElm = rng.startContainer.childNodes[rng.startOffset];
+
+								if (!tdElm)
+									break;
+
+								if (tdElm.nodeName == "TD")
+									cells[cells.length] = tdElm;
+							}
+
+							// Get rows and cells
+							var tRows = tableElm.rows;
+							for (var y=0; y<tRows.length; y++) {
+								var rowCells = new Array();
+
+								for (var x=0; x<tRows[y].cells.length; x++) {
+									var td = tRows[y].cells[x];
+
+									for (var i=0; i<cells.length; i++) {
+										if (td == cells[i]) {
+											rowCells[rowCells.length] = td;
+										}
+									}
+								}
+
+								if (rowCells.length > 0)
+									rows[rows.length] = rowCells;
+							}
+
+							// Find selected cells in grid and box
+							var curRow = new Array();
+							var lastTR = null;
+							for (var y=0; y<grid.length; y++) {
+								for (var x=0; x<grid[y].length; x++) {
+									grid[y][x]._selected = false;
+
+									for (var i=0; i<cells.length; i++) {
+										if (grid[y][x] == cells[i]) {
+											// Get start pos
+											if (x1 == -1) {
+												x1 = x;
+												y1 = y;
+											}
+
+											// Get end pos
+											x2 = x;
+											y2 = y;
+
+											grid[y][x]._selected = true;
+										}
+									}
+								}
+							}
+
+							// Is there gaps, if so deny
+							for (var y=y1; y<=y2; y++) {
+								for (var x=x1; x<=x2; x++) {
+									if (!grid[y][x]._selected) {
+										alert("Invalid selection for merge.");
+										return true;
+									}
+								}
+							}
+						}
+
+						// Validate selection and get total rowspan and colspan
+						var rowSpan = 1, colSpan = 1;
+
+						// Validate horizontal and get total colspan
+						var lastRowSpan = -1;
+						for (var y=0; y<rows.length; y++) {
+							var rowColSpan = 0;
+
+							for (var x=0; x<rows[y].length; x++) {
+								var sd = getColRowSpan(rows[y][x]);
+
+								rowColSpan += sd['colspan'];
+
+								if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
+									alert("Invalid selection for merge.");
+									return true;
+								}
+
+								lastRowSpan = sd['rowspan'];
+							}
+
+							if (rowColSpan > colSpan)
+								colSpan = rowColSpan;
+
+							lastRowSpan = -1;
+						}
+
+						// Validate vertical and get total rowspan
+						var lastColSpan = -1;
+						for (var x=0; x<rows[0].length; x++) {
+							var colRowSpan = 0;
+
+							for (var y=0; y<rows.length; y++) {
+								var sd = getColRowSpan(rows[y][x]);
+
+								colRowSpan += sd['rowspan'];
+
+								if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
+									alert("Invalid selection for merge.");
+									return true;
+								}
+
+								lastColSpan = sd['colspan'];
+							}
+
+							if (colRowSpan > rowSpan)
+								rowSpan = colRowSpan;
+
+							lastColSpan = -1;
+						}
+
+						// Setup td
+						tdElm = rows[0][0];
+						tdElm.rowSpan = rowSpan;
+						tdElm.colSpan = colSpan;
+
+						// Merge cells
+						for (var y=0; y<rows.length; y++) {
+							for (var x=0; x<rows[y].length; x++) {
+								var html = rows[y][x].innerHTML;
+								var chk = tinyMCE.regexpReplace(html, "[ \t\r\n]", "");
+
+								if (chk != "<br/>" && chk != "<br>" && chk != "&nbsp;" && (x+y > 0))
+									tdElm.innerHTML += html;
+
+								// Not current cell
+								if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
+									var cpos = getCellPos(grid, rows[y][x]);
+									var tr = rows[y][x].parentNode;
+
+									tr.removeChild(rows[y][x]);
+									rows[y][x]._deleted = true;
+
+									// Empty TR, remove it
+									if (!tr.hasChildNodes()) {
+										tr.parentNode.removeChild(tr);
+
+										var lastCell = null;
+										for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
+											if (cellElm != lastCell && cellElm.rowSpan > 1)
+												cellElm.rowSpan--;
+
+											lastCell = cellElm;
+										}
+
+										if (tdElm.rowSpan > 1)
+											tdElm.rowSpan--;
+									}
+								}
+							}
+						}
+
+						break;
+					}
+
+					tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+					tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
+					tinyMCE.triggerNodeChange();
+					inst.repaint();
+				}
+
+			return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("table", TinyMCE_TablePlugin);
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/buttons.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/buttons.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_cell_props.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_cell_props.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete_col.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete_col.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete_row.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete_row.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_col_after.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_col_after.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_col_before.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_col_before.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_row_after.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_row_after.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_row_before.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_row_before.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_merge_cells.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_merge_cells.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_row_props.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_row_props.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_split_cells.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/images/table_split_cells.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/cell.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/cell.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/cell.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/cell.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,249 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
+
+	var inst = tinyMCE.selectedInstance;
+	var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th");
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(tinyMCE.getAttrib(tdElm, "style"));
+
+	// Get table cell data
+	var celltype = tdElm.nodeName.toLowerCase();
+	var align = tinyMCE.getAttrib(tdElm, 'align');
+	var valign = tinyMCE.getAttrib(tdElm, 'valign');
+	var width = trimSize(getStyle(tdElm, 'width', 'width'));
+	var height = trimSize(getStyle(tdElm, 'height', 'height'));
+	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
+	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
+	var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tdElm, 'class'), false);
+	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+	var id = tinyMCE.getAttrib(tdElm, 'id');
+	var lang = tinyMCE.getAttrib(tdElm, 'lang');
+	var dir = tinyMCE.getAttrib(tdElm, 'dir');
+	var scope = tinyMCE.getAttrib(tdElm, 'scope');
+
+	// Setup form
+	addClassesToList('class', 'table_cell_styles');
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.backgroundimage.value = backgroundimage;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.id.value = id;
+	formObj.lang.value = lang;
+	formObj.style.value = tinyMCE.serializeStyle(st);
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'valign', valign);
+	selectByValue(formObj, 'class', className);
+	selectByValue(formObj, 'celltype', celltype);
+	selectByValue(formObj, 'dir', dir);
+	selectByValue(formObj, 'scope', scope);
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+}
+
+function updateAction() {
+	tinyMCEPopup.restoreSelection();
+
+	var inst = tinyMCE.selectedInstance;
+	var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th");
+	var trElm = tinyMCE.getParentElement(inst.getFocusElement(), "tr");
+	var tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+	var formObj = document.forms[0];
+
+	inst.execCommand('mceBeginUndoLevel');
+
+	switch (getSelectValue(formObj, 'action')) {
+		case "cell":
+			var celltype = getSelectValue(formObj, 'celltype');
+			var scope = getSelectValue(formObj, 'scope');
+
+			if (tinyMCE.getParam("accessibility_warnings")) {
+				if (celltype == "th" && scope == "")
+					var answer = confirm(tinyMCE.getLang('lang_table_missing_scope', '', true));
+				else
+					var answer = true;
+
+				if (!answer)
+					return;
+			}
+
+			updateCell(tdElm);
+			break;
+
+		case "row":
+			var cell = trElm.firstChild;
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				cell = updateCell(cell, true);
+			} while ((cell = nextCell(cell)) != null);
+
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				var cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				do {
+					cell = updateCell(cell, true);
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+	}
+
+	tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+	tinyMCE.triggerNodeChange();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function nextCell(elm) {
+	while ((elm = elm.nextSibling) != null) {
+		if (elm.nodeName == "TD" || elm.nodeName == "TH")
+			return elm;
+	}
+
+	return null;
+}
+
+function updateCell(td, skip_id) {
+	var inst = tinyMCE.selectedInstance;
+	var formObj = document.forms[0];
+	var curCellType = td.nodeName.toLowerCase();
+	var celltype = getSelectValue(formObj, 'celltype');
+	var doc = inst.getDoc();
+
+	if (!skip_id)
+		td.setAttribute('id', formObj.id.value);
+
+	td.setAttribute('align', formObj.align.value);
+	td.setAttribute('vAlign', formObj.valign.value);
+	td.setAttribute('lang', formObj.lang.value);
+	td.setAttribute('dir', getSelectValue(formObj, 'dir'));
+	td.setAttribute('style', tinyMCE.serializeStyle(tinyMCE.parseStyle(formObj.style.value)));
+	td.setAttribute('scope', formObj.scope.value);
+	tinyMCE.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	tinyMCE.setAttrib(td, 'width', '');
+	tinyMCE.setAttrib(td, 'height', '');
+	tinyMCE.setAttrib(td, 'bgColor', '');
+	tinyMCE.setAttrib(td, 'borderColor', '');
+	tinyMCE.setAttrib(td, 'background', '');
+
+	// Set styles
+	td.style.width = getCSSSize(formObj.width.value);
+	td.style.height = getCSSSize(formObj.height.value);
+	if (formObj.bordercolor.value != "") {
+		td.style.borderColor = formObj.bordercolor.value;
+		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
+		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
+	} else
+		td.style.borderColor = '';
+
+	td.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		td.style.backgroundImage = '';
+
+	if (curCellType != celltype) {
+		// changing to a different node type
+		var newCell = doc.createElement(celltype);
+
+		for (var c=0; c<td.childNodes.length; c++)
+			newCell.appendChild(td.childNodes[c].cloneNode(1));
+
+		for (var a=0; a<td.attributes.length; a++) {
+			var attr = td.attributes[a];
+			newCell.setAttribute(attr.name, attr.value);
+		}
+
+		td.parentNode.replaceChild(newCell, td);
+		td = newCell;
+	}
+
+	return td;
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = getCSSSize(width);
+	else
+		st['width'] = "";
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+	st['border-color'] = formObj.bordercolor.value;
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/merge_cells.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/merge_cells.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/merge_cells.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/merge_cells.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,19 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+
+	formObj.numcols.value = tinyMCE.getWindowArg('numcols', 1);
+	formObj.numrows.value = tinyMCE.getWindowArg('numrows', 1);
+}
+
+function mergeCells() {
+	var args = new Array();
+	var formObj = document.forms[0];
+
+	args["numcols"] = formObj.numcols.value;
+	args["numrows"] = formObj.numrows.value;
+
+	tinyMCEPopup.execCommand("mceTableMergeCells", false, args);
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/row.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/row.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/row.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/row.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,200 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var inst = tinyMCE.selectedInstance;
+	var trElm = tinyMCE.getParentElement(inst.getFocusElement(), "tr");
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(tinyMCE.getAttrib(trElm, "style"));
+
+	// Get table row data
+	var rowtype = trElm.parentNode.nodeName.toLowerCase();
+	var align = tinyMCE.getAttrib(trElm, 'align');
+	var valign = tinyMCE.getAttrib(trElm, 'valign');
+	var height = trimSize(getStyle(trElm, 'height', 'height'));
+	var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(trElm, 'class'), false);
+	var bgcolor = convertRGBToHex(getStyle(trElm, 'bgcolor', 'backgroundColor'));
+	var backgroundimage = getStyle(trElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+	var id = tinyMCE.getAttrib(trElm, 'id');
+	var lang = tinyMCE.getAttrib(trElm, 'lang');
+	var dir = tinyMCE.getAttrib(trElm, 'dir');
+
+	// Setup form
+	addClassesToList('class', 'table_row_styles');
+	formObj.bgcolor.value = bgcolor;
+	formObj.backgroundimage.value = backgroundimage;
+	formObj.height.value = height;
+	formObj.id.value = id;
+	formObj.lang.value = lang;
+	formObj.style.value = tinyMCE.serializeStyle(st);
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'valign', valign);
+	selectByValue(formObj, 'class', className);
+	selectByValue(formObj, 'rowtype', rowtype);
+	selectByValue(formObj, 'dir', dir);
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	updateColor('bgcolor_pick', 'bgcolor');
+}
+
+function updateAction() {
+	tinyMCEPopup.restoreSelection();
+
+	var inst = tinyMCE.selectedInstance;
+	var trElm = tinyMCE.getParentElement(inst.getFocusElement(), "tr");
+	var tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+	var formObj = document.forms[0];
+	var action = getSelectValue(formObj, 'action');
+
+	inst.execCommand('mceBeginUndoLevel');
+
+	switch (action) {
+		case "row":
+			updateRow(trElm);
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++)
+				updateRow(rows[i], true);
+
+			break;
+
+		case "odd":
+		case "even":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				if ((i % 2 == 0 && action == "odd") || (i % 2 != 0 && action == "even"))
+					updateRow(rows[i], true, true);
+			}
+
+			break;
+	}
+
+	tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+	tinyMCE.triggerNodeChange();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function updateRow(tr_elm, skip_id, skip_parent) {
+	var inst = tinyMCE.selectedInstance;
+	var formObj = document.forms[0];
+	var curRowType = tr_elm.parentNode.nodeName.toLowerCase();
+	var rowtype = getSelectValue(formObj, 'rowtype');
+	var doc = inst.getDoc();
+
+	// Update row element
+	if (!skip_id)
+		tr_elm.setAttribute('id', formObj.id.value);
+
+	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));
+	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));
+	tr_elm.setAttribute('lang', formObj.lang.value);
+	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));
+	tr_elm.setAttribute('style', tinyMCE.serializeStyle(tinyMCE.parseStyle(formObj.style.value)));
+	tinyMCE.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	tr_elm.setAttribute('background', '');
+	tr_elm.setAttribute('bgColor', '');
+	tr_elm.setAttribute('height', '');
+
+	// Set styles
+	tr_elm.style.height = getCSSSize(formObj.height.value);
+	tr_elm.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		tr_elm.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		tr_elm.style.backgroundImage = '';
+
+	// Setup new rowtype
+	if (curRowType != rowtype && !skip_parent) {
+		// first, clone the node we are working on
+		var newRow = tr_elm.cloneNode(1);
+
+		// next, find the parent of its new destination (creating it if necessary)
+		var theTable = tinyMCE.getParentElement(tr_elm, "table");
+		var dest = rowtype;
+		var newParent = null;
+		for (var i = 0; i < theTable.childNodes.length; i++) {
+			if (theTable.childNodes[i].nodeName.toLowerCase() == dest)
+				newParent = theTable.childNodes[i];
+		}
+
+		if (newParent == null) {
+			newParent = doc.createElement(dest);
+
+			if (dest == "thead")
+				theTable.insertBefore(newParent, theTable.firstChild);
+			else
+				theTable.appendChild(newParent);
+		}
+
+		// append the row to the new parent
+		newParent.appendChild(newRow);
+
+		// remove the original
+		tr_elm.parentNode.removeChild(tr_elm);
+
+		// set tr_elm to the new node
+		tr_elm = newRow;
+	}
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/table.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/table.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/table.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/jscripts/table.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,344 @@
+var action, orgTableWidth, orgTableHeight;
+
+function insertTable() {
+	var formObj = document.forms[0];
+	var inst = tinyMCE.selectedInstance;
+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className;
+	var html = '';
+	var elm = tinyMCE.tableElm;
+	var cellLimit, rowLimit, colLimit;
+
+	tinyMCEPopup.restoreSelection();
+
+	// Get form data
+	cols = formObj.elements['cols'].value;
+	rows = formObj.elements['rows'].value;
+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;
+	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
+	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
+	align = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value;
+	width = formObj.elements['width'].value;
+	height = formObj.elements['height'].value;
+	bordercolor = formObj.elements['bordercolor'].value;
+	bgcolor = formObj.elements['bgcolor'].value;
+	className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value;
+	id = formObj.elements['id'].value;
+	summary = formObj.elements['summary'].value;
+	style = formObj.elements['style'].value;
+	dir = formObj.elements['dir'].value;
+	lang = formObj.elements['lang'].value;
+	background = formObj.elements['backgroundimage'].value;
+
+	cellLimit = tinyMCE.getParam('table_cell_limit', false);
+	rowLimit = tinyMCE.getParam('table_row_limit', false);
+	colLimit = tinyMCE.getParam('table_col_limit', false);
+
+	// Validate table size
+	if (colLimit && cols > colLimit) {
+		alert(tinyMCE.getLang('lang_table_col_limit', '', true, {cols : colLimit}));
+		return false;
+	} else if (rowLimit && rows > rowLimit) {
+		alert(tinyMCE.getLang('lang_table_row_limit', '', true, {rows : rowLimit}));
+		return false;
+	} else if (cellLimit && cols * rows > cellLimit) {
+		alert(tinyMCE.getLang('lang_table_cell_limit', '', true, {cells : cellLimit}));
+		return false;
+	}
+
+	// Update table
+	if (action == "update") {
+		inst.execCommand('mceBeginUndoLevel');
+
+		tinyMCE.setAttrib(elm, 'cellPadding', cellpadding, true);
+		tinyMCE.setAttrib(elm, 'cellSpacing', cellspacing, true);
+		tinyMCE.setAttrib(elm, 'border', border, true);
+		tinyMCE.setAttrib(elm, 'align', align);
+		tinyMCE.setAttrib(elm, 'class', className);
+		tinyMCE.setAttrib(elm, 'style', style);
+		tinyMCE.setAttrib(elm, 'id', id);
+		tinyMCE.setAttrib(elm, 'summary', summary);
+		tinyMCE.setAttrib(elm, 'dir', dir);
+		tinyMCE.setAttrib(elm, 'lang', lang);
+
+		// Not inline styles
+		if (!tinyMCE.getParam("inline_styles"))
+			tinyMCE.setAttrib(elm, 'width', width, true);
+
+		// Remove these since they are not valid XHTML
+		tinyMCE.setAttrib(elm, 'borderColor', '');
+		tinyMCE.setAttrib(elm, 'bgColor', '');
+		tinyMCE.setAttrib(elm, 'background', '');
+		tinyMCE.setAttrib(elm, 'height', '');
+
+		if (background != '')
+			elm.style.backgroundImage = "url('" + background + "')";
+		else
+			elm.style.backgroundImage = '';
+
+		if (tinyMCE.getParam("inline_styles"))
+			elm.style.borderWidth = border + "px";
+
+		if (tinyMCE.getParam("inline_styles")) {
+			if (width != '')
+				elm.style.width = getCSSSize(width);
+		}
+
+		if (bordercolor != "") {
+			elm.style.borderColor = bordercolor;
+			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
+			elm.style.borderWidth = border == "" ? "1px" : border;
+		} else
+			elm.style.borderColor = '';
+
+		elm.style.backgroundColor = bgcolor;
+		elm.style.height = getCSSSize(height);
+
+		tinyMCE.handleVisualAid(tinyMCE.tableElm, false, inst.visualAid, inst);
+
+		// Fix for stange MSIE align bug
+		tinyMCE.tableElm.outerHTML = tinyMCE.tableElm.outerHTML;
+
+		tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+		tinyMCE.triggerNodeChange();
+		inst.execCommand('mceEndUndoLevel');
+
+		// Repaint if dimensions changed
+		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
+			inst.repaint();
+
+		tinyMCEPopup.close();
+		return true;
+	}
+
+	// Create new table
+	html += '<table';
+
+	html += makeAttrib('id', id);
+	html += makeAttrib('border', border);
+	html += makeAttrib('cellpadding', cellpadding);
+	html += makeAttrib('cellspacing', cellspacing);
+	html += makeAttrib('width', width);
+	//html += makeAttrib('height', height);
+	//html += makeAttrib('bordercolor', bordercolor);
+	//html += makeAttrib('bgcolor', bgcolor);
+	html += makeAttrib('align', align);
+	html += makeAttrib('class', tinyMCE.getVisualAidClass(className, border == 0));
+	html += makeAttrib('style', style);
+	html += makeAttrib('summary', summary);
+	html += makeAttrib('dir', dir);
+	html += makeAttrib('lang', lang);
+
+	html += '>';
+
+	for (var y=0; y<rows; y++) {
+		html += "<tr>";
+
+		for (var x=0; x<cols; x++)
+			html += '<td>&nbsp;</td>';
+
+		html += "</tr>";
+	}
+
+	html += "</table>";
+
+	inst.execCommand('mceBeginUndoLevel');
+	inst.execCommand('mceInsertContent', false, html);
+	tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual']);
+	inst.execCommand('mceEndUndoLevel');
+
+	tinyMCEPopup.close();
+}
+
+function makeAttrib(attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value == "")
+		return "";
+
+	// XML encode it
+	value = value.replace(/&/g, '&amp;');
+	value = value.replace(/\"/g, '&quot;');
+	value = value.replace(/</g, '&lt;');
+	value = value.replace(/>/g, '&gt;');
+
+	return ' ' + attrib + '="' + value + '"';
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var cols = 2, rows = 2, border = 0, cellpadding = "", cellspacing = "";
+	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "";
+	var inst = tinyMCE.selectedInstance;
+	var formObj = document.forms[0];
+	var elm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+
+	tinyMCE.tableElm = elm;
+	action = tinyMCE.getWindowArg('action');
+	if (action == null)
+		action = tinyMCE.tableElm ? "update" : "insert";
+
+	if (tinyMCE.tableElm && action != "insert") {
+		var rowsAr = tinyMCE.tableElm.rows;
+		var cols = 0;
+		for (var i=0; i<rowsAr.length; i++)
+			if (rowsAr[i].cells.length > cols)
+				cols = rowsAr[i].cells.length;
+
+		cols = cols;
+		rows = rowsAr.length;
+
+		st = tinyMCE.parseStyle(tinyMCE.getAttrib(tinyMCE.tableElm, "style"));
+		border = trimSize(getStyle(elm, 'border', 'borderWidth'));
+		cellpadding = tinyMCE.getAttrib(tinyMCE.tableElm, 'cellpadding', "");
+		cellspacing = tinyMCE.getAttrib(tinyMCE.tableElm, 'cellspacing', "");
+		width = trimSize(getStyle(elm, 'width', 'width'));
+		height = trimSize(getStyle(elm, 'height', 'height'));
+		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
+		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
+		align = tinyMCE.getAttrib(tinyMCE.tableElm, 'align', align);
+		className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tinyMCE.tableElm, 'class'), false);
+		id = tinyMCE.getAttrib(tinyMCE.tableElm, 'id');
+		summary = tinyMCE.getAttrib(tinyMCE.tableElm, 'summary');
+		style = tinyMCE.serializeStyle(st);
+		dir = tinyMCE.getAttrib(tinyMCE.tableElm, 'dir');
+		lang = tinyMCE.getAttrib(tinyMCE.tableElm, 'lang');
+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+		orgTableWidth = width;
+		orgTableHeight = height;
+
+		action = "update";
+	}
+
+	addClassesToList('class', "table_styles");
+
+	// Update form
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'class', className);
+	formObj.cols.value = cols;
+	formObj.rows.value = rows;
+	formObj.border.value = border;
+	formObj.cellpadding.value = cellpadding;
+	formObj.cellspacing.value = cellspacing;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.id.value = id;
+	formObj.summary.value = summary;
+	formObj.style.value = style;
+	formObj.dir.value = dir;
+	formObj.lang.value = lang;
+	formObj.backgroundimage.value = background;
+	formObj.insert.value = tinyMCE.getLang('lang_' + action, 'Insert', true); 
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	// Disable some fields in update mode
+	if (action == "update") {
+		formObj.cols.disabled = true;
+		formObj.rows.disabled = true;
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = tinyMCE.getParam("inline_styles") ? getCSSSize(width) : "";
+	else
+		st['width'] = "";
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedBorder() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	// Update border width if the element has a color
+	if (formObj.border.value != "" && formObj.bordercolor.value != "")
+		st['border-width'] = formObj.border.value + "px";
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	if (formObj.bordercolor.value != "") {
+		st['border-color'] = formObj.bordercolor.value;
+
+		// Add border-width if it's missing
+		if (!st['border-width'])
+			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";
+	}
+
+	formObj.style.value = tinyMCE.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = tinyMCE.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/en.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,78 @@
+// UK lang variables
+
+tinyMCE.addToLang('table',{
+general_tab : 'General',
+advanced_tab : 'Advanced',
+general_props : 'General properties',
+advanced_props : 'Advanced properties',
+desc : 'Inserts a new table',
+row_before_desc : 'Insert row before',
+row_after_desc : 'Insert row after',
+delete_row_desc : 'Delete row',
+col_before_desc : 'Insert column before',
+col_after_desc : 'Insert column after',
+delete_col_desc : 'Remove column',
+rowtype : 'Row in table part',
+title : 'Insert/Modify table',
+width : 'Width',
+height : 'Height',
+cols : 'Columns',
+rows : 'Rows',
+cellspacing : 'Cellspacing',
+cellpadding : 'Cellpadding',
+border : 'Border',
+align : 'Alignment',
+align_default : 'Default',
+align_left : 'Left',
+align_right : 'Right',
+align_middle : 'Center',
+row_title : 'Table row properties',
+cell_title : 'Table cell properties',
+cell_type : 'Cell type',
+row_desc : 'Table row properties',
+cell_desc : 'Table cell properties',
+valign : 'Vertical alignment',
+align_top : 'Top',
+align_bottom : 'Bottom',
+props_desc : 'Table properties',
+bordercolor : 'Border color',
+bgcolor : 'Background color',
+merge_cells_title : 'Merge table cells',
+split_cells_desc : 'Split table cells',
+merge_cells_desc : 'Merge table cells',
+cut_row_desc : 'Cut table row',
+copy_row_desc : 'Copy table row',
+paste_row_before_desc : 'Paste table row before',
+paste_row_after_desc : 'Paste table row after',
+id : 'Id',
+style: 'Style',
+langdir : 'Language direction',
+langcode : 'Language code',
+mime : 'Target MIME type',
+ltr : 'Left to right',
+rtl : 'Right to left',
+bgimage : 'Background image',
+summary : 'Summary',
+td : "Data",
+th : "Header",
+cell_cell : 'Update current cell',
+cell_row : 'Update all cells in row',
+cell_all : 'Update all cells in table',
+row_row : 'Update current row',
+row_odd : 'Update odd rows in table',
+row_even : 'Update even rows in table',
+row_all : 'Update all rows in table',
+thead : 'Table Head',
+tbody : 'Table Body',
+tfoot : 'Table Foot',
+del : 'Delete table',
+scope : 'Scope',
+row : 'Row',
+col : 'Col',
+rowgroup : 'Row Group',
+colgroup : 'Col Group',
+col_limit : 'You\'ve exceeded the maximum number of columns of {$cols}.',
+row_limit : 'You\'ve exceeded the maximum number of rows of {$rows}.',
+cell_limit : 'You\'ve exceeded the maximum number of cells of {$cells}.',
+missing_scope: 'Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/merge_cells.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/merge_cells.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/merge_cells.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/merge_cells.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,37 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_table_merge_cells_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/merge_cells.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="margin: 8px" style="display: none">
+<form onsubmit="insertTable();return false;" action="#">
+	<fieldset>
+		<legend>{$lang_table_merge_cells_title}</legend>
+		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
+			  <tr>
+				<td>{$lang_table_cols}:</td>
+				<td align="right"><input type="text" name="numcols" value="" style="width: 30px" /></td>
+				<td>
+			  </tr>
+			  <tr>
+				<td>{$lang_table_rows}:</td>
+				<td align="right"><input type="text" name="numrows" value="" style="width: 30px" /></td>
+			  </tr>
+		  </table>
+	</fieldset>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" id="insert" name="insert" value="{$lang_update}" onclick="mergeCells();" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/row.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/row.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/row.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/row.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,159 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_table_row_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/row.js"></script>
+	<link href="css/row.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="tablerow" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+	<form onsubmit="updateAction();return false;">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_table_general_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{$lang_table_advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{$lang_table_general_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="rowtype">{$lang_table_rowtype}</label></td>
+							<td class="col2">
+								<select id="rowtype" name="rowtype">
+									<option value="thead">{$lang_table_thead}</option>
+									<option value="tbody">{$lang_table_tbody}</option>
+									<option value="tfoot">{$lang_table_tfoot}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="align">{$lang_table_align}</label></td>
+							<td class="col2">
+								<select id="align" name="align">
+									<option value="">{$lang_not_set}</option>
+									<option value="center">{$lang_table_align_middle}</option>
+									<option value="left">{$lang_table_align_left}</option>
+									<option value="right">{$lang_table_align_right}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="valign">{$lang_table_valign}</label></td>
+							<td class="col2">
+								<select id="valign" name="valign">
+									<option value="">{$lang_not_set}</option>
+									<option value="top">{$lang_table_align_top}</option>
+									<option value="middle">{$lang_table_align_middle}</option>
+									<option value="bottom">{$lang_table_align_bottom}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr id="styleSelectRow">
+							<td><label for="class">{$lang_class_name}</label></td>
+							<td class="col2">
+								<select id="class" name="class">
+									<option value="" selected="selected">{$lang_not_set}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="height">{$lang_table_height}</label></td>
+							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_table_advanced_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="id">{$lang_table_id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{$lang_table_style}</label></td>
+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="dir">{$lang_table_langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" style="width: 200px"> 
+										<option value="">{$lang_not_set}</option> 
+										<option value="ltr">{$lang_table_ltr}</option> 
+										<option value="rtl">{$lang_table_rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="lang">{$lang_table_langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{$lang_table_bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor">{$lang_table_bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div>
+				<select id="action" name="action">
+					<option value="row">{$lang_table_row_row}</option>
+					<option value="odd">{$lang_table_row_odd}</option>
+					<option value="even">{$lang_table_row_even}</option>
+					<option value="all">{$lang_table_row_all}</option>
+				</select>
+			</div>
+
+			<div style="float: left">
+				<div><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="updateAction();" /></div>
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/table.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/table.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/table.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/table/table.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,155 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_table_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/table.js"></script>
+	<link href="css/table.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="table" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+	<form onsubmit="insertTable();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_table_general_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{$lang_table_advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{$lang_table_general_props}</legend>
+
+					  <table border="0" cellpadding="4" cellspacing="0" width="100%">
+							  <tr>
+								<td><label id="colslabel" for="cols">{$lang_table_cols}</label></td>
+								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" /></td>
+								<td><label id="rowslabel" for="rows">{$lang_table_rows}</label></td>
+								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" /></td>
+							  </tr>
+							  <tr>
+								<td><label id="cellpaddinglabel" for="cellpadding">{$lang_table_cellpadding}</label></td>
+								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" /></td>
+								<td><label id="cellspacinglabel" for="cellspacing">{$lang_table_cellspacing}</label></td>
+								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" /></td>
+							  </tr>
+							  <tr>
+								<td><label id="alignlabel" for="align">{$lang_table_align}</label></td>
+								<td><select id="align" name="align">
+									<option value="">{$lang_not_set}</option>
+									<option value="center">{$lang_table_align_middle}</option>
+									<option value="left">{$lang_table_align_left}</option>
+									<option value="right">{$lang_table_align_right}</option>
+								  </select></td>
+								<td><label id="borderlabel" for="border">{$lang_table_border}</label></td>
+								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" /></td>
+							  </tr>
+							  <tr>
+								<td><label id="widthlabel" for="width">{$lang_table_width}</label></td>
+								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+								<td><label id="heightlabel" for="height">{$lang_table_height}</label></td>
+								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+							  </tr>
+							  <tr id="styleSelectRow">
+								<td><label id="classlabel" for="class">{$lang_class_name}</label></td>
+								<td colspan="3">
+								 <select id="class" name="class">
+									<option value="" selected>{$lang_not_set}</option>
+								 </select></td>
+							  </tr>
+							</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{$lang_table_advanced_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="id">{$lang_table_id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="summary">{$lang_table_summary}</label></td> 
+							<td><input id="summary" name="summary" type="text" value="" class="advfield" /></td> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{$lang_table_style}</label></td>
+							<td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="dir">{$lang_table_langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" class="advfield"> 
+										<option value="">{$lang_not_set}</option> 
+										<option value="ltr">{$lang_table_ltr}</option> 
+										<option value="rtl">{$lang_table_rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="langlabel" for="lang">{$lang_table_langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" class="advfield" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{$lang_table_bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bordercolor">{$lang_table_bordercolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
+										<td id="bordercolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor">{$lang_table_bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertTable();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+var TinyMCE_ZoomPlugin={getInfo:function(){return{longname:'Zoom',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_zoom.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(control_name){if(!tinyMCE.isMSIE||tinyMCE.isMSIE5_0||tinyMCE.isOpera)return"";switch(control_name){case"zoom":return'<select id="{$editor_id}_zoomSelect" name="{$editor_id}_zoomSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceZoom\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+'<option value="100%">+ 100%</option>'+'<option value="150%">+ 150%</option>'+'<option value="200%">+ 200%</option>'+'<option value="250%">+ 250%</option>'+'</select>';}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceZoom":tinyMCE.getInstanceById(editor_id).contentDocument.body.style.zoom=value;tinyMCE.getInstanceById(editor_id).contentDocument.body.style.mozZoom=value;return true;}return false;}};tinyMCE.addPlugin("zoom",TinyMCE_ZoomPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,58 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.10 $
+ * $Date: 2006/04/07 15:52:50 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+var TinyMCE_ZoomPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Zoom',
+			author : 'Moxiecode Systems',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_zoom.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	/**
+	 * Returns the HTML contents of the zoom control.
+	 */
+	getControlHTML : function(control_name) {
+		if (!tinyMCE.isMSIE || tinyMCE.isMSIE5_0 || tinyMCE.isOpera)
+			return "";
+
+		switch (control_name) {
+			case "zoom":
+				return '<select id="{$editor_id}_zoomSelect" name="{$editor_id}_zoomSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceZoom\',false,this.options[this.selectedIndex].value);" class="mceSelectList">' + 
+						'<option value="100%">+ 100%</option>' + 
+						'<option value="150%">+ 150%</option>' + 
+						'<option value="200%">+ 200%</option>' + 
+						'<option value="250%">+ 250%</option>' + 
+						'</select>';
+		}
+
+		return "";
+	},
+
+	/**
+	 * Executes the mceZoom command.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceZoom":
+				tinyMCE.getInstanceById(editor_id).contentDocument.body.style.zoom = value;
+				tinyMCE.getInstanceById(editor_id).contentDocument.body.style.mozZoom = value;
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	}
+};
+
+tinyMCE.addPlugin("zoom", TinyMCE_ZoomPlugin);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/readme.txt 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/readme.txt
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/readme.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/plugins/zoom/readme.txt	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/about.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/about.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/about.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/about.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,52 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_about_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/about.js"></script>
+	<base target="_self" />
+</head>
+<body id="about" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_about}</a></span></li>
+				<li id="help_tab"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{$lang_help}</a></span></li>
+				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{$lang_plugins}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<h3>{$lang_about_title}</h3>
+				<p>Version: {$tinymce_version} ({$tinymce_releasedate})</p>
+				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
+				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
+				<p>Copyright &copy; 2003-2006, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
+				<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>
+
+				<div id="buttoncontainer"></div>
+			</div>
+
+			<div id="plugins_panel" class="panel">
+				<div id="pluginscontainer">
+					<h3>{$lang_loaded_plugins}</h3>
+
+					<div id="plugintablecontainer">
+					</div>
+
+					<p>&nbsp;</p>
+				</div>
+			</div>
+
+			<div id="help_panel" class="panel noscroll" style="overflow: visible;">
+				<div id="iframecontainer"></div>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{$lang_close}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/anchor.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/anchor.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/anchor.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/anchor.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,33 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_insert_anchor_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/anchor.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+<form onsubmit="insertAnchor();return false;" action="#">
+
+	<table border="0" cellpadding="4" cellspacing="0">
+		<tr>
+			<td colspan="2" class="title">{$lang_insert_anchor_title}</td>
+		</tr>
+		<tr>
+			<td nowrap="nowrap">{$lang_insert_anchor_name}:</td>
+			<td><input name="anchorName" type="text" id="anchorName" value="" style="width: 200px" /></td>
+		</tr>
+	</table>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" id="insert" name="insert" value="{$lang_update}" onclick="insertAnchor();" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/charmap.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/charmap.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/charmap.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/charmap.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,53 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_theme_charmap_title}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/charmap.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+<table align="center" border="0" cellspacing="0" cellpadding="2">
+    <tr>
+        <td colspan="2" class="title">{$lang_theme_charmap_title}</td>
+    </tr>
+    <tr>
+        <td rowspan="2" align="left" valign="top">
+            <script language="javascript" type="text/javascript">renderCharMapHTML();</script>
+        </td>
+        <td width="100" align="center" valign="top">
+            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height: 100px">
+                <tr>
+                    <td class="charmapOver" style="font-size: 40px; height:80px;" id="codeV">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 10px; font-family: Arial, Helvetica, sans-serif; text-align:center;" id="codeN">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td valign="bottom" style="padding-bottom: 3px;">
+            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 1px;">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/color_picker.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/color_picker.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/color_picker.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/color_picker.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,13 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_theme_colorpicker_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/color_picker.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="margin: 3px; display: none">
+	<div align="center">
+	   <script language="javascript" type="text/javascript">renderColorMap();</script>
+	</div>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_content.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_content.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_content.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_content.css	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,58 @@
+/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
+/* You can extend this CSS by adding your own CSS file with the the content_css option */
+
+body, td, pre {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+body {
+	background-color: #FFFFFF;
+}
+
+.mceVisualAid {
+	border: 1px dashed #BBBBBB !important;
+}
+
+div.mceVisualAid {
+	background-image:url('../images/spacer.gif');
+	visibility: visible !important;
+}
+
+.mceItemAnchor {
+	width: 12px;
+	line-height: 6px;
+	overflow: hidden;
+	padding-left: 12px;
+	background-image: url('../images/anchor_symbol.gif');
+	background-position: bottom;
+	background-repeat: no-repeat;
+}
+
+/* Important is needed in Gecko browsers inorder to style links */
+/*
+a {
+	color: green !important;
+}
+*/
+
+/* Style selection range colors in Gecko browsers */
+/*
+::-moz-selection {
+	background-color: red;
+	color: green;
+}
+*/
+
+/* MSIE specific */
+
+* html body {
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_popup.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_popup.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_popup.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_popup.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,327 @@
+/* This file contains the CSS data for all popups in TinyMCE */
+
+body {
+	background-color: #F0F0EE;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;
+	margin: 8px;
+}
+
+td {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+}
+
+input {
+	background: #FFFFFF;
+	border: 1px solid #cccccc;
+}
+
+td, input, select, textarea {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+input, select, textarea {
+	border: 1px solid #808080;
+}
+
+.input_noborder {
+	border: 0;
+}
+
+#insert, .updateButton {
+   font-weight: bold;
+   width: 90px;
+   height: 21px;
+   border: 0;
+   background-image: url('../images/insert_button_bg.gif');
+   cursor: pointer;
+}
+
+#cancel {
+   font-weight: bold;
+   width: 90px;
+   height: 21px;
+   border: 0;
+   background-image: url('../images/cancel_button_bg.gif');
+   cursor: pointer;
+}
+
+/* Mozilla only style */
+html>body #insert, html>body #cancel {
+	padding-bottom: 2px;
+}
+
+.title {
+	font-size: 12px;
+	font-weight: bold;
+	color: #2B6FB6;
+}
+
+table.charmap {
+	border-style: solid;
+	border-width: 1px;
+	border-color: #AAAAAA;
+}
+
+td.charmap, td.charmapOver {
+	color: #000000;
+	border-color: #AAAAAA;
+	border-style: solid;
+	border-width: 1px;
+	text-align: center;
+	font-size: 12px;
+}
+
+td.charmapOver {
+	background-color: #CCCCCC;
+	cursor: default;
+}
+
+a.charmap {
+	color: #000000;
+	text-decoration: none
+}
+
+.wordWrapCode {
+	vertical-align: middle;
+	border: 1px none #000000;
+	background-color: transparent;
+}
+
+input.radio {
+	border: 1px none #000000;
+	background-color: transparent;
+	vertical-align: middle;
+}
+
+input.checkbox {
+	border: 1px none #000000;
+	background-color: transparent;
+	vertical-align: middle;
+}
+
+.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceButtonDisabled, .mceButtonSelected {
+	margin-left: 1px;
+}
+
+.mceButtonNormal {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: default;
+}
+
+.mceButtonOver {
+	border: 1px solid #0A246A;
+	cursor: default;
+	background-color: #B6BDD2;
+}
+
+.mceButtonDown {
+	cursor: default;
+	border: 1px solid #0A246A;
+	background-color: #8592B5;
+}
+
+.mceButtonDisabled {
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
+	-moz-opacity:0.3;
+	opacity: 0.3;
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: default;
+}
+
+.mceActionPanel {
+	margin-top: 5px;
+}
+
+/* Tabs classes */
+
+.tabs {
+	float: left;
+	width: 100%;
+	line-height: normal;
+	background-image: url("../images/xp/tabs_bg.gif");
+}
+
+.tabs ul {
+	margin: 0;
+	padding: 0 0 0;
+	list-style: none;
+}
+
+.tabs li {
+	float: left;
+	background: url("../images/xp/tab_bg.gif") no-repeat left top;
+	margin: 0;
+	margin-left: 0;
+	margin-right: 2px;
+	padding: 0 0 0 10px;
+	line-height: 18px;
+}
+
+.tabs li.current {
+	background: url("../images/xp/tab_sel_bg.gif") no-repeat left top;
+	margin-right: 2px;
+}
+
+.tabs span {
+	float: left;
+	display: block;
+	background: url("../images/xp/tab_end.gif") no-repeat right top;
+	padding: 0px 10px 0 0;
+}
+
+.tabs .current span {
+	background: url("../images/xp/tab_sel_end.gif") no-repeat right top;
+}
+
+.tabs a {
+	text-decoration: none;
+	font-family: Verdana, Arial;
+	font-size: 10px;
+}
+
+.tabs a:link, .tabs a:visited, .tabs a:hover {
+	color: black;
+}
+
+.tabs a:hover {
+}
+
+.tabs .current {
+}
+
+.tabs .current a, .tabs .current a:link, .tabs .current a:visited {
+}
+
+.panel_wrapper div.panel {
+	display: none;
+}
+
+.panel_wrapper div.current {
+	display: block;
+	width: 100%;
+	height: 300px;
+	overflow: visible; /* Should be auto but that breaks Safari */
+}
+
+.panel_wrapper {
+	border: 1px solid #919B9C;
+	border-top: 0px;
+	padding: 10px;
+	padding-top: 5px;
+	clear: both;
+	background-color: white;
+}
+
+fieldset {
+	border: 1px solid #919B9C;
+	font-family: Verdana, Arial;
+	font-size: 10px;
+	padding: 0;
+	margin: 0;
+	padding: 4px;
+}
+
+legend {
+	color: #2B6FB6;
+	font-weight: bold;
+}
+
+.properties {
+	width: 100%;
+}
+
+.properties .column1 {
+}
+
+.properties .column2 {
+	text-align: left;
+}
+
+a:link, a:visited {
+	color: black;
+}
+
+a:hover {
+	color: #2B6FB6;
+}
+
+#plugintable thead {
+	font-weight: bold;
+	background-color: #DDDDDD;
+}
+
+#plugintable, #about #plugintable td {
+	border: 1px solid #919B9C;
+}
+
+#plugintable {
+	width: 99%;
+	margin-top: 10px;
+}
+
+#pluginscontainer {
+	height: 290px;
+	overflow: auto;
+}
+
+/* MSIE Specific styles */
+
+* html .panel_wrapper {
+	width: 100%;
+}
+
+.column {
+	float: left;
+}
+
+h1, h2, h3, h4 {
+	color: #2B6FB6;
+	margin: 0;
+	padding: 0;
+	padding-top: 5px;
+}
+
+h3 {
+	font-size: 14px;
+}
+
+#link .panel_wrapper, #link div.current {
+	height: 125px;
+}
+
+#image .panel_wrapper, #image div.current {
+	height: 190px;
+}
+
+/* Disables the advanced tab in the table plugin. */
+/*
+#table #advanced_tab {
+	display: none;
+}
+*/
+
+/* Disables the border input field and label in the table plugin. */
+/*
+#table #border, #table #borderlabel {
+	display: none;
+}
+*/
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,353 @@
+/* This file contains the CSS data for the editor UI of TinyMCE instances */
+
+.mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {
+	border: 0; margin: 0; padding: 0; background: transparent;
+}
+
+.mceSeparatorLine {
+	border: 0;
+	padding: 0;
+	margin-left: 4px;
+	margin-right: 2px;
+}
+
+.mceSelectList {
+	font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
+	font-size: 7pt !important;
+	font-weight: normal;
+	margin-top: 3px;
+	padding: 0;
+	display: inline;
+	vertical-align: top;
+	background-color: #F0F0EE;
+}
+
+.mceLabel, .mceLabelDisabled {
+	font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
+	font-size: 9pt;
+}
+
+.mceLabel {
+	color: #000000;
+}
+
+.mceLabelDisabled {
+	cursor: text;
+	color: #999999;
+}
+
+.mceEditor {
+	background: #F0F0EE;
+	border: 1px solid #cccccc;
+	padding: 0;
+	margin: 0;
+}
+
+.mceEditorArea {
+	font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
+	background: #FFFFFF;
+	padding: 0;
+	margin: 0;
+}
+
+.mceToolbarTop, .mceToolbarBottom {
+	background: #F0F0EE;
+	line-height: 1px;
+	font-size: 1px;
+}
+
+.mceToolbarTop {
+	border-bottom: 1px solid #cccccc;
+	padding-bottom: 1px;
+}
+
+.mceToolbarBottom {
+	border-top: 1px solid #cccccc;
+}
+
+.mceStatusbarTop, .mceStatusbarBottom, .mceStatusbar {
+	height: 20px;
+}
+
+.mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {
+	font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
+	font-size: 9pt;
+	padding: 2px;
+	line-height: 16px;
+	overflow: visible;
+}
+
+.mceStatusbarTop {
+	border-bottom: 1px solid #cccccc;
+}
+
+.mceStatusbarBottom {
+	border-top: 1px solid #cccccc;
+}
+
+.mceStatusbar {
+	border-bottom: 1px solid #cccccc;
+}
+
+.mcePathItem, .mcePathItem:link, .mcePathItem:visited, .mcePathItem:hover {
+	text-decoration: none;
+	font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
+	font-size: 9pt;
+	color: #000000;
+}
+
+.mcePathItem:hover {
+	text-decoration: underline;
+}
+
+.mceStatusbarPathText {
+	float: left;
+}
+
+.mceStatusbarResize {
+	float: right;
+	background-image: url('../images/statusbar_resize.gif');
+	background-repeat: no-repeat;
+	width: 11px;
+	height: 20px;
+	cursor: se-resize;
+}
+
+.mceResizeBox {
+	width: 10px;
+	height: 10px;
+	display: none;
+	border: 1px dotted gray;
+	margin: 0;
+	padding: 0;
+}
+
+.mceEditorIframe {
+	border: 0;
+}
+
+/* Button CSS rules */
+
+a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {
+	width: 20px;
+	height: 20px;
+	cursor: default;
+	margin-top: 1px;
+	margin-left: 1px;
+}
+
+a.mceButtonDisabled img {
+	border: 0 !important;
+}
+
+a.mceButtonNormal img, a.mceButtonSelected img {
+	border: 1px solid #F0F0EE !important;
+}
+
+a.mceButtonSelected img {
+	border: 1px solid #6779AA !important;
+	background-color: #D4D5D8;
+}
+
+a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {
+	border: 1px solid #0A246A !important;
+	cursor: default;
+	background-color: #B6BDD2;
+}
+
+a.mceButtonDisabled img {
+	-moz-opacity:0.3;
+	opacity: 0.3;
+	border: 1px solid #F0F0EE !important;
+	cursor: default;
+}
+
+a.mceTiledButton img {
+	background-image: url('../images/buttons.gif');
+	background-repeat: no-repeat;
+}
+
+/* MSIE specific rules */
+
+* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {
+	border: 0 !important;
+	margin-top: 2px;
+	margin-bottom: 1px;
+}
+
+* html a.mceButtonDisabled img {
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
+	border: 0 !important;
+}
+
+* html a.mceButtonDisabled {
+	border: 1px solid #F0F0EE !important;
+}
+
+* html a.mceButtonNormal, * html a.mceButtonSelected {
+	border: 1px solid #F0F0EE !important;
+	cursor: default;
+}
+
+* html a.mceButtonSelected {
+	border: 1px solid #6779AA !important;
+	background-color: #D4D5D8;
+}
+
+* html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {
+	border: 1px solid #0A246A !important;
+	cursor: default;
+	background-color: #B6BDD2;
+}
+
+* html .mceSelectList {
+	margin-top: 2px;
+}
+
+/* Menu button CSS rules */
+
+span.mceMenuButton img, span.mceMenuButtonSelected img {
+	border: 1px solid #F0F0EE;
+	margin-left: 1px;
+}
+
+span.mceMenuButtonSelected img {
+	border: 1px solid #6779AA;
+	background-color: #B6BDD2;
+}
+
+span.mceMenuButtonSelected img.mceMenuButton {
+	border: 1px solid #F0F0EE;
+	background-color: transparent;
+}
+
+span.mceMenuButton img.mceMenuButton, span.mceMenuButtonSelected img.mceMenuButton {
+	border-left: 0;
+	margin-left: 0;
+}
+
+span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+span.mceMenuButton:hover img.mceMenuButton, span.mceMenuButtonSelected:hover img.mceMenuButton {
+	border-left: 0;
+}
+
+span.mceMenuButtonFocus img {
+	border: 1px solid gray;
+	border-right: 0;
+	margin-left: 1px;
+	background-color: #F5F4F2;
+}
+
+span.mceMenuButtonFocus img.mceMenuButton {
+	border: 1px solid gray;
+	border-left: 1px solid #F5F4F2;
+	margin-left: 0;
+}
+
+/* Menu button MSIE specific rules */
+
+* html span.mceMenuButton, * html span.mceMenuButtonFocus {
+	position: relative;
+	left: 0;
+	top: 0;
+}
+
+* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {
+	position: relative;
+	top: 1px;
+}
+
+* html span.mceMenuHover img {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+* html span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+	border-left: 0;
+}
+
+/* Menu */
+
+.mceMenu {
+	position: absolute;
+	left: 0;
+	top: 0;
+	display: none;
+	z-index: 100;
+	background-color: white;
+	border: 1px solid gray;
+	font-weight: normal;
+}
+
+.mceMenu a, .mceMenuTitle, .mceMenuDisabled {
+	display: block;
+	width: 100%;
+	text-decoration: none;
+	background-color: white;
+	font-family: Tahoma, Verdana, Arial, Helvetica;
+	font-size: 11px;
+	line-height: 20px;
+	color: black;
+}
+
+.mceMenu a:hover {
+	background-color: #B6BDD2;
+	color: black;
+	text-decoration: none !important;
+}
+
+.mceMenu span {
+	padding-left: 10px;
+	padding-right: 10px;
+	display: block;
+	line-height: 20px;
+}
+
+.mceMenuSeparator {
+	border-bottom: 1px solid gray;
+	background-color: gray;
+	height: 1px;
+}
+
+.mceMenuTitle span {
+	padding-left: 5px;
+}
+
+.mceMenuTitle {
+	background-color: #DDDDDD;
+	font-weight: bold;
+}
+
+.mceMenuDisabled {
+	color: gray;
+}
+
+span.mceMenuSelectedItem {
+	background-image: url('../images/menu_check.gif');
+	background-repeat: no-repeat;
+	background-position: 5px 8px;
+	padding-left: 20px;
+}
+
+span.mceMenuCheckItem {
+	padding-left: 20px;
+}
+
+span.mceMenuLine {
+	display: block;
+	position: absolute;
+	left: 0;
+	top: -1px;
+	background-color: #F5F4F2;
+	width: 30px;
+	height: 1px;
+	overflow: hidden;
+	padding-left: 0;
+	padding-right: 0;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/about.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/about.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/about.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/about.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>About TinyMCE</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">About TinyMCE</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+TinyMCE is a small WYSIWYG editor control for web browsers such as MSIE or Mozilla 
+that enables you to edit HTML contents in a more user friendly way. It has common 
+features that are found in most word processors and should not be difficult to 
+use.<br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,162 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Common buttons</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Common buttons</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+Below is a short description about each button.
+<br>
+<br>
+<table border="1" cellpadding="3" cellspacing="0">
+  <tr>
+    <td><img src="../../images/bold.gif" width="20" height="20" alt="Bold text icon" /></td>
+    <td>Bold text style (Ctrl+B).</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/italic.gif" width="20" height="20" alt="Italic text icon" /></td>
+    <td>Italic text style (Ctrl+I).</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/underline.gif" width="20" height="20" alt="Underline text icon." /></td>
+    <td>Underline text style (Ctrl+U).</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/strikethrough.gif" width="20" height="20" alt="Strikethrough text icon." /></td>
+    <td>Strikethrough text style.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/justifyleft.gif" width="20" height="20" alt="Align left icon." /></td>
+    <td>Align left.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/justifycenter.gif" width="20" height="20" alt="Align center icon." /></td>
+    <td>Align center.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/justifyright.gif" width="20" height="20" alt="Align right icon." /></td>
+    <td>Align right.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/justifyfull.gif" width="20" height="20" alt="Align full icon." /></td>
+    <td>Align full.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/bullist.gif" width="20" height="20" alt="Unordered list/bullet list icon." /></td>
+    <td>Unordered list/bullet list.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/numlist.gif" width="20" height="20" alt="Ordered list/numbered list icon." /></td>
+    <td>Ordered list/numbered list</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/outdent.gif" width="20" height="20" alt="Outdent/decrease indentation icon." /></td>
+    <td>Outdent/decrease indentation.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/indent.gif" width="20" height="20" alt="Indent/increase indentation icon." /></td>
+    <td>Indent/increase indentation.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/undo.gif" width="20" height="20" alt="Undo the last operation." /></td>
+    <td>Undo the last operation (Ctrl+Z).</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/redo.gif" width="20" height="20" alt="Redo the last operation icon." /></td>
+    <td>Redo the last operation (Ctrl+Y).</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/link.gif" width="20" height="20" alt="Insert a new link icon." /></td>
+    <td>Insert a new link, read more about this function in the <a href="insert_link_button.htm">Insert 
+      link section</a>.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/unlink.gif" width="20" height="20" alt="Unlinks the current selection icon." /></td>
+    <td>Unlinks the current selection/removes all selected links.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/anchor.gif" width="20" height="20" alt="Insert a new anchor icon." /></td>
+    <td>Insert a new anchor, read more about this function in the <a href="insert_anchor_button.htm">Insert anchor section.</a></td>
+  </tr>
+  <tr>
+    <td><img src="../../images/image.gif" width="20" height="20" alt="Insert a new image icon." /></td>
+    <td>Insert a new image, read more about this function in the <a href="insert_image_button.htm">Insert 
+      image section</a>.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/cleanup.gif" width="20" height="20" alt="Cleanup code icon." /></td>
+    <td>Cleanup code/Removes unwanted formating. This function is useful when 
+      you copy contents from for example a office product.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/help.gif" width="20" height="20" alt="Show help icon." /></td>
+    <td>Shows this help window.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/code.gif" width="20" height="20" alt="Source code editor icon." /></td>
+    <td>Opens HTML source code editor. </td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table.gif" width="20" height="20" alt="Insert table icon." /></td>
+    <td>Inserts a new table at the current location. </td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table_insert_row_before.gif" width="20" height="20" alt="Adds a row above icon." /></td>
+    <td>Adds a row above the current one. </td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table_insert_row_after.gif" width="20" height="20" alt="Adds a row under icon." /></td>
+    <td>Adds a row under the current one. </td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table_delete_row.gif" width="20" height="20" alt="Remove row icon." /></td>
+    <td>Removes the row. </td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table_insert_col_before.gif" width="20" height="20" alt="Add column before icon." /></td>
+    <td>Adds a column before the current one.</td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table_insert_col_after.gif" width="20" height="20" alt="Add column after icon." /></td>
+    <td>Adds a column after the current one.</td>
+  </tr>
+  <tr>
+    <td><img src="../../../../plugins/table/images/table_delete_col.gif" width="20" height="20" alt="Remove column icon." /></td>
+    <td>Removes the current column.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/hr.gif" width="20" height="20" alt="Insert horizontal ruler icon." /></td>
+    <td>Inserts a new horizontal ruler </td>
+  </tr>
+  <tr>
+    <td><img src="../../images/removeformat.gif" width="20" height="20" alt="Remove formatting icon." /></td>
+    <td>Removes formatting from the selection. </td>
+  </tr>
+  <tr>
+    <td><img src="../../images/sub.gif" width="20" height="20" alt="Subscript icon." /></td>
+    <td>Makes the selection to be subscript. </td>
+  </tr>
+  <tr>
+    <td><img src="../../images/sup.gif" width="20" height="20" alt="Superscript icon." /></td>
+    <td>Makes the selection to be superscripted. </td>
+  </tr>
+</table>
+<br>
+<hr noshade="noshade" />
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,45 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Insert table button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Create accessible content</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<p>TinyMCE can create HTML content that will be accessible to all users, including those with disabilities using assistive technologies, as well as those using text-based browsers, or those browsing the Web with images turned off. </p>
+
+<p><strong>Things you can do to make your content accessible:</strong></p>
+<ol>
+<li><strong>Include an Image Description:</strong> Blind users, or others who are unable to view images, will rely on the Image Description (or Alt text) to take the place of the image. If an image contains no meaning, such as a decoration or a spacer image, leave the Image Description empty. TinyMCE will then insert an empty Alt text attribute that will force assistive technologies to ignore the image. <br /><br /></li>
+
+<li> <strong>Add Scope to data table header cells:</strong> In the table cell editor dialog window, choose a Scope when creating Header cells so the column or row label in that cell becomes explicitely associated with its data cells. Table cell headers will then be announced with each data cell, making it easier for blind users using a screen reader to understand what the content of each cell represents. <br /><br /></li>
+
+<li><strong> Structure content with properly nested headings:</strong> In the format selection menu choose Heading 1 to Heading 6 to represent headings in your content,  rather than using other font formating options. Blind users using a screen reader can then extract the headings from the page to generate a summary of the content it contains, and use those headings to navigate quickly to subsections within the page.<br /><br /></li>
+
+<li><strong> Include alternate content:</strong> Create an alternate page for non-HTML content such as Flash, Java applets, or  embedded movies. This might be a static image, with a description of the image, and a description of the content that would have appeared in its place. An alternate HTML page could also be created, and a link to it included next to the non-HTML object. This will ensure that the content will be accessible to users of assistive technologies that can not view or play the content, and ensure the content will be available to those who do not have the appropriate plugin or helper application installed.<br /><br /></li>
+
+<li><strong> Check accessbility: </strong> When the AChecker plugin is installed with TinyMCE, click on the Check Accessibility button to generate a report of potential accessibility problems.<br /><br /></li>
+
+</ol>
+
+<p>See the <a href="http://checker.atrc.utoronto.ca" target="_new">AChecker Web Site</a> for further details about creating content that will be accessible to all users.<br />
+</p>
+
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+
+<br>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/index.html	2006-06-20 01:05:22.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Help Index</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+<BODY onload="window.focus();">
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Table of contents</span></td>
+    <td align="right">&nbsp;</td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+Click the links below to go to the different help sections. 
+<ul class="toc_ul">
+  <li class="toc_li"><a href="about.htm">About TinyMCE</a></li>
+  <li class="toc_li"><a href="common_buttons.htm">Common buttons</a></li>
+  <li class="toc_li"><a href="insert_image_button.htm">Insert image button</a></li>
+  <li class="toc_li"><a href="insert_link_button.htm">Insert link button</a></li>
+  <li class="toc_li"><a href="insert_anchor_button.htm">Insert anchor button</a></li>
+  <li class="toc_li"><a href="insert_table_button.htm">Insert table button</a></li>
+ <li class="toc_li"><a href="create_accessible_content.htm">Create accessible content</a></li>
+</ul>
+<hr noshade>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,32 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Insert anchor button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert anchor button</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+This button opens a new window with the insert/edit anchor function.<br>
+<br>
+<img src="images/insert_anchor_window.gif" width="330" height="139" alt="Anchor dialog/window" /><br>
+<br>
+There are one field in this window, this is where you enter the name of you anchor point. Remember the anchor name needs to be unique. <br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,65 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Insert image button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert image button</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+The insert image button opens the window shown below.<br>
+<br>
+<img src="images/insert_image_window.gif" alt="Insert image dialog/window" /><br>
+<br>
+You simply enter a URL to the image you want to link to and enter a image description, 
+this is then displayed as an alternative text descripton of the image on the page.<br>
+<br>
+<strong>Field descriptions:</strong><br>
+<table border="1" cellspacing="0">
+  <tr>
+    <td width="150"><strong>Image URL </strong></td>
+    <td>URL/path to the image.</td>
+  </tr>
+  <tr>
+    <td width="150"><strong>Image description </strong></td>
+    <td>Alternative description of image contents.</td>
+  </tr>
+  <tr>
+    <td><strong>Dimentions</strong></td>
+    <td>Image width/height. </td>
+  </tr>
+  <tr>
+    <td><strong>Alignment</strong></td>
+    <td>Image alignment, useful when wrapping text around images.</td>
+  </tr>
+  <tr>
+    <td><strong>Border</strong></td>
+    <td>Border thickness. </td>
+  </tr>
+  <tr>
+    <td><strong>VSpace</strong></td>
+    <td>Vertical space, useful when wrapping text around images.</td>
+  </tr>
+  <tr>
+    <td><strong>HSpace</strong></td>
+    <td>Horizontal space, useful when wrapping text around images.</td>
+  </tr>
+</table>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,33 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Insert link button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert link button</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+This button opens a new window with the insert/edit link function.<br>
+<br>
+<img src="images/insert_link_window.gif" width="330" height="159" alt="Insert link dialog/window" /><br>
+<br>
+There are two fields in this window the first one &quot;Link URL&quot; is the 
+URL of the link. The target enables you to select how the link is to be opened.<br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,71 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<TITLE>Insert table button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert table button</span></td>
+    <td align="right"><a href="index.htm"><acronym title="Table of contents">TOC</acronym></a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+The insert table button opens the window shown below. This action enables you to create tables. <br>
+<br>
+<img src="images/insert_table_window.gif" width="340" height="229" alt="Image of table window" /><br>
+<br>
+<strong>Field descriptions:</strong><br>
+<table border="1" cellspacing="0">
+  <tr>
+    <td width="150"><strong>Columns</strong></td>
+    <td>Number of columns in the  table. </td>
+  </tr>
+  <tr>
+    <td width="150"><strong>Rows</strong></td>
+    <td>Number of rows in the new table.</td>
+  </tr>
+  <tr>
+    <td><strong>Cellpadding</strong></td>
+    <td>Cellpadding of the table . </td>
+  </tr>
+  <tr>
+    <td><strong>Cellspacing</strong></td>
+    <td>Cellspacing of the table .</td>
+  </tr>
+  <tr>
+    <td><strong>Alignment</strong></td>
+    <td>Table alignment . </td>
+  </tr>
+  <tr>
+    <td><strong>Border</strong></td>
+    <td>Border thinkness of table.</td>
+  </tr>
+  <tr>
+    <td><strong>Width</strong></td>
+    <td>Width in pixels of table .</td>
+  </tr>
+  <tr>
+    <td><strong>Height</strong></td>
+    <td>Height in pixels of table.</td>
+  </tr>
+  <tr>
+    <td><strong>Class</strong></td>
+    <td>Style or CSS class of table.</td>
+  </tr>
+</table>
+<br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/style.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/style.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/style.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/style.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,28 @@
+body { background-color: #FFFFFF; }
+body, td, .content { font-family: Verdana, Arial, helvetica, sans-serif; font-size: 12px; }
+.title { font-family: Verdana, Arial, helvetica, sans-serif; font-size: 16px; font-weight: bold; }
+.subtitle { font-size: 12px; font-weight: bold; }
+
+.toc_ul, .toc_li { margin-left: 8px; line-height: 16px; }
+.step_ol, .step_li { margin-left: 11px; line-height: 16px; }
+img { border: #000000 solid 1px; }
+
+a:visited { color: #666666; text-decoration: underline; }
+a:active { color: #666666; text-decoration: underline; }
+a:hover { color: #666666; text-decoration: underline; }
+a { color: #666666; text-decoration: underline; }
+
+.pageheader { border: #E0E0E0 solid 1px; }
+.pagefooter { border: #E0E0E0 solid 1px; }
+.sample { background-color: #FFFFFF; border: #000000 solid 1px; }
+.samplecontent { font-size: 10px; }
+
+.code { background-color: #FFFFFF; border: #000000 solid 1px; }
+.codecontent { font-size: 10px; }
+.codecontent a:visited { color: #666666; text-decoration: none; font-weight: bold }
+.codecontent a:active { color: #666666; text-decoration: none; font-weight: bold  }
+.codecontent a:hover { color: #666666; text-decoration: none; font-weight: bold  }
+.codecontent a { color: #666666; text-decoration: none; font-weight: bold  }
+
+hr { height: 1px; }
+
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/docs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+tinyMCE.importThemeLanguagePack('advanced');var TinyMCE_AdvancedTheme={_autoImportCSSClasses:true,_resizer:{},_buttons:[['bold','{$lang_bold_img}','lang_bold_desc','Bold'],['italic','{$lang_italic_img}','lang_italic_desc','Italic'],['underline','{$lang_underline_img}','lang_underline_desc','Underline'],['strikethrough','strikethrough.gif','lang_striketrough_desc','Strikethrough'],['justifyleft','justifyleft.gif','lang_justifyleft_desc','JustifyLeft'],['justifycenter','justifycenter.gif','lang_justifycenter_desc','JustifyCenter'],['justifyright','justifyright.gif','lang_justifyright_desc','JustifyRight'],['justifyfull','justifyfull.gif','lang_justifyfull_desc','JustifyFull'],['bullist','bullist.gif','lang_bullist_desc','InsertUnorderedList'],['numlist','numlist.gif','lang_numlist_desc','InsertOrderedList'],['outdent','outdent.gif','lang_outdent_desc','Outdent'],['indent','indent.gif','lang_indent_desc','Indent'],['cut','cut.gif','lang_cut_desc','Cut'],['copy','copy.gif','lang_copy_desc','Copy'],['paste','paste.gif','lang_paste_desc','Paste'],['undo','undo.gif','lang_undo_desc','Undo'],['redo','redo.gif','lang_redo_desc','Redo'],['link','link.gif','lang_link_desc','mceLink',true],['unlink','unlink.gif','lang_unlink_desc','unlink'],['image','image.gif','lang_image_desc','mceImage',true],['cleanup','cleanup.gif','lang_cleanup_desc','mceCleanup'],['help','help.gif','lang_help_desc','mceHelp'],['code','code.gif','lang_theme_code_desc','mceCodeEditor'],['hr','hr.gif','lang_theme_hr_desc','inserthorizontalrule'],['removeformat','removeformat.gif','lang_theme_removeformat_desc','removeformat'],['sub','sub.gif','lang_theme_sub_desc','subscript'],['sup','sup.gif','lang_theme_sup_desc','superscript'],['forecolor','forecolor.gif','lang_theme_forecolor_desc','mceForeColor',true],['backcolor','backcolor.gif','lang_theme_backcolor_desc','mceBackColor',true],['charmap','charmap.gif','lang_theme_charmap_desc','mceCharMap'],['visualaid','visualaid.gif','lang_theme_visualaid_desc','mceToggleVisualAid'],['anchor','anchor.gif','lang_theme_anchor_desc','mceInsertAnchor'],['newdocument','newdocument.gif','lang_newdocument_desc','mceNewDocument']],_buttonMap:'anchor,backcolor,bold,bullist,charmap,cleanup,code,copy,cut,forecolor,help,hr,image,indent,italic,justifycenter,justifyfull,justifyleft,justifyright,link,newdocument,numlist,outdent,paste,redo,removeformat,strikethrough,sub,sup,underline,undo,unlink,visualaid,advhr,ltr,rtl,emotions,flash,fullpage,fullscreen,iespell,insertdate,inserttime,pastetext,pasteword,selectall,preview,print,save,replace,search,table,cell_props,delete_col,delete_row,col_after,col_before,row_after,row_before,merge_cells,row_props,split_cells',getControlHTML:function(button_name){var i,x;for(i=0;i<TinyMCE_AdvancedTheme._buttons.length;i++){var but=TinyMCE_AdvancedTheme._buttons[i];if(but[0]==button_name)return tinyMCE.getButtonHTML(but[0],but[2],'{$themeurl}/images/'+but[1],but[3],(but.length>4?but[4]:false),(but.length>5?but[5]:null));}switch(button_name){case"formatselect":var html='<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';var formats=tinyMCE.getParam("theme_advanced_blockformats","p,address,pre,h1,h2,h3,h4,h5,h6",true).split(',');var lookup=[['p','{$lang_theme_paragraph}'],['address','{$lang_theme_address}'],['pre','{$lang_theme_pre}'],['h1','{$lang_theme_h1}'],['h2','{$lang_theme_h2}'],['h3','{$lang_theme_h3}'],['h4','{$lang_theme_h4}'],['h5','{$lang_theme_h5}'],['h6','{$lang_theme_h6}'],['div','{$lang_theme_div}'],['blockquote','{$lang_theme_blockquote}'],['code','{$lang_theme_code}'],['dt','{$lang_theme_dt}'],['dd','{$lang_theme_dd}'],['samp','{$lang_theme_samp}']];html+='<option value="">{$lang_theme_block}</option>';for(var i=0;i<formats.length;i++){for(var x=0;x<lookup.length;x++){if(formats[i]==lookup[x][0])html+='<option value="&lt;'+lookup[x][0]+'&gt;">'+lookup[x][1]+'</option>';}}html+='</select>';return html;case"styleselect":return'<select id="{$editor_id}_styleSelect" onmousedown="tinyMCE.themes.advanced._setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onfocus="tinyMCE.addSelectAccessibility(event,this,window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';case"fontselect":var fontHTML='<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList"><option value="">{$lang_theme_fontdefault}</option>';var iFonts='Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';var nFonts='Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sand;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats';var fonts=tinyMCE.getParam("theme_advanced_fonts",nFonts).split(';');for(i=0;i<fonts.length;i++){if(fonts[i]!=''){var parts=fonts[i].split('=');fontHTML+='<option value="'+parts[1]+'">'+parts[0]+'</option>';}}fontHTML+='</select>';return fontHTML;case"fontsizeselect":return'<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+'<option value="0">{$lang_theme_font_size}</option>'+'<option value="1">1 (8 pt)</option>'+'<option value="2">2 (10 pt)</option>'+'<option value="3">3 (12 pt)</option>'+'<option value="4">4 (14 pt)</option>'+'<option value="5">5 (18 pt)</option>'+'<option value="6">6 (24 pt)</option>'+'<option value="7">7 (36 pt)</option>'+'</select>';case"|":case"separator":return'<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';case"spacer":return'<img src="{$themeurl}/images/separator.gif" width="2" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';case"rowseparator":return'<br />';}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceLink":var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=inst.getSel().toString();if(!tinyMCE.linkElement){if((tinyMCE.selectedElement.nodeName.toLowerCase()!="img")&&(selectedText.length<=0))return true;}var href="",target="",title="",onclick="",action="insert",style_class="";if(tinyMCE.selectedElement.nodeName.toLowerCase()=="a")tinyMCE.linkElement=tinyMCE.selectedElement;if(tinyMCE.linkElement!=null&&tinyMCE.getAttrib(tinyMCE.linkElement,'href')=="")tinyMCE.linkElement=null;if(tinyMCE.linkElement){href=tinyMCE.getAttrib(tinyMCE.linkElement,'href');target=tinyMCE.getAttrib(tinyMCE.linkElement,'target');title=tinyMCE.getAttrib(tinyMCE.linkElement,'title');onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');style_class=tinyMCE.getAttrib(tinyMCE.linkElement,'class');if(onclick=="")onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');onclick=tinyMCE.cleanupEventStr(onclick);href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");mceRealHref=tinyMCE.getAttrib(tinyMCE.linkElement,'mce_href');if(mceRealHref!=""){href=mceRealHref;if(tinyMCE.getParam('convert_urls'))href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");}action="update";}var template=new Array();template['file']='link.htm';template['width']=310;template['height']=200;template['width']+=tinyMCE.getLang('lang_insert_link_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_link_delta_height',0);if(inst.settings['insertlink_callback']){var returnVal=eval(inst.settings['insertlink_callback']+"(href, target, title, onclick, action, style_class);");if(returnVal&&returnVal['href'])TinyMCE_AdvancedTheme._insertLink(returnVal['href'],returnVal['target'],returnVal['title'],returnVal['onclick'],returnVal['style_class']);}else{tinyMCE.openWindow(template,{href:href,target:target,title:title,onclick:onclick,action:action,className:style_class,inline:"yes"});}return true;case"mceImage":var src="",alt="",border="",hspace="",vspace="",width="",height="",align="";var title="",onmouseover="",onmouseout="",action="insert";var img=tinyMCE.imgElement;var inst=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedElement!=null&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){img=tinyMCE.selectedElement;tinyMCE.imgElement=img;}if(img){if(tinyMCE.getAttrib(img,'name').indexOf('mce_')==0)return true;src=tinyMCE.getAttrib(img,'src');alt=tinyMCE.getAttrib(img,'alt');if(alt=="")alt=tinyMCE.getAttrib(img,'title');if(tinyMCE.isGecko){var w=img.style.width;if(w!=null&&w!="")img.setAttribute("width",w);var h=img.style.height;if(h!=null&&h!="")img.setAttribute("height",h);}border=tinyMCE.getAttrib(img,'border');hspace=tinyMCE.getAttrib(img,'hspace');vspace=tinyMCE.getAttrib(img,'vspace');width=tinyMCE.getAttrib(img,'width');height=tinyMCE.getAttrib(img,'height');align=tinyMCE.getAttrib(img,'align');onmouseover=tinyMCE.getAttrib(img,'onmouseover');onmouseout=tinyMCE.getAttrib(img,'onmouseout');title=tinyMCE.getAttrib(img,'title');if(tinyMCE.isMSIE){width=img.attributes['width'].specified?width:"";height=img.attributes['height'].specified?height:"";}src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");mceRealSrc=tinyMCE.getAttrib(img,'mce_src');if(mceRealSrc!=""){src=mceRealSrc;if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");}action="update";}var template=new Array();template['file']='image.htm?src={$src}';template['width']=355;template['height']=265+(tinyMCE.isMSIE?25:0);template['width']+=tinyMCE.getLang('lang_insert_image_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_image_delta_height',0);if(inst.settings['insertimage_callback']){var returnVal=eval(inst.settings['insertimage_callback']+"(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");if(returnVal&&returnVal['src'])TinyMCE_AdvancedTheme._insertImage(returnVal['src'],returnVal['alt'],returnVal['border'],returnVal['hspace'],returnVal['vspace'],returnVal['width'],returnVal['height'],returnVal['align'],returnVal['title'],returnVal['onmouseover'],returnVal['onmouseout']);}else tinyMCE.openWindow(template,{src:src,alt:alt,border:border,hspace:hspace,vspace:vspace,width:width,height:height,align:align,title:title,onmouseover:onmouseover,onmouseout:onmouseout,action:action,inline:"yes"});return true;case"mceForeColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=tinyMCE.getAttrib(elm,"color");if(inputColor=='')inputColor=elm.style.color;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"forecolor",input_color:inputColor});return true;case"mceBackColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=elm.style.backgroundColor;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;template['width']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"HiliteColor",input_color:inputColor});return true;case"mceColorPicker":if(user_interface){var template=new Array();var inputColor=value['document'].getElementById(value['element_id']).value;template['file']='color_picker.htm';template['width']=220;template['height']=190;template['close_previous']="no";template['width']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_height',0);if(typeof(value['store_selection'])=="undefined")value['store_selection']=true;tinyMCE.lastColorPickerValue=value;tinyMCE.openWindow(template,{editor_id:editor_id,mce_store_selection:value['store_selection'],inline:"yes",command:"mceColorPicker",input_color:inputColor});}else{var savedVal=tinyMCE.lastColorPickerValue;var elm=savedVal['document'].getElementById(savedVal['element_id']);elm.value=value;if(elm.onchange!=null&&elm.onchange!='')eval('elm.onchange();');}return true;case"mceCodeEditor":var template=new Array();template['file']='source_editor.htm';template['width']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_width",720));template['height']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_height",580));tinyMCE.openWindow(template,{editor_id:editor_id,resizable:"yes",scrollbars:"no",inline:"yes"});return true;case"mceCharMap":var template=new Array();template['file']='charmap.htm';template['width']=550+(tinyMCE.isOpera?40:0);template['height']=250;template['width']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceInsertAnchor":var template=new Array();template['file']='anchor.htm';template['width']=320;template['height']=90+(tinyMCE.isNS7?30:0);template['width']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceNewDocument":if(confirm(tinyMCE.getLang('lang_newdocument')))tinyMCE.execInstanceCommand(editor_id,'mceSetContent',false,' ');return true;}return false;},getEditorTemplate:function(settings,editorId){function removeFromArray(in_array,remove_array){var outArray=new Array();for(var i=0;i<in_array.length;i++){skip=false;for(var j=0;j<remove_array.length;j++){if(in_array[i]==remove_array[j]){skip=true;}}if(!skip){outArray[outArray.length]=in_array[i];}}return outArray;}function addToArray(in_array,add_array){for(var i=0;i<add_array.length;i++){in_array[in_array.length]=add_array[i];}return in_array;}var template=new Array();var deltaHeight=0;var resizing=tinyMCE.getParam("theme_advanced_resizing",false);var path=tinyMCE.getParam("theme_advanced_path",true);var statusbarHTML='<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: '+(path?"block":"none")+'">&#160;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: '+(resizing?"block":"none")+'" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';var layoutManager=tinyMCE.getParam("theme_advanced_layout_manager","SimpleLayout");var styleSelectHTML='<option value="">{$lang_theme_style_select}</option>';if(settings['theme_advanced_styles']){var stylesAr=settings['theme_advanced_styles'].split(';');for(var i=0;i<stylesAr.length;i++){var key,value;key=stylesAr[i].split('=')[0];value=stylesAr[i].split('=')[1];styleSelectHTML+='<option value="'+value+'">'+key+'</option>';}TinyMCE_AdvancedTheme._autoImportCSSClasses=false;}switch(layoutManager){case"SimpleLayout":var toolbarHTML="";var toolbarLocation=tinyMCE.getParam("theme_advanced_toolbar_location","bottom");var toolbarAlign=tinyMCE.getParam("theme_advanced_toolbar_align","center");var pathLocation=tinyMCE.getParam("theme_advanced_path_location","none");var statusbarLocation=tinyMCE.getParam("theme_advanced_statusbar_location",pathLocation);var defVals={theme_advanced_buttons1:"bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,separator,sub,sup,separator,charmap"};toolbarHTML+='<a href="#" accesskey="q" title="'+tinyMCE.getLang("lang_toolbar_focus")+'"';if(!tinyMCE.getParam("accessibility_focus"))toolbarHTML+=' onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"';toolbarHTML+='></a>';for(var i=1;i<100;i++){var def=defVals["theme_advanced_buttons"+i];var buttons=tinyMCE.getParam("theme_advanced_buttons"+i,def==null?'':def,true,',');if(buttons.length==0)break;buttons=removeFromArray(buttons,tinyMCE.getParam("theme_advanced_disable","",true,','));buttons=addToArray(buttons,tinyMCE.getParam("theme_advanced_buttons"+i+"_add","",true,','));buttons=addToArray(tinyMCE.getParam("theme_advanced_buttons"+i+"_add_before","",true,','),buttons);for(var b=0;b<buttons.length;b++)toolbarHTML+=tinyMCE.getControlHTML(buttons[b]);if(buttons.length>0){toolbarHTML+="<br />";deltaHeight-=23;}}toolbarHTML+='<a href="#" accesskey="z" onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"></a>';template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';if(toolbarLocation=="top"){template['html']+='<tr><td class="mceToolbarTop" align="'+toolbarAlign+'" height="1" nowrap="nowrap">'+toolbarHTML+'</td></tr>';}if(statusbarLocation=="top"){template['html']+='<tr><td class="mceStatusbarTop" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';if(toolbarLocation=="bottom"){template['html']+='<tr><td class="mceToolbarBottom" align="'+toolbarAlign+'" height="1">'+toolbarHTML+'</td></tr>';}if(toolbarLocation=="external"){var bod=document.body;var elm=document.createElement("div");toolbarHTML=tinyMCE.replaceVar(toolbarHTML,'style_select_options',styleSelectHTML);toolbarHTML=tinyMCE.applyTemplate(toolbarHTML,{editor_id:editorId});elm.className="mceToolbarExternal";elm.id=editorId+"_toolbar";elm.innerHTML='<table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table>';bod.appendChild(elm);deltaHeight=0;tinyMCE.getInstanceById(editorId).toolbarElement=elm;}else{tinyMCE.getInstanceById(editorId).toolbarElement=null;}if(statusbarLocation=="bottom"){template['html']+='<tr><td class="mceStatusbarBottom" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='</tbody></table>';break;case"RowLayout":template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';var containers=tinyMCE.getParam("theme_advanced_containers","",true,",");var defaultContainerCSS=tinyMCE.getParam("theme_advanced_containers_default_class","container");var defaultContainerAlign=tinyMCE.getParam("theme_advanced_containers_default_align","center");for(var i=0;i<containers.length;i++){if(containers[i]=="mceEditor")template['html']+='<tr><td align="center" class="mceEditor_border"><span id="{$editor_id}"></span></td></tr>';else if(containers[i]=="mceElementpath"||containers[i]=="mceStatusbar"){var pathClass="mceStatusbar";if(i==containers.length-1){pathClass="mceStatusbarBottom";}else if(i==0){pathClass="mceStatusbar";}else{deltaHeight-=2;}template['html']+='<tr><td class="'+pathClass+'" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=22;}else{var curContainer=tinyMCE.getParam("theme_advanced_container_"+containers[i],"",true,',');var curContainerHTML="";var curAlign=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align",defaultContainerAlign);var curCSS=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class",defaultContainerCSS);for(var j=0;j<curContainer.length;j++){curContainerHTML+=tinyMCE.getControlHTML(curContainer[j]);}if(curContainer.length>0){curContainerHTML+="<br />";deltaHeight-=23;}template['html']+='<tr><td class="'+curCSS+'" align="'+curAlign+'" height="1">'+curContainerHTML+'</td></tr>';}}template['html']+='</tbody></table>';break;case"CustomLayout":var customLayout=tinyMCE.getParam("theme_advanced_custom_layout","");if(customLayout!=""&&eval("typeof("+customLayout+")")!="undefined"){template=eval(customLayout+"(template);");}break;}if(resizing)template['html']+='<span id="{$editor_id}_resize_box" class="mceResizeBox"></span>';template['html']=tinyMCE.replaceVar(template['html'],'style_select_options',styleSelectHTML);template['delta_width']=0;template['delta_height']=deltaHeight;return template;},initInstance:function(inst){if(tinyMCE.getParam("theme_advanced_resizing",false)){if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var w=TinyMCE_AdvancedTheme._getCookie("TinyMCE_"+inst.editorId+"_width");var h=TinyMCE_AdvancedTheme._getCookie("TinyMCE_"+inst.editorId+"_height");TinyMCE_AdvancedTheme._resizeTo(inst,w,h,tinyMCE.getParam("theme_advanced_resize_horizontal",true));}}inst.addShortcut('ctrl','k','lang_link_desc','mceLink');},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection,setup_content){function selectByValue(select_elm,value,first_index){first_index=typeof(first_index)=="undefined"?false:true;if(select_elm){for(var i=0;i<select_elm.options.length;i++){var ov=""+select_elm.options[i].value;if(first_index&&ov.toLowerCase().indexOf(value.toLowerCase())==0){select_elm.selectedIndex=i;return true;}if(ov==value){select_elm.selectedIndex=i;return true;}}}return false;};function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";};if(node==null)return;var pathElm=document.getElementById(editor_id+"_path");var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();if(pathElm){var parentNode=node;var path=new Array();while(parentNode!=null){if(parentNode.nodeName.toUpperCase()=="BODY"){break;}if(parentNode.nodeType==1&&tinyMCE.getAttrib(parentNode,"class").indexOf('mceItemHidden')==-1){path[path.length]=parentNode;}parentNode=parentNode.parentNode;}var html="";for(var i=path.length-1;i>=0;i--){var nodeName=path[i].nodeName.toLowerCase();var nodeData="";if(nodeName=="b"){nodeName="strong";}if(nodeName=="i"){nodeName="em";}if(nodeName=="span"){var cn=tinyMCE.getAttrib(path[i],"class");if(cn!=""&&cn.indexOf('mceItem')==-1)nodeData+="class: "+cn+" ";var st=tinyMCE.getAttrib(path[i],"style");if(st!=""){st=tinyMCE.serializeStyle(tinyMCE.parseStyle(st));nodeData+="style: "+st+" ";}}if(nodeName=="font"){if(tinyMCE.getParam("convert_fonts_to_spans"))nodeName="span";var face=tinyMCE.getAttrib(path[i],"face");if(face!="")nodeData+="font: "+face+" ";var size=tinyMCE.getAttrib(path[i],"size");if(size!="")nodeData+="size: "+size+" ";var color=tinyMCE.getAttrib(path[i],"color");if(color!="")nodeData+="color: "+color+" ";}if(getAttrib(path[i],'id')!=""){nodeData+="id: "+path[i].getAttribute('id')+" ";}var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1)nodeData+="class: "+className+" ";if(getAttrib(path[i],'src')!=""){var src=tinyMCE.getAttrib(path[i],"mce_src");if(src=="")src=tinyMCE.getAttrib(path[i],"src");nodeData+="src: "+src+" ";}if(getAttrib(path[i],'href')!=""){var href=tinyMCE.getAttrib(path[i],"mce_href");if(href=="")href=tinyMCE.getAttrib(path[i],"href");nodeData+="href: "+href+" ";}if(nodeName=="img"&&tinyMCE.getAttrib(path[i],"class").indexOf('mceItemFlash')!=-1){nodeName="flash";nodeData="src: "+path[i].getAttribute('title');}if(nodeName=="a"&&(anchor=tinyMCE.getAttrib(path[i],"name"))!=""){nodeName="a";nodeName+="#"+anchor;nodeData="";}if(getAttrib(path[i],'name').indexOf("mce_")!=0){var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1){nodeName+="."+className;}}var cmd='tinyMCE.execInstanceCommand(\''+editor_id+'\',\'mceSelectNodeDepth\',false,\''+i+'\');';html+='<a title="'+nodeData+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" target="_self" class="mcePathItem">'+nodeName+'</a>';if(i>0){html+=" &raquo; ";}}pathElm.innerHTML='<a href="#" accesskey="x"></a>'+tinyMCE.getLang('lang_theme_path')+": "+html+'&#160;';}tinyMCE.switchClass(editor_id+'_justifyleft','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifyright','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifyfull','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClass(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClass(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_numlist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_sub','mceButtonNormal');tinyMCE.switchClass(editor_id+'_sup','mceButtonNormal');tinyMCE.switchClass(editor_id+'_anchor','mceButtonNormal');tinyMCE.switchClass(editor_id+'_link','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_unlink','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_outdent','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_image','mceButtonNormal');tinyMCE.switchClass(editor_id+'_hr','mceButtonNormal');if(node.nodeName=="A"&&tinyMCE.getAttrib(node,"class").indexOf('mceItemAnchor')!=-1)tinyMCE.switchClass(editor_id+'_anchor','mceButtonSelected');var anchorLink=tinyMCE.getParentElement(node,"a","href");if(anchorLink||any_selection){tinyMCE.switchClass(editor_id+'_link',anchorLink?'mceButtonSelected':'mceButtonNormal');tinyMCE.switchClass(editor_id+'_unlink',anchorLink?'mceButtonSelected':'mceButtonNormal');}tinyMCE.switchClass(editor_id+'_visualaid',visual_aid?'mceButtonSelected':'mceButtonNormal');if(undo_levels!=-1){tinyMCE.switchClass(editor_id+'_undo','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_redo','mceButtonDisabled');}if(tinyMCE.getParentElement(node,"li,blockquote"))tinyMCE.switchClass(editor_id+'_outdent','mceButtonNormal');if(undo_index!=-1&&(undo_index<undo_levels-1&&undo_levels>0))tinyMCE.switchClass(editor_id+'_redo','mceButtonNormal');if(undo_index!=-1&&(undo_index>0&&undo_levels>0))tinyMCE.switchClass(editor_id+'_undo','mceButtonNormal');var selectElm=document.getElementById(editor_id+"_styleSelect");if(selectElm){TinyMCE_AdvancedTheme._setupCSSClasses(editor_id);classNode=node;breakOut=false;var index=0;do{if(classNode&&classNode.className){for(var i=0;i<selectElm.options.length;i++){if(selectElm.options[i].value==classNode.className){index=i;breakOut=true;break;}}}}while(!breakOut&&classNode!=null&&(classNode=classNode.parentNode)!=null);selectElm.selectedIndex=index;}var selectElm=document.getElementById(editor_id+"_formatSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"p,div,h1,h2,h3,h4,h5,h6,pre,address");if(elm)selectByValue(selectElm,"<"+elm.nodeName.toLowerCase()+">");else selectByValue(selectElm,"");}var selectElm=document.getElementById(editor_id+"_fontNameSelect");if(selectElm){if(!tinyMCE.isSafari&&!(tinyMCE.isMSIE&&!tinyMCE.isOpera)){var face=inst.queryCommandValue('FontName');face=face==null||face==""?"":face;selectByValue(selectElm,face,face!="");}else{var elm=tinyMCE.getParentElement(node,"font","face");if(elm){var family=tinyMCE.getAttrib(elm,"face");if(family=='')family=''+elm.style.fontFamily;if(!selectByValue(selectElm,family,family!=""))selectByValue(selectElm,"");}else selectByValue(selectElm,"");}}var selectElm=document.getElementById(editor_id+"_fontSizeSelect");if(selectElm){if(!tinyMCE.isSafari&&!tinyMCE.isOpera){var size=inst.queryCommandValue('FontSize');selectByValue(selectElm,size==null||size==""?"0":size);}else{var elm=tinyMCE.getParentElement(node,"font","size");if(elm){var size=tinyMCE.getAttrib(elm,"size");if(size==''){var sizes=new Array('','8px','10px','12px','14px','18px','24px','36px');size=''+elm.style.fontSize;for(var i=0;i<sizes.length;i++){if((''+sizes[i])==size){size=i;break;}}}if(!selectByValue(selectElm,size))selectByValue(selectElm,"");}else selectByValue(selectElm,"0");}}alignNode=node;breakOut=false;do{if(!alignNode.getAttribute||!alignNode.getAttribute('align'))continue;switch(alignNode.getAttribute('align').toLowerCase()){case"left":tinyMCE.switchClass(editor_id+'_justifyleft','mceButtonSelected');breakOut=true;break;case"right":tinyMCE.switchClass(editor_id+'_justifyright','mceButtonSelected');breakOut=true;break;case"middle":case"center":tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonSelected');breakOut=true;break;case"justify":tinyMCE.switchClass(editor_id+'_justifyfull','mceButtonSelected');breakOut=true;break;}}while(!breakOut&&(alignNode=alignNode.parentNode)!=null);var div=tinyMCE.getParentElement(node,"div");if(div&&div.style.textAlign=="center")tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonSelected');if(!setup_content){var ar=new Array("Bold","_bold","Italic","_italic","Strikethrough","_strikethrough","superscript","_sup","subscript","_sub");for(var i=0;i<ar.length;i+=2){if(inst.queryCommandState(ar[i]))tinyMCE.switchClass(editor_id+ar[i+1],'mceButtonSelected');}if(inst.queryCommandState("Underline")&&(node.parentNode==null||node.parentNode.nodeName!="A"))tinyMCE.switchClass(editor_id+'_underline','mceButtonSelected');}do{switch(node.nodeName){case"UL":tinyMCE.switchClass(editor_id+'_bullist','mceButtonSelected');break;case"OL":tinyMCE.switchClass(editor_id+'_numlist','mceButtonSelected');break;case"HR":tinyMCE.switchClass(editor_id+'_hr','mceButtonSelected');break;case"IMG":if(getAttrib(node,'name').indexOf('mce_')!=0){tinyMCE.switchClass(editor_id+'_image','mceButtonSelected');}break;}}while((node=node.parentNode)!=null);},_setupCSSClasses:function(editor_id){var i,selectElm;if(!TinyMCE_AdvancedTheme._autoImportCSSClasses)return;selectElm=document.getElementById(editor_id+'_styleSelect');if(selectElm&&selectElm.getAttribute('cssImported')!='true'){var csses=tinyMCE.getCSSClasses(editor_id);if(csses&&selectElm){for(i=0;i<csses.length;i++)selectElm.options[selectElm.options.length]=new Option(csses[i],csses[i]);}if(csses!=null&&csses.length>0)selectElm.setAttribute('cssImported','true');}},_setCookie:function(name,value,expires,path,domain,secure){var curCookie=name+"="+escape(value)+((expires)?"; expires="+expires.toGMTString():"")+((path)?"; path="+escape(path):"")+((domain)?"; domain="+domain:"")+((secure)?"; secure":"");document.cookie=curCookie;},_getCookie:function(name){var dc=document.cookie;var prefix=name+"=";var begin=dc.indexOf("; "+prefix);if(begin==-1){begin=dc.indexOf(prefix);if(begin!=0)return null;}else begin+=2;var end=document.cookie.indexOf(";",begin);if(end==-1)end=dc.length;return unescape(dc.substring(begin+prefix.length,end));},_resizeTo:function(inst,w,h,set_w){var editorContainer=document.getElementById(inst.editorId+'_parent');var tableElm=editorContainer.firstChild;var iframe=inst.iframeElement;if(w==null||w=="null"){set_w=false;w=0;}if(h==null||h=="null")return;w=parseInt(w);h=parseInt(h);if(tinyMCE.isGecko){w+=2;h+=2;}var dx=w-tableElm.clientWidth;var dy=h-tableElm.clientHeight;w=w<1?30:w;h=h<1?30:h;if(set_w)tableElm.style.width=w+"px";tableElm.style.height=h+"px";iw=iframe.clientWidth+dx;ih=iframe.clientHeight+dy;iw=iw<1?30:iw;ih=ih<1?30:ih;if(tinyMCE.isGecko){iw-=2;ih-=2;}if(set_w)iframe.style.width=iw+"px";iframe.style.height=ih+"px";if(set_w){var tableBodyElm=tableElm.firstChild;var minIframeWidth=tableBodyElm.scrollWidth;if(inst.iframeElement.clientWidth<minIframeWidth){dx=minIframeWidth-inst.iframeElement.clientWidth;inst.iframeElement.style.width=(iw+dx)+"px";}}},_resizeEventHandler:function(e){var resizer=TinyMCE_AdvancedTheme._resizer;if(!resizer.resizing)return;e=typeof(e)=="undefined"?window.event:e;var dx=e.screenX-resizer.downX;var dy=e.screenY-resizer.downY;var resizeBox=resizer.resizeBox;var editorId=resizer.editorId;switch(e.type){case"mousemove":var w,h;w=resizer.width+dx;h=resizer.height+dy;w=w<1?1:w;h=h<1?1:h;if(resizer.horizontal)resizeBox.style.width=w+"px";resizeBox.style.height=h+"px";break;case"mouseup":TinyMCE_AdvancedTheme._setResizing(e,editorId,false);TinyMCE_AdvancedTheme._resizeTo(tinyMCE.getInstanceById(editorId),resizer.width+dx,resizer.height+dy,resizer.horizontal);if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var expires=new Date();expires.setTime(expires.getTime()+3600000*24*30);TinyMCE_AdvancedTheme._setCookie("TinyMCE_"+editorId+"_width",""+(resizer.horizontal?resizer.width+dx:""),expires);TinyMCE_AdvancedTheme._setCookie("TinyMCE_"+editorId+"_height",""+(resizer.height+dy),expires);}break;}},_setResizing:function(e,editor_id,state){e=typeof(e)=="undefined"?window.event:e;var resizer=TinyMCE_AdvancedTheme._resizer;var editorContainer=document.getElementById(editor_id+'_parent');var editorArea=document.getElementById(editor_id+'_parent').firstChild;var resizeBox=document.getElementById(editor_id+'_resize_box');var inst=tinyMCE.getInstanceById(editor_id);if(state){var width=editorArea.clientWidth;var height=editorArea.clientHeight;resizeBox.style.width=width+"px";resizeBox.style.height=height+"px";resizer.iframeWidth=inst.iframeElement.clientWidth;resizer.iframeHeight=inst.iframeElement.clientHeight;editorArea.style.display="none";resizeBox.style.display="block";if(!resizer.eventHandlers){if(tinyMCE.isMSIE)tinyMCE.addEvent(document,"mousemove",TinyMCE_AdvancedTheme._resizeEventHandler);else tinyMCE.addEvent(window,"mousemove",TinyMCE_AdvancedTheme._resizeEventHandler);tinyMCE.addEvent(document,"mouseup",TinyMCE_AdvancedTheme._resizeEventHandler);resizer.eventHandlers=true;}resizer.resizing=true;resizer.downX=e.screenX;resizer.downY=e.screenY;resizer.width=parseInt(resizeBox.style.width);resizer.height=parseInt(resizeBox.style.height);resizer.editorId=editor_id;resizer.resizeBox=resizeBox;resizer.horizontal=tinyMCE.getParam("theme_advanced_resize_horizontal",true);}else{resizer.resizing=false;resizeBox.style.display="none";editorArea.style.display=tinyMCE.isMSIE&&!tinyMCE.isOpera?"block":"table";tinyMCE.execCommand('mceResetDesignMode');}},_insertImage:function(src,alt,border,hspace,vspace,width,height,align,title,onmouseover,onmouseout){tinyMCE.execCommand('mceBeginUndoLevel');if(src=="")return;if(!tinyMCE.imgElement&&tinyMCE.isSafari){var html="";html+='<img src="'+src+'" alt="'+alt+'"';html+=' border="'+border+'" hspace="'+hspace+'"';html+=' vspace="'+vspace+'" width="'+width+'"';html+=' height="'+height+'" align="'+align+'" title="'+title+'" onmouseover="'+onmouseover+'" onmouseout="'+onmouseout+'" />';tinyMCE.execCommand("mceInsertContent",false,html);}else{if(!tinyMCE.imgElement&&tinyMCE.selectedInstance){if(tinyMCE.isSafari)tinyMCE.execCommand("mceInsertContent",false,'<img src="'+tinyMCE.uniqueURL+'" />');else tinyMCE.selectedInstance.contentDocument.execCommand("insertimage",false,tinyMCE.uniqueURL);tinyMCE.imgElement=tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"img","src",tinyMCE.uniqueURL);}}if(tinyMCE.imgElement){var needsRepaint=false;var msrc=src;src=eval(tinyMCE.settings['urlconverter_callback']+"(src, tinyMCE.imgElement);");if(tinyMCE.getParam('convert_urls'))msrc=src;if(onmouseover&&onmouseover!="")onmouseover="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseover, tinyMCE.imgElement);")+"';";if(onmouseout&&onmouseout!="")onmouseout="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseout, tinyMCE.imgElement);")+"';";if(typeof(title)=="undefined")title=alt;if(width!=tinyMCE.imgElement.getAttribute("width")||height!=tinyMCE.imgElement.getAttribute("height")||align!=tinyMCE.imgElement.getAttribute("align"))needsRepaint=true;tinyMCE.setAttrib(tinyMCE.imgElement,'src',src);tinyMCE.setAttrib(tinyMCE.imgElement,'mce_src',msrc);tinyMCE.setAttrib(tinyMCE.imgElement,'alt',alt);tinyMCE.setAttrib(tinyMCE.imgElement,'title',title);tinyMCE.setAttrib(tinyMCE.imgElement,'align',align);tinyMCE.setAttrib(tinyMCE.imgElement,'border',border,true);tinyMCE.setAttrib(tinyMCE.imgElement,'hspace',hspace,true);tinyMCE.setAttrib(tinyMCE.imgElement,'vspace',vspace,true);tinyMCE.setAttrib(tinyMCE.imgElement,'width',width,true);tinyMCE.setAttrib(tinyMCE.imgElement,'height',height,true);tinyMCE.setAttrib(tinyMCE.imgElement,'onmouseover',onmouseover);tinyMCE.setAttrib(tinyMCE.imgElement,'onmouseout',onmouseout);if(width&&width!="")tinyMCE.imgElement.style.pixelWidth=width;if(height&&height!="")tinyMCE.imgElement.style.pixelHeight=height;if(needsRepaint)tinyMCE.selectedInstance.repaint();}tinyMCE.execCommand('mceEndUndoLevel');},_insertLink:function(href,target,title,onclick,style_class){tinyMCE.execCommand('mceBeginUndoLevel');if(tinyMCE.selectedInstance&&tinyMCE.selectedElement&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){var doc=tinyMCE.selectedInstance.getDoc();var linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");var newLink=false;if(!linkElement){linkElement=doc.createElement("a");newLink=true;}var mhref=href;var thref=eval(tinyMCE.settings['urlconverter_callback']+"(href, linkElement);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(linkElement,'href',thref);tinyMCE.setAttrib(linkElement,'mce_href',mhref);tinyMCE.setAttrib(linkElement,'target',target);tinyMCE.setAttrib(linkElement,'title',title);tinyMCE.setAttrib(linkElement,'onclick',onclick);tinyMCE.setAttrib(linkElement,'class',style_class);if(newLink){linkElement.appendChild(tinyMCE.selectedElement.cloneNode(true));tinyMCE.selectedElement.parentNode.replaceChild(linkElement,tinyMCE.selectedElement);}return;}if(!tinyMCE.linkElement&&tinyMCE.selectedInstance){if(tinyMCE.isSafari){tinyMCE.execCommand("mceInsertContent",false,'<a href="'+tinyMCE.uniqueURL+'">'+tinyMCE.selectedInstance.selection.getSelectedHTML()+'</a>');}else tinyMCE.selectedInstance.contentDocument.execCommand("createlink",false,tinyMCE.uniqueURL);tinyMCE.linkElement=tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"a","href",tinyMCE.uniqueURL);var elementArray=tinyMCE.getElementsByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"a","href",tinyMCE.uniqueURL);for(var i=0;i<elementArray.length;i++){var mhref=href;var thref=eval(tinyMCE.settings['urlconverter_callback']+"(href, elementArray[i]);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(elementArray[i],'href',thref);tinyMCE.setAttrib(elementArray[i],'mce_href',mhref);tinyMCE.setAttrib(elementArray[i],'target',target);tinyMCE.setAttrib(elementArray[i],'title',title);tinyMCE.setAttrib(elementArray[i],'onclick',onclick);tinyMCE.setAttrib(elementArray[i],'class',style_class);}tinyMCE.linkElement=elementArray[0];}if(tinyMCE.linkElement){var mhref=href;href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(tinyMCE.linkElement,'href',href);tinyMCE.setAttrib(tinyMCE.linkElement,'mce_href',mhref);tinyMCE.setAttrib(tinyMCE.linkElement,'target',target);tinyMCE.setAttrib(tinyMCE.linkElement,'title',title);tinyMCE.setAttrib(tinyMCE.linkElement,'onclick',onclick);tinyMCE.setAttrib(tinyMCE.linkElement,'class',style_class);}tinyMCE.execCommand('mceEndUndoLevel');}};tinyMCE.addTheme("advanced",TinyMCE_AdvancedTheme);tinyMCE.addButtonMap(TinyMCE_AdvancedTheme._buttonMap);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/editor_template_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,1411 @@
+/**
+ * $RCSfile: editor_template_src.js,v $
+ * $Revision: 1.96 $
+ * $Date: 2006/04/18 13:32:52 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import theme specific language pack */
+tinyMCE.importThemeLanguagePack('advanced');
+
+var TinyMCE_AdvancedTheme = {
+	// Private theme fields
+	_autoImportCSSClasses : true,
+	_resizer : {},
+	_buttons : [
+		// Control id, button img, button title, command, user_interface, value
+		['bold', '{$lang_bold_img}', 'lang_bold_desc', 'Bold'],
+		['italic', '{$lang_italic_img}', 'lang_italic_desc', 'Italic'],
+		['underline', '{$lang_underline_img}', 'lang_underline_desc', 'Underline'],
+		['strikethrough', 'strikethrough.gif', 'lang_striketrough_desc', 'Strikethrough'],
+		['justifyleft', 'justifyleft.gif', 'lang_justifyleft_desc', 'JustifyLeft'],
+		['justifycenter', 'justifycenter.gif', 'lang_justifycenter_desc', 'JustifyCenter'],
+		['justifyright', 'justifyright.gif', 'lang_justifyright_desc', 'JustifyRight'],
+		['justifyfull', 'justifyfull.gif', 'lang_justifyfull_desc', 'JustifyFull'],
+		['bullist', 'bullist.gif', 'lang_bullist_desc', 'InsertUnorderedList'],
+		['numlist', 'numlist.gif', 'lang_numlist_desc', 'InsertOrderedList'],
+		['outdent', 'outdent.gif', 'lang_outdent_desc', 'Outdent'],
+		['indent', 'indent.gif', 'lang_indent_desc', 'Indent'],
+		['cut', 'cut.gif', 'lang_cut_desc', 'Cut'],
+		['copy', 'copy.gif', 'lang_copy_desc', 'Copy'],
+		['paste', 'paste.gif', 'lang_paste_desc', 'Paste'],
+		['undo', 'undo.gif', 'lang_undo_desc', 'Undo'],
+		['redo', 'redo.gif', 'lang_redo_desc', 'Redo'],
+		['link', 'link.gif', 'lang_link_desc', 'mceLink', true],
+		['unlink', 'unlink.gif', 'lang_unlink_desc', 'unlink'],
+		['image', 'image.gif', 'lang_image_desc', 'mceImage', true],
+		['cleanup', 'cleanup.gif', 'lang_cleanup_desc', 'mceCleanup'],
+		['help', 'help.gif', 'lang_help_desc', 'mceHelp'],
+		['code', 'code.gif', 'lang_theme_code_desc', 'mceCodeEditor'],
+		['hr', 'hr.gif', 'lang_theme_hr_desc', 'inserthorizontalrule'],
+		['removeformat', 'removeformat.gif', 'lang_theme_removeformat_desc', 'removeformat'],
+		['sub', 'sub.gif', 'lang_theme_sub_desc', 'subscript'],
+		['sup', 'sup.gif', 'lang_theme_sup_desc', 'superscript'],
+		['forecolor', 'forecolor.gif', 'lang_theme_forecolor_desc', 'mceForeColor', true],
+		['backcolor', 'backcolor.gif', 'lang_theme_backcolor_desc', 'mceBackColor', true],
+		['charmap', 'charmap.gif', 'lang_theme_charmap_desc', 'mceCharMap'],
+		['visualaid', 'visualaid.gif', 'lang_theme_visualaid_desc', 'mceToggleVisualAid'],
+		['anchor', 'anchor.gif', 'lang_theme_anchor_desc', 'mceInsertAnchor'],
+		['newdocument', 'newdocument.gif', 'lang_newdocument_desc', 'mceNewDocument']
+	],
+
+	_buttonMap : 'anchor,backcolor,bold,bullist,charmap,cleanup,code,copy,cut,forecolor,help,hr,image,indent,italic,justifycenter,justifyfull,justifyleft,justifyright,link,newdocument,numlist,outdent,paste,redo,removeformat,strikethrough,sub,sup,underline,undo,unlink,visualaid,advhr,ltr,rtl,emotions,flash,fullpage,fullscreen,iespell,insertdate,inserttime,pastetext,pasteword,selectall,preview,print,save,replace,search,table,cell_props,delete_col,delete_row,col_after,col_before,row_after,row_before,merge_cells,row_props,split_cells',
+
+	/**
+	 * Returns HTML code for the specificed control.
+	 */
+	getControlHTML : function(button_name) {
+		var i, x;
+
+		// Lookup button in button list
+		for (i=0; i<TinyMCE_AdvancedTheme._buttons.length; i++) {
+			var but = TinyMCE_AdvancedTheme._buttons[i];
+
+			if (but[0] == button_name)
+				return tinyMCE.getButtonHTML(but[0], but[2], '{$themeurl}/images/' + but[1], but[3], (but.length > 4 ? but[4] : false), (but.length > 5 ? but[5] : null));
+		}
+
+		// Custom controlls other than buttons
+		switch (button_name) {
+			case "formatselect":
+				var html = '<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';
+				var formats = tinyMCE.getParam("theme_advanced_blockformats", "p,address,pre,h1,h2,h3,h4,h5,h6", true).split(',');
+				var lookup = [
+					['p', '{$lang_theme_paragraph}'],
+					['address', '{$lang_theme_address}'],
+					['pre', '{$lang_theme_pre}'],
+					['h1', '{$lang_theme_h1}'],
+					['h2', '{$lang_theme_h2}'],
+					['h3', '{$lang_theme_h3}'],
+					['h4', '{$lang_theme_h4}'],
+					['h5', '{$lang_theme_h5}'],
+					['h6', '{$lang_theme_h6}'],
+					['div', '{$lang_theme_div}'],
+					['blockquote', '{$lang_theme_blockquote}'],
+					['code', '{$lang_theme_code}'],
+					['dt', '{$lang_theme_dt}'],
+					['dd', '{$lang_theme_dd}'],
+					['samp', '{$lang_theme_samp}']
+				];
+
+				html += '<option value="">{$lang_theme_block}</option>';
+
+				// Build format select
+				for (var i=0; i<formats.length; i++) {
+					for (var x=0; x<lookup.length; x++) {
+						if (formats[i] == lookup[x][0])
+							html += '<option value="&lt;' + lookup[x][0] + '&gt;">' + lookup[x][1] + '</option>';
+					}
+				}
+
+				html += '</select>';
+
+				return html;
+
+			case "styleselect":
+				return '<select id="{$editor_id}_styleSelect" onmousedown="tinyMCE.themes.advanced._setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onfocus="tinyMCE.addSelectAccessibility(event,this,window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';
+
+			case "fontselect":
+				var fontHTML = '<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList"><option value="">{$lang_theme_fontdefault}</option>';
+				var iFonts = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+				var nFonts = 'Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sand;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats';
+				var fonts = tinyMCE.getParam("theme_advanced_fonts", nFonts).split(';');
+				for (i=0; i<fonts.length; i++) {
+					if (fonts[i] != '') {
+						var parts = fonts[i].split('=');
+						fontHTML += '<option value="' + parts[1] + '">' + parts[0] + '</option>';
+					}
+				}
+
+				fontHTML += '</select>';
+				return fontHTML;
+
+			case "fontsizeselect":
+				return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+
+						'<option value="0">{$lang_theme_font_size}</option>'+
+						'<option value="1">1 (8 pt)</option>'+
+						'<option value="2">2 (10 pt)</option>'+
+						'<option value="3">3 (12 pt)</option>'+
+						'<option value="4">4 (14 pt)</option>'+
+						'<option value="5">5 (18 pt)</option>'+
+						'<option value="6">6 (24 pt)</option>'+
+						'<option value="7">7 (36 pt)</option>'+
+						'</select>';
+
+			case "|":
+			case "separator":
+				return '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+
+			case "spacer":
+				return '<img src="{$themeurl}/images/separator.gif" width="2" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';
+
+			case "rowseparator":
+				return '<br />';
+		}
+
+		return "";
+	},
+
+	/**
+	 * Theme specific execcommand handling.
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		switch (command) {
+			case "mceLink":
+				var inst = tinyMCE.getInstanceById(editor_id);
+				var doc = inst.getDoc();
+				var selectedText = "";
+
+				if (tinyMCE.isMSIE) {
+					var rng = doc.selection.createRange();
+					selectedText = rng.text;
+				} else
+					selectedText = inst.getSel().toString();
+
+				if (!tinyMCE.linkElement) {
+					if ((tinyMCE.selectedElement.nodeName.toLowerCase() != "img") && (selectedText.length <= 0))
+						return true;
+				}
+
+				var href = "", target = "", title = "", onclick = "", action = "insert", style_class = "";
+
+				if (tinyMCE.selectedElement.nodeName.toLowerCase() == "a")
+					tinyMCE.linkElement = tinyMCE.selectedElement;
+
+				// Is anchor not a link
+				if (tinyMCE.linkElement != null && tinyMCE.getAttrib(tinyMCE.linkElement, 'href') == "")
+					tinyMCE.linkElement = null;
+
+				if (tinyMCE.linkElement) {
+					href = tinyMCE.getAttrib(tinyMCE.linkElement, 'href');
+					target = tinyMCE.getAttrib(tinyMCE.linkElement, 'target');
+					title = tinyMCE.getAttrib(tinyMCE.linkElement, 'title');
+					onclick = tinyMCE.getAttrib(tinyMCE.linkElement, 'onclick');
+					style_class = tinyMCE.getAttrib(tinyMCE.linkElement, 'class');
+
+					// Try old onclick to if copy/pasted content
+					if (onclick == "")
+						onclick = tinyMCE.getAttrib(tinyMCE.linkElement, 'onclick');
+
+					onclick = tinyMCE.cleanupEventStr(onclick);
+
+					href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement, true);");
+
+					// Use mce_href if defined
+					mceRealHref = tinyMCE.getAttrib(tinyMCE.linkElement, 'mce_href');
+					if (mceRealHref != "") {
+						href = mceRealHref;
+
+						if (tinyMCE.getParam('convert_urls'))
+							href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement, true);");
+					}
+
+					action = "update";
+				}
+
+				var template = new Array();
+
+				template['file'] = 'link.htm';
+				template['width'] = 310;
+				template['height'] = 200;
+
+				// Language specific width and height addons
+				template['width'] += tinyMCE.getLang('lang_insert_link_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_insert_link_delta_height', 0);
+
+				if (inst.settings['insertlink_callback']) {
+					var returnVal = eval(inst.settings['insertlink_callback'] + "(href, target, title, onclick, action, style_class);");
+					if (returnVal && returnVal['href'])
+						TinyMCE_AdvancedTheme._insertLink(returnVal['href'], returnVal['target'], returnVal['title'], returnVal['onclick'], returnVal['style_class']);
+				} else {
+					tinyMCE.openWindow(template, {href : href, target : target, title : title, onclick : onclick, action : action, className : style_class, inline : "yes"});
+				}
+
+				return true;
+
+			case "mceImage":
+				var src = "", alt = "", border = "", hspace = "", vspace = "", width = "", height = "", align = "";
+				var title = "", onmouseover = "", onmouseout = "", action = "insert";
+				var img = tinyMCE.imgElement;
+				var inst = tinyMCE.getInstanceById(editor_id);
+
+				if (tinyMCE.selectedElement != null && tinyMCE.selectedElement.nodeName.toLowerCase() == "img") {
+					img = tinyMCE.selectedElement;
+					tinyMCE.imgElement = img;
+				}
+
+				if (img) {
+					// Is it a internal MCE visual aid image, then skip this one.
+					if (tinyMCE.getAttrib(img, 'name').indexOf('mce_') == 0)
+						return true;
+
+					src = tinyMCE.getAttrib(img, 'src');
+					alt = tinyMCE.getAttrib(img, 'alt');
+
+					// Try polling out the title
+					if (alt == "")
+						alt = tinyMCE.getAttrib(img, 'title');
+
+					// Fix width/height attributes if the styles is specified
+					if (tinyMCE.isGecko) {
+						var w = img.style.width;
+						if (w != null && w != "")
+							img.setAttribute("width", w);
+
+						var h = img.style.height;
+						if (h != null && h != "")
+							img.setAttribute("height", h);
+					}
+
+					border = tinyMCE.getAttrib(img, 'border');
+					hspace = tinyMCE.getAttrib(img, 'hspace');
+					vspace = tinyMCE.getAttrib(img, 'vspace');
+					width = tinyMCE.getAttrib(img, 'width');
+					height = tinyMCE.getAttrib(img, 'height');
+					align = tinyMCE.getAttrib(img, 'align');
+					onmouseover = tinyMCE.getAttrib(img, 'onmouseover');
+					onmouseout = tinyMCE.getAttrib(img, 'onmouseout');
+					title = tinyMCE.getAttrib(img, 'title');
+
+					// Is realy specified?
+					if (tinyMCE.isMSIE) {
+						width = img.attributes['width'].specified ? width : "";
+						height = img.attributes['height'].specified ? height : "";
+					}
+
+					//onmouseover = tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseover));
+					//onmouseout = tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseout));
+
+					src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, img, true);");
+
+					// Use mce_src if defined
+					mceRealSrc = tinyMCE.getAttrib(img, 'mce_src');
+					if (mceRealSrc != "") {
+						src = mceRealSrc;
+
+						if (tinyMCE.getParam('convert_urls'))
+							src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, img, true);");
+					}
+
+					//if (onmouseover != "")
+					//	onmouseover = eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseover, img, true);");
+
+					//if (onmouseout != "")
+					//	onmouseout = eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseout, img, true);");
+
+					action = "update";
+				}
+
+				var template = new Array();
+
+				template['file'] = 'image.htm?src={$src}';
+				template['width'] = 355;
+				template['height'] = 265 + (tinyMCE.isMSIE ? 25 : 0);
+
+				// Language specific width and height addons
+				template['width'] += tinyMCE.getLang('lang_insert_image_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_insert_image_delta_height', 0);
+
+				if (inst.settings['insertimage_callback']) {
+					var returnVal = eval(inst.settings['insertimage_callback'] + "(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");
+					if (returnVal && returnVal['src'])
+						TinyMCE_AdvancedTheme._insertImage(returnVal['src'], returnVal['alt'], returnVal['border'], returnVal['hspace'], returnVal['vspace'], returnVal['width'], returnVal['height'], returnVal['align'], returnVal['title'], returnVal['onmouseover'], returnVal['onmouseout']);
+				} else
+					tinyMCE.openWindow(template, {src : src, alt : alt, border : border, hspace : hspace, vspace : vspace, width : width, height : height, align : align, title : title, onmouseover : onmouseover, onmouseout : onmouseout, action : action, inline : "yes"});
+
+				return true;
+
+			case "mceForeColor":
+				var template = new Array();
+				var elm = tinyMCE.selectedInstance.getFocusElement();
+				var inputColor = tinyMCE.getAttrib(elm, "color");
+
+				if (inputColor == '')
+					inputColor = elm.style.color;
+
+				if (!inputColor)
+					inputColor = "#000000";
+
+				template['file'] = 'color_picker.htm';
+				template['width'] = 220;
+				template['height'] = 190;
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes", command : "forecolor", input_color : inputColor});
+			return true;
+
+			case "mceBackColor":
+				var template = new Array();
+				var elm = tinyMCE.selectedInstance.getFocusElement();
+				var inputColor = elm.style.backgroundColor;
+
+				if (!inputColor)
+					inputColor = "#000000";
+
+				template['file'] = 'color_picker.htm';
+				template['width'] = 220;
+				template['height'] = 190;
+
+				template['width'] += tinyMCE.getLang('lang_theme_advanced_backcolor_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_theme_advanced_backcolor_delta_height', 0);
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes", command : "HiliteColor", input_color : inputColor});
+				//mceBackColor
+			return true;
+
+			case "mceColorPicker":
+				if (user_interface) {
+					var template = new Array();
+					var inputColor = value['document'].getElementById(value['element_id']).value;
+
+					template['file'] = 'color_picker.htm';
+					template['width'] = 220;
+					template['height'] = 190;
+					template['close_previous'] = "no";
+
+					template['width'] += tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_width', 0);
+					template['height'] += tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_height', 0);
+
+					if (typeof(value['store_selection']) == "undefined")
+						value['store_selection'] = true;
+
+					tinyMCE.lastColorPickerValue = value;
+					tinyMCE.openWindow(template, {editor_id : editor_id, mce_store_selection : value['store_selection'], inline : "yes", command : "mceColorPicker", input_color : inputColor});
+				} else {
+					var savedVal = tinyMCE.lastColorPickerValue;
+					var elm = savedVal['document'].getElementById(savedVal['element_id']);
+					elm.value = value;
+
+					if (elm.onchange != null && elm.onchange != '')
+						eval('elm.onchange();');
+				}
+			return true;
+
+			case "mceCodeEditor":
+				var template = new Array();
+
+				template['file'] = 'source_editor.htm';
+				template['width'] = parseInt(tinyMCE.getParam("theme_advanced_source_editor_width", 720));
+				template['height'] = parseInt(tinyMCE.getParam("theme_advanced_source_editor_height", 580));
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, resizable : "yes", scrollbars : "no", inline : "yes"});
+				return true;
+
+			case "mceCharMap":
+				var template = new Array();
+
+				template['file'] = 'charmap.htm';
+				template['width'] = 550 + (tinyMCE.isOpera ? 40 : 0);
+				template['height'] = 250;
+
+				template['width'] += tinyMCE.getLang('lang_theme_advanced_charmap_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_theme_advanced_charmap_delta_height', 0);
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+				return true;
+
+			case "mceInsertAnchor":
+				var template = new Array();
+
+				template['file'] = 'anchor.htm';
+				template['width'] = 320;
+				template['height'] = 90 + (tinyMCE.isNS7 ? 30 : 0);
+
+				template['width'] += tinyMCE.getLang('lang_theme_advanced_anchor_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_theme_advanced_anchor_delta_height', 0);
+
+				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+				return true;
+
+			case "mceNewDocument":
+				if (confirm(tinyMCE.getLang('lang_newdocument')))
+					tinyMCE.execInstanceCommand(editor_id, 'mceSetContent', false, ' ');
+
+				return true;
+		}
+
+		return false;
+	},
+
+	/**
+	 * Editor instance template function.
+	 */
+	getEditorTemplate : function(settings, editorId) {
+		function removeFromArray(in_array, remove_array) {
+			var outArray = new Array();
+			
+			for (var i=0; i<in_array.length; i++) {
+				skip = false;
+
+				for (var j=0; j<remove_array.length; j++) {
+					if (in_array[i] == remove_array[j]) {
+						skip = true;
+					}
+				}
+
+				if (!skip) {
+					outArray[outArray.length] = in_array[i];
+				}
+			}
+
+			return outArray;
+		}
+
+		function addToArray(in_array, add_array) {
+			for (var i=0; i<add_array.length; i++) {
+				in_array[in_array.length] = add_array[i];
+			}
+
+			return in_array;
+		}
+
+		var template = new Array();
+		var deltaHeight = 0;
+		var resizing = tinyMCE.getParam("theme_advanced_resizing", false);
+		var path = tinyMCE.getParam("theme_advanced_path", true);
+		var statusbarHTML = '<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: ' + (path ? "block" : "none") + '">&#160;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: ' + (resizing ? "block" : "none") + '" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';
+		var layoutManager = tinyMCE.getParam("theme_advanced_layout_manager", "SimpleLayout");
+
+		// Setup style select options -- MOVED UP FOR EXTERNAL TOOLBAR COMPATABILITY!
+		var styleSelectHTML = '<option value="">{$lang_theme_style_select}</option>';
+		if (settings['theme_advanced_styles']) {
+			var stylesAr = settings['theme_advanced_styles'].split(';');
+			
+			for (var i=0; i<stylesAr.length; i++) {
+				var key, value;
+
+				key = stylesAr[i].split('=')[0];
+				value = stylesAr[i].split('=')[1];
+
+				styleSelectHTML += '<option value="' + value + '">' + key + '</option>';
+			}
+
+			TinyMCE_AdvancedTheme._autoImportCSSClasses = false;
+		}
+
+		switch(layoutManager) {
+			case "SimpleLayout" : //the default TinyMCE Layout (for backwards compatibility)...
+				var toolbarHTML = "";
+				var toolbarLocation = tinyMCE.getParam("theme_advanced_toolbar_location", "bottom");
+				var toolbarAlign = tinyMCE.getParam("theme_advanced_toolbar_align", "center");
+				var pathLocation = tinyMCE.getParam("theme_advanced_path_location", "none"); // Compatiblity
+				var statusbarLocation = tinyMCE.getParam("theme_advanced_statusbar_location", pathLocation);
+				var defVals = {
+					theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",
+					theme_advanced_buttons2 : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",
+					theme_advanced_buttons3 : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"
+				};
+
+				// Add accessibility control
+				toolbarHTML += '<a href="#" accesskey="q" title="' + tinyMCE.getLang("lang_toolbar_focus") + '"';
+
+				if (!tinyMCE.getParam("accessibility_focus"))
+					toolbarHTML += ' onfocus="tinyMCE.getInstanceById(\'' + editorId + '\').getWin().focus();"';
+
+				toolbarHTML += '></a>';
+
+				// Render rows
+				for (var i=1; i<100; i++) {
+					var def = defVals["theme_advanced_buttons" + i];
+
+					var buttons = tinyMCE.getParam("theme_advanced_buttons" + i, def == null ? '' : def, true, ',');
+					if (buttons.length == 0)
+						break;
+
+					buttons = removeFromArray(buttons, tinyMCE.getParam("theme_advanced_disable", "", true, ','));
+					buttons = addToArray(buttons, tinyMCE.getParam("theme_advanced_buttons" + i + "_add", "", true, ','));
+					buttons = addToArray(tinyMCE.getParam("theme_advanced_buttons" + i + "_add_before", "", true, ','), buttons);
+
+					for (var b=0; b<buttons.length; b++)
+						toolbarHTML += tinyMCE.getControlHTML(buttons[b]);
+
+					if (buttons.length > 0) {
+						toolbarHTML += "<br />";
+						deltaHeight -= 23;
+					}
+				}
+
+				// Add accessibility control
+				toolbarHTML += '<a href="#" accesskey="z" onfocus="tinyMCE.getInstanceById(\'' + editorId + '\').getWin().focus();"></a>';
+
+				// Setup template html
+				template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';
+
+				if (toolbarLocation == "top") {
+					template['html'] += '<tr><td class="mceToolbarTop" align="' + toolbarAlign + '" height="1" nowrap="nowrap">' + toolbarHTML + '</td></tr>';
+				}
+
+				if (statusbarLocation == "top") {
+					template['html'] += '<tr><td class="mceStatusbarTop" height="1">' + statusbarHTML + '</td></tr>';
+					deltaHeight -= 23;
+				}
+
+				template['html'] += '<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';
+
+				if (toolbarLocation == "bottom") {
+					template['html'] += '<tr><td class="mceToolbarBottom" align="' + toolbarAlign + '" height="1">' + toolbarHTML + '</td></tr>';
+				}
+
+				// External toolbar changes
+				if (toolbarLocation == "external") {
+					var bod = document.body;
+					var elm = document.createElement ("div");
+
+					toolbarHTML = tinyMCE.replaceVar(toolbarHTML, 'style_select_options', styleSelectHTML);
+					toolbarHTML = tinyMCE.applyTemplate(toolbarHTML, {editor_id : editorId});
+
+					elm.className = "mceToolbarExternal";
+					elm.id = editorId+"_toolbar";
+					elm.innerHTML = '<table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table>';
+					bod.appendChild (elm);
+					// bod.style.marginTop = elm.offsetHeight + "px";
+
+					deltaHeight = 0;
+					tinyMCE.getInstanceById(editorId).toolbarElement = elm;
+
+					//template['html'] = '<div id="mceExternalToolbar" align="center" class="mceToolbarExternal"><table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table></div>' + template["html"];
+				} else {
+					tinyMCE.getInstanceById(editorId).toolbarElement = null;
+				}
+
+				if (statusbarLocation == "bottom") {
+					template['html'] += '<tr><td class="mceStatusbarBottom" height="1">' + statusbarHTML + '</td></tr>';
+					deltaHeight -= 23;
+				}
+
+				template['html'] += '</tbody></table>';
+				//"SimpleLayout"
+			break;
+
+			case "RowLayout" : //Container Layout - containers defined in "theme_advanced_containers" are rendered from top to bottom.
+				template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';
+
+				var containers = tinyMCE.getParam("theme_advanced_containers", "", true, ",");
+				var defaultContainerCSS = tinyMCE.getParam("theme_advanced_containers_default_class", "container");
+				var defaultContainerAlign = tinyMCE.getParam("theme_advanced_containers_default_align", "center");
+
+				//Render Containers:
+				for (var i = 0; i < containers.length; i++)
+				{
+					if (containers[i] == "mceEditor") //Exceptions for mceEditor and ...
+						template['html'] += '<tr><td align="center" class="mceEditor_border"><span id="{$editor_id}"></span></td></tr>';
+					else if (containers[i] == "mceElementpath" || containers[i] == "mceStatusbar") // ... mceElementpath:
+					{
+						var pathClass = "mceStatusbar";
+
+						if (i == containers.length-1)
+						{
+							pathClass = "mceStatusbarBottom";
+						}
+						else if (i == 0)
+						{
+							pathClass = "mceStatusbar";
+						}
+						else
+						{
+							deltaHeight-=2;
+						}
+
+						template['html'] += '<tr><td class="' + pathClass + '" height="1">' + statusbarHTML + '</td></tr>';
+						deltaHeight -= 22;
+					} else { // Render normal Container
+						var curContainer = tinyMCE.getParam("theme_advanced_container_"+containers[i], "", true, ',');
+						var curContainerHTML = "";
+						var curAlign = tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align", defaultContainerAlign);
+						var curCSS = tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class", defaultContainerCSS);
+
+						for (var j=0; j<curContainer.length; j++) {
+							curContainerHTML += tinyMCE.getControlHTML(curContainer[j]);
+						}
+
+						if (curContainer.length > 0) {
+							curContainerHTML += "<br />";
+							deltaHeight -= 23;
+						}
+
+						template['html'] += '<tr><td class="' + curCSS + '" align="' + curAlign + '" height="1">' + curContainerHTML + '</td></tr>';
+					}
+				}
+
+				template['html'] += '</tbody></table>';
+				//RowLayout
+			break;
+
+			case "CustomLayout" : //User defined layout callback...
+				var customLayout = tinyMCE.getParam("theme_advanced_custom_layout","");
+
+				if (customLayout != "" && eval("typeof(" + customLayout + ")") != "undefined") {
+					template = eval(customLayout + "(template);");
+				}
+			break;
+		}
+
+		if (resizing)
+			template['html'] += '<span id="{$editor_id}_resize_box" class="mceResizeBox"></span>';
+
+		template['html'] = tinyMCE.replaceVar(template['html'], 'style_select_options', styleSelectHTML);
+		template['delta_width'] = 0;
+		template['delta_height'] = deltaHeight;
+
+		return template;
+	},
+
+	initInstance : function(inst) {
+		if (tinyMCE.getParam("theme_advanced_resizing", false)) {
+			if (tinyMCE.getParam("theme_advanced_resizing_use_cookie", true)) {
+				var w = TinyMCE_AdvancedTheme._getCookie("TinyMCE_" + inst.editorId + "_width");
+				var h = TinyMCE_AdvancedTheme._getCookie("TinyMCE_" + inst.editorId + "_height");
+
+				TinyMCE_AdvancedTheme._resizeTo(inst, w, h, tinyMCE.getParam("theme_advanced_resize_horizontal", true));
+			}
+		}
+
+		inst.addShortcut('ctrl', 'k', 'lang_link_desc', 'mceLink');
+	},
+
+	/**
+	 * Node change handler.
+	 */
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection, setup_content) {
+		function selectByValue(select_elm, value, first_index) {
+			first_index = typeof(first_index) == "undefined" ? false : true;
+
+			if (select_elm) {
+				for (var i=0; i<select_elm.options.length; i++) {
+					var ov = "" + select_elm.options[i].value;
+
+					if (first_index && ov.toLowerCase().indexOf(value.toLowerCase()) == 0) {
+						select_elm.selectedIndex = i;
+						return true;
+					}
+
+					if (ov == value) {
+						select_elm.selectedIndex = i;
+						return true;
+					}
+				}
+			}
+
+			return false;
+		};
+
+		function getAttrib(elm, name) {
+			return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+		};
+
+		// No node provided
+		if (node == null)
+			return;
+
+		// Update path
+		var pathElm = document.getElementById(editor_id + "_path");
+		var inst = tinyMCE.getInstanceById(editor_id);
+		var doc = inst.getDoc();
+
+		if (pathElm) {
+			// Get node path
+			var parentNode = node;
+			var path = new Array();
+			
+			while (parentNode != null) {
+				if (parentNode.nodeName.toUpperCase() == "BODY") {
+					break;
+				}
+
+				// Only append element nodes to path
+				if (parentNode.nodeType == 1 && tinyMCE.getAttrib(parentNode, "class").indexOf('mceItemHidden') == -1) {
+					path[path.length] = parentNode;
+				}
+
+				parentNode = parentNode.parentNode;
+			}
+
+			// Setup HTML
+			var html = "";
+			for (var i=path.length-1; i>=0; i--) {
+				var nodeName = path[i].nodeName.toLowerCase();
+				var nodeData = "";
+
+				if (nodeName == "b") {
+					nodeName = "strong";
+				}
+
+				if (nodeName == "i") {
+					nodeName = "em";
+				}
+
+				if (nodeName == "span") {
+					var cn = tinyMCE.getAttrib(path[i], "class");
+					if (cn != "" && cn.indexOf('mceItem') == -1)
+						nodeData += "class: " + cn + " ";
+
+					var st = tinyMCE.getAttrib(path[i], "style");
+					if (st != "") {
+						st = tinyMCE.serializeStyle(tinyMCE.parseStyle(st));
+						nodeData += "style: " + st + " ";
+					}
+				}
+
+				if (nodeName == "font") {
+					if (tinyMCE.getParam("convert_fonts_to_spans"))
+						nodeName = "span";
+
+					var face = tinyMCE.getAttrib(path[i], "face");
+					if (face != "")
+						nodeData += "font: " + face + " ";
+
+					var size = tinyMCE.getAttrib(path[i], "size");
+					if (size != "")
+						nodeData += "size: " + size + " ";
+
+					var color = tinyMCE.getAttrib(path[i], "color");
+					if (color != "")
+						nodeData += "color: " + color + " ";
+				}
+
+				if (getAttrib(path[i], 'id') != "") {
+					nodeData += "id: " + path[i].getAttribute('id') + " ";
+				}
+
+				var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], "class"), false);
+				if (className != "" && className.indexOf('mceItem') == -1)
+					nodeData += "class: " + className + " ";
+
+				if (getAttrib(path[i], 'src') != "") {
+					var src = tinyMCE.getAttrib(path[i], "mce_src");
+
+					if (src == "")
+						 src = tinyMCE.getAttrib(path[i], "src");
+
+					nodeData += "src: " + src + " ";
+				}
+
+				if (getAttrib(path[i], 'href') != "") {
+					var href = tinyMCE.getAttrib(path[i], "mce_href");
+
+					if (href == "")
+						 href = tinyMCE.getAttrib(path[i], "href");
+
+					nodeData += "href: " + href + " ";
+				}
+
+				if (nodeName == "img" && tinyMCE.getAttrib(path[i], "class").indexOf('mceItemFlash') != -1) {
+					nodeName = "flash";
+					nodeData = "src: " + path[i].getAttribute('title');
+				}
+
+				if (nodeName == "a" && (anchor = tinyMCE.getAttrib(path[i], "name")) != "") {
+					nodeName = "a";
+					nodeName += "#" + anchor;
+					nodeData = "";
+				}
+
+				if (getAttrib(path[i], 'name').indexOf("mce_") != 0) {
+					var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], "class"), false);
+					if (className != "" && className.indexOf('mceItem') == -1) {
+						nodeName += "." + className;
+					}
+				}
+
+				var cmd = 'tinyMCE.execInstanceCommand(\'' + editor_id + '\',\'mceSelectNodeDepth\',false,\'' + i + '\');';
+				html += '<a title="' + nodeData + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" target="_self" class="mcePathItem">' + nodeName + '</a>';
+
+				if (i > 0) {
+					html += " &raquo; ";
+				}
+			}
+
+			pathElm.innerHTML = '<a href="#" accesskey="x"></a>' + tinyMCE.getLang('lang_theme_path') + ": " + html + '&#160;';
+		}
+
+		// Reset old states
+		tinyMCE.switchClass(editor_id + '_justifyleft', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_justifyright', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_justifycenter', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_justifyfull', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_bold', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_italic', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_underline', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_strikethrough', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_bullist', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_numlist', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_sub', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_sup', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_anchor', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_link', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_unlink', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_outdent', 'mceButtonDisabled');
+		tinyMCE.switchClass(editor_id + '_image', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_hr', 'mceButtonNormal');
+
+		if (node.nodeName == "A" && tinyMCE.getAttrib(node, "class").indexOf('mceItemAnchor') != -1)
+			tinyMCE.switchClass(editor_id + '_anchor', 'mceButtonSelected');
+
+		// Get link
+		var anchorLink = tinyMCE.getParentElement(node, "a", "href");
+
+		if (anchorLink || any_selection) {
+			tinyMCE.switchClass(editor_id + '_link', anchorLink ? 'mceButtonSelected' : 'mceButtonNormal');
+			tinyMCE.switchClass(editor_id + '_unlink', anchorLink ? 'mceButtonSelected' : 'mceButtonNormal');
+		}
+
+		// Handle visual aid
+		tinyMCE.switchClass(editor_id + '_visualaid', visual_aid ? 'mceButtonSelected' : 'mceButtonNormal');
+
+		if (undo_levels != -1) {
+			tinyMCE.switchClass(editor_id + '_undo', 'mceButtonDisabled');
+			tinyMCE.switchClass(editor_id + '_redo', 'mceButtonDisabled');
+		}
+
+		// Within li, blockquote
+		if (tinyMCE.getParentElement(node, "li,blockquote"))
+			tinyMCE.switchClass(editor_id + '_outdent', 'mceButtonNormal');
+
+		// Has redo levels
+		if (undo_index != -1 && (undo_index < undo_levels-1 && undo_levels > 0))
+			tinyMCE.switchClass(editor_id + '_redo', 'mceButtonNormal');
+
+		// Has undo levels
+		if (undo_index != -1 && (undo_index > 0 && undo_levels > 0))
+			tinyMCE.switchClass(editor_id + '_undo', 'mceButtonNormal');
+
+		// Select class in select box
+		var selectElm = document.getElementById(editor_id + "_styleSelect");
+		
+		if (selectElm) {
+			TinyMCE_AdvancedTheme._setupCSSClasses(editor_id);
+
+			classNode = node;
+			breakOut = false;
+			var index = 0;
+
+			do {
+				if (classNode && classNode.className) {
+					for (var i=0; i<selectElm.options.length; i++) {
+						if (selectElm.options[i].value == classNode.className) {
+							index = i;
+							breakOut = true;
+							break;
+						}
+					}
+				}
+			} while (!breakOut && classNode != null && (classNode = classNode.parentNode) != null);
+
+			selectElm.selectedIndex = index;
+		}
+
+		// Select formatblock
+		var selectElm = document.getElementById(editor_id + "_formatSelect");
+		if (selectElm) {
+			var elm = tinyMCE.getParentElement(node, "p,div,h1,h2,h3,h4,h5,h6,pre,address");
+
+			if (elm)
+				selectByValue(selectElm, "<" + elm.nodeName.toLowerCase() + ">");
+			else
+				selectByValue(selectElm, "");
+		}
+
+		// Select fontselect
+		var selectElm = document.getElementById(editor_id + "_fontNameSelect");
+		if (selectElm) {
+			if (!tinyMCE.isSafari && !(tinyMCE.isMSIE && !tinyMCE.isOpera)) {
+				var face = inst.queryCommandValue('FontName');
+
+				face = face == null || face == "" ? "" : face;
+
+				selectByValue(selectElm, face, face != "");
+			} else {
+				var elm = tinyMCE.getParentElement(node, "font", "face");
+
+				if (elm) {
+					var family = tinyMCE.getAttrib(elm, "face");
+
+					if (family == '')
+						family = '' + elm.style.fontFamily;
+
+					if (!selectByValue(selectElm, family, family != ""))
+						selectByValue(selectElm, "");
+				} else
+					selectByValue(selectElm, "");
+			}
+		}
+
+		// Select fontsize
+		var selectElm = document.getElementById(editor_id + "_fontSizeSelect");
+		if (selectElm) {
+			if (!tinyMCE.isSafari && !tinyMCE.isOpera) {
+				var size = inst.queryCommandValue('FontSize');
+				selectByValue(selectElm, size == null || size == "" ? "0" : size);
+			} else {
+				var elm = tinyMCE.getParentElement(node, "font", "size");
+				if (elm) {
+					var size = tinyMCE.getAttrib(elm, "size");
+
+					if (size == '') {
+						var sizes = new Array('', '8px', '10px', '12px', '14px', '18px', '24px', '36px');
+
+						size = '' + elm.style.fontSize;
+
+						for (var i=0; i<sizes.length; i++) {
+							if (('' + sizes[i]) == size) {
+								size = i;
+								break;
+							}
+						}
+					}
+
+					if (!selectByValue(selectElm, size))
+						selectByValue(selectElm, "");
+				} else
+					selectByValue(selectElm, "0");
+			}
+		}
+
+		// Handle align attributes
+		alignNode = node;
+		breakOut = false;
+		do {
+			if (!alignNode.getAttribute || !alignNode.getAttribute('align'))
+				continue;
+
+			switch (alignNode.getAttribute('align').toLowerCase()) {
+				case "left":
+					tinyMCE.switchClass(editor_id + '_justifyleft', 'mceButtonSelected');
+					breakOut = true;
+				break;
+
+				case "right":
+					tinyMCE.switchClass(editor_id + '_justifyright', 'mceButtonSelected');
+					breakOut = true;
+				break;
+
+				case "middle":
+				case "center":
+					tinyMCE.switchClass(editor_id + '_justifycenter', 'mceButtonSelected');
+					breakOut = true;
+				break;
+
+				case "justify":
+					tinyMCE.switchClass(editor_id + '_justifyfull', 'mceButtonSelected');
+					breakOut = true;
+				break;
+			}
+		} while (!breakOut && (alignNode = alignNode.parentNode) != null);
+
+		// Div justification
+		var div = tinyMCE.getParentElement(node, "div");
+		if (div && div.style.textAlign == "center")
+			tinyMCE.switchClass(editor_id + '_justifycenter', 'mceButtonSelected');
+
+		// Do special text
+		if (!setup_content) {
+			// , "JustifyLeft", "_justifyleft", "JustifyCenter", "justifycenter", "JustifyRight", "justifyright", "JustifyFull", "justifyfull", "InsertUnorderedList", "bullist", "InsertOrderedList", "numlist", "InsertUnorderedList", "bullist", "Outdent", "outdent", "Indent", "indent", "subscript", "sub"
+			var ar = new Array("Bold", "_bold", "Italic", "_italic", "Strikethrough", "_strikethrough", "superscript", "_sup", "subscript", "_sub");
+			for (var i=0; i<ar.length; i+=2) {
+				if (inst.queryCommandState(ar[i]))
+					tinyMCE.switchClass(editor_id + ar[i+1], 'mceButtonSelected');
+			}
+
+			if (inst.queryCommandState("Underline") && (node.parentNode == null || node.parentNode.nodeName != "A"))
+				tinyMCE.switchClass(editor_id + '_underline', 'mceButtonSelected');
+		}
+
+		// Handle elements
+		do {
+			switch (node.nodeName) {
+				case "UL":
+					tinyMCE.switchClass(editor_id + '_bullist', 'mceButtonSelected');
+				break;
+
+				case "OL":
+					tinyMCE.switchClass(editor_id + '_numlist', 'mceButtonSelected');
+				break;
+
+				case "HR":
+					 tinyMCE.switchClass(editor_id + '_hr', 'mceButtonSelected');
+				break;
+
+				case "IMG":
+				if (getAttrib(node, 'name').indexOf('mce_') != 0) {
+					tinyMCE.switchClass(editor_id + '_image', 'mceButtonSelected');
+				}
+				break;
+			}
+		} while ((node = node.parentNode) != null);
+	},
+
+	// Private theme internal functions
+
+	// This function auto imports CSS classes into the class selection droplist
+	_setupCSSClasses : function(editor_id) {
+		var i, selectElm;
+
+		if (!TinyMCE_AdvancedTheme._autoImportCSSClasses)
+			return;
+
+		selectElm = document.getElementById(editor_id + '_styleSelect');
+
+		if (selectElm && selectElm.getAttribute('cssImported') != 'true') {
+			var csses = tinyMCE.getCSSClasses(editor_id);
+			if (csses && selectElm)	{
+				for (i=0; i<csses.length; i++)
+					selectElm.options[selectElm.options.length] = new Option(csses[i], csses[i]);
+			}
+
+			// Only do this once
+			if (csses != null && csses.length > 0)
+				selectElm.setAttribute('cssImported', 'true');
+		}
+	},
+
+	_setCookie : function(name, value, expires, path, domain, secure) {
+		var curCookie = name + "=" + escape(value) +
+			((expires) ? "; expires=" + expires.toGMTString() : "") +
+			((path) ? "; path=" + escape(path) : "") +
+			((domain) ? "; domain=" + domain : "") +
+			((secure) ? "; secure" : "");
+
+		document.cookie = curCookie;
+	},
+
+	_getCookie : function(name) {
+		var dc = document.cookie;
+		var prefix = name + "=";
+		var begin = dc.indexOf("; " + prefix);
+
+		if (begin == -1) {
+			begin = dc.indexOf(prefix);
+
+			if (begin != 0)
+				return null;
+		} else
+			begin += 2;
+
+		var end = document.cookie.indexOf(";", begin);
+
+		if (end == -1)
+			end = dc.length;
+
+		return unescape(dc.substring(begin + prefix.length, end));
+	},
+
+	_resizeTo : function(inst, w, h, set_w) {
+		var editorContainer = document.getElementById(inst.editorId + '_parent');
+		var tableElm = editorContainer.firstChild;
+		var iframe = inst.iframeElement;
+
+		if (w == null || w == "null") {
+			set_w = false;
+			w = 0;
+		}
+
+		if (h == null || h == "null")
+			return;
+
+		w = parseInt(w);
+		h = parseInt(h);
+
+		if (tinyMCE.isGecko) {
+			w += 2;
+			h += 2;
+		}
+
+		var dx = w - tableElm.clientWidth;
+		var dy = h - tableElm.clientHeight;
+
+		w = w < 1 ? 30 : w;
+		h = h < 1 ? 30 : h;
+
+		if (set_w)
+			tableElm.style.width = w + "px";
+
+		tableElm.style.height = h + "px";
+
+		iw = iframe.clientWidth + dx;
+		ih = iframe.clientHeight + dy;
+
+		iw = iw < 1 ? 30 : iw;
+		ih = ih < 1 ? 30 : ih;
+
+		if (tinyMCE.isGecko) {
+			iw -= 2;
+			ih -= 2;
+		}
+
+		if (set_w)
+			iframe.style.width = iw + "px";
+
+		iframe.style.height = ih + "px";
+
+		// Is it to small, make it bigger again
+		if (set_w) {
+			var tableBodyElm = tableElm.firstChild;
+			var minIframeWidth = tableBodyElm.scrollWidth;
+			if (inst.iframeElement.clientWidth < minIframeWidth) {
+				dx = minIframeWidth - inst.iframeElement.clientWidth;
+
+				inst.iframeElement.style.width = (iw + dx) + "px";
+			}
+		}
+	},
+
+	/**
+	 * Handles resizing events.
+	 */
+	_resizeEventHandler : function(e) {
+		var resizer = TinyMCE_AdvancedTheme._resizer;
+
+		// Do nothing
+		if (!resizer.resizing)
+			return;
+
+		e = typeof(e) == "undefined" ? window.event : e;
+
+		var dx = e.screenX - resizer.downX;
+		var dy = e.screenY - resizer.downY;
+		var resizeBox = resizer.resizeBox;
+		var editorId = resizer.editorId;
+
+		switch (e.type) {
+			case "mousemove":
+				var w, h;
+
+				w = resizer.width + dx;
+				h = resizer.height + dy;
+
+				w = w < 1 ? 1 : w;
+				h = h < 1 ? 1 : h;
+
+				if (resizer.horizontal)
+					resizeBox.style.width = w + "px";
+
+				resizeBox.style.height = h + "px";
+				break;
+
+			case "mouseup":
+				TinyMCE_AdvancedTheme._setResizing(e, editorId, false);
+				TinyMCE_AdvancedTheme._resizeTo(tinyMCE.getInstanceById(editorId), resizer.width + dx, resizer.height + dy, resizer.horizontal);
+
+				// Expire in a month
+				if (tinyMCE.getParam("theme_advanced_resizing_use_cookie", true)) {
+					var expires = new Date();
+					expires.setTime(expires.getTime() + 3600000 * 24 * 30);
+
+					// Set the cookies
+					TinyMCE_AdvancedTheme._setCookie("TinyMCE_" + editorId + "_width", "" + (resizer.horizontal ? resizer.width + dx : ""), expires);
+					TinyMCE_AdvancedTheme._setCookie("TinyMCE_" + editorId + "_height", "" + (resizer.height + dy), expires);
+				}
+				break;
+		}
+	},
+
+	/**
+	 * Starts/stops the editor resizing.
+	 */
+	_setResizing : function(e, editor_id, state) {
+		e = typeof(e) == "undefined" ? window.event : e;
+
+		var resizer = TinyMCE_AdvancedTheme._resizer;
+		var editorContainer = document.getElementById(editor_id + '_parent');
+		var editorArea = document.getElementById(editor_id + '_parent').firstChild;
+		var resizeBox = document.getElementById(editor_id + '_resize_box');
+		var inst = tinyMCE.getInstanceById(editor_id);
+
+		if (state) {
+			// Place box over editor area
+			var width = editorArea.clientWidth;
+			var height = editorArea.clientHeight;
+
+			resizeBox.style.width = width + "px";
+			resizeBox.style.height = height + "px";
+
+			resizer.iframeWidth = inst.iframeElement.clientWidth;
+			resizer.iframeHeight = inst.iframeElement.clientHeight;
+
+			// Hide editor and show resize box
+			editorArea.style.display = "none";
+			resizeBox.style.display = "block";
+
+			// Add event handlers, only once
+			if (!resizer.eventHandlers) {
+				if (tinyMCE.isMSIE)
+					tinyMCE.addEvent(document, "mousemove", TinyMCE_AdvancedTheme._resizeEventHandler);
+				else
+					tinyMCE.addEvent(window, "mousemove", TinyMCE_AdvancedTheme._resizeEventHandler);
+
+				tinyMCE.addEvent(document, "mouseup", TinyMCE_AdvancedTheme._resizeEventHandler);
+
+				resizer.eventHandlers = true;
+			}
+
+			resizer.resizing = true;
+			resizer.downX = e.screenX;
+			resizer.downY = e.screenY;
+			resizer.width = parseInt(resizeBox.style.width);
+			resizer.height = parseInt(resizeBox.style.height);
+			resizer.editorId = editor_id;
+			resizer.resizeBox = resizeBox;
+			resizer.horizontal = tinyMCE.getParam("theme_advanced_resize_horizontal", true);
+		} else {
+			resizer.resizing = false;
+			resizeBox.style.display = "none";
+			editorArea.style.display = tinyMCE.isMSIE && !tinyMCE.isOpera ? "block" : "table";
+			tinyMCE.execCommand('mceResetDesignMode');
+		}
+	},
+
+	_insertImage : function(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout) {
+		tinyMCE.execCommand('mceBeginUndoLevel');
+
+		if (src == "")
+			return;
+
+		if (!tinyMCE.imgElement && tinyMCE.isSafari) {
+			var html = "";
+
+			html += '<img src="' + src + '" alt="' + alt + '"';
+			html += ' border="' + border + '" hspace="' + hspace + '"';
+			html += ' vspace="' + vspace + '" width="' + width + '"';
+			html += ' height="' + height + '" align="' + align + '" title="' + title + '" onmouseover="' + onmouseover + '" onmouseout="' + onmouseout + '" />';
+
+			tinyMCE.execCommand("mceInsertContent", false, html);
+		} else {
+			if (!tinyMCE.imgElement && tinyMCE.selectedInstance) {
+				if (tinyMCE.isSafari)
+					tinyMCE.execCommand("mceInsertContent", false, '<img src="' + tinyMCE.uniqueURL + '" />');
+				else
+					tinyMCE.selectedInstance.contentDocument.execCommand("insertimage", false, tinyMCE.uniqueURL);
+
+				tinyMCE.imgElement = tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body, "img", "src", tinyMCE.uniqueURL);
+			}
+		}
+
+		if (tinyMCE.imgElement) {
+			var needsRepaint = false;
+			var msrc = src;
+
+			src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, tinyMCE.imgElement);");
+
+			if (tinyMCE.getParam('convert_urls'))
+				msrc = src;
+
+			if (onmouseover && onmouseover != "")
+				onmouseover = "this.src='" + eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseover, tinyMCE.imgElement);") + "';";
+
+			if (onmouseout && onmouseout != "")
+				onmouseout = "this.src='" + eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseout, tinyMCE.imgElement);") + "';";
+
+			// Use alt as title if it's undefined
+			if (typeof(title) == "undefined")
+				title = alt;
+
+			if (width != tinyMCE.imgElement.getAttribute("width") || height != tinyMCE.imgElement.getAttribute("height") || align != tinyMCE.imgElement.getAttribute("align"))
+				needsRepaint = true;
+
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'src', src);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'mce_src', msrc);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'alt', alt);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'title', title);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'align', align);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'border', border, true);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'hspace', hspace, true);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'vspace', vspace, true);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'width', width, true);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'height', height, true);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'onmouseover', onmouseover);
+			tinyMCE.setAttrib(tinyMCE.imgElement, 'onmouseout', onmouseout);
+
+			// Fix for bug #989846 - Image resize bug
+			if (width && width != "")
+				tinyMCE.imgElement.style.pixelWidth = width;
+
+			if (height && height != "")
+				tinyMCE.imgElement.style.pixelHeight = height;
+
+			if (needsRepaint)
+				tinyMCE.selectedInstance.repaint();
+		}
+
+		tinyMCE.execCommand('mceEndUndoLevel');
+	},
+
+	_insertLink : function(href, target, title, onclick, style_class) {
+		tinyMCE.execCommand('mceBeginUndoLevel');
+
+		if (tinyMCE.selectedInstance && tinyMCE.selectedElement && tinyMCE.selectedElement.nodeName.toLowerCase() == "img") {
+			var doc = tinyMCE.selectedInstance.getDoc();
+			var linkElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+			var newLink = false;
+
+			if (!linkElement) {
+				linkElement = doc.createElement("a");
+				newLink = true;
+			}
+
+			var mhref = href;
+			var thref = eval(tinyMCE.settings['urlconverter_callback'] + "(href, linkElement);");
+			mhref = tinyMCE.getParam('convert_urls') ? href : mhref;
+
+			tinyMCE.setAttrib(linkElement, 'href', thref);
+			tinyMCE.setAttrib(linkElement, 'mce_href', mhref);
+			tinyMCE.setAttrib(linkElement, 'target', target);
+			tinyMCE.setAttrib(linkElement, 'title', title);
+			tinyMCE.setAttrib(linkElement, 'onclick', onclick);
+			tinyMCE.setAttrib(linkElement, 'class', style_class);
+
+			if (newLink) {
+				linkElement.appendChild(tinyMCE.selectedElement.cloneNode(true));
+				tinyMCE.selectedElement.parentNode.replaceChild(linkElement, tinyMCE.selectedElement);
+			}
+
+			return;
+		}
+
+		if (!tinyMCE.linkElement && tinyMCE.selectedInstance) {
+			if (tinyMCE.isSafari) {
+				tinyMCE.execCommand("mceInsertContent", false, '<a href="' + tinyMCE.uniqueURL + '">' + tinyMCE.selectedInstance.selection.getSelectedHTML() + '</a>');
+			} else
+				tinyMCE.selectedInstance.contentDocument.execCommand("createlink", false, tinyMCE.uniqueURL);
+
+			tinyMCE.linkElement = tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body, "a", "href", tinyMCE.uniqueURL);
+
+			var elementArray = tinyMCE.getElementsByAttributeValue(tinyMCE.selectedInstance.contentDocument.body, "a", "href", tinyMCE.uniqueURL);
+
+			for (var i=0; i<elementArray.length; i++) {
+				var mhref = href;
+				var thref = eval(tinyMCE.settings['urlconverter_callback'] + "(href, elementArray[i]);");
+				mhref = tinyMCE.getParam('convert_urls') ? href : mhref;
+
+				tinyMCE.setAttrib(elementArray[i], 'href', thref);
+				tinyMCE.setAttrib(elementArray[i], 'mce_href', mhref);
+				tinyMCE.setAttrib(elementArray[i], 'target', target);
+				tinyMCE.setAttrib(elementArray[i], 'title', title);
+				tinyMCE.setAttrib(elementArray[i], 'onclick', onclick);
+				tinyMCE.setAttrib(elementArray[i], 'class', style_class);
+			}
+
+			tinyMCE.linkElement = elementArray[0];
+		}
+
+		if (tinyMCE.linkElement) {
+			var mhref = href;
+			href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement);");
+			mhref = tinyMCE.getParam('convert_urls') ? href : mhref;
+
+			tinyMCE.setAttrib(tinyMCE.linkElement, 'href', href);
+			tinyMCE.setAttrib(tinyMCE.linkElement, 'mce_href', mhref);
+			tinyMCE.setAttrib(tinyMCE.linkElement, 'target', target);
+			tinyMCE.setAttrib(tinyMCE.linkElement, 'title', title);
+			tinyMCE.setAttrib(tinyMCE.linkElement, 'onclick', onclick);
+			tinyMCE.setAttrib(tinyMCE.linkElement, 'class', style_class);
+		}
+
+		tinyMCE.execCommand('mceEndUndoLevel');
+	}
+};
+
+tinyMCE.addTheme("advanced", TinyMCE_AdvancedTheme);
+
+// Add default buttons maps for advanced theme and all internal plugins
+tinyMCE.addButtonMap(TinyMCE_AdvancedTheme._buttonMap);
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/image.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/image.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/image.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/image.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,100 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_insert_image_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/image.js"></script>
+	<base target="_self" />
+</head>
+<body id="image" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+<form onsubmit="insertImage();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_insert_image_title}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+     <table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td nowrap="nowrap"><label for="src">{$lang_insert_image_src}</label></td>
+            <td><table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                  <td><input id="src" name="src" type="text" value="" style="width: 200px" onchange="getImageData();"></td>
+                  <td id="srcbrowsercontainer">&nbsp;</td>
+                </tr>
+              </table></td>
+          </tr>
+		  <!-- Image list -->
+		  <script language="javascript">
+			if (typeof(tinyMCEImageList) != "undefined" && tinyMCEImageList.length > 0) {
+				var html = "";
+
+				html += '<tr><td><label for="image_list">{$lang_image_list}</label></td>';
+				html += '<td><select id="image_list" name="image_list" style="width: 200px" onchange="this.form.src.value=this.options[this.selectedIndex].value;resetImageData();getImageData();">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCEImageList.length; i++)
+					html += '<option value="' + tinyMCEImageList[i][1] + '">' + tinyMCEImageList[i][0] + '</option>';
+
+				html += '</select></td></tr>';
+
+				document.write(html);
+			}
+		  </script>
+		  <!-- /Image list -->
+          <tr>
+            <td nowrap="nowrap"><label for="alt">{$lang_insert_image_alt}</label></td>
+            <td><input id="alt" name="alt" type="text" value="" style="width: 200px"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="align">{$lang_insert_image_align}</label></td>
+            <td><select id="align" name="align">
+                <option value="">{$lang_insert_image_align_default}</option>
+                <option value="baseline">{$lang_insert_image_align_baseline}</option>
+                <option value="top">{$lang_insert_image_align_top}</option>
+                <option value="middle">{$lang_insert_image_align_middle}</option>
+                <option value="bottom">{$lang_insert_image_align_bottom}</option>
+                <option value="texttop">{$lang_insert_image_align_texttop}</option>
+                <option value="absmiddle">{$lang_insert_image_align_absmiddle}</option>
+                <option value="absbottom">{$lang_insert_image_align_absbottom}</option>
+                <option value="left">{$lang_insert_image_align_left}</option>
+                <option value="right">{$lang_insert_image_align_right}</option>
+              </select></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="width">{$lang_insert_image_dimensions}</label></td>
+            <td><input id="width" name="width" type="text" value="" size="3" maxlength="3">
+              x
+              <input id="height" name="height" type="text" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="border">{$lang_insert_image_border}</label></td>
+            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="vspace">{$lang_insert_image_vspace}</label></td>
+            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="hspace">{$lang_insert_image_hspace}</label></td>
+            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3"></td>
+          </tr>
+        </table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertImage();" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/anchor.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/anchor.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/anchor_symbol.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/anchor_symbol.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/backcolor.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/backcolor.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_de_se.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_de_se.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_es.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_es.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_fr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_fr.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_ru.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_ru.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_tw.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_tw.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/browse.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/browse.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bullist.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/bullist.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/button_menu.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/button_menu.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/buttons.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/buttons.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/cancel_button_bg.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/cancel_button_bg.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/charmap.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/charmap.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/cleanup.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/cleanup.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/close.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/close.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/code.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/code.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/color.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/color.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/copy.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/copy.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/custom_1.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/custom_1.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/cut.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/cut.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/forecolor.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/forecolor.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/help.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/help.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/hr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/hr.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/image.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/image.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/indent.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/indent.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/insert_button_bg.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/insert_button_bg.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_de_se.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_de_se.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_es.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_es.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_ru.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_ru.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_tw.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_tw.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifycenter.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifycenter.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyfull.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyfull.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyleft.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyleft.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyright.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyright.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/link.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/link.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/menu_check.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/menu_check.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/newdocument.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/newdocument.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/numlist.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/numlist.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/opacity.png and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/opacity.png differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/outdent.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/outdent.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/paste.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/paste.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/redo.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/redo.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/removeformat.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/removeformat.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/separator.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/separator.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/spacer.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/spacer.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/statusbar_resize.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/statusbar_resize.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/strikethrough.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/strikethrough.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/sub.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/sub.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/sup.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/sup.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_es.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_es.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_fr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_fr.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_ru.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_ru.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_tw.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_tw.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/undo.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/undo.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/unlink.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/unlink.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/visualaid.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/visualaid.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_bg.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_bg.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_end.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_end.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_sel_bg.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_sel_bg.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_sel_end.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_sel_end.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tabs_bg.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tabs_bg.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/about.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/about.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/about.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/about.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,75 @@
+function init() {
+	var inst;
+
+	tinyMCEPopup.resizeToInnerSize();
+	inst = tinyMCE.selectedInstance;
+
+	// Give FF some time
+	window.setTimeout('insertHelpIFrame();', 10);
+
+	var tcont = document.getElementById('plugintablecontainer');
+	var plugins = tinyMCE.getParam('plugins', '', true, ',');
+	if (plugins.length == 0)
+		document.getElementById('plugins_tab').style.display = 'none';
+
+	var html = "";
+	html += '<table id="plugintable">';
+	html += '<thead>';
+	html += '<tr>';
+	html += '<td>' + tinyMCE.getLang('lang_plugin') + '</td>';
+	html += '<td>' + tinyMCE.getLang('lang_author') + '</td>';
+	html += '<td>' + tinyMCE.getLang('lang_version') + '</td>';
+	html += '</tr>';
+	html += '</thead>';
+	html += '<tbody>';
+
+	for (var i=0; i<inst.plugins.length; i++) {
+		var info = getPluginInfo(inst.plugins[i]);
+
+		html += '<tr>';
+
+		if (info.infourl != null && info.infourl != '')
+			html += '<td width="50%" title="' + plugins[i] + '"><a href="' + info.infourl + '" target="mceplugin">' + info.longname + '</a></td>';
+		else
+			html += '<td width="50%" title="' + plugins[i] + '">' + info.longname + '</td>';
+
+		if (info.authorurl != null && info.authorurl != '')
+			html += '<td width="35%"><a href="' + info.authorurl + '" target="mceplugin">' + info.author + '</a></td>';
+		else
+			html += '<td width="35%">' + info.author + '</td>';
+
+		html += '<td width="15%">' + info.version + '</td>';
+		html += '</tr>';
+	}
+
+	html += '</tbody>';
+	html += '</table>';
+
+	tcont.innerHTML = html;
+}
+
+function getPluginInfo(name) {
+	if (tinyMCE.plugins[name].getInfo)
+		return tinyMCE.plugins[name].getInfo();
+
+	return {
+		longname : name,
+		authorurl : '',
+		infourl : '',
+		author : '--',
+		version : '--'
+	};
+}
+
+function insertHelpIFrame() {
+	var html = '<iframe width="100%" height="300" src="' + tinyMCE.themeURL + "/docs/" + tinyMCE.settings['docs_language'] + "/index.htm" + '"></iframe>';
+
+	document.getElementById('iframecontainer').innerHTML = html;
+
+	html = '';
+	html += '<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a> ';
+	html += '<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a> ';
+	html += '<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a> ';
+
+	document.getElementById('buttoncontainer').innerHTML = html;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/anchor.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/anchor.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/anchor.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/anchor.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,74 @@
+var action, element;
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var anchor = tinyMCE.getParentElement(inst.getFocusElement(), "a", "name");
+	var img = inst.getFocusElement();
+	action = 'insert';
+
+	if (anchor != null) {
+		element = anchor;
+		action = "update";
+	}
+
+	if (tinyMCE.getAttrib(img, "class") == "mceItemAnchor") {
+		element = img;
+		action = "update";
+	}
+
+	if (action == "update")
+		document.forms[0].anchorName.value = element.nodeName == "IMG" ? element.getAttribute("title") : element.getAttribute("name");
+
+	document.forms[0].insert.value = tinyMCE.getLang('lang_' + action, 'Insert', true);
+}
+
+function insertAnchor() {
+	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
+	var name = document.forms[0].anchorName.value, e;
+
+	tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+	if (action == "update") {
+		if (element.nodeName == "IMG")
+			element.setAttribute("title", name);
+		else
+			element.setAttribute("name", name);
+	} else {
+		var rng = inst.getRng();
+
+		if (rng.collapse)
+			rng.collapse(false);
+
+		name = name.replace(/&/g, '&amp;');
+		name = name.replace(/\"/g, '&quot;');
+		name = name.replace(/</g, '&lt;');
+		name = name.replace(/>/g, '&gt;');
+
+		// Fix for bug #1447335
+		if (tinyMCE.isGecko)
+			html = '<a id="mceNewAnchor" name="' + name + '"></a>';
+		else
+			html = '<a name="' + name + '"></a>';
+
+		tinyMCEPopup.execCommand("mceInsertContent", false, html);
+
+		// Fix for bug #1447335 force cursor after the anchor element
+		if (tinyMCE.isGecko) {
+			e = inst.getDoc().getElementById('mceNewAnchor');
+
+			if (e) {
+				inst.selection.selectNode(e, true, false, false);
+				e.removeAttribute('id');
+			}
+		}
+
+		tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+	}
+
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+
+	tinyMCE.triggerNodeChange();
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/charmap.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/charmap.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/charmap.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/charmap.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,326 @@
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+}
+
+var charmap = new Array();
+
+// for mor details please see w3c.org
+// now here is the complete list ;)
+
+charmap = [
+	['&nbsp;',    '&#160;',  true, 'no-break space'],
+	['&amp;',     '&#38;',   true, 'ampersand'],
+	['&quot;',    '&#34;',   true, 'quotation mark'],
+// finance
+	['&cent;',    '&#162;',  true, 'cent sign'],
+	['&euro;',    '&#8364;', true, 'euro sign'],
+	['&pound;',   '&#163;',  true, 'pound sign'],
+	['&yen;',     '&#165;',  true, 'yen sign'],
+// signs
+	['&copy;',    '&#169;',  true, 'copyright sign'],
+	['&reg;',     '&#174;',  true, 'registered sign'],
+	['&trade;',   '&#8482;', true, 'trade mark sign'],
+	['&permil;',  '&#8240;', true, 'per mille sign'],
+	['&micro;',   '&#181;',  true, 'micro sign'],
+	['&middot;',  '&#183;',  true, 'middle dot'],
+	['&bull;',    '&#8226;', true, 'bullet'],
+	['&hellip;',  '&#8230;', true, 'three dot leader'],
+	['&prime;',   '&#8242;', true, 'minutes / feet'],
+	['&Prime;',   '&#8243;', true, 'seconds / inches'],
+	['&sect;',    '&#167;',  true, 'section sign'],
+	['&para;',    '&#182;',  true, 'paragraph sign'],
+	['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],
+// quotations
+	['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],
+	['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],
+	['&laquo;',   '&#171;',  true, 'left pointing guillemet'],
+	['&raquo;',   '&#187;',  true, 'right pointing guillemet'],
+	['&lsquo;',   '&#8216;', true, 'left single quotation mark'],
+	['&rsquo;',   '&#8217;', true, 'right single quotation mark'],
+	['&ldquo;',   '&#8220;', true, 'left double quotation mark'],
+	['&rdquo;',   '&#8221;', true, 'right double quotation mark'],
+	['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],
+	['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],
+	['&lt;',      '&#60;',   true, 'less-than sign'],
+	['&gt;',      '&#62;',   true, 'greater-than sign'],
+	['&le;',      '&#8804;', true, 'less-than or equal to'],
+	['&ge;',      '&#8805;', true, 'greater-than or equal to'],
+	['&ndash;',   '&#8211;', true, 'en dash'],
+	['&mdash;',   '&#8212;', true, 'em dash'],
+	['&macr;',    '&#175;',  true, 'macron'],
+	['&oline;',   '&#8254;', true, 'overline'],
+	['&curren;',  '&#164;',  true, 'currency sign'],
+	['&brvbar;',  '&#166;',  true, 'broken bar'],
+	['&uml;',     '&#168;',  true, 'diaeresis'],
+	['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],
+	['&iquest;',  '&#191;',  true, 'turned question mark'],
+	['&circ;',    '&#710;',  true, 'circumflex accent'],
+	['&tilde;',   '&#732;',  true, 'small tilde'],
+	['&deg;',     '&#176;',  true, 'degree sign'],
+	['&minus;',   '&#8722;', true, 'minus sign'],
+	['&plusmn;',  '&#177;',  true, 'plus-minus sign'],
+	['&divide;',  '&#247;',  true, 'division sign'],
+	['&frasl;',   '&#8260;', true, 'fraction slash'],
+	['&times;',   '&#215;',  true, 'multiplication sign'],
+	['&sup1;',    '&#185;',  true, 'superscript one'],
+	['&sup2;',    '&#178;',  true, 'superscript two'],
+	['&sup3;',    '&#179;',  true, 'superscript three'],
+	['&frac14;',  '&#188;',  true, 'fraction one quarter'],
+	['&frac12;',  '&#189;',  true, 'fraction one half'],
+	['&frac34;',  '&#190;',  true, 'fraction three quarters'],
+// math / logical
+	['&fnof;',    '&#402;',  true, 'function / florin'],
+	['&int;',     '&#8747;', true, 'integral'],
+	['&sum;',     '&#8721;', true, 'n-ary sumation'],
+	['&infin;',   '&#8734;', true, 'infinity'],
+	['&radic;',   '&#8730;', true, 'square root'],
+	['&sim;',     '&#8764;', false,'similar to'],
+	['&cong;',    '&#8773;', false,'approximately equal to'],
+	['&asymp;',   '&#8776;', true, 'almost equal to'],
+	['&ne;',      '&#8800;', true, 'not equal to'],
+	['&equiv;',   '&#8801;', true, 'identical to'],
+	['&isin;',    '&#8712;', false,'element of'],
+	['&notin;',   '&#8713;', false,'not an element of'],
+	['&ni;',      '&#8715;', false,'contains as member'],
+	['&prod;',    '&#8719;', true, 'n-ary product'],
+	['&and;',     '&#8743;', false,'logical and'],
+	['&or;',      '&#8744;', false,'logical or'],
+	['&not;',     '&#172;',  true, 'not sign'],
+	['&cap;',     '&#8745;', true, 'intersection'],
+	['&cup;',     '&#8746;', false,'union'],
+	['&part;',    '&#8706;', true, 'partial differential'],
+	['&forall;',  '&#8704;', false,'for all'],
+	['&exist;',   '&#8707;', false,'there exists'],
+	['&empty;',   '&#8709;', false,'diameter'],
+	['&nabla;',   '&#8711;', false,'backward difference'],
+	['&lowast;',  '&#8727;', false,'asterisk operator'],
+	['&prop;',    '&#8733;', false,'proportional to'],
+	['&ang;',     '&#8736;', false,'angle'],
+// undefined
+	['&acute;',   '&#180;',  true, 'acute accent'],
+	['&cedil;',   '&#184;',  true, 'cedilla'],
+	['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],
+	['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],
+	['&dagger;',  '&#8224;', true, 'dagger'],
+	['&Dagger;',  '&#8225;', true, 'double dagger'],
+// alphabetical special chars
+	['&Agrave;',  '&#192;',  true, 'A - grave'],
+	['&Aacute;',  '&#193;',  true, 'A - acute'],
+	['&Acirc;',   '&#194;',  true, 'A - circumflex'],
+	['&Atilde;',  '&#195;',  true, 'A - tilde'],
+	['&Auml;',    '&#196;',  true, 'A - diaeresis'],
+	['&Aring;',   '&#197;',  true, 'A - ring above'],
+	['&AElig;',   '&#198;',  true, 'ligature AE'],
+	['&Ccedil;',  '&#199;',  true, 'C - cedilla'],
+	['&Egrave;',  '&#200;',  true, 'E - grave'],
+	['&Eacute;',  '&#201;',  true, 'E - acute'],
+	['&Ecirc;',   '&#202;',  true, 'E - circumflex'],
+	['&Euml;',    '&#203;',  true, 'E - diaeresis'],
+	['&Igrave;',  '&#204;',  true, 'I - grave'],
+	['&Iacute;',  '&#205;',  true, 'I - acute'],
+	['&Icirc;',   '&#206;',  true, 'I - circumflex'],
+	['&Iuml;',    '&#207;',  true, 'I - diaeresis'],
+	['&ETH;',     '&#208;',  true, 'ETH'],
+	['&Ntilde;',  '&#209;',  true, 'N - tilde'],
+	['&Ograve;',  '&#210;',  true, 'O - grave'],
+	['&Oacute;',  '&#211;',  true, 'O - acute'],
+	['&Ocirc;',   '&#212;',  true, 'O - circumflex'],
+	['&Otilde;',  '&#213;',  true, 'O - tilde'],
+	['&Ouml;',    '&#214;',  true, 'O - diaeresis'],
+	['&Oslash;',  '&#216;',  true, 'O - slash'],
+	['&OElig;',   '&#338;',  true, 'ligature OE'],
+	['&Scaron;',  '&#352;',  true, 'S - caron'],
+	['&Ugrave;',  '&#217;',  true, 'U - grave'],
+	['&Uacute;',  '&#218;',  true, 'U - acute'],
+	['&Ucirc;',   '&#219;',  true, 'U - circumflex'],
+	['&Uuml;',    '&#220;',  true, 'U - diaeresis'],
+	['&Yacute;',  '&#221;',  true, 'Y - acute'],
+	['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],
+	['&THORN;',   '&#222;',  true, 'THORN'],
+	['&agrave;',  '&#224;',  true, 'a - grave'],
+	['&aacute;',  '&#225;',  true, 'a - acute'],
+	['&acirc;',   '&#226;',  true, 'a - circumflex'],
+	['&atilde;',  '&#227;',  true, 'a - tilde'],
+	['&auml;',    '&#228;',  true, 'a - diaeresis'],
+	['&aring;',   '&#229;',  true, 'a - ring above'],
+	['&aelig;',   '&#230;',  true, 'ligature ae'],
+	['&ccedil;',  '&#231;',  true, 'c - cedilla'],
+	['&egrave;',  '&#232;',  true, 'e - grave'],
+	['&eacute;',  '&#233;',  true, 'e - acute'],
+	['&ecirc;',   '&#234;',  true, 'e - circumflex'],
+	['&euml;',    '&#235;',  true, 'e - diaeresis'],
+	['&igrave;',  '&#236;',  true, 'i - grave'],
+	['&iacute;',  '&#237;',  true, 'i - acute'],
+	['&icirc;',   '&#238;',  true, 'i - circumflex'],
+	['&iuml;',    '&#239;',  true, 'i - diaeresis'],
+	['&eth;',     '&#240;',  true, 'eth'],
+	['&ntilde;',  '&#241;',  true, 'n - tilde'],
+	['&ograve;',  '&#242;',  true, 'o - grave'],
+	['&oacute;',  '&#243;',  true, 'o - acute'],
+	['&ocirc;',   '&#244;',  true, 'o - circumflex'],
+	['&otilde;',  '&#245;',  true, 'o - tilde'],
+	['&ouml;',    '&#246;',  true, 'o - diaeresis'],
+	['&oslash;',  '&#248;',  true, 'o slash'],
+	['&oelig;',   '&#339;',  true, 'ligature oe'],
+	['&scaron;',  '&#353;',  true, 's - caron'],
+	['&ugrave;',  '&#249;',  true, 'u - grave'],
+	['&uacute;',  '&#250;',  true, 'u - acute'],
+	['&ucirc;',   '&#251;',  true, 'u - circumflex'],
+	['&uuml;',    '&#252;',  true, 'u - diaeresis'],
+	['&yacute;',  '&#253;',  true, 'y - acute'],
+	['&thorn;',   '&#254;',  true, 'thorn'],
+	['&yuml;',    '&#255;',  true, 'y - diaeresis'],
+    ['&Alpha;',   '&#913;',  true, 'Alpha'],
+	['&Beta;',    '&#914;',  true, 'Beta'],
+	['&Gamma;',   '&#915;',  true, 'Gamma'],
+	['&Delta;',   '&#916;',  true, 'Delta'],
+	['&Epsilon;', '&#917;',  true, 'Epsilon'],
+	['&Zeta;',    '&#918;',  true, 'Zeta'],
+	['&Eta;',     '&#919;',  true, 'Eta'],
+	['&Theta;',   '&#920;',  true, 'Theta'],
+	['&Iota;',    '&#921;',  true, 'Iota'],
+	['&Kappa;',   '&#922;',  true, 'Kappa'],
+	['&Lambda;',  '&#923;',  true, 'Lambda'],
+	['&Mu;',      '&#924;',  true, 'Mu'],
+	['&Nu;',      '&#925;',  true, 'Nu'],
+	['&Xi;',      '&#926;',  true, 'Xi'],
+	['&Omicron;', '&#927;',  true, 'Omicron'],
+	['&Pi;',      '&#928;',  true, 'Pi'],
+	['&Rho;',     '&#929;',  true, 'Rho'],
+	['&Sigma;',   '&#931;',  true, 'Sigma'],
+	['&Tau;',     '&#932;',  true, 'Tau'],
+	['&Upsilon;', '&#933;',  true, 'Upsilon'],
+	['&Phi;',     '&#934;',  true, 'Phi'],
+	['&Chi;',     '&#935;',  true, 'Chi'],
+	['&Psi;',     '&#936;',  true, 'Psi'],
+	['&Omega;',   '&#937;',  true, 'Omega'],
+	['&alpha;',   '&#945;',  true, 'alpha'],
+	['&beta;',    '&#946;',  true, 'beta'],
+	['&gamma;',   '&#947;',  true, 'gamma'],
+	['&delta;',   '&#948;',  true, 'delta'],
+	['&epsilon;', '&#949;',  true, 'epsilon'],
+	['&zeta;',    '&#950;',  true, 'zeta'],
+	['&eta;',     '&#951;',  true, 'eta'],
+	['&theta;',   '&#952;',  true, 'theta'],
+	['&iota;',    '&#953;',  true, 'iota'],
+	['&kappa;',   '&#954;',  true, 'kappa'],
+	['&lambda;',  '&#955;',  true, 'lambda'],
+	['&mu;',      '&#956;',  true, 'mu'],
+	['&nu;',      '&#957;',  true, 'nu'],
+	['&xi;',      '&#958;',  true, 'xi'],
+	['&omicron;', '&#959;',  true, 'omicron'],
+	['&pi;',      '&#960;',  true, 'pi'],
+	['&rho;',     '&#961;',  true, 'rho'],
+	['&sigmaf;',  '&#962;',  true, 'final sigma'],
+	['&sigma;',   '&#963;',  true, 'sigma'],
+	['&tau;',     '&#964;',  true, 'tau'],
+	['&upsilon;', '&#965;',  true, 'upsilon'],
+	['&phi;',     '&#966;',  true, 'phi'],
+	['&chi;',     '&#967;',  true, 'chi'],
+	['&psi;',     '&#968;',  true, 'psi'],
+	['&omega;',   '&#969;',  true, 'omega'],
+// symbols
+	['&alefsym;', '&#8501;', false,'alef symbol'],
+	['&piv;',     '&#982;',  false,'pi symbol'],
+	['&real;',    '&#8476;', false,'real part symbol'],
+	['&thetasym;','&#977;',  false,'theta symbol'],
+	['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],
+	['&weierp;',  '&#8472;', false,'Weierstrass p'],
+	['&image;',   '&#8465;', false,'imaginary part'],
+// arrows
+	['&larr;',    '&#8592;', true, 'leftwards arrow'],
+	['&uarr;',    '&#8593;', true, 'upwards arrow'],
+	['&rarr;',    '&#8594;', true, 'rightwards arrow'],
+	['&darr;',    '&#8595;', true, 'downwards arrow'],
+	['&harr;',    '&#8596;', true, 'left right arrow'],
+	['&crarr;',   '&#8629;', false,'carriage return'],
+	['&lArr;',    '&#8656;', false,'leftwards double arrow'],
+	['&uArr;',    '&#8657;', false,'upwards double arrow'],
+	['&rArr;',    '&#8658;', false,'rightwards double arrow'],
+	['&dArr;',    '&#8659;', false,'downwards double arrow'],
+	['&hArr;',    '&#8660;', false,'left right double arrow'],
+	['&there4;',  '&#8756;', false,'therefore'],
+	['&sub;',     '&#8834;', false,'subset of'],
+	['&sup;',     '&#8835;', false,'superset of'],
+	['&nsub;',    '&#8836;', false,'not a subset of'],
+	['&sube;',    '&#8838;', false,'subset of or equal to'],
+	['&supe;',    '&#8839;', false,'superset of or equal to'],
+	['&oplus;',   '&#8853;', false,'circled plus'],
+	['&otimes;',  '&#8855;', false,'circled times'],
+	['&perp;',    '&#8869;', false,'perpendicular'],
+	['&sdot;',    '&#8901;', false,'dot operator'],
+	['&lceil;',   '&#8968;', false,'left ceiling'],
+	['&rceil;',   '&#8969;', false,'right ceiling'],
+	['&lfloor;',  '&#8970;', false,'left floor'],
+	['&rfloor;',  '&#8971;', false,'right floor'],
+	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
+	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
+	['&loz;',     '&#9674;', true,'lozenge'],
+	['&spades;',  '&#9824;', false,'black spade suit'],
+	['&clubs;',   '&#9827;', true, 'black club suit'],
+	['&hearts;',  '&#9829;', true, 'black heart suit'],
+	['&diams;',   '&#9830;', true, 'black diamond suit'],
+	['&ensp;',    '&#8194;', false,'en space'],
+	['&emsp;',    '&#8195;', false,'em space'],
+	['&thinsp;',  '&#8201;', false,'thin space'],
+	['&zwnj;',    '&#8204;', false,'zero width non-joiner'],
+	['&zwj;',     '&#8205;', false,'zero width joiner'],
+	['&lrm;',     '&#8206;', false,'left-to-right mark'],
+	['&rlm;',     '&#8207;', false,'right-to-left mark'],
+	['&shy;',     '&#173;',  false,'soft hyphen']
+];
+
+function renderCharMapHTML() {
+	var charsPerRow = 20, tdWidth=20, tdHeight=20;
+	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+	var cols=-1;
+	for (var i=0; i<charmap.length; i++) {
+		if (charmap[i][2]==true) {
+			cols++;
+			html += ''
+				+ '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap"'
+				+ ' onmouseover="this.className=\'charmapOver\';'
+				+ 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');"'
+				+ ' onmouseout="this.className=\'charmap\';"'
+				+ ' nowrap="nowrap" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');"><a style="text-decoration: none;" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+				+ charmap[i][1]
+				+ '</a></td>';
+			if ((cols+1) % charsPerRow == 0)
+				html += '</tr><tr height="' + tdHeight + '">';
+		}
+	 }
+	if (cols % charsPerRow > 0) {
+		var padd = charsPerRow - (cols % charsPerRow);
+		for (var i=0; i<padd-1; i++)
+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+	}
+	html += '</tr></table>';
+	document.write(html);
+}
+
+function insertChar(chr) {
+	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
+
+	// Refocus in window
+	if (tinyMCEPopup.isWindow)
+		window.focus();
+
+	tinyMCEPopup.close();
+}
+
+function previewChar(codeA, codeB, codeN) {
+	var elmA = document.getElementById('codeA');
+	var elmB = document.getElementById('codeB');
+	var elmV = document.getElementById('codeV');
+	var elmN = document.getElementById('codeN');
+
+	if (codeA=='#160;') {
+		elmV.innerHTML = '__';
+	} else {
+		elmV.innerHTML = '&' + codeA;
+	}
+
+	elmB.innerHTML = '&amp;' + codeA;
+	elmA.innerHTML = '&amp;' + codeB;
+	elmN.innerHTML = codeN;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/color_picker.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/color_picker.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/color_picker.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/color_picker.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,108 @@
+function init() {
+	if (tinyMCE.isMSIE)
+		tinyMCEPopup.resizeToInnerSize();
+}
+
+function selectColor() {
+	var color = document.getElementById("selectedColorBox").value;
+
+	tinyMCEPopup.execCommand(tinyMCE.getWindowArg('command'), false, color);
+	tinyMCEPopup.close();
+}
+
+function showColor(color) {
+	document.getElementById("selectedColor").style.backgroundColor = color;
+	document.getElementById("selectedColorBox").value = color;
+}
+
+var colors = new Array(
+	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
+	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
+	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
+	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
+	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
+	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
+	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
+	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
+	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
+	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
+	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
+	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
+	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
+	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
+	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
+	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
+	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
+	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
+	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
+	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
+	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
+	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
+	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
+	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
+	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
+	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
+	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
+);
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return "rgb(" + r + "," + g + "," + b + ")";
+	}
+
+	return col;
+}
+
+function renderColorMap() {
+	var html = "";
+	var inputColor = convertRGBToHex(tinyMCE.getWindowArg('input_color'));
+
+	html += '<table border="0" cellspacing="1" cellpadding="0">'
+		+ '<tr>';
+	for (var i=0; i<colors.length; i++) {
+		html += '<td bgcolor="' + colors[i] + '">'
+			+ '<a href="javascript:selectColor();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');">'
+			+ '<img border="0" src="images/spacer.gif" width="10" height="10" title="' + colors[i] +  '" alt="' + colors[i] +  '" /></a></td>';
+		if ((i+1) % 18 == 0)
+			html += '</tr><tr>';
+	}
+	html += '<tr><td colspan="18">'
+		+ '<table width="100%" border="0" cellspacing="0" cellpadding="0">'
+		+ '<tr><td>'
+		+ '<img id="selectedColor" style="background-color:' + tinyMCE.getWindowArg('input_color') + '" border="0" src="images/spacer.gif" width="80" height="16" />'
+		+ '</td><td align="right">'
+		+ '<input id="selectedColorBox" name="selectedColorBox" type="text" size="7" maxlength="7" style="width:65px" value="' + inputColor + '" />'
+		+ '</td></tr>'
+		+ '</table>'
+		+ '<div style="float: left"><input type="button" id="insert" name="insert" value="{$lang_theme_colorpicker_apply}" style="margin-top:3px" onclick="selectColor();"></div>'
+		+ '<div style="float: right"><input type="button" name="cancel" value="{$lang_cancel}" style="margin-top:3px" onclick="tinyMCEPopup.close();" id="cancel" /></div>'
+		+ '</td></tr>'
+		+ '</table>';
+
+	document.write(html);
+}
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/image.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/image.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/image.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/image.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,81 @@
+var url = tinyMCE.getParam("external_image_list_url");
+if (url != null) {
+	// Fix relative
+	if (url.charAt(0) != '/' && url.indexOf('://') == -1)
+		url = tinyMCE.documentBasePath + "/" + url;
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
+}
+
+function insertImage() {
+	var src = document.forms[0].src.value;
+	var alt = document.forms[0].alt.value;
+	var border = document.forms[0].border.value;
+	var vspace = document.forms[0].vspace.value;
+	var hspace = document.forms[0].hspace.value;
+	var width = document.forms[0].width.value;
+	var height = document.forms[0].height.value;
+	var align = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
+
+	tinyMCEPopup.restoreSelection();
+	tinyMCE.themes['advanced']._insertImage(src, alt, border, hspace, vspace, width, height, align);
+	tinyMCEPopup.close();
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+
+	var formObj = document.forms[0];
+
+	for (var i=0; i<document.forms[0].align.options.length; i++) {
+		if (document.forms[0].align.options[i].value == tinyMCE.getWindowArg('align'))
+			document.forms[0].align.options.selectedIndex = i;
+	}
+
+	formObj.src.value = tinyMCE.getWindowArg('src');
+	formObj.alt.value = tinyMCE.getWindowArg('alt');
+	formObj.border.value = tinyMCE.getWindowArg('border');
+	formObj.vspace.value = tinyMCE.getWindowArg('vspace');
+	formObj.hspace.value = tinyMCE.getWindowArg('hspace');
+	formObj.width.value = tinyMCE.getWindowArg('width');
+	formObj.height.value = tinyMCE.getWindowArg('height');
+	formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 
+
+	// Handle file browser
+	if (isVisible('srcbrowser'))
+		document.getElementById('src').style.width = '180px';
+
+	// Auto select image in list
+	if (typeof(tinyMCEImageList) != "undefined" && tinyMCEImageList.length > 0) {
+		for (var i=0; i<formObj.image_list.length; i++) {
+			if (formObj.image_list.options[i].value == tinyMCE.getWindowArg('src'))
+				formObj.image_list.options[i].selected = true;
+		}
+	}
+}
+
+var preloadImg = new Image();
+
+function resetImageData() {
+	var formObj = document.forms[0];
+	formObj.width.value = formObj.height.value = "";	
+}
+
+function updateImageData() {
+	var formObj = document.forms[0];
+
+	if (formObj.width.value == "")
+		formObj.width.value = preloadImg.width;
+
+	if (formObj.height.value == "")
+		formObj.height.value = preloadImg.height;
+}
+
+function getImageData() {
+	preloadImg = new Image();
+	tinyMCE.addEvent(preloadImg, "load", updateImageData);
+	tinyMCE.addEvent(preloadImg, "error", function () {var formObj = document.forms[0];formObj.width.value = formObj.height.value = "";});
+	preloadImg.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], document.forms[0].src.value);
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/link.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/link.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/link.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/link.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,70 @@
+var url = tinyMCE.getParam("external_link_list_url");
+if (url != null) {
+	// Fix relative
+	if (url.charAt(0) != '/' && url.indexOf('://') == -1)
+		url = tinyMCE.documentBasePath + "/" + url;
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','theme_advanced_link');
+
+	// Handle file browser
+	if (isVisible('hrefbrowser'))
+		document.getElementById('href').style.width = '180px';
+
+	var formObj = document.forms[0];
+
+	for (var i=0; i<document.forms[0].target.options.length; i++) {
+		var option = document.forms[0].target.options[i];
+
+		if (option.value == tinyMCE.getWindowArg('target'))
+			option.selected = true;
+	}
+
+	document.forms[0].href.value = tinyMCE.getWindowArg('href');
+	document.forms[0].linktitle.value = tinyMCE.getWindowArg('title');
+	document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 
+
+	addClassesToList('styleSelect', 'theme_advanced_link_styles');
+	selectByValue(formObj, 'styleSelect', tinyMCE.getWindowArg('className'), true);
+
+	// Hide css select row if no CSS classes
+	if (formObj.styleSelect && formObj.styleSelect.options.length <= 1) {
+		var sr = document.getElementById('styleSelectRow');
+		sr.style.display = 'none';
+		sr.parentNode.removeChild(sr);
+	}
+
+	// Auto select link in list
+	if (typeof(tinyMCELinkList) != "undefined" && tinyMCELinkList.length > 0) {
+		var formObj = document.forms[0];
+
+		for (var i=0; i<formObj.link_list.length; i++) {
+			if (formObj.link_list.options[i].value == tinyMCE.getWindowArg('href'))
+				formObj.link_list.options[i].selected = true;
+		}
+	}
+}
+
+function insertLink() {
+	var href = document.forms[0].href.value;
+	var target = document.forms[0].target.options[document.forms[0].target.selectedIndex].value;
+	var title = document.forms[0].linktitle.value;
+	var style_class = document.forms[0].styleSelect ? document.forms[0].styleSelect.value : "";
+	var dummy;
+
+	// Make anchors absolute
+	if (href.charAt(0) == '#')
+		href = tinyMCE.settings['document_base_url'] + href;
+
+	if (target == '_self')
+		target = '';
+
+	tinyMCEPopup.restoreSelection();
+	tinyMCE.themes['advanced']._insertLink(href, target, title, dummy, style_class);
+	tinyMCEPopup.close();
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,66 @@
+function saveContent() {
+	tinyMCE.setContent(document.getElementById('htmlSource').value);
+	tinyMCE.closeWindow(window);
+}
+
+// Fixes some charcode issues
+function fixContent(html) {
+/*	html = html.replace(new RegExp('<(p|hr|table|tr|td|ol|ul|object|embed|li|blockquote)', 'gi'),'\n<$1');
+	html = html.replace(new RegExp('<\/(p|ol|ul|li|table|tr|td|blockquote|object)>', 'gi'),'</$1>\n');
+	html = tinyMCE.regexpReplace(html, '<br />','<br />\n','gi');
+	html = tinyMCE.regexpReplace(html, '\n\n','\n','gi');*/
+	return html;
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.forms[0].htmlSource.value = fixContent(tinyMCE.getContent(tinyMCE.getWindowArg('editor_id')));
+	resizeInputs();
+
+	if (tinyMCE.getParam("theme_advanced_source_editor_wrap", true)) {
+		setWrap('soft');
+		document.forms[0].wraped.checked = true;
+	}
+}
+
+function setWrap(val) {
+	var s = document.forms[0].htmlSource;
+
+	s.wrap = val;
+
+	if (tinyMCE.isGecko) {
+		var v = s.value;
+		var n = s.cloneNode(false);
+		n.setAttribute("wrap", val);
+		s.parentNode.replaceChild(n, s);
+		n.value = v;
+	}
+}
+
+function toggleWordWrap(elm) {
+	if (elm.checked)
+		setWrap('soft');
+	else
+		setWrap('off');
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	if (!tinyMCE.isMSIE) {
+		 wHeight = self.innerHeight-80;
+		 wWidth = self.innerWidth-16;
+	} else {
+		 wHeight = document.body.clientHeight - 80;
+		 wWidth = document.body.clientWidth - 16;
+	}
+
+	document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px';
+	document.forms[0].htmlSource.style.width  = Math.abs(wWidth) + 'px';
+}
+
+function renderWordWrap() {
+	if (tinyMCE.isMSIE || tinyMCE.isGecko)
+		document.write('<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{$lang_theme_code_wordwrap}</label>');
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/en.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/en.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/en.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,81 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+theme_style_select : '-- Styles --',
+theme_code_desc : 'Edit HTML Source',
+theme_code_title : 'HTML Source Editor',
+theme_code_wordwrap : 'Word wrap',
+theme_sub_desc : 'Subscript',
+theme_sup_desc : 'Superscript',
+theme_hr_desc : 'Insert horizontal ruler',
+theme_removeformat_desc : 'Remove formatting',
+theme_custom1_desc : 'Your custom description here',
+insert_image_border : 'Border',
+insert_image_dimensions : 'Dimensions',
+insert_image_vspace : 'Vertical space',
+insert_image_hspace : 'Horizontal space',
+insert_image_align : 'Alignment',
+insert_image_align_default : '-- Not set --',
+insert_image_align_baseline : 'Baseline',
+insert_image_align_top : 'Top',
+insert_image_align_middle : 'Middle',
+insert_image_align_bottom : 'Bottom',
+insert_image_align_texttop : 'TextTop',
+insert_image_align_absmiddle : 'Absolute Middle',
+insert_image_align_absbottom : 'Absolute Bottom',
+insert_image_align_left : 'Left',
+insert_image_align_right : 'Right',
+theme_font_size : '-- Font size --',
+theme_fontdefault : '-- Font family --',
+theme_block : '-- Format --',
+theme_paragraph : 'Paragraph',
+theme_div : 'Div',
+theme_address : 'Address',
+theme_pre : 'Preformatted',
+theme_h1 : 'Heading 1',
+theme_h2 : 'Heading 2',
+theme_h3 : 'Heading 3',
+theme_h4 : 'Heading 4',
+theme_h5 : 'Heading 5',
+theme_h6 : 'Heading 6',
+theme_blockquote : 'Blockquote',
+theme_code : 'Code',
+theme_samp : 'Code sample',
+theme_dt : 'Definition term ',
+theme_dd : 'Definition description',
+theme_colorpicker_title : 'Select a color',
+theme_colorpicker_apply : 'Apply',
+theme_forecolor_desc : 'Select text color',
+theme_backcolor_desc : 'Select background color',
+theme_charmap_title : 'Select custom character',
+theme_charmap_desc : 'Insert custom character',
+theme_visualaid_desc : 'Toggle guidelines/invisible elements',
+insert_anchor_title : 'Insert/edit anchor',
+insert_anchor_name : 'Anchor name',
+theme_anchor_desc : 'Insert/edit anchor',
+theme_insert_link_titlefield : 'Title',
+theme_clipboard_msg : 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?',
+theme_path : 'Path',
+cut_desc : 'Cut',
+copy_desc : 'Copy',
+paste_desc : 'Paste',
+link_list : 'Link list',
+image_list : 'Image list',
+browse : 'Browse',
+image_props_desc : 'Image properties',
+newdocument_desc : 'New document',
+class_name : 'Class',
+newdocument : 'Are you sure you want clear all contents?',
+about_title : 'About TinyMCE',
+about : 'About',
+license : 'License',
+plugins : 'Plugins',
+plugin : 'Plugin',
+author : 'Author',
+version : 'Version',
+loaded_plugins : 'Loaded plugins',
+help : 'Help',
+not_set : '-- Not set --',
+close : 'Close',
+toolbar_focus : 'Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X'
+});
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/langs/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/link.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/link.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/link.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/link.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,100 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{$lang_insert_link_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/link.js"></script>
+	<base target="_self" />
+</head>
+<body id="link" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
+<form onsubmit="insertLink();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_insert_link_title}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+
+		<table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td nowrap="nowrap"><label for="href">{$lang_insert_link_url}</label></td>
+            <td><table border="0" cellspacing="0" cellpadding="0"> 
+				  <tr> 
+					<td><input id="href" name="href" type="text" value="" style="width: 200px" /></td> 
+					<td id="hrefbrowsercontainer">&nbsp;</td>
+				  </tr> 
+				</table></td>
+          </tr>
+		  <!-- Link list -->
+		  <script language="javascript">
+			if (typeof(tinyMCELinkList) != "undefined" && tinyMCELinkList.length > 0) {
+				var html = "";
+
+				html += '<tr><td><label for="link_list">{$lang_link_list}</label></td>';
+				html += '<td><select id="link_list" name="link_list" style="width: 200px" onchange="this.form.href.value=this.options[this.selectedIndex].value;">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCELinkList.length; i++)
+					html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
+
+				html += '</select></td></tr>';
+
+				document.write(html);
+			}
+		  </script>
+		  <!-- /Link list -->
+          <tr>
+            <td nowrap="nowrap"><label for="target">{$lang_insert_link_target}</label></td>
+            <td><select id="target" name="target" style="width: 200px">
+                <option value="_self">{$lang_insert_link_target_same}</option>
+                <option value="_blank">{$lang_insert_link_target_blank}</option>
+				<script language="javascript">
+					var html = "";
+					var targets = tinyMCE.getParam('theme_advanced_link_targets', '').split(';');
+
+					for (var i=0; i<targets.length; i++) {
+						var key, value;
+
+						if (targets[i] == "")
+							continue;
+
+						key = targets[i].split('=')[0];
+						value = targets[i].split('=')[1];
+
+						html += '<option value="' + value + '">' + key + '</option>';
+					}
+
+					document.write(html);
+				</script>
+            </select></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="linktitle">{$lang_theme_insert_link_titlefield}</label></td>
+            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px"></td>
+          </tr>
+          <tr id="styleSelectRow">
+            <td><label for="styleSelect">{$lang_class_name}</label></td>
+            <td>
+			 <select id="styleSelect" name="styleSelect">
+                <option value="" selected>{$lang_theme_style_select}</option>
+             </select></td>
+          </tr>
+        </table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertLink();" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/source_editor.htm 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/source_editor.htm
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/source_editor.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/advanced/source_editor.htm	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,30 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>{$lang_theme_code_title}</title>
+	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script language="javascript" type="text/javascript" src="jscripts/source_editor.js"></script>
+	<base target="_self" />
+</head>
+<body onload="tinyMCEPopup.executeOnLoad('onLoadInit();');" onresize="resizeInputs();" style="display: none">
+	<form name="source" onsubmit="saveContent();" action="#">
+		<div style="float: left" class="title">{$lang_theme_code_title}</div>
+
+		<div style="float: right">
+			<script language="javascript" type="text/javascript">renderWordWrap();</script>
+		</div>
+
+		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px" dir="ltr" wrap="off"></textarea>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" name="insert" value="{$lang_update}" onclick="saveContent();" id="insert" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_content.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_content.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_content.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_content.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,25 @@
+body, td, pre {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+body {
+	background-color: #FFFFFF;
+}
+
+.mceVisualAid {
+	border: 1px dashed #BBBBBB;
+}
+
+/* MSIE specific */
+
+* html body {
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;	
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_popup.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_popup.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_popup.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_popup.css	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,41 @@
+body {
+	background-color: #F0F0EE;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;
+}
+
+td {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+}
+
+input {
+	background: #FFFFFF;
+	border: 1px solid #cccccc;
+}
+
+td, input, select, textarea {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+input, select, textarea {
+	border: 1px solid #808080;
+}
+
+.input_noborder {
+	border: 0;
+}
+
+.title {
+	font-size: 12px;
+	font-weight: bold;
+}
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_ui.css 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_ui.css
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_ui.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/editor_ui.css	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,125 @@
+.mceSeparatorLine {
+	border: 0;
+	padding: 0;
+	margin-left: 4px;
+	margin-right: 2px;
+}
+
+.mceSelectList {
+	font-family: "MS Sans Serif";
+	font-size: 7pt;
+	font-weight: normal;
+	margin-top: 2px;
+}
+
+.mceLabel, .mceLabelDisabled {
+	font-family: "MS Sans Serif";
+	font-size: 9pt;
+}
+
+.mceLabel {
+	color: #000000;
+}
+
+.mceLabelDisabled {
+	cursor: text;
+	color: #999999;
+}
+
+.mceEditor {
+	background: #F0F0EE;
+	border: 1px solid #cccccc;
+}
+
+.mceEditorArea {
+	font-family: "MS Sans Serif";
+	background: #FFFFFF;
+}
+
+.mceToolbar {
+	background: #F0F0EE;
+	border-top: 1px solid #cccccc;
+	line-height: 1px;
+	font-size: 1px;
+	padding-bottom: 1px;
+}
+
+.mceEditorIframe {
+	border: 0;
+}
+
+/* Button CSS rules */
+
+a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {
+	width: 20px;
+	height: 20px;
+	cursor: default;
+	margin-top: 1px;
+	margin-left: 1px;
+}
+
+a.mceButtonDisabled img {
+	border: 0 !important;
+}
+
+a.mceButtonNormal img, a.mceButtonSelected img {
+	border: 1px solid #F0F0EE !important;
+}
+
+a.mceButtonSelected img {
+	border: 1px solid #C0C0BB !important;
+}
+
+a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {
+	border: 1px solid #0A246A !important;
+	cursor: default;
+	background-color: #B6BDD2;
+}
+
+a.mceButtonDisabled img {
+	-moz-opacity:0.3;
+	opacity: 0.3;
+	border: 1px solid #F0F0EE !important;
+	cursor: default;
+}
+
+a.mceTiledButton img {
+	background-image: url('../images/buttons.gif');
+	background-repeat: no-repeat;
+}
+
+/* MSIE specific rules */
+
+* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {
+	border: 0px !important;
+	margin-top: 2px;
+	margin-bottom: 1px;
+}
+
+* html a.mceButtonDisabled img {
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
+	border: 0px !important;
+}
+
+* html a.mceButtonDisabled {
+	border: 1px solid #F0F0EE !important;
+}
+
+* html a.mceButtonNormal, * html a.mceButtonSelected {
+	border: 1px solid #F0F0EE;
+	cursor: default;
+}
+
+* html a.mceButtonSelected {
+	border: 1px solid #C0C0BB;
+}
+
+* html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {
+	border: 1px solid #0A246A;
+	cursor: default;
+	background-color: #B6BDD2;
+}
+
+* html .mceSelectList {
+	margin-top: 2px;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/css/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,4 @@
+var TinyMCE_SimpleTheme={_buttonMap:'bold,bullist,cleanup,italic,numlist,redo,strikethrough,underline,undo',getEditorTemplate:function(){var html='';html+='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}">';html+='<tr><td align="center">';html+='<span id="{$editor_id}">IFRAME</span>';html+='</td></tr>';html+='<tr><td class="mceToolbar" align="center" height="1">';html+=tinyMCE.getButtonHTML('bold','lang_bold_desc','{$themeurl}/images/{$lang_bold_img}','Bold');html+=tinyMCE.getButtonHTML('italic','lang_italic_desc','{$themeurl}/images/{$lang_italic_img}','Italic');html+=tinyMCE.getButtonHTML('underline','lang_underline_desc','{$themeurl}/images/{$lang_underline_img}','Underline');html+=tinyMCE.getButtonHTML('strikethrough','lang_striketrough_desc','{$themeurl}/images/strikethrough.gif','Strikethrough');html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';html+=tinyMCE.getButtonHTML('undo','lang_undo_desc','{$themeurl}/images/undo.gif','Undo');html+=tinyMCE.getButtonHTML('redo','lang_redo_desc','{$themeurl}/images/redo.gif','Redo');html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';html+=tinyMCE.getButtonHTML('cleanup','lang_cleanup_desc','{$themeurl}/images/cleanup.gif','mceCleanup')
+html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';html+=tinyMCE.getButtonHTML('bullist','lang_bullist_desc','{$themeurl}/images/bullist.gif','InsertUnorderedList')
+html+=tinyMCE.getButtonHTML('numlist','lang_numlist_desc','{$themeurl}/images/numlist.gif','InsertOrderedList')
+html+='</td></tr></table>';return{delta_width:0,delta_height:20,html:html};},handleNodeChange:function(editor_id,node){tinyMCE.switchClass(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClass(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClass(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_numlist','mceButtonNormal');do{switch(node.nodeName.toLowerCase()){case"b":case"strong":tinyMCE.switchClass(editor_id+'_bold','mceButtonSelected');break;case"i":case"em":tinyMCE.switchClass(editor_id+'_italic','mceButtonSelected');break;case"u":tinyMCE.switchClass(editor_id+'_underline','mceButtonSelected');break;case"strike":tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonSelected');break;case"ul":tinyMCE.switchClass(editor_id+'_bullist','mceButtonSelected');break;case"ol":tinyMCE.switchClass(editor_id+'_numlist','mceButtonSelected');break;}}while((node=node.parentNode)!=null);}};tinyMCE.addTheme("simple",TinyMCE_SimpleTheme);tinyMCE.addButtonMap(TinyMCE_SimpleTheme._buttonMap);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/editor_template_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,86 @@
+/**
+ * $RCSfile: editor_template_src.js,v $
+ * $Revision: 1.9 $
+ * $Date: 2006/04/18 13:32:53 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+var TinyMCE_SimpleTheme = {
+	// List of button ids in tile map
+	_buttonMap : 'bold,bullist,cleanup,italic,numlist,redo,strikethrough,underline,undo',
+
+	getEditorTemplate : function() {
+		var html = '';
+
+		html += '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}">';
+		html += '<tr><td align="center">';
+		html += '<span id="{$editor_id}">IFRAME</span>';
+		html += '</td></tr>';
+		html += '<tr><td class="mceToolbar" align="center" height="1">';
+		html += tinyMCE.getButtonHTML('bold', 'lang_bold_desc', '{$themeurl}/images/{$lang_bold_img}', 'Bold');
+		html += tinyMCE.getButtonHTML('italic', 'lang_italic_desc', '{$themeurl}/images/{$lang_italic_img}', 'Italic');
+		html += tinyMCE.getButtonHTML('underline', 'lang_underline_desc', '{$themeurl}/images/{$lang_underline_img}', 'Underline');
+		html += tinyMCE.getButtonHTML('strikethrough', 'lang_striketrough_desc', '{$themeurl}/images/strikethrough.gif', 'Strikethrough');
+		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+		html += tinyMCE.getButtonHTML('undo', 'lang_undo_desc', '{$themeurl}/images/undo.gif', 'Undo');
+		html += tinyMCE.getButtonHTML('redo', 'lang_redo_desc', '{$themeurl}/images/redo.gif', 'Redo');
+		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+		html += tinyMCE.getButtonHTML('cleanup', 'lang_cleanup_desc', '{$themeurl}/images/cleanup.gif', 'mceCleanup')
+		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+		html += tinyMCE.getButtonHTML('bullist', 'lang_bullist_desc', '{$themeurl}/images/bullist.gif', 'InsertUnorderedList')
+		html += tinyMCE.getButtonHTML('numlist', 'lang_numlist_desc', '{$themeurl}/images/numlist.gif', 'InsertOrderedList')
+		html += '</td></tr></table>';
+
+		return {
+			delta_width : 0,
+			delta_height : 20,
+			html : html
+		};
+	},
+
+	handleNodeChange : function(editor_id, node) {
+		// Reset old states
+		tinyMCE.switchClass(editor_id + '_bold', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_italic', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_underline', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_strikethrough', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_bullist', 'mceButtonNormal');
+		tinyMCE.switchClass(editor_id + '_numlist', 'mceButtonNormal');
+
+		// Handle elements
+		do {
+			switch (node.nodeName.toLowerCase()) {
+				case "b":
+				case "strong":
+					tinyMCE.switchClass(editor_id + '_bold', 'mceButtonSelected');
+				break;
+
+				case "i":
+				case "em":
+					tinyMCE.switchClass(editor_id + '_italic', 'mceButtonSelected');
+				break;
+
+				case "u":
+					tinyMCE.switchClass(editor_id + '_underline', 'mceButtonSelected');
+				break;
+
+				case "strike":
+					tinyMCE.switchClass(editor_id + '_strikethrough', 'mceButtonSelected');
+				break;
+				
+				case "ul":
+					tinyMCE.switchClass(editor_id + '_bullist', 'mceButtonSelected');
+				break;
+
+				case "ol":
+					tinyMCE.switchClass(editor_id + '_numlist', 'mceButtonSelected');
+				break;
+			}
+		} while ((node = node.parentNode) != null);
+	}
+};
+
+tinyMCE.addTheme("simple", TinyMCE_SimpleTheme);
+tinyMCE.addButtonMap(TinyMCE_SimpleTheme._buttonMap);
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_de_se.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_de_se.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_fr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_fr.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_ru.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_ru.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_tw.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bold_tw.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bullist.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/bullist.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/buttons.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/buttons.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/cleanup.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/cleanup.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic_de_se.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic_de_se.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic_ru.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic_ru.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic_tw.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/italic_tw.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/numlist.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/numlist.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/redo.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/redo.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/separator.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/separator.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/spacer.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/spacer.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/strikethrough.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/strikethrough.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline_fr.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline_fr.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline_ru.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline_ru.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline_tw.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/underline_tw.gif differ
Binary files 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/undo.gif and 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/images/undo.gif differ
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/themes/simple/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+function TinyMCE_Engine(){this.majorVersion="2";this.minorVersion="0.6.1";this.releaseDate="2006-05-04";this.instances=new Array();this.switchClassCache=new Array();this.windowArgs=new Array();this.loadedFiles=new Array();this.pendingFiles=new Array();this.loadingIndex=0;this.configs=new Array();this.currentConfig=0;this.eventHandlers=new Array();var ua=navigator.userAgent;this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.isMSIE5=this.isMSIE&&(ua.indexOf('MSIE 5')!=-1);this.isMSIE5_0=this.isMSIE&&(ua.indexOf('MSIE 5.0')!=-1);this.isGecko=ua.indexOf('Gecko')!=-1;this.isSafari=ua.indexOf('Safari')!=-1;this.isOpera=ua.indexOf('Opera')!=-1;this.isMac=ua.indexOf('Mac')!=-1;this.isNS7=ua.indexOf('Netscape/7')!=-1;this.isNS71=ua.indexOf('Netscape/7.1')!=-1;this.dialogCounter=0;this.plugins=new Array();this.themes=new Array();this.menus=new Array();this.loadedPlugins=new Array();this.buttonMap=new Array();this.isLoaded=false;if(this.isOpera){this.isMSIE=true;this.isGecko=false;this.isSafari=false;}this.idCounter=0;};TinyMCE_Engine.prototype={init:function(settings){var theme;this.settings=settings;if(typeof(document.execCommand)=='undefined')return;if(!tinyMCE.baseURL){var elements=document.getElementsByTagName('script');for(var i=0;i<elements.length;i++){if(elements[i].src&&(elements[i].src.indexOf("tiny_mce.js")!=-1||elements[i].src.indexOf("tiny_mce_dev.js")!=-1||elements[i].src.indexOf("tiny_mce_src.js")!=-1||elements[i].src.indexOf("tiny_mce_gzip")!=-1)){var src=elements[i].src;tinyMCE.srcMode=(src.indexOf('_src')!=-1||src.indexOf('_dev')!=-1)?'_src':'';tinyMCE.gzipMode=src.indexOf('_gzip')!=-1;src=src.substring(0,src.lastIndexOf('/'));if(settings.exec_mode=="src"||settings.exec_mode=="normal")tinyMCE.srcMode=settings.exec_mode=="src"?'_src':'';tinyMCE.baseURL=src;break;}}}this.documentBasePath=document.location.href;if(this.documentBasePath.indexOf('?')!=-1)this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.indexOf('?'));this.documentURL=this.documentBasePath;this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.lastIndexOf('/'));if(tinyMCE.baseURL.indexOf('://')==-1&&tinyMCE.baseURL.charAt(0)!='/'){tinyMCE.baseURL=this.documentBasePath+"/"+tinyMCE.baseURL;}this._def("mode","none");this._def("theme","advanced");this._def("plugins","",true);this._def("language","en");this._def("docs_language",this.settings['language']);this._def("elements","");this._def("textarea_trigger","mce_editable");this._def("editor_selector","");this._def("editor_deselector","mceNoEditor");this._def("valid_elements","+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]");this._def("extended_valid_elements","");this._def("invalid_elements","");this._def("encoding","");this._def("urlconverter_callback",tinyMCE.getParam("urlconvertor_callback","TinyMCE_Engine.prototype.convertURL"));this._def("save_callback","");this._def("debug",false);this._def("force_br_newlines",false);this._def("force_p_newlines",true);this._def("add_form_submit_trigger",true);this._def("relative_urls",true);this._def("remove_script_host",true);this._def("focus_alert",true);this._def("document_base_url",this.documentURL);this._def("visual",true);this._def("visual_table_class","mceVisualAid");this._def("setupcontent_callback","");this._def("fix_content_duplication",true);this._def("custom_undo_redo",true);this._def("custom_undo_redo_levels",-1);this._def("custom_undo_redo_keyboard_shortcuts",true);this._def("custom_undo_redo_restore_selection",true);this._def("verify_html",true);this._def("apply_source_formatting",false);this._def("directionality","ltr");this._def("cleanup_on_startup",false);this._def("inline_styles",false);this._def("convert_newlines_to_brs",false);this._def("auto_reset_designmode",true);this._def("entities","39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",true);this._def("entity_encoding","named");this._def("cleanup_callback","");this._def("add_unload_trigger",true);this._def("ask",false);this._def("nowrap",false);this._def("auto_resize",false);this._def("auto_focus",false);this._def("cleanup",true);this._def("remove_linebreaks",true);this._def("button_tile_map",false);this._def("submit_patch",true);this._def("browsers","msie,safari,gecko,opera",true);this._def("dialog_type","window");this._def("accessibility_warnings",true);this._def("accessibility_focus",true);this._def("merge_styles_invalid_parents","");this._def("force_hex_style_colors",true);this._def("trim_span_elements",true);this._def("convert_fonts_to_spans",false);this._def("doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');this._def("font_size_classes",'');this._def("font_size_style_values",'xx-small,x-small,small,medium,large,x-large,xx-large',true);this._def("event_elements",'a,img',true);this._def("convert_urls",true);this._def("table_inline_editing",false);this._def("object_resizing",true);this._def("custom_shortcuts",true);this._def("convert_on_click",false);this._def("content_css",'');this._def("fix_list_elements",false);this._def("fix_table_elements",false);this._def("strict_loading_mode",document.contentType=='application/xhtml+xml');this._def("hidden_tab_class",'');this._def("display_tab_class",'');if(this.isMSIE&&!this.isOpera)this.settings.strict_loading_mode=false;if(this.isMSIE&&this.settings['browsers'].indexOf('msie')==-1)return;if(this.isGecko&&this.settings['browsers'].indexOf('gecko')==-1)return;if(this.isSafari&&this.settings['browsers'].indexOf('safari')==-1)return;if(this.isOpera&&this.settings['browsers'].indexOf('opera')==-1)return;var baseHREF=tinyMCE.settings['document_base_url'];var h=document.location.href;var p=h.indexOf('://');if(p>0&&document.location.protocol!="file:"){p=h.indexOf('/',p+3);h=h.substring(0,p);if(baseHREF.indexOf('://')==-1)baseHREF=h+baseHREF;tinyMCE.settings['document_base_url']=baseHREF;tinyMCE.settings['document_base_prefix']=h;}if(baseHREF.indexOf('?')!=-1)baseHREF=baseHREF.substring(0,baseHREF.indexOf('?'));this.settings['base_href']=baseHREF.substring(0,baseHREF.lastIndexOf('/'))+"/";theme=this.settings['theme'];this.blockRegExp=new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$","i");this.posKeyCodes=new Array(13,45,36,35,33,34,37,38,39,40);this.uniqueURL='javascript:TINYMCE_UNIQUEURL();';this.uniqueTag='<div id="mceTMPElement" style="display: none">TMP</div>';this.callbacks=new Array('onInit','getInfo','getEditorTemplate','setupContent','onChange','onPageLoad','handleNodeChange','initInstance','execCommand','getControlHTML','handleEvent','cleanup');this.settings['theme_href']=tinyMCE.baseURL+"/themes/"+theme;if(!tinyMCE.isMSIE)this.settings['force_br_newlines']=false;if(tinyMCE.getParam("popups_css",false)){var cssPath=tinyMCE.getParam("popups_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['popups_css']=this.documentBasePath+"/"+cssPath;else this.settings['popups_css']=cssPath;}else this.settings['popups_css']=tinyMCE.baseURL+"/themes/"+theme+"/css/editor_popup.css";if(tinyMCE.getParam("editor_css",false)){var cssPath=tinyMCE.getParam("editor_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['editor_css']=this.documentBasePath+"/"+cssPath;else this.settings['editor_css']=cssPath;}else this.settings['editor_css']=tinyMCE.baseURL+"/themes/"+theme+"/css/editor_ui.css";if(tinyMCE.settings['debug']){var msg="Debug: \n";msg+="baseURL: "+this.baseURL+"\n";msg+="documentBasePath: "+this.documentBasePath+"\n";msg+="content_css: "+this.settings['content_css']+"\n";msg+="popups_css: "+this.settings['popups_css']+"\n";msg+="editor_css: "+this.settings['editor_css']+"\n";alert(msg);}if(this.configs.length==0){if(this.isSafari&&this.getParam('safari_warning',false))alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false");if(typeof(TinyMCECompressed)=="undefined"){tinyMCE.addEvent(window,"DOMContentLoaded",TinyMCE_Engine.prototype.onLoad);if(tinyMCE.isMSIE&&!tinyMCE.isOpera){if(document.body)tinyMCE.addEvent(document.body,"readystatechange",TinyMCE_Engine.prototype.onLoad);else tinyMCE.addEvent(document,"readystatechange",TinyMCE_Engine.prototype.onLoad);}tinyMCE.addEvent(window,"load",TinyMCE_Engine.prototype.onLoad);tinyMCE._addUnloadEvents();}}this.loadScript(tinyMCE.baseURL+'/themes/'+this.settings['theme']+'/editor_template'+tinyMCE.srcMode+'.js');this.loadScript(tinyMCE.baseURL+'/langs/'+this.settings['language']+'.js');this.loadCSS(this.settings['editor_css']);var p=tinyMCE.getParam('plugins','',true,',');if(p.length>0){for(var i=0;i<p.length;i++){if(p[i].charAt(0)!='-')this.loadScript(tinyMCE.baseURL+'/plugins/'+p[i]+'/editor_plugin'+tinyMCE.srcMode+'.js');}}settings['cleanup_entities']=new Array();var entities=tinyMCE.getParam('entities','',true,',');for(var i=0;i<entities.length;i+=2)settings['cleanup_entities']['c'+entities[i]]=entities[i+1];settings['index']=this.configs.length;this.configs[this.configs.length]=settings;this.loadNextScript();},_addUnloadEvents:function(){if(tinyMCE.isMSIE){if(tinyMCE.settings['add_unload_trigger']){tinyMCE.addEvent(window,"unload",TinyMCE_Engine.prototype.unloadHandler);tinyMCE.addEvent(window.document,"beforeunload",TinyMCE_Engine.prototype.unloadHandler);}}else{if(tinyMCE.settings['add_unload_trigger'])tinyMCE.addEvent(window,"unload",function(){tinyMCE.triggerSave(true,true);});}},_def:function(key,def_val,t){var v=tinyMCE.getParam(key,def_val);v=t?v.replace(/\s+/g,""):v;this.settings[key]=v;},hasPlugin:function(n){return typeof(this.plugins[n])!="undefined"&&this.plugins[n]!=null;},addPlugin:function(n,p){var op=this.plugins[n];p.baseURL=op?op.baseURL:tinyMCE.baseURL+"/plugins/"+n;this.plugins[n]=p;this.loadNextScript();},setPluginBaseURL:function(n,u){var op=this.plugins[n];if(op)op.baseURL=u;else this.plugins[n]={baseURL:u};},loadPlugin:function(n,u){u=u.indexOf('.js')!=-1?u.substring(0,u.lastIndexOf('/')):u;u=u.charAt(u.length-1)=='/'?u.substring(0,u.length-1):u;this.plugins[n]={baseURL:u};this.loadScript(u+"/editor_plugin"+(tinyMCE.srcMode?'_src':'')+".js");},hasTheme:function(n){return typeof(this.themes[n])!="undefined"&&this.themes[n]!=null;},addTheme:function(n,t){this.themes[n]=t;this.loadNextScript();},addMenu:function(n,m){this.menus[n]=m;},hasMenu:function(n){return typeof(this.plugins[n])!="undefined"&&this.plugins[n]!=null;},loadScript:function(url){var i;for(i=0;i<this.loadedFiles.length;i++){if(this.loadedFiles[i]==url)return;}if(tinyMCE.settings.strict_loading_mode)this.pendingFiles[this.pendingFiles.length]=url;else document.write('<sc'+'ript language="javascript" type="text/javascript" src="'+url+'"></script>');this.loadedFiles[this.loadedFiles.length]=url;},loadNextScript:function(){var d=document,se;if(!tinyMCE.settings.strict_loading_mode)return;if(this.loadingIndex<this.pendingFiles.length){se=d.createElementNS('http://www.w3.org/1999/xhtml','script');se.setAttribute('language','javascript');se.setAttribute('type','text/javascript');se.setAttribute('src',this.pendingFiles[this.loadingIndex++]);d.getElementsByTagName("head")[0].appendChild(se);}else this.loadingIndex=-1;},loadCSS:function(url){var ar=url.replace(/\s+/,'').split(',');var lflen=0,csslen=0;var skip=false;var x=0,i=0,nl,le;for(x=0,csslen=ar.length;x<csslen;x++){ignore_css=false;if(ar[x]!=null&&ar[x]!='null'&&ar[x].length>0){for(i=0,lflen=this.loadedFiles.length;i<lflen;i++){if(this.loadedFiles[i]==ar[x]){skip=true;break;}}if(!skip){if(tinyMCE.settings.strict_loading_mode){nl=document.getElementsByTagName("head");le=document.createElement('link');le.setAttribute('href',ar[x]);le.setAttribute('rel','stylesheet');le.setAttribute('type','text/css');nl[0].appendChild(le);}else document.write('<link href="'+ar[x]+'" rel="stylesheet" type="text/css" />');this.loadedFiles[this.loadedFiles.length]=ar[x];}}}},importCSS:function(doc,css){var css_ary=css.replace(/\s+/,'').split(',');var csslen,elm,headArr,x,css_file;for(x=0,csslen=css_ary.length;x<csslen;x++){css_file=css_ary[x];if(css_file!=null&&css_file!='null'&&css_file.length>0){if(css_file.indexOf('://')==-1&&css_file.charAt(0)!='/')css_file=this.documentBasePath+"/"+css_file;if(typeof(doc.createStyleSheet)=="undefined"){elm=doc.createElement("link");elm.rel="stylesheet";elm.href=css_file;if((headArr=doc.getElementsByTagName("head"))!=null&&headArr.length>0)headArr[0].appendChild(elm);}else doc.createStyleSheet(css_file);}}},confirmAdd:function(e,settings){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var elementId=elm.name?elm.name:elm.id;tinyMCE.settings=settings;if(tinyMCE.settings['convert_on_click']||(!elm.getAttribute('mce_noask')&&confirm(tinyMCELang['lang_edit_confirm'])))tinyMCE.addMCEControl(elm,elementId);elm.setAttribute('mce_noask','true');},updateContent:function(form_element_name){var formElement=document.getElementById(form_element_name);for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.switchSettings();if(inst.formElement==formElement){var doc=inst.getDoc();tinyMCE._setHTML(doc,inst.formElement.value);if(!tinyMCE.isMSIE)doc.body.innerHTML=tinyMCE._cleanupHTML(inst,doc,this.settings,doc.body,inst.visualAid);}}},addMCEControl:function(replace_element,form_element_name,target_document){var id="mce_editor_"+tinyMCE.idCounter++;var inst=new TinyMCE_Control(tinyMCE.settings);inst.editorId=id;this.instances[id]=inst;inst._onAdd(replace_element,form_element_name,target_document);},removeMCEControl:function(editor_id){var inst=tinyMCE.getInstanceById(editor_id);if(inst){inst.switchSettings();editor_id=inst.editorId;var html=tinyMCE.getContent(editor_id);var tmpInstances=new Array();for(var instanceName in tinyMCE.instances){var instance=tinyMCE.instances[instanceName];if(!tinyMCE.isInstance(instance))continue;if(instanceName!=editor_id)tmpInstances[instanceName]=instance;}tinyMCE.instances=tmpInstances;tinyMCE.selectedElement=null;tinyMCE.selectedInstance=null;var replaceElement=document.getElementById(editor_id+"_parent");var oldTargetElement=inst.oldTargetElement;var targetName=oldTargetElement.nodeName.toLowerCase();if(targetName=="textarea"||targetName=="input"){replaceElement.parentNode.removeChild(replaceElement);oldTargetElement.style.display="inline";oldTargetElement.value=html;}else{oldTargetElement.innerHTML=html;oldTargetElement.style.display='block';replaceElement.parentNode.insertBefore(oldTargetElement,replaceElement);replaceElement.parentNode.removeChild(replaceElement);}}},triggerSave:function(skip_cleanup,skip_callback){var inst,n;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.triggerSave(skip_cleanup,skip_callback);}},resetForm:function(form_index){var i,inst,n,formObj=document.forms[form_index];for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.switchSettings();for(i=0;i<formObj.elements.length;i++){if(inst.formTargetElementId==formObj.elements[i].name)inst.getBody().innerHTML=inst.startContent;}}},execInstanceCommand:function(editor_id,command,user_interface,value,focus){var inst=tinyMCE.getInstanceById(editor_id);if(inst){if(typeof(focus)=="undefined")focus=true;if(focus)inst.contentWindow.focus();inst.autoResetDesignMode();this.selectedElement=inst.getFocusElement();this.selectedInstance=inst;tinyMCE.execCommand(command,user_interface,value);if(tinyMCE.isMSIE&&window.event!=null)tinyMCE.cancelEvent(window.event);}},execCommand:function(command,user_interface,value){user_interface=user_interface?user_interface:false;value=value?value:null;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();switch(command){case'mceHelp':tinyMCE.openWindow({file:'about.htm',width:480,height:380},{tinymce_version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion,tinymce_releasedate:tinyMCE.releaseDate,inline:"yes"});return;case'mceFocus':var inst=tinyMCE.getInstanceById(value);if(inst)inst.contentWindow.focus();return;case"mceAddControl":case"mceAddEditor":tinyMCE.addMCEControl(tinyMCE._getElementById(value),value);return;case"mceAddFrameControl":tinyMCE.addMCEControl(tinyMCE._getElementById(value['element'],value['document']),value['element'],value['document']);return;case"mceRemoveControl":case"mceRemoveEditor":tinyMCE.removeMCEControl(value);return;case"mceResetDesignMode":if(!tinyMCE.isMSIE){for(var n in tinyMCE.instances){if(!tinyMCE.isInstance(tinyMCE.instances[n]))continue;try{tinyMCE.instances[n].getDoc().designMode="on";}catch(e){}}}return;}if(this.selectedInstance){this.selectedInstance.execCommand(command,user_interface,value);}else if(tinyMCE.settings['focus_alert'])alert(tinyMCELang['lang_focus_alert']);},_createIFrame:function(replace_element,doc,win){var iframe,id=replace_element.getAttribute("id");var aw,ah;if(typeof(doc)=="undefined")doc=document;if(typeof(win)=="undefined")win=window;iframe=doc.createElement("iframe");aw=""+tinyMCE.settings['area_width'];ah=""+tinyMCE.settings['area_height'];if(aw.indexOf('%')==-1){aw=parseInt(aw);aw=aw<0?300:aw;aw=aw+"px";}if(ah.indexOf('%')==-1){ah=parseInt(ah);ah=ah<0?240:ah;ah=ah+"px";}iframe.setAttribute("id",id);iframe.setAttribute("class","mceEditorIframe");iframe.setAttribute("border","0");iframe.setAttribute("frameBorder","0");iframe.setAttribute("marginWidth","0");iframe.setAttribute("marginHeight","0");iframe.setAttribute("leftMargin","0");iframe.setAttribute("topMargin","0");iframe.setAttribute("width",aw);iframe.setAttribute("height",ah);iframe.setAttribute("allowtransparency","true");iframe.className='mceEditorIframe';if(tinyMCE.settings["auto_resize"])iframe.setAttribute("scrolling","no");if(tinyMCE.isMSIE&&!tinyMCE.isOpera)iframe.setAttribute("src",this.settings['default_document']);iframe.style.width=aw;iframe.style.height=ah;if(tinyMCE.settings.strict_loading_mode)iframe.style.marginBottom='-5px';if(tinyMCE.isMSIE&&!tinyMCE.isOpera)replace_element.outerHTML=iframe.outerHTML;else replace_element.parentNode.replaceChild(iframe,replace_element);if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return win.frames[id];else return iframe;},setupContent:function(editor_id){var inst=tinyMCE.instances[editor_id];var doc=inst.getDoc();var head=doc.getElementsByTagName('head').item(0);var content=inst.startContent;if(tinyMCE.settings.strict_loading_mode){content=content.replace(/&lt;/g,'<');content=content.replace(/&gt;/g,'>');content=content.replace(/&quot;/g,'"');content=content.replace(/&amp;/g,'&');}inst.switchSettings();if(!tinyMCE.isMSIE&&tinyMCE.getParam("setupcontent_reload",false)&&doc.title!="blank_page"){try{doc.location.href=tinyMCE.baseURL+"/blank.htm";}catch(ex){}window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",1000);return;}if(!head){window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",10);return;}tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/themes/"+inst.settings['theme']+"/css/editor_content.css");tinyMCE.importCSS(inst.getDoc(),inst.settings['content_css']);tinyMCE.dispatchCallback(inst,'init_instance_callback','initInstance',inst);if(tinyMCE.getParam('custom_undo_redo_keyboard_shortcuts')){inst.addShortcut('ctrl','z','lang_undo_desc','Undo');inst.addShortcut('ctrl','y','lang_redo_desc','Redo');}if(tinyMCE.isGecko){inst.addShortcut('ctrl','b','lang_bold_desc','Bold');inst.addShortcut('ctrl','i','lang_italic_desc','Italic');inst.addShortcut('ctrl','u','lang_underline_desc','Underline');}if(tinyMCE.getParam("convert_fonts_to_spans"))inst.getDoc().body.setAttribute('id','mceSpanFonts');if(tinyMCE.settings['nowrap'])doc.body.style.whiteSpace="nowrap";doc.body.dir=this.settings['directionality'];doc.editorId=editor_id;if(!tinyMCE.isMSIE)doc.documentElement.editorId=editor_id;inst.setBaseHREF(tinyMCE.settings['base_href']);if(tinyMCE.settings['convert_newlines_to_brs']){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}content=tinyMCE.storeAwayURLs(content);content=tinyMCE._customCleanup(inst,"insert_to_editor",content);if(tinyMCE.isMSIE){window.setInterval('try{tinyMCE.getCSSClasses(tinyMCE.instances["'+editor_id+'"].getDoc(), "'+editor_id+'");}catch(e){}',500);if(tinyMCE.settings["force_br_newlines"])doc.styleSheets[0].addRule("p","margin: 0;");var body=inst.getBody();body.editorId=editor_id;}content=tinyMCE.cleanupHTMLCode(content);if(!tinyMCE.isMSIE){var contentElement=inst.getDoc().createElement("body");var doc=inst.getDoc();contentElement.innerHTML=content;if(tinyMCE.isGecko&&tinyMCE.settings['remove_lt_gt'])content=content.replace(new RegExp('&lt;&gt;','g'),"");if(tinyMCE.settings['cleanup_on_startup'])tinyMCE.setInnerHTML(inst.getBody(),tinyMCE._cleanupHTML(inst,doc,this.settings,contentElement));else{content=tinyMCE.regexpReplace(content,"<strong","<b","gi");content=tinyMCE.regexpReplace(content,"<em(/?)>","<i$1>","gi");content=tinyMCE.regexpReplace(content,"<em ","<i ","gi");content=tinyMCE.regexpReplace(content,"</strong>","</b>","gi");content=tinyMCE.regexpReplace(content,"</em>","</i>","gi");tinyMCE.setInnerHTML(inst.getBody(),content);}tinyMCE.convertAllRelativeURLs(inst.getBody());}else{if(tinyMCE.settings['cleanup_on_startup']){tinyMCE._setHTML(inst.getDoc(),content);eval('try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}');}else tinyMCE._setHTML(inst.getDoc(),content);}var parentElm=inst.targetDoc.getElementById(inst.editorId+'_parent');inst.formElement=tinyMCE.isGecko?parentElm.previousSibling:parentElm.nextSibling;tinyMCE.handleVisualAid(inst.getBody(),true,tinyMCE.settings['visual'],inst);tinyMCE.dispatchCallback(inst,'setupcontent_callback','setupContent',editor_id,inst.getBody(),inst.getDoc());if(!tinyMCE.isMSIE)tinyMCE.addEventHandlers(inst);if(tinyMCE.isMSIE){tinyMCE.addEvent(inst.getBody(),"blur",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(inst.getBody(),"beforedeactivate",TinyMCE_Engine.prototype._eventPatch);if(!tinyMCE.isOpera){tinyMCE.addEvent(doc.body,"mousemove",TinyMCE_Engine.prototype.onMouseMove);tinyMCE.addEvent(doc.body,"beforepaste",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc.body,"drop",TinyMCE_Engine.prototype._eventPatch);}}tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=inst.contentWindow.document.body;tinyMCE._customCleanup(inst,"insert_to_editor_dom",inst.getBody());tinyMCE._customCleanup(inst,"setup_content_dom",inst.getBody());tinyMCE._setEventsEnabled(inst.getBody(),false);tinyMCE.cleanupAnchors(inst.getDoc());if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(inst.getDoc());inst.startContent=tinyMCE.trim(inst.getBody().innerHTML);inst.undoRedo.add({content:inst.startContent});if(tinyMCE.isGecko){tinyMCE.selectNodes(inst.getBody(),function(n){if(n.nodeType==3||n.nodeType==8){n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");}return false;});}tinyMCE._removeInternal(inst.getBody());tinyMCE.selectedInstance=inst;tinyMCE.triggerNodeChange(false,true);},storeAwayURLs:function(s){if(!s.match(/(mce_src|mce_href)/gi,s)){s=s.replace(new RegExp('src\\s*=\\s*\"([^ >\"]*)\"','gi'),'src="$1" mce_src="$1"');s=s.replace(new RegExp('href\\s*=\\s*\"([^ >\"]*)\"','gi'),'href="$1" mce_href="$1"');}return s;},_removeInternal:function(n){if(tinyMCE.isGecko){tinyMCE.selectNodes(n,function(n){if(n.nodeType==3||n.nodeType==8){n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");}return false;});}},removeTinyMCEFormElements:function(form_obj){if(typeof(form_obj)=="undefined"||form_obj==null)return;if(form_obj.nodeName!="FORM"){if(form_obj.form)form_obj=form_obj.form;else form_obj=tinyMCE.getParentElement(form_obj,"form");}if(form_obj==null)return;for(var i=0;i<form_obj.elements.length;i++){var elementId=form_obj.elements[i].name?form_obj.elements[i].name:form_obj.elements[i].id;if(elementId.indexOf('mce_editor_')==0)form_obj.elements[i].disabled=true;}},handleEvent:function(e){var inst=tinyMCE.selectedInstance;if(typeof(tinyMCE)=="undefined")return true;if(tinyMCE.executeCallback(tinyMCE.selectedInstance,'handle_event_callback','handleEvent',e))return false;switch(e.type){case"beforedeactivate":case"blur":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.execCommand('mceEndTyping');tinyMCE.hideMenus();return;case"drop":case"beforepaste":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.setBaseHREF(null);if(tinyMCE.isMSIE&&!tinyMCE.isOpera){var ife=tinyMCE.selectedInstance.iframeElement;if(ife.style.height.indexOf('%')!=-1){ife._oldHeight=ife.style.height;ife.style.height=ife.clientHeight;}}window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();",1);return;case"submit":tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE?window.event.srcElement:e.target);tinyMCE.triggerSave();tinyMCE.isNotDirty=true;return;case"reset":var formObj=tinyMCE.isMSIE?window.event.srcElement:e.target;for(var i=0;i<document.forms.length;i++){if(document.forms[i]==formObj)window.setTimeout('tinyMCE.resetForm('+i+');',10);}return;case"keypress":if(inst&&inst.handleShortcut(e))return false;if(e.target.editorId){tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];}else{if(e.target.ownerDocument.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.ownerDocument.editorId];}if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&e.keyCode==13&&!e.shiftKey){if(TinyMCE_ForceParagraphs._insertPara(tinyMCE.selectedInstance,e)){tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.cancelEvent(e);return false;}}if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance,e.type)){tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.cancelEvent(e);return false;}}if(tinyMCE.isMSIE&&tinyMCE.settings['force_br_newlines']&&e.keyCode==13){if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];if(tinyMCE.selectedInstance){var sel=tinyMCE.selectedInstance.getDoc().selection;var rng=sel.createRange();if(tinyMCE.getParentElement(rng.parentElement(),"li")!=null)return false;e.returnValue=false;e.cancelBubble=true;rng.pasteHTML("<br />");rng.collapse(false);rng.select();tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.triggerNodeChange(false);return false;}}if(e.keyCode==8||e.keyCode==46){tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(e.target,"a");tinyMCE.imgElement=tinyMCE.getParentElement(e.target,"img");tinyMCE.triggerNodeChange(false);}return false;break;case"keyup":case"keydown":tinyMCE.hideMenus();tinyMCE.hasMouseMoved=false;if(inst&&inst.handleShortcut(e))return false;if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];else return;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();var inst=tinyMCE.selectedInstance;if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance,e.type)){tinyMCE.execCommand("mceAddUndoLevel");e.preventDefault();return false;}}tinyMCE.selectedElement=null;tinyMCE.selectedNode=null;var elm=tinyMCE.selectedInstance.getFocusElement();tinyMCE.linkElement=tinyMCE.getParentElement(elm,"a");tinyMCE.imgElement=tinyMCE.getParentElement(elm,"img");tinyMCE.selectedElement=elm;if(tinyMCE.isGecko&&e.type=="keyup"&&e.keyCode==9)tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(),true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);if(tinyMCE.isMSIE&&e.type=="keydown"&&e.keyCode==13)tinyMCE.enterKeyElement=tinyMCE.selectedInstance.getFocusElement();if(tinyMCE.isMSIE&&e.type=="keyup"&&e.keyCode==13){var elm=tinyMCE.enterKeyElement;if(elm){var re=new RegExp('^HR|IMG|BR$','g');var dre=new RegExp('^H[1-6]$','g');if(!elm.hasChildNodes()&&!re.test(elm.nodeName)){if(dre.test(elm.nodeName))elm.innerHTML="&nbsp;&nbsp;";else elm.innerHTML="&nbsp;";}}}var keys=tinyMCE.posKeyCodes;var posKey=false;for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){posKey=true;break;}}if(tinyMCE.isMSIE&&tinyMCE.settings['custom_undo_redo']){var keys=new Array(8,46);for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){if(e.type=="keyup")tinyMCE.triggerNodeChange(false);}}}if(e.keyCode==17)return true;if(!posKey&&e.type=="keyup")tinyMCE.execCommand("mceStartTyping");if(e.type=="keydown"&&(posKey||e.ctrlKey)&&inst)inst.undoBookmark=inst.selection.getBookmark();if(e.type=="keyup"&&(posKey||e.ctrlKey))tinyMCE.execCommand("mceEndTyping");if(posKey&&e.type=="keyup")tinyMCE.triggerNodeChange(false);if(tinyMCE.isMSIE&&e.ctrlKey)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);break;case"mousedown":case"mouseup":case"click":case"focus":tinyMCE.hideMenus();if(tinyMCE.selectedInstance){tinyMCE.selectedInstance.switchSettings();tinyMCE.selectedInstance.isFocused=true;}var targetBody=tinyMCE.getParentElement(e.target,"body");for(var instanceName in tinyMCE.instances){if(!tinyMCE.isInstance(tinyMCE.instances[instanceName]))continue;var inst=tinyMCE.instances[instanceName];inst.autoResetDesignMode();if(inst.getBody()==targetBody){tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");tinyMCE.imgElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"img");break;}}if(!tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark)tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark=tinyMCE.selectedInstance.selection.getBookmark();if(tinyMCE.isSafari){tinyMCE.selectedInstance.lastSafariSelection=tinyMCE.selectedInstance.selection.getBookmark();tinyMCE.selectedInstance.lastSafariSelectedElement=tinyMCE.selectedElement;var lnk=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");if(lnk&&e.type=="mousedown"){lnk.setAttribute("mce_real_href",lnk.getAttribute("href"));lnk.setAttribute("href","javascript:void(0);");}if(lnk&&e.type=="click"){window.setTimeout(function(){lnk.setAttribute("href",lnk.getAttribute("mce_real_href"));lnk.removeAttribute("mce_real_href");},10);}}if(e.type!="focus")tinyMCE.selectedNode=null;tinyMCE.triggerNodeChange(false);tinyMCE.execCommand("mceEndTyping");if(e.type=="mouseup")tinyMCE.execCommand("mceAddUndoLevel");if(!tinyMCE.selectedInstance&&e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];return false;break;}},getButtonHTML:function(id,lang,img,cmd,ui,val){var h='',m,x;cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+cmd+'\'';if(typeof(ui)!="undefined"&&ui!=null)cmd+=','+ui;if(typeof(val)!="undefined"&&val!=null)cmd+=",'"+val+"'";cmd+=');';if(tinyMCE.getParam('button_tile_map')&&(!tinyMCE.isMSIE||tinyMCE.isOpera)&&(m=this.buttonMap[id])!=null&&(tinyMCE.getParam("language")=="en"||img.indexOf('$lang')==-1)){x=0-(m*20)==0?'0':0-(m*20);h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';h+='<img src="{$themeurl}/images/spacer.gif" style="background-position: '+x+'px 0" title="{$'+lang+'}" />';h+='</a>';}else{h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceButtonNormal" target="_self">';h+='<img src="'+img+'" title="{$'+lang+'}" />';h+='</a>';}return h;},addButtonMap:function(m){var i,a=m.replace(/\s+/,'').split(',');for(i=0;i<a.length;i++)this.buttonMap[a[i]]=i;},submitPatch:function(){tinyMCE.removeTinyMCEFormElements(this);tinyMCE.triggerSave();this.mceOldSubmit();tinyMCE.isNotDirty=true;},onLoad:function(){if(tinyMCE.settings.strict_loading_mode&&this.loadingIndex!=-1){window.setTimeout('tinyMCE.onLoad();',1);return;}if(tinyMCE.isMSIE&&!tinyMCE.isOpera&&window.event.type=="readystatechange"&&document.readyState!="complete")return true;if(tinyMCE.isLoaded)return true;tinyMCE.isLoaded=true;tinyMCE.dispatchCallback(null,'onpageload','onPageLoad');for(var c=0;c<tinyMCE.configs.length;c++){tinyMCE.settings=tinyMCE.configs[c];var selector=tinyMCE.getParam("editor_selector");var deselector=tinyMCE.getParam("editor_deselector");var elementRefAr=new Array();if(document.forms&&tinyMCE.settings['add_form_submit_trigger']&&!tinyMCE.submitTriggers){for(var i=0;i<document.forms.length;i++){var form=document.forms[i];tinyMCE.addEvent(form,"submit",TinyMCE_Engine.prototype.handleEvent);tinyMCE.addEvent(form,"reset",TinyMCE_Engine.prototype.handleEvent);tinyMCE.submitTriggers=true;if(tinyMCE.settings['submit_patch']){try{form.mceOldSubmit=form.submit;form.submit=TinyMCE_Engine.prototype.submitPatch;}catch(e){}}}}var mode=tinyMCE.settings['mode'];switch(mode){case"exact":var elements=tinyMCE.getParam('elements','',true,',');for(var i=0;i<elements.length;i++){var element=tinyMCE._getElementById(elements[i]);var trigger=element?element.getAttribute(tinyMCE.settings['textarea_trigger']):"";if(tinyMCE.getAttrib(element,"class").indexOf(deselector)!=-1)continue;if(trigger=="false")continue;if((tinyMCE.settings['ask']||tinyMCE.settings['convert_on_click'])&&element){elementRefAr[elementRefAr.length]=element;continue;}if(element)tinyMCE.addMCEControl(element,elements[i]);else if(tinyMCE.settings['debug'])alert("Error: Could not find element by id or name: "+elements[i]);}break;case"specific_textareas":case"textareas":var nodeList=document.getElementsByTagName("textarea");for(var i=0;i<nodeList.length;i++){var elm=nodeList.item(i);var trigger=elm.getAttribute(tinyMCE.settings['textarea_trigger']);if(selector!=''&&tinyMCE.getAttrib(elm,"class").indexOf(selector)==-1)continue;if(selector!='')trigger=selector!=""?"true":"";if(tinyMCE.getAttrib(elm,"class").indexOf(deselector)!=-1)continue;if((mode=="specific_textareas"&&trigger=="true")||(mode=="textareas"&&trigger!="false"))elementRefAr[elementRefAr.length]=elm;}break;}for(var i=0;i<elementRefAr.length;i++){var element=elementRefAr[i];var elementId=element.name?element.name:element.id;if(tinyMCE.settings['ask']||tinyMCE.settings['convert_on_click']){if(tinyMCE.isGecko){var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(e){window.setTimeout(function(){TinyMCE_Engine.prototype.confirmAdd(e,settings);},10);});if(element.nodeName!="TEXTAREA"&&element.nodeName!="INPUT")tinyMCE.addEvent(element,"click",function(e){window.setTimeout(function(){TinyMCE_Engine.prototype.confirmAdd(e,settings);},10);});}else{var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(){TinyMCE_Engine.prototype.confirmAdd(null,settings);});tinyMCE.addEvent(element,"click",function(){TinyMCE_Engine.prototype.confirmAdd(null,settings);});}}else tinyMCE.addMCEControl(element,elementId);}if(tinyMCE.settings['auto_focus']){window.setTimeout(function(){var inst=tinyMCE.getInstanceById(tinyMCE.settings['auto_focus']);inst.selection.selectNode(inst.getBody(),true,true);inst.contentWindow.focus();},10);}tinyMCE.dispatchCallback(null,'oninit','onInit');}},isInstance:function(o){return o!=null&&typeof(o)=="object"&&o.isTinyMCE_Control;},getParam:function(name,default_value,strip_whitespace,split_chr){var value=(typeof(this.settings[name])=="undefined")?default_value:this.settings[name];if(value=="true"||value=="false")return(value=="true");if(strip_whitespace)value=tinyMCE.regexpReplace(value,"[ \t\r\n]","");if(typeof(split_chr)!="undefined"&&split_chr!=null){value=value.split(split_chr);var outArray=new Array();for(var i=0;i<value.length;i++){if(value[i]&&value[i]!="")outArray[outArray.length]=value[i];}value=outArray;}return value;},getLang:function(name,default_value,parse_entities,va){var v=(typeof(tinyMCELang[name])=="undefined")?default_value:tinyMCELang[name],n;if(parse_entities)v=tinyMCE.entityDecode(v);if(va){for(n in va)v=this.replaceVar(v,n,va[n]);}return v;},entityDecode:function(s){var e=document.createElement("div");e.innerHTML=s;return e.innerHTML;},addToLang:function(prefix,ar){for(var key in ar){if(typeof(ar[key])=='function')continue;tinyMCELang[(key.indexOf('lang_')==-1?'lang_':'')+(prefix!=''?(prefix+"_"):'')+key]=ar[key];}this.loadNextScript();},triggerNodeChange:function(focus,setup_content){if(tinyMCE.selectedInstance){var inst=tinyMCE.selectedInstance;var editorId=inst.editorId;var elm=(typeof(setup_content)!="undefined"&&setup_content)?tinyMCE.selectedElement:inst.getFocusElement();var undoIndex=-1;var undoLevels=-1;var anySelection=false;var selectedText=inst.selection.getSelectedText();if(setup_content&&tinyMCE.isGecko&&inst.isHidden())elm=inst.getBody();inst.switchSettings();if(tinyMCE.settings["auto_resize"]){var doc=inst.getDoc();inst.iframeElement.style.width=doc.body.offsetWidth+"px";inst.iframeElement.style.height=doc.body.offsetHeight+"px";}if(tinyMCE.selectedElement)anySelection=(tinyMCE.selectedElement.nodeName.toLowerCase()=="img")||(selectedText&&selectedText.length>0);if(tinyMCE.settings['custom_undo_redo']){undoIndex=inst.undoRedo.undoIndex;undoLevels=inst.undoRedo.undoLevels.length;}tinyMCE.dispatchCallback(inst,'handle_node_change_callback','handleNodeChange',editorId,elm,undoIndex,undoLevels,inst.visualAid,anySelection,setup_content);}if(this.selectedInstance&&(typeof(focus)=="undefined"||focus))this.selectedInstance.contentWindow.focus();},_customCleanup:function(inst,type,content){var pl,po,i;var customCleanup=tinyMCE.settings['cleanup_callback'];if(customCleanup!=""&&eval("typeof("+customCleanup+")")!="undefined")content=eval(customCleanup+"(type, content, inst);");pl=inst.plugins;for(i=0;i<pl.length;i++){po=tinyMCE.plugins[pl[i]];if(po&&po.cleanup)content=po.cleanup(type,content,inst);}return content;},setContent:function(h){if(tinyMCE.selectedInstance){tinyMCE.selectedInstance.execCommand('mceSetContent',false,h);tinyMCE.selectedInstance.repaint();}},importThemeLanguagePack:function(name){if(typeof(name)=="undefined")name=tinyMCE.settings['theme'];tinyMCE.loadScript(tinyMCE.baseURL+'/themes/'+name+'/langs/'+tinyMCE.settings['language']+'.js');},importPluginLanguagePack:function(name,valid_languages){var lang="en",b=tinyMCE.baseURL+'/plugins/'+name;valid_languages=valid_languages.split(',');for(var i=0;i<valid_languages.length;i++){if(tinyMCE.settings['language']==valid_languages[i])lang=tinyMCE.settings['language'];}if(this.plugins[name])b=this.plugins[name].baseURL;tinyMCE.loadScript(b+'/langs/'+lang+'.js');},applyTemplate:function(h,as){var i,s,ar=h.match(new RegExp('\\{\\$[a-z0-9_]+\\}','gi'));if(ar&&ar.length>0){for(i=ar.length-1;i>=0;i--){s=ar[i].substring(2,ar[i].length-1);if(s.indexOf('lang_')==0&&tinyMCELang[s])h=tinyMCE.replaceVar(h,s,tinyMCELang[s]);else if(as&&as[s])h=tinyMCE.replaceVar(h,s,as[s]);else if(tinyMCE.settings[s])h=tinyMCE.replaceVar(h,s,tinyMCE.settings[s]);}}h=tinyMCE.replaceVar(h,"themeurl",tinyMCE.themeURL);return h;},replaceVar:function(h,r,v){return h.replace(new RegExp('{\\\$'+r+'}','g'),v);},openWindow:function(template,args){var html,width,height,x,y,resizable,scrollbars,url;args['mce_template_file']=template['file'];args['mce_width']=template['width'];args['mce_height']=template['height'];tinyMCE.windowArgs=args;html=template['html'];if(!(width=parseInt(template['width'])))width=320;if(!(height=parseInt(template['height'])))height=200;if(tinyMCE.isMSIE)height+=40;else height+=20;x=parseInt(screen.width/2.0)-(width/2.0);y=parseInt(screen.height/2.0)-(height/2.0);resizable=(args&&args['resizable'])?args['resizable']:"no";scrollbars=(args&&args['scrollbars'])?args['scrollbars']:"no";if(template['file'].charAt(0)!='/'&&template['file'].indexOf('://')==-1)url=tinyMCE.baseURL+"/themes/"+tinyMCE.getParam("theme")+"/"+template['file'];else url=template['file'];for(var name in args){if(typeof(args[name])=='function')continue;url=tinyMCE.replaceVar(url,name,escape(args[name]));}if(html){html=tinyMCE.replaceVar(html,"css",this.settings['popups_css']);html=tinyMCE.applyTemplate(html,args);var win=window.open("","mcePopup"+new Date().getTime(),"top="+y+",left="+x+",scrollbars="+scrollbars+",dialog=yes,minimizable="+resizable+",modal=yes,width="+width+",height="+height+",resizable="+resizable);if(win==null){alert(tinyMCELang['lang_popup_blocked']);return;}win.document.write(html);win.document.close();win.resizeTo(width,height);win.focus();}else{if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&resizable!='yes'&&tinyMCE.settings["dialog_type"]=="modal"){height+=10;var features="resizable:"+resizable+";scroll:"+scrollbars+";status:yes;center:yes;help:no;dialogWidth:"+width+"px;dialogHeight:"+height+"px;";window.showModalDialog(url,window,features);}else{var modal=(resizable=="yes")?"no":"yes";if(tinyMCE.isGecko&&tinyMCE.isMac)modal="no";if(template['close_previous']!="no")try{tinyMCE.lastWindow.close();}catch(ex){}var win=window.open(url,"mcePopup"+new Date().getTime(),"top="+y+",left="+x+",scrollbars="+scrollbars+",dialog="+modal+",minimizable="+resizable+",modal="+modal+",width="+width+",height="+height+",resizable="+resizable);if(win==null){alert(tinyMCELang['lang_popup_blocked']);return;}if(template['close_previous']!="no")tinyMCE.lastWindow=win;eval('try { win.resizeTo(width, height); } catch(e) { }');if(tinyMCE.isGecko){if(win.document.defaultView.statusbar.visible)win.resizeBy(0,tinyMCE.isMac?10:24);}win.focus();}}},closeWindow:function(win){win.close();},getVisualAidClass:function(class_name,state){var aidClass=tinyMCE.settings['visual_table_class'];if(typeof(state)=="undefined")state=tinyMCE.settings['visual'];var classNames=new Array();var ar=class_name.split(' ');for(var i=0;i<ar.length;i++){if(ar[i]==aidClass)ar[i]="";if(ar[i]!="")classNames[classNames.length]=ar[i];}if(state)classNames[classNames.length]=aidClass;var className="";for(var i=0;i<classNames.length;i++){if(i>0)className+=" ";className+=classNames[i];}return className;},handleVisualAid:function(el,deep,state,inst,skip_dispatch){if(!el)return;if(!skip_dispatch)tinyMCE.dispatchCallback(inst,'handle_visual_aid_callback','handleVisualAid',el,deep,state,inst);var tableElement=null;switch(el.nodeName){case"TABLE":var oldW=el.style.width;var oldH=el.style.height;var bo=tinyMCE.getAttrib(el,"border");bo=bo==""||bo=="0"?true:false;tinyMCE.setAttrib(el,"class",tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el,"class"),state&&bo));el.style.width=oldW;el.style.height=oldH;for(var y=0;y<el.rows.length;y++){for(var x=0;x<el.rows[y].cells.length;x++){var cn=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el.rows[y].cells[x],"class"),state&&bo);tinyMCE.setAttrib(el.rows[y].cells[x],"class",cn);}}break;case"A":var anchorName=tinyMCE.getAttrib(el,"name");if(anchorName!=''&&state){el.title=anchorName;el.className='mceItemAnchor';}else if(anchorName!=''&&!state)el.className='';break;}if(deep&&el.hasChildNodes()){for(var i=0;i<el.childNodes.length;i++)tinyMCE.handleVisualAid(el.childNodes[i],deep,state,inst,true);}},fixGeckoBaseHREFBug:function(m,e,h){var nl,i,a,n,xsrc,xhref,el;if(tinyMCE.isGecko){if(m==1){h=h.replace(/\ssrc=/gi," mce_tsrc=");h=h.replace(/\shref=/gi," mce_thref=");return h;}else{el=new Array('a','img','select','area','iframe','base','input','script','embed','object','link');for(a=0;a<el.length;a++){n=e.getElementsByTagName(el[a]);for(i=0;i<n.length;i++){xsrc=tinyMCE.getAttrib(n[i],"mce_tsrc");xhref=tinyMCE.getAttrib(n[i],"mce_thref");if(xsrc!=""){try{n[i].src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],xsrc);}catch(e){}n[i].removeAttribute("mce_tsrc");}if(xhref!=""){try{n[i].href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],xhref);}catch(e){}n[i].removeAttribute("mce_thref");}}}el=tinyMCE.selectNodes(e,function(n){if(n.nodeType==3||n.nodeType==8){n.nodeValue=n.nodeValue.replace(/\smce_tsrc=/gi," src=");n.nodeValue=n.nodeValue.replace(/\smce_thref=/gi," href=");}return false;});}}return h;},_setHTML:function(doc,html_content){html_content=tinyMCE.cleanupHTMLCode(html_content);try{tinyMCE.setInnerHTML(doc.body,html_content);}catch(e){if(this.isMSIE)doc.body.createTextRange().pasteHTML(html_content);}if(tinyMCE.isMSIE&&tinyMCE.settings['fix_content_duplication']){var paras=doc.getElementsByTagName("P");for(var i=0;i<paras.length;i++){var node=paras[i];while((node=node.parentNode)!=null){if(node.nodeName=="P")node.outerHTML=node.innerHTML;}}var html=doc.body.innerHTML;tinyMCE.setInnerHTML(doc.body,html);}tinyMCE.cleanupAnchors(doc);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);},getEditorId:function(form_element){var inst=this.getInstanceById(form_element);if(!inst)return null;return inst.editorId;},getInstanceById:function(editor_id){var inst=this.instances[editor_id];if(!inst){for(var n in tinyMCE.instances){var instance=tinyMCE.instances[n];if(!tinyMCE.isInstance(instance))continue;if(instance.formTargetElementId==editor_id){inst=instance;break;}}}return inst;},queryInstanceCommandValue:function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandValue(command);return false;},queryInstanceCommandState:function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandState(command);return null;},setWindowArg:function(n,v){this.windowArgs[n]=v;},getWindowArg:function(n,d){return(typeof(this.windowArgs[n])=="undefined")?d:this.windowArgs[n];},getCSSClasses:function(editor_id,doc){var output=new Array();if(typeof(tinyMCE.cssClasses)!="undefined")return tinyMCE.cssClasses;if(typeof(editor_id)=="undefined"&&typeof(doc)=="undefined"){var instance;for(var instanceName in tinyMCE.instances){instance=tinyMCE.instances[instanceName];if(!tinyMCE.isInstance(instance))continue;break;}doc=instance.getDoc();}if(typeof(doc)=="undefined"){var instance=tinyMCE.getInstanceById(editor_id);doc=instance.getDoc();}if(doc){var styles=doc.styleSheets;if(styles&&styles.length>0){for(var x=0;x<styles.length;x++){var csses=null;eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets("+x+").rules : styles["+x+"].cssRules;} catch(e) {}");if(!csses)return new Array();for(var i=0;i<csses.length;i++){var selectorText=csses[i].selectorText;if(selectorText){var rules=selectorText.split(',');for(var c=0;c<rules.length;c++){var rule=rules[c];while(rule.indexOf(' ')==0)rule=rule.substring(1);if(rule.indexOf(' ')!=-1||rule.indexOf(':')!=-1||rule.indexOf('mceItem')!=-1)continue;if(rule.indexOf(tinyMCE.settings['visual_table_class'])!=-1||rule.indexOf('mceEditable')!=-1||rule.indexOf('mceNonEditable')!=-1)continue;if(rule.indexOf('.')!=-1){var cssClass=rule.substring(rule.indexOf('.')+1);var addClass=true;for(var p=0;p<output.length&&addClass;p++){if(output[p]==cssClass)addClass=false;}if(addClass)output[output.length]=cssClass;}}}}}}}if(output.length>0)tinyMCE.cssClasses=output;return output;},regexpReplace:function(in_str,reg_exp,replace_str,opts){if(in_str==null)return in_str;if(typeof(opts)=="undefined")opts='g';var re=new RegExp(reg_exp,opts);return in_str.replace(re,replace_str);},trim:function(s){return s.replace(/^\s*|\s*$/g,"");},cleanupEventStr:function(s){s=""+s;s=s.replace('function anonymous()\n{\n','');s=s.replace('\n}','');s=s.replace(/^return true;/gi,'');return s;},getControlHTML:function(c){var i,l,n,o,v;l=tinyMCE.plugins;for(n in l){o=l[n];if(o.getControlHTML&&(v=o.getControlHTML(c))!='')return tinyMCE.replaceVar(v,"pluginurl",o.baseURL);}o=tinyMCE.themes[tinyMCE.settings['theme']];if(o.getControlHTML&&(v=o.getControlHTML(c))!='')return v;return'';},evalFunc:function(f,idx,a){var s='(',i;for(i=idx;i<a.length;i++){s+='a['+i+']';if(i<a.length-1)s+=',';}s+=');';return eval("f"+s);},dispatchCallback:function(i,p,n){return this.callFunc(i,p,n,0,this.dispatchCallback.arguments);},executeCallback:function(i,p,n){return this.callFunc(i,p,n,1,this.executeCallback.arguments);},execCommandCallback:function(i,p,n){return this.callFunc(i,p,n,2,this.execCommandCallback.arguments);},callFunc:function(ins,p,n,m,a){var l,i,on,o,s,v;s=m==2;l=tinyMCE.getParam(p,'');if(l!=''&&(v=tinyMCE.evalFunc(typeof(l)=="function"?l:eval(l),3,a))==s&&m>0)return true;if(ins!=null){for(i=0,l=ins.plugins;i<l.length;i++){o=tinyMCE.plugins[l[i]];if(o[n]&&(v=tinyMCE.evalFunc(o[n],3,a))==s&&m>0)return true;}}l=tinyMCE.themes;for(on in l){o=l[on];if(o[n]&&(v=tinyMCE.evalFunc(o[n],3,a))==s&&m>0)return true;}return false;},xmlEncode:function(s){s=""+s;s=s.replace(/&/g,'&amp;');s=s.replace(new RegExp('"','g'),'&quot;');s=s.replace(/\'/g,'&#39;');s=s.replace(/</g,'&lt;');s=s.replace(/>/g,'&gt;');return s;},extend:function(p,np){var o={};o.parent=p;for(n in p)o[n]=p[n];for(n in np)o[n]=np[n];return o;},hideMenus:function(){var e=tinyMCE.lastSelectedMenuBtn;if(tinyMCE.lastMenu){tinyMCE.lastMenu.hide();tinyMCE.lastMenu=null;}if(e){tinyMCE.switchClass(e,tinyMCE.lastMenuBtnClass);tinyMCE.lastSelectedMenuBtn=null;}},explode:function(d,s){var ar=s.split(d),oar=new Array(),i;for(i=0;i<ar.length;i++){if(ar[i]!="")oar[oar.length]=ar[i];}return oar;}};var TinyMCE=TinyMCE_Engine;var tinyMCE=new TinyMCE_Engine();var tinyMCELang={};function TinyMCE_Control(settings){var t,i,to,fu,p,x,fn,fu,pn,s=settings;this.undoRedoLevel=true;this.isTinyMCE_Control=true;this.settings=s;this.settings['theme']=tinyMCE.getParam("theme","default");this.settings['width']=tinyMCE.getParam("width",-1);this.settings['height']=tinyMCE.getParam("height",-1);this.selection=new TinyMCE_Selection(this);this.undoRedo=new TinyMCE_UndoRedo(this);this.cleanup=new TinyMCE_Cleanup();this.shortcuts=new Array();this.hasMouseMoved=false;this.cleanup.init({valid_elements:s.valid_elements,extended_valid_elements:s.extended_valid_elements,entities:s.entities,entity_encoding:s.entity_encoding,debug:s.cleanup_debug,url_converter:'TinyMCE_Cleanup.prototype._urlConverter',indent:s.apply_source_formatting,invalid_elements:s.invalid_elements,verify_html:s.verify_html,fix_content_duplication:s.fix_content_duplication});t=this.settings['theme'];if(!tinyMCE.hasTheme(t)){fn=tinyMCE.callbacks;to={};for(i=0;i<fn.length;i++){if((fu=window['TinyMCE_'+t+"_"+fn[i]]))to[fn[i]]=fu;}tinyMCE.addTheme(t,to);}this.plugins=new Array();p=tinyMCE.getParam('plugins','',true,',');if(p.length>0){for(i=0;i<p.length;i++){pn=p[i];if(pn.charAt(0)=='-')pn=pn.substring(1);if(!tinyMCE.hasPlugin(pn)){fn=tinyMCE.callbacks;to={};for(x=0;x<fn.length;x++){if((fu=window['TinyMCE_'+pn+"_"+fn[x]]))to[fn[x]]=fu;}tinyMCE.addPlugin(pn,to);}this.plugins[this.plugins.length]=pn;}}};TinyMCE_Control.prototype={hasPlugin:function(n){var i;for(i=0;i<this.plugins.length;i++){if(this.plugins[i]==n)return true;}return false;},addPlugin:function(n,p){if(!this.hasPlugin(n)){tinyMCE.addPlugin(n,p);this.plugins[this.plugins.length]=n;}},repaint:function(){if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return;try{var s=this.selection;var b=s.getBookmark(true);this.getBody().style.display='none';this.getDoc().execCommand('selectall',false,null);this.getSel().collapseToStart();this.getBody().style.display='block';s.moveToBookmark(b);}catch(ex){}},switchSettings:function(){if(tinyMCE.configs.length>1&&tinyMCE.currentConfig!=this.settings['index']){tinyMCE.settings=this.settings;tinyMCE.currentConfig=this.settings['index'];}},getBody:function(){return this.getDoc().body;},getDoc:function(){return this.contentWindow.document;},getWin:function(){return this.contentWindow;},addShortcut:function(m,k,d,cmd,ui,va){var n=typeof(k)=="number",ie=tinyMCE.isMSIE,c,sc,i;var scl=this.shortcuts;if(!tinyMCE.getParam('custom_shortcuts'))return false;m=m.toLowerCase();k=ie&&!n?k.toUpperCase():k;c=n?null:k.charCodeAt(0);d=d&&d.indexOf('lang_')==0?tinyMCE.getLang(d):d;sc={alt:m.indexOf('alt')!=-1,ctrl:m.indexOf('ctrl')!=-1,shift:m.indexOf('shift')!=-1,charCode:c,keyCode:n?k:(ie?c:null),desc:d,cmd:cmd,ui:ui,val:va};for(i=0;i<scl.length;i++){if(sc.alt==scl[i].alt&&sc.ctrl==scl[i].ctrl&&sc.shift==scl[i].shift&&sc.charCode==scl[i].charCode&&sc.keyCode==scl[i].keyCode){return false;}}scl[scl.length]=sc;return true;},handleShortcut:function(e){var i,s=this.shortcuts,o;for(i=0;i<s.length;i++){o=s[i];if(o.alt==e.altKey&&o.ctrl==e.ctrlKey&&(o.keyCode==e.keyCode||o.charCode==e.charCode)){if(o.cmd&&(e.type=="keydown"||(e.type=="keypress"&&!tinyMCE.isOpera)))tinyMCE.execCommand(o.cmd,o.ui,o.val);tinyMCE.cancelEvent(e);return true;}}return false;},autoResetDesignMode:function(){if(!tinyMCE.isMSIE&&this.isHidden()&&tinyMCE.getParam('auto_reset_designmode'))eval('try { this.getDoc().designMode = "On"; } catch(e) {}');},isHidden:function(){if(tinyMCE.isMSIE)return false;var s=this.getSel();return(!s||!s.rangeCount||s.rangeCount==0);},isDirty:function(){return this.startContent!=tinyMCE.trim(this.getBody().innerHTML)&&!tinyMCE.isNotDirty;},_mergeElements:function(scmd,pa,ch,override){if(scmd=="removeformat"){pa.className="";pa.style.cssText="";ch.className="";ch.style.cssText="";return;}var st=tinyMCE.parseStyle(tinyMCE.getAttrib(pa,"style"));var stc=tinyMCE.parseStyle(tinyMCE.getAttrib(ch,"style"));var className=tinyMCE.getAttrib(pa,"class");className+=" "+tinyMCE.getAttrib(ch,"class");if(override){for(var n in st){if(typeof(st[n])=='function')continue;stc[n]=st[n];}}else{for(var n in stc){if(typeof(stc[n])=='function')continue;st[n]=stc[n];}}tinyMCE.setAttrib(pa,"style",tinyMCE.serializeStyle(st));tinyMCE.setAttrib(pa,"class",tinyMCE.trim(className));ch.className="";ch.style.cssText="";ch.removeAttribute("class");ch.removeAttribute("style");},_setUseCSS:function(b){var d=this.getDoc();try{d.execCommand("useCSS",false,!b);}catch(ex){}try{d.execCommand("styleWithCSS",false,b);}catch(ex){}if(!tinyMCE.getParam("table_inline_editing"))try{d.execCommand('enableInlineTableEditing',false,"false");}catch(ex){}if(!tinyMCE.getParam("object_resizing"))try{d.execCommand('enableObjectResizing',false,"false");}catch(ex){}},execCommand:function(command,user_interface,value){var doc=this.getDoc();var win=this.getWin();var focusElm=this.getFocusElement();if(!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel','gi').test(command))this.undoBookmark=null;if(this.lastSafariSelection&&!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel','gi').test(command)){this.selection.moveToBookmark(this.lastSafariSelection);tinyMCE.selectedElement=this.lastSafariSelectedElement;}if(!tinyMCE.isMSIE&&!this.useCSS){this._setUseCSS(false);this.useCSS=true;}this.contentDocument=doc;if(tinyMCE.execCommandCallback(this,'execcommand_callback','execCommand',this.editorId,this.getBody(),command,user_interface,value))return;if(focusElm&&focusElm.nodeName=="IMG"){var align=focusElm.getAttribute('align');var img=command=="JustifyCenter"?focusElm.cloneNode(false):focusElm;switch(command){case"JustifyLeft":if(align=='left')img.removeAttribute('align');else img.setAttribute('align','left');var div=focusElm.parentNode;if(div&&div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;case"JustifyCenter":img.removeAttribute('align');var div=tinyMCE.getParentElement(focusElm,"div");if(div&&div.style.textAlign=="center"){if(div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);}else{var div=this.getDoc().createElement("div");div.style.textAlign='center';div.appendChild(img);focusElm.parentNode.replaceChild(div,focusElm);}this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;case"JustifyRight":if(align=='right')img.removeAttribute('align');else img.setAttribute('align','right');var div=focusElm.parentNode;if(div&&div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;}}if(tinyMCE.settings['force_br_newlines']){var alignValue="";if(doc.selection.type!="Control"){switch(command){case"JustifyLeft":alignValue="left";break;case"JustifyCenter":alignValue="center";break;case"JustifyFull":alignValue="justify";break;case"JustifyRight":alignValue="right";break;}if(alignValue!=""){var rng=doc.selection.createRange();if((divElm=tinyMCE.getParentElement(rng.parentElement(),"div"))!=null)divElm.setAttribute("align",alignValue);else if(rng.pasteHTML&&rng.htmlText.length>0)rng.pasteHTML('<div align="'+alignValue+'">'+rng.htmlText+"</div>");tinyMCE.triggerNodeChange();return;}}}switch(command){case"mceRepaint":this.repaint();return true;case"InsertUnorderedList":case"InsertOrderedList":var tag=(command=="InsertUnorderedList")?"ul":"ol";if(tinyMCE.isSafari)this.execCommand("mceInsertContent",false,"<"+tag+"><li>&nbsp;</li><"+tag+">");else this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();break;case"Strikethrough":if(tinyMCE.isSafari)this.execCommand("mceInsertContent",false,"<strike>"+this.selection.getSelectedHTML()+"</strike>");else this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();break;case"mceSelectNode":this.selection.selectNode(value);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=value;break;case"FormatBlock":if(value==null||value==""){var elm=tinyMCE.getParentElement(this.getFocusElement(),"p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp");if(elm)this.execCommand("mceRemoveNode",false,elm);}else{if(tinyMCE.isGecko&&new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>','gi').test(value))value=value.replace(/[^a-z]/gi,'');if(tinyMCE.isMSIE&&new RegExp('blockquote|code|samp','gi').test(value)){var b=this.selection.getBookmark();this.getDoc().execCommand("FormatBlock",false,'<p>');tinyMCE.renameElement(tinyMCE.getParentBlockElement(this.getFocusElement()),value);this.selection.moveToBookmark(b);}else this.getDoc().execCommand("FormatBlock",false,value);}tinyMCE.triggerNodeChange();break;case"mceRemoveNode":if(!value)value=tinyMCE.getParentElement(this.getFocusElement());if(tinyMCE.isMSIE){value.outerHTML=value.innerHTML;}else{var rng=value.ownerDocument.createRange();rng.setStartBefore(value);rng.setEndAfter(value);rng.deleteContents();rng.insertNode(rng.createContextualFragment(value.innerHTML));}tinyMCE.triggerNodeChange();break;case"mceSelectNodeDepth":var parentNode=this.getFocusElement();for(var i=0;parentNode;i++){if(parentNode.nodeName.toLowerCase()=="body")break;if(parentNode.nodeName.toLowerCase()=="#text"){i--;parentNode=parentNode.parentNode;continue;}if(i==value){this.selection.selectNode(parentNode,false);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=parentNode;return;}parentNode=parentNode.parentNode;}break;case"SetStyleInfo":var rng=this.getRng();var sel=this.getSel();var scmd=value['command'];var sname=value['name'];var svalue=value['value']==null?'':value['value'];var wrapper=value['wrapper']?value['wrapper']:"span";var parentElm=null;var invalidRe=new RegExp("^BODY|HTML$","g");var invalidParentsRe=tinyMCE.settings['merge_styles_invalid_parents']!=''?new RegExp(tinyMCE.settings['merge_styles_invalid_parents'],"gi"):null;if(tinyMCE.isMSIE){if(rng.item)parentElm=rng.item(0);else{var pelm=rng.parentElement();var prng=doc.selection.createRange();prng.moveToElementText(pelm);if(rng.htmlText==prng.htmlText||rng.boundingWidth==0){if(invalidParentsRe==null||!invalidParentsRe.test(pelm.nodeName))parentElm=pelm;}}}else{var felm=this.getFocusElement();if(sel.isCollapsed||(new RegExp('td|tr|tbody|table','gi').test(felm.nodeName)&&sel.anchorNode==felm.parentNode))parentElm=felm;}if(parentElm&&!invalidRe.test(parentElm.nodeName)){if(scmd=="setstyle")tinyMCE.setStyleAttrib(parentElm,sname,svalue);if(scmd=="setattrib")tinyMCE.setAttrib(parentElm,sname,svalue);if(scmd=="removeformat"){parentElm.style.cssText='';tinyMCE.setAttrib(parentElm,'class','');}var ch=tinyMCE.getNodeTree(parentElm,new Array(),1);for(var z=0;z<ch.length;z++){if(ch[z]==parentElm)continue;if(scmd=="setstyle")tinyMCE.setStyleAttrib(ch[z],sname,'');if(scmd=="setattrib")tinyMCE.setAttrib(ch[z],sname,'');if(scmd=="removeformat"){ch[z].style.cssText='';tinyMCE.setAttrib(ch[z],'class','');}}}else{this._setUseCSS(false);doc.execCommand("FontName",false,"#mce_temp_font#");var elementArray=tinyMCE.getElementsByAttributeValue(this.getBody(),"font","face","#mce_temp_font#");for(var x=0;x<elementArray.length;x++){elm=elementArray[x];if(elm){var spanElm=doc.createElement(wrapper);if(scmd=="setstyle")tinyMCE.setStyleAttrib(spanElm,sname,svalue);if(scmd=="setattrib")tinyMCE.setAttrib(spanElm,sname,svalue);if(scmd=="removeformat"){spanElm.style.cssText='';tinyMCE.setAttrib(spanElm,'class','');}if(elm.hasChildNodes()){for(var i=0;i<elm.childNodes.length;i++)spanElm.appendChild(elm.childNodes[i].cloneNode(true));}spanElm.setAttribute("mce_new","true");elm.parentNode.replaceChild(spanElm,elm);var ch=tinyMCE.getNodeTree(spanElm,new Array(),1);for(var z=0;z<ch.length;z++){if(ch[z]==spanElm)continue;if(scmd=="setstyle")tinyMCE.setStyleAttrib(ch[z],sname,'');if(scmd=="setattrib")tinyMCE.setAttrib(ch[z],sname,'');if(scmd=="removeformat"){ch[z].style.cssText='';tinyMCE.setAttrib(ch[z],'class','');}}}}}var nodes=doc.getElementsByTagName(wrapper);for(var i=nodes.length-1;i>=0;i--){var elm=nodes[i];var isNew=tinyMCE.getAttrib(elm,"mce_new")=="true";elm.removeAttribute("mce_new");if(elm.childNodes&&elm.childNodes.length==1&&elm.childNodes[0].nodeType==1){this._mergeElements(scmd,elm,elm.childNodes[0],isNew);continue;}if(elm.parentNode.childNodes.length==1&&!invalidRe.test(elm.nodeName)&&!invalidRe.test(elm.parentNode.nodeName)){if(invalidParentsRe==null||!invalidParentsRe.test(elm.parentNode.nodeName))this._mergeElements(scmd,elm.parentNode,elm,false);}}var nodes=doc.getElementsByTagName(wrapper);for(var i=nodes.length-1;i>=0;i--){var elm=nodes[i];var isEmpty=true;var tmp=doc.createElement("body");tmp.appendChild(elm.cloneNode(false));tmp.innerHTML=tmp.innerHTML.replace(new RegExp('style=""|class=""','gi'),'');if(new RegExp('<span>','gi').test(tmp.innerHTML)){for(var x=0;x<elm.childNodes.length;x++){if(elm.parentNode!=null)elm.parentNode.insertBefore(elm.childNodes[x].cloneNode(true),elm);}elm.parentNode.removeChild(elm);}}if(scmd=="removeformat")tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE.triggerNodeChange();break;case"FontName":if(value==null){var s=this.getSel();if(tinyMCE.isGecko&&s.isCollapsed){var f=tinyMCE.getParentElement(this.getFocusElement(),"font");if(f!=null)this.selection.selectNode(f,false);}this.getDoc().execCommand("RemoveFormat",false,null);if(f!=null&&tinyMCE.isGecko){var r=this.getRng().cloneRange();r.collapse(true);s.removeAllRanges();s.addRange(r);}}else this.getDoc().execCommand('FontName',false,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);return;case"FontSize":this.getDoc().execCommand('FontSize',false,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);return;case"forecolor":this.getDoc().execCommand('forecolor',false,value);break;case"HiliteColor":if(tinyMCE.isGecko){this._setUseCSS(true);this.getDoc().execCommand('hilitecolor',false,value);this._setUseCSS(false);}else this.getDoc().execCommand('BackColor',false,value);break;case"Cut":case"Copy":case"Paste":var cmdFailed=false;eval('try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}');if(tinyMCE.isOpera&&cmdFailed)alert('Currently not supported by your browser, use keyboard shortcuts instead.');if(tinyMCE.isGecko&&cmdFailed){if(confirm(tinyMCE.entityDecode(tinyMCE.getLang('lang_clipboard_msg'))))window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html','mceExternal');return;}else tinyMCE.triggerNodeChange();break;case"mceSetContent":if(!value)value="";value=tinyMCE.storeAwayURLs(value);value=tinyMCE._customCleanup(this,"insert_to_editor",value);tinyMCE._setHTML(doc,value);tinyMCE.setInnerHTML(doc.body,tinyMCE._cleanupHTML(this,doc,tinyMCE.settings,doc.body));tinyMCE.convertAllRelativeURLs(doc.body);tinyMCE._removeInternal(this.getBody());if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);tinyMCE.handleVisualAid(doc.body,true,this.visualAid,this);tinyMCE._setEventsEnabled(doc.body,false);return true;case"mceCleanup":var b=this.selection.getBookmark();tinyMCE._setHTML(this.contentDocument,this.getBody().innerHTML);tinyMCE.setInnerHTML(this.getBody(),tinyMCE._cleanupHTML(this,this.contentDocument,this.settings,this.getBody(),this.visualAid));tinyMCE.convertAllRelativeURLs(doc.body);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE._setEventsEnabled(this.getBody(),false);this.repaint();this.selection.moveToBookmark(b);tinyMCE.triggerNodeChange();break;case"mceReplaceContent":if(!value)value='';this.getWin().focus();var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=this.getSel().toString();if(selectedText.length>0){value=tinyMCE.replaceVar(value,"selection",selectedText);tinyMCE.execCommand('mceInsertContent',false,value);}tinyMCE.triggerNodeChange();break;case"mceSetAttribute":if(typeof(value)=='object'){var targetElms=(typeof(value['targets'])=="undefined")?"p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address":value['targets'];var targetNode=tinyMCE.getParentElement(this.getFocusElement(),targetElms);if(targetNode){targetNode.setAttribute(value['name'],value['value']);tinyMCE.triggerNodeChange();}}break;case"mceSetCSSClass":this.execCommand("SetStyleInfo",false,{command:"setattrib",name:"class",value:value});break;case"mceInsertRawHTML":var key='tiny_mce_marker';this.execCommand('mceBeginUndoLevel');this.execCommand('mceInsertContent',false,key);var scrollX=this.getDoc().body.scrollLeft+this.getDoc().documentElement.scrollLeft;var scrollY=this.getDoc().body.scrollTop+this.getDoc().documentElement.scrollTop;var html=this.getBody().innerHTML;if((pos=html.indexOf(key))!=-1)tinyMCE.setInnerHTML(this.getBody(),html.substring(0,pos)+value+html.substring(pos+key.length));this.contentWindow.scrollTo(scrollX,scrollY);this.execCommand('mceEndUndoLevel');break;case"mceInsertContent":if(!value)value='';var insertHTMLFailed=false;this.getWin().focus();if(tinyMCE.isGecko||tinyMCE.isOpera){try{if(value.indexOf('<')==-1&&!value.match(/(&#38;|&#160;|&#60;|&#62;)/g)){var r=this.getRng();var n=this.getDoc().createTextNode(tinyMCE.entityDecode(value));var s=this.getSel();var r2=r.cloneRange();s.removeAllRanges();r.deleteContents();r.insertNode(n);r2.selectNode(n);r2.collapse(false);s.removeAllRanges();s.addRange(r2);}else{value=tinyMCE.fixGeckoBaseHREFBug(1,this.getDoc(),value);this.getDoc().execCommand('inserthtml',false,value);tinyMCE.fixGeckoBaseHREFBug(2,this.getDoc(),value);}}catch(ex){insertHTMLFailed=true;}if(!insertHTMLFailed){tinyMCE.triggerNodeChange();return;}}if(tinyMCE.isOpera&&insertHTMLFailed){this.getDoc().execCommand("insertimage",false,tinyMCE.uniqueURL);var ar=tinyMCE.getElementsByAttributeValue(this.getBody(),"img","src",tinyMCE.uniqueURL);ar[0].outerHTML=value;return;}if(!tinyMCE.isMSIE){var isHTML=value.indexOf('<')!=-1;var sel=this.getSel();var rng=this.getRng();if(isHTML){if(tinyMCE.isSafari){var tmpRng=this.getDoc().createRange();tmpRng.setStart(this.getBody(),0);tmpRng.setEnd(this.getBody(),0);value=tmpRng.createContextualFragment(value);}else value=rng.createContextualFragment(value);}else{var el=document.createElement("div");el.innerHTML=value;value=el.firstChild.nodeValue;value=doc.createTextNode(value);}if(tinyMCE.isSafari&&!isHTML){this.execCommand('InsertText',false,value.nodeValue);tinyMCE.triggerNodeChange();return true;}else if(tinyMCE.isSafari&&isHTML){rng.deleteContents();rng.insertNode(value);tinyMCE.triggerNodeChange();return true;}rng.deleteContents();if(rng.startContainer.nodeType==3){var node=rng.startContainer.splitText(rng.startOffset);node.parentNode.insertBefore(value,node);}else rng.insertNode(value);if(!isHTML){sel.selectAllChildren(doc.body);sel.removeAllRanges();var rng=doc.createRange();rng.selectNode(value);rng.collapse(false);sel.addRange(rng);}else rng.collapse(false);tinyMCE.fixGeckoBaseHREFBug(2,this.getDoc(),value);}else{var rng=doc.selection.createRange();var c=value.indexOf('<!--')!=-1;if(c)value=tinyMCE.uniqueTag+value;if(rng.item)rng.item(0).outerHTML=value;else rng.pasteHTML(value);if(c){var e=this.getDoc().getElementById('mceTMPElement');e.parentNode.removeChild(e);}}tinyMCE.triggerNodeChange();break;case"mceStartTyping":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedo.typingUndoIndex==-1){this.undoRedo.typingUndoIndex=this.undoRedo.undoIndex;this.execCommand('mceAddUndoLevel');}break;case"mceEndTyping":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedo.typingUndoIndex!=-1){this.execCommand('mceAddUndoLevel');this.undoRedo.typingUndoIndex=-1;}break;case"mceBeginUndoLevel":this.undoRedoLevel=false;break;case"mceEndUndoLevel":this.undoRedoLevel=true;this.execCommand('mceAddUndoLevel');break;case"mceAddUndoLevel":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedoLevel){if(this.undoRedo.add())tinyMCE.triggerNodeChange(false);}break;case"Undo":if(tinyMCE.settings['custom_undo_redo']){tinyMCE.execCommand("mceEndTyping");this.undoRedo.undo();tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case"Redo":if(tinyMCE.settings['custom_undo_redo']){tinyMCE.execCommand("mceEndTyping");this.undoRedo.redo();tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case"mceToggleVisualAid":this.visualAid=!this.visualAid;tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE.triggerNodeChange();break;case"Indent":this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();if(tinyMCE.isMSIE){var n=tinyMCE.getParentElement(this.getFocusElement(),"blockquote");do{if(n&&n.nodeName=="BLOCKQUOTE"){n.removeAttribute("dir");n.removeAttribute("style");}}while(n!=null&&(n=n.parentNode)!=null);}break;case"removeformat":var text=this.selection.getSelectedText();if(tinyMCE.isOpera){this.getDoc().execCommand("RemoveFormat",false,null);return;}if(tinyMCE.isMSIE){try{var rng=doc.selection.createRange();rng.execCommand("RemoveFormat",false,null);}catch(e){}this.execCommand("SetStyleInfo",false,{command:"removeformat"});}else{this.getDoc().execCommand(command,user_interface,value);this.execCommand("SetStyleInfo",false,{command:"removeformat"});}if(text.length==0)this.execCommand("mceSetCSSClass",false,"");tinyMCE.triggerNodeChange();break;default:this.getDoc().execCommand(command,user_interface,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);else tinyMCE.triggerNodeChange();}if(command!="mceAddUndoLevel"&&command!="Undo"&&command!="Redo"&&command!="mceStartTyping"&&command!="mceEndTyping")tinyMCE.execCommand("mceAddUndoLevel");},queryCommandValue:function(c){try{return this.getDoc().queryCommandValue(c);}catch(e){return null;}},queryCommandState:function(c){return this.getDoc().queryCommandState(c);},_onAdd:function(replace_element,form_element_name,target_document){var hc,th,to,editorTemplate;th=this.settings['theme'];to=tinyMCE.themes[th];var targetDoc=target_document?target_document:document;this.targetDoc=targetDoc;tinyMCE.themeURL=tinyMCE.baseURL+"/themes/"+this.settings['theme'];this.settings['themeurl']=tinyMCE.themeURL;if(!replace_element){alert("Error: Could not find the target element.");return false;}if(to.getEditorTemplate)editorTemplate=to.getEditorTemplate(this.settings,this.editorId);var deltaWidth=editorTemplate['delta_width']?editorTemplate['delta_width']:0;var deltaHeight=editorTemplate['delta_height']?editorTemplate['delta_height']:0;var html='<span id="'+this.editorId+'_parent" class="mceEditorContainer">'+editorTemplate['html'];html=tinyMCE.replaceVar(html,"editor_id",this.editorId);this.settings['default_document']=tinyMCE.baseURL+"/blank.htm";this.settings['old_width']=this.settings['width'];this.settings['old_height']=this.settings['height'];if(this.settings['width']==-1)this.settings['width']=replace_element.offsetWidth;if(this.settings['height']==-1)this.settings['height']=replace_element.offsetHeight;if(this.settings['width']==0)this.settings['width']=replace_element.style.width;if(this.settings['height']==0)this.settings['height']=replace_element.style.height;if(this.settings['width']==0)this.settings['width']=320;if(this.settings['height']==0)this.settings['height']=240;this.settings['area_width']=parseInt(this.settings['width']);this.settings['area_height']=parseInt(this.settings['height']);this.settings['area_width']+=deltaWidth;this.settings['area_height']+=deltaHeight;if((""+this.settings['width']).indexOf('%')!=-1)this.settings['area_width']="100%";if((""+this.settings['height']).indexOf('%')!=-1)this.settings['area_height']="100%";if((""+replace_element.style.width).indexOf('%')!=-1){this.settings['width']=replace_element.style.width;this.settings['area_width']="100%";}if((""+replace_element.style.height).indexOf('%')!=-1){this.settings['height']=replace_element.style.height;this.settings['area_height']="100%";}html=tinyMCE.applyTemplate(html);this.settings['width']=this.settings['old_width'];this.settings['height']=this.settings['old_height'];this.visualAid=this.settings['visual'];this.formTargetElementId=form_element_name;if(replace_element.nodeName=="TEXTAREA"||replace_element.nodeName=="INPUT")this.startContent=replace_element.value;else this.startContent=replace_element.innerHTML;if(replace_element.nodeName!="TEXTAREA"&&replace_element.nodeName!="INPUT"){this.oldTargetElement=replace_element;if(tinyMCE.settings['debug']){hc='<textarea wrap="off" id="'+form_element_name+'" name="'+form_element_name+'" cols="100" rows="15"></textarea>';}else{hc='<input type="hidden" id="'+form_element_name+'" name="'+form_element_name+'" />';this.oldTargetElement.style.display="none";}html+='</span>';if(tinyMCE.isGecko)html=hc+html;else html+=hc;if(tinyMCE.isGecko){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);tinyMCE.insertAfter(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}else{html+='</span>';this.oldTargetElement=replace_element;if(!tinyMCE.settings['debug'])this.oldTargetElement.style.display="none";if(tinyMCE.isGecko){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);tinyMCE.insertAfter(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}var dynamicIFrame=false;var tElm=targetDoc.getElementById(this.editorId);if(!tinyMCE.isMSIE){if(tElm&&(tElm.nodeName=="SPAN"||tElm.nodeName=="span")){tElm=tinyMCE._createIFrame(tElm,targetDoc);dynamicIFrame=true;}this.targetElement=tElm;this.iframeElement=tElm;this.contentDocument=tElm.contentDocument;this.contentWindow=tElm.contentWindow;}else{if(tElm&&tElm.nodeName=="SPAN")tElm=tinyMCE._createIFrame(tElm,targetDoc,targetDoc.parentWindow);else tElm=targetDoc.frames[this.editorId];this.targetElement=tElm;this.iframeElement=targetDoc.getElementById(this.editorId);if(tinyMCE.isOpera){this.contentDocument=this.iframeElement.contentDocument;this.contentWindow=this.iframeElement.contentWindow;dynamicIFrame=true;}else{this.contentDocument=tElm.window.document;this.contentWindow=tElm.window;}this.getDoc().designMode="on";}var doc=this.contentDocument;if(dynamicIFrame){var html=tinyMCE.getParam('doctype')+'<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="'+tinyMCE.settings['base_href']+'" /><title>blank_page</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body class="mceContentBody"></body></html>';try{if(!this.isHidden())this.getDoc().designMode="on";doc.open();doc.write(html);doc.close();}catch(e){this.getDoc().location.href=tinyMCE.baseURL+"/blank.htm";}}if(tinyMCE.isMSIE)window.setTimeout("tinyMCE.addEventHandlers(tinyMCE.instances[\""+this.editorId+"\"]);",1);tinyMCE.setupContent(this.editorId,true);return true;},setBaseHREF:function(u){var h,b,d,nl;d=this.getDoc();nl=d.getElementsByTagName("base");b=nl.length>0?nl[0]:null;if(!b){nl=d.getElementsByTagName("head");h=nl.length>0?nl[0]:null;b=d.createElement("base");b.setAttribute('href',u);h.appendChild(b);}else{if(u==""||u==null)b.parentNode.removeChild(b);else b.setAttribute('href',u);}},getFocusElement:function(){return this.selection.getFocusElement();},getSel:function(){return this.selection.getSel();},getRng:function(){return this.selection.getRng();},triggerSave:function(skip_cleanup,skip_callback){var e,nl=new Array(),i,s;this.switchSettings();s=tinyMCE.settings;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){e=this.iframeElement;do{if(e.style&&e.style.display=='none'){e.style.display='block';nl[nl.length]={elm:e,type:'style'};}if(e.style&&s.hidden_tab_class.length>0&&e.className.indexOf(s.hidden_tab_class)!=-1){e.className=s.display_tab_class;nl[nl.length]={elm:e,type:'class'};}}while((e=e.parentNode)!=null)}tinyMCE.settings['preformatted']=false;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;tinyMCE._setHTML(this.getDoc(),this.getBody().innerHTML);if(this.settings['cleanup']==false){tinyMCE.handleVisualAid(this.getBody(),true,false,this);tinyMCE._setEventsEnabled(this.getBody(),true);}tinyMCE._customCleanup(this,"submit_content_dom",this.contentWindow.document.body);var htm=skip_cleanup?this.getBody().innerHTML:tinyMCE._cleanupHTML(this,this.getDoc(),this.settings,this.getBody(),tinyMCE.visualAid,true,true);htm=tinyMCE._customCleanup(this,"submit_content",htm);if(!skip_callback&&tinyMCE.settings['save_callback']!="")var content=eval(tinyMCE.settings['save_callback']+"(this.formTargetElementId,htm,this.getBody());");if((typeof(content)!="undefined")&&content!=null)htm=content;htm=tinyMCE.regexpReplace(htm,"&#40;","(","gi");htm=tinyMCE.regexpReplace(htm,"&#41;",")","gi");htm=tinyMCE.regexpReplace(htm,"&#59;",";","gi");htm=tinyMCE.regexpReplace(htm,"&#34;","&quot;","gi");htm=tinyMCE.regexpReplace(htm,"&#94;","^","gi");if(this.formElement)this.formElement.value=htm;if(tinyMCE.isSafari&&this.formElement)this.formElement.innerText=htm;for(i=0;i<nl.length;i++){if(nl[i].type=='style')nl[i].elm.style.display='none';else nl[i].elm.className=s.hidden_tab_class;}}};TinyMCE_Engine.prototype.cleanupHTMLCode=function(s){s=s.replace(new RegExp('<p \\/>','gi'),'<p>&nbsp;</p>');s=s.replace(new RegExp('<p>\\s*<\\/p>','gi'),'<p>&nbsp;</p>');s=s.replace(new RegExp('<br>\\s*<\\/br>','gi'),'<br />');s=s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>','gi'),'<$1$2$3></$1$2>');s=s.replace(new RegExp('\\s+></','gi'),'></');s=s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>','gi'),'<$1$2 />');if(tinyMCE.isMSIE)s=s.replace(new RegExp('<p><hr \\/><\\/p>','gi'),"<hr>");if(tinyMCE.getParam('convert_urls'))s=s.replace(new RegExp('(href=\"{0,1})(\\s*#)','gi'),'$1'+tinyMCE.settings['document_base_url']+"#");return s;};TinyMCE_Engine.prototype.parseStyle=function(str){var ar=new Array();if(str==null)return ar;var st=str.split(';');tinyMCE.clearArray(ar);for(var i=0;i<st.length;i++){if(st[i]=='')continue;var re=new RegExp('^\\s*([^:]*):\\s*(.*)\\s*$');var pa=st[i].replace(re,'$1||$2').split('||');if(pa.length==2)ar[pa[0].toLowerCase()]=pa[1];}return ar;};TinyMCE_Engine.prototype.compressStyle=function(ar,pr,sf,res){var box=new Array();box[0]=ar[pr+'-top'+sf];box[1]=ar[pr+'-left'+sf];box[2]=ar[pr+'-right'+sf];box[3]=ar[pr+'-bottom'+sf];for(var i=0;i<box.length;i++){if(box[i]==null)return;for(var a=0;a<box.length;a++){if(box[a]!=box[i])return;}}ar[res]=box[0];ar[pr+'-top'+sf]=null;ar[pr+'-left'+sf]=null;ar[pr+'-right'+sf]=null;ar[pr+'-bottom'+sf]=null;};TinyMCE_Engine.prototype.serializeStyle=function(ar){var str="";tinyMCE.compressStyle(ar,"border","","border");tinyMCE.compressStyle(ar,"border","-width","border-width");tinyMCE.compressStyle(ar,"border","-color","border-color");tinyMCE.compressStyle(ar,"border","-style","border-style");tinyMCE.compressStyle(ar,"padding","","padding");tinyMCE.compressStyle(ar,"margin","","margin");for(var key in ar){var val=ar[key];if(typeof(val)=='function')continue;if(key.indexOf('mso-')==0)continue;if(val!=null&&val!=''){val=''+val;val=val.replace(new RegExp("url\\(\\'?([^\\']*)\\'?\\)",'gi'),"url('$1')");if(val.indexOf('url(')!=-1&&tinyMCE.getParam('convert_urls')){var m=new RegExp("url\\('(.*?)'\\)").exec(val);if(m.length>1)val="url('"+eval(tinyMCE.getParam('urlconverter_callback')+"(m[1], null, true);")+"')";}if(tinyMCE.getParam("force_hex_style_colors"))val=tinyMCE.convertRGBToHex(val,true);if(val!="url('')")str+=key.toLowerCase()+": "+val+"; ";}}if(new RegExp('; $').test(str))str=str.substring(0,str.length-2);return str;};TinyMCE_Engine.prototype.convertRGBToHex=function(s,k){if(s.toLowerCase().indexOf('rgb')!=-1){var re=new RegExp("(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)","gi");var rgb=s.replace(re,"$1,$2,$3,$4,$5").split(',');if(rgb.length==5){r=parseInt(rgb[1]).toString(16);g=parseInt(rgb[2]).toString(16);b=parseInt(rgb[3]).toString(16);r=r.length==1?'0'+r:r;g=g.length==1?'0'+g:g;b=b.length==1?'0'+b:b;s="#"+r+g+b;if(k)s=rgb[0]+s+rgb[4];}}return s;};TinyMCE_Engine.prototype.convertHexToRGB=function(s){if(s.indexOf('#')!=-1){s=s.replace(new RegExp('[^0-9A-F]','gi'),'');return"rgb("+parseInt(s.substring(0,2),16)+","+parseInt(s.substring(2,4),16)+","+parseInt(s.substring(4,6),16)+")";}return s;};TinyMCE_Engine.prototype.convertSpansToFonts=function(doc){var sizes=tinyMCE.getParam('font_size_style_values').replace(/\s+/,'').split(',');var h=doc.body.innerHTML;h=h.replace(/<span/gi,'<font');h=h.replace(/<\/span/gi,'</font');doc.body.innerHTML=h;var s=doc.getElementsByTagName("font");for(var i=0;i<s.length;i++){var size=tinyMCE.trim(s[i].style.fontSize).toLowerCase();var fSize=0;for(var x=0;x<sizes.length;x++){if(sizes[x]==size){fSize=x+1;break;}}if(fSize>0){tinyMCE.setAttrib(s[i],'size',fSize);s[i].style.fontSize='';}var fFace=s[i].style.fontFamily;if(fFace!=null&&fFace!=""){tinyMCE.setAttrib(s[i],'face',fFace);s[i].style.fontFamily='';}var fColor=s[i].style.color;if(fColor!=null&&fColor!=""){tinyMCE.setAttrib(s[i],'color',tinyMCE.convertRGBToHex(fColor));s[i].style.color='';}}};TinyMCE_Engine.prototype.convertFontsToSpans=function(doc){var sizes=tinyMCE.getParam('font_size_style_values').replace(/\s+/,'').split(',');var h=doc.body.innerHTML;h=h.replace(/<font/gi,'<span');h=h.replace(/<\/font/gi,'</span');doc.body.innerHTML=h;var fsClasses=tinyMCE.getParam('font_size_classes');if(fsClasses!='')fsClasses=fsClasses.replace(/\s+/,'').split(',');else fsClasses=null;var s=doc.getElementsByTagName("span");for(var i=0;i<s.length;i++){var fSize,fFace,fColor;fSize=tinyMCE.getAttrib(s[i],'size');fFace=tinyMCE.getAttrib(s[i],'face');fColor=tinyMCE.getAttrib(s[i],'color');if(fSize!=""){fSize=parseInt(fSize);if(fSize>0&&fSize<8){if(fsClasses!=null)tinyMCE.setAttrib(s[i],'class',fsClasses[fSize-1]);else s[i].style.fontSize=sizes[fSize-1];}s[i].removeAttribute('size');}if(fFace!=""){s[i].style.fontFamily=fFace;s[i].removeAttribute('face');}if(fColor!=""){s[i].style.color=fColor;s[i].removeAttribute('color');}}};TinyMCE_Engine.prototype.cleanupAnchors=function(doc){var i,cn,x,an=doc.getElementsByTagName("a");for(i=an.length-1;i>=0;i--){if(tinyMCE.getAttrib(an[i],"name")!=""&&tinyMCE.getAttrib(an[i],"href")==""){cn=an[i].childNodes;for(x=cn.length-1;x>=0;x--)tinyMCE.insertAfter(cn[x],an[i]);}}};TinyMCE_Engine.prototype.getContent=function(editor_id){var h;if(typeof(editor_id)!="undefined")tinyMCE.selectedInstance=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedInstance){h=tinyMCE._cleanupHTML(this.selectedInstance,this.selectedInstance.getDoc(),tinyMCE.settings,this.selectedInstance.getBody(),false,true);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(this.selectedInstance.getDoc());return h;}return null;};TinyMCE_Engine.prototype._fixListElements=function(d){var nl,x,a=['ol','ul'],i,n,p,r=new RegExp('^(OL|UL)$'),np;for(x=0;x<a.length;x++){nl=d.getElementsByTagName(a[x]);for(i=0;i<nl.length;i++){n=nl[i];p=n.parentNode;if(r.test(p.nodeName)){np=tinyMCE.prevNode(n,'LI');if(!np){np=d.createElement('li');np.innerHTML='&nbsp;';np.appendChild(n);p.insertBefore(np,p.firstChild);}else np.appendChild(n);}}}};TinyMCE_Engine.prototype._fixTables=function(d){var nl,i,n,p,np,x,t;nl=d.getElementsByTagName('table');for(i=0;i<nl.length;i++){n=nl[i];if((p=tinyMCE.getParentElement(n,'p,div,h1,h2,h3,h4,h5,h6'))!=null){np=p.cloneNode(false);np.removeAttribute('id');t=n;while((n=n.nextSibling))np.appendChild(n);tinyMCE.insertAfter(np,p);tinyMCE.insertAfter(t,p);}}};TinyMCE_Engine.prototype._cleanupHTML=function(inst,doc,config,elm,visual,on_save,on_submit){var h,d,t1,t2,t3,t4,t5,c,s;if(!tinyMCE.getParam('cleanup'))return elm.innerHTML;on_save=typeof(on_save)=='undefined'?false:on_save;c=inst.cleanup;s=inst.settings;d=c.settings.debug;if(d)t1=new Date().getTime();if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertFontsToSpans(doc);if(tinyMCE.getParam("fix_list_elements"))tinyMCE._fixListElements(doc);if(tinyMCE.getParam("fix_table_elements"))tinyMCE._fixTables(doc);tinyMCE._customCleanup(inst,on_save?"get_from_editor_dom":"insert_to_editor_dom",doc.body);if(d)t2=new Date().getTime();c.settings.on_save=on_save;c.idCount=0;c.serializationId++;c.serializedNodes=new Array();c.sourceIndex=-1;if(s.cleanup_serializer=="xml")h=c.serializeNodeAsXML(elm);else h=c.serializeNodeAsHTML(elm);if(d)t3=new Date().getTime();h=h.replace(/<\/?(body|head|html)[^>]*>/gi,'');h=h.replace(new RegExp(' (rowspan="1"|colspan="1")','g'),'');h=h.replace(/<p><hr \/><\/p>/g,'<hr />');h=h.replace(/<p>(&nbsp;|&#160;)<\/p><hr \/><p>(&nbsp;|&#160;)<\/p>/g,'<hr />');h=h.replace(/<td>\s*<br \/>\s*<\/td>/g,'<td>&nbsp;</td>');h=h.replace(/<p>\s*<br \/>\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*(&nbsp;|&#160;)\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*<br \/>\s*&nbsp;\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(new RegExp('<a>(.*?)<\\/a>','g'),'$1');h=h.replace(/<p([^>]*)>\s*<\/p>/g,'<p$1>&nbsp;</p>');if(/^\s*(<br \/>|<p>&nbsp;<\/p>|<p>&#160;<\/p>|<p><\/p>)\s*$/.test(h))h='';if(s.preformatted){h=h.replace(/^<pre>/,'');h=h.replace(/<\/pre>$/,'');h='<pre>'+h+'</pre>';}if(tinyMCE.isGecko){h=h.replace(/<o:p _moz-userdefined="" \/>/g,'');h=h.replace(/<td([^>]*)>\s*<br \/>\s*<\/td>/g,'<td$1>&nbsp;</td>');}if(s.force_br_newlines)h=h.replace(/<p>(&nbsp;|&#160;)<\/p>/g,'<br />');h=tinyMCE._customCleanup(inst,on_save?"get_from_editor":"insert_to_editor",h);if(on_save){h=h.replace(new RegExp(' ?(mceItem[a-zA-Z0-9]*|'+s.visual_table_class+')','g'),'');h=h.replace(new RegExp(' ?class=""','g'),'');}if(s.remove_linebreaks&&!c.settings.indent)h=h.replace(/\n|\r/g,' ');if(d)t4=new Date().getTime();if(on_save&&c.settings.indent)h=c.formatHTML(h);if(on_submit&&(s.encoding=="xml"||s.encoding=="html"))h=c.xmlEncode(h);if(d)t5=new Date().getTime();if(c.settings.debug)tinyMCE.debug("Cleanup in ms: Pre="+(t2-t1)+", Serialize: "+(t3-t2)+", Post: "+(t4-t3)+", Format: "+(t5-t4)+", Sum: "+(t5-t1)+".");return h;};function TinyMCE_Cleanup(){this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.rules=tinyMCE.clearArray(new Array());this.settings={indent_elements:'head,table,tbody,thead,tfoot,form,tr,ul,ol,blockquote,object',newline_before_elements:'h1,h2,h3,h4,h5,h6,pre,address,div,ul,ol,li,meta,option,area,title,link,base,script,td',newline_after_elements:'br,hr,p,pre,address,div,ul,ol,meta,option,area,link,base,script',newline_before_after_elements:'html,head,body,table,thead,tbody,tfoot,tr,form,ul,ol,blockquote,p,object,param,hr,div',indent_char:'\t',indent_levels:1,entity_encoding:'raw',valid_elements:'*[*]',entities:'',url_converter:'',invalid_elements:'',verify_html:false};this.vElements=tinyMCE.clearArray(new Array());this.vElementsRe='';this.closeElementsRe=/^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON|AREA)$/;this.codeElementsRe=/^(SCRIPT|STYLE)$/;this.serializationId=0;this.mceAttribs={href:'mce_href',src:'mce_src',type:'mce_type'};}TinyMCE_Cleanup.prototype={init:function(s){var n,a,i,ir,or,st;for(n in s)this.settings[n]=s[n];s=this.settings;this.inRe=this._arrayToRe(s.indent_elements.split(','),'','^<(',')[^>]*');this.ouRe=this._arrayToRe(s.indent_elements.split(','),'','^<\\/(',')[^>]*');this.nlBeforeRe=this._arrayToRe(s.newline_before_elements.split(','),'gi','<(',')([^>]*)>');this.nlAfterRe=this._arrayToRe(s.newline_after_elements.split(','),'gi','<(',')([^>]*)>');this.nlBeforeAfterRe=this._arrayToRe(s.newline_before_after_elements.split(','),'gi','<(\\/?)(',')([^>]*)>');if(s.invalid_elements!='')this.iveRe=this._arrayToRe(s.invalid_elements.toUpperCase().split(','),'g','^(',')$');else this.iveRe=null;st='';for(i=0;i<s.indent_levels;i++)st+=s.indent_char;this.inStr=st;if(!s.verify_html){s.valid_elements='*[*]';s.extended_valid_elements='';}this.fillStr=s.entity_encoding=="named"?"&nbsp;":"&#160;";this.idCount=0;},addRuleStr:function(s){var r=this.parseRuleStr(s);var n;for(n in r){if(r[n])this.rules[n]=r[n];}this.vElements=tinyMCE.clearArray(new Array());for(n in this.rules){if(this.rules[n])this.vElements[this.vElements.length]=this.rules[n].tag;}this.vElementsRe=this._arrayToRe(this.vElements,'');},parseRuleStr:function(s){var ta,p,r,a,i,x,px,t,tn,y,av,or=tinyMCE.clearArray(new Array()),dv;if(s==null||s.length==0)return or;ta=s.split(',');for(x=0;x<ta.length;x++){s=ta[x];if(s.length==0)continue;p=this.split(/\[|\]/,s);if(p==null||p.length<1)t=s.toUpperCase();else t=p[0].toUpperCase();tn=this.split('/',t);for(y=0;y<tn.length;y++){r={};r.tag=tn[y];r.forceAttribs=null;r.defaultAttribs=null;r.validAttribValues=null;px=r.tag.charAt(0);r.forceOpen=px=='+';r.removeEmpty=px=='-';r.fill=px=='#';r.tag=r.tag.replace(/\+|-|#/g,'');r.oTagName=tn[0].replace(/\+|-|#/g,'').toLowerCase();r.isWild=new RegExp('\\*|\\?|\\+','g').test(r.tag);r.validRe=new RegExp(this._wildcardToRe('^'+r.tag+'$'));if(p.length>1){r.vAttribsRe='^(';a=this.split(/\|/,p[1]);for(i=0;i<a.length;i++){t=a[i];av=new RegExp('(=|:|<)(.*?)$').exec(t);t=t.replace(new RegExp('(=|:|<).*?$'),'');if(av&&av.length>0){if(av[0].charAt(0)==':'){if(!r.forceAttribs)r.forceAttribs=tinyMCE.clearArray(new Array());r.forceAttribs[t.toLowerCase()]=av[0].substring(1);}else if(av[0].charAt(0)=='='){if(!r.defaultAttribs)r.defaultAttribs=tinyMCE.clearArray(new Array());dv=av[0].substring(1);r.defaultAttribs[t.toLowerCase()]=dv==""?"mce_empty":dv;}else if(av[0].charAt(0)=='<'){if(!r.validAttribValues)r.validAttribValues=tinyMCE.clearArray(new Array());r.validAttribValues[t.toLowerCase()]=this._arrayToRe(this.split('?',av[0].substring(1)),'');}}r.vAttribsRe+=''+t.toLowerCase()+(i!=a.length-1?'|':'');a[i]=t.toLowerCase();}r.vAttribsRe+=')$';r.vAttribsRe=this._wildcardToRe(r.vAttribsRe);r.vAttribsReIsWild=new RegExp('\\*|\\?|\\+','g').test(r.vAttribsRe);r.vAttribsRe=new RegExp(r.vAttribsRe);r.vAttribs=a.reverse();}else{r.vAttribsRe='';r.vAttribs=tinyMCE.clearArray(new Array());r.vAttribsReIsWild=false;}or[r.tag]=r;}}return or;},serializeNodeAsXML:function(n){var s,b;if(!this.xmlDoc){if(this.isMSIE){try{this.xmlDoc=new ActiveXObject('MSXML2.DOMDocument');}catch(e){}if(!this.xmlDoc)try{this.xmlDoc=new ActiveXObject('Microsoft.XmlDom');}catch(e){}}else this.xmlDoc=document.implementation.createDocument('','',null);if(!this.xmlDoc)alert("Error XML Parser could not be found.");}if(this.xmlDoc.firstChild)this.xmlDoc.removeChild(this.xmlDoc.firstChild);b=this.xmlDoc.createElement("html");b=this.xmlDoc.appendChild(b);this._convertToXML(n,b);if(this.isMSIE)return this.xmlDoc.xml;else return new XMLSerializer().serializeToString(this.xmlDoc);},_convertToXML:function(n,xn){var xd,el,i,l,cn,at,no,hc=false;if(this._isDuplicate(n))return;xd=this.xmlDoc;switch(n.nodeType){case 1:hc=n.hasChildNodes();el=xd.createElement(n.nodeName.toLowerCase());at=n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified&&no.nodeValue)el.setAttribute(no.nodeName.toLowerCase(),no.nodeValue);}if(!hc&&!this.closeElementsRe.test(n.nodeName))el.appendChild(xd.createTextNode(""));xn=xn.appendChild(el);break;case 3:xn.appendChild(xd.createTextNode(n.nodeValue));return;case 8:xn.appendChild(xd.createComment(n.nodeValue));return;}if(hc){cn=n.childNodes;for(i=0,l=cn.length;i<l;i++)this._convertToXML(cn[i],xn);}},serializeNodeAsHTML:function(n){var en,no,h='',i,l,r,cn,va=false,f=false,at,hc;this._setupRules();if(this._isDuplicate(n))return'';switch(n.nodeType){case 1:hc=n.hasChildNodes();if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&n.nodeName.indexOf('/')!=-1)break;if(this.vElementsRe.test(n.nodeName)&&(!this.iveRe||!this.iveRe.test(n.nodeName))){va=true;r=this.rules[n.nodeName];if(!r){at=this.rules;for(no in at){if(at[no]&&at[no].validRe.test(n.nodeName)){r=at[no];break;}}}en=r.isWild?n.nodeName.toLowerCase():r.oTagName;f=r.fill;if(r.removeEmpty&&!hc)return"";h+='<'+en;if(r.vAttribsReIsWild){at=n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified&&r.vAttribsRe.test(no.nodeName))h+=this._serializeAttribute(n,r,no.nodeName);}}else{for(i=r.vAttribs.length-1;i>-1;i--)h+=this._serializeAttribute(n,r,r.vAttribs[i]);}if(!this.settings.on_save){at=this.mceAttribs;for(no in at){if(at[no])h+=this._serializeAttribute(n,r,at[no]);}}if(this.closeElementsRe.test(n.nodeName))return h+' />';h+='>';if(this.isMSIE&&this.codeElementsRe.test(n.nodeName))h+=n.innerHTML;}break;case 3:if(n.parentNode&&this.codeElementsRe.test(n.parentNode.nodeName))return this.isMSIE?'':n.nodeValue;return this.xmlEncode(n.nodeValue);case 8:return"<!--"+this._trimComment(n.nodeValue)+"-->";}if(hc){cn=n.childNodes;for(i=0,l=cn.length;i<l;i++)h+=this.serializeNodeAsHTML(cn[i]);}if(f&&!hc)h+=this.fillStr;if(va)h+='</'+en+'>';return h;},_serializeAttribute:function(n,r,an){var av='',t,os=this.settings.on_save;if(os&&(an.indexOf('mce_')==0||an.indexOf('_moz')==0))return'';if(os&&this.mceAttribs[an])av=this._getAttrib(n,this.mceAttribs[an]);if(av.length==0)av=this._getAttrib(n,an);if(av.length==0&&r.defaultAttribs&&(t=r.defaultAttribs[an])){av=t;if(av=="mce_empty")return" "+an+'=""';}if(r.forceAttribs&&(t=r.forceAttribs[an]))av=t;if(os&&av.length!=0&&this.settings.url_converter.length!=0&&/^(src|href|longdesc)$/.test(an))av=eval(this.settings.url_converter+'(this, n, av)');if(av.length!=0&&r.validAttribValues&&r.validAttribValues[an]&&!r.validAttribValues[an].test(av))return"";if(av.length!=0&&av=="{$uid}")av="uid_"+(this.idCount++);if(av.length!=0)return" "+an+"="+'"'+this.xmlEncode(av)+'"';return"";},formatHTML:function(h){var s=this.settings,p='',i=0,li=0,o='',l;h=h.replace(/\r/g,'');h='\n'+h;h=h.replace(new RegExp('\\n\\s+','gi'),'\n');h=h.replace(this.nlBeforeRe,'\n<$1$2>');h=h.replace(this.nlAfterRe,'<$1$2>\n');h=h.replace(this.nlBeforeAfterRe,'\n<$1$2$3>\n');h+='\n';while((i=h.indexOf('\n',i+1))!=-1){if((l=h.substring(li+1,i)).length!=0){if(this.ouRe.test(l)&&p.length>=s.indent_levels)p=p.substring(s.indent_levels);o+=p+l+'\n';if(this.inRe.test(l))p+=this.inStr;}li=i;}return o;},xmlEncode:function(s){var i,l,e,o='',c;this._setupEntities();switch(this.settings.entity_encoding){case"raw":return tinyMCE.xmlEncode(s);case"named":for(i=0,l=s.length;i<l;i++){c=s.charCodeAt(i);e=this.entities[c];if(e&&e!='')o+='&'+e+';';else o+=String.fromCharCode(c);}return o;case"numeric":for(i=0,l=s.length;i<l;i++){c=s.charCodeAt(i);if(c>127||c==60||c==62||c==38||c==39||c==34)o+='&#'+c+";";else o+=String.fromCharCode(c);}return o;}return s;},split:function(re,s){var c=s.split(re);var i,l,o=new Array();for(i=0,l=c.length;i<l;i++){if(c[i]!='')o[i]=c[i];}return o;},_trimComment:function(s){s=s.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");s=s.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");return s;},_getAttrib:function(e,n,d){if(typeof(d)=="undefined")d="";if(!e||e.nodeType!=1)return d;var v=e.getAttribute(n,0);if(n=="class"&&!v)v=e.className;if(this.isMSIE&&n=="http-equiv")v=e.httpEquiv;if(this.isMSIE&&e.nodeName=="FORM"&&n=="enctype"&&v=="application/x-www-form-urlencoded")v="";if(this.isMSIE&&e.nodeName=="INPUT"&&n=="size"&&v=="20")v="";if(this.isMSIE&&e.nodeName=="INPUT"&&n=="maxlength"&&v=="2147483647")v="";if(n=="style"&&!tinyMCE.isOpera)v=e.style.cssText;if(n=='style')v=tinyMCE.serializeStyle(tinyMCE.parseStyle(v));if(this.settings.on_save&&n.indexOf('on')!=-1&&this.settings.on_save&&v&&v!="")v=tinyMCE.cleanupEventStr(v);return(v&&v!="")?''+v:d;},_urlConverter:function(c,n,v){if(!c.settings.on_save)return tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href,v);else if(tinyMCE.getParam('convert_urls'))return eval(tinyMCE.settings.urlconverter_callback+"(v, n, true);");return v;},_arrayToRe:function(a,op,be,af){var i,r;op=typeof(op)=="undefined"?"gi":op;be=typeof(be)=="undefined"?"^(":be;af=typeof(af)=="undefined"?")$":af;r=be;for(i=0;i<a.length;i++)r+=this._wildcardToRe(a[i])+(i!=a.length-1?"|":"");r+=af;return new RegExp(r,op);},_wildcardToRe:function(s){s=s.replace(/\?/g,'(\\S?)');s=s.replace(/\+/g,'(\\S+)');s=s.replace(/\*/g,'(\\S*)');return s;},_setupEntities:function(){var n,a,i,s=this.settings;if(!this.entitiesDone){if(s.entity_encoding=="named"){n=tinyMCE.clearArray(new Array());a=this.split(',',s.entities);for(i=0;i<a.length;i+=2)n[a[i]]=a[i+1];this.entities=n;}this.entitiesDone=true;}},_setupRules:function(){var s=this.settings;if(!this.rulesDone){this.addRuleStr(s.valid_elements);this.addRuleStr(s.extended_valid_elements);this.rulesDone=true;}},_isDuplicate:function(n){var i;if(!this.settings.fix_content_duplication)return false;if(tinyMCE.isMSIE&&!tinyMCE.isOpera&&n.nodeType==1){if(n.mce_serialized==this.serializationId)return true;n.setAttribute('mce_serialized',this.serializationId);}else{for(i=0;i<this.serializedNodes.length;i++){if(this.serializedNodes[i]==n)return true;}this.serializedNodes[this.serializedNodes.length]=n;}return false;}};TinyMCE_Engine.prototype.getElementByAttributeValue=function(n,e,a,v){return(n=this.getElementsByAttributeValue(n,e,a,v)).length==0?null:n[0];};TinyMCE_Engine.prototype.getElementsByAttributeValue=function(n,e,a,v){var i,nl=n.getElementsByTagName(e),o=new Array();for(i=0;i<nl.length;i++){if(tinyMCE.getAttrib(nl[i],a).indexOf(v)!=-1)o[o.length]=nl[i];}return o;};TinyMCE_Engine.prototype.isBlockElement=function(n){return n!=null&&n.nodeType==1&&this.blockRegExp.test(n.nodeName);};TinyMCE_Engine.prototype.getParentBlockElement=function(n){while(n){if(this.isBlockElement(n))return n;n=n.parentNode;}return null;};TinyMCE_Engine.prototype.insertAfter=function(n,r){if(r.nextSibling)r.parentNode.insertBefore(n,r.nextSibling);else r.parentNode.appendChild(n);};TinyMCE_Engine.prototype.setInnerHTML=function(e,h){var i,nl,n;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){h=h.replace(/\s\/>/g,'>');h=h.replace(/<p([^>]*)>\u00A0?<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');h=h.replace(/<p([^>]*)>\s*&nbsp;\s*<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');h=h.replace(/<p([^>]*)>\s+<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');e.innerHTML=tinyMCE.uniqueTag+h;e.firstChild.removeNode(true);nl=e.getElementsByTagName("p");for(i=nl.length-1;i>=0;i--){n=nl[i];if(n.nodeName=='P'&&!n.hasChildNodes()&&!n.mce_keep)n.parentNode.removeChild(n);}}else{h=this.fixGeckoBaseHREFBug(1,e,h);e.innerHTML=h;this.fixGeckoBaseHREFBug(2,e,h);}};TinyMCE_Engine.prototype.getOuterHTML=function(e){if(tinyMCE.isMSIE)return e.outerHTML;var d=e.ownerDocument.createElement("body");d.appendChild(e);return d.innerHTML;};TinyMCE_Engine.prototype.setOuterHTML=function(e,h){if(tinyMCE.isMSIE){e.outerHTML=h;return;}var d=e.ownerDocument.createElement("body");d.innerHTML=h;e.parentNode.replaceChild(d.firstChild,e);};TinyMCE_Engine.prototype._getElementById=function(id,d){var e,i,j,f;if(typeof(d)=="undefined")d=document;e=d.getElementById(id);if(!e){f=d.forms;for(i=0;i<f.length;i++){for(j=0;j<f[i].elements.length;j++){if(f[i].elements[j].name==id){e=f[i].elements[j];break;}}}}return e;};TinyMCE_Engine.prototype.getNodeTree=function(n,na,t,nn){var i;if(typeof(t)=="undefined"||n.nodeType==t&&(typeof(nn)=="undefined"||n.nodeName==nn))na[na.length]=n;if(n.hasChildNodes()){for(i=0;i<n.childNodes.length;i++)tinyMCE.getNodeTree(n.childNodes[i],na,t,nn);}return na;};TinyMCE_Engine.prototype.getParentElement=function(node,names,attrib_name,attrib_value){if(typeof(names)=="undefined"){if(node.nodeType==1)return node;while((node=node.parentNode)!=null&&node.nodeType!=1);return node;}if(node==null)return null;var namesAr=names.toUpperCase().split(',');do{for(var i=0;i<namesAr.length;i++){if(node.nodeName==namesAr[i]||names=="*"){if(typeof(attrib_name)=="undefined")return node;else if(node.getAttribute(attrib_name)){if(typeof(attrib_value)=="undefined"){if(node.getAttribute(attrib_name)!="")return node;}else if(node.getAttribute(attrib_name)==attrib_value)return node;}}}}while((node=node.parentNode)!=null);return null;};TinyMCE_Engine.prototype.getParentNode=function(n,f){while(n){if(f(n))return n;n=n.parentNode;}return null;};TinyMCE_Engine.prototype.getAttrib=function(elm,name,default_value){if(typeof(default_value)=="undefined")default_value="";if(!elm||elm.nodeType!=1)return default_value;var v=elm.getAttribute(name);if(name=="class"&&!v)v=elm.className;if(tinyMCE.isGecko&&name=="src"&&elm.src!=null&&elm.src!="")v=elm.src;if(tinyMCE.isGecko&&name=="href"&&elm.href!=null&&elm.href!="")v=elm.href;if(name=="http-equiv"&&tinyMCE.isMSIE)v=elm.httpEquiv;if(name=="style"&&!tinyMCE.isOpera)v=elm.style.cssText;return(v&&v!="")?v:default_value;};TinyMCE_Engine.prototype.setAttrib=function(element,name,value,fix_value){if(typeof(value)=="number"&&value!=null)value=""+value;if(fix_value){if(value==null)value="";var re=new RegExp('[^0-9%]','g');value=value.replace(re,'');}if(name=="style")element.style.cssText=value;if(name=="class")element.className=value;if(value!=null&&value!=""&&value!=-1)element.setAttribute(name,value);else element.removeAttribute(name);};TinyMCE_Engine.prototype.setStyleAttrib=function(elm,name,value){eval('elm.style.'+name+'=value;');if(tinyMCE.isMSIE&&value==null||value==''){var str=tinyMCE.serializeStyle(tinyMCE.parseStyle(elm.style.cssText));elm.style.cssText=str;elm.setAttribute("style",str);}};TinyMCE_Engine.prototype.switchClass=function(ei,c){var e;if(tinyMCE.switchClassCache[ei])e=tinyMCE.switchClassCache[ei];else e=tinyMCE.switchClassCache[ei]=document.getElementById(ei);if(e){if(tinyMCE.settings.button_tile_map&&e.className&&e.className.indexOf('mceTiledButton')==0)c='mceTiledButton '+c;e.className=c;}};TinyMCE_Engine.prototype.getAbsPosition=function(n){var p={absLeft:0,absTop:0};while(n){p.absLeft+=n.offsetLeft;p.absTop+=n.offsetTop;n=n.offsetParent;}return p;};TinyMCE_Engine.prototype.prevNode=function(e,n){var a=n.split(','),i;while((e=e.previousSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};TinyMCE_Engine.prototype.nextNode=function(e,n){var a=n.split(','),i;while((e=e.nextSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};TinyMCE_Engine.prototype.selectNodes=function(n,f,a){var i;if(!a)a=new Array();if(f(n))a[a.length]=n;if(n.hasChildNodes()){for(i=0;i<n.childNodes.length;i++)tinyMCE.selectNodes(n.childNodes[i],f,a);}return a;};TinyMCE_Engine.prototype.addCSSClass=function(e,c,b){var o=this.removeCSSClass(e,c);return e.className=b?c+(o!=''?(' '+o):''):(o!=''?(o+' '):'')+c;};TinyMCE_Engine.prototype.removeCSSClass=function(e,c){var a=this.explode(' ',e.className),i;for(i=0;i<a.length;i++){if(a[i]==c)a[i]='';}return e.className=a.join(' ');};TinyMCE_Engine.prototype.renameElement=function(e,n,d){var ne,i,ar;d=typeof(d)=="undefined"?tinyMCE.selectedInstance.getDoc():d;if(e){ne=d.createElement(n);ar=e.attributes;for(i=ar.length-1;i>-1;i--){if(ar[i].specified&&ar[i].nodeValue)ne.setAttribute(ar[i].nodeName.toLowerCase(),ar[i].nodeValue);}ar=e.childNodes;for(i=0;i<ar.length;i++)ne.appendChild(ar[i].cloneNode(true));e.parentNode.replaceChild(ne,e);}};TinyMCE_Engine.prototype.parseURL=function(url_str){var urlParts=new Array();if(url_str){var pos,lastPos;pos=url_str.indexOf('://');if(pos!=-1){urlParts['protocol']=url_str.substring(0,pos);lastPos=pos+3;}for(var i=lastPos;i<url_str.length;i++){var chr=url_str.charAt(i);if(chr==':')break;if(chr=='/')break;}pos=i;urlParts['host']=url_str.substring(lastPos,pos);urlParts['port']="";lastPos=pos;if(url_str.charAt(pos)==':'){pos=url_str.indexOf('/',lastPos);urlParts['port']=url_str.substring(lastPos+1,pos);}lastPos=pos;pos=url_str.indexOf('?',lastPos);if(pos==-1)pos=url_str.indexOf('#',lastPos);if(pos==-1)pos=url_str.length;urlParts['path']=url_str.substring(lastPos,pos);lastPos=pos;if(url_str.charAt(pos)=='?'){pos=url_str.indexOf('#');pos=(pos==-1)?url_str.length:pos;urlParts['query']=url_str.substring(lastPos+1,pos);}lastPos=pos;if(url_str.charAt(pos)=='#'){pos=url_str.length;urlParts['anchor']=url_str.substring(lastPos+1,pos);}}return urlParts;};TinyMCE_Engine.prototype.serializeURL=function(up){var o="";if(up['protocol'])o+=up['protocol']+"://";if(up['host'])o+=up['host'];if(up['port'])o+=":"+up['port'];if(up['path'])o+=up['path'];if(up['query'])o+="?"+up['query'];if(up['anchor'])o+="#"+up['anchor'];return o;};TinyMCE_Engine.prototype.convertAbsoluteURLToRelativeURL=function(base_url,url_to_relative){var baseURL=this.parseURL(base_url);var targetURL=this.parseURL(url_to_relative);var strTok1;var strTok2;var breakPoint=0;var outPath="";var forceSlash=false;if(targetURL.path=="")targetURL.path="/";else forceSlash=true;base_url=baseURL.path.substring(0,baseURL.path.lastIndexOf('/'));strTok1=base_url.split('/');strTok2=targetURL.path.split('/');if(strTok1.length>=strTok2.length){for(var i=0;i<strTok1.length;i++){if(i>=strTok2.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(strTok1.length<strTok2.length){for(var i=0;i<strTok2.length;i++){if(i>=strTok1.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(breakPoint==1)return targetURL.path;for(var i=0;i<(strTok1.length-(breakPoint-1));i++)outPath+="../";for(var i=breakPoint-1;i<strTok2.length;i++){if(i!=(breakPoint-1))outPath+="/"+strTok2[i];else outPath+=strTok2[i];}targetURL.protocol=null;targetURL.host=null;targetURL.port=null;targetURL.path=outPath==""&&forceSlash?"/":outPath;var fileName=baseURL.path;var pos;if((pos=fileName.lastIndexOf('/'))!=-1)fileName=fileName.substring(pos+1);if(fileName==targetURL.path&&targetURL.anchor!="")targetURL.path="";if(targetURL.path==""&&!targetURL.anchor)targetURL.path=fileName!=""?fileName:"/";return this.serializeURL(targetURL);};TinyMCE_Engine.prototype.convertRelativeToAbsoluteURL=function(base_url,relative_url){var baseURL=this.parseURL(base_url);var relURL=this.parseURL(relative_url);if(relative_url==""||relative_url.charAt(0)=='/'||relative_url.indexOf('://')!=-1||relative_url.indexOf('mailto:')!=-1||relative_url.indexOf('javascript:')!=-1)return relative_url;baseURLParts=baseURL['path'].split('/');relURLParts=relURL['path'].split('/');var newBaseURLParts=new Array();for(var i=baseURLParts.length-1;i>=0;i--){if(baseURLParts[i].length==0)continue;newBaseURLParts[newBaseURLParts.length]=baseURLParts[i];}baseURLParts=newBaseURLParts.reverse();var newRelURLParts=new Array();var numBack=0;for(var i=relURLParts.length-1;i>=0;i--){if(relURLParts[i].length==0||relURLParts[i]==".")continue;if(relURLParts[i]=='..'){numBack++;continue;}if(numBack>0){numBack--;continue;}newRelURLParts[newRelURLParts.length]=relURLParts[i];}relURLParts=newRelURLParts.reverse();var len=baseURLParts.length-numBack;var absPath=(len<=0?"":"/")+baseURLParts.slice(0,len).join('/')+"/"+relURLParts.join('/');var start="",end="";relURL.protocol=baseURL.protocol;relURL.host=baseURL.host;relURL.port=baseURL.port;if(relURL.path.charAt(relURL.path.length-1)=="/")absPath+="/";relURL.path=absPath;return this.serializeURL(relURL);};TinyMCE_Engine.prototype.convertURL=function(url,node,on_save){var prot=document.location.protocol;var host=document.location.hostname;var port=document.location.port;if(prot=="file:")return url;url=tinyMCE.regexpReplace(url,'(http|https):///','/');if(url.indexOf('mailto:')!=-1||url.indexOf('javascript:')!=-1||tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0)=="#")return url;if(!tinyMCE.isMSIE&&!on_save&&url.indexOf("://")==-1&&url.charAt(0)!='/')return tinyMCE.settings['base_href']+url;if(on_save&&tinyMCE.getParam('relative_urls')){var curl=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],url);if(curl.charAt(0)=='/')curl=tinyMCE.settings['document_base_prefix']+curl;var urlParts=tinyMCE.parseURL(curl);var tmpUrlParts=tinyMCE.parseURL(tinyMCE.settings['document_base_url']);if(urlParts['host']==tmpUrlParts['host']&&(urlParts['port']==tmpUrlParts['port']))return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'],curl);}if(!tinyMCE.getParam('relative_urls')){var urlParts=tinyMCE.parseURL(url);var baseUrlParts=tinyMCE.parseURL(tinyMCE.settings['base_href']);url=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],url);if(urlParts['anchor']&&urlParts['path']==baseUrlParts['path'])return"#"+urlParts['anchor'];}if(tinyMCE.getParam('remove_script_host')){var start="",portPart="";if(port!="")portPart=":"+port;start=prot+"//"+host+portPart+"/";if(url.indexOf(start)==0)url=url.substring(start.length-1);}return url;};TinyMCE_Engine.prototype.convertAllRelativeURLs=function(body){var elms=body.getElementsByTagName("img");for(var i=0;i<elms.length;i++){var src=tinyMCE.getAttrib(elms[i],'src');var msrc=tinyMCE.getAttrib(elms[i],'mce_src');if(msrc!="")src=msrc;if(src!=""){src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],src);elms[i].setAttribute("src",src);}}var elms=body.getElementsByTagName("a");for(var i=0;i<elms.length;i++){var href=tinyMCE.getAttrib(elms[i],'href');var mhref=tinyMCE.getAttrib(elms[i],'mce_href');if(mhref!="")href=mhref;if(href&&href!=""){href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],href);elms[i].setAttribute("href",href);}}};TinyMCE_Engine.prototype.clearArray=function(a){for(var k in a)a[k]=null;return a;};TinyMCE_Engine.prototype._setEventsEnabled=function(node,state){var events=new Array('onfocus','onblur','onclick','ondblclick','onmousedown','onmouseup','onmouseover','onmousemove','onmouseout','onkeypress','onkeydown','onkeydown','onkeyup');var evs=tinyMCE.settings['event_elements'].split(',');for(var y=0;y<evs.length;y++){var elms=node.getElementsByTagName(evs[y]);for(var i=0;i<elms.length;i++){var event="";for(var x=0;x<events.length;x++){if((event=tinyMCE.getAttrib(elms[i],events[x]))!=''){event=tinyMCE.cleanupEventStr(""+event);if(!state)event="return true;"+event;else event=event.replace(/^return true;/gi,'');elms[i].removeAttribute(events[x]);elms[i].setAttribute(events[x],event);}}}}};TinyMCE_Engine.prototype._eventPatch=function(editor_id){var n,inst,win,e;if(typeof(tinyMCE)=="undefined")return true;try{if(tinyMCE.selectedInstance){win=tinyMCE.selectedInstance.getWin();if(win&&win.event){e=win.event;if(!e.target)e.target=e.srcElement;TinyMCE_Engine.prototype.handleEvent(e);return;}}for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;tinyMCE.selectedInstance=inst;win=inst.getWin();if(win&&win.event){e=win.event;if(!e.target)e.target=e.srcElement;TinyMCE_Engine.prototype.handleEvent(e);return;}}}catch(ex){}};TinyMCE_Engine.prototype.unloadHandler=function(){tinyMCE.triggerSave(true,true);};TinyMCE_Engine.prototype.addEventHandlers=function(inst){var doc=inst.getDoc();inst.switchSettings();if(tinyMCE.isMSIE){tinyMCE.addEvent(doc,"keypress",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"keyup",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"keydown",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"mouseup",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"mousedown",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"click",TinyMCE_Engine.prototype._eventPatch);}else{tinyMCE.addEvent(doc,"keypress",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keydown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keyup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"click",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mouseup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mousedown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"focus",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"blur",tinyMCE.handleEvent);eval('try { doc.designMode = "On"; } catch(e) {}');}};TinyMCE_Engine.prototype.onMouseMove=function(){var inst;if(!tinyMCE.hasMouseMoved){inst=tinyMCE.selectedInstance;if(inst.isFocused){inst.undoBookmark=inst.selection.getBookmark();tinyMCE.hasMouseMoved=true;}}};TinyMCE_Engine.prototype.cancelEvent=function(e){if(tinyMCE.isMSIE){e.returnValue=false;e.cancelBubble=true;}else e.preventDefault();};TinyMCE_Engine.prototype.addEvent=function(o,n,h){if(o.attachEvent)o.attachEvent("on"+n,h);else o.addEventListener(n,h,false);};TinyMCE_Engine.prototype.addSelectAccessibility=function(e,s,w){if(!s._isAccessible){s.onkeydown=tinyMCE.accessibleEventHandler;s.onblur=tinyMCE.accessibleEventHandler;s._isAccessible=true;s._win=w;}return false;};TinyMCE_Engine.prototype.accessibleEventHandler=function(e){var win=this._win;e=tinyMCE.isMSIE?win.event:e;var elm=tinyMCE.isMSIE?e.srcElement:e.target;if(e.type=="blur"){if(elm.oldonchange){elm.onchange=elm.oldonchange;elm.oldonchange=null;}return true;}if(elm.nodeName=="SELECT"&&!elm.oldonchange){elm.oldonchange=elm.onchange;elm.onchange=null;}if(e.keyCode==13||e.keyCode==32){elm.onchange=elm.oldonchange;elm.onchange();elm.oldonchange=null;tinyMCE.cancelEvent(e);return false;}return true;};TinyMCE_Engine.prototype._resetIframeHeight=function(){var ife;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){ife=tinyMCE.selectedInstance.iframeElement;if(ife._oldHeight){ife.style.height=ife._oldHeight;ife.height=ife._oldHeight;}}};function TinyMCE_Selection(inst){this.instance=inst;};TinyMCE_Selection.prototype={getSelectedHTML:function(){var inst=this.instance;var e,r=this.getRng(),h;if(tinyMCE.isSafari){return r.toString();}e=document.createElement("body");if(tinyMCE.isGecko)e.appendChild(r.cloneContents());else e.innerHTML=r.item?r.item(0).outerHTML:r.htmlText;h=tinyMCE._cleanupHTML(inst,inst.contentDocument,inst.settings,e,e,false,true,false);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(inst.getDoc());return h;},getSelectedText:function(){var inst=this.instance;var d,r,s,t;if(tinyMCE.isMSIE){d=inst.getDoc();if(d.selection.type=="Text"){r=d.selection.createRange();t=r.text;}else t='';}else{s=this.getSel();if(s&&s.toString)t=s.toString();else t='';}return t;},getBookmark:function(simple){var rng=this.getRng();var doc=this.instance.getDoc();var sp,le,s,e,nl,i,si,ei;var trng,sx,sy,xx=-999999999;if(tinyMCE.isOpera)return null;sx=doc.body.scrollLeft+doc.documentElement.scrollLeft;sy=doc.body.scrollTop+doc.documentElement.scrollTop;if(tinyMCE.isSafari||tinyMCE.isGecko)return{rng:rng,scrollX:sx,scrollY:sy};if(tinyMCE.isMSIE){if(simple)return{rng:rng};if(rng.item){e=rng.item(0);nl=doc.getElementsByTagName(e.nodeName);for(i=0;i<nl.length;i++){if(e==nl[i]){sp=i;break;}}return{tag:e.nodeName,index:sp,scrollX:sx,scrollY:sy};}else{trng=rng.duplicate();trng.collapse(true);sp=Math.abs(trng.move('character',xx));trng=rng.duplicate();trng.collapse(false);le=Math.abs(trng.move('character',xx))-sp;return{start:sp,length:le,scrollX:sx,scrollY:sy};}}if(tinyMCE.isGecko){s=tinyMCE.getParentElement(rng.startContainer);for(si=0;si<s.childNodes.length&&s.childNodes[si]!=rng.startContainer;si++);nl=doc.getElementsByTagName(s.nodeName);for(i=0;i<nl.length;i++){if(s==nl[i]){sp=i;break;}}e=tinyMCE.getParentElement(rng.endContainer);for(ei=0;ei<e.childNodes.length&&e.childNodes[ei]!=rng.endContainer;ei++);nl=doc.getElementsByTagName(e.nodeName);for(i=0;i<nl.length;i++){if(e==nl[i]){le=i;break;}}return{startTag:s.nodeName,start:sp,startIndex:si,endTag:e.nodeName,end:le,endIndex:ei,startOffset:rng.startOffset,endOffset:rng.endOffset,scrollX:sx,scrollY:sy};}return null;},moveToBookmark:function(bookmark){var rng,nl,i;var inst=this.instance;var doc=inst.getDoc();var win=inst.getWin();var sel=this.getSel();if(!bookmark)return false;if(tinyMCE.isSafari){sel.setBaseAndExtent(bookmark.startContainer,bookmark.startOffset,bookmark.endContainer,bookmark.endOffset);return true;}if(tinyMCE.isMSIE){if(bookmark.rng){bookmark.rng.select();return true;}win.focus();if(bookmark.tag){rng=inst.getBody().createControlRange();nl=doc.getElementsByTagName(bookmark.tag);if(nl.length>bookmark.index){try{rng.addElement(nl[bookmark.index]);}catch(ex){}}}else{rng=inst.getSel().createRange();rng.moveToElementText(inst.getBody());rng.collapse(true);rng.moveStart('character',bookmark.start);rng.moveEnd('character',bookmark.length);}rng.select();win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}if(tinyMCE.isGecko&&bookmark.rng){sel.removeAllRanges();sel.addRange(bookmark.rng);win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}if(tinyMCE.isGecko){rng=doc.createRange();nl=doc.getElementsByTagName(bookmark.startTag);if(nl.length>bookmark.start)rng.setStart(nl[bookmark.start].childNodes[bookmark.startIndex],bookmark.startOffset);nl=doc.getElementsByTagName(bookmark.endTag);if(nl.length>bookmark.end)rng.setEnd(nl[bookmark.end].childNodes[bookmark.endIndex],bookmark.endOffset);sel.removeAllRanges();sel.addRange(rng);win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}return false;},selectNode:function(node,collapse,select_text_node,to_start){var inst=this.instance,sel,rng,nodes;if(!node)return;if(typeof(collapse)=="undefined")collapse=true;if(typeof(select_text_node)=="undefined")select_text_node=false;if(typeof(to_start)=="undefined")to_start=true;if(tinyMCE.isMSIE){rng=inst.getBody().createTextRange();try{rng.moveToElementText(node);if(collapse)rng.collapse(to_start);rng.select();}catch(e){}}else{sel=this.getSel();if(!sel)return;if(tinyMCE.isSafari){sel.setBaseAndExtent(node,0,node,node.innerText.length);if(collapse){if(to_start)sel.collapseToStart();else sel.collapseToEnd();}this.scrollToNode(node);return;}rng=inst.getDoc().createRange();if(select_text_node){nodes=tinyMCE.getNodeTree(node,new Array(),3);if(nodes.length>0)rng.selectNodeContents(nodes[0]);else rng.selectNodeContents(node);}else rng.selectNode(node);if(collapse){if(!to_start&&node.nodeType==3){rng.setStart(node,node.nodeValue.length);rng.setEnd(node,node.nodeValue.length);}else rng.collapse(to_start);}sel.removeAllRanges();sel.addRange(rng);}this.scrollToNode(node);tinyMCE.selectedElement=null;if(node.nodeType==1)tinyMCE.selectedElement=node;},scrollToNode:function(node){var inst=this.instance;var pos,doc,scrollX,scrollY,height;pos=tinyMCE.getAbsPosition(node);doc=inst.getDoc();scrollX=doc.body.scrollLeft+doc.documentElement.scrollLeft;scrollY=doc.body.scrollTop+doc.documentElement.scrollTop;height=tinyMCE.isMSIE?document.getElementById(inst.editorId).style.pixelHeight:inst.targetElement.clientHeight;if(!tinyMCE.settings['auto_resize']&&!(pos.absTop>scrollY&&pos.absTop<(scrollY-25+height)))inst.contentWindow.scrollTo(pos.absLeft,pos.absTop-height+25);},getSel:function(){var inst=this.instance;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return inst.getDoc().selection;return inst.contentWindow.getSelection();},getRng:function(){var inst=this.instance;var sel=this.getSel();if(sel==null)return null;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return sel.createRange();if(tinyMCE.isSafari&&!sel.getRangeAt)return''+window.getSelection();return sel.getRangeAt(0);},getFocusElement:function(){var inst=this.instance;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){var doc=inst.getDoc();var rng=doc.selection.createRange();var elm=rng.item?rng.item(0):rng.parentElement();}else{if(inst.isHidden())return inst.getBody();var sel=this.getSel();var rng=this.getRng();if(!sel||!rng)return null;var elm=rng.commonAncestorContainer;if(!rng.collapsed){if(rng.startContainer==rng.endContainer){if(rng.startOffset-rng.endOffset<2){if(rng.startContainer.hasChildNodes())elm=rng.startContainer.childNodes[rng.startOffset];}}}elm=tinyMCE.getParentElement(elm);}return elm;}};function TinyMCE_UndoRedo(inst){this.instance=inst;this.undoLevels=new Array();this.undoIndex=0;this.typingUndoIndex=-1;this.undoRedo=true;};TinyMCE_UndoRedo.prototype={add:function(l){var b;if(l){this.undoLevels[this.undoLevels.length]=l;return true;}var inst=this.instance;if(this.typingUndoIndex!=-1){this.undoIndex=this.typingUndoIndex;}var newHTML=tinyMCE.trim(inst.getBody().innerHTML);if(this.undoLevels[this.undoIndex]&&newHTML!=this.undoLevels[this.undoIndex].content){tinyMCE.dispatchCallback(inst,'onchange_callback','onChange',inst);var customUndoLevels=tinyMCE.settings['custom_undo_redo_levels'];if(customUndoLevels!=-1&&this.undoLevels.length>customUndoLevels){for(var i=0;i<this.undoLevels.length-1;i++){this.undoLevels[i]=this.undoLevels[i+1];}this.undoLevels.length--;this.undoIndex--;}b=inst.undoBookmark;if(!b)b=inst.selection.getBookmark();this.undoIndex++;this.undoLevels[this.undoIndex]={content:newHTML,bookmark:b};this.undoLevels.length=this.undoIndex+1;return true;}return false;},undo:function(){var inst=this.instance;if(this.undoIndex>0){this.undoIndex--;tinyMCE.setInnerHTML(inst.getBody(),this.undoLevels[this.undoIndex].content);inst.repaint();if(inst.settings.custom_undo_redo_restore_selection)inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);}},redo:function(){var inst=this.instance;tinyMCE.execCommand("mceEndTyping");if(this.undoIndex<(this.undoLevels.length-1)){this.undoIndex++;tinyMCE.setInnerHTML(inst.getBody(),this.undoLevels[this.undoIndex].content);inst.repaint();if(inst.settings.custom_undo_redo_restore_selection)inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);}tinyMCE.triggerNodeChange();}};var TinyMCE_ForceParagraphs={_insertPara:function(inst,e){function isEmpty(para){function isEmptyHTML(html){return html.replace(new RegExp('[ \t\r\n]+','g'),'').toLowerCase()=="";}if(para.getElementsByTagName("img").length>0)return false;if(para.getElementsByTagName("table").length>0)return false;if(para.getElementsByTagName("hr").length>0)return false;var nodes=tinyMCE.getNodeTree(para,new Array(),3);for(var i=0;i<nodes.length;i++){if(!isEmptyHTML(nodes[i].nodeValue))return false;}return true;}var doc=inst.getDoc();var sel=inst.getSel();var win=inst.contentWindow;var rng=sel.getRangeAt(0);var body=doc.body;var rootElm=doc.documentElement;var blockName="P";var rngBefore=doc.createRange();rngBefore.setStart(sel.anchorNode,sel.anchorOffset);rngBefore.collapse(true);var rngAfter=doc.createRange();rngAfter.setStart(sel.focusNode,sel.focusOffset);rngAfter.collapse(true);var direct=rngBefore.compareBoundaryPoints(rngBefore.START_TO_END,rngAfter)<0;var startNode=direct?sel.anchorNode:sel.focusNode;var startOffset=direct?sel.anchorOffset:sel.focusOffset;var endNode=direct?sel.focusNode:sel.anchorNode;var endOffset=direct?sel.focusOffset:sel.anchorOffset;startNode=startNode.nodeName=="BODY"?startNode.firstChild:startNode;endNode=endNode.nodeName=="BODY"?endNode.firstChild:endNode;var startBlock=tinyMCE.getParentBlockElement(startNode);var endBlock=tinyMCE.getParentBlockElement(endNode);if(startBlock&&new RegExp('absolute|relative|static','gi').test(startBlock.style.position))startBlock=null;if(endBlock&&new RegExp('absolute|relative|static','gi').test(endBlock.style.position))endBlock=null;if(startBlock!=null){blockName=startBlock.nodeName;if(blockName=="TD"||blockName=="TABLE"||(blockName=="DIV"&&new RegExp('left|right','gi').test(startBlock.style.cssFloat)))blockName="P";}if(tinyMCE.getParentElement(startBlock,"OL,UL")!=null)return false;if((startBlock!=null&&startBlock.nodeName=="TABLE")||(endBlock!=null&&endBlock.nodeName=="TABLE"))startBlock=endBlock=null;var paraBefore=(startBlock!=null&&startBlock.nodeName==blockName)?startBlock.cloneNode(false):doc.createElement(blockName);var paraAfter=(endBlock!=null&&endBlock.nodeName==blockName)?endBlock.cloneNode(false):doc.createElement(blockName);if(/^(H[1-6])$/.test(blockName))paraAfter=doc.createElement("p");var startChop=startNode;var endChop=endNode;node=startChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;startChop=node;}while((node=node.previousSibling?node.previousSibling:node.parentNode));node=endChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;endChop=node;}while((node=node.nextSibling?node.nextSibling:node.parentNode));if(startChop.nodeName=="TD")startChop=startChop.firstChild;if(endChop.nodeName=="TD")endChop=endChop.lastChild;if(startBlock==null){rng.deleteContents();sel.removeAllRanges();if(startChop!=rootElm&&endChop!=rootElm){rngBefore=rng.cloneRange();if(startChop==body)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);paraBefore.appendChild(rngBefore.cloneContents());if(endChop.parentNode.nodeName==blockName)endChop=endChop.parentNode;rng.setEndAfter(endChop);if(endChop.nodeName!="#text"&&endChop.nodeName!="BODY")rngBefore.setEndAfter(endChop);var contents=rng.cloneContents();if(contents.firstChild&&(contents.firstChild.nodeName==blockName||contents.firstChild.nodeName=="BODY"))paraAfter.innerHTML=contents.firstChild.innerHTML;else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";rng.deleteContents();rngAfter.deleteContents();rngBefore.deleteContents();paraAfter.normalize();rngBefore.insertNode(paraAfter);paraBefore.normalize();rngBefore.insertNode(paraBefore);}else{body.innerHTML="<"+blockName+">&nbsp;</"+blockName+"><"+blockName+">&nbsp;</"+blockName+">";paraAfter=body.childNodes[1];}inst.selection.selectNode(paraAfter,true,true);return true;}if(startChop.nodeName==blockName)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);rngBefore.setEnd(startNode,startOffset);paraBefore.appendChild(rngBefore.cloneContents());rngAfter.setEndAfter(endChop);rngAfter.setStart(endNode,endOffset);var contents=rngAfter.cloneContents();if(contents.firstChild&&contents.firstChild.nodeName==blockName){paraAfter.innerHTML=contents.firstChild.innerHTML;}else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";var rng=doc.createRange();if(!startChop.previousSibling&&startChop.parentNode.nodeName.toUpperCase()==blockName){rng.setStartBefore(startChop.parentNode);}else{if(rngBefore.startContainer.nodeName.toUpperCase()==blockName&&rngBefore.startOffset==0)rng.setStartBefore(rngBefore.startContainer);else rng.setStart(rngBefore.startContainer,rngBefore.startOffset);}if(!endChop.nextSibling&&endChop.parentNode.nodeName.toUpperCase()==blockName)rng.setEndAfter(endChop.parentNode);else rng.setEnd(rngAfter.endContainer,rngAfter.endOffset);rng.deleteContents();rng.insertNode(paraAfter);rng.insertNode(paraBefore);paraAfter.normalize();paraBefore.normalize();inst.selection.selectNode(paraAfter,true,true);return true;},_handleBackSpace:function(inst){var r=inst.getRng(),sn=r.startContainer,nv,s=false;if(sn&&sn.nextSibling&&sn.nextSibling.nodeName=="BR"){nv=sn.nodeValue;if(nv!=null&&nv.length>=r.startOffset&&nv.charAt(r.startOffset-1)==' ')s=true;if(nv!=null&&r.startOffset==nv.length)sn.nextSibling.parentNode.removeChild(sn.nextSibling);}return s;}};function TinyMCE_Layer(id,bm){this.id=id;this.blockerElement=null;this.events=false;this.element=null;this.blockMode=typeof(bm)!='undefined'?bm:true;this.doc=document;};TinyMCE_Layer.prototype={moveRelativeTo:function(re,p){var rep=this.getAbsPosition(re);var w=parseInt(re.offsetWidth);var h=parseInt(re.offsetHeight);var e=this.getElement();var ew=parseInt(e.offsetWidth);var eh=parseInt(e.offsetHeight);var x,y;switch(p){case"tl":x=rep.absLeft;y=rep.absTop;break;case"tr":x=rep.absLeft+w;y=rep.absTop;break;case"bl":x=rep.absLeft;y=rep.absTop+h;break;case"br":x=rep.absLeft+w;y=rep.absTop+h;break;case"cc":x=rep.absLeft+(w/2)-(ew/2);y=rep.absTop+(h/2)-(eh/2);break;}this.moveTo(x,y);},moveBy:function(x,y){var e=this.getElement();this.moveTo(parseInt(e.style.left)+x,parseInt(e.style.top)+y);},moveTo:function(x,y){var e=this.getElement();e.style.left=x+"px";e.style.top=y+"px";this.updateBlocker();},resizeBy:function(w,h){var e=this.getElement();this.resizeTo(parseInt(e.style.width)+w,parseInt(e.style.height)+h);},resizeTo:function(w,h){var e=this.getElement();if(w!=null)e.style.width=w+"px";if(h!=null)e.style.height=h+"px";this.updateBlocker();},show:function(){this.getElement().style.display='block';this.updateBlocker();},hide:function(){this.getElement().style.display='none';this.updateBlocker();},isVisible:function(){return this.getElement().style.display=='block';},getElement:function(){if(!this.element)this.element=this.doc.getElementById(this.id);return this.element;},setBlockMode:function(s){this.blockMode=s;},updateBlocker:function(){var e,b,x,y,w,h;b=this.getBlocker();if(b){if(this.blockMode){e=this.getElement();x=this.parseInt(e.style.left);y=this.parseInt(e.style.top);w=this.parseInt(e.offsetWidth);h=this.parseInt(e.offsetHeight);b.style.left=x+'px';b.style.top=y+'px';b.style.width=w+'px';b.style.height=h+'px';b.style.display=e.style.display;}else b.style.display='none';}},getBlocker:function(){var d,b;if(!this.blockerElement&&this.blockMode){d=this.doc;b=d.createElement("iframe");b.style.cssText='display: none; position: absolute; left: 0; top: 0';b.src='javascript:false;';b.frameBorder='0';b.scrolling='no';d.body.appendChild(b);this.blockerElement=b;}return this.blockerElement;},getAbsPosition:function(n){var p={absLeft:0,absTop:0};while(n){p.absLeft+=n.offsetLeft;p.absTop+=n.offsetTop;n=n.offsetParent;}return p;},create:function(n,c,p){var d=this.doc,e=d.createElement(n);e.setAttribute('id',this.id);if(c)e.className=c;if(!p)p=d.body;p.appendChild(e);return this.element=e;},parseInt:function(s){if(s==null||s=='')return 0;return parseInt(s);}};function TinyMCE_Menu(){var id;if(typeof(tinyMCE.menuCounter)=="undefined")tinyMCE.menuCounter=0;id="mc_menu_"+tinyMCE.menuCounter++;TinyMCE_Layer.call(this,id,true);this.id=id;this.items=new Array();this.needsUpdate=true;};TinyMCE_Menu.prototype=tinyMCE.extend(TinyMCE_Layer.prototype,{init:function(s){var n;this.settings={separator_class:'mceMenuSeparator',title_class:'mceMenuTitle',disabled_class:'mceMenuDisabled',menu_class:'mceMenu',drop_menu:true};for(n in s)this.settings[n]=s[n];this.create('div',this.settings.menu_class);},clear:function(){this.items=new Array();},addTitle:function(t){this.add({type:'title',text:t});},addDisabled:function(t){this.add({type:'disabled',text:t});},addSeparator:function(){this.add({type:'separator'});},addItem:function(t,js){this.add({text:t,js:js});},add:function(mi){this.items[this.items.length]=mi;this.needsUpdate=true;},update:function(){var e=this.getElement(),h='',i,t,m=this.items,s=this.settings;if(this.settings.drop_menu)h+='<span class="mceMenuLine"></span>';h+='<table border="0" cellpadding="0" cellspacing="0">';for(i=0;i<m.length;i++){t=tinyMCE.xmlEncode(m[i].text);c=m[i].class_name?' class="'+m[i].class_name+'"':'';switch(m[i].type){case'separator':h+='<tr class="'+s.separator_class+'"><td>';break;case'title':h+='<tr class="'+s.title_class+'"><td><span'+c+'>'+t+'</span>';break;case'disabled':h+='<tr class="'+s.disabled_class+'"><td><span'+c+'>'+t+'</span>';break;default:h+='<tr><td><a href="javascript:void(0);" onmousedown="'+tinyMCE.xmlEncode(m[i].js)+';return false;"><span'+c+'>'+t+'</span></a>';}h+='</td></tr>';}h+='</table>';e.innerHTML=h;this.needsUpdate=false;this.updateBlocker();},show:function(){var nl,i;if(tinyMCE.lastMenu==this)return;if(this.needsUpdate)this.update();if(tinyMCE.lastMenu&&tinyMCE.lastMenu!=this)tinyMCE.lastMenu.hide();TinyMCE_Layer.prototype.show.call(this);if(!tinyMCE.isOpera){}tinyMCE.lastMenu=this;}});TinyMCE_Engine.prototype.debug=function(){var m="",e,a,i;e=document.getElementById("tinymce_debug");if(!e){var d=document.createElement("div");d.setAttribute("className","debugger");d.className="debugger";d.innerHTML='Debug output:<textarea id="tinymce_debug" style="width: 100%; height: 300px" wrap="nowrap" mce_editable="false"></textarea>';document.body.appendChild(d);e=document.getElementById("tinymce_debug");}a=this.debug.arguments;for(i=0;i<a.length;i++){m+=a[i];if(i<a.length-1)m+=', ';}e.value+=m+"\n";};
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_gzip.php 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_gzip.php
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_gzip.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_gzip.php	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,268 @@
+<?php
+/**
+ * $RCSfile: tiny_mce_gzip.php,v $
+ * $Revision: $
+ * $Date: $
+ *
+ * @version 1.08
+ * @author Moxiecode
+ * @copyright Copyright  2005-2006, Moxiecode Systems AB, All rights reserved.
+ *
+ * This file compresses the TinyMCE JavaScript using GZip and
+ * enables the browser to do two requests instead of one for each .js file.
+ * Notice: This script defaults the button_tile_map option to true for extra performance.
+ */
+
+// General options
+$suffix = "";							// Set to "_src" to use source version
+$expiresOffset = 3600 * 24 * 10;		// 10 days util client cache expires
+$diskCache = false;						// If you enable this option gzip files will be cached on disk.
+$cacheDir = realpath(".");				// Absolute directory path to where cached gz files will be stored
+$debug = false;							// Enable this option if you need debuging info
+
+// Headers
+header("Content-type: text/javascript; charset: UTF-8");
+// header("Cache-Control: must-revalidate");
+header("Vary: Accept-Encoding"); // Handle proxies
+header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+
+// Get data to load
+$theme = isset($_GET['theme']) ? TinyMCE_cleanInput($_GET['theme']) : "";
+$language = isset($_GET['language']) ? TinyMCE_cleanInput($_GET['language']) : "";
+$plugins = isset($_GET['plugins']) ? TinyMCE_cleanInput($_GET['plugins']) : "";
+$lang = isset($_GET['lang']) ? TinyMCE_cleanInput($_GET['lang']) : "en";
+$index = isset($_GET['index']) ? TinyMCE_cleanInput($_GET['index']) : -1;
+$cacheKey = md5($theme . $language . $plugins . $lang . $index . $debug);
+$cacheFile = $cacheDir == "" ? "" : $cacheDir . "/" . "tinymce_" .  $cacheKey . ".gz";
+$cacheData = "";
+
+// Patch older versions of PHP < 4.3.0
+if (!function_exists('file_get_contents')) {
+	function file_get_contents($filename) {
+		$fd = fopen($filename, 'rb');
+		$content = fread($fd, filesize($filename));
+		fclose($fd);
+		return $content;
+	}
+}
+
+// Security check function, can only contain a-z 0-9 , _ - and whitespace.
+function TinyMCE_cleanInput($str) {
+	return preg_replace("/[^0-9a-z\-_,]+/i", "", $str); // Remove anything but 0-9,a-z,-_
+}
+
+function TinyMCE_echo($str) {
+	global $cacheData, $diskCache;
+
+	if ($diskCache)
+		$cacheData .= $str;
+	else
+		echo $str;
+}
+
+// Only gzip the contents if clients and server support it
+$encodings = array();
+
+if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+	$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+
+// Check for gzip header or northon internet securities
+if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+	$enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+
+	// Use cached file if it exists but not in debug mode
+	if (file_exists($cacheFile) && !$debug) {
+		header("Content-Encoding: " . $enc);
+		echo file_get_contents($cacheFile);
+		die;
+	}
+
+	if (!$diskCache)
+		ob_start("ob_gzhandler");
+} else
+	$diskCache = false;
+
+if ($index > -1) {
+	// Write main script and patch some things
+	if ($index == 0) {
+		TinyMCE_echo(file_get_contents(realpath("tiny_mce" . $suffix . ".js")));
+		TinyMCE_echo('TinyMCE.prototype.orgLoadScript = TinyMCE.prototype.loadScript;');
+		TinyMCE_echo('TinyMCE.prototype.loadScript = function() {};var realTinyMCE = tinyMCE;');
+	} else
+		TinyMCE_echo('tinyMCE = realTinyMCE;');
+
+	// Do init based on index
+	TinyMCE_echo("tinyMCE.init(tinyMCECompressed.configs[" . $index . "]);");
+
+	// Load external plugins
+	if ($index == 0)
+		TinyMCE_echo("tinyMCECompressed.loadPlugins();");
+
+	// Load theme, language pack and theme language packs
+	if ($theme) {
+		TinyMCE_echo(file_get_contents(realpath("themes/" . $theme . "/editor_template" . $suffix . ".js")));
+		TinyMCE_echo(file_get_contents(realpath("themes/" . $theme . "/langs/" . $lang . ".js")));
+	}
+
+	if ($language)
+		TinyMCE_echo(file_get_contents(realpath("langs/" . $language . ".js")));
+
+	// Load all plugins and their language packs
+	$plugins = explode(",", $plugins);
+	foreach ($plugins as $plugin) {
+		$pluginFile = realpath("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js");
+		$languageFile = realpath("plugins/" . $plugin . "/langs/" . $lang . ".js");
+
+		if ($pluginFile)
+			TinyMCE_echo(file_get_contents($pluginFile));
+
+		if ($languageFile)
+			TinyMCE_echo(file_get_contents($languageFile));
+	}
+
+	// Reset tinyMCE compressor engine
+	TinyMCE_echo("tinyMCE = tinyMCECompressed;");
+
+	// Write to cache
+	if ($diskCache) {
+		// Calculate compression ratio and debug target output path
+		if ($debug) {
+			$ratio = round(100 - strlen(gzencode($cacheData, 9, FORCE_GZIP)) / strlen($cacheData) * 100.0);
+			TinyMCE_echo("alert('TinyMCE was compressed by " . $ratio . "%.\\nOutput cache file: " . $cacheFile . "');");
+		}
+
+		$cacheData = gzencode($cacheData, 9, FORCE_GZIP);
+
+		// Write to file if possible
+		$fp = @fopen($cacheFile, "wb");
+		if ($fp) {
+			fwrite($fp, $cacheData);
+			fclose($fp);
+		}
+
+		// Output
+		header("Content-Encoding: " . $enc);
+		echo $cacheData;
+	}
+
+	die;
+}
+?>
+
+function TinyMCECompressed() {
+	this.configs = new Array();
+	this.loadedFiles = new Array();
+	this.externalPlugins = new Array();
+	this.loadAdded = false;
+	this.isLoaded = false;
+}
+
+TinyMCECompressed.prototype.init = function(settings) {
+	var elements = document.getElementsByTagName('script');
+	var scriptURL = "";
+
+	for (var i=0; i<elements.length; i++) {
+		if (elements[i].src && elements[i].src.indexOf("tiny_mce_gzip.php") != -1) {
+			scriptURL = elements[i].src;
+			break;
+		}
+	}
+
+	settings["theme"] = typeof(settings["theme"]) != "undefined" ? settings["theme"] : "default";
+	settings["plugins"] = typeof(settings["plugins"]) != "undefined" ? settings["plugins"] : "";
+	settings["language"] = typeof(settings["language"]) != "undefined" ? settings["language"] : "en";
+	settings["button_tile_map"] = typeof(settings["button_tile_map"]) != "undefined" ? settings["button_tile_map"] : true;
+	this.configs[this.configs.length] = settings;
+	this.settings = settings;
+
+	scriptURL += "?theme=" + escape(this.getOnce(settings["theme"])) + "&language=" + escape(this.getOnce(settings["language"])) + "&plugins=" + escape(this.getOnce(settings["plugins"])) + "&lang=" + settings["language"] + "&index=" + escape(this.configs.length-1);
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + scriptURL + '"></script>');
+
+	if (!this.loadAdded) {
+		tinyMCE.addEvent(window, "DOMContentLoaded", TinyMCECompressed.prototype.onLoad);
+		tinyMCE.addEvent(window, "load", TinyMCECompressed.prototype.onLoad);
+		this.loadAdded = true;
+	}
+}
+
+TinyMCECompressed.prototype.onLoad = function() {
+	if (tinyMCE.isLoaded)
+		return true;
+
+	tinyMCE = realTinyMCE;
+	TinyMCE_Engine.prototype.onLoad();
+	tinyMCE._addUnloadEvents();
+
+	tinyMCE.isLoaded = true;
+}
+
+TinyMCECompressed.prototype.addEvent = function(o, n, h) {
+	if (o.attachEvent)
+		o.attachEvent("on" + n, h);
+	else
+		o.addEventListener(n, h, false);
+}
+
+TinyMCECompressed.prototype.getOnce = function(str) {
+	var ar = str.replace(/\s+/g, '').split(',');
+
+	for (var i=0; i<ar.length; i++) {
+		if (ar[i] == '' || ar[i].charAt(0) == '-') {
+			ar[i] = null;
+			continue;
+		}
+
+		// Skip load
+		for (var x=0; x<this.loadedFiles.length; x++) {
+			if (this.loadedFiles[x] == ar[i])
+				ar[i] = null;
+		}
+
+		this.loadedFiles[this.loadedFiles.length] = ar[i];
+	}
+
+	// Glue
+	str = "";
+	for (var i=0; i<ar.length; i++) {
+		if (ar[i] == null)
+			continue;
+
+		str += ar[i];
+
+		if (i != ar.length-1)
+			str += ",";
+	}
+
+	return str;
+};
+
+TinyMCECompressed.prototype.loadPlugins = function() {
+	var i, ar;
+
+	TinyMCE.prototype.loadScript = TinyMCE.prototype.orgLoadScript;
+	tinyMCE = realTinyMCE;
+
+	ar = tinyMCECompressed.externalPlugins;
+	for (i=0; i<ar.length; i++)
+		tinyMCE.loadPlugin(ar[i].name, ar[i].url);
+
+	TinyMCE.prototype.loadScript = function() {};
+};
+
+TinyMCECompressed.prototype.loadPlugin = function(n, u) {
+	this.externalPlugins[this.externalPlugins.length] = {name : n, url : u};
+};
+
+TinyMCECompressed.prototype.importPluginLanguagePack = function(n, v) {
+	tinyMCE = realTinyMCE;
+	TinyMCE.prototype.loadScript = TinyMCE.prototype.orgLoadScript;
+	tinyMCE.importPluginLanguagePack(n, v);
+};
+
+TinyMCECompressed.prototype.addPlugin = function(n, p) {
+	tinyMCE = realTinyMCE;
+	tinyMCE.addPlugin(n, p);
+};
+
+var tinyMCE = new TinyMCECompressed();
+var tinyMCECompressed = tinyMCE;
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_popup.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_popup.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_popup.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_popup.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,272 @@
+
+
+// Some global instances, this will be filled later
+var tinyMCE = null, tinyMCELang = null;
+
+
+function TinyMCE_Popup() {
+};
+
+
+TinyMCE_Popup.prototype.init = function() {
+	var win = window.opener ? window.opener : window.dialogArguments;
+	var inst;
+
+	if (!win) {
+		// Try parent
+		win = parent.parent;
+
+		// Try top
+		if (typeof(win.tinyMCE) == "undefined")
+			win = top;
+	}
+
+	window.opener = win;
+	this.windowOpener = win;
+	this.onLoadEval = "";
+
+	// Setup parent references
+	tinyMCE = win.tinyMCE;
+	tinyMCELang = win.tinyMCELang;
+
+	if (!tinyMCE) {
+		alert("tinyMCE object reference not found from popup.");
+		return;
+	}
+
+	inst = tinyMCE.selectedInstance;
+	this.isWindow = tinyMCE.getWindowArg('mce_inside_iframe', false) == false;
+	this.storeSelection = (tinyMCE.isMSIE && !tinyMCE.isOpera) && !this.isWindow && tinyMCE.getWindowArg('mce_store_selection', true);
+
+	if (this.isWindow)
+		window.focus();
+
+	// Store selection
+	if (this.storeSelection)
+		inst.selectionBookmark = inst.selection.getBookmark(true);
+
+	// Setup dir
+	if (tinyMCELang['lang_dir'])
+		document.dir = tinyMCELang['lang_dir'];
+
+	// Setup title
+	var re = new RegExp('{|\\\$|}', 'g');
+	var title = document.title.replace(re, "");
+	if (typeof tinyMCELang[title] != "undefined") {
+		var divElm = document.createElement("div");
+		divElm.innerHTML = tinyMCELang[title];
+		document.title = divElm.innerHTML;
+
+		if (tinyMCE.setWindowTitle != null)
+			tinyMCE.setWindowTitle(window, divElm.innerHTML);
+	}
+
+	// Output Popup CSS class
+	document.write('<link href="' + tinyMCE.getParam("popups_css") + '" rel="stylesheet" type="text/css">');
+
+	tinyMCE.addEvent(window, "load", this.onLoad);
+};
+
+
+TinyMCE_Popup.prototype.onLoad = function() {
+	var dir, i, elms, body = document.body;
+
+	if (tinyMCE.getWindowArg('mce_replacevariables', true))
+		body.innerHTML = tinyMCE.applyTemplate(body.innerHTML, tinyMCE.windowArgs);
+
+	dir = tinyMCE.selectedInstance.settings['directionality'];
+	if (dir == "rtl" && document.forms && document.forms.length > 0) {
+		elms = document.forms[0].elements;
+		for (i=0; i<elms.length; i++) {
+			if ((elms[i].type == "text" || elms[i].type == "textarea") && elms[i].getAttribute("dir") != "ltr")
+				elms[i].dir = dir;
+		}
+	}
+
+	if (body.style.display == 'none')
+		body.style.display = 'block';
+
+	// Execute real onload (Opera fix)
+	if (tinyMCEPopup.onLoadEval != "")
+		eval(tinyMCEPopup.onLoadEval);
+};
+
+
+TinyMCE_Popup.prototype.executeOnLoad = function(str) {
+	if (tinyMCE.isOpera)
+		this.onLoadEval = str;
+	else
+		eval(str);
+};
+
+
+TinyMCE_Popup.prototype.resizeToInnerSize = function() {
+	// Netscape 7.1 workaround
+	if (this.isWindow && tinyMCE.isNS71) {
+		window.resizeBy(0, 10);
+		return;
+	}
+
+	if (this.isWindow) {
+		var doc = document;
+		var body = doc.body;
+		var oldMargin, wrapper, iframe, nodes, dx, dy;
+
+		if (body.style.display == 'none')
+			body.style.display = 'block';
+
+		// Remove margin
+		oldMargin = body.style.margin;
+		body.style.margin = '0';
+
+		// Create wrapper
+		wrapper = doc.createElement("div");
+		wrapper.id = 'mcBodyWrapper';
+		wrapper.style.display = 'none';
+		wrapper.style.margin = '0';
+
+		// Wrap body elements
+		nodes = doc.body.childNodes;
+		for (var i=nodes.length-1; i>=0; i--) {
+			if (wrapper.hasChildNodes())
+				wrapper.insertBefore(nodes[i].cloneNode(true), wrapper.firstChild);
+			else
+				wrapper.appendChild(nodes[i].cloneNode(true));
+
+			nodes[i].parentNode.removeChild(nodes[i]);
+		}
+
+		// Add wrapper
+		doc.body.appendChild(wrapper);
+
+		// Create iframe
+		iframe = document.createElement("iframe");
+		iframe.id = "mcWinIframe";
+		iframe.src = document.location.href.toLowerCase().indexOf('https') == -1 ? "about:blank" : tinyMCE.settings['default_document'];
+		iframe.width = "100%";
+		iframe.height = "100%";
+		iframe.style.margin = '0';
+
+		// Add iframe
+		doc.body.appendChild(iframe);
+
+		// Measure iframe
+		iframe = document.getElementById('mcWinIframe');
+		dx = tinyMCE.getWindowArg('mce_width') - iframe.clientWidth;
+		dy = tinyMCE.getWindowArg('mce_height') - iframe.clientHeight;
+
+		// Resize window
+		// tinyMCE.debug(tinyMCE.getWindowArg('mce_width') + "," + tinyMCE.getWindowArg('mce_height') + " - " + dx + "," + dy);
+		window.resizeBy(dx, dy);
+
+		// Hide iframe and show wrapper
+		body.style.margin = oldMargin;
+		iframe.style.display = 'none';
+		wrapper.style.display = 'block';
+	}
+};
+
+
+TinyMCE_Popup.prototype.resizeToContent = function() {
+	var isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	var isOpera = (navigator.userAgent.indexOf("Opera") != -1);
+
+	if (isOpera)
+		return;
+
+	if (isMSIE) {
+		try { window.resizeTo(10, 10); } catch (e) {}
+
+		var elm = document.body;
+		var width = elm.offsetWidth;
+		var height = elm.offsetHeight;
+		var dx = (elm.scrollWidth - width) + 4;
+		var dy = elm.scrollHeight - height;
+
+		try { window.resizeBy(dx, dy); } catch (e) {}
+	} else {
+		window.scrollBy(1000, 1000);
+		if (window.scrollX > 0 || window.scrollY > 0) {
+			window.resizeBy(window.innerWidth * 2, window.innerHeight * 2);
+			window.sizeToContent();
+			window.scrollTo(0, 0);
+			var x = parseInt(screen.width / 2.0) - (window.outerWidth / 2.0);
+			var y = parseInt(screen.height / 2.0) - (window.outerHeight / 2.0);
+			window.moveTo(x, y);
+		}
+	}
+};
+
+
+TinyMCE_Popup.prototype.getWindowArg = function(name, default_value) {
+	return tinyMCE.getWindowArg(name, default_value);
+};
+
+
+TinyMCE_Popup.prototype.restoreSelection = function() {
+	if (this.storeSelection) {
+		var inst = tinyMCE.selectedInstance;
+
+		inst.getWin().focus();
+
+		if (inst.selectionBookmark)
+			inst.selection.moveToBookmark(inst.selectionBookmark);
+	}
+};
+
+
+TinyMCE_Popup.prototype.execCommand = function(command, user_interface, value) {
+	var inst = tinyMCE.selectedInstance;
+
+	this.restoreSelection();
+	inst.execCommand(command, user_interface, value);
+
+	// Store selection
+	if (this.storeSelection)
+		inst.selectionBookmark = inst.selection.getBookmark(true);
+};
+
+
+TinyMCE_Popup.prototype.close = function() {
+	tinyMCE.closeWindow(window);
+};
+
+
+TinyMCE_Popup.prototype.pickColor = function(e, element_id) {
+	tinyMCE.selectedInstance.execCommand('mceColorPicker', true, {
+		element_id : element_id,
+		document : document,
+		window : window,
+		store_selection : false
+	});
+};
+
+
+TinyMCE_Popup.prototype.openBrowser = function(element_id, type, option) {
+	var cb = tinyMCE.getParam(option, tinyMCE.getParam("file_browser_callback"));
+	var url = document.getElementById(element_id).value;
+
+	tinyMCE.setWindowArg("window", window);
+	tinyMCE.setWindowArg("document", document);
+
+	// Call to external callback
+	if (eval('typeof(tinyMCEPopup.windowOpener.' + cb + ')') == "undefined")
+		alert("Callback function: " + cb + " could not be found.");
+	else
+		eval("tinyMCEPopup.windowOpener." + cb + "(element_id, url, type, window);");
+};
+
+
+TinyMCE_Popup.prototype.importClass = function(c) {
+	window[c] = function() {};
+
+	for (var n in window.opener[c].prototype)
+		window[c].prototype[n] = window.opener[c].prototype[n];
+
+	window[c].constructor = window.opener[c].constructor;
+};
+
+// Setup global instance
+var tinyMCEPopup = new TinyMCE_Popup();
+
+tinyMCEPopup.init();
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_src.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_src.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_src.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_src.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,6719 @@
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Engine.class.js */
+
+function TinyMCE_Engine() {
+	this.majorVersion = "2";
+	this.minorVersion = "0.6.1";
+	this.releaseDate = "2006-05-04";
+
+	this.instances = new Array();
+	this.switchClassCache = new Array();
+	this.windowArgs = new Array();
+	this.loadedFiles = new Array();
+	this.pendingFiles = new Array();
+	this.loadingIndex = 0;
+	this.configs = new Array();
+	this.currentConfig = 0;
+	this.eventHandlers = new Array();
+
+	// Browser check
+	var ua = navigator.userAgent;
+	this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	this.isMSIE5 = this.isMSIE && (ua.indexOf('MSIE 5') != -1);
+	this.isMSIE5_0 = this.isMSIE && (ua.indexOf('MSIE 5.0') != -1);
+	this.isGecko = ua.indexOf('Gecko') != -1;
+	this.isSafari = ua.indexOf('Safari') != -1;
+	this.isOpera = ua.indexOf('Opera') != -1;
+	this.isMac = ua.indexOf('Mac') != -1;
+	this.isNS7 = ua.indexOf('Netscape/7') != -1;
+	this.isNS71 = ua.indexOf('Netscape/7.1') != -1;
+	this.dialogCounter = 0;
+	this.plugins = new Array();
+	this.themes = new Array();
+	this.menus = new Array();
+	this.loadedPlugins = new Array();
+	this.buttonMap = new Array();
+	this.isLoaded = false;
+
+	// Fake MSIE on Opera and if Opera fakes IE, Gecko or Safari cancel those
+	if (this.isOpera) {
+		this.isMSIE = true;
+		this.isGecko = false;
+		this.isSafari =  false;
+	}
+
+	// TinyMCE editor id instance counter
+	this.idCounter = 0;
+};
+
+TinyMCE_Engine.prototype = {
+	init : function(settings) {
+		var theme;
+
+		this.settings = settings;
+
+		// Check if valid browser has execcommand support
+		if (typeof(document.execCommand) == 'undefined')
+			return;
+
+		// Get script base path
+		if (!tinyMCE.baseURL) {
+			var elements = document.getElementsByTagName('script');
+
+			for (var i=0; i<elements.length; i++) {
+				if (elements[i].src && (elements[i].src.indexOf("tiny_mce.js") != -1 || elements[i].src.indexOf("tiny_mce_dev.js") != -1 || elements[i].src.indexOf("tiny_mce_src.js") != -1 || elements[i].src.indexOf("tiny_mce_gzip") != -1)) {
+					var src = elements[i].src;
+
+					tinyMCE.srcMode = (src.indexOf('_src') != -1 || src.indexOf('_dev') != -1) ? '_src' : '';
+					tinyMCE.gzipMode = src.indexOf('_gzip') != -1;
+					src = src.substring(0, src.lastIndexOf('/'));
+
+					if (settings.exec_mode == "src" || settings.exec_mode == "normal")
+						tinyMCE.srcMode = settings.exec_mode == "src" ? '_src' : '';
+
+					tinyMCE.baseURL = src;
+					break;
+				}
+			}
+		}
+
+		// Get document base path
+		this.documentBasePath = document.location.href;
+		if (this.documentBasePath.indexOf('?') != -1)
+			this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.indexOf('?'));
+		this.documentURL = this.documentBasePath;
+		this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.lastIndexOf('/'));
+
+		// If not HTTP absolute
+		if (tinyMCE.baseURL.indexOf('://') == -1 && tinyMCE.baseURL.charAt(0) != '/') {
+			// If site absolute
+			tinyMCE.baseURL = this.documentBasePath + "/" + tinyMCE.baseURL;
+		}
+
+		// Set default values on settings
+		this._def("mode", "none");
+		this._def("theme", "advanced");
+		this._def("plugins", "", true);
+		this._def("language", "en");
+		this._def("docs_language", this.settings['language']);
+		this._def("elements", "");
+		this._def("textarea_trigger", "mce_editable");
+		this._def("editor_selector", "");
+		this._def("editor_deselector", "mceNoEditor");
+		this._def("valid_elements", "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]");
+		this._def("extended_valid_elements", "");
+		this._def("invalid_elements", "");
+		this._def("encoding", "");
+		this._def("urlconverter_callback", tinyMCE.getParam("urlconvertor_callback", "TinyMCE_Engine.prototype.convertURL"));
+		this._def("save_callback", "");
+		this._def("debug", false);
+		this._def("force_br_newlines", false);
+		this._def("force_p_newlines", true);
+		this._def("add_form_submit_trigger", true);
+		this._def("relative_urls", true);
+		this._def("remove_script_host", true);
+		this._def("focus_alert", true);
+		this._def("document_base_url", this.documentURL);
+		this._def("visual", true);
+		this._def("visual_table_class", "mceVisualAid");
+		this._def("setupcontent_callback", "");
+		this._def("fix_content_duplication", true);
+		this._def("custom_undo_redo", true);
+		this._def("custom_undo_redo_levels", -1);
+		this._def("custom_undo_redo_keyboard_shortcuts", true);
+		this._def("custom_undo_redo_restore_selection", true);
+		this._def("verify_html", true);
+		this._def("apply_source_formatting", false);
+		this._def("directionality", "ltr");
+		this._def("cleanup_on_startup", false);
+		this._def("inline_styles", false);
+		this._def("convert_newlines_to_brs", false);
+		this._def("auto_reset_designmode", true);
+		this._def("entities", "39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro", true);
+		this._def("entity_encoding", "named");
+		this._def("cleanup_callback", "");
+		this._def("add_unload_trigger", true);
+		this._def("ask", false);
+		this._def("nowrap", false);
+		this._def("auto_resize", false);
+		this._def("auto_focus", false);
+		this._def("cleanup", true);
+		this._def("remove_linebreaks", true);
+		this._def("button_tile_map", false);
+		this._def("submit_patch", true);
+		this._def("browsers", "msie,safari,gecko,opera", true);
+		this._def("dialog_type", "window");
+		this._def("accessibility_warnings", true);
+		this._def("accessibility_focus", true);
+		this._def("merge_styles_invalid_parents", "");
+		this._def("force_hex_style_colors", true);
+		this._def("trim_span_elements", true);
+		this._def("convert_fonts_to_spans", false);
+		this._def("doctype", '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');
+		this._def("font_size_classes", '');
+		this._def("font_size_style_values", 'xx-small,x-small,small,medium,large,x-large,xx-large', true);
+		this._def("event_elements", 'a,img', true);
+		this._def("convert_urls", true);
+		this._def("table_inline_editing", false);
+		this._def("object_resizing", true);
+		this._def("custom_shortcuts", true);
+		this._def("convert_on_click", false);
+		this._def("content_css", '');
+		this._def("fix_list_elements", false);
+		this._def("fix_table_elements", false);
+		this._def("strict_loading_mode", document.contentType == 'application/xhtml+xml');
+		this._def("hidden_tab_class", '');
+		this._def("display_tab_class", '');
+
+		// Force strict loading mode to false on non Gecko browsers
+		if (this.isMSIE && !this.isOpera)
+			this.settings.strict_loading_mode = false;
+
+		// Browser check IE
+		if (this.isMSIE && this.settings['browsers'].indexOf('msie') == -1)
+			return;
+
+		// Browser check Gecko
+		if (this.isGecko && this.settings['browsers'].indexOf('gecko') == -1)
+			return;
+
+		// Browser check Safari
+		if (this.isSafari && this.settings['browsers'].indexOf('safari') == -1)
+			return;
+
+		// Browser check Opera
+		if (this.isOpera && this.settings['browsers'].indexOf('opera') == -1)
+			return;
+
+		// If not super absolute make it so
+		var baseHREF = tinyMCE.settings['document_base_url'];
+		var h = document.location.href;
+		var p = h.indexOf('://');
+		if (p > 0 && document.location.protocol != "file:") {
+			p = h.indexOf('/', p + 3);
+			h = h.substring(0, p);
+
+			if (baseHREF.indexOf('://') == -1)
+				baseHREF = h + baseHREF;
+
+			tinyMCE.settings['document_base_url'] = baseHREF;
+			tinyMCE.settings['document_base_prefix'] = h;
+		}
+
+		// Trim away query part
+		if (baseHREF.indexOf('?') != -1)
+			baseHREF = baseHREF.substring(0, baseHREF.indexOf('?'));
+
+		this.settings['base_href'] = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/";
+
+		theme = this.settings['theme'];
+		this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$", "i");
+		this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
+		this.uniqueURL = 'javascript:TINYMCE_UNIQUEURL();'; // Make unique URL non real URL
+		this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
+		this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup');
+
+		// Theme url
+		this.settings['theme_href'] = tinyMCE.baseURL + "/themes/" + theme;
+
+		if (!tinyMCE.isMSIE)
+			this.settings['force_br_newlines'] = false;
+
+		if (tinyMCE.getParam("popups_css", false)) {
+			var cssPath = tinyMCE.getParam("popups_css", "");
+
+			// Is relative
+			if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+				this.settings['popups_css'] = this.documentBasePath + "/" + cssPath;
+			else
+				this.settings['popups_css'] = cssPath;
+		} else
+			this.settings['popups_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_popup.css";
+
+		if (tinyMCE.getParam("editor_css", false)) {
+			var cssPath = tinyMCE.getParam("editor_css", "");
+
+			// Is relative
+			if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+				this.settings['editor_css'] = this.documentBasePath + "/" + cssPath;
+			else
+				this.settings['editor_css'] = cssPath;
+		} else
+			this.settings['editor_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_ui.css";
+
+		if (tinyMCE.settings['debug']) {
+			var msg = "Debug: \n";
+
+			msg += "baseURL: " + this.baseURL + "\n";
+			msg += "documentBasePath: " + this.documentBasePath + "\n";
+			msg += "content_css: " + this.settings['content_css'] + "\n";
+			msg += "popups_css: " + this.settings['popups_css'] + "\n";
+			msg += "editor_css: " + this.settings['editor_css'] + "\n";
+
+			alert(msg);
+		}
+
+		// Only do this once
+		if (this.configs.length == 0) {
+			// Is Safari enabled
+			if (this.isSafari && this.getParam('safari_warning', false))
+				alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false");
+
+			if (typeof(TinyMCECompressed) == "undefined") {
+				tinyMCE.addEvent(window, "DOMContentLoaded", TinyMCE_Engine.prototype.onLoad);
+
+				if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+					if (document.body)
+						tinyMCE.addEvent(document.body, "readystatechange", TinyMCE_Engine.prototype.onLoad);
+					else
+						tinyMCE.addEvent(document, "readystatechange", TinyMCE_Engine.prototype.onLoad);
+				}
+
+				tinyMCE.addEvent(window, "load", TinyMCE_Engine.prototype.onLoad);
+				tinyMCE._addUnloadEvents();
+			}
+		}
+
+		this.loadScript(tinyMCE.baseURL + '/themes/' + this.settings['theme'] + '/editor_template' + tinyMCE.srcMode + '.js');
+		this.loadScript(tinyMCE.baseURL + '/langs/' + this.settings['language'] +  '.js');
+		this.loadCSS(this.settings['editor_css']);
+
+		// Add plugins
+		var p = tinyMCE.getParam('plugins', '', true, ',');
+		if (p.length > 0) {
+			for (var i=0; i<p.length; i++) {
+				if (p[i].charAt(0) != '-')
+					this.loadScript(tinyMCE.baseURL + '/plugins/' + p[i] + '/editor_plugin' + tinyMCE.srcMode + '.js');
+			}
+		}
+
+		// Setup entities
+		settings['cleanup_entities'] = new Array();
+		var entities = tinyMCE.getParam('entities', '', true, ',');
+		for (var i=0; i<entities.length; i+=2)
+			settings['cleanup_entities']['c' + entities[i]] = entities[i+1];
+
+		// Save away this config
+		settings['index'] = this.configs.length;
+		this.configs[this.configs.length] = settings;
+
+		// Start loading first one in chain
+		this.loadNextScript();
+	},
+
+	_addUnloadEvents : function() {
+		if (tinyMCE.isMSIE) {
+			if (tinyMCE.settings['add_unload_trigger']) {
+				tinyMCE.addEvent(window, "unload", TinyMCE_Engine.prototype.unloadHandler);
+				tinyMCE.addEvent(window.document, "beforeunload", TinyMCE_Engine.prototype.unloadHandler);
+			}
+		} else {
+			if (tinyMCE.settings['add_unload_trigger'])
+				tinyMCE.addEvent(window, "unload", function () {tinyMCE.triggerSave(true, true);});
+		}
+	},
+
+	_def : function(key, def_val, t) {
+		var v = tinyMCE.getParam(key, def_val);
+
+		v = t ? v.replace(/\s+/g,"") : v;
+
+		this.settings[key] = v;
+	},
+
+	hasPlugin : function(n) {
+		return typeof(this.plugins[n]) != "undefined" && this.plugins[n] != null;
+	},
+
+	addPlugin : function(n, p) {
+		var op = this.plugins[n];
+
+		// Use the previous plugin object base URL used when loading external plugins
+		p.baseURL = op ? op.baseURL : tinyMCE.baseURL + "/plugins/" + n;
+		this.plugins[n] = p;
+
+		this.loadNextScript();
+	},
+
+	setPluginBaseURL : function(n, u) {
+		var op = this.plugins[n];
+
+		if (op)
+			op.baseURL = u;
+		else
+			this.plugins[n] = {baseURL : u};
+	},
+
+	loadPlugin : function(n, u) {
+		u = u.indexOf('.js') != -1 ? u.substring(0, u.lastIndexOf('/')) : u;
+		u = u.charAt(u.length-1) == '/' ? u.substring(0, u.length-1) : u;
+		this.plugins[n] = {baseURL : u};
+		this.loadScript(u + "/editor_plugin" + (tinyMCE.srcMode ? '_src' : '') + ".js");
+	},
+
+	hasTheme : function(n) {
+		return typeof(this.themes[n]) != "undefined" && this.themes[n] != null;
+	},
+
+	addTheme : function(n, t) {
+		this.themes[n] = t;
+
+		this.loadNextScript();
+	},
+
+	addMenu : function(n, m) {
+		this.menus[n] = m;
+	},
+
+	hasMenu : function(n) {
+		return typeof(this.plugins[n]) != "undefined" && this.plugins[n] != null;
+	},
+
+	loadScript : function(url) {
+		var i;
+
+		for (i=0; i<this.loadedFiles.length; i++) {
+			if (this.loadedFiles[i] == url)
+				return;
+		}
+
+		if (tinyMCE.settings.strict_loading_mode)
+			this.pendingFiles[this.pendingFiles.length] = url;
+		else
+			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
+
+		this.loadedFiles[this.loadedFiles.length] = url;
+	},
+
+	loadNextScript : function() {
+		var d = document, se;
+
+		if (!tinyMCE.settings.strict_loading_mode)
+			return;
+
+		if (this.loadingIndex < this.pendingFiles.length) {
+			se = d.createElementNS('http://www.w3.org/1999/xhtml', 'script');
+			se.setAttribute('language', 'javascript');
+			se.setAttribute('type', 'text/javascript');
+			se.setAttribute('src', this.pendingFiles[this.loadingIndex++]);
+
+			d.getElementsByTagName("head")[0].appendChild(se);
+		} else
+			this.loadingIndex = -1; // Done with loading
+	},
+
+	loadCSS : function(url) {
+		var ar = url.replace(/\s+/, '').split(',');
+		var lflen = 0, csslen = 0;
+		var skip = false;
+		var x = 0, i = 0, nl, le;
+
+		for (x = 0,csslen = ar.length; x<csslen; x++) {
+			ignore_css = false;
+
+			if (ar[x] != null && ar[x] != 'null' && ar[x].length > 0) {
+				/* Make sure it doesn't exist. */
+				for (i=0, lflen=this.loadedFiles.length; i<lflen; i++) {
+					if (this.loadedFiles[i] == ar[x]) {
+						skip = true;
+						break;
+					}
+				}
+
+				if (!skip) {
+					if (tinyMCE.settings.strict_loading_mode) {
+						nl = document.getElementsByTagName("head");
+
+						le = document.createElement('link');
+						le.setAttribute('href', ar[x]);
+						le.setAttribute('rel', 'stylesheet');
+						le.setAttribute('type', 'text/css');
+
+						nl[0].appendChild(le);			
+					} else
+						document.write('<link href="' + ar[x] + '" rel="stylesheet" type="text/css" />');
+
+					this.loadedFiles[this.loadedFiles.length] = ar[x];
+				}
+			}
+		}
+	},
+
+	importCSS : function(doc, css) {
+		var css_ary = css.replace(/\s+/, '').split(',');
+		var csslen, elm, headArr, x, css_file;
+
+		for (x = 0, csslen = css_ary.length; x<csslen; x++) {
+			css_file = css_ary[x];
+
+			if (css_file != null && css_file != 'null' && css_file.length > 0) {
+				// Is relative, make absolute
+				if (css_file.indexOf('://') == -1 && css_file.charAt(0) != '/')
+					css_file = this.documentBasePath + "/" + css_file;
+
+				if (typeof(doc.createStyleSheet) == "undefined") {
+					elm = doc.createElement("link");
+
+					elm.rel = "stylesheet";
+					elm.href = css_file;
+
+					if ((headArr = doc.getElementsByTagName("head")) != null && headArr.length > 0)
+						headArr[0].appendChild(elm);
+				} else
+					doc.createStyleSheet(css_file);
+			}
+		}
+	},
+
+	confirmAdd : function(e, settings) {
+		var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+		var elementId = elm.name ? elm.name : elm.id;
+
+		tinyMCE.settings = settings;
+
+		if (tinyMCE.settings['convert_on_click'] || (!elm.getAttribute('mce_noask') && confirm(tinyMCELang['lang_edit_confirm'])))
+			tinyMCE.addMCEControl(elm, elementId);
+
+		elm.setAttribute('mce_noask', 'true');
+	},
+
+	updateContent : function(form_element_name) {
+		// Find MCE instance linked to given form element and copy it's value
+		var formElement = document.getElementById(form_element_name);
+		for (var n in tinyMCE.instances) {
+			var inst = tinyMCE.instances[n];
+			if (!tinyMCE.isInstance(inst))
+				continue;
+
+			inst.switchSettings();
+
+			if (inst.formElement == formElement) {
+				var doc = inst.getDoc();
+		
+				tinyMCE._setHTML(doc, inst.formElement.value);
+
+				if (!tinyMCE.isMSIE)
+					doc.body.innerHTML = tinyMCE._cleanupHTML(inst, doc, this.settings, doc.body, inst.visualAid);
+			}
+		}
+	},
+
+	addMCEControl : function(replace_element, form_element_name, target_document) {
+		var id = "mce_editor_" + tinyMCE.idCounter++;
+		var inst = new TinyMCE_Control(tinyMCE.settings);
+
+		inst.editorId = id;
+		this.instances[id] = inst;
+
+		inst._onAdd(replace_element, form_element_name, target_document);
+	},
+
+	removeMCEControl : function(editor_id) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+
+		if (inst) {
+			inst.switchSettings();
+
+			editor_id = inst.editorId;
+			var html = tinyMCE.getContent(editor_id);
+
+			// Remove editor instance from instances array
+			var tmpInstances = new Array();
+			for (var instanceName in tinyMCE.instances) {
+				var instance = tinyMCE.instances[instanceName];
+				if (!tinyMCE.isInstance(instance))
+					continue;
+
+				if (instanceName != editor_id)
+						tmpInstances[instanceName] = instance;
+			}
+			tinyMCE.instances = tmpInstances;
+
+			tinyMCE.selectedElement = null;
+			tinyMCE.selectedInstance = null;
+
+			// Remove element
+			var replaceElement = document.getElementById(editor_id + "_parent");
+			var oldTargetElement = inst.oldTargetElement;
+			var targetName = oldTargetElement.nodeName.toLowerCase();
+
+			if (targetName == "textarea" || targetName == "input") {
+				// Just show the old text area
+				replaceElement.parentNode.removeChild(replaceElement);
+				oldTargetElement.style.display = "inline";
+				oldTargetElement.value = html;
+			} else {
+				oldTargetElement.innerHTML = html;
+				oldTargetElement.style.display = 'block';
+
+				replaceElement.parentNode.insertBefore(oldTargetElement, replaceElement);
+				replaceElement.parentNode.removeChild(replaceElement);
+			}
+		}
+	},
+
+	triggerSave : function(skip_cleanup, skip_callback) {
+		var inst, n;
+
+		// Default to false
+		if (typeof(skip_cleanup) == "undefined")
+			skip_cleanup = false;
+
+		// Default to false
+		if (typeof(skip_callback) == "undefined")
+			skip_callback = false;
+
+		// Cleanup and set all form fields
+		for (n in tinyMCE.instances) {
+			inst = tinyMCE.instances[n];
+
+			if (!tinyMCE.isInstance(inst))
+				continue;
+
+			inst.triggerSave(skip_cleanup, skip_callback);
+		}
+	},
+
+	resetForm : function(form_index) {
+		var i, inst, n, formObj = document.forms[form_index];
+
+		for (n in tinyMCE.instances) {
+			inst = tinyMCE.instances[n];
+
+			if (!tinyMCE.isInstance(inst))
+				continue;
+
+			inst.switchSettings();
+
+			for (i=0; i<formObj.elements.length; i++) {
+				if (inst.formTargetElementId == formObj.elements[i].name)
+					inst.getBody().innerHTML = inst.startContent;
+			}
+		}
+	},
+
+	execInstanceCommand : function(editor_id, command, user_interface, value, focus) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+		if (inst) {
+			if (typeof(focus) == "undefined")
+				focus = true;
+
+			if (focus)
+				inst.contentWindow.focus();
+
+			// Reset design mode if lost
+			inst.autoResetDesignMode();
+
+			this.selectedElement = inst.getFocusElement();
+			this.selectedInstance = inst;
+			tinyMCE.execCommand(command, user_interface, value);
+
+			// Cancel event so it doesn't call onbeforeonunlaod
+			if (tinyMCE.isMSIE && window.event != null)
+				tinyMCE.cancelEvent(window.event);
+		}
+	},
+
+	execCommand : function(command, user_interface, value) {
+		// Default input
+		user_interface = user_interface ? user_interface : false;
+		value = value ? value : null;
+
+		if (tinyMCE.selectedInstance)
+			tinyMCE.selectedInstance.switchSettings();
+
+		switch (command) {
+			case 'mceHelp':
+				tinyMCE.openWindow({
+					file : 'about.htm',
+					width : 480,
+					height : 380
+				}, {
+					tinymce_version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion,
+					tinymce_releasedate : tinyMCE.releaseDate,
+					inline : "yes"
+				});
+			return;
+
+			case 'mceFocus':
+				var inst = tinyMCE.getInstanceById(value);
+				if (inst)
+					inst.contentWindow.focus();
+			return;
+
+			case "mceAddControl":
+			case "mceAddEditor":
+				tinyMCE.addMCEControl(tinyMCE._getElementById(value), value);
+				return;
+
+			case "mceAddFrameControl":
+				tinyMCE.addMCEControl(tinyMCE._getElementById(value['element'], value['document']), value['element'], value['document']);
+				return;
+
+			case "mceRemoveControl":
+			case "mceRemoveEditor":
+				tinyMCE.removeMCEControl(value);
+				return;
+
+			case "mceResetDesignMode":
+				// Resets the designmode state of the editors in Gecko
+				if (!tinyMCE.isMSIE) {
+					for (var n in tinyMCE.instances) {
+						if (!tinyMCE.isInstance(tinyMCE.instances[n]))
+							continue;
+
+						try {
+							tinyMCE.instances[n].getDoc().designMode = "on";
+						} catch (e) {
+							// Ignore any errors
+						}
+					}
+				}
+
+				return;
+		}
+
+		if (this.selectedInstance) {
+			this.selectedInstance.execCommand(command, user_interface, value);
+		} else if (tinyMCE.settings['focus_alert'])
+			alert(tinyMCELang['lang_focus_alert']);
+	},
+
+	_createIFrame : function(replace_element, doc, win) {
+		var iframe, id = replace_element.getAttribute("id");
+		var aw, ah;
+
+		if (typeof(doc) == "undefined")
+			doc = document;
+
+		if (typeof(win) == "undefined")
+			win = window;
+
+		iframe = doc.createElement("iframe");
+
+		aw = "" + tinyMCE.settings['area_width'];
+		ah = "" + tinyMCE.settings['area_height'];
+
+		if (aw.indexOf('%') == -1) {
+			aw = parseInt(aw);
+			aw = aw < 0 ? 300 : aw;
+			aw = aw + "px";
+		}
+
+		if (ah.indexOf('%') == -1) {
+			ah = parseInt(ah);
+			ah = ah < 0 ? 240 : ah;
+			ah = ah + "px";
+		}
+
+		iframe.setAttribute("id", id);
+		iframe.setAttribute("class", "mceEditorIframe");
+		iframe.setAttribute("border", "0");
+		iframe.setAttribute("frameBorder", "0");
+		iframe.setAttribute("marginWidth", "0");
+		iframe.setAttribute("marginHeight", "0");
+		iframe.setAttribute("leftMargin", "0");
+		iframe.setAttribute("topMargin", "0");
+		iframe.setAttribute("width", aw);
+		iframe.setAttribute("height", ah);
+		iframe.setAttribute("allowtransparency", "true");
+		iframe.className = 'mceEditorIframe';
+
+		if (tinyMCE.settings["auto_resize"])
+			iframe.setAttribute("scrolling", "no");
+
+		// Must have a src element in MSIE HTTPs breaks aswell as absoute URLs
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			iframe.setAttribute("src", this.settings['default_document']);
+
+		iframe.style.width = aw;
+		iframe.style.height = ah;
+
+		// Ugly hack for Gecko problem in strict mode
+		if (tinyMCE.settings.strict_loading_mode)
+			iframe.style.marginBottom = '-5px';
+
+		// MSIE 5.0 issue
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			replace_element.outerHTML = iframe.outerHTML;
+		else
+			replace_element.parentNode.replaceChild(iframe, replace_element);
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			return win.frames[id];
+		else
+			return iframe;
+	},
+
+	setupContent : function(editor_id) {
+		var inst = tinyMCE.instances[editor_id];
+		var doc = inst.getDoc();
+		var head = doc.getElementsByTagName('head').item(0);
+		var content = inst.startContent;
+
+		// HTML values get XML encoded in strict mode
+		if (tinyMCE.settings.strict_loading_mode) {
+			content = content.replace(/&lt;/g, '<');
+			content = content.replace(/&gt;/g, '>');
+			content = content.replace(/&quot;/g, '"');
+			content = content.replace(/&amp;/g, '&');
+		}
+
+		inst.switchSettings();
+
+		// Not loaded correctly hit it again, Mozilla bug #997860
+		if (!tinyMCE.isMSIE && tinyMCE.getParam("setupcontent_reload", false) && doc.title != "blank_page") {
+			// This part will remove the designMode status
+			// Failes first time in Firefox 1.5b2 on Mac
+			try {doc.location.href = tinyMCE.baseURL + "/blank.htm";} catch (ex) {}
+			window.setTimeout("tinyMCE.setupContent('" + editor_id + "');", 1000);
+			return;
+		}
+
+		if (!head) {
+			window.setTimeout("tinyMCE.setupContent('" + editor_id + "');", 10);
+			return;
+		}
+
+		// Import theme specific content CSS the user specific
+		tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/themes/" + inst.settings['theme'] + "/css/editor_content.css");
+		tinyMCE.importCSS(inst.getDoc(), inst.settings['content_css']);
+		tinyMCE.dispatchCallback(inst, 'init_instance_callback', 'initInstance', inst);
+
+		// Setup keyboard shortcuts
+		if (tinyMCE.getParam('custom_undo_redo_keyboard_shortcuts')) {
+			inst.addShortcut('ctrl', 'z', 'lang_undo_desc', 'Undo');
+			inst.addShortcut('ctrl', 'y', 'lang_redo_desc', 'Redo');
+		}
+
+		// Add default shortcuts for gecko
+		if (tinyMCE.isGecko) {
+			inst.addShortcut('ctrl', 'b', 'lang_bold_desc', 'Bold');
+			inst.addShortcut('ctrl', 'i', 'lang_italic_desc', 'Italic');
+			inst.addShortcut('ctrl', 'u', 'lang_underline_desc', 'Underline');
+		}
+
+		// Setup span styles
+		if (tinyMCE.getParam("convert_fonts_to_spans"))
+			inst.getDoc().body.setAttribute('id', 'mceSpanFonts');
+
+		if (tinyMCE.settings['nowrap'])
+			doc.body.style.whiteSpace = "nowrap";
+
+		doc.body.dir = this.settings['directionality'];
+		doc.editorId = editor_id;
+
+		// Add on document element in Mozilla
+		if (!tinyMCE.isMSIE)
+			doc.documentElement.editorId = editor_id;
+
+		inst.setBaseHREF(tinyMCE.settings['base_href']);
+
+		// Replace new line characters to BRs
+		if (tinyMCE.settings['convert_newlines_to_brs']) {
+			content = tinyMCE.regexpReplace(content, "\r\n", "<br />", "gi");
+			content = tinyMCE.regexpReplace(content, "\r", "<br />", "gi");
+			content = tinyMCE.regexpReplace(content, "\n", "<br />", "gi");
+		}
+
+		// Open closed anchors
+	//	content = content.replace(new RegExp('<a(.*?)/>', 'gi'), '<a$1></a>');
+
+		// Call custom cleanup code
+		content = tinyMCE.storeAwayURLs(content);
+		content = tinyMCE._customCleanup(inst, "insert_to_editor", content);
+
+		if (tinyMCE.isMSIE) {
+			// Ugly!!!
+			window.setInterval('try{tinyMCE.getCSSClasses(tinyMCE.instances["' + editor_id + '"].getDoc(), "' + editor_id + '");}catch(e){}', 500);
+
+			if (tinyMCE.settings["force_br_newlines"])
+				doc.styleSheets[0].addRule("p", "margin: 0;");
+
+			var body = inst.getBody();
+			body.editorId = editor_id;
+		}
+
+		content = tinyMCE.cleanupHTMLCode(content);
+
+		// Fix for bug #958637
+		if (!tinyMCE.isMSIE) {
+			var contentElement = inst.getDoc().createElement("body");
+			var doc = inst.getDoc();
+
+			contentElement.innerHTML = content;
+
+			// Remove weridness!
+			if (tinyMCE.isGecko && tinyMCE.settings['remove_lt_gt'])
+				content = content.replace(new RegExp('&lt;&gt;', 'g'), "");
+
+			if (tinyMCE.settings['cleanup_on_startup'])
+				tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, doc, this.settings, contentElement));
+			else {
+				// Convert all strong/em to b/i
+				content = tinyMCE.regexpReplace(content, "<strong", "<b", "gi");
+				content = tinyMCE.regexpReplace(content, "<em(/?)>", "<i$1>", "gi");
+				content = tinyMCE.regexpReplace(content, "<em ", "<i ", "gi");
+				content = tinyMCE.regexpReplace(content, "</strong>", "</b>", "gi");
+				content = tinyMCE.regexpReplace(content, "</em>", "</i>", "gi");
+				tinyMCE.setInnerHTML(inst.getBody(), content);
+			}
+
+			tinyMCE.convertAllRelativeURLs(inst.getBody());
+		} else {
+			if (tinyMCE.settings['cleanup_on_startup']) {
+				tinyMCE._setHTML(inst.getDoc(), content);
+
+				// Produces permission denied error in MSIE 5.5
+				eval('try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}');
+			} else
+				tinyMCE._setHTML(inst.getDoc(), content);
+		}
+
+		// Fix for bug #957681
+		//inst.getDoc().designMode = inst.getDoc().designMode;
+
+		// Setup element references
+		var parentElm = inst.targetDoc.getElementById(inst.editorId + '_parent');
+		inst.formElement = tinyMCE.isGecko ? parentElm.previousSibling : parentElm.nextSibling;
+
+		tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual'], inst);
+		tinyMCE.dispatchCallback(inst, 'setupcontent_callback', 'setupContent', editor_id, inst.getBody(), inst.getDoc());
+
+		// Re-add design mode on mozilla
+		if (!tinyMCE.isMSIE)
+			tinyMCE.addEventHandlers(inst);
+
+		// Add blur handler
+		if (tinyMCE.isMSIE) {
+			tinyMCE.addEvent(inst.getBody(), "blur", TinyMCE_Engine.prototype._eventPatch);
+			tinyMCE.addEvent(inst.getBody(), "beforedeactivate", TinyMCE_Engine.prototype._eventPatch); // Bug #1439953
+
+			// Workaround for drag drop/copy paste base href bug
+			if (!tinyMCE.isOpera) {
+				tinyMCE.addEvent(doc.body, "mousemove", TinyMCE_Engine.prototype.onMouseMove);
+				tinyMCE.addEvent(doc.body, "beforepaste", TinyMCE_Engine.prototype._eventPatch);
+				tinyMCE.addEvent(doc.body, "drop", TinyMCE_Engine.prototype._eventPatch);
+			}
+		}
+
+		// Trigger node change, this call locks buttons for tables and so forth
+		tinyMCE.selectedInstance = inst;
+		tinyMCE.selectedElement = inst.contentWindow.document.body;
+
+		// Call custom DOM cleanup
+		tinyMCE._customCleanup(inst, "insert_to_editor_dom", inst.getBody());
+		tinyMCE._customCleanup(inst, "setup_content_dom", inst.getBody());
+		tinyMCE._setEventsEnabled(inst.getBody(), false);
+		tinyMCE.cleanupAnchors(inst.getDoc());
+
+		if (tinyMCE.getParam("convert_fonts_to_spans"))
+			tinyMCE.convertSpansToFonts(inst.getDoc());
+
+		inst.startContent = tinyMCE.trim(inst.getBody().innerHTML);
+		inst.undoRedo.add({ content : inst.startContent });
+
+		// Cleanup any mess left from storyAwayURLs
+		if (tinyMCE.isGecko) {
+			// Remove mce_src from textnodes and comments
+			tinyMCE.selectNodes(inst.getBody(), function(n) {
+				if (n.nodeType == 3 || n.nodeType == 8) {
+					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+				}
+
+				return false;
+			});
+		}
+
+		// Cleanup any mess left from storyAwayURLs
+		tinyMCE._removeInternal(inst.getBody());
+
+		tinyMCE.selectedInstance = inst;
+		tinyMCE.triggerNodeChange(false, true);
+	},
+
+	storeAwayURLs : function(s) {
+		// Remove all mce_src, mce_href and replace them with new ones
+	//	s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+	//	s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+
+		if (!s.match(/(mce_src|mce_href)/gi, s)) {
+			s = s.replace(new RegExp('src\\s*=\\s*\"([^ >\"]*)\"', 'gi'), 'src="$1" mce_src="$1"');
+			s = s.replace(new RegExp('href\\s*=\\s*\"([^ >\"]*)\"', 'gi'), 'href="$1" mce_href="$1"');
+		}
+
+		return s;
+	},
+
+	_removeInternal : function(n) {
+		if (tinyMCE.isGecko) {
+			// Remove mce_src from textnodes and comments
+			tinyMCE.selectNodes(n, function(n) {
+				if (n.nodeType == 3 || n.nodeType == 8) {
+					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+				}
+
+				return false;
+			});
+		}
+	},
+
+	removeTinyMCEFormElements : function(form_obj) {
+		// Check if form is valid
+		if (typeof(form_obj) == "undefined" || form_obj == null)
+			return;
+
+		// If not a form, find the form
+		if (form_obj.nodeName != "FORM") {
+			if (form_obj.form)
+				form_obj = form_obj.form;
+			else
+				form_obj = tinyMCE.getParentElement(form_obj, "form");
+		}
+
+		// Still nothing
+		if (form_obj == null)
+			return;
+
+		// Disable all UI form elements that TinyMCE created
+		for (var i=0; i<form_obj.elements.length; i++) {
+			var elementId = form_obj.elements[i].name ? form_obj.elements[i].name : form_obj.elements[i].id;
+
+			if (elementId.indexOf('mce_editor_') == 0)
+				form_obj.elements[i].disabled = true;
+		}
+	},
+
+	handleEvent : function(e) {
+		var inst = tinyMCE.selectedInstance;
+
+		// Remove odd, error
+		if (typeof(tinyMCE) == "undefined")
+			return true;
+
+		//tinyMCE.debug(e.type + " " + e.target.nodeName + " " + (e.relatedTarget ? e.relatedTarget.nodeName : ""));
+
+		if (tinyMCE.executeCallback(tinyMCE.selectedInstance, 'handle_event_callback', 'handleEvent', e))
+			return false;
+
+		switch (e.type) {
+			case "beforedeactivate": // Was added due to bug #1439953
+			case "blur":
+				if (tinyMCE.selectedInstance)
+					tinyMCE.selectedInstance.execCommand('mceEndTyping');
+
+				tinyMCE.hideMenus();
+
+				return;
+
+			// Workaround for drag drop/copy paste base href bug
+			case "drop":
+			case "beforepaste":
+				if (tinyMCE.selectedInstance)
+					tinyMCE.selectedInstance.setBaseHREF(null);
+
+				// Fixes odd MSIE bug where drag/droping elements in a iframe with height 100% breaks
+				// This logic forces the width/height to be in pixels while the user is drag/dropping
+				if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+					var ife = tinyMCE.selectedInstance.iframeElement;
+
+					/*if (ife.style.width.indexOf('%') != -1) {
+						ife._oldWidth = ife.width.height;
+						ife.style.width = ife.clientWidth;
+					}*/
+
+					if (ife.style.height.indexOf('%') != -1) {
+						ife._oldHeight = ife.style.height;
+						ife.style.height = ife.clientHeight;
+					}
+				}
+
+				window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();", 1);
+				return;
+
+			case "submit":
+				tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target);
+				tinyMCE.triggerSave();
+				tinyMCE.isNotDirty = true;
+				return;
+
+			case "reset":
+				var formObj = tinyMCE.isMSIE ? window.event.srcElement : e.target;
+
+				for (var i=0; i<document.forms.length; i++) {
+					if (document.forms[i] == formObj)
+						window.setTimeout('tinyMCE.resetForm(' + i + ');', 10);
+				}
+
+				return;
+
+			case "keypress":
+				if (inst && inst.handleShortcut(e))
+					return false;
+
+				if (e.target.editorId) {
+					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+				} else {
+					if (e.target.ownerDocument.editorId)
+						tinyMCE.selectedInstance = tinyMCE.instances[e.target.ownerDocument.editorId];
+				}
+
+				if (tinyMCE.selectedInstance)
+					tinyMCE.selectedInstance.switchSettings();
+
+				// Insert P element
+				if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && e.keyCode == 13 && !e.shiftKey) {
+					// Insert P element instead of BR
+					if (TinyMCE_ForceParagraphs._insertPara(tinyMCE.selectedInstance, e)) {
+						// Cancel event
+						tinyMCE.execCommand("mceAddUndoLevel");
+						tinyMCE.cancelEvent(e);
+						return false;
+					}
+				}
+
+				// Handle backspace
+				if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && (e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) {
+					// Insert P element instead of BR
+					if (TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance, e.type)) {
+						// Cancel event
+						tinyMCE.execCommand("mceAddUndoLevel");
+						tinyMCE.cancelEvent(e);
+						return false;
+					}
+				}
+
+				// Return key pressed
+				if (tinyMCE.isMSIE && tinyMCE.settings['force_br_newlines'] && e.keyCode == 13) {
+					if (e.target.editorId)
+						tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+
+					if (tinyMCE.selectedInstance) {
+						var sel = tinyMCE.selectedInstance.getDoc().selection;
+						var rng = sel.createRange();
+
+						if (tinyMCE.getParentElement(rng.parentElement(), "li") != null)
+							return false;
+
+						// Cancel event
+						e.returnValue = false;
+						e.cancelBubble = true;
+
+						// Insert BR element
+						rng.pasteHTML("<br />");
+						rng.collapse(false);
+						rng.select();
+
+						tinyMCE.execCommand("mceAddUndoLevel");
+						tinyMCE.triggerNodeChange(false);
+						return false;
+					}
+				}
+
+				// Backspace or delete
+				if (e.keyCode == 8 || e.keyCode == 46) {
+					tinyMCE.selectedElement = e.target;
+					tinyMCE.linkElement = tinyMCE.getParentElement(e.target, "a");
+					tinyMCE.imgElement = tinyMCE.getParentElement(e.target, "img");
+					tinyMCE.triggerNodeChange(false);
+				}
+
+				return false;
+			break;
+
+			case "keyup":
+			case "keydown":
+				tinyMCE.hideMenus();
+				tinyMCE.hasMouseMoved = false;
+
+				if (inst && inst.handleShortcut(e))
+					return false;
+
+				if (e.target.editorId)
+					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+				else
+					return;
+
+				if (tinyMCE.selectedInstance)
+					tinyMCE.selectedInstance.switchSettings();
+
+				var inst = tinyMCE.selectedInstance;
+
+				// Handle backspace
+				if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && (e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) {
+					// Insert P element instead of BR
+					if (TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance, e.type)) {
+						// Cancel event
+						tinyMCE.execCommand("mceAddUndoLevel");
+						e.preventDefault();
+						return false;
+					}
+				}
+
+				tinyMCE.selectedElement = null;
+				tinyMCE.selectedNode = null;
+				var elm = tinyMCE.selectedInstance.getFocusElement();
+				tinyMCE.linkElement = tinyMCE.getParentElement(elm, "a");
+				tinyMCE.imgElement = tinyMCE.getParentElement(elm, "img");
+				tinyMCE.selectedElement = elm;
+
+				// Update visualaids on tabs
+				if (tinyMCE.isGecko && e.type == "keyup" && e.keyCode == 9)
+					tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(), true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
+
+				// Fix empty elements on return/enter, check where enter occured
+				if (tinyMCE.isMSIE && e.type == "keydown" && e.keyCode == 13)
+					tinyMCE.enterKeyElement = tinyMCE.selectedInstance.getFocusElement();
+
+				// Fix empty elements on return/enter
+				if (tinyMCE.isMSIE && e.type == "keyup" && e.keyCode == 13) {
+					var elm = tinyMCE.enterKeyElement;
+					if (elm) {
+						var re = new RegExp('^HR|IMG|BR$','g'); // Skip these
+						var dre = new RegExp('^H[1-6]$','g'); // Add double on these
+
+						if (!elm.hasChildNodes() && !re.test(elm.nodeName)) {
+							if (dre.test(elm.nodeName))
+								elm.innerHTML = "&nbsp;&nbsp;";
+							else
+								elm.innerHTML = "&nbsp;";
+						}
+					}
+				}
+
+				// Check if it's a position key
+				var keys = tinyMCE.posKeyCodes;
+				var posKey = false;
+				for (var i=0; i<keys.length; i++) {
+					if (keys[i] == e.keyCode) {
+						posKey = true;
+						break;
+					}
+				}
+
+				// MSIE custom key handling
+				if (tinyMCE.isMSIE && tinyMCE.settings['custom_undo_redo']) {
+					var keys = new Array(8,46); // Backspace,Delete
+					for (var i=0; i<keys.length; i++) {
+						if (keys[i] == e.keyCode) {
+							if (e.type == "keyup")
+								tinyMCE.triggerNodeChange(false);
+						}
+					}
+				}
+
+				// If Ctrl key
+				if (e.keyCode == 17)
+					return true;
+
+				// Handle Undo/Redo when typing content
+
+				// Start typing (non position key)
+				if (!posKey && e.type == "keyup")
+					tinyMCE.execCommand("mceStartTyping");
+
+				// Store undo bookmark
+				if (e.type == "keydown" && (posKey || e.ctrlKey) && inst)
+					inst.undoBookmark = inst.selection.getBookmark();
+
+				// End typing (position key) or some Ctrl event
+				if (e.type == "keyup" && (posKey || e.ctrlKey))
+					tinyMCE.execCommand("mceEndTyping");
+
+				if (posKey && e.type == "keyup")
+					tinyMCE.triggerNodeChange(false);
+
+				if (tinyMCE.isMSIE && e.ctrlKey)
+					window.setTimeout('tinyMCE.triggerNodeChange(false);', 1);
+			break;
+
+			case "mousedown":
+			case "mouseup":
+			case "click":
+			case "focus":
+				tinyMCE.hideMenus();
+
+				if (tinyMCE.selectedInstance) {
+					tinyMCE.selectedInstance.switchSettings();
+					tinyMCE.selectedInstance.isFocused = true;
+				}
+
+				// Check instance event trigged on
+				var targetBody = tinyMCE.getParentElement(e.target, "body");
+				for (var instanceName in tinyMCE.instances) {
+					if (!tinyMCE.isInstance(tinyMCE.instances[instanceName]))
+						continue;
+
+					var inst = tinyMCE.instances[instanceName];
+
+					// Reset design mode if lost (on everything just in case)
+					inst.autoResetDesignMode();
+
+					if (inst.getBody() == targetBody) {
+						tinyMCE.selectedInstance = inst;
+						tinyMCE.selectedElement = e.target;
+						tinyMCE.linkElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+						tinyMCE.imgElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "img");
+						break;
+					}
+				}
+
+				// Add first bookmark location
+				if (!tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark)
+					tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark = tinyMCE.selectedInstance.selection.getBookmark();
+
+				if (tinyMCE.isSafari) {
+					tinyMCE.selectedInstance.lastSafariSelection = tinyMCE.selectedInstance.selection.getBookmark();
+					tinyMCE.selectedInstance.lastSafariSelectedElement = tinyMCE.selectedElement;
+
+					var lnk = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+
+					// Patch the darned link
+					if (lnk && e.type == "mousedown") {
+						lnk.setAttribute("mce_real_href", lnk.getAttribute("href"));
+						lnk.setAttribute("href", "javascript:void(0);");
+					}
+
+					// Patch back
+					if (lnk && e.type == "click") {
+						window.setTimeout(function() {
+							lnk.setAttribute("href", lnk.getAttribute("mce_real_href"));
+							lnk.removeAttribute("mce_real_href");
+						}, 10);
+					}
+				}
+
+				// Reset selected node
+				if (e.type != "focus")
+					tinyMCE.selectedNode = null;
+
+				tinyMCE.triggerNodeChange(false);
+				tinyMCE.execCommand("mceEndTyping");
+
+				if (e.type == "mouseup")
+					tinyMCE.execCommand("mceAddUndoLevel");
+
+				// Just in case
+				if (!tinyMCE.selectedInstance && e.target.editorId)
+					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+
+				return false;
+			break;
+		}
+	},
+
+	getButtonHTML : function(id, lang, img, cmd, ui, val) {
+		var h = '', m, x;
+
+		cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + cmd + '\'';
+
+		if (typeof(ui) != "undefined" && ui != null)
+			cmd += ',' + ui;
+
+		if (typeof(val) != "undefined" && val != null)
+			cmd += ",'" + val + "'";
+
+		cmd += ');';
+
+		// Use tilemaps when enabled and found and never in MSIE since it loads the tile each time from cache if cahce is disabled
+		if (tinyMCE.getParam('button_tile_map') && (!tinyMCE.isMSIE || tinyMCE.isOpera) && (m = this.buttonMap[id]) != null && (tinyMCE.getParam("language") == "en" || img.indexOf('$lang') == -1)) {
+			// Tiled button
+			x = 0 - (m * 20) == 0 ? '0' : 0 - (m * 20);
+			h += '<a id="{$editor_id}_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';
+			h += '<img src="{$themeurl}/images/spacer.gif" style="background-position: ' + x + 'px 0" title="{$' + lang + '}" />';
+			h += '</a>';
+		} else {
+			// Normal button
+			h += '<a id="{$editor_id}_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceButtonNormal" target="_self">';
+			h += '<img src="' + img + '" title="{$' + lang + '}" />';
+			h += '</a>';
+		}
+
+		return h;
+	},
+
+	addButtonMap : function(m) {
+		var i, a = m.replace(/\s+/, '').split(',');
+
+		for (i=0; i<a.length; i++)
+			this.buttonMap[a[i]] = i;
+	},
+
+	submitPatch : function() {
+		tinyMCE.removeTinyMCEFormElements(this);
+		tinyMCE.triggerSave();
+		this.mceOldSubmit();
+		tinyMCE.isNotDirty = true;
+	},
+
+	onLoad : function() {
+		// Wait for everything to be loaded first
+		if (tinyMCE.settings.strict_loading_mode && this.loadingIndex != -1) {
+			window.setTimeout('tinyMCE.onLoad();', 1);
+			return;
+		}
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera && window.event.type == "readystatechange" && document.readyState != "complete")
+			return true;
+
+		if (tinyMCE.isLoaded)
+			return true;
+
+		tinyMCE.isLoaded = true;
+
+		tinyMCE.dispatchCallback(null, 'onpageload', 'onPageLoad');
+
+		for (var c=0; c<tinyMCE.configs.length; c++) {
+			tinyMCE.settings = tinyMCE.configs[c];
+
+			var selector = tinyMCE.getParam("editor_selector");
+			var deselector = tinyMCE.getParam("editor_deselector");
+			var elementRefAr = new Array();
+
+			// Add submit triggers
+			if (document.forms && tinyMCE.settings['add_form_submit_trigger'] && !tinyMCE.submitTriggers) {
+				for (var i=0; i<document.forms.length; i++) {
+					var form = document.forms[i];
+
+					tinyMCE.addEvent(form, "submit", TinyMCE_Engine.prototype.handleEvent);
+					tinyMCE.addEvent(form, "reset", TinyMCE_Engine.prototype.handleEvent);
+					tinyMCE.submitTriggers = true; // Do it only once
+
+					// Patch the form.submit function
+					if (tinyMCE.settings['submit_patch']) {
+						try {
+							form.mceOldSubmit = form.submit;
+							form.submit = TinyMCE_Engine.prototype.submitPatch;
+						} catch (e) {
+							// Do nothing
+						}
+					}
+				}
+			}
+
+			// Add editor instances based on mode
+			var mode = tinyMCE.settings['mode'];
+			switch (mode) {
+				case "exact":
+					var elements = tinyMCE.getParam('elements', '', true, ',');
+
+					for (var i=0; i<elements.length; i++) {
+						var element = tinyMCE._getElementById(elements[i]);
+						var trigger = element ? element.getAttribute(tinyMCE.settings['textarea_trigger']) : "";
+
+						if (tinyMCE.getAttrib(element, "class").indexOf(deselector) != -1)
+							continue;
+
+						if (trigger == "false")
+							continue;
+
+						if ((tinyMCE.settings['ask'] || tinyMCE.settings['convert_on_click']) && element) {
+							elementRefAr[elementRefAr.length] = element;
+							continue;
+						}
+
+						if (element)
+							tinyMCE.addMCEControl(element, elements[i]);
+						else if (tinyMCE.settings['debug'])
+							alert("Error: Could not find element by id or name: " + elements[i]);
+					}
+				break;
+
+				case "specific_textareas":
+				case "textareas":
+					var nodeList = document.getElementsByTagName("textarea");
+
+					for (var i=0; i<nodeList.length; i++) {
+						var elm = nodeList.item(i);
+						var trigger = elm.getAttribute(tinyMCE.settings['textarea_trigger']);
+
+						if (selector != '' && tinyMCE.getAttrib(elm, "class").indexOf(selector) == -1)
+							continue;
+
+						if (selector != '')
+							trigger = selector != "" ? "true" : "";
+
+						if (tinyMCE.getAttrib(elm, "class").indexOf(deselector) != -1)
+							continue;
+
+						if ((mode == "specific_textareas" && trigger == "true") || (mode == "textareas" && trigger != "false"))
+							elementRefAr[elementRefAr.length] = elm;
+					}
+				break;
+			}
+
+			for (var i=0; i<elementRefAr.length; i++) {
+				var element = elementRefAr[i];
+				var elementId = element.name ? element.name : element.id;
+
+				if (tinyMCE.settings['ask'] || tinyMCE.settings['convert_on_click']) {
+					// Focus breaks in Mozilla
+					if (tinyMCE.isGecko) {
+						var settings = tinyMCE.settings;
+
+						tinyMCE.addEvent(element, "focus", function (e) {window.setTimeout(function() {TinyMCE_Engine.prototype.confirmAdd(e, settings);}, 10);});
+
+						if (element.nodeName != "TEXTAREA" && element.nodeName != "INPUT")
+							tinyMCE.addEvent(element, "click", function (e) {window.setTimeout(function() {TinyMCE_Engine.prototype.confirmAdd(e, settings);}, 10);});
+						// tinyMCE.addEvent(element, "mouseover", function (e) {window.setTimeout(function() {TinyMCE_Engine.prototype.confirmAdd(e, settings);}, 10);});
+					} else {
+						var settings = tinyMCE.settings;
+
+						tinyMCE.addEvent(element, "focus", function () { TinyMCE_Engine.prototype.confirmAdd(null, settings); });
+						tinyMCE.addEvent(element, "click", function () { TinyMCE_Engine.prototype.confirmAdd(null, settings); });
+						// tinyMCE.addEvent(element, "mouseenter", function () { TinyMCE_Engine.prototype.confirmAdd(null, settings); });
+					}
+				} else
+					tinyMCE.addMCEControl(element, elementId);
+			}
+
+			// Handle auto focus
+			if (tinyMCE.settings['auto_focus']) {
+				window.setTimeout(function () {
+					var inst = tinyMCE.getInstanceById(tinyMCE.settings['auto_focus']);
+					inst.selection.selectNode(inst.getBody(), true, true);
+					inst.contentWindow.focus();
+				}, 10);
+			}
+
+			tinyMCE.dispatchCallback(null, 'oninit', 'onInit');
+		}
+	},
+
+	isInstance : function(o) {
+		return o != null && typeof(o) == "object" && o.isTinyMCE_Control;
+	},
+
+	getParam : function(name, default_value, strip_whitespace, split_chr) {
+		var value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+		// Fix bool values
+		if (value == "true" || value == "false")
+			return (value == "true");
+
+		if (strip_whitespace)
+			value = tinyMCE.regexpReplace(value, "[ \t\r\n]", "");
+
+		if (typeof(split_chr) != "undefined" && split_chr != null) {
+			value = value.split(split_chr);
+			var outArray = new Array();
+
+			for (var i=0; i<value.length; i++) {
+				if (value[i] && value[i] != "")
+					outArray[outArray.length] = value[i];
+			}
+
+			value = outArray;
+		}
+
+		return value;
+	},
+
+	getLang : function(name, default_value, parse_entities, va) {
+		var v = (typeof(tinyMCELang[name]) == "undefined") ? default_value : tinyMCELang[name], n;
+
+		if (parse_entities)
+			v = tinyMCE.entityDecode(v);
+
+		if (va) {
+			for (n in va)
+				v = this.replaceVar(v, n, va[n]);
+		}
+
+		return v;
+	},
+
+	entityDecode : function(s) {
+		var e = document.createElement("div");
+		e.innerHTML = s;
+		return e.innerHTML;
+	},
+
+	addToLang : function(prefix, ar) {
+		for (var key in ar) {
+			if (typeof(ar[key]) == 'function')
+				continue;
+
+			tinyMCELang[(key.indexOf('lang_') == -1 ? 'lang_' : '') + (prefix != '' ? (prefix + "_") : '') + key] = ar[key];
+		}
+
+		this.loadNextScript();
+
+	//	for (var key in ar)
+	//		tinyMCELang[(key.indexOf('lang_') == -1 ? 'lang_' : '') + (prefix != '' ? (prefix + "_") : '') + key] = "|" + ar[key] + "|";
+	},
+
+	triggerNodeChange : function(focus, setup_content) {
+		if (tinyMCE.selectedInstance) {
+			var inst = tinyMCE.selectedInstance;
+			var editorId = inst.editorId;
+			var elm = (typeof(setup_content) != "undefined" && setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
+			var undoIndex = -1;
+			var undoLevels = -1;
+			var anySelection = false;
+			var selectedText = inst.selection.getSelectedText();
+
+			if (setup_content && tinyMCE.isGecko && inst.isHidden())
+				elm = inst.getBody();
+
+			inst.switchSettings();
+
+			if (tinyMCE.settings["auto_resize"]) {
+				var doc = inst.getDoc();
+
+				inst.iframeElement.style.width = doc.body.offsetWidth + "px";
+				inst.iframeElement.style.height = doc.body.offsetHeight + "px";
+			}
+
+			if (tinyMCE.selectedElement)
+				anySelection = (tinyMCE.selectedElement.nodeName.toLowerCase() == "img") || (selectedText && selectedText.length > 0);
+
+			if (tinyMCE.settings['custom_undo_redo']) {
+				undoIndex = inst.undoRedo.undoIndex;
+				undoLevels = inst.undoRedo.undoLevels.length;
+			}
+
+			tinyMCE.dispatchCallback(inst, 'handle_node_change_callback', 'handleNodeChange', editorId, elm, undoIndex, undoLevels, inst.visualAid, anySelection, setup_content);
+		}
+
+		if (this.selectedInstance && (typeof(focus) == "undefined" || focus))
+			this.selectedInstance.contentWindow.focus();
+	},
+
+	_customCleanup : function(inst, type, content) {
+		var pl, po, i;
+
+		// Call custom cleanup
+		var customCleanup = tinyMCE.settings['cleanup_callback'];
+		if (customCleanup != "" && eval("typeof(" + customCleanup + ")") != "undefined")
+			content = eval(customCleanup + "(type, content, inst);");
+
+		// Trigger plugin cleanups
+		pl = inst.plugins;
+		for (i=0; i<pl.length; i++) {
+			po = tinyMCE.plugins[pl[i]];
+
+			if (po && po.cleanup)
+				content = po.cleanup(type, content, inst);
+		}
+
+		return content;
+	},
+
+	setContent : function(h) {
+		if (tinyMCE.selectedInstance) {
+			tinyMCE.selectedInstance.execCommand('mceSetContent', false, h);
+			tinyMCE.selectedInstance.repaint();
+		}
+	},
+
+	importThemeLanguagePack : function(name) {
+		if (typeof(name) == "undefined")
+			name = tinyMCE.settings['theme'];
+
+		tinyMCE.loadScript(tinyMCE.baseURL + '/themes/' + name + '/langs/' + tinyMCE.settings['language'] + '.js');
+	},
+
+	importPluginLanguagePack : function(name, valid_languages) {
+		var lang = "en", b = tinyMCE.baseURL + '/plugins/' + name;
+
+		valid_languages = valid_languages.split(',');
+		for (var i=0; i<valid_languages.length; i++) {
+			if (tinyMCE.settings['language'] == valid_languages[i])
+				lang = tinyMCE.settings['language'];
+		}
+
+		if (this.plugins[name])
+			b = this.plugins[name].baseURL;
+
+		tinyMCE.loadScript(b + '/langs/' + lang +  '.js');
+	},
+
+	applyTemplate : function(h, as) {
+		var i, s, ar = h.match(new RegExp('\\{\\$[a-z0-9_]+\\}', 'gi'));
+
+		if (ar && ar.length > 0) {
+			for (i=ar.length-1; i>=0; i--) {
+				s = ar[i].substring(2, ar[i].length-1);
+
+				if (s.indexOf('lang_') == 0 && tinyMCELang[s])
+					h = tinyMCE.replaceVar(h, s, tinyMCELang[s]);
+				else if (as && as[s])
+					h = tinyMCE.replaceVar(h, s, as[s]);
+				else if (tinyMCE.settings[s])
+					h = tinyMCE.replaceVar(h, s, tinyMCE.settings[s]);
+			}
+		}
+
+		h = tinyMCE.replaceVar(h, "themeurl", tinyMCE.themeURL);
+
+		return h;
+	},
+
+	replaceVar : function(h, r, v) {
+		return h.replace(new RegExp('{\\\$' + r + '}', 'g'), v);
+	},
+
+	openWindow : function(template, args) {
+		var html, width, height, x, y, resizable, scrollbars, url;
+
+		args['mce_template_file'] = template['file'];
+		args['mce_width'] = template['width'];
+		args['mce_height'] = template['height'];
+		tinyMCE.windowArgs = args;
+
+		html = template['html'];
+		if (!(width = parseInt(template['width'])))
+			width = 320;
+
+		if (!(height = parseInt(template['height'])))
+			height = 200;
+
+		// Add to height in M$ due to SP2 WHY DON'T YOU GUYS IMPLEMENT innerWidth of windows!!
+		if (tinyMCE.isMSIE)
+			height += 40;
+		else
+			height += 20;
+
+		x = parseInt(screen.width / 2.0) - (width / 2.0);
+		y = parseInt(screen.height / 2.0) - (height / 2.0);
+
+		resizable = (args && args['resizable']) ? args['resizable'] : "no";
+		scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no";
+
+		if (template['file'].charAt(0) != '/' && template['file'].indexOf('://') == -1)
+			url = tinyMCE.baseURL + "/themes/" + tinyMCE.getParam("theme") + "/" + template['file'];
+		else
+			url = template['file'];
+
+		// Replace all args as variables in URL
+		for (var name in args) {
+			if (typeof(args[name]) == 'function')
+				continue;
+
+			url = tinyMCE.replaceVar(url, name, escape(args[name]));
+		}
+
+		if (html) {
+			html = tinyMCE.replaceVar(html, "css", this.settings['popups_css']);
+			html = tinyMCE.applyTemplate(html, args);
+
+			var win = window.open("", "mcePopup" + new Date().getTime(), "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=yes,minimizable=" + resizable + ",modal=yes,width=" + width + ",height=" + height + ",resizable=" + resizable);
+			if (win == null) {
+				alert(tinyMCELang['lang_popup_blocked']);
+				return;
+			}
+
+			win.document.write(html);
+			win.document.close();
+			win.resizeTo(width, height);
+			win.focus();
+		} else {
+			if ((tinyMCE.isMSIE && !tinyMCE.isOpera) && resizable != 'yes' && tinyMCE.settings["dialog_type"] == "modal") {
+				height += 10;
+
+				var features = "resizable:" + resizable 
+					+ ";scroll:"
+					+ scrollbars + ";status:yes;center:yes;help:no;dialogWidth:"
+					+ width + "px;dialogHeight:" + height + "px;";
+
+				window.showModalDialog(url, window, features);
+			} else {
+				var modal = (resizable == "yes") ? "no" : "yes";
+
+				if (tinyMCE.isGecko && tinyMCE.isMac)
+					modal = "no";
+
+				if (template['close_previous'] != "no")
+					try {tinyMCE.lastWindow.close();} catch (ex) {}
+
+				var win = window.open(url, "mcePopup" + new Date().getTime(), "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=" + modal + ",minimizable=" + resizable + ",modal=" + modal + ",width=" + width + ",height=" + height + ",resizable=" + resizable);
+				if (win == null) {
+					alert(tinyMCELang['lang_popup_blocked']);
+					return;
+				}
+
+				if (template['close_previous'] != "no")
+					tinyMCE.lastWindow = win;
+
+				eval('try { win.resizeTo(width, height); } catch(e) { }');
+
+				// Make it bigger if statusbar is forced
+				if (tinyMCE.isGecko) {
+					if (win.document.defaultView.statusbar.visible)
+						win.resizeBy(0, tinyMCE.isMac ? 10 : 24);
+				}
+
+				win.focus();
+			}
+		}
+	},
+
+	closeWindow : function(win) {
+		win.close();
+	},
+
+	getVisualAidClass : function(class_name, state) {
+		var aidClass = tinyMCE.settings['visual_table_class'];
+
+		if (typeof(state) == "undefined")
+			state = tinyMCE.settings['visual'];
+
+		// Split
+		var classNames = new Array();
+		var ar = class_name.split(' ');
+		for (var i=0; i<ar.length; i++) {
+			if (ar[i] == aidClass)
+				ar[i] = "";
+
+			if (ar[i] != "")
+				classNames[classNames.length] = ar[i];
+		}
+
+		if (state)
+			classNames[classNames.length] = aidClass;
+
+		// Glue
+		var className = "";
+		for (var i=0; i<classNames.length; i++) {
+			if (i > 0)
+				className += " ";
+
+			className += classNames[i];
+		}
+
+		return className;
+	},
+
+	handleVisualAid : function(el, deep, state, inst, skip_dispatch) {
+		if (!el)
+			return;
+
+		if (!skip_dispatch)
+			tinyMCE.dispatchCallback(inst, 'handle_visual_aid_callback', 'handleVisualAid', el, deep, state, inst);
+
+		var tableElement = null;
+
+		switch (el.nodeName) {
+			case "TABLE":
+				var oldW = el.style.width;
+				var oldH = el.style.height;
+				var bo = tinyMCE.getAttrib(el, "border");
+
+				bo = bo == "" || bo == "0" ? true : false;
+
+				tinyMCE.setAttrib(el, "class", tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el, "class"), state && bo));
+
+				el.style.width = oldW;
+				el.style.height = oldH;
+
+				for (var y=0; y<el.rows.length; y++) {
+					for (var x=0; x<el.rows[y].cells.length; x++) {
+						var cn = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el.rows[y].cells[x], "class"), state && bo);
+						tinyMCE.setAttrib(el.rows[y].cells[x], "class", cn);
+					}
+				}
+
+				break;
+
+			case "A":
+				var anchorName = tinyMCE.getAttrib(el, "name");
+
+				if (anchorName != '' && state) {
+					el.title = anchorName;
+					el.className = 'mceItemAnchor';
+				} else if (anchorName != '' && !state)
+					el.className = '';
+
+				break;
+		}
+
+		if (deep && el.hasChildNodes()) {
+			for (var i=0; i<el.childNodes.length; i++)
+				tinyMCE.handleVisualAid(el.childNodes[i], deep, state, inst, true);
+		}
+	},
+
+	/*
+	applyClassesToFonts : function(doc, size) {
+		var f = doc.getElementsByTagName("font");
+		for (var i=0; i<f.length; i++) {
+			var s = tinyMCE.getAttrib(f[i], "size");
+
+			if (s != "")
+				tinyMCE.setAttrib(f[i], 'class', "mceItemFont" + s);
+		}
+
+		if (typeof(size) != "undefined") {
+			var css = "";
+
+			for (var x=0; x<doc.styleSheets.length; x++) {
+				for (var i=0; i<doc.styleSheets[x].rules.length; i++) {
+					if (doc.styleSheets[x].rules[i].selectorText == '#mceSpanFonts .mceItemFont' + size) {
+						css = doc.styleSheets[x].rules[i].style.cssText;
+						break;
+					}
+				}
+
+				if (css != "")
+					break;
+			}
+
+			if (doc.styleSheets[0].rules[0].selectorText == "FONT")
+				doc.styleSheets[0].removeRule(0);
+
+			doc.styleSheets[0].addRule("FONT", css, 0);
+		}
+	},
+	*/
+
+	fixGeckoBaseHREFBug : function(m, e, h) {
+		var nl, i, a, n, xsrc, xhref, el;
+
+		if (tinyMCE.isGecko) {
+			if (m == 1) {
+				h = h.replace(/\ssrc=/gi, " mce_tsrc=");
+				h = h.replace(/\shref=/gi, " mce_thref=");
+
+				return h;
+			} else {
+				el = new Array('a','img','select','area','iframe','base','input','script','embed','object','link');
+
+				for (a=0; a<el.length; a++) {
+					n = e.getElementsByTagName(el[a]);
+
+					for (i=0; i<n.length; i++) {
+						xsrc = tinyMCE.getAttrib(n[i], "mce_tsrc");
+						xhref = tinyMCE.getAttrib(n[i], "mce_thref");
+
+						if (xsrc != "") {
+							try {
+								n[i].src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xsrc);
+							} catch (e) {
+								// Ignore, Firefox cast exception if local file wasn't found
+							}
+
+							n[i].removeAttribute("mce_tsrc");
+						}
+
+						if (xhref != "") {
+							try {
+								n[i].href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xhref);
+							} catch (e) {
+								// Ignore, Firefox cast exception if local file wasn't found
+							}
+
+							n[i].removeAttribute("mce_thref");
+						}
+					}
+				}
+
+				el = tinyMCE.selectNodes(e, function(n) {
+					if (n.nodeType == 3 || n.nodeType == 8) {
+						n.nodeValue = n.nodeValue.replace(/\smce_tsrc=/gi, " src=");
+						n.nodeValue = n.nodeValue.replace(/\smce_thref=/gi, " href=");
+					}
+
+					return false;
+				});
+			}
+		}
+
+		return h;
+	},
+
+	_setHTML : function(doc, html_content) {
+		// Force closed anchors open
+		//html_content = html_content.replace(new RegExp('<a(.*?)/>', 'gi'), '<a$1></a>');
+
+		html_content = tinyMCE.cleanupHTMLCode(html_content);
+
+		// Try innerHTML if it fails use pasteHTML in MSIE
+		try {
+			tinyMCE.setInnerHTML(doc.body, html_content);
+		} catch (e) {
+			if (this.isMSIE)
+				doc.body.createTextRange().pasteHTML(html_content);
+		}
+
+		// Content duplication bug fix
+		if (tinyMCE.isMSIE && tinyMCE.settings['fix_content_duplication']) {
+			// Remove P elements in P elements
+			var paras = doc.getElementsByTagName("P");
+			for (var i=0; i<paras.length; i++) {
+				var node = paras[i];
+				while ((node = node.parentNode) != null) {
+					if (node.nodeName == "P")
+						node.outerHTML = node.innerHTML;
+				}
+			}
+
+			// Content duplication bug fix (Seems to be word crap)
+			var html = doc.body.innerHTML;
+/*
+			if (html.indexOf('="mso') != -1) {
+				for (var i=0; i<doc.body.all.length; i++) {
+					var el = doc.body.all[i];
+					el.removeAttribute("className","",0);
+					el.removeAttribute("style","",0);
+				}
+
+				html = doc.body.innerHTML;
+				html = tinyMCE.regexpReplace(html, "<o:p><\/o:p>", "<br />");
+				html = tinyMCE.regexpReplace(html, "<o:p>&nbsp;<\/o:p>", "");
+				html = tinyMCE.regexpReplace(html, "<st1:.*?>", "");
+				html = tinyMCE.regexpReplace(html, "<p><\/p>", "");
+				html = tinyMCE.regexpReplace(html, "<p><\/p>\r\n<p><\/p>", "");
+				html = tinyMCE.regexpReplace(html, "<p>&nbsp;<\/p>", "<br />");
+				html = tinyMCE.regexpReplace(html, "<p>\s*(<p>\s*)?", "<p>");
+				html = tinyMCE.regexpReplace(html, "<\/p>\s*(<\/p>\s*)?", "</p>");
+			}*/
+
+			// Always set the htmlText output
+			tinyMCE.setInnerHTML(doc.body, html);
+		}
+
+		tinyMCE.cleanupAnchors(doc);
+
+		if (tinyMCE.getParam("convert_fonts_to_spans"))
+			tinyMCE.convertSpansToFonts(doc);
+	},
+
+	getEditorId : function(form_element) {
+		var inst = this.getInstanceById(form_element);
+		if (!inst)
+			return null;
+
+		return inst.editorId;
+	},
+
+	getInstanceById : function(editor_id) {
+		var inst = this.instances[editor_id];
+		if (!inst) {
+			for (var n in tinyMCE.instances) {
+				var instance = tinyMCE.instances[n];
+				if (!tinyMCE.isInstance(instance))
+					continue;
+
+				if (instance.formTargetElementId == editor_id) {
+					inst = instance;
+					break;
+				}
+			}
+		}
+
+		return inst;
+	},
+
+	queryInstanceCommandValue : function(editor_id, command) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+		if (inst)
+			return inst.queryCommandValue(command);
+
+		return false;
+	},
+
+	queryInstanceCommandState : function(editor_id, command) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+		if (inst)
+			return inst.queryCommandState(command);
+
+		return null;
+	},
+
+	setWindowArg : function(n, v) {
+		this.windowArgs[n] = v;
+	},
+
+	getWindowArg : function(n, d) {
+		return (typeof(this.windowArgs[n]) == "undefined") ? d : this.windowArgs[n];
+	},
+
+	getCSSClasses : function(editor_id, doc) {
+		var output = new Array();
+
+		// Is cached, use that
+		if (typeof(tinyMCE.cssClasses) != "undefined")
+			return tinyMCE.cssClasses;
+
+		if (typeof(editor_id) == "undefined" && typeof(doc) == "undefined") {
+			var instance;
+
+			for (var instanceName in tinyMCE.instances) {
+				instance = tinyMCE.instances[instanceName];
+				if (!tinyMCE.isInstance(instance))
+					continue;
+
+				break;
+			}
+
+			doc = instance.getDoc();
+		}
+
+		if (typeof(doc) == "undefined") {
+			var instance = tinyMCE.getInstanceById(editor_id);
+			doc = instance.getDoc();
+		}
+
+		if (doc) {
+			var styles = doc.styleSheets;
+
+			if (styles && styles.length > 0) {
+				for (var x=0; x<styles.length; x++) {
+					var csses = null;
+
+					// Just ignore any errors
+					eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(" + x + ").rules : styles[" + x + "].cssRules;} catch(e) {}");
+					if (!csses)
+						return new Array();
+
+					for (var i=0; i<csses.length; i++) {
+						var selectorText = csses[i].selectorText;
+
+						// Can be multiple rules per selector
+						if (selectorText) {
+							var rules = selectorText.split(',');
+							for (var c=0; c<rules.length; c++) {
+								var rule = rules[c];
+
+								// Strip spaces between selectors
+								while (rule.indexOf(' ') == 0)
+									rule = rule.substring(1);
+
+								// Invalid rule
+								if (rule.indexOf(' ') != -1 || rule.indexOf(':') != -1 || rule.indexOf('mceItem') != -1)
+									continue;
+
+								if (rule.indexOf(tinyMCE.settings['visual_table_class']) != -1 || rule.indexOf('mceEditable') != -1 || rule.indexOf('mceNonEditable') != -1)
+									continue;
+
+								// Is class rule
+								if (rule.indexOf('.') != -1) {
+									var cssClass = rule.substring(rule.indexOf('.') + 1);
+									var addClass = true;
+
+									for (var p=0; p<output.length && addClass; p++) {
+										if (output[p] == cssClass)
+											addClass = false;
+									}
+
+									if (addClass)
+										output[output.length] = cssClass;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Cache em
+		if (output.length > 0)
+			tinyMCE.cssClasses = output;
+
+		return output;
+	},
+
+	regexpReplace : function(in_str, reg_exp, replace_str, opts) {
+		if (in_str == null)
+			return in_str;
+
+		if (typeof(opts) == "undefined")
+			opts = 'g';
+
+		var re = new RegExp(reg_exp, opts);
+		return in_str.replace(re, replace_str);
+	},
+
+	trim : function(s) {
+		return s.replace(/^\s*|\s*$/g, "");
+	},
+
+	cleanupEventStr : function(s) {
+		s = "" + s;
+		s = s.replace('function anonymous()\n{\n', '');
+		s = s.replace('\n}', '');
+		s = s.replace(/^return true;/gi, ''); // Remove event blocker
+
+		return s;
+	},
+
+	getControlHTML : function(c) {
+		var i, l, n, o, v;
+
+		l = tinyMCE.plugins;
+		for (n in l) {
+			o = l[n];
+
+			if (o.getControlHTML && (v = o.getControlHTML(c)) != '')
+				return tinyMCE.replaceVar(v, "pluginurl", o.baseURL);
+		}
+
+		o = tinyMCE.themes[tinyMCE.settings['theme']];
+		if (o.getControlHTML && (v = o.getControlHTML(c)) != '')
+			return v;
+
+		return '';
+	},
+
+	evalFunc : function(f, idx, a) {
+		var s = '(', i;
+
+		for (i=idx; i<a.length; i++) {
+			s += 'a[' + i + ']';
+
+			if (i < a.length-1)
+				s += ',';
+		}
+
+		s += ');';
+
+		return eval("f" + s);
+	},
+
+	dispatchCallback : function(i, p, n) {
+		return this.callFunc(i, p, n, 0, this.dispatchCallback.arguments);
+	},
+
+	executeCallback : function(i, p, n) {
+		return this.callFunc(i, p, n, 1, this.executeCallback.arguments);
+	},
+
+	execCommandCallback : function(i, p, n) {
+		return this.callFunc(i, p, n, 2, this.execCommandCallback.arguments);
+	},
+
+	callFunc : function(ins, p, n, m, a) {
+		var l, i, on, o, s, v;
+
+		s = m == 2;
+
+		l = tinyMCE.getParam(p, '');
+
+		if (l != '' && (v = tinyMCE.evalFunc(typeof(l) == "function" ? l : eval(l), 3, a)) == s && m > 0)
+			return true;
+
+		if (ins != null) {
+			for (i=0, l = ins.plugins; i<l.length; i++) {
+				o = tinyMCE.plugins[l[i]];
+
+				if (o[n] && (v = tinyMCE.evalFunc(o[n], 3, a)) == s && m > 0)
+					return true;
+			}
+		}
+
+		l = tinyMCE.themes;
+		for (on in l) {
+			o = l[on];
+
+			if (o[n] && (v = tinyMCE.evalFunc(o[n], 3, a)) == s && m > 0)
+				return true;
+		}
+
+		return false;
+	},
+
+	xmlEncode : function(s) {
+		s = "" + s;
+		s = s.replace(/&/g, '&amp;');
+		s = s.replace(new RegExp('"', 'g'), '&quot;');
+		s = s.replace(/\'/g, '&#39;'); // &apos; is not working in MSIE
+		s = s.replace(/</g, '&lt;');
+		s = s.replace(/>/g, '&gt;');
+
+		return s;
+	},
+
+	extend : function(p, np) {
+		var o = {};
+
+		o.parent = p;
+
+		for (n in p)
+			o[n] = p[n];
+
+		for (n in np)
+			o[n] = np[n];
+
+		return o;
+	},
+
+	hideMenus : function() {
+		var e = tinyMCE.lastSelectedMenuBtn;
+
+		if (tinyMCE.lastMenu) {
+			tinyMCE.lastMenu.hide();
+			tinyMCE.lastMenu = null;
+		}
+
+		if (e) {
+			tinyMCE.switchClass(e, tinyMCE.lastMenuBtnClass);
+			tinyMCE.lastSelectedMenuBtn = null;
+		}
+	},
+
+	explode : function(d, s) {
+		var ar = s.split(d), oar = new Array(), i;
+	
+		for (i = 0; i<ar.length; i++) {
+			if (ar[i] != "")
+				oar[oar.length] = ar[i];
+		}
+	
+		return oar;
+	}
+};
+
+// Global instances
+var TinyMCE = TinyMCE_Engine; // Compatiblity with gzip compressors
+var tinyMCE = new TinyMCE_Engine();
+var tinyMCELang = {};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Control.class.js */
+
+function TinyMCE_Control(settings) {
+	var t, i, to, fu, p, x, fn, fu, pn, s = settings;
+
+	this.undoRedoLevel = true;
+	this.isTinyMCE_Control = true;
+
+	// Default settings
+	this.settings = s;
+	this.settings['theme'] = tinyMCE.getParam("theme", "default");
+	this.settings['width'] = tinyMCE.getParam("width", -1);
+	this.settings['height'] = tinyMCE.getParam("height", -1);
+	this.selection = new TinyMCE_Selection(this);
+	this.undoRedo = new TinyMCE_UndoRedo(this);
+	this.cleanup = new TinyMCE_Cleanup();
+	this.shortcuts = new Array();
+	this.hasMouseMoved = false;
+
+	this.cleanup.init({
+		valid_elements : s.valid_elements,
+		extended_valid_elements : s.extended_valid_elements,
+		entities : s.entities,
+		entity_encoding : s.entity_encoding,
+		debug : s.cleanup_debug,
+		url_converter : 'TinyMCE_Cleanup.prototype._urlConverter',
+		indent : s.apply_source_formatting,
+		invalid_elements : s.invalid_elements,
+		verify_html : s.verify_html,
+		fix_content_duplication : s.fix_content_duplication
+	});
+
+	// Wrap old theme
+	t = this.settings['theme'];
+	if (!tinyMCE.hasTheme(t)) {
+		fn = tinyMCE.callbacks;
+		to = {};
+
+		for (i=0; i<fn.length; i++) {
+			if ((fu = window['TinyMCE_' + t + "_" + fn[i]]))
+				to[fn[i]] = fu;
+		}
+
+		tinyMCE.addTheme(t, to);
+	}
+
+	// Wrap old plugins
+	this.plugins = new Array();
+	p = tinyMCE.getParam('plugins', '', true, ',');
+	if (p.length > 0) {
+		for (i=0; i<p.length; i++) {
+			pn = p[i];
+
+			if (pn.charAt(0) == '-')
+				pn = pn.substring(1);
+
+			if (!tinyMCE.hasPlugin(pn)) {
+				fn = tinyMCE.callbacks;
+				to = {};
+
+				for (x=0; x<fn.length; x++) {
+					if ((fu = window['TinyMCE_' + pn + "_" + fn[x]]))
+						to[fn[x]] = fu;
+				}
+
+				tinyMCE.addPlugin(pn, to);
+			}
+
+			this.plugins[this.plugins.length] = pn; 
+		}
+	}
+};
+
+TinyMCE_Control.prototype = {
+	hasPlugin : function(n) {
+		var i;
+
+		for (i=0; i<this.plugins.length; i++) {
+			if (this.plugins[i] == n)
+				return true;
+		}
+
+		return false;
+	},
+
+	addPlugin : function(n, p) {
+		if (!this.hasPlugin(n)) {
+			tinyMCE.addPlugin(n, p);
+			this.plugins[this.plugins.length] = n;
+		}
+	},
+
+	repaint : function() {
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			return;
+
+		try {
+			var s = this.selection;
+			var b = s.getBookmark(true);
+			this.getBody().style.display = 'none';
+			this.getDoc().execCommand('selectall', false, null);
+			this.getSel().collapseToStart();
+			this.getBody().style.display = 'block';
+			s.moveToBookmark(b);
+		} catch (ex) {
+			// Ignore
+		}
+	},
+
+	switchSettings : function() {
+		if (tinyMCE.configs.length > 1 && tinyMCE.currentConfig != this.settings['index']) {
+			tinyMCE.settings = this.settings;
+			tinyMCE.currentConfig = this.settings['index'];
+		}
+	},
+
+	getBody : function() {
+		return this.getDoc().body;
+	},
+
+	getDoc : function() {
+		return this.contentWindow.document;
+	},
+
+	getWin : function() {
+		return this.contentWindow;
+	},
+
+	addShortcut : function(m, k, d, cmd, ui, va) {
+		var n = typeof(k) == "number", ie = tinyMCE.isMSIE, c, sc, i;
+		var scl = this.shortcuts;
+
+		if (!tinyMCE.getParam('custom_shortcuts'))
+			return false;
+
+		m = m.toLowerCase();
+		k = ie && !n ? k.toUpperCase() : k;
+		c = n ? null : k.charCodeAt(0);
+		d = d && d.indexOf('lang_') == 0 ? tinyMCE.getLang(d) : d;
+
+		sc = {
+			alt : m.indexOf('alt') != -1,
+			ctrl : m.indexOf('ctrl') != -1,
+			shift : m.indexOf('shift') != -1,
+			charCode : c,
+			keyCode : n ? k : (ie ? c : null),
+			desc : d,
+			cmd : cmd,
+			ui : ui,
+			val : va
+		};
+
+		for (i=0; i<scl.length; i++) {
+			if (sc.alt == scl[i].alt && sc.ctrl == scl[i].ctrl && sc.shift == scl[i].shift
+				&& sc.charCode == scl[i].charCode && sc.keyCode == scl[i].keyCode) {
+				return false;
+			}
+		}
+
+		scl[scl.length] = sc;
+
+		return true;
+	},
+
+	handleShortcut : function(e) {
+		var i, s = this.shortcuts, o;
+
+		for (i=0; i<s.length; i++) {
+			o = s[i];
+			if (o.alt == e.altKey && o.ctrl == e.ctrlKey && (o.keyCode == e.keyCode || o.charCode == e.charCode)) {
+				if (o.cmd && (e.type == "keydown" || (e.type == "keypress" && !tinyMCE.isOpera)))
+					tinyMCE.execCommand(o.cmd, o.ui, o.val);
+
+				tinyMCE.cancelEvent(e);
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	autoResetDesignMode : function() {
+		// Add fix for tab/style.display none/block problems in Gecko
+		if (!tinyMCE.isMSIE && this.isHidden() && tinyMCE.getParam('auto_reset_designmode'))
+			eval('try { this.getDoc().designMode = "On"; } catch(e) {}');
+	},
+
+	isHidden : function() {
+		if (tinyMCE.isMSIE)
+			return false;
+
+		var s = this.getSel();
+
+		// Weird, wheres that cursor selection?
+		return (!s || !s.rangeCount || s.rangeCount == 0);
+	},
+
+	isDirty : function() {
+		// Is content modified and not in a submit procedure
+		return this.startContent != tinyMCE.trim(this.getBody().innerHTML) && !tinyMCE.isNotDirty;
+	},
+
+	_mergeElements : function(scmd, pa, ch, override) {
+		if (scmd == "removeformat") {
+			pa.className = "";
+			pa.style.cssText = "";
+			ch.className = "";
+			ch.style.cssText = "";
+			return;
+		}
+
+		var st = tinyMCE.parseStyle(tinyMCE.getAttrib(pa, "style"));
+		var stc = tinyMCE.parseStyle(tinyMCE.getAttrib(ch, "style"));
+		var className = tinyMCE.getAttrib(pa, "class");
+
+		className += " " + tinyMCE.getAttrib(ch, "class");
+
+		if (override) {
+			for (var n in st) {
+				if (typeof(st[n]) == 'function')
+					continue;
+
+				stc[n] = st[n];
+			}
+		} else {
+			for (var n in stc) {
+				if (typeof(stc[n]) == 'function')
+					continue;
+
+				st[n] = stc[n];
+			}
+		}
+
+		tinyMCE.setAttrib(pa, "style", tinyMCE.serializeStyle(st));
+		tinyMCE.setAttrib(pa, "class", tinyMCE.trim(className));
+		ch.className = "";
+		ch.style.cssText = "";
+		ch.removeAttribute("class");
+		ch.removeAttribute("style");
+	},
+
+	_setUseCSS : function(b) {
+		var d = this.getDoc();
+
+		try {d.execCommand("useCSS", false, !b);} catch (ex) {}
+		try {d.execCommand("styleWithCSS", false, b);} catch (ex) {}
+
+		if (!tinyMCE.getParam("table_inline_editing"))
+			try {d.execCommand('enableInlineTableEditing', false, "false");} catch (ex) {}
+
+		if (!tinyMCE.getParam("object_resizing"))
+			try {d.execCommand('enableObjectResizing', false, "false");} catch (ex) {}
+	},
+
+	execCommand : function(command, user_interface, value) {
+		var doc = this.getDoc();
+		var win = this.getWin();
+		var focusElm = this.getFocusElement();
+
+		// Is non udno specific command
+		if (!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel', 'gi').test(command))
+			this.undoBookmark = null;
+
+		if (this.lastSafariSelection && !new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel', 'gi').test(command)) {
+			this.selection.moveToBookmark(this.lastSafariSelection);
+			tinyMCE.selectedElement = this.lastSafariSelectedElement;
+		}
+
+		// Mozilla issue
+		if (!tinyMCE.isMSIE && !this.useCSS) {
+			this._setUseCSS(false);
+			this.useCSS = true;
+		}
+
+		//debug("command: " + command + ", user_interface: " + user_interface + ", value: " + value);
+		this.contentDocument = doc; // <-- Strange, unless this is applied Mozilla 1.3 breaks
+
+		if (tinyMCE.execCommandCallback(this, 'execcommand_callback', 'execCommand', this.editorId, this.getBody(), command, user_interface, value))
+			return;
+
+		// Fix align on images
+		if (focusElm && focusElm.nodeName == "IMG") {
+			var align = focusElm.getAttribute('align');
+			var img = command == "JustifyCenter" ? focusElm.cloneNode(false) : focusElm;
+
+			switch (command) {
+				case "JustifyLeft":
+					if (align == 'left')
+						img.removeAttribute('align');
+					else
+						img.setAttribute('align', 'left');
+
+					// Remove the div
+					var div = focusElm.parentNode;
+					if (div && div.nodeName == "DIV" && div.childNodes.length == 1 && div.parentNode)
+						div.parentNode.replaceChild(img, div);
+
+					this.selection.selectNode(img);
+					this.repaint();
+					tinyMCE.triggerNodeChange();
+					return;
+
+				case "JustifyCenter":
+					img.removeAttribute('align');
+
+					// Is centered
+					var div = tinyMCE.getParentElement(focusElm, "div");
+					if (div && div.style.textAlign == "center") {
+						// Remove div
+						if (div.nodeName == "DIV" && div.childNodes.length == 1 && div.parentNode)
+							div.parentNode.replaceChild(img, div);
+					} else {
+						// Add div
+						var div = this.getDoc().createElement("div");
+						div.style.textAlign = 'center';
+						div.appendChild(img);
+						focusElm.parentNode.replaceChild(div, focusElm);
+					}
+
+					this.selection.selectNode(img);
+					this.repaint();
+					tinyMCE.triggerNodeChange();
+					return;
+
+				case "JustifyRight":
+					if (align == 'right')
+						img.removeAttribute('align');
+					else
+						img.setAttribute('align', 'right');
+
+					// Remove the div
+					var div = focusElm.parentNode;
+					if (div && div.nodeName == "DIV" && div.childNodes.length == 1 && div.parentNode)
+						div.parentNode.replaceChild(img, div);
+
+					this.selection.selectNode(img);
+					this.repaint();
+					tinyMCE.triggerNodeChange();
+					return;
+			}
+		}
+
+		if (tinyMCE.settings['force_br_newlines']) {
+			var alignValue = "";
+
+			if (doc.selection.type != "Control") {
+				switch (command) {
+						case "JustifyLeft":
+							alignValue = "left";
+							break;
+
+						case "JustifyCenter":
+							alignValue = "center";
+							break;
+
+						case "JustifyFull":
+							alignValue = "justify";
+							break;
+
+						case "JustifyRight":
+							alignValue = "right";
+							break;
+				}
+
+				if (alignValue != "") {
+					var rng = doc.selection.createRange();
+
+					if ((divElm = tinyMCE.getParentElement(rng.parentElement(), "div")) != null)
+						divElm.setAttribute("align", alignValue);
+					else if (rng.pasteHTML && rng.htmlText.length > 0)
+						rng.pasteHTML('<div align="' + alignValue + '">' + rng.htmlText + "</div>");
+
+					tinyMCE.triggerNodeChange();
+					return;
+				}
+			}
+		}
+
+		switch (command) {
+			case "mceRepaint":
+				this.repaint();
+				return true;
+
+			case "InsertUnorderedList":
+			case "InsertOrderedList":
+				var tag = (command == "InsertUnorderedList") ? "ul" : "ol";
+
+				if (tinyMCE.isSafari)
+					this.execCommand("mceInsertContent", false, "<" + tag + "><li>&nbsp;</li><" + tag + ">");
+				else
+					this.getDoc().execCommand(command, user_interface, value);
+
+				tinyMCE.triggerNodeChange();
+				break;
+
+			case "Strikethrough":
+				if (tinyMCE.isSafari)
+					this.execCommand("mceInsertContent", false, "<strike>" + this.selection.getSelectedHTML() + "</strike>");
+				else
+					this.getDoc().execCommand(command, user_interface, value);
+
+				tinyMCE.triggerNodeChange();
+				break;
+
+			case "mceSelectNode":
+				this.selection.selectNode(value);
+				tinyMCE.triggerNodeChange();
+				tinyMCE.selectedNode = value;
+				break;
+
+			case "FormatBlock":
+				if (value == null || value == "") {
+					var elm = tinyMCE.getParentElement(this.getFocusElement(), "p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp");
+
+					if (elm)
+						this.execCommand("mceRemoveNode", false, elm);
+				} else {
+					if (tinyMCE.isGecko && new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>', 'gi').test(value))
+						value = value.replace(/[^a-z]/gi, '');
+
+					if (tinyMCE.isMSIE && new RegExp('blockquote|code|samp', 'gi').test(value)) {
+						var b = this.selection.getBookmark();
+						this.getDoc().execCommand("FormatBlock", false, '<p>');
+						tinyMCE.renameElement(tinyMCE.getParentBlockElement(this.getFocusElement()), value);
+						this.selection.moveToBookmark(b);
+					} else
+						this.getDoc().execCommand("FormatBlock", false, value);
+				}
+
+				tinyMCE.triggerNodeChange();
+
+				break;
+
+			case "mceRemoveNode":
+				if (!value)
+					value = tinyMCE.getParentElement(this.getFocusElement());
+
+				if (tinyMCE.isMSIE) {
+					value.outerHTML = value.innerHTML;
+				} else {
+					var rng = value.ownerDocument.createRange();
+					rng.setStartBefore(value);
+					rng.setEndAfter(value);
+					rng.deleteContents();
+					rng.insertNode(rng.createContextualFragment(value.innerHTML));
+				}
+
+				tinyMCE.triggerNodeChange();
+
+				break;
+
+			case "mceSelectNodeDepth":
+				var parentNode = this.getFocusElement();
+				for (var i=0; parentNode; i++) {
+					if (parentNode.nodeName.toLowerCase() == "body")
+						break;
+
+					if (parentNode.nodeName.toLowerCase() == "#text") {
+						i--;
+						parentNode = parentNode.parentNode;
+						continue;
+					}
+
+					if (i == value) {
+						this.selection.selectNode(parentNode, false);
+						tinyMCE.triggerNodeChange();
+						tinyMCE.selectedNode = parentNode;
+						return;
+					}
+
+					parentNode = parentNode.parentNode;
+				}
+
+				break;
+
+			case "SetStyleInfo":
+				var rng = this.getRng();
+				var sel = this.getSel();
+				var scmd = value['command'];
+				var sname = value['name'];
+				var svalue = value['value'] == null ? '' : value['value'];
+				//var svalue = value['value'] == null ? '' : value['value'];
+				var wrapper = value['wrapper'] ? value['wrapper'] : "span";
+				var parentElm = null;
+				var invalidRe = new RegExp("^BODY|HTML$", "g");
+				var invalidParentsRe = tinyMCE.settings['merge_styles_invalid_parents'] != '' ? new RegExp(tinyMCE.settings['merge_styles_invalid_parents'], "gi") : null;
+
+				// Whole element selected check
+				if (tinyMCE.isMSIE) {
+					// Control range
+					if (rng.item)
+						parentElm = rng.item(0);
+					else {
+						var pelm = rng.parentElement();
+						var prng = doc.selection.createRange();
+						prng.moveToElementText(pelm);
+
+						if (rng.htmlText == prng.htmlText || rng.boundingWidth == 0) {
+							if (invalidParentsRe == null || !invalidParentsRe.test(pelm.nodeName))
+								parentElm = pelm;
+						}
+					}
+				} else {
+					var felm = this.getFocusElement();
+					if (sel.isCollapsed || (new RegExp('td|tr|tbody|table', 'gi').test(felm.nodeName) && sel.anchorNode == felm.parentNode))
+						parentElm = felm;
+				}
+
+				// Whole element selected
+				if (parentElm && !invalidRe.test(parentElm.nodeName)) {
+					if (scmd == "setstyle")
+						tinyMCE.setStyleAttrib(parentElm, sname, svalue);
+
+					if (scmd == "setattrib")
+						tinyMCE.setAttrib(parentElm, sname, svalue);
+
+					if (scmd == "removeformat") {
+						parentElm.style.cssText = '';
+						tinyMCE.setAttrib(parentElm, 'class', '');
+					}
+
+					// Remove style/attribs from all children
+					var ch = tinyMCE.getNodeTree(parentElm, new Array(), 1);
+					for (var z=0; z<ch.length; z++) {
+						if (ch[z] == parentElm)
+							continue;
+
+						if (scmd == "setstyle")
+							tinyMCE.setStyleAttrib(ch[z], sname, '');
+
+						if (scmd == "setattrib")
+							tinyMCE.setAttrib(ch[z], sname, '');
+
+						if (scmd == "removeformat") {
+							ch[z].style.cssText = '';
+							tinyMCE.setAttrib(ch[z], 'class', '');
+						}
+					}
+				} else {
+					this._setUseCSS(false); // Bug in FF when running in fullscreen
+					doc.execCommand("FontName", false, "#mce_temp_font#");
+					var elementArray = tinyMCE.getElementsByAttributeValue(this.getBody(), "font", "face", "#mce_temp_font#");
+
+					// Change them all
+					for (var x=0; x<elementArray.length; x++) {
+						elm = elementArray[x];
+						if (elm) {
+							var spanElm = doc.createElement(wrapper);
+
+							if (scmd == "setstyle")
+								tinyMCE.setStyleAttrib(spanElm, sname, svalue);
+
+							if (scmd == "setattrib")
+								tinyMCE.setAttrib(spanElm, sname, svalue);
+
+							if (scmd == "removeformat") {
+								spanElm.style.cssText = '';
+								tinyMCE.setAttrib(spanElm, 'class', '');
+							}
+
+							if (elm.hasChildNodes()) {
+								for (var i=0; i<elm.childNodes.length; i++)
+									spanElm.appendChild(elm.childNodes[i].cloneNode(true));
+							}
+
+							spanElm.setAttribute("mce_new", "true");
+							elm.parentNode.replaceChild(spanElm, elm);
+
+							// Remove style/attribs from all children
+							var ch = tinyMCE.getNodeTree(spanElm, new Array(), 1);
+							for (var z=0; z<ch.length; z++) {
+								if (ch[z] == spanElm)
+									continue;
+
+								if (scmd == "setstyle")
+									tinyMCE.setStyleAttrib(ch[z], sname, '');
+
+								if (scmd == "setattrib")
+									tinyMCE.setAttrib(ch[z], sname, '');
+
+								if (scmd == "removeformat") {
+									ch[z].style.cssText = '';
+									tinyMCE.setAttrib(ch[z], 'class', '');
+								}
+							}
+						}
+					}
+				}
+
+				// Cleaup wrappers
+				var nodes = doc.getElementsByTagName(wrapper);
+				for (var i=nodes.length-1; i>=0; i--) {
+					var elm = nodes[i];
+					var isNew = tinyMCE.getAttrib(elm, "mce_new") == "true";
+
+					elm.removeAttribute("mce_new");
+
+					// Is only child a element
+					if (elm.childNodes && elm.childNodes.length == 1 && elm.childNodes[0].nodeType == 1) {
+						//tinyMCE.debug("merge1" + isNew);
+						this._mergeElements(scmd, elm, elm.childNodes[0], isNew);
+						continue;
+					}
+
+					// Is I the only child
+					if (elm.parentNode.childNodes.length == 1 && !invalidRe.test(elm.nodeName) && !invalidRe.test(elm.parentNode.nodeName)) {
+						//tinyMCE.debug("merge2" + isNew + "," + elm.nodeName + "," + elm.parentNode.nodeName);
+						if (invalidParentsRe == null || !invalidParentsRe.test(elm.parentNode.nodeName))
+							this._mergeElements(scmd, elm.parentNode, elm, false);
+					}
+				}
+
+				// Remove empty wrappers
+				var nodes = doc.getElementsByTagName(wrapper);
+				for (var i=nodes.length-1; i>=0; i--) {
+					var elm = nodes[i];
+					var isEmpty = true;
+
+					// Check if it has any attribs
+					var tmp = doc.createElement("body");
+					tmp.appendChild(elm.cloneNode(false));
+
+					// Is empty span, remove it
+					tmp.innerHTML = tmp.innerHTML.replace(new RegExp('style=""|class=""', 'gi'), '');
+					//tinyMCE.debug(tmp.innerHTML);
+					if (new RegExp('<span>', 'gi').test(tmp.innerHTML)) {
+						for (var x=0; x<elm.childNodes.length; x++) {
+							if (elm.parentNode != null)
+								elm.parentNode.insertBefore(elm.childNodes[x].cloneNode(true), elm);
+						}
+
+						elm.parentNode.removeChild(elm);
+					}
+				}
+
+				// Re add the visual aids
+				if (scmd == "removeformat")
+					tinyMCE.handleVisualAid(this.getBody(), true, this.visualAid, this);
+
+				tinyMCE.triggerNodeChange();
+
+				break;
+
+			case "FontName":
+				if (value == null) {
+					var s = this.getSel();
+
+					// Find font and select it
+					if (tinyMCE.isGecko && s.isCollapsed) {
+						var f = tinyMCE.getParentElement(this.getFocusElement(), "font");
+
+						if (f != null)
+							this.selection.selectNode(f, false);
+					}
+
+					// Remove format
+					this.getDoc().execCommand("RemoveFormat", false, null);
+
+					// Collapse range if font was found
+					if (f != null && tinyMCE.isGecko) {
+						var r = this.getRng().cloneRange();
+						r.collapse(true);
+						s.removeAllRanges();
+						s.addRange(r);
+					}
+				} else
+					this.getDoc().execCommand('FontName', false, value);
+
+				if (tinyMCE.isGecko)
+					window.setTimeout('tinyMCE.triggerNodeChange(false);', 1);
+
+				return;
+
+			case "FontSize":
+				this.getDoc().execCommand('FontSize', false, value);
+
+				if (tinyMCE.isGecko)
+					window.setTimeout('tinyMCE.triggerNodeChange(false);', 1);
+
+				return;
+
+			case "forecolor":
+				this.getDoc().execCommand('forecolor', false, value);
+				break;
+
+			case "HiliteColor":
+				if (tinyMCE.isGecko) {
+					this._setUseCSS(true);
+					this.getDoc().execCommand('hilitecolor', false, value);
+					this._setUseCSS(false);
+				} else
+					this.getDoc().execCommand('BackColor', false, value);
+				break;
+
+			case "Cut":
+			case "Copy":
+			case "Paste":
+				var cmdFailed = false;
+
+				// Try executing command
+				eval('try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}');
+
+				if (tinyMCE.isOpera && cmdFailed)
+					alert('Currently not supported by your browser, use keyboard shortcuts instead.');
+
+				// Alert error in gecko if command failed
+				if (tinyMCE.isGecko && cmdFailed) {
+					// Confirm more info
+					if (confirm(tinyMCE.entityDecode(tinyMCE.getLang('lang_clipboard_msg'))))
+						window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', 'mceExternal');
+
+					return;
+				} else
+					tinyMCE.triggerNodeChange();
+			break;
+
+			case "mceSetContent":
+				if (!value)
+					value = "";
+
+				// Call custom cleanup code
+				value = tinyMCE.storeAwayURLs(value);
+				value = tinyMCE._customCleanup(this, "insert_to_editor", value);
+				tinyMCE._setHTML(doc, value);
+				tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(this, doc, tinyMCE.settings, doc.body));
+				tinyMCE.convertAllRelativeURLs(doc.body);
+
+				// Cleanup any mess left from storyAwayURLs
+				tinyMCE._removeInternal(this.getBody());
+
+				// When editing always use fonts internaly
+				if (tinyMCE.getParam("convert_fonts_to_spans"))
+					tinyMCE.convertSpansToFonts(doc);
+
+				tinyMCE.handleVisualAid(doc.body, true, this.visualAid, this);
+				tinyMCE._setEventsEnabled(doc.body, false);
+				return true;
+
+			case "mceCleanup":
+				var b = this.selection.getBookmark();
+				tinyMCE._setHTML(this.contentDocument, this.getBody().innerHTML);
+				tinyMCE.setInnerHTML(this.getBody(), tinyMCE._cleanupHTML(this, this.contentDocument, this.settings, this.getBody(), this.visualAid));
+				tinyMCE.convertAllRelativeURLs(doc.body);
+
+				// When editing always use fonts internaly
+				if (tinyMCE.getParam("convert_fonts_to_spans"))
+					tinyMCE.convertSpansToFonts(doc);
+
+				tinyMCE.handleVisualAid(this.getBody(), true, this.visualAid, this);
+				tinyMCE._setEventsEnabled(this.getBody(), false);
+				this.repaint();
+				this.selection.moveToBookmark(b);
+				tinyMCE.triggerNodeChange();
+			break;
+
+			case "mceReplaceContent":
+				// Force empty string
+				if (!value)
+					value = '';
+
+				this.getWin().focus();
+
+				var selectedText = "";
+
+				if (tinyMCE.isMSIE) {
+					var rng = doc.selection.createRange();
+					selectedText = rng.text;
+				} else
+					selectedText = this.getSel().toString();
+
+				if (selectedText.length > 0) {
+					value = tinyMCE.replaceVar(value, "selection", selectedText);
+					tinyMCE.execCommand('mceInsertContent', false, value);
+				}
+
+				tinyMCE.triggerNodeChange();
+			break;
+
+			case "mceSetAttribute":
+				if (typeof(value) == 'object') {
+					var targetElms = (typeof(value['targets']) == "undefined") ? "p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address" : value['targets'];
+					var targetNode = tinyMCE.getParentElement(this.getFocusElement(), targetElms);
+
+					if (targetNode) {
+						targetNode.setAttribute(value['name'], value['value']);
+						tinyMCE.triggerNodeChange();
+					}
+				}
+			break;
+
+			case "mceSetCSSClass":
+				this.execCommand("SetStyleInfo", false, {command : "setattrib", name : "class", value : value});
+			break;
+
+			case "mceInsertRawHTML":
+				var key = 'tiny_mce_marker';
+
+				this.execCommand('mceBeginUndoLevel');
+
+				// Insert marker key
+				this.execCommand('mceInsertContent', false, key);
+
+				// Store away scroll pos
+				var scrollX = this.getDoc().body.scrollLeft + this.getDoc().documentElement.scrollLeft;
+				var scrollY = this.getDoc().body.scrollTop + this.getDoc().documentElement.scrollTop;
+
+				// Find marker and replace with RAW HTML
+				var html = this.getBody().innerHTML;
+				if ((pos = html.indexOf(key)) != -1)
+					tinyMCE.setInnerHTML(this.getBody(), html.substring(0, pos) + value + html.substring(pos + key.length));
+
+				// Restore scoll pos
+				this.contentWindow.scrollTo(scrollX, scrollY);
+
+				this.execCommand('mceEndUndoLevel');
+
+				break;
+
+			case "mceInsertContent":
+				// Force empty string
+				if (!value)
+					value = '';
+
+				var insertHTMLFailed = false;
+				this.getWin().focus();
+
+				if (tinyMCE.isGecko || tinyMCE.isOpera) {
+					try {
+						// Is plain text or HTML, &amp;, &nbsp; etc will be encoded wrong in FF
+						if (value.indexOf('<') == -1 && !value.match(/(&#38;|&#160;|&#60;|&#62;)/g)) {
+							var r = this.getRng();
+							var n = this.getDoc().createTextNode(tinyMCE.entityDecode(value));
+							var s = this.getSel();
+							var r2 = r.cloneRange();
+
+							// Insert text at cursor position
+							s.removeAllRanges();
+							r.deleteContents();
+							r.insertNode(n);
+
+							// Move the cursor to the end of text
+							r2.selectNode(n);
+							r2.collapse(false);
+							s.removeAllRanges();
+							s.addRange(r2);
+						} else {
+							value = tinyMCE.fixGeckoBaseHREFBug(1, this.getDoc(), value);
+							this.getDoc().execCommand('inserthtml', false, value);
+							tinyMCE.fixGeckoBaseHREFBug(2, this.getDoc(), value);
+						}
+					} catch (ex) {
+						insertHTMLFailed = true;
+					}
+
+					if (!insertHTMLFailed) {
+						tinyMCE.triggerNodeChange();
+						return;
+					}
+				}
+
+				// Ugly hack in Opera due to non working "inserthtml"
+				if (tinyMCE.isOpera && insertHTMLFailed) {
+					this.getDoc().execCommand("insertimage", false, tinyMCE.uniqueURL);
+					var ar = tinyMCE.getElementsByAttributeValue(this.getBody(), "img", "src", tinyMCE.uniqueURL);
+					ar[0].outerHTML = value;
+					return;
+				}
+
+				if (!tinyMCE.isMSIE) {
+					var isHTML = value.indexOf('<') != -1;
+					var sel = this.getSel();
+					var rng = this.getRng();
+
+					if (isHTML) {
+						if (tinyMCE.isSafari) {
+							var tmpRng = this.getDoc().createRange();
+
+							tmpRng.setStart(this.getBody(), 0);
+							tmpRng.setEnd(this.getBody(), 0);
+
+							value = tmpRng.createContextualFragment(value);
+						} else
+							value = rng.createContextualFragment(value);
+					} else {
+						// Setup text node
+						var el = document.createElement("div");
+						el.innerHTML = value;
+						value = el.firstChild.nodeValue;
+						value = doc.createTextNode(value);
+					}
+
+					// Insert plain text in Safari
+					if (tinyMCE.isSafari && !isHTML) {
+						this.execCommand('InsertText', false, value.nodeValue);
+						tinyMCE.triggerNodeChange();
+						return true;
+					} else if (tinyMCE.isSafari && isHTML) {
+						rng.deleteContents();
+						rng.insertNode(value);
+						tinyMCE.triggerNodeChange();
+						return true;
+					}
+
+					rng.deleteContents();
+
+					// If target node is text do special treatment, (Mozilla 1.3 fix)
+					if (rng.startContainer.nodeType == 3) {
+						var node = rng.startContainer.splitText(rng.startOffset);
+						node.parentNode.insertBefore(value, node); 
+					} else
+						rng.insertNode(value);
+
+					if (!isHTML) {
+						// Removes weird selection trails
+						sel.selectAllChildren(doc.body);
+						sel.removeAllRanges();
+
+						// Move cursor to end of content
+						var rng = doc.createRange();
+
+						rng.selectNode(value);
+						rng.collapse(false);
+
+						sel.addRange(rng);
+					} else
+						rng.collapse(false);
+
+					tinyMCE.fixGeckoBaseHREFBug(2, this.getDoc(), value);
+				} else {
+					var rng = doc.selection.createRange();
+					var c = value.indexOf('<!--') != -1;
+
+					// Fix comment bug, add tag before comments
+					if (c)
+						value = tinyMCE.uniqueTag + value;
+
+					if (rng.item)
+						rng.item(0).outerHTML = value;
+					else
+						rng.pasteHTML(value);
+
+					// Remove unique tag
+					if (c) {
+						var e = this.getDoc().getElementById('mceTMPElement');
+						e.parentNode.removeChild(e);
+					}
+				}
+
+				tinyMCE.triggerNodeChange();
+			break;
+
+			case "mceStartTyping":
+				if (tinyMCE.settings['custom_undo_redo'] && this.undoRedo.typingUndoIndex == -1) {
+					this.undoRedo.typingUndoIndex = this.undoRedo.undoIndex;
+					this.execCommand('mceAddUndoLevel');
+					//tinyMCE.debug("mceStartTyping");
+				}
+				break;
+
+			case "mceEndTyping":
+				if (tinyMCE.settings['custom_undo_redo'] && this.undoRedo.typingUndoIndex != -1) {
+					this.execCommand('mceAddUndoLevel');
+					this.undoRedo.typingUndoIndex = -1;
+					//tinyMCE.debug("mceEndTyping");
+				}
+				break;
+
+			case "mceBeginUndoLevel":
+				this.undoRedoLevel = false;
+				break;
+
+			case "mceEndUndoLevel":
+				this.undoRedoLevel = true;
+				this.execCommand('mceAddUndoLevel');
+				break;
+
+			case "mceAddUndoLevel":
+				if (tinyMCE.settings['custom_undo_redo'] && this.undoRedoLevel) {
+					if (this.undoRedo.add())
+						tinyMCE.triggerNodeChange(false);
+				}
+				break;
+
+			case "Undo":
+				if (tinyMCE.settings['custom_undo_redo']) {
+					tinyMCE.execCommand("mceEndTyping");
+					this.undoRedo.undo();
+					tinyMCE.triggerNodeChange();
+				} else
+					this.getDoc().execCommand(command, user_interface, value);
+				break;
+
+			case "Redo":
+				if (tinyMCE.settings['custom_undo_redo']) {
+					tinyMCE.execCommand("mceEndTyping");
+					this.undoRedo.redo();
+					tinyMCE.triggerNodeChange();
+				} else
+					this.getDoc().execCommand(command, user_interface, value);
+				break;
+
+			case "mceToggleVisualAid":
+				this.visualAid = !this.visualAid;
+				tinyMCE.handleVisualAid(this.getBody(), true, this.visualAid, this);
+				tinyMCE.triggerNodeChange();
+				break;
+
+			case "Indent":
+				this.getDoc().execCommand(command, user_interface, value);
+				tinyMCE.triggerNodeChange();
+				if (tinyMCE.isMSIE) {
+					var n = tinyMCE.getParentElement(this.getFocusElement(), "blockquote");
+					do {
+						if (n && n.nodeName == "BLOCKQUOTE") {
+							n.removeAttribute("dir");
+							n.removeAttribute("style");
+						}
+					} while (n != null && (n = n.parentNode) != null);
+				}
+				break;
+
+			case "removeformat":
+				var text = this.selection.getSelectedText();
+
+				if (tinyMCE.isOpera) {
+					this.getDoc().execCommand("RemoveFormat", false, null);
+					return;
+				}
+
+				if (tinyMCE.isMSIE) {
+					try {
+						var rng = doc.selection.createRange();
+						rng.execCommand("RemoveFormat", false, null);
+					} catch (e) {
+						// Do nothing
+					}
+
+					this.execCommand("SetStyleInfo", false, {command : "removeformat"});
+				} else {
+					this.getDoc().execCommand(command, user_interface, value);
+
+					this.execCommand("SetStyleInfo", false, {command : "removeformat"});
+				}
+
+				// Remove class
+				if (text.length == 0)
+					this.execCommand("mceSetCSSClass", false, "");
+
+				tinyMCE.triggerNodeChange();
+				break;
+
+			default:
+				this.getDoc().execCommand(command, user_interface, value);
+
+				if (tinyMCE.isGecko)
+					window.setTimeout('tinyMCE.triggerNodeChange(false);', 1);
+				else
+					tinyMCE.triggerNodeChange();
+		}
+
+		// Add undo level after modification
+		if (command != "mceAddUndoLevel" && command != "Undo" && command != "Redo" && command != "mceStartTyping" && command != "mceEndTyping")
+			tinyMCE.execCommand("mceAddUndoLevel");
+	},
+
+	queryCommandValue : function(c) {
+		try {
+			return this.getDoc().queryCommandValue(c);
+		} catch (e) {
+			return null;
+		}
+	},
+
+	queryCommandState : function(c) {
+		return this.getDoc().queryCommandState(c);
+	},
+
+	_onAdd : function(replace_element, form_element_name, target_document) {
+		var hc, th, to, editorTemplate;
+
+		th = this.settings['theme'];
+		to = tinyMCE.themes[th];
+
+		var targetDoc = target_document ? target_document : document;
+
+		this.targetDoc = targetDoc;
+
+		tinyMCE.themeURL = tinyMCE.baseURL + "/themes/" + this.settings['theme'];
+		this.settings['themeurl'] = tinyMCE.themeURL;
+
+		if (!replace_element) {
+			alert("Error: Could not find the target element.");
+			return false;
+		}
+
+		if (to.getEditorTemplate)
+			editorTemplate = to.getEditorTemplate(this.settings, this.editorId);
+
+		var deltaWidth = editorTemplate['delta_width'] ? editorTemplate['delta_width'] : 0;
+		var deltaHeight = editorTemplate['delta_height'] ? editorTemplate['delta_height'] : 0;
+		var html = '<span id="' + this.editorId + '_parent" class="mceEditorContainer">' + editorTemplate['html'];
+
+		html = tinyMCE.replaceVar(html, "editor_id", this.editorId);
+		this.settings['default_document'] = tinyMCE.baseURL + "/blank.htm";
+
+		this.settings['old_width'] = this.settings['width'];
+		this.settings['old_height'] = this.settings['height'];
+
+		// Set default width, height
+		if (this.settings['width'] == -1)
+			this.settings['width'] = replace_element.offsetWidth;
+
+		if (this.settings['height'] == -1)
+			this.settings['height'] = replace_element.offsetHeight;
+
+		// Try the style width
+		if (this.settings['width'] == 0)
+			this.settings['width'] = replace_element.style.width;
+
+		// Try the style height
+		if (this.settings['height'] == 0)
+			this.settings['height'] = replace_element.style.height; 
+
+		// If no width/height then default to 320x240, better than nothing
+		if (this.settings['width'] == 0)
+			this.settings['width'] = 320;
+
+		if (this.settings['height'] == 0)
+			this.settings['height'] = 240;
+
+		this.settings['area_width'] = parseInt(this.settings['width']);
+		this.settings['area_height'] = parseInt(this.settings['height']);
+		this.settings['area_width'] += deltaWidth;
+		this.settings['area_height'] += deltaHeight;
+
+		// Special % handling
+		if (("" + this.settings['width']).indexOf('%') != -1)
+			this.settings['area_width'] = "100%";
+
+		if (("" + this.settings['height']).indexOf('%') != -1)
+			this.settings['area_height'] = "100%";
+
+		if (("" + replace_element.style.width).indexOf('%') != -1) {
+			this.settings['width'] = replace_element.style.width;
+			this.settings['area_width'] = "100%";
+		}
+
+		if (("" + replace_element.style.height).indexOf('%') != -1) {
+			this.settings['height'] = replace_element.style.height;
+			this.settings['area_height'] = "100%";
+		}
+
+		html = tinyMCE.applyTemplate(html);
+
+		this.settings['width'] = this.settings['old_width'];
+		this.settings['height'] = this.settings['old_height'];
+
+		this.visualAid = this.settings['visual'];
+		this.formTargetElementId = form_element_name;
+
+		// Get replace_element contents
+		if (replace_element.nodeName == "TEXTAREA" || replace_element.nodeName == "INPUT")
+			this.startContent = replace_element.value;
+		else
+			this.startContent = replace_element.innerHTML;
+
+		// If not text area or input
+		if (replace_element.nodeName != "TEXTAREA" && replace_element.nodeName != "INPUT") {
+			this.oldTargetElement = replace_element;
+
+			// Debug mode
+			if (tinyMCE.settings['debug']) {
+				hc = '<textarea wrap="off" id="' + form_element_name + '" name="' + form_element_name + '" cols="100" rows="15"></textarea>';
+			} else {
+				hc = '<input type="hidden" id="' + form_element_name + '" name="' + form_element_name + '" />';
+				this.oldTargetElement.style.display = "none";
+			}
+
+			html += '</span>';
+
+			if (tinyMCE.isGecko)
+				html = hc + html;
+			else
+				html += hc;
+
+			// Output HTML and set editable
+			if (tinyMCE.isGecko) {
+				var rng = replace_element.ownerDocument.createRange();
+				rng.setStartBefore(replace_element);
+
+				var fragment = rng.createContextualFragment(html);
+				tinyMCE.insertAfter(fragment, replace_element);
+			} else
+				replace_element.insertAdjacentHTML("beforeBegin", html);
+		} else {
+			html += '</span>';
+
+			// Just hide the textarea element
+			this.oldTargetElement = replace_element;
+
+			if (!tinyMCE.settings['debug'])
+				this.oldTargetElement.style.display = "none";
+
+			// Output HTML and set editable
+			if (tinyMCE.isGecko) {
+				var rng = replace_element.ownerDocument.createRange();
+				rng.setStartBefore(replace_element);
+
+				var fragment = rng.createContextualFragment(html);
+				tinyMCE.insertAfter(fragment, replace_element);
+			} else
+				replace_element.insertAdjacentHTML("beforeBegin", html);
+		}
+
+		// Setup iframe
+		var dynamicIFrame = false;
+		var tElm = targetDoc.getElementById(this.editorId);
+
+		if (!tinyMCE.isMSIE) {
+			// Node case is preserved in XML strict mode
+			if (tElm && (tElm.nodeName == "SPAN" || tElm.nodeName == "span")) {
+				tElm = tinyMCE._createIFrame(tElm, targetDoc);
+				dynamicIFrame = true;
+			}
+
+			this.targetElement = tElm;
+			this.iframeElement = tElm;
+			this.contentDocument = tElm.contentDocument;
+			this.contentWindow = tElm.contentWindow;
+
+			//this.getDoc().designMode = "on";
+		} else {
+			if (tElm && tElm.nodeName == "SPAN")
+				tElm = tinyMCE._createIFrame(tElm, targetDoc, targetDoc.parentWindow);
+			else
+				tElm = targetDoc.frames[this.editorId];
+
+			this.targetElement = tElm;
+			this.iframeElement = targetDoc.getElementById(this.editorId);
+
+			if (tinyMCE.isOpera) {
+				this.contentDocument = this.iframeElement.contentDocument;
+				this.contentWindow = this.iframeElement.contentWindow;
+				dynamicIFrame = true;
+			} else {
+				this.contentDocument = tElm.window.document;
+				this.contentWindow = tElm.window;
+			}
+
+			this.getDoc().designMode = "on";
+		}
+
+		// Setup base HTML
+		var doc = this.contentDocument;
+		if (dynamicIFrame) {
+			var html = tinyMCE.getParam('doctype') + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + tinyMCE.settings['base_href'] + '" /><title>blank_page</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body class="mceContentBody"></body></html>';
+
+			try {
+				if (!this.isHidden())
+					this.getDoc().designMode = "on";
+
+				doc.open();
+				doc.write(html);
+				doc.close();
+			} catch (e) {
+				// Failed Mozilla 1.3
+				this.getDoc().location.href = tinyMCE.baseURL + "/blank.htm";
+			}
+		}
+
+		// This timeout is needed in MSIE 5.5 for some odd reason
+		// it seems that the document.frames isn't initialized yet?
+		if (tinyMCE.isMSIE)
+			window.setTimeout("tinyMCE.addEventHandlers(tinyMCE.instances[\"" + this.editorId + "\"]);", 1);
+
+		tinyMCE.setupContent(this.editorId, true);
+
+		return true;
+	},
+
+	setBaseHREF : function(u) {
+		var h, b, d, nl;
+
+		d = this.getDoc();
+		nl = d.getElementsByTagName("base");
+		b = nl.length > 0 ? nl[0] : null;
+
+		if (!b) {
+			nl = d.getElementsByTagName("head");
+			h = nl.length > 0 ? nl[0] : null;
+
+			b = d.createElement("base");
+			b.setAttribute('href', u);
+			h.appendChild(b);
+		} else {
+			if (u == "" || u == null)
+				b.parentNode.removeChild(b);
+			else
+				b.setAttribute('href', u);
+		}
+	},
+
+	getFocusElement : function() {
+		return this.selection.getFocusElement();
+	},
+
+	getSel : function() {
+		return this.selection.getSel();
+	},
+
+	getRng : function() {
+		return this.selection.getRng();
+	},
+
+	triggerSave : function(skip_cleanup, skip_callback) {
+		var e, nl = new Array(), i, s;
+
+		this.switchSettings();
+		s = tinyMCE.settings;
+
+		// Force hidden tabs visible while serializing
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+			e = this.iframeElement;
+
+			do {
+				if (e.style && e.style.display == 'none') {
+					e.style.display = 'block';
+					nl[nl.length] = {elm : e, type : 'style'};
+				}
+
+				if (e.style && s.hidden_tab_class.length > 0 && e.className.indexOf(s.hidden_tab_class) != -1) {
+					e.className = s.display_tab_class;
+					nl[nl.length] = {elm : e, type : 'class'};
+				}
+			} while ((e = e.parentNode) != null)
+		}
+
+		tinyMCE.settings['preformatted'] = false;
+
+		// Default to false
+		if (typeof(skip_cleanup) == "undefined")
+			skip_cleanup = false;
+
+		// Default to false
+		if (typeof(skip_callback) == "undefined")
+			skip_callback = false;
+
+		tinyMCE._setHTML(this.getDoc(), this.getBody().innerHTML);
+
+		// Remove visual aids when cleanup is disabled
+		if (this.settings['cleanup'] == false) {
+			tinyMCE.handleVisualAid(this.getBody(), true, false, this);
+			tinyMCE._setEventsEnabled(this.getBody(), true);
+		}
+
+		tinyMCE._customCleanup(this, "submit_content_dom", this.contentWindow.document.body);
+		var htm = skip_cleanup ? this.getBody().innerHTML : tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true);
+		htm = tinyMCE._customCleanup(this, "submit_content", htm);
+
+		if (!skip_callback && tinyMCE.settings['save_callback'] != "")
+			var content = eval(tinyMCE.settings['save_callback'] + "(this.formTargetElementId,htm,this.getBody());");
+
+		// Use callback content if available
+		if ((typeof(content) != "undefined") && content != null)
+			htm = content;
+
+		// Replace some weird entities (Bug: #1056343)
+		htm = tinyMCE.regexpReplace(htm, "&#40;", "(", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#41;", ")", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#59;", ";", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#34;", "&quot;", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#94;", "^", "gi");
+
+		if (this.formElement)
+			this.formElement.value = htm;
+
+		if (tinyMCE.isSafari && this.formElement)
+			this.formElement.innerText = htm;
+
+		// Hide them again (tabs in MSIE)
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].type == 'style')
+				nl[i].elm.style.display = 'none';
+			else
+				nl[i].elm.className = s.hidden_tab_class;
+		}
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Cleanup.class.js */
+
+TinyMCE_Engine.prototype.cleanupHTMLCode = function(s) {
+	s = s.replace(new RegExp('<p \\/>', 'gi'), '<p>&nbsp;</p>');
+	s = s.replace(new RegExp('<p>\\s*<\\/p>', 'gi'), '<p>&nbsp;</p>');
+
+	// Fix close BR elements
+	s = s.replace(new RegExp('<br>\\s*<\\/br>', 'gi'), '<br />');
+
+	// Open closed tags like <b/> to <b></b>
+	s = s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>', 'gi'), '<$1$2$3></$1$2>');
+
+	// Remove trailing space <b > to <b>
+	s = s.replace(new RegExp('\\s+></', 'gi'), '></');
+
+	// Close tags <img></img> to <img/>
+	s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />');
+
+	// Weird MSIE bug, <p><hr /></p> breaks runtime?
+	if (tinyMCE.isMSIE)
+		s = s.replace(new RegExp('<p><hr \\/><\\/p>', 'gi'), "<hr>");
+
+	// Convert relative anchors to absolute URLs ex: #something to file.htm#something
+	if (tinyMCE.getParam('convert_urls'))
+		s = s.replace(new RegExp('(href=\"{0,1})(\\s*#)', 'gi'), '$1' + tinyMCE.settings['document_base_url'] + "#");
+
+	return s;
+};
+
+TinyMCE_Engine.prototype.parseStyle = function(str) {
+	var ar = new Array();
+
+	if (str == null)
+		return ar;
+
+	var st = str.split(';');
+
+	tinyMCE.clearArray(ar);
+
+	for (var i=0; i<st.length; i++) {
+		if (st[i] == '')
+			continue;
+
+		var re = new RegExp('^\\s*([^:]*):\\s*(.*)\\s*$');
+		var pa = st[i].replace(re, '$1||$2').split('||');
+//tinyMCE.debug(str, pa[0] + "=" + pa[1], st[i].replace(re, '$1||$2'));
+		if (pa.length == 2)
+			ar[pa[0].toLowerCase()] = pa[1];
+	}
+
+	return ar;
+};
+
+TinyMCE_Engine.prototype.compressStyle = function(ar, pr, sf, res) {
+	var box = new Array();
+
+	box[0] = ar[pr + '-top' + sf];
+	box[1] = ar[pr + '-left' + sf];
+	box[2] = ar[pr + '-right' + sf];
+	box[3] = ar[pr + '-bottom' + sf];
+
+	for (var i=0; i<box.length; i++) {
+		if (box[i] == null)
+			return;
+
+		for (var a=0; a<box.length; a++) {
+			if (box[a] != box[i])
+				return;
+		}
+	}
+
+	// They are all the same
+	ar[res] = box[0];
+	ar[pr + '-top' + sf] = null;
+	ar[pr + '-left' + sf] = null;
+	ar[pr + '-right' + sf] = null;
+	ar[pr + '-bottom' + sf] = null;
+};
+
+TinyMCE_Engine.prototype.serializeStyle = function(ar) {
+	var str = "";
+
+	// Compress box
+	tinyMCE.compressStyle(ar, "border", "", "border");
+	tinyMCE.compressStyle(ar, "border", "-width", "border-width");
+	tinyMCE.compressStyle(ar, "border", "-color", "border-color");
+	tinyMCE.compressStyle(ar, "border", "-style", "border-style");
+	tinyMCE.compressStyle(ar, "padding", "", "padding");
+	tinyMCE.compressStyle(ar, "margin", "", "margin");
+
+	for (var key in ar) {
+		var val = ar[key];
+
+		if (typeof(val) == 'function')
+			continue;
+
+		if (key.indexOf('mso-') == 0)
+			continue;
+
+		if (val != null && val != '') {
+			val = '' + val; // Force string
+
+			// Fix style URL
+			val = val.replace(new RegExp("url\\(\\'?([^\\']*)\\'?\\)", 'gi'), "url('$1')");
+
+			// Convert URL
+			if (val.indexOf('url(') != -1 && tinyMCE.getParam('convert_urls')) {
+				var m = new RegExp("url\\('(.*?)'\\)").exec(val);
+
+				if (m.length > 1)
+					val = "url('" + eval(tinyMCE.getParam('urlconverter_callback') + "(m[1], null, true);") + "')";
+			}
+
+			// Force HEX colors
+			if (tinyMCE.getParam("force_hex_style_colors"))
+				val = tinyMCE.convertRGBToHex(val, true);
+
+			if (val != "url('')")
+				str += key.toLowerCase() + ": " + val + "; ";
+		}
+	}
+
+	if (new RegExp('; $').test(str))
+		str = str.substring(0, str.length - 2);
+
+	return str;
+};
+
+TinyMCE_Engine.prototype.convertRGBToHex = function(s, k) {
+	if (s.toLowerCase().indexOf('rgb') != -1) {
+		var re = new RegExp("(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)", "gi");
+		var rgb = s.replace(re, "$1,$2,$3,$4,$5").split(',');
+		if (rgb.length == 5) {
+			r = parseInt(rgb[1]).toString(16);
+			g = parseInt(rgb[2]).toString(16);
+			b = parseInt(rgb[3]).toString(16);
+
+			r = r.length == 1 ? '0' + r : r;
+			g = g.length == 1 ? '0' + g : g;
+			b = b.length == 1 ? '0' + b : b;
+
+			s = "#" + r + g + b;
+
+			if (k)
+				s = rgb[0] + s + rgb[4];
+		}
+	}
+
+	return s;
+};
+
+TinyMCE_Engine.prototype.convertHexToRGB = function(s) {
+	if (s.indexOf('#') != -1) {
+		s = s.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+		return "rgb(" + parseInt(s.substring(0, 2), 16) + "," + parseInt(s.substring(2, 4), 16) + "," + parseInt(s.substring(4, 6), 16) + ")";
+	}
+
+	return s;
+};
+
+TinyMCE_Engine.prototype.convertSpansToFonts = function(doc) {
+	var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(',');
+
+	var h = doc.body.innerHTML;
+	h = h.replace(/<span/gi, '<font');
+	h = h.replace(/<\/span/gi, '</font');
+	doc.body.innerHTML = h;
+
+	var s = doc.getElementsByTagName("font");
+	for (var i=0; i<s.length; i++) {
+		var size = tinyMCE.trim(s[i].style.fontSize).toLowerCase();
+		var fSize = 0;
+
+		for (var x=0; x<sizes.length; x++) {
+			if (sizes[x] == size) {
+				fSize = x + 1;
+				break;
+			}
+		}
+
+		if (fSize > 0) {
+			tinyMCE.setAttrib(s[i], 'size', fSize);
+			s[i].style.fontSize = '';
+		}
+
+		var fFace = s[i].style.fontFamily;
+		if (fFace != null && fFace != "") {
+			tinyMCE.setAttrib(s[i], 'face', fFace);
+			s[i].style.fontFamily = '';
+		}
+
+		var fColor = s[i].style.color;
+		if (fColor != null && fColor != "") {
+			tinyMCE.setAttrib(s[i], 'color', tinyMCE.convertRGBToHex(fColor));
+			s[i].style.color = '';
+		}
+	}
+};
+
+TinyMCE_Engine.prototype.convertFontsToSpans = function(doc) {
+	var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(',');
+
+	var h = doc.body.innerHTML;
+	h = h.replace(/<font/gi, '<span');
+	h = h.replace(/<\/font/gi, '</span');
+	doc.body.innerHTML = h;
+
+	var fsClasses = tinyMCE.getParam('font_size_classes');
+	if (fsClasses != '')
+		fsClasses = fsClasses.replace(/\s+/, '').split(',');
+	else
+		fsClasses = null;
+
+	var s = doc.getElementsByTagName("span");
+	for (var i=0; i<s.length; i++) {
+		var fSize, fFace, fColor;
+
+		fSize = tinyMCE.getAttrib(s[i], 'size');
+		fFace = tinyMCE.getAttrib(s[i], 'face');
+		fColor = tinyMCE.getAttrib(s[i], 'color');
+
+		if (fSize != "") {
+			fSize = parseInt(fSize);
+
+			if (fSize > 0 && fSize < 8) {
+				if (fsClasses != null)
+					tinyMCE.setAttrib(s[i], 'class', fsClasses[fSize-1]);
+				else
+					s[i].style.fontSize = sizes[fSize-1];
+			}
+
+			s[i].removeAttribute('size');
+		}
+
+		if (fFace != "") {
+			s[i].style.fontFamily = fFace;
+			s[i].removeAttribute('face');
+		}
+
+		if (fColor != "") {
+			s[i].style.color = fColor;
+			s[i].removeAttribute('color');
+		}
+	}
+};
+
+TinyMCE_Engine.prototype.cleanupAnchors = function(doc) {
+	var i, cn, x, an = doc.getElementsByTagName("a");
+
+	// Loops backwards due to bug #1467987
+	for (i=an.length-1; i>=0; i--) {
+		if (tinyMCE.getAttrib(an[i], "name") != "" && tinyMCE.getAttrib(an[i], "href") == "") {
+			cn = an[i].childNodes;
+
+			for (x=cn.length-1; x>=0; x--)
+				tinyMCE.insertAfter(cn[x], an[i]);
+		}
+	}
+};
+
+TinyMCE_Engine.prototype.getContent = function(editor_id) {
+	var h;
+
+	if (typeof(editor_id) != "undefined")
+		tinyMCE.selectedInstance = tinyMCE.getInstanceById(editor_id);
+
+	if (tinyMCE.selectedInstance) {
+		h = tinyMCE._cleanupHTML(this.selectedInstance, this.selectedInstance.getDoc(), tinyMCE.settings, this.selectedInstance.getBody(), false, true);
+
+		// When editing always use fonts internaly
+		if (tinyMCE.getParam("convert_fonts_to_spans"))
+			tinyMCE.convertSpansToFonts(this.selectedInstance.getDoc());
+
+		return h;
+	}
+
+	return null;
+};
+
+TinyMCE_Engine.prototype._fixListElements = function(d) {
+	var nl, x, a = ['ol', 'ul'], i, n, p, r = new RegExp('^(OL|UL)$'), np;
+
+	for (x=0; x<a.length; x++) {
+		nl = d.getElementsByTagName(a[x]);
+
+		for (i=0; i<nl.length; i++) {
+			n = nl[i];
+			p = n.parentNode;
+
+			if (r.test(p.nodeName)) {
+				np = tinyMCE.prevNode(n, 'LI');
+
+				if (!np) {
+					np = d.createElement('li');
+					np.innerHTML = '&nbsp;';
+					np.appendChild(n);
+					p.insertBefore(np, p.firstChild);
+				} else
+					np.appendChild(n);
+			}
+		}
+	}
+};
+
+TinyMCE_Engine.prototype._fixTables = function(d) {
+	var nl, i, n, p, np, x, t;
+
+	nl = d.getElementsByTagName('table');
+	for (i=0; i<nl.length; i++) {
+		n = nl[i];
+
+		if ((p = tinyMCE.getParentElement(n, 'p,div,h1,h2,h3,h4,h5,h6')) != null) {
+			np = p.cloneNode(false);
+			np.removeAttribute('id');
+
+			t = n;
+
+			while ((n = n.nextSibling))
+				np.appendChild(n);
+
+			tinyMCE.insertAfter(np, p);
+			tinyMCE.insertAfter(t, p);
+		}
+	}
+};
+
+TinyMCE_Engine.prototype._cleanupHTML = function(inst, doc, config, elm, visual, on_save, on_submit) {
+	var h, d, t1, t2, t3, t4, t5, c, s;
+
+	if (!tinyMCE.getParam('cleanup'))
+		return elm.innerHTML;
+
+	on_save = typeof(on_save) == 'undefined' ? false : on_save;
+
+	c = inst.cleanup;
+	s = inst.settings;
+	d = c.settings.debug;
+
+	if (d)
+		t1 = new Date().getTime();
+
+	if (tinyMCE.getParam("convert_fonts_to_spans"))
+		tinyMCE.convertFontsToSpans(doc);
+
+	if (tinyMCE.getParam("fix_list_elements"))
+		tinyMCE._fixListElements(doc);
+
+	if (tinyMCE.getParam("fix_table_elements"))
+		tinyMCE._fixTables(doc);
+
+	// Call custom cleanup code
+	tinyMCE._customCleanup(inst, on_save ? "get_from_editor_dom" : "insert_to_editor_dom", doc.body);
+
+	if (d)
+		t2 = new Date().getTime();
+
+	c.settings.on_save = on_save;
+	//for (var i=0; i<100; i++)
+
+	c.idCount = 0;
+	c.serializationId++;
+	c.serializedNodes = new Array();
+	c.sourceIndex = -1;
+
+	if (s.cleanup_serializer == "xml")
+		h = c.serializeNodeAsXML(elm);
+	else
+		h = c.serializeNodeAsHTML(elm);
+
+	if (d)
+		t3 = new Date().getTime();
+
+	// Post processing
+	h = h.replace(/<\/?(body|head|html)[^>]*>/gi, '');
+	h = h.replace(new RegExp(' (rowspan="1"|colspan="1")', 'g'), '');
+	h = h.replace(/<p><hr \/><\/p>/g, '<hr />');
+	h = h.replace(/<p>(&nbsp;|&#160;)<\/p><hr \/><p>(&nbsp;|&#160;)<\/p>/g, '<hr />');
+	h = h.replace(/<td>\s*<br \/>\s*<\/td>/g, '<td>&nbsp;</td>');
+	h = h.replace(/<p>\s*<br \/>\s*<\/p>/g, '<p>&nbsp;</p>');
+	h = h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*(&nbsp;|&#160;)\s*<\/p>/g, '<p>&nbsp;</p>');
+	h = h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*<\/p>/g, '<p>&nbsp;</p>');
+	h = h.replace(/<p>\s*<br \/>\s*&nbsp;\s*<\/p>/g, '<p>&nbsp;</p>');
+	h = h.replace(new RegExp('<a>(.*?)<\\/a>', 'g'), '$1');
+	h = h.replace(/<p([^>]*)>\s*<\/p>/g, '<p$1>&nbsp;</p>');
+
+	// Clean body
+	if (/^\s*(<br \/>|<p>&nbsp;<\/p>|<p>&#160;<\/p>|<p><\/p>)\s*$/.test(h))
+		h = '';
+
+	// If preformatted
+	if (s.preformatted) {
+		h = h.replace(/^<pre>/, '');
+		h = h.replace(/<\/pre>$/, '');
+		h = '<pre>' + h + '</pre>';
+	}
+
+	// Gecko specific processing
+	if (tinyMCE.isGecko) {
+		h = h.replace(/<o:p _moz-userdefined="" \/>/g, '');
+		h = h.replace(/<td([^>]*)>\s*<br \/>\s*<\/td>/g, '<td$1>&nbsp;</td>');
+	}
+
+	if (s.force_br_newlines)
+		h = h.replace(/<p>(&nbsp;|&#160;)<\/p>/g, '<br />');
+
+	// Call custom cleanup code
+	h = tinyMCE._customCleanup(inst, on_save ? "get_from_editor" : "insert_to_editor", h);
+
+	// Remove internal classes
+	if (on_save) {
+		h = h.replace(new RegExp(' ?(mceItem[a-zA-Z0-9]*|' + s.visual_table_class + ')', 'g'), '');
+		h = h.replace(new RegExp(' ?class=""', 'g'), '');
+	}
+
+	if (s.remove_linebreaks && !c.settings.indent)
+		h = h.replace(/\n|\r/g, ' ');
+
+	if (d)
+		t4 = new Date().getTime();
+
+	if (on_save && c.settings.indent)
+		h = c.formatHTML(h);
+
+	// If encoding (not recommended option)
+	if (on_submit && (s.encoding == "xml" || s.encoding == "html"))
+		h = c.xmlEncode(h);
+
+	if (d)
+		t5 = new Date().getTime();
+
+	if (c.settings.debug)
+		tinyMCE.debug("Cleanup in ms: Pre=" + (t2-t1) + ", Serialize: " + (t3-t2) + ", Post: " + (t4-t3) + ", Format: " + (t5-t4) + ", Sum: " + (t5-t1) + ".");
+
+	return h;
+};
+
+function TinyMCE_Cleanup() {
+	this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	this.rules = tinyMCE.clearArray(new Array());
+
+	// Default config
+	this.settings = {
+		indent_elements : 'head,table,tbody,thead,tfoot,form,tr,ul,ol,blockquote,object',
+		newline_before_elements : 'h1,h2,h3,h4,h5,h6,pre,address,div,ul,ol,li,meta,option,area,title,link,base,script,td',
+		newline_after_elements : 'br,hr,p,pre,address,div,ul,ol,meta,option,area,link,base,script',
+		newline_before_after_elements : 'html,head,body,table,thead,tbody,tfoot,tr,form,ul,ol,blockquote,p,object,param,hr,div',
+		indent_char : '\t',
+		indent_levels : 1,
+		entity_encoding : 'raw',
+		valid_elements : '*[*]',
+		entities : '',
+		url_converter : '',
+		invalid_elements : '',
+		verify_html : false
+	};
+
+	this.vElements = tinyMCE.clearArray(new Array());
+	this.vElementsRe = '';
+	this.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON|AREA)$/;
+	this.codeElementsRe = /^(SCRIPT|STYLE)$/;
+	this.serializationId = 0;
+	this.mceAttribs = {
+		href : 'mce_href',
+		src : 'mce_src',
+		type : 'mce_type'
+	};
+}
+
+TinyMCE_Cleanup.prototype = {
+	init : function(s) {
+		var n, a, i, ir, or, st;
+
+		for (n in s)
+			this.settings[n] = s[n];
+
+		// Setup code formating
+		s = this.settings;
+
+		// Setup regexps
+		this.inRe = this._arrayToRe(s.indent_elements.split(','), '', '^<(', ')[^>]*');
+		this.ouRe = this._arrayToRe(s.indent_elements.split(','), '', '^<\\/(', ')[^>]*');
+		this.nlBeforeRe = this._arrayToRe(s.newline_before_elements.split(','), 'gi', '<(',  ')([^>]*)>');
+		this.nlAfterRe = this._arrayToRe(s.newline_after_elements.split(','), 'gi', '<(',  ')([^>]*)>');
+		this.nlBeforeAfterRe = this._arrayToRe(s.newline_before_after_elements.split(','), 'gi', '<(\\/?)(', ')([^>]*)>');
+
+		if (s.invalid_elements != '')
+			this.iveRe = this._arrayToRe(s.invalid_elements.toUpperCase().split(','), 'g', '^(', ')$');
+		else
+			this.iveRe = null;
+
+		// Setup separator
+		st = '';
+		for (i=0; i<s.indent_levels; i++)
+			st += s.indent_char;
+
+		this.inStr = st;
+
+		// If verify_html if false force *[*]
+		if (!s.verify_html) {
+			s.valid_elements = '*[*]';
+			s.extended_valid_elements = '';
+		}
+
+		this.fillStr = s.entity_encoding == "named" ? "&nbsp;" : "&#160;";
+		this.idCount = 0;
+	},
+
+	addRuleStr : function(s) {
+		var r = this.parseRuleStr(s);
+		var n;
+
+		for (n in r) {
+			if (r[n])
+				this.rules[n] = r[n];
+		}
+
+		this.vElements = tinyMCE.clearArray(new Array());
+
+		for (n in this.rules) {
+			if (this.rules[n])
+				this.vElements[this.vElements.length] = this.rules[n].tag;
+		}
+
+		this.vElementsRe = this._arrayToRe(this.vElements, '');
+	},
+
+	parseRuleStr : function(s) {
+		var ta, p, r, a, i, x, px, t, tn, y, av, or = tinyMCE.clearArray(new Array()), dv;
+
+		if (s == null || s.length == 0)
+			return or;
+
+		ta = s.split(',');
+		for (x=0; x<ta.length; x++) {
+			s = ta[x];
+			if (s.length == 0)
+				continue;
+
+			// Split tag/attrs
+			p = this.split(/\[|\]/, s);
+			if (p == null || p.length < 1)
+				t = s.toUpperCase();
+			else
+				t = p[0].toUpperCase();
+
+			// Handle all tag names
+			tn = this.split('/', t);
+			for (y=0; y<tn.length; y++) {
+				r = {};
+
+				r.tag = tn[y];
+				r.forceAttribs = null;
+				r.defaultAttribs = null;
+				r.validAttribValues = null;
+
+				// Handle prefixes
+				px = r.tag.charAt(0);
+				r.forceOpen = px == '+';
+				r.removeEmpty = px == '-';
+				r.fill = px == '#';
+				r.tag = r.tag.replace(/\+|-|#/g, '');
+				r.oTagName = tn[0].replace(/\+|-|#/g, '').toLowerCase();
+				r.isWild = new RegExp('\\*|\\?|\\+', 'g').test(r.tag);
+				r.validRe = new RegExp(this._wildcardToRe('^' + r.tag + '$'));
+
+				// Setup valid attributes
+				if (p.length > 1) {
+					r.vAttribsRe = '^(';
+					a = this.split(/\|/, p[1]);
+
+					for (i=0; i<a.length; i++) {
+						t = a[i];
+
+						av = new RegExp('(=|:|<)(.*?)$').exec(t);
+						t = t.replace(new RegExp('(=|:|<).*?$'), '');
+						if (av && av.length > 0) {
+							if (av[0].charAt(0) == ':') {
+								if (!r.forceAttribs)
+									r.forceAttribs = tinyMCE.clearArray(new Array());
+
+								r.forceAttribs[t.toLowerCase()] = av[0].substring(1);
+							} else if (av[0].charAt(0) == '=') {
+								if (!r.defaultAttribs)
+									r.defaultAttribs = tinyMCE.clearArray(new Array());
+
+								dv = av[0].substring(1);
+
+								r.defaultAttribs[t.toLowerCase()] = dv == "" ? "mce_empty" : dv;
+							} else if (av[0].charAt(0) == '<') {
+								if (!r.validAttribValues)
+									r.validAttribValues = tinyMCE.clearArray(new Array());
+
+								r.validAttribValues[t.toLowerCase()] = this._arrayToRe(this.split('?', av[0].substring(1)), '');
+							}
+						}
+
+						r.vAttribsRe += '' + t.toLowerCase() + (i != a.length - 1 ? '|' : '');
+
+						a[i] = t.toLowerCase();
+					}
+
+					r.vAttribsRe += ')$';
+					r.vAttribsRe = this._wildcardToRe(r.vAttribsRe);
+					r.vAttribsReIsWild = new RegExp('\\*|\\?|\\+', 'g').test(r.vAttribsRe);
+					r.vAttribsRe = new RegExp(r.vAttribsRe);
+					r.vAttribs = a.reverse();
+
+					//tinyMCE.debug(r.tag, r.oTagName, r.vAttribsRe, r.vAttribsReWC);
+				} else {
+					r.vAttribsRe = '';
+					r.vAttribs = tinyMCE.clearArray(new Array());
+					r.vAttribsReIsWild = false;
+				}
+
+				or[r.tag] = r;
+			}
+		}
+
+		return or;
+	},
+
+	serializeNodeAsXML : function(n) {
+		var s, b;
+
+		if (!this.xmlDoc) {
+			if (this.isMSIE) {
+				try {this.xmlDoc = new ActiveXObject('MSXML2.DOMDocument');} catch (e) {}
+
+				if (!this.xmlDoc)
+					try {this.xmlDoc = new ActiveXObject('Microsoft.XmlDom');} catch (e) {}
+			} else
+				this.xmlDoc = document.implementation.createDocument('', '', null);
+
+			if (!this.xmlDoc)
+				alert("Error XML Parser could not be found.");
+		}
+
+		if (this.xmlDoc.firstChild)
+			this.xmlDoc.removeChild(this.xmlDoc.firstChild);
+
+		b = this.xmlDoc.createElement("html");
+		b = this.xmlDoc.appendChild(b);
+
+		this._convertToXML(n, b);
+
+		if (this.isMSIE)
+			return this.xmlDoc.xml;
+		else
+			return new XMLSerializer().serializeToString(this.xmlDoc);
+	},
+
+	_convertToXML : function(n, xn) {
+		var xd, el, i, l, cn, at, no, hc = false;
+
+		if (this._isDuplicate(n))
+			return;
+
+		xd = this.xmlDoc;
+
+		switch (n.nodeType) {
+			case 1: // Element
+				hc = n.hasChildNodes();
+
+				el = xd.createElement(n.nodeName.toLowerCase());
+
+				at = n.attributes;
+				for (i=at.length-1; i>-1; i--) {
+					no = at[i];
+
+					if (no.specified && no.nodeValue)
+						el.setAttribute(no.nodeName.toLowerCase(), no.nodeValue);
+				}
+
+				if (!hc && !this.closeElementsRe.test(n.nodeName))
+					el.appendChild(xd.createTextNode(""));
+
+				xn = xn.appendChild(el);
+				break;
+
+			case 3: // Text
+				xn.appendChild(xd.createTextNode(n.nodeValue));
+				return;
+
+			case 8: // Comment
+				xn.appendChild(xd.createComment(n.nodeValue));
+				return;
+		}
+
+		if (hc) {
+			cn = n.childNodes;
+
+			for (i=0, l=cn.length; i<l; i++)
+				this._convertToXML(cn[i], xn);
+		}
+	},
+
+	serializeNodeAsHTML : function(n) {
+		var en, no, h = '', i, l, r, cn, va = false, f = false, at, hc;
+
+		this._setupRules(); // Will initialize cleanup rules
+
+		if (this._isDuplicate(n))
+			return '';
+
+		switch (n.nodeType) {
+			case 1: // Element
+				hc = n.hasChildNodes();
+
+				// MSIE sometimes produces <//tag>
+				if ((tinyMCE.isMSIE && !tinyMCE.isOpera) && n.nodeName.indexOf('/') != -1)
+					break;
+
+				if (this.vElementsRe.test(n.nodeName) && (!this.iveRe || !this.iveRe.test(n.nodeName))) {
+					va = true;
+
+					r = this.rules[n.nodeName];
+					if (!r) {
+						at = this.rules;
+						for (no in at) {
+							if (at[no] && at[no].validRe.test(n.nodeName)) {
+								r = at[no];
+								break;
+							}
+						}
+					}
+
+					en = r.isWild ? n.nodeName.toLowerCase() : r.oTagName;
+					f = r.fill;
+
+					if (r.removeEmpty && !hc)
+						return "";
+
+					h += '<' + en;
+
+					if (r.vAttribsReIsWild) {
+						// Serialize wildcard attributes
+						at = n.attributes;
+						for (i=at.length-1; i>-1; i--) {
+							no = at[i];
+							if (no.specified && r.vAttribsRe.test(no.nodeName))
+								h += this._serializeAttribute(n, r, no.nodeName);
+						}
+					} else {
+						// Serialize specific attributes
+						for (i=r.vAttribs.length-1; i>-1; i--)
+							h += this._serializeAttribute(n, r, r.vAttribs[i]);
+					}
+
+					// Serialize mce_ atts
+					if (!this.settings.on_save) {
+						at = this.mceAttribs;
+
+						for (no in at) {
+							if (at[no])
+								h += this._serializeAttribute(n, r, at[no]);
+						}
+					}
+
+					// Close these
+					if (this.closeElementsRe.test(n.nodeName))
+						return h + ' />';
+
+					h += '>';
+
+					if (this.isMSIE && this.codeElementsRe.test(n.nodeName))
+						h += n.innerHTML;
+				}
+			break;
+
+			case 3: // Text
+				if (n.parentNode && this.codeElementsRe.test(n.parentNode.nodeName))
+					return this.isMSIE ? '' : n.nodeValue;
+
+				return this.xmlEncode(n.nodeValue);
+
+			case 8: // Comment
+				return "<!--" + this._trimComment(n.nodeValue) + "-->";
+		}
+
+		if (hc) {
+			cn = n.childNodes;
+
+			for (i=0, l=cn.length; i<l; i++)
+				h += this.serializeNodeAsHTML(cn[i]);
+		}
+
+		// Fill empty nodes
+		if (f && !hc)
+			h += this.fillStr;
+
+		// End element
+		if (va)
+			h += '</' + en + '>';
+
+		return h;
+	},
+
+	_serializeAttribute : function(n, r, an) {
+		var av = '', t, os = this.settings.on_save;
+
+		if (os && (an.indexOf('mce_') == 0 || an.indexOf('_moz') == 0))
+			return '';
+
+		if (os && this.mceAttribs[an])
+			av = this._getAttrib(n, this.mceAttribs[an]);
+
+		if (av.length == 0)
+			av = this._getAttrib(n, an);
+
+		if (av.length == 0 && r.defaultAttribs && (t = r.defaultAttribs[an])) {
+			av = t;
+
+			if (av == "mce_empty")
+				return " " + an + '=""';
+		}
+
+		if (r.forceAttribs && (t = r.forceAttribs[an]))
+			av = t;
+
+		if (os && av.length != 0 && this.settings.url_converter.length != 0 && /^(src|href|longdesc)$/.test(an))
+			av = eval(this.settings.url_converter + '(this, n, av)');
+
+		if (av.length != 0 && r.validAttribValues && r.validAttribValues[an] && !r.validAttribValues[an].test(av))
+			return "";
+
+		if (av.length != 0 && av == "{$uid}")
+			av = "uid_" + (this.idCount++);
+
+		if (av.length != 0)
+			return " " + an + "=" + '"' + this.xmlEncode(av) + '"';
+
+		return "";
+	},
+
+	formatHTML : function(h) {
+		var s = this.settings, p = '', i = 0, li = 0, o = '', l;
+
+		h = h.replace(/\r/g, ''); // Windows sux, isn't carriage return a thing of the past :)
+		h = '\n' + h;
+		h = h.replace(new RegExp('\\n\\s+', 'gi'), '\n'); // Remove previous formatting
+		h = h.replace(this.nlBeforeRe, '\n<$1$2>');
+		h = h.replace(this.nlAfterRe, '<$1$2>\n');
+		h = h.replace(this.nlBeforeAfterRe, '\n<$1$2$3>\n');
+		h += '\n';
+
+		//tinyMCE.debug(h);
+
+		while ((i = h.indexOf('\n', i + 1)) != -1) {
+			if ((l = h.substring(li + 1, i)).length != 0) {
+				if (this.ouRe.test(l) && p.length >= s.indent_levels)
+					p = p.substring(s.indent_levels);
+
+				o += p + l + '\n';
+	
+				if (this.inRe.test(l))
+					p += this.inStr;
+			}
+
+			li = i;
+		}
+
+		//tinyMCE.debug(h);
+
+		return o;
+	},
+
+	xmlEncode : function(s) {
+		var i, l, e, o = '', c;
+
+		this._setupEntities(); // Will intialize lookup table
+
+		switch (this.settings.entity_encoding) {
+			case "raw":
+				return tinyMCE.xmlEncode(s);
+
+			case "named":
+				for (i=0, l=s.length; i<l; i++) {
+					c = s.charCodeAt(i);
+					e = this.entities[c];
+
+					if (e && e != '')
+						o += '&' + e + ';';
+					else
+						o += String.fromCharCode(c);
+				}
+
+				return o;
+
+			case "numeric":
+				for (i=0, l=s.length; i<l; i++) {
+					c = s.charCodeAt(i);
+
+					if (c > 127 || c == 60 || c == 62 || c == 38 || c == 39 || c == 34)
+						o += '&#' + c + ";";
+					else
+						o += String.fromCharCode(c);
+				}
+
+				return o;
+		}
+
+		return s;
+	},
+
+	split : function(re, s) {
+		var c = s.split(re);
+		var i, l, o = new Array();
+
+		for (i=0, l=c.length; i<l; i++) {
+			if (c[i] != '')
+				o[i] = c[i];
+		}
+
+		return o;
+	},
+
+	_trimComment : function(s) {
+		// Remove mce_src, mce_href
+		s = s.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+		s = s.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+
+		return s;
+	},
+
+	_getAttrib : function(e, n, d) {
+		if (typeof(d) == "undefined")
+			d = "";
+
+		if (!e || e.nodeType != 1)
+			return d;
+
+		var v = e.getAttribute(n, 0);
+
+		if (n == "class" && !v)
+			v = e.className;
+
+		if (this.isMSIE && n == "http-equiv")
+			v = e.httpEquiv;
+
+		if (this.isMSIE && e.nodeName == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
+			v = "";
+
+		if (this.isMSIE && e.nodeName == "INPUT" && n == "size" && v == "20")
+			v = "";
+
+		if (this.isMSIE && e.nodeName == "INPUT" && n == "maxlength" && v == "2147483647")
+			v = "";
+
+		if (n == "style" && !tinyMCE.isOpera)
+			v = e.style.cssText;
+
+		if (n == 'style')
+			v = tinyMCE.serializeStyle(tinyMCE.parseStyle(v));
+
+		if (this.settings.on_save && n.indexOf('on') != -1 && this.settings.on_save && v && v != "")
+			v = tinyMCE.cleanupEventStr(v);
+
+		return (v && v != "") ? '' + v : d;
+	},
+
+	_urlConverter : function(c, n, v) {
+		if (!c.settings.on_save)
+			return tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href, v);
+		else if (tinyMCE.getParam('convert_urls'))
+			return eval(tinyMCE.settings.urlconverter_callback + "(v, n, true);");
+
+		return v;
+	},
+
+	_arrayToRe : function(a, op, be, af) {
+		var i, r;
+
+		op = typeof(op) == "undefined" ? "gi" : op;
+		be = typeof(be) == "undefined" ? "^(" : be;
+		af = typeof(af) == "undefined" ? ")$" : af;
+
+		r = be;
+
+		for (i=0; i<a.length; i++)
+			r += this._wildcardToRe(a[i]) + (i != a.length-1 ? "|" : "");
+
+		r += af;
+
+		return new RegExp(r, op);
+	},
+
+	_wildcardToRe : function(s) {
+		s = s.replace(/\?/g, '(\\S?)');
+		s = s.replace(/\+/g, '(\\S+)');
+		s = s.replace(/\*/g, '(\\S*)');
+
+		return s;
+	},
+
+	_setupEntities : function() {
+		var n, a, i, s = this.settings;
+
+		// Setup entities
+		if (!this.entitiesDone) {
+			if (s.entity_encoding == "named") {
+				n = tinyMCE.clearArray(new Array());
+				a = this.split(',', s.entities);
+				for (i=0; i<a.length; i+=2)
+					n[a[i]] = a[i+1];
+
+				this.entities = n;
+			}
+
+			this.entitiesDone = true;
+		}
+	},
+
+	_setupRules : function() {
+		var s = this.settings;
+
+		// Setup default rule
+		if (!this.rulesDone) {
+			this.addRuleStr(s.valid_elements);
+			this.addRuleStr(s.extended_valid_elements);
+
+			this.rulesDone = true;
+		}
+	},
+
+	_isDuplicate : function(n) {
+		var i;
+
+		if (!this.settings.fix_content_duplication)
+			return false;
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera && n.nodeType == 1) {
+			// Mark elements
+			if (n.mce_serialized == this.serializationId)
+				return true;
+
+			n.setAttribute('mce_serialized', this.serializationId);
+		} else {
+			// Search lookup table for text nodes  and comments
+			for (i=0; i<this.serializedNodes.length; i++) {
+				if (this.serializedNodes[i] == n)
+					return true;
+			}
+
+			this.serializedNodes[this.serializedNodes.length] = n;
+		}
+
+		return false;
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_DOMUtils.class.js */
+
+TinyMCE_Engine.prototype.getElementByAttributeValue = function(n, e, a, v) {
+	return (n = this.getElementsByAttributeValue(n, e, a, v)).length == 0 ? null : n[0];
+};
+
+TinyMCE_Engine.prototype.getElementsByAttributeValue = function(n, e, a, v) {
+	var i, nl = n.getElementsByTagName(e), o = new Array();
+
+	for (i=0; i<nl.length; i++) {
+		if (tinyMCE.getAttrib(nl[i], a).indexOf(v) != -1)
+			o[o.length] = nl[i];
+	}
+
+	return o;
+};
+
+TinyMCE_Engine.prototype.isBlockElement = function(n) {
+	return n != null && n.nodeType == 1 && this.blockRegExp.test(n.nodeName);
+};
+
+TinyMCE_Engine.prototype.getParentBlockElement = function(n) {
+	while (n) {
+		if (this.isBlockElement(n))
+			return n;
+
+		n = n.parentNode;
+	}
+
+	return null;
+};
+
+TinyMCE_Engine.prototype.insertAfter = function(n, r){
+	if (r.nextSibling)
+		r.parentNode.insertBefore(n, r.nextSibling);
+	else
+		r.parentNode.appendChild(n);
+};
+
+TinyMCE_Engine.prototype.setInnerHTML = function(e, h) {
+	var i, nl, n;
+
+	if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+		// Since MSIE handles invalid HTML better that valid XHTML we
+		// need to make some things invalid. <hr /> gets converted to <hr>.
+		h = h.replace(/\s\/>/g, '>');
+
+		// Since MSIE auto generated emtpy P tags some times we must tell it to keep the real ones
+		h = h.replace(/<p([^>]*)>\u00A0?<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
+		h = h.replace(/<p([^>]*)>\s*&nbsp;\s*<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
+		h = h.replace(/<p([^>]*)>\s+<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
+
+		// Remove first comment
+		e.innerHTML = tinyMCE.uniqueTag + h;
+		e.firstChild.removeNode(true);
+
+		// Remove weird auto generated empty paragraphs unless it's supposed to be there
+		nl = e.getElementsByTagName("p");
+		for (i=nl.length-1; i>=0; i--) {
+			n = nl[i];
+
+			if (n.nodeName == 'P' && !n.hasChildNodes() && !n.mce_keep)
+				n.parentNode.removeChild(n);
+		}
+	} else {
+		h = this.fixGeckoBaseHREFBug(1, e, h);
+		e.innerHTML = h;
+		this.fixGeckoBaseHREFBug(2, e, h);
+	}
+};
+
+TinyMCE_Engine.prototype.getOuterHTML = function(e) {
+	if (tinyMCE.isMSIE)
+		return e.outerHTML;
+
+	var d = e.ownerDocument.createElement("body");
+	d.appendChild(e);
+	return d.innerHTML;
+};
+
+TinyMCE_Engine.prototype.setOuterHTML = function(e, h) {
+	if (tinyMCE.isMSIE) {
+		e.outerHTML = h;
+		return;
+	}
+
+	var d = e.ownerDocument.createElement("body");
+	d.innerHTML = h;
+	e.parentNode.replaceChild(d.firstChild, e);
+};
+
+TinyMCE_Engine.prototype._getElementById = function(id, d) {
+	var e, i, j, f;
+
+	if (typeof(d) == "undefined")
+		d = document;
+
+	e = d.getElementById(id);
+	if (!e) {
+		f = d.forms;
+
+		for (i=0; i<f.length; i++) {
+			for (j=0; j<f[i].elements.length; j++) {
+				if (f[i].elements[j].name == id) {
+					e = f[i].elements[j];
+					break;
+				}
+			}
+		}
+	}
+
+	return e;
+};
+
+TinyMCE_Engine.prototype.getNodeTree = function(n, na, t, nn) {
+	var i;
+
+	if (typeof(t) == "undefined" || n.nodeType == t && (typeof(nn) == "undefined" || n.nodeName == nn))
+		na[na.length] = n;
+
+	if (n.hasChildNodes()) {
+		for (i=0; i<n.childNodes.length; i++)
+			tinyMCE.getNodeTree(n.childNodes[i], na, t, nn);
+	}
+
+	return na;
+};
+
+TinyMCE_Engine.prototype.getParentElement = function(node, names, attrib_name, attrib_value) {
+	if (typeof(names) == "undefined") {
+		if (node.nodeType == 1)
+			return node;
+
+		// Find parent node that is a element
+		while ((node = node.parentNode) != null && node.nodeType != 1) ;
+
+		return node;
+	}
+
+	if (node == null)
+		return null;
+
+	var namesAr = names.toUpperCase().split(',');
+
+	do {
+		for (var i=0; i<namesAr.length; i++) {
+			if (node.nodeName == namesAr[i] || names == "*") {
+				if (typeof(attrib_name) == "undefined")
+					return node;
+				else if (node.getAttribute(attrib_name)) {
+					if (typeof(attrib_value) == "undefined") {
+						if (node.getAttribute(attrib_name) != "")
+							return node;
+					} else if (node.getAttribute(attrib_name) == attrib_value)
+						return node;
+				}
+			}
+		}
+	} while ((node = node.parentNode) != null);
+
+	return null;
+};
+
+TinyMCE_Engine.prototype.getParentNode = function(n, f) {
+	while (n) {
+		if (f(n))
+			return n;
+
+		n = n.parentNode;
+	}
+
+	return null;
+};
+
+TinyMCE_Engine.prototype.getAttrib = function(elm, name, default_value) {
+	if (typeof(default_value) == "undefined")
+		default_value = "";
+
+	// Not a element
+	if (!elm || elm.nodeType != 1)
+		return default_value;
+
+	var v = elm.getAttribute(name);
+
+	// Try className for class attrib
+	if (name == "class" && !v)
+		v = elm.className;
+
+	// Workaround for a issue with Firefox 1.5rc2+
+	if (tinyMCE.isGecko && name == "src" && elm.src != null && elm.src != "")
+		v = elm.src;
+
+	// Workaround for a issue with Firefox 1.5rc2+
+	if (tinyMCE.isGecko && name == "href" && elm.href != null && elm.href != "")
+		v = elm.href;
+
+	if (name == "http-equiv" && tinyMCE.isMSIE)
+		v = elm.httpEquiv;
+
+	if (name == "style" && !tinyMCE.isOpera)
+		v = elm.style.cssText;
+
+	return (v && v != "") ? v : default_value;
+};
+
+TinyMCE_Engine.prototype.setAttrib = function(element, name, value, fix_value) {
+	if (typeof(value) == "number" && value != null)
+		value = "" + value;
+
+	if (fix_value) {
+		if (value == null)
+			value = "";
+
+		var re = new RegExp('[^0-9%]', 'g');
+		value = value.replace(re, '');
+	}
+
+	if (name == "style")
+		element.style.cssText = value;
+
+	if (name == "class")
+		element.className = value;
+
+	if (value != null && value != "" && value != -1)
+		element.setAttribute(name, value);
+	else
+		element.removeAttribute(name);
+};
+
+TinyMCE_Engine.prototype.setStyleAttrib = function(elm, name, value) {
+	eval('elm.style.' + name + '=value;');
+
+	// Style attrib deleted
+	if (tinyMCE.isMSIE && value == null || value == '') {
+		var str = tinyMCE.serializeStyle(tinyMCE.parseStyle(elm.style.cssText));
+		elm.style.cssText = str;
+		elm.setAttribute("style", str);
+	}
+};
+
+TinyMCE_Engine.prototype.switchClass = function(ei, c) {
+	var e;
+
+	if (tinyMCE.switchClassCache[ei])
+		e = tinyMCE.switchClassCache[ei];
+	else
+		e = tinyMCE.switchClassCache[ei] = document.getElementById(ei);
+
+	if (e) {
+		// Keep tile mode
+		if (tinyMCE.settings.button_tile_map && e.className && e.className.indexOf('mceTiledButton') == 0)
+			c = 'mceTiledButton ' + c;
+
+		e.className = c;
+	}
+};
+
+TinyMCE_Engine.prototype.getAbsPosition = function(n) {
+	var p = {absLeft : 0, absTop : 0};
+
+	while (n) {
+		p.absLeft += n.offsetLeft;
+		p.absTop += n.offsetTop;
+		n = n.offsetParent;
+	}
+
+	return p;
+};
+
+TinyMCE_Engine.prototype.prevNode = function(e, n) {
+	var a = n.split(','), i;
+
+	while ((e = e.previousSibling) != null) {
+		for (i=0; i<a.length; i++) {
+			if (e.nodeName == a[i])
+				return e;
+		}
+	}
+
+	return null;
+};
+
+TinyMCE_Engine.prototype.nextNode = function(e, n) {
+	var a = n.split(','), i;
+
+	while ((e = e.nextSibling) != null) {
+		for (i=0; i<a.length; i++) {
+			if (e.nodeName == a[i])
+				return e;
+		}
+	}
+
+	return null;
+};
+
+TinyMCE_Engine.prototype.selectNodes = function(n, f, a) {
+	var i;
+
+	if (!a)
+		a = new Array();
+
+	if (f(n))
+		a[a.length] = n;
+
+	if (n.hasChildNodes()) {
+		for (i=0; i<n.childNodes.length; i++)
+			tinyMCE.selectNodes(n.childNodes[i], f, a);
+	}
+
+	return a;
+};
+
+TinyMCE_Engine.prototype.addCSSClass = function(e, c, b) {
+	var o = this.removeCSSClass(e, c);
+
+	return e.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+};
+
+TinyMCE_Engine.prototype.removeCSSClass = function(e, c) {
+	var a = this.explode(' ', e.className), i;
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == c)
+			a[i] = '';
+	}
+
+	return e.className = a.join(' ');
+};
+
+TinyMCE_Engine.prototype.renameElement = function(e, n, d) {
+	var ne, i, ar;
+
+	d = typeof(d) == "undefined" ? tinyMCE.selectedInstance.getDoc() : d;
+
+	if (e) {
+		ne = d.createElement(n);
+
+		ar = e.attributes;
+		for (i=ar.length-1; i>-1; i--) {
+			if (ar[i].specified && ar[i].nodeValue)
+				ne.setAttribute(ar[i].nodeName.toLowerCase(), ar[i].nodeValue);
+		}
+
+		ar = e.childNodes;
+		for (i=0; i<ar.length; i++)
+			ne.appendChild(ar[i].cloneNode(true));
+
+		e.parentNode.replaceChild(ne, e);
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_URL.class.js */
+
+TinyMCE_Engine.prototype.parseURL = function(url_str) {
+	var urlParts = new Array();
+
+	if (url_str) {
+		var pos, lastPos;
+
+		// Parse protocol part
+		pos = url_str.indexOf('://');
+		if (pos != -1) {
+			urlParts['protocol'] = url_str.substring(0, pos);
+			lastPos = pos + 3;
+		}
+
+		// Find port or path start
+		for (var i=lastPos; i<url_str.length; i++) {
+			var chr = url_str.charAt(i);
+
+			if (chr == ':')
+				break;
+
+			if (chr == '/')
+				break;
+		}
+		pos = i;
+
+		// Get host
+		urlParts['host'] = url_str.substring(lastPos, pos);
+
+		// Get port
+		urlParts['port'] = "";
+		lastPos = pos;
+		if (url_str.charAt(pos) == ':') {
+			pos = url_str.indexOf('/', lastPos);
+			urlParts['port'] = url_str.substring(lastPos+1, pos);
+		}
+
+		// Get path
+		lastPos = pos;
+		pos = url_str.indexOf('?', lastPos);
+
+		if (pos == -1)
+			pos = url_str.indexOf('#', lastPos);
+
+		if (pos == -1)
+			pos = url_str.length;
+
+		urlParts['path'] = url_str.substring(lastPos, pos);
+
+		// Get query
+		lastPos = pos;
+		if (url_str.charAt(pos) == '?') {
+			pos = url_str.indexOf('#');
+			pos = (pos == -1) ? url_str.length : pos;
+			urlParts['query'] = url_str.substring(lastPos+1, pos);
+		}
+
+		// Get anchor
+		lastPos = pos;
+		if (url_str.charAt(pos) == '#') {
+			pos = url_str.length;
+			urlParts['anchor'] = url_str.substring(lastPos+1, pos);
+		}
+	}
+
+	return urlParts;
+};
+
+TinyMCE_Engine.prototype.serializeURL = function(up) {
+	var o = "";
+
+	if (up['protocol'])
+		o += up['protocol'] + "://";
+
+	if (up['host'])
+		o += up['host'];
+
+	if (up['port'])
+		o += ":" + up['port'];
+
+	if (up['path'])
+		o += up['path'];
+
+	if (up['query'])
+		o += "?" + up['query'];
+
+	if (up['anchor'])
+		o += "#" + up['anchor'];
+
+	return o;
+};
+
+TinyMCE_Engine.prototype.convertAbsoluteURLToRelativeURL = function(base_url, url_to_relative) {
+	var baseURL = this.parseURL(base_url);
+	var targetURL = this.parseURL(url_to_relative);
+	var strTok1;
+	var strTok2;
+	var breakPoint = 0;
+	var outPath = "";
+	var forceSlash = false;
+
+	if (targetURL.path == "")
+		targetURL.path = "/";
+	else
+		forceSlash = true;
+
+	// Crop away last path part
+	base_url = baseURL.path.substring(0, baseURL.path.lastIndexOf('/'));
+	strTok1 = base_url.split('/');
+	strTok2 = targetURL.path.split('/');
+
+	if (strTok1.length >= strTok2.length) {
+		for (var i=0; i<strTok1.length; i++) {
+			if (i >= strTok2.length || strTok1[i] != strTok2[i]) {
+				breakPoint = i + 1;
+				break;
+			}
+		}
+	}
+
+	if (strTok1.length < strTok2.length) {
+		for (var i=0; i<strTok2.length; i++) {
+			if (i >= strTok1.length || strTok1[i] != strTok2[i]) {
+				breakPoint = i + 1;
+				break;
+			}
+		}
+	}
+
+	if (breakPoint == 1)
+		return targetURL.path;
+
+	for (var i=0; i<(strTok1.length-(breakPoint-1)); i++)
+		outPath += "../";
+
+	for (var i=breakPoint-1; i<strTok2.length; i++) {
+		if (i != (breakPoint-1))
+			outPath += "/" + strTok2[i];
+		else
+			outPath += strTok2[i];
+	}
+
+	targetURL.protocol = null;
+	targetURL.host = null;
+	targetURL.port = null;
+	targetURL.path = outPath == "" && forceSlash ? "/" : outPath;
+
+	// Remove document prefix from local anchors
+	var fileName = baseURL.path;
+	var pos;
+
+	if ((pos = fileName.lastIndexOf('/')) != -1)
+		fileName = fileName.substring(pos + 1);
+
+	// Is local anchor
+	if (fileName == targetURL.path && targetURL.anchor != "")
+		targetURL.path = "";
+
+	// If empty and not local anchor force filename or slash
+	if (targetURL.path == "" && !targetURL.anchor)
+		targetURL.path = fileName != "" ? fileName : "/";
+
+	return this.serializeURL(targetURL);
+};
+
+TinyMCE_Engine.prototype.convertRelativeToAbsoluteURL = function(base_url, relative_url) {
+	var baseURL = this.parseURL(base_url);
+	var relURL = this.parseURL(relative_url);
+
+	if (relative_url == "" || relative_url.charAt(0) == '/' || relative_url.indexOf('://') != -1 || relative_url.indexOf('mailto:') != -1 || relative_url.indexOf('javascript:') != -1)
+		return relative_url;
+
+	// Split parts
+	baseURLParts = baseURL['path'].split('/');
+	relURLParts = relURL['path'].split('/');
+
+	// Remove empty chunks
+	var newBaseURLParts = new Array();
+	for (var i=baseURLParts.length-1; i>=0; i--) {
+		if (baseURLParts[i].length == 0)
+			continue;
+
+		newBaseURLParts[newBaseURLParts.length] = baseURLParts[i];
+	}
+	baseURLParts = newBaseURLParts.reverse();
+
+	// Merge relURLParts chunks
+	var newRelURLParts = new Array();
+	var numBack = 0;
+	for (var i=relURLParts.length-1; i>=0; i--) {
+		if (relURLParts[i].length == 0 || relURLParts[i] == ".")
+			continue;
+
+		if (relURLParts[i] == '..') {
+			numBack++;
+			continue;
+		}
+
+		if (numBack > 0) {
+			numBack--;
+			continue;
+		}
+
+		newRelURLParts[newRelURLParts.length] = relURLParts[i];
+	}
+
+	relURLParts = newRelURLParts.reverse();
+
+	// Remove end from absolute path
+	var len = baseURLParts.length-numBack;
+	var absPath = (len <= 0 ? "" : "/") + baseURLParts.slice(0, len).join('/') + "/" + relURLParts.join('/');
+	var start = "", end = "";
+
+	// Build output URL
+	relURL.protocol = baseURL.protocol;
+	relURL.host = baseURL.host;
+	relURL.port = baseURL.port;
+
+	// Re-add trailing slash if it's removed
+	if (relURL.path.charAt(relURL.path.length-1) == "/")
+		absPath += "/";
+
+	relURL.path = absPath;
+
+	return this.serializeURL(relURL);
+};
+
+TinyMCE_Engine.prototype.convertURL = function(url, node, on_save) {
+	var prot = document.location.protocol;
+	var host = document.location.hostname;
+	var port = document.location.port;
+
+	// Pass through file protocol
+	if (prot == "file:")
+		return url;
+
+	// Something is wrong, remove weirdness
+	url = tinyMCE.regexpReplace(url, '(http|https):///', '/');
+
+	// Mailto link or anchor (Pass through)
+	if (url.indexOf('mailto:') != -1 || url.indexOf('javascript:') != -1 || tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0) == "#")
+		return url;
+
+	// Fix relative/Mozilla
+	if (!tinyMCE.isMSIE && !on_save && url.indexOf("://") == -1 && url.charAt(0) != '/')
+		return tinyMCE.settings['base_href'] + url;
+
+	// Handle relative URLs
+	if (on_save && tinyMCE.getParam('relative_urls')) {
+		var curl = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], url);
+		if (curl.charAt(0) == '/')
+			curl = tinyMCE.settings['document_base_prefix'] + curl;
+
+		var urlParts = tinyMCE.parseURL(curl);
+		var tmpUrlParts = tinyMCE.parseURL(tinyMCE.settings['document_base_url']);
+
+		// Force relative
+		if (urlParts['host'] == tmpUrlParts['host'] && (urlParts['port'] == tmpUrlParts['port']))
+			return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'], curl);
+	}
+
+	// Handle absolute URLs
+	if (!tinyMCE.getParam('relative_urls')) {
+		var urlParts = tinyMCE.parseURL(url);
+		var baseUrlParts = tinyMCE.parseURL(tinyMCE.settings['base_href']);
+
+		// Force absolute URLs from relative URLs
+		url = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], url);
+
+		// If anchor and path is the same page
+		if (urlParts['anchor'] && urlParts['path'] == baseUrlParts['path'])
+			return "#" + urlParts['anchor'];
+	}
+
+	// Remove current domain
+	if (tinyMCE.getParam('remove_script_host')) {
+		var start = "", portPart = "";
+
+		if (port != "")
+			portPart = ":" + port;
+
+		start = prot + "//" + host + portPart + "/";
+
+		if (url.indexOf(start) == 0)
+			url = url.substring(start.length-1);
+	}
+
+	return url;
+};
+
+TinyMCE_Engine.prototype.convertAllRelativeURLs = function(body) {
+	// Convert all image URL:s to absolute URL
+	var elms = body.getElementsByTagName("img");
+	for (var i=0; i<elms.length; i++) {
+		var src = tinyMCE.getAttrib(elms[i], 'src');
+
+		var msrc = tinyMCE.getAttrib(elms[i], 'mce_src');
+		if (msrc != "")
+			src = msrc;
+
+		if (src != "") {
+			src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
+			elms[i].setAttribute("src", src);
+		}
+	}
+
+	// Convert all link URL:s to absolute URL
+	var elms = body.getElementsByTagName("a");
+	for (var i=0; i<elms.length; i++) {
+		var href = tinyMCE.getAttrib(elms[i], 'href');
+
+		var mhref = tinyMCE.getAttrib(elms[i], 'mce_href');
+		if (mhref != "")
+			href = mhref;
+
+		if (href && href != "") {
+			href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], href);
+			elms[i].setAttribute("href", href);
+		}
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Array.class.js */
+
+TinyMCE_Engine.prototype.clearArray = function(a) {
+	for (var k in a)
+		a[k] = null;
+
+	return a;
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Event.class.js */
+
+TinyMCE_Engine.prototype._setEventsEnabled = function(node, state) {
+	var events = new Array('onfocus','onblur','onclick','ondblclick',
+				'onmousedown','onmouseup','onmouseover','onmousemove',
+				'onmouseout','onkeypress','onkeydown','onkeydown','onkeyup');
+
+	var evs = tinyMCE.settings['event_elements'].split(',');
+	for (var y=0; y<evs.length; y++){
+		var elms = node.getElementsByTagName(evs[y]);
+		for (var i=0; i<elms.length; i++) {
+			var event = "";
+
+			for (var x=0; x<events.length; x++) {
+				if ((event = tinyMCE.getAttrib(elms[i], events[x])) != '') {
+					event = tinyMCE.cleanupEventStr("" + event);
+
+					if (!state)
+						event = "return true;" + event;
+					else
+						event = event.replace(/^return true;/gi, '');
+
+					elms[i].removeAttribute(events[x]);
+					elms[i].setAttribute(events[x], event);
+				}
+			}
+		}
+	}
+};
+
+TinyMCE_Engine.prototype._eventPatch = function(editor_id) {
+	var n, inst, win, e;
+
+	// Remove odd, error
+	if (typeof(tinyMCE) == "undefined")
+		return true;
+
+	try {
+		// Try selected instance first
+		if (tinyMCE.selectedInstance) {
+			win = tinyMCE.selectedInstance.getWin();
+
+			if (win && win.event) {
+				e = win.event;
+
+				if (!e.target)
+					e.target = e.srcElement;
+
+				TinyMCE_Engine.prototype.handleEvent(e);
+				return;
+			}
+		}
+
+		// Search for it
+		for (n in tinyMCE.instances) {
+			inst = tinyMCE.instances[n];
+
+			if (!tinyMCE.isInstance(inst))
+				continue;
+
+			tinyMCE.selectedInstance = inst;
+			win = inst.getWin();
+
+			if (win && win.event) {
+				e = win.event;
+
+				if (!e.target)
+					e.target = e.srcElement;
+
+				TinyMCE_Engine.prototype.handleEvent(e);
+				return;
+			}
+		}
+	} catch (ex) {
+		// Ignore error if iframe is pointing to external URL
+	}
+};
+
+TinyMCE_Engine.prototype.unloadHandler = function() {
+	tinyMCE.triggerSave(true, true);
+};
+
+TinyMCE_Engine.prototype.addEventHandlers = function(inst) {
+	var doc = inst.getDoc();
+
+	inst.switchSettings();
+
+	if (tinyMCE.isMSIE) {
+		tinyMCE.addEvent(doc, "keypress", TinyMCE_Engine.prototype._eventPatch);
+		tinyMCE.addEvent(doc, "keyup", TinyMCE_Engine.prototype._eventPatch);
+		tinyMCE.addEvent(doc, "keydown", TinyMCE_Engine.prototype._eventPatch);
+		tinyMCE.addEvent(doc, "mouseup", TinyMCE_Engine.prototype._eventPatch);
+		tinyMCE.addEvent(doc, "mousedown", TinyMCE_Engine.prototype._eventPatch);
+		tinyMCE.addEvent(doc, "click", TinyMCE_Engine.prototype._eventPatch);
+	} else {
+		tinyMCE.addEvent(doc, "keypress", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "keydown", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "keyup", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "click", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "mouseup", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "mousedown", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "focus", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "blur", tinyMCE.handleEvent);
+
+		eval('try { doc.designMode = "On"; } catch(e) {}'); // Force designmode
+	}
+};
+
+TinyMCE_Engine.prototype.onMouseMove = function() {
+	var inst;
+
+	if (!tinyMCE.hasMouseMoved) {
+		inst = tinyMCE.selectedInstance;
+
+		// Workaround for bug #1437457 (Odd MSIE bug)
+		if (inst.isFocused) {
+			inst.undoBookmark = inst.selection.getBookmark();
+			tinyMCE.hasMouseMoved = true;
+		}
+	}
+
+//	tinyMCE.cancelEvent(inst.getWin().event);
+//	return false;
+};
+
+TinyMCE_Engine.prototype.cancelEvent = function(e) {
+	if (tinyMCE.isMSIE) {
+		e.returnValue = false;
+		e.cancelBubble = true;
+	} else
+		e.preventDefault();
+};
+
+TinyMCE_Engine.prototype.addEvent = function(o, n, h) {
+	if (o.attachEvent)
+		o.attachEvent("on" + n, h);
+	else
+		o.addEventListener(n, h, false);
+};
+
+TinyMCE_Engine.prototype.addSelectAccessibility = function(e, s, w) {
+	// Add event handlers 
+	if (!s._isAccessible) {
+		s.onkeydown = tinyMCE.accessibleEventHandler;
+		s.onblur = tinyMCE.accessibleEventHandler;
+		s._isAccessible = true;
+		s._win = w;
+	}
+
+	return false;
+};
+
+TinyMCE_Engine.prototype.accessibleEventHandler = function(e) {
+	var win = this._win;
+	e = tinyMCE.isMSIE ? win.event : e;
+	var elm = tinyMCE.isMSIE ? e.srcElement : e.target;
+
+	// Unpiggyback onchange on blur
+	if (e.type == "blur") {
+		if (elm.oldonchange) {
+			elm.onchange = elm.oldonchange;
+			elm.oldonchange = null;
+		}
+
+		return true;
+	}
+
+	// Piggyback onchange
+	if (elm.nodeName == "SELECT" && !elm.oldonchange) {
+		elm.oldonchange = elm.onchange;
+		elm.onchange = null;
+	}
+
+	// Execute onchange and remove piggyback
+	if (e.keyCode == 13 || e.keyCode == 32) {
+		elm.onchange = elm.oldonchange;
+		elm.onchange();
+		elm.oldonchange = null;
+
+		tinyMCE.cancelEvent(e);
+		return false;
+	}
+
+	return true;
+};
+
+TinyMCE_Engine.prototype._resetIframeHeight = function() {
+	var ife;
+
+	if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+		ife = tinyMCE.selectedInstance.iframeElement;
+
+/*		if (ife._oldWidth) {
+			ife.style.width = ife._oldWidth;
+			ife.width = ife._oldWidth;
+		}*/
+
+		if (ife._oldHeight) {
+			ife.style.height = ife._oldHeight;
+			ife.height = ife._oldHeight;
+		}
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Selection.class.js */
+
+function TinyMCE_Selection(inst) {
+	this.instance = inst;
+};
+
+TinyMCE_Selection.prototype = {
+	getSelectedHTML : function() {
+		var inst = this.instance;
+		var e, r = this.getRng(), h;
+
+		if (tinyMCE.isSafari) {
+			// Not realy perfect!!
+			return r.toString();
+		}
+
+		e = document.createElement("body");
+
+		if (tinyMCE.isGecko)
+			e.appendChild(r.cloneContents());
+		else 
+			e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
+
+		h = tinyMCE._cleanupHTML(inst, inst.contentDocument, inst.settings, e, e, false, true, false);
+
+		// When editing always use fonts internaly
+		if (tinyMCE.getParam("convert_fonts_to_spans"))
+			tinyMCE.convertSpansToFonts(inst.getDoc());
+
+		return h;
+	},
+
+	getSelectedText : function() {
+		var inst = this.instance;
+		var d, r, s, t;
+
+		if (tinyMCE.isMSIE) {
+			d = inst.getDoc();
+
+			if (d.selection.type == "Text") {
+				r = d.selection.createRange();
+				t = r.text;
+			} else
+				t = '';
+		} else {
+			s = this.getSel();
+
+			if (s && s.toString)
+				t = s.toString();
+			else
+				t = '';
+		}
+
+		return t;
+	},
+
+	getBookmark : function(simple) {
+		var rng = this.getRng();
+		var doc = this.instance.getDoc();
+		var sp, le, s, e, nl, i, si, ei;
+		var trng, sx, sy, xx = -999999999;
+
+		// Skip Opera for now
+		if (tinyMCE.isOpera)
+			return null;
+
+		sx = doc.body.scrollLeft + doc.documentElement.scrollLeft;
+		sy = doc.body.scrollTop + doc.documentElement.scrollTop;
+
+		if (tinyMCE.isSafari || tinyMCE.isGecko)
+			return {rng : rng, scrollX : sx, scrollY : sy};
+
+		if (tinyMCE.isMSIE) {
+			if (simple)
+				return {rng : rng};
+
+			if (rng.item) {
+				e = rng.item(0);
+
+				nl = doc.getElementsByTagName(e.nodeName);
+				for (i=0; i<nl.length; i++) {
+					if (e == nl[i]) {
+						sp = i;
+						break;
+					}
+				}
+
+				return {
+					tag : e.nodeName,
+					index : sp,
+					scrollX : sx,
+					scrollY : sy
+				};
+			} else {
+				trng = rng.duplicate();
+				trng.collapse(true);
+				sp = Math.abs(trng.move('character', xx));
+
+				trng = rng.duplicate();
+				trng.collapse(false);
+				le = Math.abs(trng.move('character', xx)) - sp;
+
+				return {
+					start : sp,
+					length : le,
+					scrollX : sx,
+					scrollY : sy
+				};
+			}
+		}
+
+		if (tinyMCE.isGecko) {
+			s = tinyMCE.getParentElement(rng.startContainer);
+			for (si=0; si<s.childNodes.length && s.childNodes[si] != rng.startContainer; si++) ;
+
+			nl = doc.getElementsByTagName(s.nodeName);
+			for (i=0; i<nl.length; i++) {
+					if (s == nl[i]) {
+						sp = i;
+						break;
+					}
+			}
+
+			e = tinyMCE.getParentElement(rng.endContainer);
+			for (ei=0; ei<e.childNodes.length && e.childNodes[ei] != rng.endContainer; ei++) ;
+
+			nl = doc.getElementsByTagName(e.nodeName);
+			for (i=0; i<nl.length; i++) {
+					if (e == nl[i]) {
+						le = i;
+						break;
+					}
+			}
+
+			//tinyMCE.debug(s.nodeName, sp, rng.startOffset, '-' , e.nodeName, le, rng.endOffset);
+			//tinyMCE.debug(sx, sy);
+
+			return {
+				startTag : s.nodeName,
+				start : sp,
+				startIndex : si,
+				endTag : e.nodeName,
+				end : le,
+				endIndex : ei,
+				startOffset : rng.startOffset,
+				endOffset : rng.endOffset,
+				scrollX : sx,
+				scrollY : sy
+			};
+		}
+
+		return null;
+	},
+
+	moveToBookmark : function(bookmark) {
+		var rng, nl, i;
+		var inst = this.instance;
+		var doc = inst.getDoc();
+		var win = inst.getWin();
+		var sel = this.getSel();
+
+		if (!bookmark)
+			return false;
+
+		if (tinyMCE.isSafari) {
+			sel.setBaseAndExtent(bookmark.startContainer, bookmark.startOffset, bookmark.endContainer, bookmark.endOffset);
+			return true;
+		}
+
+		if (tinyMCE.isMSIE) {
+			if (bookmark.rng) {
+				bookmark.rng.select();
+				return true;
+			}
+
+			win.focus();
+
+			if (bookmark.tag) {
+				rng = inst.getBody().createControlRange();
+
+				nl = doc.getElementsByTagName(bookmark.tag);
+
+				if (nl.length > bookmark.index) {
+					try {
+						rng.addElement(nl[bookmark.index]);
+					} catch (ex) {
+						// Might be thrown if the node no longer exists
+					}
+				}
+			} else {
+				rng = inst.getSel().createRange();
+				rng.moveToElementText(inst.getBody());
+				rng.collapse(true);
+				rng.moveStart('character', bookmark.start);
+				rng.moveEnd('character', bookmark.length);
+			}
+
+			rng.select();
+
+			win.scrollTo(bookmark.scrollX, bookmark.scrollY);
+			return true;
+		}
+
+		if (tinyMCE.isGecko && bookmark.rng) {
+			sel.removeAllRanges();
+			sel.addRange(bookmark.rng);
+			win.scrollTo(bookmark.scrollX, bookmark.scrollY);
+			return true;
+		}
+
+		if (tinyMCE.isGecko) {
+	//		try {
+				rng = doc.createRange();
+
+				nl = doc.getElementsByTagName(bookmark.startTag);
+				if (nl.length > bookmark.start)
+					rng.setStart(nl[bookmark.start].childNodes[bookmark.startIndex], bookmark.startOffset);
+
+				nl = doc.getElementsByTagName(bookmark.endTag);
+				if (nl.length > bookmark.end)
+					rng.setEnd(nl[bookmark.end].childNodes[bookmark.endIndex], bookmark.endOffset);
+
+				sel.removeAllRanges();
+				sel.addRange(rng);
+	/*		} catch {
+				// Ignore
+			}*/
+
+			win.scrollTo(bookmark.scrollX, bookmark.scrollY);
+			return true;
+		}
+
+		return false;
+	},
+
+	selectNode : function(node, collapse, select_text_node, to_start) {
+		var inst = this.instance, sel, rng, nodes;
+
+		if (!node)
+			return;
+
+		if (typeof(collapse) == "undefined")
+			collapse = true;
+
+		if (typeof(select_text_node) == "undefined")
+			select_text_node = false;
+
+		if (typeof(to_start) == "undefined")
+			to_start = true;
+
+		if (tinyMCE.isMSIE) {
+			rng = inst.getBody().createTextRange();
+
+			try {
+				rng.moveToElementText(node);
+
+				if (collapse)
+					rng.collapse(to_start);
+
+				rng.select();
+			} catch (e) {
+				// Throws illigal agrument in MSIE some times
+			}
+		} else {
+			sel = this.getSel();
+
+			if (!sel)
+				return;
+
+			if (tinyMCE.isSafari) {
+				sel.setBaseAndExtent(node, 0, node, node.innerText.length);
+
+				if (collapse) {
+					if (to_start)
+						sel.collapseToStart();
+					else
+						sel.collapseToEnd();
+				}
+
+				this.scrollToNode(node);
+
+				return;
+			}
+
+			rng = inst.getDoc().createRange();
+
+			if (select_text_node) {
+				// Find first textnode in tree
+				nodes = tinyMCE.getNodeTree(node, new Array(), 3);
+				if (nodes.length > 0)
+					rng.selectNodeContents(nodes[0]);
+				else
+					rng.selectNodeContents(node);
+			} else
+				rng.selectNode(node);
+
+			if (collapse) {
+				// Special treatment of textnode collapse
+				if (!to_start && node.nodeType == 3) {
+					rng.setStart(node, node.nodeValue.length);
+					rng.setEnd(node, node.nodeValue.length);
+				} else
+					rng.collapse(to_start);
+			}
+
+			sel.removeAllRanges();
+			sel.addRange(rng);
+		}
+
+		this.scrollToNode(node);
+
+		// Set selected element
+		tinyMCE.selectedElement = null;
+		if (node.nodeType == 1)
+			tinyMCE.selectedElement = node;
+	},
+
+	scrollToNode : function(node) {
+		var inst = this.instance;
+		var pos, doc, scrollX, scrollY, height;
+
+		// Scroll to node position
+		pos = tinyMCE.getAbsPosition(node);
+		doc = inst.getDoc();
+		scrollX = doc.body.scrollLeft + doc.documentElement.scrollLeft;
+		scrollY = doc.body.scrollTop + doc.documentElement.scrollTop;
+		height = tinyMCE.isMSIE ? document.getElementById(inst.editorId).style.pixelHeight : inst.targetElement.clientHeight;
+
+		// Only scroll if out of visible area
+		if (!tinyMCE.settings['auto_resize'] && !(pos.absTop > scrollY && pos.absTop < (scrollY - 25 + height)))
+			inst.contentWindow.scrollTo(pos.absLeft, pos.absTop - height + 25); 
+	},
+
+	getSel : function() {
+		var inst = this.instance;
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			return inst.getDoc().selection;
+
+		return inst.contentWindow.getSelection();
+	},
+
+	getRng : function() {
+		var inst = this.instance;
+		var sel = this.getSel();
+
+		if (sel == null)
+			return null;
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+			return sel.createRange();
+
+		if (tinyMCE.isSafari && !sel.getRangeAt)
+			return '' + window.getSelection();
+
+		return sel.getRangeAt(0);
+	},
+
+	getFocusElement : function() {
+		var inst = this.instance;
+
+		if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+			var doc = inst.getDoc();
+			var rng = doc.selection.createRange();
+
+	//		if (rng.collapse)
+	//			rng.collapse(true);
+
+			var elm = rng.item ? rng.item(0) : rng.parentElement();
+		} else {
+			if (inst.isHidden())
+				return inst.getBody();
+
+			var sel = this.getSel();
+			var rng = this.getRng();
+
+			if (!sel || !rng)
+				return null;
+
+			var elm = rng.commonAncestorContainer;
+			//var elm = (sel && sel.anchorNode) ? sel.anchorNode : null;
+
+			// Handle selection a image or other control like element such as anchors
+			if (!rng.collapsed) {
+				// Is selection small
+				if (rng.startContainer == rng.endContainer) {
+					if (rng.startOffset - rng.endOffset < 2) {
+						if (rng.startContainer.hasChildNodes())
+							elm = rng.startContainer.childNodes[rng.startOffset];
+					}
+				}
+			}
+
+			// Get the element parent of the node
+			elm = tinyMCE.getParentElement(elm);
+
+			//if (tinyMCE.selectedElement != null && tinyMCE.selectedElement.nodeName.toLowerCase() == "img")
+			//	elm = tinyMCE.selectedElement;
+		}
+
+		return elm;
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_UndoRedo.class.js */
+
+function TinyMCE_UndoRedo(inst) {
+	this.instance = inst;
+	this.undoLevels = new Array();
+	this.undoIndex = 0;
+	this.typingUndoIndex = -1;
+	this.undoRedo = true;
+};
+
+TinyMCE_UndoRedo.prototype = {
+	add : function(l) {
+		var b;
+
+		if (l) {
+			this.undoLevels[this.undoLevels.length] = l;
+			return true;
+		}
+
+		var inst = this.instance;
+
+		if (this.typingUndoIndex != -1) {
+			this.undoIndex = this.typingUndoIndex;
+			// tinyMCE.debug("Override: " + this.undoIndex);
+		}
+
+		var newHTML = tinyMCE.trim(inst.getBody().innerHTML);
+		if (this.undoLevels[this.undoIndex] && newHTML != this.undoLevels[this.undoIndex].content) {
+			//tinyMCE.debug(newHTML, this.undoLevels[this.undoIndex]);
+
+			tinyMCE.dispatchCallback(inst, 'onchange_callback', 'onChange', inst);
+
+			// Time to compress
+			var customUndoLevels = tinyMCE.settings['custom_undo_redo_levels'];
+			if (customUndoLevels != -1 && this.undoLevels.length > customUndoLevels) {
+				for (var i=0; i<this.undoLevels.length-1; i++) {
+					//tinyMCE.debug(this.undoLevels[i] + "=" + this.undoLevels[i+1]);
+					this.undoLevels[i] = this.undoLevels[i+1];
+				}
+
+				this.undoLevels.length--;
+				this.undoIndex--;
+			}
+
+			b = inst.undoBookmark;
+			if (!b)
+				b = inst.selection.getBookmark();
+
+			this.undoIndex++;
+			this.undoLevels[this.undoIndex] = {
+				content : newHTML,
+				bookmark : b
+			};
+
+			this.undoLevels.length = this.undoIndex + 1;
+
+			//tinyMCE.debug("level added" + this.undoIndex);
+			return true;
+
+			// tinyMCE.debug(this.undoIndex + "," + (this.undoLevels.length-1));
+		}
+
+		return false;
+	},
+
+	undo : function() {
+		var inst = this.instance;
+
+		// Do undo
+		if (this.undoIndex > 0) {
+			this.undoIndex--;
+			tinyMCE.setInnerHTML(inst.getBody(), this.undoLevels[this.undoIndex].content);
+			inst.repaint();
+			if (inst.settings.custom_undo_redo_restore_selection)
+				inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);
+		}
+
+		// tinyMCE.debug("Undo - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);
+	},
+
+	redo : function() {
+		var inst = this.instance;
+
+		tinyMCE.execCommand("mceEndTyping");
+
+		if (this.undoIndex < (this.undoLevels.length-1)) {
+			this.undoIndex++;
+			tinyMCE.setInnerHTML(inst.getBody(), this.undoLevels[this.undoIndex].content);
+			inst.repaint();
+//					if (this.undoIndex > 0)
+//						inst.selection.moveToBookmark(this.undoLevels[this.undoIndex-1].bookmark);
+			if (inst.settings.custom_undo_redo_restore_selection)
+				inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);
+			// tinyMCE.debug("Redo - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);
+		}
+
+		tinyMCE.triggerNodeChange();
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_ForceParagraphs.class.js */
+
+var TinyMCE_ForceParagraphs = {
+	_insertPara : function(inst, e) {
+		function isEmpty(para) {
+			function isEmptyHTML(html) {
+				return html.replace(new RegExp('[ \t\r\n]+', 'g'), '').toLowerCase() == "";
+			}
+
+			// Check for images
+			if (para.getElementsByTagName("img").length > 0)
+				return false;
+
+			// Check for tables
+			if (para.getElementsByTagName("table").length > 0)
+				return false;
+
+			// Check for HRs
+			if (para.getElementsByTagName("hr").length > 0)
+				return false;
+
+			// Check all textnodes
+			var nodes = tinyMCE.getNodeTree(para, new Array(), 3);
+			for (var i=0; i<nodes.length; i++) {
+				if (!isEmptyHTML(nodes[i].nodeValue))
+					return false;
+			}
+
+			// No images, no tables, no hrs, no text content then it's empty
+			return true;
+		}
+
+		var doc = inst.getDoc();
+		var sel = inst.getSel();
+		var win = inst.contentWindow;
+		var rng = sel.getRangeAt(0);
+		var body = doc.body;
+		var rootElm = doc.documentElement;
+		var blockName = "P";
+
+	//	tinyMCE.debug(body.innerHTML);
+
+	//	debug(e.target, sel.anchorNode.nodeName, sel.focusNode.nodeName, rng.startContainer, rng.endContainer, rng.commonAncestorContainer, sel.anchorOffset, sel.focusOffset, rng.toString());
+
+		// Setup before range
+		var rngBefore = doc.createRange();
+		rngBefore.setStart(sel.anchorNode, sel.anchorOffset);
+		rngBefore.collapse(true);
+
+		// Setup after range
+		var rngAfter = doc.createRange();
+		rngAfter.setStart(sel.focusNode, sel.focusOffset);
+		rngAfter.collapse(true);
+
+		// Setup start/end points
+		var direct = rngBefore.compareBoundaryPoints(rngBefore.START_TO_END, rngAfter) < 0;
+		var startNode = direct ? sel.anchorNode : sel.focusNode;
+		var startOffset = direct ? sel.anchorOffset : sel.focusOffset;
+		var endNode = direct ? sel.focusNode : sel.anchorNode;
+		var endOffset = direct ? sel.focusOffset : sel.anchorOffset;
+
+		startNode = startNode.nodeName == "BODY" ? startNode.firstChild : startNode;
+		endNode = endNode.nodeName == "BODY" ? endNode.firstChild : endNode;
+
+		// tinyMCE.debug(startNode, endNode);
+
+		// Get block elements
+		var startBlock = tinyMCE.getParentBlockElement(startNode);
+		var endBlock = tinyMCE.getParentBlockElement(endNode);
+
+		// If absolute force paragraph generation within
+		if (startBlock && new RegExp('absolute|relative|static', 'gi').test(startBlock.style.position))
+			startBlock = null;
+
+		if (endBlock && new RegExp('absolute|relative|static', 'gi').test(endBlock.style.position))
+			endBlock = null;
+
+		// Use current block name
+		if (startBlock != null) {
+			blockName = startBlock.nodeName;
+
+			// Use P instead
+			if (blockName == "TD" || blockName == "TABLE" || (blockName == "DIV" && new RegExp('left|right', 'gi').test(startBlock.style.cssFloat)))
+				blockName = "P";
+		}
+
+		// Within a list use normal behaviour
+		if (tinyMCE.getParentElement(startBlock, "OL,UL") != null)
+			return false;
+
+		// Within a table create new paragraphs
+		if ((startBlock != null && startBlock.nodeName == "TABLE") || (endBlock != null && endBlock.nodeName == "TABLE"))
+			startBlock = endBlock = null;
+
+		// Setup new paragraphs
+		var paraBefore = (startBlock != null && startBlock.nodeName == blockName) ? startBlock.cloneNode(false) : doc.createElement(blockName);
+		var paraAfter = (endBlock != null && endBlock.nodeName == blockName) ? endBlock.cloneNode(false) : doc.createElement(blockName);
+
+		// Is header, then force paragraph under
+		if (/^(H[1-6])$/.test(blockName))
+			paraAfter = doc.createElement("p");
+
+		// Setup chop nodes
+		var startChop = startNode;
+		var endChop = endNode;
+
+		// Get startChop node
+		node = startChop;
+		do {
+			if (node == body || node.nodeType == 9 || tinyMCE.isBlockElement(node))
+				break;
+
+			startChop = node;
+		} while ((node = node.previousSibling ? node.previousSibling : node.parentNode));
+
+		// Get endChop node
+		node = endChop;
+		do {
+			if (node == body || node.nodeType == 9 || tinyMCE.isBlockElement(node))
+				break;
+
+			endChop = node;
+		} while ((node = node.nextSibling ? node.nextSibling : node.parentNode));
+
+		// Fix when only a image is within the TD
+		if (startChop.nodeName == "TD")
+			startChop = startChop.firstChild;
+
+		if (endChop.nodeName == "TD")
+			endChop = endChop.lastChild;
+
+		// If not in a block element
+		if (startBlock == null) {
+			// Delete selection
+			rng.deleteContents();
+			sel.removeAllRanges();
+
+			if (startChop != rootElm && endChop != rootElm) {
+				// Insert paragraph before
+				rngBefore = rng.cloneRange();
+
+				if (startChop == body)
+					rngBefore.setStart(startChop, 0);
+				else
+					rngBefore.setStartBefore(startChop);
+
+				paraBefore.appendChild(rngBefore.cloneContents());
+
+				// Insert paragraph after
+				if (endChop.parentNode.nodeName == blockName)
+					endChop = endChop.parentNode;
+
+				// If not after image
+				//if (rng.startContainer.nodeName != "BODY" && rng.endContainer.nodeName != "BODY")
+					rng.setEndAfter(endChop);
+
+				if (endChop.nodeName != "#text" && endChop.nodeName != "BODY")
+					rngBefore.setEndAfter(endChop);
+
+				var contents = rng.cloneContents();
+				if (contents.firstChild && (contents.firstChild.nodeName == blockName || contents.firstChild.nodeName == "BODY"))
+					paraAfter.innerHTML = contents.firstChild.innerHTML;
+				else
+					paraAfter.appendChild(contents);
+
+				// Check if it's a empty paragraph
+				if (isEmpty(paraBefore))
+					paraBefore.innerHTML = "&nbsp;";
+
+				// Check if it's a empty paragraph
+				if (isEmpty(paraAfter))
+					paraAfter.innerHTML = "&nbsp;";
+
+				// Delete old contents
+				rng.deleteContents();
+				rngAfter.deleteContents();
+				rngBefore.deleteContents();
+
+				// Insert new paragraphs
+				paraAfter.normalize();
+				rngBefore.insertNode(paraAfter);
+				paraBefore.normalize();
+				rngBefore.insertNode(paraBefore);
+
+				// tinyMCE.debug("1: ", paraBefore.innerHTML, paraAfter.innerHTML);
+			} else {
+				body.innerHTML = "<" + blockName + ">&nbsp;</" + blockName + "><" + blockName + ">&nbsp;</" + blockName + ">";
+				paraAfter = body.childNodes[1];
+			}
+
+			inst.selection.selectNode(paraAfter, true, true);
+
+			return true;
+		}
+
+		// Place first part within new paragraph
+		if (startChop.nodeName == blockName)
+			rngBefore.setStart(startChop, 0);
+		else
+			rngBefore.setStartBefore(startChop);
+
+		rngBefore.setEnd(startNode, startOffset);
+		paraBefore.appendChild(rngBefore.cloneContents());
+
+		// Place secound part within new paragraph
+		rngAfter.setEndAfter(endChop);
+		rngAfter.setStart(endNode, endOffset);
+		var contents = rngAfter.cloneContents();
+
+		if (contents.firstChild && contents.firstChild.nodeName == blockName) {
+	/*		var nodes = contents.firstChild.childNodes;
+			for (var i=0; i<nodes.length; i++) {
+				//tinyMCE.debug(nodes[i].nodeName);
+				if (nodes[i].nodeName != "BODY")
+					paraAfter.appendChild(nodes[i]);
+			}
+	*/
+			paraAfter.innerHTML = contents.firstChild.innerHTML;
+		} else
+			paraAfter.appendChild(contents);
+
+		// Check if it's a empty paragraph
+		if (isEmpty(paraBefore))
+			paraBefore.innerHTML = "&nbsp;";
+
+		// Check if it's a empty paragraph
+		if (isEmpty(paraAfter))
+			paraAfter.innerHTML = "&nbsp;";
+
+		// Create a range around everything
+		var rng = doc.createRange();
+
+		if (!startChop.previousSibling && startChop.parentNode.nodeName.toUpperCase() == blockName) {
+			rng.setStartBefore(startChop.parentNode);
+		} else {
+			if (rngBefore.startContainer.nodeName.toUpperCase() == blockName && rngBefore.startOffset == 0)
+				rng.setStartBefore(rngBefore.startContainer);
+			else
+				rng.setStart(rngBefore.startContainer, rngBefore.startOffset);
+		}
+
+		if (!endChop.nextSibling && endChop.parentNode.nodeName.toUpperCase() == blockName)
+			rng.setEndAfter(endChop.parentNode);
+		else
+			rng.setEnd(rngAfter.endContainer, rngAfter.endOffset);
+
+		// Delete all contents and insert new paragraphs
+		rng.deleteContents();
+		rng.insertNode(paraAfter);
+		rng.insertNode(paraBefore);
+		//tinyMCE.debug("2", paraBefore.innerHTML, paraAfter.innerHTML);
+
+		// Normalize
+		paraAfter.normalize();
+		paraBefore.normalize();
+
+		inst.selection.selectNode(paraAfter, true, true);
+
+		return true;
+	},
+
+	_handleBackSpace : function(inst) {
+		var r = inst.getRng(), sn = r.startContainer, nv, s = false;
+
+		if (sn && sn.nextSibling && sn.nextSibling.nodeName == "BR") {
+			nv = sn.nodeValue;
+
+			// Handle if a backspace is pressed after a space character #bug 1466054
+			if (nv != null && nv.length >= r.startOffset && nv.charAt(r.startOffset - 1) == ' ')
+				s = true;
+
+			// Only remove BRs if we are at the end of line #bug 1464152
+			if (nv != null && r.startOffset == nv.length)
+				sn.nextSibling.parentNode.removeChild(sn.nextSibling);
+		}
+
+		return s;
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Layer.class.js */
+
+function TinyMCE_Layer(id, bm) {
+	this.id = id;
+	this.blockerElement = null;
+	this.events = false;
+	this.element = null;
+	this.blockMode = typeof(bm) != 'undefined' ? bm : true;
+	this.doc = document;
+};
+
+TinyMCE_Layer.prototype = {
+	moveRelativeTo : function(re, p) {
+		var rep = this.getAbsPosition(re);
+		var w = parseInt(re.offsetWidth);
+		var h = parseInt(re.offsetHeight);
+		var e = this.getElement();
+		var ew = parseInt(e.offsetWidth);
+		var eh = parseInt(e.offsetHeight);
+		var x, y;
+
+		switch (p) {
+			case "tl":
+				x = rep.absLeft;
+				y = rep.absTop;
+				break;
+
+			case "tr":
+				x = rep.absLeft + w;
+				y = rep.absTop;
+				break;
+
+			case "bl":
+				x = rep.absLeft;
+				y = rep.absTop + h;
+				break;
+
+			case "br":
+				x = rep.absLeft + w;
+				y = rep.absTop + h;
+				break;
+
+			case "cc":
+				x = rep.absLeft + (w / 2) - (ew / 2);
+				y = rep.absTop + (h / 2) - (eh / 2);
+				break;
+		}
+
+		this.moveTo(x, y);
+	},
+
+	moveBy : function(x, y) {
+		var e = this.getElement();
+		this.moveTo(parseInt(e.style.left) + x, parseInt(e.style.top) + y);
+	},
+
+	moveTo : function(x, y) {
+		var e = this.getElement();
+
+		e.style.left = x + "px";
+		e.style.top = y + "px";
+
+		this.updateBlocker();
+	},
+
+	resizeBy : function(w, h) {
+		var e = this.getElement();
+		this.resizeTo(parseInt(e.style.width) + w, parseInt(e.style.height) + h);
+	},
+
+	resizeTo : function(w, h) {
+		var e = this.getElement();
+
+		if (w != null)
+			e.style.width = w + "px";
+
+		if (h != null)
+			e.style.height = h + "px";
+
+		this.updateBlocker();
+	},
+
+	show : function() {
+		this.getElement().style.display = 'block';
+		this.updateBlocker();
+	},
+
+	hide : function() {
+		this.getElement().style.display = 'none';
+		this.updateBlocker();
+	},
+
+	isVisible : function() {
+		return this.getElement().style.display == 'block';
+	},
+
+	getElement : function() {
+		if (!this.element)
+			this.element = this.doc.getElementById(this.id);
+
+		return this.element;
+	},
+
+	setBlockMode : function(s) {
+		this.blockMode = s;
+	},
+
+	updateBlocker : function() {
+		var e, b, x, y, w, h;
+
+		b = this.getBlocker();
+		if (b) {
+			if (this.blockMode) {
+				e = this.getElement();
+				x = this.parseInt(e.style.left);
+				y = this.parseInt(e.style.top);
+				w = this.parseInt(e.offsetWidth);
+				h = this.parseInt(e.offsetHeight);
+
+				b.style.left = x + 'px';
+				b.style.top = y + 'px';
+				b.style.width = w + 'px';
+				b.style.height = h + 'px';
+				b.style.display = e.style.display;
+			} else
+				b.style.display = 'none';
+		}
+	},
+
+	getBlocker : function() {
+		var d, b;
+
+		if (!this.blockerElement && this.blockMode) {
+			d = this.doc;
+			b = d.createElement("iframe");
+
+			b.style.cssText = 'display: none; position: absolute; left: 0; top: 0';
+			b.src = 'javascript:false;';
+			b.frameBorder = '0';
+			b.scrolling = 'no';
+
+			d.body.appendChild(b);
+			this.blockerElement = b;
+		}
+
+		return this.blockerElement;
+	},
+
+	getAbsPosition : function(n) {
+		var p = {absLeft : 0, absTop : 0};
+
+		while (n) {
+			p.absLeft += n.offsetLeft;
+			p.absTop += n.offsetTop;
+			n = n.offsetParent;
+		}
+
+		return p;
+	},
+
+	create : function(n, c, p) {
+		var d = this.doc, e = d.createElement(n);
+
+		e.setAttribute('id', this.id);
+
+		if (c)
+			e.className = c;
+
+		if (!p)
+			p = d.body;
+
+		p.appendChild(e);
+
+		return this.element = e;
+	},
+
+	parseInt : function(s) {
+		if (s == null || s == '')
+			return 0;
+
+		return parseInt(s);
+	}
+};
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Menu.class.js */
+
+function TinyMCE_Menu() {
+	var id;
+
+	if (typeof(tinyMCE.menuCounter) == "undefined")
+		tinyMCE.menuCounter = 0;
+
+	id = "mc_menu_" + tinyMCE.menuCounter++;
+
+	TinyMCE_Layer.call(this, id, true);
+
+	this.id = id;
+	this.items = new Array();
+	this.needsUpdate = true;
+};
+
+// Extends the TinyMCE_Layer class
+TinyMCE_Menu.prototype = tinyMCE.extend(TinyMCE_Layer.prototype, {
+	init : function(s) {
+		var n;
+
+		// Default params
+		this.settings = {
+			separator_class : 'mceMenuSeparator',
+			title_class : 'mceMenuTitle',
+			disabled_class : 'mceMenuDisabled',
+			menu_class : 'mceMenu',
+			drop_menu : true
+		};
+
+		for (n in s)
+			this.settings[n] = s[n];
+
+		this.create('div', this.settings.menu_class);
+	},
+
+	clear : function() {
+		this.items = new Array();
+	},
+
+	addTitle : function(t) {
+		this.add({type : 'title', text : t});
+	},
+
+	addDisabled : function(t) {
+		this.add({type : 'disabled', text : t});
+	},
+
+	addSeparator : function() {
+		this.add({type : 'separator'});
+	},
+
+	addItem : function(t, js) {
+		this.add({text : t, js : js});
+	},
+
+	add : function(mi) {
+		this.items[this.items.length] = mi;
+		this.needsUpdate = true;
+	},
+
+	update : function() {
+		var e = this.getElement(), h = '', i, t, m = this.items, s = this.settings;
+
+		if (this.settings.drop_menu)
+			h += '<span class="mceMenuLine"></span>';
+
+		h += '<table border="0" cellpadding="0" cellspacing="0">';
+
+		for (i=0; i<m.length; i++) {
+			t = tinyMCE.xmlEncode(m[i].text);
+			c = m[i].class_name ? ' class="' + m[i].class_name + '"' : '';
+
+			switch (m[i].type) {
+				case 'separator':
+					h += '<tr class="' + s.separator_class + '"><td>';
+					break;
+
+				case 'title':
+					h += '<tr class="' + s.title_class + '"><td><span' + c +'>' + t + '</span>';
+					break;
+
+				case 'disabled':
+					h += '<tr class="' + s.disabled_class + '"><td><span' + c +'>' + t + '</span>';
+					break;
+
+				default:
+					h += '<tr><td><a href="javascript:void(0);" onmousedown="' + tinyMCE.xmlEncode(m[i].js) + ';return false;"><span' + c +'>' + t + '</span></a>';
+			}
+
+			h += '</td></tr>';
+		}
+
+		h += '</table>';
+
+		e.innerHTML = h;
+
+		this.needsUpdate = false;
+		this.updateBlocker();
+	},
+
+	show : function() {
+		var nl, i;
+
+		if (tinyMCE.lastMenu == this)
+			return;
+
+		if (this.needsUpdate)
+			this.update();
+
+		if (tinyMCE.lastMenu && tinyMCE.lastMenu != this)
+			tinyMCE.lastMenu.hide();
+
+		TinyMCE_Layer.prototype.show.call(this);
+
+		if (!tinyMCE.isOpera) {
+			// Accessibility stuff
+/*			nl = this.getElement().getElementsByTagName("a");
+			if (nl.length > 0)
+				nl[0].focus();*/
+		}
+
+		tinyMCE.lastMenu = this;
+	}
+});
+
+/* file:jscripts/tiny_mce/classes/TinyMCE_Debug.class.js */
+
+TinyMCE_Engine.prototype.debug = function() {
+	var m = "", e, a, i;
+
+	e = document.getElementById("tinymce_debug");
+	if (!e) {
+		var d = document.createElement("div");
+		d.setAttribute("className", "debugger");
+		d.className = "debugger";
+		d.innerHTML = 'Debug output:<textarea id="tinymce_debug" style="width: 100%; height: 300px" wrap="nowrap" mce_editable="false"></textarea>';
+
+		document.body.appendChild(d);
+		e = document.getElementById("tinymce_debug");
+	}
+
+	a = this.debug.arguments;
+	for (i=0; i<a.length; i++) {
+		m += a[i];
+		if (i<a.length-1)
+			m += ', ';
+	}
+
+	e.value += m + "\n";
+};
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/editable_selects.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/editable_selects.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/editable_selects.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/editable_selects.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,63 @@
+/**
+ * $RCSfile: editable_selects.js,v $
+ * $Revision: 1.1 $
+ * $Date: 2006/04/10 09:30:19 $
+ *
+ * Makes select boxes editable.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+var TinyMCE_EditableSelects = {
+	editSelectElm : null,
+
+	init : function() {
+		var nl = document.getElementsByTagName("select"), i, d = document, o;
+
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
+				o = new Option('(value)', '__mce_add_custom__');
+
+				o.className = 'mceAddSelectValue';
+
+				nl[i].options[nl[i].options.length] = o;
+				nl[i].setAttribute('onchange', 'TinyMCE_EditableSelects.onChangeEditableSelect(this);');
+			}
+		}
+	},
+
+	onChangeEditableSelect : function(se) {
+		var d = document, ne;
+
+		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
+			ne = d.createElement("input");
+			ne.id = se.id + "_custom";
+			ne.name = se.name + "_custom";
+			ne.type = "text";
+
+			ne.style.width = se.clientWidth;
+			se.parentNode.insertBefore(ne, se);
+			se.style.display = 'none';
+			ne.focus();
+			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
+			TinyMCE_EditableSelects.editSelectElm = se;
+		}
+	},
+
+	onBlurEditableSelectInput : function() {
+		var se = TinyMCE_EditableSelects.editSelectElm;
+
+		if (se) {
+			if (se.previousSibling.value != '') {
+				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
+				selectByValue(document.forms[0], se.id, se.previousSibling.value);
+			} else
+				selectByValue(document.forms[0], se.id, '');
+
+			se.style.display = 'inline';
+			se.parentNode.removeChild(se.previousSibling);
+			TinyMCE_EditableSelects.editSelectElm = null;
+		}
+	}
+};
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/form_utils.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/form_utils.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/form_utils.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/form_utils.js	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1,210 @@
+/**
+ * $RCSfile: form_utils.js,v $
+ * $Revision: 1.11 $
+ * $Date: 2006/04/07 15:53:12 $
+ *
+ * Various form utilitiy functions.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+function getColorPickerHTML(id, target_form_element) {
+	var html = "";
+
+	html += '<a id="' + id + '_link" href="javascript:void(0);" onkeydown="pickColor(event,\'' + target_form_element +'\');" onmousedown="pickColor(event,\'' + target_form_element +'\');return false;">';
+	html += '<img id="' + id + '" src="../../themes/' + tinyMCE.getParam("theme") + '/images/color.gif"';
+	html += ' onmouseover="this.className=\'mceButtonOver\'"';
+	html += ' onmouseout="this.className=\'mceButtonNormal\'"';
+	html += ' onmousedown="this.className=\'mceButtonDown\'"';
+	html += ' width="20" height="16" border="0" title="' + tinyMCE.getLang('lang_browse') + '"';
+	html += ' class="mceButtonNormal" alt="' + tinyMCE.getLang('lang_browse') + '" /></a>';
+
+	return html;
+}
+
+function pickColor(e, target_form_element) {
+	if ((e.keyCode == 32 || e.keyCode == 13) || e.type == "mousedown")
+		tinyMCEPopup.pickColor(e, target_form_element);
+}
+
+function updateColor(img_id, form_element_id) {
+	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
+}
+
+function setBrowserDisabled(id, state) {
+	var img = document.getElementById(id);
+	var lnk = document.getElementById(id + "_link");
+
+	if (lnk) {
+		if (state) {
+			lnk.setAttribute("realhref", lnk.getAttribute("href"));
+			lnk.removeAttribute("href");
+			tinyMCE.switchClass(img, 'mceButtonDisabled', true);
+		} else {
+			lnk.setAttribute("href", lnk.getAttribute("realhref"));
+			tinyMCE.switchClass(img, 'mceButtonNormal', false);
+		}
+	}
+}
+
+function getBrowserHTML(id, target_form_element, type, prefix) {
+	var option = prefix + "_" + type + "_browser_callback";
+	var cb = tinyMCE.getParam(option, tinyMCE.getParam("file_browser_callback"));
+	if (cb == null)
+		return "";
+
+	var html = "";
+
+	html += '<a id="' + id + '_link" href="javascript:openBrower(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;">';
+	html += '<img id="' + id + '" src="../../themes/' + tinyMCE.getParam("theme") + '/images/browse.gif"';
+	html += ' onmouseover="this.className=\'mceButtonOver\';"';
+	html += ' onmouseout="this.className=\'mceButtonNormal\';"';
+	html += ' onmousedown="this.className=\'mceButtonDown\';"';
+	html += ' width="20" height="18" border="0" title="' + tinyMCE.getLang('lang_browse') + '"';
+	html += ' class="mceButtonNormal" alt="' + tinyMCE.getLang('lang_browse') + '" /></a>';
+
+	return html;
+}
+
+function openBrower(img_id, target_form_element, type, option) {
+	var img = document.getElementById(img_id);
+
+	if (img.className != "mceButtonDisabled")
+		tinyMCEPopup.openBrowser(target_form_element, type, option);
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option(value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+		sel.selectedIndex = sel.options.length - 1;
+	}
+
+	return found;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function addSelectValue(form_obj, field_name, name, value) {
+	var s = form_obj.elements[field_name];
+	var o = new Option(name, value);
+	s.options[s.options.length] = o;
+}
+
+function addClassesToList(list_id, specific_option) {
+	// Setup class droplist
+	var styleSelectElm = document.getElementById(list_id);
+	var styles = tinyMCE.getParam('theme_advanced_styles', false);
+	styles = tinyMCE.getParam(specific_option, styles);
+
+	if (styles) {
+		var stylesAr = styles.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			if (stylesAr != "") {
+				var key, value;
+
+				key = stylesAr[i].split('=')[0];
+				value = stylesAr[i].split('=')[1];
+
+				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			}
+		}
+	} else {
+		// Use auto impored classes
+		var csses = tinyMCE.getCSSClasses(tinyMCE.getWindowArg('editor_id'));
+		for (var i=0; i<csses.length; i++)
+			styleSelectElm.options[styleSelectElm.length] = new Option(csses[i], csses[i]);
+	}
+}
+
+function isVisible(element_id) {
+	var elm = document.getElementById(element_id);
+
+	return elm && elm.style.display != "none";
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return "rgb(" + r + "," + g + "," + b + ")";
+	}
+
+	return col;
+}
+
+function trimSize(size) {
+	return size.replace(new RegExp('[^0-9%]', 'gi'), '');
+}
+
+function getCSSSize(size) {
+	size = trimSize(size);
+
+	if (size == "")
+		return "";
+
+	return size.indexOf('%') != -1 ? size : size + "px";
+}
+
+function getStyle(elm, attrib, style) {
+	var val = tinyMCE.getAttrib(elm, attrib);
+
+	if (val != '')
+		return '' + val;
+
+	if (typeof(style) == 'undefined')
+		style = attrib;
+
+	val = eval('elm.style.' + style);
+
+	return val == null ? '' : '' + val;
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/index.html 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/index.html
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/index.html	2006-05-13 20:23:34.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mclayer.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mclayer.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mclayer.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mclayer.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,212 @@
+/**
+ * $RCSfile: mclayer.js,v $
+ * $Revision: 1.2 $
+ * $Date: 2006/02/06 20:11:09 $
+ *
+ * Moxiecode floating layer script.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+function MCLayer(id) {
+	this.id = id;
+	this.settings = new Array();
+	this.blockerElement = null;
+	this.isMSIE = navigator.appName == "Microsoft Internet Explorer";
+	this.events = false;
+	this.autoHideCallback = null;
+}
+
+MCLayer.prototype = {
+	moveRelativeTo : function(re, p, a) {
+		var rep = this.getAbsPosition(re);
+		var w = parseInt(re.offsetWidth);
+		var h = parseInt(re.offsetHeight);
+		var x, y;
+
+		switch (p) {
+			case "tl":
+				break;
+
+			case "tr":
+				x = rep.absLeft + w;
+				y = rep.absTop;
+				break;
+
+			case "bl":
+				break;
+
+			case "br":
+				break;
+		}
+
+		this.moveTo(x, y);
+	},
+
+	moveBy : function(dx, dy) {
+		var e = this.getElement();
+		var x = parseInt(e.style.left);
+		var y = parseInt(e.style.top);
+
+		e.style.left = (x + dx) + "px";
+		e.style.top = (y + dy) + "px";
+
+		this.updateBlocker();
+	},
+
+	moveTo : function(x, y) {
+		var e = this.getElement();
+
+		e.style.left = x + "px";
+		e.style.top = y + "px";
+
+		this.updateBlocker();
+	},
+
+	show : function() {
+		MCLayer.visibleLayer = this;
+
+		this.getElement().style.display = 'block';
+		this.updateBlocker();
+	},
+
+	hide : function() {
+		this.getElement().style.display = 'none';
+		this.updateBlocker();
+	},
+
+	setAutoHide : function(s, cb) {
+		this.autoHideCallback = cb;
+		this.registerEventHandlers();
+	},
+
+	getElement : function() {
+		return document.getElementById(this.id);
+	},
+
+	updateBlocker : function() {
+		if (!this.isMSIE)
+			return;
+
+		var e = this.getElement();
+		var b = this.getBlocker();
+		var x = this.parseInt(e.style.left);
+		var y = this.parseInt(e.style.top);
+		var w = this.parseInt(e.offsetWidth);
+		var h = this.parseInt(e.offsetHeight);
+
+		b.style.left = x + 'px';
+		b.style.top = y + 'px';
+		b.style.width = w + 'px';
+		b.style.height = h + 'px';
+		b.style.display = e.style.display;
+	},
+
+	getBlocker : function() {
+		if (!this.blockerElement) {
+			var d = document, b = d.createElement("iframe");
+
+			b.style.cssText = 'display: none; left: 0px; position: absolute; top: 0';
+			b.src = 'javascript:false;';
+			b.frameBorder = '0';
+			b.scrolling = 'no';
+
+			d.body.appendChild(b);
+			this.blockerElement = b;
+		}
+
+		return this.blockerElement;
+	},
+
+	getAbsPosition : function(n) {
+		var p = {absLeft : 0, absTop : 0};
+
+		while (n) {
+			p.absLeft += n.offsetLeft;
+			p.absTop += n.offsetTop;
+			n = n.offsetParent;
+		}
+
+		return p;
+	},
+
+	registerEventHandlers : function() {
+		if (!this.events) {
+			var d = document;
+
+			this.addEvent(d, 'mousedown', MCLayer.prototype.onMouseDown);
+
+			this.events = true;
+		}
+	},
+
+	addEvent : function(o, n, h) {
+		if (o.attachEvent)
+			o.attachEvent("on" + n, h);
+		else
+			o.addEventListener(n, h, false);
+	},
+
+	onMouseDown : function(e) {
+		e = typeof(e) == "undefined" ? window.event : e;
+		var b = document.body;
+		var l = MCLayer.visibleLayer;
+
+		if (l) {
+			var mx = l.isMSIE ? e.clientX + b.scrollLeft : e.pageX;
+			var my = l.isMSIE ? e.clientY + b.scrollTop : e.pageY;
+			var el = l.getElement();
+			var x = parseInt(el.style.left);
+			var y = parseInt(el.style.top);
+			var w = parseInt(el.offsetWidth);
+			var h = parseInt(el.offsetHeight);
+
+			if (!(mx > x && mx < x + w && my > y && my < y + h)) {
+				MCLayer.visibleLayer = null;
+
+				if (l.autoHideCallback && l.autoHideCallback(l, e, mx, my))
+					return true;
+
+				l.hide();
+			}
+		}
+	},
+
+	addCSSClass : function(e, c) {
+		this.removeCSSClass(e, c);
+		var a = this.explode(' ', e.className);
+		a[a.length] = c;
+		e.className = a.join(' ');
+	},
+
+	removeCSSClass : function(e, c) {
+		var a = this.explode(' ', e.className), i;
+
+		for (i=0; i<a.length; i++) {
+			if (a[i] == c)
+				a[i] = '';
+		}
+
+		e.className = a.join(' ');
+	},
+
+	explode : function(d, s) {
+		var ar = s.split(d);
+		var oar = new Array();
+
+		for (var i = 0; i<ar.length; i++) {
+			if (ar[i] != "")
+				oar[oar.length] = ar[i];
+		}
+
+		return oar;
+	},
+
+	parseInt : function(s) {
+		if (s == null || s == '')
+			return 0;
+
+		return parseInt(s);
+	}
+}
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mctabs.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mctabs.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mctabs.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/mctabs.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,76 @@
+/**
+ * $RCSfile: mctabs.js,v $
+ * $Revision: 1.2 $
+ * $Date: 2006/02/06 20:11:09 $
+ *
+ * Moxiecode DHTML Tabs script.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+function MCTabs() {
+	this.settings = new Array();
+};
+
+MCTabs.prototype.init = function(settings) {
+	this.settings = settings;
+};
+
+MCTabs.prototype.getParam = function(name, default_value) {
+	var value = null;
+
+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	return value;
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id) {
+	var panelElm = document.getElementById(panel_id);
+	var panelContainerElm = panelElm ? panelElm.parentNode : null;
+	var tabElm = document.getElementById(tab_id);
+	var tabContainerElm = tabElm ? tabElm.parentNode : null;
+	var selectionClass = this.getParam('selection_class', 'current');
+
+	if (tabElm && tabContainerElm) {
+		var nodes = tabContainerElm.childNodes;
+
+		// Hide all other tabs
+		for (var i=0; i<nodes.length; i++) {
+			if (nodes[i].nodeName == "LI")
+				nodes[i].className = '';
+		}
+
+		// Show selected tab
+		tabElm.className = 'current';
+	}
+
+	if (panelElm && panelContainerElm) {
+		var nodes = panelContainerElm.childNodes;
+
+		// Hide all other panels
+		for (var i=0; i<nodes.length; i++) {
+			if (nodes[i].nodeName == "DIV")
+				nodes[i].className = 'panel';
+		}
+
+		// Show selected panel
+		panelElm.className = 'current';
+	}
+};
+
+MCTabs.prototype.getAnchor = function() {
+	var pos, url = document.location.href;
+
+	if ((pos = url.lastIndexOf('#')) != -1)
+		return url.substring(pos + 1);
+
+	return "";
+};
+
+// Global instance
+var mcTabs = new MCTabs();
diff -ruN 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/validate.js 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/validate.js
--- 4.5.4/mambots/editors/mostlyce/jscripts/tiny_mce/utils/validate.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/jscripts/tiny_mce/utils/validate.js	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,50 @@
+/**
+ * $RCSfile: validate.js,v $
+ * $Revision: 1.3 $
+ * $Date: 2006/02/06 20:11:09 $
+ *
+ * Various form validation methods.
+ *
+ * @author Moxiecode
+ * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+function testRegExp(form_name, element_name, re) {
+	return new RegExp(re).test(document.forms[form_name].elements[element_name].value);
+}
+
+function validateString(form_name, element_name) {
+	return (document.forms[form_name].elements[element_name].value.length > 0);
+}
+
+function validateSelection(form_name, element_name) {
+	return (document.forms[form_name].elements[element_name].selectedIndex > 0);
+}
+
+function validateCheckBox(form_name, element_name) {
+	return document.forms[form_name].elements[element_name].checked;
+}
+
+function validateCleanString(form_name, element_name) {
+	return testRegExp(form_name, element_name, '^[A-Za-z0-9_]+$');
+}
+
+function validateEmail(form_name, element_name) {
+	return testRegExp(form_name, element_name, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+}
+
+function validateAbsUrl(form_name, element_name) {
+	return testRegExp(form_name, element_name, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+$');
+}
+
+function validateNumber(form_name, element_name, allow_blank) {
+	return (!allow_blank && value == '') ? false : testRegExp(form_name, element_name, '^-?[0-9]*\\.?[0-9]*$');
+}
+
+function validateSize(form_name, element_name,) {
+	return testRegExp(form_name, element_name, '^[0-9]+(px|%)?$');
+}
+
+function validateID(form_name, element_name,) {
+	return testRegExp(form_name, element_name, '^[A-Za-z_]([A-Za-z0-9_])*$');
+}
diff -ruN 4.5.4/mambots/editors/mostlyce/lgpl.txt 4.6rc2/mambots/editors/mostlyce/lgpl.txt
--- 4.5.4/mambots/editors/mostlyce/lgpl.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce/lgpl.txt	2006-04-30 14:02:06.000000000 -0500
@@ -0,0 +1,437 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff -ruN 4.5.4/mambots/editors/mostlyce.php 4.6rc2/mambots/editors/mostlyce.php
--- 4.5.4/mambots/editors/mostlyce.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce.php	2006-06-20 01:01:27.000000000 -0500
@@ -0,0 +1,279 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+/**
+* @version $Id: mostlyce.php, 2006/06/19 cauld
+* @package Mambo_4.6
+* @Based on tinymce.php
+* @copyright (C) 2000 - 2006 The Mambo Foundation
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$_MAMBOTS->registerFunction( 'onInitEditor', 'botmostlyceEditorInit' );
+$_MAMBOTS->registerFunction( 'onGetEditorContents', 'botmostlyceEditorGetContents' );
+$_MAMBOTS->registerFunction( 'onEditorArea', 'botmostlyceEditorEditorArea' );
+
+Global $mosConfig_live_site, $jspath, $mosConfig_absolute_path;
+include ($mosConfig_absolute_path."/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php");
+
+// --- Start custom code DHS Informatisering - opensource@dhs.nl, www.dhs.nl  
+// This code makes it possible to use mostlyce in a website that combines normal and SSL-connections
+if (isset($_SERVER['HTTPS']) &&  $_SERVER['HTTPS'] == "on") { 
+	$jspath = "https:" . stristr ( $mosConfig_live_site, "//" );
+} else {
+	$jspath = "http:" . stristr ( $mosConfig_live_site, "//" );
+}
+// Replaced every occurrence of '$mosConfig_live_site' with '$jspath' in this file
+// --- End custom code DHS Informatisering ---
+
+//Render Row Buttons
+function renderButton( $row, $remove_font )
+{
+    $row = explode( ',', $row );
+    foreach( $row as $key => $rowitem ) {
+        if( strpos( $rowitem, '-' )  === 0) {
+            unset( $row[$key] );
+        }
+        if( $remove_font ){
+            if( $rowitem == 'fontselect' || $rowitem == 'fontsizeselect' || $rowitem == 'forecolor' || $rowitem == 'backcolor' ) {
+                unset( $row[$key] );
+            }
+        }
+    }
+    return $new_row = implode( ',', array_values( $row ) );
+}
+
+//Use new $adminside global for 4.6+, doesn't exist pre46 so we have to determine it dynamically
+/*******
+// So 4.5.3 & 4.5.4 specific
+if (!isset($adminside)) {
+	$url_check = $_SERVER['PHP_SELF'];
+    if (preg_match("/administrator/", $url_check)) {
+   		$adminside=1;
+    }
+else $adminside=0;
+}
+//End 4.5.3 & 4.5.4 specific
+********/
+
+/**
+* TinyMCE WYSIWYG Editor - javascript initialisation
+*/
+function botmostlyceEditorInit() {
+
+   global $mosConfig_live_site, $my, $database, $mosConfig_absolute_path, $jspath, $adminside;
+
+   require ( $mosConfig_absolute_path."/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php" );
+
+        //Allows for dynamic editor sizing by apps like Remository
+	    $get_width = mosGetParam($_GET,'width',NULL);
+	    $get_height = mosGetParam($_GET,'height',NULL);
+	    if ($get_width) {$editor_width = (int)$get_width; }
+	    if ($get_height) {$editor_height = (int)$get_height; } 
+        
+        // Get the default stylesheet (the 4.6 way)
+        $mainframe = mosMainFrame::getInstance();
+        $cur_template = $mainframe->getTemplate();
+        
+        //Stylesheet and templates assignments will change in 4.6 and use above syntax
+        /*****
+        //So below is 4.5.3 & 4.5.4 specific
+        // Get the default stylesheet
+        $query = "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'";
+        $database->setQuery( $query );
+        $cur_template = $database->loadResult();
+        // Assigned template
+        if ( isset( $Itemid ) && $Itemid != "" && $Itemid != 0 ) {
+            $query = "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='$Itemid' LIMIT 1";
+            $database->setQuery( $query );
+            $cur_template = $database->loadResult() ? $database->loadResult() : $cur_template;
+        }
+        //End 4.5.3 & 4.5.4 specific
+        ********/
+        
+        //Plugin settings and Authorization
+        $invalid_elements[] = 'object,applet';
+
+	    //Check access level and MOStlyCE Admin preference.  Set editor items accordingly.  
+        
+        //Flash Plugin (Only loads for Admin)
+        if( ($adminside>0) && ($editor_plugin_flash_acl=='true') ) {
+        	$plugins[] = 'flash';
+        }
+        //Script Elements (Only loads for Admin)
+        if( ($adminside>0) && ($editor_script_acl=='true') ) {
+        	$elements[] = "script[$editor_script_elms]";
+        } else {
+            $invalid_elements[] = "script";
+        }
+        //IFrame Elements (Only loads for Admin)
+        if( ($adminside>0) && ($editor_iframe_acl=='true') ) {
+            $elements[] = "iframe[$editor_iframe_elms]";
+        } 
+        //Font Options
+        if ( $editor_font_tools_acl=='true' ) {
+            $elements[] = "font[face|size|color|style]";
+            $remove_font = false;
+       }else{
+            $remove_font = true;
+       }
+        //Emotions Plugin
+        if( $editor_plugin_emotions_acl=='true' ) {
+            $plugins[] = 'emotions';
+        } 
+        //Print Plugin
+        if( $editor_plugin_print=='true' ) {
+            $plugins[] = 'print';
+        } 
+        //Search & Replace Plugin
+        if( $editor_plugin_searchreplace=='true' ) {
+            $plugins[] = 'searchreplace';
+        } 
+        //Table Plugin
+        if( $editor_plugin_table_acl=='true' ) {
+            $plugins[] = 'table';
+        } 
+        //DateTime Plugin
+        if( $editor_plugin_datetime_acl=='true' ) {
+            $plugins[] = 'insertdatetime';
+        } 
+        //SpellChecker Plugin
+        if( $editor_plugin_spellchecker=='true' ) {
+            $plugins[] = 'spellchecker';
+        } 
+        //Layer Plugin
+        if( $editor_plugin_layer=='true' ) {
+            $plugins[] = 'layer';
+        }     
+        //Paragraphs or breaks
+        if ( $editor_newlines == 'p' ){
+            $p_newlines = "true";
+            $br_newlines = "false";
+        }
+        if ( $editor_newlines == 'br' ){
+            $p_newlines = "false";
+            $br_newlines = "true";
+        }
+
+        $css_template = $mosConfig_live_site."/templates/".$cur_template."/css/";
+        $content_css = ($editor_css_override == '1' ) ? $css_template.$editor_custom_css : $css_template."template_css.css";
+
+        $editor_layout_row1 = renderButton( str_replace( "\r\n", "", $editor_layout_row1 ), $remove_font );
+        $editor_layout_row2 = renderButton( str_replace( "\r\n", "", $editor_layout_row2 ), $remove_font );
+        $editor_layout_row3 = renderButton( str_replace( "\r\n", "", $editor_layout_row3 ), $remove_font );
+        $editor_layout_row4 = renderButton( str_replace( "\r\n", "", $editor_layout_row4 ), $remove_font );
+        
+        //Plugins List
+        $plugins[] = $editor_extra_plugins;
+        $plugins = implode( ',', $plugins );
+        $elements[] = $editor_xtd_elms;
+        $elements = implode( ',', $elements );
+        $invalid_elements = implode( ',', $invalid_elements );
+
+//Check TinyMCE compression setting and set correct file path
+if ($editor_compression=='true')
+{ $compress_file = "mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce_gzip.php"; }
+else
+{ $compress_file = "mambots/editors/mostlyce/jscripts/tiny_mce/tiny_mce.js"; }
+        
+        return <<<EOD
+<!--//TinyMCE/MosTlyCE-->	
+<script type="text/javascript" src="$jspath/$compress_file"></script>
+<script type="text/javascript" src="$jspath/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_functions.js"></script>
+<script type="text/javascript">
+	tinyMCE.init({
+	    mode : "specific_textareas",
+		theme : "$editor_themes",
+		language : "$editor_lang",
+        lang_list : "$editor_lang_list",
+        table_color_fields : true,
+        paste_use_dialog : true,
+        advimage_constrain_proportions : true,
+        invalid_elements: "$invalid_elements",
+        force_br_newlines : "$br_newlines",
+        force_p_newlines : "$p_newlines",
+        directionality : "$editor_direction",
+		plugins : "$plugins,preview,advlink,advimage,paste,fullscreen,directionality,mambo",
+        theme_advanced_layout_manager : "RowLayout",
+        theme_advanced_containers : "top1,top2,top3,top4,mceEditor,mceElementpath",
+        theme_advanced_containers_default_class : "mceToolbar",
+        theme_advanced_containers_default_align : "center",
+        theme_advanced_container_top1_align : "left",
+        theme_advanced_container_top2_align : "left",
+        theme_advanced_container_top3_align : "left",
+        theme_advanced_container_top4_align : "left",
+        theme_advanced_container_top1 : "$editor_layout_row1",
+        theme_advanced_container_top2 : "$editor_layout_row2",
+        theme_advanced_container_top3 : "$editor_layout_row3",
+        theme_advanced_container_top4 : "$editor_layout_row4",
+        theme_advanced_container_top1_class : "mceToolbarTop",
+        theme_advanced_container_top2_class : "mceToolbarTop",
+        theme_advanced_container_top3_class : "mceToolbarTop",
+        theme_advanced_container_top4_class : "mceToolbarTop",
+        theme_advanced_container_mceElementpath_class : "mcePathBottom",
+		width : "$editor_width",
+        height : "$editor_height",
+        mambo_base_url: "$mosConfig_live_site/",
+        document_base_url: "$mosConfig_live_site/",
+        content_css : "$content_css",
+        plugin_insertdate_dateFormat : "$editor_plugin_dateformat",
+    	plugin_insertdate_timeFormat : "$editor_plugin_timeformat",
+		extended_valid_elements : "hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style],$elements",
+		theme_advanced_resize_horizontal : false,
+		theme_advanced_resizing : true,
+		apply_source_formatting : true,
+		spellchecker_languages : "+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv"
+		});
+</script>
+<!-- /tinyMCE -->
+EOD;
+}
+/**
+* TinyMCE WYSIWYG Editor - copy editor contents to form field
+* @param string The name of the editor area
+* @param string The name of the form field
+*/
+function botmostlyceEditorGetContents( $editorArea, $hiddenField ) {
+        global $jspath;
+
+        return <<<EOD
+        tinyMCE.triggerSave();
+EOD;
+}
+/**
+* mostlyce WYSIWYG Editor - display the editor
+* @param string The name of the editor area
+* @param string The content of the field
+* @param string The name of the form field
+* @param string The width of the editor area
+* @param string The height of the editor area
+* @param int The number of columns for the editor area
+* @param int The number of rows for the editor area
+*/
+function botmostlyceEditorEditorArea( $name, $content, $hiddenField, $width, $height, $col, $row, $showbut=1 ) {
+        global $jspath, $_MAMBOTS;
+
+        $results = $_MAMBOTS->trigger( 'onCustomEditorButton' );
+        $buttons = array();
+        foreach ($results as $result) {
+               $buttons[] = '<img src="'.$jspath.'/mambots/editors-xtd/'.$result[0].'" onclick="tinyMCE.execCommand(\'mceInsertContent\',false,\''.$result[1].'\')" />';
+        }
+            $buttons = implode( "", $buttons );
+
+        return <<<EOD
+<textarea id="$hiddenField" name="$hiddenField" cols="$col" rows="$row" style="width:{$width}px; height:{$height}px;" mce_editable="true">$content</textarea>
+<br />$buttons
+EOD;
+}
+?>
diff -ruN 4.5.4/mambots/editors/mostlyce.xml 4.6rc2/mambots/editors/mostlyce.xml
--- 4.5.4/mambots/editors/mostlyce.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/mostlyce.xml	2006-06-20 01:01:27.000000000 -0500
@@ -0,0 +1,681 @@
+<?xml version="1.0" ?>
+
+<mosinstall version="4.6" type="mambot" group="editors">
+<name>MOStlyCE</name>
+<version>1.7</version>
+<creationDate>May 2006</creationDate>
+<author>Chad Auld</author>
+<authorEmail>cauld@mambo-foundation.org</authorEmail>
+<authorUrl>http://opensourcepenguin.net</authorUrl>
+<copyright>Chad Auld 2006</copyright>
+<license>LGPL</license>
+<description><![CDATA[<p>MOStlyContent Editor - a wysiwyg editor for Mambo, based on Moxiecode's 
+TinyMCE! and mosCE.</p><p>Features:</p><p>All the features of TinyMCE by Moxiecode and 
+mosCE 1.0.3 Final.  Now with a recent version of TinyMCE, Advanced and Simple themes, editor compression, dynamic plugin loading, plus more.</p><p>History:  Ryan Demmer has moved on and is no longer developing the mosCE editor.  Since futher development is not planned for mosCE I decided to create MOStlyCE based on mosCE and continue development.</p>]]></description>
+    <files>
+      <filename mambot="mostlyce">mostlyce.php</filename>
+      <filename>mostlyce.xml</filename>
+      <filename>mostlyce/index.html</filename>
+      <filename>mostlyce/lgpl.txt</filename>
+      <filename>mostlyce/docs/index.html</filename>
+      <filename>mostlyce/docs/css/index.html</filename>
+      <filename>mostlyce/docs/css/screen.css</filename>
+      <filename>mostlyce/docs/images/index.html</filename>
+      <filename>mostlyce/docs/images/moxiecode.gif</filename>
+      <filename>mostlyce/docs/reference_javascript_functions.html</filename>
+      <filename>mostlyce/docs/plugin_zoom.html</filename>
+      <filename>mostlyce/docs/plugin_searchreplace.html</filename>
+      <filename>mostlyce/docs/plugin_save.html</filename>
+      <filename>mostlyce/docs/plugin_print.html</filename>
+      <filename>mostlyce/docs/plugin_preview.html</filename>
+      <filename>mostlyce/docs/plugin_noneditable.html</filename>
+      <filename>mostlyce/docs/plugin_insertdatetime.html</filename>
+      <filename>mostlyce/docs/plugin_inlinepopups.html</filename>
+      <filename>mostlyce/docs/plugin_iespell.html</filename>
+      <filename>mostlyce/docs/plugin_fullscreen.html</filename>
+      <filename>mostlyce/docs/plugin_fullpage.html</filename>
+      <filename>mostlyce/docs/plugin_flash.html</filename>
+      <filename>mostlyce/docs/plugin_emotions.html</filename>
+      <filename>mostlyce/docs/plugin_directionality.html</filename>
+      <filename>mostlyce/docs/plugin_contextmenu.html</filename>
+      <filename>mostlyce/docs/plugin_autosave.html</filename>
+      <filename>mostlyce/docs/plugin_advhr.html</filename>
+      <filename>mostlyce/docs/option_width.html</filename>
+      <filename>mostlyce/docs/option_visual_table_class.html</filename>
+      <filename>mostlyce/docs/option_visual.html</filename>
+      <filename>mostlyce/docs/option_verify_html.html</filename>
+      <filename>mostlyce/docs/option_verify_css_classes.html</filename>
+      <filename>mostlyce/docs/option_urlconverter_callback.html</filename>
+      <filename>mostlyce/docs/option_trim_span_elements.html</filename>
+      <filename>mostlyce/docs/option_theme.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_toolbar_location.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_toolbar_align.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_styles.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_statusbar_location.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_source_editor_width.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_source_editor_height.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_resizing_use_cookie.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_resizing.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_resize_horizontal.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_path_location.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_path.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_link_targets.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_layout_manager.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_fonts.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_disable.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_custom_layout.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_containers.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_containers_default_class.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_containers_default_align.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_container.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_container_class.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_container_align.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_buttons_n.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_buttons_n_add.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_buttons_n_add_before.html</filename>
+      <filename>mostlyce/docs/option_textarea_trigger.html</filename>
+      <filename>mostlyce/docs/option_table_inline_editing.html</filename>
+      <filename>mostlyce/docs/option_submit_patch.html</filename>
+      <filename>mostlyce/docs/option_setupcontent_callback.html</filename>
+      <filename>mostlyce/docs/option_save_callback.html</filename>
+      <filename>mostlyce/docs/option_remove_script_host.html</filename>
+      <filename>mostlyce/docs/option_remove_linebreaks.html</filename>
+      <filename>mostlyce/docs/option_relative_urls.html</filename>
+      <filename>mostlyce/docs/option_preformatted.html</filename>
+      <filename>mostlyce/docs/option_popups_css.html</filename>
+      <filename>mostlyce/docs/option_plugins.html</filename>
+      <filename>mostlyce/docs/option_onpageload.html</filename>
+      <filename>mostlyce/docs/option_oninit.html</filename>
+      <filename>mostlyce/docs/option_onchange_callback.html</filename>
+      <filename>mostlyce/docs/option_object_resizing.html</filename>
+      <filename>mostlyce/docs/option_nowrap.html</filename>
+      <filename>mostlyce/docs/option_mode.html</filename>
+      <filename>mostlyce/docs/option_merge_styles_invalid_parents.html</filename>
+      <filename>mostlyce/docs/option_invalid_elements.html</filename>
+      <filename>mostlyce/docs/option_insertlink_callback.html</filename>
+      <filename>mostlyce/docs/option_insertimage_callback.html</filename>
+      <filename>mostlyce/docs/option_inline_styles.html</filename>
+      <filename>mostlyce/docs/option_init_instance_callback.html</filename>
+      <filename>mostlyce/docs/option_height.html</filename>
+      <filename>mostlyce/docs/option_force_p_newlines.html</filename>
+      <filename>mostlyce/docs/option_force_hex_style_colors.html</filename>
+      <filename>mostlyce/docs/option_force_br_newlines.html</filename>
+      <filename>mostlyce/docs/option_font_size_style_values.html</filename>
+      <filename>mostlyce/docs/option_font_size_classes.html</filename>
+      <filename>mostlyce/docs/option_focus_alert.html</filename>
+      <filename>mostlyce/docs/option_fix_content_duplication.html</filename>
+      <filename>mostlyce/docs/option_file_browser_callback.html</filename>
+      <filename>mostlyce/docs/option_external_link_list_url.html</filename>
+      <filename>mostlyce/docs/option_external_image_list_url.html</filename>
+      <filename>mostlyce/docs/option_extended_valid_elements.html</filename>
+      <filename>mostlyce/docs/option_execcommand_callback.html</filename>
+      <filename>mostlyce/docs/option_event_elements.html</filename>
+      <filename>mostlyce/docs/option_entity_encoding.html</filename>
+      <filename>mostlyce/docs/option_entities.html</filename>
+      <filename>mostlyce/docs/option_encoding.html</filename>
+      <filename>mostlyce/docs/option_elements.html</filename>
+      <filename>mostlyce/docs/option_editor_selector.html</filename>
+      <filename>mostlyce/docs/option_editor_deselector.html</filename>
+      <filename>mostlyce/docs/option_editor_css.html</filename>
+      <filename>mostlyce/docs/option_document_base_url.html</filename>
+      <filename>mostlyce/docs/option_doctype.html</filename>
+      <filename>mostlyce/docs/option_directionality.html</filename>
+      <filename>mostlyce/docs/option_dialog_type.html</filename>
+      <filename>mostlyce/docs/option_debug.html</filename>
+      <filename>mostlyce/docs/option_custom_undo_redo_restore_selection.html</filename>
+      <filename>mostlyce/docs/option_custom_undo_redo_levels.html</filename>
+      <filename>mostlyce/docs/option_custom_undo_redo_keyboard_shortcuts.html</filename>
+      <filename>mostlyce/docs/option_custom_undo_redo.html</filename>
+      <filename>mostlyce/docs/option_custom_shortcuts.html</filename>
+      <filename>mostlyce/docs/option_convert_urls.html</filename>
+      <filename>mostlyce/docs/option_convert_newlines_to_brs.html</filename>
+      <filename>mostlyce/docs/option_convert_fonts_to_spans.html</filename>
+      <filename>mostlyce/docs/option_cleanup_on_startup.html</filename>
+      <filename>mostlyce/docs/option_cleanup.html</filename>
+      <filename>mostlyce/docs/option_cleanup_callback.html</filename>
+      <filename>mostlyce/docs/option_button_tile_map.html</filename>
+      <filename>mostlyce/docs/option_browsers.html</filename>
+      <filename>mostlyce/docs/option_auto_resize.html</filename>
+      <filename>mostlyce/docs/option_auto_reset_designmode.html</filename>
+      <filename>mostlyce/docs/option_auto_focus.html</filename>
+      <filename>mostlyce/docs/option_ask.html</filename>
+      <filename>mostlyce/docs/option_apply_source_formatting.html</filename>
+      <filename>mostlyce/docs/option_add_unload_trigger.html</filename>
+      <filename>mostlyce/docs/option_add_form_submit_trigger.html</filename>
+      <filename>mostlyce/docs/option_accessibility_warnings.html</filename>
+      <filename>mostlyce/docs/option_accessibility_focus.html</filename>
+      <filename>mostlyce/docs/license.html</filename>
+      <filename>mostlyce/docs/installing.html</filename>
+      <filename>mostlyce/docs/installation_example_03.html</filename>
+      <filename>mostlyce/docs/installation_example_02.html</filename>
+      <filename>mostlyce/docs/installation_example_01.html</filename>
+      <filename>mostlyce/docs/installation_example_00.html</filename>
+      <filename>mostlyce/docs/faq.html</filename>
+      <filename>mostlyce/docs/customization_themes.html</filename>
+      <filename>mostlyce/docs/customization_plugins.html</filename>
+      <filename>mostlyce/docs/compatiblity_chart.html</filename>
+      <filename>mostlyce/docs/about.html</filename>
+      <filename>mostlyce/docs/plugin_paste.html</filename>
+      <filename>mostlyce/docs/plugin_advlink.html</filename>
+      <filename>mostlyce/docs/plugin_advimage.html</filename>
+      <filename>mostlyce/docs/option_valid_elements.html</filename>
+      <filename>mostlyce/docs/option_content_css.html</filename>
+      <filename>mostlyce/docs/plugin_table.html</filename>
+      <filename>mostlyce/docs/option_fix_list_elements.html</filename>
+      <filename>mostlyce/docs/option_fix_table_elements.html</filename>
+      <filename>mostlyce/docs/option_handle_event_callback.html</filename>
+      <filename>mostlyce/docs/plugin_spellchecker.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_blockformats.html</filename>
+      <filename>mostlyce/docs/option_theme_advanced_source_editor_wrap.html</filename>
+      <filename>mostlyce/docs/option_strict_loading_mode.html</filename>
+      <filename>mostlyce/docs/reference_plugins.html</filename>
+      <filename>mostlyce/docs/reference_buttons.html</filename>
+      <filename>mostlyce/docs/plugin_style.html</filename>
+      <filename>mostlyce/docs/plugin_layer.html</filename>
+      <filename>mostlyce/docs/option_language.html</filename>
+      <filename>mostlyce/docs/option_docs_language.html</filename>
+      <filename>mostlyce/docs/customization_language_packs.html</filename>
+      <filename>mostlyce/docs/reference_configuration.html</filename>
+      <filename>mostlyce/docs/option_hidden_tab_class.html</filename>
+      <filename>mostlyce/docs/option_display_tab_class.html</filename>
+      <filename>mostlyce/docs/credits.html</filename>
+      <filename>mostlyce/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/auth_plugin.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/blank.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/license.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/mostlyce_config.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/mostlyce_functions.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/tiny_mce.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/tiny_mce_gzip.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/tiny_mce_popup.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/tiny_mce_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/utils/editable_selects.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/utils/form_utils.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/utils/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/utils/mclayer.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/utils/mctabs.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/utils/validate.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/info/editor_info_english.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/info/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/langs/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/rule.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/css/advhr.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/images/advhr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/jscripts/rule.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advhr/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/image.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/css/advimage.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/images/sample.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/functions.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advimage/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/link.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/css/advlink.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/functions.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/advlink/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/autosave/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/autosave/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/autosave/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/autosave/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/cleanup/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/cleanup/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/cleanup/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/cleanup/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/contextmenu.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/contextmenu/images/spacer.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/images/ltr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/images/rtl.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/directionality/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/emotions.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/emotions.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-cool.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-cry.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-embarassed.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-frown.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-innocent.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-kiss.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-laughing.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-sealed.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-smile.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-surprised.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-undecided.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-wink.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/images/smiley-yell.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/emotions/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/flash.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/css/content.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/css/flash.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/images/flash.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/flash.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/flash/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/blank.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/images/add.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/images/fullpage.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/images/move_down.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/images/move_up.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/images/remove.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/fullpage.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullpage/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/fullscreen.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/fullscreen/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/htmltemplate.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/htmltemplate/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/images/iespell.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/iespell/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/css/inlinepopup.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/spacer.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_close.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_maximize.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_minimize.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/images/window_resize.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/inlinepopups/jscripts/mcwindows.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/insertdate.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/images/inserttime.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/insertdatetime/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/images/absolute.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/images/backward.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/images/forward.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/images/insert_layer.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/layer/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/mospagebreak.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/images/mosimage.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/images/mospagebreak.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/de.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fi.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/fr.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/nl.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pl.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/pt_br.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/mambo/langs/th.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/noneditable/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/noneditable/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/noneditable/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/noneditable/css/noneditable.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/blank.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/pastetext.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/pasteword.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/css/blank.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/css/pasteword.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/images/pastetext.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/images/pasteword.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/images/selectall.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pastetext.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/jscripts/pasteword.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/paste/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/example.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/images/preview.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/preview/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/images/print.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/print/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/images/save.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/save/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/replace.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/search.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/replace.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/images/search.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/replace.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/jscripts/search.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/config.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/tinyspell.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/HttpClient.class.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyGoogleSpell.class.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspell.class.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/classes/TinyPspellShell.class.php</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/content.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/css/spellchecker.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/spellchecker.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/images/wline.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/spellchecker/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/props.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/css/props.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/images/apply_button_bg.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/images/style_info.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/jscripts/props.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/style/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/cell.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/merge_cells.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/row.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/table.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/css/cell.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/css/row.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/css/table.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/buttons.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_cell_props.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete_col.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_delete_row.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_col_after.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_col_before.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_row_after.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_insert_row_before.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_merge_cells.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_row_props.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/images/table_split_cells.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/jscripts/cell.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/jscripts/merge_cells.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/jscripts/row.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/jscripts/table.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/table/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/popup.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/images/template.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/_template/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/zoom/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/plugins/zoom/readme.txt</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/about.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/anchor.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/charmap.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/color_picker.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/editor_template.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/editor_template_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/image.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/link.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/source_editor.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_content.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_popup.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/about.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/style.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/anchor.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/anchor_symbol.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/backcolor.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_de_se.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_es.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_fr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bold.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_ru.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bold_tw.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/browse.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/bullist.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/button_menu.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/buttons.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/cancel_button_bg.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/charmap.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/cleanup.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/close.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/code.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/color.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/copy.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/custom_1.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/cut.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/forecolor.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/help.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/hr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/image.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/indent.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/insert_button_bg.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_de_se.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_es.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/italic.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_ru.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/italic_tw.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/justifycenter.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyfull.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyleft.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/justifyright.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/link.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/menu_check.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/newdocument.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/numlist.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/opacity.png</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/outdent.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/paste.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/redo.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/removeformat.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/separator.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/spacer.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/statusbar_resize.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/strikethrough.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/sub.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/sup.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_es.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_fr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/underline.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_ru.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/underline_tw.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/undo.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/unlink.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/visualaid.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_bg.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_end.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tabs_bg.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_sel_bg.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/images/xp/tab_sel_end.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/about.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/anchor.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/charmap.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/color_picker.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/image.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/link.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/langs/en.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/advanced/langs/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/editor_template.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/editor_template_src.js</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/css/editor_content.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/css/editor_popup.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/css/editor_ui.css</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/css/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/bold_de_se.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/bold_fr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/bold.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/bold_ru.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/bold_tw.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/bullist.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/buttons.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/cleanup.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/index.html</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/italic_de_se.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/italic.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/italic_ru.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/italic_tw.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/numlist.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/redo.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/separator.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/spacer.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/strikethrough.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/underline_fr.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/underline.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/underline_ru.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/underline_tw.gif</filename>
+      <filename>mostlyce/jscripts/tiny_mce/themes/simple/images/undo.gif</filename>
+    </files>
+</mosinstall>
diff -ruN 4.5.4/mambots/editors/none.php 4.6rc2/mambots/editors/none.php
--- 4.5.4/mambots/editors/none.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/none.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: none.php,v 1.1 2005/07/22 01:57:50 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/mambots/editors/tinymce/docs/credits.html 4.6rc2/mambots/editors/tinymce/docs/credits.html
--- 4.5.4/mambots/editors/tinymce/docs/credits.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/credits.html	2006-04-30 15:27:06.000000000 -0500
@@ -24,7 +24,6 @@
 			<ul>
 				<li class="list_subtitle">Code / Solutions / Features</li>
 				<ul>
-					<li>Digital Ventures</li>
 					<li>donadoni</li>
 					<li>Michael Keck</li>
 					<li>Victor Nilsson</li>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/customization_language_packs.html 4.6rc2/mambots/editors/tinymce/docs/customization_language_packs.html
--- 4.5.4/mambots/editors/tinymce/docs/customization_language_packs.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/customization_language_packs.html	2006-04-30 15:27:06.000000000 -0500
@@ -12,7 +12,7 @@
 
 <div class="content">
 	<h2>Making language packs</h2>
-	<p>Language packs are simply JavaScript name/value arrays placed in the &quot;<ISO-639-1 code>.js&quot; files in the &quot;lang&quot; directory. Remember to allways use the &quot;lang_&quot; prefix for these value names so that they don't override other variables in the templates. The example below shows how the cut, copy and paste texts are lang packed. Notice there are three kinds of language packs the first one is the general one shared by all themes these are located in the &quot;jscripts/tiny_mce/langs&quot; directory the secound ones are theme specific language packs these are contained in &quot;jscripts/tiny_mce/themes/&lt;some theme&gt;/langs&quot; and the last one is plugin specific language packs located in each plugin.
+	<p>Language packs are simply JavaScript name/value arrays placed in the &quot;<ISO-639-2 code>.js&quot; files in the &quot;lang&quot; directory. Remember to allways use the &quot;lang_&quot; prefix for these value names so that they don't override other variables in the templates. The example below shows how the cut, copy and paste texts are lang packed. Notice there are three kinds of language packs the first one is the general one shared by all themes these are located in the &quot;jscripts/tiny_mce/langs&quot; directory the secound ones are theme specific language packs these are contained in &quot;jscripts/tiny_mce/themes/&lt;some theme&gt;/langs&quot; and the last one is plugin specific language packs located in each plugin.
 	</p>
 	<p>
 	<div class="example">
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_display_tab_class.html 4.6rc2/mambots/editors/tinymce/docs/option_display_tab_class.html
--- 4.5.4/mambots/editors/tinymce/docs/option_display_tab_class.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_display_tab_class.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: display_tab_class</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: display_tab_class</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the display_tab_class option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>display_tab_class : "showTab"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_docs_language.html 4.6rc2/mambots/editors/tinymce/docs/option_docs_language.html
--- 4.5.4/mambots/editors/tinymce/docs/option_docs_language.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_docs_language.html	2006-04-30 15:27:06.000000000 -0500
@@ -12,7 +12,7 @@
 
 <div class="content">
 	<p>
-		This option should contain a language code of the editor documentation to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of &quot;tinymce/jscripts/tiny_mce/theme/&lt;theme used&gt;/docs&quot;. The default value of this option is the value specified in the  &quot;language&quot; option or &quot;en&quot; for English.
+		This option should contain a language code of the editor documentation to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-2</a> format to see if your language is available check the contents of &quot;tinymce/jscripts/tiny_mce/theme/&lt;theme used&gt;/docs&quot;. The default value of this option is the value specified in the  &quot;language&quot; option or &quot;en&quot; for English.
 	</p>
 
 	<div class="separator"></div>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_hidden_tab_class.html 4.6rc2/mambots/editors/tinymce/docs/option_hidden_tab_class.html
--- 4.5.4/mambots/editors/tinymce/docs/option_hidden_tab_class.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_hidden_tab_class.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: hidden_tab_class</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: hidden_tab_class</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the hidden_tab_class option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>hidden_tab_class : "hideTab"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_language.html 4.6rc2/mambots/editors/tinymce/docs/option_language.html
--- 4.5.4/mambots/editors/tinymce/docs/option_language.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_language.html	2006-04-30 15:27:06.000000000 -0500
@@ -12,7 +12,7 @@
 
 <div class="content">
 	<p>
-		This option should contain a language code of the language pack to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of &quot;tinymce/jscripts/tiny_mce/langs&quot;. The default value of this option is &quot;en&quot; for English.
+		This option should contain a language code of the language pack to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-2</a> format to see if your language is available check the contents of &quot;tinymce/jscripts/tiny_mce/langs&quot;. The default value of this option is &quot;en&quot; for English.
 	</p>
 
 	<p>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_strict_loading_mode.html 4.6rc2/mambots/editors/tinymce/docs/option_strict_loading_mode.html
--- 4.5.4/mambots/editors/tinymce/docs/option_strict_loading_mode.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_strict_loading_mode.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>Option: strict_loading_mode</title>
-	<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: strict_loading_mode</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option will force TinyMCE to load script using a DOM insert method instead of document.write on Gecko browsers. Since this results in asynchronous script loading a build in synchronized will ensure that themes, plugins and language packs files are loaded in the correct order. This will on the otherhand make the initialization procedure of TinyMCE a bit slower thats why this isn't the default behavior. So this option is set to true by default if the document content type is application/xhtml+xml.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the strict_loading_mode option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>strict_loading_mode : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_theme_advanced_blockformats.html 4.6rc2/mambots/editors/tinymce/docs/option_theme_advanced_blockformats.html
--- 4.5.4/mambots/editors/tinymce/docs/option_theme_advanced_blockformats.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_theme_advanced_blockformats.html	2006-04-30 15:27:06.000000000 -0500
@@ -22,7 +22,7 @@
 <pre>
 tinyMCE.init({
 	...
-	<strong>theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6,div,blockquote,dt,dd,code,samp"</strong>
+	<strong>theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6"</strong>
 });
 </pre>
 	</div>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/option_theme_advanced_source_editor_wrap.html 4.6rc2/mambots/editors/tinymce/docs/option_theme_advanced_source_editor_wrap.html
--- 4.5.4/mambots/editors/tinymce/docs/option_theme_advanced_source_editor_wrap.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/option_theme_advanced_source_editor_wrap.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_source_editor_wrap</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_source_editor_wrap</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to force word wrap for the source editor, this option is set to true by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_source_editor_wrap option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_source_editor_wrap : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/plugin_layer.html 4.6rc2/mambots/editors/tinymce/docs/plugin_layer.html
--- 4.5.4/mambots/editors/tinymce/docs/plugin_layer.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/plugin_layer.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Plugin: layer</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Plugin: layer</h1>
-</div>
-
-<div class="content">
-	<p>Adds a layer suport to TinyMCE by making it possible to create/remove and z-index block elements.</p>
-
-	<p>These are the possible button control that this plugin contains: insertlayer,moveforward,movebackward,absolute</p>
-
-	<h3>Installation Instructions</h3>
-	<p>
-	<ul>
-		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;layer&quot;.</li>
-		<li>Add the insertlayer,moveforward,movebackward,absolute button names to button list, example: theme_advanced_buttons3_add : &quot;insertlayer,moveforward,movebackward,absolute&quot;.</li>
-	</ul>
-	</p>
-	<h3>Initialization Example</h3>
-	<p>
-	<div class="example">
-	<pre>
-tinyMCE.init({
-	theme : &quot;advanced&quot;,
-	mode : &quot;textareas&quot;,
-	plugins : &quot;<strong>layer</strong>&quot;,
-	theme_advanced_buttons3_add : &quot;<strong>insertlayer,moveforward,movebackward,absolute</strong>&quot;
-});</pre>
-	</div>
-	</p>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/plugin_spellchecker.html 4.6rc2/mambots/editors/tinymce/docs/plugin_spellchecker.html
--- 4.5.4/mambots/editors/tinymce/docs/plugin_spellchecker.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/plugin_spellchecker.html	2006-04-30 15:27:06.000000000 -0500
@@ -21,16 +21,6 @@
 		<li>Add the button name to button list, example: theme_advanced_buttons3_add : &quot;spellchecker&quot;.</li>
 	</ol>
 	</p>
-	<h3>Spellchecker plugins/modes</h3>
-	<p>
-		TinyMCE Spellchecker currently supports 3 modes. These are available as configurable PHP classes.
-		<ul>
-			<li>TinyPspell - Run pspell within PHP. (PHP needs to be compiled with pspell support)</li>
-			<li>TinyPspellShell - Run pspell as a command line shell application.</li>
-			<li>TinyGoogleSpell - Use HTTP proxy bridge to connect to a Google XML Web Service.</li>
-		</ul>
-		Use this as the value for the the languages option when you are using the GoogleSpell class: +English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv
-	<br /><br /></p>
 	<h3>Initialization Example</h3>
 	<p>
 	<div class="example">
@@ -61,6 +51,7 @@
  	</tr>
 	</table>
 	</p>
+
 </div>
 
 <div class="footer">
@@ -68,5 +59,6 @@
 	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
 	<br style="clear: both" />
 </div>
+
 </body>
 </html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/plugin_style.html 4.6rc2/mambots/editors/tinymce/docs/plugin_style.html
--- 4.5.4/mambots/editors/tinymce/docs/plugin_style.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/plugin_style.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,303 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Plugin: style</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Plugin: style</h1>
-</div>
-
-<div class="content">
-	<p>Adds CSS style editing support to TinyMCE, this will enable you to edit allmost any CSS style property in a visual way.</p>
-
-	<h3>Installation Instructions</h3>
-	<p>
-	<ul>
-		<li>Add plugin to TinyMCE plugin option list example: plugins : &quot;style&quot;.</li>
-		<li>Add the styleprops butto names to button list, example: theme_advanced_buttons3_add : &quot;styleprops&quot;.</li>
-	</ul>
-	</p>
-	<h3>Initialization Example</h3>
-	<p>
-	<div class="example">
-	<pre>
-tinyMCE.init({
-	theme : &quot;advanced&quot;,
-	mode : &quot;textareas&quot;,
-	plugins : &quot;<strong>style</strong>&quot;,
-	theme_advanced_buttons3_add : &quot;<strong>styleprops</strong>&quot;
-});</pre>
-	</div>
-	</p>
-	<br />
-
-	<h3>Options</h3>
-	<p>
-	<table border="1" cellspacing="0" cellpadding="4">
-	<tr>
-		<td>[style_font]</td>
-		<td>Semicolon separated list of select box option name/values. Default: Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;Times New Roman, Times, serif=Times New Roman, Times, serif;Courier New, Courier, mono=Courier New, Courier, mono;Times New Roman, Times, serif=Times New Roman, Times, serif;Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif</td>
-	</tr>
-	<tr>
-		<td>[style_font_size]</td>
-		<td>Semicolon separated list of select box option name/values. In format key1=value1;key2=value2;..</td>
-	</tr>
-	<tr>
-		<td>[style_font_size_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_text_case]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_font_weight]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_font_style]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_font_variant]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_font_line_height]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_font_line_height_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_background_attachment]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_background_repeat]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_background_hpos_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_background_vpos_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_background_hpos]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_background_vpos]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_wordspacing]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_wordspacing_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_letterspacing]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_letterspacing_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_vertical_alignment]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_text_align]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_whitespace]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_display]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_text_indent_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_box_width_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_box_height_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_float]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_clear]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_padding_left_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_padding_top_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_padding_bottom_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_padding_right_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_margin_left_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_margin_top_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_margin_bottom_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_margin_right_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_style_top]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_style_right]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_style_bottom]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_style_left]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_top]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_right]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_bottom]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_left]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_top_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_right_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_bottom_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_border_width_left_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_list_type]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_list_position]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_type]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_visibility]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_width_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_height_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_overflow]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_placement_top_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_placement_right_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_placement_bottom_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_placement_left_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_clip_top_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_clip_right_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_clip_bottom_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	<tr>
-		<td>[style_positioning_clip_left_measurement]</td>
-		<td>Semicolon separated list of select box option name/values.</td>
-	</tr>
-	</table>
-	</p>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/reference_buttons.html 4.6rc2/mambots/editors/tinymce/docs/reference_buttons.html
--- 4.5.4/mambots/editors/tinymce/docs/reference_buttons.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/reference_buttons.html	2006-04-30 15:27:06.000000000 -0500
@@ -122,22 +122,10 @@
 				<li>ltr</li>
 				<li>rtl</li>
 			</ul>
-		<li><a href="plugin_layer.html">layer</a></li>
-			<ul>
-				<li>moveforward</li>
-				<li>movebackward</li>
-				<li>absolute</li>
-				<li>insertlayer</li>
-			</ul>
-		<li><a href="plugin_style.html">style</a></li>
-			<ul>
-				<li>styleprops</li>
-			</ul>
 	</ul>
 	</p>
 </div>
 
-
 <div class="footer">
 	<div class="helpindexlink"><a href="index.html">Index</a></div>
 	<div class="copyright">Copyright &copy; 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/reference_configuration.html 4.6rc2/mambots/editors/tinymce/docs/reference_configuration.html
--- 4.5.4/mambots/editors/tinymce/docs/reference_configuration.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/reference_configuration.html	2006-04-30 15:27:06.000000000 -0500
@@ -48,7 +48,6 @@
 				<li><a href="option_table_inline_editing.html">table_inline_editing</a></li>
 				<li><a href="option_object_resizing.html">object_resizing</a></li>
 				<li><a href="option_custom_shortcuts.html">custom_shortcuts</a></li>
-				<li><a href="option_strict_loading_mode.html">strict_loading_mode</a></li>
 			</ul>
 
 			<h3>Cleanup/Output</h3>
@@ -139,12 +138,6 @@
 				<li><a href="option_external_image_list_url.html">external_image_list_url</a></li>
 			</ul>
 
-			<h3>Tab specific</h3>
-			<ul class="optionlist">
-				<li><a href="option_display_tab_class.html">display_tab_class</a></li>
-				<li><a href="option_hidden_tab_class.html">hidden_tab_class</a></li>
-			</ul>
-
 			</div>
 			<div class="column">
 
@@ -162,7 +155,6 @@
 				<li><a href="option_theme_advanced_styles.html">theme_advanced_styles</a></li>
 				<li><a href="option_theme_advanced_source_editor_width.html">theme_advanced_source_editor_width</a></li>
 				<li><a href="option_theme_advanced_source_editor_height.html">theme_advanced_source_editor_height</a></li>
-				<li><a href="option_theme_advanced_source_editor_wrap.html">theme_advanced_source_editor_wrap</a></li>
 				<li><a href="option_theme_advanced_toolbar_location.html">theme_advanced_toolbar_location</a></li>
 				<li><a href="option_theme_advanced_toolbar_align.html">theme_advanced_toolbar_align</a></li>
 				<li><a href="option_theme_advanced_statusbar_location.html">theme_advanced_statusbar_location</a></li>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/reference_plugins.html 4.6rc2/mambots/editors/tinymce/docs/reference_plugins.html
--- 4.5.4/mambots/editors/tinymce/docs/reference_plugins.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/reference_plugins.html	2006-04-30 15:27:06.000000000 -0500
@@ -28,8 +28,6 @@
 				<li><a href="plugin_emotions.html">emotions</a></li>
 				<li><a href="plugin_flash.html">flash</a></li>
 				<li><a href="plugin_autosave.html">autosave</a></li>
-				<li><a href="plugin_style.html">style</a></li>
-				<li><a href="plugin_layer.html">layer</a></li>
 			</ul>
 		</div>		
 		<div class="column">
@@ -41,7 +39,6 @@
 				<li><a href="plugin_print.html">print</a></li>
 				<li><a href="plugin_save.html">save</a></li>
 				<li><a href="plugin_noneditable.html">noneditable</a></li>
-				<li><a href="plugin_spellchecker.html">spellchecker</a></li>
 			</ul>
 		</div>
 		<div class="column">
@@ -54,6 +51,7 @@
 				<li><a href="plugin_fullpage.html">fullpage</a></li>
 				<li><a href="plugin_inlinepopups.html">inlinepopups</a></li>
 				<li><a href="plugin_fullpage.html">fullpage</a></li>
+				<li><a href="plugin_spellchecker.html">spellchecker</a></li>
 			</ul>
 		</div>
 		<br style="clear: both" />
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/GLOBALS.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/GLOBALS.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/GLOBALS.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/GLOBALS.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,267 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-GLOBALS
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="GLOBALS";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<B>PREV CLASS</B><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Cleanup.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="GLOBALS.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class GLOBALS</H2>
-<PRE>Object
-   |
-   +--<b>GLOBALS</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>GLOBALS</B>
-   
-
-</DL>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&lt;static&gt;&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#!s!TinyMCE_Menu">TinyMCE_Menu</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Constructor for the menu layer class.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="!s!TinyMCE_Menu"><!-- --></A>
-   <H3>TinyMCE_Menu</H3>
-   <PRE>&lt;static&gt; void <B>TinyMCE_Menu</B>()</PRE>
-   
-      <UL>Constructor for the menu layer class.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<B>PREV CLASS</B><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Cleanup.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="GLOBALS.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Cleanup.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Cleanup.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Cleanup.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Cleanup.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,675 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_Cleanup
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_Cleanup";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Cleanup.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="GLOBALS.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Control.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Cleanup.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_Cleanup</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_Cleanup</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_Cleanup</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_Cleanup.class.js.html'>TinyMCE_Cleanup.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_Cleanup.html#TinyMCE_Cleanup()">TinyMCE_Cleanup</A> 
-	 </B>
-	 ()
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      TinyMCE_Cleanup class.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addRuleStr">addRuleStr</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a cleanup rule string, for TinyMCE_Cleanup.prototype.example = a;[href|name|title=title|class=class1?class2?class3].
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#formatHTML">formatHTML</A></B>(&lt;string&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Applies source formatting/indentation on the specified HTML string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#init">init</A></B>(&lt;Array&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Initializes the cleanup engine with the specified config.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#parseRuleStr">parseRuleStr</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Parses a cleanup rule string, for TinyMCE_Cleanup.prototype.example = a;[href|name|title=title|class=class1?class2?class3].
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#serializeNodeAsHTML">serializeNodeAsHTML</A></B>(&lt;HTMLNode&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Serializes the specified node as a XHTML string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#serializeNodeAsXML">serializeNodeAsXML</A></B>(&lt;HTMLNode&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Serializes the specified node as a HTML string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#split">split</A></B>(&lt;RegEx&gt; re, &lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Splits the specified string and removed empty chunks.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#xmlEncode">xmlEncode</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 XML Encodes the specified string based on configured entity encoding.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_Cleanup()"><!-- --></A><H3>
-TinyMCE_Cleanup</H3>
-<PRE><B>TinyMCE_Cleanup</B>()</PRE>
-
-
-<UL>
-   TinyMCE_Cleanup class.
-</UL>
-
-
-
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="addRuleStr"><!-- --></A>
-   <H3>addRuleStr</H3>
-   <PRE>void <B>addRuleStr</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Adds a cleanup rule string, for TinyMCE_Cleanup.prototype.example = a;[href|name|title=title|class=class1?class2?class3].
- These rules are then used when serializing the DOM tree as a HTML string, it gives the possibility
- to control the valid elements and attributes and force attribute values or default them.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  Rule string to parse and add to the cleanup rules array. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="formatHTML"><!-- --></A>
-   <H3>formatHTML</H3>
-   <PRE>string <B>formatHTML</B>(&lt;string&gt; h)</PRE>
-   
-      <UL>Applies source formatting/indentation on the specified HTML string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>h</CODE> -  HTML string to apply formatting to.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Formatted HTML string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="init"><!-- --></A>
-   <H3>init</H3>
-   <PRE>void <B>init</B>(&lt;Array&gt; s)</PRE>
-   
-      <UL>Initializes the cleanup engine with the specified config.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  Name/Value array with config settings. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="parseRuleStr"><!-- --></A>
-   <H3>parseRuleStr</H3>
-   <PRE>Array <B>parseRuleStr</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Parses a cleanup rule string, for TinyMCE_Cleanup.prototype.example = a;[href|name|title=title|class=class1?class2?class3].
- These rules are then used when serializing the DOM tree as a HTML string, it gives the possibility
- to control the valid elements and attributes and force attribute values or default them.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  Rule string to parse as a name/value rule array.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Parsed name/value rule array.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="serializeNodeAsHTML"><!-- --></A>
-   <H3>serializeNodeAsHTML</H3>
-   <PRE>string <B>serializeNodeAsHTML</B>(&lt;HTMLNode&gt; n)</PRE>
-   
-      <UL>Serializes the specified node as a XHTML string. This uses the TinyMCE serializer logic since it gives more
- control over the output than the build in browser XML serializer.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node to serialize as a XHTML string.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Serialized XHTML string based on specified node.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="serializeNodeAsXML"><!-- --></A>
-   <H3>serializeNodeAsXML</H3>
-   <PRE>string <B>serializeNodeAsXML</B>(&lt;HTMLNode&gt; n)</PRE>
-   
-      <UL>Serializes the specified node as a HTML string. This uses the XML parser and serializer
- to generate a XHTML string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node to serialize as a XHTML string.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Serialized XHTML string based on specified node.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="split"><!-- --></A>
-   <H3>split</H3>
-   <PRE>string <B>split</B>(&lt;RegEx&gt; re, &lt;string&gt; s)</PRE>
-   
-      <UL>Splits the specified string and removed empty chunks.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>re</CODE> -  RegEx to split string by.  
-      </UL> 
-   
-     <UL><CODE>s</CODE> -  String value to split.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Array with parts from specified string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="xmlEncode"><!-- --></A>
-   <H3>xmlEncode</H3>
-   <PRE>string <B>xmlEncode</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>XML Encodes the specified string based on configured entity encoding. The entity encoding modes
- are raw, numeric and named. Where raw is the fastest and named is default.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  String to convert to XML.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Encoded XML string based on configured entity encoding.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Cleanup.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="GLOBALS.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Control.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Cleanup.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Control.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Control.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Control.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Control.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,1387 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_Control
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_Control";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Control.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Cleanup.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Engine.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Control.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_Control</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_Control</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_Control</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_Control.class.js.html'>TinyMCE_Control.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-   <A NAME="field_summary"><!-- --></A>
-      <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-         <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-            <TD COLSPAN=2><FONT SIZE="+2">
-               <B>Field Summary</B></FONT></TD>
-         </TR>
-
-   <!-- This is one instance field summary -->
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#cleanup">cleanup</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#hasMouseMoved">hasMouseMoved</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isTinyMCE_Control">isTinyMCE_Control</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#plugins">plugins</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#selection">selection</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#settings">settings</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#shortcuts">shortcuts</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#undoRedo">undoRedo</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#undoRedoLevel">undoRedoLevel</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-
-   </TABLE>
-   &nbsp;
-   
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_Control.html#TinyMCE_Control()">TinyMCE_Control</A> 
-	 </B>
-	 (&lt;Array&gt; settings)
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      This is the TinyMCE editor control instance class.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addPlugin">addPlugin</A></B>(&lt;string&gt; n, p)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a plugin to the editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addShortcut">addShortcut</A></B>(&lt;string&gt; m, &lt;Object&gt; k, &lt;string&gt; d, &lt;string&gt; cmd, &lt;boolean&gt; ui, &lt;Object&gt; va)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a keyboard shortcut to a specific command.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#autoResetDesignMode">autoResetDesignMode</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Auto resets the design mode of the document if it gets lost.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#execCommand">execCommand</A></B>(&lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;mixed&gt; value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes a command on the current instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getBody">getBody</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the body element of a editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;DOMDocument</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getDoc">getDoc</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the DOM document of a editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getFocusElement">getFocusElement</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the currently selected element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;DOMRange</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getRng">getRng</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the browsers selections first range instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;DOMSelection</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getSel">getSel</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the browsers selection instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Window</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getWin">getWin</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the window of a editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#handleShortcut">handleShortcut</A></B>(&lt;DOMEvent&gt; e)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes shortcuts based on the event information.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#hasPlugin">hasPlugin</A></B>(&lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if the instance has the current plugin available.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#isDirty">isDirty</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if the editor instance is dirty or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#isHidden">isHidden</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns if the instance is hidden or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#queryCommandState">queryCommandState</A></B>(&lt;string&gt; c)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a command specific state, for example if bold is enabled or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;mixed</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#queryCommandValue">queryCommandValue</A></B>(&lt;string&gt; c)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a command specific value, for example the current font size.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#repaint">repaint</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Repaints the editarea in Gecko browsers.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setBaseHREF">setBaseHREF</A></B>(&lt;string&gt; u)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the base href url of the current document instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#switchSettings">switchSettings</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Switches the global TinyMCE settings to the current instance settings.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#triggerSave">triggerSave</A></B>(&lt;boolean&gt; skip_cleanup, &lt;boolean&gt; skip_callback)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the contents from the TinyMCE editor control instance to the hidden textarea
- that got replaced with TinyMCE.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-   <A NAME="field_detail"><!-- --></A>
-   <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-      <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-         <TD COLSPAN=1><FONT SIZE="+2"><B>Field Detail</B></FONT></TD>
-      </TR>
-   </TABLE>
-
-   
-   <A NAME="cleanup"><!-- --></A>
-   <H3>cleanup</H3>
-   <PRE>Object&nbsp;<B>cleanup</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="hasMouseMoved"><!-- --></A>
-   <H3>hasMouseMoved</H3>
-   <PRE>Object&nbsp;<B>hasMouseMoved</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isTinyMCE_Control"><!-- --></A>
-   <H3>isTinyMCE_Control</H3>
-   <PRE>Object&nbsp;<B>isTinyMCE_Control</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="plugins"><!-- --></A>
-   <H3>plugins</H3>
-   <PRE>Object&nbsp;<B>plugins</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="selection"><!-- --></A>
-   <H3>selection</H3>
-   <PRE>Object&nbsp;<B>selection</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="settings"><!-- --></A>
-   <H3>settings</H3>
-   <PRE>Object&nbsp;<B>settings</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="shortcuts"><!-- --></A>
-   <H3>shortcuts</H3>
-   <PRE>Object&nbsp;<B>shortcuts</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="undoRedo"><!-- --></A>
-   <H3>undoRedo</H3>
-   <PRE>Object&nbsp;<B>undoRedo</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="undoRedoLevel"><!-- --></A>
-   <H3>undoRedoLevel</H3>
-   <PRE>Object&nbsp;<B>undoRedoLevel</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_Control()"><!-- --></A><H3>
-TinyMCE_Control</H3>
-<PRE><B>TinyMCE_Control</B>(&lt;Array&gt; settings)</PRE>
-
-
-<UL>
-   This is the TinyMCE editor control instance class. A instance of this class will is made for each
- converted text area.
-</UL>
-
-
-
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>settings</CODE> -  Name/Value array of instance specific configuration settings.
-     </UL>
-   
-   
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="addPlugin"><!-- --></A>
-   <H3>addPlugin</H3>
-   <PRE>void <B>addPlugin</B>(&lt;string&gt; n, p)</PRE>
-   
-      <UL>Adds a plugin to the editor instance. This will also add it globaly.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Plugin name to check for.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  TinyMCE plugin instance. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addShortcut"><!-- --></A>
-   <H3>addShortcut</H3>
-   <PRE>boolean <B>addShortcut</B>(&lt;string&gt; m, &lt;Object&gt; k, &lt;string&gt; d, &lt;string&gt; cmd, &lt;boolean&gt; ui, &lt;Object&gt; va)</PRE>
-   
-      <UL>Adds a keyboard shortcut to a specific command. These shortcuts can for example be added
- at the initInstance callback of a plugin. The shortcut description can be a language variable name
- or a string describing the function. If you don't specify a command, the shortcut will simply be a blocker
- shortcut. This enables you to remove built in shortcuts or remove theme specific shortcuts from a plugin.<br />
- Example shortcut inst.addShortcut('ctrl,alt', 'k', 'mceSomeCommand', false, 'somevalue');
- Example blocker inst.addShortcut('ctrl,alt', 'k');</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>m</CODE> -  List of shortcut modifiers keys, for example "ctrl,alt".  
-      </UL> 
-   
-     <UL><CODE>k</CODE> -  Shortcut key char for example "s" or a keycode value "13".  
-      </UL> 
-   
-     <UL><CODE>d</CODE> -  Optional Shortcut description, this will be presented in the about dialog.  
-      </UL> 
-   
-     <UL><CODE>cmd</CODE> -  Optional Command name to execute, for example mceLink or Bold.  
-      </UL> 
-   
-     <UL><CODE>ui</CODE> -  Optional True/false state if a UI (dialog) should be presented or not.  
-      </UL> 
-   
-     <UL><CODE>va</CODE> -  Optional command value, this can be anything.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if the shortcut was added or not   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="autoResetDesignMode"><!-- --></A>
-   <H3>autoResetDesignMode</H3>
-   <PRE>void <B>autoResetDesignMode</B>()</PRE>
-   
-      <UL>Auto resets the design mode of the document if it gets lost.
- This is a Gecko specific function since it's a workaround for a bug where Gecko browsers
- loose the designMode state if the editor is hidden and shown in a tab or div.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="execCommand"><!-- --></A>
-   <H3>execCommand</H3>
-   <PRE>Object <B>execCommand</B>(&lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;mixed&gt; value)</PRE>
-   
-      <UL>Executes a command on the current instance. These commands can be TinyMCE internal commands prefixed with "mce" or
- they can be build in browser commands such as "Bold". A compleate list of browser commands is available on MSDN or Mozilla.org.
- This function will dispatch the execCommand function on each plugin, theme or the execcommand_callback option if none of these
- return true it will handle the command as a internal browser command.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>command</CODE> -  Command name to execute, for example mceLink or Bold.  
-      </UL> 
-   
-     <UL><CODE>user_interface</CODE> -  True/false state if a UI (dialog) should be presented or not.  
-      </UL> 
-   
-     <UL><CODE>value</CODE> -  Optional command value, this can be anything.
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getBody"><!-- --></A>
-   <H3>getBody</H3>
-   <PRE>HTMLElement <B>getBody</B>()</PRE>
-   
-      <UL>Returns the body element of a editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Body element of a editor instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getDoc"><!-- --></A>
-   <H3>getDoc</H3>
-   <PRE>DOMDocument <B>getDoc</B>()</PRE>
-   
-      <UL>Returns the DOM document of a editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        DOM document of a editor instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getFocusElement"><!-- --></A>
-   <H3>getFocusElement</H3>
-   <PRE>HTMLElement <B>getFocusElement</B>()</PRE>
-   
-      <UL>Returns the currently selected element. This is was added for compatiblity and is deprecated.
- Please use inst.selection.getFocusElement instead.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Currently selected element.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getRng"><!-- --></A>
-   <H3>getRng</H3>
-   <PRE>DOMRange <B>getRng</B>()</PRE>
-   
-      <UL>Returns the browsers selections first range instance. This is was added for compatiblity and is deprecated.
- Please use inst.selection.getRng instead.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Browsers selections first range instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getSel"><!-- --></A>
-   <H3>getSel</H3>
-   <PRE>DOMSelection <B>getSel</B>()</PRE>
-   
-      <UL>Returns the browsers selection instance. This is was added for compatiblity and is deprecated.
- Please use inst.selection.getSel instead.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Browser selection instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getWin"><!-- --></A>
-   <H3>getWin</H3>
-   <PRE>Window <B>getWin</B>()</PRE>
-   
-      <UL>Returns the window of a editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Window of a editor instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="handleShortcut"><!-- --></A>
-   <H3>handleShortcut</H3>
-   <PRE>boolean <B>handleShortcut</B>(&lt;DOMEvent&gt; e)</PRE>
-   
-      <UL>Executes shortcuts based on the event information.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  Keyboard event to handle.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if the shortcut was found and executed or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="hasPlugin"><!-- --></A>
-   <H3>hasPlugin</H3>
-   <PRE>boolean <B>hasPlugin</B>(&lt;string&gt; n)</PRE>
-   
-      <UL>Returns true/false if the instance has the current plugin available.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Plugin name to check for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if the instance has the current plugin available.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="isDirty"><!-- --></A>
-   <H3>isDirty</H3>
-   <PRE>boolean <B>isDirty</B>()</PRE>
-   
-      <UL>Returns true/false if the editor instance is dirty or not. In other words if it has been modified
- or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Editor instance dirty state.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="isHidden"><!-- --></A>
-   <H3>isHidden</H3>
-   <PRE>boolean <B>isHidden</B>()</PRE>
-   
-      <UL>Returns if the instance is hidden or not. This is a Gecko specific function
- other browsers will always return false. This function is used to workaround the lost
- designMode bug in Gecko browsers.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Returns if the instance is hidden or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="queryCommandState"><!-- --></A>
-   <H3>queryCommandState</H3>
-   <PRE>boolean <B>queryCommandState</B>(&lt;string&gt; c)</PRE>
-   
-      <UL>Returns a command specific state, for example if bold is enabled or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>c</CODE> -  Command to query state from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Command specific state, for example if bold is enabled or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="queryCommandValue"><!-- --></A>
-   <H3>queryCommandValue</H3>
-   <PRE>mixed <B>queryCommandValue</B>(&lt;string&gt; c)</PRE>
-   
-      <UL>Returns a command specific value, for example the current font size.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>c</CODE> -  Command to query value from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Command specific value, for example the current font size.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="repaint"><!-- --></A>
-   <H3>repaint</H3>
-   <PRE>void <B>repaint</B>()</PRE>
-   
-      <UL>Repaints the editarea in Gecko browsers. This method removes ghost resize handlers
- and other trailing graphics.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setBaseHREF"><!-- --></A>
-   <H3>setBaseHREF</H3>
-   <PRE>void <B>setBaseHREF</B>(&lt;string&gt; u)</PRE>
-   
-      <UL>Sets the base href url of the current document instance. This method is used
- to temporarly remove the base url during copy/paste and drag/drop operations
- of relative links from external sites into TinyMCE. MSIE has a bug and converts
- relative links from external sites to absolute links incorrectly.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>u</CODE> -  URL to set as base URL or null to remove it. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="switchSettings"><!-- --></A>
-   <H3>switchSettings</H3>
-   <PRE>void <B>switchSettings</B>()</PRE>
-   
-      <UL>Switches the global TinyMCE settings to the current instance settings. This method is
- used to handle multiple configurations.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="triggerSave"><!-- --></A>
-   <H3>triggerSave</H3>
-   <PRE>void <B>triggerSave</B>(&lt;boolean&gt; skip_cleanup, &lt;boolean&gt; skip_callback)</PRE>
-   
-      <UL>Moves the contents from the TinyMCE editor control instance to the hidden textarea
- that got replaced with TinyMCE. This is executed automaticly on for example form submit unless you configure otherwice.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>skip_cleanup</CODE> -  Optional Skip cleanup, simply move the contents as fast as possible.  
-      </UL> 
-   
-     <UL><CODE>skip_callback</CODE> -  Optional Skip callback, don't call the save_callback function. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Control.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Cleanup.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Engine.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Control.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Engine.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Engine.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Engine.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Engine.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,6390 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_Engine
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_Engine";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Engine.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Control.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Layer.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Engine.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_Engine</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_Engine</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_Engine</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_Engine.class.js.html'>TinyMCE_Engine.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-   <A NAME="field_summary"><!-- --></A>
-      <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-         <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-            <TD COLSPAN=2><FONT SIZE="+2">
-               <B>Field Summary</B></FONT></TD>
-         </TR>
-
-   <!-- This is one instance field summary -->
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#buttonMap">buttonMap</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#configs">configs</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#currentConfig">currentConfig</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#dialogCounter">dialogCounter</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#eventHandlers">eventHandlers</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#idCounter">idCounter</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#instances">instances</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isGecko">isGecko</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isLoaded">isLoaded</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isMac">isMac</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isMSIE">isMSIE</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isMSIE5">isMSIE5</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isMSIE5_0">isMSIE5_0</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isNS7">isNS7</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isNS71">isNS71</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isOpera">isOpera</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#isSafari">isSafari</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#loadedFiles">loadedFiles</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#loadedPlugins">loadedPlugins</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#majorVersion">majorVersion</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#menus">menus</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#minorVersion">minorVersion</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#plugins">plugins</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#releaseDate">releaseDate</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#switchClassCache">switchClassCache</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#themes">themes</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#windowArgs">windowArgs</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-
-   </TABLE>
-   &nbsp;
-   
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_Engine.html#TinyMCE_Engine()">TinyMCE_Engine</A> 
-	 </B>
-	 ()
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      Core engine class for TinyMCE, a instance of this class is available as a global called tinyMCE.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#_getElementById">_getElementById</A></B>(&lt;string&gt; i&lt;DOMDocument&gt; d, d)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a element by id, this will also search the form names to match the id.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#_removeInternal">_removeInternal</A></B>(&lt;DOMNode&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Removes any internal content inserted by regexps.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#accessibleEventHandler">accessibleEventHandler</A></B>(&lt;DOMEvent&gt; e)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Accessibility handler that gets executed when the user hits a key in a select element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addButtonMap">addButtonMap</A></B>(&lt;string&gt; m)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a list of buttons available in the tiled button image used by the button_tile_map option.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addCSSClass">addCSSClass</A></B>(&lt;HTMLElement&gt; e, c, b)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a CSS class to the specified element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addEvent">addEvent</A></B>(&lt;HTMLElement&gt; o, &lt;string&gt; n, &lt;function&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a event handler function to the specified object.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addEventHandlers">addEventHandlers</A></B>(&lt;inst&gt; inst)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds the handleEvent function to the specified editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addMCEControl">addMCEControl</A></B>(&lt;HTMLElement&gt; replace_element, &lt;string&gt; form_element_name, &lt;DOMDocument&gt; target_document)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a TinyMCE editor control instance to a specific form element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addMenu">addMenu</A></B>(&lt;string&gt; n, &lt;TinyMCE_Menu&gt; m)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a floating menu instance to TinyMCE.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addPlugin">addPlugin</A></B>(n, &lt;TinyMCE_Plugin&gt; p)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds the specified plugin to the list of loaded plugins, this will also setup the baseURL
- property of the plugin.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addSelectAccessibility">addSelectAccessibility</A></B>(&lt;DOMEvent&gt; e, &lt;HTMLElement&gt; s, &lt;DOMWindow&gt; w)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds accessibility keydown handler to the specified select element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addTheme">addTheme</A></B>(&l&lt;TinyMCE_Theme&gt; t;string&gt; n, t)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds the specified theme in to the list of loaded themes.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#addToLang">addToLang</A></B>(&lt;string&gt; prefix, &lt;Array&gt; ar)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds language items to the global language array.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#applyTemplate">applyTemplate</A></B>(&lt;string&gt; h, &lt;Array&gt; as)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Replaces language, args and settings variables in a HTML string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#callFunc">callFunc</A></B>(&lt;<&lt;Array&gt; a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; ins, &lt;string&gt; p, &lt;string&gt; n, &lt;int&gt; m, a)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes callback chain.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#cancelEvent">cancelEvent</A></B>(&lt;DOMEvent&gt; e)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Cancels the specified event, this will disable the event from be passed to other listeners in event chain.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#cleanupAnchors">cleanupAnchors</A></B>(&lt;DOMDocument&gt; doc)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the contents of a anchor outside and after the anchor.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#cleanupEventStr">cleanupEventStr</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Removes MSIE 5.5 specific event wrapper function form a event string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#cleanupHTMLCode">cleanupHTMLCode</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Makes some preprocessing cleanup routines on the specified HTML string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#clearArray">clearArray</A></B>(a)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a cleared array, since some external libraries tend to extend the Array core object
- arrays needs to be cleaned from these extended functions.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#closeWindow">closeWindow</A></B>(&lt;DOMWindow&gt; win)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Closes the specified window.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#compressStyle">compressStyle</A></B>(&lt;Array&gt; ar, &lt;string&gt; pr, &lt;string&gt; sf, &lt;string&gt; res)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Compresses larger styles into a smaller.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#confirmAdd">confirmAdd</A></B>(&lt;DOMEvent&gt; e, &lt;Array&gt; settings)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Displays a confirm dialog when a user clicks/focus a textarea that is to be converted into
- a TinyMCE instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertAbsoluteURLToRelativeURL">convertAbsoluteURLToRelativeURL</A></B>(&lt;string&gt; base_url, &lt;string&gt; url_to_relative)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Converts an absolute path to relative path.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertAllRelativeURLs">convertAllRelativeURLs</A></B>(&lt;HTMLElement&gt; body)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Converts all img and a element URLs to absolute URLs.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertFontsToSpans">convertFontsToSpans</A></B>(&lt;DOMDocument&gt; doc)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Convers fonts to spans in the specified document.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertHexToRGB">convertHexToRGB</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a rgb(n,n,n) string from a hexadecimal value.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertRelativeToAbsoluteURL">convertRelativeToAbsoluteURL</A></B>(&lt;string&gt; base_url, &lt;string&gt; relative_url)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Converts an relative path to absolute path.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertRGBToHex">convertRGBToHex</A></B>(&lt;string&gt; s, &lt;boolean&gt; k)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a hexadecimal version of the specified rgb(1,2,3) string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertSpansToFonts">convertSpansToFonts</A></B>(&lt;DOMDocument&gt; doc)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Converts span elements to font elements in the specified document instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#convertURL">convertURL</A></B>(&lt;string&gt; url, &lt;HTMLElement&gt; node, &lt;boolean&gt; on_save)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Converts the specified URL based in TinyMCE configuration settings.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#debug">debug</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Debugs the specified message to a screen.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#dispatchCallback">dispatchCallback</A></B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; i, &lt;string&gt; p, &lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Dispatches the specified callback on all options, plugins and themes.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#entityDecode">entityDecode</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 HTML entity decode a string, replaces &lt; with <.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#evalFunc">evalFunc</A></B>(&lt;string&gt; f, &lt;int&gt; idx, &lt;Array&gt; a)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Evaluates the specified function and uses the array of arguments.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#execCommand">execCommand</A></B>(&lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;object&gt; value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes a command on the selected or last selected TinyMCE editor control instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#execCommandCallback">execCommandCallback</A></B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; i, &lt;string&gt; p, &lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes the specified execcommand callback on all options, plugins and themes.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#execInstanceCommand">execInstanceCommand</A></B>(&lt;string&gt; editor_id, &lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;object&gt; value, &lt;boolean&gt; focus)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes a command on a specific editor instance by id.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#executeCallback">executeCallback</A></B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; i, &lt;string&gt; p, &lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes the specified callback on all options, plugins and themes.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#explode">explode</A></B>(&lt;string&gt; d, &lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Splits a string by the specified delimiter and skips any empty items.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#extend">extend</A></B>(&lt;Object&gt; p, &lt;Object&gt; np)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Extends the specified prototype with new methods.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#fixGeckoBaseHREFBug">fixGeckoBaseHREFBug</A></B>(&lt;boolean&gt; m, &lt;HTMLElement&gt; e, &lt;string&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Fixes a Gecko specific bug where href, src attribute values gets converted incorrectly
- when inserted into editor.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;TinyMCE_ElementPosition</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getAbsPosition">getAbsPosition</A></B>(&lt;HTMLNode&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the absolute x, y position of a node.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getAttrib">getAttrib</A></B>(&lt;HTMLElement&gt; elm, &lt;string&gt; name, &lt;string&gt; default_value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the attribute value of a element or the default value if it wasn't found.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getButtonHTML">getButtonHTML</A></B>(&lt;string&gt; id, &lt;string&gt; lang, &lt;string&gt; img, &lt;string&gt; cmd, &lt;string&gt; ui, &lt;string&gt; val)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the HTML code for a normal button control.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getContent">getContent</A></B>(&lt;string&gt; editor_id)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the HTML contents of the specified editor instance id.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getControlHTML">getControlHTML</A></B>(&lt;string&gt; c)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the HTML for the specified control this will loop through
- the theme and all plugins inorder to find the control.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getCSSClasses">getCSSClasses</A></B>(&lt;string&gt; editor_id, &lt;DOMDocument&gt; doc)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a array of CSS classes that is available in a document.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getEditorId">getEditorId</A></B>(&lt;string&gt; form_element)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the editor instance id of a specific form element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getElementByAttributeValue">getElementByAttributeValue</A></B>(&lt;HTMLElement&gt; n, &lt;string&gt; e, &lt;string&gt; a, &lt;string&gt; v)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a element by a specific attribute and it's value.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getElementsByAttributeValue">getElementsByAttributeValue</A></B>(&lt;HTMLElement&gt; n, &lt;string&gt; e, &lt;string&gt; a, &lt;string&gt; v)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a element array by a specific attribute and it's value.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;<a href="TinyMCE_Control.html">TinyMCE_Control</a></CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getInstanceById">getInstanceById</A></B>(&lt;string&gt; editor_id)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a TinyMCE editor instance by the specified editor id or null if it wasn't found.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getLang">getLang</A></B>(&lt;string&gt; name, &lt;string&gt; default_value, &lt;boolean&gt; parse_entities, &lt;Array&gt; va)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a language variable value from the language packs.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getNodeTree">getNodeTree</A></B>(&l&lt;int&gt; t;HTMLNode&gt; n, &lt;Array&gt; na, t, &lt;string&gt; nn)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a array of nodes selected retrived from the child nodes of the specified node.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getOuterHTML">getOuterHTML</A></B>(&lt;HTMLElement&gt; e)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the outer HTML of a element, this uses the outerHTML
- property in MSIE and Opera and a workaround for Gecko.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getParam">getParam</A></B>(&lt;string&gt; name, &lt;string&gt; default_value, &lt;boolean&gt; strip_whitespace, &lt;string&gt; split_chr)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a specific configuration setting or the default value if it wasn't found.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getParentBlockElement">getParentBlockElement</A></B>(&lt;HTMLNode&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the first block element parent of the specified node.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getParentElement">getParentElement</A></B>(&lt;HTMLNode&gt; node, &lt;string&gt; names, &lt;string&gt; attrib_name, &lt;string&gt; attrib_value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the parent element of the specified node based on the search criteria.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;DOMNode</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getParentNode">getParentNode</A></B>(&lt;DOMNode&gt; n, &lt;function&gt; f)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a node by the specified selector function.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getVisualAidClass">getVisualAidClass</A></B>(&lt;string&gt; class_name, &lt;boolean&gt; state)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the visual aid class string, this will add/remove the visual aid class.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getWindowArg">getWindowArg</A></B>(&lt;string&gt; n, d)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the window argument to be passed to TinyMCE popup.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#handleEvent">handleEvent</A></B>(&lt;DOMEvent&gt; e)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Event handler function that gets executed each time a event occurs in a TinyMCE editor control instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#handleVisualAid">handleVisualAid</A></B>(&lt;HTMLElement&gt; el, &lt;boolean&gt; deep, &lt;boolean&gt; state, &lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; inst, skip_dispatch)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds visual aid classes to all elements that need them recursive in the DOM tree.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#hasMenu">hasMenu</A></B>(&lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Checks if the specified menu by name is added to TinyMCE.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#hasPlugin">hasPlugin</A></B>(&lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if the specified plugin is loaded or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#hasTheme">hasTheme</A></B>(&lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if the specified theme is loaded or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#importCSS">importCSS</A></B>(&lt;DOMDocument&gt; doc, &lt;string&gt; css)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Imports a CSS file into a allready loaded document.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#importPluginLanguagePack">importPluginLanguagePack</A></B>(&lt;string&gt; name, &lt;string&gt; valid_languages)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Loads a plugin specific language pack.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#importThemeLanguagePack">importThemeLanguagePack</A></B>(&lt;string&gt; name)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Loads a theme specific language pack.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#init">init</A></B>(settings)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Initializes TinyMCE with the specific configuration settings.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#insertAfter">insertAfter</A></B>(&lt;HTMLNode&gt; n, &lt;HTMLNode&gt; r)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Inserts a node after the specific node.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#isBlockElement">isBlockElement</A></B>(&lt;HTMLNode&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if the specified node is a block element or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#isInstance">isInstance</A></B>(&lt;object&gt; o)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if a specific object is a TinyMCE_Control instance or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#loadCSS">loadCSS</A></B>(&lt;string&gt; url)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Loads the specified CSS by writing the a link tag to the current page.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#loadPlugin">loadPlugin</A></B>(&lt;string&gt; n, &lt;string&gt; u)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Load plugin from external URL.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#loadScript">loadScript</A></B>(&lt;string&gt; url)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Loads the specified script by writing the a script tag to the current page.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#nextNode">nextNode</A></B>(&lt;HTMLNode&gt; e, &lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Finds any element after the current one by name.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#onLoad">onLoad</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Gets executed when the page loads or get intitialized.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#onMouseMove">onMouseMove</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Mouse move handler function, this will be executed each time
- the mouse is moved within a editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#openWindow">openWindow</A></B>(&lt;Array&gt; template, &lt;Array&gt; args)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Opens a popup window based in the specified input data.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#parseStyle">parseStyle</A></B>(&lt;string&gt; str)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Parses the specified HTML style data.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;TinyMCE_URL_Item</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#parseURL">parseURL</A></B>(&lt;string&gt; url_str)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Parses a URL in to its diffrent components.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#prevNode">prevNode</A></B>(&lt;HTMLNode&gt; e, &lt;string&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Finds any previous element by name.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#queryInstanceCommandState">queryInstanceCommandState</A></B>(&lt;string&gt; editor_id, &lt;string&gt; command)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Queries a command state for a specific command on a specific editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#queryInstanceCommandValue">queryInstanceCommandValue</A></B>(&lt;string&gt; editor_id, &lt;string&gt; command)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Queries a command value for a specific command on a specific editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#regexpReplace">regexpReplace</A></B>(&lt;string&gt; in_str, &lt;string&gt; reg_exp, &lt;string&gt; replace_str, opts)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Regexp replaces the contents of a string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#removeCSSClass">removeCSSClass</A></B>(&lt;HTMLElement&gt; e, c)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Removes the specified CSS class from the element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#removeMCEControl">removeMCEControl</A></B>(&lt;string&gt; editor_id)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Removes a TinyMCE editor control instance by id.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#removeTinyMCEFormElements">removeTinyMCEFormElements</A></B>(&lt;HTMLElement&gt; form_obj)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Removes/disables TinyMCE built in form elements such as select boxes for font sizes etc.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#renameElement">renameElement</A></B>(&lt;HTMLElement&gt; e, &lt;string&gt; n, &lt;DOMDocument&gt; d)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Renames the specified element to the specified name.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#replaceVar">replaceVar</A></B>(&lt;string&gt; h, &lt;string&gt; r, &lt;string&gt; v)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Replaces a specific variable in the string with a nother string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#resetForm">resetForm</A></B>(&lt;int&gt; form_index)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Resets a forms TinyMCE instances based on form index.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Array</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#selectNodes">selectNodes</A></B>(&lt;DOMNode&gt; n, &lt;function&gt; f, &lt;Array&gt; a)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a array of nodes when the specified function matches a node.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#serializeStyle">serializeStyle</A></B>(&lt;Array&gt; ar)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Serializes the specified style item name/value array into a HTML string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#serializeURL">serializeURL</A></B>(&lt;TinyMCE_URL_Item&gt; up)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Serializes the specified URL object into a string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setAttrib">setAttrib</A></B>(&lt;HTMLElement&gt; element, &lt;string&gt; name, &lt;string&gt; value, &lt;boolean&gt; fix_value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the attribute value for a specific attribute.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setContent">setContent</A></B>(&lt;string&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the HTML contents of the selected editor instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setInnerHTML">setInnerHTML</A></B>(&lt;HTMLElement&gt; e, &lt;string&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the innerHTML property of a element, this function also
- fixes a MSIE bug where the first comment is removed.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setOuterHTML">setOuterHTML</A></B>(&lt;HTMLElement&gt; e, &lt;string&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the outer HTML of a element, this uses the outerHTML
- property in MSIE and Opera and a workaround for Gecko.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setPluginBaseURL">setPluginBaseURL</A></B>(&lt;string&gt; n, &lt;string&gt; u)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the baseURL of the specified plugin, this is useful if the plugin is loaded from
- a external location.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setStyleAttrib">setStyleAttrib</A></B>(&lt;HTMLElement&gt; elm, &lt;string&gt; name, &lt;string&gt; value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets a style attribute item value.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setupContent">setupContent</A></B>(&lt;string&gt; editor_id)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Setups the contents of TinyMCE editor instance and fills it with contents.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setWindowArg">setWindowArg</A></B>(&lt;string&gt; n, &lt;string&gt; v)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the window argument to be passed to TinyMCE popup.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#storeAwayURLs">storeAwayURLs</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Stores away the src and href attribute values in separate mce_src and mce_href attributes.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#submitPatch">submitPatch</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Piggyback onsubmit event handler function, this will remove/hide the TinyMCE specific form elements
- call triggerSave to fill the textarea with the correct contents then call the old piggy backed event handler.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#switchClass">switchClass</A></B>(&lt;HTMLElement&gt; ei, &lt;string&gt; c)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Switches the CSS class of the specified element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#triggerNodeChange">triggerNodeChange</A></B>(&lt;boolean&gt; focus, &lt;boolean&gt; setup_content)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Triggers a nodeChange event to every theme and plugin.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#triggerSave">triggerSave</A></B>(&lt;boolean&gt; skip_cleanup, &lt;boolean&gt; skip_callback)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the contents from a TinyMCE editor control instance to the hidden textarea
- that got replaced with TinyMCE.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#trim">trim</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Removes all prefix, suffix whitespace of a string.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#unloadHandler">unloadHandler</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Unload document event handler function.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#updateContent">updateContent</A></B>(&lt;string&gt; form_element_name)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the contents from the hidden textarea to the editor that gets inserted.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#xmlEncode">xmlEncode</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Encodes the string to raw XML entities.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-   <A NAME="field_detail"><!-- --></A>
-   <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-      <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-         <TD COLSPAN=1><FONT SIZE="+2"><B>Field Detail</B></FONT></TD>
-      </TR>
-   </TABLE>
-
-   
-   <A NAME="buttonMap"><!-- --></A>
-   <H3>buttonMap</H3>
-   <PRE>Object&nbsp;<B>buttonMap</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="configs"><!-- --></A>
-   <H3>configs</H3>
-   <PRE>Object&nbsp;<B>configs</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="currentConfig"><!-- --></A>
-   <H3>currentConfig</H3>
-   <PRE>Object&nbsp;<B>currentConfig</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="dialogCounter"><!-- --></A>
-   <H3>dialogCounter</H3>
-   <PRE>Object&nbsp;<B>dialogCounter</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="eventHandlers"><!-- --></A>
-   <H3>eventHandlers</H3>
-   <PRE>Object&nbsp;<B>eventHandlers</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="idCounter"><!-- --></A>
-   <H3>idCounter</H3>
-   <PRE>Object&nbsp;<B>idCounter</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="instances"><!-- --></A>
-   <H3>instances</H3>
-   <PRE>Object&nbsp;<B>instances</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isGecko"><!-- --></A>
-   <H3>isGecko</H3>
-   <PRE>Object&nbsp;<B>isGecko</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isLoaded"><!-- --></A>
-   <H3>isLoaded</H3>
-   <PRE>Object&nbsp;<B>isLoaded</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isMac"><!-- --></A>
-   <H3>isMac</H3>
-   <PRE>Object&nbsp;<B>isMac</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isMSIE"><!-- --></A>
-   <H3>isMSIE</H3>
-   <PRE>Object&nbsp;<B>isMSIE</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isMSIE5"><!-- --></A>
-   <H3>isMSIE5</H3>
-   <PRE>Object&nbsp;<B>isMSIE5</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isMSIE5_0"><!-- --></A>
-   <H3>isMSIE5_0</H3>
-   <PRE>Object&nbsp;<B>isMSIE5_0</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isNS7"><!-- --></A>
-   <H3>isNS7</H3>
-   <PRE>Object&nbsp;<B>isNS7</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isNS71"><!-- --></A>
-   <H3>isNS71</H3>
-   <PRE>Object&nbsp;<B>isNS71</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isOpera"><!-- --></A>
-   <H3>isOpera</H3>
-   <PRE>Object&nbsp;<B>isOpera</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="isSafari"><!-- --></A>
-   <H3>isSafari</H3>
-   <PRE>Object&nbsp;<B>isSafari</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="loadedFiles"><!-- --></A>
-   <H3>loadedFiles</H3>
-   <PRE>Object&nbsp;<B>loadedFiles</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="loadedPlugins"><!-- --></A>
-   <H3>loadedPlugins</H3>
-   <PRE>Object&nbsp;<B>loadedPlugins</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="majorVersion"><!-- --></A>
-   <H3>majorVersion</H3>
-   <PRE>Object&nbsp;<B>majorVersion</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="menus"><!-- --></A>
-   <H3>menus</H3>
-   <PRE>Object&nbsp;<B>menus</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="minorVersion"><!-- --></A>
-   <H3>minorVersion</H3>
-   <PRE>Object&nbsp;<B>minorVersion</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="plugins"><!-- --></A>
-   <H3>plugins</H3>
-   <PRE>Object&nbsp;<B>plugins</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="releaseDate"><!-- --></A>
-   <H3>releaseDate</H3>
-   <PRE>Object&nbsp;<B>releaseDate</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="switchClassCache"><!-- --></A>
-   <H3>switchClassCache</H3>
-   <PRE>Object&nbsp;<B>switchClassCache</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="themes"><!-- --></A>
-   <H3>themes</H3>
-   <PRE>Object&nbsp;<B>themes</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="windowArgs"><!-- --></A>
-   <H3>windowArgs</H3>
-   <PRE>Object&nbsp;<B>windowArgs</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_Engine()"><!-- --></A><H3>
-TinyMCE_Engine</H3>
-<PRE><B>TinyMCE_Engine</B>()</PRE>
-
-
-<UL>
-   Core engine class for TinyMCE, a instance of this class is available as a global called tinyMCE.
-</UL>
-
-
-
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="_getElementById"><!-- --></A>
-   <H3>_getElementById</H3>
-   <PRE>HTMLElement <B>_getElementById</B>(&lt;string&gt; i&lt;DOMDocument&gt; d, d)</PRE>
-   
-      <UL>Returns a element by id, this will also search the form names to match the id.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>id</CODE> -  Id of element.  
-      </UL> 
-   
-     <UL><CODE>d</CODE> -  Optional document.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML element that matches the id.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="_removeInternal"><!-- --></A>
-   <H3>_removeInternal</H3>
-   <PRE>void <B>_removeInternal</B>(&lt;DOMNode&gt; n)</PRE>
-   
-      <UL>Removes any internal content inserted by regexps.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node to remove internal content from. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="accessibleEventHandler"><!-- --></A>
-   <H3>accessibleEventHandler</H3>
-   <PRE>Object <B>accessibleEventHandler</B>(&lt;DOMEvent&gt; e)</PRE>
-   
-      <UL>Accessibility handler that gets executed when the user hits a key in a select element.
- This handler trams the enter/return or space key and then executes the onchange event handler.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  DOM event object instance.
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addButtonMap"><!-- --></A>
-   <H3>addButtonMap</H3>
-   <PRE>void <B>addButtonMap</B>(&lt;string&gt; m)</PRE>
-   
-      <UL>Adds a list of buttons available in the tiled button image used by the button_tile_map option.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>m</CODE> -  Comma separated list of buttons that are available in tiled image. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addCSSClass"><!-- --></A>
-   <H3>addCSSClass</H3>
-   <PRE>string <B>addCSSClass</B>(&lt;HTMLElement&gt; e, c, b)</PRE>
-   
-      <UL>Adds a CSS class to the specified element. It will remove any previous item with the same name
- so adding a class that already exists will move it to the end.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  HTML element to add CSS class to.  
-      </UL> 
-   
-     <UL><CODE>string</CODE> - ] c CSS class to add to HTML element.  
-      </UL> 
-   
-     <UL><CODE>boolean</CODE> - ] b Optional parameter, if set to true, class will be added to the beginning.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Returns the new class attribute value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addEvent"><!-- --></A>
-   <H3>addEvent</H3>
-   <PRE>void <B>addEvent</B>(&lt;HTMLElement&gt; o, &lt;string&gt; n, &lt;function&gt; h)</PRE>
-   
-      <UL>Adds a event handler function to the specified object.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>o</CODE> -  Object to add event handler to.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Event name to listen to for example "click".  
-      </UL> 
-   
-     <UL><CODE>h</CODE> -  Function handler to execute when event occurs.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addEventHandlers"><!-- --></A>
-   <H3>addEventHandlers</H3>
-   <PRE>void <B>addEventHandlers</B>(&lt;inst&gt; inst)</PRE>
-   
-      <UL>Adds the handleEvent function to the specified editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>inst</CODE> -  Editor control instance to add event handler to.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addMCEControl"><!-- --></A>
-   <H3>addMCEControl</H3>
-   <PRE>void <B>addMCEControl</B>(&lt;HTMLElement&gt; replace_element, &lt;string&gt; form_element_name, &lt;DOMDocument&gt; target_document)</PRE>
-   
-      <UL>Adds a TinyMCE editor control instance to a specific form element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>replace_element</CODE> -  HTML element object to replace.  
-      </UL> 
-   
-     <UL><CODE>form_element_name</CODE> -  HTML form element name,  
-      </UL> 
-   
-     <UL><CODE>target_document</CODE> -  Target document that holds the element. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addMenu"><!-- --></A>
-   <H3>addMenu</H3>
-   <PRE>void <B>addMenu</B>(&lt;string&gt; n, &lt;TinyMCE_Menu&gt; m)</PRE>
-   
-      <UL>Adds a floating menu instance to TinyMCE.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  TinyMCE menu id.  
-      </UL> 
-   
-     <UL><CODE>m</CODE> -  TinyMCE menu instance. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addPlugin"><!-- --></A>
-   <H3>addPlugin</H3>
-   <PRE>void <B>addPlugin</B>(n, &lt;TinyMCE_Plugin&gt; p)</PRE>
-   
-      <UL>Adds the specified plugin to the list of loaded plugins, this will also setup the baseURL
- property of the plugin.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>p</CODE> -  Plugin instance to add. 	   
-      </UL> 
-   
-     <UL><CODE>Plugin</CODE> -  name/id.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addSelectAccessibility"><!-- --></A>
-   <H3>addSelectAccessibility</H3>
-   <PRE>Object <B>addSelectAccessibility</B>(&lt;DOMEvent&gt; e, &lt;HTMLElement&gt; s, &lt;DOMWindow&gt; w)</PRE>
-   
-      <UL>Adds accessibility keydown handler to the specified select element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  Event that gets passed when the element is focused.  
-      </UL> 
-   
-     <UL><CODE>s</CODE> -  Select element that the keydown handler gets added to.  
-      </UL> 
-   
-     <UL><CODE>w</CODE> -  DOM window reference to add.
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addTheme"><!-- --></A>
-   <H3>addTheme</H3>
-   <PRE>void <B>addTheme</B>(&l&lt;TinyMCE_Theme&gt; t;string&gt; n, t)</PRE>
-   
-      <UL>Adds the specified theme in to the list of loaded themes.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Theme name/id to add the object reference to.  
-      </UL> 
-   
-     <UL><CODE>t</CODE> -  Theme instance to add to the loaded list. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="addToLang"><!-- --></A>
-   <H3>addToLang</H3>
-   <PRE>void <B>addToLang</B>(&lt;string&gt; prefix, &lt;Array&gt; ar)</PRE>
-   
-      <UL>Adds language items to the global language array.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>prefix</CODE> -  Prefix string to add infront of every array item before adding it.  
-      </UL> 
-   
-     <UL><CODE>ar</CODE> -  Language item array to add to global language array. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="applyTemplate"><!-- --></A>
-   <H3>applyTemplate</H3>
-   <PRE>string <B>applyTemplate</B>(&lt;string&gt; h, &lt;Array&gt; as)</PRE>
-   
-      <UL>Replaces language, args and settings variables in a HTML string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>h</CODE> -  HTML string to replace language variables in.  
-      </UL> 
-   
-     <UL><CODE>as</CODE> -  Optional arguments array to take variables from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML string with replaced varliables.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="callFunc"><!-- --></A>
-   <H3>callFunc</H3>
-   <PRE>boolean <B>callFunc</B>(&lt;<&lt;Array&gt; a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; ins, &lt;string&gt; p, &lt;string&gt; n, &lt;int&gt; m, a)</PRE>
-   
-      <UL>Executes callback chain. Callback TinyMCE_Engine.prototype.order = Option; Plugins, Themes.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>ins</CODE> -  TinyMCE editor control instance to execute callback on.  
-      </UL> 
-   
-     <UL><CODE>p</CODE> -  TinyMCE callback parameter name.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Function name to execute.  
-      </UL> 
-   
-     <UL><CODE>m</CODE> -  Execution mode value, 0 = no chain, 1 = event chain, 2 = execcommand chain.  
-      </UL> 
-   
-     <UL><CODE>a</CODE> -  Array with function arguments.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true - if the callback was executed, false if it wasn't.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="cancelEvent"><!-- --></A>
-   <H3>cancelEvent</H3>
-   <PRE>void <B>cancelEvent</B>(&lt;DOMEvent&gt; e)</PRE>
-   
-      <UL>Cancels the specified event, this will disable the event from be passed to other listeners in event chain.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  Event to cancel.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="cleanupAnchors"><!-- --></A>
-   <H3>cleanupAnchors</H3>
-   <PRE>void <B>cleanupAnchors</B>(&lt;DOMDocument&gt; doc)</PRE>
-   
-      <UL>Moves the contents of a anchor outside and after the anchor. Only if the anchor doesn't
- have a href.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>doc</CODE> -  DOM document instance to fix anchors in.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="cleanupEventStr"><!-- --></A>
-   <H3>cleanupEventStr</H3>
-   <PRE>string <B>cleanupEventStr</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Removes MSIE 5.5 specific event wrapper function form a event string.
- This will also remove the event blocker if it's added in front of the event.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  String to replace event data in.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Replaced string value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="cleanupHTMLCode"><!-- --></A>
-   <H3>cleanupHTMLCode</H3>
-   <PRE>string <B>cleanupHTMLCode</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Makes some preprocessing cleanup routines on the specified HTML string.
- This includes forcing some tags to be open so MSIE doesn't fail. Forcing other to close and
- padding paragraphs with non breaking spaces. This function is used when the editor gets
- initialized with content.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  HTML string to cleanup.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Cleaned HTML string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="clearArray"><!-- --></A>
-   <H3>clearArray</H3>
-   <PRE>Array <B>clearArray</B>(a)</PRE>
-   
-      <UL>Returns a cleared array, since some external libraries tend to extend the Array core object
- arrays needs to be cleaned from these extended functions. So this function simply sets any
- named properties back to null.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>Name</CODE> - /Value array to clear.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Cleared name/value array.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="closeWindow"><!-- --></A>
-   <H3>closeWindow</H3>
-   <PRE>void <B>closeWindow</B>(&lt;DOMWindow&gt; win)</PRE>
-   
-      <UL>Closes the specified window. This function is deprecated and should be replaced with
- tinyMCEPopup.close();.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>win</CODE> -  Window reference to close.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="compressStyle"><!-- --></A>
-   <H3>compressStyle</H3>
-   <PRE>void <B>compressStyle</B>(&lt;Array&gt; ar, &lt;string&gt; pr, &lt;string&gt; sf, &lt;string&gt; res)</PRE>
-   
-      <UL>Compresses larger styles into a smaller. Since MSIE automaticly converts
- border: 1px solid red to border-left: 1px solid red, border-righ: 1px solid red and so forth.'
- This will bundle them together again if the information is the same in each item.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>ar</CODE> -  Style name/value array with items.  
-      </UL> 
-   
-     <UL><CODE>pr</CODE> -  Style item prefix to bundle for example border.  
-      </UL> 
-   
-     <UL><CODE>sf</CODE> -  Style item suffix to bunlde for example -width or -width.  
-      </UL> 
-   
-     <UL><CODE>res</CODE> -  Result name, for example border-width.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="confirmAdd"><!-- --></A>
-   <H3>confirmAdd</H3>
-   <PRE>void <B>confirmAdd</B>(&lt;DOMEvent&gt; e, &lt;Array&gt; settings)</PRE>
-   
-      <UL>Displays a confirm dialog when a user clicks/focus a textarea that is to be converted into
- a TinyMCE instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  DOM event instance.  
-      </UL> 
-   
-     <UL><CODE>settings</CODE> -  Name/Value array of initialization settings. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertAbsoluteURLToRelativeURL"><!-- --></A>
-   <H3>convertAbsoluteURLToRelativeURL</H3>
-   <PRE>string <B>convertAbsoluteURLToRelativeURL</B>(&lt;string&gt; base_url, &lt;string&gt; url_to_relative)</PRE>
-   
-      <UL>Converts an absolute path to relative path.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>base_url</CODE> -  URL to make as a base path, URLs will be converted relative from this point.  
-      </UL> 
-   
-     <UL><CODE>url_to_relative</CODE> -  URL to convert into a relative URL.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Relative URL based in input.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertAllRelativeURLs"><!-- --></A>
-   <H3>convertAllRelativeURLs</H3>
-   <PRE>void <B>convertAllRelativeURLs</B>(&lt;HTMLElement&gt; body)</PRE>
-   
-      <UL>Converts all img and a element URLs to absolute URLs. This will use the mce_src or mce_href attribute values
- if they are provided. This function is used when the editor is initialized.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>body</CODE> -  HTML element to convert all URLs in.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertFontsToSpans"><!-- --></A>
-   <H3>convertFontsToSpans</H3>
-   <PRE>void <B>convertFontsToSpans</B>(&lt;DOMDocument&gt; doc)</PRE>
-   
-      <UL>Convers fonts to spans in the specified document.
- Todo: Move this function into a XHTML plugin or simmilar.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>doc</CODE> -  Document instance to convert fonts in.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertHexToRGB"><!-- --></A>
-   <H3>convertHexToRGB</H3>
-   <PRE>string <B>convertHexToRGB</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Returns a rgb(n,n,n) string from a hexadecimal value.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  Hexadecimal string to parse.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        rgb(n,n,n) string from a hexadecimal value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertRelativeToAbsoluteURL"><!-- --></A>
-   <H3>convertRelativeToAbsoluteURL</H3>
-   <PRE>string <B>convertRelativeToAbsoluteURL</B>(&lt;string&gt; base_url, &lt;string&gt; relative_url)</PRE>
-   
-      <UL>Converts an relative path to absolute path.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>base_url</CODE> -  URL to make as a base path, URLs will be converted absolute from this point.  
-      </UL> 
-   
-     <UL><CODE>relative_url</CODE> -  URL to convert into a absolute URL.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Absolute URL based in input.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertRGBToHex"><!-- --></A>
-   <H3>convertRGBToHex</H3>
-   <PRE>string <B>convertRGBToHex</B>(&lt;string&gt; s, &lt;boolean&gt; k)</PRE>
-   
-      <UL>Returns a hexadecimal version of the specified rgb(1,2,3) string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  RGB string to parse, if this doesn't isn't a rgb(n,n,n) it will passthrough the string.  
-      </UL> 
-   
-     <UL><CODE>k</CODE> -  Keep before/after contents. If enabled contents before after the rgb(n,n,n) will be intact.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Hexadecimal version of the specified rgb(1,2,3) string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertSpansToFonts"><!-- --></A>
-   <H3>convertSpansToFonts</H3>
-   <PRE>void <B>convertSpansToFonts</B>(&lt;DOMDocument&gt; doc)</PRE>
-   
-      <UL>Converts span elements to font elements in the specified document instance.
- Todo: Move this function into a XHTML plugin or simmilar.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>doc</CODE> -  Document instance to convert spans in.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="convertURL"><!-- --></A>
-   <H3>convertURL</H3>
-   <PRE>string <B>convertURL</B>(&lt;string&gt; url, &lt;HTMLElement&gt; node, &lt;boolean&gt; on_save)</PRE>
-   
-      <UL>Converts the specified URL based in TinyMCE configuration settings.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>url</CODE> -  URL to convert based on config.  
-      </UL> 
-   
-     <UL><CODE>node</CODE> -  HTML element that holds the URL.  
-      </UL> 
-   
-     <UL><CODE>on_save</CODE> -  Is this convertion the final output URL.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Converted URL string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="debug"><!-- --></A>
-   <H3>debug</H3>
-   <PRE>void <B>debug</B>()</PRE>
-   
-      <UL>Debugs the specified message to a screen.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>Numerous</CODE> -  arguments that will be outputed.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="dispatchCallback"><!-- --></A>
-   <H3>dispatchCallback</H3>
-   <PRE>Object <B>dispatchCallback</B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; i, &lt;string&gt; p, &lt;string&gt; n)</PRE>
-   
-      <UL>Dispatches the specified callback on all options, plugins and themes. This will not
- chain them, so all functions callbacks will be executed regardless if the return true/false.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>i</CODE> -  TinyMCE editor control instance to execute callback on.  
-      </UL> 
-   
-     <UL><CODE>p</CODE> -  TinyMCE callback parameter to execute.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Function name to execute.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if they where dispatched. 
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="entityDecode"><!-- --></A>
-   <H3>entityDecode</H3>
-   <PRE>string <B>entityDecode</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>HTML entity decode a string, replaces &lt; with <.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  Entity string to decode into normal string.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Entity decoded string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="evalFunc"><!-- --></A>
-   <H3>evalFunc</H3>
-   <PRE>object <B>evalFunc</B>(&lt;string&gt; f, &lt;int&gt; idx, &lt;Array&gt; a)</PRE>
-   
-      <UL>Evaluates the specified function and uses the array of arguments.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>f</CODE> -  Function reference to execute.  
-      </UL> 
-   
-     <UL><CODE>idx</CODE> -  Index in array to start grabbing arguments from.  
-      </UL> 
-   
-     <UL><CODE>a</CODE> -  Array of function arguments.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Value returned from the evaluated function.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="execCommand"><!-- --></A>
-   <H3>execCommand</H3>
-   <PRE>void <B>execCommand</B>(&lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;object&gt; value)</PRE>
-   
-      <UL>Executes a command on the selected or last selected TinyMCE editor control instance. This function also handles
- some non instance specific commands like mceAddControl, mceRemoveControl, mceHelp or mceFocus.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>command</CODE> -  Command name to execute, for example mceLink or Bold.  
-      </UL> 
-   
-     <UL><CODE>user_interface</CODE> -  True/false state if a UI (dialog) should be presented or not.  
-      </UL> 
-   
-     <UL><CODE>value</CODE> -  Optional command value, this can be anything. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="execCommandCallback"><!-- --></A>
-   <H3>execCommandCallback</H3>
-   <PRE>Object <B>execCommandCallback</B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; i, &lt;string&gt; p, &lt;string&gt; n)</PRE>
-   
-      <UL>Executes the specified execcommand callback on all options, plugins and themes. This will
- chain them, so callback chain will be broken if one function returns true.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>i</CODE> -  TinyMCE editor control instance to execute callback on.  
-      </UL> 
-   
-     <UL><CODE>p</CODE> -  TinyMCE callback parameter to execute.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Function name to execute.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if a callback was executed. 
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="execInstanceCommand"><!-- --></A>
-   <H3>execInstanceCommand</H3>
-   <PRE>void <B>execInstanceCommand</B>(&lt;string&gt; editor_id, &lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;object&gt; value, &lt;boolean&gt; focus)</PRE>
-   
-      <UL>Executes a command on a specific editor instance by id.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  TinyMCE editor control instance id to perform comman on.  
-      </UL> 
-   
-     <UL><CODE>command</CODE> -  Command name to execute, for example mceLink or Bold.  
-      </UL> 
-   
-     <UL><CODE>user_interface</CODE> -  True/false state if a UI (dialog) should be presented or not.  
-      </UL> 
-   
-     <UL><CODE>value</CODE> -  Optional command value, this can be anything.  
-      </UL> 
-   
-     <UL><CODE>focus</CODE> -  True/false if the editor instance should be focused first. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="executeCallback"><!-- --></A>
-   <H3>executeCallback</H3>
-   <PRE>Object <B>executeCallback</B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; i, &lt;string&gt; p, &lt;string&gt; n)</PRE>
-   
-      <UL>Executes the specified callback on all options, plugins and themes. This will
- chain them, so callback chain will be broken if one function returns false.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>i</CODE> -  TinyMCE editor control instance to execute callback on.  
-      </UL> 
-   
-     <UL><CODE>p</CODE> -  TinyMCE callback parameter to execute.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Function name to execute.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if a callback was executed. 
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="explode"><!-- --></A>
-   <H3>explode</H3>
-   <PRE>Array <B>explode</B>(&lt;string&gt; d, &lt;string&gt; s)</PRE>
-   
-      <UL>Splits a string by the specified delimiter and skips any empty items.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>d</CODE> -  Delimiter to split by.  
-      </UL> 
-   
-     <UL><CODE>s</CODE> -  String to split.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Array with chunks from string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="extend"><!-- --></A>
-   <H3>extend</H3>
-   <PRE>Object <B>extend</B>(&lt;Object&gt; p, &lt;Object&gt; np)</PRE>
-   
-      <UL>Extends the specified prototype with new methods.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>p</CODE> -  Prototype to extend with new methods.  
-      </UL> 
-   
-     <UL><CODE>np</CODE> -  New prototype to extend the other one with.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Extended prototype array.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="fixGeckoBaseHREFBug"><!-- --></A>
-   <H3>fixGeckoBaseHREFBug</H3>
-   <PRE>string <B>fixGeckoBaseHREFBug</B>(&lt;boolean&gt; m, &lt;HTMLElement&gt; e, &lt;string&gt; h)</PRE>
-   
-      <UL>Fixes a Gecko specific bug where href, src attribute values gets converted incorrectly
- when inserted into editor. This function will replace all src, href with mce_tsrc and mce_thref
- to keep the values from chaging when they get inserted.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>m</CODE> -  Mode state, true is to replace the src, href attributes to mce_tsrc and mce_thref.  
-      </UL> 
-   
-     <UL><CODE>e</CODE> -  HTML element to replace them in. (Will be used if m is 0)  
-      </UL> 
-   
-     <UL><CODE>h</CODE> -  HTML code to replace them in. (Will be used if m is 1)  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Converted string or the specified HTML value depending on mode.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getAbsPosition"><!-- --></A>
-   <H3>getAbsPosition</H3>
-   <PRE>TinyMCE_ElementPosition <B>getAbsPosition</B>(&lt;HTMLNode&gt; n)</PRE>
-   
-      <UL>Returns the absolute x, y position of a node. The position will be returned in a object with
- two properties absLeft and absTop.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  HTML element to get x, y position from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Absolute position of the specified element.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getAttrib"><!-- --></A>
-   <H3>getAttrib</H3>
-   <PRE>string <B>getAttrib</B>(&lt;HTMLElement&gt; elm, &lt;string&gt; name, &lt;string&gt; default_value)</PRE>
-   
-      <UL>Returns the attribute value of a element or the default value if it wasn't found.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>elm</CODE> -  HTML element to get attribute from.  
-      </UL> 
-   
-     <UL><CODE>name</CODE> -  Attribute name to retrive.  
-      </UL> 
-   
-     <UL><CODE>default_value</CODE> -  Optional default value to return, this value defaults to a empty string.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Attribute value or default value if it wasn't found in element.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getButtonHTML"><!-- --></A>
-   <H3>getButtonHTML</H3>
-   <PRE>string <B>getButtonHTML</B>(&lt;string&gt; id, &lt;string&gt; lang, &lt;string&gt; img, &lt;string&gt; cmd, &lt;string&gt; ui, &lt;string&gt; val)</PRE>
-   
-      <UL>Returns the HTML code for a normal button control.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>id</CODE> -  Button control id, this will be the suffix for the element id, the prefix is the editor id.  
-      </UL> 
-   
-     <UL><CODE>lang</CODE> -  Language variable key name to insert as the title/alt of the button image.  
-      </UL> 
-   
-     <UL><CODE>img</CODE> -  Image URL to insert, {$themeurl} and {$pluginurl} will be replaced.  
-      </UL> 
-   
-     <UL><CODE>cmd</CODE> -  Command to execute when the user clicks the button.  
-      </UL> 
-   
-     <UL><CODE>ui</CODE> -  Optional user interface boolean for command.  
-      </UL> 
-   
-     <UL><CODE>val</CODE> -  Optional value for command.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML code for a normal button based in input information.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getContent"><!-- --></A>
-   <H3>getContent</H3>
-   <PRE>string <B>getContent</B>(&lt;string&gt; editor_id)</PRE>
-   
-      <UL>Returns the HTML contents of the specified editor instance id.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  Editor instance id to retrive HTML code from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML contents of editor id or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getControlHTML"><!-- --></A>
-   <H3>getControlHTML</H3>
-   <PRE>string <B>getControlHTML</B>(&lt;string&gt; c)</PRE>
-   
-      <UL>Returns the HTML for the specified control this will loop through
- the theme and all plugins inorder to find the control. The callback for each
- theme and plugin is called getControlHTML.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>c</CODE> -  Control name/id to get HTML code for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML code for the specified control or empty string if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getCSSClasses"><!-- --></A>
-   <H3>getCSSClasses</H3>
-   <PRE>Array <B>getCSSClasses</B>(&lt;string&gt; editor_id, &lt;DOMDocument&gt; doc)</PRE>
-   
-      <UL>Returns a array of CSS classes that is available in a document.
- TinyMCE_Engine.prototype.Todo = Fix;this one, it's so ugly. :)</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  Editor id to get CSS classes from.  
-      </UL> 
-   
-     <UL><CODE>doc</CODE> -  DOM document to get the CSS classes from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Array of CSS classes that is available in a document.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getEditorId"><!-- --></A>
-   <H3>getEditorId</H3>
-   <PRE>string <B>getEditorId</B>(&lt;string&gt; form_element)</PRE>
-   
-      <UL>Returns the editor instance id of a specific form element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>form_element</CODE> -  Form element name to get instance id for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        TinyMCE editor instance id or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getElementByAttributeValue"><!-- --></A>
-   <H3>getElementByAttributeValue</H3>
-   <PRE>HTMLElement <B>getElementByAttributeValue</B>(&lt;HTMLElement&gt; n, &lt;string&gt; e, &lt;string&gt; a, &lt;string&gt; v)</PRE>
-   
-      <UL>Returns a element by a specific attribute and it's value.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Element to search in.  
-      </UL> 
-   
-     <UL><CODE>e</CODE> -  Element name to search for.  
-      </UL> 
-   
-     <UL><CODE>a</CODE> -  Attribute name to search for.  
-      </UL> 
-   
-     <UL><CODE>v</CODE> -  Attribute value to search for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML element that matched the criterias or null on failure.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getElementsByAttributeValue"><!-- --></A>
-   <H3>getElementsByAttributeValue</H3>
-   <PRE>Array <B>getElementsByAttributeValue</B>(&lt;HTMLElement&gt; n, &lt;string&gt; e, &lt;string&gt; a, &lt;string&gt; v)</PRE>
-   
-      <UL>Returns a element array by a specific attribute and it's value.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Element to search in.  
-      </UL> 
-   
-     <UL><CODE>e</CODE> -  Element name to search for.  
-      </UL> 
-   
-     <UL><CODE>a</CODE> -  Attribute name to search for.  
-      </UL> 
-   
-     <UL><CODE>v</CODE> -  Attribute value to search for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML element array that matched the criterias or null on failure.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getInstanceById"><!-- --></A>
-   <H3>getInstanceById</H3>
-   <PRE><a href="TinyMCE_Control.html">TinyMCE_Control</a> <B>getInstanceById</B>(&lt;string&gt; editor_id)</PRE>
-   
-      <UL>Returns a TinyMCE editor instance by the specified editor id or null if it wasn't found.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  Editor id to get instance for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        TinyMCE editor control instance or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getLang"><!-- --></A>
-   <H3>getLang</H3>
-   <PRE>object <B>getLang</B>(&lt;string&gt; name, &lt;string&gt; default_value, &lt;boolean&gt; parse_entities, &lt;Array&gt; va)</PRE>
-   
-      <UL>Returns a language variable value from the language packs.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>name</CODE> -  Name of the key to retrive.  
-      </UL> 
-   
-     <UL><CODE>default_value</CODE> -  Optional default value to return if it wasn't found.  
-      </UL> 
-   
-     <UL><CODE>parse_entities</CODE> -  Is HTML entities to be resolved or not.  
-      </UL> 
-   
-     <UL><CODE>va</CODE> -  Optional name/value array of variables to replace in language string.	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Language string value could be a number if it's a relative dimenstion.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getNodeTree"><!-- --></A>
-   <H3>getNodeTree</H3>
-   <PRE>Array <B>getNodeTree</B>(&l&lt;int&gt; t;HTMLNode&gt; n, &lt;Array&gt; na, t, &lt;string&gt; nn)</PRE>
-   
-      <UL>Returns a array of nodes selected retrived from the child nodes of the specified node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node to get children from.  
-      </UL> 
-   
-     <UL><CODE>na</CODE> -  Array to fill with children.  
-      </UL> 
-   
-     <UL><CODE>t</CODE> -  Node type to get.  
-      </UL> 
-   
-     <UL><CODE>nn</CODE> -  Node name of items to retrive.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Node array.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getOuterHTML"><!-- --></A>
-   <H3>getOuterHTML</H3>
-   <PRE>string <B>getOuterHTML</B>(&lt;HTMLElement&gt; e)</PRE>
-   
-      <UL>Returns the outer HTML of a element, this uses the outerHTML
- property in MSIE and Opera and a workaround for Gecko.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  HTML element to get outerHTML from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML content string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getParam"><!-- --></A>
-   <H3>getParam</H3>
-   <PRE>object <B>getParam</B>(&lt;string&gt; name, &lt;string&gt; default_value, &lt;boolean&gt; strip_whitespace, &lt;string&gt; split_chr)</PRE>
-   
-      <UL>Returns a specific configuration setting or the default value if it wasn't found.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>name</CODE> -  Configuration setting to get.  
-      </UL> 
-   
-     <UL><CODE>default_value</CODE> -  Default value to return if it wasn't found.  
-      </UL> 
-   
-     <UL><CODE>strip_whitespace</CODE> -  Optional remove all whitespace.  
-      </UL> 
-   
-     <UL><CODE>split_chr</CODE> -  Split char/regex/string.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Number, string or other object based in parameter and default_value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getParentBlockElement"><!-- --></A>
-   <H3>getParentBlockElement</H3>
-   <PRE>HTMLElement <B>getParentBlockElement</B>(&lt;HTMLNode&gt; n)</PRE>
-   
-      <UL>Returns the first block element parent of the specified node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node get parent block element for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        First block element parent of the specified node or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getParentElement"><!-- --></A>
-   <H3>getParentElement</H3>
-   <PRE>HTMLElement <B>getParentElement</B>(&lt;HTMLNode&gt; node, &lt;string&gt; names, &lt;string&gt; attrib_name, &lt;string&gt; attrib_value)</PRE>
-   
-      <UL>Returns the parent element of the specified node based on the search criteria.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>node</CODE> -  Node to get parent element of.  
-      </UL> 
-   
-     <UL><CODE>names</CODE> -  Comma separated list of element names to get.  
-      </UL> 
-   
-     <UL><CODE>attrib_name</CODE> -  Optional attribute name to match.  
-      </UL> 
-   
-     <UL><CODE>attrib_value</CODE> -  Optional attribute value to match.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTMLElement or null based on search criteras.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getParentNode"><!-- --></A>
-   <H3>getParentNode</H3>
-   <PRE>DOMNode <B>getParentNode</B>(&lt;DOMNode&gt; n, &lt;function&gt; f)</PRE>
-   
-      <UL>Returns a node by the specified selector function. This function will
- loop through all parent nodes and call the specified function for each node.
- If the function then returns true it will stop the execution and return that node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  HTML node to search parents on.  
-      </UL> 
-   
-     <UL><CODE>f</CODE> -  Selection function to execute on each node.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        DOMNode or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getVisualAidClass"><!-- --></A>
-   <H3>getVisualAidClass</H3>
-   <PRE>string <B>getVisualAidClass</B>(&lt;string&gt; class_name, &lt;boolean&gt; state)</PRE>
-   
-      <UL>Returns the visual aid class string, this will add/remove the visual aid class.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>class_name</CODE> -  Class name value to add/remove visual aid classes from.  
-      </UL> 
-   
-     <UL><CODE>state</CODE> -  true/false if the classes should be added or removed.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        New class value containing the visual aid classes or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getWindowArg"><!-- --></A>
-   <H3>getWindowArg</H3>
-   <PRE>Object <B>getWindowArg</B>(&lt;string&gt; n, d)</PRE>
-   
-      <UL>Returns the window argument to be passed to TinyMCE popup.
- TinyMCE_Engine.prototype.Use = tinyMCEPopup;.getWindowArg instead.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Window argument name.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Argument value or default value if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="handleEvent"><!-- --></A>
-   <H3>handleEvent</H3>
-   <PRE>boolean <B>handleEvent</B>(&lt;DOMEvent&gt; e)</PRE>
-   
-      <UL>Event handler function that gets executed each time a event occurs in a TinyMCE editor control instance.
- TinyMCE_Engine.prototype.Todo = Fix;the return statements so they return true or false.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  DOM event object reference.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true - if the event is to be chained, false - if the event chain is to be canceled.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="handleVisualAid"><!-- --></A>
-   <H3>handleVisualAid</H3>
-   <PRE>void <B>handleVisualAid</B>(&lt;HTMLElement&gt; el, &lt;boolean&gt; deep, &lt;boolean&gt; state, &lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; inst, skip_dispatch)</PRE>
-   
-      <UL>Adds visual aid classes to all elements that need them recursive in the DOM tree.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>el</CODE> -  HTML element to add visual aid classes to.  
-      </UL> 
-   
-     <UL><CODE>deep</CODE> -  Should they be added to all children aswell.  
-      </UL> 
-   
-     <UL><CODE>state</CODE> -  Should they be added or removed.  
-      </UL> 
-   
-     <UL><CODE>inst</CODE> -  TinyMCE editor control instance to add/remove them to/from. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="hasMenu"><!-- --></A>
-   <H3>hasMenu</H3>
-   <PRE>boolean <B>hasMenu</B>(&lt;string&gt; n)</PRE>
-   
-      <UL>Checks if the specified menu by name is added to TinyMCE.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  TinyMCE menu id.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if it exists or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="hasPlugin"><!-- --></A>
-   <H3>hasPlugin</H3>
-   <PRE>boolean <B>hasPlugin</B>(&lt;string&gt; n)</PRE>
-   
-      <UL>Returns true/false if the specified plugin is loaded or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Plugin name to look for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if the specified plugin is loaded or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="hasTheme"><!-- --></A>
-   <H3>hasTheme</H3>
-   <PRE>boolean <B>hasTheme</B>(&lt;string&gt; n)</PRE>
-   
-      <UL>Returns true/false if the specified theme is loaded or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Theme name/id to check for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if the specified theme is loaded or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="importCSS"><!-- --></A>
-   <H3>importCSS</H3>
-   <PRE>void <B>importCSS</B>(&lt;DOMDocument&gt; doc, &lt;string&gt; css)</PRE>
-   
-      <UL>Imports a CSS file into a allready loaded document. This will add a link element
- to the head element of the document.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>doc</CODE> -  DOM Document to load CSS into.  
-      </UL> 
-   
-     <UL><CODE>css</CODE> -  CSS File URL to load or comma separated list of files. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="importPluginLanguagePack"><!-- --></A>
-   <H3>importPluginLanguagePack</H3>
-   <PRE>void <B>importPluginLanguagePack</B>(&lt;string&gt; name, &lt;string&gt; valid_languages)</PRE>
-   
-      <UL>Loads a plugin specific language pack.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>name</CODE> -  Plugin name/id to load language pack for.  
-      </UL> 
-   
-     <UL><CODE>valid_languages</CODE> -  Comma separated list of valid languages for the plugin. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="importThemeLanguagePack"><!-- --></A>
-   <H3>importThemeLanguagePack</H3>
-   <PRE>void <B>importThemeLanguagePack</B>(&lt;string&gt; name)</PRE>
-   
-      <UL>Loads a theme specific language pack.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>name</CODE> -  Optional name of the theme to load language pack from. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="init"><!-- --></A>
-   <H3>init</H3>
-   <PRE>void <B>init</B>(settings)</PRE>
-   
-      <UL>Initializes TinyMCE with the specific configuration settings. This method
- may be called multiple times when multiple instances with diffrent settings is to be created.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>Name</CODE> - /Value array of initialization settings. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="insertAfter"><!-- --></A>
-   <H3>insertAfter</H3>
-   <PRE>void <B>insertAfter</B>(&lt;HTMLNode&gt; n, &lt;HTMLNode&gt; r)</PRE>
-   
-      <UL>Inserts a node after the specific node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  New node to insert.  
-      </UL> 
-   
-     <UL><CODE>r</CODE> -  Reference node to insert after.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="isBlockElement"><!-- --></A>
-   <H3>isBlockElement</H3>
-   <PRE>boolean <B>isBlockElement</B>(&lt;HTMLNode&gt; n)</PRE>
-   
-      <UL>Returns true/false if the specified node is a block element or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node to verify.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if the specified node is a block element or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="isInstance"><!-- --></A>
-   <H3>isInstance</H3>
-   <PRE>boolean <B>isInstance</B>(&lt;object&gt; o)</PRE>
-   
-      <UL>Returns true/false if a specific object is a TinyMCE_Control instance or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>o</CODE> -  Object to check.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if it's a control or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="loadCSS"><!-- --></A>
-   <H3>loadCSS</H3>
-   <PRE>void <B>loadCSS</B>(&lt;string&gt; url)</PRE>
-   
-      <UL>Loads the specified CSS by writing the a link tag to the current page.
- This will also check if the file has been loaded before. This function should only be used
- when the page is loading.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>url</CODE> -  CSS file URL to load or comma separated list of files. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="loadPlugin"><!-- --></A>
-   <H3>loadPlugin</H3>
-   <PRE>void <B>loadPlugin</B>(&lt;string&gt; n, &lt;string&gt; u)</PRE>
-   
-      <UL>Load plugin from external URL.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Plugin name for example \"emotions\".  
-      </UL> 
-   
-     <UL><CODE>u</CODE> -  URL of plugin directory to load. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="loadScript"><!-- --></A>
-   <H3>loadScript</H3>
-   <PRE>void <B>loadScript</B>(&lt;string&gt; url)</PRE>
-   
-      <UL>Loads the specified script by writing the a script tag to the current page.
- This will also check if the file has been loaded before. This function should only be used
- when the page is loading.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>url</CODE> -  Script URL to load. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="nextNode"><!-- --></A>
-   <H3>nextNode</H3>
-   <PRE>HTMLElement <B>nextNode</B>(&lt;HTMLNode&gt; e, &lt;string&gt; n)</PRE>
-   
-      <UL>Finds any element after the current one by name. This will loop through the siblings
- inorder to find the specified element by name. If the element wasn't found
- it will return a null value.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  HTML node to search from.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Comma separated list of element names to search for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML Element or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="onLoad"><!-- --></A>
-   <H3>onLoad</H3>
-   <PRE>boolean <B>onLoad</B>()</PRE>
-   
-      <UL>Gets executed when the page loads or get intitialized. This function will then convert all textareas/divs that
- is to be converted into TinyMCE editor controls.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true - if the event is to be chained, false - if the event chain is to be canceled.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="onMouseMove"><!-- --></A>
-   <H3>onMouseMove</H3>
-   <PRE>void <B>onMouseMove</B>()</PRE>
-   
-      <UL>Mouse move handler function, this will be executed each time
- the mouse is moved within a editor instance. This function stores away the current selection in MSIE
- this will then be used when a undo/redo level is added.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="openWindow"><!-- --></A>
-   <H3>openWindow</H3>
-   <PRE>void <B>openWindow</B>(&lt;Array&gt; template, &lt;Array&gt; args)</PRE>
-   
-      <UL>Opens a popup window based in the specified input data. This function
- is used for all popup windows in TinyMCE.
-
- These are the current template TinyMCE_Engine.prototype.keys = file; width, height, close_previous.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>template</CODE> -  Popup template data such as with, height etc.  
-      </UL> 
-   
-     <UL><CODE>args</CODE> -  Popup arguments that is to be passed to the popup such as custom data. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="parseStyle"><!-- --></A>
-   <H3>parseStyle</H3>
-   <PRE>Array <B>parseStyle</B>(&lt;string&gt; str)</PRE>
-   
-      <UL>Parses the specified HTML style data. This will parse for example
- "border-left: 1px; background-color: red" into an key/value array.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>str</CODE> -  Style data to parse.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Name/Value array of style items.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="parseURL"><!-- --></A>
-   <H3>parseURL</H3>
-   <PRE>TinyMCE_URL_Item <B>parseURL</B>(&lt;string&gt; url_str)</PRE>
-   
-      <UL>Parses a URL in to its diffrent components.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>url_str</CODE> -  URL string to parse into a URL object.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        URL object based on input string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="prevNode"><!-- --></A>
-   <H3>prevNode</H3>
-   <PRE>HTMLElement <B>prevNode</B>(&lt;HTMLNode&gt; e, &lt;string&gt; n)</PRE>
-   
-      <UL>Finds any previous element by name. This will loop through the siblings
- inorder to find the specified element by name. If the element wasn't found
- it will return a null value.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  HTML node to search from.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  Comma separated list of element names to search for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML Element or null if it wasn't found.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="queryInstanceCommandState"><!-- --></A>
-   <H3>queryInstanceCommandState</H3>
-   <PRE>boolean <B>queryInstanceCommandState</B>(&lt;string&gt; editor_id, &lt;string&gt; command)</PRE>
-   
-      <UL>Queries a command state for a specific command on a specific editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  Editor id to query command state on.  
-      </UL> 
-   
-     <UL><CODE>command</CODE> -  Command to query for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Command state passed from browser.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="queryInstanceCommandValue"><!-- --></A>
-   <H3>queryInstanceCommandValue</H3>
-   <PRE>object <B>queryInstanceCommandValue</B>(&lt;string&gt; editor_id, &lt;string&gt; command)</PRE>
-   
-      <UL>Queries a command value for a specific command on a specific editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  Editor id to query command value on.  
-      </UL> 
-   
-     <UL><CODE>command</CODE> -  Command to query for.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Command value passed from browser.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="regexpReplace"><!-- --></A>
-   <H3>regexpReplace</H3>
-   <PRE>string <B>regexpReplace</B>(&lt;string&gt; in_str, &lt;string&gt; reg_exp, &lt;string&gt; replace_str, opts)</PRE>
-   
-      <UL>Regexp replaces the contents of a string. Use normal replace instead.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>in_str</CODE> -  String to replace in.  
-      </UL> 
-   
-     <UL><CODE>in_str</CODE> -  Optional regexp options like "gi".  
-      </UL> 
-   
-     <UL><CODE>reg_exp</CODE> -  Regexp to replace.  
-      </UL> 
-   
-     <UL><CODE>replace_str</CODE> -  String to replace with.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Replaced string value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="removeCSSClass"><!-- --></A>
-   <H3>removeCSSClass</H3>
-   <PRE>string <B>removeCSSClass</B>(&lt;HTMLElement&gt; e, c)</PRE>
-   
-      <UL>Removes the specified CSS class from the element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  HTML element to remove CSS class to.  
-      </UL> 
-   
-     <UL><CODE>string</CODE> - ] c CSS class to remove to HTML element.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Returns the new class attribute value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="removeMCEControl"><!-- --></A>
-   <H3>removeMCEControl</H3>
-   <PRE>void <B>removeMCEControl</B>(&lt;string&gt; editor_id)</PRE>
-   
-      <UL>Removes a TinyMCE editor control instance by id.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  Id of editor instance to remove. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="removeTinyMCEFormElements"><!-- --></A>
-   <H3>removeTinyMCEFormElements</H3>
-   <PRE>void <B>removeTinyMCEFormElements</B>(&lt;HTMLElement&gt; form_obj)</PRE>
-   
-      <UL>Removes/disables TinyMCE built in form elements such as select boxes for font sizes etc.
- These are disabled when the user submits a form so they don't get picked up by the backend script
- that intercepts the contents.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>form_obj</CODE> -  Form object to loop through for TinyMCE specific form elements. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="renameElement"><!-- --></A>
-   <H3>renameElement</H3>
-   <PRE>void <B>renameElement</B>(&lt;HTMLElement&gt; e, &lt;string&gt; n, &lt;DOMDocument&gt; d)</PRE>
-   
-      <UL>Renames the specified element to the specified name.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  Element to rename.  
-      </UL> 
-   
-     <UL><CODE>n</CODE> -  New name of the element.  
-      </UL> 
-   
-     <UL><CODE>d</CODE> -  Optional document reference.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="replaceVar"><!-- --></A>
-   <H3>replaceVar</H3>
-   <PRE>string <B>replaceVar</B>(&lt;string&gt; h, &lt;string&gt; r, &lt;string&gt; v)</PRE>
-   
-      <UL>Replaces a specific variable in the string with a nother string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>h</CODE> -  String to search in for the variable.  
-      </UL> 
-   
-     <UL><CODE>r</CODE> -  Variable name to search for.  
-      </UL> 
-   
-     <UL><CODE>v</CODE> -  Value to insert where a variable is found.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        String with replaced variable.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="resetForm"><!-- --></A>
-   <H3>resetForm</H3>
-   <PRE>void <B>resetForm</B>(&lt;int&gt; form_index)</PRE>
-   
-      <UL>Resets a forms TinyMCE instances based on form index.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>form_index</CODE> -  Form index to reset. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="selectNodes"><!-- --></A>
-   <H3>selectNodes</H3>
-   <PRE>Array <B>selectNodes</B>(&lt;DOMNode&gt; n, &lt;function&gt; f, &lt;Array&gt; a)</PRE>
-   
-      <UL>Returns a array of nodes when the specified function matches a node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Node to select children from.  
-      </UL> 
-   
-     <UL><CODE>f</CODE> -  Function that returns true/false if the node is to be added or not.  
-      </UL> 
-   
-     <UL><CODE>a</CODE> -  Optional array to fill with nodes.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Array with selected nodes.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="serializeStyle"><!-- --></A>
-   <H3>serializeStyle</H3>
-   <PRE>string <B>serializeStyle</B>(&lt;Array&gt; ar)</PRE>
-   
-      <UL>Serializes the specified style item name/value array into a HTML string. This function
- will force HEX colors in Firefox and convert the URL items of a style correctly.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>ar</CODE> -  Name/Value array of items to serialize.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Serialized HTML string containing the items.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="serializeURL"><!-- --></A>
-   <H3>serializeURL</H3>
-   <PRE>string <B>serializeURL</B>(&lt;TinyMCE_URL_Item&gt; up)</PRE>
-   
-      <UL>Serializes the specified URL object into a string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>up</CODE> -  URL object to serialize.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Serialized URL object.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setAttrib"><!-- --></A>
-   <H3>setAttrib</H3>
-   <PRE>void <B>setAttrib</B>(&lt;HTMLElement&gt; element, &lt;string&gt; name, &lt;string&gt; value, &lt;boolean&gt; fix_value)</PRE>
-   
-      <UL>Sets the attribute value for a specific attribute.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>element</CODE> -  HTML element to set attribute on.  
-      </UL> 
-   
-     <UL><CODE>name</CODE> -  Attribute name to set.  
-      </UL> 
-   
-     <UL><CODE>value</CODE> -  Attribute value to set.  
-      </UL> 
-   
-     <UL><CODE>fix_value</CODE> -  Optional fix value state, if true only number data will be accepted.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setContent"><!-- --></A>
-   <H3>setContent</H3>
-   <PRE>void <B>setContent</B>(&lt;string&gt; h)</PRE>
-   
-      <UL>Sets the HTML contents of the selected editor instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>h</CODE> -  HTML contents to set in the selected instance.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setInnerHTML"><!-- --></A>
-   <H3>setInnerHTML</H3>
-   <PRE>void <B>setInnerHTML</B>(&lt;HTMLElement&gt; e, &lt;string&gt; h)</PRE>
-   
-      <UL>Sets the innerHTML property of a element, this function also
- fixes a MSIE bug where the first comment is removed.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  Element to insert HTML in.  
-      </UL> 
-   
-     <UL><CODE>h</CODE> -  HTML code to insert into innerHTML.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setOuterHTML"><!-- --></A>
-   <H3>setOuterHTML</H3>
-   <PRE>void <B>setOuterHTML</B>(&lt;HTMLElement&gt; e, &lt;string&gt; h)</PRE>
-   
-      <UL>Sets the outer HTML of a element, this uses the outerHTML
- property in MSIE and Opera and a workaround for Gecko.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  HTML element to set outerHTML on.  
-      </UL> 
-   
-     <UL><CODE>h</CODE> -  HTML string to set in property.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setPluginBaseURL"><!-- --></A>
-   <H3>setPluginBaseURL</H3>
-   <PRE>void <B>setPluginBaseURL</B>(&lt;string&gt; n, &lt;string&gt; u)</PRE>
-   
-      <UL>Sets the baseURL of the specified plugin, this is useful if the plugin is loaded from
- a external location.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Plugin name/id to set base URL on. This have to be added before.  
-      </UL> 
-   
-     <UL><CODE>u</CODE> -  Base URL of plugin, this string should be the URL prefix for the plugin without a trailing slash. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setStyleAttrib"><!-- --></A>
-   <H3>setStyleAttrib</H3>
-   <PRE>void <B>setStyleAttrib</B>(&lt;HTMLElement&gt; elm, &lt;string&gt; name, &lt;string&gt; value)</PRE>
-   
-      <UL>Sets a style attribute item value.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>elm</CODE> -  HTML element to set style attribute item on.  
-      </UL> 
-   
-     <UL><CODE>name</CODE> -  Style item name to set.  
-      </UL> 
-   
-     <UL><CODE>value</CODE> -  Style item value to set.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setupContent"><!-- --></A>
-   <H3>setupContent</H3>
-   <PRE>void <B>setupContent</B>(&lt;string&gt; editor_id)</PRE>
-   
-      <UL>Setups the contents of TinyMCE editor instance and fills it with contents.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>editor_id</CODE> -  TinyMCE editor instance control id to fill. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setWindowArg"><!-- --></A>
-   <H3>setWindowArg</H3>
-   <PRE>void <B>setWindowArg</B>(&lt;string&gt; n, &lt;string&gt; v)</PRE>
-   
-      <UL>Sets the window argument to be passed to TinyMCE popup.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Window argument name.  
-      </UL> 
-   
-     <UL><CODE>v</CODE> -  Window argument value. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="storeAwayURLs"><!-- --></A>
-   <H3>storeAwayURLs</H3>
-   <PRE>string <B>storeAwayURLs</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Stores away the src and href attribute values in separate mce_src and mce_href attributes.
- This is needed since both MSIE and Gecko messes with these attributes. The old
- src and href will be intact, this simply adds them to a separate attribute.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  HTML string to replace src and href attributes in.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML string with replaced src and href attributes.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="submitPatch"><!-- --></A>
-   <H3>submitPatch</H3>
-   <PRE>void <B>submitPatch</B>()</PRE>
-   
-      <UL>Piggyback onsubmit event handler function, this will remove/hide the TinyMCE specific form elements
- call triggerSave to fill the textarea with the correct contents then call the old piggy backed event handler.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="switchClass"><!-- --></A>
-   <H3>switchClass</H3>
-   <PRE>void <B>switchClass</B>(&lt;HTMLElement&gt; ei, &lt;string&gt; c)</PRE>
-   
-      <UL>Switches the CSS class of the specified element. This method also caches the
- elements in a lookup table for performance. This should only be used for TinyMCE main UI controls
- like buttons or select elements.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>ei</CODE> -  Element to set CSS class on.  
-      </UL> 
-   
-     <UL><CODE>c</CODE> -  CSS class to set.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="triggerNodeChange"><!-- --></A>
-   <H3>triggerNodeChange</H3>
-   <PRE>void <B>triggerNodeChange</B>(&lt;boolean&gt; focus, &lt;boolean&gt; setup_content)</PRE>
-   
-      <UL>Triggers a nodeChange event to every theme and plugin. This will be executed when the cursor moves or
- when a command that modifies the editor contents is executed.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>focus</CODE> -  Optional state if the last selected editor instance is to be focused or not.  
-      </UL> 
-   
-     <UL><CODE>setup_content</CODE> -  Optional state if it's called from setup content function or not. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="triggerSave"><!-- --></A>
-   <H3>triggerSave</H3>
-   <PRE>void <B>triggerSave</B>(&lt;boolean&gt; skip_cleanup, &lt;boolean&gt; skip_callback)</PRE>
-   
-      <UL>Moves the contents from a TinyMCE editor control instance to the hidden textarea
- that got replaced with TinyMCE. This is executed automaticly on for example form submit.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>skip_cleanup</CODE> -  Optional Skip cleanup, simply move the contents as fast as possible.  
-      </UL> 
-   
-     <UL><CODE>skip_callback</CODE> -  Optional Skip callback, don't call the save_callback function. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="trim"><!-- --></A>
-   <H3>trim</H3>
-   <PRE>string <B>trim</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Removes all prefix, suffix whitespace of a string.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  String to replace whitespace in.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Replaced string value.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="unloadHandler"><!-- --></A>
-   <H3>unloadHandler</H3>
-   <PRE>void <B>unloadHandler</B>()</PRE>
-   
-      <UL>Unload document event handler function. This function will be executed when the
- page is unloaded, this will automaticly move the current editor contents to the textarea element this enables
- the editor to restore it's state when the user presses the back button in the browser.
- This will execute the triggerSave function.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="updateContent"><!-- --></A>
-   <H3>updateContent</H3>
-   <PRE>void <B>updateContent</B>(&lt;string&gt; form_element_name)</PRE>
-   
-      <UL>Moves the contents from the hidden textarea to the editor that gets inserted.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>form_element_name</CODE> -  Form element name to move contents from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <UL>   
-   <B>Deprecated</B> <I></I><BR/><BR/>
-   </UL>
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="xmlEncode"><!-- --></A>
-   <H3>xmlEncode</H3>
-   <PRE>string <B>xmlEncode</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Encodes the string to raw XML entities. This will only convert the most common ones.
- For real entity encoding use the xmlEncode method of the Cleanup class.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  String to encode.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        XML Encoded string.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Engine.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Control.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Layer.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Engine.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Layer.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Layer.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Layer.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Layer.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,952 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_Layer
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_Layer";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Layer.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Engine.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Popup.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Layer.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_Layer</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_Layer</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_Layer</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_Layer.class.js.html'>TinyMCE_Layer.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_Layer.html#TinyMCE_Layer()">TinyMCE_Layer</A> 
-	 </B>
-	 (&lt;string&gt; id, &lt;boolean&gt; bm)
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      Constructor for the TinyMCE Layer.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#create">create</A></B>(&lt;string&gt; n, &lt;string&gt; c, &lt;HTMLElement&gt; p)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Creates a element for the layer based on the id and specified name.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getAbsPosition">getAbsPosition</A></B>(&lt;DOMElement&gt; n)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the absolute x, y cordinate of the specified node.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getBlocker">getBlocker</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the blocker DOM element, this is a invisible iframe.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getElement">getElement</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the DOM element that the layer is binded to.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#hide">hide</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Hides the layer.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#isVisible">isVisible</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns true/false if the layer is visible or not.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#moveBy">moveBy</A></B>(&lt;int&gt; x, &lt;int&gt; y)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the layer relative in pixels.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#moveRelativeTo">moveRelativeTo</A></B>(&lt;HTMLElement&gt; re, &lt;string&gt; p)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the layer relative to the specified HTML element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#moveTo">moveTo</A></B>(&lt;int&gt; x, &lt;int&gt; y)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Moves the layer absolute in pixels.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;int</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#parseInt">parseInt</A></B>(&lt;string&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Parses a int value this method will return 0 if the string is empty.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#resizeBy">resizeBy</A></B>(&lt;int&gt; w, &lt;int&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Resizes the layer by the specified relative width and height.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#resizeTo">resizeTo</A></B>(&lt;int&gt; w, &lt;int&gt; h)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Resizes the layer to the specified width and height.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#setBlockMode">setBlockMode</A></B>(&lt;boolean&gt; s)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Sets the block mode.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#show">show</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Shows the layer.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#updateBlocker">updateBlocker</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Updates the select/iframe/flash blocker this will also block the caret in Firefox.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_Layer()"><!-- --></A><H3>
-TinyMCE_Layer</H3>
-<PRE><B>TinyMCE_Layer</B>(&lt;string&gt; id, &lt;boolean&gt; bm)</PRE>
-
-
-<UL>
-   Constructor for the TinyMCE Layer. This class enables you to construct
- floating layers that is visible on top of select input fields, flashes and iframes.
-</UL>
-
-
-
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>id</CODE> -  Unique ID name for the layer.  
-     </UL>
-   
-     <UL><CODE>bm</CODE> -  Block mode, defaults to true.    
-     </UL>
-   
-   
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="create"><!-- --></A>
-   <H3>create</H3>
-   <PRE>HTMLElement <B>create</B>(&lt;string&gt; n, &lt;string&gt; c, &lt;HTMLElement&gt; p)</PRE>
-   
-      <UL>Creates a element for the layer based on the id and specified name.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  Element tag name, like div.  
-      </UL> 
-   
-     <UL><CODE>c</CODE> -  Optional class name to set as class attribute value.  
-      </UL> 
-   
-     <UL><CODE>p</CODE> -  Optional parent element reference, defaults to body.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        HTML DOM element that got created.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getAbsPosition"><!-- --></A>
-   <H3>getAbsPosition</H3>
-   <PRE>Object <B>getAbsPosition</B>(&lt;DOMElement&gt; n)</PRE>
-   
-      <UL>Returns the absolute x, y cordinate of the specified node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>n</CODE> -  DOM node to retrive x, y of.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Object containing absLeft and absTop properties.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getBlocker"><!-- --></A>
-   <H3>getBlocker</H3>
-   <PRE>HTMLElement <B>getBlocker</B>()</PRE>
-   
-      <UL>Returns the blocker DOM element, this is a invisible iframe.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        DOM HTML element.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getElement"><!-- --></A>
-   <H3>getElement</H3>
-   <PRE>HTMLElement <B>getElement</B>()</PRE>
-   
-      <UL>Returns the DOM element that the layer is binded to.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        DOM HTML element.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="hide"><!-- --></A>
-   <H3>hide</H3>
-   <PRE>void <B>hide</B>()</PRE>
-   
-      <UL>Hides the layer.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="isVisible"><!-- --></A>
-   <H3>isVisible</H3>
-   <PRE>boolean <B>isVisible</B>()</PRE>
-   
-      <UL>Returns true/false if the layer is visible or not.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if it's visible or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="moveBy"><!-- --></A>
-   <H3>moveBy</H3>
-   <PRE>void <B>moveBy</B>(&lt;int&gt; x, &lt;int&gt; y)</PRE>
-   
-      <UL>Moves the layer relative in pixels.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>x</CODE> -  Horizontal relative position in pixels.  
-      </UL> 
-   
-     <UL><CODE>y</CODE> -  Vertical relative position in pixels. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="moveRelativeTo"><!-- --></A>
-   <H3>moveRelativeTo</H3>
-   <PRE>void <B>moveRelativeTo</B>(&lt;HTMLElement&gt; re, &lt;string&gt; p)</PRE>
-   
-      <UL>Moves the layer relative to the specified HTML element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>re</CODE> -  Element to move the layer relative to.  
-      </UL> 
-   
-     <UL><CODE>p</CODE> -  Position of the layer tl = top left, tr = top right, bl = bottom left, br = bottom right. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="moveTo"><!-- --></A>
-   <H3>moveTo</H3>
-   <PRE>void <B>moveTo</B>(&lt;int&gt; x, &lt;int&gt; y)</PRE>
-   
-      <UL>Moves the layer absolute in pixels.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>x</CODE> -  Horizontal absolute position in pixels.  
-      </UL> 
-   
-     <UL><CODE>y</CODE> -  Vertical absolute position in pixels. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="parseInt"><!-- --></A>
-   <H3>parseInt</H3>
-   <PRE>int <B>parseInt</B>(&lt;string&gt; s)</PRE>
-   
-      <UL>Parses a int value this method will return 0 if the string is empty.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  String to parse value of.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Parsed number.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="resizeBy"><!-- --></A>
-   <H3>resizeBy</H3>
-   <PRE>void <B>resizeBy</B>(&lt;int&gt; w, &lt;int&gt; h)</PRE>
-   
-      <UL>Resizes the layer by the specified relative width and height.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>w</CODE> -  Relative width value.  
-      </UL> 
-   
-     <UL><CODE>h</CODE> -  Relative height value. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="resizeTo"><!-- --></A>
-   <H3>resizeTo</H3>
-   <PRE>void <B>resizeTo</B>(&lt;int&gt; w, &lt;int&gt; h)</PRE>
-   
-      <UL>Resizes the layer to the specified width and height.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>w</CODE> -  Width value.  
-      </UL> 
-   
-     <UL><CODE>h</CODE> -  Height value. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="setBlockMode"><!-- --></A>
-   <H3>setBlockMode</H3>
-   <PRE>void <B>setBlockMode</B>(&lt;boolean&gt; s)</PRE>
-   
-      <UL>Sets the block mode. If you set this property to true a control box blocker iframe
- will be added to the document since MSIE has a issue where select boxes are visible
- through layers.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>s</CODE> -  Block mode state, true is the default value. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="show"><!-- --></A>
-   <H3>show</H3>
-   <PRE>void <B>show</B>()</PRE>
-   
-      <UL>Shows the layer.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="updateBlocker"><!-- --></A>
-   <H3>updateBlocker</H3>
-   <PRE>void <B>updateBlocker</B>()</PRE>
-   
-      <UL>Updates the select/iframe/flash blocker this will also block the caret in Firefox.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Layer.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Engine.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Popup.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Layer.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Popup.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Popup.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Popup.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Popup.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,789 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_Popup
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_Popup";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Popup.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Layer.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Selection.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Popup.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_Popup</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_Popup</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_Popup</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_Popup.class.js.html'>TinyMCE_Popup.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_Popup.html#TinyMCE_Popup()">TinyMCE_Popup</A> 
-	 </B>
-	 ()
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      Constructor for the popup class.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#close">close</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Closes the current window.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#execCommand">execCommand</A></B>(&lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;mixed&gt; value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes the specific command on the parent instance that opened the window.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#executeOnLoad">executeOnLoad</A></B>(&lt;string&gt; str)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes the specified string onload.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;Object</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getWindowArg">getWindowArg</A></B>(&lt;string&gt; name, &lt;string&gt; default_value)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a window argument, window arguments can be passed from a plugin to a window
- by using the tinyMCE.openWindow function.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#importClass">importClass</A></B>(&lt;string&gt; c)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Imports the specified class into the current popup.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#init">init</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Initializes the TinyMCE Popup class.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#onLoad">onLoad</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Gets executed when the window has finished loading it's contents.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#openBrowser">openBrowser</A></B>(&lt;string&gt; element_id, &lt;string&gt; type, &lt;string&gt; option)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Opens a filebrowser/imagebrowser this will set the output value from
- the browser as a value on the specified element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#pickColor">pickColor</A></B>(&lt;DOMEvent&gt; e, &lt;string&gt; element_id)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Executes a color picker on the specified element id.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#resizeToContent">resizeToContent</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Resizes the current window to the dimensions of the body.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#resizeToInnerSize">resizeToInnerSize</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Resizes the current window to it's inner body size.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#restoreSelection">restoreSelection</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Restores the selection back to the one stored after executing a command.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_Popup()"><!-- --></A><H3>
-TinyMCE_Popup</H3>
-<PRE><B>TinyMCE_Popup</B>()</PRE>
-
-
-<UL>
-   Constructor for the popup class. This class contains base logic for popup/dialogs and sets up
- object references to the TinyMCE core.
-</UL>
-
-
-
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="close"><!-- --></A>
-   <H3>close</H3>
-   <PRE>void <B>close</B>()</PRE>
-   
-      <UL>Closes the current window. This should be used instead of window.close. Since this will
- also handle inlinepopups closing.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="execCommand"><!-- --></A>
-   <H3>execCommand</H3>
-   <PRE>void <B>execCommand</B>(&lt;string&gt; command, &lt;boolean&gt; user_interface, &lt;mixed&gt; value)</PRE>
-   
-      <UL>Executes the specific command on the parent instance that opened the window. This method
- will also take care of the storage and restorage of the current selection in MSIE when
- using inlinepopups. So we suggest using this method instead of tinyMCE.execCommand when using
- popup windows.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>command</CODE> -  Command name to execute, for example mceLink or Bold.  
-      </UL> 
-   
-     <UL><CODE>user_interface</CODE> -  True/false state if a UI (dialog) should be presented or not.  
-      </UL> 
-   
-     <UL><CODE>value</CODE> -  Optional command value, this can be anything.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="executeOnLoad"><!-- --></A>
-   <H3>executeOnLoad</H3>
-   <PRE>void <B>executeOnLoad</B>(&lt;string&gt; str)</PRE>
-   
-      <UL>Executes the specified string onload. This is a workaround for Opera since it
- doesn't execute the events in the same order than MSIE and Firefox.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>str</CODE> -  String to evaluate on load.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getWindowArg"><!-- --></A>
-   <H3>getWindowArg</H3>
-   <PRE>Object <B>getWindowArg</B>(&lt;string&gt; name, &lt;string&gt; default_value)</PRE>
-   
-      <UL>Returns a window argument, window arguments can be passed from a plugin to a window
- by using the tinyMCE.openWindow function.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>name</CODE> -  Argument name to retrive.  
-      </UL> 
-   
-     <UL><CODE>default_value</CODE> -  Optional default value to assign if the argument wasn't set.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Argument value object.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="importClass"><!-- --></A>
-   <H3>importClass</H3>
-   <PRE>void <B>importClass</B>(&lt;string&gt; c)</PRE>
-   
-      <UL>Imports the specified class into the current popup. This will setup a local class definition
- by importing from the parent window.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>c</CODE> -  Class name to import to current page.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="init"><!-- --></A>
-   <H3>init</H3>
-   <PRE>void <B>init</B>()</PRE>
-   
-      <UL>Initializes the TinyMCE Popup class. This will setup the TinyMCE core references and other popup/dialog related functions.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="onLoad"><!-- --></A>
-   <H3>onLoad</H3>
-   <PRE>void <B>onLoad</B>()</PRE>
-   
-      <UL>Gets executed when the window has finished loading it's contents. This function will then
- replace language variables with their real values.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="openBrowser"><!-- --></A>
-   <H3>openBrowser</H3>
-   <PRE>void <B>openBrowser</B>(&lt;string&gt; element_id, &lt;string&gt; type, &lt;string&gt; option)</PRE>
-   
-      <UL>Opens a filebrowser/imagebrowser this will set the output value from
- the browser as a value on the specified element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>element_id</CODE> -  Id of the element to set value in.  
-      </UL> 
-   
-     <UL><CODE>type</CODE> -  Type of browser to open image/file/flash.  
-      </UL> 
-   
-     <UL><CODE>option</CODE> -  Option name to get the file_broswer_callback function name from.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="pickColor"><!-- --></A>
-   <H3>pickColor</H3>
-   <PRE>void <B>pickColor</B>(&lt;DOMEvent&gt; e, &lt;string&gt; element_id)</PRE>
-   
-      <UL>Executes a color picker on the specified element id. When the user
- then selects a color it will be set as the value of the specified element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>e</CODE> -  DOM event object.  
-      </UL> 
-   
-     <UL><CODE>element_id</CODE> -  Element id to be filled with the color value from the picker.    
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="resizeToContent"><!-- --></A>
-   <H3>resizeToContent</H3>
-   <PRE>void <B>resizeToContent</B>()</PRE>
-   
-      <UL>Resizes the current window to the dimensions of the body.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="resizeToInnerSize"><!-- --></A>
-   <H3>resizeToInnerSize</H3>
-   <PRE>void <B>resizeToInnerSize</B>()</PRE>
-   
-      <UL>Resizes the current window to it's inner body size. This function
- was needed since MSIE makes the visible dialog area diffrent depending
- on what Theme/Skin you use.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="restoreSelection"><!-- --></A>
-   <H3>restoreSelection</H3>
-   <PRE>void <B>restoreSelection</B>()</PRE>
-   
-      <UL>Restores the selection back to the one stored after executing a command.
- This function was needed in MSIE when using inlinepopups, the selection
- would otherwice get lost if the user focused another field.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Popup.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Layer.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_Selection.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Popup.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Selection.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Selection.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Selection.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_Selection.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,732 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_Selection
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_Selection";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Selection.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Popup.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_UndoRedo.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Selection.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_Selection</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_Selection</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_Selection</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_Selection.class.js.html'>TinyMCE_Selection.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-   <A NAME="field_summary"><!-- --></A>
-      <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-         <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-            <TD COLSPAN=2><FONT SIZE="+2">
-               <B>Field Summary</B></FONT></TD>
-         </TR>
-
-   <!-- This is one instance field summary -->
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#instance">instance</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-
-   </TABLE>
-   &nbsp;
-   
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_Selection.html#TinyMCE_Selection()">TinyMCE_Selection</A> 
-	 </B>
-	 (&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; inst)
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      Constructs a Selection instance and binds it to the specificed TinyMCE editor control.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;TinyMCE_Bookmark</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getBookmark">getBookmark</A></B>(&lt;boolean&gt; simple)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns a selection bookmark that can be restored later with moveToBookmark.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;HTMLElement</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getFocusElement">getFocusElement</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the currently selected/focused element.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;DOMRange</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getRng">getRng</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the browsers selections first range instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;DOMSelection</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getSel">getSel</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the browsers selection instance.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getSelectedHTML">getSelectedHTML</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the selected HTML code.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;string</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#getSelectedText">getSelectedText</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Returns the selected text.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#moveToBookmark">moveToBookmark</A></B>(&lt;TinyMCE_Bookmark&gt; bookmark)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Restores the selection to the specified bookmark.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#scrollToNode">scrollToNode</A></B>(&lt;HTMLNode&gt; node)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Scrolls to the specified node location.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#selectNode">selectNode</A></B>(&lt;HTMLNode&gt; node, &lt;boolean&gt; collapse, &lt;boolean&gt; select_text_node, &lt;boolean&gt; to_start)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Selects the specified node.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-   <A NAME="field_detail"><!-- --></A>
-   <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-      <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-         <TD COLSPAN=1><FONT SIZE="+2"><B>Field Detail</B></FONT></TD>
-      </TR>
-   </TABLE>
-
-   
-   <A NAME="instance"><!-- --></A>
-   <H3>instance</H3>
-   <PRE>Object&nbsp;<B>instance</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_Selection()"><!-- --></A><H3>
-TinyMCE_Selection</H3>
-<PRE><B>TinyMCE_Selection</B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; inst)</PRE>
-
-
-<UL>
-   Constructs a Selection instance and binds it to the specificed TinyMCE editor control.
-</UL>
-
-
-
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>inst</CODE> -  TinyMCE editor control instance.  
-     </UL>
-   
-   
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="getBookmark"><!-- --></A>
-   <H3>getBookmark</H3>
-   <PRE>TinyMCE_Bookmark <B>getBookmark</B>(&lt;boolean&gt; simple)</PRE>
-   
-      <UL>Returns a selection bookmark that can be restored later with moveToBookmark.
- This acts much like the one MSIE has built in but this one is persistent if between DOM
- tree rewritings. The simple mode enables a quicker and non persistent bookmark.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>simple</CODE> -  If this is set to true, the selection bookmark will not me dom persistent.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Selection bookmark that can be restored later with moveToBookmark.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getFocusElement"><!-- --></A>
-   <H3>getFocusElement</H3>
-   <PRE>HTMLElement <B>getFocusElement</B>()</PRE>
-   
-      <UL>Returns the currently selected/focused element.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Currently selected element.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getRng"><!-- --></A>
-   <H3>getRng</H3>
-   <PRE>DOMRange <B>getRng</B>()</PRE>
-   
-      <UL>Returns the browsers selections first range instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Browsers selections first range instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getSel"><!-- --></A>
-   <H3>getSel</H3>
-   <PRE>DOMSelection <B>getSel</B>()</PRE>
-   
-      <UL>Returns the browsers selection instance.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Browser selection instance.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getSelectedHTML"><!-- --></A>
-   <H3>getSelectedHTML</H3>
-   <PRE>string <B>getSelectedHTML</B>()</PRE>
-   
-      <UL>Returns the selected HTML code.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Selected HTML contents.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="getSelectedText"><!-- --></A>
-   <H3>getSelectedText</H3>
-   <PRE>string <B>getSelectedText</B>()</PRE>
-   
-      <UL>Returns the selected text.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        Selected text contents.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="moveToBookmark"><!-- --></A>
-   <H3>moveToBookmark</H3>
-   <PRE>boolean <B>moveToBookmark</B>(&lt;TinyMCE_Bookmark&gt; bookmark)</PRE>
-   
-      <UL>Restores the selection to the specified bookmark.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>bookmark</CODE> -  Bookmark to restore selection from.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false if it was successful or not.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="scrollToNode"><!-- --></A>
-   <H3>scrollToNode</H3>
-   <PRE>void <B>scrollToNode</B>(&lt;HTMLNode&gt; node)</PRE>
-   
-      <UL>Scrolls to the specified node location.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>node</CODE> -  Node to scroll to. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="selectNode"><!-- --></A>
-   <H3>selectNode</H3>
-   <PRE>void <B>selectNode</B>(&lt;HTMLNode&gt; node, &lt;boolean&gt; collapse, &lt;boolean&gt; select_text_node, &lt;boolean&gt; to_start)</PRE>
-   
-      <UL>Selects the specified node.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>node</CODE> -  Node object to move selection to.  
-      </UL> 
-   
-     <UL><CODE>collapse</CODE> -  True/false if it will be collasped.  
-      </UL> 
-   
-     <UL><CODE>select_text_node</CODE> -  True/false if the text contents should be selected or not.  
-      </UL> 
-   
-     <UL><CODE>to_start</CODE> -  True/false if the collapse should be to start or end of range. 	   
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_Selection.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Popup.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<A HREF="TinyMCE_UndoRedo.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_Selection.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_UndoRedo.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_UndoRedo.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_UndoRedo.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/TinyMCE_UndoRedo.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,513 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-TinyMCE_UndoRedo
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="TinyMCE_UndoRedo";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_UndoRedo.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">&nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Selection.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<B>NEXT CLASS</B></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_UndoRedo.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-<HR>
-
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>Class TinyMCE_UndoRedo</H2>
-<PRE>Object
-   |
-   +--<b>TinyMCE_UndoRedo</b>
-</PRE>
-
-
-<HR>
-<DL>
-   <!-- Class definition -->
-   <DT>class 
-   <B>TinyMCE_UndoRedo</B>
-   
-
-</DL>
-   
-   <P>
-   <I>Defined in <a href='overview-summary-TinyMCE_UndoRedo.class.js.html'>TinyMCE_UndoRedo.class.js</a></I><BR/><BR/>
-   </P>
-   
-   <HR>
-
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-<!-- ======== END NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-   <A NAME="field_summary"><!-- --></A>
-      <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-         <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-            <TD COLSPAN=2><FONT SIZE="+2">
-               <B>Field Summary</B></FONT></TD>
-         </TR>
-
-   <!-- This is one instance field summary -->
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#instance">instance</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#typingUndoIndex">typingUndoIndex</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#undoIndex">undoIndex</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#undoLevels">undoLevels</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-   <CODE>&nbsp;Object</CODE></FONT></TD>
-   <TD><CODE><B><A HREF="#undoRedo">undoRedo</A></B></CODE>
-   <BR>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-   </TR>
-   
-
-   </TABLE>
-   &nbsp;
-   
-
-   
-
-<!-- =========== END FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-   <TD>
-      <CODE>
-	 <B>
-	    <A HREF="TinyMCE_UndoRedo.html#TinyMCE_UndoRedo()">TinyMCE_UndoRedo</A> 
-	 </B>
-	 (&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; inst)
-      </CODE>
-      <BR>
-      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      Constructs a undo redo instance, this instance handles the custom undo/redo handeling in TinyMCE.
-      </TD>
-</TR>
-</TABLE>
-
-<!-- ======== END CONSTRUCTOR SUMMARY ======== -->
-
-&nbsp;
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;boolean</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#add">add</A></B>(&lt;TinyMCE_UndoRedoLevel&gt; l)
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Adds a new undo level, this will take a snapshot of the current instance HTML or use the specified level.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#redo">redo</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Performes a undo action, this will restore the HTML contents of the editor to a former undoed state.
-      </TD>
-   </TR>
-
-   <TR BGCOLOR="white" CLASS="TableRowColor">
-      <TD ALIGN="right" VALIGN="top" WIDTH="1%">
-	 <FONT SIZE="-1">
-	    <CODE>&nbsp;void</CODE>
-	 </FONT>
-      </TD>
-      <TD>
-	 <CODE>
-	    <B>
-	       <A HREF="#undo">undo</A></B>()
-	 </CODE>
-	 <BR>
-	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	 Performes a undo action, this will restore the HTML contents of the editor to a former state.
-      </TD>
-   </TR>
-
-
-</TABLE>
-
-
-
-<P>
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-<!-- ============ FIELD DETAIL START =========== -->
-
-   <A NAME="field_detail"><!-- --></A>
-   <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-      <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-         <TD COLSPAN=1><FONT SIZE="+2"><B>Field Detail</B></FONT></TD>
-      </TR>
-   </TABLE>
-
-   
-   <A NAME="instance"><!-- --></A>
-   <H3>instance</H3>
-   <PRE>Object&nbsp;<B>instance</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="typingUndoIndex"><!-- --></A>
-   <H3>typingUndoIndex</H3>
-   <PRE>Object&nbsp;<B>typingUndoIndex</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="undoIndex"><!-- --></A>
-   <H3>undoIndex</H3>
-   <PRE>Object&nbsp;<B>undoIndex</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="undoLevels"><!-- --></A>
-   <H3>undoLevels</H3>
-   <PRE>Object&nbsp;<B>undoLevels</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-   <A NAME="undoRedo"><!-- --></A>
-   <H3>undoRedo</H3>
-   <PRE>Object&nbsp;<B>undoRedo</B></PRE>
-   <UL>
-   
-   
-   </UL>
-   <HR>
-   
-
-
-<!-- ============ FIELD DETAIL END =========== -->
-
-    <!-- ========= CONSTRUCTOR DETAIL START ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1>
-      <FONT SIZE="+2"><B>Constructor Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<A NAME="TinyMCE_UndoRedo()"><!-- --></A><H3>
-TinyMCE_UndoRedo</H3>
-<PRE><B>TinyMCE_UndoRedo</B>(&lt;<a href="TinyMCE_Control.html">TinyMCE_Control</a>&gt; inst)</PRE>
-
-
-<UL>
-   Constructs a undo redo instance, this instance handles the custom undo/redo handeling in TinyMCE.
-</UL>
-
-
-
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>inst</CODE> -  TinyMCE editor control instance.  
-     </UL>
-   
-   
-   </UL>
-
-
-<!-- Constructor return value(s) -->
-
-<!-- End constructor return value(s) -->
-
-<!-- ADDITIONAL ATTRIBUTES -->
-
-<HR/>
-<!-- END ADDITIONAL ATTRIBUTES  -->
-
-<!-- ========= CONSTRUCTOR DETAIL END ======== -->
-
-
-<!-- ============ METHOD DETAIL START ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-   <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-      <TD COLSPAN=1><FONT SIZE="+2">
-         <B>Method Detail</B></FONT>
-      </TD>
-   </TR>
-</TABLE>
-
-<!-- One single method detail entry -->
-
-   <A NAME="add"><!-- --></A>
-   <H3>add</H3>
-   <PRE>boolean <B>add</B>(&lt;TinyMCE_UndoRedoLevel&gt; l)</PRE>
-   
-      <UL>Adds a new undo level, this will take a snapshot of the current instance HTML or use the specified level.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <UL>
-   <B>Parameters:</B>
-   
-     <UL><CODE>l</CODE> -  Optional undo/redo level to add.  
-      </UL> 
-   
-   </UL>
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-   <UL>
-   <B>Returns:</B>
-        <UL>
-        true/false on success or failure.   
-        </UL>
-   </UL>
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="redo"><!-- --></A>
-   <H3>redo</H3>
-   <PRE>void <B>redo</B>()</PRE>
-   
-      <UL>Performes a undo action, this will restore the HTML contents of the editor to a former undoed state.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-   <A NAME="undo"><!-- --></A>
-   <H3>undo</H3>
-   <PRE>void <B>undo</B>()</PRE>
-   
-      <UL>Performes a undo action, this will restore the HTML contents of the editor to a former state.</UL>
-   
-
-   <!-- METHOD PARAMETERS START -->
-   
-   <!-- METHOD PARAMETERS END -->
-
-   
-
-   <!-- ADDITIONAL ATTRIBUTES START -->
-   
-   <!-- ADDITIONAL ATTRIBUTES  END -->
-<HR>
-
-
-
-<!-- ============ METHOD DETAIL END ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <A HREF="overview-summary-TinyMCE_UndoRedo.class.js.html"><FONT CLASS="NavBarFont1"><B>File</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"-->    <!--A HREF="deprecated-list.html"--><!--FONT CLASS="NavBarFont1">Deprecated</FONT--><!--/A--><!--&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="TinyMCE_Selection.html"><B>PREV CLASS</B></A><!-- 
-   NEXT CLASS 
--->
-&nbsp;<B>NEXT CLASS</B></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="TinyMCE_UndoRedo.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/allclasses-frame.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/allclasses-frame.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/allclasses-frame.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/allclasses-frame.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- All Classes 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" All Classes";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary.html" target="classFrame">All Classes</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="GLOBALS.html" TARGET="classFrame">GLOBALS</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Cleanup.html" TARGET="classFrame">TinyMCE_Cleanup</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Control.html" TARGET="classFrame">TinyMCE_Control</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Engine.html" TARGET="classFrame">TinyMCE_Engine</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Layer.html" TARGET="classFrame">TinyMCE_Layer</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Popup.html" TARGET="classFrame">TinyMCE_Popup</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Selection.html" TARGET="classFrame">TinyMCE_Selection</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_UndoRedo.html" TARGET="classFrame">TinyMCE_UndoRedo</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/allclasses-noframe.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/allclasses-noframe.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/allclasses-noframe.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/allclasses-noframe.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>
- All Classes
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" All Classes";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 CLASS="FrameHeadingFont"></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary.html">All Classes</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="GLOBALS.html" >GLOBALS</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Cleanup.html" >TinyMCE_Cleanup</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Control.html" >TinyMCE_Control</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Engine.html" >TinyMCE_Engine</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Layer.html" >TinyMCE_Layer</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Popup.html" >TinyMCE_Popup</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Selection.html" >TinyMCE_Selection</A>
-<BR>
-</FONT></TD>
-</TR>
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_UndoRedo.html" >TinyMCE_UndoRedo</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/help-doc.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/help-doc.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/help-doc.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/help-doc.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>
- API Help 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" API Help";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Class</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class has its own separate page. Each of these pages has three sections consisting of a class description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>Class declaration<LI>Class description
-<P>
-<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. </BLOCKQUOTE>
-<!--H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all classes. The hierarchy page contains a list of classes. The classes are organized by inheritance structure starting with <code>Object</code>.<UL>
-</BLOCKQUOTE-->
-<!-- H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE-->
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames.  All pages are available with or without frames.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD-->
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/index-all.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/index-all.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/index-all.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/index-all.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,1663 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
-Index ()
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="Index ()";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD-->
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<!--
- Listing of letters
--->
-&nbsp;<A HREF="index-all.html#_____">_</A>&nbsp;<A HREF="index-all.html#__A__">A</A>&nbsp;<A HREF="index-all.html#__B__">B</A>&nbsp;<A HREF="index-all.html#__C__">C</A>&nbsp;<A HREF="index-all.html#__D__">D</A>&nbsp;<A HREF="index-all.html#__E__">E</A>&nbsp;<A HREF="index-all.html#__F__">F</A>&nbsp;<A HREF="index-all.html#__G__">G</A>&nbsp;<A HREF="index-all.html#__H__">H</A>&nbsp;<A HREF="index-all.html#__I__">I</A>&nbsp;<A HREF="index-all.html#__L__">L</A>&nbsp;<A HREF="index-all.html#__M__">M</A>&nbsp;<A HREF="index-all.html#__N__">N</A>&nbsp;<A HREF="index-all.html#__O__">O</A>&nbsp;<A HREF="index-all.html#__P__">P</A>&nbsp;<A HREF="index-all.html#__Q__">Q</A>&nbsp;<A HREF="index-all.html#__R__">R</A>&nbsp;<A HREF="index-all.html#__S__">S</A>&nbsp;<A HREF="index-all.html#__T__">T</A>&nbsp;<A HREF="index-all.html#__U__">U</A>&nbsp;<A HREF="index-all.html#__W__">W</A>&nbsp;<A HREF="index-all.html#__X__">X</A>
-<HR>
-<!-- End letter listing -->
-
-<A NAME="_____"><!-- --></A><H2>
-<B>_</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#_getElementById"><B>_getElementById(id, d)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#_removeInternal"><B>_removeInternal(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__A__"><!-- --></A><H2>
-<B>A</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#accessibleEventHandler"><B>accessibleEventHandler(e)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#add"><B>add(l)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addButtonMap"><B>addButtonMap(m)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addCSSClass"><B>addCSSClass(e, c, b)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addEvent"><B>addEvent(o, n, h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addEventHandlers"><B>addEventHandlers(inst)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addMCEControl"><B>addMCEControl(replace_element, form_element_name, target_document)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addMenu"><B>addMenu(n, m)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addPlugin"><B>addPlugin(n, p)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#addPlugin"><B>addPlugin(n, p)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#addRuleStr"><B>addRuleStr(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addSelectAccessibility"><B>addSelectAccessibility(e, s, w)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#addShortcut"><B>addShortcut(m, k, d, cmd, ui, va)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addTheme"><B>addTheme(n, t)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#addToLang"><B>addToLang(prefix, ar)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#applyTemplate"><B>applyTemplate(h, as)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#autoResetDesignMode"><B>autoResetDesignMode()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__B__"><!-- --></A><H2>
-<B>B</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#buttonMap"><B>buttonMap</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__C__"><!-- --></A><H2>
-<B>C</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#callFunc"><B>callFunc(ins, p, n, m, a)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#cancelEvent"><B>cancelEvent(e)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#cleanup"><B>cleanup</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#cleanupAnchors"><B>cleanupAnchors(doc)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#cleanupEventStr"><B>cleanupEventStr(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#cleanupHTMLCode"><B>cleanupHTMLCode(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#clearArray"><B>clearArray(a)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#close"><B>close()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#closeWindow"><B>closeWindow(win)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#compressStyle"><B>compressStyle(ar, pr, sf, res)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#configs"><B>configs</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#confirmAdd"><B>confirmAdd(e, settings)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertAbsoluteURLToRelativeURL"><B>convertAbsoluteURLToRelativeURL(base_url, url_to_relative)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertAllRelativeURLs"><B>convertAllRelativeURLs(body)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertFontsToSpans"><B>convertFontsToSpans(doc)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertHexToRGB"><B>convertHexToRGB(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertRelativeToAbsoluteURL"><B>convertRelativeToAbsoluteURL(base_url, relative_url)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertRGBToHex"><B>convertRGBToHex(s, k)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertSpansToFonts"><B>convertSpansToFonts(doc)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#convertURL"><B>convertURL(url, node, on_save)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#create"><B>create(n, c, p)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#currentConfig"><B>currentConfig</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__D__"><!-- --></A><H2>
-<B>D</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#debug"><B>debug()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#dialogCounter"><B>dialogCounter</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#dispatchCallback"><B>dispatchCallback(i, p, n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__E__"><!-- --></A><H2>
-<B>E</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#entityDecode"><B>entityDecode(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#evalFunc"><B>evalFunc(f, idx, a)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#eventHandlers"><B>eventHandlers</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#execCommand"><B>execCommand(command, user_interface, value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#execCommand"><B>execCommand(command, user_interface, value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#execCommand"><B>execCommand(command, user_interface, value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#execCommandCallback"><B>execCommandCallback(i, p, n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#execInstanceCommand"><B>execInstanceCommand(editor_id, command, user_interface, value, focus)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#executeCallback"><B>executeCallback(i, p, n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#executeOnLoad"><B>executeOnLoad(str)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#explode"><B>explode(d, s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#extend"><B>extend(p, np)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__F__"><!-- --></A><H2>
-<B>F</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#fixGeckoBaseHREFBug"><B>fixGeckoBaseHREFBug(m, e, h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#formatHTML"><B>formatHTML(h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__G__"><!-- --></A><H2>
-<B>G</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#getAbsPosition"><B>getAbsPosition(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getAbsPosition"><B>getAbsPosition(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getAttrib"><B>getAttrib(elm, name, default_value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#getBlocker"><B>getBlocker()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#getBody"><B>getBody()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#getBookmark"><B>getBookmark(simple)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getButtonHTML"><B>getButtonHTML(id, lang, img, cmd, ui, val)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getContent"><B>getContent(editor_id)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getControlHTML"><B>getControlHTML(c)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getCSSClasses"><B>getCSSClasses(editor_id, doc)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#getDoc"><B>getDoc()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getEditorId"><B>getEditorId(form_element)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#getElement"><B>getElement()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getElementByAttributeValue"><B>getElementByAttributeValue(n, e, a, v)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getElementsByAttributeValue"><B>getElementsByAttributeValue(n, e, a, v)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#getFocusElement"><B>getFocusElement()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#getFocusElement"><B>getFocusElement()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getInstanceById"><B>getInstanceById(editor_id)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getLang"><B>getLang(name, default_value, parse_entities, va)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getNodeTree"><B>getNodeTree(n, na, t, nn)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getOuterHTML"><B>getOuterHTML(e)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getParam"><B>getParam(name, default_value, strip_whitespace, split_chr)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getParentBlockElement"><B>getParentBlockElement(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getParentElement"><B>getParentElement(node, names, attrib_name, attrib_value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getParentNode"><B>getParentNode(n, f)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#getRng"><B>getRng()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#getRng"><B>getRng()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#getSel"><B>getSel()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#getSel"><B>getSel()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#getSelectedHTML"><B>getSelectedHTML()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#getSelectedText"><B>getSelectedText()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getVisualAidClass"><B>getVisualAidClass(class_name, state)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#getWin"><B>getWin()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#getWindowArg"><B>getWindowArg(n, d)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#getWindowArg"><B>getWindowArg(name, default_value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="GLOBALS.html#"><B>GLOBALS</B></A> - 
- class <A HREF="GLOBALS.html">GLOBALS</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__H__"><!-- --></A><H2>
-<B>H</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#handleEvent"><B>handleEvent(e)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#handleShortcut"><B>handleShortcut(e)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#handleVisualAid"><B>handleVisualAid(el, deep, state, inst, skip_dispatch)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#hasMenu"><B>hasMenu(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#hasMouseMoved"><B>hasMouseMoved</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#hasPlugin"><B>hasPlugin(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#hasPlugin"><B>hasPlugin(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#hasTheme"><B>hasTheme(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#hide"><B>hide()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__I__"><!-- --></A><H2>
-<B>I</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#idCounter"><B>idCounter</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#importClass"><B>importClass(c)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#importCSS"><B>importCSS(doc, css)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#importPluginLanguagePack"><B>importPluginLanguagePack(name, valid_languages)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#importThemeLanguagePack"><B>importThemeLanguagePack(name)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#init"><B>init()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#init"><B>init(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#init"><B>init(settings)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#insertAfter"><B>insertAfter(n, r)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#instance"><B>instance</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#instance"><B>instance</B></A> - 
-Instance field in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#instances"><B>instances</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isBlockElement"><B>isBlockElement(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#isDirty"><B>isDirty()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isGecko"><B>isGecko</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#isHidden"><B>isHidden()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isInstance"><B>isInstance(o)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isLoaded"><B>isLoaded</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isMac"><B>isMac</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isMSIE"><B>isMSIE</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isMSIE5"><B>isMSIE5</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isMSIE5_0"><B>isMSIE5_0</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isNS7"><B>isNS7</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isNS71"><B>isNS71</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isOpera"><B>isOpera</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#isSafari"><B>isSafari</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#isTinyMCE_Control"><B>isTinyMCE_Control</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#isVisible"><B>isVisible()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__L__"><!-- --></A><H2>
-<B>L</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#loadCSS"><B>loadCSS(url)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#loadedFiles"><B>loadedFiles</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#loadedPlugins"><B>loadedPlugins</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#loadPlugin"><B>loadPlugin(n, u)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#loadScript"><B>loadScript(url)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__M__"><!-- --></A><H2>
-<B>M</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#majorVersion"><B>majorVersion</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#menus"><B>menus</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#minorVersion"><B>minorVersion</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#moveBy"><B>moveBy(x, y)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#moveRelativeTo"><B>moveRelativeTo(re, p)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#moveTo"><B>moveTo(x, y)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#moveToBookmark"><B>moveToBookmark(bookmark)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__N__"><!-- --></A><H2>
-<B>N</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#nextNode"><B>nextNode(e, n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__O__"><!-- --></A><H2>
-<B>O</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#onLoad"><B>onLoad()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#onLoad"><B>onLoad()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#onMouseMove"><B>onMouseMove()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#openBrowser"><B>openBrowser(element_id, type, option)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#openWindow"><B>openWindow(template, args)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__P__"><!-- --></A><H2>
-<B>P</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#parseInt"><B>parseInt(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#parseRuleStr"><B>parseRuleStr(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#parseStyle"><B>parseStyle(str)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#parseURL"><B>parseURL(url_str)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#pickColor"><B>pickColor(e, element_id)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#plugins"><B>plugins</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#plugins"><B>plugins</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#prevNode"><B>prevNode(e, n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__Q__"><!-- --></A><H2>
-<B>Q</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#queryCommandState"><B>queryCommandState(c)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#queryCommandValue"><B>queryCommandValue(c)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#queryInstanceCommandState"><B>queryInstanceCommandState(editor_id, command)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#queryInstanceCommandValue"><B>queryInstanceCommandValue(editor_id, command)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__R__"><!-- --></A><H2>
-<B>R</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#redo"><B>redo()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#regexpReplace"><B>regexpReplace(in_str, reg_exp, replace_str, opts)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#releaseDate"><B>releaseDate</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#removeCSSClass"><B>removeCSSClass(e, c)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#removeMCEControl"><B>removeMCEControl(editor_id)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#removeTinyMCEFormElements"><B>removeTinyMCEFormElements(form_obj)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#renameElement"><B>renameElement(e, n, d)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#repaint"><B>repaint()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#replaceVar"><B>replaceVar(h, r, v)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#resetForm"><B>resetForm(form_index)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#resizeBy"><B>resizeBy(w, h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#resizeTo"><B>resizeTo(w, h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#resizeToContent"><B>resizeToContent()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#resizeToInnerSize"><B>resizeToInnerSize()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#restoreSelection"><B>restoreSelection()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__S__"><!-- --></A><H2>
-<B>S</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#scrollToNode"><B>scrollToNode(node)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#selection"><B>selection</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#selectNode"><B>selectNode(node, collapse, select_text_node, to_start)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#selectNodes"><B>selectNodes(n, f, a)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#serializeNodeAsHTML"><B>serializeNodeAsHTML(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#serializeNodeAsXML"><B>serializeNodeAsXML(n)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#serializeStyle"><B>serializeStyle(ar)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#serializeURL"><B>serializeURL(up)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setAttrib"><B>setAttrib(element, name, value, fix_value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#setBaseHREF"><B>setBaseHREF(u)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#setBlockMode"><B>setBlockMode(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setContent"><B>setContent(h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setInnerHTML"><B>setInnerHTML(e, h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setOuterHTML"><B>setOuterHTML(e, h)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setPluginBaseURL"><B>setPluginBaseURL(n, u)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setStyleAttrib"><B>setStyleAttrib(elm, name, value)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#settings"><B>settings</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setupContent"><B>setupContent(editor_id)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#setWindowArg"><B>setWindowArg(n, v)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#shortcuts"><B>shortcuts</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#show"><B>show()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#split"><B>split(re, s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#storeAwayURLs"><B>storeAwayURLs(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#submitPatch"><B>submitPatch()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#switchClass"><B>switchClass(ei, c)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#switchClassCache"><B>switchClassCache</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#switchSettings"><B>switchSettings()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__T__"><!-- --></A><H2>
-<B>T</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#themes"><B>themes</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#"><B>TinyMCE_Cleanup</B></A> - 
- class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#constructor_detail"><B>TinyMCE_Cleanup()</B></A> - 
-Constructor in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#"><B>TinyMCE_Control</B></A> - 
- class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#constructor_detail"><B>TinyMCE_Control(settings)</B></A> - 
-Constructor in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#"><B>TinyMCE_Engine</B></A> - 
- class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#constructor_detail"><B>TinyMCE_Engine()</B></A> - 
-Constructor in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#"><B>TinyMCE_Layer</B></A> - 
- class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#constructor_detail"><B>TinyMCE_Layer(id, bm)</B></A> - 
-Constructor in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="GLOBALS.html#TinyMCE_Menu"><B>TinyMCE_Menu()</B></A> - 
-Class method in  class <A HREF="GLOBALS.html">GLOBALS</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#"><B>TinyMCE_Popup</B></A> - 
- class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Popup.html#constructor_detail"><B>TinyMCE_Popup()</B></A> - 
-Constructor in  class <A HREF="TinyMCE_Popup.html">TinyMCE_Popup</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#"><B>TinyMCE_Selection</B></A> - 
- class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Selection.html#constructor_detail"><B>TinyMCE_Selection(inst)</B></A> - 
-Constructor in  class <A HREF="TinyMCE_Selection.html">TinyMCE_Selection</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#"><B>TinyMCE_UndoRedo</B></A> - 
- class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#constructor_detail"><B>TinyMCE_UndoRedo(inst)</B></A> - 
-Constructor in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#triggerNodeChange"><B>triggerNodeChange(focus, setup_content)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#triggerSave"><B>triggerSave(skip_cleanup, skip_callback)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#triggerSave"><B>triggerSave(skip_cleanup, skip_callback)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#trim"><B>trim(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#typingUndoIndex"><B>typingUndoIndex</B></A> - 
-Instance field in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__U__"><!-- --></A><H2>
-<B>U</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#undo"><B>undo()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#undoIndex"><B>undoIndex</B></A> - 
-Instance field in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#undoLevels"><B>undoLevels</B></A> - 
-Instance field in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#undoRedo"><B>undoRedo</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_UndoRedo.html#undoRedo"><B>undoRedo</B></A> - 
-Instance field in  class <A HREF="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Control.html#undoRedoLevel"><B>undoRedoLevel</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Control.html">TinyMCE_Control</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#unloadHandler"><B>unloadHandler()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Layer.html#updateBlocker"><B>updateBlocker()</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Layer.html">TinyMCE_Layer</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#updateContent"><B>updateContent(form_element_name)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__W__"><!-- --></A><H2>
-<B>W</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#windowArgs"><B>windowArgs</B></A> - 
-Instance field in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<A NAME="__X__"><!-- --></A><H2>
-<B>X</B></H2>
-
-<DL>
-<DT><A HREF="TinyMCE_Engine.html#xmlEncode"><B>xmlEncode(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Engine.html">TinyMCE_Engine</A>
-<DD>&nbsp;
-</DL>
-
-<DL>
-<DT><A HREF="TinyMCE_Cleanup.html#xmlEncode"><B>xmlEncode(s)</B></A> - 
-Instance method in  class <A HREF="TinyMCE_Cleanup.html">TinyMCE_Cleanup</A>
-<DD>&nbsp;
-</DL>
-
-<HR>
-
-<!-- 
-   Listing of letters
--->
-&nbsp;<A HREF="index-all.html#_____">_</A>&nbsp;<A HREF="index-all.html#__A__">A</A>&nbsp;<A HREF="index-all.html#__B__">B</A>&nbsp;<A HREF="index-all.html#__C__">C</A>&nbsp;<A HREF="index-all.html#__D__">D</A>&nbsp;<A HREF="index-all.html#__E__">E</A>&nbsp;<A HREF="index-all.html#__F__">F</A>&nbsp;<A HREF="index-all.html#__G__">G</A>&nbsp;<A HREF="index-all.html#__H__">H</A>&nbsp;<A HREF="index-all.html#__I__">I</A>&nbsp;<A HREF="index-all.html#__L__">L</A>&nbsp;<A HREF="index-all.html#__M__">M</A>&nbsp;<A HREF="index-all.html#__N__">N</A>&nbsp;<A HREF="index-all.html#__O__">O</A>&nbsp;<A HREF="index-all.html#__P__">P</A>&nbsp;<A HREF="index-all.html#__Q__">Q</A>&nbsp;<A HREF="index-all.html#__R__">R</A>&nbsp;<A HREF="index-all.html#__S__">S</A>&nbsp;<A HREF="index-all.html#__T__">T</A>&nbsp;<A HREF="index-all.html#__U__">U</A>&nbsp;<A HREF="index-all.html#__W__">W</A>&nbsp;<A HREF="index-all.html#__X__">X</A>
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><b>Tree</b></FONT></A>&nbsp;</TD>
-  <!--TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD-->
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<B></B>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" TARGET="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/index.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/index.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/index.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/index.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>
-Generated Javascript Documentation 
-</TITLE>
-</HEAD>
-<FRAMESET cols="20%,80%">
-
-<FRAMESET rows="40%,50%">
-<FRAME src="overview-frame.html" name="overviewFrame">
-
-<FRAME src="allclasses-frame.html" name="packageFrame">
-
-</FRAMESET>
-
-<FRAME src="overview-summary.html" name="classFrame">
-</FRAMESET>
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to <A HREF="allclasses-frame.html">Non-frame version.</A></NOFRAMES>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Array.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Array.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Array.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Array.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Array.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Array.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Array.class.js.html" 
-                                        target="classFrame">TinyMCE_Array.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Cleanup.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Cleanup.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Cleanup.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Cleanup.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Cleanup.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Cleanup.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Cleanup.class.js.html" 
-                                        target="classFrame">TinyMCE_Cleanup.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Cleanup.html" TARGET="classFrame">TinyMCE_Cleanup</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Control.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Control.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Control.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Control.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Control.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Control.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Control.class.js.html" 
-                                        target="classFrame">TinyMCE_Control.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Control.html" TARGET="classFrame">TinyMCE_Control</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_DOMUtils.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_DOMUtils.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_DOMUtils.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_DOMUtils.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_DOMUtils.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_DOMUtils.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_DOMUtils.class.js.html" 
-                                        target="classFrame">TinyMCE_DOMUtils.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Debug.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Debug.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Debug.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Debug.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Debug.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Debug.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Debug.class.js.html" 
-                                        target="classFrame">TinyMCE_Debug.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Engine.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Engine.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Engine.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Engine.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Engine.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Engine.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Engine.class.js.html" 
-                                        target="classFrame">TinyMCE_Engine.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Engine.html" TARGET="classFrame">TinyMCE_Engine</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Event.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Event.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Event.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Event.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Event.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Event.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Event.class.js.html" 
-                                        target="classFrame">TinyMCE_Event.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_ForceParagraphs.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_ForceParagraphs.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_ForceParagraphs.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_ForceParagraphs.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_ForceParagraphs.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_ForceParagraphs.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_ForceParagraphs.class.js.html" 
-                                        target="classFrame">TinyMCE_ForceParagraphs.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Layer.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Layer.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Layer.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Layer.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Layer.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Layer.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Layer.class.js.html" 
-                                        target="classFrame">TinyMCE_Layer.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Layer.html" TARGET="classFrame">TinyMCE_Layer</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Menu.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Menu.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Menu.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Menu.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Menu.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Menu.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Menu.class.js.html" 
-                                        target="classFrame">TinyMCE_Menu.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Popup.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Popup.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Popup.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Popup.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Popup.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Popup.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Popup.class.js.html" 
-                                        target="classFrame">TinyMCE_Popup.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Popup.html" TARGET="classFrame">TinyMCE_Popup</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Selection.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Selection.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Selection.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_Selection.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_Selection.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_Selection.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_Selection.class.js.html" 
-                                        target="classFrame">TinyMCE_Selection.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_Selection.html" TARGET="classFrame">TinyMCE_Selection</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_URL.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_URL.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_URL.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_URL.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_URL.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_URL.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_URL.class.js.html" 
-                                        target="classFrame">TinyMCE_URL.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_UndoRedo.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_UndoRedo.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_UndoRedo.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-TinyMCE_UndoRedo.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- TinyMCE_UndoRedo.class.js 
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title=" TinyMCE_UndoRedo.class.js";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B><a href="overview-summary-TinyMCE_UndoRedo.class.js.html" 
-                                        target="classFrame">TinyMCE_UndoRedo.class.js</a></B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-
-
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="TinyMCE_UndoRedo.html" TARGET="classFrame">TinyMCE_UndoRedo</A>
-<BR>
-</FONT></TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-frame.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-frame.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-frame.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-frame.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>
-Overview ()
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<SCRIPT>
-function asd()
-{
-parent.document.title="Overview ()";
-}
-</SCRIPT>
-<BODY BGCOLOR="white" onload="asd();">
-
-<H3 class="FrameHeadingFont"><B></B></H3>
-<TABLE BORDER="0" WIDTH="100%">
-<TR>
-<B></B></FONT></TD>
-</TR>
-</TABLE>
-
-<TABLE BORDER="0" WIDTH="100%">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="allclasses-frame.html" TARGET="packageFrame">All Classes</A></FONT>
-<P>
-<FONT size="+1" CLASS="FrameHeadingFont">
-Files</FONT>
-<BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Array.class.js.html" TARGET="packageFrame">TinyMCE_Array.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Cleanup.class.js.html" TARGET="packageFrame">TinyMCE_Cleanup.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Control.class.js.html" TARGET="packageFrame">TinyMCE_Control.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Debug.class.js.html" TARGET="packageFrame">TinyMCE_Debug.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_DOMUtils.class.js.html" TARGET="packageFrame">TinyMCE_DOMUtils.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Engine.class.js.html" TARGET="packageFrame">TinyMCE_Engine.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Event.class.js.html" TARGET="packageFrame">TinyMCE_Event.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_ForceParagraphs.class.js.html" TARGET="packageFrame">TinyMCE_ForceParagraphs.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Layer.class.js.html" TARGET="packageFrame">TinyMCE_Layer.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Menu.class.js.html" TARGET="packageFrame">TinyMCE_Menu.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Popup.class.js.html" TARGET="packageFrame">TinyMCE_Popup.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_Selection.class.js.html" TARGET="packageFrame">TinyMCE_Selection.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_UndoRedo.class.js.html" TARGET="packageFrame">TinyMCE_UndoRedo.class.js</A></FONT><BR>
-
-<FONT CLASS="FrameItemFont"><A HREF="overview-TinyMCE_URL.class.js.html" TARGET="packageFrame">TinyMCE_URL.class.js</A></FONT><BR>
-
-</TD>
-</TR>
-</TABLE>
-
-<P>
-&nbsp;
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Array.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Array.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Array.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Array.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,180 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Array.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Array.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Array.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Array.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:28 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- *
- * The contents of this file will be wrapped in a class later on.
- */</span>
-
-<span class="comment">/**
- * Returns a cleared array, since some external libraries tend to extend the Array core object
- * arrays needs to be cleaned from these extended functions. So this function simply sets any
- * named properties back to null.
- *
- * <span class="attrib">@param</span> {Array} Name/Value array to clear.
- * <span class="attrib">@return</span> Cleared name/value array.
- * <span class="attrib">@type</span> Array
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.clearArray = <span class="reserved">function</span>(a) {
-	<span class="reserved">for</span> (var k in a)
-		a[k] = null;
-
-	<span class="reserved">return</span> a;
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Cleanup.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Cleanup.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Cleanup.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Cleanup.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,1480 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Cleanup.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Cleanup.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Cleanup.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_Cleanup.html">TinyMCE_Cleanup</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Cleanup.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:28 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- *
- * Some of the contents of this file will be wrapped in a class later on it will also be replaced with the new cleanup logic.
- */</span>
-
-<span class="comment">/**
- * Makes some preprocessing cleanup routines on the specified HTML string.
- * This includes forcing some tags to be open so MSIE doesn't fail. Forcing other to close and
- * padding paragraphs with non breaking spaces. This function is used when the editor gets
- * initialized with content.
- *
- * <span class="attrib">@param</span> {string} s HTML string to cleanup.
- * <span class="attrib">@return</span> Cleaned HTML string.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.cleanupHTMLCode = <span class="reserved">function</span>(s) {
-	s = s.replace(new RegExp(<span class="literal">'&lt;p \\/&gt;'</span>, <span class="literal">'gi'</span>), <span class="literal">'&lt;p&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-	s = s.replace(new RegExp(<span class="literal">'&lt;p&gt;\\s*&lt;\\/p&gt;'</span>, <span class="literal">'gi'</span>), <span class="literal">'&lt;p&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-
-	<span class="comment">// Fix close BR elements</span>
-	s = s.replace(new RegExp(<span class="literal">'&lt;br&gt;\\s*&lt;\\/br&gt;'</span>, <span class="literal">'gi'</span>), <span class="literal">'&lt;br /&gt;'</span>);
-
-	<span class="comment">// Open closed tags like &lt;b/&gt; to &lt;b&gt;&lt;/b&gt;</span>
-	s = s.replace(new RegExp(<span class="literal">'&lt;(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|&gt;]*)\\/&gt;'</span>, <span class="literal">'gi'</span>), <span class="literal">'&lt;$1$2$3&gt;&lt;/$1$2&gt;'</span>);
-
-	<span class="comment">// Remove trailing space &lt;b &gt; to &lt;b&gt;</span>
-	s = s.replace(new RegExp(<span class="literal">'\\s+&gt;&lt;/'</span>, <span class="literal">'gi'</span>), <span class="literal">'&gt;&lt;/'</span>);
-
-	<span class="comment">// Close tags &lt;img&gt;&lt;/img&gt; to &lt;img/&gt;</span>
-	s = s.replace(new RegExp(<span class="literal">'&lt;(img|br|hr)([^&gt;]*)&gt;&lt;\\/(img|br|hr)&gt;'</span>, <span class="literal">'gi'</span>), <span class="literal">'&lt;$1$2 /&gt;'</span>);
-
-	<span class="comment">// Weird MSIE bug, &lt;p&gt;&lt;hr /&gt;&lt;/p&gt; breaks runtime?</span>
-	<span class="reserved">if</span> (tinyMCE.isMSIE)
-		s = s.replace(new RegExp(<span class="literal">'&lt;p&gt;&lt;hr \\/&gt;&lt;\\/p&gt;'</span>, <span class="literal">'gi'</span>), <span class="literal">"&lt;hr&gt;"</span>);
-
-	<span class="comment">// Convert relative anchors to absolute URLs ex: #something to file.htm#something</span>
-	<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">'convert_urls'</span>))
-		s = s.replace(new RegExp(<span class="literal">'(href=\"{0,1})(\\s*#)'</span>, <span class="literal">'gi'</span>), <span class="literal">'$1'</span> + tinyMCE.settings[<span class="literal">'document_base_url'</span>] + <span class="literal">"#"</span>);
-
-	<span class="reserved">return</span> s;
-};
-
-<span class="comment">/**
- * Parses the specified HTML style data. This will parse for example
- * "border-left: 1px; background-color: red" into an key/value array.
- *
- * <span class="attrib">@param</span> {string} str Style data to parse.
- * <span class="attrib">@return</span> Name/Value array of style items.
- * <span class="attrib">@type</span> Array
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.parseStyle = <span class="reserved">function</span>(str) {
-	var ar = new Array();
-
-	<span class="reserved">if</span> (str == null)
-		<span class="reserved">return</span> ar;
-
-	var st = str.split(<span class="literal">';'</span>);
-
-	tinyMCE.clearArray(ar);
-
-	<span class="reserved">for</span> (var i=0; i&lt;st.length; i++) {
-		<span class="reserved">if</span> (st[i] == <span class="literal">''</span>)
-			continue;
-
-		var re = new RegExp(<span class="literal">'^\\s*([^:]*):\\s*(.*)\\s*$'</span>);
-		var pa = st[i].replace(re, <span class="literal">'$1||$2'</span>).split(<span class="literal">'||'</span>);
-<span class="comment">//tinyMCE.debug(str, pa[0] + "=" + pa[1], st[i].replace(re, '$1||$2'));</span>
-		<span class="reserved">if</span> (pa.length == 2)
-			ar[pa[0].toLowerCase()] = pa[1];
-	}
-
-	<span class="reserved">return</span> ar;
-};
-
-<span class="comment">/**
- * Compresses larger styles into a smaller. Since MSIE automaticly converts
- * border: 1px solid red to border-left: 1px solid red, border-righ: 1px solid red and so forth.'
- * This will bundle them together again if the information is the same in each item.
- *
- * <span class="attrib">@param</span> {Array} ar Style name/value array with items.
- * <span class="attrib">@param</span> {string} pr Style item prefix to bundle for example border.
- * <span class="attrib">@param</span> {string} sf Style item suffix to bunlde for example -width or -width.
- * <span class="attrib">@param</span> {string} res Result name, for example border-width.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.compressStyle = <span class="reserved">function</span>(ar, pr, sf, res) {
-	var box = new Array();
-
-	box[0] = ar[pr + <span class="literal">'-top'</span> + sf];
-	box[1] = ar[pr + <span class="literal">'-left'</span> + sf];
-	box[2] = ar[pr + <span class="literal">'-right'</span> + sf];
-	box[3] = ar[pr + <span class="literal">'-bottom'</span> + sf];
-
-	<span class="reserved">for</span> (var i=0; i&lt;box.length; i++) {
-		<span class="reserved">if</span> (box[i] == null)
-			<span class="reserved">return</span>;
-
-		<span class="reserved">for</span> (var a=0; a&lt;box.length; a++) {
-			<span class="reserved">if</span> (box[a] != box[i])
-				<span class="reserved">return</span>;
-		}
-	}
-
-	<span class="comment">// They are all the same</span>
-	ar[res] = box[0];
-	ar[pr + <span class="literal">'-top'</span> + sf] = null;
-	ar[pr + <span class="literal">'-left'</span> + sf] = null;
-	ar[pr + <span class="literal">'-right'</span> + sf] = null;
-	ar[pr + <span class="literal">'-bottom'</span> + sf] = null;
-};
-
-<span class="comment">/**
- * Serializes the specified style item name/value array into a HTML string. This function
- * will force HEX colors in Firefox and convert the URL items of a style correctly.
- *
- * <span class="attrib">@param</span> {Array} ar Name/Value array of items to serialize.
- * <span class="attrib">@return</span> Serialized HTML string containing the items.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.serializeStyle = <span class="reserved">function</span>(ar) {
-	var str = <span class="literal">""</span>;
-
-	<span class="comment">// Compress box</span>
-	tinyMCE.compressStyle(ar, <span class="literal">"border"</span>, <span class="literal">""</span>, <span class="literal">"border"</span>);
-	tinyMCE.compressStyle(ar, <span class="literal">"border"</span>, <span class="literal">"-width"</span>, <span class="literal">"border-width"</span>);
-	tinyMCE.compressStyle(ar, <span class="literal">"border"</span>, <span class="literal">"-color"</span>, <span class="literal">"border-color"</span>);
-	tinyMCE.compressStyle(ar, <span class="literal">"border"</span>, <span class="literal">"-style"</span>, <span class="literal">"border-style"</span>);
-	tinyMCE.compressStyle(ar, <span class="literal">"padding"</span>, <span class="literal">""</span>, <span class="literal">"padding"</span>);
-	tinyMCE.compressStyle(ar, <span class="literal">"margin"</span>, <span class="literal">""</span>, <span class="literal">"margin"</span>);
-
-	<span class="reserved">for</span> (var key in ar) {
-		var val = ar[key];
-
-		<span class="reserved">if</span> (typeof(val) == <span class="literal">'function'</span>)
-			continue;
-
-		<span class="reserved">if</span> (key.indexOf(<span class="literal">'mso-'</span>) == 0)
-			continue;
-
-		<span class="reserved">if</span> (val != null &amp;&amp; val != <span class="literal">''</span>) {
-			val = <span class="literal">''</span> + val; <span class="comment">// Force string</span>
-
-			<span class="comment">// Fix style URL</span>
-			val = val.replace(new RegExp(<span class="literal">"url\\(\\'?([^\\']*)\\'?\\)"</span>, <span class="literal">'gi'</span>), <span class="literal">"url('$1')"</span>);
-
-			<span class="comment">// Convert URL</span>
-			<span class="reserved">if</span> (val.indexOf(<span class="literal">'url('</span>) != -1 &amp;&amp; tinyMCE.getParam(<span class="literal">'convert_urls'</span>)) {
-				var m = new RegExp(<span class="literal">"url\\('(.*?)'\\)"</span>).exec(val);
-
-				<span class="reserved">if</span> (m.length &gt; 1)
-					val = <span class="literal">"url('"</span> + eval(tinyMCE.getParam(<span class="literal">'urlconverter_callback'</span>) + <span class="literal">"(m[1], null, true);"</span>) + <span class="literal">"')"</span>;
-			}
-
-			<span class="comment">// Force HEX colors</span>
-			<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"force_hex_style_colors"</span>))
-				val = tinyMCE.convertRGBToHex(val, true);
-
-			<span class="reserved">if</span> (val != <span class="literal">"url('')"</span>)
-				str += key.toLowerCase() + <span class="literal">": "</span> + val + <span class="literal">"; "</span>;
-		}
-	}
-
-	<span class="reserved">if</span> (new RegExp(<span class="literal">'; $'</span>).test(str))
-		str = str.substring(0, str.length - 2);
-
-	<span class="reserved">return</span> str;
-};
-
-<span class="comment">/**
- * Returns a hexadecimal version of the specified rgb(1,2,3) string.
- *
- * <span class="attrib">@param</span> {string} s RGB string to parse, if this doesn't isn't a rgb(n,n,n) it will passthrough the string.
- * <span class="attrib">@param</span> {boolean} k Keep before/after contents. If enabled contents before after the rgb(n,n,n) will be intact.
- * <span class="attrib">@return</span> Hexadecimal version of the specified rgb(1,2,3) string.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertRGBToHex = <span class="reserved">function</span>(s, k) {
-	<span class="reserved">if</span> (s.toLowerCase().indexOf(<span class="literal">'rgb'</span>) != -1) {
-		var re = new RegExp(<span class="literal">"(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)"</span>, <span class="literal">"gi"</span>);
-		var rgb = s.replace(re, <span class="literal">"$1,$2,$3,$4,$5"</span>).split(<span class="literal">','</span>);
-		<span class="reserved">if</span> (rgb.length == 5) {
-			r = parseInt(rgb[1]).toString(16);
-			g = parseInt(rgb[2]).toString(16);
-			b = parseInt(rgb[3]).toString(16);
-
-			r = r.length == 1 ? <span class="literal">'0'</span> + r : r;
-			g = g.length == 1 ? <span class="literal">'0'</span> + g : g;
-			b = b.length == 1 ? <span class="literal">'0'</span> + b : b;
-
-			s = <span class="literal">"#"</span> + r + g + b;
-
-			<span class="reserved">if</span> (k)
-				s = rgb[0] + s + rgb[4];
-		}
-	}
-
-	<span class="reserved">return</span> s;
-};
-
-<span class="comment">/**
- * Returns a rgb(n,n,n) string from a hexadecimal value.
- *
- * <span class="attrib">@param</span> {string} s Hexadecimal string to parse.
- * <span class="attrib">@return</span> rgb(n,n,n) string from a hexadecimal value.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertHexToRGB = <span class="reserved">function</span>(s) {
-	<span class="reserved">if</span> (s.indexOf(<span class="literal">'#'</span>) != -1) {
-		s = s.replace(new RegExp(<span class="literal">'[^0-9A-F]'</span>, <span class="literal">'gi'</span>), <span class="literal">''</span>);
-		<span class="reserved">return</span> <span class="literal">"rgb("</span> + parseInt(s.substring(0, 2), 16) + <span class="literal">","</span> + parseInt(s.substring(2, 4), 16) + <span class="literal">","</span> + parseInt(s.substring(4, 6), 16) + <span class="literal">")"</span>;
-	}
-
-	<span class="reserved">return</span> s;
-};
-
-<span class="comment">/**
- * Converts span elements to font elements in the specified document instance.
- * Todo: Move this function into a XHTML plugin or simmilar.
- *
- * <span class="attrib">@param</span> {DOMDocument} doc Document instance to convert spans in.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertSpansToFonts = <span class="reserved">function</span>(doc) {
-	var sizes = tinyMCE.getParam(<span class="literal">'font_size_style_values'</span>).replace(/\s+/, <span class="literal">''</span>).split(<span class="literal">','</span>);
-
-	var h = doc.body.innerHTML;
-	h = h.replace(/&lt;span/gi, <span class="literal">'&lt;font'</span>);
-	h = h.replace(/&lt;\/span/gi, <span class="literal">'&lt;/font'</span>);
-	doc.body.innerHTML = h;
-
-	var s = doc.getElementsByTagName(<span class="literal">"font"</span>);
-	<span class="reserved">for</span> (var i=0; i&lt;s.length; i++) {
-		var size = tinyMCE.trim(s[i].style.fontSize).toLowerCase();
-		var fSize = 0;
-
-		<span class="reserved">for</span> (var x=0; x&lt;sizes.length; x++) {
-			<span class="reserved">if</span> (sizes[x] == size) {
-				fSize = x + 1;
-				break;
-			}
-		}
-
-		<span class="reserved">if</span> (fSize &gt; 0) {
-			tinyMCE.setAttrib(s[i], <span class="literal">'size'</span>, fSize);
-			s[i].style.fontSize = <span class="literal">''</span>;
-		}
-
-		var fFace = s[i].style.fontFamily;
-		<span class="reserved">if</span> (fFace != null &amp;&amp; fFace != <span class="literal">""</span>) {
-			tinyMCE.setAttrib(s[i], <span class="literal">'face'</span>, fFace);
-			s[i].style.fontFamily = <span class="literal">''</span>;
-		}
-
-		var fColor = s[i].style.color;
-		<span class="reserved">if</span> (fColor != null &amp;&amp; fColor != <span class="literal">""</span>) {
-			tinyMCE.setAttrib(s[i], <span class="literal">'color'</span>, tinyMCE.convertRGBToHex(fColor));
-			s[i].style.color = <span class="literal">''</span>;
-		}
-	}
-};
-
-<span class="comment">/**
- * Convers fonts to spans in the specified document.
- * Todo: Move this function into a XHTML plugin or simmilar.
- *
- * <span class="attrib">@param</span> {DOMDocument} doc Document instance to convert fonts in.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertFontsToSpans = <span class="reserved">function</span>(doc) {
-	var sizes = tinyMCE.getParam(<span class="literal">'font_size_style_values'</span>).replace(/\s+/, <span class="literal">''</span>).split(<span class="literal">','</span>);
-
-	var h = doc.body.innerHTML;
-	h = h.replace(/&lt;font/gi, <span class="literal">'&lt;span'</span>);
-	h = h.replace(/&lt;\/font/gi, <span class="literal">'&lt;/span'</span>);
-	doc.body.innerHTML = h;
-
-	var fsClasses = tinyMCE.getParam(<span class="literal">'font_size_classes'</span>);
-	<span class="reserved">if</span> (fsClasses != <span class="literal">''</span>)
-		fsClasses = fsClasses.replace(/\s+/, <span class="literal">''</span>).split(<span class="literal">','</span>);
-	<span class="reserved">else</span>
-		fsClasses = null;
-
-	var s = doc.getElementsByTagName(<span class="literal">"span"</span>);
-	<span class="reserved">for</span> (var i=0; i&lt;s.length; i++) {
-		var fSize, fFace, fColor;
-
-		fSize = tinyMCE.getAttrib(s[i], <span class="literal">'size'</span>);
-		fFace = tinyMCE.getAttrib(s[i], <span class="literal">'face'</span>);
-		fColor = tinyMCE.getAttrib(s[i], <span class="literal">'color'</span>);
-
-		<span class="reserved">if</span> (fSize != <span class="literal">""</span>) {
-			fSize = parseInt(fSize);
-
-			<span class="reserved">if</span> (fSize &gt; 0 &amp;&amp; fSize &lt; 8) {
-				<span class="reserved">if</span> (fsClasses != null)
-					tinyMCE.setAttrib(s[i], <span class="literal">'class'</span>, fsClasses[fSize-1]);
-				<span class="reserved">else</span>
-					s[i].style.fontSize = sizes[fSize-1];
-			}
-
-			s[i].removeAttribute(<span class="literal">'size'</span>);
-		}
-
-		<span class="reserved">if</span> (fFace != <span class="literal">""</span>) {
-			s[i].style.fontFamily = fFace;
-			s[i].removeAttribute(<span class="literal">'face'</span>);
-		}
-
-		<span class="reserved">if</span> (fColor != <span class="literal">""</span>) {
-			s[i].style.color = fColor;
-			s[i].removeAttribute(<span class="literal">'color'</span>);
-		}
-	}
-};
-
-<span class="comment">/**
- * Moves the contents of a anchor outside and after the anchor. Only if the anchor doesn't
- * have a href.
- *
- * <span class="attrib">@param</span> {DOMDocument} doc DOM document instance to fix anchors in.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.cleanupAnchors = <span class="reserved">function</span>(doc) {
-	var i, cn, x, an = doc.getElementsByTagName(<span class="literal">"a"</span>);
-
-	<span class="comment">// Loops backwards due to bug #1467987</span>
-	<span class="reserved">for</span> (i=an.length-1; i&gt;=0; i--) {
-		<span class="reserved">if</span> (tinyMCE.getAttrib(an[i], <span class="literal">"name"</span>) != <span class="literal">""</span> &amp;&amp; tinyMCE.getAttrib(an[i], <span class="literal">"href"</span>) == <span class="literal">""</span>) {
-			cn = an[i].childNodes;
-
-			<span class="reserved">for</span> (x=cn.length-1; x&gt;=0; x--)
-				tinyMCE.insertAfter(cn[x], an[i]);
-		}
-	}
-};
-
-<span class="comment">/**
- * Returns the HTML contents of the specified editor instance id.
- *
- * <span class="attrib">@param</span> {string} editor_id Editor instance id to retrive HTML code from.
- * <span class="attrib">@return</span> HTML contents of editor id or null if it wasn't found.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getContent = <span class="reserved">function</span>(editor_id) {
-	var h;
-
-	<span class="reserved">if</span> (typeof(editor_id) != <span class="literal">"undefined"</span>)
-		tinyMCE.selectedInstance = tinyMCE.getInstanceById(editor_id);
-
-	<span class="reserved">if</span> (tinyMCE.selectedInstance) {
-		h = tinyMCE._cleanupHTML(<span class="reserved">this</span>.selectedInstance, <span class="reserved">this</span>.selectedInstance.getDoc(), tinyMCE.settings, <span class="reserved">this</span>.selectedInstance.getBody(), false, true);
-
-		<span class="comment">// When editing always use fonts internaly</span>
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-			tinyMCE.convertSpansToFonts(<span class="reserved">this</span>.selectedInstance.getDoc());
-
-		<span class="reserved">return</span> h;
-	}
-
-	<span class="reserved">return</span> null;
-};
-
-<span class="comment">/**
- * Fixes invalid ul/ol elements so the document is more XHTML valid.
- *
- * <span class="attrib">@param</span> {DOMDocument} d HTML DOM document to fix list elements in.
- * <span class="attrib">@private</span>
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>._fixListElements = <span class="reserved">function</span>(d) {
-	var nl, x, a = [<span class="literal">'ol'</span>, <span class="literal">'ul'</span>], i, n, p, r = new RegExp(<span class="literal">'^(OL|UL)$'</span>), np;
-
-	<span class="reserved">for</span> (x=0; x&lt;a.length; x++) {
-		nl = d.getElementsByTagName(a[x]);
-
-		<span class="reserved">for</span> (i=0; i&lt;nl.length; i++) {
-			n = nl[i];
-			p = n.parentNode;
-
-			<span class="reserved">if</span> (r.test(p.nodeName)) {
-				np = tinyMCE.prevNode(n, <span class="literal">'LI'</span>);
-
-				<span class="reserved">if</span> (!np) {
-					np = d.createElement(<span class="literal">'li'</span>);
-					np.innerHTML = <span class="literal">'&amp;nbsp;'</span>;
-					np.appendChild(n);
-					p.insertBefore(np, p.firstChild);
-				} <span class="reserved">else</span>
-					np.appendChild(n);
-			}
-		}
-	}
-};
-
-<span class="comment">/**
- * Moves table elements out of block elements to produce more valid XHTML.
- *
- * <span class="attrib">@param</span> {DOMDocument} d HTML DOM document to fix list elements in.
- * <span class="attrib">@private</span>
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>._fixTables = <span class="reserved">function</span>(d) {
-	var nl, i, n, p, np, x, t;
-
-	nl = d.getElementsByTagName(<span class="literal">'table'</span>);
-	<span class="reserved">for</span> (i=0; i&lt;nl.length; i++) {
-		n = nl[i];
-
-		<span class="reserved">if</span> ((p = tinyMCE.getParentElement(n, <span class="literal">'p,div,h1,h2,h3,h4,h5,h6'</span>)) != null) {
-			np = p.cloneNode(false);
-			np.removeAttribute(<span class="literal">'id'</span>);
-
-			t = n;
-
-			<span class="reserved">while</span> ((n = n.nextSibling))
-				np.appendChild(n);
-
-			tinyMCE.insertAfter(np, p);
-			tinyMCE.insertAfter(t, p);
-		}
-	}
-};
-
-<span class="comment">/**
- * Performces cleanup of the contents of the specified instance.
- * Todo: Finish documentation, and remove useless parameters.
- *
- * <span class="attrib">@param</span> {TinyMCE_Control} inst Editor instance.
- * <span class="attrib">@param</span> {DOMDocument} doc ...
- * <span class="attrib">@param</span> {Array} config ...
- * <span class="attrib">@param</span> {HTMLElement} elm ...
- * <span class="attrib">@param</span> {boolean} visual ...
- * <span class="attrib">@param</span> {boolean} on_save ...
- * <span class="attrib">@param</span> {boolean} on_submit ...
- * <span class="attrib">@return</span> Cleaned HTML contents of editor instance.
- * <span class="attrib">@type</span> string
- * <span class="attrib">@private</span>
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>._cleanupHTML = <span class="reserved">function</span>(inst, doc, config, elm, visual, on_save, on_submit) {
-	var h, d, t1, t2, t3, t4, t5, c, s;
-
-	<span class="reserved">if</span> (!tinyMCE.getParam(<span class="literal">'cleanup'</span>))
-		<span class="reserved">return</span> elm.innerHTML;
-
-	on_save = typeof(on_save) == <span class="literal">'undefined'</span> ? false : on_save;
-
-	c = inst.cleanup;
-	s = inst.settings;
-	d = c.settings.debug;
-
-	<span class="reserved">if</span> (d)
-		t1 = new Date().getTime();
-
-	<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-		tinyMCE.convertFontsToSpans(doc);
-
-	<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"fix_list_elements"</span>))
-		tinyMCE._fixListElements(doc);
-
-	<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"fix_table_elements"</span>))
-		tinyMCE._fixTables(doc);
-
-	<span class="comment">// Call custom cleanup code</span>
-	tinyMCE._customCleanup(inst, on_save ? <span class="literal">"get_from_editor_dom"</span> : <span class="literal">"insert_to_editor_dom"</span>, doc.body);
-
-	<span class="reserved">if</span> (d)
-		t2 = new Date().getTime();
-
-	c.settings.on_save = on_save;
-	<span class="comment">//for (var i=0; i&lt;100; i++)</span>
-
-	c.idCount = 0;
-	c.serializationId++;
-	c.serializedNodes = new Array();
-	c.sourceIndex = -1;
-
-	<span class="reserved">if</span> (s.cleanup_serializer == <span class="literal">"xml"</span>)
-		h = c.serializeNodeAsXML(elm);
-	<span class="reserved">else</span>
-		h = c.serializeNodeAsHTML(elm);
-
-	<span class="reserved">if</span> (d)
-		t3 = new Date().getTime();
-
-	<span class="comment">// Post processing</span>
-	h = h.replace(/&lt;\/?(body|head|html)[^&gt;]*&gt;/gi, <span class="literal">''</span>);
-	h = h.replace(new RegExp(<span class="literal">' (rowspan="1"|colspan="1")'</span>, <span class="literal">'g'</span>), <span class="literal">''</span>);
-	h = h.replace(/&lt;p&gt;&lt;hr \/&gt;&lt;\/p&gt;/g, <span class="literal">'&lt;hr /&gt;'</span>);
-	h = h.replace(/&lt;p&gt;(&amp;nbsp;|&amp;#160;)&lt;\/p&gt;&lt;hr \/&gt;&lt;p&gt;(&amp;nbsp;|&amp;#160;)&lt;\/p&gt;/g, <span class="literal">'&lt;hr /&gt;'</span>);
-	h = h.replace(/&lt;td&gt;\s*&lt;br \/&gt;\s*&lt;\/td&gt;/g, <span class="literal">'&lt;td&gt;&amp;nbsp;&lt;/td&gt;'</span>);
-	h = h.replace(/&lt;p&gt;\s*&lt;br \/&gt;\s*&lt;\/p&gt;/g, <span class="literal">'&lt;p&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-	h = h.replace(/&lt;p&gt;\s*(&amp;nbsp;|&amp;#160;)\s*&lt;br \/&gt;\s*(&amp;nbsp;|&amp;#160;)\s*&lt;\/p&gt;/g, <span class="literal">'&lt;p&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-	h = h.replace(/&lt;p&gt;\s*(&amp;nbsp;|&amp;#160;)\s*&lt;br \/&gt;\s*&lt;\/p&gt;/g, <span class="literal">'&lt;p&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-	h = h.replace(/&lt;p&gt;\s*&lt;br \/&gt;\s*&amp;nbsp;\s*&lt;\/p&gt;/g, <span class="literal">'&lt;p&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-	h = h.replace(new RegExp(<span class="literal">'&lt;a&gt;(.*?)&lt;\\/a&gt;'</span>, <span class="literal">'g'</span>), <span class="literal">'$1'</span>);
-	h = h.replace(/&lt;p([^&gt;]*)&gt;\s*&lt;\/p&gt;/g, <span class="literal">'&lt;p$1&gt;&amp;nbsp;&lt;/p&gt;'</span>);
-
-	<span class="comment">// Clean body</span>
-	<span class="reserved">if</span> (/^\s*(&lt;br \/&gt;|&lt;p&gt;&amp;nbsp;&lt;\/p&gt;|&lt;p&gt;&amp;#160;&lt;\/p&gt;|&lt;p&gt;&lt;\/p&gt;)\s*$/.test(h))
-		h = <span class="literal">''</span>;
-
-	<span class="comment">// If preformatted</span>
-	<span class="reserved">if</span> (s.preformatted) {
-		h = h.replace(/^&lt;pre&gt;/, <span class="literal">''</span>);
-		h = h.replace(/&lt;\/pre&gt;$/, <span class="literal">''</span>);
-		h = <span class="literal">'&lt;pre&gt;'</span> + h + <span class="literal">'&lt;/pre&gt;'</span>;
-	}
-
-	<span class="comment">// Gecko specific processing</span>
-	<span class="reserved">if</span> (tinyMCE.isGecko) {
-		h = h.replace(/&lt;o:p _moz-userdefined=<span class="literal">""</span> \/&gt;/g, <span class="literal">''</span>);
-		h = h.replace(/&lt;td([^&gt;]*)&gt;\s*&lt;br \/&gt;\s*&lt;\/td&gt;/g, <span class="literal">'&lt;td$1&gt;&amp;nbsp;&lt;/td&gt;'</span>);
-	}
-
-	<span class="reserved">if</span> (s.force_br_newlines)
-		h = h.replace(/&lt;p&gt;(&amp;nbsp;|&amp;#160;)&lt;\/p&gt;/g, <span class="literal">'&lt;br /&gt;'</span>);
-
-	<span class="comment">// Call custom cleanup code</span>
-	h = tinyMCE._customCleanup(inst, on_save ? <span class="literal">"get_from_editor"</span> : <span class="literal">"insert_to_editor"</span>, h);
-
-	<span class="comment">// Remove internal classes</span>
-	<span class="reserved">if</span> (on_save) {
-		h = h.replace(new RegExp(<span class="literal">' ?(mceItem[a-zA-Z0-9]*|'</span> + s.visual_table_class + <span class="literal">')'</span>, <span class="literal">'g'</span>), <span class="literal">''</span>);
-		h = h.replace(new RegExp(<span class="literal">' ?class=""'</span>, <span class="literal">'g'</span>), <span class="literal">''</span>);
-	}
-
-	<span class="reserved">if</span> (s.remove_linebreaks &amp;&amp; !c.settings.indent)
-		h = h.replace(/\n|\r/g, <span class="literal">' '</span>);
-
-	<span class="reserved">if</span> (d)
-		t4 = new Date().getTime();
-
-	<span class="reserved">if</span> (on_save &amp;&amp; c.settings.indent)
-		h = c.formatHTML(h);
-
-	<span class="comment">// If encoding (not recommended option)</span>
-	<span class="reserved">if</span> (on_submit &amp;&amp; (s.encoding == <span class="literal">"xml"</span> || s.encoding == <span class="literal">"html"</span>))
-		h = c.xmlEncode(h);
-
-	<span class="reserved">if</span> (d)
-		t5 = new Date().getTime();
-
-	<span class="reserved">if</span> (c.settings.debug)
-		tinyMCE.debug(<span class="literal">"Cleanup in ms: Pre="</span> + (t2-t1) + <span class="literal">", Serialize: "</span> + (t3-t2) + <span class="literal">", Post: "</span> + (t4-t3) + <span class="literal">", Format: "</span> + (t5-t4) + <span class="literal">", Sum: "</span> + (t5-t1) + <span class="literal">"."</span>);
-
-	<span class="reserved">return</span> h;
-};
-
-<span class="comment">/**
- * TinyMCE_Cleanup class.
- */</span>
-<span class="reserved">function</span> TinyMCE_Cleanup() {
-	<span class="reserved">this</span>.isMSIE = (navigator.appName == <span class="literal">"Microsoft Internet Explorer"</span>);
-	<span class="reserved">this</span>.rules = tinyMCE.clearArray(new Array());
-
-	<span class="comment">// Default config</span>
-	<span class="reserved">this</span>.settings = {
-		indent_elements : <span class="literal">'head,table,tbody,thead,tfoot,form,tr,ul,ol,blockquote,object'</span>,
-		newline_before_elements : <span class="literal">'h1,h2,h3,h4,h5,h6,pre,address,div,ul,ol,li,meta,option,area,title,link,base,script,td'</span>,
-		newline_after_elements : <span class="literal">'br,hr,p,pre,address,div,ul,ol,meta,option,area,link,base,script'</span>,
-		newline_before_after_elements : <span class="literal">'html,head,body,table,thead,tbody,tfoot,tr,form,ul,ol,blockquote,p,object,param,hr,div'</span>,
-		indent_char : <span class="literal">'\t'</span>,
-		indent_levels : 1,
-		entity_encoding : <span class="literal">'raw'</span>,
-		valid_elements : <span class="literal">'*[*]'</span>,
-		entities : <span class="literal">''</span>,
-		url_converter : <span class="literal">''</span>,
-		invalid_elements : <span class="literal">''</span>,
-		verify_html : false
-	};
-
-	<span class="reserved">this</span>.vElements = tinyMCE.clearArray(new Array());
-	<span class="reserved">this</span>.vElementsRe = <span class="literal">''</span>;
-	<span class="reserved">this</span>.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON|AREA)$/;
-	<span class="reserved">this</span>.codeElementsRe = /^(SCRIPT|STYLE)$/;
-	<span class="reserved">this</span>.serializationId = 0;
-	<span class="reserved">this</span>.mceAttribs = {
-		href : <span class="literal">'mce_href'</span>,
-		src : <span class="literal">'mce_src'</span>,
-		type : <span class="literal">'mce_type'</span>
-	};
-}
-
-TinyMCE_Cleanup.<span class="reserved">prototype</span> = {
-	<span class="comment">/**
-	 * Initializes the cleanup engine with the specified config.
-	 *
-	 * <span class="attrib">@param</span> {Array} s Name/Value array with config settings.
-	 */</span>
-	init : <span class="reserved">function</span>(s) {
-		var n, a, i, ir, or, st;
-
-		<span class="reserved">for</span> (n in s)
-			<span class="reserved">this</span>.settings[n] = s[n];
-
-		<span class="comment">// Setup code formating</span>
-		s = <span class="reserved">this</span>.settings;
-
-		<span class="comment">// Setup regexps</span>
-		<span class="reserved">this</span>.inRe = <span class="reserved">this</span>._arrayToRe(s.indent_elements.split(<span class="literal">','</span>), <span class="literal">''</span>, <span class="literal">'^&lt;('</span>, <span class="literal">')[^&gt;]*'</span>);
-		<span class="reserved">this</span>.ouRe = <span class="reserved">this</span>._arrayToRe(s.indent_elements.split(<span class="literal">','</span>), <span class="literal">''</span>, <span class="literal">'^&lt;\\/('</span>, <span class="literal">')[^&gt;]*'</span>);
-		<span class="reserved">this</span>.nlBeforeRe = <span class="reserved">this</span>._arrayToRe(s.newline_before_elements.split(<span class="literal">','</span>), <span class="literal">'gi'</span>, <span class="literal">'&lt;('</span>,  <span class="literal">')([^&gt;]*)&gt;'</span>);
-		<span class="reserved">this</span>.nlAfterRe = <span class="reserved">this</span>._arrayToRe(s.newline_after_elements.split(<span class="literal">','</span>), <span class="literal">'gi'</span>, <span class="literal">'&lt;('</span>,  <span class="literal">')([^&gt;]*)&gt;'</span>);
-		<span class="reserved">this</span>.nlBeforeAfterRe = <span class="reserved">this</span>._arrayToRe(s.newline_before_after_elements.split(<span class="literal">','</span>), <span class="literal">'gi'</span>, <span class="literal">'&lt;(\\/?)('</span>, <span class="literal">')([^&gt;]*)&gt;'</span>);
-
-		<span class="reserved">if</span> (s.invalid_elements != <span class="literal">''</span>)
-			<span class="reserved">this</span>.iveRe = <span class="reserved">this</span>._arrayToRe(s.invalid_elements.toUpperCase().split(<span class="literal">','</span>), <span class="literal">'g'</span>, <span class="literal">'^('</span>, <span class="literal">')$'</span>);
-		<span class="reserved">else</span>
-			<span class="reserved">this</span>.iveRe = null;
-
-		<span class="comment">// Setup separator</span>
-		st = <span class="literal">''</span>;
-		<span class="reserved">for</span> (i=0; i&lt;s.indent_levels; i++)
-			st += s.indent_char;
-
-		<span class="reserved">this</span>.inStr = st;
-
-		<span class="comment">// If verify_html if false force *[*]</span>
-		<span class="reserved">if</span> (!s.verify_html) {
-			s.valid_elements = <span class="literal">'*[*]'</span>;
-			s.extended_valid_elements = <span class="literal">''</span>;
-		}
-
-		<span class="reserved">this</span>.fillStr = s.entity_encoding == <span class="literal">"named"</span> ? <span class="literal">"&amp;nbsp;"</span> : <span class="literal">"&amp;#160;"</span>;
-		<span class="reserved">this</span>.idCount = 0;
-	},
-
-	<span class="comment">/**
-	 * Adds a cleanup rule string, for example: a[href|name|title=title|class=class1?class2?class3].
-	 * These rules are then used when serializing the DOM tree as a HTML string, it gives the possibility
-	 * to control the valid elements and attributes and force attribute values or default them.
-	 *
-	 * <span class="attrib">@param</span> {string} s Rule string to parse and add to the cleanup rules array.
-	 */</span>
-	addRuleStr : <span class="reserved">function</span>(s) {
-		var r = <span class="reserved">this</span>.parseRuleStr(s);
-		var n;
-
-		<span class="reserved">for</span> (n in r) {
-			<span class="reserved">if</span> (r[n])
-				<span class="reserved">this</span>.rules[n] = r[n];
-		}
-
-		<span class="reserved">this</span>.vElements = tinyMCE.clearArray(new Array());
-
-		<span class="reserved">for</span> (n in <span class="reserved">this</span>.rules) {
-			<span class="reserved">if</span> (<span class="reserved">this</span>.rules[n])
-				<span class="reserved">this</span>.vElements[<span class="reserved">this</span>.vElements.length] = <span class="reserved">this</span>.rules[n].tag;
-		}
-
-		<span class="reserved">this</span>.vElementsRe = <span class="reserved">this</span>._arrayToRe(<span class="reserved">this</span>.vElements, <span class="literal">''</span>);
-	},
-
-	<span class="comment">/**
-	 * Parses a cleanup rule string, for example: a[href|name|title=title|class=class1?class2?class3].
-	 * These rules are then used when serializing the DOM tree as a HTML string, it gives the possibility
-	 * to control the valid elements and attributes and force attribute values or default them.
-	 *
-	 * <span class="attrib">@param</span> {string} s Rule string to parse as a name/value rule array.
-	 * <span class="attrib">@return</span> Parsed name/value rule array.
-	 * <span class="attrib">@type</span> Array
-	 */</span>
-	parseRuleStr : <span class="reserved">function</span>(s) {
-		var ta, p, r, a, i, x, px, t, tn, y, av, or = tinyMCE.clearArray(new Array()), dv;
-
-		<span class="reserved">if</span> (s == null || s.length == 0)
-			<span class="reserved">return</span> or;
-
-		ta = s.split(<span class="literal">','</span>);
-		<span class="reserved">for</span> (x=0; x&lt;ta.length; x++) {
-			s = ta[x];
-			<span class="reserved">if</span> (s.length == 0)
-				continue;
-
-			<span class="comment">// Split tag/attrs</span>
-			p = <span class="reserved">this</span>.split(/\[|\]/, s);
-			<span class="reserved">if</span> (p == null || p.length &lt; 1)
-				t = s.toUpperCase();
-			<span class="reserved">else</span>
-				t = p[0].toUpperCase();
-
-			<span class="comment">// Handle all tag names</span>
-			tn = <span class="reserved">this</span>.split(<span class="literal">'/'</span>, t);
-			<span class="reserved">for</span> (y=0; y&lt;tn.length; y++) {
-				r = {};
-
-				r.tag = tn[y];
-				r.forceAttribs = null;
-				r.defaultAttribs = null;
-				r.validAttribValues = null;
-
-				<span class="comment">// Handle prefixes</span>
-				px = r.tag.charAt(0);
-				r.forceOpen = px == <span class="literal">'+'</span>;
-				r.removeEmpty = px == <span class="literal">'-'</span>;
-				r.fill = px == <span class="literal">'#'</span>;
-				r.tag = r.tag.replace(/\+|-|#/g, <span class="literal">''</span>);
-				r.oTagName = tn[0].replace(/\+|-|#/g, <span class="literal">''</span>).toLowerCase();
-				r.isWild = new RegExp(<span class="literal">'\\*|\\?|\\+'</span>, <span class="literal">'g'</span>).test(r.tag);
-				r.validRe = new RegExp(<span class="reserved">this</span>._wildcardToRe(<span class="literal">'^'</span> + r.tag + <span class="literal">'$'</span>));
-
-				<span class="comment">// Setup valid attributes</span>
-				<span class="reserved">if</span> (p.length &gt; 1) {
-					r.vAttribsRe = <span class="literal">'^('</span>;
-					a = <span class="reserved">this</span>.split(/\|/, p[1]);
-
-					<span class="reserved">for</span> (i=0; i&lt;a.length; i++) {
-						t = a[i];
-
-						av = new RegExp(<span class="literal">'(=|:|&lt;)(.*?)$'</span>).exec(t);
-						t = t.replace(new RegExp(<span class="literal">'(=|:|&lt;).*?$'</span>), <span class="literal">''</span>);
-						<span class="reserved">if</span> (av &amp;&amp; av.length &gt; 0) {
-							<span class="reserved">if</span> (av[0].charAt(0) == <span class="literal">':'</span>) {
-								<span class="reserved">if</span> (!r.forceAttribs)
-									r.forceAttribs = tinyMCE.clearArray(new Array());
-
-								r.forceAttribs[t.toLowerCase()] = av[0].substring(1);
-							} <span class="reserved">else</span> <span class="reserved">if</span> (av[0].charAt(0) == <span class="literal">'='</span>) {
-								<span class="reserved">if</span> (!r.defaultAttribs)
-									r.defaultAttribs = tinyMCE.clearArray(new Array());
-
-								dv = av[0].substring(1);
-
-								r.defaultAttribs[t.toLowerCase()] = dv == <span class="literal">""</span> ? <span class="literal">"mce_empty"</span> : dv;
-							} <span class="reserved">else</span> <span class="reserved">if</span> (av[0].charAt(0) == <span class="literal">'&lt;'</span>) {
-								<span class="reserved">if</span> (!r.validAttribValues)
-									r.validAttribValues = tinyMCE.clearArray(new Array());
-
-								r.validAttribValues[t.toLowerCase()] = <span class="reserved">this</span>._arrayToRe(<span class="reserved">this</span>.split(<span class="literal">'?'</span>, av[0].substring(1)), <span class="literal">''</span>);
-							}
-						}
-
-						r.vAttribsRe += <span class="literal">''</span> + t.toLowerCase() + (i != a.length - 1 ? <span class="literal">'|'</span> : <span class="literal">''</span>);
-
-						a[i] = t.toLowerCase();
-					}
-
-					r.vAttribsRe += <span class="literal">')$'</span>;
-					r.vAttribsRe = <span class="reserved">this</span>._wildcardToRe(r.vAttribsRe);
-					r.vAttribsReIsWild = new RegExp(<span class="literal">'\\*|\\?|\\+'</span>, <span class="literal">'g'</span>).test(r.vAttribsRe);
-					r.vAttribsRe = new RegExp(r.vAttribsRe);
-					r.vAttribs = a.reverse();
-
-					<span class="comment">//tinyMCE.debug(r.tag, r.oTagName, r.vAttribsRe, r.vAttribsReWC);</span>
-				} <span class="reserved">else</span> {
-					r.vAttribsRe = <span class="literal">''</span>;
-					r.vAttribs = tinyMCE.clearArray(new Array());
-					r.vAttribsReIsWild = false;
-				}
-
-				or[r.tag] = r;
-			}
-		}
-
-		<span class="reserved">return</span> or;
-	},
-
-	<span class="comment">/**
-	 * Serializes the specified node as a HTML string. This uses the XML parser and serializer
-	 * to generate a XHTML string.
-	 *
-	 * <span class="attrib">@param</span> {HTMLNode} n Node to serialize as a XHTML string.
-	 * <span class="attrib">@return</span> Serialized XHTML string based on specified node.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	serializeNodeAsXML : <span class="reserved">function</span>(n) {
-		var s, b;
-
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.xmlDoc) {
-			<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE) {
-				try {<span class="reserved">this</span>.xmlDoc = new ActiveXObject(<span class="literal">'MSXML2.DOMDocument'</span>);} catch (e) {}
-
-				<span class="reserved">if</span> (!<span class="reserved">this</span>.xmlDoc)
-					try {<span class="reserved">this</span>.xmlDoc = new ActiveXObject(<span class="literal">'Microsoft.XmlDom'</span>);} catch (e) {}
-			} <span class="reserved">else</span>
-				<span class="reserved">this</span>.xmlDoc = document.implementation.createDocument(<span class="literal">''</span>, <span class="literal">''</span>, null);
-
-			<span class="reserved">if</span> (!<span class="reserved">this</span>.xmlDoc)
-				alert(<span class="literal">"Error XML Parser could not be found."</span>);
-		}
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.xmlDoc.firstChild)
-			<span class="reserved">this</span>.xmlDoc.removeChild(<span class="reserved">this</span>.xmlDoc.firstChild);
-
-		b = <span class="reserved">this</span>.xmlDoc.createElement(<span class="literal">"html"</span>);
-		b = <span class="reserved">this</span>.xmlDoc.appendChild(b);
-
-		<span class="reserved">this</span>._convertToXML(n, b);
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE)
-			<span class="reserved">return</span> <span class="reserved">this</span>.xmlDoc.xml;
-		<span class="reserved">else</span>
-			<span class="reserved">return</span> new XMLSerializer().serializeToString(<span class="reserved">this</span>.xmlDoc);
-	},
-
-	<span class="comment">/**
-	 * Converts and adds the specified HTML DOM node to a XML DOM node.
-	 *
-	 * <span class="attrib">@param</span> {HTMLNode} n HTML Node to add as a XML node.
-	 * <span class="attrib">@param</span> {XMLNode} xn XML Node to add the HTML node to.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_convertToXML : <span class="reserved">function</span>(n, xn) {
-		var xd, el, i, l, cn, at, no, hc = false;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>._isDuplicate(n))
-			<span class="reserved">return</span>;
-
-		xd = <span class="reserved">this</span>.xmlDoc;
-
-		switch (n.nodeType) {
-			case 1: <span class="comment">// Element</span>
-				hc = n.hasChildNodes();
-
-				el = xd.createElement(n.nodeName.toLowerCase());
-
-				at = n.attributes;
-				<span class="reserved">for</span> (i=at.length-1; i&gt;-1; i--) {
-					no = at[i];
-
-					<span class="reserved">if</span> (no.specified &amp;&amp; no.nodeValue)
-						el.setAttribute(no.nodeName.toLowerCase(), no.nodeValue);
-				}
-
-				<span class="reserved">if</span> (!hc &amp;&amp; !<span class="reserved">this</span>.closeElementsRe.test(n.nodeName))
-					el.appendChild(xd.createTextNode(<span class="literal">""</span>));
-
-				xn = xn.appendChild(el);
-				break;
-
-			case 3: <span class="comment">// Text</span>
-				xn.appendChild(xd.createTextNode(n.nodeValue));
-				<span class="reserved">return</span>;
-
-			case 8: <span class="comment">// Comment</span>
-				xn.appendChild(xd.createComment(n.nodeValue));
-				<span class="reserved">return</span>;
-		}
-
-		<span class="reserved">if</span> (hc) {
-			cn = n.childNodes;
-
-			<span class="reserved">for</span> (i=0, l=cn.length; i&lt;l; i++)
-				<span class="reserved">this</span>._convertToXML(cn[i], xn);
-		}
-	},
-
-	<span class="comment">/**
-	 * Serializes the specified node as a XHTML string. This uses the TinyMCE serializer logic since it gives more
-	 * control over the output than the build in browser XML serializer.
-	 *
-	 * <span class="attrib">@param</span> {HTMLNode} n Node to serialize as a XHTML string.
-	 * <span class="attrib">@return</span> Serialized XHTML string based on specified node.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	serializeNodeAsHTML : <span class="reserved">function</span>(n) {
-		var en, no, h = <span class="literal">''</span>, i, l, r, cn, va = false, f = false, at, hc;
-
-		<span class="reserved">this</span>._setupRules(); <span class="comment">// Will initialize cleanup rules</span>
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>._isDuplicate(n))
-			<span class="reserved">return</span> <span class="literal">''</span>;
-
-		switch (n.nodeType) {
-			case 1: <span class="comment">// Element</span>
-				hc = n.hasChildNodes();
-
-				<span class="comment">// MSIE sometimes produces &lt;//tag&gt;</span>
-				<span class="reserved">if</span> ((tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera) &amp;&amp; n.nodeName.indexOf(<span class="literal">'/'</span>) != -1)
-					break;
-
-				<span class="reserved">if</span> (<span class="reserved">this</span>.vElementsRe.test(n.nodeName) &amp;&amp; (!<span class="reserved">this</span>.iveRe || !<span class="reserved">this</span>.iveRe.test(n.nodeName))) {
-					va = true;
-
-					r = <span class="reserved">this</span>.rules[n.nodeName];
-					<span class="reserved">if</span> (!r) {
-						at = <span class="reserved">this</span>.rules;
-						<span class="reserved">for</span> (no in at) {
-							<span class="reserved">if</span> (at[no] &amp;&amp; at[no].validRe.test(n.nodeName)) {
-								r = at[no];
-								break;
-							}
-						}
-					}
-
-					en = r.isWild ? n.nodeName.toLowerCase() : r.oTagName;
-					f = r.fill;
-
-					<span class="reserved">if</span> (r.removeEmpty &amp;&amp; !hc)
-						<span class="reserved">return</span> <span class="literal">""</span>;
-
-					h += <span class="literal">'&lt;'</span> + en;
-
-					<span class="reserved">if</span> (r.vAttribsReIsWild) {
-						<span class="comment">// Serialize wildcard attributes</span>
-						at = n.attributes;
-						<span class="reserved">for</span> (i=at.length-1; i&gt;-1; i--) {
-							no = at[i];
-							<span class="reserved">if</span> (no.specified &amp;&amp; r.vAttribsRe.test(no.nodeName))
-								h += <span class="reserved">this</span>._serializeAttribute(n, r, no.nodeName);
-						}
-					} <span class="reserved">else</span> {
-						<span class="comment">// Serialize specific attributes</span>
-						<span class="reserved">for</span> (i=r.vAttribs.length-1; i&gt;-1; i--)
-							h += <span class="reserved">this</span>._serializeAttribute(n, r, r.vAttribs[i]);
-					}
-
-					<span class="comment">// Serialize mce_ atts</span>
-					<span class="reserved">if</span> (!<span class="reserved">this</span>.settings.on_save) {
-						at = <span class="reserved">this</span>.mceAttribs;
-
-						<span class="reserved">for</span> (no in at) {
-							<span class="reserved">if</span> (at[no])
-								h += <span class="reserved">this</span>._serializeAttribute(n, r, at[no]);
-						}
-					}
-
-					<span class="comment">// Close these</span>
-					<span class="reserved">if</span> (<span class="reserved">this</span>.closeElementsRe.test(n.nodeName))
-						<span class="reserved">return</span> h + <span class="literal">' /&gt;'</span>;
-
-					h += <span class="literal">'&gt;'</span>;
-
-					<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE &amp;&amp; <span class="reserved">this</span>.codeElementsRe.test(n.nodeName))
-						h += n.innerHTML;
-				}
-			break;
-
-			case 3: <span class="comment">// Text</span>
-				<span class="reserved">if</span> (n.parentNode &amp;&amp; <span class="reserved">this</span>.codeElementsRe.test(n.parentNode.nodeName))
-					<span class="reserved">return</span> <span class="reserved">this</span>.isMSIE ? <span class="literal">''</span> : n.nodeValue;
-
-				<span class="reserved">return</span> <span class="reserved">this</span>.xmlEncode(n.nodeValue);
-
-			case 8: <span class="comment">// Comment</span>
-				<span class="reserved">return</span> <span class="literal">"&lt;!--"</span> + <span class="reserved">this</span>._trimComment(n.nodeValue) + <span class="literal">"--&gt;"</span>;
-		}
-
-		<span class="reserved">if</span> (hc) {
-			cn = n.childNodes;
-
-			<span class="reserved">for</span> (i=0, l=cn.length; i&lt;l; i++)
-				h += <span class="reserved">this</span>.serializeNodeAsHTML(cn[i]);
-		}
-
-		<span class="comment">// Fill empty nodes</span>
-		<span class="reserved">if</span> (f &amp;&amp; !hc)
-			h += <span class="reserved">this</span>.fillStr;
-
-		<span class="comment">// End element</span>
-		<span class="reserved">if</span> (va)
-			h += <span class="literal">'&lt;/'</span> + en + <span class="literal">'&gt;'</span>;
-
-		<span class="reserved">return</span> h;
-	},
-
-	<span class="comment">/**
-	 * Serializes the specified attribute as a XHTML string chunk.
-	 *
-	 * <span class="attrib">@param</span> {HTMLNode} n HTML node to get attribute from.
-	 * <span class="attrib">@param</span> {TinyMCE_CleanupRule} r Cleanup rule to use in serialization.
-	 * <span class="attrib">@param</span> {string} an Attribute name to lookfor and serialize.
-	 * <span class="attrib">@return</span> XHTML chunk containing attribute data if it was found.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_serializeAttribute : <span class="reserved">function</span>(n, r, an) {
-		var av = <span class="literal">''</span>, t, os = <span class="reserved">this</span>.settings.on_save;
-
-		<span class="reserved">if</span> (os &amp;&amp; (an.indexOf(<span class="literal">'mce_'</span>) == 0 || an.indexOf(<span class="literal">'_moz'</span>) == 0))
-			<span class="reserved">return</span> <span class="literal">''</span>;
-
-		<span class="reserved">if</span> (os &amp;&amp; <span class="reserved">this</span>.mceAttribs[an])
-			av = <span class="reserved">this</span>._getAttrib(n, <span class="reserved">this</span>.mceAttribs[an]);
-
-		<span class="reserved">if</span> (av.length == 0)
-			av = <span class="reserved">this</span>._getAttrib(n, an);
-
-		<span class="reserved">if</span> (av.length == 0 &amp;&amp; r.defaultAttribs &amp;&amp; (t = r.defaultAttribs[an])) {
-			av = t;
-
-			<span class="reserved">if</span> (av == <span class="literal">"mce_empty"</span>)
-				<span class="reserved">return</span> <span class="literal">" "</span> + an + <span class="literal">'=""'</span>;
-		}
-
-		<span class="reserved">if</span> (r.forceAttribs &amp;&amp; (t = r.forceAttribs[an]))
-			av = t;
-
-		<span class="reserved">if</span> (os &amp;&amp; av.length != 0 &amp;&amp; <span class="reserved">this</span>.settings.url_converter.length != 0 &amp;&amp; /^(src|href|longdesc)$/.test(an))
-			av = eval(<span class="reserved">this</span>.settings.url_converter + <span class="literal">'(this, n, av)'</span>);
-
-		<span class="reserved">if</span> (av.length != 0 &amp;&amp; r.validAttribValues &amp;&amp; r.validAttribValues[an] &amp;&amp; !r.validAttribValues[an].test(av))
-			<span class="reserved">return</span> <span class="literal">""</span>;
-
-		<span class="reserved">if</span> (av.length != 0 &amp;&amp; av == <span class="literal">"{$uid}"</span>)
-			av = <span class="literal">"uid_"</span> + (<span class="reserved">this</span>.idCount++);
-
-		<span class="reserved">if</span> (av.length != 0)
-			<span class="reserved">return</span> <span class="literal">" "</span> + an + <span class="literal">"="</span> + <span class="literal">'"'</span> + <span class="reserved">this</span>.xmlEncode(av) + <span class="literal">'"'</span>;
-
-		<span class="reserved">return</span> <span class="literal">""</span>;
-	},
-
-	<span class="comment">/**
-	 * Applies source formatting/indentation on the specified HTML string.
-	 *
-	 * <span class="attrib">@param</span> {string} h HTML string to apply formatting to.
-	 * <span class="attrib">@return</span> Formatted HTML string.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	formatHTML : <span class="reserved">function</span>(h) {
-		var s = <span class="reserved">this</span>.settings, p = <span class="literal">''</span>, i = 0, li = 0, o = <span class="literal">''</span>, l;
-
-		h = h.replace(/\r/g, <span class="literal">''</span>); <span class="comment">// Windows sux, isn't carriage return a thing of the past :)</span>
-		h = <span class="literal">'\n'</span> + h;
-		h = h.replace(new RegExp(<span class="literal">'\\n\\s+'</span>, <span class="literal">'gi'</span>), <span class="literal">'\n'</span>); <span class="comment">// Remove previous formatting</span>
-		h = h.replace(<span class="reserved">this</span>.nlBeforeRe, <span class="literal">'\n&lt;$1$2&gt;'</span>);
-		h = h.replace(<span class="reserved">this</span>.nlAfterRe, <span class="literal">'&lt;$1$2&gt;\n'</span>);
-		h = h.replace(<span class="reserved">this</span>.nlBeforeAfterRe, <span class="literal">'\n&lt;$1$2$3&gt;\n'</span>);
-		h += <span class="literal">'\n'</span>;
-
-		<span class="comment">//tinyMCE.debug(h);</span>
-
-		<span class="reserved">while</span> ((i = h.indexOf(<span class="literal">'\n'</span>, i + 1)) != -1) {
-			<span class="reserved">if</span> ((l = h.substring(li + 1, i)).length != 0) {
-				<span class="reserved">if</span> (<span class="reserved">this</span>.ouRe.test(l) &amp;&amp; p.length &gt;= s.indent_levels)
-					p = p.substring(s.indent_levels);
-
-				o += p + l + <span class="literal">'\n'</span>;
-	
-				<span class="reserved">if</span> (<span class="reserved">this</span>.inRe.test(l))
-					p += <span class="reserved">this</span>.inStr;
-			}
-
-			li = i;
-		}
-
-		<span class="comment">//tinyMCE.debug(h);</span>
-
-		<span class="reserved">return</span> o;
-	},
-
-	<span class="comment">/**
-	 * XML Encodes the specified string based on configured entity encoding. The entity encoding modes
-	 * are raw, numeric and named. Where raw is the fastest and named is default.
-	 *
-	 * <span class="attrib">@param</span> {string} s String to convert to XML.
-	 * <span class="attrib">@return</span> Encoded XML string based on configured entity encoding.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	xmlEncode : <span class="reserved">function</span>(s) {
-		var i, l, e, o = <span class="literal">''</span>, c;
-
-		<span class="reserved">this</span>._setupEntities(); <span class="comment">// Will intialize lookup table</span>
-
-		switch (<span class="reserved">this</span>.settings.entity_encoding) {
-			case <span class="literal">"raw"</span>:
-				<span class="reserved">return</span> tinyMCE.xmlEncode(s);
-
-			case <span class="literal">"named"</span>:
-				<span class="reserved">for</span> (i=0, l=s.length; i&lt;l; i++) {
-					c = s.charCodeAt(i);
-					e = <span class="reserved">this</span>.entities[c];
-
-					<span class="reserved">if</span> (e &amp;&amp; e != <span class="literal">''</span>)
-						o += <span class="literal">'&amp;'</span> + e + <span class="literal">';'</span>;
-					<span class="reserved">else</span>
-						o += String.fromCharCode(c);
-				}
-
-				<span class="reserved">return</span> o;
-
-			case <span class="literal">"numeric"</span>:
-				<span class="reserved">for</span> (i=0, l=s.length; i&lt;l; i++) {
-					c = s.charCodeAt(i);
-
-					<span class="reserved">if</span> (c &gt; 127 || c == 60 || c == 62 || c == 38 || c == 39 || c == 34)
-						o += <span class="literal">'&amp;#'</span> + c + <span class="literal">";"</span>;
-					<span class="reserved">else</span>
-						o += String.fromCharCode(c);
-				}
-
-				<span class="reserved">return</span> o;
-		}
-
-		<span class="reserved">return</span> s;
-	},
-
-	<span class="comment">/**
-	 * Splits the specified string and removed empty chunks.
-	 *
-	 * <span class="attrib">@param</span> {RegEx} re RegEx to split string by.
-	 * <span class="attrib">@param</span> {string} s String value to split.
-	 * <span class="attrib">@return</span> Array with parts from specified string.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	split : <span class="reserved">function</span>(re, s) {
-		var c = s.split(re);
-		var i, l, o = new Array();
-
-		<span class="reserved">for</span> (i=0, l=c.length; i&lt;l; i++) {
-			<span class="reserved">if</span> (c[i] != <span class="literal">''</span>)
-				o[i] = c[i];
-		}
-
-		<span class="reserved">return</span> o;
-	},
-
-	<span class="comment">/**
-	 * Removes contents that got added by TinyMCE to comments.
-	 *
-	 * <span class="attrib">@param</span> {string} s Comment string data to trim.
-	 * <span class="attrib">@return</span> Cleaned string from TinyMCE specific content.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_trimComment : <span class="reserved">function</span>(s) {
-		<span class="comment">// Remove mce_src, mce_href</span>
-		s = s.replace(new RegExp(<span class="literal">'\\smce_src=\"[^\"]*\"'</span>, <span class="literal">'gi'</span>), <span class="literal">""</span>);
-		s = s.replace(new RegExp(<span class="literal">'\\smce_href=\"[^\"]*\"'</span>, <span class="literal">'gi'</span>), <span class="literal">""</span>);
-
-		<span class="reserved">return</span> s;
-	},
-
-	<span class="comment">/**
-	 * Returns the value of the specified attribute name or default value if it wasn't found.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} e HTML element to get attribute from.
-	 * <span class="attrib">@param</span> {string} n Attribute name to get from element.
-	 * <span class="attrib">@param</span> {string} d Default value to return if attribute wasn't found.
-	 * <span class="attrib">@return</span> Attribute value based on specified attribute name.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_getAttrib : <span class="reserved">function</span>(e, n, d) {
-		<span class="reserved">if</span> (typeof(d) == <span class="literal">"undefined"</span>)
-			d = <span class="literal">""</span>;
-
-		<span class="reserved">if</span> (!e || e.nodeType != 1)
-			<span class="reserved">return</span> d;
-
-		var v = e.getAttribute(n, 0);
-
-		<span class="reserved">if</span> (n == <span class="literal">"class"</span> &amp;&amp; !v)
-			v = e.className;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE &amp;&amp; n == <span class="literal">"http-equiv"</span>)
-			v = e.httpEquiv;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE &amp;&amp; e.nodeName == <span class="literal">"FORM"</span> &amp;&amp; n == <span class="literal">"enctype"</span> &amp;&amp; v == <span class="literal">"application/x-www-form-urlencoded"</span>)
-			v = <span class="literal">""</span>;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE &amp;&amp; e.nodeName == <span class="literal">"INPUT"</span> &amp;&amp; n == <span class="literal">"size"</span> &amp;&amp; v == <span class="literal">"20"</span>)
-			v = <span class="literal">""</span>;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE &amp;&amp; e.nodeName == <span class="literal">"INPUT"</span> &amp;&amp; n == <span class="literal">"maxlength"</span> &amp;&amp; v == <span class="literal">"2147483647"</span>)
-			v = <span class="literal">""</span>;
-
-		<span class="reserved">if</span> (n == <span class="literal">"style"</span> &amp;&amp; !tinyMCE.isOpera)
-			v = e.style.cssText;
-
-		<span class="reserved">if</span> (n == <span class="literal">'style'</span>)
-			v = tinyMCE.serializeStyle(tinyMCE.parseStyle(v));
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings.on_save &amp;&amp; n.indexOf(<span class="literal">'on'</span>) != -1 &amp;&amp; <span class="reserved">this</span>.settings.on_save &amp;&amp; v &amp;&amp; v != <span class="literal">""</span>)
-			v = tinyMCE.cleanupEventStr(v);
-
-		<span class="reserved">return</span> (v &amp;&amp; v != <span class="literal">""</span>) ? <span class="literal">''</span> + v : d;
-	},
-
-	<span class="comment">/**
-	 * Internal URL converter callback function. This simply converts URLs based
-	 * on some settings.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Cleanup} c Cleanup instance.
-	 * <span class="attrib">@param</span> {HTMLNode} n HTML node that holds the URL.
-	 * <span class="attrib">@param</span> {string} v URL value to convert.
-	 * <span class="attrib">@return</span> Converted URL value.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_urlConverter : <span class="reserved">function</span>(c, n, v) {
-		<span class="reserved">if</span> (!c.settings.on_save)
-			<span class="reserved">return</span> tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href, v);
-		<span class="reserved">else</span> <span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">'convert_urls'</span>))
-			<span class="reserved">return</span> eval(tinyMCE.settings.urlconverter_callback + <span class="literal">"(v, n, true);"</span>);
-
-		<span class="reserved">return</span> v;
-	},
-
-	<span class="comment">/**
-	 * Converts a array into a regex.
-	 *
-	 * <span class="attrib">@param</span> {Array} a Array to convert into a regex.
-	 * <span class="attrib">@param</span> {string} op RegEx options like, gi.
-	 * <span class="attrib">@param</span> {string} be Before chunk, beginning of expression.
-	 * <span class="attrib">@param</span> {string} af After chunk, end of expression.
-	 * <span class="attrib">@return</span> RegEx instance based in input information.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_arrayToRe : <span class="reserved">function</span>(a, op, be, af) {
-		var i, r;
-
-		op = typeof(op) == <span class="literal">"undefined"</span> ? <span class="literal">"gi"</span> : op;
-		be = typeof(be) == <span class="literal">"undefined"</span> ? <span class="literal">"^("</span> : be;
-		af = typeof(af) == <span class="literal">"undefined"</span> ? <span class="literal">")$"</span> : af;
-
-		r = be;
-
-		<span class="reserved">for</span> (i=0; i&lt;a.length; i++)
-			r += <span class="reserved">this</span>._wildcardToRe(a[i]) + (i != a.length-1 ? <span class="literal">"|"</span> : <span class="literal">""</span>);
-
-		r += af;
-
-		<span class="reserved">return</span> new RegExp(r, op);
-	},
-
-	<span class="comment">/**
-	 * Converts a wildcard string into a regex.
-	 *
-	 * <span class="attrib">@param</span> {string} s Wildcard string to convert into RegEx.
-	 * <span class="attrib">@return</span> RegEx string based on input.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_wildcardToRe : <span class="reserved">function</span>(s) {
-		s = s.replace(/\?/g, <span class="literal">'(\\S?)'</span>);
-		s = s.replace(/\+/g, <span class="literal">'(\\S+)'</span>);
-		s = s.replace(/\*/g, <span class="literal">'(\\S*)'</span>);
-
-		<span class="reserved">return</span> s;
-	},
-
-	<span class="comment">/**
-	 * Sets up the entity name lookup table ones. This moves the entity lookup pasing time
-	 * from init to first xmlEncode call.
-	 *
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_setupEntities : <span class="reserved">function</span>() {
-		var n, a, i, s = <span class="reserved">this</span>.settings;
-
-		<span class="comment">// Setup entities</span>
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.entitiesDone) {
-			<span class="reserved">if</span> (s.entity_encoding == <span class="literal">"named"</span>) {
-				n = tinyMCE.clearArray(new Array());
-				a = <span class="reserved">this</span>.split(<span class="literal">','</span>, s.entities);
-				<span class="reserved">for</span> (i=0; i&lt;a.length; i+=2)
-					n[a[i]] = a[i+1];
-
-				<span class="reserved">this</span>.entities = n;
-			}
-
-			<span class="reserved">this</span>.entitiesDone = true;
-		}
-	},
-
-	<span class="comment">/**
-	 * Sets up the cleanup rules ones. This moves the cleanup rule pasing time
-	 * from init to first cleanup call.
-	 *
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_setupRules : <span class="reserved">function</span>() {
-		var s = <span class="reserved">this</span>.settings;
-
-		<span class="comment">// Setup default rule</span>
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.rulesDone) {
-			<span class="reserved">this</span>.addRuleStr(s.valid_elements);
-			<span class="reserved">this</span>.addRuleStr(s.extended_valid_elements);
-
-			<span class="reserved">this</span>.rulesDone = true;
-		}
-	},
-
-	<span class="comment">/**
-	 * Checks if the specified node is a duplicate in other words has it been processed/serialized before.
-	 *
-	 * <span class="attrib">@param</span> {DOMNode} n DOM Node that is to be checked.
-	 * <span class="attrib">@return</span> true/false if the node is a duplicate or not.
-	 * <span class="attrib">@type</span> boolean
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_isDuplicate : <span class="reserved">function</span>(n) {
-		var i;
-
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.settings.fix_content_duplication)
-			<span class="reserved">return</span> false;
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera &amp;&amp; n.nodeType == 1) {
-			<span class="comment">// Mark elements</span>
-			<span class="reserved">if</span> (n.mce_serialized == <span class="reserved">this</span>.serializationId)
-				<span class="reserved">return</span> true;
-
-			n.setAttribute(<span class="literal">'mce_serialized'</span>, <span class="reserved">this</span>.serializationId);
-		} <span class="reserved">else</span> {
-			<span class="comment">// Search lookup table for text nodes  and comments</span>
-			<span class="reserved">for</span> (i=0; i&lt;<span class="reserved">this</span>.serializedNodes.length; i++) {
-				<span class="reserved">if</span> (<span class="reserved">this</span>.serializedNodes[i] == n)
-					<span class="reserved">return</span> true;
-			}
-
-			<span class="reserved">this</span>.serializedNodes[<span class="reserved">this</span>.serializedNodes.length] = n;
-		}
-
-		<span class="reserved">return</span> false;
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Control.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Control.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Control.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Control.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,1710 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Control.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Control.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Control.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_Control.html">TinyMCE_Control</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Control.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:28 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * This is the TinyMCE editor control instance class. A instance of this class will is made for each
- * converted text area.
- *
- * <span class="attrib">@constructor</span>
- * <span class="attrib">@param</span> {Array} settings Name/Value array of instance specific configuration settings.
- */</span>
-<span class="reserved">function</span> TinyMCE_Control(settings) {
-	var t, i, to, fu, p, x, fn, fu, pn, s = settings;
-
-	<span class="reserved">this</span>.undoRedoLevel = true;
-	<span class="reserved">this</span>.isTinyMCE_Control = true;
-
-	<span class="comment">// Default settings</span>
-	<span class="reserved">this</span>.settings = s;
-	<span class="reserved">this</span>.settings[<span class="literal">'theme'</span>] = tinyMCE.getParam(<span class="literal">"theme"</span>, <span class="literal">"default"</span>);
-	<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] = tinyMCE.getParam(<span class="literal">"width"</span>, -1);
-	<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] = tinyMCE.getParam(<span class="literal">"height"</span>, -1);
-	<span class="reserved">this</span>.selection = new TinyMCE_Selection(<span class="reserved">this</span>);
-	<span class="reserved">this</span>.undoRedo = new TinyMCE_UndoRedo(<span class="reserved">this</span>);
-	<span class="reserved">this</span>.cleanup = new TinyMCE_Cleanup();
-	<span class="reserved">this</span>.shortcuts = new Array();
-	<span class="reserved">this</span>.hasMouseMoved = false;
-
-	<span class="reserved">this</span>.cleanup.init({
-		valid_elements : s.valid_elements,
-		extended_valid_elements : s.extended_valid_elements,
-		entities : s.entities,
-		entity_encoding : s.entity_encoding,
-		debug : s.cleanup_debug,
-		url_converter : <span class="literal">'TinyMCE_Cleanup.prototype._urlConverter'</span>,
-		indent : s.apply_source_formatting,
-		invalid_elements : s.invalid_elements,
-		verify_html : s.verify_html,
-		fix_content_duplication : s.fix_content_duplication
-	});
-
-	<span class="comment">// Wrap old theme</span>
-	t = <span class="reserved">this</span>.settings[<span class="literal">'theme'</span>];
-	<span class="reserved">if</span> (!tinyMCE.hasTheme(t)) {
-		fn = tinyMCE.callbacks;
-		to = {};
-
-		<span class="reserved">for</span> (i=0; i&lt;fn.length; i++) {
-			<span class="reserved">if</span> ((fu = window[<span class="literal">'TinyMCE_'</span> + t + <span class="literal">"_"</span> + fn[i]]))
-				to[fn[i]] = fu;
-		}
-
-		tinyMCE.addTheme(t, to);
-	}
-
-	<span class="comment">// Wrap old plugins</span>
-	<span class="reserved">this</span>.plugins = new Array();
-	p = tinyMCE.getParam(<span class="literal">'plugins'</span>, <span class="literal">''</span>, true, <span class="literal">','</span>);
-	<span class="reserved">if</span> (p.length &gt; 0) {
-		<span class="reserved">for</span> (i=0; i&lt;p.length; i++) {
-			pn = p[i];
-
-			<span class="reserved">if</span> (pn.charAt(0) == <span class="literal">'-'</span>)
-				pn = pn.substring(1);
-
-			<span class="reserved">if</span> (!tinyMCE.hasPlugin(pn)) {
-				fn = tinyMCE.callbacks;
-				to = {};
-
-				<span class="reserved">for</span> (x=0; x&lt;fn.length; x++) {
-					<span class="reserved">if</span> ((fu = window[<span class="literal">'TinyMCE_'</span> + pn + <span class="literal">"_"</span> + fn[x]]))
-						to[fn[x]] = fu;
-				}
-
-				tinyMCE.addPlugin(pn, to);
-			}
-
-			<span class="reserved">this</span>.plugins[<span class="reserved">this</span>.plugins.length] = pn; 
-		}
-	}
-};
-
-TinyMCE_Control.<span class="reserved">prototype</span> = {
-	<span class="comment">/**
-	 * Returns true/false if the instance has the current plugin available.
-	 *
-	 * <span class="attrib">@param</span> {string} n Plugin name to check for.
-	 * <span class="attrib">@return</span> true/false if the instance has the current plugin available.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	hasPlugin : <span class="reserved">function</span>(n) {
-		var i;
-
-		<span class="reserved">for</span> (i=0; i&lt;<span class="reserved">this</span>.plugins.length; i++) {
-			<span class="reserved">if</span> (<span class="reserved">this</span>.plugins[i] == n)
-				<span class="reserved">return</span> true;
-		}
-
-		<span class="reserved">return</span> false;
-	},
-
-	<span class="comment">/**
-	 * Adds a plugin to the editor instance. This will also add it globaly.
-	 *
-	 * <span class="attrib">@param</span> {string} n Plugin name to check for.
-	 * <span class="attrib">@param</span> {TinyMCE_Plugin} n TinyMCE plugin instance.
-	 */</span>
-	addPlugin : <span class="reserved">function</span>(n, p) {
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.hasPlugin(n)) {
-			tinyMCE.addPlugin(n, p);
-			<span class="reserved">this</span>.plugins[<span class="reserved">this</span>.plugins.length] = n;
-		}
-	},
-
-	<span class="comment">/**
-	 * Repaints the editarea in Gecko browsers. This method removes ghost resize handlers
-	 * and other trailing graphics.
-	 */</span>
-	repaint : <span class="reserved">function</span>() {
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera)
-			<span class="reserved">return</span>;
-
-		try {
-			var s = <span class="reserved">this</span>.selection;
-			var b = s.getBookmark(true);
-			<span class="reserved">this</span>.getBody().style.display = <span class="literal">'none'</span>;
-			<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'selectall'</span>, false, null);
-			<span class="reserved">this</span>.getSel().collapseToStart();
-			<span class="reserved">this</span>.getBody().style.display = <span class="literal">'block'</span>;
-			s.moveToBookmark(b);
-		} catch (ex) {
-			<span class="comment">// Ignore</span>
-		}
-	},
-
-	<span class="comment">/**
-	 * Switches the global TinyMCE settings to the current instance settings. This method is
-	 * used to handle multiple configurations.
-	 */</span>
-	switchSettings : <span class="reserved">function</span>() {
-		<span class="reserved">if</span> (tinyMCE.configs.length &gt; 1 &amp;&amp; tinyMCE.currentConfig != <span class="reserved">this</span>.settings[<span class="literal">'index'</span>]) {
-			tinyMCE.settings = <span class="reserved">this</span>.settings;
-			tinyMCE.currentConfig = <span class="reserved">this</span>.settings[<span class="literal">'index'</span>];
-		}
-	},
-
-	<span class="comment">/**
-	 * Returns the body element of a editor instance.
-	 *
-	 * <span class="attrib">@return</span> Body element of a editor instance.
-	 * <span class="attrib">@type</span> HTMLElement
-	 */</span>
-	getBody : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.getDoc().body;
-	},
-
-	<span class="comment">/**
-	 * Returns the DOM document of a editor instance.
-	 *
-	 * <span class="attrib">@return</span> DOM document of a editor instance.
-	 * <span class="attrib">@type</span> DOMDocument
-	 */</span>
-	getDoc : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.contentWindow.document;
-	},
-
-	<span class="comment">/**
-	 * Returns the window of a editor instance.
-	 *
-	 * <span class="attrib">@return</span> Window of a editor instance.
-	 * <span class="attrib">@type</span> Window
-	 */</span>
-	getWin : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.contentWindow;
-	},
-
-	<span class="comment">/**
-	 * Adds a keyboard shortcut to a specific command. These shortcuts can for example be added
-	 * at the initInstance callback of a plugin. The shortcut description can be a language variable name
-	 * or a string describing the function. If you don't specify a command, the shortcut will simply be a blocker
-	 * shortcut. This enables you to remove built in shortcuts or remove theme specific shortcuts from a plugin.&lt;br /&gt;
-	 * Example shortcut inst.addShortcut('ctrl,alt', 'k', 'mceSomeCommand', false, 'somevalue');
-	 * Example blocker inst.addShortcut('ctrl,alt', 'k');
-	 *
-	 * <span class="attrib">@param</span> {string} m List of shortcut modifiers keys, for example "ctrl,alt".
-	 * <span class="attrib">@param</span> {Object} k Shortcut key char for example "s" or a keycode value "13".
-	 * <span class="attrib">@param</span> {string} d Optional Shortcut description, this will be presented in the about dialog.
-	 * <span class="attrib">@param</span> {string} cmd Optional Command name to execute, for example mceLink or Bold.
-	 * <span class="attrib">@param</span> {boolean} ui Optional True/false state if a UI (dialog) should be presented or not.
-	 * <span class="attrib">@param</span> {Object} va Optional command value, this can be anything.
-	 * <span class="attrib">@return</span> true/false if the shortcut was added or not
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	addShortcut : <span class="reserved">function</span>(m, k, d, cmd, ui, va) {
-		var n = typeof(k) == <span class="literal">"number"</span>, ie = tinyMCE.isMSIE, c, sc, i;
-		var scl = <span class="reserved">this</span>.shortcuts;
-
-		<span class="reserved">if</span> (!tinyMCE.getParam(<span class="literal">'custom_shortcuts'</span>))
-			<span class="reserved">return</span> false;
-
-		m = m.toLowerCase();
-		k = ie &amp;&amp; !n ? k.toUpperCase() : k;
-		c = n ? null : k.charCodeAt(0);
-		d = d &amp;&amp; d.indexOf(<span class="literal">'lang_'</span>) == 0 ? tinyMCE.getLang(d) : d;
-
-		sc = {
-			alt : m.indexOf(<span class="literal">'alt'</span>) != -1,
-			ctrl : m.indexOf(<span class="literal">'ctrl'</span>) != -1,
-			shift : m.indexOf(<span class="literal">'shift'</span>) != -1,
-			charCode : c,
-			keyCode : n ? k : (ie ? c : null),
-			desc : d,
-			cmd : cmd,
-			ui : ui,
-			val : va
-		};
-
-		<span class="reserved">for</span> (i=0; i&lt;scl.length; i++) {
-			<span class="reserved">if</span> (sc.alt == scl[i].alt &amp;&amp; sc.ctrl == scl[i].ctrl &amp;&amp; sc.shift == scl[i].shift
-				&amp;&amp; sc.charCode == scl[i].charCode &amp;&amp; sc.keyCode == scl[i].keyCode) {
-				<span class="reserved">return</span> false;
-			}
-		}
-
-		scl[scl.length] = sc;
-
-		<span class="reserved">return</span> true;
-	},
-
-	<span class="comment">/**
-	 * Executes shortcuts based on the event information.
-	 *
-	 * <span class="attrib">@param</span> {DOMEvent} e Keyboard event to handle.
-	 * <span class="attrib">@return</span> true/false if the shortcut was found and executed or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	handleShortcut : <span class="reserved">function</span>(e) {
-		var i, s = <span class="reserved">this</span>.shortcuts, o;
-
-		<span class="reserved">for</span> (i=0; i&lt;s.length; i++) {
-			o = s[i];
-			<span class="reserved">if</span> (o.alt == e.altKey &amp;&amp; o.ctrl == e.ctrlKey &amp;&amp; (o.keyCode == e.keyCode || o.charCode == e.charCode)) {
-				<span class="reserved">if</span> (o.cmd &amp;&amp; (e.type == <span class="literal">"keydown"</span> || (e.type == <span class="literal">"keypress"</span> &amp;&amp; !tinyMCE.isOpera)))
-					tinyMCE.execCommand(o.cmd, o.ui, o.val);
-
-				tinyMCE.cancelEvent(e);
-				<span class="reserved">return</span> true;
-			}
-		}
-
-		<span class="reserved">return</span> false;
-	},
-
-	<span class="comment">/**
-	 * Auto resets the design mode of the document if it gets lost.
-	 * This is a Gecko specific function since it's a workaround for a bug where Gecko browsers
-	 * loose the designMode state if the editor is hidden and shown in a tab or div.
-	 */</span>
-	autoResetDesignMode : <span class="reserved">function</span>() {
-		<span class="comment">// Add fix for tab/style.display none/block problems in Gecko</span>
-		<span class="reserved">if</span> (!tinyMCE.isMSIE &amp;&amp; <span class="reserved">this</span>.isHidden() &amp;&amp; tinyMCE.getParam(<span class="literal">'auto_reset_designmode'</span>))
-			eval(<span class="literal">'try { this.getDoc().designMode = "On"; } catch(e) {}'</span>);
-	},
-
-	<span class="comment">/**
-	 * Returns if the instance is hidden or not. This is a Gecko specific function
-	 * other browsers will always return false. This function is used to workaround the lost
-	 * designMode bug in Gecko browsers.
-	 *
-	 * <span class="attrib">@return</span> Returns if the instance is hidden or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	isHidden : <span class="reserved">function</span>() {
-		<span class="reserved">if</span> (tinyMCE.isMSIE)
-			<span class="reserved">return</span> false;
-
-		var s = <span class="reserved">this</span>.getSel();
-
-		<span class="comment">// Weird, wheres that cursor selection?</span>
-		<span class="reserved">return</span> (!s || !s.rangeCount || s.rangeCount == 0);
-	},
-
-	<span class="comment">/**
-	 * Returns true/false if the editor instance is dirty or not. In other words if it has been modified
-	 * or not.
-	 *
-	 * <span class="attrib">@return</span> Editor instance dirty state.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	isDirty : <span class="reserved">function</span>() {
-		<span class="comment">// Is content modified and not in a submit procedure</span>
-		<span class="reserved">return</span> <span class="reserved">this</span>.startContent != tinyMCE.trim(<span class="reserved">this</span>.getBody().innerHTML) &amp;&amp; !tinyMCE.isNotDirty;
-	},
-
-	<span class="comment">/**
-	 * ..
-	 *
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_mergeElements : <span class="reserved">function</span>(scmd, pa, ch, override) {
-		<span class="reserved">if</span> (scmd == <span class="literal">"removeformat"</span>) {
-			pa.className = <span class="literal">""</span>;
-			pa.style.cssText = <span class="literal">""</span>;
-			ch.className = <span class="literal">""</span>;
-			ch.style.cssText = <span class="literal">""</span>;
-			<span class="reserved">return</span>;
-		}
-
-		var st = tinyMCE.parseStyle(tinyMCE.getAttrib(pa, <span class="literal">"style"</span>));
-		var stc = tinyMCE.parseStyle(tinyMCE.getAttrib(ch, <span class="literal">"style"</span>));
-		var className = tinyMCE.getAttrib(pa, <span class="literal">"class"</span>);
-
-		className += <span class="literal">" "</span> + tinyMCE.getAttrib(ch, <span class="literal">"class"</span>);
-
-		<span class="reserved">if</span> (override) {
-			<span class="reserved">for</span> (var n in st) {
-				<span class="reserved">if</span> (typeof(st[n]) == <span class="literal">'function'</span>)
-					continue;
-
-				stc[n] = st[n];
-			}
-		} <span class="reserved">else</span> {
-			<span class="reserved">for</span> (var n in stc) {
-				<span class="reserved">if</span> (typeof(stc[n]) == <span class="literal">'function'</span>)
-					continue;
-
-				st[n] = stc[n];
-			}
-		}
-
-		tinyMCE.setAttrib(pa, <span class="literal">"style"</span>, tinyMCE.serializeStyle(st));
-		tinyMCE.setAttrib(pa, <span class="literal">"class"</span>, tinyMCE.trim(className));
-		ch.className = <span class="literal">""</span>;
-		ch.style.cssText = <span class="literal">""</span>;
-		ch.removeAttribute(<span class="literal">"class"</span>);
-		ch.removeAttribute(<span class="literal">"style"</span>);
-	},
-
-	<span class="comment">/**
-	 * Sets the useCSS mode in Gecko browsers. This will also remove the build in
-	 * inline table editing controls since they are buggy when it comes to col/rowspans.
-	 *
-	 * <span class="attrib">@param</span> {boolean} b UseCSS state true/false.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_setUseCSS : <span class="reserved">function</span>(b) {
-		var d = <span class="reserved">this</span>.getDoc();
-
-		try {d.execCommand(<span class="literal">"useCSS"</span>, false, !b);} catch (ex) {}
-		try {d.execCommand(<span class="literal">"styleWithCSS"</span>, false, b);} catch (ex) {}
-
-		<span class="reserved">if</span> (!tinyMCE.getParam(<span class="literal">"table_inline_editing"</span>))
-			try {d.execCommand(<span class="literal">'enableInlineTableEditing'</span>, false, <span class="literal">"false"</span>);} catch (ex) {}
-
-		<span class="reserved">if</span> (!tinyMCE.getParam(<span class="literal">"object_resizing"</span>))
-			try {d.execCommand(<span class="literal">'enableObjectResizing'</span>, false, <span class="literal">"false"</span>);} catch (ex) {}
-	},
-
-	<span class="comment">/**
-	 * Executes a command on the current instance. These commands can be TinyMCE internal commands prefixed with "mce" or
-	 * they can be build in browser commands such as "Bold". A compleate list of browser commands is available on MSDN or Mozilla.org.
-	 * This function will dispatch the execCommand function on each plugin, theme or the execcommand_callback option if none of these
-	 * return true it will handle the command as a internal browser command.
-	 *
-	 * <span class="attrib">@param</span> {string} command Command name to execute, for example mceLink or Bold.
-	 * <span class="attrib">@param</span> {boolean} user_interface True/false state if a UI (dialog) should be presented or not.
-	 * <span class="attrib">@param</span> {mixed} value Optional command value, this can be anything.
-	 */</span>
-	execCommand : <span class="reserved">function</span>(command, user_interface, value) {
-		var doc = <span class="reserved">this</span>.getDoc();
-		var win = <span class="reserved">this</span>.getWin();
-		var focusElm = <span class="reserved">this</span>.getFocusElement();
-
-		<span class="comment">// Is non udno specific command</span>
-		<span class="reserved">if</span> (!new RegExp(<span class="literal">'mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel'</span>, <span class="literal">'gi'</span>).test(command))
-			<span class="reserved">this</span>.undoBookmark = null;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.lastSafariSelection &amp;&amp; !new RegExp(<span class="literal">'mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel'</span>, <span class="literal">'gi'</span>).test(command)) {
-			<span class="reserved">this</span>.selection.moveToBookmark(<span class="reserved">this</span>.lastSafariSelection);
-			tinyMCE.selectedElement = <span class="reserved">this</span>.lastSafariSelectedElement;
-		}
-
-		<span class="comment">// Mozilla issue</span>
-		<span class="reserved">if</span> (!tinyMCE.isMSIE &amp;&amp; !<span class="reserved">this</span>.useCSS) {
-			<span class="reserved">this</span>._setUseCSS(false);
-			<span class="reserved">this</span>.useCSS = true;
-		}
-
-		<span class="comment">//debug("command: " + command + ", user_interface: " + user_interface + ", value: " + value);</span>
-		<span class="reserved">this</span>.contentDocument = doc; <span class="comment">// &lt;-- Strange, unless this is applied Mozilla 1.3 breaks</span>
-
-		<span class="reserved">if</span> (tinyMCE.execCommandCallback(<span class="reserved">this</span>, <span class="literal">'execcommand_callback'</span>, <span class="literal">'execCommand'</span>, <span class="reserved">this</span>.editorId, <span class="reserved">this</span>.getBody(), command, user_interface, value))
-			<span class="reserved">return</span>;
-
-		<span class="comment">// Fix align on images</span>
-		<span class="reserved">if</span> (focusElm &amp;&amp; focusElm.nodeName == <span class="literal">"IMG"</span>) {
-			var align = focusElm.getAttribute(<span class="literal">'align'</span>);
-			var img = command == <span class="literal">"JustifyCenter"</span> ? focusElm.cloneNode(false) : focusElm;
-
-			switch (command) {
-				case <span class="literal">"JustifyLeft"</span>:
-					<span class="reserved">if</span> (align == <span class="literal">'left'</span>)
-						img.removeAttribute(<span class="literal">'align'</span>);
-					<span class="reserved">else</span>
-						img.setAttribute(<span class="literal">'align'</span>, <span class="literal">'left'</span>);
-
-					<span class="comment">// Remove the div</span>
-					var div = focusElm.parentNode;
-					<span class="reserved">if</span> (div &amp;&amp; div.nodeName == <span class="literal">"DIV"</span> &amp;&amp; div.childNodes.length == 1 &amp;&amp; div.parentNode)
-						div.parentNode.replaceChild(img, div);
-
-					<span class="reserved">this</span>.selection.selectNode(img);
-					<span class="reserved">this</span>.repaint();
-					tinyMCE.triggerNodeChange();
-					<span class="reserved">return</span>;
-
-				case <span class="literal">"JustifyCenter"</span>:
-					img.removeAttribute(<span class="literal">'align'</span>);
-
-					<span class="comment">// Is centered</span>
-					var div = tinyMCE.getParentElement(focusElm, <span class="literal">"div"</span>);
-					<span class="reserved">if</span> (div &amp;&amp; div.style.textAlign == <span class="literal">"center"</span>) {
-						<span class="comment">// Remove div</span>
-						<span class="reserved">if</span> (div.nodeName == <span class="literal">"DIV"</span> &amp;&amp; div.childNodes.length == 1 &amp;&amp; div.parentNode)
-							div.parentNode.replaceChild(img, div);
-					} <span class="reserved">else</span> {
-						<span class="comment">// Add div</span>
-						var div = <span class="reserved">this</span>.getDoc().createElement(<span class="literal">"div"</span>);
-						div.style.textAlign = <span class="literal">'center'</span>;
-						div.appendChild(img);
-						focusElm.parentNode.replaceChild(div, focusElm);
-					}
-
-					<span class="reserved">this</span>.selection.selectNode(img);
-					<span class="reserved">this</span>.repaint();
-					tinyMCE.triggerNodeChange();
-					<span class="reserved">return</span>;
-
-				case <span class="literal">"JustifyRight"</span>:
-					<span class="reserved">if</span> (align == <span class="literal">'right'</span>)
-						img.removeAttribute(<span class="literal">'align'</span>);
-					<span class="reserved">else</span>
-						img.setAttribute(<span class="literal">'align'</span>, <span class="literal">'right'</span>);
-
-					<span class="comment">// Remove the div</span>
-					var div = focusElm.parentNode;
-					<span class="reserved">if</span> (div &amp;&amp; div.nodeName == <span class="literal">"DIV"</span> &amp;&amp; div.childNodes.length == 1 &amp;&amp; div.parentNode)
-						div.parentNode.replaceChild(img, div);
-
-					<span class="reserved">this</span>.selection.selectNode(img);
-					<span class="reserved">this</span>.repaint();
-					tinyMCE.triggerNodeChange();
-					<span class="reserved">return</span>;
-			}
-		}
-
-		<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'force_br_newlines'</span>]) {
-			var alignValue = <span class="literal">""</span>;
-
-			<span class="reserved">if</span> (doc.selection.type != <span class="literal">"Control"</span>) {
-				switch (command) {
-						case <span class="literal">"JustifyLeft"</span>:
-							alignValue = <span class="literal">"left"</span>;
-							break;
-
-						case <span class="literal">"JustifyCenter"</span>:
-							alignValue = <span class="literal">"center"</span>;
-							break;
-
-						case <span class="literal">"JustifyFull"</span>:
-							alignValue = <span class="literal">"justify"</span>;
-							break;
-
-						case <span class="literal">"JustifyRight"</span>:
-							alignValue = <span class="literal">"right"</span>;
-							break;
-				}
-
-				<span class="reserved">if</span> (alignValue != <span class="literal">""</span>) {
-					var rng = doc.selection.createRange();
-
-					<span class="reserved">if</span> ((divElm = tinyMCE.getParentElement(rng.parentElement(), <span class="literal">"div"</span>)) != null)
-						divElm.setAttribute(<span class="literal">"align"</span>, alignValue);
-					<span class="reserved">else</span> <span class="reserved">if</span> (rng.pasteHTML &amp;&amp; rng.htmlText.length &gt; 0)
-						rng.pasteHTML(<span class="literal">'&lt;div align="'</span> + alignValue + <span class="literal">'"&gt;'</span> + rng.htmlText + <span class="literal">"&lt;/div&gt;"</span>);
-
-					tinyMCE.triggerNodeChange();
-					<span class="reserved">return</span>;
-				}
-			}
-		}
-
-		switch (command) {
-			case <span class="literal">"mceRepaint"</span>:
-				<span class="reserved">this</span>.repaint();
-				<span class="reserved">return</span> true;
-
-			case <span class="literal">"InsertUnorderedList"</span>:
-			case <span class="literal">"InsertOrderedList"</span>:
-				var tag = (command == <span class="literal">"InsertUnorderedList"</span>) ? <span class="literal">"ul"</span> : <span class="literal">"ol"</span>;
-
-				<span class="reserved">if</span> (tinyMCE.isSafari)
-					<span class="reserved">this</span>.execCommand(<span class="literal">"mceInsertContent"</span>, false, <span class="literal">"&lt;"</span> + tag + <span class="literal">"&gt;&lt;li&gt;&amp;nbsp;&lt;/li&gt;&lt;"</span> + tag + <span class="literal">"&gt;"</span>);
-				<span class="reserved">else</span>
-					<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-
-				tinyMCE.triggerNodeChange();
-				break;
-
-			case <span class="literal">"Strikethrough"</span>:
-				<span class="reserved">if</span> (tinyMCE.isSafari)
-					<span class="reserved">this</span>.execCommand(<span class="literal">"mceInsertContent"</span>, false, <span class="literal">"&lt;strike&gt;"</span> + <span class="reserved">this</span>.selection.getSelectedHTML() + <span class="literal">"&lt;/strike&gt;"</span>);
-				<span class="reserved">else</span>
-					<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-
-				tinyMCE.triggerNodeChange();
-				break;
-
-			case <span class="literal">"mceSelectNode"</span>:
-				<span class="reserved">this</span>.selection.selectNode(value);
-				tinyMCE.triggerNodeChange();
-				tinyMCE.selectedNode = value;
-				break;
-
-			case <span class="literal">"FormatBlock"</span>:
-				<span class="reserved">if</span> (value == null || value == <span class="literal">""</span>) {
-					var elm = tinyMCE.getParentElement(<span class="reserved">this</span>.getFocusElement(), <span class="literal">"p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp"</span>);
-
-					<span class="reserved">if</span> (elm)
-						<span class="reserved">this</span>.execCommand(<span class="literal">"mceRemoveNode"</span>, false, elm);
-				} <span class="reserved">else</span> {
-					<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; new RegExp(<span class="literal">'&lt;(div|blockquote|code|dt|dd|dl|samp)&gt;'</span>, <span class="literal">'gi'</span>).test(value))
-						value = value.replace(/[^a-z]/gi, <span class="literal">''</span>);
-
-					<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; new RegExp(<span class="literal">'blockquote|code|samp'</span>, <span class="literal">'gi'</span>).test(value)) {
-						var b = <span class="reserved">this</span>.selection.getBookmark();
-						<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">"FormatBlock"</span>, false, <span class="literal">'&lt;p&gt;'</span>);
-						tinyMCE.renameElement(tinyMCE.getParentBlockElement(<span class="reserved">this</span>.getFocusElement()), value);
-						<span class="reserved">this</span>.selection.moveToBookmark(b);
-					} <span class="reserved">else</span>
-						<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">"FormatBlock"</span>, false, value);
-				}
-
-				tinyMCE.triggerNodeChange();
-
-				break;
-
-			case <span class="literal">"mceRemoveNode"</span>:
-				<span class="reserved">if</span> (!value)
-					value = tinyMCE.getParentElement(<span class="reserved">this</span>.getFocusElement());
-
-				<span class="reserved">if</span> (tinyMCE.isMSIE) {
-					value.outerHTML = value.innerHTML;
-				} <span class="reserved">else</span> {
-					var rng = value.ownerDocument.createRange();
-					rng.setStartBefore(value);
-					rng.setEndAfter(value);
-					rng.deleteContents();
-					rng.insertNode(rng.createContextualFragment(value.innerHTML));
-				}
-
-				tinyMCE.triggerNodeChange();
-
-				break;
-
-			case <span class="literal">"mceSelectNodeDepth"</span>:
-				var parentNode = <span class="reserved">this</span>.getFocusElement();
-				<span class="reserved">for</span> (var i=0; parentNode; i++) {
-					<span class="reserved">if</span> (parentNode.nodeName.toLowerCase() == <span class="literal">"body"</span>)
-						break;
-
-					<span class="reserved">if</span> (parentNode.nodeName.toLowerCase() == <span class="literal">"#text"</span>) {
-						i--;
-						parentNode = parentNode.parentNode;
-						continue;
-					}
-
-					<span class="reserved">if</span> (i == value) {
-						<span class="reserved">this</span>.selection.selectNode(parentNode, false);
-						tinyMCE.triggerNodeChange();
-						tinyMCE.selectedNode = parentNode;
-						<span class="reserved">return</span>;
-					}
-
-					parentNode = parentNode.parentNode;
-				}
-
-				break;
-
-			case <span class="literal">"SetStyleInfo"</span>:
-				var rng = <span class="reserved">this</span>.getRng();
-				var sel = <span class="reserved">this</span>.getSel();
-				var scmd = value[<span class="literal">'command'</span>];
-				var sname = value[<span class="literal">'name'</span>];
-				var svalue = value[<span class="literal">'value'</span>] == null ? <span class="literal">''</span> : value[<span class="literal">'value'</span>];
-				<span class="comment">//var svalue = value['value'] == null ? '' : value['value'];</span>
-				var wrapper = value[<span class="literal">'wrapper'</span>] ? value[<span class="literal">'wrapper'</span>] : <span class="literal">"span"</span>;
-				var parentElm = null;
-				var invalidRe = new RegExp(<span class="literal">"^BODY|HTML$"</span>, <span class="literal">"g"</span>);
-				var invalidParentsRe = tinyMCE.settings[<span class="literal">'merge_styles_invalid_parents'</span>] != <span class="literal">''</span> ? new RegExp(tinyMCE.settings[<span class="literal">'merge_styles_invalid_parents'</span>], <span class="literal">"gi"</span>) : null;
-
-				<span class="comment">// Whole element selected check</span>
-				<span class="reserved">if</span> (tinyMCE.isMSIE) {
-					<span class="comment">// Control range</span>
-					<span class="reserved">if</span> (rng.item)
-						parentElm = rng.item(0);
-					<span class="reserved">else</span> {
-						var pelm = rng.parentElement();
-						var prng = doc.selection.createRange();
-						prng.moveToElementText(pelm);
-
-						<span class="reserved">if</span> (rng.htmlText == prng.htmlText || rng.boundingWidth == 0) {
-							<span class="reserved">if</span> (invalidParentsRe == null || !invalidParentsRe.test(pelm.nodeName))
-								parentElm = pelm;
-						}
-					}
-				} <span class="reserved">else</span> {
-					var felm = <span class="reserved">this</span>.getFocusElement();
-					<span class="reserved">if</span> (sel.isCollapsed || (new RegExp(<span class="literal">'td|tr|tbody|table'</span>, <span class="literal">'gi'</span>).test(felm.nodeName) &amp;&amp; sel.anchorNode == felm.parentNode))
-						parentElm = felm;
-				}
-
-				<span class="comment">// Whole element selected</span>
-				<span class="reserved">if</span> (parentElm &amp;&amp; !invalidRe.test(parentElm.nodeName)) {
-					<span class="reserved">if</span> (scmd == <span class="literal">"setstyle"</span>)
-						tinyMCE.setStyleAttrib(parentElm, sname, svalue);
-
-					<span class="reserved">if</span> (scmd == <span class="literal">"setattrib"</span>)
-						tinyMCE.setAttrib(parentElm, sname, svalue);
-
-					<span class="reserved">if</span> (scmd == <span class="literal">"removeformat"</span>) {
-						parentElm.style.cssText = <span class="literal">''</span>;
-						tinyMCE.setAttrib(parentElm, <span class="literal">'class'</span>, <span class="literal">''</span>);
-					}
-
-					<span class="comment">// Remove style/attribs from all children</span>
-					var ch = tinyMCE.getNodeTree(parentElm, new Array(), 1);
-					<span class="reserved">for</span> (var z=0; z&lt;ch.length; z++) {
-						<span class="reserved">if</span> (ch[z] == parentElm)
-							continue;
-
-						<span class="reserved">if</span> (scmd == <span class="literal">"setstyle"</span>)
-							tinyMCE.setStyleAttrib(ch[z], sname, <span class="literal">''</span>);
-
-						<span class="reserved">if</span> (scmd == <span class="literal">"setattrib"</span>)
-							tinyMCE.setAttrib(ch[z], sname, <span class="literal">''</span>);
-
-						<span class="reserved">if</span> (scmd == <span class="literal">"removeformat"</span>) {
-							ch[z].style.cssText = <span class="literal">''</span>;
-							tinyMCE.setAttrib(ch[z], <span class="literal">'class'</span>, <span class="literal">''</span>);
-						}
-					}
-				} <span class="reserved">else</span> {
-					<span class="reserved">this</span>._setUseCSS(false); <span class="comment">// Bug in FF when running in fullscreen</span>
-					doc.execCommand(<span class="literal">"FontName"</span>, false, <span class="literal">"#mce_temp_font#"</span>);
-					var elementArray = tinyMCE.getElementsByAttributeValue(<span class="reserved">this</span>.getBody(), <span class="literal">"font"</span>, <span class="literal">"face"</span>, <span class="literal">"#mce_temp_font#"</span>);
-
-					<span class="comment">// Change them all</span>
-					<span class="reserved">for</span> (var x=0; x&lt;elementArray.length; x++) {
-						elm = elementArray[x];
-						<span class="reserved">if</span> (elm) {
-							var spanElm = doc.createElement(wrapper);
-
-							<span class="reserved">if</span> (scmd == <span class="literal">"setstyle"</span>)
-								tinyMCE.setStyleAttrib(spanElm, sname, svalue);
-
-							<span class="reserved">if</span> (scmd == <span class="literal">"setattrib"</span>)
-								tinyMCE.setAttrib(spanElm, sname, svalue);
-
-							<span class="reserved">if</span> (scmd == <span class="literal">"removeformat"</span>) {
-								spanElm.style.cssText = <span class="literal">''</span>;
-								tinyMCE.setAttrib(spanElm, <span class="literal">'class'</span>, <span class="literal">''</span>);
-							}
-
-							<span class="reserved">if</span> (elm.hasChildNodes()) {
-								<span class="reserved">for</span> (var i=0; i&lt;elm.childNodes.length; i++)
-									spanElm.appendChild(elm.childNodes[i].cloneNode(true));
-							}
-
-							spanElm.setAttribute(<span class="literal">"mce_new"</span>, <span class="literal">"true"</span>);
-							elm.parentNode.replaceChild(spanElm, elm);
-
-							<span class="comment">// Remove style/attribs from all children</span>
-							var ch = tinyMCE.getNodeTree(spanElm, new Array(), 1);
-							<span class="reserved">for</span> (var z=0; z&lt;ch.length; z++) {
-								<span class="reserved">if</span> (ch[z] == spanElm)
-									continue;
-
-								<span class="reserved">if</span> (scmd == <span class="literal">"setstyle"</span>)
-									tinyMCE.setStyleAttrib(ch[z], sname, <span class="literal">''</span>);
-
-								<span class="reserved">if</span> (scmd == <span class="literal">"setattrib"</span>)
-									tinyMCE.setAttrib(ch[z], sname, <span class="literal">''</span>);
-
-								<span class="reserved">if</span> (scmd == <span class="literal">"removeformat"</span>) {
-									ch[z].style.cssText = <span class="literal">''</span>;
-									tinyMCE.setAttrib(ch[z], <span class="literal">'class'</span>, <span class="literal">''</span>);
-								}
-							}
-						}
-					}
-				}
-
-				<span class="comment">// Cleaup wrappers</span>
-				var nodes = doc.getElementsByTagName(wrapper);
-				<span class="reserved">for</span> (var i=nodes.length-1; i&gt;=0; i--) {
-					var elm = nodes[i];
-					var isNew = tinyMCE.getAttrib(elm, <span class="literal">"mce_new"</span>) == <span class="literal">"true"</span>;
-
-					elm.removeAttribute(<span class="literal">"mce_new"</span>);
-
-					<span class="comment">// Is only child a element</span>
-					<span class="reserved">if</span> (elm.childNodes &amp;&amp; elm.childNodes.length == 1 &amp;&amp; elm.childNodes[0].nodeType == 1) {
-						<span class="comment">//tinyMCE.debug("merge1" + isNew);</span>
-						<span class="reserved">this</span>._mergeElements(scmd, elm, elm.childNodes[0], isNew);
-						continue;
-					}
-
-					<span class="comment">// Is I the only child</span>
-					<span class="reserved">if</span> (elm.parentNode.childNodes.length == 1 &amp;&amp; !invalidRe.test(elm.nodeName) &amp;&amp; !invalidRe.test(elm.parentNode.nodeName)) {
-						<span class="comment">//tinyMCE.debug("merge2" + isNew + "," + elm.nodeName + "," + elm.parentNode.nodeName);</span>
-						<span class="reserved">if</span> (invalidParentsRe == null || !invalidParentsRe.test(elm.parentNode.nodeName))
-							<span class="reserved">this</span>._mergeElements(scmd, elm.parentNode, elm, false);
-					}
-				}
-
-				<span class="comment">// Remove empty wrappers</span>
-				var nodes = doc.getElementsByTagName(wrapper);
-				<span class="reserved">for</span> (var i=nodes.length-1; i&gt;=0; i--) {
-					var elm = nodes[i];
-					var isEmpty = true;
-
-					<span class="comment">// Check if it has any attribs</span>
-					var tmp = doc.createElement(<span class="literal">"body"</span>);
-					tmp.appendChild(elm.cloneNode(false));
-
-					<span class="comment">// Is empty span, remove it</span>
-					tmp.innerHTML = tmp.innerHTML.replace(new RegExp(<span class="literal">'style=""|class=""'</span>, <span class="literal">'gi'</span>), <span class="literal">''</span>);
-					<span class="comment">//tinyMCE.debug(tmp.innerHTML);</span>
-					<span class="reserved">if</span> (new RegExp(<span class="literal">'&lt;span&gt;'</span>, <span class="literal">'gi'</span>).test(tmp.innerHTML)) {
-						<span class="reserved">for</span> (var x=0; x&lt;elm.childNodes.length; x++) {
-							<span class="reserved">if</span> (elm.parentNode != null)
-								elm.parentNode.insertBefore(elm.childNodes[x].cloneNode(true), elm);
-						}
-
-						elm.parentNode.removeChild(elm);
-					}
-				}
-
-				<span class="comment">// Re add the visual aids</span>
-				<span class="reserved">if</span> (scmd == <span class="literal">"removeformat"</span>)
-					tinyMCE.handleVisualAid(<span class="reserved">this</span>.getBody(), true, <span class="reserved">this</span>.visualAid, <span class="reserved">this</span>);
-
-				tinyMCE.triggerNodeChange();
-
-				break;
-
-			case <span class="literal">"FontName"</span>:
-				<span class="reserved">if</span> (value == null) {
-					var s = <span class="reserved">this</span>.getSel();
-
-					<span class="comment">// Find font and select it</span>
-					<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; s.isCollapsed) {
-						var f = tinyMCE.getParentElement(<span class="reserved">this</span>.getFocusElement(), <span class="literal">"font"</span>);
-
-						<span class="reserved">if</span> (f != null)
-							<span class="reserved">this</span>.selection.selectNode(f, false);
-					}
-
-					<span class="comment">// Remove format</span>
-					<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">"RemoveFormat"</span>, false, null);
-
-					<span class="comment">// Collapse range if font was found</span>
-					<span class="reserved">if</span> (f != null &amp;&amp; tinyMCE.isGecko) {
-						var r = <span class="reserved">this</span>.getRng().cloneRange();
-						r.collapse(true);
-						s.removeAllRanges();
-						s.addRange(r);
-					}
-				} <span class="reserved">else</span>
-					<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'FontName'</span>, false, value);
-
-				<span class="reserved">if</span> (tinyMCE.isGecko)
-					window.setTimeout(<span class="literal">'tinyMCE.triggerNodeChange(false);'</span>, 1);
-
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"FontSize"</span>:
-				<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'FontSize'</span>, false, value);
-
-				<span class="reserved">if</span> (tinyMCE.isGecko)
-					window.setTimeout(<span class="literal">'tinyMCE.triggerNodeChange(false);'</span>, 1);
-
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"forecolor"</span>:
-				<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'forecolor'</span>, false, value);
-				break;
-
-			case <span class="literal">"HiliteColor"</span>:
-				<span class="reserved">if</span> (tinyMCE.isGecko) {
-					<span class="reserved">this</span>._setUseCSS(true);
-					<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'hilitecolor'</span>, false, value);
-					<span class="reserved">this</span>._setUseCSS(false);
-				} <span class="reserved">else</span>
-					<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'BackColor'</span>, false, value);
-				break;
-
-			case <span class="literal">"Cut"</span>:
-			case <span class="literal">"Copy"</span>:
-			case <span class="literal">"Paste"</span>:
-				var cmdFailed = false;
-
-				<span class="comment">// Try executing command</span>
-				eval(<span class="literal">'try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}'</span>);
-
-				<span class="reserved">if</span> (tinyMCE.isOpera &amp;&amp; cmdFailed)
-					alert(<span class="literal">'Currently not supported by your browser, use keyboard shortcuts instead.'</span>);
-
-				<span class="comment">// Alert error in gecko if command failed</span>
-				<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; cmdFailed) {
-					<span class="comment">// Confirm more info</span>
-					<span class="reserved">if</span> (confirm(tinyMCE.entityDecode(tinyMCE.getLang(<span class="literal">'lang_clipboard_msg'</span>))))
-						window.open(<span class="literal">'http://www.mozilla.org/editor/midasdemo/securityprefs.html'</span>, <span class="literal">'mceExternal'</span>);
-
-					<span class="reserved">return</span>;
-				} <span class="reserved">else</span>
-					tinyMCE.triggerNodeChange();
-			break;
-
-			case <span class="literal">"mceSetContent"</span>:
-				<span class="reserved">if</span> (!value)
-					value = <span class="literal">""</span>;
-
-				<span class="comment">// Call custom cleanup code</span>
-				value = tinyMCE.storeAwayURLs(value);
-				value = tinyMCE._customCleanup(<span class="reserved">this</span>, <span class="literal">"insert_to_editor"</span>, value);
-				tinyMCE._setHTML(doc, value);
-				tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(<span class="reserved">this</span>, doc, tinyMCE.settings, doc.body));
-				tinyMCE.convertAllRelativeURLs(doc.body);
-
-				<span class="comment">// Cleanup any mess left from storyAwayURLs</span>
-				tinyMCE._removeInternal(<span class="reserved">this</span>.getBody());
-
-				<span class="comment">// When editing always use fonts internaly</span>
-				<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-					tinyMCE.convertSpansToFonts(doc);
-
-				tinyMCE.handleVisualAid(doc.body, true, <span class="reserved">this</span>.visualAid, <span class="reserved">this</span>);
-				tinyMCE._setEventsEnabled(doc.body, false);
-				<span class="reserved">return</span> true;
-
-			case <span class="literal">"mceCleanup"</span>:
-				var b = <span class="reserved">this</span>.selection.getBookmark();
-				tinyMCE._setHTML(<span class="reserved">this</span>.contentDocument, <span class="reserved">this</span>.getBody().innerHTML);
-				tinyMCE.setInnerHTML(<span class="reserved">this</span>.getBody(), tinyMCE._cleanupHTML(<span class="reserved">this</span>, <span class="reserved">this</span>.contentDocument, <span class="reserved">this</span>.settings, <span class="reserved">this</span>.getBody(), <span class="reserved">this</span>.visualAid));
-				tinyMCE.convertAllRelativeURLs(doc.body);
-
-				<span class="comment">// When editing always use fonts internaly</span>
-				<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-					tinyMCE.convertSpansToFonts(doc);
-
-				tinyMCE.handleVisualAid(<span class="reserved">this</span>.getBody(), true, <span class="reserved">this</span>.visualAid, <span class="reserved">this</span>);
-				tinyMCE._setEventsEnabled(<span class="reserved">this</span>.getBody(), false);
-				<span class="reserved">this</span>.repaint();
-				<span class="reserved">this</span>.selection.moveToBookmark(b);
-				tinyMCE.triggerNodeChange();
-			break;
-
-			case <span class="literal">"mceReplaceContent"</span>:
-				<span class="comment">// Force empty string</span>
-				<span class="reserved">if</span> (!value)
-					value = <span class="literal">''</span>;
-
-				<span class="reserved">this</span>.getWin().focus();
-
-				var selectedText = <span class="literal">""</span>;
-
-				<span class="reserved">if</span> (tinyMCE.isMSIE) {
-					var rng = doc.selection.createRange();
-					selectedText = rng.text;
-				} <span class="reserved">else</span>
-					selectedText = <span class="reserved">this</span>.getSel().toString();
-
-				<span class="reserved">if</span> (selectedText.length &gt; 0) {
-					value = tinyMCE.replaceVar(value, <span class="literal">"selection"</span>, selectedText);
-					tinyMCE.execCommand(<span class="literal">'mceInsertContent'</span>, false, value);
-				}
-
-				tinyMCE.triggerNodeChange();
-			break;
-
-			case <span class="literal">"mceSetAttribute"</span>:
-				<span class="reserved">if</span> (typeof(value) == <span class="literal">'object'</span>) {
-					var targetElms = (typeof(value[<span class="literal">'targets'</span>]) == <span class="literal">"undefined"</span>) ? <span class="literal">"p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address"</span> : value[<span class="literal">'targets'</span>];
-					var targetNode = tinyMCE.getParentElement(<span class="reserved">this</span>.getFocusElement(), targetElms);
-
-					<span class="reserved">if</span> (targetNode) {
-						targetNode.setAttribute(value[<span class="literal">'name'</span>], value[<span class="literal">'value'</span>]);
-						tinyMCE.triggerNodeChange();
-					}
-				}
-			break;
-
-			case <span class="literal">"mceSetCSSClass"</span>:
-				<span class="reserved">this</span>.execCommand(<span class="literal">"SetStyleInfo"</span>, false, {command : <span class="literal">"setattrib"</span>, name : <span class="literal">"class"</span>, value : value});
-			break;
-
-			case <span class="literal">"mceInsertRawHTML"</span>:
-				var key = <span class="literal">'tiny_mce_marker'</span>;
-
-				<span class="reserved">this</span>.execCommand(<span class="literal">'mceBeginUndoLevel'</span>);
-
-				<span class="comment">// Insert marker key</span>
-				<span class="reserved">this</span>.execCommand(<span class="literal">'mceInsertContent'</span>, false, key);
-
-				<span class="comment">// Store away scroll pos</span>
-				var scrollX = <span class="reserved">this</span>.getDoc().body.scrollLeft + <span class="reserved">this</span>.getDoc().documentElement.scrollLeft;
-				var scrollY = <span class="reserved">this</span>.getDoc().body.scrollTop + <span class="reserved">this</span>.getDoc().documentElement.scrollTop;
-
-				<span class="comment">// Find marker and replace with RAW HTML</span>
-				var html = <span class="reserved">this</span>.getBody().innerHTML;
-				<span class="reserved">if</span> ((pos = html.indexOf(key)) != -1)
-					tinyMCE.setInnerHTML(<span class="reserved">this</span>.getBody(), html.substring(0, pos) + value + html.substring(pos + key.length));
-
-				<span class="comment">// Restore scoll pos</span>
-				<span class="reserved">this</span>.contentWindow.scrollTo(scrollX, scrollY);
-
-				<span class="reserved">this</span>.execCommand(<span class="literal">'mceEndUndoLevel'</span>);
-
-				break;
-
-			case <span class="literal">"mceInsertContent"</span>:
-				<span class="comment">// Force empty string</span>
-				<span class="reserved">if</span> (!value)
-					value = <span class="literal">''</span>;
-
-				var insertHTMLFailed = false;
-				<span class="reserved">this</span>.getWin().focus();
-
-				<span class="reserved">if</span> (tinyMCE.isGecko || tinyMCE.isOpera) {
-					try {
-						<span class="comment">// Is plain text or HTML, &amp;amp;, &amp;nbsp; etc will be encoded wrong in FF</span>
-						<span class="reserved">if</span> (value.indexOf(<span class="literal">'&lt;'</span>) == -1 &amp;&amp; !value.match(/(&amp;#38;|&amp;#160;|&amp;#60;|&amp;#62;)/g)) {
-							var r = <span class="reserved">this</span>.getRng();
-							var n = <span class="reserved">this</span>.getDoc().createTextNode(tinyMCE.entityDecode(value));
-							var s = <span class="reserved">this</span>.getSel();
-							var r2 = r.cloneRange();
-
-							<span class="comment">// Insert text at cursor position</span>
-							s.removeAllRanges();
-							r.deleteContents();
-							r.insertNode(n);
-
-							<span class="comment">// Move the cursor to the end of text</span>
-							r2.selectNode(n);
-							r2.collapse(false);
-							s.removeAllRanges();
-							s.addRange(r2);
-						} <span class="reserved">else</span> {
-							value = tinyMCE.fixGeckoBaseHREFBug(1, <span class="reserved">this</span>.getDoc(), value);
-							<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">'inserthtml'</span>, false, value);
-							tinyMCE.fixGeckoBaseHREFBug(2, <span class="reserved">this</span>.getDoc(), value);
-						}
-					} catch (ex) {
-						insertHTMLFailed = true;
-					}
-
-					<span class="reserved">if</span> (!insertHTMLFailed) {
-						tinyMCE.triggerNodeChange();
-						<span class="reserved">return</span>;
-					}
-				}
-
-				<span class="comment">// Ugly hack in Opera due to non working "inserthtml"</span>
-				<span class="reserved">if</span> (tinyMCE.isOpera &amp;&amp; insertHTMLFailed) {
-					<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">"insertimage"</span>, false, tinyMCE.uniqueURL);
-					var ar = tinyMCE.getElementsByAttributeValue(<span class="reserved">this</span>.getBody(), <span class="literal">"img"</span>, <span class="literal">"src"</span>, tinyMCE.uniqueURL);
-					ar[0].outerHTML = value;
-					<span class="reserved">return</span>;
-				}
-
-				<span class="reserved">if</span> (!tinyMCE.isMSIE) {
-					var isHTML = value.indexOf(<span class="literal">'&lt;'</span>) != -1;
-					var sel = <span class="reserved">this</span>.getSel();
-					var rng = <span class="reserved">this</span>.getRng();
-
-					<span class="reserved">if</span> (isHTML) {
-						<span class="reserved">if</span> (tinyMCE.isSafari) {
-							var tmpRng = <span class="reserved">this</span>.getDoc().createRange();
-
-							tmpRng.setStart(<span class="reserved">this</span>.getBody(), 0);
-							tmpRng.setEnd(<span class="reserved">this</span>.getBody(), 0);
-
-							value = tmpRng.createContextualFragment(value);
-						} <span class="reserved">else</span>
-							value = rng.createContextualFragment(value);
-					} <span class="reserved">else</span> {
-						<span class="comment">// Setup text node</span>
-						var el = document.createElement(<span class="literal">"div"</span>);
-						el.innerHTML = value;
-						value = el.firstChild.nodeValue;
-						value = doc.createTextNode(value);
-					}
-
-					<span class="comment">// Insert plain text in Safari</span>
-					<span class="reserved">if</span> (tinyMCE.isSafari &amp;&amp; !isHTML) {
-						<span class="reserved">this</span>.execCommand(<span class="literal">'InsertText'</span>, false, value.nodeValue);
-						tinyMCE.triggerNodeChange();
-						<span class="reserved">return</span> true;
-					} <span class="reserved">else</span> <span class="reserved">if</span> (tinyMCE.isSafari &amp;&amp; isHTML) {
-						rng.deleteContents();
-						rng.insertNode(value);
-						tinyMCE.triggerNodeChange();
-						<span class="reserved">return</span> true;
-					}
-
-					rng.deleteContents();
-
-					<span class="comment">// If target node is text do special treatment, (Mozilla 1.3 fix)</span>
-					<span class="reserved">if</span> (rng.startContainer.nodeType == 3) {
-						var node = rng.startContainer.splitText(rng.startOffset);
-						node.parentNode.insertBefore(value, node); 
-					} <span class="reserved">else</span>
-						rng.insertNode(value);
-
-					<span class="reserved">if</span> (!isHTML) {
-						<span class="comment">// Removes weird selection trails</span>
-						sel.selectAllChildren(doc.body);
-						sel.removeAllRanges();
-
-						<span class="comment">// Move cursor to end of content</span>
-						var rng = doc.createRange();
-
-						rng.selectNode(value);
-						rng.collapse(false);
-
-						sel.addRange(rng);
-					} <span class="reserved">else</span>
-						rng.collapse(false);
-
-					tinyMCE.fixGeckoBaseHREFBug(2, <span class="reserved">this</span>.getDoc(), value);
-				} <span class="reserved">else</span> {
-					var rng = doc.selection.createRange();
-					var c = value.indexOf(<span class="literal">'&lt;!--'</span>) != -1;
-
-					<span class="comment">// Fix comment bug, add tag before comments</span>
-					<span class="reserved">if</span> (c)
-						value = tinyMCE.uniqueTag + value;
-
-					<span class="reserved">if</span> (rng.item)
-						rng.item(0).outerHTML = value;
-					<span class="reserved">else</span>
-						rng.pasteHTML(value);
-
-					<span class="comment">// Remove unique tag</span>
-					<span class="reserved">if</span> (c) {
-						var e = <span class="reserved">this</span>.getDoc().getElementById(<span class="literal">'mceTMPElement'</span>);
-						e.parentNode.removeChild(e);
-					}
-				}
-
-				tinyMCE.triggerNodeChange();
-			break;
-
-			case <span class="literal">"mceStartTyping"</span>:
-				<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>] &amp;&amp; <span class="reserved">this</span>.undoRedo.typingUndoIndex == -1) {
-					<span class="reserved">this</span>.undoRedo.typingUndoIndex = <span class="reserved">this</span>.undoRedo.undoIndex;
-					<span class="reserved">this</span>.execCommand(<span class="literal">'mceAddUndoLevel'</span>);
-					<span class="comment">//tinyMCE.debug("mceStartTyping");</span>
-				}
-				break;
-
-			case <span class="literal">"mceEndTyping"</span>:
-				<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>] &amp;&amp; <span class="reserved">this</span>.undoRedo.typingUndoIndex != -1) {
-					<span class="reserved">this</span>.execCommand(<span class="literal">'mceAddUndoLevel'</span>);
-					<span class="reserved">this</span>.undoRedo.typingUndoIndex = -1;
-					<span class="comment">//tinyMCE.debug("mceEndTyping");</span>
-				}
-				break;
-
-			case <span class="literal">"mceBeginUndoLevel"</span>:
-				<span class="reserved">this</span>.undoRedoLevel = false;
-				break;
-
-			case <span class="literal">"mceEndUndoLevel"</span>:
-				<span class="reserved">this</span>.undoRedoLevel = true;
-				<span class="reserved">this</span>.execCommand(<span class="literal">'mceAddUndoLevel'</span>);
-				break;
-
-			case <span class="literal">"mceAddUndoLevel"</span>:
-				<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>] &amp;&amp; <span class="reserved">this</span>.undoRedoLevel) {
-					<span class="reserved">if</span> (<span class="reserved">this</span>.undoRedo.add())
-						tinyMCE.triggerNodeChange(false);
-				}
-				break;
-
-			case <span class="literal">"Undo"</span>:
-				<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>]) {
-					tinyMCE.execCommand(<span class="literal">"mceEndTyping"</span>);
-					<span class="reserved">this</span>.undoRedo.undo();
-					tinyMCE.triggerNodeChange();
-				} <span class="reserved">else</span>
-					<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-				break;
-
-			case <span class="literal">"Redo"</span>:
-				<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>]) {
-					tinyMCE.execCommand(<span class="literal">"mceEndTyping"</span>);
-					<span class="reserved">this</span>.undoRedo.redo();
-					tinyMCE.triggerNodeChange();
-				} <span class="reserved">else</span>
-					<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-				break;
-
-			case <span class="literal">"mceToggleVisualAid"</span>:
-				<span class="reserved">this</span>.visualAid = !<span class="reserved">this</span>.visualAid;
-				tinyMCE.handleVisualAid(<span class="reserved">this</span>.getBody(), true, <span class="reserved">this</span>.visualAid, <span class="reserved">this</span>);
-				tinyMCE.triggerNodeChange();
-				break;
-
-			case <span class="literal">"Indent"</span>:
-				<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-				tinyMCE.triggerNodeChange();
-				<span class="reserved">if</span> (tinyMCE.isMSIE) {
-					var n = tinyMCE.getParentElement(<span class="reserved">this</span>.getFocusElement(), <span class="literal">"blockquote"</span>);
-					do {
-						<span class="reserved">if</span> (n &amp;&amp; n.nodeName == <span class="literal">"BLOCKQUOTE"</span>) {
-							n.removeAttribute(<span class="literal">"dir"</span>);
-							n.removeAttribute(<span class="literal">"style"</span>);
-						}
-					} <span class="reserved">while</span> (n != null &amp;&amp; (n = n.parentNode) != null);
-				}
-				break;
-
-			case <span class="literal">"removeformat"</span>:
-				var text = <span class="reserved">this</span>.selection.getSelectedText();
-
-				<span class="reserved">if</span> (tinyMCE.isOpera) {
-					<span class="reserved">this</span>.getDoc().execCommand(<span class="literal">"RemoveFormat"</span>, false, null);
-					<span class="reserved">return</span>;
-				}
-
-				<span class="reserved">if</span> (tinyMCE.isMSIE) {
-					try {
-						var rng = doc.selection.createRange();
-						rng.execCommand(<span class="literal">"RemoveFormat"</span>, false, null);
-					} catch (e) {
-						<span class="comment">// Do nothing</span>
-					}
-
-					<span class="reserved">this</span>.execCommand(<span class="literal">"SetStyleInfo"</span>, false, {command : <span class="literal">"removeformat"</span>});
-				} <span class="reserved">else</span> {
-					<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-
-					<span class="reserved">this</span>.execCommand(<span class="literal">"SetStyleInfo"</span>, false, {command : <span class="literal">"removeformat"</span>});
-				}
-
-				<span class="comment">// Remove class</span>
-				<span class="reserved">if</span> (text.length == 0)
-					<span class="reserved">this</span>.execCommand(<span class="literal">"mceSetCSSClass"</span>, false, <span class="literal">""</span>);
-
-				tinyMCE.triggerNodeChange();
-				break;
-
-			default:
-				<span class="reserved">this</span>.getDoc().execCommand(command, user_interface, value);
-
-				<span class="reserved">if</span> (tinyMCE.isGecko)
-					window.setTimeout(<span class="literal">'tinyMCE.triggerNodeChange(false);'</span>, 1);
-				<span class="reserved">else</span>
-					tinyMCE.triggerNodeChange();
-		}
-
-		<span class="comment">// Add undo level after modification</span>
-		<span class="reserved">if</span> (command != <span class="literal">"mceAddUndoLevel"</span> &amp;&amp; command != <span class="literal">"Undo"</span> &amp;&amp; command != <span class="literal">"Redo"</span> &amp;&amp; command != <span class="literal">"mceStartTyping"</span> &amp;&amp; command != <span class="literal">"mceEndTyping"</span>)
-			tinyMCE.execCommand(<span class="literal">"mceAddUndoLevel"</span>);
-	},
-
-	<span class="comment">/**
-	 * Returns a command specific value, for example the current font size.
-	 *
-	 * <span class="attrib">@param</span> {string} c Command to query value from.
-	 * <span class="attrib">@return</span> Command specific value, for example the current font size.
-	 * <span class="attrib">@type</span> mixed
-	 */</span>
-	queryCommandValue : <span class="reserved">function</span>(c) {
-		try {
-			<span class="reserved">return</span> <span class="reserved">this</span>.getDoc().queryCommandValue(c);
-		} catch (e) {
-			<span class="reserved">return</span> null;
-		}
-	},
-
-	<span class="comment">/**
-	 * Returns a command specific state, for example if bold is enabled or not.
-	 *
-	 * <span class="attrib">@param</span> {string} c Command to query state from.
-	 * <span class="attrib">@return</span> Command specific state, for example if bold is enabled or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	queryCommandState : <span class="reserved">function</span>(c) {
-		<span class="reserved">return</span> <span class="reserved">this</span>.getDoc().queryCommandState(c);
-	},
-
-	<span class="comment">/**
-	 * Gets executed when the editor control instance is added.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} replace_element Element to replace with a editor instance.
-	 * <span class="attrib">@param</span> {string} form_element_name Form element name that gets replaced.
-	 * <span class="attrib">@param</span> {DOMDocument} target_document Target document reference where the element is located.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_onAdd : <span class="reserved">function</span>(replace_element, form_element_name, target_document) {
-		var hc, th, to, editorTemplate;
-
-		th = <span class="reserved">this</span>.settings[<span class="literal">'theme'</span>];
-		to = tinyMCE.themes[th];
-
-		var targetDoc = target_document ? target_document : document;
-
-		<span class="reserved">this</span>.targetDoc = targetDoc;
-
-		tinyMCE.themeURL = tinyMCE.baseURL + <span class="literal">"/themes/"</span> + <span class="reserved">this</span>.settings[<span class="literal">'theme'</span>];
-		<span class="reserved">this</span>.settings[<span class="literal">'themeurl'</span>] = tinyMCE.themeURL;
-
-		<span class="reserved">if</span> (!replace_element) {
-			alert(<span class="literal">"Error: Could not find the target element."</span>);
-			<span class="reserved">return</span> false;
-		}
-
-		<span class="reserved">if</span> (to.getEditorTemplate)
-			editorTemplate = to.getEditorTemplate(<span class="reserved">this</span>.settings, <span class="reserved">this</span>.editorId);
-
-		var deltaWidth = editorTemplate[<span class="literal">'delta_width'</span>] ? editorTemplate[<span class="literal">'delta_width'</span>] : 0;
-		var deltaHeight = editorTemplate[<span class="literal">'delta_height'</span>] ? editorTemplate[<span class="literal">'delta_height'</span>] : 0;
-		var html = <span class="literal">'&lt;span id="'</span> + <span class="reserved">this</span>.editorId + <span class="literal">'_parent" class="mceEditorContainer"&gt;'</span> + editorTemplate[<span class="literal">'html'</span>];
-
-		html = tinyMCE.replaceVar(html, <span class="literal">"editor_id"</span>, <span class="reserved">this</span>.editorId);
-		<span class="reserved">this</span>.settings[<span class="literal">'default_document'</span>] = tinyMCE.baseURL + <span class="literal">"/blank.htm"</span>;
-
-		<span class="reserved">this</span>.settings[<span class="literal">'old_width'</span>] = <span class="reserved">this</span>.settings[<span class="literal">'width'</span>];
-		<span class="reserved">this</span>.settings[<span class="literal">'old_height'</span>] = <span class="reserved">this</span>.settings[<span class="literal">'height'</span>];
-
-		<span class="comment">// Set default width, height</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] == -1)
-			<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] = replace_element.offsetWidth;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] == -1)
-			<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] = replace_element.offsetHeight;
-
-		<span class="comment">// Try the style width</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] == 0)
-			<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] = replace_element.style.width;
-
-		<span class="comment">// Try the style height</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] == 0)
-			<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] = replace_element.style.height; 
-
-		<span class="comment">// If no width/height then default to 320x240, better than nothing</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] == 0)
-			<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] = 320;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] == 0)
-			<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] = 240;
-
-		<span class="reserved">this</span>.settings[<span class="literal">'area_width'</span>] = parseInt(<span class="reserved">this</span>.settings[<span class="literal">'width'</span>]);
-		<span class="reserved">this</span>.settings[<span class="literal">'area_height'</span>] = parseInt(<span class="reserved">this</span>.settings[<span class="literal">'height'</span>]);
-		<span class="reserved">this</span>.settings[<span class="literal">'area_width'</span>] += deltaWidth;
-		<span class="reserved">this</span>.settings[<span class="literal">'area_height'</span>] += deltaHeight;
-
-		<span class="comment">// Special % handling</span>
-		<span class="reserved">if</span> ((<span class="literal">""</span> + <span class="reserved">this</span>.settings[<span class="literal">'width'</span>]).indexOf(<span class="literal">'%'</span>) != -1)
-			<span class="reserved">this</span>.settings[<span class="literal">'area_width'</span>] = <span class="literal">"100%"</span>;
-
-		<span class="reserved">if</span> ((<span class="literal">""</span> + <span class="reserved">this</span>.settings[<span class="literal">'height'</span>]).indexOf(<span class="literal">'%'</span>) != -1)
-			<span class="reserved">this</span>.settings[<span class="literal">'area_height'</span>] = <span class="literal">"100%"</span>;
-
-		<span class="reserved">if</span> ((<span class="literal">""</span> + replace_element.style.width).indexOf(<span class="literal">'%'</span>) != -1) {
-			<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] = replace_element.style.width;
-			<span class="reserved">this</span>.settings[<span class="literal">'area_width'</span>] = <span class="literal">"100%"</span>;
-		}
-
-		<span class="reserved">if</span> ((<span class="literal">""</span> + replace_element.style.height).indexOf(<span class="literal">'%'</span>) != -1) {
-			<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] = replace_element.style.height;
-			<span class="reserved">this</span>.settings[<span class="literal">'area_height'</span>] = <span class="literal">"100%"</span>;
-		}
-
-		html = tinyMCE.applyTemplate(html);
-
-		<span class="reserved">this</span>.settings[<span class="literal">'width'</span>] = <span class="reserved">this</span>.settings[<span class="literal">'old_width'</span>];
-		<span class="reserved">this</span>.settings[<span class="literal">'height'</span>] = <span class="reserved">this</span>.settings[<span class="literal">'old_height'</span>];
-
-		<span class="reserved">this</span>.visualAid = <span class="reserved">this</span>.settings[<span class="literal">'visual'</span>];
-		<span class="reserved">this</span>.formTargetElementId = form_element_name;
-
-		<span class="comment">// Get replace_element contents</span>
-		<span class="reserved">if</span> (replace_element.nodeName == <span class="literal">"TEXTAREA"</span> || replace_element.nodeName == <span class="literal">"INPUT"</span>)
-			<span class="reserved">this</span>.startContent = replace_element.value;
-		<span class="reserved">else</span>
-			<span class="reserved">this</span>.startContent = replace_element.innerHTML;
-
-		<span class="comment">// If not text area or input</span>
-		<span class="reserved">if</span> (replace_element.nodeName != <span class="literal">"TEXTAREA"</span> &amp;&amp; replace_element.nodeName != <span class="literal">"INPUT"</span>) {
-			<span class="reserved">this</span>.oldTargetElement = replace_element;
-
-			<span class="comment">// Debug mode</span>
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'debug'</span>]) {
-				hc = <span class="literal">'&lt;textarea wrap="off" id="'</span> + form_element_name + <span class="literal">'" name="'</span> + form_element_name + <span class="literal">'" cols="100" rows="15"&gt;&lt;/textarea&gt;'</span>;
-			} <span class="reserved">else</span> {
-				hc = <span class="literal">'&lt;input type="hidden" type="text" id="'</span> + form_element_name + <span class="literal">'" name="'</span> + form_element_name + <span class="literal">'" /&gt;'</span>;
-				<span class="reserved">this</span>.oldTargetElement.style.display = <span class="literal">"none"</span>;
-			}
-
-			html += <span class="literal">'&lt;/span&gt;'</span>;
-
-			<span class="reserved">if</span> (tinyMCE.isGecko)
-				html = hc + html;
-			<span class="reserved">else</span>
-				html += hc;
-
-			<span class="comment">// Output HTML and set editable</span>
-			<span class="reserved">if</span> (tinyMCE.isGecko) {
-				var rng = replace_element.ownerDocument.createRange();
-				rng.setStartBefore(replace_element);
-
-				var fragment = rng.createContextualFragment(html);
-				tinyMCE.insertAfter(fragment, replace_element);
-			} <span class="reserved">else</span>
-				replace_element.insertAdjacentHTML(<span class="literal">"beforeBegin"</span>, html);
-		} <span class="reserved">else</span> {
-			html += <span class="literal">'&lt;/span&gt;'</span>;
-
-			<span class="comment">// Just hide the textarea element</span>
-			<span class="reserved">this</span>.oldTargetElement = replace_element;
-
-			<span class="reserved">if</span> (!tinyMCE.settings[<span class="literal">'debug'</span>])
-				<span class="reserved">this</span>.oldTargetElement.style.display = <span class="literal">"none"</span>;
-
-			<span class="comment">// Output HTML and set editable</span>
-			<span class="reserved">if</span> (tinyMCE.isGecko) {
-				var rng = replace_element.ownerDocument.createRange();
-				rng.setStartBefore(replace_element);
-
-				var fragment = rng.createContextualFragment(html);
-				tinyMCE.insertAfter(fragment, replace_element);
-			} <span class="reserved">else</span>
-				replace_element.insertAdjacentHTML(<span class="literal">"beforeBegin"</span>, html);
-		}
-
-		<span class="comment">// Setup iframe</span>
-		var dynamicIFrame = false;
-		var tElm = targetDoc.getElementById(<span class="reserved">this</span>.editorId);
-
-		<span class="reserved">if</span> (!tinyMCE.isMSIE) {
-			<span class="reserved">if</span> (tElm &amp;&amp; tElm.nodeName == <span class="literal">"SPAN"</span>) {
-				tElm = tinyMCE._createIFrame(tElm, targetDoc);
-				dynamicIFrame = true;
-			}
-
-			<span class="reserved">this</span>.targetElement = tElm;
-			<span class="reserved">this</span>.iframeElement = tElm;
-			<span class="reserved">this</span>.contentDocument = tElm.contentDocument;
-			<span class="reserved">this</span>.contentWindow = tElm.contentWindow;
-
-			<span class="comment">//this.getDoc().designMode = "on";</span>
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> (tElm &amp;&amp; tElm.nodeName == <span class="literal">"SPAN"</span>)
-				tElm = tinyMCE._createIFrame(tElm, targetDoc, targetDoc.parentWindow);
-			<span class="reserved">else</span>
-				tElm = targetDoc.frames[<span class="reserved">this</span>.editorId];
-
-			<span class="reserved">this</span>.targetElement = tElm;
-			<span class="reserved">this</span>.iframeElement = targetDoc.getElementById(<span class="reserved">this</span>.editorId);
-
-			<span class="reserved">if</span> (tinyMCE.isOpera) {
-				<span class="reserved">this</span>.contentDocument = <span class="reserved">this</span>.iframeElement.contentDocument;
-				<span class="reserved">this</span>.contentWindow = <span class="reserved">this</span>.iframeElement.contentWindow;
-				dynamicIFrame = true;
-			} <span class="reserved">else</span> {
-				<span class="reserved">this</span>.contentDocument = tElm.window.document;
-				<span class="reserved">this</span>.contentWindow = tElm.window;
-			}
-
-			<span class="reserved">this</span>.getDoc().designMode = <span class="literal">"on"</span>;
-		}
-
-		<span class="comment">// Setup base HTML</span>
-		var doc = <span class="reserved">this</span>.contentDocument;
-		<span class="reserved">if</span> (dynamicIFrame) {
-			var html = tinyMCE.getParam(<span class="literal">'doctype'</span>) + <span class="literal">'&lt;html&gt;&lt;head xmlns="http://www.w3.org/1999/xhtml"&gt;&lt;base href="'</span> + tinyMCE.settings[<span class="literal">'base_href'</span>] + <span class="literal">'" /&gt;&lt;title&gt;blank_page&lt;/title&gt;&lt;meta http-equiv="Content-Type" content="text/html; charset=UTF-8"&gt;&lt;/head&gt;&lt;body class="mceContentBody"&gt;&lt;/body&gt;&lt;/html&gt;'</span>;
-
-			try {
-				<span class="reserved">if</span> (!<span class="reserved">this</span>.isHidden())
-					<span class="reserved">this</span>.getDoc().designMode = <span class="literal">"on"</span>;
-
-				doc.open();
-				doc.write(html);
-				doc.close();
-			} catch (e) {
-				<span class="comment">// Failed Mozilla 1.3</span>
-				<span class="reserved">this</span>.getDoc().location.href = tinyMCE.baseURL + <span class="literal">"/blank.htm"</span>;
-			}
-		}
-
-		<span class="comment">// This timeout is needed in MSIE 5.5 for some odd reason</span>
-		<span class="comment">// it seems that the document.frames isn't initialized yet?</span>
-		<span class="reserved">if</span> (tinyMCE.isMSIE)
-			window.setTimeout(<span class="literal">"tinyMCE.addEventHandlers(tinyMCE.instances[\"</span><span class="literal">" + this.editorId + "</span>\<span class="literal">"]);"</span>, 1);
-
-		tinyMCE.setupContent(<span class="reserved">this</span>.editorId, true);
-
-		<span class="reserved">return</span> true;
-	},
-
-	<span class="comment">/**
-	 * Sets the base href url of the current document instance. This method is used
-	 * to temporarly remove the base url during copy/paste and drag/drop operations
-	 * of relative links from external sites into TinyMCE. MSIE has a bug and converts
-	 * relative links from external sites to absolute links incorrectly.
-	 *
-	 * <span class="attrib">@param</span> {string} u URL to set as base URL or null to remove it.
-	 */</span>
-	setBaseHREF : <span class="reserved">function</span>(u) {
-		var h, b, d, nl;
-
-		d = <span class="reserved">this</span>.getDoc();
-		nl = d.getElementsByTagName(<span class="literal">"base"</span>);
-		b = nl.length &gt; 0 ? nl[0] : null;
-
-		<span class="reserved">if</span> (!b) {
-			nl = d.getElementsByTagName(<span class="literal">"head"</span>);
-			h = nl.length &gt; 0 ? nl[0] : null;
-
-			b = d.createElement(<span class="literal">"base"</span>);
-			b.setAttribute(<span class="literal">'href'</span>, u);
-			h.appendChild(b);
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> (u == <span class="literal">""</span> || u == null)
-				b.parentNode.removeChild(b);
-			<span class="reserved">else</span>
-				b.setAttribute(<span class="literal">'href'</span>, u);
-		}
-	},
-
-	<span class="comment">/**
-	 * Returns the currently selected element. This is was added for compatiblity and is deprecated.
-	 * Please use inst.selection.getFocusElement instead.
-	 *
-	 * <span class="attrib">@return</span> Currently selected element.
-	 * <span class="attrib">@type</span> HTMLElement
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	getFocusElement : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.selection.getFocusElement();
-	},
-
-	<span class="comment">/**
-	 * Returns the browsers selection instance. This is was added for compatiblity and is deprecated.
-	 * Please use inst.selection.getSel instead.
-	 *
-	 * <span class="attrib">@return</span> Browser selection instance.
-	 * <span class="attrib">@type</span> DOMSelection
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	getSel : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.selection.getSel();
-	},
-
-	<span class="comment">/**
-	 * Returns the browsers selections first range instance. This is was added for compatiblity and is deprecated.
-	 * Please use inst.selection.getRng instead.
-	 *
-	 * <span class="attrib">@return</span> Browsers selections first range instance.
-	 * <span class="attrib">@type</span> DOMRange
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	getRng : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.selection.getRng();
-	},
-
-	<span class="comment">/**
-	 * Moves the contents from the TinyMCE editor control instance to the hidden textarea
-	 * that got replaced with TinyMCE. This is executed automaticly on for example form submit unless you configure otherwice.
-	 *
-	 * <span class="attrib">@param</span> {boolean} skip_cleanup Optional Skip cleanup, simply move the contents as fast as possible.
-	 * <span class="attrib">@param</span> {boolean} skip_callback Optional Skip callback, don't call the save_callback function.
-	 */</span>
-	triggerSave : <span class="reserved">function</span>(skip_cleanup, skip_callback) {
-		<span class="reserved">this</span>.switchSettings();
-
-		tinyMCE.settings[<span class="literal">'preformatted'</span>] = false;
-
-		<span class="comment">// Default to false</span>
-		<span class="reserved">if</span> (typeof(skip_cleanup) == <span class="literal">"undefined"</span>)
-			skip_cleanup = false;
-
-		<span class="comment">// Default to false</span>
-		<span class="reserved">if</span> (typeof(skip_callback) == <span class="literal">"undefined"</span>)
-			skip_callback = false;
-
-		tinyMCE._setHTML(<span class="reserved">this</span>.getDoc(), <span class="reserved">this</span>.getBody().innerHTML);
-
-		<span class="comment">// Remove visual aids when cleanup is disabled</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings[<span class="literal">'cleanup'</span>] == false) {
-			tinyMCE.handleVisualAid(<span class="reserved">this</span>.getBody(), true, false, <span class="reserved">this</span>);
-			tinyMCE._setEventsEnabled(<span class="reserved">this</span>.getBody(), true);
-		}
-
-		tinyMCE._customCleanup(<span class="reserved">this</span>, <span class="literal">"submit_content_dom"</span>, <span class="reserved">this</span>.contentWindow.document.body);
-		var htm = skip_cleanup ? <span class="reserved">this</span>.getBody().innerHTML : tinyMCE._cleanupHTML(<span class="reserved">this</span>, <span class="reserved">this</span>.getDoc(), <span class="reserved">this</span>.settings, <span class="reserved">this</span>.getBody(), tinyMCE.visualAid, true, true);
-		htm = tinyMCE._customCleanup(<span class="reserved">this</span>, <span class="literal">"submit_content"</span>, htm);
-
-		<span class="reserved">if</span> (!skip_callback &amp;&amp; tinyMCE.settings[<span class="literal">'save_callback'</span>] != <span class="literal">""</span>)
-			var content = eval(tinyMCE.settings[<span class="literal">'save_callback'</span>] + <span class="literal">"(this.formTargetElementId,htm,this.getBody());"</span>);
-
-		<span class="comment">// Use callback content if available</span>
-		<span class="reserved">if</span> ((typeof(content) != <span class="literal">"undefined"</span>) &amp;&amp; content != null)
-			htm = content;
-
-		<span class="comment">// Replace some weird entities (Bug: #1056343)</span>
-		htm = tinyMCE.regexpReplace(htm, <span class="literal">"&amp;#40;"</span>, <span class="literal">"("</span>, <span class="literal">"gi"</span>);
-		htm = tinyMCE.regexpReplace(htm, <span class="literal">"&amp;#41;"</span>, <span class="literal">")"</span>, <span class="literal">"gi"</span>);
-		htm = tinyMCE.regexpReplace(htm, <span class="literal">"&amp;#59;"</span>, <span class="literal">";"</span>, <span class="literal">"gi"</span>);
-		htm = tinyMCE.regexpReplace(htm, <span class="literal">"&amp;#34;"</span>, <span class="literal">"&amp;quot;"</span>, <span class="literal">"gi"</span>);
-		htm = tinyMCE.regexpReplace(htm, <span class="literal">"&amp;#94;"</span>, <span class="literal">"^"</span>, <span class="literal">"gi"</span>);
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.formElement)
-			<span class="reserved">this</span>.formElement.value = htm;
-
-		<span class="reserved">if</span> (tinyMCE.isSafari &amp;&amp; <span class="reserved">this</span>.formElement)
-			<span class="reserved">this</span>.formElement.innerText = htm;
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_DOMUtils.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_DOMUtils.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_DOMUtils.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_DOMUtils.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,707 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_DOMUtils.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_DOMUtils.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_DOMUtils.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_DOMUtils.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:29 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- *
- * The contents of this file will be wrapped in a class later on.
- */</span>
-
-<span class="comment">/**
- * Returns a element by a specific attribute and it's value.
- *
- * <span class="attrib">@param</span> {HTMLElement} n Element to search in.
- * <span class="attrib">@param</span> {string} e Element name to search for.
- * <span class="attrib">@param</span> {string} a Attribute name to search for.
- * <span class="attrib">@param</span> {string} v Attribute value to search for.
- * <span class="attrib">@return</span> HTML element that matched the criterias or null on failure.
- * <span class="attrib">@type</span> HTMLElement
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getElementByAttributeValue = <span class="reserved">function</span>(n, e, a, v) {
-	<span class="reserved">return</span> (n = <span class="reserved">this</span>.getElementsByAttributeValue(n, e, a, v)).length == 0 ? null : n[0];
-};
-
-<span class="comment">/**
- * Returns a element array by a specific attribute and it's value.
- *
- * <span class="attrib">@param</span> {HTMLElement} n Element to search in.
- * <span class="attrib">@param</span> {string} e Element name to search for.
- * <span class="attrib">@param</span> {string} a Attribute name to search for.
- * <span class="attrib">@param</span> {string} v Attribute value to search for.
- * <span class="attrib">@return</span> HTML element array that matched the criterias or null on failure.
- * <span class="attrib">@type</span> Array
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getElementsByAttributeValue = <span class="reserved">function</span>(n, e, a, v) {
-	var i, nl = n.getElementsByTagName(e), o = new Array();
-
-	<span class="reserved">for</span> (i=0; i&lt;nl.length; i++) {
-		<span class="reserved">if</span> (tinyMCE.getAttrib(nl[i], a).indexOf(v) != -1)
-			o[o.length] = nl[i];
-	}
-
-	<span class="reserved">return</span> o;
-};
-
-<span class="comment">/**
- * Returns true/false if the specified node is a block element or not.
- *
- * <span class="attrib">@param</span> {HTMLNode} n Node to verify.
- * <span class="attrib">@return</span> true/false if the specified node is a block element or not.
- * <span class="attrib">@type</span> boolean
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.isBlockElement = <span class="reserved">function</span>(n) {
-	<span class="reserved">return</span> n != null &amp;&amp; n.nodeType == 1 &amp;&amp; <span class="reserved">this</span>.blockRegExp.test(n.nodeName);
-};
-
-<span class="comment">/**
- * Returns the first block element parent of the specified node.
- *
- * <span class="attrib">@param</span> {HTMLNode} n Node get parent block element for.
- * <span class="attrib">@return</span> First block element parent of the specified node or null if it wasn't found.
- * <span class="attrib">@type</span> HTMLElement
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getParentBlockElement = <span class="reserved">function</span>(n) {
-	<span class="reserved">while</span> (n) {
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isBlockElement(n))
-			<span class="reserved">return</span> n;
-
-		n = n.parentNode;
-	}
-
-	<span class="reserved">return</span> null;
-};
-
-<span class="comment">/**
- * Inserts a node after the specific node.
- *
- * <span class="attrib">@param</span> {HTMLNode} n New node to insert.
- * <span class="attrib">@param</span> {HTMLNode} r Reference node to insert after.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.insertAfter = <span class="reserved">function</span>(n, r){
-	<span class="reserved">if</span> (r.nextSibling)
-		r.parentNode.insertBefore(n, r.nextSibling);
-	<span class="reserved">else</span>
-		r.parentNode.appendChild(n);
-};
-
-<span class="comment">/**
- * Sets the innerHTML property of a element, this function also
- * fixes a MSIE bug where the first comment is removed.
- *
- * <span class="attrib">@param</span> {HTMLElement} e Element to insert HTML in.
- * <span class="attrib">@param</span> {string} h HTML code to insert into innerHTML.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.setInnerHTML = <span class="reserved">function</span>(e, h) {
-	var i, nl, n;
-
-	<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera) {
-		<span class="comment">// Since MSIE handles invalid HTML better that valid XHTML we</span>
-		<span class="comment">// need to make some things invalid. &lt;hr /&gt; gets converted to &lt;hr&gt;.</span>
-		h = h.replace(/\s\/&gt;/g, <span class="literal">'&gt;'</span>);
-
-		<span class="comment">// Since MSIE auto generated emtpy P tags some times we must tell it to keep the real ones</span>
-		h = h.replace(/&lt;p([^&gt;]*)&gt;\u00A0?&lt;\/p&gt;/gi, <span class="literal">'&lt;p$1 mce_keep="true"&gt;&amp;nbsp;&lt;/p&gt;'</span>); <span class="comment">// Keep empty paragraphs</span>
-		h = h.replace(/&lt;p([^&gt;]*)&gt;\s*&amp;nbsp;\s*&lt;\/p&gt;/gi, <span class="literal">'&lt;p$1 mce_keep="true"&gt;&amp;nbsp;&lt;/p&gt;'</span>); <span class="comment">// Keep empty paragraphs</span>
-		h = h.replace(/&lt;p([^&gt;]*)&gt;\s+&lt;\/p&gt;/gi, <span class="literal">'&lt;p$1 mce_keep="true"&gt;&amp;nbsp;&lt;/p&gt;'</span>); <span class="comment">// Keep empty paragraphs</span>
-
-		<span class="comment">// Remove first comment</span>
-		e.innerHTML = tinyMCE.uniqueTag + h;
-		e.firstChild.removeNode(true);
-
-		<span class="comment">// Remove weird auto generated empty paragraphs unless it's supposed to be there</span>
-		nl = e.getElementsByTagName(<span class="literal">"p"</span>);
-		<span class="reserved">for</span> (i=nl.length-1; i&gt;=0; i--) {
-			n = nl[i];
-
-			<span class="reserved">if</span> (n.nodeName == <span class="literal">'P'</span> &amp;&amp; !n.hasChildNodes() &amp;&amp; !n.mce_keep)
-				n.parentNode.removeChild(n);
-		}
-	} <span class="reserved">else</span> {
-		h = <span class="reserved">this</span>.fixGeckoBaseHREFBug(1, e, h);
-		e.innerHTML = h;
-		<span class="reserved">this</span>.fixGeckoBaseHREFBug(2, e, h);
-	}
-};
-
-<span class="comment">/**
- * Returns the outer HTML of a element, this uses the outerHTML
- * property in MSIE and Opera and a workaround for Gecko.
- *
- * <span class="attrib">@param</span> {HTMLElement} e HTML element to get outerHTML from.
- * <span class="attrib">@return</span> HTML content string.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getOuterHTML = <span class="reserved">function</span>(e) {
-	<span class="reserved">if</span> (tinyMCE.isMSIE)
-		<span class="reserved">return</span> e.outerHTML;
-
-	var d = e.ownerDocument.createElement(<span class="literal">"body"</span>);
-	d.appendChild(e);
-	<span class="reserved">return</span> d.innerHTML;
-};
-
-<span class="comment">/**
- * Sets the outer HTML of a element, this uses the outerHTML
- * property in MSIE and Opera and a workaround for Gecko.
- *
- * <span class="attrib">@param</span> {HTMLElement} e HTML element to set outerHTML on.
- * <span class="attrib">@param</span> {string} h HTML string to set in property.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.setOuterHTML = <span class="reserved">function</span>(e, h) {
-	<span class="reserved">if</span> (tinyMCE.isMSIE) {
-		e.outerHTML = h;
-		<span class="reserved">return</span>;
-	}
-
-	var d = e.ownerDocument.createElement(<span class="literal">"body"</span>);
-	d.innerHTML = h;
-	e.parentNode.replaceChild(d.firstChild, e);
-};
-
-<span class="comment">/**
- * Returns a element by id, this will also search the form names to match the id.
- *
- * <span class="attrib">@param</span> {string} id Id of element.
- * <span class="attrib">@param</span> {DOMDocument} d Optional document.
- * <span class="attrib">@return</span> HTML element that matches the id.
- * <span class="attrib">@type</span> HTMLElement
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>._getElementById = <span class="reserved">function</span>(id, d) {
-	var e, i, j, f;
-
-	<span class="reserved">if</span> (typeof(d) == <span class="literal">"undefined"</span>)
-		d = document;
-
-	e = d.getElementById(id);
-	<span class="reserved">if</span> (!e) {
-		f = d.forms;
-
-		<span class="reserved">for</span> (i=0; i&lt;f.length; i++) {
-			<span class="reserved">for</span> (j=0; j&lt;f[i].elements.length; j++) {
-				<span class="reserved">if</span> (f[i].elements[j].name == id) {
-					e = f[i].elements[j];
-					break;
-				}
-			}
-		}
-	}
-
-	<span class="reserved">return</span> e;
-};
-
-<span class="comment">/**
- * Returns a array of nodes selected retrived from the child nodes of the specified node.
- *
- * <span class="attrib">@param</span> {HTMLNode} n Node to get children from.
- * <span class="attrib">@param</span> {Array} na Array to fill with children.
- * <span class="attrib">@param</span> {int} t Node type to get.
- * <span class="attrib">@param</span> {string} nn Node name of items to retrive.
- * <span class="attrib">@return</span> Node array.
- * <span class="attrib">@type</span> Array
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getNodeTree = <span class="reserved">function</span>(n, na, t, nn) {
-	var i;
-
-	<span class="reserved">if</span> (typeof(t) == <span class="literal">"undefined"</span> || n.nodeType == t &amp;&amp; (typeof(nn) == <span class="literal">"undefined"</span> || n.nodeName == nn))
-		na[na.length] = n;
-
-	<span class="reserved">if</span> (n.hasChildNodes()) {
-		<span class="reserved">for</span> (i=0; i&lt;n.childNodes.length; i++)
-			tinyMCE.getNodeTree(n.childNodes[i], na, t, nn);
-	}
-
-	<span class="reserved">return</span> na;
-};
-
-<span class="comment">/**
- * Returns the parent element of the specified node based on the search criteria.
- *
- * <span class="attrib">@param</span> {HTMLNode} node Node to get parent element of.
- * <span class="attrib">@param</span> {string} names Comma separated list of element names to get.
- * <span class="attrib">@param</span> {string} attrib_name Optional attribute name to match.
- * <span class="attrib">@param</span> {string} attrib_value Optional attribute value to match.
- * <span class="attrib">@return</span> HTMLElement or null based on search criteras.
- * <span class="attrib">@type</span> HTMLElement
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getParentElement = <span class="reserved">function</span>(node, names, attrib_name, attrib_value) {
-	<span class="reserved">if</span> (typeof(names) == <span class="literal">"undefined"</span>) {
-		<span class="reserved">if</span> (node.nodeType == 1)
-			<span class="reserved">return</span> node;
-
-		<span class="comment">// Find parent node that is a element</span>
-		<span class="reserved">while</span> ((node = node.parentNode) != null &amp;&amp; node.nodeType != 1) ;
-
-		<span class="reserved">return</span> node;
-	}
-
-	<span class="reserved">if</span> (node == null)
-		<span class="reserved">return</span> null;
-
-	var namesAr = names.toUpperCase().split(<span class="literal">','</span>);
-
-	do {
-		<span class="reserved">for</span> (var i=0; i&lt;namesAr.length; i++) {
-			<span class="reserved">if</span> (node.nodeName == namesAr[i] || names == <span class="literal">"*"</span>) {
-				<span class="reserved">if</span> (typeof(attrib_name) == <span class="literal">"undefined"</span>)
-					<span class="reserved">return</span> node;
-				<span class="reserved">else</span> <span class="reserved">if</span> (node.getAttribute(attrib_name)) {
-					<span class="reserved">if</span> (typeof(attrib_value) == <span class="literal">"undefined"</span>) {
-						<span class="reserved">if</span> (node.getAttribute(attrib_name) != <span class="literal">""</span>)
-							<span class="reserved">return</span> node;
-					} <span class="reserved">else</span> <span class="reserved">if</span> (node.getAttribute(attrib_name) == attrib_value)
-						<span class="reserved">return</span> node;
-				}
-			}
-		}
-	} <span class="reserved">while</span> ((node = node.parentNode) != null);
-
-	<span class="reserved">return</span> null;
-};
-
-<span class="comment">/**
- * Returns a node by the specified selector function. This function will
- * loop through all parent nodes and call the specified function for each node.
- * If the function then returns true it will stop the execution and return that node.
- *
- * <span class="attrib">@param</span> {DOMNode} n HTML node to search parents on.
- * <span class="attrib">@param</span> {function} f Selection function to execute on each node.
- * <span class="attrib">@return</span> DOMNode or null if it wasn't found.
- * <span class="attrib">@type</span> DOMNode
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getParentNode = <span class="reserved">function</span>(n, f) {
-	<span class="reserved">while</span> (n) {
-		<span class="reserved">if</span> (f(n))
-			<span class="reserved">return</span> n;
-
-		n = n.parentNode;
-	}
-
-	<span class="reserved">return</span> null;
-};
-
-<span class="comment">/**
- * Returns the attribute value of a element or the default value if it wasn't found.
- *
- * <span class="attrib">@param</span> {HTMLElement} elm HTML element to get attribute from.
- * <span class="attrib">@param</span> {string} name Attribute name to retrive.
- * <span class="attrib">@param</span> {string} default_value Optional default value to return, this value defaults to a empty string.
- * <span class="attrib">@return</span> Attribute value or default value if it wasn't found in element.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getAttrib = <span class="reserved">function</span>(elm, name, default_value) {
-	<span class="reserved">if</span> (typeof(default_value) == <span class="literal">"undefined"</span>)
-		default_value = <span class="literal">""</span>;
-
-	<span class="comment">// Not a element</span>
-	<span class="reserved">if</span> (!elm || elm.nodeType != 1)
-		<span class="reserved">return</span> default_value;
-
-	var v = elm.getAttribute(name);
-
-	<span class="comment">// Try className for class attrib</span>
-	<span class="reserved">if</span> (name == <span class="literal">"class"</span> &amp;&amp; !v)
-		v = elm.className;
-
-	<span class="comment">// Workaround for a issue with Firefox 1.5rc2+</span>
-	<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; name == <span class="literal">"src"</span> &amp;&amp; elm.src != null &amp;&amp; elm.src != <span class="literal">""</span>)
-		v = elm.src;
-
-	<span class="comment">// Workaround for a issue with Firefox 1.5rc2+</span>
-	<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; name == <span class="literal">"href"</span> &amp;&amp; elm.href != null &amp;&amp; elm.href != <span class="literal">""</span>)
-		v = elm.href;
-
-	<span class="reserved">if</span> (name == <span class="literal">"http-equiv"</span> &amp;&amp; tinyMCE.isMSIE)
-		v = elm.httpEquiv;
-
-	<span class="reserved">if</span> (name == <span class="literal">"style"</span> &amp;&amp; !tinyMCE.isOpera)
-		v = elm.style.cssText;
-
-	<span class="reserved">return</span> (v &amp;&amp; v != <span class="literal">""</span>) ? v : default_value;
-};
-
-<span class="comment">/**
- * Sets the attribute value for a specific attribute.
- *
- * <span class="attrib">@param</span> {HTMLElement} element HTML element to set attribute on.
- * <span class="attrib">@param</span> {string} name Attribute name to set.
- * <span class="attrib">@param</span> {string} value Attribute value to set.
- * <span class="attrib">@param</span> {boolean} fix_value Optional fix value state, if true only number data will be accepted.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.setAttrib = <span class="reserved">function</span>(element, name, value, fix_value) {
-	<span class="reserved">if</span> (typeof(value) == <span class="literal">"number"</span> &amp;&amp; value != null)
-		value = <span class="literal">""</span> + value;
-
-	<span class="reserved">if</span> (fix_value) {
-		<span class="reserved">if</span> (value == null)
-			value = <span class="literal">""</span>;
-
-		var re = new RegExp(<span class="literal">'[^0-9%]'</span>, <span class="literal">'g'</span>);
-		value = value.replace(re, <span class="literal">''</span>);
-	}
-
-	<span class="reserved">if</span> (name == <span class="literal">"style"</span>)
-		element.style.cssText = value;
-
-	<span class="reserved">if</span> (name == <span class="literal">"class"</span>)
-		element.className = value;
-
-	<span class="reserved">if</span> (value != null &amp;&amp; value != <span class="literal">""</span> &amp;&amp; value != -1)
-		element.setAttribute(name, value);
-	<span class="reserved">else</span>
-		element.removeAttribute(name);
-};
-
-<span class="comment">/**
- * Sets a style attribute item value.
- *
- * <span class="attrib">@param</span> {HTMLElement} elm HTML element to set style attribute item on.
- * <span class="attrib">@param</span> {string} name Style item name to set.
- * <span class="attrib">@param</span> {string} value Style item value to set.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.setStyleAttrib = <span class="reserved">function</span>(elm, name, value) {
-	eval(<span class="literal">'elm.style.'</span> + name + <span class="literal">'=value;'</span>);
-
-	<span class="comment">// Style attrib deleted</span>
-	<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; value == null || value == <span class="literal">''</span>) {
-		var str = tinyMCE.serializeStyle(tinyMCE.parseStyle(elm.style.cssText));
-		elm.style.cssText = str;
-		elm.setAttribute(<span class="literal">"style"</span>, str);
-	}
-};
-
-<span class="comment">/**
- * Switches the CSS class of the specified element. This method also caches the
- * elements in a lookup table for performance. This should only be used for TinyMCE main UI controls
- * like buttons or select elements.
- *
- * <span class="attrib">@param</span> {HTMLElement} ei Element to set CSS class on.
- * <span class="attrib">@param</span> {string} c CSS class to set.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.switchClass = <span class="reserved">function</span>(ei, c) {
-	var e;
-
-	<span class="reserved">if</span> (tinyMCE.switchClassCache[ei])
-		e = tinyMCE.switchClassCache[ei];
-	<span class="reserved">else</span>
-		e = tinyMCE.switchClassCache[ei] = document.getElementById(ei);
-
-	<span class="reserved">if</span> (e) {
-		<span class="comment">// Keep tile mode</span>
-		<span class="reserved">if</span> (tinyMCE.settings.button_tile_map &amp;&amp; e.className &amp;&amp; e.className.indexOf(<span class="literal">'mceTiledButton'</span>) == 0)
-			c = <span class="literal">'mceTiledButton '</span> + c;
-
-		e.className = c;
-	}
-};
-
-<span class="comment">/**
- * Returns the absolute x, y position of a node. The position will be returned in a object with
- * two properties absLeft and absTop.
- *
- * <span class="attrib">@param</span> {HTMLNode} n HTML element to get x, y position from.
- * <span class="attrib">@return</span> Absolute position of the specified element.
- * <span class="attrib">@type</span> TinyMCE_ElementPosition
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.getAbsPosition = <span class="reserved">function</span>(n) {
-	var p = {absLeft : 0, absTop : 0};
-
-	<span class="reserved">while</span> (n) {
-		p.absLeft += n.offsetLeft;
-		p.absTop += n.offsetTop;
-		n = n.offsetParent;
-	}
-
-	<span class="reserved">return</span> p;
-};
-
-<span class="comment">/**
- * Finds any previous element by name. This will loop through the siblings
- * inorder to find the specified element by name. If the element wasn't found
- * it will return a null value. 
- *
- * <span class="attrib">@param</span> {HTMLNode} e HTML node to search from.
- * <span class="attrib">@param</span> {string} n Comma separated list of element names to search for.
- * <span class="attrib">@return</span> HTML Element or null if it wasn't found.
- * <span class="attrib">@type</span> HTMLElement 
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.prevNode = <span class="reserved">function</span>(e, n) {
-	var a = n.split(<span class="literal">','</span>), i;
-
-	<span class="reserved">while</span> ((e = e.previousSibling) != null) {
-		<span class="reserved">for</span> (i=0; i&lt;a.length; i++) {
-			<span class="reserved">if</span> (e.nodeName == a[i])
-				<span class="reserved">return</span> e;
-		}
-	}
-
-	<span class="reserved">return</span> null;
-};
-
-<span class="comment">/**
- * Finds any element after the current one by name. This will loop through the siblings
- * inorder to find the specified element by name. If the element wasn't found
- * it will return a null value. 
- *
- * <span class="attrib">@param</span> {HTMLNode} e HTML node to search from.
- * <span class="attrib">@param</span> {string} n Comma separated list of element names to search for.
- * <span class="attrib">@return</span> HTML Element or null if it wasn't found.
- * <span class="attrib">@type</span> HTMLElement 
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.nextNode = <span class="reserved">function</span>(e, n) {
-	var a = n.split(<span class="literal">','</span>), i;
-
-	<span class="reserved">while</span> ((e = e.nextSibling) != null) {
-		<span class="reserved">for</span> (i=0; i&lt;a.length; i++) {
-			<span class="reserved">if</span> (e.nodeName == a[i])
-				<span class="reserved">return</span> e;
-		}
-	}
-
-	<span class="reserved">return</span> null;
-};
-
-<span class="comment">/**
- * Returns a array of nodes when the specified function matches a node.
- *
- * <span class="attrib">@param</span> {DOMNode} n Node to select children from.
- * <span class="attrib">@param</span> {function} f Function that returns true/false if the node is to be added or not.
- * <span class="attrib">@param</span> {Array} a Optional array to fill with nodes.
- * <span class="attrib">@return</span> Array with selected nodes.
- * <span class="attrib">@type</span> Array
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.selectNodes = <span class="reserved">function</span>(n, f, a) {
-	var i;
-
-	<span class="reserved">if</span> (!a)
-		a = new Array();
-
-	<span class="reserved">if</span> (f(n))
-		a[a.length] = n;
-
-	<span class="reserved">if</span> (n.hasChildNodes()) {
-		<span class="reserved">for</span> (i=0; i&lt;n.childNodes.length; i++)
-			tinyMCE.selectNodes(n.childNodes[i], f, a);
-	}
-
-	<span class="reserved">return</span> a;
-};
-
-<span class="comment">/**
- * Adds a CSS class to the specified element. It will remove any previous item with the same name
- * so adding a class that already exists will move it to the end.
- *
- * <span class="attrib">@param</span> {HTMLElement} e HTML element to add CSS class to.
- * <span class="attrib">@param</span> {string] c CSS class to add to HTML element.
- * <span class="attrib">@param</span> {boolean] b Optional parameter, if set to true, class will be added to the beginning.
- * <span class="attrib">@return</span> Returns the new class attribute value.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.addCSSClass = <span class="reserved">function</span>(e, c, b) {
-	var o = <span class="reserved">this</span>.removeCSSClass(e, c);
-
-	<span class="reserved">return</span> e.className = b ? c + (o != <span class="literal">''</span> ? (<span class="literal">' '</span> + o) : <span class="literal">''</span>) : (o != <span class="literal">''</span> ? (o + <span class="literal">' '</span>) : <span class="literal">''</span>) + c;
-};
-
-<span class="comment">/**
- * Removes the specified CSS class from the element.
- *
- * <span class="attrib">@param</span> {HTMLElement} e HTML element to remove CSS class to.
- * <span class="attrib">@param</span> {string] c CSS class to remove to HTML element.
- * <span class="attrib">@return</span> Returns the new class attribute value.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.removeCSSClass = <span class="reserved">function</span>(e, c) {
-	var a = <span class="reserved">this</span>.explode(<span class="literal">' '</span>, e.className), i;
-
-	<span class="reserved">for</span> (i=0; i&lt;a.length; i++) {
-		<span class="reserved">if</span> (a[i] == c)
-			a[i] = <span class="literal">''</span>;
-	}
-
-	<span class="reserved">return</span> e.className = a.join(<span class="literal">' '</span>);
-};
-
-<span class="comment">/**
- * Renames the specified element to the specified name.
- *
- * <span class="attrib">@param</span> {HTMLElement} e Element to rename.
- * <span class="attrib">@param</span> {string} n New name of the element.
- * <span class="attrib">@param</span> {DOMDocument} d Optional document reference.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.renameElement = <span class="reserved">function</span>(e, n, d) {
-	var ne, i, ar;
-
-	d = typeof(d) == <span class="literal">"undefined"</span> ? tinyMCE.selectedInstance.getDoc() : d;
-
-	<span class="reserved">if</span> (e) {
-		ne = d.createElement(n);
-
-		ar = e.attributes;
-		<span class="reserved">for</span> (i=ar.length-1; i&gt;-1; i--) {
-			<span class="reserved">if</span> (ar[i].specified &amp;&amp; ar[i].nodeValue)
-				ne.setAttribute(ar[i].nodeName.toLowerCase(), ar[i].nodeValue);
-		}
-
-		ar = e.childNodes;
-		<span class="reserved">for</span> (i=0; i&lt;ar.length; i++)
-			ne.appendChild(ar[i].cloneNode(true));
-
-		e.parentNode.replaceChild(ne, e);
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Debug.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Debug.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Debug.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Debug.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,193 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Debug.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Debug.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Debug.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Debug.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:29 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- *
- * The contents of this file will be wrapped in a class later on.
- */</span>
-
-<span class="comment">/**
- * Debugs the specified message to a screen.
- *
- * <span class="attrib">@param</span> {1..n} Numerous arguments that will be outputed.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.debug = <span class="reserved">function</span>() {
-	var m = <span class="literal">""</span>, e, a, i;
-
-	e = document.getElementById(<span class="literal">"tinymce_debug"</span>);
-	<span class="reserved">if</span> (!e) {
-		var d = document.createElement(<span class="literal">"div"</span>);
-		d.setAttribute(<span class="literal">"className"</span>, <span class="literal">"debugger"</span>);
-		d.className = <span class="literal">"debugger"</span>;
-		d.innerHTML = <span class="literal">'Debug output:&lt;textarea id="tinymce_debug" style="width: 100%; height: 300px" wrap="nowrap" mce_editable="false"&gt;&lt;/textarea&gt;'</span>;
-
-		document.body.appendChild(d);
-		e = document.getElementById(<span class="literal">"tinymce_debug"</span>);
-	}
-
-	a = <span class="reserved">this</span>.debug.arguments;
-	<span class="reserved">for</span> (i=0; i&lt;a.length; i++) {
-		m += a[i];
-		<span class="reserved">if</span> (i&lt;a.length-1)
-			m += <span class="literal">', '</span>;
-	}
-
-	e.value += m + <span class="literal">"\n"</span>;
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Engine.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Engine.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Engine.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Engine.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,2890 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Engine.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Engine.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Engine.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_Engine.html">TinyMCE_Engine</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Engine.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:29 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * Core engine class for TinyMCE, a instance of this class is available as a global called tinyMCE.
- *
- * <span class="attrib">@constructor</span>
- */</span>
-<span class="reserved">function</span> TinyMCE_Engine() {
-	<span class="reserved">this</span>.majorVersion = <span class="literal">"2"</span>;
-	<span class="reserved">this</span>.minorVersion = <span class="literal">"0.6"</span>;
-	<span class="reserved">this</span>.releaseDate = <span class="literal">"2006-xx-xx"</span>;
-
-	<span class="reserved">this</span>.instances = new Array();
-	<span class="reserved">this</span>.switchClassCache = new Array();
-	<span class="reserved">this</span>.windowArgs = new Array();
-	<span class="reserved">this</span>.loadedFiles = new Array();
-	<span class="reserved">this</span>.configs = new Array();
-	<span class="reserved">this</span>.currentConfig = 0;
-	<span class="reserved">this</span>.eventHandlers = new Array();
-
-	<span class="comment">// Browser check</span>
-	var ua = navigator.userAgent;
-	<span class="reserved">this</span>.isMSIE = (navigator.appName == <span class="literal">"Microsoft Internet Explorer"</span>);
-	<span class="reserved">this</span>.isMSIE5 = <span class="reserved">this</span>.isMSIE &amp;&amp; (ua.indexOf(<span class="literal">'MSIE 5'</span>) != -1);
-	<span class="reserved">this</span>.isMSIE5_0 = <span class="reserved">this</span>.isMSIE &amp;&amp; (ua.indexOf(<span class="literal">'MSIE 5.0'</span>) != -1);
-	<span class="reserved">this</span>.isGecko = ua.indexOf(<span class="literal">'Gecko'</span>) != -1;
-	<span class="reserved">this</span>.isSafari = ua.indexOf(<span class="literal">'Safari'</span>) != -1;
-	<span class="reserved">this</span>.isOpera = ua.indexOf(<span class="literal">'Opera'</span>) != -1;
-	<span class="reserved">this</span>.isMac = ua.indexOf(<span class="literal">'Mac'</span>) != -1;
-	<span class="reserved">this</span>.isNS7 = ua.indexOf(<span class="literal">'Netscape/7'</span>) != -1;
-	<span class="reserved">this</span>.isNS71 = ua.indexOf(<span class="literal">'Netscape/7.1'</span>) != -1;
-	<span class="reserved">this</span>.dialogCounter = 0;
-	<span class="reserved">this</span>.plugins = new Array();
-	<span class="reserved">this</span>.themes = new Array();
-	<span class="reserved">this</span>.menus = new Array();
-	<span class="reserved">this</span>.loadedPlugins = new Array();
-	<span class="reserved">this</span>.buttonMap = new Array();
-	<span class="reserved">this</span>.isLoaded = false;
-
-	<span class="comment">// Fake MSIE on Opera and if Opera fakes IE, Gecko or Safari cancel those</span>
-	<span class="reserved">if</span> (<span class="reserved">this</span>.isOpera) {
-		<span class="reserved">this</span>.isMSIE = true;
-		<span class="reserved">this</span>.isGecko = false;
-		<span class="reserved">this</span>.isSafari =  false;
-	}
-
-	<span class="comment">// TinyMCE editor id instance counter</span>
-	<span class="reserved">this</span>.idCounter = 0;
-};
-
-TinyMCE_Engine.<span class="reserved">prototype</span> = {
-	<span class="comment">/**
-	 * Initializes TinyMCE with the specific configuration settings. This method
-	 * may be called multiple times when multiple instances with diffrent settings is to be created.
-	 *
-	 * <span class="attrib">@param</span> {Array} Name/Value array of initialization settings.
-	 */</span>
-	init : <span class="reserved">function</span>(settings) {
-		var theme;
-
-		<span class="reserved">this</span>.settings = settings;
-
-		<span class="comment">// Check if valid browser has execcommand support</span>
-		<span class="reserved">if</span> (typeof(document.execCommand) == <span class="literal">'undefined'</span>)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// Get script base path</span>
-		<span class="reserved">if</span> (!tinyMCE.baseURL) {
-			var elements = document.getElementsByTagName(<span class="literal">'script'</span>);
-
-			<span class="reserved">for</span> (var i=0; i&lt;elements.length; i++) {
-				<span class="reserved">if</span> (elements[i].src &amp;&amp; (elements[i].src.indexOf(<span class="literal">"tiny_mce.js"</span>) != -1 || elements[i].src.indexOf(<span class="literal">"tiny_mce_dev.js"</span>) != -1 || elements[i].src.indexOf(<span class="literal">"tiny_mce_src.js"</span>) != -1 || elements[i].src.indexOf(<span class="literal">"tiny_mce_gzip"</span>) != -1)) {
-					var src = elements[i].src;
-
-					tinyMCE.srcMode = (src.indexOf(<span class="literal">'_src'</span>) != -1 || src.indexOf(<span class="literal">'_dev'</span>) != -1) ? <span class="literal">'_src'</span> : <span class="literal">''</span>;
-					tinyMCE.gzipMode = src.indexOf(<span class="literal">'_gzip'</span>) != -1;
-					src = src.substring(0, src.lastIndexOf(<span class="literal">'/'</span>));
-
-					<span class="reserved">if</span> (settings.exec_mode == <span class="literal">"src"</span> || settings.exec_mode == <span class="literal">"normal"</span>)
-						tinyMCE.srcMode = settings.exec_mode == <span class="literal">"src"</span> ? <span class="literal">'_src'</span> : <span class="literal">''</span>;
-
-					tinyMCE.baseURL = src;
-					break;
-				}
-			}
-		}
-
-		<span class="comment">// Get document base path</span>
-		<span class="reserved">this</span>.documentBasePath = document.location.href;
-		<span class="reserved">if</span> (<span class="reserved">this</span>.documentBasePath.indexOf(<span class="literal">'?'</span>) != -1)
-			<span class="reserved">this</span>.documentBasePath = <span class="reserved">this</span>.documentBasePath.substring(0, <span class="reserved">this</span>.documentBasePath.indexOf(<span class="literal">'?'</span>));
-		<span class="reserved">this</span>.documentURL = <span class="reserved">this</span>.documentBasePath;
-		<span class="reserved">this</span>.documentBasePath = <span class="reserved">this</span>.documentBasePath.substring(0, <span class="reserved">this</span>.documentBasePath.lastIndexOf(<span class="literal">'/'</span>));
-
-		<span class="comment">// If not HTTP absolute</span>
-		<span class="reserved">if</span> (tinyMCE.baseURL.indexOf(<span class="literal">'://'</span>) == -1 &amp;&amp; tinyMCE.baseURL.charAt(0) != <span class="literal">'/'</span>) {
-			<span class="comment">// If site absolute</span>
-			tinyMCE.baseURL = <span class="reserved">this</span>.documentBasePath + <span class="literal">"/"</span> + tinyMCE.baseURL;
-		}
-
-		<span class="comment">// Set default values on settings</span>
-		<span class="reserved">this</span>._def(<span class="literal">"mode"</span>, <span class="literal">"none"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"theme"</span>, <span class="literal">"advanced"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"plugins"</span>, <span class="literal">""</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"language"</span>, <span class="literal">"en"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"docs_language"</span>, <span class="reserved">this</span>.settings[<span class="literal">'language'</span>]);
-		<span class="reserved">this</span>._def(<span class="literal">"elements"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"textarea_trigger"</span>, <span class="literal">"mce_editable"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"editor_selector"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"editor_deselector"</span>, <span class="literal">"mceNoEditor"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"valid_elements"</span>, <span class="literal">"+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"extended_valid_elements"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"invalid_elements"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"encoding"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"urlconverter_callback"</span>, tinyMCE.getParam(<span class="literal">"urlconvertor_callback"</span>, <span class="literal">"TinyMCE_Engine.prototype.convertURL"</span>));
-		<span class="reserved">this</span>._def(<span class="literal">"save_callback"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"debug"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"force_br_newlines"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"force_p_newlines"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"add_form_submit_trigger"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"relative_urls"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"remove_script_host"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"focus_alert"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"document_base_url"</span>, <span class="reserved">this</span>.documentURL);
-		<span class="reserved">this</span>._def(<span class="literal">"visual"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"visual_table_class"</span>, <span class="literal">"mceVisualAid"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"setupcontent_callback"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"fix_content_duplication"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"custom_undo_redo"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"custom_undo_redo_levels"</span>, -1);
-		<span class="reserved">this</span>._def(<span class="literal">"custom_undo_redo_keyboard_shortcuts"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"custom_undo_redo_restore_selection"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"verify_html"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"apply_source_formatting"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"directionality"</span>, <span class="literal">"ltr"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"cleanup_on_startup"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"inline_styles"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"convert_newlines_to_brs"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"auto_reset_designmode"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"entities"</span>, <span class="literal">"39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"entity_encoding"</span>, <span class="literal">"named"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"cleanup_callback"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"add_unload_trigger"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"ask"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"nowrap"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"auto_resize"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"auto_focus"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"cleanup"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"remove_linebreaks"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"button_tile_map"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"submit_patch"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"browsers"</span>, <span class="literal">"msie,safari,gecko,opera"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"dialog_type"</span>, <span class="literal">"window"</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"accessibility_warnings"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"accessibility_focus"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"merge_styles_invalid_parents"</span>, <span class="literal">""</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"force_hex_style_colors"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"trim_span_elements"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"convert_fonts_to_spans"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"doctype"</span>, <span class="literal">'&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"&gt;'</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"font_size_classes"</span>, <span class="literal">''</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"font_size_style_values"</span>, <span class="literal">'xx-small,x-small,small,medium,large,x-large,xx-large'</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"event_elements"</span>, <span class="literal">'a,img'</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"convert_urls"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"table_inline_editing"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"object_resizing"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"custom_shortcuts"</span>, true);
-		<span class="reserved">this</span>._def(<span class="literal">"convert_on_click"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"content_css"</span>, <span class="literal">''</span>);
-		<span class="reserved">this</span>._def(<span class="literal">"fix_list_elements"</span>, false);
-		<span class="reserved">this</span>._def(<span class="literal">"fix_table_elements"</span>, false);
-
-		<span class="comment">// Browser check IE</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE &amp;&amp; <span class="reserved">this</span>.settings[<span class="literal">'browsers'</span>].indexOf(<span class="literal">'msie'</span>) == -1)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// Browser check Gecko</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isGecko &amp;&amp; <span class="reserved">this</span>.settings[<span class="literal">'browsers'</span>].indexOf(<span class="literal">'gecko'</span>) == -1)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// Browser check Safari</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isSafari &amp;&amp; <span class="reserved">this</span>.settings[<span class="literal">'browsers'</span>].indexOf(<span class="literal">'safari'</span>) == -1)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// Browser check Opera</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.isOpera &amp;&amp; <span class="reserved">this</span>.settings[<span class="literal">'browsers'</span>].indexOf(<span class="literal">'opera'</span>) == -1)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// If not super absolute make it so</span>
-		var baseHREF = tinyMCE.settings[<span class="literal">'document_base_url'</span>];
-		var h = document.location.href;
-		var p = h.indexOf(<span class="literal">'://'</span>);
-		<span class="reserved">if</span> (p &gt; 0 &amp;&amp; document.location.protocol != <span class="literal">"file:"</span>) {
-			p = h.indexOf(<span class="literal">'/'</span>, p + 3);
-			h = h.substring(0, p);
-
-			<span class="reserved">if</span> (baseHREF.indexOf(<span class="literal">'://'</span>) == -1)
-				baseHREF = h + baseHREF;
-
-			tinyMCE.settings[<span class="literal">'document_base_url'</span>] = baseHREF;
-			tinyMCE.settings[<span class="literal">'document_base_prefix'</span>] = h;
-		}
-
-		<span class="comment">// Trim away query part</span>
-		<span class="reserved">if</span> (baseHREF.indexOf(<span class="literal">'?'</span>) != -1)
-			baseHREF = baseHREF.substring(0, baseHREF.indexOf(<span class="literal">'?'</span>));
-
-		<span class="reserved">this</span>.settings[<span class="literal">'base_href'</span>] = baseHREF.substring(0, baseHREF.lastIndexOf(<span class="literal">'/'</span>)) + <span class="literal">"/"</span>;
-
-		theme = <span class="reserved">this</span>.settings[<span class="literal">'theme'</span>];
-		<span class="reserved">this</span>.blockRegExp = new RegExp(<span class="literal">"^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$"</span>, <span class="literal">"i"</span>);
-		<span class="reserved">this</span>.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
-		<span class="reserved">this</span>.uniqueURL = <span class="literal">'javascript:TINYMCE_UNIQUEURL();'</span>; <span class="comment">// Make unique URL non real URL</span>
-		<span class="reserved">this</span>.uniqueTag = <span class="literal">'&lt;div id="mceTMPElement" style="display: none"&gt;TMP&lt;/div&gt;'</span>;
-		<span class="reserved">this</span>.callbacks = new Array(<span class="literal">'onInit'</span>, <span class="literal">'getInfo'</span>, <span class="literal">'getEditorTemplate'</span>, <span class="literal">'setupContent'</span>, <span class="literal">'onChange'</span>, <span class="literal">'onPageLoad'</span>, <span class="literal">'handleNodeChange'</span>, <span class="literal">'initInstance'</span>, <span class="literal">'execCommand'</span>, <span class="literal">'getControlHTML'</span>, <span class="literal">'handleEvent'</span>, <span class="literal">'cleanup'</span>);
-
-		<span class="comment">// Theme url</span>
-		<span class="reserved">this</span>.settings[<span class="literal">'theme_href'</span>] = tinyMCE.baseURL + <span class="literal">"/themes/"</span> + theme;
-
-		<span class="reserved">if</span> (!tinyMCE.isMSIE)
-			<span class="reserved">this</span>.settings[<span class="literal">'force_br_newlines'</span>] = false;
-
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"popups_css"</span>, false)) {
-			var cssPath = tinyMCE.getParam(<span class="literal">"popups_css"</span>, <span class="literal">""</span>);
-
-			<span class="comment">// Is relative</span>
-			<span class="reserved">if</span> (cssPath.indexOf(<span class="literal">'://'</span>) == -1 &amp;&amp; cssPath.charAt(0) != <span class="literal">'/'</span>)
-				<span class="reserved">this</span>.settings[<span class="literal">'popups_css'</span>] = <span class="reserved">this</span>.documentBasePath + <span class="literal">"/"</span> + cssPath;
-			<span class="reserved">else</span>
-				<span class="reserved">this</span>.settings[<span class="literal">'popups_css'</span>] = cssPath;
-		} <span class="reserved">else</span>
-			<span class="reserved">this</span>.settings[<span class="literal">'popups_css'</span>] = tinyMCE.baseURL + <span class="literal">"/themes/"</span> + theme + <span class="literal">"/css/editor_popup.css"</span>;
-
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"editor_css"</span>, false)) {
-			var cssPath = tinyMCE.getParam(<span class="literal">"editor_css"</span>, <span class="literal">""</span>);
-
-			<span class="comment">// Is relative</span>
-			<span class="reserved">if</span> (cssPath.indexOf(<span class="literal">'://'</span>) == -1 &amp;&amp; cssPath.charAt(0) != <span class="literal">'/'</span>)
-				<span class="reserved">this</span>.settings[<span class="literal">'editor_css'</span>] = <span class="reserved">this</span>.documentBasePath + <span class="literal">"/"</span> + cssPath;
-			<span class="reserved">else</span>
-				<span class="reserved">this</span>.settings[<span class="literal">'editor_css'</span>] = cssPath;
-		} <span class="reserved">else</span>
-			<span class="reserved">this</span>.settings[<span class="literal">'editor_css'</span>] = tinyMCE.baseURL + <span class="literal">"/themes/"</span> + theme + <span class="literal">"/css/editor_ui.css"</span>;
-
-		<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'debug'</span>]) {
-			var msg = <span class="literal">"Debug: \n"</span>;
-
-			msg += <span class="literal">"baseURL: "</span> + <span class="reserved">this</span>.baseURL + <span class="literal">"\n"</span>;
-			msg += <span class="literal">"documentBasePath: "</span> + <span class="reserved">this</span>.documentBasePath + <span class="literal">"\n"</span>;
-			msg += <span class="literal">"content_css: "</span> + <span class="reserved">this</span>.settings[<span class="literal">'content_css'</span>] + <span class="literal">"\n"</span>;
-			msg += <span class="literal">"popups_css: "</span> + <span class="reserved">this</span>.settings[<span class="literal">'popups_css'</span>] + <span class="literal">"\n"</span>;
-			msg += <span class="literal">"editor_css: "</span> + <span class="reserved">this</span>.settings[<span class="literal">'editor_css'</span>] + <span class="literal">"\n"</span>;
-
-			alert(msg);
-		}
-
-		<span class="comment">// Only do this once</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.configs.length == 0) {
-			<span class="comment">// Is Safari enabled</span>
-			<span class="reserved">if</span> (<span class="reserved">this</span>.isSafari &amp;&amp; <span class="reserved">this</span>.getParam(<span class="literal">'safari_warning'</span>, false))
-				alert(<span class="literal">"Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false"</span>);
-
-			<span class="reserved">if</span> (typeof(TinyMCECompressed) == <span class="literal">"undefined"</span>) {
-				tinyMCE.addEvent(window, <span class="literal">"DOMContentLoaded"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.onLoad);
-
-				<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera) {
-					<span class="reserved">if</span> (document.body)
-						tinyMCE.addEvent(document.body, <span class="literal">"readystatechange"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.onLoad);
-					<span class="reserved">else</span>
-						tinyMCE.addEvent(document, <span class="literal">"readystatechange"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.onLoad);
-				}
-
-				tinyMCE.addEvent(window, <span class="literal">"load"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.onLoad);
-				tinyMCE._addUnloadEvents();
-			}
-		}
-
-		<span class="reserved">this</span>.loadScript(tinyMCE.baseURL + <span class="literal">'/themes/'</span> + <span class="reserved">this</span>.settings[<span class="literal">'theme'</span>] + <span class="literal">'/editor_template'</span> + tinyMCE.srcMode + <span class="literal">'.js'</span>);
-		<span class="reserved">this</span>.loadScript(tinyMCE.baseURL + <span class="literal">'/langs/'</span> + <span class="reserved">this</span>.settings[<span class="literal">'language'</span>] +  <span class="literal">'.js'</span>);
-		<span class="reserved">this</span>.loadCSS(<span class="reserved">this</span>.settings[<span class="literal">'editor_css'</span>]);
-
-		<span class="comment">// Add plugins</span>
-		var p = tinyMCE.getParam(<span class="literal">'plugins'</span>, <span class="literal">''</span>, true, <span class="literal">','</span>);
-		<span class="reserved">if</span> (p.length &gt; 0) {
-			<span class="reserved">for</span> (var i=0; i&lt;p.length; i++) {
-				<span class="reserved">if</span> (p[i].charAt(0) != <span class="literal">'-'</span>)
-					<span class="reserved">this</span>.loadScript(tinyMCE.baseURL + <span class="literal">'/plugins/'</span> + p[i] + <span class="literal">'/editor_plugin'</span> + tinyMCE.srcMode + <span class="literal">'.js'</span>);
-			}
-		}
-
-		<span class="comment">// Setup entities</span>
-		settings[<span class="literal">'cleanup_entities'</span>] = new Array();
-		var entities = tinyMCE.getParam(<span class="literal">'entities'</span>, <span class="literal">''</span>, true, <span class="literal">','</span>);
-		<span class="reserved">for</span> (var i=0; i&lt;entities.length; i+=2)
-			settings[<span class="literal">'cleanup_entities'</span>][<span class="literal">'c'</span> + entities[i]] = entities[i+1];
-
-		<span class="comment">// Save away this config</span>
-		settings[<span class="literal">'index'</span>] = <span class="reserved">this</span>.configs.length;
-		<span class="reserved">this</span>.configs[<span class="reserved">this</span>.configs.length] = settings;
-	},
-
-	<span class="comment">/**
-	 * Adds unload event handles to execute triggerSave.
-	 *
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_addUnloadEvents : <span class="reserved">function</span>() {
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'add_unload_trigger'</span>]) {
-				tinyMCE.addEvent(window, <span class="literal">"unload"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.unloadHandler);
-				tinyMCE.addEvent(window.document, <span class="literal">"beforeunload"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.unloadHandler);
-			}
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'add_unload_trigger'</span>])
-				tinyMCE.addEvent(window, <span class="literal">"unload"</span>, <span class="reserved">function</span> () {tinyMCE.triggerSave(true, true);});
-		}
-	},
-
-	<span class="comment">/**
-	 * Assigns a default value for a specific config parameter.
-	 *
-	 * <span class="attrib">@param</span> {string} key Settings key to add default value to.
-	 * <span class="attrib">@param</span> {object} def_val Default value to assign if the settings option isn't defined.
-	 * <span class="attrib">@param</span> {boolean} t Trim all white space, if true all whitespace will be removed from option value.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_def : <span class="reserved">function</span>(key, def_val, t) {
-		var v = tinyMCE.getParam(key, def_val);
-
-		v = t ? v.replace(/\s+/g,<span class="literal">""</span>) : v;
-
-		<span class="reserved">this</span>.settings[key] = v;
-	},
-
-	<span class="comment">/**
-	 * Returns true/false if the specified plugin is loaded or not.
-	 *
-	 * <span class="attrib">@param</span> {string} n Plugin name to look for.
-	 * <span class="attrib">@return</span> true/false if the specified plugin is loaded or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	hasPlugin : <span class="reserved">function</span>(n) {
-		<span class="reserved">return</span> typeof(<span class="reserved">this</span>.plugins[n]) != <span class="literal">"undefined"</span> &amp;&amp; <span class="reserved">this</span>.plugins[n] != null;
-	},
-
-	<span class="comment">/**
-	 * Adds the specified plugin to the list of loaded plugins, this will also setup the baseURL
-	 * property of the plugin.
-	 *
-	 * <span class="attrib">@param</span> {string} Plugin name/id.
-	 * <span class="attrib">@param</span> {TinyMCE_Plugin} p Plugin instance to add.
-	 */</span>
-	addPlugin : <span class="reserved">function</span>(n, p) {
-		var op = <span class="reserved">this</span>.plugins[n];
-
-		<span class="comment">// Use the previous plugin object base URL used when loading external plugins</span>
-		p.baseURL = op ? op.baseURL : tinyMCE.baseURL + <span class="literal">"/plugins/"</span> + n;
-		<span class="reserved">this</span>.plugins[n] = p;
-	},
-
-	<span class="comment">/**
-	 * Sets the baseURL of the specified plugin, this is useful if the plugin is loaded from
-	 * a external location.
-	 *
-	 * <span class="attrib">@param</span> {string} n Plugin name/id to set base URL on. This have to be added before.
-	 * <span class="attrib">@param</span> {string} u Base URL of plugin, this string should be the URL prefix for the plugin without a trailing slash.
-	 */</span>
-	setPluginBaseURL : <span class="reserved">function</span>(n, u) {
-		var op = <span class="reserved">this</span>.plugins[n];
-
-		<span class="reserved">if</span> (op)
-			op.baseURL = u;
-		<span class="reserved">else</span>
-			<span class="reserved">this</span>.plugins[n] = {baseURL : u};
-	},
-
-	<span class="comment">/**
-	 * Load plugin from external URL.
-	 *
-	 * <span class="attrib">@param</span> {string} n Plugin name for example \"emotions\".
-	 * <span class="attrib">@param</span> {string} u URL of plugin directory to load.
-	 */</span>
-	loadPlugin : <span class="reserved">function</span>(n, u) {
-		u = u.indexOf(<span class="literal">'.js'</span>) != -1 ? u.substring(0, u.lastIndexOf(<span class="literal">'/'</span>)) : u;
-		u = u.charAt(u.length-1) == <span class="literal">'/'</span> ? u.substring(0, u.length-1) : u;
-		<span class="reserved">this</span>.plugins[n] = {baseURL : u};
-		<span class="reserved">this</span>.loadScript(u + <span class="literal">"/editor_plugin"</span> + (tinyMCE.srcMode ? <span class="literal">'_src'</span> : <span class="literal">''</span>) + <span class="literal">".js"</span>);
-	},
-
-	<span class="comment">/**
-	 * Returns true/false if the specified theme is loaded or not.
-	 *
-	 * <span class="attrib">@param</span> {string} n Theme name/id to check for.
-	 * <span class="attrib">@return</span> true/false if the specified theme is loaded or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	hasTheme : <span class="reserved">function</span>(n) {
-		<span class="reserved">return</span> typeof(<span class="reserved">this</span>.themes[n]) != <span class="literal">"undefined"</span> &amp;&amp; <span class="reserved">this</span>.themes[n] != null;
-	},
-
-	<span class="comment">/**
-	 * Adds the specified theme in to the list of loaded themes.
-	 *
-	 * <span class="attrib">@param</span> {string} n Theme name/id to add the object reference to.
-	 * <span class="attrib">@param</span> {TinyMCE_Theme} t Theme instance to add to the loaded list.
-	 */</span>
-	addTheme : <span class="reserved">function</span>(n, t) {
-		<span class="reserved">this</span>.themes[n] = t;
-	},
-
-	<span class="comment">/**
-	 * Adds a floating menu instance to TinyMCE.
-	 *
-	 * <span class="attrib">@param</span> {string} n TinyMCE menu id.
-	 * <span class="attrib">@param</span> {TinyMCE_Menu} m TinyMCE menu instance.
-	 */</span>
-	addMenu : <span class="reserved">function</span>(n, m) {
-		<span class="reserved">this</span>.menus[n] = m;
-	},
-
-	<span class="comment">/**
-	 * Checks if the specified menu by name is added to TinyMCE.
-	 *
-	 * <span class="attrib">@param</span> {string} n TinyMCE menu id.
-	 * <span class="attrib">@return</span> true/false if it exists or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	hasMenu : <span class="reserved">function</span>(n) {
-		<span class="reserved">return</span> typeof(<span class="reserved">this</span>.plugins[n]) != <span class="literal">"undefined"</span> &amp;&amp; <span class="reserved">this</span>.plugins[n] != null;
-	},
-
-	<span class="comment">/**
-	 * Loads the specified script by writing the a script tag to the current page.
-	 * This will also check if the file has been loaded before. This function should only be used
-	 * when the page is loading.
-	 *
-	 * <span class="attrib">@param</span> {string} url Script URL to load.
-	 */</span>
-	loadScript : <span class="reserved">function</span>(url) {
-		<span class="reserved">for</span> (var i=0; i&lt;<span class="reserved">this</span>.loadedFiles.length; i++) {
-			<span class="reserved">if</span> (<span class="reserved">this</span>.loadedFiles[i] == url)
-				<span class="reserved">return</span>;
-		}
-
-		document.write(<span class="literal">'&lt;sc'</span>+<span class="literal">'ript language="javascript" type="text/javascript" src="'</span> + url + <span class="literal">'"&gt;&lt;/script&gt;'</span>);
-
-		<span class="reserved">this</span>.loadedFiles[<span class="reserved">this</span>.loadedFiles.length] = url;
-	},
-
-	<span class="comment">/**
-	 * Loads the specified CSS by writing the a link tag to the current page.
-	 * This will also check if the file has been loaded before. This function should only be used
-	 * when the page is loading.
-	 *
-	 * <span class="attrib">@param</span> {string} url CSS file URL to load or comma separated list of files.
-	 */</span>
-	loadCSS : <span class="reserved">function</span>(url) {
-		var ar = url.replace(/\s+/, <span class="literal">''</span>).split(<span class="literal">','</span>);
-		var lflen = 0, csslen = 0;
-		var skip = false;
-		var x = 0, i = 0;
-
-		<span class="reserved">for</span> (x = 0,csslen = ar.length; x&lt;csslen; x++) {
-			ignore_css = false;
-
-			<span class="reserved">if</span> (ar[x] != null &amp;&amp; ar[x] != <span class="literal">'null'</span> &amp;&amp; ar[x].length &gt; 0) {
-				<span class="comment">/* Make sure it doesn't exist. */</span>
-				<span class="reserved">for</span> (i=0, lflen=<span class="reserved">this</span>.loadedFiles.length; i&lt;lflen; i++) {
-					<span class="reserved">if</span> (<span class="reserved">this</span>.loadedFiles[i] == ar[x]) {
-						skip = true;
-						break;
-					}
-				}
-
-				<span class="reserved">if</span> (!skip) {
-					document.write(<span class="literal">'&lt;link href="'</span> + ar[x] + <span class="literal">'" rel="stylesheet" type="text/css" /&gt;'</span>);
-					<span class="reserved">this</span>.loadedFiles[<span class="reserved">this</span>.loadedFiles.length] = ar[x];
-				}
-			}
-		}
-	},
-
-	<span class="comment">/**
-	 * Imports a CSS file into a allready loaded document. This will add a link element
-	 * to the head element of the document.
-	 *
-	 * <span class="attrib">@param</span> {DOMDocument} doc DOM Document to load CSS into.
-	 * <span class="attrib">@param</span> {string} css CSS File URL to load or comma separated list of files.
-	 */</span>
-	importCSS : <span class="reserved">function</span>(doc, css) {
-		var css_ary = css.replace(/\s+/, <span class="literal">''</span>).split(<span class="literal">','</span>);
-		var csslen, elm, headArr, x, css_file;
-
-		<span class="reserved">for</span> (x = 0, csslen = css_ary.length; x&lt;csslen; x++) {
-			css_file = css_ary[x];
-
-			<span class="reserved">if</span> (css_file != null &amp;&amp; css_file != <span class="literal">'null'</span> &amp;&amp; css_file.length &gt; 0) {
-				<span class="comment">// Is relative, make absolute</span>
-				<span class="reserved">if</span> (css_file.indexOf(<span class="literal">'://'</span>) == -1 &amp;&amp; css_file.charAt(0) != <span class="literal">'/'</span>)
-					css_file = <span class="reserved">this</span>.documentBasePath + <span class="literal">"/"</span> + css_file;
-
-				<span class="reserved">if</span> (typeof(doc.createStyleSheet) == <span class="literal">"undefined"</span>) {
-					elm = doc.createElement(<span class="literal">"link"</span>);
-
-					elm.rel = <span class="literal">"stylesheet"</span>;
-					elm.href = css_file;
-
-					<span class="reserved">if</span> ((headArr = doc.getElementsByTagName(<span class="literal">"head"</span>)) != null &amp;&amp; headArr.length &gt; 0)
-						headArr[0].appendChild(elm);
-				} <span class="reserved">else</span>
-					doc.createStyleSheet(css_file);
-			}
-		}
-	},
-
-	<span class="comment">/**
-	 * Displays a confirm dialog when a user clicks/focus a textarea that is to be converted into
-	 * a TinyMCE instance.
-	 *
-	 * <span class="attrib">@param</span> {DOMEvent} e DOM event instance.
-	 * <span class="attrib">@param</span> {Array} settings Name/Value array of initialization settings.
-	 */</span>
-	confirmAdd : <span class="reserved">function</span>(e, settings) {
-		var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
-		var elementId = elm.name ? elm.name : elm.id;
-
-		tinyMCE.settings = settings;
-
-		<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'convert_on_click'</span>] || (!elm.getAttribute(<span class="literal">'mce_noask'</span>) &amp;&amp; confirm(tinyMCELang[<span class="literal">'lang_edit_confirm'</span>])))
-			tinyMCE.addMCEControl(elm, elementId);
-
-		elm.setAttribute(<span class="literal">'mce_noask'</span>, <span class="literal">'true'</span>);
-	},
-
-	<span class="comment">/**
-	 * Moves the contents from the hidden textarea to the editor that gets inserted.
-	 *
-	 * <span class="attrib">@param</span> {string} form_element_name Form element name to move contents from.
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	updateContent : <span class="reserved">function</span>(form_element_name) {
-		<span class="comment">// Find MCE instance linked to given form element and copy it's value</span>
-		var formElement = document.getElementById(form_element_name);
-		<span class="reserved">for</span> (var n in tinyMCE.instances) {
-			var inst = tinyMCE.instances[n];
-			<span class="reserved">if</span> (!tinyMCE.isInstance(inst))
-				continue;
-
-			inst.switchSettings();
-
-			<span class="reserved">if</span> (inst.formElement == formElement) {
-				var doc = inst.getDoc();
-		
-				tinyMCE._setHTML(doc, inst.formElement.value);
-
-				<span class="reserved">if</span> (!tinyMCE.isMSIE)
-					doc.body.innerHTML = tinyMCE._cleanupHTML(inst, doc, <span class="reserved">this</span>.settings, doc.body, inst.visualAid);
-			}
-		}
-	},
-
-	<span class="comment">/**
-	 * Adds a TinyMCE editor control instance to a specific form element.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} replace_element HTML element object to replace.
-	 * <span class="attrib">@param</span> {string} form_element_name HTML form element name,
-	 * <span class="attrib">@param</span> {DOMDocument} target_document Target document that holds the element.
-	 */</span>
-	addMCEControl : <span class="reserved">function</span>(replace_element, form_element_name, target_document) {
-		var id = <span class="literal">"mce_editor_"</span> + tinyMCE.idCounter++;
-		var inst = new TinyMCE_Control(tinyMCE.settings);
-
-		inst.editorId = id;
-		<span class="reserved">this</span>.instances[id] = inst;
-
-		inst._onAdd(replace_element, form_element_name, target_document);
-	},
-
-	<span class="comment">/**
-	 * Removes a TinyMCE editor control instance by id.
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id Id of editor instance to remove.
-	 */</span>
-	removeMCEControl : <span class="reserved">function</span>(editor_id) {
-		var inst = tinyMCE.getInstanceById(editor_id);
-
-		<span class="reserved">if</span> (inst) {
-			inst.switchSettings();
-
-			editor_id = inst.editorId;
-			var html = tinyMCE.getContent(editor_id);
-
-			<span class="comment">// Remove editor instance from instances array</span>
-			var tmpInstances = new Array();
-			<span class="reserved">for</span> (var instanceName in tinyMCE.instances) {
-				var instance = tinyMCE.instances[instanceName];
-				<span class="reserved">if</span> (!tinyMCE.isInstance(instance))
-					continue;
-
-				<span class="reserved">if</span> (instanceName != editor_id)
-						tmpInstances[instanceName] = instance;
-			}
-			tinyMCE.instances = tmpInstances;
-
-			tinyMCE.selectedElement = null;
-			tinyMCE.selectedInstance = null;
-
-			<span class="comment">// Remove element</span>
-			var replaceElement = document.getElementById(editor_id + <span class="literal">"_parent"</span>);
-			var oldTargetElement = inst.oldTargetElement;
-			var targetName = oldTargetElement.nodeName.toLowerCase();
-
-			<span class="reserved">if</span> (targetName == <span class="literal">"textarea"</span> || targetName == <span class="literal">"input"</span>) {
-				<span class="comment">// Just show the old text area</span>
-				replaceElement.parentNode.removeChild(replaceElement);
-				oldTargetElement.style.display = <span class="literal">"inline"</span>;
-				oldTargetElement.value = html;
-			} <span class="reserved">else</span> {
-				oldTargetElement.innerHTML = html;
-				oldTargetElement.style.display = <span class="literal">'block'</span>;
-
-				replaceElement.parentNode.insertBefore(oldTargetElement, replaceElement);
-				replaceElement.parentNode.removeChild(replaceElement);
-			}
-		}
-	},
-
-	<span class="comment">/**
-	 * Moves the contents from a TinyMCE editor control instance to the hidden textarea
-	 * that got replaced with TinyMCE. This is executed automaticly on for example form submit.
-	 *
-	 * <span class="attrib">@param</span> {boolean} skip_cleanup Optional Skip cleanup, simply move the contents as fast as possible.
-	 * <span class="attrib">@param</span> {boolean} skip_callback Optional Skip callback, don't call the save_callback function.
-	 */</span>
-	triggerSave : <span class="reserved">function</span>(skip_cleanup, skip_callback) {
-		var inst, n;
-
-		<span class="comment">// Default to false</span>
-		<span class="reserved">if</span> (typeof(skip_cleanup) == <span class="literal">"undefined"</span>)
-			skip_cleanup = false;
-
-		<span class="comment">// Default to false</span>
-		<span class="reserved">if</span> (typeof(skip_callback) == <span class="literal">"undefined"</span>)
-			skip_callback = false;
-
-		<span class="comment">// Cleanup and set all form fields</span>
-		<span class="reserved">for</span> (n in tinyMCE.instances) {
-			inst = tinyMCE.instances[n];
-
-			<span class="reserved">if</span> (!tinyMCE.isInstance(inst))
-				continue;
-
-			inst.triggerSave(skip_cleanup, skip_callback);
-		}
-	},
-
-	<span class="comment">/**
-	 * Resets a forms TinyMCE instances based on form index.
-	 *
-	 * <span class="attrib">@param</span> {int} form_index Form index to reset.
-	 */</span>
-	resetForm : <span class="reserved">function</span>(form_index) {
-		var i, inst, n, formObj = document.forms[form_index];
-
-		<span class="reserved">for</span> (n in tinyMCE.instances) {
-			inst = tinyMCE.instances[n];
-
-			<span class="reserved">if</span> (!tinyMCE.isInstance(inst))
-				continue;
-
-			inst.switchSettings();
-
-			<span class="reserved">for</span> (i=0; i&lt;formObj.elements.length; i++) {
-				<span class="reserved">if</span> (inst.formTargetElementId == formObj.elements[i].name)
-					inst.getBody().innerHTML = inst.startContent;
-			}
-		}
-	},
-
-	<span class="comment">/**
-	 * Executes a command on a specific editor instance by id.
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id TinyMCE editor control instance id to perform comman on.
-	 * <span class="attrib">@param</span> {string} command Command name to execute, for example mceLink or Bold.
-	 * <span class="attrib">@param</span> {boolean} user_interface True/false state if a UI (dialog) should be presented or not.
-	 * <span class="attrib">@param</span> {object} value Optional command value, this can be anything.
-	 * <span class="attrib">@param</span> {boolean} focus True/false if the editor instance should be focused first.
-	 */</span>
-	execInstanceCommand : <span class="reserved">function</span>(editor_id, command, user_interface, value, focus) {
-		var inst = tinyMCE.getInstanceById(editor_id);
-		<span class="reserved">if</span> (inst) {
-			<span class="reserved">if</span> (typeof(focus) == <span class="literal">"undefined"</span>)
-				focus = true;
-
-			<span class="reserved">if</span> (focus)
-				inst.contentWindow.focus();
-
-			<span class="comment">// Reset design mode if lost</span>
-			inst.autoResetDesignMode();
-
-			<span class="reserved">this</span>.selectedElement = inst.getFocusElement();
-			<span class="reserved">this</span>.selectedInstance = inst;
-			tinyMCE.execCommand(command, user_interface, value);
-
-			<span class="comment">// Cancel event so it doesn't call onbeforeonunlaod</span>
-			<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; window.event != null)
-				tinyMCE.cancelEvent(window.event);
-		}
-	},
-
-	<span class="comment">/**
-	 * Executes a command on the selected or last selected TinyMCE editor control instance. This function also handles
-	 * some non instance specific commands like mceAddControl, mceRemoveControl, mceHelp or mceFocus.
-	 *
-	 * <span class="attrib">@param</span> {string} command Command name to execute, for example mceLink or Bold.
-	 * <span class="attrib">@param</span> {boolean} user_interface True/false state if a UI (dialog) should be presented or not.
-	 * <span class="attrib">@param</span> {object} value Optional command value, this can be anything.
-	 */</span>
-	execCommand : <span class="reserved">function</span>(command, user_interface, value) {
-		<span class="comment">// Default input</span>
-		user_interface = user_interface ? user_interface : false;
-		value = value ? value : null;
-
-		<span class="reserved">if</span> (tinyMCE.selectedInstance)
-			tinyMCE.selectedInstance.switchSettings();
-
-		switch (command) {
-			case <span class="literal">'mceHelp'</span>:
-				tinyMCE.openWindow({
-					file : <span class="literal">'about.htm'</span>,
-					width : 480,
-					height : 380
-				}, {
-					tinymce_version : tinyMCE.majorVersion + <span class="literal">"."</span> + tinyMCE.minorVersion,
-					tinymce_releasedate : tinyMCE.releaseDate,
-					inline : <span class="literal">"yes"</span>
-				});
-			<span class="reserved">return</span>;
-
-			case <span class="literal">'mceFocus'</span>:
-				var inst = tinyMCE.getInstanceById(value);
-				<span class="reserved">if</span> (inst)
-					inst.contentWindow.focus();
-			<span class="reserved">return</span>;
-
-			case <span class="literal">"mceAddControl"</span>:
-			case <span class="literal">"mceAddEditor"</span>:
-				tinyMCE.addMCEControl(tinyMCE._getElementById(value), value);
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"mceAddFrameControl"</span>:
-				tinyMCE.addMCEControl(tinyMCE._getElementById(value[<span class="literal">'element'</span>], value[<span class="literal">'document'</span>]), value[<span class="literal">'element'</span>], value[<span class="literal">'document'</span>]);
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"mceRemoveControl"</span>:
-			case <span class="literal">"mceRemoveEditor"</span>:
-				tinyMCE.removeMCEControl(value);
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"mceResetDesignMode"</span>:
-				<span class="comment">// Resets the designmode state of the editors in Gecko</span>
-				<span class="reserved">if</span> (!tinyMCE.isMSIE) {
-					<span class="reserved">for</span> (var n in tinyMCE.instances) {
-						<span class="reserved">if</span> (!tinyMCE.isInstance(tinyMCE.instances[n]))
-							continue;
-
-						try {
-							tinyMCE.instances[n].getDoc().designMode = <span class="literal">"on"</span>;
-						} catch (e) {
-							<span class="comment">// Ignore any errors</span>
-						}
-					}
-				}
-
-				<span class="reserved">return</span>;
-		}
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.selectedInstance) {
-			<span class="reserved">this</span>.selectedInstance.execCommand(command, user_interface, value);
-		} <span class="reserved">else</span> <span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'focus_alert'</span>])
-			alert(tinyMCELang[<span class="literal">'lang_focus_alert'</span>]);
-	},
-
-	<span class="comment">/**
-	 * Creates a iframe editor container for the specified element.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} replace_element Element to replace with iframe element.
-	 * <span class="attrib">@param</span> {DOMDocument} doc Optional document to use with iframe replacement.
-	 * <span class="attrib">@param</span> {DOMWindow} win Optional window to use with iframe replacement.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_createIFrame : <span class="reserved">function</span>(replace_element, doc, win) {
-		var iframe, id = replace_element.getAttribute(<span class="literal">"id"</span>);
-		var aw, ah;
-
-		<span class="reserved">if</span> (typeof(doc) == <span class="literal">"undefined"</span>)
-			doc = document;
-
-		<span class="reserved">if</span> (typeof(win) == <span class="literal">"undefined"</span>)
-			win = window;
-
-		iframe = doc.createElement(<span class="literal">"iframe"</span>);
-
-		aw = <span class="literal">""</span> + tinyMCE.settings[<span class="literal">'area_width'</span>];
-		ah = <span class="literal">""</span> + tinyMCE.settings[<span class="literal">'area_height'</span>];
-
-		<span class="reserved">if</span> (aw.indexOf(<span class="literal">'%'</span>) == -1) {
-			aw = parseInt(aw);
-			aw = aw &lt; 0 ? 300 : aw;
-			aw = aw + <span class="literal">"px"</span>;
-		}
-
-		<span class="reserved">if</span> (ah.indexOf(<span class="literal">'%'</span>) == -1) {
-			ah = parseInt(ah);
-			ah = ah &lt; 0 ? 240 : ah;
-			ah = ah + <span class="literal">"px"</span>;
-		}
-
-		iframe.setAttribute(<span class="literal">"id"</span>, id);
-		iframe.setAttribute(<span class="literal">"className"</span>, <span class="literal">"mceEditorIframe"</span>);
-		iframe.setAttribute(<span class="literal">"border"</span>, <span class="literal">"0"</span>);
-		iframe.setAttribute(<span class="literal">"frameBorder"</span>, <span class="literal">"0"</span>);
-		iframe.setAttribute(<span class="literal">"marginWidth"</span>, <span class="literal">"0"</span>);
-		iframe.setAttribute(<span class="literal">"marginHeight"</span>, <span class="literal">"0"</span>);
-		iframe.setAttribute(<span class="literal">"leftMargin"</span>, <span class="literal">"0"</span>);
-		iframe.setAttribute(<span class="literal">"topMargin"</span>, <span class="literal">"0"</span>);
-		iframe.setAttribute(<span class="literal">"width"</span>, aw);
-		iframe.setAttribute(<span class="literal">"height"</span>, ah);
-		iframe.setAttribute(<span class="literal">"allowtransparency"</span>, <span class="literal">"true"</span>);
-
-		<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">"auto_resize"</span>])
-			iframe.setAttribute(<span class="literal">"scrolling"</span>, <span class="literal">"no"</span>);
-
-		<span class="comment">// Must have a src element in MSIE HTTPs breaks aswell as absoute URLs</span>
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera)
-			iframe.setAttribute(<span class="literal">"src"</span>, <span class="reserved">this</span>.settings[<span class="literal">'default_document'</span>]);
-
-		iframe.style.width = aw;
-		iframe.style.height = ah;
-
-		<span class="comment">// MSIE 5.0 issue</span>
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera)
-			replace_element.outerHTML = iframe.outerHTML;
-		<span class="reserved">else</span>
-			replace_element.parentNode.replaceChild(iframe, replace_element);
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera)
-			<span class="reserved">return</span> win.frames[id];
-		<span class="reserved">else</span>
-			<span class="reserved">return</span> iframe;
-	},
-
-	<span class="comment">/**
-	 * Setups the contents of TinyMCE editor instance and fills it with contents.
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id TinyMCE editor instance control id to fill.
-	 */</span>
-	setupContent : <span class="reserved">function</span>(editor_id) {
-		var inst = tinyMCE.instances[editor_id];
-		var doc = inst.getDoc();
-		var head = doc.getElementsByTagName(<span class="literal">'head'</span>).item(0);
-		var content = inst.startContent;
-
-		inst.switchSettings();
-
-		<span class="comment">// Not loaded correctly hit it again, Mozilla bug #997860</span>
-		<span class="reserved">if</span> (!tinyMCE.isMSIE &amp;&amp; tinyMCE.getParam(<span class="literal">"setupcontent_reload"</span>, false) &amp;&amp; doc.title != <span class="literal">"blank_page"</span>) {
-			<span class="comment">// This part will remove the designMode status</span>
-			<span class="comment">// Failes first time in Firefox 1.5b2 on Mac</span>
-			try {doc.location.href = tinyMCE.baseURL + <span class="literal">"/blank.htm"</span>;} catch (ex) {}
-			window.setTimeout(<span class="literal">"tinyMCE.setupContent('"</span> + editor_id + <span class="literal">"');"</span>, 1000);
-			<span class="reserved">return</span>;
-		}
-
-		<span class="reserved">if</span> (!head) {
-			window.setTimeout(<span class="literal">"tinyMCE.setupContent('"</span> + editor_id + <span class="literal">"');"</span>, 10);
-			<span class="reserved">return</span>;
-		}
-
-		<span class="comment">// Import theme specific content CSS the user specific</span>
-		tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + <span class="literal">"/themes/"</span> + inst.settings[<span class="literal">'theme'</span>] + <span class="literal">"/css/editor_content.css"</span>);
-		tinyMCE.importCSS(inst.getDoc(), inst.settings[<span class="literal">'content_css'</span>]);
-		tinyMCE.dispatchCallback(inst, <span class="literal">'init_instance_callback'</span>, <span class="literal">'initInstance'</span>, inst);
-
-		<span class="comment">// Setup keyboard shortcuts</span>
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">'custom_undo_redo_keyboard_shortcuts'</span>)) {
-			inst.addShortcut(<span class="literal">'ctrl'</span>, <span class="literal">'z'</span>, <span class="literal">'lang_undo_desc'</span>, <span class="literal">'Undo'</span>);
-			inst.addShortcut(<span class="literal">'ctrl'</span>, <span class="literal">'y'</span>, <span class="literal">'lang_redo_desc'</span>, <span class="literal">'Redo'</span>);
-		}
-
-		<span class="comment">// Add default shortcuts for gecko</span>
-		<span class="reserved">if</span> (tinyMCE.isGecko) {
-			inst.addShortcut(<span class="literal">'ctrl'</span>, <span class="literal">'b'</span>, <span class="literal">'lang_bold_desc'</span>, <span class="literal">'Bold'</span>);
-			inst.addShortcut(<span class="literal">'ctrl'</span>, <span class="literal">'i'</span>, <span class="literal">'lang_italic_desc'</span>, <span class="literal">'Italic'</span>);
-			inst.addShortcut(<span class="literal">'ctrl'</span>, <span class="literal">'u'</span>, <span class="literal">'lang_underline_desc'</span>, <span class="literal">'Underline'</span>);
-		}
-
-		<span class="comment">// Setup span styles</span>
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-			inst.getDoc().body.setAttribute(<span class="literal">'id'</span>, <span class="literal">'mceSpanFonts'</span>);
-
-		<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'nowrap'</span>])
-			doc.body.style.whiteSpace = <span class="literal">"nowrap"</span>;
-
-		doc.body.dir = <span class="reserved">this</span>.settings[<span class="literal">'directionality'</span>];
-		doc.editorId = editor_id;
-
-		<span class="comment">// Add on document element in Mozilla</span>
-		<span class="reserved">if</span> (!tinyMCE.isMSIE)
-			doc.documentElement.editorId = editor_id;
-
-		inst.setBaseHREF(tinyMCE.settings[<span class="literal">'base_href'</span>]);
-
-		<span class="comment">// Replace new line characters to BRs</span>
-		<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'convert_newlines_to_brs'</span>]) {
-			content = tinyMCE.regexpReplace(content, <span class="literal">"\r\n"</span>, <span class="literal">"&lt;br /&gt;"</span>, <span class="literal">"gi"</span>);
-			content = tinyMCE.regexpReplace(content, <span class="literal">"\r"</span>, <span class="literal">"&lt;br /&gt;"</span>, <span class="literal">"gi"</span>);
-			content = tinyMCE.regexpReplace(content, <span class="literal">"\n"</span>, <span class="literal">"&lt;br /&gt;"</span>, <span class="literal">"gi"</span>);
-		}
-
-		<span class="comment">// Open closed anchors</span>
-	<span class="comment">//	content = content.replace(new RegExp('&lt;a(.*?)/&gt;', 'gi'), '&lt;a$1&gt;&lt;/a&gt;');</span>
-
-		<span class="comment">// Call custom cleanup code</span>
-		content = tinyMCE.storeAwayURLs(content);
-		content = tinyMCE._customCleanup(inst, <span class="literal">"insert_to_editor"</span>, content);
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			<span class="comment">// Ugly!!!</span>
-			window.setInterval(<span class="literal">'try{tinyMCE.getCSSClasses(tinyMCE.instances["'</span> + editor_id + <span class="literal">'"].getDoc(), "'</span> + editor_id + <span class="literal">'");}catch(e){}'</span>, 500);
-
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">"force_br_newlines"</span>])
-				doc.styleSheets[0].addRule(<span class="literal">"p"</span>, <span class="literal">"margin: 0;"</span>);
-
-			var body = inst.getBody();
-			body.editorId = editor_id;
-		}
-
-		content = tinyMCE.cleanupHTMLCode(content);
-
-		<span class="comment">// Fix for bug #958637</span>
-		<span class="reserved">if</span> (!tinyMCE.isMSIE) {
-			var contentElement = inst.getDoc().createElement(<span class="literal">"body"</span>);
-			var doc = inst.getDoc();
-
-			contentElement.innerHTML = content;
-
-			<span class="comment">// Remove weridness!</span>
-			<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; tinyMCE.settings[<span class="literal">'remove_lt_gt'</span>])
-				content = content.replace(new RegExp(<span class="literal">'&amp;lt;&amp;gt;'</span>, <span class="literal">'g'</span>), <span class="literal">""</span>);
-
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'cleanup_on_startup'</span>])
-				tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, doc, <span class="reserved">this</span>.settings, contentElement));
-			<span class="reserved">else</span> {
-				<span class="comment">// Convert all strong/em to b/i</span>
-				content = tinyMCE.regexpReplace(content, <span class="literal">"&lt;strong"</span>, <span class="literal">"&lt;b"</span>, <span class="literal">"gi"</span>);
-				content = tinyMCE.regexpReplace(content, <span class="literal">"&lt;em(/?)&gt;"</span>, <span class="literal">"&lt;i$1&gt;"</span>, <span class="literal">"gi"</span>);
-				content = tinyMCE.regexpReplace(content, <span class="literal">"&lt;em "</span>, <span class="literal">"&lt;i "</span>, <span class="literal">"gi"</span>);
-				content = tinyMCE.regexpReplace(content, <span class="literal">"&lt;/strong&gt;"</span>, <span class="literal">"&lt;/b&gt;"</span>, <span class="literal">"gi"</span>);
-				content = tinyMCE.regexpReplace(content, <span class="literal">"&lt;/em&gt;"</span>, <span class="literal">"&lt;/i&gt;"</span>, <span class="literal">"gi"</span>);
-				tinyMCE.setInnerHTML(inst.getBody(), content);
-			}
-
-			tinyMCE.convertAllRelativeURLs(inst.getBody());
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'cleanup_on_startup'</span>]) {
-				tinyMCE._setHTML(inst.getDoc(), content);
-
-				<span class="comment">// Produces permission denied error in MSIE 5.5</span>
-				eval(<span class="literal">'try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}'</span>);
-			} <span class="reserved">else</span>
-				tinyMCE._setHTML(inst.getDoc(), content);
-		}
-
-		<span class="comment">// Fix for bug #957681</span>
-		<span class="comment">//inst.getDoc().designMode = inst.getDoc().designMode;</span>
-
-		<span class="comment">// Setup element references</span>
-		var parentElm = inst.targetDoc.getElementById(inst.editorId + <span class="literal">'_parent'</span>);
-		inst.formElement = tinyMCE.isGecko ? parentElm.previousSibling : parentElm.nextSibling;
-
-		tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings[<span class="literal">'visual'</span>], inst);
-		tinyMCE.dispatchCallback(inst, <span class="literal">'setupcontent_callback'</span>, <span class="literal">'setupContent'</span>, editor_id, inst.getBody(), inst.getDoc());
-
-		<span class="comment">// Re-add design mode on mozilla</span>
-		<span class="reserved">if</span> (!tinyMCE.isMSIE)
-			tinyMCE.addEventHandlers(inst);
-
-		<span class="comment">// Add blur handler</span>
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			tinyMCE.addEvent(inst.getBody(), <span class="literal">"blur"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-			tinyMCE.addEvent(inst.getBody(), <span class="literal">"beforedeactivate"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch); <span class="comment">// Bug #1439953</span>
-
-			<span class="comment">// Workaround for drag drop/copy paste base href bug</span>
-			<span class="reserved">if</span> (!tinyMCE.isOpera) {
-				tinyMCE.addEvent(doc.body, <span class="literal">"mousemove"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.onMouseMove);
-				tinyMCE.addEvent(doc.body, <span class="literal">"beforepaste"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-				tinyMCE.addEvent(doc.body, <span class="literal">"drop"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-			}
-		}
-
-		<span class="comment">// Trigger node change, this call locks buttons for tables and so forth</span>
-		tinyMCE.selectedInstance = inst;
-		tinyMCE.selectedElement = inst.contentWindow.document.body;
-
-		<span class="comment">// Call custom DOM cleanup</span>
-		tinyMCE._customCleanup(inst, <span class="literal">"insert_to_editor_dom"</span>, inst.getBody());
-		tinyMCE._customCleanup(inst, <span class="literal">"setup_content_dom"</span>, inst.getBody());
-		tinyMCE._setEventsEnabled(inst.getBody(), false);
-		tinyMCE.cleanupAnchors(inst.getDoc());
-
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-			tinyMCE.convertSpansToFonts(inst.getDoc());
-
-		inst.startContent = tinyMCE.trim(inst.getBody().innerHTML);
-		inst.undoRedo.add({ content : inst.startContent });
-
-		<span class="comment">// Cleanup any mess left from storyAwayURLs</span>
-		<span class="reserved">if</span> (tinyMCE.isGecko) {
-			<span class="comment">// Remove mce_src from textnodes and comments</span>
-			tinyMCE.selectNodes(inst.getBody(), <span class="reserved">function</span>(n) {
-				<span class="reserved">if</span> (n.nodeType == 3 || n.nodeType == 8) {
-					n.nodeValue = n.nodeValue.replace(new RegExp(<span class="literal">'\\smce_src=\"[^\"]*\"'</span>, <span class="literal">'gi'</span>), <span class="literal">""</span>);
-					n.nodeValue = n.nodeValue.replace(new RegExp(<span class="literal">'\\smce_href=\"[^\"]*\"'</span>, <span class="literal">'gi'</span>), <span class="literal">""</span>);
-				}
-
-				<span class="reserved">return</span> false;
-			});
-		}
-
-		<span class="comment">// Cleanup any mess left from storyAwayURLs</span>
-		tinyMCE._removeInternal(inst.getBody());
-
-		tinyMCE.selectedInstance = inst;
-		tinyMCE.triggerNodeChange(false, true);
-	},
-
-	<span class="comment">/**
-	 * Stores away the src and href attribute values in separate mce_src and mce_href attributes.
-	 * This is needed since both MSIE and Gecko messes with these attributes. The old
-	 * src and href will be intact, this simply adds them to a separate attribute.
-	 *
-	 * <span class="attrib">@param</span> {string} s HTML string to replace src and href attributes in.
-	 * <span class="attrib">@return</span> HTML string with replaced src and href attributes.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	storeAwayURLs : <span class="reserved">function</span>(s) {
-		<span class="comment">// Remove all mce_src, mce_href and replace them with new ones</span>
-	<span class="comment">//	s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ &gt;\"]*\"', 'gi'), '');</span>
-	<span class="comment">//	s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ &gt;\"]*\"', 'gi'), '');</span>
-
-		<span class="reserved">if</span> (!s.match(/(mce_src|mce_href)/gi, s)) {
-			s = s.replace(new RegExp(<span class="literal">'src\\s*=\\s*\"([^ &gt;\"]*)\"'</span>, <span class="literal">'gi'</span>), <span class="literal">'src="$1" mce_src="$1"'</span>);
-			s = s.replace(new RegExp(<span class="literal">'href\\s*=\\s*\"([^ &gt;\"]*)\"'</span>, <span class="literal">'gi'</span>), <span class="literal">'href="$1" mce_href="$1"'</span>);
-		}
-
-		<span class="reserved">return</span> s;
-	},
-
-	<span class="comment">/**
-	 * Removes any internal content inserted by regexps.
-	 *
-	 * <span class="attrib">@param</span> {DOMNode} n Node to remove internal content from.
-	 */</span>
-	_removeInternal : <span class="reserved">function</span>(n) {
-		<span class="reserved">if</span> (tinyMCE.isGecko) {
-			<span class="comment">// Remove mce_src from textnodes and comments</span>
-			tinyMCE.selectNodes(n, <span class="reserved">function</span>(n) {
-				<span class="reserved">if</span> (n.nodeType == 3 || n.nodeType == 8) {
-					n.nodeValue = n.nodeValue.replace(new RegExp(<span class="literal">'\\smce_src=\"[^\"]*\"'</span>, <span class="literal">'gi'</span>), <span class="literal">""</span>);
-					n.nodeValue = n.nodeValue.replace(new RegExp(<span class="literal">'\\smce_href=\"[^\"]*\"'</span>, <span class="literal">'gi'</span>), <span class="literal">""</span>);
-				}
-
-				<span class="reserved">return</span> false;
-			});
-		}
-	},
-
-	<span class="comment">/**
-	 * Removes/disables TinyMCE built in form elements such as select boxes for font sizes etc.
-	 * These are disabled when the user submits a form so they don't get picked up by the backend script
-	 * that intercepts the contents.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} form_obj Form object to loop through for TinyMCE specific form elements.
-	 */</span>
-	removeTinyMCEFormElements : <span class="reserved">function</span>(form_obj) {
-		<span class="comment">// Check if form is valid</span>
-		<span class="reserved">if</span> (typeof(form_obj) == <span class="literal">"undefined"</span> || form_obj == null)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// If not a form, find the form</span>
-		<span class="reserved">if</span> (form_obj.nodeName != <span class="literal">"FORM"</span>) {
-			<span class="reserved">if</span> (form_obj.form)
-				form_obj = form_obj.form;
-			<span class="reserved">else</span>
-				form_obj = tinyMCE.getParentElement(form_obj, <span class="literal">"form"</span>);
-		}
-
-		<span class="comment">// Still nothing</span>
-		<span class="reserved">if</span> (form_obj == null)
-			<span class="reserved">return</span>;
-
-		<span class="comment">// Disable all UI form elements that TinyMCE created</span>
-		<span class="reserved">for</span> (var i=0; i&lt;form_obj.elements.length; i++) {
-			var elementId = form_obj.elements[i].name ? form_obj.elements[i].name : form_obj.elements[i].id;
-
-			<span class="reserved">if</span> (elementId.indexOf(<span class="literal">'mce_editor_'</span>) == 0)
-				form_obj.elements[i].disabled = true;
-		}
-	},
-
-	<span class="comment">/**
-	 * Event handler function that gets executed each time a event occurs in a TinyMCE editor control instance.
-	 * Todo: Fix the return statements so they return true or false.
-	 *
-	 * <span class="attrib">@param</span> {DOMEvent} e DOM event object reference.
-	 * <span class="attrib">@return</span> true - if the event is to be chained, false - if the event chain is to be canceled.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	handleEvent : <span class="reserved">function</span>(e) {
-		var inst = tinyMCE.selectedInstance;
-
-		<span class="comment">// Remove odd, error</span>
-		<span class="reserved">if</span> (typeof(tinyMCE) == <span class="literal">"undefined"</span>)
-			<span class="reserved">return</span> true;
-
-		<span class="comment">//tinyMCE.debug(e.type + " " + e.target.nodeName + " " + (e.relatedTarget ? e.relatedTarget.nodeName : ""));</span>
-
-		<span class="reserved">if</span> (tinyMCE.executeCallback(tinyMCE.selectedInstance, <span class="literal">'handle_event_callback'</span>, <span class="literal">'handleEvent'</span>, e))
-			<span class="reserved">return</span> false;
-
-		switch (e.type) {
-			case <span class="literal">"beforedeactivate"</span>: <span class="comment">// Was added due to bug #1439953</span>
-			case <span class="literal">"blur"</span>:
-				<span class="reserved">if</span> (tinyMCE.selectedInstance)
-					tinyMCE.selectedInstance.execCommand(<span class="literal">'mceEndTyping'</span>);
-
-				tinyMCE.hideMenus();
-
-				<span class="reserved">return</span>;
-
-			<span class="comment">// Workaround for drag drop/copy paste base href bug</span>
-			case <span class="literal">"drop"</span>:
-			case <span class="literal">"beforepaste"</span>:
-				<span class="reserved">if</span> (tinyMCE.selectedInstance)
-					tinyMCE.selectedInstance.setBaseHREF(null);
-
-				window.setTimeout(<span class="literal">"tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);"</span>, 1);
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"submit"</span>:
-				tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target);
-				tinyMCE.triggerSave();
-				tinyMCE.isNotDirty = true;
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"reset"</span>:
-				var formObj = tinyMCE.isMSIE ? window.event.srcElement : e.target;
-
-				<span class="reserved">for</span> (var i=0; i&lt;document.forms.length; i++) {
-					<span class="reserved">if</span> (document.forms[i] == formObj)
-						window.setTimeout(<span class="literal">'tinyMCE.resetForm('</span> + i + <span class="literal">');'</span>, 10);
-				}
-
-				<span class="reserved">return</span>;
-
-			case <span class="literal">"keypress"</span>:
-				<span class="reserved">if</span> (inst &amp;&amp; inst.handleShortcut(e))
-					<span class="reserved">return</span> false;
-
-				<span class="reserved">if</span> (e.target.editorId) {
-					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
-				} <span class="reserved">else</span> {
-					<span class="reserved">if</span> (e.target.ownerDocument.editorId)
-						tinyMCE.selectedInstance = tinyMCE.instances[e.target.ownerDocument.editorId];
-				}
-
-				<span class="reserved">if</span> (tinyMCE.selectedInstance)
-					tinyMCE.selectedInstance.switchSettings();
-
-				<span class="comment">// Insert P element</span>
-				<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; tinyMCE.settings[<span class="literal">'force_p_newlines'</span>] &amp;&amp; e.keyCode == 13 &amp;&amp; !e.shiftKey) {
-					<span class="comment">// Insert P element instead of BR</span>
-					<span class="reserved">if</span> (TinyMCE_ForceParagraphs._insertPara(tinyMCE.selectedInstance, e)) {
-						<span class="comment">// Cancel event</span>
-						tinyMCE.execCommand(<span class="literal">"mceAddUndoLevel"</span>);
-						tinyMCE.cancelEvent(e);
-						<span class="reserved">return</span> false;
-					}
-				}
-
-				<span class="comment">// Handle backspace</span>
-				<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; tinyMCE.settings[<span class="literal">'force_p_newlines'</span>] &amp;&amp; (e.keyCode == 8 || e.keyCode == 46) &amp;&amp; !e.shiftKey) {
-					<span class="comment">// Insert P element instead of BR</span>
-					<span class="reserved">if</span> (TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance, e.type)) {
-						<span class="comment">// Cancel event</span>
-						tinyMCE.execCommand(<span class="literal">"mceAddUndoLevel"</span>);
-						tinyMCE.cancelEvent(e);
-						<span class="reserved">return</span> false;
-					}
-				}
-
-				<span class="comment">// Return key pressed</span>
-				<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; tinyMCE.settings[<span class="literal">'force_br_newlines'</span>] &amp;&amp; e.keyCode == 13) {
-					<span class="reserved">if</span> (e.target.editorId)
-						tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
-
-					<span class="reserved">if</span> (tinyMCE.selectedInstance) {
-						var sel = tinyMCE.selectedInstance.getDoc().selection;
-						var rng = sel.createRange();
-
-						<span class="reserved">if</span> (tinyMCE.getParentElement(rng.parentElement(), <span class="literal">"li"</span>) != null)
-							<span class="reserved">return</span> false;
-
-						<span class="comment">// Cancel event</span>
-						e.returnValue = false;
-						e.cancelBubble = true;
-
-						<span class="comment">// Insert BR element</span>
-						rng.pasteHTML(<span class="literal">"&lt;br /&gt;"</span>);
-						rng.collapse(false);
-						rng.select();
-
-						tinyMCE.execCommand(<span class="literal">"mceAddUndoLevel"</span>);
-						tinyMCE.triggerNodeChange(false);
-						<span class="reserved">return</span> false;
-					}
-				}
-
-				<span class="comment">// Backspace or delete</span>
-				<span class="reserved">if</span> (e.keyCode == 8 || e.keyCode == 46) {
-					tinyMCE.selectedElement = e.target;
-					tinyMCE.linkElement = tinyMCE.getParentElement(e.target, <span class="literal">"a"</span>);
-					tinyMCE.imgElement = tinyMCE.getParentElement(e.target, <span class="literal">"img"</span>);
-					tinyMCE.triggerNodeChange(false);
-				}
-
-				<span class="reserved">return</span> false;
-			break;
-
-			case <span class="literal">"keyup"</span>:
-			case <span class="literal">"keydown"</span>:
-				tinyMCE.hideMenus();
-				tinyMCE.hasMouseMoved = false;
-
-				<span class="reserved">if</span> (inst &amp;&amp; inst.handleShortcut(e))
-					<span class="reserved">return</span> false;
-
-				<span class="reserved">if</span> (e.target.editorId)
-					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
-				<span class="reserved">else</span>
-					<span class="reserved">return</span>;
-
-				<span class="reserved">if</span> (tinyMCE.selectedInstance)
-					tinyMCE.selectedInstance.switchSettings();
-
-				var inst = tinyMCE.selectedInstance;
-
-				<span class="comment">// Handle backspace</span>
-				<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; tinyMCE.settings[<span class="literal">'force_p_newlines'</span>] &amp;&amp; (e.keyCode == 8 || e.keyCode == 46) &amp;&amp; !e.shiftKey) {
-					<span class="comment">// Insert P element instead of BR</span>
-					<span class="reserved">if</span> (TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance, e.type)) {
-						<span class="comment">// Cancel event</span>
-						tinyMCE.execCommand(<span class="literal">"mceAddUndoLevel"</span>);
-						e.preventDefault();
-						<span class="reserved">return</span> false;
-					}
-				}
-
-				tinyMCE.selectedElement = null;
-				tinyMCE.selectedNode = null;
-				var elm = tinyMCE.selectedInstance.getFocusElement();
-				tinyMCE.linkElement = tinyMCE.getParentElement(elm, <span class="literal">"a"</span>);
-				tinyMCE.imgElement = tinyMCE.getParentElement(elm, <span class="literal">"img"</span>);
-				tinyMCE.selectedElement = elm;
-
-				<span class="comment">// Update visualaids on tabs</span>
-				<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; e.type == <span class="literal">"keyup"</span> &amp;&amp; e.keyCode == 9)
-					tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(), true, tinyMCE.settings[<span class="literal">'visual'</span>], tinyMCE.selectedInstance);
-
-				<span class="comment">// Fix empty elements on return/enter, check where enter occured</span>
-				<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; e.type == <span class="literal">"keydown"</span> &amp;&amp; e.keyCode == 13)
-					tinyMCE.enterKeyElement = tinyMCE.selectedInstance.getFocusElement();
-
-				<span class="comment">// Fix empty elements on return/enter</span>
-				<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; e.type == <span class="literal">"keyup"</span> &amp;&amp; e.keyCode == 13) {
-					var elm = tinyMCE.enterKeyElement;
-					<span class="reserved">if</span> (elm) {
-						var re = new RegExp(<span class="literal">'^HR|IMG|BR$'</span>,<span class="literal">'g'</span>); <span class="comment">// Skip these</span>
-						var dre = new RegExp(<span class="literal">'^H[1-6]$'</span>,<span class="literal">'g'</span>); <span class="comment">// Add double on these</span>
-
-						<span class="reserved">if</span> (!elm.hasChildNodes() &amp;&amp; !re.test(elm.nodeName)) {
-							<span class="reserved">if</span> (dre.test(elm.nodeName))
-								elm.innerHTML = <span class="literal">"&amp;nbsp;&amp;nbsp;"</span>;
-							<span class="reserved">else</span>
-								elm.innerHTML = <span class="literal">"&amp;nbsp;"</span>;
-						}
-					}
-				}
-
-				<span class="comment">// Check if it's a position key</span>
-				var keys = tinyMCE.posKeyCodes;
-				var posKey = false;
-				<span class="reserved">for</span> (var i=0; i&lt;keys.length; i++) {
-					<span class="reserved">if</span> (keys[i] == e.keyCode) {
-						posKey = true;
-						break;
-					}
-				}
-
-				<span class="comment">// MSIE custom key handling</span>
-				<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>]) {
-					var keys = new Array(8,46); <span class="comment">// Backspace,Delete</span>
-					<span class="reserved">for</span> (var i=0; i&lt;keys.length; i++) {
-						<span class="reserved">if</span> (keys[i] == e.keyCode) {
-							<span class="reserved">if</span> (e.type == <span class="literal">"keyup"</span>)
-								tinyMCE.triggerNodeChange(false);
-						}
-					}
-				}
-
-				<span class="comment">// If Ctrl key</span>
-				<span class="reserved">if</span> (e.keyCode == 17)
-					<span class="reserved">return</span> true;
-
-				<span class="comment">// Handle Undo/Redo when typing content</span>
-
-				<span class="comment">// Start typing (non position key)</span>
-				<span class="reserved">if</span> (!posKey &amp;&amp; e.type == <span class="literal">"keyup"</span>)
-					tinyMCE.execCommand(<span class="literal">"mceStartTyping"</span>);
-
-				<span class="comment">// Store undo bookmark</span>
-				<span class="reserved">if</span> (e.type == <span class="literal">"keydown"</span> &amp;&amp; (posKey || e.ctrlKey) &amp;&amp; inst)
-					inst.undoBookmark = inst.selection.getBookmark();
-
-				<span class="comment">// End typing (position key) or some Ctrl event</span>
-				<span class="reserved">if</span> (e.type == <span class="literal">"keyup"</span> &amp;&amp; (posKey || e.ctrlKey))
-					tinyMCE.execCommand(<span class="literal">"mceEndTyping"</span>);
-
-				<span class="reserved">if</span> (posKey &amp;&amp; e.type == <span class="literal">"keyup"</span>)
-					tinyMCE.triggerNodeChange(false);
-
-				<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; e.ctrlKey)
-					window.setTimeout(<span class="literal">'tinyMCE.triggerNodeChange(false);'</span>, 1);
-			break;
-
-			case <span class="literal">"mousedown"</span>:
-			case <span class="literal">"mouseup"</span>:
-			case <span class="literal">"click"</span>:
-			case <span class="literal">"focus"</span>:
-				tinyMCE.hideMenus();
-
-				<span class="reserved">if</span> (tinyMCE.selectedInstance) {
-					tinyMCE.selectedInstance.switchSettings();
-					tinyMCE.selectedInstance.isFocused = true;
-				}
-
-				<span class="comment">// Check instance event trigged on</span>
-				var targetBody = tinyMCE.getParentElement(e.target, <span class="literal">"body"</span>);
-				<span class="reserved">for</span> (var instanceName in tinyMCE.instances) {
-					<span class="reserved">if</span> (!tinyMCE.isInstance(tinyMCE.instances[instanceName]))
-						continue;
-
-					var inst = tinyMCE.instances[instanceName];
-
-					<span class="comment">// Reset design mode if lost (on everything just in case)</span>
-					inst.autoResetDesignMode();
-
-					<span class="reserved">if</span> (inst.getBody() == targetBody) {
-						tinyMCE.selectedInstance = inst;
-						tinyMCE.selectedElement = e.target;
-						tinyMCE.linkElement = tinyMCE.getParentElement(tinyMCE.selectedElement, <span class="literal">"a"</span>);
-						tinyMCE.imgElement = tinyMCE.getParentElement(tinyMCE.selectedElement, <span class="literal">"img"</span>);
-						break;
-					}
-				}
-
-				<span class="comment">// Add first bookmark location</span>
-				<span class="reserved">if</span> (!tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark)
-					tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark = tinyMCE.selectedInstance.selection.getBookmark();
-
-				<span class="reserved">if</span> (tinyMCE.isSafari) {
-					tinyMCE.selectedInstance.lastSafariSelection = tinyMCE.selectedInstance.selection.getBookmark();
-					tinyMCE.selectedInstance.lastSafariSelectedElement = tinyMCE.selectedElement;
-
-					var lnk = tinyMCE.getParentElement(tinyMCE.selectedElement, <span class="literal">"a"</span>);
-
-					<span class="comment">// Patch the darned link</span>
-					<span class="reserved">if</span> (lnk &amp;&amp; e.type == <span class="literal">"mousedown"</span>) {
-						lnk.setAttribute(<span class="literal">"mce_real_href"</span>, lnk.getAttribute(<span class="literal">"href"</span>));
-						lnk.setAttribute(<span class="literal">"href"</span>, <span class="literal">"javascript:void(0);"</span>);
-					}
-
-					<span class="comment">// Patch back</span>
-					<span class="reserved">if</span> (lnk &amp;&amp; e.type == <span class="literal">"click"</span>) {
-						window.setTimeout(<span class="reserved">function</span>() {
-							lnk.setAttribute(<span class="literal">"href"</span>, lnk.getAttribute(<span class="literal">"mce_real_href"</span>));
-							lnk.removeAttribute(<span class="literal">"mce_real_href"</span>);
-						}, 10);
-					}
-				}
-
-				<span class="comment">// Reset selected node</span>
-				<span class="reserved">if</span> (e.type != <span class="literal">"focus"</span>)
-					tinyMCE.selectedNode = null;
-
-				tinyMCE.triggerNodeChange(false);
-				tinyMCE.execCommand(<span class="literal">"mceEndTyping"</span>);
-
-				<span class="reserved">if</span> (e.type == <span class="literal">"mouseup"</span>)
-					tinyMCE.execCommand(<span class="literal">"mceAddUndoLevel"</span>);
-
-				<span class="comment">// Just in case</span>
-				<span class="reserved">if</span> (!tinyMCE.selectedInstance &amp;&amp; e.target.editorId)
-					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
-
-				<span class="reserved">return</span> false;
-			break;
-		}
-	},
-
-	<span class="comment">/**
-	 * Returns the HTML code for a normal button control.
-	 *
-	 * <span class="attrib">@param</span> {string} id Button control id, this will be the suffix for the element id, the prefix is the editor id.
-	 * <span class="attrib">@param</span> {string} lang Language variable key name to insert as the title/alt of the button image.
-	 * <span class="attrib">@param</span> {string} img Image URL to insert, {$themeurl} and {$pluginurl} will be replaced.
-	 * <span class="attrib">@param</span> {string} cmd Command to execute when the user clicks the button.
-	 * <span class="attrib">@param</span> {string} ui Optional user interface boolean for command.
-	 * <span class="attrib">@param</span> {string} val Optional value for command.
-	 * <span class="attrib">@return</span> HTML code for a normal button based in input information.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	getButtonHTML : <span class="reserved">function</span>(id, lang, img, cmd, ui, val) {
-		var h = <span class="literal">''</span>, m, x;
-
-		cmd = <span class="literal">'tinyMCE.execInstanceCommand(\'</span>{$editor_id}\<span class="literal">',\'</span><span class="literal">' + cmd + '</span>\<span class="literal">''</span>;
-
-		<span class="reserved">if</span> (typeof(ui) != <span class="literal">"undefined"</span> &amp;&amp; ui != null)
-			cmd += <span class="literal">','</span> + ui;
-
-		<span class="reserved">if</span> (typeof(val) != <span class="literal">"undefined"</span> &amp;&amp; val != null)
-			cmd += <span class="literal">",'"</span> + val + <span class="literal">"'"</span>;
-
-		cmd += <span class="literal">');'</span>;
-
-		<span class="comment">// Use tilemaps when enabled and found and never in MSIE since it loads the tile each time from cache if cahce is disabled</span>
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">'button_tile_map'</span>) &amp;&amp; (!tinyMCE.isMSIE || tinyMCE.isOpera) &amp;&amp; (m = <span class="reserved">this</span>.buttonMap[id]) != null &amp;&amp; (tinyMCE.getParam(<span class="literal">"language"</span>) == <span class="literal">"en"</span> || img.indexOf(<span class="literal">'$lang'</span>) == -1)) {
-			<span class="comment">// Tiled button</span>
-			x = 0 - (m * 20) == 0 ? <span class="literal">'0'</span> : 0 - (m * 20);
-			h += <span class="literal">'&lt;a id="{$editor_id}_'</span> + id + <span class="literal">'" href="javascript:'</span> + cmd + <span class="literal">'" onclick="'</span> + cmd + <span class="literal">'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self"&gt;'</span>;
-			h += <span class="literal">'&lt;img src="{$themeurl}/images/spacer.gif" style="background-position: '</span> + x + <span class="literal">'px 0" title="{$'</span> + lang + <span class="literal">'}" /&gt;'</span>;
-			h += <span class="literal">'&lt;/a&gt;'</span>;
-		} <span class="reserved">else</span> {
-			<span class="comment">// Normal button</span>
-			h += <span class="literal">'&lt;a id="{$editor_id}_'</span> + id + <span class="literal">'" href="javascript:'</span> + cmd + <span class="literal">'" onclick="'</span> + cmd + <span class="literal">'return false;" onmousedown="return false;" class="mceButtonNormal" target="_self"&gt;'</span>;
-			h += <span class="literal">'&lt;img src="'</span> + img + <span class="literal">'" title="{$'</span> + lang + <span class="literal">'}" /&gt;'</span>;
-			h += <span class="literal">'&lt;/a&gt;'</span>;
-		}
-
-		<span class="reserved">return</span> h;
-	},
-
-	<span class="comment">/**
-	 * Adds a list of buttons available in the tiled button image used by the button_tile_map option.
-	 *
-	 * <span class="attrib">@param</span> {string} m Comma separated list of buttons that are available in tiled image.
-	 */</span>
-	addButtonMap : <span class="reserved">function</span>(m) {
-		var i, a = m.replace(/\s+/, <span class="literal">''</span>).split(<span class="literal">','</span>);
-
-		<span class="reserved">for</span> (i=0; i&lt;a.length; i++)
-			<span class="reserved">this</span>.buttonMap[a[i]] = i;
-	},
-
-	<span class="comment">/**
-	 * Piggyback onsubmit event handler function, this will remove/hide the TinyMCE specific form elements
-	 * call triggerSave to fill the textarea with the correct contents then call the old piggy backed event handler.
-	 */</span>
-	submitPatch : <span class="reserved">function</span>() {
-		tinyMCE.removeTinyMCEFormElements(<span class="reserved">this</span>);
-		tinyMCE.triggerSave();
-		<span class="reserved">this</span>.mceOldSubmit();
-		tinyMCE.isNotDirty = true;
-	},
-
-	<span class="comment">/**
-	 * Gets executed when the page loads or get intitialized. This function will then convert all textareas/divs that
-	 * is to be converted into TinyMCE editor controls.
-	 *
-	 * <span class="attrib">@return</span> true - if the event is to be chained, false - if the event chain is to be canceled.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	onLoad : <span class="reserved">function</span>() {
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera &amp;&amp; window.event.type == <span class="literal">"readystatechange"</span> &amp;&amp; document.readyState != <span class="literal">"complete"</span>)
-			<span class="reserved">return</span> true;
-
-		<span class="reserved">if</span> (tinyMCE.isLoaded)
-			<span class="reserved">return</span> true;
-
-		tinyMCE.isLoaded = true;
-
-		tinyMCE.dispatchCallback(null, <span class="literal">'onpageload'</span>, <span class="literal">'onPageLoad'</span>);
-
-		<span class="reserved">for</span> (var c=0; c&lt;tinyMCE.configs.length; c++) {
-			tinyMCE.settings = tinyMCE.configs[c];
-
-			var selector = tinyMCE.getParam(<span class="literal">"editor_selector"</span>);
-			var deselector = tinyMCE.getParam(<span class="literal">"editor_deselector"</span>);
-			var elementRefAr = new Array();
-
-			<span class="comment">// Add submit triggers</span>
-			<span class="reserved">if</span> (document.forms &amp;&amp; tinyMCE.settings[<span class="literal">'add_form_submit_trigger'</span>] &amp;&amp; !tinyMCE.submitTriggers) {
-				<span class="reserved">for</span> (var i=0; i&lt;document.forms.length; i++) {
-					var form = document.forms[i];
-
-					tinyMCE.addEvent(form, <span class="literal">"submit"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.handleEvent);
-					tinyMCE.addEvent(form, <span class="literal">"reset"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>.handleEvent);
-					tinyMCE.submitTriggers = true; <span class="comment">// Do it only once</span>
-
-					<span class="comment">// Patch the form.submit function</span>
-					<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'submit_patch'</span>]) {
-						try {
-							form.mceOldSubmit = form.submit;
-							form.submit = TinyMCE_Engine.<span class="reserved">prototype</span>.submitPatch;
-						} catch (e) {
-							<span class="comment">// Do nothing</span>
-						}
-					}
-				}
-			}
-
-			<span class="comment">// Add editor instances based on mode</span>
-			var mode = tinyMCE.settings[<span class="literal">'mode'</span>];
-			switch (mode) {
-				case <span class="literal">"exact"</span>:
-					var elements = tinyMCE.getParam(<span class="literal">'elements'</span>, <span class="literal">''</span>, true, <span class="literal">','</span>);
-
-					<span class="reserved">for</span> (var i=0; i&lt;elements.length; i++) {
-						var element = tinyMCE._getElementById(elements[i]);
-						var trigger = element ? element.getAttribute(tinyMCE.settings[<span class="literal">'textarea_trigger'</span>]) : <span class="literal">""</span>;
-
-						<span class="reserved">if</span> (tinyMCE.getAttrib(element, <span class="literal">"class"</span>).indexOf(deselector) != -1)
-							continue;
-
-						<span class="reserved">if</span> (trigger == <span class="literal">"false"</span>)
-							continue;
-
-						<span class="reserved">if</span> ((tinyMCE.settings[<span class="literal">'ask'</span>] || tinyMCE.settings[<span class="literal">'convert_on_click'</span>]) &amp;&amp; element) {
-							elementRefAr[elementRefAr.length] = element;
-							continue;
-						}
-
-						<span class="reserved">if</span> (element)
-							tinyMCE.addMCEControl(element, elements[i]);
-						<span class="reserved">else</span> <span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'debug'</span>])
-							alert(<span class="literal">"Error: Could not find element by id or name: "</span> + elements[i]);
-					}
-				break;
-
-				case <span class="literal">"specific_textareas"</span>:
-				case <span class="literal">"textareas"</span>:
-					var nodeList = document.getElementsByTagName(<span class="literal">"textarea"</span>);
-
-					<span class="reserved">for</span> (var i=0; i&lt;nodeList.length; i++) {
-						var elm = nodeList.item(i);
-						var trigger = elm.getAttribute(tinyMCE.settings[<span class="literal">'textarea_trigger'</span>]);
-
-						<span class="reserved">if</span> (selector != <span class="literal">''</span> &amp;&amp; tinyMCE.getAttrib(elm, <span class="literal">"class"</span>).indexOf(selector) == -1)
-							continue;
-
-						<span class="reserved">if</span> (selector != <span class="literal">''</span>)
-							trigger = selector != <span class="literal">""</span> ? <span class="literal">"true"</span> : <span class="literal">""</span>;
-
-						<span class="reserved">if</span> (tinyMCE.getAttrib(elm, <span class="literal">"class"</span>).indexOf(deselector) != -1)
-							continue;
-
-						<span class="reserved">if</span> ((mode == <span class="literal">"specific_textareas"</span> &amp;&amp; trigger == <span class="literal">"true"</span>) || (mode == <span class="literal">"textareas"</span> &amp;&amp; trigger != <span class="literal">"false"</span>))
-							elementRefAr[elementRefAr.length] = elm;
-					}
-				break;
-			}
-
-			<span class="reserved">for</span> (var i=0; i&lt;elementRefAr.length; i++) {
-				var element = elementRefAr[i];
-				var elementId = element.name ? element.name : element.id;
-
-				<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'ask'</span>] || tinyMCE.settings[<span class="literal">'convert_on_click'</span>]) {
-					<span class="comment">// Focus breaks in Mozilla</span>
-					<span class="reserved">if</span> (tinyMCE.isGecko) {
-						var settings = tinyMCE.settings;
-
-						tinyMCE.addEvent(element, <span class="literal">"focus"</span>, <span class="reserved">function</span> (e) {window.setTimeout(<span class="reserved">function</span>() {TinyMCE_Engine.<span class="reserved">prototype</span>.confirmAdd(e, settings);}, 10);});
-
-						<span class="reserved">if</span> (element.nodeName != <span class="literal">"TEXTAREA"</span> &amp;&amp; element.nodeName != <span class="literal">"INPUT"</span>)
-							tinyMCE.addEvent(element, <span class="literal">"click"</span>, <span class="reserved">function</span> (e) {window.setTimeout(<span class="reserved">function</span>() {TinyMCE_Engine.<span class="reserved">prototype</span>.confirmAdd(e, settings);}, 10);});
-						<span class="comment">// tinyMCE.addEvent(element, "mouseover", function (e) {window.setTimeout(function() {TinyMCE_Engine.prototype.confirmAdd(e, settings);}, 10);});</span>
-					} <span class="reserved">else</span> {
-						var settings = tinyMCE.settings;
-
-						tinyMCE.addEvent(element, <span class="literal">"focus"</span>, <span class="reserved">function</span> () { TinyMCE_Engine.<span class="reserved">prototype</span>.confirmAdd(null, settings); });
-						tinyMCE.addEvent(element, <span class="literal">"click"</span>, <span class="reserved">function</span> () { TinyMCE_Engine.<span class="reserved">prototype</span>.confirmAdd(null, settings); });
-						<span class="comment">// tinyMCE.addEvent(element, "mouseenter", function () { TinyMCE_Engine.prototype.confirmAdd(null, settings); });</span>
-					}
-				} <span class="reserved">else</span>
-					tinyMCE.addMCEControl(element, elementId);
-			}
-
-			<span class="comment">// Handle auto focus</span>
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'auto_focus'</span>]) {
-				window.setTimeout(<span class="reserved">function</span> () {
-					var inst = tinyMCE.getInstanceById(tinyMCE.settings[<span class="literal">'auto_focus'</span>]);
-					inst.selection.selectNode(inst.getBody(), true, true);
-					inst.contentWindow.focus();
-				}, 10);
-			}
-
-			tinyMCE.dispatchCallback(null, <span class="literal">'oninit'</span>, <span class="literal">'onInit'</span>);
-		}
-	},
-
-	<span class="comment">/**
-	 * Returns true/false if a specific object is a TinyMCE_Control instance or not.
-	 *
-	 * <span class="attrib">@param</span> {object} o Object to check.
-	 * <span class="attrib">@return</span> true/false if it's a control or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	isInstance : <span class="reserved">function</span>(o) {
-		<span class="reserved">return</span> o != null &amp;&amp; typeof(o) == <span class="literal">"object"</span> &amp;&amp; o.isTinyMCE_Control;
-	},
-
-	<span class="comment">/**
-	 * Returns a specific configuration setting or the default value if it wasn't found.
-	 *
-	 * <span class="attrib">@param</span> {string} name Configuration setting to get.
-	 * <span class="attrib">@param</span> {string} default_value Default value to return if it wasn't found.
-	 * <span class="attrib">@param</span> {boolean} strip_whitespace Optional remove all whitespace.
-	 * <span class="attrib">@param</span> {string} split_chr Split char/regex/string.
-	 * <span class="attrib">@return</span> Number, string or other object based in parameter and default_value.
-	 * <span class="attrib">@type</span> object
-	 */</span>
-	getParam : <span class="reserved">function</span>(name, default_value, strip_whitespace, split_chr) {
-		var value = (typeof(<span class="reserved">this</span>.settings[name]) == <span class="literal">"undefined"</span>) ? default_value : <span class="reserved">this</span>.settings[name];
-
-		<span class="comment">// Fix bool values</span>
-		<span class="reserved">if</span> (value == <span class="literal">"true"</span> || value == <span class="literal">"false"</span>)
-			<span class="reserved">return</span> (value == <span class="literal">"true"</span>);
-
-		<span class="reserved">if</span> (strip_whitespace)
-			value = tinyMCE.regexpReplace(value, <span class="literal">"[ \t\r\n]"</span>, <span class="literal">""</span>);
-
-		<span class="reserved">if</span> (typeof(split_chr) != <span class="literal">"undefined"</span> &amp;&amp; split_chr != null) {
-			value = value.split(split_chr);
-			var outArray = new Array();
-
-			<span class="reserved">for</span> (var i=0; i&lt;value.length; i++) {
-				<span class="reserved">if</span> (value[i] &amp;&amp; value[i] != <span class="literal">""</span>)
-					outArray[outArray.length] = value[i];
-			}
-
-			value = outArray;
-		}
-
-		<span class="reserved">return</span> value;
-	},
-
-	<span class="comment">/**
-	 * Returns a language variable value from the language packs.
-	 *
-	 * <span class="attrib">@param</span> {string} name Name of the key to retrive.
-	 * <span class="attrib">@param</span> {string} default_value Optional default value to return if it wasn't found.
-	 * <span class="attrib">@param</span> {boolean} parse_entities Is HTML entities to be resolved or not.
-	 * <span class="attrib">@param</span> {Array} va Optional name/value array of variables to replace in language string.	 
-	 * <span class="attrib">@return</span> Language string value could be a number if it's a relative dimenstion.
-	 * <span class="attrib">@type</span> object
-	 */</span>
-	getLang : <span class="reserved">function</span>(name, default_value, parse_entities, va) {
-		var v = (typeof(tinyMCELang[name]) == <span class="literal">"undefined"</span>) ? default_value : tinyMCELang[name], n;
-
-		<span class="reserved">if</span> (parse_entities)
-			v = tinyMCE.entityDecode(v);
-
-		<span class="reserved">if</span> (va) {
-			<span class="reserved">for</span> (n in va)
-				v = <span class="reserved">this</span>.replaceVar(v, n, va[n]);
-		}
-
-		<span class="reserved">return</span> v;
-	},
-
-	<span class="comment">/**
-	 * HTML entity decode a string, replaces &amp;lt; with &lt;.
-	 *
-	 * <span class="attrib">@param</span> {string} s Entity string to decode into normal string.
-	 * <span class="attrib">@return</span> Entity decoded string.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	entityDecode : <span class="reserved">function</span>(s) {
-		var e = document.createElement(<span class="literal">"div"</span>);
-		e.innerHTML = s;
-		<span class="reserved">return</span> e.innerHTML;
-	},
-
-	<span class="comment">/**
-	 * Adds language items to the global language array.
-	 *
-	 * <span class="attrib">@param</span> {string} prefix Prefix string to add infront of every array item before adding it.
-	 * <span class="attrib">@param</span> {Array} ar Language item array to add to global language array.
-	 */</span>
-	addToLang : <span class="reserved">function</span>(prefix, ar) {
-		<span class="reserved">for</span> (var key in ar) {
-			<span class="reserved">if</span> (typeof(ar[key]) == <span class="literal">'function'</span>)
-				continue;
-
-			tinyMCELang[(key.indexOf(<span class="literal">'lang_'</span>) == -1 ? <span class="literal">'lang_'</span> : <span class="literal">''</span>) + (prefix != <span class="literal">''</span> ? (prefix + <span class="literal">"_"</span>) : <span class="literal">''</span>) + key] = ar[key];
-		}
-
-	<span class="comment">//	for (var key in ar)</span>
-	<span class="comment">//		tinyMCELang[(key.indexOf('lang_') == -1 ? 'lang_' : '') + (prefix != '' ? (prefix + "_") : '') + key] = "|" + ar[key] + "|";</span>
-	},
-
-	<span class="comment">/**
-	 * Triggers a nodeChange event to every theme and plugin. This will be executed when the cursor moves or
-	 * when a command that modifies the editor contents is executed.
-	 *
-	 * <span class="attrib">@param</span> {boolean} focus Optional state if the last selected editor instance is to be focused or not.
-	 * <span class="attrib">@param</span> {boolean} setup_content Optional state if it's called from setup content function or not.
-	 */</span>
-	triggerNodeChange : <span class="reserved">function</span>(focus, setup_content) {
-		<span class="reserved">if</span> (tinyMCE.selectedInstance) {
-			var inst = tinyMCE.selectedInstance;
-			var editorId = inst.editorId;
-			var elm = (typeof(setup_content) != <span class="literal">"undefined"</span> &amp;&amp; setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
-			var undoIndex = -1;
-			var undoLevels = -1;
-			var anySelection = false;
-			var selectedText = inst.selection.getSelectedText();
-
-			<span class="reserved">if</span> (setup_content &amp;&amp; tinyMCE.isGecko &amp;&amp; inst.isHidden())
-				elm = inst.getBody();
-
-			inst.switchSettings();
-
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">"auto_resize"</span>]) {
-				var doc = inst.getDoc();
-
-				inst.iframeElement.style.width = doc.body.offsetWidth + <span class="literal">"px"</span>;
-				inst.iframeElement.style.height = doc.body.offsetHeight + <span class="literal">"px"</span>;
-			}
-
-			<span class="reserved">if</span> (tinyMCE.selectedElement)
-				anySelection = (tinyMCE.selectedElement.nodeName.toLowerCase() == <span class="literal">"img"</span>) || (selectedText &amp;&amp; selectedText.length &gt; 0);
-
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'custom_undo_redo'</span>]) {
-				undoIndex = inst.undoRedo.undoIndex;
-				undoLevels = inst.undoRedo.undoLevels.length;
-			}
-
-			tinyMCE.dispatchCallback(inst, <span class="literal">'handle_node_change_callback'</span>, <span class="literal">'handleNodeChange'</span>, editorId, elm, undoIndex, undoLevels, inst.visualAid, anySelection, setup_content);
-		}
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.selectedInstance &amp;&amp; (typeof(focus) == <span class="literal">"undefined"</span> || focus))
-			<span class="reserved">this</span>.selectedInstance.contentWindow.focus();
-	},
-
-	<span class="comment">/**
-	 * Executes the custom cleanup functions on the specified content.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} inst TinyMCE editor control instance.
-	 * <span class="attrib">@param</span> {string} type Event type to call.
-	 * <span class="attrib">@param</span> {object} content DOM element or string to pass to handlers depending on type.
-	 * <span class="attrib">@return</span> string or DOM element depending on type.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_customCleanup : <span class="reserved">function</span>(inst, type, content) {
-		var pl, po, i;
-
-		<span class="comment">// Call custom cleanup</span>
-		var customCleanup = tinyMCE.settings[<span class="literal">'cleanup_callback'</span>];
-		<span class="reserved">if</span> (customCleanup != <span class="literal">""</span> &amp;&amp; eval(<span class="literal">"typeof("</span> + customCleanup + <span class="literal">")"</span>) != <span class="literal">"undefined"</span>)
-			content = eval(customCleanup + <span class="literal">"(type, content, inst);"</span>);
-
-		<span class="comment">// Trigger plugin cleanups</span>
-		pl = inst.plugins;
-		<span class="reserved">for</span> (i=0; i&lt;pl.length; i++) {
-			po = tinyMCE.plugins[pl[i]];
-
-			<span class="reserved">if</span> (po &amp;&amp; po.cleanup)
-				content = po.cleanup(type, content, inst);
-		}
-
-		<span class="reserved">return</span> content;
-	},
-
-	<span class="comment">/**
-	 * Sets the HTML contents of the selected editor instance.
-	 *
-	 * <span class="attrib">@param</span> {string} h HTML contents to set in the selected instance.
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	setContent : <span class="reserved">function</span>(h) {
-		<span class="reserved">if</span> (tinyMCE.selectedInstance) {
-			tinyMCE.selectedInstance.execCommand(<span class="literal">'mceSetContent'</span>, false, h);
-			tinyMCE.selectedInstance.repaint();
-		}
-	},
-
-	<span class="comment">/**
-	 * Loads a theme specific language pack.
-	 *
-	 * <span class="attrib">@param</span> {string} name Optional name of the theme to load language pack from.
-	 */</span>
-	importThemeLanguagePack : <span class="reserved">function</span>(name) {
-		<span class="reserved">if</span> (typeof(name) == <span class="literal">"undefined"</span>)
-			name = tinyMCE.settings[<span class="literal">'theme'</span>];
-
-		tinyMCE.loadScript(tinyMCE.baseURL + <span class="literal">'/themes/'</span> + name + <span class="literal">'/langs/'</span> + tinyMCE.settings[<span class="literal">'language'</span>] + <span class="literal">'.js'</span>);
-	},
-
-	<span class="comment">/**
-	 * Loads a plugin specific language pack.
-	 *
-	 * <span class="attrib">@param</span> {string} name Plugin name/id to load language pack for.
-	 * <span class="attrib">@param</span> {string} valid_languages Comma separated list of valid languages for the plugin.
-	 */</span>
-	importPluginLanguagePack : <span class="reserved">function</span>(name, valid_languages) {
-		var lang = <span class="literal">"en"</span>, b = tinyMCE.baseURL + <span class="literal">'/plugins/'</span> + name;
-
-		valid_languages = valid_languages.split(<span class="literal">','</span>);
-		<span class="reserved">for</span> (var i=0; i&lt;valid_languages.length; i++) {
-			<span class="reserved">if</span> (tinyMCE.settings[<span class="literal">'language'</span>] == valid_languages[i])
-				lang = tinyMCE.settings[<span class="literal">'language'</span>];
-		}
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.plugins[name])
-			b = <span class="reserved">this</span>.plugins[name].baseURL;
-
-		tinyMCE.loadScript(b + <span class="literal">'/langs/'</span> + lang +  <span class="literal">'.js'</span>);
-	},
-
-	<span class="comment">/**
-	 * Replaces language, args and settings variables in a HTML string.
-	 *
-	 * <span class="attrib">@param</span> {string} h HTML string to replace language variables in.
-	 * <span class="attrib">@param</span> {Array} as Optional arguments array to take variables from.
-	 * <span class="attrib">@return</span> HTML string with replaced varliables.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	applyTemplate : <span class="reserved">function</span>(h, as) {
-		var i, s, ar = h.match(new RegExp(<span class="literal">'\\{\\$[a-z0-9_]+\\}'</span>, <span class="literal">'gi'</span>));
-
-		<span class="reserved">if</span> (ar &amp;&amp; ar.length &gt; 0) {
-			<span class="reserved">for</span> (i=ar.length-1; i&gt;=0; i--) {
-				s = ar[i].substring(2, ar[i].length-1);
-
-				<span class="reserved">if</span> (s.indexOf(<span class="literal">'lang_'</span>) == 0 &amp;&amp; tinyMCELang[s])
-					h = tinyMCE.replaceVar(h, s, tinyMCELang[s]);
-				<span class="reserved">else</span> <span class="reserved">if</span> (as &amp;&amp; as[s])
-					h = tinyMCE.replaceVar(h, s, as[s]);
-				<span class="reserved">else</span> <span class="reserved">if</span> (tinyMCE.settings[s])
-					h = tinyMCE.replaceVar(h, s, tinyMCE.settings[s]);
-			}
-		}
-
-		h = tinyMCE.replaceVar(h, <span class="literal">"themeurl"</span>, tinyMCE.themeURL);
-
-		<span class="reserved">return</span> h;
-	},
-
-	<span class="comment">/**
-	 * Replaces a specific variable in the string with a nother string.
-	 *
-	 * <span class="attrib">@param</span> {string} h String to search in for the variable.
-	 * <span class="attrib">@param</span> {string} r Variable name to search for.
-	 * <span class="attrib">@param</span> {string} v Value to insert where a variable is found.
-	 * <span class="attrib">@return</span> String with replaced variable.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	replaceVar : <span class="reserved">function</span>(h, r, v) {
-		<span class="reserved">return</span> h.replace(new RegExp(<span class="literal">'{\\\$'</span> + r + <span class="literal">'}'</span>, <span class="literal">'g'</span>), v);
-	},
-
-	<span class="comment">/**
-	 * Opens a popup window based in the specified input data. This function
-	 * is used for all popup windows in TinyMCE.
-	 *
-	 * These are the current template keys: file, width, height, close_previous.
-	 *
-	 * <span class="attrib">@param</span> {Array} template Popup template data such as with, height etc.
-	 * <span class="attrib">@param</span> {Array} args Popup arguments that is to be passed to the popup such as custom data.
-	 */</span>
-	openWindow : <span class="reserved">function</span>(template, args) {
-		var html, width, height, x, y, resizable, scrollbars, url;
-
-		args[<span class="literal">'mce_template_file'</span>] = template[<span class="literal">'file'</span>];
-		args[<span class="literal">'mce_width'</span>] = template[<span class="literal">'width'</span>];
-		args[<span class="literal">'mce_height'</span>] = template[<span class="literal">'height'</span>];
-		tinyMCE.windowArgs = args;
-
-		html = template[<span class="literal">'html'</span>];
-		<span class="reserved">if</span> (!(width = parseInt(template[<span class="literal">'width'</span>])))
-			width = 320;
-
-		<span class="reserved">if</span> (!(height = parseInt(template[<span class="literal">'height'</span>])))
-			height = 200;
-
-		<span class="comment">// Add to height in M$ due to SP2 WHY DON'T YOU GUYS IMPLEMENT innerWidth of windows!!</span>
-		<span class="reserved">if</span> (tinyMCE.isMSIE)
-			height += 40;
-		<span class="reserved">else</span>
-			height += 20;
-
-		x = parseInt(screen.width / 2.0) - (width / 2.0);
-		y = parseInt(screen.height / 2.0) - (height / 2.0);
-
-		resizable = (args &amp;&amp; args[<span class="literal">'resizable'</span>]) ? args[<span class="literal">'resizable'</span>] : <span class="literal">"no"</span>;
-		scrollbars = (args &amp;&amp; args[<span class="literal">'scrollbars'</span>]) ? args[<span class="literal">'scrollbars'</span>] : <span class="literal">"no"</span>;
-
-		<span class="reserved">if</span> (template[<span class="literal">'file'</span>].charAt(0) != <span class="literal">'/'</span> &amp;&amp; template[<span class="literal">'file'</span>].indexOf(<span class="literal">'://'</span>) == -1)
-			url = tinyMCE.baseURL + <span class="literal">"/themes/"</span> + tinyMCE.getParam(<span class="literal">"theme"</span>) + <span class="literal">"/"</span> + template[<span class="literal">'file'</span>];
-		<span class="reserved">else</span>
-			url = template[<span class="literal">'file'</span>];
-
-		<span class="comment">// Replace all args as variables in URL</span>
-		<span class="reserved">for</span> (var name in args) {
-			<span class="reserved">if</span> (typeof(args[name]) == <span class="literal">'function'</span>)
-				continue;
-
-			url = tinyMCE.replaceVar(url, name, escape(args[name]));
-		}
-
-		<span class="reserved">if</span> (html) {
-			html = tinyMCE.replaceVar(html, <span class="literal">"css"</span>, <span class="reserved">this</span>.settings[<span class="literal">'popups_css'</span>]);
-			html = tinyMCE.applyTemplate(html, args);
-
-			var win = window.open(<span class="literal">""</span>, <span class="literal">"mcePopup"</span> + new Date().getTime(), <span class="literal">"top="</span> + y + <span class="literal">",left="</span> + x + <span class="literal">",scrollbars="</span> + scrollbars + <span class="literal">",dialog=yes,minimizable="</span> + resizable + <span class="literal">",modal=yes,width="</span> + width + <span class="literal">",height="</span> + height + <span class="literal">",resizable="</span> + resizable);
-			<span class="reserved">if</span> (win == null) {
-				alert(tinyMCELang[<span class="literal">'lang_popup_blocked'</span>]);
-				<span class="reserved">return</span>;
-			}
-
-			win.document.write(html);
-			win.document.close();
-			win.resizeTo(width, height);
-			win.focus();
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> ((tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera) &amp;&amp; resizable != <span class="literal">'yes'</span> &amp;&amp; tinyMCE.settings[<span class="literal">"dialog_type"</span>] == <span class="literal">"modal"</span>) {
-				height += 10;
-
-				var features = <span class="literal">"resizable:"</span> + resizable 
-					+ <span class="literal">";scroll:"</span>
-					+ scrollbars + <span class="literal">";status:yes;center:yes;help:no;dialogWidth:"</span>
-					+ width + <span class="literal">"px;dialogHeight:"</span> + height + <span class="literal">"px;"</span>;
-
-				window.showModalDialog(url, window, features);
-			} <span class="reserved">else</span> {
-				var modal = (resizable == <span class="literal">"yes"</span>) ? <span class="literal">"no"</span> : <span class="literal">"yes"</span>;
-
-				<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; tinyMCE.isMac)
-					modal = <span class="literal">"no"</span>;
-
-				<span class="reserved">if</span> (template[<span class="literal">'close_previous'</span>] != <span class="literal">"no"</span>)
-					try {tinyMCE.lastWindow.close();} catch (ex) {}
-
-				var win = window.open(url, <span class="literal">"mcePopup"</span> + new Date().getTime(), <span class="literal">"top="</span> + y + <span class="literal">",left="</span> + x + <span class="literal">",scrollbars="</span> + scrollbars + <span class="literal">",dialog="</span> + modal + <span class="literal">",minimizable="</span> + resizable + <span class="literal">",modal="</span> + modal + <span class="literal">",width="</span> + width + <span class="literal">",height="</span> + height + <span class="literal">",resizable="</span> + resizable);
-				<span class="reserved">if</span> (win == null) {
-					alert(tinyMCELang[<span class="literal">'lang_popup_blocked'</span>]);
-					<span class="reserved">return</span>;
-				}
-
-				<span class="reserved">if</span> (template[<span class="literal">'close_previous'</span>] != <span class="literal">"no"</span>)
-					tinyMCE.lastWindow = win;
-
-				eval(<span class="literal">'try { win.resizeTo(width, height); } catch(e) { }'</span>);
-
-				<span class="comment">// Make it bigger if statusbar is forced</span>
-				<span class="reserved">if</span> (tinyMCE.isGecko) {
-					<span class="reserved">if</span> (win.document.defaultView.statusbar.visible)
-						win.resizeBy(0, tinyMCE.isMac ? 10 : 24);
-				}
-
-				win.focus();
-			}
-		}
-	},
-
-	<span class="comment">/**
-	 * Closes the specified window. This function is deprecated and should be replaced with
-	 * tinyMCEPopup.close();.
-	 *
-	 * <span class="attrib">@param</span> {DOMWindow} win Window reference to close.
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	closeWindow : <span class="reserved">function</span>(win) {
-		win.close();
-	},
-
-	<span class="comment">/**
-	 * Returns the visual aid class string, this will add/remove the visual aid class.
-	 *
-	 * <span class="attrib">@param</span> {string} class_name Class name value to add/remove visual aid classes from.
-	 * <span class="attrib">@param</span> {boolean} state true/false if the classes should be added or removed.
-	 * <span class="attrib">@return</span> New class value containing the visual aid classes or not.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	getVisualAidClass : <span class="reserved">function</span>(class_name, state) {
-		var aidClass = tinyMCE.settings[<span class="literal">'visual_table_class'</span>];
-
-		<span class="reserved">if</span> (typeof(state) == <span class="literal">"undefined"</span>)
-			state = tinyMCE.settings[<span class="literal">'visual'</span>];
-
-		<span class="comment">// Split</span>
-		var classNames = new Array();
-		var ar = class_name.split(<span class="literal">' '</span>);
-		<span class="reserved">for</span> (var i=0; i&lt;ar.length; i++) {
-			<span class="reserved">if</span> (ar[i] == aidClass)
-				ar[i] = <span class="literal">""</span>;
-
-			<span class="reserved">if</span> (ar[i] != <span class="literal">""</span>)
-				classNames[classNames.length] = ar[i];
-		}
-
-		<span class="reserved">if</span> (state)
-			classNames[classNames.length] = aidClass;
-
-		<span class="comment">// Glue</span>
-		var className = <span class="literal">""</span>;
-		<span class="reserved">for</span> (var i=0; i&lt;classNames.length; i++) {
-			<span class="reserved">if</span> (i &gt; 0)
-				className += <span class="literal">" "</span>;
-
-			className += classNames[i];
-		}
-
-		<span class="reserved">return</span> className;
-	},
-
-	<span class="comment">/**
-	 * Adds visual aid classes to all elements that need them recursive in the DOM tree.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} el HTML element to add visual aid classes to.
-	 * <span class="attrib">@param</span> {boolean} deep Should they be added to all children aswell.
-	 * <span class="attrib">@param</span> {boolean} state Should they be added or removed.
-	 * <span class="attrib">@param</span> {TinyMCE_Control} inst TinyMCE editor control instance to add/remove them to/from.
-	 */</span>
-	handleVisualAid : <span class="reserved">function</span>(el, deep, state, inst, skip_dispatch) {
-		<span class="reserved">if</span> (!el)
-			<span class="reserved">return</span>;
-
-		<span class="reserved">if</span> (!skip_dispatch)
-			tinyMCE.dispatchCallback(inst, <span class="literal">'handle_visual_aid_callback'</span>, <span class="literal">'handleVisualAid'</span>, el, deep, state, inst);
-
-		var tableElement = null;
-
-		switch (el.nodeName) {
-			case <span class="literal">"TABLE"</span>:
-				var oldW = el.style.width;
-				var oldH = el.style.height;
-				var bo = tinyMCE.getAttrib(el, <span class="literal">"border"</span>);
-
-				bo = bo == <span class="literal">""</span> || bo == <span class="literal">"0"</span> ? true : false;
-
-				tinyMCE.setAttrib(el, <span class="literal">"class"</span>, tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el, <span class="literal">"class"</span>), state &amp;&amp; bo));
-
-				el.style.width = oldW;
-				el.style.height = oldH;
-
-				<span class="reserved">for</span> (var y=0; y&lt;el.rows.length; y++) {
-					<span class="reserved">for</span> (var x=0; x&lt;el.rows[y].cells.length; x++) {
-						var cn = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el.rows[y].cells[x], <span class="literal">"class"</span>), state &amp;&amp; bo);
-						tinyMCE.setAttrib(el.rows[y].cells[x], <span class="literal">"class"</span>, cn);
-					}
-				}
-
-				break;
-
-			case <span class="literal">"A"</span>:
-				var anchorName = tinyMCE.getAttrib(el, <span class="literal">"name"</span>);
-
-				<span class="reserved">if</span> (anchorName != <span class="literal">''</span> &amp;&amp; state) {
-					el.title = anchorName;
-					el.className = <span class="literal">'mceItemAnchor'</span>;
-				} <span class="reserved">else</span> <span class="reserved">if</span> (anchorName != <span class="literal">''</span> &amp;&amp; !state)
-					el.className = <span class="literal">''</span>;
-
-				break;
-		}
-
-		<span class="reserved">if</span> (deep &amp;&amp; el.hasChildNodes()) {
-			<span class="reserved">for</span> (var i=0; i&lt;el.childNodes.length; i++)
-				tinyMCE.handleVisualAid(el.childNodes[i], deep, state, inst, true);
-		}
-	},
-
-	<span class="comment">/*
-	applyClassesToFonts : function(doc, size) {
-		var f = doc.getElementsByTagName("font");
-		for (var i=0; i&lt;f.length; i++) {
-			var s = tinyMCE.getAttrib(f[i], "size");
-
-			if (s != "")
-				tinyMCE.setAttrib(f[i], 'class', "mceItemFont" + s);
-		}
-
-		if (typeof(size) != "undefined") {
-			var css = "";
-
-			for (var x=0; x&lt;doc.styleSheets.length; x++) {
-				for (var i=0; i&lt;doc.styleSheets[x].rules.length; i++) {
-					if (doc.styleSheets[x].rules[i].selectorText == '#mceSpanFonts .mceItemFont' + size) {
-						css = doc.styleSheets[x].rules[i].style.cssText;
-						break;
-					}
-				}
-
-				if (css != "")
-					break;
-			}
-
-			if (doc.styleSheets[0].rules[0].selectorText == "FONT")
-				doc.styleSheets[0].removeRule(0);
-
-			doc.styleSheets[0].addRule("FONT", css, 0);
-		}
-	},
-	*/</span>
-
-	<span class="comment">/**
-	 * Fixes a Gecko specific bug where href, src attribute values gets converted incorrectly
-	 * when inserted into editor. This function will replace all src, href with mce_tsrc and mce_thref
-	 * to keep the values from chaging when they get inserted.
-	 *
-	 * <span class="attrib">@param</span> {boolean} m Mode state, true is to replace the src, href attributes to mce_tsrc and mce_thref.
-	 * <span class="attrib">@param</span> {HTMLElement} e HTML element to replace them in. (Will be used if m is 0)
-	 * <span class="attrib">@param</span> {string} h HTML code to replace them in. (Will be used if m is 1)
-	 * <span class="attrib">@return</span> Converted string or the specified HTML value depending on mode.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	fixGeckoBaseHREFBug : <span class="reserved">function</span>(m, e, h) {
-		var nl, i, a, n, xsrc, xhref, el;
-
-		<span class="reserved">if</span> (tinyMCE.isGecko) {
-			<span class="reserved">if</span> (m == 1) {
-				h = h.replace(/\ssrc=/gi, <span class="literal">" mce_tsrc="</span>);
-				h = h.replace(/\shref=/gi, <span class="literal">" mce_thref="</span>);
-
-				<span class="reserved">return</span> h;
-			} <span class="reserved">else</span> {
-				el = new Array(<span class="literal">'a'</span>,<span class="literal">'img'</span>,<span class="literal">'select'</span>,<span class="literal">'area'</span>,<span class="literal">'iframe'</span>,<span class="literal">'base'</span>,<span class="literal">'input'</span>,<span class="literal">'script'</span>,<span class="literal">'embed'</span>,<span class="literal">'object'</span>,<span class="literal">'link'</span>);
-
-				<span class="reserved">for</span> (a=0; a&lt;el.length; a++) {
-					n = e.getElementsByTagName(el[a]);
-
-					<span class="reserved">for</span> (i=0; i&lt;n.length; i++) {
-						xsrc = tinyMCE.getAttrib(n[i], <span class="literal">"mce_tsrc"</span>);
-						xhref = tinyMCE.getAttrib(n[i], <span class="literal">"mce_thref"</span>);
-
-						<span class="reserved">if</span> (xsrc != <span class="literal">""</span>) {
-							try {
-								n[i].src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings[<span class="literal">'base_href'</span>], xsrc);
-							} catch (e) {
-								<span class="comment">// Ignore, Firefox cast exception if local file wasn't found</span>
-							}
-
-							n[i].removeAttribute(<span class="literal">"mce_tsrc"</span>);
-						}
-
-						<span class="reserved">if</span> (xhref != <span class="literal">""</span>) {
-							try {
-								n[i].href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings[<span class="literal">'base_href'</span>], xhref);
-							} catch (e) {
-								<span class="comment">// Ignore, Firefox cast exception if local file wasn't found</span>
-							}
-
-							n[i].removeAttribute(<span class="literal">"mce_thref"</span>);
-						}
-					}
-				}
-
-				el = tinyMCE.selectNodes(e, <span class="reserved">function</span>(n) {
-					<span class="reserved">if</span> (n.nodeType == 3 || n.nodeType == 8) {
-						n.nodeValue = n.nodeValue.replace(/\smce_tsrc=/gi, <span class="literal">" src="</span>);
-						n.nodeValue = n.nodeValue.replace(/\smce_thref=/gi, <span class="literal">" href="</span>);
-					}
-
-					<span class="reserved">return</span> false;
-				});
-			}
-		}
-
-		<span class="reserved">return</span> h;
-	},
-
-	<span class="comment">/**
-	 * Sets the HTML code of a specific document.
-	 * Todo: Try to merge/remove this one.
-	 *
-	 * <span class="attrib">@param</span> {DOMDocument} doc DOM document to set the HTML code in.
-	 * <span class="attrib">@param</span> {string} html_content HTML contents to set in DOM document.
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_setHTML : <span class="reserved">function</span>(doc, html_content) {
-		<span class="comment">// Force closed anchors open</span>
-		<span class="comment">//html_content = html_content.replace(new RegExp('&lt;a(.*?)/&gt;', 'gi'), '&lt;a$1&gt;&lt;/a&gt;');</span>
-
-		html_content = tinyMCE.cleanupHTMLCode(html_content);
-
-		<span class="comment">// Try innerHTML if it fails use pasteHTML in MSIE</span>
-		try {
-			tinyMCE.setInnerHTML(doc.body, html_content);
-		} catch (e) {
-			<span class="reserved">if</span> (<span class="reserved">this</span>.isMSIE)
-				doc.body.createTextRange().pasteHTML(html_content);
-		}
-
-		<span class="comment">// Content duplication bug fix</span>
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; tinyMCE.settings[<span class="literal">'fix_content_duplication'</span>]) {
-			<span class="comment">// Remove P elements in P elements</span>
-			var paras = doc.getElementsByTagName(<span class="literal">"P"</span>);
-			<span class="reserved">for</span> (var i=0; i&lt;paras.length; i++) {
-				var node = paras[i];
-				<span class="reserved">while</span> ((node = node.parentNode) != null) {
-					<span class="reserved">if</span> (node.nodeName == <span class="literal">"P"</span>)
-						node.outerHTML = node.innerHTML;
-				}
-			}
-
-			<span class="comment">// Content duplication bug fix (Seems to be word crap)</span>
-			var html = doc.body.innerHTML;
-<span class="comment">/*
-			if (html.indexOf('="mso') != -1) {
-				for (var i=0; i&lt;doc.body.all.length; i++) {
-					var el = doc.body.all[i];
-					el.removeAttribute("className","",0);
-					el.removeAttribute("style","",0);
-				}
-
-				html = doc.body.innerHTML;
-				html = tinyMCE.regexpReplace(html, "&lt;o:p&gt;&lt;\/o:p&gt;", "&lt;br /&gt;");
-				html = tinyMCE.regexpReplace(html, "&lt;o:p&gt;&amp;nbsp;&lt;\/o:p&gt;", "");
-				html = tinyMCE.regexpReplace(html, "&lt;st1:.*?&gt;", "");
-				html = tinyMCE.regexpReplace(html, "&lt;p&gt;&lt;\/p&gt;", "");
-				html = tinyMCE.regexpReplace(html, "&lt;p&gt;&lt;\/p&gt;\r\n&lt;p&gt;&lt;\/p&gt;", "");
-				html = tinyMCE.regexpReplace(html, "&lt;p&gt;&amp;nbsp;&lt;\/p&gt;", "&lt;br /&gt;");
-				html = tinyMCE.regexpReplace(html, "&lt;p&gt;\s*(&lt;p&gt;\s*)?", "&lt;p&gt;");
-				html = tinyMCE.regexpReplace(html, "&lt;\/p&gt;\s*(&lt;\/p&gt;\s*)?", "&lt;/p&gt;");
-			}*/</span>
-
-			<span class="comment">// Always set the htmlText output</span>
-			tinyMCE.setInnerHTML(doc.body, html);
-		}
-
-		tinyMCE.cleanupAnchors(doc);
-
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-			tinyMCE.convertSpansToFonts(doc);
-	},
-
-	<span class="comment">/**
-	 * Returns the editor instance id of a specific form element.
-	 *
-	 * <span class="attrib">@param</span> {string} form_element Form element name to get instance id for.
-	 * <span class="attrib">@return</span> TinyMCE editor instance id or null if it wasn't found.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	getEditorId : <span class="reserved">function</span>(form_element) {
-		var inst = <span class="reserved">this</span>.getInstanceById(form_element);
-		<span class="reserved">if</span> (!inst)
-			<span class="reserved">return</span> null;
-
-		<span class="reserved">return</span> inst.editorId;
-	},
-
-	<span class="comment">/**
-	 * Returns a TinyMCE editor instance by the specified editor id or null if it wasn't found.
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id Editor id to get instance for.
-	 * <span class="attrib">@return</span> TinyMCE editor control instance or null if it wasn't found.
-	 * <span class="attrib">@type</span> TinyMCE_Control
-	 */</span>
-	getInstanceById : <span class="reserved">function</span>(editor_id) {
-		var inst = <span class="reserved">this</span>.instances[editor_id];
-		<span class="reserved">if</span> (!inst) {
-			<span class="reserved">for</span> (var n in tinyMCE.instances) {
-				var instance = tinyMCE.instances[n];
-				<span class="reserved">if</span> (!tinyMCE.isInstance(instance))
-					continue;
-
-				<span class="reserved">if</span> (instance.formTargetElementId == editor_id) {
-					inst = instance;
-					break;
-				}
-			}
-		}
-
-		<span class="reserved">return</span> inst;
-	},
-
-	<span class="comment">/**
-	 * Queries a command value for a specific command on a specific editor instance.
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id Editor id to query command value on.
-	 * <span class="attrib">@param</span> {string} command Command to query for.
-	 * <span class="attrib">@return</span> Command value passed from browser.
-	 * <span class="attrib">@type</span> object
-	 */</span>
-	queryInstanceCommandValue : <span class="reserved">function</span>(editor_id, command) {
-		var inst = tinyMCE.getInstanceById(editor_id);
-		<span class="reserved">if</span> (inst)
-			<span class="reserved">return</span> inst.queryCommandValue(command);
-
-		<span class="reserved">return</span> false;
-	},
-
-	<span class="comment">/**
-	 * Queries a command state for a specific command on a specific editor instance.
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id Editor id to query command state on.
-	 * <span class="attrib">@param</span> {string} command Command to query for.
-	 * <span class="attrib">@return</span> Command state passed from browser.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	queryInstanceCommandState : <span class="reserved">function</span>(editor_id, command) {
-		var inst = tinyMCE.getInstanceById(editor_id);
-		<span class="reserved">if</span> (inst)
-			<span class="reserved">return</span> inst.queryCommandState(command);
-
-		<span class="reserved">return</span> null;
-	},
-
-	<span class="comment">/**
-	 * Sets the window argument to be passed to TinyMCE popup.
-	 *
-	 * <span class="attrib">@param</span> {string} n Window argument name.
-	 * <span class="attrib">@param</span> {string} v Window argument value.
-	 */</span>
-	setWindowArg : <span class="reserved">function</span>(n, v) {
-		<span class="reserved">this</span>.windowArgs[n] = v;
-	},
-
-	<span class="comment">/**
-	 * Returns the window argument to be passed to TinyMCE popup.
-	 * Use: tinyMCEPopup.getWindowArg instead.
-	 *
-	 * <span class="attrib">@param</span> {string} n Window argument name.
-	 * <span class="attrib">@return</span> Argument value or default value if it wasn't found.
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	getWindowArg : <span class="reserved">function</span>(n, d) {
-		<span class="reserved">return</span> (typeof(<span class="reserved">this</span>.windowArgs[n]) == <span class="literal">"undefined"</span>) ? d : <span class="reserved">this</span>.windowArgs[n];
-	},
-
-	<span class="comment">/**
-	 * Returns a array of CSS classes that is available in a document.
-	 * Todo: Fix this one, it's so ugly. :)
-	 *
-	 * <span class="attrib">@param</span> {string} editor_id Editor id to get CSS classes from.
-	 * <span class="attrib">@param</span> {DOMDocument} doc DOM document to get the CSS classes from.
-	 * <span class="attrib">@return</span> Array of CSS classes that is available in a document.
-	 * <span class="attrib">@type</span> Array
-	 */</span>
-	getCSSClasses : <span class="reserved">function</span>(editor_id, doc) {
-		var output = new Array();
-
-		<span class="comment">// Is cached, use that</span>
-		<span class="reserved">if</span> (typeof(tinyMCE.cssClasses) != <span class="literal">"undefined"</span>)
-			<span class="reserved">return</span> tinyMCE.cssClasses;
-
-		<span class="reserved">if</span> (typeof(editor_id) == <span class="literal">"undefined"</span> &amp;&amp; typeof(doc) == <span class="literal">"undefined"</span>) {
-			var instance;
-
-			<span class="reserved">for</span> (var instanceName in tinyMCE.instances) {
-				instance = tinyMCE.instances[instanceName];
-				<span class="reserved">if</span> (!tinyMCE.isInstance(instance))
-					continue;
-
-				break;
-			}
-
-			doc = instance.getDoc();
-		}
-
-		<span class="reserved">if</span> (typeof(doc) == <span class="literal">"undefined"</span>) {
-			var instance = tinyMCE.getInstanceById(editor_id);
-			doc = instance.getDoc();
-		}
-
-		<span class="reserved">if</span> (doc) {
-			var styles = doc.styleSheets;
-
-			<span class="reserved">if</span> (styles &amp;&amp; styles.length &gt; 0) {
-				<span class="reserved">for</span> (var x=0; x&lt;styles.length; x++) {
-					var csses = null;
-
-					<span class="comment">// Just ignore any errors</span>
-					eval(<span class="literal">"try {var csses = tinyMCE.isMSIE ? doc.styleSheets("</span> + x + <span class="literal">").rules : styles["</span> + x + <span class="literal">"].cssRules;} catch(e) {}"</span>);
-					<span class="reserved">if</span> (!csses)
-						<span class="reserved">return</span> new Array();
-
-					<span class="reserved">for</span> (var i=0; i&lt;csses.length; i++) {
-						var selectorText = csses[i].selectorText;
-
-						<span class="comment">// Can be multiple rules per selector</span>
-						<span class="reserved">if</span> (selectorText) {
-							var rules = selectorText.split(<span class="literal">','</span>);
-							<span class="reserved">for</span> (var c=0; c&lt;rules.length; c++) {
-								var rule = rules[c];
-
-								<span class="comment">// Strip spaces between selectors</span>
-								<span class="reserved">while</span> (rule.indexOf(<span class="literal">' '</span>) == 0)
-									rule = rule.substring(1);
-
-								<span class="comment">// Invalid rule</span>
-								<span class="reserved">if</span> (rule.indexOf(<span class="literal">' '</span>) != -1 || rule.indexOf(<span class="literal">':'</span>) != -1 || rule.indexOf(<span class="literal">'mceItem'</span>) != -1)
-									continue;
-
-								<span class="reserved">if</span> (rule.indexOf(tinyMCE.settings[<span class="literal">'visual_table_class'</span>]) != -1 || rule.indexOf(<span class="literal">'mceEditable'</span>) != -1 || rule.indexOf(<span class="literal">'mceNonEditable'</span>) != -1)
-									continue;
-
-								<span class="comment">// Is class rule</span>
-								<span class="reserved">if</span> (rule.indexOf(<span class="literal">'.'</span>) != -1) {
-									var cssClass = rule.substring(rule.indexOf(<span class="literal">'.'</span>) + 1);
-									var addClass = true;
-
-									<span class="reserved">for</span> (var p=0; p&lt;output.length &amp;&amp; addClass; p++) {
-										<span class="reserved">if</span> (output[p] == cssClass)
-											addClass = false;
-									}
-
-									<span class="reserved">if</span> (addClass)
-										output[output.length] = cssClass;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		<span class="comment">// Cache em</span>
-		<span class="reserved">if</span> (output.length &gt; 0)
-			tinyMCE.cssClasses = output;
-
-		<span class="reserved">return</span> output;
-	},
-
-	<span class="comment">/**
-	 * Regexp replaces the contents of a string. Use normal replace instead.
-	 *
-	 * <span class="attrib">@param</span> {string} in_str String to replace in.
-	 * <span class="attrib">@param</span> {string} reg_exp Regexp to replace.
-	 * <span class="attrib">@param</span> {string} replace_str String to replace with.
-	 * <span class="attrib">@param</span> {string} in_str Optional regexp options like "gi".
-	 * <span class="attrib">@return</span> Replaced string value.
-	 * <span class="attrib">@type</span> string
-	 * <span class="attrib">@deprecated</span>
-	 */</span>
-	regexpReplace : <span class="reserved">function</span>(in_str, reg_exp, replace_str, opts) {
-		<span class="reserved">if</span> (in_str == null)
-			<span class="reserved">return</span> in_str;
-
-		<span class="reserved">if</span> (typeof(opts) == <span class="literal">"undefined"</span>)
-			opts = <span class="literal">'g'</span>;
-
-		var re = new RegExp(reg_exp, opts);
-		<span class="reserved">return</span> in_str.replace(re, replace_str);
-	},
-
-	<span class="comment">/**
-	 * Removes all prefix, suffix whitespace of a string.
-	 *
-	 * <span class="attrib">@param</span> {string} s String to replace whitespace in.
-	 * <span class="attrib">@return</span> Replaced string value.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	trim : <span class="reserved">function</span>(s) {
-		<span class="reserved">return</span> s.replace(/^\s*|\s*$/g, <span class="literal">""</span>);
-	},
-
-	<span class="comment">/**
-	 * Removes MSIE 5.5 specific event wrapper function form a event string.
-	 * This will also remove the event blocker if it's added in front of the event.
-	 *
-	 * <span class="attrib">@param</span> {string} s String to replace event data in.
-	 * <span class="attrib">@return</span> Replaced string value.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	cleanupEventStr : <span class="reserved">function</span>(s) {
-		s = <span class="literal">""</span> + s;
-		s = s.replace(<span class="literal">'function anonymous()\n{\n'</span>, <span class="literal">''</span>);
-		s = s.replace(<span class="literal">'\n}'</span>, <span class="literal">''</span>);
-		s = s.replace(/^<span class="reserved">return</span> true;/gi, <span class="literal">''</span>); <span class="comment">// Remove event blocker</span>
-
-		<span class="reserved">return</span> s;
-	},
-
-	<span class="comment">/**
-	 * Returns the HTML for the specified control this will loop through
-	 * the theme and all plugins inorder to find the control. The callback for each
-	 * theme and plugin is called getControlHTML.
-	 *
-	 * <span class="attrib">@param</span> {string} c Control name/id to get HTML code for.
-	 * <span class="attrib">@return</span> HTML code for the specified control or empty string if it wasn't found.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	getControlHTML : <span class="reserved">function</span>(c) {
-		var i, l, n, o, v;
-
-		l = tinyMCE.plugins;
-		<span class="reserved">for</span> (n in l) {
-			o = l[n];
-
-			<span class="reserved">if</span> (o.getControlHTML &amp;&amp; (v = o.getControlHTML(c)) != <span class="literal">''</span>)
-				<span class="reserved">return</span> tinyMCE.replaceVar(v, <span class="literal">"pluginurl"</span>, o.baseURL);
-		}
-
-		o = tinyMCE.themes[tinyMCE.settings[<span class="literal">'theme'</span>]];
-		<span class="reserved">if</span> (o.getControlHTML &amp;&amp; (v = o.getControlHTML(c)) != <span class="literal">''</span>)
-			<span class="reserved">return</span> v;
-
-		<span class="reserved">return</span> <span class="literal">''</span>;
-	},
-
-	<span class="comment">/**
-	 * Evaluates the specified function and uses the array of arguments.
-	 *
-	 * <span class="attrib">@param</span> {string} f Function reference to execute.
-	 * <span class="attrib">@param</span> {int} idx Index in array to start grabbing arguments from.
-	 * <span class="attrib">@param</span> {Array} a Array of function arguments.
-	 * <span class="attrib">@return</span> Value returned from the evaluated function.
-	 * <span class="attrib">@type</span> object
-	 */</span>
-	evalFunc : <span class="reserved">function</span>(f, idx, a) {
-		var s = <span class="literal">'('</span>, i;
-
-		<span class="reserved">for</span> (i=idx; i&lt;a.length; i++) {
-			s += <span class="literal">'a['</span> + i + <span class="literal">']'</span>;
-
-			<span class="reserved">if</span> (i &lt; a.length-1)
-				s += <span class="literal">','</span>;
-		}
-
-		s += <span class="literal">');'</span>;
-
-		<span class="reserved">return</span> eval(<span class="literal">"f"</span> + s);
-	},
-
-	<span class="comment">/**
-	 * Dispatches the specified callback on all options, plugins and themes. This will not
-	 * chain them, so all functions callbacks will be executed regardless if the return true/false.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} i TinyMCE editor control instance to execute callback on.
-	 * <span class="attrib">@param</span> {string} p TinyMCE callback parameter to execute.
-	 * <span class="attrib">@param</span> {string} n Function name to execute.
-	 * <span class="attrib">@return</span> true/false if they where dispatched.
-	 */</span>
-	dispatchCallback : <span class="reserved">function</span>(i, p, n) {
-		<span class="reserved">return</span> <span class="reserved">this</span>.callFunc(i, p, n, 0, <span class="reserved">this</span>.dispatchCallback.arguments);
-	},
-
-	<span class="comment">/**
-	 * Executes the specified callback on all options, plugins and themes. This will
-	 * chain them, so callback chain will be broken if one function returns false.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} i TinyMCE editor control instance to execute callback on.
-	 * <span class="attrib">@param</span> {string} p TinyMCE callback parameter to execute.
-	 * <span class="attrib">@param</span> {string} n Function name to execute.
-	 * <span class="attrib">@return</span> true/false if a callback was executed.
-	 */</span>
-	executeCallback : <span class="reserved">function</span>(i, p, n) {
-		<span class="reserved">return</span> <span class="reserved">this</span>.callFunc(i, p, n, 1, <span class="reserved">this</span>.executeCallback.arguments);
-	},
-
-	<span class="comment">/**
-	 * Executes the specified execcommand callback on all options, plugins and themes. This will
-	 * chain them, so callback chain will be broken if one function returns true.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} i TinyMCE editor control instance to execute callback on.
-	 * <span class="attrib">@param</span> {string} p TinyMCE callback parameter to execute.
-	 * <span class="attrib">@param</span> {string} n Function name to execute.
-	 * <span class="attrib">@return</span> true/false if a callback was executed.
-	 */</span>
-	execCommandCallback : <span class="reserved">function</span>(i, p, n) {
-		<span class="reserved">return</span> <span class="reserved">this</span>.callFunc(i, p, n, 2, <span class="reserved">this</span>.execCommandCallback.arguments);
-	},
-
-	<span class="comment">/**
-	 * Executes callback chain. Callback order: Option, Plugins, Themes.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} ins TinyMCE editor control instance to execute callback on.
-	 * <span class="attrib">@param</span> {string} p TinyMCE callback parameter name.
-	 * <span class="attrib">@param</span> {string} n Function name to execute.
-	 * <span class="attrib">@param</span> {int} m Execution mode value, 0 = no chain, 1 = event chain, 2 = execcommand chain.
-	 * <span class="attrib">@param</span> {Array} a Array with function arguments.
-	 * <span class="attrib">@return</span> true - if the callback was executed, false if it wasn't.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	callFunc : <span class="reserved">function</span>(ins, p, n, m, a) {
-		var l, i, on, o, s, v;
-
-		s = m == 2;
-
-		l = tinyMCE.getParam(p, <span class="literal">''</span>);
-
-		<span class="reserved">if</span> (l != <span class="literal">''</span> &amp;&amp; (v = tinyMCE.evalFunc(typeof(l) == <span class="literal">"function"</span> ? l : eval(l), 3, a)) == s &amp;&amp; m &gt; 0)
-			<span class="reserved">return</span> true;
-
-		<span class="reserved">if</span> (ins != null) {
-			<span class="reserved">for</span> (i=0, l = ins.plugins; i&lt;l.length; i++) {
-				o = tinyMCE.plugins[l[i]];
-
-				<span class="reserved">if</span> (o[n] &amp;&amp; (v = tinyMCE.evalFunc(o[n], 3, a)) == s &amp;&amp; m &gt; 0)
-					<span class="reserved">return</span> true;
-			}
-		}
-
-		l = tinyMCE.themes;
-		<span class="reserved">for</span> (on in l) {
-			o = l[on];
-
-			<span class="reserved">if</span> (o[n] &amp;&amp; (v = tinyMCE.evalFunc(o[n], 3, a)) == s &amp;&amp; m &gt; 0)
-				<span class="reserved">return</span> true;
-		}
-
-		<span class="reserved">return</span> false;
-	},
-
-	<span class="comment">/**
-	 * Encodes the string to raw XML entities. This will only convert the most common ones.
-	 * For real entity encoding use the xmlEncode method of the Cleanup class.
-	 *
-	 * <span class="attrib">@param</span> {string} s String to encode.
-	 * <span class="attrib">@return</span> XML Encoded string.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	xmlEncode : <span class="reserved">function</span>(s) {
-		s = <span class="literal">""</span> + s;
-		s = s.replace(/&amp;/g, <span class="literal">'&amp;amp;'</span>);
-		s = s.replace(new RegExp(<span class="literal">'"'</span>, <span class="literal">'g'</span>), <span class="literal">'&amp;quot;'</span>);
-		s = s.replace(/\<span class="literal">'/g, '</span>&amp;#39;<span class="literal">'); // &amp;apos; is not working in MSIE
-		s = s.replace(/&lt;/g, '</span>&amp;lt;<span class="literal">');
-		s = s.replace(/&gt;/g, '</span>&amp;gt;');
-
-		<span class="reserved">return</span> s;
-	},
-
-	<span class="comment">/**
-	 * Extends the specified prototype with new methods.
-	 *
-	 * <span class="attrib">@param</span> {Object} p Prototype to extend with new methods.
-	 * <span class="attrib">@param</span> {Object} np New prototype to extend the other one with.
-	 * <span class="attrib">@return</span> Extended prototype array.
-	 * <span class="attrib">@type</span> Object
-	 */</span>
-	extend : <span class="reserved">function</span>(p, np) {
-		var o = {};
-
-		o.parent = p;
-
-		<span class="reserved">for</span> (n in p)
-			o[n] = p[n];
-
-		<span class="reserved">for</span> (n in np)
-			o[n] = np[n];
-
-		<span class="reserved">return</span> o;
-	},
-
-	<span class="comment">/**
-	 * Hides any visible menu layers.
-	 *
-	 * <span class="attrib">@private</span>
-	 */</span>
-	hideMenus : <span class="reserved">function</span>() {
-		var e = tinyMCE.lastSelectedMenuBtn;
-
-		<span class="reserved">if</span> (tinyMCE.lastMenu) {
-			tinyMCE.lastMenu.hide();
-			tinyMCE.lastMenu = null;
-		}
-
-		<span class="reserved">if</span> (e) {
-			tinyMCE.switchClass(e, tinyMCE.lastMenuBtnClass);
-			tinyMCE.lastSelectedMenuBtn = null;
-		}
-	},
-
-	<span class="comment">/**
-	 * Splits a string by the specified delimiter and skips any empty items.
-	 *
-	 * <span class="attrib">@param</span> {string} d Delimiter to split by.
-	 * <span class="attrib">@param</span> {string} s String to split.
-	 * <span class="attrib">@return</span> Array with chunks from string.
-	 * <span class="attrib">@type</span> Array
-	 */</span>
-	explode : <span class="reserved">function</span>(d, s) {
-		var ar = s.split(d), oar = new Array(), i;
-	
-		<span class="reserved">for</span> (i = 0; i&lt;ar.length; i++) {
-			<span class="reserved">if</span> (ar[i] != <span class="literal">""</span>)
-				oar[oar.length] = ar[i];
-		}
-	
-		<span class="reserved">return</span> oar;
-	}
-};
-
-<span class="comment">// Global instances</span>
-var TinyMCE = TinyMCE_Engine; <span class="comment">// Compatiblity with gzip compressors</span>
-var tinyMCE = new TinyMCE_Engine();
-var tinyMCELang = {};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Event.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Event.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Event.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Event.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,403 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Event.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Event.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Event.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Event.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:30 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- *
- * The contents of this file will be wrapped in a class later on.
- */</span>
-
-<span class="comment">/**
- * Sets the enabled/disabled state of build in events on the specific node.
- * This function is needed since some events gets executed in WYSIWYG mode.
- *
- * <span class="attrib">@param</span> {HTMLNode} node HTML node to enable/disable events on.
- * <span class="attrib">@param</span> {boolean} state true/false state if the events should be disabled or enabled.
- * <span class="attrib">@private</span>
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>._setEventsEnabled = <span class="reserved">function</span>(node, state) {
-	var events = new Array(<span class="literal">'onfocus'</span>,<span class="literal">'onblur'</span>,<span class="literal">'onclick'</span>,<span class="literal">'ondblclick'</span>,
-				<span class="literal">'onmousedown'</span>,<span class="literal">'onmouseup'</span>,<span class="literal">'onmouseover'</span>,<span class="literal">'onmousemove'</span>,
-				<span class="literal">'onmouseout'</span>,<span class="literal">'onkeypress'</span>,<span class="literal">'onkeydown'</span>,<span class="literal">'onkeydown'</span>,<span class="literal">'onkeyup'</span>);
-
-	var evs = tinyMCE.settings[<span class="literal">'event_elements'</span>].split(<span class="literal">','</span>);
-	<span class="reserved">for</span> (var y=0; y&lt;evs.length; y++){
-		var elms = node.getElementsByTagName(evs[y]);
-		<span class="reserved">for</span> (var i=0; i&lt;elms.length; i++) {
-			var event = <span class="literal">""</span>;
-
-			<span class="reserved">for</span> (var x=0; x&lt;events.length; x++) {
-				<span class="reserved">if</span> ((event = tinyMCE.getAttrib(elms[i], events[x])) != <span class="literal">''</span>) {
-					event = tinyMCE.cleanupEventStr(<span class="literal">""</span> + event);
-
-					<span class="reserved">if</span> (!state)
-						event = <span class="literal">"return true;"</span> + event;
-					<span class="reserved">else</span>
-						event = event.replace(/^<span class="reserved">return</span> true;/gi, <span class="literal">''</span>);
-
-					elms[i].removeAttribute(events[x]);
-					elms[i].setAttribute(events[x], event);
-				}
-			}
-		}
-	}
-};
-
-<span class="comment">/**
- * Patch function for MSIE specific events, this one simply grabs the window.event object and
- * passes it as a argument to the handleEvent function of the TinyMCE_Engine class.
- *
- * <span class="attrib">@param</span> {string} editor_id Editor id to patch.
- * <span class="attrib">@private</span>
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch = <span class="reserved">function</span>(editor_id) {
-	var n, inst, win, e;
-
-	<span class="comment">// Remove odd, error</span>
-	<span class="reserved">if</span> (typeof(tinyMCE) == <span class="literal">"undefined"</span>)
-		<span class="reserved">return</span> true;
-
-	try {
-		<span class="comment">// Try selected instance first</span>
-		<span class="reserved">if</span> (tinyMCE.selectedInstance) {
-			win = tinyMCE.selectedInstance.getWin();
-
-			<span class="reserved">if</span> (win &amp;&amp; win.event) {
-				e = win.event;
-
-				<span class="reserved">if</span> (!e.target)
-					e.target = e.srcElement;
-
-				TinyMCE_Engine.<span class="reserved">prototype</span>.handleEvent(e);
-				<span class="reserved">return</span>;
-			}
-		}
-
-		<span class="comment">// Search for it</span>
-		<span class="reserved">for</span> (n in tinyMCE.instances) {
-			inst = tinyMCE.instances[n];
-
-			<span class="reserved">if</span> (!tinyMCE.isInstance(inst))
-				continue;
-
-			tinyMCE.selectedInstance = inst;
-			win = inst.getWin();
-
-			<span class="reserved">if</span> (win &amp;&amp; win.event) {
-				e = win.event;
-
-				<span class="reserved">if</span> (!e.target)
-					e.target = e.srcElement;
-
-				TinyMCE_Engine.<span class="reserved">prototype</span>.handleEvent(e);
-				<span class="reserved">return</span>;
-			}
-		}
-	} catch (ex) {
-		<span class="comment">// Ignore error if iframe is pointing to external URL</span>
-	}
-};
-
-<span class="comment">/**
- * Unload document event handler function. This function will be executed when the
- * page is unloaded, this will automaticly move the current editor contents to the textarea element this enables
- * the editor to restore it's state when the user presses the back button in the browser.
- * This will execute the triggerSave function.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.unloadHandler = <span class="reserved">function</span>() {
-	tinyMCE.triggerSave(true, true);
-};
-
-<span class="comment">/**
- * Adds the handleEvent function to the specified editor instance.
- *
- * <span class="attrib">@param</span> {inst} inst Editor control instance to add event handler to.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.addEventHandlers = <span class="reserved">function</span>(inst) {
-	var doc = inst.getDoc();
-
-	inst.switchSettings();
-
-	<span class="reserved">if</span> (tinyMCE.isMSIE) {
-		tinyMCE.addEvent(doc, <span class="literal">"keypress"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-		tinyMCE.addEvent(doc, <span class="literal">"keyup"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-		tinyMCE.addEvent(doc, <span class="literal">"keydown"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-		tinyMCE.addEvent(doc, <span class="literal">"mouseup"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-		tinyMCE.addEvent(doc, <span class="literal">"click"</span>, TinyMCE_Engine.<span class="reserved">prototype</span>._eventPatch);
-	} <span class="reserved">else</span> {
-		tinyMCE.addEvent(doc, <span class="literal">"keypress"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"keydown"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"keyup"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"click"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"mouseup"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"mousedown"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"focus"</span>, tinyMCE.handleEvent);
-		tinyMCE.addEvent(doc, <span class="literal">"blur"</span>, tinyMCE.handleEvent);
-
-		eval(<span class="literal">'try { doc.designMode = "On"; } catch(e) {}'</span>); <span class="comment">// Force designmode</span>
-	}
-};
-
-<span class="comment">/**
- * Mouse move handler function, this will be executed each time
- * the mouse is moved within a editor instance. This function stores away the current selection in MSIE
- * this will then be used when a undo/redo level is added.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.onMouseMove = <span class="reserved">function</span>() {
-	var inst;
-
-	<span class="reserved">if</span> (!tinyMCE.hasMouseMoved) {
-		inst = tinyMCE.selectedInstance;
-
-		<span class="comment">// Workaround for bug #1437457 (Odd MSIE bug)</span>
-		<span class="reserved">if</span> (inst.isFocused) {
-			inst.undoBookmark = inst.selection.getBookmark();
-			tinyMCE.hasMouseMoved = true;
-		}
-	}
-
-<span class="comment">//	tinyMCE.cancelEvent(inst.getWin().event);</span>
-<span class="comment">//	return false;</span>
-};
-
-<span class="comment">/**
- * Cancels the specified event, this will disable the event from be passed to other listeners in event chain.
- *
- * <span class="attrib">@param</span> {DOMEvent} e Event to cancel.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.cancelEvent = <span class="reserved">function</span>(e) {
-	<span class="reserved">if</span> (tinyMCE.isMSIE) {
-		e.returnValue = false;
-		e.cancelBubble = true;
-	} <span class="reserved">else</span>
-		e.preventDefault();
-};
-
-<span class="comment">/**
- * Adds a event handler function to the specified object.
- *
- * <span class="attrib">@param</span> {HTMLElement} o Object to add event handler to.
- * <span class="attrib">@param</span> {string} n Event name to listen to for example "click".
- * <span class="attrib">@param</span> {function} h Function handler to execute when event occurs.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.addEvent = <span class="reserved">function</span>(o, n, h) {
-	<span class="reserved">if</span> (o.attachEvent)
-		o.attachEvent(<span class="literal">"on"</span> + n, h);
-	<span class="reserved">else</span>
-		o.addEventListener(n, h, false);
-};
-
-<span class="comment">/**
- * Adds accessibility keydown handler to the specified select element.
- *
- * <span class="attrib">@param</span> {DOMEvent} e Event that gets passed when the element is focused.
- * <span class="attrib">@param</span> {HTMLElement} s Select element that the keydown handler gets added to.
- * <span class="attrib">@param</span> {DOMWindow} w DOM window reference to add.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.addSelectAccessibility = <span class="reserved">function</span>(e, s, w) {
-	<span class="comment">// Add event handlers </span>
-	<span class="reserved">if</span> (!s._isAccessible) {
-		s.onkeydown = tinyMCE.accessibleEventHandler;
-		s.onblur = tinyMCE.accessibleEventHandler;
-		s._isAccessible = true;
-		s._win = w;
-	}
-
-	<span class="reserved">return</span> false;
-};
-
-<span class="comment">/**
- * Accessibility handler that gets executed when the user hits a key in a select element.
- * This handler trams the enter/return or space key and then executes the onchange event handler.
- *
- * <span class="attrib">@param</span> {DOMEvent} e DOM event object instance.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.accessibleEventHandler = <span class="reserved">function</span>(e) {
-	var win = <span class="reserved">this</span>._win;
-	e = tinyMCE.isMSIE ? win.event : e;
-	var elm = tinyMCE.isMSIE ? e.srcElement : e.target;
-
-	<span class="comment">// Unpiggyback onchange on blur</span>
-	<span class="reserved">if</span> (e.type == <span class="literal">"blur"</span>) {
-		<span class="reserved">if</span> (elm.oldonchange) {
-			elm.onchange = elm.oldonchange;
-			elm.oldonchange = null;
-		}
-
-		<span class="reserved">return</span> true;
-	}
-
-	<span class="comment">// Piggyback onchange</span>
-	<span class="reserved">if</span> (elm.nodeName == <span class="literal">"SELECT"</span> &amp;&amp; !elm.oldonchange) {
-		elm.oldonchange = elm.onchange;
-		elm.onchange = null;
-	}
-
-	<span class="comment">// Execute onchange and remove piggyback</span>
-	<span class="reserved">if</span> (e.keyCode == 13 || e.keyCode == 32) {
-		elm.onchange = elm.oldonchange;
-		elm.onchange();
-		elm.oldonchange = null;
-
-		tinyMCE.cancelEvent(e);
-		<span class="reserved">return</span> false;
-	}
-
-	<span class="reserved">return</span> true;
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_ForceParagraphs.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_ForceParagraphs.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_ForceParagraphs.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_ForceParagraphs.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,460 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_ForceParagraphs.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_ForceParagraphs.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_ForceParagraphs.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_ForceParagraphs.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:30 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * Forces P tags on return/enter in Gecko browsers.
- */</span>
-var TinyMCE_ForceParagraphs = {
-	<span class="comment">/**
-	 * Inserts a paragraph at the current cursor location.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} inst TinyMCE editor control instance.
-	 * <span class="attrib">@param</span> {DOMEvent} e DOM event object.
-	 * <span class="attrib">@return</span> true on success or false if it fails.
-	 * <span class="attrib">@type</span> boolean
-	 * <span class="attrib">@private</span>
-	 */</span>
-	_insertPara : <span class="reserved">function</span>(inst, e) {
-		<span class="reserved">function</span> isEmpty(para) {
-			<span class="reserved">function</span> isEmptyHTML(html) {
-				<span class="reserved">return</span> html.replace(new RegExp(<span class="literal">'[ \t\r\n]+'</span>, <span class="literal">'g'</span>), <span class="literal">''</span>).toLowerCase() == <span class="literal">""</span>;
-			}
-
-			<span class="comment">// Check for images</span>
-			<span class="reserved">if</span> (para.getElementsByTagName(<span class="literal">"img"</span>).length &gt; 0)
-				<span class="reserved">return</span> false;
-
-			<span class="comment">// Check for tables</span>
-			<span class="reserved">if</span> (para.getElementsByTagName(<span class="literal">"table"</span>).length &gt; 0)
-				<span class="reserved">return</span> false;
-
-			<span class="comment">// Check for HRs</span>
-			<span class="reserved">if</span> (para.getElementsByTagName(<span class="literal">"hr"</span>).length &gt; 0)
-				<span class="reserved">return</span> false;
-
-			<span class="comment">// Check all textnodes</span>
-			var nodes = tinyMCE.getNodeTree(para, new Array(), 3);
-			<span class="reserved">for</span> (var i=0; i&lt;nodes.length; i++) {
-				<span class="reserved">if</span> (!isEmptyHTML(nodes[i].nodeValue))
-					<span class="reserved">return</span> false;
-			}
-
-			<span class="comment">// No images, no tables, no hrs, no text content then it's empty</span>
-			<span class="reserved">return</span> true;
-		}
-
-		var doc = inst.getDoc();
-		var sel = inst.getSel();
-		var win = inst.contentWindow;
-		var rng = sel.getRangeAt(0);
-		var body = doc.body;
-		var rootElm = doc.documentElement;
-		var blockName = <span class="literal">"P"</span>;
-
-	<span class="comment">//	tinyMCE.debug(body.innerHTML);</span>
-
-	<span class="comment">//	debug(e.target, sel.anchorNode.nodeName, sel.focusNode.nodeName, rng.startContainer, rng.endContainer, rng.commonAncestorContainer, sel.anchorOffset, sel.focusOffset, rng.toString());</span>
-
-		<span class="comment">// Setup before range</span>
-		var rngBefore = doc.createRange();
-		rngBefore.setStart(sel.anchorNode, sel.anchorOffset);
-		rngBefore.collapse(true);
-
-		<span class="comment">// Setup after range</span>
-		var rngAfter = doc.createRange();
-		rngAfter.setStart(sel.focusNode, sel.focusOffset);
-		rngAfter.collapse(true);
-
-		<span class="comment">// Setup start/end points</span>
-		var direct = rngBefore.compareBoundaryPoints(rngBefore.START_TO_END, rngAfter) &lt; 0;
-		var startNode = direct ? sel.anchorNode : sel.focusNode;
-		var startOffset = direct ? sel.anchorOffset : sel.focusOffset;
-		var endNode = direct ? sel.focusNode : sel.anchorNode;
-		var endOffset = direct ? sel.focusOffset : sel.anchorOffset;
-
-		startNode = startNode.nodeName == <span class="literal">"BODY"</span> ? startNode.firstChild : startNode;
-		endNode = endNode.nodeName == <span class="literal">"BODY"</span> ? endNode.firstChild : endNode;
-
-		<span class="comment">// tinyMCE.debug(startNode, endNode);</span>
-
-		<span class="comment">// Get block elements</span>
-		var startBlock = tinyMCE.getParentBlockElement(startNode);
-		var endBlock = tinyMCE.getParentBlockElement(endNode);
-
-		<span class="comment">// If absolute force paragraph generation within</span>
-		<span class="reserved">if</span> (startBlock &amp;&amp; new RegExp(<span class="literal">'absolute|relative|static'</span>, <span class="literal">'gi'</span>).test(startBlock.style.position))
-			startBlock = null;
-
-		<span class="reserved">if</span> (endBlock &amp;&amp; new RegExp(<span class="literal">'absolute|relative|static'</span>, <span class="literal">'gi'</span>).test(endBlock.style.position))
-			endBlock = null;
-
-		<span class="comment">// Use current block name</span>
-		<span class="reserved">if</span> (startBlock != null) {
-			blockName = startBlock.nodeName;
-
-			<span class="comment">// Use P instead</span>
-			<span class="reserved">if</span> (blockName == <span class="literal">"TD"</span> || blockName == <span class="literal">"TABLE"</span> || (blockName == <span class="literal">"DIV"</span> &amp;&amp; new RegExp(<span class="literal">'left|right'</span>, <span class="literal">'gi'</span>).test(startBlock.style.cssFloat)))
-				blockName = <span class="literal">"P"</span>;
-		}
-
-		<span class="comment">// Within a list use normal behaviour</span>
-		<span class="reserved">if</span> (tinyMCE.getParentElement(startBlock, <span class="literal">"OL,UL"</span>) != null)
-			<span class="reserved">return</span> false;
-
-		<span class="comment">// Within a table create new paragraphs</span>
-		<span class="reserved">if</span> ((startBlock != null &amp;&amp; startBlock.nodeName == <span class="literal">"TABLE"</span>) || (endBlock != null &amp;&amp; endBlock.nodeName == <span class="literal">"TABLE"</span>))
-			startBlock = endBlock = null;
-
-		<span class="comment">// Setup new paragraphs</span>
-		var paraBefore = (startBlock != null &amp;&amp; startBlock.nodeName == blockName) ? startBlock.cloneNode(false) : doc.createElement(blockName);
-		var paraAfter = (endBlock != null &amp;&amp; endBlock.nodeName == blockName) ? endBlock.cloneNode(false) : doc.createElement(blockName);
-
-		<span class="comment">// Is header, then force paragraph under</span>
-		<span class="reserved">if</span> (/^(H[1-6])$/.test(blockName))
-			paraAfter = doc.createElement(<span class="literal">"p"</span>);
-
-		<span class="comment">// Setup chop nodes</span>
-		var startChop = startNode;
-		var endChop = endNode;
-
-		<span class="comment">// Get startChop node</span>
-		node = startChop;
-		do {
-			<span class="reserved">if</span> (node == body || node.nodeType == 9 || tinyMCE.isBlockElement(node))
-				break;
-
-			startChop = node;
-		} <span class="reserved">while</span> ((node = node.previousSibling ? node.previousSibling : node.parentNode));
-
-		<span class="comment">// Get endChop node</span>
-		node = endChop;
-		do {
-			<span class="reserved">if</span> (node == body || node.nodeType == 9 || tinyMCE.isBlockElement(node))
-				break;
-
-			endChop = node;
-		} <span class="reserved">while</span> ((node = node.nextSibling ? node.nextSibling : node.parentNode));
-
-		<span class="comment">// Fix when only a image is within the TD</span>
-		<span class="reserved">if</span> (startChop.nodeName == <span class="literal">"TD"</span>)
-			startChop = startChop.firstChild;
-
-		<span class="reserved">if</span> (endChop.nodeName == <span class="literal">"TD"</span>)
-			endChop = endChop.lastChild;
-
-		<span class="comment">// If not in a block element</span>
-		<span class="reserved">if</span> (startBlock == null) {
-			<span class="comment">// Delete selection</span>
-			rng.deleteContents();
-			sel.removeAllRanges();
-
-			<span class="reserved">if</span> (startChop != rootElm &amp;&amp; endChop != rootElm) {
-				<span class="comment">// Insert paragraph before</span>
-				rngBefore = rng.cloneRange();
-
-				<span class="reserved">if</span> (startChop == body)
-					rngBefore.setStart(startChop, 0);
-				<span class="reserved">else</span>
-					rngBefore.setStartBefore(startChop);
-
-				paraBefore.appendChild(rngBefore.cloneContents());
-
-				<span class="comment">// Insert paragraph after</span>
-				<span class="reserved">if</span> (endChop.parentNode.nodeName == blockName)
-					endChop = endChop.parentNode;
-
-				<span class="comment">// If not after image</span>
-				<span class="comment">//if (rng.startContainer.nodeName != "BODY" &amp;&amp; rng.endContainer.nodeName != "BODY")</span>
-					rng.setEndAfter(endChop);
-
-				<span class="reserved">if</span> (endChop.nodeName != <span class="literal">"#text"</span> &amp;&amp; endChop.nodeName != <span class="literal">"BODY"</span>)
-					rngBefore.setEndAfter(endChop);
-
-				var contents = rng.cloneContents();
-				<span class="reserved">if</span> (contents.firstChild &amp;&amp; (contents.firstChild.nodeName == blockName || contents.firstChild.nodeName == <span class="literal">"BODY"</span>))
-					paraAfter.innerHTML = contents.firstChild.innerHTML;
-				<span class="reserved">else</span>
-					paraAfter.appendChild(contents);
-
-				<span class="comment">// Check if it's a empty paragraph</span>
-				<span class="reserved">if</span> (isEmpty(paraBefore))
-					paraBefore.innerHTML = <span class="literal">"&amp;nbsp;"</span>;
-
-				<span class="comment">// Check if it's a empty paragraph</span>
-				<span class="reserved">if</span> (isEmpty(paraAfter))
-					paraAfter.innerHTML = <span class="literal">"&amp;nbsp;"</span>;
-
-				<span class="comment">// Delete old contents</span>
-				rng.deleteContents();
-				rngAfter.deleteContents();
-				rngBefore.deleteContents();
-
-				<span class="comment">// Insert new paragraphs</span>
-				paraAfter.normalize();
-				rngBefore.insertNode(paraAfter);
-				paraBefore.normalize();
-				rngBefore.insertNode(paraBefore);
-
-				<span class="comment">// tinyMCE.debug("1: ", paraBefore.innerHTML, paraAfter.innerHTML);</span>
-			} <span class="reserved">else</span> {
-				body.innerHTML = <span class="literal">"&lt;"</span> + blockName + <span class="literal">"&gt;&amp;nbsp;&lt;/"</span> + blockName + <span class="literal">"&gt;&lt;"</span> + blockName + <span class="literal">"&gt;&amp;nbsp;&lt;/"</span> + blockName + <span class="literal">"&gt;"</span>;
-				paraAfter = body.childNodes[1];
-			}
-
-			inst.selection.selectNode(paraAfter, true, true);
-
-			<span class="reserved">return</span> true;
-		}
-
-		<span class="comment">// Place first part within new paragraph</span>
-		<span class="reserved">if</span> (startChop.nodeName == blockName)
-			rngBefore.setStart(startChop, 0);
-		<span class="reserved">else</span>
-			rngBefore.setStartBefore(startChop);
-
-		rngBefore.setEnd(startNode, startOffset);
-		paraBefore.appendChild(rngBefore.cloneContents());
-
-		<span class="comment">// Place secound part within new paragraph</span>
-		rngAfter.setEndAfter(endChop);
-		rngAfter.setStart(endNode, endOffset);
-		var contents = rngAfter.cloneContents();
-
-		<span class="reserved">if</span> (contents.firstChild &amp;&amp; contents.firstChild.nodeName == blockName) {
-	<span class="comment">/*		var nodes = contents.firstChild.childNodes;
-			for (var i=0; i&lt;nodes.length; i++) {
-				//tinyMCE.debug(nodes[i].nodeName);
-				if (nodes[i].nodeName != "BODY")
-					paraAfter.appendChild(nodes[i]);
-			}
-	*/</span>
-			paraAfter.innerHTML = contents.firstChild.innerHTML;
-		} <span class="reserved">else</span>
-			paraAfter.appendChild(contents);
-
-		<span class="comment">// Check if it's a empty paragraph</span>
-		<span class="reserved">if</span> (isEmpty(paraBefore))
-			paraBefore.innerHTML = <span class="literal">"&amp;nbsp;"</span>;
-
-		<span class="comment">// Check if it's a empty paragraph</span>
-		<span class="reserved">if</span> (isEmpty(paraAfter))
-			paraAfter.innerHTML = <span class="literal">"&amp;nbsp;"</span>;
-
-		<span class="comment">// Create a range around everything</span>
-		var rng = doc.createRange();
-
-		<span class="reserved">if</span> (!startChop.previousSibling &amp;&amp; startChop.parentNode.nodeName.toUpperCase() == blockName) {
-			rng.setStartBefore(startChop.parentNode);
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> (rngBefore.startContainer.nodeName.toUpperCase() == blockName &amp;&amp; rngBefore.startOffset == 0)
-				rng.setStartBefore(rngBefore.startContainer);
-			<span class="reserved">else</span>
-				rng.setStart(rngBefore.startContainer, rngBefore.startOffset);
-		}
-
-		<span class="reserved">if</span> (!endChop.nextSibling &amp;&amp; endChop.parentNode.nodeName.toUpperCase() == blockName)
-			rng.setEndAfter(endChop.parentNode);
-		<span class="reserved">else</span>
-			rng.setEnd(rngAfter.endContainer, rngAfter.endOffset);
-
-		<span class="comment">// Delete all contents and insert new paragraphs</span>
-		rng.deleteContents();
-		rng.insertNode(paraAfter);
-		rng.insertNode(paraBefore);
-		<span class="comment">//tinyMCE.debug("2", paraBefore.innerHTML, paraAfter.innerHTML);</span>
-
-		<span class="comment">// Normalize</span>
-		paraAfter.normalize();
-		paraBefore.normalize();
-
-		inst.selection.selectNode(paraAfter, true, true);
-
-		<span class="reserved">return</span> true;
-	},
-
-	<span class="comment">/**
-	 * Handles the backspace action in Gecko. This will remove the weird BR element
-	 * that gets generated when a user hits backspace in the beginning of a paragraph.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Control} inst TinyMCE editor control instance.
-	 * <span class="attrib">@return</span> true/false if the event should be canceled or not.
-	 * <span class="attrib">@type</span>
-	 */</span>
-	_handleBackSpace : <span class="reserved">function</span>(inst) {
-		var r = inst.getRng(), sn = r.startContainer, nv, s = false;
-
-		<span class="reserved">if</span> (sn &amp;&amp; sn.nextSibling &amp;&amp; sn.nextSibling.nodeName == <span class="literal">"BR"</span>) {
-			nv = sn.nodeValue;
-
-			<span class="comment">// Handle if a backspace is pressed after a space character #bug 1466054</span>
-			<span class="reserved">if</span> (nv != null &amp;&amp; nv.length &gt;= r.startOffset &amp;&amp; nv.charAt(r.startOffset - 1) == <span class="literal">' '</span>)
-				s = true;
-
-			<span class="comment">// Only remove BRs if we are at the end of line #bug 1464152</span>
-			<span class="reserved">if</span> (nv != null &amp;&amp; r.startOffset == nv.length)
-				sn.nextSibling.parentNode.removeChild(sn.nextSibling);
-		}
-
-		<span class="reserved">return</span> s;
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Layer.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Layer.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Layer.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Layer.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,455 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Layer.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Layer.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Layer.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_Layer.html">TinyMCE_Layer</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Layer.class.js.html,v $
- * $Revision: 1.19 $
- * $Date: 2006/04/14 20:00:30 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * Constructor for the TinyMCE Layer. This class enables you to construct
- * floating layers that is visible on top of select input fields, flashes and iframes.
- *
- * <span class="attrib">@param</span> {string} id Unique ID name for the layer.
- * <span class="attrib">@param</span> {boolean} bm Block mode, defaults to true.
- */</span>
-<span class="reserved">function</span> TinyMCE_Layer(id, bm) {
-	<span class="reserved">this</span>.id = id;
-	<span class="reserved">this</span>.blockerElement = null;
-	<span class="reserved">this</span>.events = false;
-	<span class="reserved">this</span>.element = null;
-	<span class="reserved">this</span>.blockMode = typeof(bm) != <span class="literal">'undefined'</span> ? bm : true;
-	<span class="reserved">this</span>.doc = document;
-};
-
-TinyMCE_Layer.<span class="reserved">prototype</span> = {
-	<span class="comment">/**
-	 * Moves the layer relative to the specified HTML element.
-	 *
-	 * <span class="attrib">@param</span> {HTMLElement} re Element to move the layer relative to.
-	 * <span class="attrib">@param</span> {string} p Position of the layer tl = top left, tr = top right, bl = bottom left, br = bottom right.
-	 */</span>
-	moveRelativeTo : <span class="reserved">function</span>(re, p) {
-		var rep = <span class="reserved">this</span>.getAbsPosition(re);
-		var w = parseInt(re.offsetWidth);
-		var h = parseInt(re.offsetHeight);
-		var e = <span class="reserved">this</span>.getElement();
-		var ew = parseInt(e.offsetWidth);
-		var eh = parseInt(e.offsetHeight);
-		var x, y;
-
-		switch (p) {
-			case <span class="literal">"tl"</span>:
-				x = rep.absLeft;
-				y = rep.absTop;
-				break;
-
-			case <span class="literal">"tr"</span>:
-				x = rep.absLeft + w;
-				y = rep.absTop;
-				break;
-
-			case <span class="literal">"bl"</span>:
-				x = rep.absLeft;
-				y = rep.absTop + h;
-				break;
-
-			case <span class="literal">"br"</span>:
-				x = rep.absLeft + w;
-				y = rep.absTop + h;
-				break;
-
-			case <span class="literal">"cc"</span>:
-				x = rep.absLeft + (w / 2) - (ew / 2);
-				y = rep.absTop + (h / 2) - (eh / 2);
-				break;
-		}
-
-		<span class="reserved">this</span>.moveTo(x, y);
-	},
-
-	<span class="comment">/**
-	 * Moves the layer relative in pixels.
-	 *
-	 * <span class="attrib">@param</span> {int} x Horizontal relative position in pixels.
-	 * <span class="attrib">@param</span> {int} y Vertical relative position in pixels.
-	 */</span>
-	moveBy : <span class="reserved">function</span>(x, y) {
-		var e = <span class="reserved">this</span>.getElement();
-		<span class="reserved">this</span>.moveTo(parseInt(e.style.left) + x, parseInt(e.style.top) + y);
-	},
-
-	<span class="comment">/**
-	 * Moves the layer absolute in pixels.
-	 *
-	 * <span class="attrib">@param</span> {int} x Horizontal absolute position in pixels.
-	 * <span class="attrib">@param</span> {int} y Vertical absolute position in pixels.
-	 */</span>
-	moveTo : <span class="reserved">function</span>(x, y) {
-		var e = <span class="reserved">this</span>.getElement();
-
-		e.style.left = x + <span class="literal">"px"</span>;
-		e.style.top = y + <span class="literal">"px"</span>;
-
-		<span class="reserved">this</span>.updateBlocker();
-	},
-
-	<span class="comment">/**
-	 * Resizes the layer by the specified relative width and height.
-	 *
-	 * <span class="attrib">@param</span> {int} w Relative width value.
-	 * <span class="attrib">@param</span> {int} h Relative height value.
-	 */</span>
-	resizeBy : <span class="reserved">function</span>(w, h) {
-		var e = <span class="reserved">this</span>.getElement();
-		<span class="reserved">this</span>.resizeTo(parseInt(e.style.width) + w, parseInt(e.style.height) + h);
-	},
-
-	<span class="comment">/**
-	 * Resizes the layer to the specified width and height.
-	 *
-	 * <span class="attrib">@param</span> {int} w Width value.
-	 * <span class="attrib">@param</span> {int} h Height value.
-	 */</span>
-	resizeTo : <span class="reserved">function</span>(w, h) {
-		var e = <span class="reserved">this</span>.getElement();
-
-		<span class="reserved">if</span> (w != null)
-			e.style.width = w + <span class="literal">"px"</span>;
-
-		<span class="reserved">if</span> (h != null)
-			e.style.height = h + <span class="literal">"px"</span>;
-
-		<span class="reserved">this</span>.updateBlocker();
-	},
-
-	<span class="comment">/**
-	 * Shows the layer.
-	 */</span>
-	show : <span class="reserved">function</span>() {
-		<span class="reserved">this</span>.getElement().style.display = <span class="literal">'block'</span>;
-		<span class="reserved">this</span>.updateBlocker();
-	},
-
-	<span class="comment">/**
-	 * Hides the layer.
-	 */</span>
-	hide : <span class="reserved">function</span>() {
-		<span class="reserved">this</span>.getElement().style.display = <span class="literal">'none'</span>;
-		<span class="reserved">this</span>.updateBlocker();
-	},
-
-	<span class="comment">/**
-	 * Returns true/false if the layer is visible or not.
-	 *
-	 * <span class="attrib">@return</span> true/false if it's visible or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	isVisible : <span class="reserved">function</span>() {
-		<span class="reserved">return</span> <span class="reserved">this</span>.getElement().style.display == <span class="literal">'block'</span>;
-	},
-
-	<span class="comment">/**
-	 * Returns the DOM element that the layer is binded to.
-	 *
-	 * <span class="attrib">@return</span> DOM HTML element.
-	 * <span class="attrib">@type</span> HTMLElement
-	 */</span>
-	getElement : <span class="reserved">function</span>() {
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.element)
-			<span class="reserved">this</span>.element = <span class="reserved">this</span>.doc.getElementById(<span class="reserved">this</span>.id);
-
-		<span class="reserved">return</span> <span class="reserved">this</span>.element;
-	},
-
-	<span class="comment">/**
-	 * Sets the block mode. If you set this property to true a control box blocker iframe
-	 * will be added to the document since MSIE has a issue where select boxes are visible
-	 * through layers.
-	 *
-	 * <span class="attrib">@param</span> {boolean} s Block mode state, true is the default value.
-	 */</span>
-	setBlockMode : <span class="reserved">function</span>(s) {
-		<span class="reserved">this</span>.blockMode = s;
-	},
-
-	<span class="comment">/**
-	 * Updates the select/iframe/flash blocker this will also block the caret in Firefox.
-	 */</span>
-	updateBlocker : <span class="reserved">function</span>() {
-		var e, b, x, y, w, h;
-
-		b = <span class="reserved">this</span>.getBlocker();
-		<span class="reserved">if</span> (b) {
-			<span class="reserved">if</span> (<span class="reserved">this</span>.blockMode) {
-				e = <span class="reserved">this</span>.getElement();
-				x = <span class="reserved">this</span>.parseInt(e.style.left);
-				y = <span class="reserved">this</span>.parseInt(e.style.top);
-				w = <span class="reserved">this</span>.parseInt(e.offsetWidth);
-				h = <span class="reserved">this</span>.parseInt(e.offsetHeight);
-
-				b.style.left = x + <span class="literal">'px'</span>;
-				b.style.top = y + <span class="literal">'px'</span>;
-				b.style.width = w + <span class="literal">'px'</span>;
-				b.style.height = h + <span class="literal">'px'</span>;
-				b.style.display = e.style.display;
-			} <span class="reserved">else</span>
-				b.style.display = <span class="literal">'none'</span>;
-		}
-	},
-
-	<span class="comment">/**
-	 * Returns the blocker DOM element, this is a invisible iframe.
-	 *
-	 * <span class="attrib">@return</span> DOM HTML element.
-	 * <span class="attrib">@type</span> HTMLElement
-	 */</span>
-	getBlocker : <span class="reserved">function</span>() {
-		var d, b;
-
-		<span class="reserved">if</span> (!<span class="reserved">this</span>.blockerElement &amp;&amp; <span class="reserved">this</span>.blockMode) {
-			d = <span class="reserved">this</span>.doc;
-			b = d.createElement(<span class="literal">"iframe"</span>);
-
-			b.style.cssText = <span class="literal">'display: none; position: absolute; left: 0; top: 0'</span>;
-			b.src = <span class="literal">'javascript:false;'</span>;
-			b.frameBorder = <span class="literal">'0'</span>;
-			b.scrolling = <span class="literal">'no'</span>;
-
-			d.body.appendChild(b);
-			<span class="reserved">this</span>.blockerElement = b;
-		}
-
-		<span class="reserved">return</span> <span class="reserved">this</span>.blockerElement;
-	},
-
-	<span class="comment">/**
-	 * Returns the absolute x, y cordinate of the specified node.
-	 *
-	 * <span class="attrib">@param</span> {DOMElement} n DOM node to retrive x, y of.
-	 * <span class="attrib">@return</span> Object containing absLeft and absTop properties.
-	 * <span class="attrib">@type</span> Object
-	 */</span>
-	getAbsPosition : <span class="reserved">function</span>(n) {
-		var p = {absLeft : 0, absTop : 0};
-
-		<span class="reserved">while</span> (n) {
-			p.absLeft += n.offsetLeft;
-			p.absTop += n.offsetTop;
-			n = n.offsetParent;
-		}
-
-		<span class="reserved">return</span> p;
-	},
-
-	<span class="comment">/**
-	 * Creates a element for the layer based on the id and specified name.
-	 *
-	 * <span class="attrib">@param</span> {string} n Element tag name, like div.
-	 * <span class="attrib">@param</span> {string} c Optional class name to set as class attribute value.
-	 * <span class="attrib">@param</span> {HTMLElement} p Optional parent element reference, defaults to body.
-	 * <span class="attrib">@return</span> HTML DOM element that got created.
-	 * <span class="attrib">@type</span> HTMLElement
-	 */</span>
-	create : <span class="reserved">function</span>(n, c, p) {
-		var d = <span class="reserved">this</span>.doc, e = d.createElement(n);
-
-		e.setAttribute(<span class="literal">'id'</span>, <span class="reserved">this</span>.id);
-
-		<span class="reserved">if</span> (c)
-			e.className = c;
-
-		<span class="reserved">if</span> (!p)
-			p = d.body;
-
-		p.appendChild(e);
-
-		<span class="reserved">return</span> <span class="reserved">this</span>.element = e;
-	},
-
-	<span class="comment">/**
-	 * Parses a int value this method will return 0 if the string is empty.
-	 *
-	 * <span class="attrib">@param</span> {string} s String to parse value of.
-	 * <span class="attrib">@return</span> Parsed number.
-	 * <span class="attrib">@type</span> int
-	 */</span>
-	parseInt : <span class="reserved">function</span>(s) {
-		<span class="reserved">if</span> (s == null || s == <span class="literal">''</span>)
-			<span class="reserved">return</span> 0;
-
-		<span class="reserved">return</span> parseInt(s);
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Menu.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Menu.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Menu.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Menu.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,361 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Menu.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Menu.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Menu.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-	<a name="method_summary"><!-- --></a>
-	<table border="1" cellpadding="3" cellspacing="0" width="100%">
-		<tr bgcolor="#CCCCFF" class="TableHeadingColor">
-			<td colspan=2>
-				<font size="+2">
-					<b>Method Summary</b>
-				</font>
-			</td>
-		</tr>
-	
-		
-		   <tr bgcolor="white" class="TableRowColor">
-		      <td align="right" valign="top" width="1%">
-			 <font size="-1">
-			    <code>static&nbsp;void</code>
-			 </font>
-		      </td>
-		      <td>
-			 <code>
-			    <b>
-			       <a href="GLOBALS.html#TinyMCE_Menu">TinyMCE_Menu</a></b>()
-			 </code>
-			 <br>
-			 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			 Constructor for the menu layer class.
-		      </td>
-		   </tr>
-		
-	
-	</table>
-    <p>
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Menu.class.js.html,v $
- * $Revision: 1.15 $
- * $Date: 2006/04/14 20:00:30 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * Constructor for the menu layer class.
- */</span>
-<span class="reserved">function</span> TinyMCE_Menu() {
-	var id;
-
-	<span class="reserved">if</span> (typeof(tinyMCE.menuCounter) == <span class="literal">"undefined"</span>)
-		tinyMCE.menuCounter = 0;
-
-	id = <span class="literal">"mc_menu_"</span> + tinyMCE.menuCounter++;
-
-	TinyMCE_Layer.call(<span class="reserved">this</span>, id, true);
-
-	<span class="reserved">this</span>.id = id;
-	<span class="reserved">this</span>.items = new Array();
-	<span class="reserved">this</span>.needsUpdate = true;
-};
-
-<span class="comment">// Extends the TinyMCE_Layer class</span>
-TinyMCE_Menu.<span class="reserved">prototype</span> = tinyMCE.extend(TinyMCE_Layer.<span class="reserved">prototype</span>, {
-	<span class="comment">/**
-	 * Initializes the Menu with settings. This will also create the menu
-	 * as a DIV element if it doesn't exists in the DOM.
-	 *
-	 * <span class="attrib">@param</span> {Array} s Name/Value array with settings.
-	 */</span>
-	init : <span class="reserved">function</span>(s) {
-		var n;
-
-		<span class="comment">// Default params</span>
-		<span class="reserved">this</span>.settings = {
-			separator_class : <span class="literal">'mceMenuSeparator'</span>,
-			title_class : <span class="literal">'mceMenuTitle'</span>,
-			disabled_class : <span class="literal">'mceMenuDisabled'</span>,
-			menu_class : <span class="literal">'mceMenu'</span>,
-			drop_menu : true
-		};
-
-		<span class="reserved">for</span> (n in s)
-			<span class="reserved">this</span>.settings[n] = s[n];
-
-		<span class="reserved">this</span>.create(<span class="literal">'div'</span>, <span class="reserved">this</span>.settings.menu_class);
-	},
-
-	<span class="comment">/**
-	 * Clears the menu.
-	 */</span>
-	clear : <span class="reserved">function</span>() {
-		<span class="reserved">this</span>.items = new Array();
-	},
-
-	<span class="comment">/**
-	 * Adds a menu title, this is a static item that can't be clicked.
-	 *
-	 * <span class="attrib">@param</span> {string} t Text to add to title.
-	 */</span>
-	addTitle : <span class="reserved">function</span>(t) {
-		<span class="reserved">this</span>.add({type : <span class="literal">'title'</span>, text : t});
-	},
-
-	<span class="comment">/**
-	 * Adds a disabled menu item, this is a static item that can't be clicked.
-	 *
-	 * <span class="attrib">@param</span> {string} t Text to add to title.
-	 */</span>
-	addDisabled : <span class="reserved">function</span>(t) {
-		<span class="reserved">this</span>.add({type : <span class="literal">'disabled'</span>, text : t});
-	},
-
-	<span class="comment">/**
-	 * Adds a menu separator line.
-	 */</span>
-	addSeparator : <span class="reserved">function</span>() {
-		<span class="reserved">this</span>.add({type : <span class="literal">'separator'</span>});
-	},
-
-	<span class="comment">/**
-	 * Adds a menu item.
-	 *
-	 * <span class="attrib">@param</span> {string} t Menu item text.
-	 * <span class="attrib">@param</span> {string} js JS string to evaluate on click.
-	 */</span>
-	addItem : <span class="reserved">function</span>(t, js) {
-		<span class="reserved">this</span>.add({text : t, js : js});
-	},
-
-	<span class="comment">/**
-	 * Adds a menu item object.
-	 *
-	 * <span class="attrib">@param</span> {Object} mi Menu item object to add.
-	 */</span>
-	add : <span class="reserved">function</span>(mi) {
-		<span class="reserved">this</span>.items[<span class="reserved">this</span>.items.length] = mi;
-		<span class="reserved">this</span>.needsUpdate = true;
-	},
-
-	<span class="comment">/**
-	 * Update the menu with new HTML contents.
-	 */</span>
-	update : <span class="reserved">function</span>() {
-		var e = <span class="reserved">this</span>.getElement(), h = <span class="literal">''</span>, i, t, m = <span class="reserved">this</span>.items, s = <span class="reserved">this</span>.settings;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.settings.drop_menu)
-			h += <span class="literal">'&lt;span class="mceMenuLine"&gt;&lt;/span&gt;'</span>;
-
-		h += <span class="literal">'&lt;table border="0" cellpadding="0" cellspacing="0"&gt;'</span>;
-
-		<span class="reserved">for</span> (i=0; i&lt;m.length; i++) {
-			t = tinyMCE.xmlEncode(m[i].text);
-			c = m[i].class_name ? <span class="literal">' class="'</span> + m[i].class_name + <span class="literal">'"'</span> : <span class="literal">''</span>;
-
-			switch (m[i].type) {
-				case <span class="literal">'separator'</span>:
-					h += <span class="literal">'&lt;tr class="'</span> + s.separator_class + <span class="literal">'"&gt;&lt;td&gt;'</span>;
-					break;
-
-				case <span class="literal">'title'</span>:
-					h += <span class="literal">'&lt;tr class="'</span> + s.title_class + <span class="literal">'"&gt;&lt;td&gt;&lt;span'</span> + c +<span class="literal">'&gt;'</span> + t + <span class="literal">'&lt;/span&gt;'</span>;
-					break;
-
-				case <span class="literal">'disabled'</span>:
-					h += <span class="literal">'&lt;tr class="'</span> + s.disabled_class + <span class="literal">'"&gt;&lt;td&gt;&lt;span'</span> + c +<span class="literal">'&gt;'</span> + t + <span class="literal">'&lt;/span&gt;'</span>;
-					break;
-
-				default:
-					h += <span class="literal">'&lt;tr&gt;&lt;td&gt;&lt;a href="javascript:void(0);" onmousedown="'</span> + tinyMCE.xmlEncode(m[i].js) + <span class="literal">';return false;"&gt;&lt;span'</span> + c +<span class="literal">'&gt;'</span> + t + <span class="literal">'&lt;/span&gt;&lt;/a&gt;'</span>;
-			}
-
-			h += <span class="literal">'&lt;/td&gt;&lt;/tr&gt;'</span>;
-		}
-
-		h += <span class="literal">'&lt;/table&gt;'</span>;
-
-		e.innerHTML = h;
-
-		<span class="reserved">this</span>.needsUpdate = false;
-		<span class="reserved">this</span>.updateBlocker();
-	},
-
-	<span class="comment">/**
-	 * Displays the menu. This function will automaticly hide any previously visible menus.
-	 */</span>
-	show : <span class="reserved">function</span>() {
-		var nl, i;
-
-		<span class="reserved">if</span> (tinyMCE.lastMenu == <span class="reserved">this</span>)
-			<span class="reserved">return</span>;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.needsUpdate)
-			<span class="reserved">this</span>.update();
-
-		<span class="reserved">if</span> (tinyMCE.lastMenu &amp;&amp; tinyMCE.lastMenu != <span class="reserved">this</span>)
-			tinyMCE.lastMenu.hide();
-
-		TinyMCE_Layer.<span class="reserved">prototype</span>.show.call(<span class="reserved">this</span>);
-
-		<span class="reserved">if</span> (!tinyMCE.isOpera) {
-			<span class="comment">// Accessibility stuff</span>
-<span class="comment">/*			nl = this.getElement().getElementsByTagName("a");
-			if (nl.length &gt; 0)
-				nl[0].focus();*/</span>
-		}
-
-		tinyMCE.lastMenu = <span class="reserved">this</span>;
-	}
-});
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Popup.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Popup.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Popup.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Popup.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,511 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Popup.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Popup.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Popup.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_Popup.html">TinyMCE_Popup</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Popup.class.js.html,v $
- * $Revision: 1.24 $
- * $Date: 2006/04/14 20:00:30 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">// Some global instances, this will be filled later</span>
-var tinyMCE = null, tinyMCELang = null;
-
-<span class="comment">/**
- * Constructor for the popup class. This class contains base logic for popup/dialogs and sets up
- * object references to the TinyMCE core.
- */</span>
-<span class="reserved">function</span> TinyMCE_Popup() {
-};
-
-<span class="comment">/**
- * Initializes the TinyMCE Popup class. This will setup the TinyMCE core references and other popup/dialog related functions.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.init = <span class="reserved">function</span>() {
-	var win = window.opener ? window.opener : window.dialogArguments;
-	var inst;
-
-	<span class="reserved">if</span> (!win) {
-		<span class="comment">// Try parent</span>
-		win = parent.parent;
-
-		<span class="comment">// Try top</span>
-		<span class="reserved">if</span> (typeof(win.tinyMCE) == <span class="literal">"undefined"</span>)
-			win = top;
-	}
-
-	window.opener = win;
-	<span class="reserved">this</span>.windowOpener = win;
-	<span class="reserved">this</span>.onLoadEval = <span class="literal">""</span>;
-
-	<span class="comment">// Setup parent references</span>
-	tinyMCE = win.tinyMCE;
-	tinyMCELang = win.tinyMCELang;
-
-	<span class="reserved">if</span> (!tinyMCE) {
-		alert(<span class="literal">"tinyMCE object reference not found from popup."</span>);
-		<span class="reserved">return</span>;
-	}
-
-	inst = tinyMCE.selectedInstance;
-	<span class="reserved">this</span>.isWindow = tinyMCE.getWindowArg(<span class="literal">'mce_inside_iframe'</span>, false) == false;
-	<span class="reserved">this</span>.storeSelection = (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera) &amp;&amp; !<span class="reserved">this</span>.isWindow &amp;&amp; tinyMCE.getWindowArg(<span class="literal">'mce_store_selection'</span>, true);
-
-	<span class="reserved">if</span> (<span class="reserved">this</span>.isWindow)
-		window.focus();
-
-	<span class="comment">// Store selection</span>
-	<span class="reserved">if</span> (<span class="reserved">this</span>.storeSelection)
-		inst.selectionBookmark = inst.selection.getBookmark(true);
-
-	<span class="comment">// Setup dir</span>
-	<span class="reserved">if</span> (tinyMCELang[<span class="literal">'lang_dir'</span>])
-		document.dir = tinyMCELang[<span class="literal">'lang_dir'</span>];
-
-	<span class="comment">// Setup title</span>
-	var re = new RegExp(<span class="literal">'{|\\\$|}'</span>, <span class="literal">'g'</span>);
-	var title = document.title.replace(re, <span class="literal">""</span>);
-	<span class="reserved">if</span> (typeof tinyMCELang[title] != <span class="literal">"undefined"</span>) {
-		var divElm = document.createElement(<span class="literal">"div"</span>);
-		divElm.innerHTML = tinyMCELang[title];
-		document.title = divElm.innerHTML;
-
-		<span class="reserved">if</span> (tinyMCE.setWindowTitle != null)
-			tinyMCE.setWindowTitle(window, divElm.innerHTML);
-	}
-
-	<span class="comment">// Output Popup CSS class</span>
-	document.write(<span class="literal">'&lt;link href="'</span> + tinyMCE.getParam(<span class="literal">"popups_css"</span>) + <span class="literal">'" rel="stylesheet" type="text/css"&gt;'</span>);
-
-	tinyMCE.addEvent(window, <span class="literal">"load"</span>, <span class="reserved">this</span>.onLoad);
-};
-
-<span class="comment">/**
- * Gets executed when the window has finished loading it's contents. This function will then
- * replace language variables with their real values.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.onLoad = <span class="reserved">function</span>() {
-	var dir, i, elms, body = document.body;
-
-	<span class="reserved">if</span> (tinyMCE.getWindowArg(<span class="literal">'mce_replacevariables'</span>, true))
-		body.innerHTML = tinyMCE.applyTemplate(body.innerHTML, tinyMCE.windowArgs);
-
-	dir = tinyMCE.selectedInstance.settings[<span class="literal">'directionality'</span>];
-	<span class="reserved">if</span> (dir == <span class="literal">"rtl"</span> &amp;&amp; document.forms &amp;&amp; document.forms.length &gt; 0) {
-		elms = document.forms[0].elements;
-		<span class="reserved">for</span> (i=0; i&lt;elms.length; i++) {
-			<span class="reserved">if</span> ((elms[i].type == <span class="literal">"text"</span> || elms[i].type == <span class="literal">"textarea"</span>) &amp;&amp; elms[i].getAttribute(<span class="literal">"dir"</span>) != <span class="literal">"ltr"</span>)
-				elms[i].dir = dir;
-		}
-	}
-
-	<span class="reserved">if</span> (body.style.display == <span class="literal">'none'</span>)
-		body.style.display = <span class="literal">'block'</span>;
-
-	<span class="comment">// Execute real onload (Opera fix)</span>
-	<span class="reserved">if</span> (tinyMCEPopup.onLoadEval != <span class="literal">""</span>)
-		eval(tinyMCEPopup.onLoadEval);
-};
-
-<span class="comment">/**
- * Executes the specified string onload. This is a workaround for Opera since it
- * doesn't execute the events in the same order than MSIE and Firefox.
- *
- * <span class="attrib">@param</span> {string} str String to evaluate on load.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.executeOnLoad = <span class="reserved">function</span>(str) {
-	<span class="reserved">if</span> (tinyMCE.isOpera)
-		<span class="reserved">this</span>.onLoadEval = str;
-	<span class="reserved">else</span>
-		eval(str);
-};
-
-<span class="comment">/**
- * Resizes the current window to it's inner body size. This function
- * was needed since MSIE makes the visible dialog area diffrent depending
- * on what Theme/Skin you use.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.resizeToInnerSize = <span class="reserved">function</span>() {
-	<span class="comment">// Netscape 7.1 workaround</span>
-	<span class="reserved">if</span> (<span class="reserved">this</span>.isWindow &amp;&amp; tinyMCE.isNS71) {
-		window.resizeBy(0, 10);
-		<span class="reserved">return</span>;
-	}
-
-	<span class="reserved">if</span> (<span class="reserved">this</span>.isWindow) {
-		var doc = document;
-		var body = doc.body;
-		var oldMargin, wrapper, iframe, nodes, dx, dy;
-
-		<span class="reserved">if</span> (body.style.display == <span class="literal">'none'</span>)
-			body.style.display = <span class="literal">'block'</span>;
-
-		<span class="comment">// Remove margin</span>
-		oldMargin = body.style.margin;
-		body.style.margin = <span class="literal">'0'</span>;
-
-		<span class="comment">// Create wrapper</span>
-		wrapper = doc.createElement(<span class="literal">"div"</span>);
-		wrapper.id = <span class="literal">'mcBodyWrapper'</span>;
-		wrapper.style.display = <span class="literal">'none'</span>;
-		wrapper.style.margin = <span class="literal">'0'</span>;
-
-		<span class="comment">// Wrap body elements</span>
-		nodes = doc.body.childNodes;
-		<span class="reserved">for</span> (var i=nodes.length-1; i&gt;=0; i--) {
-			<span class="reserved">if</span> (wrapper.hasChildNodes())
-				wrapper.insertBefore(nodes[i].cloneNode(true), wrapper.firstChild);
-			<span class="reserved">else</span>
-				wrapper.appendChild(nodes[i].cloneNode(true));
-
-			nodes[i].parentNode.removeChild(nodes[i]);
-		}
-
-		<span class="comment">// Add wrapper</span>
-		doc.body.appendChild(wrapper);
-
-		<span class="comment">// Create iframe</span>
-		iframe = document.createElement(<span class="literal">"iframe"</span>);
-		iframe.id = <span class="literal">"mcWinIframe"</span>;
-		iframe.src = document.location.href.toLowerCase().indexOf(<span class="literal">'https'</span>) == -1 ? <span class="literal">"about:blank"</span> : tinyMCE.settings[<span class="literal">'default_document'</span>];
-		iframe.width = <span class="literal">"100%"</span>;
-		iframe.height = <span class="literal">"100%"</span>;
-		iframe.style.margin = <span class="literal">'0'</span>;
-
-		<span class="comment">// Add iframe</span>
-		doc.body.appendChild(iframe);
-
-		<span class="comment">// Measure iframe</span>
-		iframe = document.getElementById(<span class="literal">'mcWinIframe'</span>);
-		dx = tinyMCE.getWindowArg(<span class="literal">'mce_width'</span>) - iframe.clientWidth;
-		dy = tinyMCE.getWindowArg(<span class="literal">'mce_height'</span>) - iframe.clientHeight;
-
-		<span class="comment">// Resize window</span>
-		<span class="comment">// tinyMCE.debug(tinyMCE.getWindowArg('mce_width') + "," + tinyMCE.getWindowArg('mce_height') + " - " + dx + "," + dy);</span>
-		window.resizeBy(dx, dy);
-
-		<span class="comment">// Hide iframe and show wrapper</span>
-		body.style.margin = oldMargin;
-		iframe.style.display = <span class="literal">'none'</span>;
-		wrapper.style.display = <span class="literal">'block'</span>;
-	}
-};
-
-<span class="comment">/**
- * Resizes the current window to the dimensions of the body.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.resizeToContent = <span class="reserved">function</span>() {
-	var isMSIE = (navigator.appName == <span class="literal">"Microsoft Internet Explorer"</span>);
-	var isOpera = (navigator.userAgent.indexOf(<span class="literal">"Opera"</span>) != -1);
-
-	<span class="reserved">if</span> (isOpera)
-		<span class="reserved">return</span>;
-
-	<span class="reserved">if</span> (isMSIE) {
-		try { window.resizeTo(10, 10); } catch (e) {}
-
-		var elm = document.body;
-		var width = elm.offsetWidth;
-		var height = elm.offsetHeight;
-		var dx = (elm.scrollWidth - width) + 4;
-		var dy = elm.scrollHeight - height;
-
-		try { window.resizeBy(dx, dy); } catch (e) {}
-	} <span class="reserved">else</span> {
-		window.scrollBy(1000, 1000);
-		<span class="reserved">if</span> (window.scrollX &gt; 0 || window.scrollY &gt; 0) {
-			window.resizeBy(window.innerWidth * 2, window.innerHeight * 2);
-			window.sizeToContent();
-			window.scrollTo(0, 0);
-			var x = parseInt(screen.width / 2.0) - (window.outerWidth / 2.0);
-			var y = parseInt(screen.height / 2.0) - (window.outerHeight / 2.0);
-			window.moveTo(x, y);
-		}
-	}
-};
-
-<span class="comment">/**
- * Returns a window argument, window arguments can be passed from a plugin to a window
- * by using the tinyMCE.openWindow function.
- *
- * <span class="attrib">@param</span> {string} name Argument name to retrive.
- * <span class="attrib">@param</span> {string} default_value Optional default value to assign if the argument wasn't set.
- * <span class="attrib">@return</span> Argument value object.
- * <span class="attrib">@type</span> Object
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.getWindowArg = <span class="reserved">function</span>(name, default_value) {
-	<span class="reserved">return</span> tinyMCE.getWindowArg(name, default_value);
-};
-
-<span class="comment">/**
- * Restores the selection back to the one stored after executing a command.
- * This function was needed in MSIE when using inlinepopups, the selection
- * would otherwice get lost if the user focused another field.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.restoreSelection = <span class="reserved">function</span>() {
-	<span class="reserved">if</span> (<span class="reserved">this</span>.storeSelection) {
-		var inst = tinyMCE.selectedInstance;
-
-		inst.getWin().focus();
-
-		<span class="reserved">if</span> (inst.selectionBookmark)
-			inst.selection.moveToBookmark(inst.selectionBookmark);
-	}
-};
-
-<span class="comment">/**
- * Executes the specific command on the parent instance that opened the window. This method
- * will also take care of the storage and restorage of the current selection in MSIE when
- * using inlinepopups. So we suggest using this method instead of tinyMCE.execCommand when using
- * popup windows.
- *
- * <span class="attrib">@param</span> {string} command Command name to execute, for example mceLink or Bold.
- * <span class="attrib">@param</span> {boolean} user_interface True/false state if a UI (dialog) should be presented or not.
- * <span class="attrib">@param</span> {mixed} value Optional command value, this can be anything.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.execCommand = <span class="reserved">function</span>(command, user_interface, value) {
-	var inst = tinyMCE.selectedInstance;
-
-	<span class="reserved">this</span>.restoreSelection();
-	inst.execCommand(command, user_interface, value);
-
-	<span class="comment">// Store selection</span>
-	<span class="reserved">if</span> (<span class="reserved">this</span>.storeSelection)
-		inst.selectionBookmark = inst.selection.getBookmark(true);
-};
-
-<span class="comment">/**
- * Closes the current window. This should be used instead of window.close. Since this will
- * also handle inlinepopups closing.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.close = <span class="reserved">function</span>() {
-	tinyMCE.closeWindow(window);
-};
-
-<span class="comment">/**
- * Executes a color picker on the specified element id. When the user
- * then selects a color it will be set as the value of the specified element.
- *
- * <span class="attrib">@param</span> {DOMEvent} e DOM event object.
- * <span class="attrib">@param</span> {string} element_id Element id to be filled with the color value from the picker.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.pickColor = <span class="reserved">function</span>(e, element_id) {
-	tinyMCE.selectedInstance.execCommand(<span class="literal">'mceColorPicker'</span>, true, {
-		element_id : element_id,
-		document : document,
-		window : window,
-		store_selection : false
-	});
-};
-
-<span class="comment">/**
- * Opens a filebrowser/imagebrowser this will set the output value from
- * the browser as a value on the specified element.
- *
- * <span class="attrib">@param</span> {string} element_id Id of the element to set value in.
- * <span class="attrib">@param</span> {string} type Type of browser to open image/file/flash.
- * <span class="attrib">@param</span> {string} option Option name to get the file_broswer_callback function name from.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.openBrowser = <span class="reserved">function</span>(element_id, type, option) {
-	var cb = tinyMCE.getParam(option, tinyMCE.getParam(<span class="literal">"file_browser_callback"</span>));
-	var url = document.getElementById(element_id).value;
-
-	tinyMCE.setWindowArg(<span class="literal">"window"</span>, window);
-	tinyMCE.setWindowArg(<span class="literal">"document"</span>, document);
-
-	<span class="comment">// Call to external callback</span>
-	<span class="reserved">if</span> (eval(<span class="literal">'typeof(tinyMCEPopup.windowOpener.'</span> + cb + <span class="literal">')'</span>) == <span class="literal">"undefined"</span>)
-		alert(<span class="literal">"Callback function: "</span> + cb + <span class="literal">" could not be found."</span>);
-	<span class="reserved">else</span>
-		eval(<span class="literal">"tinyMCEPopup.windowOpener."</span> + cb + <span class="literal">"(element_id, url, type, window);"</span>);
-};
-
-<span class="comment">/**
- * Imports the specified class into the current popup. This will setup a local class definition
- * by importing from the parent window.
- *
- * <span class="attrib">@param</span> {string} c Class name to import to current page.
- */</span>
-TinyMCE_Popup.<span class="reserved">prototype</span>.importClass = <span class="reserved">function</span>(c) {
-	window[c] = <span class="reserved">function</span>() {};
-
-	<span class="reserved">for</span> (var n in window.opener[c].<span class="reserved">prototype</span>)
-		window[c].<span class="reserved">prototype</span>[n] = window.opener[c].<span class="reserved">prototype</span>[n];
-
-	window[c].constructor = window.opener[c].constructor;
-};
-
-<span class="comment">// Setup global instance</span>
-var tinyMCEPopup = new TinyMCE_Popup();
-
-tinyMCEPopup.init();
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Selection.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Selection.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Selection.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Selection.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,646 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_Selection.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_Selection.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_Selection.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_Selection.html">TinyMCE_Selection</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_Selection.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:31 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * Constructs a Selection instance and binds it to the specificed TinyMCE editor control.
- *
- * <span class="attrib">@param</span> {TinyMCE_Control} inst TinyMCE editor control instance.
- * <span class="attrib">@constructor</span>
- */</span>
-<span class="reserved">function</span> TinyMCE_Selection(inst) {
-	<span class="reserved">this</span>.instance = inst;
-};
-
-TinyMCE_Selection.<span class="reserved">prototype</span> = {
-	<span class="comment">/**
-	 * Returns the selected HTML code.
-	 *
-	 * <span class="attrib">@return</span> Selected HTML contents.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	getSelectedHTML : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-		var e, r = <span class="reserved">this</span>.getRng(), h;
-
-		<span class="reserved">if</span> (tinyMCE.isSafari) {
-			<span class="comment">// Not realy perfect!!</span>
-			<span class="reserved">return</span> r.toString();
-		}
-
-		e = document.createElement(<span class="literal">"body"</span>);
-
-		<span class="reserved">if</span> (tinyMCE.isGecko)
-			e.appendChild(r.cloneContents());
-		<span class="reserved">else</span> 
-			e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
-
-		h = tinyMCE._cleanupHTML(inst, inst.contentDocument, inst.settings, e, e, false, true, false);
-
-		<span class="comment">// When editing always use fonts internaly</span>
-		<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">"convert_fonts_to_spans"</span>))
-			tinyMCE.convertSpansToFonts(inst.getDoc());
-
-		<span class="reserved">return</span> h;
-	},
-
-	<span class="comment">/**
-	 * Returns the selected text.
-	 *
-	 * <span class="attrib">@return</span> Selected text contents.
-	 * <span class="attrib">@type</span> string
-	 */</span>
-	getSelectedText : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-		var d, r, s, t;
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			d = inst.getDoc();
-
-			<span class="reserved">if</span> (d.selection.type == <span class="literal">"Text"</span>) {
-				r = d.selection.createRange();
-				t = r.text;
-			} <span class="reserved">else</span>
-				t = <span class="literal">''</span>;
-		} <span class="reserved">else</span> {
-			s = <span class="reserved">this</span>.getSel();
-
-			<span class="reserved">if</span> (s &amp;&amp; s.toString)
-				t = s.toString();
-			<span class="reserved">else</span>
-				t = <span class="literal">''</span>;
-		}
-
-		<span class="reserved">return</span> t;
-	},
-
-	<span class="comment">/**
-	 * Returns a selection bookmark that can be restored later with moveToBookmark.
-	 * This acts much like the one MSIE has built in but this one is persistent if between DOM
-	 * tree rewritings. The simple mode enables a quicker and non persistent bookmark.
-	 *
-	 * <span class="attrib">@param</span> {boolean} simple If this is set to true, the selection bookmark will not me dom persistent.
-	 * <span class="attrib">@return</span> Selection bookmark that can be restored later with moveToBookmark.
-	 * <span class="attrib">@type</span> TinyMCE_Bookmark
-	 */</span>
-	getBookmark : <span class="reserved">function</span>(simple) {
-		var rng = <span class="reserved">this</span>.getRng();
-		var doc = <span class="reserved">this</span>.instance.getDoc();
-		var sp, le, s, e, nl, i, si, ei;
-		var trng, sx, sy, xx = -999999999;
-
-		<span class="comment">// Skip Opera for now</span>
-		<span class="reserved">if</span> (tinyMCE.isOpera)
-			<span class="reserved">return</span> null;
-
-		sx = doc.body.scrollLeft + doc.documentElement.scrollLeft;
-		sy = doc.body.scrollTop + doc.documentElement.scrollTop;
-
-		<span class="reserved">if</span> (tinyMCE.isSafari || tinyMCE.isGecko)
-			<span class="reserved">return</span> {rng : rng, scrollX : sx, scrollY : sy};
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			<span class="reserved">if</span> (simple)
-				<span class="reserved">return</span> {rng : rng};
-
-			<span class="reserved">if</span> (rng.item) {
-				e = rng.item(0);
-
-				nl = doc.getElementsByTagName(e.nodeName);
-				<span class="reserved">for</span> (i=0; i&lt;nl.length; i++) {
-					<span class="reserved">if</span> (e == nl[i]) {
-						sp = i;
-						break;
-					}
-				}
-
-				<span class="reserved">return</span> {
-					tag : e.nodeName,
-					index : sp,
-					scrollX : sx,
-					scrollY : sy
-				};
-			} <span class="reserved">else</span> {
-				trng = rng.duplicate();
-				trng.collapse(true);
-				sp = Math.abs(trng.move(<span class="literal">'character'</span>, xx));
-
-				trng = rng.duplicate();
-				trng.collapse(false);
-				le = Math.abs(trng.move(<span class="literal">'character'</span>, xx)) - sp;
-
-				<span class="reserved">return</span> {
-					start : sp,
-					length : le,
-					scrollX : sx,
-					scrollY : sy
-				};
-			}
-		}
-
-		<span class="reserved">if</span> (tinyMCE.isGecko) {
-			s = tinyMCE.getParentElement(rng.startContainer);
-			<span class="reserved">for</span> (si=0; si&lt;s.childNodes.length &amp;&amp; s.childNodes[si] != rng.startContainer; si++) ;
-
-			nl = doc.getElementsByTagName(s.nodeName);
-			<span class="reserved">for</span> (i=0; i&lt;nl.length; i++) {
-					<span class="reserved">if</span> (s == nl[i]) {
-						sp = i;
-						break;
-					}
-			}
-
-			e = tinyMCE.getParentElement(rng.endContainer);
-			<span class="reserved">for</span> (ei=0; ei&lt;e.childNodes.length &amp;&amp; e.childNodes[ei] != rng.endContainer; ei++) ;
-
-			nl = doc.getElementsByTagName(e.nodeName);
-			<span class="reserved">for</span> (i=0; i&lt;nl.length; i++) {
-					<span class="reserved">if</span> (e == nl[i]) {
-						le = i;
-						break;
-					}
-			}
-
-			<span class="comment">//tinyMCE.debug(s.nodeName, sp, rng.startOffset, '-' , e.nodeName, le, rng.endOffset);</span>
-			<span class="comment">//tinyMCE.debug(sx, sy);</span>
-
-			<span class="reserved">return</span> {
-				startTag : s.nodeName,
-				start : sp,
-				startIndex : si,
-				endTag : e.nodeName,
-				end : le,
-				endIndex : ei,
-				startOffset : rng.startOffset,
-				endOffset : rng.endOffset,
-				scrollX : sx,
-				scrollY : sy
-			};
-		}
-
-		<span class="reserved">return</span> null;
-	},
-
-	<span class="comment">/**
-	 * Restores the selection to the specified bookmark.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_Bookmark} bookmark Bookmark to restore selection from.
-	 * <span class="attrib">@return</span> true/false if it was successful or not.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	moveToBookmark : <span class="reserved">function</span>(bookmark) {
-		var rng, nl, i;
-		var inst = <span class="reserved">this</span>.instance;
-		var doc = inst.getDoc();
-		var win = inst.getWin();
-		var sel = <span class="reserved">this</span>.getSel();
-
-		<span class="reserved">if</span> (!bookmark)
-			<span class="reserved">return</span> false;
-
-		<span class="reserved">if</span> (tinyMCE.isSafari) {
-			sel.setBaseAndExtent(bookmark.startContainer, bookmark.startOffset, bookmark.endContainer, bookmark.endOffset);
-			<span class="reserved">return</span> true;
-		}
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			<span class="reserved">if</span> (bookmark.rng) {
-				bookmark.rng.select();
-				<span class="reserved">return</span> true;
-			}
-
-			win.focus();
-
-			<span class="reserved">if</span> (bookmark.tag) {
-				rng = inst.getBody().createControlRange();
-
-				nl = doc.getElementsByTagName(bookmark.tag);
-
-				<span class="reserved">if</span> (nl.length &gt; bookmark.index) {
-					try {
-						rng.addElement(nl[bookmark.index]);
-					} catch (ex) {
-						<span class="comment">// Might be thrown if the node no longer exists</span>
-					}
-				}
-			} <span class="reserved">else</span> {
-				rng = inst.getSel().createRange();
-				rng.moveToElementText(inst.getBody());
-				rng.collapse(true);
-				rng.moveStart(<span class="literal">'character'</span>, bookmark.start);
-				rng.moveEnd(<span class="literal">'character'</span>, bookmark.length);
-			}
-
-			rng.select();
-
-			win.scrollTo(bookmark.scrollX, bookmark.scrollY);
-			<span class="reserved">return</span> true;
-		}
-
-		<span class="reserved">if</span> (tinyMCE.isGecko &amp;&amp; bookmark.rng) {
-			sel.removeAllRanges();
-			sel.addRange(bookmark.rng);
-			win.scrollTo(bookmark.scrollX, bookmark.scrollY);
-			<span class="reserved">return</span> true;
-		}
-
-		<span class="reserved">if</span> (tinyMCE.isGecko) {
-	<span class="comment">//		try {</span>
-				rng = doc.createRange();
-
-				nl = doc.getElementsByTagName(bookmark.startTag);
-				<span class="reserved">if</span> (nl.length &gt; bookmark.start)
-					rng.setStart(nl[bookmark.start].childNodes[bookmark.startIndex], bookmark.startOffset);
-
-				nl = doc.getElementsByTagName(bookmark.endTag);
-				<span class="reserved">if</span> (nl.length &gt; bookmark.end)
-					rng.setEnd(nl[bookmark.end].childNodes[bookmark.endIndex], bookmark.endOffset);
-
-				sel.removeAllRanges();
-				sel.addRange(rng);
-	<span class="comment">/*		} catch {
-				// Ignore
-			}*/</span>
-
-			win.scrollTo(bookmark.scrollX, bookmark.scrollY);
-			<span class="reserved">return</span> true;
-		}
-
-		<span class="reserved">return</span> false;
-	},
-
-	<span class="comment">/**
-	 * Selects the specified node.
-	 *
-	 * <span class="attrib">@param</span> {HTMLNode} node Node object to move selection to.
-	 * <span class="attrib">@param</span> {boolean} collapse True/false if it will be collasped.
-	 * <span class="attrib">@param</span> {boolean} select_text_node True/false if the text contents should be selected or not.
-	 * <span class="attrib">@param</span> {boolean} to_start True/false if the collapse should be to start or end of range.
-	 */</span>
-	selectNode : <span class="reserved">function</span>(node, collapse, select_text_node, to_start) {
-		var inst = <span class="reserved">this</span>.instance, sel, rng, nodes;
-
-		<span class="reserved">if</span> (!node)
-			<span class="reserved">return</span>;
-
-		<span class="reserved">if</span> (typeof(collapse) == <span class="literal">"undefined"</span>)
-			collapse = true;
-
-		<span class="reserved">if</span> (typeof(select_text_node) == <span class="literal">"undefined"</span>)
-			select_text_node = false;
-
-		<span class="reserved">if</span> (typeof(to_start) == <span class="literal">"undefined"</span>)
-			to_start = true;
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE) {
-			rng = inst.getBody().createTextRange();
-
-			try {
-				rng.moveToElementText(node);
-
-				<span class="reserved">if</span> (collapse)
-					rng.collapse(to_start);
-
-				rng.select();
-			} catch (e) {
-				<span class="comment">// Throws illigal agrument in MSIE some times</span>
-			}
-		} <span class="reserved">else</span> {
-			sel = <span class="reserved">this</span>.getSel();
-
-			<span class="reserved">if</span> (!sel)
-				<span class="reserved">return</span>;
-
-			<span class="reserved">if</span> (tinyMCE.isSafari) {
-				sel.setBaseAndExtent(node, 0, node, node.innerText.length);
-
-				<span class="reserved">if</span> (collapse) {
-					<span class="reserved">if</span> (to_start)
-						sel.collapseToStart();
-					<span class="reserved">else</span>
-						sel.collapseToEnd();
-				}
-
-				<span class="reserved">this</span>.scrollToNode(node);
-
-				<span class="reserved">return</span>;
-			}
-
-			rng = inst.getDoc().createRange();
-
-			<span class="reserved">if</span> (select_text_node) {
-				<span class="comment">// Find first textnode in tree</span>
-				nodes = tinyMCE.getNodeTree(node, new Array(), 3);
-				<span class="reserved">if</span> (nodes.length &gt; 0)
-					rng.selectNodeContents(nodes[0]);
-				<span class="reserved">else</span>
-					rng.selectNodeContents(node);
-			} <span class="reserved">else</span>
-				rng.selectNode(node);
-
-			<span class="reserved">if</span> (collapse) {
-				<span class="comment">// Special treatment of textnode collapse</span>
-				<span class="reserved">if</span> (!to_start &amp;&amp; node.nodeType == 3) {
-					rng.setStart(node, node.nodeValue.length);
-					rng.setEnd(node, node.nodeValue.length);
-				} <span class="reserved">else</span>
-					rng.collapse(to_start);
-			}
-
-			sel.removeAllRanges();
-			sel.addRange(rng);
-		}
-
-		<span class="reserved">this</span>.scrollToNode(node);
-
-		<span class="comment">// Set selected element</span>
-		tinyMCE.selectedElement = null;
-		<span class="reserved">if</span> (node.nodeType == 1)
-			tinyMCE.selectedElement = node;
-	},
-
-	<span class="comment">/**
-	 * Scrolls to the specified node location.
-	 *
-	 * <span class="attrib">@param</span> {HTMLNode} node Node to scroll to.
-	 */</span>
-	scrollToNode : <span class="reserved">function</span>(node) {
-		var inst = <span class="reserved">this</span>.instance;
-		var pos, doc, scrollX, scrollY, height;
-
-		<span class="comment">// Scroll to node position</span>
-		pos = tinyMCE.getAbsPosition(node);
-		doc = inst.getDoc();
-		scrollX = doc.body.scrollLeft + doc.documentElement.scrollLeft;
-		scrollY = doc.body.scrollTop + doc.documentElement.scrollTop;
-		height = tinyMCE.isMSIE ? document.getElementById(inst.editorId).style.pixelHeight : inst.targetElement.clientHeight;
-
-		<span class="comment">// Only scroll if out of visible area</span>
-		<span class="reserved">if</span> (!tinyMCE.settings[<span class="literal">'auto_resize'</span>] &amp;&amp; !(pos.absTop &gt; scrollY &amp;&amp; pos.absTop &lt; (scrollY - 25 + height)))
-			inst.contentWindow.scrollTo(pos.absLeft, pos.absTop - height + 25); 
-	},
-
-	<span class="comment">/**
-	 * Returns the browsers selection instance.
-	 *
-	 * <span class="attrib">@return</span> Browser selection instance.
-	 * <span class="attrib">@type</span> DOMSelection
-	 */</span>
-	getSel : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera)
-			<span class="reserved">return</span> inst.getDoc().selection;
-
-		<span class="reserved">return</span> inst.contentWindow.getSelection();
-	},
-
-	<span class="comment">/**
-	 * Returns the browsers selections first range instance.
-	 *
-	 * <span class="attrib">@return</span> Browsers selections first range instance.
-	 * <span class="attrib">@type</span> DOMRange
-	 */</span>
-	getRng : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-		var sel = <span class="reserved">this</span>.getSel();
-
-		<span class="reserved">if</span> (sel == null)
-			<span class="reserved">return</span> null;
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera)
-			<span class="reserved">return</span> sel.createRange();
-
-		<span class="reserved">if</span> (tinyMCE.isSafari &amp;&amp; !sel.getRangeAt)
-			<span class="reserved">return</span> <span class="literal">''</span> + window.getSelection();
-
-		<span class="reserved">return</span> sel.getRangeAt(0);
-	},
-
-	<span class="comment">/**
-	 * Returns the currently selected/focused element.
-	 *
-	 * <span class="attrib">@return</span> Currently selected element.
-	 * <span class="attrib">@type</span> HTMLElement
-	 */</span>
-	getFocusElement : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-
-		<span class="reserved">if</span> (tinyMCE.isMSIE &amp;&amp; !tinyMCE.isOpera) {
-			var doc = inst.getDoc();
-			var rng = doc.selection.createRange();
-
-	<span class="comment">//		if (rng.collapse)</span>
-	<span class="comment">//			rng.collapse(true);</span>
-
-			var elm = rng.item ? rng.item(0) : rng.parentElement();
-		} <span class="reserved">else</span> {
-			<span class="reserved">if</span> (inst.isHidden())
-				<span class="reserved">return</span> inst.getBody();
-
-			var sel = <span class="reserved">this</span>.getSel();
-			var rng = <span class="reserved">this</span>.getRng();
-
-			<span class="reserved">if</span> (!sel || !rng)
-				<span class="reserved">return</span> null;
-
-			var elm = rng.commonAncestorContainer;
-			<span class="comment">//var elm = (sel &amp;&amp; sel.anchorNode) ? sel.anchorNode : null;</span>
-
-			<span class="comment">// Handle selection a image or other control like element such as anchors</span>
-			<span class="reserved">if</span> (!rng.collapsed) {
-				<span class="comment">// Is selection small</span>
-				<span class="reserved">if</span> (rng.startContainer == rng.endContainer) {
-					<span class="reserved">if</span> (rng.startOffset - rng.endOffset &lt; 2) {
-						<span class="reserved">if</span> (rng.startContainer.hasChildNodes())
-							elm = rng.startContainer.childNodes[rng.startOffset];
-					}
-				}
-			}
-
-			<span class="comment">// Get the element parent of the node</span>
-			elm = tinyMCE.getParentElement(elm);
-
-			<span class="comment">//if (tinyMCE.selectedElement != null &amp;&amp; tinyMCE.selectedElement.nodeName.toLowerCase() == "img")</span>
-			<span class="comment">//	elm = tinyMCE.selectedElement;</span>
-		}
-
-		<span class="reserved">return</span> elm;
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_URL.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_URL.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_URL.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_URL.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,530 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_URL.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_URL.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_URL.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_URL.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:31 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- *
- * The contents of this file will be wrapped in a class later on.
- */</span>
-
-<span class="comment">/**
- * Parses a URL in to its diffrent components.
- *
- * <span class="attrib">@param</span> {string} url_str URL string to parse into a URL object.
- * <span class="attrib">@return</span> URL object based on input string.
- * <span class="attrib">@type</span> TinyMCE_URL_Item
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.parseURL = <span class="reserved">function</span>(url_str) {
-	var urlParts = new Array();
-
-	<span class="reserved">if</span> (url_str) {
-		var pos, lastPos;
-
-		<span class="comment">// Parse protocol part</span>
-		pos = url_str.indexOf(<span class="literal">'://'</span>);
-		<span class="reserved">if</span> (pos != -1) {
-			urlParts[<span class="literal">'protocol'</span>] = url_str.substring(0, pos);
-			lastPos = pos + 3;
-		}
-
-		<span class="comment">// Find port or path start</span>
-		<span class="reserved">for</span> (var i=lastPos; i&lt;url_str.length; i++) {
-			var chr = url_str.charAt(i);
-
-			<span class="reserved">if</span> (chr == <span class="literal">':'</span>)
-				break;
-
-			<span class="reserved">if</span> (chr == <span class="literal">'/'</span>)
-				break;
-		}
-		pos = i;
-
-		<span class="comment">// Get host</span>
-		urlParts[<span class="literal">'host'</span>] = url_str.substring(lastPos, pos);
-
-		<span class="comment">// Get port</span>
-		urlParts[<span class="literal">'port'</span>] = <span class="literal">""</span>;
-		lastPos = pos;
-		<span class="reserved">if</span> (url_str.charAt(pos) == <span class="literal">':'</span>) {
-			pos = url_str.indexOf(<span class="literal">'/'</span>, lastPos);
-			urlParts[<span class="literal">'port'</span>] = url_str.substring(lastPos+1, pos);
-		}
-
-		<span class="comment">// Get path</span>
-		lastPos = pos;
-		pos = url_str.indexOf(<span class="literal">'?'</span>, lastPos);
-
-		<span class="reserved">if</span> (pos == -1)
-			pos = url_str.indexOf(<span class="literal">'#'</span>, lastPos);
-
-		<span class="reserved">if</span> (pos == -1)
-			pos = url_str.length;
-
-		urlParts[<span class="literal">'path'</span>] = url_str.substring(lastPos, pos);
-
-		<span class="comment">// Get query</span>
-		lastPos = pos;
-		<span class="reserved">if</span> (url_str.charAt(pos) == <span class="literal">'?'</span>) {
-			pos = url_str.indexOf(<span class="literal">'#'</span>);
-			pos = (pos == -1) ? url_str.length : pos;
-			urlParts[<span class="literal">'query'</span>] = url_str.substring(lastPos+1, pos);
-		}
-
-		<span class="comment">// Get anchor</span>
-		lastPos = pos;
-		<span class="reserved">if</span> (url_str.charAt(pos) == <span class="literal">'#'</span>) {
-			pos = url_str.length;
-			urlParts[<span class="literal">'anchor'</span>] = url_str.substring(lastPos+1, pos);
-		}
-	}
-
-	<span class="reserved">return</span> urlParts;
-};
-
-<span class="comment">/**
- * Serializes the specified URL object into a string.
- *
- * <span class="attrib">@param</span> {TinyMCE_URL_Item} up URL object to serialize.
- * <span class="attrib">@return</span> Serialized URL object.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.serializeURL = <span class="reserved">function</span>(up) {
-	var o = <span class="literal">""</span>;
-
-	<span class="reserved">if</span> (up[<span class="literal">'protocol'</span>])
-		o += up[<span class="literal">'protocol'</span>] + <span class="literal">"://"</span>;
-
-	<span class="reserved">if</span> (up[<span class="literal">'host'</span>])
-		o += up[<span class="literal">'host'</span>];
-
-	<span class="reserved">if</span> (up[<span class="literal">'port'</span>])
-		o += <span class="literal">":"</span> + up[<span class="literal">'port'</span>];
-
-	<span class="reserved">if</span> (up[<span class="literal">'path'</span>])
-		o += up[<span class="literal">'path'</span>];
-
-	<span class="reserved">if</span> (up[<span class="literal">'query'</span>])
-		o += <span class="literal">"?"</span> + up[<span class="literal">'query'</span>];
-
-	<span class="reserved">if</span> (up[<span class="literal">'anchor'</span>])
-		o += <span class="literal">"#"</span> + up[<span class="literal">'anchor'</span>];
-
-	<span class="reserved">return</span> o;
-};
-
-<span class="comment">/**
- * Converts an absolute path to relative path.
- *
- * <span class="attrib">@param</span> {string} base_url URL to make as a base path, URLs will be converted relative from this point.
- * <span class="attrib">@param</span> {string} url_to_relative URL to convert into a relative URL.
- * <span class="attrib">@return</span> Relative URL based in input.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertAbsoluteURLToRelativeURL = <span class="reserved">function</span>(base_url, url_to_relative) {
-	var baseURL = <span class="reserved">this</span>.parseURL(base_url);
-	var targetURL = <span class="reserved">this</span>.parseURL(url_to_relative);
-	var strTok1;
-	var strTok2;
-	var breakPoint = 0;
-	var outPath = <span class="literal">""</span>;
-	var forceSlash = false;
-
-	<span class="reserved">if</span> (targetURL.path == <span class="literal">""</span>)
-		targetURL.path = <span class="literal">"/"</span>;
-	<span class="reserved">else</span>
-		forceSlash = true;
-
-	<span class="comment">// Crop away last path part</span>
-	base_url = baseURL.path.substring(0, baseURL.path.lastIndexOf(<span class="literal">'/'</span>));
-	strTok1 = base_url.split(<span class="literal">'/'</span>);
-	strTok2 = targetURL.path.split(<span class="literal">'/'</span>);
-
-	<span class="reserved">if</span> (strTok1.length &gt;= strTok2.length) {
-		<span class="reserved">for</span> (var i=0; i&lt;strTok1.length; i++) {
-			<span class="reserved">if</span> (i &gt;= strTok2.length || strTok1[i] != strTok2[i]) {
-				breakPoint = i + 1;
-				break;
-			}
-		}
-	}
-
-	<span class="reserved">if</span> (strTok1.length &lt; strTok2.length) {
-		<span class="reserved">for</span> (var i=0; i&lt;strTok2.length; i++) {
-			<span class="reserved">if</span> (i &gt;= strTok1.length || strTok1[i] != strTok2[i]) {
-				breakPoint = i + 1;
-				break;
-			}
-		}
-	}
-
-	<span class="reserved">if</span> (breakPoint == 1)
-		<span class="reserved">return</span> targetURL.path;
-
-	<span class="reserved">for</span> (var i=0; i&lt;(strTok1.length-(breakPoint-1)); i++)
-		outPath += <span class="literal">"../"</span>;
-
-	<span class="reserved">for</span> (var i=breakPoint-1; i&lt;strTok2.length; i++) {
-		<span class="reserved">if</span> (i != (breakPoint-1))
-			outPath += <span class="literal">"/"</span> + strTok2[i];
-		<span class="reserved">else</span>
-			outPath += strTok2[i];
-	}
-
-	targetURL.protocol = null;
-	targetURL.host = null;
-	targetURL.port = null;
-	targetURL.path = outPath == <span class="literal">""</span> &amp;&amp; forceSlash ? <span class="literal">"/"</span> : outPath;
-
-	<span class="comment">// Remove document prefix from local anchors</span>
-	var fileName = baseURL.path;
-	var pos;
-
-	<span class="reserved">if</span> ((pos = fileName.lastIndexOf(<span class="literal">'/'</span>)) != -1)
-		fileName = fileName.substring(pos + 1);
-
-	<span class="comment">// Is local anchor</span>
-	<span class="reserved">if</span> (fileName == targetURL.path &amp;&amp; targetURL.anchor != <span class="literal">""</span>)
-		targetURL.path = <span class="literal">""</span>;
-
-	<span class="comment">// If empty and not local anchor force filename or slash</span>
-	<span class="reserved">if</span> (targetURL.path == <span class="literal">""</span> &amp;&amp; !targetURL.anchor)
-		targetURL.path = fileName != <span class="literal">""</span> ? fileName : <span class="literal">"/"</span>;
-
-	<span class="reserved">return</span> <span class="reserved">this</span>.serializeURL(targetURL);
-};
-
-<span class="comment">/**
- * Converts an relative path to absolute path.
- *
- * <span class="attrib">@param</span> {string} base_url URL to make as a base path, URLs will be converted absolute from this point.
- * <span class="attrib">@param</span> {string} relative_url URL to convert into a absolute URL.
- * <span class="attrib">@return</span> Absolute URL based in input.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertRelativeToAbsoluteURL = <span class="reserved">function</span>(base_url, relative_url) {
-	var baseURL = <span class="reserved">this</span>.parseURL(base_url);
-	var relURL = <span class="reserved">this</span>.parseURL(relative_url);
-
-	<span class="reserved">if</span> (relative_url == <span class="literal">""</span> || relative_url.charAt(0) == <span class="literal">'/'</span> || relative_url.indexOf(<span class="literal">'://'</span>) != -1 || relative_url.indexOf(<span class="literal">'mailto:'</span>) != -1 || relative_url.indexOf(<span class="literal">'javascript:'</span>) != -1)
-		<span class="reserved">return</span> relative_url;
-
-	<span class="comment">// Split parts</span>
-	baseURLParts = baseURL[<span class="literal">'path'</span>].split(<span class="literal">'/'</span>);
-	relURLParts = relURL[<span class="literal">'path'</span>].split(<span class="literal">'/'</span>);
-
-	<span class="comment">// Remove empty chunks</span>
-	var newBaseURLParts = new Array();
-	<span class="reserved">for</span> (var i=baseURLParts.length-1; i&gt;=0; i--) {
-		<span class="reserved">if</span> (baseURLParts[i].length == 0)
-			continue;
-
-		newBaseURLParts[newBaseURLParts.length] = baseURLParts[i];
-	}
-	baseURLParts = newBaseURLParts.reverse();
-
-	<span class="comment">// Merge relURLParts chunks</span>
-	var newRelURLParts = new Array();
-	var numBack = 0;
-	<span class="reserved">for</span> (var i=relURLParts.length-1; i&gt;=0; i--) {
-		<span class="reserved">if</span> (relURLParts[i].length == 0 || relURLParts[i] == <span class="literal">"."</span>)
-			continue;
-
-		<span class="reserved">if</span> (relURLParts[i] == <span class="literal">'..'</span>) {
-			numBack++;
-			continue;
-		}
-
-		<span class="reserved">if</span> (numBack &gt; 0) {
-			numBack--;
-			continue;
-		}
-
-		newRelURLParts[newRelURLParts.length] = relURLParts[i];
-	}
-
-	relURLParts = newRelURLParts.reverse();
-
-	<span class="comment">// Remove end from absolute path</span>
-	var len = baseURLParts.length-numBack;
-	var absPath = (len &lt;= 0 ? <span class="literal">""</span> : <span class="literal">"/"</span>) + baseURLParts.slice(0, len).join(<span class="literal">'/'</span>) + <span class="literal">"/"</span> + relURLParts.join(<span class="literal">'/'</span>);
-	var start = <span class="literal">""</span>, end = <span class="literal">""</span>;
-
-	<span class="comment">// Build output URL</span>
-	relURL.protocol = baseURL.protocol;
-	relURL.host = baseURL.host;
-	relURL.port = baseURL.port;
-
-	<span class="comment">// Re-add trailing slash if it's removed</span>
-	<span class="reserved">if</span> (relURL.path.charAt(relURL.path.length-1) == <span class="literal">"/"</span>)
-		absPath += <span class="literal">"/"</span>;
-
-	relURL.path = absPath;
-
-	<span class="reserved">return</span> <span class="reserved">this</span>.serializeURL(relURL);
-};
-
-<span class="comment">/**
- * Converts the specified URL based in TinyMCE configuration settings.
- *
- * <span class="attrib">@param</span> {string} url URL to convert based on config.
- * <span class="attrib">@param</span> {HTMLElement} node HTML element that holds the URL.
- * <span class="attrib">@param</span> {boolean} on_save Is this convertion the final output URL.
- * <span class="attrib">@return</span> Converted URL string.
- * <span class="attrib">@type</span> string
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertURL = <span class="reserved">function</span>(url, node, on_save) {
-	var prot = document.location.protocol;
-	var host = document.location.hostname;
-	var port = document.location.port;
-
-	<span class="comment">// Pass through file protocol</span>
-	<span class="reserved">if</span> (prot == <span class="literal">"file:"</span>)
-		<span class="reserved">return</span> url;
-
-	<span class="comment">// Something is wrong, remove weirdness</span>
-	url = tinyMCE.regexpReplace(url, <span class="literal">'(http|https):///'</span>, <span class="literal">'/'</span>);
-
-	<span class="comment">// Mailto link or anchor (Pass through)</span>
-	<span class="reserved">if</span> (url.indexOf(<span class="literal">'mailto:'</span>) != -1 || url.indexOf(<span class="literal">'javascript:'</span>) != -1 || tinyMCE.regexpReplace(url,<span class="literal">'[ \t\r\n\+]|%20'</span>,<span class="literal">''</span>).charAt(0) == <span class="literal">"#"</span>)
-		<span class="reserved">return</span> url;
-
-	<span class="comment">// Fix relative/Mozilla</span>
-	<span class="reserved">if</span> (!tinyMCE.isMSIE &amp;&amp; !on_save &amp;&amp; url.indexOf(<span class="literal">"://"</span>) == -1 &amp;&amp; url.charAt(0) != <span class="literal">'/'</span>)
-		<span class="reserved">return</span> tinyMCE.settings[<span class="literal">'base_href'</span>] + url;
-
-	<span class="comment">// Handle relative URLs</span>
-	<span class="reserved">if</span> (on_save &amp;&amp; tinyMCE.getParam(<span class="literal">'relative_urls'</span>)) {
-		var curl = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings[<span class="literal">'base_href'</span>], url);
-		<span class="reserved">if</span> (curl.charAt(0) == <span class="literal">'/'</span>)
-			curl = tinyMCE.settings[<span class="literal">'document_base_prefix'</span>] + curl;
-
-		var urlParts = tinyMCE.parseURL(curl);
-		var tmpUrlParts = tinyMCE.parseURL(tinyMCE.settings[<span class="literal">'document_base_url'</span>]);
-
-		<span class="comment">// Force relative</span>
-		<span class="reserved">if</span> (urlParts[<span class="literal">'host'</span>] == tmpUrlParts[<span class="literal">'host'</span>] &amp;&amp; (urlParts[<span class="literal">'port'</span>] == tmpUrlParts[<span class="literal">'port'</span>]))
-			<span class="reserved">return</span> tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings[<span class="literal">'document_base_url'</span>], curl);
-	}
-
-	<span class="comment">// Handle absolute URLs</span>
-	<span class="reserved">if</span> (!tinyMCE.getParam(<span class="literal">'relative_urls'</span>)) {
-		var urlParts = tinyMCE.parseURL(url);
-		var baseUrlParts = tinyMCE.parseURL(tinyMCE.settings[<span class="literal">'base_href'</span>]);
-
-		<span class="comment">// Force absolute URLs from relative URLs</span>
-		url = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings[<span class="literal">'base_href'</span>], url);
-
-		<span class="comment">// If anchor and path is the same page</span>
-		<span class="reserved">if</span> (urlParts[<span class="literal">'anchor'</span>] &amp;&amp; urlParts[<span class="literal">'path'</span>] == baseUrlParts[<span class="literal">'path'</span>])
-			<span class="reserved">return</span> <span class="literal">"#"</span> + urlParts[<span class="literal">'anchor'</span>];
-	}
-
-	<span class="comment">// Remove current domain</span>
-	<span class="reserved">if</span> (tinyMCE.getParam(<span class="literal">'remove_script_host'</span>)) {
-		var start = <span class="literal">""</span>, portPart = <span class="literal">""</span>;
-
-		<span class="reserved">if</span> (port != <span class="literal">""</span>)
-			portPart = <span class="literal">":"</span> + port;
-
-		start = prot + <span class="literal">"//"</span> + host + portPart + <span class="literal">"/"</span>;
-
-		<span class="reserved">if</span> (url.indexOf(start) == 0)
-			url = url.substring(start.length-1);
-	}
-
-	<span class="reserved">return</span> url;
-};
-
-<span class="comment">/**
- * Converts all img and a element URLs to absolute URLs. This will use the mce_src or mce_href attribute values
- * if they are provided. This function is used when the editor is initialized.
- *
- * <span class="attrib">@param</span> {HTMLElement} body HTML element to convert all URLs in.
- */</span>
-TinyMCE_Engine.<span class="reserved">prototype</span>.convertAllRelativeURLs = <span class="reserved">function</span>(body) {
-	<span class="comment">// Convert all image URL:s to absolute URL</span>
-	var elms = body.getElementsByTagName(<span class="literal">"img"</span>);
-	<span class="reserved">for</span> (var i=0; i&lt;elms.length; i++) {
-		var src = tinyMCE.getAttrib(elms[i], <span class="literal">'src'</span>);
-
-		var msrc = tinyMCE.getAttrib(elms[i], <span class="literal">'mce_src'</span>);
-		<span class="reserved">if</span> (msrc != <span class="literal">""</span>)
-			src = msrc;
-
-		<span class="reserved">if</span> (src != <span class="literal">""</span>) {
-			src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings[<span class="literal">'base_href'</span>], src);
-			elms[i].setAttribute(<span class="literal">"src"</span>, src);
-		}
-	}
-
-	<span class="comment">// Convert all link URL:s to absolute URL</span>
-	var elms = body.getElementsByTagName(<span class="literal">"a"</span>);
-	<span class="reserved">for</span> (var i=0; i&lt;elms.length; i++) {
-		var href = tinyMCE.getAttrib(elms[i], <span class="literal">'href'</span>);
-
-		var mhref = tinyMCE.getAttrib(elms[i], <span class="literal">'mce_href'</span>);
-		<span class="reserved">if</span> (mhref != <span class="literal">""</span>)
-			href = mhref;
-
-		<span class="reserved">if</span> (href &amp;&amp; href != <span class="literal">""</span>) {
-			href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings[<span class="literal">'base_href'</span>], href);
-			elms[i].setAttribute(<span class="literal">"href"</span>, href);
-		}
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_UndoRedo.class.js.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_UndoRedo.class.js.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_UndoRedo.class.js.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary-TinyMCE_UndoRedo.class.js.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,296 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title="TinyMCE_UndoRedo.class.js Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>TinyMCE_UndoRedo.class.js</h2>
-	
-</center>
-
-	
-
-
-<h4>Summary</h4>
-<p>
-	
-		No overview generated for 'TinyMCE_UndoRedo.class.js'<BR/><BR/>
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>Class Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="TinyMCE_UndoRedo.html">TinyMCE_UndoRedo</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-        <pre class="sourceview"><span class="comment">/**
- * $RCSfile: overview-summary-TinyMCE_UndoRedo.class.js.html,v $
- * $Revision: 1.42 $
- * $Date: 2006/04/14 20:00:31 $
- *
- * <span class="attrib">@author</span> Moxiecode
- * <span class="attrib">@copyright</span> Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */</span>
-
-<span class="comment">/**
- * Constructs a undo redo instance, this instance handles the custom undo/redo handeling in TinyMCE.
- *
- * <span class="attrib">@param</span> {TinyMCE_Control} inst TinyMCE editor control instance.
- * <span class="attrib">@constructor</span>
- */</span>
-<span class="reserved">function</span> TinyMCE_UndoRedo(inst) {
-	<span class="reserved">this</span>.instance = inst;
-	<span class="reserved">this</span>.undoLevels = new Array();
-	<span class="reserved">this</span>.undoIndex = 0;
-	<span class="reserved">this</span>.typingUndoIndex = -1;
-	<span class="reserved">this</span>.undoRedo = true;
-};
-
-TinyMCE_UndoRedo.<span class="reserved">prototype</span> = {
-	<span class="comment">/**
-	 * Adds a new undo level, this will take a snapshot of the current instance HTML or use the specified level.
-	 *
-	 * <span class="attrib">@param</span> {TinyMCE_UndoRedoLevel} l Optional undo/redo level to add.
-	 * <span class="attrib">@return</span> true/false on success or failure.
-	 * <span class="attrib">@type</span> boolean
-	 */</span>
-	add : <span class="reserved">function</span>(l) {
-		var b;
-
-		<span class="reserved">if</span> (l) {
-			<span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoLevels.length] = l;
-			<span class="reserved">return</span> true;
-		}
-
-		var inst = <span class="reserved">this</span>.instance;
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.typingUndoIndex != -1) {
-			<span class="reserved">this</span>.undoIndex = <span class="reserved">this</span>.typingUndoIndex;
-			<span class="comment">// tinyMCE.debug("Override: " + this.undoIndex);</span>
-		}
-
-		var newHTML = tinyMCE.trim(inst.getBody().innerHTML);
-		<span class="reserved">if</span> (<span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex] &amp;&amp; newHTML != <span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex].content) {
-			<span class="comment">//tinyMCE.debug(newHTML, this.undoLevels[this.undoIndex]);</span>
-
-			tinyMCE.dispatchCallback(inst, <span class="literal">'onchange_callback'</span>, <span class="literal">'onChange'</span>, inst);
-
-			<span class="comment">// Time to compress</span>
-			var customUndoLevels = tinyMCE.settings[<span class="literal">'custom_undo_redo_levels'</span>];
-			<span class="reserved">if</span> (customUndoLevels != -1 &amp;&amp; <span class="reserved">this</span>.undoLevels.length &gt; customUndoLevels) {
-				<span class="reserved">for</span> (var i=0; i&lt;<span class="reserved">this</span>.undoLevels.length-1; i++) {
-					<span class="comment">//tinyMCE.debug(this.undoLevels[i] + "=" + this.undoLevels[i+1]);</span>
-					<span class="reserved">this</span>.undoLevels[i] = <span class="reserved">this</span>.undoLevels[i+1];
-				}
-
-				<span class="reserved">this</span>.undoLevels.length--;
-				<span class="reserved">this</span>.undoIndex--;
-			}
-
-			b = inst.undoBookmark;
-			<span class="reserved">if</span> (!b)
-				b = inst.selection.getBookmark();
-
-			<span class="reserved">this</span>.undoIndex++;
-			<span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex] = {
-				content : newHTML,
-				bookmark : b
-			};
-
-			<span class="reserved">this</span>.undoLevels.length = <span class="reserved">this</span>.undoIndex + 1;
-
-			<span class="comment">//tinyMCE.debug("level added" + this.undoIndex);</span>
-			<span class="reserved">return</span> true;
-
-			<span class="comment">// tinyMCE.debug(this.undoIndex + "," + (this.undoLevels.length-1));</span>
-		}
-
-		<span class="reserved">return</span> false;
-	},
-
-	<span class="comment">/**
-	 * Performes a undo action, this will restore the HTML contents of the editor to a former state.
-	 */</span>
-	undo : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-
-		<span class="comment">// Do undo</span>
-		<span class="reserved">if</span> (<span class="reserved">this</span>.undoIndex &gt; 0) {
-			<span class="reserved">this</span>.undoIndex--;
-			tinyMCE.setInnerHTML(inst.getBody(), <span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex].content);
-			inst.repaint();
-			<span class="reserved">if</span> (inst.settings.custom_undo_redo_restore_selection)
-				inst.selection.moveToBookmark(<span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex].bookmark);
-		}
-
-		<span class="comment">// tinyMCE.debug("Undo - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);</span>
-	},
-
-	<span class="comment">/**
-	 * Performes a undo action, this will restore the HTML contents of the editor to a former undoed state.
-	 */</span>
-	redo : <span class="reserved">function</span>() {
-		var inst = <span class="reserved">this</span>.instance;
-
-		tinyMCE.execCommand(<span class="literal">"mceEndTyping"</span>);
-
-		<span class="reserved">if</span> (<span class="reserved">this</span>.undoIndex &lt; (<span class="reserved">this</span>.undoLevels.length-1)) {
-			<span class="reserved">this</span>.undoIndex++;
-			tinyMCE.setInnerHTML(inst.getBody(), <span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex].content);
-			inst.repaint();
-<span class="comment">//					if (this.undoIndex &gt; 0)</span>
-<span class="comment">//						inst.selection.moveToBookmark(this.undoLevels[this.undoIndex-1].bookmark);</span>
-			<span class="reserved">if</span> (inst.settings.custom_undo_redo_restore_selection)
-				inst.selection.moveToBookmark(<span class="reserved">this</span>.undoLevels[<span class="reserved">this</span>.undoIndex].bookmark);
-			<span class="comment">// tinyMCE.debug("Redo - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);</span>
-		}
-
-		tinyMCE.triggerNodeChange();
-	}
-};
-</pre>
-	<hr>
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-summary.html"><font class="NavBarFont1"><b>Overview</b></font></a>&nbsp;</td>
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>File</b></font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-summary.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-summary.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,231 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<html>
-<head>
-<title>
- Overview
-</title>
-<link rel ="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script>
-function asd() {
-	
-		parent.document.title=" Overview";
-	
-}
-</script>
-</head>
-<body bgcolor="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev">	&nbsp;<font class="NavBarFont1Rev"><b>Overview</b></font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1"> <font class="NavBarFont1">File</font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> 	<font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top">
-<em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<center>
-	
-	   <h2>JSDoc Documentation</h2>
-	
-</center>
-
-
-<h4>Summary</h4>
-<p>
-	
-    	No summary generated for these documents.
-	
-</p>
-
-<hr>
-
-
-    <table border="1" cellpadding="3" cellspacing="0" width="100%">
-    <tr bgcolor="#CCCCFF" class="TableHeadingColor">
-    <td colspan=2><font size="+2">
-    
-        <b>File Summary</b>
-    
-    </font></td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Array.class.js.html">TinyMCE_Array.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Cleanup.class.js.html">TinyMCE_Cleanup.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Control.class.js.html">TinyMCE_Control.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Debug.class.js.html">TinyMCE_Debug.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_DOMUtils.class.js.html">TinyMCE_DOMUtils.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Engine.class.js.html">TinyMCE_Engine.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Event.class.js.html">TinyMCE_Event.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_ForceParagraphs.class.js.html">TinyMCE_ForceParagraphs.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Layer.class.js.html">TinyMCE_Layer.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Menu.class.js.html">TinyMCE_Menu.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Popup.class.js.html">TinyMCE_Popup.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_Selection.class.js.html">TinyMCE_Selection.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_UndoRedo.class.js.html">TinyMCE_UndoRedo.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    <tr bgcolor="white" class="TableRowColor">
-    <td width="15%"><b><a href="overview-summary-TinyMCE_URL.class.js.html">TinyMCE_URL.class.js</a></b></td>
-    <td>&nbsp;</td>
-    </tr>
-    
-    </table>
-    <hr/> 
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<!-- ========== END METHOD SUMMARY =========== -->
-
-
-
-
-<!-- ========== START OF NAVBAR ========== -->
-<a name="navbar_top"><!-- --></a>
-<table border="0" width="100%" cellpadding="1" cellspacing="0">
-<tr>
-<td colspan=2 bgcolor="#EEEEFF" class="NavBarCell1">
-<a name="navbar_top_firstrow"><!-- --></a>
-<table border="0" cellpadding="0" cellspacing="3">
-  <tr align="center" valign="top">
-  
-  
-  <td bgcolor="#FFFFFF" class="NavBarCell1Rev"> &nbsp;<font class="NavBarFont1Rev"><b>Overview</b></font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1"> <font class="NavBarFont1">File</font>&nbsp;</td>
-  
-
-  <td bgcolor="#FFFFFF" class="NavBarCell1"> <font class="NavBarFont1">Class</font>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="overview-tree.html"><font class="NavBarFont1"><b>Tree</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="index-all.html"--><font class="NavBarFont1"><b>Index</b></font></a>&nbsp;</td>
-  <td bgcolor="#EEEEFF" class="NavBarCell1">    <a href="help-doc.html"><font class="NavBarFont1"><b>Help</b></font></a>&nbsp;</td>
-  </tr>
-</table>
-</td>
-<td bgcolor="#EEEEFF" align="right" valign="top"><em>
-<b></b></em>
-</td>
-</tr>
-
-<tr>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</font></td>
-<td bgcolor="white" class="NavBarCell2"><font size="-2">
-  <a href="index.html" target="_top"><b>FRAMES</b></a>  &nbsp;
-&nbsp;<a href="overview-summary.html" target="_top"><b>NO FRAMES</b></a>
-&nbsp;&nbsp;
-<script>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</script>
-<noscript>
-<a href="allclasses-noframe.html" target=""><b>All Classes</b></a>
-</noscript>
-</font></td>
-</tr>
-</table>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<font size="-1">
-
-</font>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" target="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-tree.html 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-tree.html
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/overview-tree.html	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/overview-tree.html	1969-12-31 18:00:00.000000000 -0600
@@ -1,149 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<TITLE>
- Class Hierarchy
-</TITLE>
-<LINK REL="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-<SCRIPT>
-function asd()
-{
-parent.document.title=" Class Hierarchy";
-}
-</SCRIPT>
-</HEAD>
-<BODY BGCOLOR="white" onload="asd();">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"><A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><b>Overview</b></A></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev">  &nbsp;<FONT CLASS="NavBarFont1Rev"><b>Tree</b></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><b>Index</b></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><b>Help</b></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD BGCOLOR="#FFFFFF" ALIGN="right" VALIGN="top"><EM>
-<B></B></EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-summary.html" TARGET="_top"><B>NO FRAMES</B></A>
-&nbsp;&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<H2>Class Hierarchy</H2>
-
-<UL><LI TYPE="circle">Object</LI><UL>
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_Cleanup.html">
-                <B>TinyMCE_Cleanup</B></A></LI>
-            
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_Control.html">
-                <B>TinyMCE_Control</B></A></LI>
-            
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_Engine.html">
-                <B>TinyMCE_Engine</B></A></LI>
-            
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_Layer.html">
-                <B>TinyMCE_Layer</B></A></LI>
-            
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_Popup.html">
-                <B>TinyMCE_Popup</B></A></LI>
-            
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_Selection.html">
-                <B>TinyMCE_Selection</B></A></LI>
-            
-                <LI TYPE="circle">
-                    <A HREF="TinyMCE_UndoRedo.html">
-                <B>TinyMCE_UndoRedo</B></A></LI>
-            </UL></UL>
-
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"><A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><b>Overview</b></A></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">File</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev">  &nbsp;<FONT CLASS="NavBarFont1Rev"><b>Tree</b></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"--><FONT CLASS="NavBarFont1"><b>Index</b></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><b>Help</b></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD BGCOLOR="#FFFFFF" ALIGN="right" VALIGN="top"><EM>
-<B></B></EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-summary.html" TARGET="_top"><B>NO FRAMES</B></A>
-&nbsp;&nbsp;
-<SCRIPT>
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="allclasses-noframe.html" TARGET=""><B>All Classes</B></A>
-</NOSCRIPT>
-</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<hr>
-<FONT SIZE="-1">
-
-</FONT>
-<div class="jsdoc_ctime">Documentation generated by <a href="http://jsdoc.sourceforge.net/" parent="_parent">JSDoc</a> on Fri Apr 14 21:59:23 2006</div>
-</BODY>
-</HTML>
diff -ruN 4.5.4/mambots/editors/tinymce/docs/tinymce_api/stylesheet.css 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/stylesheet.css
--- 4.5.4/mambots/editors/tinymce/docs/tinymce_api/stylesheet.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/docs/tinymce_api/stylesheet.css	1969-12-31 18:00:00.000000000 -0600
@@ -1,39 +0,0 @@
-/* JSDoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 10pt; font-family: Helvetica, Arial, san-serif }
-.FrameHeadingFont { font-size: 10pt; font-family: Helvetica, Arial, san-serif }
-.FrameItemFont    { font-size: 10pt; font-family: Helvetica, Arial, san-serif }
-
-/* Example of smaller, sans-serif font in frames */
-/* .FrameItemFont  { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF;}/* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
-.jsdoc_ctime    { font-family: Arial, Helvetica, sans-serif; font-size: 9pt;
-                    text-align: right }
-
-/* Sourcecode view */
-.sourceview { background: #FFFFFF }
-.attrib { color: #DD7777 }
-.comment { color: #55AA55 }
-.reserved { color: #FF5555 }
-.literal { color: #5555FF }
-
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/index.html 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/index.html
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/index.html	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/langs/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/langs/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/langs/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/langs/readme.txt	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 Language packs are from version 2.0.5 removed from the core but can be downloadable from the TinyMCE website.
 http://tinymce.moxiecode.com/download.php
 
-The language pack codes are based on ISO-639-1
+The language pack codes are based on ISO-639-2
 http://www.loc.gov/standards/iso639-2/englangn.html
 
 Try using entires if possible. &aring; etc.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/_template/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/_template/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/_template/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/_template/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-This is a template/tutorial plugin that where created to help you in the development of own plugins for TinyMCE.
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advhr/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advhr/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advhr/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advhr/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advimage/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advimage/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advimage/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advimage/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/advlink/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/autosave/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/autosave/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/autosave/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/autosave/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/cleanup/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/cleanup/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/cleanup/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/cleanup/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Dummy plugin since cleanup is now moved into core.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js	2006-04-30 15:27:06.000000000 -0500
@@ -1 +1 @@
-if(!tinyMCE.settings['contextmenu_skip_plugin_css']){tinyMCE.loadCSS(tinyMCE.baseURL+"/plugins/contextmenu/css/contextmenu.css");}var TinyMCE_ContextMenuPlugin={_contextMenu:null,getInfo:function(){return{longname:'Context menus',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_contextmenu.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE5_0&&tinyMCE.isOpera)return;TinyMCE_ContextMenuPlugin._contextMenu=new TinyMCE_ContextMenu({commandhandler:"TinyMCE_ContextMenuPlugin._commandHandler",spacer_image:tinyMCE.baseURL+"/plugins/contextmenu/images/spacer.gif"});tinyMCE.addEvent(inst.getDoc(),"click",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(inst.getDoc(),"keypress",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(inst.getDoc(),"keydown",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"click",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"keypress",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"keydown",TinyMCE_ContextMenuPlugin._hideContextMenu);if(tinyMCE.isGecko){tinyMCE.addEvent(inst.getDoc(),"contextmenu",function(e){TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE?inst.contentWindow.event:e,inst);});}else tinyMCE.addEvent(inst.getDoc(),"contextmenu",TinyMCE_ContextMenuPlugin._onContextMenu);},_onContextMenu:function(e){var elm=tinyMCE.isMSIE?e.srcElement:e.target;var targetInst,body;if((body=tinyMCE.getParentElement(elm,"body"))!=null){for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;if(body==inst.getBody()){targetInst=inst;break;}}return TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE?targetInst.contentWindow.event:e,targetInst);}},_showContextMenu:function(e,inst){function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";}var x,y,elm,contextMenu;var pos=tinyMCE.getAbsPosition(inst.iframeElement);x=tinyMCE.isMSIE?e.screenX:pos.absLeft+(e.pageX-inst.getBody().scrollLeft);y=tinyMCE.isMSIE?e.screenY:pos.absTop+(e.pageY-inst.getBody().scrollTop);elm=tinyMCE.isMSIE?e.srcElement:e.target;contextMenu=this._contextMenu;contextMenu.inst=inst;window.setTimeout(function(){var theme=tinyMCE.getParam("theme");contextMenu.clearAll();var sel=inst.selection.getSelectedText().length!=0||elm.nodeName=="IMG";contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/cut.gif","$lang_cut_desc","Cut","",!sel);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/copy.gif","$lang_copy_desc","Copy","",!sel);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_paste_desc","Paste","",false);if(sel||(elm?(elm.nodeName=='A')||(elm.nodeName=='IMG'):false)){contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/themes/advanced/images/link.gif","$lang_link_desc",inst.hasPlugin("advlink")?"mceAdvLink":"mceLink");contextMenu.addItem(tinyMCE.baseURL+"/themes/advanced/images/unlink.gif","$lang_unlink_desc","unlink","",(elm?(elm.nodeName!='A')&&(elm.nodeName!='IMG'):true));}elm=tinyMCE.getParentElement(elm,"img,table,td"+(inst.hasPlugin("advhr")?',hr':''));if(elm){switch(elm.nodeName){case"IMG":contextMenu.addSeparator();if(tinyMCE.getAttrib(elm,'class').indexOf('mceItemFlash')!=-1)contextMenu.addItem(tinyMCE.baseURL+"/plugins/flash/images/flash.gif","$lang_flash_props","mceFlash");else contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/image.gif","$lang_image_props_desc",inst.hasPlugin("advimage")?"mceAdvImage":"mceImage");break;case"HR":contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/advhr/images/advhr.gif","$lang_insert_advhr_desc","mceAdvancedHr");break;case"TABLE":case"TD":if(inst.hasPlugin("table")){var colspan=(elm.nodeName=="TABLE")?"":getAttrib(elm,"colspan");var rowspan=(elm.nodeName=="TABLE")?"":getAttrib(elm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/cut.gif","$lang_table_cut_row_desc","mceTableCutRow");contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/copy.gif","$lang_table_copy_row_desc","mceTableCopyRow");contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_table_paste_row_before_desc","mceTablePasteRowBefore","",inst.tableRowClipboard==null);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_table_paste_row_after_desc","mceTablePasteRowAfter","",inst.tableRowClipboard==null);contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_desc","mceInsertTable","insert");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_props_desc","mceInsertTable");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_cell_props.gif","$lang_table_cell_desc","mceTableCellProps");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete.gif","$lang_table_del","mceTableDelete");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_row_props.gif","$lang_table_row_desc","mceTableRowProps");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_row_before.gif","$lang_table_row_before_desc","mceTableInsertRowBefore");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_row_after.gif","$lang_table_row_after_desc","mceTableInsertRowAfter");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete_row.gif","$lang_table_delete_row_desc","mceTableDeleteRow");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_col_before.gif","$lang_table_col_before_desc","mceTableInsertColBefore");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_col_after.gif","$lang_table_col_after_desc","mceTableInsertColAfter");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete_col.gif","$lang_table_delete_col_desc","mceTableDeleteCol");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_split_cells.gif","$lang_table_split_cells_desc","mceTableSplitCells","",(colspan=="1"&&rowspan=="1"));contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_merge_cells.gif","$lang_table_merge_cells_desc","mceTableMergeCells","",false);}break;}}else{if(inst.hasPlugin("table")){contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_desc","mceInsertTable","insert");}}contextMenu.show(x,y);},10);tinyMCE.cancelEvent(e);return false;},_hideContextMenu:function(){if(TinyMCE_ContextMenuPlugin._contextMenu)TinyMCE_ContextMenuPlugin._contextMenu.hide();},_commandHandler:function(command,value){var cm=TinyMCE_ContextMenuPlugin._contextMenu;cm.hide();var ui=false;if(command=="mceInsertTable"||command=="mceTableCellProps"||command=="mceTableRowProps"||command=="mceTableMergeCells")ui=true;if(command=="Paste")value=null;if(tinyMCE.getParam("dialog_type")=="modal"&&tinyMCE.isMSIE){window.setTimeout(function(){cm.inst.execCommand(command,ui,value);},100);}else cm.inst.execCommand(command,ui,value);}};tinyMCE.addPlugin("contextmenu",TinyMCE_ContextMenuPlugin);function TinyMCE_ContextMenu(settings){function defParam(key,def_val){settings[key]=typeof(settings[key])!="undefined"?settings[key]:def_val;}var self=this;this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.contextMenuDiv=document.createElement("div");this.contextMenuDiv.className="contextMenu";this.contextMenuDiv.setAttribute("class","contextMenu");this.contextMenuDiv.style.display="none";this.contextMenuDiv.style.position='absolute';this.contextMenuDiv.style.zindex=1000;this.contextMenuDiv.style.left='0';this.contextMenuDiv.style.top='0';this.contextMenuDiv.unselectable="on";document.body.appendChild(this.contextMenuDiv);defParam("commandhandler","");defParam("spacer_image","images/spacer.gif");this.items=new Array();this.settings=settings;this.html="";if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera){this.pop=window.createPopup();doc=this.pop.document;doc.open();doc.write('<html><head><link href="'+tinyMCE.baseURL+'/plugins/contextmenu/css/contextmenu.css" rel="stylesheet" type="text/css" /></head><body unselectable="yes" class="contextMenuIEPopup"></body></html>');doc.close();}};TinyMCE_ContextMenu.prototype={clearAll:function(){this.html="";this.contextMenuDiv.innerHTML="";},addSeparator:function(){this.html+='<tr class="contextMenuItem"><td class="contextMenuIcon"><img src="'+this.settings['spacer_image']+'" width="20" height="1" class="contextMenuImage" /></td><td><img class="contextMenuSeparator" width="1" height="1" src="'+this.settings['spacer_image']+'" /></td></tr>';},addItem:function(icon,title,command,value,disabled){if(title.charAt(0)=='$')title=tinyMCE.getLang(title.substring(1));var onMouseDown='';var html='';if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0)onMouseDown='contextMenu.execCommand(\''+command+'\', \''+value+'\');return false;';else onMouseDown=this.settings['commandhandler']+'(\''+command+'\', \''+value+'\');return false;';if(icon=="")icon=this.settings['spacer_image'];if(!disabled)html+='<tr class="contextMenuItem">';else html+='<tr class="contextMenuItemDisabled">';html+='<td class="contextMenuIcon"><img src="'+icon+'" width="20" height="20" class="contextMenuImage" /></td>';html+='<td><div class="contextMenuText">';html+='<a href="javascript:void(0);" onclick="'+onMouseDown+'" onmousedown="return false;">&#160;';html+=title;html+='&#160;</a>';html+='</div></td>';html+='</tr>';this.html+=html;},show:function(x,y){var vp,width,height;if(this.html=="")return;var html='';html+='<a href="#"></a><table border="0" cellpadding="0" cellspacing="0">';html+=this.html;html+='</table>';this.contextMenuDiv.innerHTML=html;this.contextMenuDiv.style.display="block";width=this.contextMenuDiv.offsetWidth;height=this.contextMenuDiv.offsetHeight;this.contextMenuDiv.style.display="none";if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera){this.pop.document.body.innerHTML='<div class="contextMenu">'+html+"</div>";this.pop.document.tinyMCE=tinyMCE;this.pop.document.contextMenu=this;this.pop.show(x,y,width,height);}else{vp=this.getViewPort();this.contextMenuDiv.style.left=(x>vp.width-width?vp.width-width:x)+'px';this.contextMenuDiv.style.top=(y>vp.height-height?vp.height-height:y)+'px';this.contextMenuDiv.style.display="block";}},getViewPort:function(){return{width:document.documentElement.offsetWidth||document.body.offsetWidth,height:self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight};},hide:function(){if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera)this.pop.hide();else this.contextMenuDiv.style.display="none";},execCommand:function(command,value){eval(this.settings['commandhandler']+"(command, value);");}};
\ No newline at end of file
+if(!tinyMCE.settings['contextmenu_skip_plugin_css']){tinyMCE.loadCSS(tinyMCE.baseURL+"/plugins/contextmenu/css/contextmenu.css");}var TinyMCE_ContextMenuPlugin={_contextMenu:null,getInfo:function(){return{longname:'Context menus',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_contextmenu.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE5_0&&tinyMCE.isOpera)return;TinyMCE_ContextMenuPlugin._contextMenu=new TinyMCE_ContextMenu({commandhandler:"TinyMCE_ContextMenuPlugin._commandHandler",spacer_image:tinyMCE.baseURL+"/plugins/contextmenu/images/spacer.gif"});tinyMCE.addEvent(inst.getDoc(),"click",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(inst.getDoc(),"keypress",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(inst.getDoc(),"keydown",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"click",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"keypress",TinyMCE_ContextMenuPlugin._hideContextMenu);tinyMCE.addEvent(document,"keydown",TinyMCE_ContextMenuPlugin._hideContextMenu);if(tinyMCE.isGecko){tinyMCE.addEvent(inst.getDoc(),"contextmenu",function(e){TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE?inst.contentWindow.event:e,inst);});}else tinyMCE.addEvent(inst.getDoc(),"contextmenu",TinyMCE_ContextMenuPlugin._onContextMenu);},_onContextMenu:function(e){var elm=tinyMCE.isMSIE?e.srcElement:e.target;var targetInst,body;if((body=tinyMCE.getParentElement(elm,"body"))!=null){for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;if(body==inst.getBody()){targetInst=inst;break;}}return TinyMCE_ContextMenuPlugin._showContextMenu(tinyMCE.isMSIE?targetInst.contentWindow.event:e,targetInst);}},_showContextMenu:function(e,inst){function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";}var x,y,elm,contextMenu;var pos=tinyMCE.getAbsPosition(inst.iframeElement);x=tinyMCE.isMSIE?e.screenX:pos.absLeft+(e.pageX-inst.getBody().scrollLeft);y=tinyMCE.isMSIE?e.screenY:pos.absTop+(e.pageY-inst.getBody().scrollTop);elm=tinyMCE.isMSIE?e.srcElement:e.target;contextMenu=this._contextMenu;contextMenu.inst=inst;window.setTimeout(function(){var theme=tinyMCE.getParam("theme");contextMenu.clearAll();var sel=inst.selection.getSelectedText().length!=0||elm.nodeName=="IMG";contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/cut.gif","$lang_cut_desc","Cut","",!sel);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/copy.gif","$lang_copy_desc","Copy","",!sel);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_paste_desc","Paste","",false);if(sel||(elm?(elm.nodeName=='A')||(elm.nodeName=='IMG'):false)){contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/themes/advanced/images/link.gif","$lang_link_desc",inst.hasPlugin("advlink")?"mceAdvLink":"mceLink");contextMenu.addItem(tinyMCE.baseURL+"/themes/advanced/images/unlink.gif","$lang_unlink_desc","unlink","",(elm?(elm.nodeName!='A')&&(elm.nodeName!='IMG'):true));}elm=tinyMCE.getParentElement(elm,"img,table,td"+(inst.hasPlugin("advhr")?',hr':''));if(elm){switch(elm.nodeName){case"IMG":contextMenu.addSeparator();if(tinyMCE.getAttrib(elm,'class').indexOf('mceItemFlash')!=-1)contextMenu.addItem(tinyMCE.baseURL+"/plugins/flash/images/flash.gif","$lang_flash_props","mceFlash");else contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/image.gif","$lang_image_props_desc",inst.hasPlugin("advimage")?"mceAdvImage":"mceImage");break;case"HR":contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/advhr/images/advhr.gif","$lang_insert_advhr_desc","mceAdvancedHr");break;case"TABLE":case"TD":if(inst.hasPlugin("table")){var colspan=(elm.nodeName=="TABLE")?"":getAttrib(elm,"colspan");var rowspan=(elm.nodeName=="TABLE")?"":getAttrib(elm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/cut.gif","$lang_table_cut_row_desc","mceTableCutRow");contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/copy.gif","$lang_table_copy_row_desc","mceTableCopyRow");contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_table_paste_row_before_desc","mceTablePasteRowBefore","",inst.tableRowClipboard==null);contextMenu.addItem(tinyMCE.baseURL+"/themes/"+theme+"/images/paste.gif","$lang_table_paste_row_after_desc","mceTablePasteRowAfter","",inst.tableRowClipboard==null);contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_desc","mceInsertTable","insert");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_props_desc","mceInsertTable");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_cell_props.gif","$lang_table_cell_desc","mceTableCellProps");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete.gif","$lang_table_del","mceTableDelete");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_row_props.gif","$lang_table_row_desc","mceTableRowProps");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_row_before.gif","$lang_table_row_before_desc","mceTableInsertRowBefore");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_row_after.gif","$lang_table_row_after_desc","mceTableInsertRowAfter");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete_row.gif","$lang_table_delete_row_desc","mceTableDeleteRow");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_col_before.gif","$lang_table_col_before_desc","mceTableInsertColBefore");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_insert_col_after.gif","$lang_table_col_after_desc","mceTableInsertColAfter");contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_delete_col.gif","$lang_table_delete_col_desc","mceTableDeleteCol");contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_split_cells.gif","$lang_table_split_cells_desc","mceTableSplitCells","",(colspan=="1"&&rowspan=="1"));contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table_merge_cells.gif","$lang_table_merge_cells_desc","mceTableMergeCells","",false);}break;}}else{if(inst.hasPlugin("table")){contextMenu.addSeparator();contextMenu.addItem(tinyMCE.baseURL+"/plugins/table/images/table.gif","$lang_table_desc","mceInsertTable","insert");}}contextMenu.show(x,y);},10);tinyMCE.cancelEvent(e);return false;},_hideContextMenu:function(){if(TinyMCE_ContextMenuPlugin._contextMenu)TinyMCE_ContextMenuPlugin._contextMenu.hide();},_commandHandler:function(command,value){var cm=TinyMCE_ContextMenuPlugin._contextMenu;cm.hide();var ui=false;if(command=="mceInsertTable"||command=="mceTableCellProps"||command=="mceTableRowProps"||command=="mceTableMergeCells")ui=true;if(command=="Paste")value=null;if(tinyMCE.getParam("dialog_type")=="modal"&&tinyMCE.isMSIE){window.setTimeout(function(){cm.inst.execCommand(command,ui,value);},100);}else cm.inst.execCommand(command,ui,value);}};tinyMCE.addPlugin("contextmenu",TinyMCE_ContextMenuPlugin);function TinyMCE_ContextMenu(settings){function defParam(key,def_val){settings[key]=typeof(settings[key])!="undefined"?settings[key]:def_val;}var self=this;this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.contextMenuDiv=document.createElement("div");this.contextMenuDiv.className="contextMenu";this.contextMenuDiv.setAttribute("class","contextMenu");this.contextMenuDiv.style.display="none";this.contextMenuDiv.style.position='absolute';this.contextMenuDiv.style.zindex=1000;this.contextMenuDiv.style.left='0';this.contextMenuDiv.style.top='0';this.contextMenuDiv.unselectable="on";document.body.appendChild(this.contextMenuDiv);defParam("commandhandler","");defParam("spacer_image","images/spacer.gif");this.items=new Array();this.settings=settings;this.html="";if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera){this.pop=window.createPopup();doc=this.pop.document;doc.open();doc.write('<html><head><link href="'+tinyMCE.baseURL+'/plugins/contextmenu/css/contextmenu.css" rel="stylesheet" type="text/css" /></head><body unselectable="yes" class="contextMenuIEPopup"></body></html>');doc.close();}};TinyMCE_ContextMenu.prototype={clearAll:function(){this.html="";this.contextMenuDiv.innerHTML="";},addSeparator:function(){this.html+='<tr class="contextMenuItem"><td class="contextMenuIcon"><img src="'+this.settings['spacer_image']+'" width="20" height="1" class="contextMenuImage" /></td><td><img class="contextMenuSeparator" width="1" height="1" src="'+this.settings['spacer_image']+'" /></td></tr>';},addItem:function(icon,title,command,value,disabled){if(title.charAt(0)=='$')title=tinyMCE.getLang(title.substring(1));var onMouseDown='';var html='';if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0)onMouseDown='contextMenu.execCommand(\''+command+'\', \''+value+'\');return false;';else onMouseDown=this.settings['commandhandler']+'(\''+command+'\', \''+value+'\');return false;';if(icon=="")icon=this.settings['spacer_image'];if(!disabled)html+='<tr class="contextMenuItem">';else html+='<tr class="contextMenuItemDisabled">';html+='<td class="contextMenuIcon"><img src="'+icon+'" width="20" height="20" class="contextMenuImage" /></td>';html+='<td><div class="contextMenuText">';html+='<a href="javascript:void(0);" onclick="'+onMouseDown+'" onmousedown="return false;">&nbsp;';html+=title;html+='&nbsp;</a>';html+='</div></td>';html+='</tr>';this.html+=html;},show:function(x,y){if(this.html=="")return;var html='';html+='<a href="#"></a><table border="0" cellpadding="0" cellspacing="0">';html+=this.html;html+='</table>';this.contextMenuDiv.innerHTML=html;if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera){var width,height;this.contextMenuDiv.style.display="block";width=this.contextMenuDiv.offsetWidth;height=this.contextMenuDiv.offsetHeight;this.contextMenuDiv.style.display="none";this.pop.document.body.innerHTML='<div class="contextMenu">'+html+"</div>";this.pop.document.tinyMCE=tinyMCE;this.pop.document.contextMenu=this;this.pop.show(x,y,width,height);}else{this.contextMenuDiv.style.left=x+'px';this.contextMenuDiv.style.top=y+'px';this.contextMenuDiv.style.display="block";}},hide:function(){if(tinyMCE.isMSIE&&!tinyMCE.isMSIE5_0&&!tinyMCE.isOpera)this.pop.hide();else this.contextMenuDiv.style.display="none";},execCommand:function(command,value){eval(this.settings['commandhandler']+"(command, value);");}};
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 /**
  * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.31 $
- * $Date: 2006/05/03 10:46:41 $
+ * $Revision: 1.29 $
+ * $Date: 2006/02/13 15:09:28 $
  *
  * @author Moxiecode
  * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
@@ -288,12 +288,12 @@
 
 		html += '<td class="contextMenuIcon"><img src="' + icon + '" width="20" height="20" class="contextMenuImage" /></td>';
 		html += '<td><div class="contextMenuText">';
-		html += '<a href="javascript:void(0);" onclick="' + onMouseDown + '" onmousedown="return false;">&#160;';
+		html += '<a href="javascript:void(0);" onclick="' + onMouseDown + '" onmousedown="return false;">&nbsp;';
 
 		// Add text
 		html += title;
 
-		html += '&#160;</a>';
+		html += '&nbsp;</a>';
 		html += '</div></td>';
 		html += '</tr>';
 
@@ -302,8 +302,6 @@
 	},
 
 	show : function(x, y) {
-		var vp, width, height;
-
 		if (this.html == "")
 			return;
 
@@ -315,34 +313,27 @@
 
 		this.contextMenuDiv.innerHTML = html;
 
-		// Get dimensions
-		this.contextMenuDiv.style.display = "block";
-		width = this.contextMenuDiv.offsetWidth;
-		height = this.contextMenuDiv.offsetHeight;
-		this.contextMenuDiv.style.display = "none";
-
 		if (tinyMCE.isMSIE && !tinyMCE.isMSIE5_0 && !tinyMCE.isOpera) {
+			var width, height;
+
+			// Get dimensions
+			this.contextMenuDiv.style.display = "block";
+			width = this.contextMenuDiv.offsetWidth;
+			height = this.contextMenuDiv.offsetHeight;
+			this.contextMenuDiv.style.display = "none";
+
 			// Setup popup and show
 			this.pop.document.body.innerHTML = '<div class="contextMenu">' + html + "</div>";
 			this.pop.document.tinyMCE = tinyMCE;
 			this.pop.document.contextMenu = this;
 			this.pop.show(x, y, width, height);
 		} else {
-			vp = this.getViewPort();
-
-			this.contextMenuDiv.style.left = (x > vp.width - width ? vp.width - width : x) + 'px';
-			this.contextMenuDiv.style.top = (y > vp.height - height ? vp.height - height : y) + 'px';
+			this.contextMenuDiv.style.left = x + 'px';
+			this.contextMenuDiv.style.top = y + 'px';
 			this.contextMenuDiv.style.display = "block";
 		}
 	},
 
-	getViewPort : function() {
-		return {
-			width : document.documentElement.offsetWidth || document.body.offsetWidth,
-			height : self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
-		};
-	},
-
 	hide : function() {
 		if (tinyMCE.isMSIE && !tinyMCE.isMSIE5_0 && !tinyMCE.isOpera)
 			this.pop.hide();
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/directionality/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/directionality/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/directionality/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/directionality/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/emotions/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/emotions/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/emotions/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/emotions/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/flash/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/flash/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/flash/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/flash/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/blank.htm	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>blank_page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<script language="javascript">
+function init() {
+	document.designMode = 'on';
+}
+</script>
+</head>
+<body onload="init();">
+
+</body>
+</html>
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/editor_plugin.js	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1,34 @@
+// Tiny MCE Template Plugin
+
+/* Import plugin specific language pack */ 
+tinyMCE.importPluginLanguagePack('htmltemplate', 'en');
+
+function TinyMCE_htmltemplate_getControlHTML(control_name) {
+	switch (control_name) { 
+		case "htmltemplate":
+			return '<img id="{$editor_id}htmltemplate" src="{$pluginurl}/images/htmltemplate.gif" title="{$lang_htmltemplate_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceHTMLTemplate\');" />';
+	} 
+	return ''; 
+} 
+function TinyMCE_htmltemplate_execCommand(editor_id, element, command, user_interface, value) {
+	switch (command) {
+  		case "mceHTMLTemplate":
+				var template = new Array();
+				template['file']	= '../../plugins/htmltemplate/htmltemplate.php'; // Relative to theme
+				template['width']  = 450;
+				template['height'] = 420;
+				var HTMLtemplate = "";
+				tinyMCE.openWindow(template, {editor_id : editor_id, HTMLtemplate: HTMLtemplate, resizable : "yes", scrollbars : "no", mceDo : 'insert'});
+		 	return true;
+	}
+
+	// Pass to next handler in chain
+	return false;
+}
+function TinyMCE_htmltemplate__insertContent(content) {
+
+	// Insert cleaned content
+		tinyMCE.execCommand("mceAddUndoLevel");
+		tinyMCE.execCommand("mceInsertContent", false, content);
+}
+
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/htmltemplate.php	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1,257 @@
+<?php
+define( '_VALID_MOS', 1 );
+
+$base_path = '../../../../../../../';
+if (!empty($_SERVER['SCRIPT_FILENAME']) && $pos = strpos($_SERVER['SCRIPT_FILENAME'], 'mambots/editors/mostlyce/jscripts/tiny_mce'))
+{
+  $base_path = substr($_SERVER['SCRIPT_FILENAME'], 0, $pos);
+}
+include ( $base_path."configuration.php" );
+include_once ( $mosConfig_absolute_path."/mambots/editors/mostlyce/jscripts/tiny_mce/mostlyce_config.php" );
+
+//From mambo.files.php
+/**
+* Utility function to read the files in a directory
+* @param string The file system path
+* @param string A filter for the names
+* @param boolean Recurse search into sub-directories
+* @param boolean True if to prepend the full path to the file name
+* @return array
+*/
+function listFiles( $path, $filter='.', $recurse=false, $fullpath=false  ) {
+    $arr = array();
+    if (!is_dir( $path )) {
+        return $arr;
+    }
+
+    // read the source directory
+    $handle = opendir( $path );
+    $path .= DIRECTORY_SEPARATOR;
+    while ($file = readdir( $handle )) {
+        $dir = $path . $file;
+        $isDir = is_dir( $dir );
+        if ($file <> '.' && $file <> '..') {
+            if ($isDir) {
+                if ($recurse) {
+                    $arr2 = listFiles( $dir, $filter, $recurse, $fullpath );
+                    $arr = array_merge( $arr, $arr2 );
+                }
+            } else {
+                if (preg_match( "/$filter/", $file )) {
+                    if ($fullpath) {
+                        $arr[] = $path . $file;
+                    } else {
+                        $arr[] = $file;
+                    }
+                }
+            }
+        }
+    }
+    closedir( $handle );
+    asort( $arr );
+    return $arr;
+}
+
+$tmplRegex 	= '\.(html|htm)$';
+$path = $mosConfig_absolute_path.$editor_tmpl_dir;
+
+if( is_dir( $path ) ){
+    $d = listFiles( $path, $tmplRegex );
+    foreach ( $d as $file ) {
+        $filepath = $path.$file;
+        if (eregi($tmplRegex, $file)) {
+            $temp = array(
+                'name' 		=> $file,
+                'path' 		=> $filepath,
+                'url' 		=> str_replace( '\\', '/', $editor_tmpl_dir ) . '/' . $file,
+            );
+        }
+        $files[] = $temp;
+    }
+}else{
+  echo "<span style=\"color: red; font-weight: bold;\">Directory $path not found!</span>";
+}
+
+$javascript = "onChange=\"selectTmpl(this.value)\"";
+$list['tmpl'] = "<select name=\"tmplFile\" $javascript style=\"width:200px\">";
+$list['tmpl'] .= "<option value=\"\" selected>--Select Template--</option>";
+
+if( !empty( $files ) ){
+    foreach ( $files as $tmpl ) {
+        $list['tmpl'] .= "<option value=\"".$tmpl['url']."\">".$tmpl['name']."</option>";
+    }
+}
+$list['tmpl'] .= "</select>";
+
+?>
+<html>
+<head>
+<title>{$lang_htmltemplate_desc}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Cache-Control" content="no-store, no-cache, must-revalidate" />
+<meta http-equiv="Expires" content="Fri, Oct 24 1976 00:00:00 GMT" />
+<script type="text/javascript" src="../../tiny_mce.js"></script>
+<style type="text/css">
+.show {
+  display : block;
+}
+.hide {
+  display : none;
+}
+</style>
+<script type="text/javascript">
+<!--
+// Adapted from TinyMCE Paste plugin - Ryan Demmer 18/09/2005
+
+// Because we can't load tiny_mce_popup.js.
+// Get tinyMCE window
+var site_url = "<?php echo $mosConfig_live_site;?>";
+var win = window.opener ? window.opener : window.dialogArguments;
+
+var tinyMCE = null;
+var tinyMCELang = null;
+
+// Use top window if not defined
+if (!win)
+	win = top;
+
+// Setup window opener
+window.opener = win;
+
+var tinyMCE = win.tinyMCE;
+var tinyMCELang = win.tinyMCELang;
+
+if (!tinyMCE)
+	alert("tinyMCE object reference not found from popup.");
+
+// Setup dir
+if (tinyMCELang['lang_dir'])
+	document.dir = tinyMCELang['lang_dir'];
+
+// Setup title
+var re = new RegExp('{|\\\$|}', 'g');
+var title = document.title.replace(re, "");
+
+if (typeof tinyMCELang[title] != "undefined") {
+	var divElm = document.createElement("div");
+	divElm.innerHTML = tinyMCELang[title];
+	document.title = divElm.innerHTML;
+}
+// Fixes some charcode issues
+function fixContent(html) {
+    html = html.replace(new RegExp('<(p|hr|table|tr|td|ol|ul|object|embed|li|blockquote)', 'gi'),'\n<$1');
+    html = html.replace(new RegExp('<\/(p|ol|ul|li|table|tr|td|blockquote|object)>', 'gi'),'</$1>\n');
+    html = tinyMCE.regexpReplace(html, '<br />','<br />\n','gi');
+    html = tinyMCE.regexpReplace(html, '\n\n','\n','gi');
+    return html;
+}
+function insertContent() {
+	if (win) {
+        if(document.getElementById('htmlsrc').checked){
+            if(tinyMCE.isMSIE){
+                html = document.getElementById('frmData').contentWindow.document.body.innerText;
+                document.getElementById('frmData').contentWindow.document.body.innerHTML = html;
+            }else{
+                html = document.getElementById('frmData').contentWindow.document.body.ownerDocument.createRange();
+                html.selectNodeContents(document.getElementById('frmData').contentWindow.document.body);
+                document.getElementById('frmData').contentWindow.document.body.innerHTML = html.toString();
+            }
+        }
+        var html = document.getElementById("frmData").contentWindow.document.body.innerHTML;
+
+		if (html == ''){
+			window.close();
+			return false;
+		}
+		win.TinyMCE_htmltemplate__insertContent(html);
+		window.close();
+	}
+}
+
+function onLoadInit() {
+	document.body.innerHTML = tinyMCE.applyTemplate(document.body.innerHTML, tinyMCE.windowArgs);
+	document.getElementById("frmData").contentWindow.document.designMode='on';
+    document.getElementById("frmData").src = "blank.htm";
+	resizeInputs();
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	if (!tinyMCE.isMSIE) {
+		wHeight = self.innerHeight - 100;
+		wWidth = self.innerWidth - 25;
+	}
+	else {
+		wHeight = document.body.clientHeight - 100;
+		wWidth = document.body.clientWidth - 25;
+	}
+
+	document.getElementById('frmData').style.height = Math.abs(wHeight) + 'px';
+	document.getElementById('frmData').style.width  = Math.abs(wWidth) + 'px';
+}
+function selectTmpl(option)
+{
+    var tplsrc = site_url+option;
+    document.getElementById('frmData').src = tplsrc;
+}
+function viewsource(source)
+{
+  var html;
+  if (source) {
+    if(tinyMCE.isMSIE){
+        html = document.getElementById('frmData').contentWindow.document.body.innerHTML;
+        document.getElementById('frmData').contentWindow.document.body.innerText = html;
+    }else{
+        html = document.createTextNode(document.getElementById('frmData').contentWindow.document.body.innerHTML);
+        document.getElementById('frmData').contentWindow.document.body.innerHTML = "";
+        html = document.getElementById('frmData').contentWindow.document.importNode(html,false);
+    	document.getElementById('frmData').contentWindow.document.body.appendChild(html);
+    }
+  } else {
+    if(tinyMCE.isMSIE){
+        html = document.getElementById('frmData').contentWindow.document.body.innerText;
+        document.getElementById('frmData').contentWindow.document.body.innerHTML = html;
+    }else{
+        html = document.getElementById('frmData').contentWindow.document.body.ownerDocument.createRange();
+        html.selectNodeContents(document.getElementById('frmData').contentWindow.document.body);
+        document.getElementById('frmData').contentWindow.document.body.innerHTML = html.toString();
+    }
+  }
+}
+
+// Output Popup CSS class
+document.write('<link href="' + tinyMCE.getParam("popups_css") + '" rel="stylesheet" type="text/css">');
+
+//--></script>
+
+</head>
+<body scroll="no" onload="onLoadInit();" onresize="resizeInputs();">
+<form name="source" onsubmit="saveContent();">
+    <table border="0" cellpadding="0" cellspacing="2" align="center">
+        <tr>
+            <td colspan="2" class="title">{$lang_htmltemplate_desc}</td>
+        </tr>
+        <tr>
+            <td colspan="2">{$lang_htmltemplate_title}</td>
+        </tr>
+        <tr>
+            <td><?php echo $list['tmpl']; ?>
+            <td align="left">
+            <input type="checkbox" id="htmlsrc" onclick="viewsource(this.checked)" style="vertical-align:middle;">View HTML Source</input>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <iframe id="frmData" name="frmData" src="blank.htm" height="250" width="400" frameborder="0" style="font-family:'Courier New',Courier,mono; font-size:8px; background-color:#FFFFFF;" dir="ltr" wrap="soft"></iframe>
+            </td>
+        </tr>
+        <tr>
+            <td width="50%" align="left"><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertContent();" /></td>
+            <td width="50%" align="right"><input type="button" id="cancel" value="{$lang_cancel}" onclick="window.close();" /></td>
+        </tr>
+    </table>
+</form>
+</body>
+</html>
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/images/htmltemplate.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/images/htmltemplate.gif differ
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/htmltemplate/langs/en.js	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1,3 @@
+// UK lang variables
+tinyMCELang['lang_htmltemplate_desc'] = 'Insert HTML Template';
+tinyMCELang['lang_htmltemplate_title'] = 'Select HTML Template to insert.';
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/iespell/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/iespell/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/iespell/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/iespell/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-tinyMCE.importPluginLanguagePack('layer','en');var TinyMCE_LayerPlugin={getInfo:function(){return{longname:'Layer',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_layer.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE&&!tinyMCE.isOpera)inst.getDoc().execCommand('2D-Position');},handleEvent:function(e){var inst=tinyMCE.selectedInstance,self=TinyMCE_LayerPlugin;var w=inst.getWin(),le=inst._lastStyleElm,e;if(tinyMCE.isGecko){e=self._getParentLayer(inst.getFocusElement());if(e){if(!inst._lastStyleElm){e.style.overflow='auto';inst._lastStyleElm=e;}}else if(le){le=inst._lastStyleElm;le.style.width=le.scrollWidth+'px';le.style.height=le.scrollHeight+'px';le.style.overflow='';inst._lastStyleElm=null;}}return true;},handleVisualAid:function(el,deep,state,inst){var nl=inst.getDoc().getElementsByTagName("div"),i;for(i=0;i<nl.length;i++){if(new RegExp('absolute|relative|static','gi').test(nl[i].style.position)){if(state)tinyMCE.addCSSClass(nl[i],'mceVisualAid');else tinyMCE.removeCSSClass(nl[i],'mceVisualAid');}}},getControlHTML:function(cn){switch(cn){case"moveforward":return tinyMCE.getButtonHTML(cn,'lang_layer_forward_desc','{$pluginurl}/images/forward.gif','mceMoveForward',true);case"movebackward":return tinyMCE.getButtonHTML(cn,'lang_layer_backward_desc','{$pluginurl}/images/backward.gif','mceMoveBackward',true);case"absolute":return tinyMCE.getButtonHTML(cn,'lang_layer_absolute_desc','{$pluginurl}/images/absolute.gif','mceMakeAbsolute',true);case"insertlayer":return tinyMCE.getButtonHTML(cn,'lang_layer_insertlayer_desc','{$pluginurl}/images/insert_layer.gif','mceInsertLayer',true);}return"";},execCommand:function(editor_id,element,command,user_interface,value){var self=TinyMCE_LayerPlugin;switch(command){case"mceInsertLayer":self._insertLayer();return true;case"mceMoveForward":self._move(1);return true;case"mceMoveBackward":self._move(-1);return true;case"mceMakeAbsolute":self._toggleAbsolute();return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){var inst=tinyMCE.getInstanceById(editor_id),self=TinyMCE_LayerPlugin;var le=self._getParentLayer(inst.getFocusElement());var p=tinyMCE.getParentElement(inst.getFocusElement(),'div,p,img');tinyMCE.switchClass(editor_id+'_absolute','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_moveforward','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_movebackward','mceButtonDisabled');if(p)tinyMCE.switchClass(editor_id+'_absolute','mceButtonNormal');if(le&&le.style.position.toLowerCase()=="absolute"){tinyMCE.switchClass(editor_id+'_absolute','mceButtonSelected');tinyMCE.switchClass(editor_id+'_moveforward','mceButtonNormal');tinyMCE.switchClass(editor_id+'_movebackward','mceButtonNormal');}},_move:function(d){var inst=tinyMCE.selectedInstance,self=TinyMCE_LayerPlugin,i,z=new Array();var le=self._getParentLayer(inst.getFocusElement()),ci=-1,fi=-1;var nl=tinyMCE.selectNodes(inst.getBody(),function(n){return n.nodeType==1&&new RegExp('absolute|relative|static','gi').test(n.style.position);});for(i=0;i<nl.length;i++){z[i]=nl[i].style.zIndex?parseInt(nl[i].style.zIndex):0;if(ci<0&&nl[i]==le)ci=i;}if(d<0){for(i=0;i<z.length;i++){if(z[i]<z[ci]){fi=i;break;}}if(fi>-1){nl[ci].style.zIndex=z[fi];nl[fi].style.zIndex=z[ci];}else{if(z[ci]>0)nl[ci].style.zIndex=z[ci]-1;}}else{for(i=0;i<z.length;i++){if(z[i]>z[ci]){fi=i;break;}}if(fi>-1){nl[ci].style.zIndex=z[fi];nl[fi].style.zIndex=z[ci];}else nl[ci].style.zIndex=z[ci]+1;}inst.repaint();},_getParentLayer:function(n){return tinyMCE.getParentNode(n,function(n){return n.nodeType==1&&new RegExp('absolute|relative|static','gi').test(n.style.position);});},_insertLayer:function(){var inst=tinyMCE.selectedInstance;var e=tinyMCE.getParentElement(inst.getFocusElement());var p=tinyMCE.getAbsPosition(e);var d=inst.getDoc();var ne=d.createElement('div');var h=inst.selection.getSelectedHTML();ne.style.position='absolute';ne.style.left=p.absLeft+'px';ne.style.top=(p.absTop>20?p.absTop:20)+'px';ne.style.width='100px';ne.style.height='100px';ne.className='mceVisualAid';if(!h)h=tinyMCE.getLang('lang_layer_content');ne.innerHTML=h;d.body.appendChild(ne);},_toggleAbsolute:function(){var inst=tinyMCE.selectedInstance,self=TinyMCE_LayerPlugin;var le=self._getParentLayer(inst.getFocusElement());if(le==null)le=tinyMCE.getParentElement(inst.getFocusElement(),'div,p,img');if(le){if(le.style.position.toLowerCase()=="absolute"){le.style.position="";le.style.left="";le.style.top="";}else{le.style.position="absolute";if(le.style.left=="")le.style.left=20+'px';if(le.style.top=="")le.style.top=20+'px';if(le.style.width=="")le.style.width=le.width?(le.width+'px'):'100px';if(le.style.height=="")le.style.height=le.height?(le.height+'px'):'100px';tinyMCE.handleVisualAid(inst.getBody(),true,inst.visualAid,inst);}inst.repaint();tinyMCE.triggerNodeChange();}}};tinyMCE.addPlugin("layer",TinyMCE_LayerPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
@@ -1,252 +0,0 @@
-/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.2 $
- * $Date: 2006/05/03 14:12:12 $
- *
- * @author Moxiecode
- * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-
-/* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('layer', 'en');
-
-var TinyMCE_LayerPlugin = {
-	getInfo : function() {
-		return {
-			longname : 'Layer',
-			author : 'Moxiecode Systems',
-			authorurl : 'http://tinymce.moxiecode.com',
-			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_layer.html',
-			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-		};
-	},
-
-	initInstance : function(inst) {
-		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
-			inst.getDoc().execCommand('2D-Position');
-	},
-
-	handleEvent : function(e) {
-		var inst = tinyMCE.selectedInstance, self = TinyMCE_LayerPlugin;
-		var w = inst.getWin(), le = inst._lastStyleElm, e;
-
-		if (tinyMCE.isGecko) {
-			e = self._getParentLayer(inst.getFocusElement());
-
-			if (e) {
-				if (!inst._lastStyleElm) {
-					e.style.overflow = 'auto';
-					inst._lastStyleElm = e;
-				}
-			} else if (le) {
-				le = inst._lastStyleElm;
-				le.style.width = le.scrollWidth + 'px';
-				le.style.height = le.scrollHeight + 'px';
-				le.style.overflow = '';
-				inst._lastStyleElm = null;
-			}
-		}
-
-		return true;
-	},
-
-	handleVisualAid : function(el, deep, state, inst) {
-		var nl = inst.getDoc().getElementsByTagName("div"), i;
-
-		for (i=0; i<nl.length; i++) {
-			if (new RegExp('absolute|relative|static', 'gi').test(nl[i].style.position)) {
-				if (state)
-					tinyMCE.addCSSClass(nl[i], 'mceVisualAid');
-				else
-					tinyMCE.removeCSSClass(nl[i], 'mceVisualAid');					
-			}
-		}
-	},
-
-	getControlHTML : function(cn) {
-		switch (cn) {
-			case "moveforward":
-				return tinyMCE.getButtonHTML(cn, 'lang_layer_forward_desc', '{$pluginurl}/images/forward.gif', 'mceMoveForward', true);
-
-			case "movebackward":
-				return tinyMCE.getButtonHTML(cn, 'lang_layer_backward_desc', '{$pluginurl}/images/backward.gif', 'mceMoveBackward', true);
-
-			case "absolute":
-				return tinyMCE.getButtonHTML(cn, 'lang_layer_absolute_desc', '{$pluginurl}/images/absolute.gif', 'mceMakeAbsolute', true);
-
-			case "insertlayer":
-				return tinyMCE.getButtonHTML(cn, 'lang_layer_insertlayer_desc', '{$pluginurl}/images/insert_layer.gif', 'mceInsertLayer', true);
-		}
-
-		return "";
-	},
-
-	execCommand : function(editor_id, element, command, user_interface, value) {
-		var self = TinyMCE_LayerPlugin;
-
-		// Handle commands
-		switch (command) {
-			case "mceInsertLayer":
-				self._insertLayer();
-				return true;
-
-			case "mceMoveForward":
-				self._move(1);
-				return true;
-
-			case "mceMoveBackward":
-				self._move(-1);
-				return true;
-
-			case "mceMakeAbsolute":
-				self._toggleAbsolute();
-				return true;
-		}
-
-		// Pass to next handler in chain
-		return false;
-	},
-
-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-		var inst = tinyMCE.getInstanceById(editor_id), self = TinyMCE_LayerPlugin;
-		var le = self._getParentLayer(inst.getFocusElement());
-		var p = tinyMCE.getParentElement(inst.getFocusElement(), 'div,p,img');
-
-		tinyMCE.switchClass(editor_id + '_absolute', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_moveforward', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_movebackward', 'mceButtonDisabled');
-
-		if (p)
-			tinyMCE.switchClass(editor_id + '_absolute', 'mceButtonNormal');
-
-		if (le && le.style.position.toLowerCase() == "absolute") {
-			tinyMCE.switchClass(editor_id + '_absolute', 'mceButtonSelected');
-			tinyMCE.switchClass(editor_id + '_moveforward', 'mceButtonNormal');
-			tinyMCE.switchClass(editor_id + '_movebackward', 'mceButtonNormal');
-		}
-	},
-
-	// Private plugin specific methods
-
-	_move : function(d) {
-		var inst = tinyMCE.selectedInstance, self = TinyMCE_LayerPlugin, i, z = new Array();
-		var le = self._getParentLayer(inst.getFocusElement()), ci = -1, fi = -1;
-		var nl = tinyMCE.selectNodes(inst.getBody(), function(n) {
-			return n.nodeType == 1 && new RegExp('absolute|relative|static', 'gi').test(n.style.position);
-		});
-
-		// Find z-indexes
-		for (i=0; i<nl.length; i++) {
-			z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
-
-			if (ci < 0 && nl[i] == le)
-				ci = i;
-		}
-
-		if (d < 0) {
-			// Move back
-
-			// Try find a lower one
-			for (i=0; i<z.length; i++) {
-				if (z[i] < z[ci]) {
-					fi = i;
-					break;
-				}
-			}
-
-			if (fi > -1) {
-				nl[ci].style.zIndex = z[fi];
-				nl[fi].style.zIndex = z[ci];
-			} else {
-				if (z[ci] > 0)
-					nl[ci].style.zIndex = z[ci] - 1;
-			}
-		} else {
-			// Move forward
-
-			// Try find a higher one
-			for (i=0; i<z.length; i++) {
-				if (z[i] > z[ci]) {
-					fi = i;
-					break;
-				}
-			}
-
-			if (fi > -1) {
-				nl[ci].style.zIndex = z[fi];
-				nl[fi].style.zIndex = z[ci];
-			} else
-				nl[ci].style.zIndex = z[ci] + 1;
-		}
-
-		inst.repaint();
-	},
-
-	_getParentLayer : function(n) {
-		return tinyMCE.getParentNode(n, function(n) {
-			return n.nodeType == 1 && new RegExp('absolute|relative|static', 'gi').test(n.style.position);
-		});
-	},
-
-	_insertLayer : function() {
-		var inst = tinyMCE.selectedInstance;
-		var e = tinyMCE.getParentElement(inst.getFocusElement());
-		var p = tinyMCE.getAbsPosition(e);
-		var d = inst.getDoc();
-		var ne = d.createElement('div');
-		var h = inst.selection.getSelectedHTML();
-
-		// Move div
-		ne.style.position = 'absolute';
-		ne.style.left = p.absLeft + 'px';
-		ne.style.top = (p.absTop > 20 ? p.absTop : 20) + 'px';
-		ne.style.width = '100px';
-		ne.style.height = '100px';
-		ne.className = 'mceVisualAid';
-
-		if (!h)
-			h = tinyMCE.getLang('lang_layer_content');
-
-		ne.innerHTML = h;
-
-		// Add it
-		d.body.appendChild(ne);
-	},
-
-	_toggleAbsolute : function() {
-		var inst = tinyMCE.selectedInstance, self = TinyMCE_LayerPlugin;
-		var le = self._getParentLayer(inst.getFocusElement());
-
-		if (le == null)
-			le = tinyMCE.getParentElement(inst.getFocusElement(), 'div,p,img');
-
-		if (le) {
-			if (le.style.position.toLowerCase() == "absolute") {
-				le.style.position = "";
-				le.style.left = "";
-				le.style.top = "";
-			} else {
-				le.style.position = "absolute";
-
-				if (le.style.left == "")
-					le.style.left = 20 + 'px';
-
-				if (le.style.top == "")
-					le.style.top = 20 + 'px';
-
-				if (le.style.width == "")
-					le.style.width = le.width ? (le.width + 'px') : '100px';
-
-				if (le.style.height == "")
-					le.style.height = le.height ? (le.height + 'px') : '100px';
-
-				tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
-			}
-
-			inst.repaint();
-			tinyMCE.triggerNodeChange();
-		}
-	}
-};
-
-tinyMCE.addPlugin("layer", TinyMCE_LayerPlugin);
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/absolute.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/absolute.gif differ
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/backward.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/backward.gif differ
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/forward.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/forward.gif differ
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/insert_layer.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/images/insert_layer.gif differ
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/langs/en.js	1969-12-31 18:00:00.000000000 -0600
@@ -1,9 +0,0 @@
-// UK lang variables
-
-tinyMCE.addToLang('layer',{
-insertlayer_desc : 'Insert new layer',
-forward_desc : 'Move forward',
-backward_desc : 'Move backward',
-absolute_desc : 'Toggle absolute positioning',
-content : 'New layer...'
-});
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/layer/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2006-04-30 15:27:06.000000000 -0500
@@ -1 +1 @@
-tinyMCE.importPluginLanguagePack('paste','en,tr,sv,cs,zh_cn,fr_ca,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl,nl,fr,pt_br');var TinyMCE_PastePlugin={getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE&&tinyMCE.getParam("paste_auto_cleanup_on_paste",false))tinyMCE.addEvent(inst.getBody(),"paste",TinyMCE_PastePlugin._handlePasteEvent);},getControlHTML:function(cn){switch(cn){case"pastetext":return tinyMCE.getButtonHTML(cn,'lang_paste_text_desc','{$pluginurl}/images/pastetext.gif','mcePasteText',true);case"pasteword":return tinyMCE.getButtonHTML(cn,'lang_paste_word_desc','{$pluginurl}/images/pasteword.gif','mcePasteWord',true);case"selectall":return tinyMCE.getButtonHTML(cn,'lang_selectall_desc','{$pluginurl}/images/selectall.gif','mceSelectAll',true);}return'';},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mcePasteText":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false))TinyMCE_PastePlugin._insertText(clipboardData.getData("Text"),true);else{var template=new Array();template['file']='../../plugins/paste/pastetext.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertText(value['html'],value['linebreaks']);return true;case"mcePasteWord":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false)){var html=TinyMCE_PastePlugin._clipboardHTML();if(html&&html.length>0)TinyMCE_PastePlugin._insertWordContent(html);}else{var template=new Array();template['file']='../../plugins/paste/pasteword.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertWordContent(value);return true;case"mceSelectAll":tinyMCE.execInstanceCommand(editor_id,'selectall');return true;}return false;},_handlePasteEvent:function(e){switch(e.type){case"paste":var html=TinyMCE_PastePlugin._clipboardHTML();var r,inst=tinyMCE.selectedInstance;if(inst&&(r=inst.getRng())&&r.text.length>0)tinyMCE.execCommand('delete');if(html&&html.length>0)tinyMCE.execCommand('mcePasteWord',false,html);tinyMCE.cancelEvent(e);return false;}return true;},_insertText:function(content,bLinebreaks){if(content&&content.length>0){if(bLinebreaks){if(tinyMCE.getParam("paste_create_paragraphs",true)){var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);content=tinyMCE.regexpReplace(content,"\r\n\r\n","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\r\r","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\n\n","</p><p>","gi");if((pos=content.indexOf('</p><p>'))!=-1){tinyMCE.execCommand("Delete");var node=tinyMCE.selectedInstance.getFocusElement();var breakElms=new Array();do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="</p>";before+=content.substring(0,pos);for(var i=0;i<breakElms.length;i++){before+="</"+breakElms[i].nodeName+">";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="<p>";content=before+content.substring(pos+7)+after;}}if(tinyMCE.getParam("paste_create_linebreaks",true)){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}}tinyMCE.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);var cb;if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('before', content)");var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>','gi'),'<p><b>$1</b></p>');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)<BR>","gi"),"<p>"+middot+"$1</p>");content=content.replace(new RegExp('<SPAN style="mso-list: Ignore">','gi'),"<span>"+bull);content=content.replace(/<o:p><\/o:p>/gi,"");content=content.replace(new RegExp('<br style="page-break-before: always;.*>','gi'),'-- page break --');content=content.replace(new RegExp('<(!--)([^>]*)(--)>','g'),"");if(tinyMCE.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(tinyMCE.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(tinyMCE.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+TinyMCE_PastePlugin._reEscape(""+document.location)+'','gi'),'href="'+tinyMCE.settings['document_base_url']);content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!tinyMCE.settings['force_p_newlines']){content=content.replace('','','gi');content=content.replace('</p>','<br /><br />','gi');}if(!tinyMCE.isMSIE&&!tinyMCE.settings['force_p_newlines']){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(tinyMCE.getParam("paste_convert_middot_lists",true)){var div=document.createElement("div");div.innerHTML=content;var className=tinyMCE.getParam("paste_unindented_list_class","unIndentedList");while(TinyMCE_PastePlugin._convertMiddots(div,"--list--"));while(TinyMCE_PastePlugin._convertMiddots(div,middot,className));while(TinyMCE_PastePlugin._convertMiddots(div,bull));content=div.innerHTML;}if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi,'<p>&nbsp;&nbsp;</p>');content=content.replace(/<h[1-6]>/gi,'<p><b>');content=content.replace(/<\/h[1-6]>/gi,'</b></p>');content=content.replace(/<b>&nbsp;<\/b>/gi,'<b>&nbsp;&nbsp;</b>');content=content.replace(/^(&nbsp;)*/gi,'');}content=content.replace(/--list--/gi,"");if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('after', content)");tinyMCE.execCommand("mceInsertContent",false,content);window.setTimeout('tinyMCE.execCommand("mceCleanup");',1);}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i<s.length;i++){var c=s.charAt(i);if(l.indexOf(c)!=-1)o+='\\'+c;else o+=c;}return o;},_convertMiddots:function(div,search,class_name){var mdot=String.fromCharCode(183);var bull=String.fromCharCode(8226);var nodes=div.getElementsByTagName("p");var prevul;for(var i=0;i<nodes.length;i++){var p=nodes[i];if(p.innerHTML.indexOf(search)==0){var ul=document.createElement("ul");if(class_name)ul.className=class_name;var li=document.createElement("li");li.innerHTML=p.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');ul.appendChild(li);var np=p.nextSibling;while(np){if(np.nodeType==3&&new RegExp('^\\s$','m').test(np.nodeValue)){np=np.nextSibling;continue;}if(search==mdot){if(np.nodeType==1&&new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)){if(!prevul){prevul=ul;ul=document.createElement("ul");prevul.appendChild(ul);}np.innerHTML=np.innerHTML.replace(/^o/,'');}else{if(prevul){ul=prevul;prevul=null;}if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}}else{if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}var cp=np.nextSibling;var li=document.createElement("li");li.innerHTML=np.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');np.parentNode.removeChild(np);ul.appendChild(li);np=cp;}p.parentNode.replaceChild(ul,p);return true;}}return false;},_clipboardHTML:function(){var div=document.getElementById('_TinyMCE_clipboardHTML');if(!div){var div=document.createElement('DIV');div.id='_TinyMCE_clipboardHTML';with(div.style){visibility='hidden';overflow='hidden';position='absolute';width=1;height=1;}document.body.appendChild(div);}div.innerHTML='';var rng=document.body.createTextRange();rng.moveToElementText(div);rng.execCommand('Paste');var html=div.innerHTML;div.innerHTML='';return html;}};tinyMCE.addPlugin("paste",TinyMCE_PastePlugin);
\ No newline at end of file
+tinyMCE.importPluginLanguagePack('paste','en,tr,sv,cs,zh_cn,fr_ca,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,es,cy,is,pl,nl,fr,pt_br');var TinyMCE_PastePlugin={getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isMSIE&&tinyMCE.getParam("paste_auto_cleanup_on_paste",false))tinyMCE.addEvent(inst.getBody(),"paste",TinyMCE_PastePlugin._handlePasteEvent);},getControlHTML:function(cn){switch(cn){case"pastetext":return tinyMCE.getButtonHTML(cn,'lang_paste_text_desc','{$pluginurl}/images/pastetext.gif','mcePasteText',true);case"pasteword":return tinyMCE.getButtonHTML(cn,'lang_paste_word_desc','{$pluginurl}/images/pasteword.gif','mcePasteWord',true);case"selectall":return tinyMCE.getButtonHTML(cn,'lang_selectall_desc','{$pluginurl}/images/selectall.gif','mceSelectAll',true);}return'';},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mcePasteText":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false))TinyMCE_PastePlugin._insertText(clipboardData.getData("Text"),true);else{var template=new Array();template['file']='../../plugins/paste/pastetext.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertText(value['html'],value['linebreaks']);return true;case"mcePasteWord":if(user_interface){if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&!tinyMCE.getParam('paste_use_dialog',false)){var html=TinyMCE_PastePlugin._clipboardHTML();if(html&&html.length>0)TinyMCE_PastePlugin._insertWordContent(html);}else{var template=new Array();template['file']='../../plugins/paste/pasteword.htm';template['width']=450;template['height']=400;var plain_text="";tinyMCE.openWindow(template,{editor_id:editor_id,plain_text:plain_text,resizable:"yes",scrollbars:"no",inline:"yes",mceDo:'insert'});}}else TinyMCE_PastePlugin._insertWordContent(value);return true;case"mceSelectAll":tinyMCE.execInstanceCommand(editor_id,'selectall');return true;}return false;},_handlePasteEvent:function(e){switch(e.type){case"paste":var html=TinyMCE_PastePlugin._clipboardHTML();var r,inst=tinyMCE.selectedInstance;if(inst&&(r=inst.getRng())&&r.text.length>0)tinyMCE.execCommand('delete');if(html&&html.length>0)tinyMCE.execCommand('mcePasteWord',false,html);tinyMCE.cancelEvent(e);return false;}return true;},_insertText:function(content,bLinebreaks){if(content&&content.length>0){if(bLinebreaks){if(tinyMCE.getParam("paste_create_paragraphs",true)){var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);content=tinyMCE.regexpReplace(content,"\r\n\r\n","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\r\r","</p><p>","gi");content=tinyMCE.regexpReplace(content,"\n\n","</p><p>","gi");if((pos=content.indexOf('</p><p>'))!=-1){tinyMCE.execCommand("Delete");var node=tinyMCE.selectedInstance.getFocusElement();var breakElms=new Array();do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="</p>";before+=content.substring(0,pos);for(var i=0;i<breakElms.length;i++){before+="</"+breakElms[i].nodeName+">";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="<p>";content=before+content.substring(pos+7)+after;}}if(tinyMCE.getParam("paste_create_linebreaks",true)){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}}tinyMCE.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);var cb;if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('before', content)");var rl=tinyMCE.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>','gi'),'<p><b>$1</b></p>');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)<BR>","gi"),"<p>"+middot+"$1</p>");content=content.replace(new RegExp('<SPAN style="mso-list: Ignore">','gi'),"<span>"+bull);content=content.replace(/<o:p><\/o:p>/gi,"");content=content.replace(new RegExp('<br style="page-break-before: always;.*>','gi'),'-- page break --');content=content.replace(new RegExp('<(!--)([^>]*)(--)>','g'),"");if(tinyMCE.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(tinyMCE.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(tinyMCE.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+TinyMCE_PastePlugin._reEscape(""+document.location)+'','gi'),'href="'+tinyMCE.settings['document_base_url']);content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!tinyMCE.settings['force_p_newlines']){content=content.replace('','','gi');content=content.replace('</p>','<br /><br />','gi');}if(!tinyMCE.isMSIE&&!tinyMCE.settings['force_p_newlines']){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(tinyMCE.getParam("paste_convert_middot_lists",true)){var div=document.createElement("div");div.innerHTML=content;var className=tinyMCE.getParam("paste_unindented_list_class","unIndentedList");while(TinyMCE_PastePlugin._convertMiddots(div,"--list--"));while(TinyMCE_PastePlugin._convertMiddots(div,middot,className));while(TinyMCE_PastePlugin._convertMiddots(div,bull));content=div.innerHTML;}if(tinyMCE.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi,'<p>&nbsp;&nbsp;</p>');content=content.replace(/<h[1-6]>/gi,'<p><b>');content=content.replace(/<\/h[1-6]>/gi,'</b></p>');content=content.replace(/<b>&nbsp;<\/b>/gi,'<b>&nbsp;&nbsp;</b>');content=content.replace(/^(&nbsp;)*/gi,'');}content=content.replace(/--list--/gi,"");if((cb=tinyMCE.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('after', content)");tinyMCE.execCommand("mceInsertContent",false,content);window.setTimeout('tinyMCE.execCommand("mceCleanup");',1);}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i<s.length;i++){var c=s.charAt(i);if(l.indexOf(c)!=-1)o+='\\'+c;else o+=c;}return o;},_convertMiddots:function(div,search,class_name){var mdot=String.fromCharCode(183);var bull=String.fromCharCode(8226);var nodes=div.getElementsByTagName("p");var prevul;for(var i=0;i<nodes.length;i++){var p=nodes[i];if(p.innerHTML.indexOf(search)==0){var ul=document.createElement("ul");if(class_name)ul.className=class_name;var li=document.createElement("li");li.innerHTML=p.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');ul.appendChild(li);var np=p.nextSibling;while(np){if(np.nodeType==3&&/^\s$/m.test(np.nodeValue)){np=np.nextSibling;continue;}if(search==mdot){if(np.nodeType==1&&/^o(\s+|&nbsp;)/.test(np.innerHTML)){if(!prevul){prevul=ul;ul=document.createElement("ul");prevul.appendChild(ul);}np.innerHTML=np.innerHTML.replace(/^o/,'');}else{if(prevul){ul=prevul;prevul=null;}if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}}else{if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}var cp=np.nextSibling;var li=document.createElement("li");li.innerHTML=np.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');np.parentNode.removeChild(np);ul.appendChild(li);np=cp;}p.parentNode.replaceChild(ul,p);return true;}}return false;},_clipboardHTML:function(){var div=document.getElementById('_TinyMCE_clipboardHTML');if(!div){var div=document.createElement('DIV');div.id='_TinyMCE_clipboardHTML';with(div.style){visibility='hidden';overflow='hidden';position='absolute';width=1;height=1;}document.body.appendChild(div);}div.innerHTML='';var rng=document.body.createTextRange();rng.moveToElementText(div);rng.execCommand('Paste');var html=div.innerHTML;div.innerHTML='';return html;}};tinyMCE.addPlugin("paste",TinyMCE_PastePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 /**
  * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.37 $
- * $Date: 2006/03/27 10:07:08 $
+ * $Revision: 1.36 $
+ * $Date: 2006/03/20 12:03:44 $
  *
  * @author Moxiecode
  * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
@@ -308,15 +308,15 @@
 				// Add the rest
 				var np = p.nextSibling;
 				while (np) {
-			        // If the node is whitespace, then
-			        // ignore it and continue on.
-			        if (np.nodeType == 3 && new RegExp('^\\s$', 'm').test(np.nodeValue)) {
-			                np = np.nextSibling;
-			                continue;
-			        }
-
+				        // If the node is whitespace, then
+				        // ignore it and continue on.
+				        if (np.nodeType == 3 && /^\s$/m.test(np.nodeValue)) {
+				                np = np.nextSibling;
+				                continue;
+				        }
+					
 					if (search == mdot) {
-					        if (np.nodeType == 1 && new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)) {
+					        if (np.nodeType == 1 && /^o(\s+|&nbsp;)/.test(np.innerHTML)) {
 					                // Second level of nesting
 					                if (!prevul) {
 					                        prevul = ul;
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/paste/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/preview/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/preview/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/preview/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/preview/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/print/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/print/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/print/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/print/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-This is the location you place TinyMCE plugins.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/save/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/save/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/save/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/save/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/css/props.css 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/css/props.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/css/props.css	1969-12-31 18:00:00.000000000 -0600
@@ -1,63 +0,0 @@
-#text_font {
-	width: 250px;
-}
-
-#text_size {
-	width: 70px;
-}
-
-.mceAddSelectValue {
-	background-color: #DDDDDD;
-}
-
-select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {
-	width: 70px;
-}
-
-#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {
-	width: 70px;
-}
-
-#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {
-	width: 70px;
-}
-
-#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {
-	width: 70px;
-}
-
-.panel_wrapper div.current {
-	padding-top: 10px;
-	height: 230px;
-}
-
-.delim {
-	b2ackground-color: #DDDDDD;
-	border-left: 1px solid gray;
-}
-
-.tdelim {
-	border-bottom: 1px solid gray;	
-}
-
-#block_display {
-	width: 145px;
-}
-
-#list_type {
-	width: 115px;
-}
-
-.disabled {
-	background-color: #EEEEEE;
-}
-
-#apply {
-	font-weight: bold;
-	width: 78px;
-	height: 21px;
-	border: 0;
-	background-image: url('../images/apply_button_bg.gif');
-	cursor: pointer;
-}
-
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-tinyMCE.importPluginLanguagePack('style','en');var TinyMCE_StylePlugin={getInfo:function(){return{longname:'Style',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_style.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(cn){switch(cn){case"styleprops":return tinyMCE.getButtonHTML(cn,'lang_style_styleinfo_desc','{$pluginurl}/images/style_info.gif','mceStyleProps',true);}return"";},execCommand:function(editor_id,element,command,user_interface,value){var e,inst;switch(command){case"mceStyleProps":TinyMCE_StylePlugin._styleProps();return true;case"mceSetElementStyle":inst=tinyMCE.getInstanceById(editor_id);e=inst.selection.getFocusElement();if(e){e.style.cssText=value;inst.repaint();}return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){},_styleProps:function(){var e=tinyMCE.selectedInstance.selection.getFocusElement();if(!e)return;tinyMCE.openWindow({file:'../../plugins/style/props.htm',width:480+tinyMCE.getLang('lang_style_props_delta_width',0),height:320+tinyMCE.getLang('lang_style_props_delta_height',0)},{editor_id:tinyMCE.selectedInstance.editorId,inline:"yes",style_text:e.style.cssText});}};tinyMCE.addPlugin("style",TinyMCE_StylePlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js	1969-12-31 18:00:00.000000000 -0600
@@ -1,81 +0,0 @@
-/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.1 $
- * $Date: 2006/05/03 10:46:42 $
- *
- * @author Moxiecode
- * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-
-/* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('style', 'en');
-
-var TinyMCE_StylePlugin = {
-	getInfo : function() {
-		return {
-			longname : 'Style',
-			author : 'Moxiecode Systems',
-			authorurl : 'http://tinymce.moxiecode.com',
-			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_style.html',
-			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-		};
-	},
-
-	getControlHTML : function(cn) {
-		switch (cn) {
-			case "styleprops":
-				return tinyMCE.getButtonHTML(cn, 'lang_style_styleinfo_desc', '{$pluginurl}/images/style_info.gif', 'mceStyleProps', true);
-		}
-
-		return "";
-	},
-
-	execCommand : function(editor_id, element, command, user_interface, value) {
-		var e, inst;
-
-		// Handle commands
-		switch (command) {
-			case "mceStyleProps":
-				TinyMCE_StylePlugin._styleProps();
-				return true;
-
-			case "mceSetElementStyle":
-				inst = tinyMCE.getInstanceById(editor_id);
-				e = inst.selection.getFocusElement();
-
-				if (e) {
-					e.style.cssText = value;
-					inst.repaint();
-				}
-
-				return true;
-		}
-
-		// Pass to next handler in chain
-		return false;
-	},
-
-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-	},
-
-	// Private plugin specific methods
-
-	_styleProps : function() {
-		var e = tinyMCE.selectedInstance.selection.getFocusElement();
-
-		if (!e)
-			return;
-
-		tinyMCE.openWindow({
-			file : '../../plugins/style/props.htm',
-			width : 480 + tinyMCE.getLang('lang_style_props_delta_width', 0),
-			height : 320 + tinyMCE.getLang('lang_style_props_delta_height', 0)
-		}, {
-			editor_id : tinyMCE.selectedInstance.editorId,
-			inline : "yes",
-			style_text : e.style.cssText
-		});
-	}
-};
-
-tinyMCE.addPlugin("style", TinyMCE_StylePlugin);
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/images/apply_button_bg.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/images/apply_button_bg.gif differ
Binary files 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/images/style_info.gif and 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/images/style_info.gif differ
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/jscripts/props.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/jscripts/props.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/jscripts/props.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/jscripts/props.js	1969-12-31 18:00:00.000000000 -0600
@@ -1,630 +0,0 @@
-var defaultFonts = "" + 
-	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 
-	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
-	"Courier New, Courier, mono=Courier New, Courier, mono;" + 
-	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
-	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 
-	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 
-	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
-
-var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
-var defaultMeasurement = "+pixels=px;points=pt;in;cm;mm;picas;ems;exs;%";
-var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";
-var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";
-var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
-var defaultTextStyle = "normal;italic;oblique";
-var defaultVariant = "normal;small-caps";
-var defaultLineHeight = "normal";
-var defaultAttachment = "fixed;scroll";
-var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
-var defaultPosH = "left;center;right";
-var defaultPosV = "top;center;bottom";
-var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
-var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
-var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
-var defaultBorderWidth = "thin;medium;thick";
-var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
-
-function init() {
-	var ce = document.getElementById('container');
-
-	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
-
-	tinyMCEPopup.resizeToInnerSize();
-
-	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
-	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
-	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
-	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
-	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
-	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
-
-	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
-	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
-	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
-	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
-	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
-	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
-	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
-	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
-	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
-
-	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
-	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
-
-	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
-	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
-	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
-	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
-	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
-	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
-	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
-	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
-	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
-
-	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
-	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
-	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
-	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
-	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
-	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
-
-	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
-	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
-	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
-	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
-
-	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
-	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
-
-	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
-	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
-
-	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
-
-	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
-
-	TinyMCE_EditableSelects.init();
-	setupFormData();
-	showDisabledControls();
-}
-
-function setupFormData() {
-	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
-
-	// Setup text fields
-
-	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
-	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
-	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
-	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
-	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
-	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
-	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
-	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
-	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
-	f.text_color.value = ce.style.color;
-	updateColor('text_color_pick', 'text_color');
-	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
-	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
-	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
-	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
-
-	// Setup background fields
-
-	f.background_color.value = ce.style.backgroundColor;
-	updateColor('background_color_pick', 'background_color');
-	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
-	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
-	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
-	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
-	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
-	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
-
-	// Setup block fields
-
-	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
-	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
-	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
-	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
-	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
-	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
-	f.block_text_indent.value = getNum(ce.style.textIndent);
-	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
-	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
-	selectByValue(f, 'block_display', ce.style.display, true, true);
-
-	// Setup box fields
-
-	f.box_width.value = getNum(ce.style.width);
-	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
-
-	f.box_height.value = getNum(ce.style.height);
-	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
-
-	if (tinyMCE.isGecko)
-		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
-	else
-		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
-
-	selectByValue(f, 'box_clear', ce.style.clear, true, true);
-
-	setupBox(f, ce, 'box_padding', 'padding', '');
-	setupBox(f, ce, 'box_margin', 'margin', '');
-
-	// Setup border fields
-
-	setupBox(f, ce, 'border_style', 'border', 'Style');
-	setupBox(f, ce, 'border_width', 'border', 'Width');
-	setupBox(f, ce, 'border_color', 'border', 'Color');
-
-	updateColor('border_color_top_pick', 'border_color_top');
-	updateColor('border_color_right_pick', 'border_color_right');
-	updateColor('border_color_bottom_pick', 'border_color_bottom');
-	updateColor('border_color_left_pick', 'border_color_left');
-
-	// Setup list fields
-
-	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
-	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
-	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-
-	// Setup box fields
-
-	selectByValue(f, 'positioning_type', ce.style.position, true, true);
-	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
-	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
-	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
-
-	f.positioning_width.value = getNum(ce.style.width);
-	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
-
-	f.positioning_height.value = getNum(ce.style.height);
-	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
-
-	setupBox(f, ce, 'positioning_placement', '', '', new Array('top', 'right', 'bottom', 'left'));
-
-	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
-	s = s.replace(/,/g, ' ');
-
-	if (!hasEqualValues(new Array(getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)))) {
-		f.positioning_clip_top.value = getNum(getVal(s, 0));
-		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
-		f.positioning_clip_right.value = getNum(getVal(s, 1));
-		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
-		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
-		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
-		f.positioning_clip_left.value = getNum(getVal(s, 3));
-		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
-	} else {
-		f.positioning_clip_top.value = getNum(getVal(s, 0));
-		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
-		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
-	}
-
-//	setupBox(f, ce, '', 'border', 'Color');
-}
-
-function getMeasurement(s) {
-	return s.replace(/^([0-9]+)(.*)$/, "$2");
-}
-
-function getNum(s) {
-	if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))
-		return s.replace(/[^0-9]/g, '');
-
-	return s;
-}
-
-function inStr(s, n) {
-	return new RegExp(n, 'gi').test(s);
-}
-
-function getVal(s, i) {
-	var a = tinyMCE.explode(' ', s);
-
-	if (a.length > 1)
-		return a[i];
-
-	return "";
-}
-
-function setValue(f, n, v) {
-	if (f.elements[n].type == "text")
-		f.elements[n].value = v;
-	else
-		selectByValue(f, n, v, true, true);
-}
-
-function setupBox(f, ce, fp, pr, sf, b) {
-	if (typeof(b) == "undefined")
-		b = new Array('Top', 'Right', 'Bottom', 'Left');
-
-	if (isSame(ce, pr, sf, b)) {
-		f.elements[fp + "_same"].checked = true;
-
-		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
-		f.elements[fp + "_top"].disabled = false;
-
-		f.elements[fp + "_right"].value = "";
-		f.elements[fp + "_right"].disabled = true;
-		f.elements[fp + "_bottom"].value = "";
-		f.elements[fp + "_bottom"].disabled = true;
-		f.elements[fp + "_left"].value = "";
-		f.elements[fp + "_left"].disabled = true;
-
-		if (f.elements[fp + "_top_measurement"]) {
-			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
-			f.elements[fp + "_left_measurement"].disabled = true;
-			f.elements[fp + "_bottom_measurement"].disabled = true;
-			f.elements[fp + "_right_measurement"].disabled = true;
-		}
-	} else {
-		f.elements[fp + "_same"].checked = false;
-
-		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
-		f.elements[fp + "_top"].disabled = false;
-
-		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
-		f.elements[fp + "_right"].disabled = false;
-
-		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
-		f.elements[fp + "_bottom"].disabled = false;
-
-		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
-		f.elements[fp + "_left"].disabled = false;
-
-		if (f.elements[fp + "_top_measurement"]) {
-			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
-			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
-			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
-			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
-			f.elements[fp + "_left_measurement"].disabled = false;
-			f.elements[fp + "_bottom_measurement"].disabled = false;
-			f.elements[fp + "_right_measurement"].disabled = false;
-		}
-	}
-}
-
-function isSame(e, pr, sf, b) {
-	var a = new Array(), i, x;
-
-	if (typeof(b) == "undefined")
-		b = new Array('Top', 'Right', 'Bottom', 'Left');
-
-	if (typeof(sf) == "undefined" || sf == null)
-		sf = "";
-
-	a[0] = e.style[pr + b[0] + sf];
-	a[1] = e.style[pr + b[1] + sf];
-	a[2] = e.style[pr + b[2] + sf];
-	a[3] = e.style[pr + b[3] + sf];
-
-	for (i=0; i<a.length; i++) {
-		if (a[i] == null)
-			return false;
-
-		for (x=0; x<a.length; x++) {
-			if (a[x] != a[i])
-				return false;
-		}
-	}
-
-	return true;
-};
-
-function hasEqualValues(a) {
-	var i, x;
-
-	for (i=0; i<a.length; i++) {
-		if (a[i] == null)
-			return false;
-
-		for (x=0; x<a.length; x++) {
-			if (a[x] != a[i])
-				return false;
-		}
-	}
-
-	return true;
-}
-
-function applyAction() {
-	var ce = document.getElementById('container');
-
-	generateCSS();
-
-	tinyMCEPopup.execCommand('mceSetElementStyle', false, tinyMCE.serializeStyle(tinyMCE.parseStyle(ce.style.cssText)));
-}
-
-function updateAction() {
-	applyAction();
-	tinyMCEPopup.close();
-}
-
-function generateCSS() {
-	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
-
-	ce.style.cssText = "";
-
-	// Build text styles
-	ce.style.fontFamily = f.text_font.value;
-	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? f.text_size_measurement.value : "");
-	ce.style.fontStyle = f.text_style.value;
-	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
-	ce.style.textTransform = f.text_case.value;
-	ce.style.fontWeight = f.text_weight.value;
-	ce.style.fontVariant = f.text_variant.value;
-	ce.style.color = f.text_color.value;
-
-	s = "";
-	s += f.text_underline.checked ? " underline" : "";
-	s += f.text_overline.checked ? " overline" : "";
-	s += f.text_linethrough.checked ? " line-through" : "";
-	s += f.text_blink.checked ? " blink" : "";
-	s = s.length > 0 ? s.substring(1) : s;
-
-	if (f.text_none.checked)
-		s = "none";
-
-	ce.style.textDecoration = s;
-
-	// Build background styles
-
-	ce.style.backgroundColor = f.background_color.value;
-	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
-	ce.style.backgroundRepeat = f.background_repeat.value;
-	ce.style.backgroundAttachment = f.background_attachment.value;
-
-	if (f.background_hpos.value != "") {
-		s = "";
-		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
-		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
-		ce.style.backgroundPosition = s;
-	}
-
-	// Build block styles
-
-	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
-	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
-	ce.style.verticalAlign = f.block_vertical_alignment.value;
-	ce.style.textAlign = f.block_text_align.value;
-	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
-	ce.style.whiteSpace = f.block_whitespace.value;
-	ce.style.display = f.block_display.value;
-
-	// Build box styles
-
-	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
-	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
-	ce.style.styleFloat = f.box_float.value;
-
-	if (tinyMCE.isGecko)
-		ce.style.cssFloat = f.box_float.value;
-
-	ce.style.clear = f.box_clear.value;
-
-	if (!f.box_padding_same.checked) {
-		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
-		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
-		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
-		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
-	} else
-		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		
-
-	if (!f.box_margin_same.checked) {
-		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
-		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
-		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
-		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
-	} else
-		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		
-
-	// Build border styles
-
-	if (!f.border_style_same.checked) {
-		ce.style.borderTopStyle = f.border_style_top.value;
-		ce.style.borderRightStyle = f.border_style_right.value;
-		ce.style.borderBottomStyle = f.border_style_bottom.value;
-		ce.style.borderLeftStyle = f.border_style_left.value;
-	} else
-		ce.style.borderStyle = f.border_style_top.value;
-
-	if (!f.border_width_same.checked) {
-		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
-		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
-		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
-		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
-	} else
-		ce.style.borderWidth = f.border_width_top.value;
-
-	if (!f.border_color_same.checked) {
-		ce.style.borderTopColor = f.border_color_top.value;
-		ce.style.borderRightColor = f.border_color_right.value;
-		ce.style.borderBottomColor = f.border_color_bottom.value;
-		ce.style.borderLeftColor = f.border_color_left.value;
-	} else
-		ce.style.borderColor = f.border_color_top.value;
-
-	// Build list styles
-
-	ce.style.listStyleType = f.list_type.value;
-	ce.style.listStylePosition = f.list_position.value;
-	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
-
-	// Build positioning styles
-
-	ce.style.position = f.positioning_type.value;
-	ce.style.visibility = f.positioning_visibility.value;
-
-	if (ce.style.width == "")
-		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
-
-	if (ce.style.height == "")
-		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
-
-	ce.style.zIndex = f.positioning_zindex.value;
-	ce.style.overflow = f.positioning_overflow.value;
-
-	if (!f.positioning_placement_same.checked) {
-		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
-		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
-		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
-		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
-	} else {
-		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
-		ce.style.top = s;
-		ce.style.right = s;
-		ce.style.bottom = s;
-		ce.style.left = s;
-	}
-
-	if (!f.positioning_clip_same.checked) {
-		s = "rect(";
-		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
-		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
-		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
-		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
-		s += ")";
-
-		if (s != "rect(auto auto auto auto)")
-			ce.style.clip = s;
-	} else {
-		s = "rect(";
-		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
-		s += t + " ";
-		s += t + " ";
-		s += t + " ";
-		s += t + ")";
-
-		if (s != "rect(auto auto auto auto)")
-			ce.style.clip = s;
-	}
-
-	ce.style.cssText = tinyMCE.serializeStyle(tinyMCE.parseStyle(ce.style.cssText));
-}
-
-function isNum(s) {
-	return new RegExp('[0-9]+', 'g').test(s);
-}
-
-function showDisabledControls() {
-	var f = document.forms, i, a;
-
-	for (i=0; i<f.length; i++) {
-		for (a=0; a<f[i].elements.length; a++) {
-			if (f[i].elements[a].disabled)
-				tinyMCE.addCSSClass(f[i].elements[a], "disabled");
-			else
-				tinyMCE.removeCSSClass(f[i].elements[a], "disabled");
-		}
-	}
-}
-
-function fillSelect(f, s, param, dval, sep, em) {
-	var i, ar, p, se;
-
-	f = document.forms[f];
-	sep = typeof(sep) == "undefined" ? ";" : sep;
-
-	if (em)
-		addSelectValue(f, s, "", "");
-
-	ar = tinyMCE.getParam(param, dval).split(sep);
-	for (i=0; i<ar.length; i++) {
-		se = false;
-
-		if (ar[i].charAt(0) == '+') {
-			ar[i] = ar[i].substring(1);
-			se = true;
-		}
-
-		p = ar[i].split('=');
-
-		if (p.length > 1) {
-			addSelectValue(f, s, p[0], p[1]);
-
-			if (se)
-				selectByValue(f, s, p[1]);
-		} else {
-			addSelectValue(f, s, p[0], p[0]);
-
-			if (se)
-				selectByValue(f, s, p[0]);
-		}
-	}
-}
-
-function toggleSame(ce, pre) {
-	var el = document.forms[0].elements, i;
-
-	if (ce.checked) {
-		el[pre + "_top"].disabled = false;
-		el[pre + "_right"].disabled = true;
-		el[pre + "_bottom"].disabled = true;
-		el[pre + "_left"].disabled = true;
-
-		if (el[pre + "_top_measurement"]) {
-			el[pre + "_top_measurement"].disabled = false;
-			el[pre + "_right_measurement"].disabled = true;
-			el[pre + "_bottom_measurement"].disabled = true;
-			el[pre + "_left_measurement"].disabled = true;
-		}
-	} else {
-		el[pre + "_top"].disabled = false;
-		el[pre + "_right"].disabled = false;
-		el[pre + "_bottom"].disabled = false;
-		el[pre + "_left"].disabled = false;
-
-		if (el[pre + "_top_measurement"]) {
-			el[pre + "_top_measurement"].disabled = false;
-			el[pre + "_right_measurement"].disabled = false;
-			el[pre + "_bottom_measurement"].disabled = false;
-			el[pre + "_left_measurement"].disabled = false;
-		}
-	}
-
-	showDisabledControls();
-}
-
-function synch(fr, to) {
-	var f = document.forms[0];
-
-	f.elements[to].value = f.elements[fr].value;
-
-	if (f.elements[fr + "_measurement"])
-		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
-}
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en.js	1969-12-31 18:00:00.000000000 -0600
@@ -1,60 +0,0 @@
-// UK lang variables
-
-tinyMCE.addToLang('style',{
-title : 'Edit CSS Style',
-styleinfo_desc : 'Edit CSS Style',
-text_tab : 'Text',
-background_tab : 'Background',
-block_tab : 'Block',
-box_tab : 'Box',
-border_tab : 'Border',
-list_tab : 'List',
-positioning_tab : 'Positioning',
-text_props : 'Text',
-text_font : 'Font',
-text_size : 'Size',
-text_weight : 'Weight',
-text_style : 'Style',
-text_variant : 'Variant',
-text_lineheight : 'Line height',
-text_case : 'Case',
-text_color : 'Color',
-text_decoration : 'Decoration',
-background_color : 'Background color',
-background_image : 'Background image',
-background_repeat : 'Repeat',
-background_attachment : 'Attachment',
-background_hpos : 'Horizontal position',
-background_vpos : 'Vertical position',
-block_wordspacing : 'Word spacing',
-block_letterspacing : 'Letter spacing',
-block_vertical_alignment : 'Vertical alignment',
-block_text_align : 'Text align',
-block_text_indent : 'Text indent',
-block_whitespace : 'Whitespace',
-block_display : 'Display',
-box_width : 'Width',
-box_height : 'Height',
-box_float : 'Float',
-box_clear : 'Clear',
-padding : 'Padding',
-same : 'Same for all',
-top : 'Top',
-right : 'Right',
-bottom : 'Bottom',
-left : 'Left',
-margin : 'Margin',
-style : 'Style',
-width : 'Width',
-height : 'Height',
-color : 'Color',
-list_type : 'Type',
-bullet_image : 'Bullet image',
-position : 'Position',
-positioning_type : 'Type',
-visibility : 'Visibility',
-zindex : 'Z-index',
-overflow : 'Overflow',
-placement : 'Placement',
-clip : 'Clip'
-});
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/props.htm 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/props.htm
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/props.htm	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/props.htm	1969-12-31 18:00:00.000000000 -0600
@@ -1,580 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{$lang_style_title}</title>
-	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script language="javascript" type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script language="javascript" type="text/javascript" src="jscripts/props.js"></script>
-	<link href="css/props.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="styleprops" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
-	<form onsubmit="updateAction();return false;" action="#">
-		<div class="tabs">
-			<ul>
-				<li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onmousedown="return false;">{$lang_style_text_tab}</a></span></li>
-				<li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onmousedown="return false;">{$lang_style_background_tab}</a></span></li>
-				<li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onmousedown="return false;">{$lang_style_block_tab}</a></span></li>
-				<li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onmousedown="return false;">{$lang_style_box_tab}</a></span></li>
-				<li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onmousedown="return false;">{$lang_style_border_tab}</a></span></li>
-				<li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onmousedown="return false;">{$lang_style_list_tab}</a></span></li>
-				<li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onmousedown="return false;">{$lang_style_positioning_tab}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="text_panel" class="panel current">
-				<table border="0" width="100%">
-					<tr>
-						<td><label for="text_font">{$lang_style_text_font}</label></td>
-						<td colspan="3">
-							<select id="text_font" name="text_font" class="mceEditableSelect" onchange="alert(this.options[this.selectedIndex].value);"></select>
-						</td>
-					</tr>
-					<tr>
-						<td><label for="text_size">{$lang_style_text_size}</label></td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
-								<td>&nbsp;<select id="text_size_measurement" name="text_size_measurement"></select>
-							</tr></table>
-						</td>
-						<td><label for="text_weight">{$lang_style_text_weight}</label></td>
-						<td>
-							<select id="text_weight" name="text_weight"></select>
-						</td>
-					</tr>
-					<tr>
-						<td><label for="text_style">{$lang_style_text_style}</label></td>
-						<td>
-							<select id="text_style" name="text_style" class="mceEditableSelect"></select>
-						</td>
-						<td><label for="text_variant">{$lang_style_text_variant}</label></td>
-						<td>
-							<select id="text_variant" name="text_variant"></select>
-						</td>
-					</tr>
-					<tr>
-						<td><label for="text_lineheight">{$lang_style_text_lineheight}</label></td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0"><tr><td>
-							<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
-							</td><td>&nbsp;<select id="text_lineheight_measurement" name="text_lineheight_measurement"></select>
-							</tr></table>
-						</td>
-						<td><label for="text_case">{$lang_style_text_case}</label></td>
-						<td>
-							<select id="text_case" name="text_case"></select>
-						</td>
-					</tr>
-					<tr>
-						<td><label for="text_color">{$lang_style_text_color}</label></td>
-						<td colspan="2">
-							<table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><input id="text_color" name="text_color" type="text" value="" size="9" onchange="updateColor('text_color_pick','text_color');" /></td>
-									<td id="text_color_pickcontainer">&nbsp;</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>{$lang_style_text_decoration}</td>
-						<td colspan="2">
-							<table border="0" cellspacing="0" cellpadding="0">
-								<tr><td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td><td><label for="text_underline">underline</label></td></tr>
-								<tr><td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td><td><label for="text_overline">overline</label></td></tr>
-								<tr><td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td><td><label for="text_linethrough">line-through</label></td></tr>
-								<tr><td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td><td><label for="text_blink">blink</label></td></tr>
-								<tr><td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td><td><label for="text_none">none</label></td></tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-			</div>
-
-			<div id="background_panel" class="panel">
-				<table border="0">
-					<tr>
-						<td><label for="background_color">{$lang_style_background_color}</label></td>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><input id="background_color" name="background_color" type="text" value="" size="9" onchange="updateColor('background_color_pick','background_color');" /></td>
-									<td id="background_color_pickcontainer">&nbsp;</td>
-								</tr>
-							</table>
-						</td>	
-					</tr>
-
-					<tr>
-						<td><label for="background_image">{$lang_style_background_image}</label></td>
-						<td><input id="background_image" name="background_image" type="text" /></td>	
-					</tr>
-
-					<tr>
-						<td><label for="background_repeat">{$lang_style_background_repeat}</label></td>
-						<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>	
-					</tr>
-
-					<tr>
-						<td><label for="background_attachment">{$lang_style_background_attachment}</label></td>
-						<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>	
-					</tr>
-
-					<tr>
-						<td><label for="background_hpos">{$lang_style_background_hpos}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
-								<td>&nbsp;<select id="background_hpos_measurement" name="background_hpos_measurement"></select>
-							</tr></table>
-						</td>
-					</tr>
-
-					<tr>
-						<td><label for="background_vpos">{$lang_style_background_vpos}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
-								<td>&nbsp;<select id="background_vpos_measurement" name="background_vpos_measurement"></select>
-							</tr></table>
-						</td>
-					</tr>
-				</table>
-			</div>
-
-			<div id="block_panel" class="panel">
-				<table border="0">
-					<tr>
-						<td><label for="block_wordspacing">{$lang_style_block_wordspacing}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
-								<td>&nbsp;<select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select>
-							</tr></table>
-						</td>
-					</tr>
-
-					<tr>
-						<td><label for="block_letterspacing">{$lang_style_block_letterspacing}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
-								<td>&nbsp;<select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select>
-							</tr></table>
-						</td>
-					</tr>
-
-					<tr>
-						<td><label for="block_vertical_alignment">{$lang_style_block_vertical_alignment}</label></td>
-						<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>	
-					</tr>
-
-					<tr>
-						<td><label for="block_text_align">{$lang_style_block_text_align}</label></td>
-						<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>	
-					</tr>
-
-					<tr>
-						<td><label for="block_text_indent">{$lang_style_block_text_indent}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
-								<td>&nbsp;<select id="block_text_indent_measurement" name="block_text_indent_measurement"></select>
-							</tr></table>
-						</td>
-					</tr>
-
-					<tr>
-						<td><label for="block_whitespace">{$lang_style_block_whitespace}</label></td>
-						<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>	
-					</tr>
-
-					<tr>
-						<td><label for="block_display">{$lang_style_block_display}</label></td>
-						<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>	
-					</tr>
-				</table>
-			</div>
-
-			<div id="box_panel" class="panel">
-				<table border="0">
-					<tr>
-						<td><label for="box_width">{$lang_style_box_width}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onchange="synch('box_width','positioning_width');" /></td>
-								<td>&nbsp;<select id="box_width_measurement" name="box_width_measurement"></select>
-							</tr></table>
-						</td>
-						<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{$lang_style_box_float}</label></td>
-						<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>							
-					</tr>
-
-					<tr>
-						<td><label for="box_height">{$lang_style_box_height}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onchange="synch('box_height','positioning_height');" /></td>
-								<td>&nbsp;<select id="box_height_measurement" name="box_height_measurement"></select>
-							</tr></table>
-						</td>
-						<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{$lang_style_box_clear}</label></td>
-						<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>							
-					</tr>					
-				</table>
-				<div style="float: left; width: 49%">
-					<fieldset>
-						<legend>{$lang_style_padding}</legend>
-
-						<table border="0">
-							<tr>
-								<td>&nbsp;</td>
-								<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onclick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{$lang_style_same}</label></td>
-							</tr>
-							<tr>
-								<td><label for="box_padding_top">{$lang_style_top}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
-										<td>&nbsp;<select id="box_padding_top_measurement" name="box_padding_top_measurement"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td><label for="box_padding_right">{$lang_style_right}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
-										<td>&nbsp;<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td><label for="box_padding_bottom">{$lang_style_bottom}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
-										<td>&nbsp;<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td><label for="box_padding_left">{$lang_style_left}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
-										<td>&nbsp;<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-						</table>
-					</fieldset>
-				</div>
-				<div style="float: right; width: 49%">
-					<fieldset>
-						<legend>{$lang_style_margin}</legend>
-
-						<table border="0">
-							<tr>
-								<td>&nbsp;</td>
-								<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onclick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{$lang_style_same}</label></td>
-							</tr>
-							<tr>
-								<td><label for="box_margin_top">{$lang_style_top}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
-										<td>&nbsp;<select id="box_margin_top_measurement" name="box_margin_top_measurement"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td><label for="box_margin_right">{$lang_style_right}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
-										<td>&nbsp;<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td><label for="box_margin_bottom">{$lang_style_bottom}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
-										<td>&nbsp;<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td><label for="box_margin_left">{$lang_style_left}</label></td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
-										<td>&nbsp;<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-						</table>
-					</fieldset>
-				</div>
-				<br style="clear: both" />
-			</div>
-
-			<div id="border_panel" class="panel">
-				<table border="0" cellspacing="0" cellp2adding="0" width="100%">
-					<tr>
-						<td class="tdelim">&nbsp;</td>
-						<td class="tdelim delim">&nbsp;</td>
-						<td class="tdelim">{$lang_style_style}</td>
-						<td class="tdelim delim">&nbsp;</td>
-						<td class="tdelim">{$lang_style_width}</td>
-						<td class="tdelim delim">&nbsp;</td>
-						<td class="tdelim">{$lang_style_color}</td>
-					</tr>
-
-					<tr>
-						<td>&nbsp;</td>
-						<td class="delim">&nbsp;</td>
-						<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onclick="toggleSame(this,'border_style');" /> <label for="border_style_same">{$lang_style_same}</label></td>
-						<td class="delim">&nbsp;</td>
-						<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onclick="toggleSame(this,'border_width');" /> <label for="border_width_same">{$lang_style_same}</label></td>
-						<td class="delim">&nbsp;</td>
-						<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onclick="toggleSame(this,'border_color');" /> <label for="border_color_same">{$lang_style_same}</label></td>
-					</tr>
-
-					<tr>
-						<td>{$lang_style_top}</td>
-						<td class="delim">&nbsp;</td>
-						<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
-						<td class="delim">&nbsp;</td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
-								<td>&nbsp;<select id="border_width_top_measurement" name="border_width_top_measurement"></select>
-							</tr></table>
-						</td>
-						<td class="delim">&nbsp;</td>
-						<td><table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onchange="updateColor('border_color_top_pick','border_color_top');" /></td>
-									<td id="border_color_top_pickcontainer">&nbsp;</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-
-					<tr>
-						<td>{$lang_style_right}</td>
-						<td class="delim">&nbsp;</td>
-						<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
-						<td class="delim">&nbsp;</td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
-								<td>&nbsp;<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select>
-							</tr></table>
-						</td>
-						<td class="delim">&nbsp;</td>
-						<td><table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onchange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
-									<td id="border_color_right_pickcontainer">&nbsp;</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-
-					<tr>
-						<td>{$lang_style_bottom}</td>
-						<td class="delim">&nbsp;</td>
-						<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
-						<td class="delim">&nbsp;</td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
-								<td>&nbsp;<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select>
-							</tr></table>
-						</td>
-						<td class="delim">&nbsp;</td>
-						<td><table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onchange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
-									<td id="border_color_bottom_pickcontainer">&nbsp;</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-
-					<tr>
-						<td>{$lang_style_left}</td>
-						<td class="delim">&nbsp;</td>
-						<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
-						<td class="delim">&nbsp;</td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
-								<td>&nbsp;<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select>
-							</tr></table>
-						</td>
-						<td class="delim">&nbsp;</td>
-						<td><table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onchange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
-									<td id="border_color_left_pickcontainer">&nbsp;</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-			</div>
-
-			<div id="list_panel" class="panel">
-				<table border="0">
-					<tr>
-						<td><label for="list_type">{$lang_style_list_type}</label></td>
-						<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>	
-					</tr>
-
-					<tr>
-						<td><label for="list_bullet_image">{$lang_style_bullet_image}</label></td>
-						<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>	
-					</tr>
-
-					<tr>
-						<td><label for="list_position">{$lang_style_position}</label></td>
-						<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>	
-					</tr>
-				</table>
-			</div>
-
-			<div id="positioning_panel" class="panel">
-				<table border="0">
-					<tr>
-						<td><label for="positioning_type">{$lang_style_positioning_type}</label></td>
-						<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
-						<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{$lang_style_visibility}</label></td>
-						<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>							
-					</tr>
-
-					<tr>
-						<td><label for="positioning_width">{$lang_style_width}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><input type="text" id="positioning_width" name="positioning_width" onchange="synch('positioning_width','box_width');" /></td>
-								<td>&nbsp;<select id="positioning_width_measurement" name="positioning_width_measurement"></select>
-							</tr></table>
-						</td>
-						<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{$lang_style_zindex}</label></td>
-						<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>							
-					</tr>
-
-					<tr>
-						<td><label for="positioning_height">{$lang_style_height}</label></td>
-						<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-								<td><input type="text" id="positioning_height" name="positioning_height" onchange="synch('positioning_height','box_height');" /></td>
-								<td>&nbsp;<select id="positioning_height_measurement" name="positioning_height_measurement"></select>
-							</tr></table>
-						</td>
-						<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{$lang_style_overflow}</label></td>
-						<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>							
-					</tr>					
-				</table>
-
-				<div style="float: left; width: 49%">
-					<fieldset>
-						<legend>{$lang_style_placement}</legend>
-
-						<table border="0">
-							<tr>
-								<td>&nbsp;</td>
-								<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onclick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{$lang_style_same}</label></td>
-							</tr>
-							<tr>
-								<td>{$lang_style_top}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
-										<td>&nbsp;<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td>{$lang_style_right}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
-										<td>&nbsp;<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td>{$lang_style_bottom}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
-										<td>&nbsp;<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td>{$lang_style_left}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
-										<td>&nbsp;<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-						</table>
-					</fieldset>
-				</div>
-				<div style="float: right; width: 49%">
-					<fieldset>
-						<legend>{$lang_style_clip}</legend>
-
-						<table border="0">
-							<tr>
-								<td>&nbsp;</td>
-								<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onclick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{$lang_style_same}</label></td>
-							</tr>
-							<tr>
-								<td>{$lang_style_top}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
-										<td>&nbsp;<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td>{$lang_style_right}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
-										<td>&nbsp;<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" ></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td>{$lang_style_bottom}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
-										<td>&nbsp;<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-							<tr>
-								<td>{$lang_style_left}</td>
-								<td><table border="0" cellspacing="0" cellpadding="0"><tr>
-										<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
-										<td>&nbsp;<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select>
-									</tr></table>
-								</td>
-							</tr>
-						</table>
-					</fieldset>
-				</div>
-				<br style="clear: both" />
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<div style="float: left"><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="updateAction();" /></div>
-				<div style="float: left">&nbsp;<input type="button" id="apply" name="apply" value="Apply" onclick="applyAction();" class="updateButton" /></div>
-				<br style="clear: both" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-	</form>
-
-	<div style="display: none">
-		<div id="container"></div>
-	</div>
-</body>
-</html>
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/style/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/cell.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/cell.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/cell.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/cell.js	2006-04-30 15:27:06.000000000 -0500
@@ -48,6 +48,11 @@
 
 	updateColor('bordercolor_pick', 'bordercolor');
 	updateColor('bgcolor_pick', 'bgcolor');
+
+	if (tinyMCE.getParam('class_selectors', true)) {
+		var sr = document.getElementById('styleSelectRow');
+		sr.style.display = 'none';
+	}
 }
 
 function updateAction() {
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/row.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/row.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/row.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/row.js	2006-04-30 15:27:06.000000000 -0500
@@ -40,6 +40,11 @@
 		document.getElementById('backgroundimage').style.width = '180px';
 
 	updateColor('bgcolor_pick', 'bgcolor');
+
+	if (tinyMCE.getParam('class_selectors', true)) {
+		var sr = document.getElementById('styleSelectRow');
+		sr.style.display = 'none';
+	}
 }
 
 function updateAction() {
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/table.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/table.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/table.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/jscripts/table.js	2006-04-30 15:27:06.000000000 -0500
@@ -259,6 +259,11 @@
 		formObj.cols.disabled = true;
 		formObj.rows.disabled = true;
 	}
+
+	if (tinyMCE.getParam ('class_selectors', true)) {
+		var sr = document.getElementById('styleSelectRow');
+		sr.style.display = 'none';
+	}
 }
 
 function changedSize() {
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/table/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin.js	2006-04-30 15:27:06.000000000 -0500
@@ -1 +1,6 @@
-var TinyMCE_ZoomPlugin={getInfo:function(){return{longname:'Zoom',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_zoom.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(control_name){if(!tinyMCE.isMSIE||tinyMCE.isMSIE5_0||tinyMCE.isOpera)return"";switch(control_name){case"zoom":return'<select id="{$editor_id}_zoomSelect" name="{$editor_id}_zoomSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceZoom\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+'<option value="100%">+ 100%</option>'+'<option value="150%">+ 150%</option>'+'<option value="200%">+ 200%</option>'+'<option value="250%">+ 250%</option>'+'</select>';}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceZoom":tinyMCE.getInstanceById(editor_id).contentDocument.body.style.zoom=value;tinyMCE.getInstanceById(editor_id).contentDocument.body.style.mozZoom=value;return true;}return false;}};tinyMCE.addPlugin("zoom",TinyMCE_ZoomPlugin);
\ No newline at end of file
+var TinyMCE_ZoomPlugin={getInfo:function(){return{longname:'Zoom',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_zoom.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},getControlHTML:function(control_name){if(!tinyMCE.isMSIE||tinyMCE.isMSIE5_0||tinyMCE.isOpera)return"";switch(control_name){case"zoom":return'<select id="{$editor_id}_zoomSelect" name="{$editor_id}_zoomSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceZoom\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+						<option value="100%">+ 100%</option>\
+						<option value="150%">+ 150%</option>\
+						<option value="200%">+ 200%</option>\
+						<option value="250%">+ 250%</option>\
+						</select>';}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceZoom":tinyMCE.getInstanceById(editor_id).contentDocument.body.style.zoom=value;tinyMCE.getInstanceById(editor_id).contentDocument.body.style.mozZoom=value;return true;}return false;}};tinyMCE.addPlugin("zoom",TinyMCE_ZoomPlugin);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/editor_plugin_src.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 /**
  * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.10 $
- * $Date: 2006/04/07 15:52:50 $
+ * $Revision: 1.9 $
+ * $Date: 2006/03/03 16:10:41 $
  *
  * @author Moxiecode
  * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
@@ -27,12 +27,12 @@
 
 		switch (control_name) {
 			case "zoom":
-				return '<select id="{$editor_id}_zoomSelect" name="{$editor_id}_zoomSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceZoom\',false,this.options[this.selectedIndex].value);" class="mceSelectList">' + 
-						'<option value="100%">+ 100%</option>' + 
-						'<option value="150%">+ 150%</option>' + 
-						'<option value="200%">+ 200%</option>' + 
-						'<option value="250%">+ 250%</option>' + 
-						'</select>';
+				return '<select id="{$editor_id}_zoomSelect" name="{$editor_id}_zoomSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceZoom\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+						<option value="100%">+ 100%</option>\
+						<option value="150%">+ 150%</option>\
+						<option value="200%">+ 200%</option>\
+						<option value="250%">+ 250%</option>\
+						</select>';
 		}
 
 		return "";
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/readme.txt 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/readme.txt
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/readme.txt	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/plugins/zoom/readme.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css	2006-04-30 15:27:06.000000000 -0500
@@ -14,11 +14,6 @@
 	border: 1px dashed #BBBBBB !important;
 }
 
-div.mceVisualAid {
-	background-image:url('../images/spacer.gif');
-	visibility: visible !important;
-}
-
 .mceItemAnchor {
 	width: 12px;
 	line-height: 6px;
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_ui.css	2006-04-30 15:27:06.000000000 -0500
@@ -122,10 +122,6 @@
 	padding: 0;
 }
 
-.mceEditorIframe {
-	border: 0;
-}
-
 /* Button CSS rules */
 
 a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {
@@ -299,7 +295,6 @@
 .mceMenu a:hover {
 	background-color: #B6BDD2;
 	color: black;
-	text-decoration: none !important;
 }
 
 .mceMenu span {
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js	2006-04-30 15:27:06.000000000 -0500
@@ -1 +1,12 @@
-tinyMCE.importThemeLanguagePack('advanced');var TinyMCE_AdvancedTheme={_autoImportCSSClasses:true,_resizer:{},_buttons:[['bold','{$lang_bold_img}','lang_bold_desc','Bold'],['italic','{$lang_italic_img}','lang_italic_desc','Italic'],['underline','{$lang_underline_img}','lang_underline_desc','Underline'],['strikethrough','strikethrough.gif','lang_striketrough_desc','Strikethrough'],['justifyleft','justifyleft.gif','lang_justifyleft_desc','JustifyLeft'],['justifycenter','justifycenter.gif','lang_justifycenter_desc','JustifyCenter'],['justifyright','justifyright.gif','lang_justifyright_desc','JustifyRight'],['justifyfull','justifyfull.gif','lang_justifyfull_desc','JustifyFull'],['bullist','bullist.gif','lang_bullist_desc','InsertUnorderedList'],['numlist','numlist.gif','lang_numlist_desc','InsertOrderedList'],['outdent','outdent.gif','lang_outdent_desc','Outdent'],['indent','indent.gif','lang_indent_desc','Indent'],['cut','cut.gif','lang_cut_desc','Cut'],['copy','copy.gif','lang_copy_desc','Copy'],['paste','paste.gif','lang_paste_desc','Paste'],['undo','undo.gif','lang_undo_desc','Undo'],['redo','redo.gif','lang_redo_desc','Redo'],['link','link.gif','lang_link_desc','mceLink',true],['unlink','unlink.gif','lang_unlink_desc','unlink'],['image','image.gif','lang_image_desc','mceImage',true],['cleanup','cleanup.gif','lang_cleanup_desc','mceCleanup'],['help','help.gif','lang_help_desc','mceHelp'],['code','code.gif','lang_theme_code_desc','mceCodeEditor'],['hr','hr.gif','lang_theme_hr_desc','inserthorizontalrule'],['removeformat','removeformat.gif','lang_theme_removeformat_desc','removeformat'],['sub','sub.gif','lang_theme_sub_desc','subscript'],['sup','sup.gif','lang_theme_sup_desc','superscript'],['forecolor','forecolor.gif','lang_theme_forecolor_desc','mceForeColor',true],['backcolor','backcolor.gif','lang_theme_backcolor_desc','mceBackColor',true],['charmap','charmap.gif','lang_theme_charmap_desc','mceCharMap'],['visualaid','visualaid.gif','lang_theme_visualaid_desc','mceToggleVisualAid'],['anchor','anchor.gif','lang_theme_anchor_desc','mceInsertAnchor'],['newdocument','newdocument.gif','lang_newdocument_desc','mceNewDocument']],_buttonMap:'anchor,backcolor,bold,bullist,charmap,cleanup,code,copy,cut,forecolor,help,hr,image,indent,italic,justifycenter,justifyfull,justifyleft,justifyright,link,newdocument,numlist,outdent,paste,redo,removeformat,strikethrough,sub,sup,underline,undo,unlink,visualaid,advhr,ltr,rtl,emotions,flash,fullpage,fullscreen,iespell,insertdate,inserttime,pastetext,pasteword,selectall,preview,print,save,replace,search,table,cell_props,delete_col,delete_row,col_after,col_before,row_after,row_before,merge_cells,row_props,split_cells',getControlHTML:function(button_name){var i,x;for(i=0;i<TinyMCE_AdvancedTheme._buttons.length;i++){var but=TinyMCE_AdvancedTheme._buttons[i];if(but[0]==button_name)return tinyMCE.getButtonHTML(but[0],but[2],'{$themeurl}/images/'+but[1],but[3],(but.length>4?but[4]:false),(but.length>5?but[5]:null));}switch(button_name){case"formatselect":var html='<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';var formats=tinyMCE.getParam("theme_advanced_blockformats","p,address,pre,h1,h2,h3,h4,h5,h6",true).split(',');var lookup=[['p','{$lang_theme_paragraph}'],['address','{$lang_theme_address}'],['pre','{$lang_theme_pre}'],['h1','{$lang_theme_h1}'],['h2','{$lang_theme_h2}'],['h3','{$lang_theme_h3}'],['h4','{$lang_theme_h4}'],['h5','{$lang_theme_h5}'],['h6','{$lang_theme_h6}'],['div','{$lang_theme_div}'],['blockquote','{$lang_theme_blockquote}'],['code','{$lang_theme_code}'],['dt','{$lang_theme_dt}'],['dd','{$lang_theme_dd}'],['samp','{$lang_theme_samp}']];html+='<option value="">{$lang_theme_block}</option>';for(var i=0;i<formats.length;i++){for(var x=0;x<lookup.length;x++){if(formats[i]==lookup[x][0])html+='<option value="&lt;'+lookup[x][0]+'&gt;">'+lookup[x][1]+'</option>';}}html+='</select>';return html;case"styleselect":return'<select id="{$editor_id}_styleSelect" onmousedown="tinyMCE.themes.advanced._setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onfocus="tinyMCE.addSelectAccessibility(event,this,window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';case"fontselect":var fontHTML='<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList"><option value="">{$lang_theme_fontdefault}</option>';var iFonts='Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';var nFonts='Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sand;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats';var fonts=tinyMCE.getParam("theme_advanced_fonts",nFonts).split(';');for(i=0;i<fonts.length;i++){if(fonts[i]!=''){var parts=fonts[i].split('=');fontHTML+='<option value="'+parts[1]+'">'+parts[0]+'</option>';}}fontHTML+='</select>';return fontHTML;case"fontsizeselect":return'<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+'<option value="0">{$lang_theme_font_size}</option>'+'<option value="1">1 (8 pt)</option>'+'<option value="2">2 (10 pt)</option>'+'<option value="3">3 (12 pt)</option>'+'<option value="4">4 (14 pt)</option>'+'<option value="5">5 (18 pt)</option>'+'<option value="6">6 (24 pt)</option>'+'<option value="7">7 (36 pt)</option>'+'</select>';case"|":case"separator":return'<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';case"spacer":return'<img src="{$themeurl}/images/separator.gif" width="2" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';case"rowseparator":return'<br />';}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceLink":var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=inst.getSel().toString();if(!tinyMCE.linkElement){if((tinyMCE.selectedElement.nodeName.toLowerCase()!="img")&&(selectedText.length<=0))return true;}var href="",target="",title="",onclick="",action="insert",style_class="";if(tinyMCE.selectedElement.nodeName.toLowerCase()=="a")tinyMCE.linkElement=tinyMCE.selectedElement;if(tinyMCE.linkElement!=null&&tinyMCE.getAttrib(tinyMCE.linkElement,'href')=="")tinyMCE.linkElement=null;if(tinyMCE.linkElement){href=tinyMCE.getAttrib(tinyMCE.linkElement,'href');target=tinyMCE.getAttrib(tinyMCE.linkElement,'target');title=tinyMCE.getAttrib(tinyMCE.linkElement,'title');onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');style_class=tinyMCE.getAttrib(tinyMCE.linkElement,'class');if(onclick=="")onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');onclick=tinyMCE.cleanupEventStr(onclick);href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");mceRealHref=tinyMCE.getAttrib(tinyMCE.linkElement,'mce_href');if(mceRealHref!=""){href=mceRealHref;if(tinyMCE.getParam('convert_urls'))href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");}action="update";}var template=new Array();template['file']='link.htm';template['width']=310;template['height']=200;template['width']+=tinyMCE.getLang('lang_insert_link_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_link_delta_height',0);if(inst.settings['insertlink_callback']){var returnVal=eval(inst.settings['insertlink_callback']+"(href, target, title, onclick, action, style_class);");if(returnVal&&returnVal['href'])TinyMCE_AdvancedTheme._insertLink(returnVal['href'],returnVal['target'],returnVal['title'],returnVal['onclick'],returnVal['style_class']);}else{tinyMCE.openWindow(template,{href:href,target:target,title:title,onclick:onclick,action:action,className:style_class,inline:"yes"});}return true;case"mceImage":var src="",alt="",border="",hspace="",vspace="",width="",height="",align="";var title="",onmouseover="",onmouseout="",action="insert";var img=tinyMCE.imgElement;var inst=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedElement!=null&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){img=tinyMCE.selectedElement;tinyMCE.imgElement=img;}if(img){if(tinyMCE.getAttrib(img,'name').indexOf('mce_')==0)return true;src=tinyMCE.getAttrib(img,'src');alt=tinyMCE.getAttrib(img,'alt');if(alt=="")alt=tinyMCE.getAttrib(img,'title');if(tinyMCE.isGecko){var w=img.style.width;if(w!=null&&w!="")img.setAttribute("width",w);var h=img.style.height;if(h!=null&&h!="")img.setAttribute("height",h);}border=tinyMCE.getAttrib(img,'border');hspace=tinyMCE.getAttrib(img,'hspace');vspace=tinyMCE.getAttrib(img,'vspace');width=tinyMCE.getAttrib(img,'width');height=tinyMCE.getAttrib(img,'height');align=tinyMCE.getAttrib(img,'align');onmouseover=tinyMCE.getAttrib(img,'onmouseover');onmouseout=tinyMCE.getAttrib(img,'onmouseout');title=tinyMCE.getAttrib(img,'title');if(tinyMCE.isMSIE){width=img.attributes['width'].specified?width:"";height=img.attributes['height'].specified?height:"";}src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");mceRealSrc=tinyMCE.getAttrib(img,'mce_src');if(mceRealSrc!=""){src=mceRealSrc;if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");}action="update";}var template=new Array();template['file']='image.htm?src={$src}';template['width']=355;template['height']=265+(tinyMCE.isMSIE?25:0);template['width']+=tinyMCE.getLang('lang_insert_image_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_image_delta_height',0);if(inst.settings['insertimage_callback']){var returnVal=eval(inst.settings['insertimage_callback']+"(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");if(returnVal&&returnVal['src'])TinyMCE_AdvancedTheme._insertImage(returnVal['src'],returnVal['alt'],returnVal['border'],returnVal['hspace'],returnVal['vspace'],returnVal['width'],returnVal['height'],returnVal['align'],returnVal['title'],returnVal['onmouseover'],returnVal['onmouseout']);}else tinyMCE.openWindow(template,{src:src,alt:alt,border:border,hspace:hspace,vspace:vspace,width:width,height:height,align:align,title:title,onmouseover:onmouseover,onmouseout:onmouseout,action:action,inline:"yes"});return true;case"mceForeColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=tinyMCE.getAttrib(elm,"color");if(inputColor=='')inputColor=elm.style.color;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"forecolor",input_color:inputColor});return true;case"mceBackColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=elm.style.backgroundColor;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;template['width']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"HiliteColor",input_color:inputColor});return true;case"mceColorPicker":if(user_interface){var template=new Array();var inputColor=value['document'].getElementById(value['element_id']).value;template['file']='color_picker.htm';template['width']=220;template['height']=190;template['close_previous']="no";template['width']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_height',0);if(typeof(value['store_selection'])=="undefined")value['store_selection']=true;tinyMCE.lastColorPickerValue=value;tinyMCE.openWindow(template,{editor_id:editor_id,mce_store_selection:value['store_selection'],inline:"yes",command:"mceColorPicker",input_color:inputColor});}else{var savedVal=tinyMCE.lastColorPickerValue;var elm=savedVal['document'].getElementById(savedVal['element_id']);elm.value=value;if(elm.onchange!=null&&elm.onchange!='')eval('elm.onchange();');}return true;case"mceCodeEditor":var template=new Array();template['file']='source_editor.htm';template['width']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_width",720));template['height']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_height",580));tinyMCE.openWindow(template,{editor_id:editor_id,resizable:"yes",scrollbars:"no",inline:"yes"});return true;case"mceCharMap":var template=new Array();template['file']='charmap.htm';template['width']=550+(tinyMCE.isOpera?40:0);template['height']=250;template['width']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceInsertAnchor":var template=new Array();template['file']='anchor.htm';template['width']=320;template['height']=90+(tinyMCE.isNS7?30:0);template['width']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceNewDocument":if(confirm(tinyMCE.getLang('lang_newdocument')))tinyMCE.execInstanceCommand(editor_id,'mceSetContent',false,' ');return true;}return false;},getEditorTemplate:function(settings,editorId){function removeFromArray(in_array,remove_array){var outArray=new Array();for(var i=0;i<in_array.length;i++){skip=false;for(var j=0;j<remove_array.length;j++){if(in_array[i]==remove_array[j]){skip=true;}}if(!skip){outArray[outArray.length]=in_array[i];}}return outArray;}function addToArray(in_array,add_array){for(var i=0;i<add_array.length;i++){in_array[in_array.length]=add_array[i];}return in_array;}var template=new Array();var deltaHeight=0;var resizing=tinyMCE.getParam("theme_advanced_resizing",false);var path=tinyMCE.getParam("theme_advanced_path",true);var statusbarHTML='<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: '+(path?"block":"none")+'">&#160;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: '+(resizing?"block":"none")+'" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';var layoutManager=tinyMCE.getParam("theme_advanced_layout_manager","SimpleLayout");var styleSelectHTML='<option value="">{$lang_theme_style_select}</option>';if(settings['theme_advanced_styles']){var stylesAr=settings['theme_advanced_styles'].split(';');for(var i=0;i<stylesAr.length;i++){var key,value;key=stylesAr[i].split('=')[0];value=stylesAr[i].split('=')[1];styleSelectHTML+='<option value="'+value+'">'+key+'</option>';}TinyMCE_AdvancedTheme._autoImportCSSClasses=false;}switch(layoutManager){case"SimpleLayout":var toolbarHTML="";var toolbarLocation=tinyMCE.getParam("theme_advanced_toolbar_location","bottom");var toolbarAlign=tinyMCE.getParam("theme_advanced_toolbar_align","center");var pathLocation=tinyMCE.getParam("theme_advanced_path_location","none");var statusbarLocation=tinyMCE.getParam("theme_advanced_statusbar_location",pathLocation);var defVals={theme_advanced_buttons1:"bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,separator,sub,sup,separator,charmap"};toolbarHTML+='<a href="#" accesskey="q" title="'+tinyMCE.getLang("lang_toolbar_focus")+'"';if(!tinyMCE.getParam("accessibility_focus"))toolbarHTML+=' onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"';toolbarHTML+='></a>';for(var i=1;i<100;i++){var def=defVals["theme_advanced_buttons"+i];var buttons=tinyMCE.getParam("theme_advanced_buttons"+i,def==null?'':def,true,',');if(buttons.length==0)break;buttons=removeFromArray(buttons,tinyMCE.getParam("theme_advanced_disable","",true,','));buttons=addToArray(buttons,tinyMCE.getParam("theme_advanced_buttons"+i+"_add","",true,','));buttons=addToArray(tinyMCE.getParam("theme_advanced_buttons"+i+"_add_before","",true,','),buttons);for(var b=0;b<buttons.length;b++)toolbarHTML+=tinyMCE.getControlHTML(buttons[b]);if(buttons.length>0){toolbarHTML+="<br />";deltaHeight-=23;}}toolbarHTML+='<a href="#" accesskey="z" onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"></a>';template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';if(toolbarLocation=="top"){template['html']+='<tr><td class="mceToolbarTop" align="'+toolbarAlign+'" height="1" nowrap="nowrap">'+toolbarHTML+'</td></tr>';}if(statusbarLocation=="top"){template['html']+='<tr><td class="mceStatusbarTop" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';if(toolbarLocation=="bottom"){template['html']+='<tr><td class="mceToolbarBottom" align="'+toolbarAlign+'" height="1">'+toolbarHTML+'</td></tr>';}if(toolbarLocation=="external"){var bod=document.body;var elm=document.createElement("div");toolbarHTML=tinyMCE.replaceVar(toolbarHTML,'style_select_options',styleSelectHTML);toolbarHTML=tinyMCE.applyTemplate(toolbarHTML,{editor_id:editorId});elm.className="mceToolbarExternal";elm.id=editorId+"_toolbar";elm.innerHTML='<table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table>';bod.appendChild(elm);deltaHeight=0;tinyMCE.getInstanceById(editorId).toolbarElement=elm;}else{tinyMCE.getInstanceById(editorId).toolbarElement=null;}if(statusbarLocation=="bottom"){template['html']+='<tr><td class="mceStatusbarBottom" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='</tbody></table>';break;case"RowLayout":template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';var containers=tinyMCE.getParam("theme_advanced_containers","",true,",");var defaultContainerCSS=tinyMCE.getParam("theme_advanced_containers_default_class","container");var defaultContainerAlign=tinyMCE.getParam("theme_advanced_containers_default_align","center");for(var i=0;i<containers.length;i++){if(containers[i]=="mceEditor")template['html']+='<tr><td align="center" class="mceEditor_border"><span id="{$editor_id}"></span></td></tr>';else if(containers[i]=="mceElementpath"||containers[i]=="mceStatusbar"){var pathClass="mceStatusbar";if(i==containers.length-1){pathClass="mceStatusbarBottom";}else if(i==0){pathClass="mceStatusbar";}else{deltaHeight-=2;}template['html']+='<tr><td class="'+pathClass+'" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=22;}else{var curContainer=tinyMCE.getParam("theme_advanced_container_"+containers[i],"",true,',');var curContainerHTML="";var curAlign=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align",defaultContainerAlign);var curCSS=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class",defaultContainerCSS);for(var j=0;j<curContainer.length;j++){curContainerHTML+=tinyMCE.getControlHTML(curContainer[j]);}if(curContainer.length>0){curContainerHTML+="<br />";deltaHeight-=23;}template['html']+='<tr><td class="'+curCSS+'" align="'+curAlign+'" height="1">'+curContainerHTML+'</td></tr>';}}template['html']+='</tbody></table>';break;case"CustomLayout":var customLayout=tinyMCE.getParam("theme_advanced_custom_layout","");if(customLayout!=""&&eval("typeof("+customLayout+")")!="undefined"){template=eval(customLayout+"(template);");}break;}if(resizing)template['html']+='<span id="{$editor_id}_resize_box" class="mceResizeBox"></span>';template['html']=tinyMCE.replaceVar(template['html'],'style_select_options',styleSelectHTML);template['delta_width']=0;template['delta_height']=deltaHeight;return template;},initInstance:function(inst){if(tinyMCE.getParam("theme_advanced_resizing",false)){if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var w=TinyMCE_AdvancedTheme._getCookie("TinyMCE_"+inst.editorId+"_width");var h=TinyMCE_AdvancedTheme._getCookie("TinyMCE_"+inst.editorId+"_height");TinyMCE_AdvancedTheme._resizeTo(inst,w,h,tinyMCE.getParam("theme_advanced_resize_horizontal",true));}}inst.addShortcut('ctrl','k','lang_link_desc','mceLink');},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection,setup_content){function selectByValue(select_elm,value,first_index){first_index=typeof(first_index)=="undefined"?false:true;if(select_elm){for(var i=0;i<select_elm.options.length;i++){var ov=""+select_elm.options[i].value;if(first_index&&ov.toLowerCase().indexOf(value.toLowerCase())==0){select_elm.selectedIndex=i;return true;}if(ov==value){select_elm.selectedIndex=i;return true;}}}return false;};function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";};if(node==null)return;var pathElm=document.getElementById(editor_id+"_path");var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();if(pathElm){var parentNode=node;var path=new Array();while(parentNode!=null){if(parentNode.nodeName.toUpperCase()=="BODY"){break;}if(parentNode.nodeType==1&&tinyMCE.getAttrib(parentNode,"class").indexOf('mceItemHidden')==-1){path[path.length]=parentNode;}parentNode=parentNode.parentNode;}var html="";for(var i=path.length-1;i>=0;i--){var nodeName=path[i].nodeName.toLowerCase();var nodeData="";if(nodeName=="b"){nodeName="strong";}if(nodeName=="i"){nodeName="em";}if(nodeName=="span"){var cn=tinyMCE.getAttrib(path[i],"class");if(cn!=""&&cn.indexOf('mceItem')==-1)nodeData+="class: "+cn+" ";var st=tinyMCE.getAttrib(path[i],"style");if(st!=""){st=tinyMCE.serializeStyle(tinyMCE.parseStyle(st));nodeData+="style: "+st+" ";}}if(nodeName=="font"){if(tinyMCE.getParam("convert_fonts_to_spans"))nodeName="span";var face=tinyMCE.getAttrib(path[i],"face");if(face!="")nodeData+="font: "+face+" ";var size=tinyMCE.getAttrib(path[i],"size");if(size!="")nodeData+="size: "+size+" ";var color=tinyMCE.getAttrib(path[i],"color");if(color!="")nodeData+="color: "+color+" ";}if(getAttrib(path[i],'id')!=""){nodeData+="id: "+path[i].getAttribute('id')+" ";}var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1)nodeData+="class: "+className+" ";if(getAttrib(path[i],'src')!=""){var src=tinyMCE.getAttrib(path[i],"mce_src");if(src=="")src=tinyMCE.getAttrib(path[i],"src");nodeData+="src: "+src+" ";}if(getAttrib(path[i],'href')!=""){var href=tinyMCE.getAttrib(path[i],"mce_href");if(href=="")href=tinyMCE.getAttrib(path[i],"href");nodeData+="href: "+href+" ";}if(nodeName=="img"&&tinyMCE.getAttrib(path[i],"class").indexOf('mceItemFlash')!=-1){nodeName="flash";nodeData="src: "+path[i].getAttribute('title');}if(nodeName=="a"&&(anchor=tinyMCE.getAttrib(path[i],"name"))!=""){nodeName="a";nodeName+="#"+anchor;nodeData="";}if(getAttrib(path[i],'name').indexOf("mce_")!=0){var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1){nodeName+="."+className;}}var cmd='tinyMCE.execInstanceCommand(\''+editor_id+'\',\'mceSelectNodeDepth\',false,\''+i+'\');';html+='<a title="'+nodeData+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" target="_self" class="mcePathItem">'+nodeName+'</a>';if(i>0){html+=" &raquo; ";}}pathElm.innerHTML='<a href="#" accesskey="x"></a>'+tinyMCE.getLang('lang_theme_path')+": "+html+'&#160;';}tinyMCE.switchClass(editor_id+'_justifyleft','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifyright','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifyfull','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClass(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClass(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_numlist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_sub','mceButtonNormal');tinyMCE.switchClass(editor_id+'_sup','mceButtonNormal');tinyMCE.switchClass(editor_id+'_anchor','mceButtonNormal');tinyMCE.switchClass(editor_id+'_link','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_unlink','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_outdent','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_image','mceButtonNormal');tinyMCE.switchClass(editor_id+'_hr','mceButtonNormal');if(node.nodeName=="A"&&tinyMCE.getAttrib(node,"class").indexOf('mceItemAnchor')!=-1)tinyMCE.switchClass(editor_id+'_anchor','mceButtonSelected');var anchorLink=tinyMCE.getParentElement(node,"a","href");if(anchorLink||any_selection){tinyMCE.switchClass(editor_id+'_link',anchorLink?'mceButtonSelected':'mceButtonNormal');tinyMCE.switchClass(editor_id+'_unlink',anchorLink?'mceButtonSelected':'mceButtonNormal');}tinyMCE.switchClass(editor_id+'_visualaid',visual_aid?'mceButtonSelected':'mceButtonNormal');if(undo_levels!=-1){tinyMCE.switchClass(editor_id+'_undo','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_redo','mceButtonDisabled');}if(tinyMCE.getParentElement(node,"li,blockquote"))tinyMCE.switchClass(editor_id+'_outdent','mceButtonNormal');if(undo_index!=-1&&(undo_index<undo_levels-1&&undo_levels>0))tinyMCE.switchClass(editor_id+'_redo','mceButtonNormal');if(undo_index!=-1&&(undo_index>0&&undo_levels>0))tinyMCE.switchClass(editor_id+'_undo','mceButtonNormal');var selectElm=document.getElementById(editor_id+"_styleSelect");if(selectElm){TinyMCE_AdvancedTheme._setupCSSClasses(editor_id);classNode=node;breakOut=false;var index=0;do{if(classNode&&classNode.className){for(var i=0;i<selectElm.options.length;i++){if(selectElm.options[i].value==classNode.className){index=i;breakOut=true;break;}}}}while(!breakOut&&classNode!=null&&(classNode=classNode.parentNode)!=null);selectElm.selectedIndex=index;}var selectElm=document.getElementById(editor_id+"_formatSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"p,div,h1,h2,h3,h4,h5,h6,pre,address");if(elm)selectByValue(selectElm,"<"+elm.nodeName.toLowerCase()+">");else selectByValue(selectElm,"");}var selectElm=document.getElementById(editor_id+"_fontNameSelect");if(selectElm){if(!tinyMCE.isSafari&&!(tinyMCE.isMSIE&&!tinyMCE.isOpera)){var face=inst.queryCommandValue('FontName');face=face==null||face==""?"":face;selectByValue(selectElm,face,face!="");}else{var elm=tinyMCE.getParentElement(node,"font","face");if(elm){var family=tinyMCE.getAttrib(elm,"face");if(family=='')family=''+elm.style.fontFamily;if(!selectByValue(selectElm,family,family!=""))selectByValue(selectElm,"");}else selectByValue(selectElm,"");}}var selectElm=document.getElementById(editor_id+"_fontSizeSelect");if(selectElm){if(!tinyMCE.isSafari&&!tinyMCE.isOpera){var size=inst.queryCommandValue('FontSize');selectByValue(selectElm,size==null||size==""?"0":size);}else{var elm=tinyMCE.getParentElement(node,"font","size");if(elm){var size=tinyMCE.getAttrib(elm,"size");if(size==''){var sizes=new Array('','8px','10px','12px','14px','18px','24px','36px');size=''+elm.style.fontSize;for(var i=0;i<sizes.length;i++){if((''+sizes[i])==size){size=i;break;}}}if(!selectByValue(selectElm,size))selectByValue(selectElm,"");}else selectByValue(selectElm,"0");}}alignNode=node;breakOut=false;do{if(!alignNode.getAttribute||!alignNode.getAttribute('align'))continue;switch(alignNode.getAttribute('align').toLowerCase()){case"left":tinyMCE.switchClass(editor_id+'_justifyleft','mceButtonSelected');breakOut=true;break;case"right":tinyMCE.switchClass(editor_id+'_justifyright','mceButtonSelected');breakOut=true;break;case"middle":case"center":tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonSelected');breakOut=true;break;case"justify":tinyMCE.switchClass(editor_id+'_justifyfull','mceButtonSelected');breakOut=true;break;}}while(!breakOut&&(alignNode=alignNode.parentNode)!=null);var div=tinyMCE.getParentElement(node,"div");if(div&&div.style.textAlign=="center")tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonSelected');if(!setup_content){var ar=new Array("Bold","_bold","Italic","_italic","Strikethrough","_strikethrough","superscript","_sup","subscript","_sub");for(var i=0;i<ar.length;i+=2){if(inst.queryCommandState(ar[i]))tinyMCE.switchClass(editor_id+ar[i+1],'mceButtonSelected');}if(inst.queryCommandState("Underline")&&(node.parentNode==null||node.parentNode.nodeName!="A"))tinyMCE.switchClass(editor_id+'_underline','mceButtonSelected');}do{switch(node.nodeName){case"UL":tinyMCE.switchClass(editor_id+'_bullist','mceButtonSelected');break;case"OL":tinyMCE.switchClass(editor_id+'_numlist','mceButtonSelected');break;case"HR":tinyMCE.switchClass(editor_id+'_hr','mceButtonSelected');break;case"IMG":if(getAttrib(node,'name').indexOf('mce_')!=0){tinyMCE.switchClass(editor_id+'_image','mceButtonSelected');}break;}}while((node=node.parentNode)!=null);},_setupCSSClasses:function(editor_id){var i,selectElm;if(!TinyMCE_AdvancedTheme._autoImportCSSClasses)return;selectElm=document.getElementById(editor_id+'_styleSelect');if(selectElm&&selectElm.getAttribute('cssImported')!='true'){var csses=tinyMCE.getCSSClasses(editor_id);if(csses&&selectElm){for(i=0;i<csses.length;i++)selectElm.options[selectElm.options.length]=new Option(csses[i],csses[i]);}if(csses!=null&&csses.length>0)selectElm.setAttribute('cssImported','true');}},_setCookie:function(name,value,expires,path,domain,secure){var curCookie=name+"="+escape(value)+((expires)?"; expires="+expires.toGMTString():"")+((path)?"; path="+escape(path):"")+((domain)?"; domain="+domain:"")+((secure)?"; secure":"");document.cookie=curCookie;},_getCookie:function(name){var dc=document.cookie;var prefix=name+"=";var begin=dc.indexOf("; "+prefix);if(begin==-1){begin=dc.indexOf(prefix);if(begin!=0)return null;}else begin+=2;var end=document.cookie.indexOf(";",begin);if(end==-1)end=dc.length;return unescape(dc.substring(begin+prefix.length,end));},_resizeTo:function(inst,w,h,set_w){var editorContainer=document.getElementById(inst.editorId+'_parent');var tableElm=editorContainer.firstChild;var iframe=inst.iframeElement;if(w==null||w=="null"){set_w=false;w=0;}if(h==null||h=="null")return;w=parseInt(w);h=parseInt(h);if(tinyMCE.isGecko){w+=2;h+=2;}var dx=w-tableElm.clientWidth;var dy=h-tableElm.clientHeight;w=w<1?30:w;h=h<1?30:h;if(set_w)tableElm.style.width=w+"px";tableElm.style.height=h+"px";iw=iframe.clientWidth+dx;ih=iframe.clientHeight+dy;iw=iw<1?30:iw;ih=ih<1?30:ih;if(tinyMCE.isGecko){iw-=2;ih-=2;}if(set_w)iframe.style.width=iw+"px";iframe.style.height=ih+"px";if(set_w){var tableBodyElm=tableElm.firstChild;var minIframeWidth=tableBodyElm.scrollWidth;if(inst.iframeElement.clientWidth<minIframeWidth){dx=minIframeWidth-inst.iframeElement.clientWidth;inst.iframeElement.style.width=(iw+dx)+"px";}}},_resizeEventHandler:function(e){var resizer=TinyMCE_AdvancedTheme._resizer;if(!resizer.resizing)return;e=typeof(e)=="undefined"?window.event:e;var dx=e.screenX-resizer.downX;var dy=e.screenY-resizer.downY;var resizeBox=resizer.resizeBox;var editorId=resizer.editorId;switch(e.type){case"mousemove":var w,h;w=resizer.width+dx;h=resizer.height+dy;w=w<1?1:w;h=h<1?1:h;if(resizer.horizontal)resizeBox.style.width=w+"px";resizeBox.style.height=h+"px";break;case"mouseup":TinyMCE_AdvancedTheme._setResizing(e,editorId,false);TinyMCE_AdvancedTheme._resizeTo(tinyMCE.getInstanceById(editorId),resizer.width+dx,resizer.height+dy,resizer.horizontal);if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var expires=new Date();expires.setTime(expires.getTime()+3600000*24*30);TinyMCE_AdvancedTheme._setCookie("TinyMCE_"+editorId+"_width",""+(resizer.horizontal?resizer.width+dx:""),expires);TinyMCE_AdvancedTheme._setCookie("TinyMCE_"+editorId+"_height",""+(resizer.height+dy),expires);}break;}},_setResizing:function(e,editor_id,state){e=typeof(e)=="undefined"?window.event:e;var resizer=TinyMCE_AdvancedTheme._resizer;var editorContainer=document.getElementById(editor_id+'_parent');var editorArea=document.getElementById(editor_id+'_parent').firstChild;var resizeBox=document.getElementById(editor_id+'_resize_box');var inst=tinyMCE.getInstanceById(editor_id);if(state){var width=editorArea.clientWidth;var height=editorArea.clientHeight;resizeBox.style.width=width+"px";resizeBox.style.height=height+"px";resizer.iframeWidth=inst.iframeElement.clientWidth;resizer.iframeHeight=inst.iframeElement.clientHeight;editorArea.style.display="none";resizeBox.style.display="block";if(!resizer.eventHandlers){if(tinyMCE.isMSIE)tinyMCE.addEvent(document,"mousemove",TinyMCE_AdvancedTheme._resizeEventHandler);else tinyMCE.addEvent(window,"mousemove",TinyMCE_AdvancedTheme._resizeEventHandler);tinyMCE.addEvent(document,"mouseup",TinyMCE_AdvancedTheme._resizeEventHandler);resizer.eventHandlers=true;}resizer.resizing=true;resizer.downX=e.screenX;resizer.downY=e.screenY;resizer.width=parseInt(resizeBox.style.width);resizer.height=parseInt(resizeBox.style.height);resizer.editorId=editor_id;resizer.resizeBox=resizeBox;resizer.horizontal=tinyMCE.getParam("theme_advanced_resize_horizontal",true);}else{resizer.resizing=false;resizeBox.style.display="none";editorArea.style.display=tinyMCE.isMSIE&&!tinyMCE.isOpera?"block":"table";tinyMCE.execCommand('mceResetDesignMode');}},_insertImage:function(src,alt,border,hspace,vspace,width,height,align,title,onmouseover,onmouseout){tinyMCE.execCommand('mceBeginUndoLevel');if(src=="")return;if(!tinyMCE.imgElement&&tinyMCE.isSafari){var html="";html+='<img src="'+src+'" alt="'+alt+'"';html+=' border="'+border+'" hspace="'+hspace+'"';html+=' vspace="'+vspace+'" width="'+width+'"';html+=' height="'+height+'" align="'+align+'" title="'+title+'" onmouseover="'+onmouseover+'" onmouseout="'+onmouseout+'" />';tinyMCE.execCommand("mceInsertContent",false,html);}else{if(!tinyMCE.imgElement&&tinyMCE.selectedInstance){if(tinyMCE.isSafari)tinyMCE.execCommand("mceInsertContent",false,'<img src="'+tinyMCE.uniqueURL+'" />');else tinyMCE.selectedInstance.contentDocument.execCommand("insertimage",false,tinyMCE.uniqueURL);tinyMCE.imgElement=tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"img","src",tinyMCE.uniqueURL);}}if(tinyMCE.imgElement){var needsRepaint=false;var msrc=src;src=eval(tinyMCE.settings['urlconverter_callback']+"(src, tinyMCE.imgElement);");if(tinyMCE.getParam('convert_urls'))msrc=src;if(onmouseover&&onmouseover!="")onmouseover="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseover, tinyMCE.imgElement);")+"';";if(onmouseout&&onmouseout!="")onmouseout="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseout, tinyMCE.imgElement);")+"';";if(typeof(title)=="undefined")title=alt;if(width!=tinyMCE.imgElement.getAttribute("width")||height!=tinyMCE.imgElement.getAttribute("height")||align!=tinyMCE.imgElement.getAttribute("align"))needsRepaint=true;tinyMCE.setAttrib(tinyMCE.imgElement,'src',src);tinyMCE.setAttrib(tinyMCE.imgElement,'mce_src',msrc);tinyMCE.setAttrib(tinyMCE.imgElement,'alt',alt);tinyMCE.setAttrib(tinyMCE.imgElement,'title',title);tinyMCE.setAttrib(tinyMCE.imgElement,'align',align);tinyMCE.setAttrib(tinyMCE.imgElement,'border',border,true);tinyMCE.setAttrib(tinyMCE.imgElement,'hspace',hspace,true);tinyMCE.setAttrib(tinyMCE.imgElement,'vspace',vspace,true);tinyMCE.setAttrib(tinyMCE.imgElement,'width',width,true);tinyMCE.setAttrib(tinyMCE.imgElement,'height',height,true);tinyMCE.setAttrib(tinyMCE.imgElement,'onmouseover',onmouseover);tinyMCE.setAttrib(tinyMCE.imgElement,'onmouseout',onmouseout);if(width&&width!="")tinyMCE.imgElement.style.pixelWidth=width;if(height&&height!="")tinyMCE.imgElement.style.pixelHeight=height;if(needsRepaint)tinyMCE.selectedInstance.repaint();}tinyMCE.execCommand('mceEndUndoLevel');},_insertLink:function(href,target,title,onclick,style_class){tinyMCE.execCommand('mceBeginUndoLevel');if(tinyMCE.selectedInstance&&tinyMCE.selectedElement&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){var doc=tinyMCE.selectedInstance.getDoc();var linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");var newLink=false;if(!linkElement){linkElement=doc.createElement("a");newLink=true;}var mhref=href;var thref=eval(tinyMCE.settings['urlconverter_callback']+"(href, linkElement);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(linkElement,'href',thref);tinyMCE.setAttrib(linkElement,'mce_href',mhref);tinyMCE.setAttrib(linkElement,'target',target);tinyMCE.setAttrib(linkElement,'title',title);tinyMCE.setAttrib(linkElement,'onclick',onclick);tinyMCE.setAttrib(linkElement,'class',style_class);if(newLink){linkElement.appendChild(tinyMCE.selectedElement.cloneNode(true));tinyMCE.selectedElement.parentNode.replaceChild(linkElement,tinyMCE.selectedElement);}return;}if(!tinyMCE.linkElement&&tinyMCE.selectedInstance){if(tinyMCE.isSafari){tinyMCE.execCommand("mceInsertContent",false,'<a href="'+tinyMCE.uniqueURL+'">'+tinyMCE.selectedInstance.selection.getSelectedHTML()+'</a>');}else tinyMCE.selectedInstance.contentDocument.execCommand("createlink",false,tinyMCE.uniqueURL);tinyMCE.linkElement=tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"a","href",tinyMCE.uniqueURL);var elementArray=tinyMCE.getElementsByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"a","href",tinyMCE.uniqueURL);for(var i=0;i<elementArray.length;i++){var mhref=href;var thref=eval(tinyMCE.settings['urlconverter_callback']+"(href, elementArray[i]);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(elementArray[i],'href',thref);tinyMCE.setAttrib(elementArray[i],'mce_href',mhref);tinyMCE.setAttrib(elementArray[i],'target',target);tinyMCE.setAttrib(elementArray[i],'title',title);tinyMCE.setAttrib(elementArray[i],'onclick',onclick);tinyMCE.setAttrib(elementArray[i],'class',style_class);}tinyMCE.linkElement=elementArray[0];}if(tinyMCE.linkElement){var mhref=href;href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(tinyMCE.linkElement,'href',href);tinyMCE.setAttrib(tinyMCE.linkElement,'mce_href',mhref);tinyMCE.setAttrib(tinyMCE.linkElement,'target',target);tinyMCE.setAttrib(tinyMCE.linkElement,'title',title);tinyMCE.setAttrib(tinyMCE.linkElement,'onclick',onclick);tinyMCE.setAttrib(tinyMCE.linkElement,'class',style_class);}tinyMCE.execCommand('mceEndUndoLevel');}};tinyMCE.addTheme("advanced",TinyMCE_AdvancedTheme);tinyMCE.addButtonMap(TinyMCE_AdvancedTheme._buttonMap);
\ No newline at end of file
+tinyMCE.importThemeLanguagePack('advanced');var TinyMCE_AdvancedTheme={_autoImportCSSClasses:true,_resizer:{},_buttons:[['bold','{$lang_bold_img}','lang_bold_desc','Bold'],['italic','{$lang_italic_img}','lang_italic_desc','Italic'],['underline','{$lang_underline_img}','lang_underline_desc','Underline'],['strikethrough','strikethrough.gif','lang_striketrough_desc','Strikethrough'],['justifyleft','justifyleft.gif','lang_justifyleft_desc','JustifyLeft'],['justifycenter','justifycenter.gif','lang_justifycenter_desc','JustifyCenter'],['justifyright','justifyright.gif','lang_justifyright_desc','JustifyRight'],['justifyfull','justifyfull.gif','lang_justifyfull_desc','JustifyFull'],['bullist','bullist.gif','lang_bullist_desc','InsertUnorderedList'],['numlist','numlist.gif','lang_numlist_desc','InsertOrderedList'],['outdent','outdent.gif','lang_outdent_desc','Outdent'],['indent','indent.gif','lang_indent_desc','Indent'],['cut','cut.gif','lang_cut_desc','Cut'],['copy','copy.gif','lang_copy_desc','Copy'],['paste','paste.gif','lang_paste_desc','Paste'],['undo','undo.gif','lang_undo_desc','Undo'],['redo','redo.gif','lang_redo_desc','Redo'],['link','link.gif','lang_link_desc','mceLink',true],['unlink','unlink.gif','lang_unlink_desc','unlink'],['image','image.gif','lang_image_desc','mceImage',true],['cleanup','cleanup.gif','lang_cleanup_desc','mceCleanup'],['help','help.gif','lang_help_desc','mceHelp'],['code','code.gif','lang_theme_code_desc','mceCodeEditor'],['hr','hr.gif','lang_theme_hr_desc','inserthorizontalrule'],['removeformat','removeformat.gif','lang_theme_removeformat_desc','removeformat'],['sub','sub.gif','lang_theme_sub_desc','subscript'],['sup','sup.gif','lang_theme_sup_desc','superscript'],['forecolor','forecolor.gif','lang_theme_forecolor_desc','mceForeColor',true],['backcolor','backcolor.gif','lang_theme_backcolor_desc','mceBackColor',true],['charmap','charmap.gif','lang_theme_charmap_desc','mceCharMap'],['visualaid','visualaid.gif','lang_theme_visualaid_desc','mceToggleVisualAid'],['anchor','anchor.gif','lang_theme_anchor_desc','mceInsertAnchor'],['newdocument','newdocument.gif','lang_newdocument_desc','mceNewDocument']],_buttonMap:'anchor,backcolor,bold,bullist,charmap,cleanup,code,copy,cut,forecolor,help,hr,image,indent,italic,justifycenter,justifyfull,justifyleft,justifyright,link,newdocument,numlist,outdent,paste,redo,removeformat,strikethrough,sub,sup,underline,undo,unlink,visualaid,advhr,ltr,rtl,emotions,flash,fullpage,fullscreen,iespell,insertdate,inserttime,pastetext,pasteword,selectall,preview,print,save,replace,search,table,cell_props,delete_col,delete_row,col_after,col_before,row_after,row_before,merge_cells,row_props,split_cells',getControlHTML:function(button_name){var i,x;for(i=0;i<TinyMCE_AdvancedTheme._buttons.length;i++){var but=TinyMCE_AdvancedTheme._buttons[i];if(but[0]==button_name)return tinyMCE.getButtonHTML(but[0],but[2],'{$themeurl}/images/'+but[1],but[3],(but.length>4?but[4]:false),(but.length>5?but[5]:null));}switch(button_name){case"formatselect":var html='<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';var formats=tinyMCE.getParam("theme_advanced_blockformats","p,address,pre,h1,h2,h3,h4,h5,h6",true).split(',');var lookup=[['p','{$lang_theme_paragraph}'],['address','{$lang_theme_address}'],['pre','{$lang_theme_pre}'],['h1','{$lang_theme_h1}'],['h2','{$lang_theme_h2}'],['h3','{$lang_theme_h3}'],['h4','{$lang_theme_h4}'],['h5','{$lang_theme_h5}'],['h6','{$lang_theme_h6}']];html+='<option value="">{$lang_theme_block}</option>';for(var i=0;i<formats.length;i++){for(var x=0;x<lookup.length;x++){if(formats[i]==lookup[x][0])html+='<option value="<'+lookup[x][0]+'>">'+lookup[x][1]+'</option>';}}html+='</select>';return html;case"styleselect":return'<select id="{$editor_id}_styleSelect" onmousedown="tinyMCE.themes.advanced._setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onfocus="tinyMCE.addSelectAccessibility(event,this,window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';case"fontselect":var fontHTML='<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList"><option value="">{$lang_theme_fontdefault}</option>';var iFonts='Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';var nFonts='Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sand;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats';var fonts=tinyMCE.getParam("theme_advanced_fonts",nFonts).split(';');for(i=0;i<fonts.length;i++){if(fonts[i]!=''){var parts=fonts[i].split('=');fontHTML+='<option value="'+parts[1]+'">'+parts[0]+'</option>';}}fontHTML+='</select>';return fontHTML;case"fontsizeselect":return'<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+						<option value="0">{$lang_theme_font_size}</option>\
+						<option value="1">1 (8 pt)</option>\
+						<option value="2">2 (10 pt)</option>\
+						<option value="3">3 (12 pt)</option>\
+						<option value="4">4 (14 pt)</option>\
+						<option value="5">5 (18 pt)</option>\
+						<option value="6">6 (24 pt)</option>\
+						<option value="7">7 (36 pt)</option>\
+						</select>';case"|":case"separator":return'<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';case"spacer":return'<img src="{$themeurl}/images/separator.gif" width="2" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';case"rowseparator":return'<br />';}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceLink":var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=inst.getSel().toString();if(!tinyMCE.linkElement){if((tinyMCE.selectedElement.nodeName.toLowerCase()!="img")&&(selectedText.length<=0))return true;}var href="",target="",title="",onclick="",action="insert",style_class="";if(tinyMCE.selectedElement.nodeName.toLowerCase()=="a")tinyMCE.linkElement=tinyMCE.selectedElement;if(tinyMCE.linkElement!=null&&tinyMCE.getAttrib(tinyMCE.linkElement,'href')=="")tinyMCE.linkElement=null;if(tinyMCE.linkElement){href=tinyMCE.getAttrib(tinyMCE.linkElement,'href');target=tinyMCE.getAttrib(tinyMCE.linkElement,'target');title=tinyMCE.getAttrib(tinyMCE.linkElement,'title');onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');style_class=tinyMCE.getAttrib(tinyMCE.linkElement,'class');if(onclick=="")onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');onclick=tinyMCE.cleanupEventStr(onclick);href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");mceRealHref=tinyMCE.getAttrib(tinyMCE.linkElement,'mce_href');if(mceRealHref!=""){href=mceRealHref;if(tinyMCE.getParam('convert_urls'))href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");}action="update";}var template=new Array();template['file']='link.htm';template['width']=310;template['height']=200;template['width']+=tinyMCE.getLang('lang_insert_link_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_link_delta_height',0);if(inst.settings['insertlink_callback']){var returnVal=eval(inst.settings['insertlink_callback']+"(href, target, title, onclick, action, style_class);");if(returnVal&&returnVal['href'])TinyMCE_AdvancedTheme._insertLink(returnVal['href'],returnVal['target'],returnVal['title'],returnVal['onclick'],returnVal['style_class']);}else{tinyMCE.openWindow(template,{href:href,target:target,title:title,onclick:onclick,action:action,className:style_class,inline:"yes"});}return true;case"mceImage":var src="",alt="",border="",hspace="",vspace="",width="",height="",align="";var title="",onmouseover="",onmouseout="",action="insert";var img=tinyMCE.imgElement;var inst=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedElement!=null&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){img=tinyMCE.selectedElement;tinyMCE.imgElement=img;}if(img){if(tinyMCE.getAttrib(img,'name').indexOf('mce_')==0)return true;src=tinyMCE.getAttrib(img,'src');alt=tinyMCE.getAttrib(img,'alt');if(alt=="")alt=tinyMCE.getAttrib(img,'title');if(tinyMCE.isGecko){var w=img.style.width;if(w!=null&&w!="")img.setAttribute("width",w);var h=img.style.height;if(h!=null&&h!="")img.setAttribute("height",h);}border=tinyMCE.getAttrib(img,'border');hspace=tinyMCE.getAttrib(img,'hspace');vspace=tinyMCE.getAttrib(img,'vspace');width=tinyMCE.getAttrib(img,'width');height=tinyMCE.getAttrib(img,'height');align=tinyMCE.getAttrib(img,'align');onmouseover=tinyMCE.getAttrib(img,'onmouseover');onmouseout=tinyMCE.getAttrib(img,'onmouseout');title=tinyMCE.getAttrib(img,'title');if(tinyMCE.isMSIE){width=img.attributes['width'].specified?width:"";height=img.attributes['height'].specified?height:"";}src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");mceRealSrc=tinyMCE.getAttrib(img,'mce_src');if(mceRealSrc!=""){src=mceRealSrc;if(tinyMCE.getParam('convert_urls'))src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");}action="update";}var template=new Array();template['file']='image.htm?src={$src}';template['width']=355;template['height']=265+(tinyMCE.isMSIE?25:0);template['width']+=tinyMCE.getLang('lang_insert_image_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_image_delta_height',0);if(inst.settings['insertimage_callback']){var returnVal=eval(inst.settings['insertimage_callback']+"(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");if(returnVal&&returnVal['src'])TinyMCE_AdvancedTheme._insertImage(returnVal['src'],returnVal['alt'],returnVal['border'],returnVal['hspace'],returnVal['vspace'],returnVal['width'],returnVal['height'],returnVal['align'],returnVal['title'],returnVal['onmouseover'],returnVal['onmouseout']);}else tinyMCE.openWindow(template,{src:src,alt:alt,border:border,hspace:hspace,vspace:vspace,width:width,height:height,align:align,title:title,onmouseover:onmouseover,onmouseout:onmouseout,action:action,inline:"yes"});return true;case"mceForeColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=tinyMCE.getAttrib(elm,"color");if(inputColor=='')inputColor=elm.style.color;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"forecolor",input_color:inputColor});return true;case"mceBackColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=elm.style.backgroundColor;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;template['width']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"HiliteColor",input_color:inputColor});return true;case"mceColorPicker":if(user_interface){var template=new Array();var inputColor=value['document'].getElementById(value['element_id']).value;template['file']='color_picker.htm';template['width']=220;template['height']=190;template['close_previous']="no";template['width']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_height',0);if(typeof(value['store_selection'])=="undefined")value['store_selection']=true;tinyMCE.lastColorPickerValue=value;tinyMCE.openWindow(template,{editor_id:editor_id,mce_store_selection:value['store_selection'],inline:"yes",command:"mceColorPicker",input_color:inputColor});}else{var savedVal=tinyMCE.lastColorPickerValue;var elm=savedVal['document'].getElementById(savedVal['element_id']);elm.value=value;if(elm.onchange!=null&&elm.onchange!='')eval('elm.onchange();');}return true;case"mceCodeEditor":var template=new Array();template['file']='source_editor.htm';template['width']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_width",720));template['height']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_height",580));tinyMCE.openWindow(template,{editor_id:editor_id,resizable:"yes",scrollbars:"no",inline:"yes"});return true;case"mceCharMap":var template=new Array();template['file']='charmap.htm';template['width']=550+(tinyMCE.isOpera?40:0);template['height']=250;template['width']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceInsertAnchor":var template=new Array();template['file']='anchor.htm';template['width']=320;template['height']=90+(tinyMCE.isNS7?30:0);template['width']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case"mceNewDocument":if(confirm(tinyMCE.getLang('lang_newdocument')))tinyMCE.execInstanceCommand(editor_id,'mceSetContent',false,' ');return true;}return false;},getEditorTemplate:function(settings,editorId){function removeFromArray(in_array,remove_array){var outArray=new Array();for(var i=0;i<in_array.length;i++){skip=false;for(var j=0;j<remove_array.length;j++){if(in_array[i]==remove_array[j]){skip=true;}}if(!skip){outArray[outArray.length]=in_array[i];}}return outArray;}function addToArray(in_array,add_array){for(var i=0;i<add_array.length;i++){in_array[in_array.length]=add_array[i];}return in_array;}var template=new Array();var deltaHeight=0;var resizing=tinyMCE.getParam("theme_advanced_resizing",false);var path=tinyMCE.getParam("theme_advanced_path",true);var statusbarHTML='<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: '+(path?"block":"none")+'">&nbsp;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: '+(resizing?"block":"none")+'" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';var layoutManager=tinyMCE.getParam("theme_advanced_layout_manager","SimpleLayout");var styleSelectHTML='<option value="">{$lang_theme_style_select}</option>';if(settings['theme_advanced_styles']){var stylesAr=settings['theme_advanced_styles'].split(';');for(var i=0;i<stylesAr.length;i++){var key,value;key=stylesAr[i].split('=')[0];value=stylesAr[i].split('=')[1];styleSelectHTML+='<option value="'+value+'">'+key+'</option>';}TinyMCE_AdvancedTheme._autoImportCSSClasses=false;}switch(layoutManager){case"SimpleLayout":var toolbarHTML="";var toolbarLocation=tinyMCE.getParam("theme_advanced_toolbar_location","bottom");var toolbarAlign=tinyMCE.getParam("theme_advanced_toolbar_align","center");var pathLocation=tinyMCE.getParam("theme_advanced_path_location","none");var statusbarLocation=tinyMCE.getParam("theme_advanced_statusbar_location",pathLocation);var defVals={theme_advanced_buttons1:"bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,separator,sub,sup,separator,charmap"};toolbarHTML+='<a href="#" accesskey="q" title="'+tinyMCE.getLang("lang_toolbar_focus")+'"';if(!tinyMCE.getParam("accessibility_focus"))toolbarHTML+=' onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"';toolbarHTML+='></a>';for(var i=1;i<100;i++){var def=defVals["theme_advanced_buttons"+i];var buttons=tinyMCE.getParam("theme_advanced_buttons"+i,def==null?'':def,true,',');if(buttons.length==0)break;buttons=removeFromArray(buttons,tinyMCE.getParam("theme_advanced_disable","",true,','));buttons=addToArray(buttons,tinyMCE.getParam("theme_advanced_buttons"+i+"_add","",true,','));buttons=addToArray(tinyMCE.getParam("theme_advanced_buttons"+i+"_add_before","",true,','),buttons);for(var b=0;b<buttons.length;b++)toolbarHTML+=tinyMCE.getControlHTML(buttons[b]);if(buttons.length>0){toolbarHTML+="<br />";deltaHeight-=23;}}toolbarHTML+='<a href="#" accesskey="z" onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"></a>';template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';if(toolbarLocation=="top"){template['html']+='<tr><td class="mceToolbarTop" align="'+toolbarAlign+'" height="1" nowrap="nowrap">'+toolbarHTML+'</td></tr>';}if(statusbarLocation=="top"){template['html']+='<tr><td class="mceStatusbarTop" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';if(toolbarLocation=="bottom"){template['html']+='<tr><td class="mceToolbarBottom" align="'+toolbarAlign+'" height="1">'+toolbarHTML+'</td></tr>';}if(toolbarLocation=="external"){var bod=document.body;var elm=document.createElement("div");toolbarHTML=tinyMCE.replaceVar(toolbarHTML,'style_select_options',styleSelectHTML);toolbarHTML=tinyMCE.applyTemplate(toolbarHTML,{editor_id:editorId});elm.className="mceToolbarExternal";elm.id=editorId+"_toolbar";elm.innerHTML='<table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table>';bod.appendChild(elm);deltaHeight=0;tinyMCE.getInstanceById(editorId).toolbarElement=elm;}else{tinyMCE.getInstanceById(editorId).toolbarElement=null;}if(statusbarLocation=="bottom"){template['html']+='<tr><td class="mceStatusbarBottom" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='</tbody></table>';break;case"RowLayout":template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';var containers=tinyMCE.getParam("theme_advanced_containers","",true,",");var defaultContainerCSS=tinyMCE.getParam("theme_advanced_containers_default_class","container");var defaultContainerAlign=tinyMCE.getParam("theme_advanced_containers_default_align","center");for(var i=0;i<containers.length;i++){if(containers[i]=="mceEditor"){template['html']+='<tr><td align="center" class="mceEditor_border">\
+													<span id="{$editor_id}"></span>\
+													</td></tr>';}else if(containers[i]=="mceElementpath"||containers[i]=="mceStatusbar"){var pathClass="mceStatusbar";if(i==containers.length-1){pathClass="mceStatusbarBottom";}else if(i==0){pathClass="mceStatusbar";}else{deltaHeight-=2;}template['html']+='<tr><td class="'+pathClass+'" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=22;}else{var curContainer=tinyMCE.getParam("theme_advanced_container_"+containers[i],"",true,',');var curContainerHTML="";var curAlign=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align",defaultContainerAlign);var curCSS=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class",defaultContainerCSS);for(var j=0;j<curContainer.length;j++){curContainerHTML+=tinyMCE.getControlHTML(curContainer[j]);}if(curContainer.length>0){curContainerHTML+="<br />";deltaHeight-=23;}template['html']+='<tr><td class="'+curCSS+'" align="'+curAlign+'" height="1">'+curContainerHTML+'</td></tr>';}}template['html']+='</tbody></table>';break;case"CustomLayout":var customLayout=tinyMCE.getParam("theme_advanced_custom_layout","");if(customLayout!=""&&eval("typeof("+customLayout+")")!="undefined"){template=eval(customLayout+"(template);");}break;}if(resizing)template['html']+='<span id="{$editor_id}_resize_box" class="mceResizeBox"></span>';template['html']=tinyMCE.replaceVar(template['html'],'style_select_options',styleSelectHTML);template['delta_width']=0;template['delta_height']=deltaHeight;return template;},initInstance:function(inst){if(tinyMCE.getParam("theme_advanced_resizing",false)){if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var w=TinyMCE_AdvancedTheme._getCookie("TinyMCE_"+inst.editorId+"_width");var h=TinyMCE_AdvancedTheme._getCookie("TinyMCE_"+inst.editorId+"_height");TinyMCE_AdvancedTheme._resizeTo(inst,w,h,tinyMCE.getParam("theme_advanced_resize_horizontal",true));}}inst.addShortcut('ctrl','k','lang_link_desc','mceLink');},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection,setup_content){function selectByValue(select_elm,value,first_index){first_index=typeof(first_index)=="undefined"?false:true;if(select_elm){for(var i=0;i<select_elm.options.length;i++){var ov=""+select_elm.options[i].value;if(first_index&&ov.toLowerCase().indexOf(value.toLowerCase())==0){select_elm.selectedIndex=i;return true;}if(ov==value){select_elm.selectedIndex=i;return true;}}}return false;};function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";};if(node==null)return;var pathElm=document.getElementById(editor_id+"_path");var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();if(pathElm){var parentNode=node;var path=new Array();while(parentNode!=null){if(parentNode.nodeName.toUpperCase()=="BODY"){break;}if(parentNode.nodeType==1&&tinyMCE.getAttrib(parentNode,"class").indexOf('mceItemHidden')==-1){path[path.length]=parentNode;}parentNode=parentNode.parentNode;}var html="";for(var i=path.length-1;i>=0;i--){var nodeName=path[i].nodeName.toLowerCase();var nodeData="";if(nodeName=="b"){nodeName="strong";}if(nodeName=="i"){nodeName="em";}if(nodeName=="span"){var cn=tinyMCE.getAttrib(path[i],"class");if(cn!=""&&cn.indexOf('mceItem')==-1)nodeData+="class: "+cn+" ";var st=tinyMCE.getAttrib(path[i],"style");if(st!=""){st=tinyMCE.serializeStyle(tinyMCE.parseStyle(st));nodeData+="style: "+st+" ";}}if(nodeName=="font"){if(tinyMCE.getParam("convert_fonts_to_spans"))nodeName="span";var face=tinyMCE.getAttrib(path[i],"face");if(face!="")nodeData+="font: "+face+" ";var size=tinyMCE.getAttrib(path[i],"size");if(size!="")nodeData+="size: "+size+" ";var color=tinyMCE.getAttrib(path[i],"color");if(color!="")nodeData+="color: "+color+" ";}if(getAttrib(path[i],'id')!=""){nodeData+="id: "+path[i].getAttribute('id')+" ";}var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1)nodeData+="class: "+className+" ";if(getAttrib(path[i],'src')!=""){var src=tinyMCE.getAttrib(path[i],"mce_src");if(src=="")src=tinyMCE.getAttrib(path[i],"src");nodeData+="src: "+src+" ";}if(getAttrib(path[i],'href')!=""){var href=tinyMCE.getAttrib(path[i],"mce_href");if(href=="")href=tinyMCE.getAttrib(path[i],"href");nodeData+="href: "+href+" ";}if(nodeName=="img"&&tinyMCE.getAttrib(path[i],"class").indexOf('mceItemFlash')!=-1){nodeName="flash";nodeData="src: "+path[i].getAttribute('title');}if(nodeName=="a"&&(anchor=tinyMCE.getAttrib(path[i],"name"))!=""){nodeName="a";nodeName+="#"+anchor;nodeData="";}if(getAttrib(path[i],'name').indexOf("mce_")!=0){var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1){nodeName+="."+className;}}var cmd='tinyMCE.execInstanceCommand(\''+editor_id+'\',\'mceSelectNodeDepth\',false,\''+i+'\');';html+='<a title="'+nodeData+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" target="_self" class="mcePathItem">'+nodeName+'</a>';if(i>0){html+=" &raquo; ";}}pathElm.innerHTML='<a href="#" accesskey="x"></a>'+tinyMCE.getLang('lang_theme_path')+": "+html+'&nbsp;';}tinyMCE.switchClass(editor_id+'_justifyleft','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifyright','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonNormal');tinyMCE.switchClass(editor_id+'_justifyfull','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClass(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClass(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_numlist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_sub','mceButtonNormal');tinyMCE.switchClass(editor_id+'_sup','mceButtonNormal');tinyMCE.switchClass(editor_id+'_anchor','mceButtonNormal');tinyMCE.switchClass(editor_id+'_link','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_unlink','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_outdent','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_image','mceButtonNormal');tinyMCE.switchClass(editor_id+'_hr','mceButtonNormal');if(node.nodeName=="A"&&tinyMCE.getAttrib(node,"class").indexOf('mceItemAnchor')!=-1)tinyMCE.switchClass(editor_id+'_anchor','mceButtonSelected');var anchorLink=tinyMCE.getParentElement(node,"a","href");if(anchorLink||any_selection){tinyMCE.switchClass(editor_id+'_link',anchorLink?'mceButtonSelected':'mceButtonNormal');tinyMCE.switchClass(editor_id+'_unlink',anchorLink?'mceButtonSelected':'mceButtonNormal');}tinyMCE.switchClass(editor_id+'_visualaid',visual_aid?'mceButtonSelected':'mceButtonNormal');if(undo_levels!=-1){tinyMCE.switchClass(editor_id+'_undo','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_redo','mceButtonDisabled');}if(tinyMCE.getParentElement(node,"li,blockquote"))tinyMCE.switchClass(editor_id+'_outdent','mceButtonNormal');if(undo_index!=-1&&(undo_index<undo_levels-1&&undo_levels>0))tinyMCE.switchClass(editor_id+'_redo','mceButtonNormal');if(undo_index!=-1&&(undo_index>0&&undo_levels>0))tinyMCE.switchClass(editor_id+'_undo','mceButtonNormal');var selectElm=document.getElementById(editor_id+"_styleSelect");if(selectElm){TinyMCE_AdvancedTheme._setupCSSClasses(editor_id);classNode=node;breakOut=false;var index=0;do{if(classNode&&classNode.className){for(var i=0;i<selectElm.options.length;i++){if(selectElm.options[i].value==classNode.className){index=i;breakOut=true;break;}}}}while(!breakOut&&classNode!=null&&(classNode=classNode.parentNode)!=null);selectElm.selectedIndex=index;}var selectElm=document.getElementById(editor_id+"_formatSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"p,div,h1,h2,h3,h4,h5,h6,pre,address");if(elm)selectByValue(selectElm,"<"+elm.nodeName.toLowerCase()+">");else selectByValue(selectElm,"");}var selectElm=document.getElementById(editor_id+"_fontNameSelect");if(selectElm){if(!tinyMCE.isSafari&&!(tinyMCE.isMSIE&&!tinyMCE.isOpera)){var face=inst.queryCommandValue('FontName');face=face==null||face==""?"":face;selectByValue(selectElm,face,face!="");}else{var elm=tinyMCE.getParentElement(node,"font","face");if(elm){var family=tinyMCE.getAttrib(elm,"face");if(family=='')family=''+elm.style.fontFamily;if(!selectByValue(selectElm,family,family!=""))selectByValue(selectElm,"");}else selectByValue(selectElm,"");}}var selectElm=document.getElementById(editor_id+"_fontSizeSelect");if(selectElm){if(!tinyMCE.isSafari&&!tinyMCE.isOpera){var size=inst.queryCommandValue('FontSize');selectByValue(selectElm,size==null||size==""?"0":size);}else{var elm=tinyMCE.getParentElement(node,"font","size");if(elm){var size=tinyMCE.getAttrib(elm,"size");if(size==''){var sizes=new Array('','8px','10px','12px','14px','18px','24px','36px');size=''+elm.style.fontSize;for(var i=0;i<sizes.length;i++){if((''+sizes[i])==size){size=i;break;}}}if(!selectByValue(selectElm,size))selectByValue(selectElm,"");}else selectByValue(selectElm,"0");}}alignNode=node;breakOut=false;do{if(!alignNode.getAttribute||!alignNode.getAttribute('align'))continue;switch(alignNode.getAttribute('align').toLowerCase()){case"left":tinyMCE.switchClass(editor_id+'_justifyleft','mceButtonSelected');breakOut=true;break;case"right":tinyMCE.switchClass(editor_id+'_justifyright','mceButtonSelected');breakOut=true;break;case"middle":case"center":tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonSelected');breakOut=true;break;case"justify":tinyMCE.switchClass(editor_id+'_justifyfull','mceButtonSelected');breakOut=true;break;}}while(!breakOut&&(alignNode=alignNode.parentNode)!=null);var div=tinyMCE.getParentElement(node,"div");if(div&&div.style.textAlign=="center")tinyMCE.switchClass(editor_id+'_justifycenter','mceButtonSelected');if(!setup_content){var ar=new Array("Bold","_bold","Italic","_italic","Strikethrough","_strikethrough","superscript","_sup","subscript","_sub");for(var i=0;i<ar.length;i+=2){if(inst.queryCommandState(ar[i]))tinyMCE.switchClass(editor_id+ar[i+1],'mceButtonSelected');}if(inst.queryCommandState("Underline")&&(node.parentNode==null||node.parentNode.nodeName!="A"))tinyMCE.switchClass(editor_id+'_underline','mceButtonSelected');}do{switch(node.nodeName){case"UL":tinyMCE.switchClass(editor_id+'_bullist','mceButtonSelected');break;case"OL":tinyMCE.switchClass(editor_id+'_numlist','mceButtonSelected');break;case"HR":tinyMCE.switchClass(editor_id+'_hr','mceButtonSelected');break;case"IMG":if(getAttrib(node,'name').indexOf('mce_')!=0){tinyMCE.switchClass(editor_id+'_image','mceButtonSelected');}break;}}while((node=node.parentNode)!=null);},_setupCSSClasses:function(editor_id){var i,selectElm;if(!TinyMCE_AdvancedTheme._autoImportCSSClasses)return;selectElm=document.getElementById(editor_id+'_styleSelect');if(selectElm&&selectElm.getAttribute('cssImported')!='true'){var csses=tinyMCE.getCSSClasses(editor_id);if(csses&&selectElm){for(i=0;i<csses.length;i++)selectElm.options[selectElm.options.length]=new Option(csses[i],csses[i]);}if(csses!=null&&csses.length>0)selectElm.setAttribute('cssImported','true');}},_setCookie:function(name,value,expires,path,domain,secure){var curCookie=name+"="+escape(value)+((expires)?"; expires="+expires.toGMTString():"")+((path)?"; path="+escape(path):"")+((domain)?"; domain="+domain:"")+((secure)?"; secure":"");document.cookie=curCookie;},_getCookie:function(name){var dc=document.cookie;var prefix=name+"=";var begin=dc.indexOf("; "+prefix);if(begin==-1){begin=dc.indexOf(prefix);if(begin!=0)return null;}else begin+=2;var end=document.cookie.indexOf(";",begin);if(end==-1)end=dc.length;return unescape(dc.substring(begin+prefix.length,end));},_resizeTo:function(inst,w,h,set_w){var editorContainer=document.getElementById(inst.editorId+'_parent');var tableElm=editorContainer.firstChild;var iframe=inst.iframeElement;if(w==null||w=="null"){set_w=false;w=0;}if(h==null||h=="null")return;w=parseInt(w);h=parseInt(h);if(tinyMCE.isGecko){w+=2;h+=2;}var dx=w-tableElm.clientWidth;var dy=h-tableElm.clientHeight;w=w<1?30:w;h=h<1?30:h;if(set_w)tableElm.style.width=w+"px";tableElm.style.height=h+"px";iw=iframe.clientWidth+dx;ih=iframe.clientHeight+dy;iw=iw<1?30:iw;ih=ih<1?30:ih;if(tinyMCE.isGecko){iw-=2;ih-=2;}if(set_w)iframe.style.width=iw+"px";iframe.style.height=ih+"px";if(set_w){var tableBodyElm=tableElm.firstChild;var minIframeWidth=tableBodyElm.scrollWidth;if(inst.iframeElement.clientWidth<minIframeWidth){dx=minIframeWidth-inst.iframeElement.clientWidth;inst.iframeElement.style.width=(iw+dx)+"px";}}},_resizeEventHandler:function(e){var resizer=TinyMCE_AdvancedTheme._resizer;if(!resizer.resizing)return;e=typeof(e)=="undefined"?window.event:e;var dx=e.screenX-resizer.downX;var dy=e.screenY-resizer.downY;var resizeBox=resizer.resizeBox;var editorId=resizer.editorId;switch(e.type){case"mousemove":var w,h;w=resizer.width+dx;h=resizer.height+dy;w=w<1?1:w;h=h<1?1:h;if(resizer.horizontal)resizeBox.style.width=w+"px";resizeBox.style.height=h+"px";break;case"mouseup":TinyMCE_AdvancedTheme._setResizing(e,editorId,false);TinyMCE_AdvancedTheme._resizeTo(tinyMCE.getInstanceById(editorId),resizer.width+dx,resizer.height+dy,resizer.horizontal);if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var expires=new Date();expires.setTime(expires.getTime()+3600000*24*30);TinyMCE_AdvancedTheme._setCookie("TinyMCE_"+editorId+"_width",""+(resizer.horizontal?resizer.width+dx:""),expires);TinyMCE_AdvancedTheme._setCookie("TinyMCE_"+editorId+"_height",""+(resizer.height+dy),expires);}break;}},_setResizing:function(e,editor_id,state){e=typeof(e)=="undefined"?window.event:e;var resizer=TinyMCE_AdvancedTheme._resizer;var editorContainer=document.getElementById(editor_id+'_parent');var editorArea=document.getElementById(editor_id+'_parent').firstChild;var resizeBox=document.getElementById(editor_id+'_resize_box');var inst=tinyMCE.getInstanceById(editor_id);if(state){var width=editorArea.clientWidth;var height=editorArea.clientHeight;resizeBox.style.width=width+"px";resizeBox.style.height=height+"px";resizer.iframeWidth=inst.iframeElement.clientWidth;resizer.iframeHeight=inst.iframeElement.clientHeight;editorArea.style.display="none";resizeBox.style.display="block";if(!resizer.eventHandlers){if(tinyMCE.isMSIE)tinyMCE.addEvent(document,"mousemove",TinyMCE_AdvancedTheme._resizeEventHandler);else tinyMCE.addEvent(window,"mousemove",TinyMCE_AdvancedTheme._resizeEventHandler);tinyMCE.addEvent(document,"mouseup",TinyMCE_AdvancedTheme._resizeEventHandler);resizer.eventHandlers=true;}resizer.resizing=true;resizer.downX=e.screenX;resizer.downY=e.screenY;resizer.width=parseInt(resizeBox.style.width);resizer.height=parseInt(resizeBox.style.height);resizer.editorId=editor_id;resizer.resizeBox=resizeBox;resizer.horizontal=tinyMCE.getParam("theme_advanced_resize_horizontal",true);}else{resizer.resizing=false;resizeBox.style.display="none";editorArea.style.display=tinyMCE.isMSIE&&!tinyMCE.isOpera?"block":"table";tinyMCE.execCommand('mceResetDesignMode');}},_insertImage:function(src,alt,border,hspace,vspace,width,height,align,title,onmouseover,onmouseout){tinyMCE.execCommand('mceBeginUndoLevel');if(src=="")return;if(!tinyMCE.imgElement&&tinyMCE.isSafari){var html="";html+='<img src="'+src+'" alt="'+alt+'"';html+=' border="'+border+'" hspace="'+hspace+'"';html+=' vspace="'+vspace+'" width="'+width+'"';html+=' height="'+height+'" align="'+align+'" title="'+title+'" onmouseover="'+onmouseover+'" onmouseout="'+onmouseout+'" />';tinyMCE.execCommand("mceInsertContent",false,html);}else{if(!tinyMCE.imgElement&&tinyMCE.selectedInstance){if(tinyMCE.isSafari)tinyMCE.execCommand("mceInsertContent",false,'<img src="'+tinyMCE.uniqueURL+'" />');else tinyMCE.selectedInstance.contentDocument.execCommand("insertimage",false,tinyMCE.uniqueURL);tinyMCE.imgElement=tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"img","src",tinyMCE.uniqueURL);}}if(tinyMCE.imgElement){var needsRepaint=false;var msrc=src;src=eval(tinyMCE.settings['urlconverter_callback']+"(src, tinyMCE.imgElement);");if(tinyMCE.getParam('convert_urls'))msrc=src;if(onmouseover&&onmouseover!="")onmouseover="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseover, tinyMCE.imgElement);")+"';";if(onmouseout&&onmouseout!="")onmouseout="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseout, tinyMCE.imgElement);")+"';";if(typeof(title)=="undefined")title=alt;if(width!=tinyMCE.imgElement.getAttribute("width")||height!=tinyMCE.imgElement.getAttribute("height")||align!=tinyMCE.imgElement.getAttribute("align"))needsRepaint=true;tinyMCE.setAttrib(tinyMCE.imgElement,'src',src);tinyMCE.setAttrib(tinyMCE.imgElement,'mce_src',msrc);tinyMCE.setAttrib(tinyMCE.imgElement,'alt',alt);tinyMCE.setAttrib(tinyMCE.imgElement,'title',title);tinyMCE.setAttrib(tinyMCE.imgElement,'align',align);tinyMCE.setAttrib(tinyMCE.imgElement,'border',border,true);tinyMCE.setAttrib(tinyMCE.imgElement,'hspace',hspace,true);tinyMCE.setAttrib(tinyMCE.imgElement,'vspace',vspace,true);tinyMCE.setAttrib(tinyMCE.imgElement,'width',width,true);tinyMCE.setAttrib(tinyMCE.imgElement,'height',height,true);tinyMCE.setAttrib(tinyMCE.imgElement,'onmouseover',onmouseover);tinyMCE.setAttrib(tinyMCE.imgElement,'onmouseout',onmouseout);if(width&&width!="")tinyMCE.imgElement.style.pixelWidth=width;if(height&&height!="")tinyMCE.imgElement.style.pixelHeight=height;if(needsRepaint)tinyMCE.selectedInstance.repaint();}tinyMCE.execCommand('mceEndUndoLevel');},_insertLink:function(href,target,title,onclick,style_class){tinyMCE.execCommand('mceBeginUndoLevel');if(tinyMCE.selectedInstance&&tinyMCE.selectedElement&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){var doc=tinyMCE.selectedInstance.getDoc();var linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");var newLink=false;if(!linkElement){linkElement=doc.createElement("a");newLink=true;}var mhref=href;var thref=eval(tinyMCE.settings['urlconverter_callback']+"(href, linkElement);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(linkElement,'href',thref);tinyMCE.setAttrib(linkElement,'mce_href',mhref);tinyMCE.setAttrib(linkElement,'target',target);tinyMCE.setAttrib(linkElement,'title',title);tinyMCE.setAttrib(linkElement,'onclick',onclick);tinyMCE.setAttrib(linkElement,'class',style_class);if(newLink){linkElement.appendChild(tinyMCE.selectedElement.cloneNode(true));tinyMCE.selectedElement.parentNode.replaceChild(linkElement,tinyMCE.selectedElement);}return;}if(!tinyMCE.linkElement&&tinyMCE.selectedInstance){if(tinyMCE.isSafari){tinyMCE.execCommand("mceInsertContent",false,'<a href="'+tinyMCE.uniqueURL+'">'+tinyMCE.selectedInstance.selection.getSelectedHTML()+'</a>');}else tinyMCE.selectedInstance.contentDocument.execCommand("createlink",false,tinyMCE.uniqueURL);tinyMCE.linkElement=tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"a","href",tinyMCE.uniqueURL);var elementArray=tinyMCE.getElementsByAttributeValue(tinyMCE.selectedInstance.contentDocument.body,"a","href",tinyMCE.uniqueURL);for(var i=0;i<elementArray.length;i++){var mhref=href;var thref=eval(tinyMCE.settings['urlconverter_callback']+"(href, elementArray[i]);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(elementArray[i],'href',thref);tinyMCE.setAttrib(elementArray[i],'mce_href',mhref);tinyMCE.setAttrib(elementArray[i],'target',target);tinyMCE.setAttrib(elementArray[i],'title',title);tinyMCE.setAttrib(elementArray[i],'onclick',onclick);tinyMCE.setAttrib(elementArray[i],'class',style_class);}tinyMCE.linkElement=elementArray[0];}if(tinyMCE.linkElement){var mhref=href;href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement);");mhref=tinyMCE.getParam('convert_urls')?href:mhref;tinyMCE.setAttrib(tinyMCE.linkElement,'href',href);tinyMCE.setAttrib(tinyMCE.linkElement,'mce_href',mhref);tinyMCE.setAttrib(tinyMCE.linkElement,'target',target);tinyMCE.setAttrib(tinyMCE.linkElement,'title',title);tinyMCE.setAttrib(tinyMCE.linkElement,'onclick',onclick);tinyMCE.setAttrib(tinyMCE.linkElement,'class',style_class);}tinyMCE.execCommand('mceEndUndoLevel');}};tinyMCE.addTheme("advanced",TinyMCE_AdvancedTheme);tinyMCE.addButtonMap(TinyMCE_AdvancedTheme._buttonMap);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 /**
  * $RCSfile: editor_template_src.js,v $
- * $Revision: 1.96 $
- * $Date: 2006/04/18 13:32:52 $
+ * $Revision: 1.93 $
+ * $Date: 2006/03/14 17:33:50 $
  *
  * @author Moxiecode
  * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
@@ -81,13 +81,7 @@
 					['h3', '{$lang_theme_h3}'],
 					['h4', '{$lang_theme_h4}'],
 					['h5', '{$lang_theme_h5}'],
-					['h6', '{$lang_theme_h6}'],
-					['div', '{$lang_theme_div}'],
-					['blockquote', '{$lang_theme_blockquote}'],
-					['code', '{$lang_theme_code}'],
-					['dt', '{$lang_theme_dt}'],
-					['dd', '{$lang_theme_dd}'],
-					['samp', '{$lang_theme_samp}']
+					['h6', '{$lang_theme_h6}']
 				];
 
 				html += '<option value="">{$lang_theme_block}</option>';
@@ -96,7 +90,7 @@
 				for (var i=0; i<formats.length; i++) {
 					for (var x=0; x<lookup.length; x++) {
 						if (formats[i] == lookup[x][0])
-							html += '<option value="&lt;' + lookup[x][0] + '&gt;">' + lookup[x][1] + '</option>';
+							html += '<option value="<' + lookup[x][0] + '>">' + lookup[x][1] + '</option>';
 					}
 				}
 
@@ -123,16 +117,16 @@
 				return fontHTML;
 
 			case "fontsizeselect":
-				return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+
-						'<option value="0">{$lang_theme_font_size}</option>'+
-						'<option value="1">1 (8 pt)</option>'+
-						'<option value="2">2 (10 pt)</option>'+
-						'<option value="3">3 (12 pt)</option>'+
-						'<option value="4">4 (14 pt)</option>'+
-						'<option value="5">5 (18 pt)</option>'+
-						'<option value="6">6 (24 pt)</option>'+
-						'<option value="7">7 (36 pt)</option>'+
-						'</select>';
+				return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+						<option value="0">{$lang_theme_font_size}</option>\
+						<option value="1">1 (8 pt)</option>\
+						<option value="2">2 (10 pt)</option>\
+						<option value="3">3 (12 pt)</option>\
+						<option value="4">4 (14 pt)</option>\
+						<option value="5">5 (18 pt)</option>\
+						<option value="6">6 (24 pt)</option>\
+						<option value="7">7 (36 pt)</option>\
+						</select>';
 
 			case "|":
 			case "separator":
@@ -464,7 +458,7 @@
 		var deltaHeight = 0;
 		var resizing = tinyMCE.getParam("theme_advanced_resizing", false);
 		var path = tinyMCE.getParam("theme_advanced_path", true);
-		var statusbarHTML = '<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: ' + (path ? "block" : "none") + '">&#160;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: ' + (resizing ? "block" : "none") + '" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';
+		var statusbarHTML = '<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: ' + (path ? "block" : "none") + '">&nbsp;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: ' + (resizing ? "block" : "none") + '" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';
 		var layoutManager = tinyMCE.getParam("theme_advanced_layout_manager", "SimpleLayout");
 
 		// Setup style select options -- MOVED UP FOR EXTERNAL TOOLBAR COMPATABILITY!
@@ -589,7 +583,11 @@
 				for (var i = 0; i < containers.length; i++)
 				{
 					if (containers[i] == "mceEditor") //Exceptions for mceEditor and ...
-						template['html'] += '<tr><td align="center" class="mceEditor_border"><span id="{$editor_id}"></span></td></tr>';
+					{
+						template['html'] += '<tr><td align="center" class="mceEditor_border">\
+													<span id="{$editor_id}"></span>\
+													</td></tr>';
+					}
 					else if (containers[i] == "mceElementpath" || containers[i] == "mceStatusbar") // ... mceElementpath:
 					{
 						var pathClass = "mceStatusbar";
@@ -816,7 +814,7 @@
 				}
 			}
 
-			pathElm.innerHTML = '<a href="#" accesskey="x"></a>' + tinyMCE.getLang('lang_theme_path') + ": " + html + '&#160;';
+			pathElm.innerHTML = '<a href="#" accesskey="x"></a>' + tinyMCE.getLang('lang_theme_path') + ": " + html + '&nbsp;';
 		}
 
 		// Reset old states
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/jscripts/source_editor.js	2006-04-30 15:27:06.000000000 -0500
@@ -17,11 +17,6 @@
 
 	document.forms[0].htmlSource.value = fixContent(tinyMCE.getContent(tinyMCE.getWindowArg('editor_id')));
 	resizeInputs();
-
-	if (tinyMCE.getParam("theme_advanced_source_editor_wrap", true)) {
-		setWrap('soft');
-		document.forms[0].wraped.checked = true;
-	}
 }
 
 function setWrap(val) {
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js	2006-04-30 15:27:06.000000000 -0500
@@ -38,11 +38,6 @@
 theme_h4 : 'Heading 4',
 theme_h5 : 'Heading 5',
 theme_h6 : 'Heading 6',
-theme_blockquote : 'Blockquote',
-theme_code : 'Code',
-theme_samp : 'Code sample',
-theme_dt : 'Definition term ',
-theme_dd : 'Definition description',
 theme_colorpicker_title : 'Select a color',
 theme_colorpicker_apply : 'Apply',
 theme_forecolor_desc : 'Select text color',
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/css/editor_ui.css 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/css/editor_ui.css
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/css/editor_ui.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/css/editor_ui.css	2006-04-30 15:27:06.000000000 -0500
@@ -44,10 +44,6 @@
 	padding-bottom: 1px;
 }
 
-.mceEditorIframe {
-	border: 0;
-}
-
 /* Button CSS rules */
 
 a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,4 +1,4 @@
-var TinyMCE_SimpleTheme={_buttonMap:'bold,bullist,cleanup,italic,numlist,redo,strikethrough,underline,undo',getEditorTemplate:function(){var html='';html+='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}">';html+='<tr><td align="center">';html+='<span id="{$editor_id}">IFRAME</span>';html+='</td></tr>';html+='<tr><td class="mceToolbar" align="center" height="1">';html+=tinyMCE.getButtonHTML('bold','lang_bold_desc','{$themeurl}/images/{$lang_bold_img}','Bold');html+=tinyMCE.getButtonHTML('italic','lang_italic_desc','{$themeurl}/images/{$lang_italic_img}','Italic');html+=tinyMCE.getButtonHTML('underline','lang_underline_desc','{$themeurl}/images/{$lang_underline_img}','Underline');html+=tinyMCE.getButtonHTML('strikethrough','lang_striketrough_desc','{$themeurl}/images/strikethrough.gif','Strikethrough');html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';html+=tinyMCE.getButtonHTML('undo','lang_undo_desc','{$themeurl}/images/undo.gif','Undo');html+=tinyMCE.getButtonHTML('redo','lang_redo_desc','{$themeurl}/images/redo.gif','Redo');html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';html+=tinyMCE.getButtonHTML('cleanup','lang_cleanup_desc','{$themeurl}/images/cleanup.gif','mceCleanup')
-html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';html+=tinyMCE.getButtonHTML('bullist','lang_bullist_desc','{$themeurl}/images/bullist.gif','InsertUnorderedList')
+var TinyMCE_SimpleTheme={_buttonMap:'bold,bullist,cleanup,italic,numlist,redo,strikethrough,underline,undo',getEditorTemplate:function(){var html='';html+='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}">';html+='<tr><td align="center">';html+='<span id="{$editor_id}">IFRAME</span>';html+='</td></tr>';html+='<tr><td class="mceToolbar" align="center" height="1">';html+=tinyMCE.getButtonHTML('bold','lang_bold_desc','{$themeurl}/images/{$lang_bold_img}','Bold');html+=tinyMCE.getButtonHTML('italic','lang_italic_desc','{$themeurl}/images/{$lang_italic_img}','Italic');html+=tinyMCE.getButtonHTML('underline','lang_underline_desc','{$themeurl}/images/{$lang_underline_img}','Underline');html+=tinyMCE.getButtonHTML('strikethrough','lang_striketrough_desc','{$themeurl}/images/strikethrough.gif','Strikethrough');html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine">';html+=tinyMCE.getButtonHTML('undo','lang_undo_desc','{$themeurl}/images/undo.gif','Undo');html+=tinyMCE.getButtonHTML('redo','lang_redo_desc','{$themeurl}/images/redo.gif','Redo');html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine">';html+=tinyMCE.getButtonHTML('cleanup','lang_cleanup_desc','{$themeurl}/images/cleanup.gif','mceCleanup')
+html+='<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine">';html+=tinyMCE.getButtonHTML('bullist','lang_bullist_desc','{$themeurl}/images/bullist.gif','InsertUnorderedList')
 html+=tinyMCE.getButtonHTML('numlist','lang_numlist_desc','{$themeurl}/images/numlist.gif','InsertOrderedList')
 html+='</td></tr></table>';return{delta_width:0,delta_height:20,html:html};},handleNodeChange:function(editor_id,node){tinyMCE.switchClass(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClass(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClass(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClass(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClass(editor_id+'_numlist','mceButtonNormal');do{switch(node.nodeName.toLowerCase()){case"b":case"strong":tinyMCE.switchClass(editor_id+'_bold','mceButtonSelected');break;case"i":case"em":tinyMCE.switchClass(editor_id+'_italic','mceButtonSelected');break;case"u":tinyMCE.switchClass(editor_id+'_underline','mceButtonSelected');break;case"strike":tinyMCE.switchClass(editor_id+'_strikethrough','mceButtonSelected');break;case"ul":tinyMCE.switchClass(editor_id+'_bullist','mceButtonSelected');break;case"ol":tinyMCE.switchClass(editor_id+'_numlist','mceButtonSelected');break;}}while((node=node.parentNode)!=null);}};tinyMCE.addTheme("simple",TinyMCE_SimpleTheme);tinyMCE.addButtonMap(TinyMCE_SimpleTheme._buttonMap);
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 /**
  * $RCSfile: editor_template_src.js,v $
- * $Revision: 1.9 $
- * $Date: 2006/04/18 13:32:53 $
+ * $Revision: 1.8 $
+ * $Date: 2006/02/11 18:53:53 $
  *
  * @author Moxiecode
  * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
@@ -23,12 +23,12 @@
 		html += tinyMCE.getButtonHTML('italic', 'lang_italic_desc', '{$themeurl}/images/{$lang_italic_img}', 'Italic');
 		html += tinyMCE.getButtonHTML('underline', 'lang_underline_desc', '{$themeurl}/images/{$lang_underline_img}', 'Underline');
 		html += tinyMCE.getButtonHTML('strikethrough', 'lang_striketrough_desc', '{$themeurl}/images/strikethrough.gif', 'Strikethrough');
-		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine">';
 		html += tinyMCE.getButtonHTML('undo', 'lang_undo_desc', '{$themeurl}/images/undo.gif', 'Undo');
 		html += tinyMCE.getButtonHTML('redo', 'lang_redo_desc', '{$themeurl}/images/redo.gif', 'Redo');
-		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine">';
 		html += tinyMCE.getButtonHTML('cleanup', 'lang_cleanup_desc', '{$themeurl}/images/cleanup.gif', 'mceCleanup')
-		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+		html += '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine">';
 		html += tinyMCE.getButtonHTML('bullist', 'lang_bullist_desc', '{$themeurl}/images/bullist.gif', 'InsertUnorderedList')
 		html += tinyMCE.getButtonHTML('numlist', 'lang_numlist_desc', '{$themeurl}/images/numlist.gif', 'InsertOrderedList')
 		html += '</td></tr></table>';
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce.js	2006-04-30 15:27:06.000000000 -0500
@@ -1 +1 @@
-function TinyMCE_Engine(){this.majorVersion="2";this.minorVersion="0.6.1";this.releaseDate="2006-05-04";this.instances=new Array();this.switchClassCache=new Array();this.windowArgs=new Array();this.loadedFiles=new Array();this.pendingFiles=new Array();this.loadingIndex=0;this.configs=new Array();this.currentConfig=0;this.eventHandlers=new Array();var ua=navigator.userAgent;this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.isMSIE5=this.isMSIE&&(ua.indexOf('MSIE 5')!=-1);this.isMSIE5_0=this.isMSIE&&(ua.indexOf('MSIE 5.0')!=-1);this.isGecko=ua.indexOf('Gecko')!=-1;this.isSafari=ua.indexOf('Safari')!=-1;this.isOpera=ua.indexOf('Opera')!=-1;this.isMac=ua.indexOf('Mac')!=-1;this.isNS7=ua.indexOf('Netscape/7')!=-1;this.isNS71=ua.indexOf('Netscape/7.1')!=-1;this.dialogCounter=0;this.plugins=new Array();this.themes=new Array();this.menus=new Array();this.loadedPlugins=new Array();this.buttonMap=new Array();this.isLoaded=false;if(this.isOpera){this.isMSIE=true;this.isGecko=false;this.isSafari=false;}this.idCounter=0;};TinyMCE_Engine.prototype={init:function(settings){var theme;this.settings=settings;if(typeof(document.execCommand)=='undefined')return;if(!tinyMCE.baseURL){var elements=document.getElementsByTagName('script');for(var i=0;i<elements.length;i++){if(elements[i].src&&(elements[i].src.indexOf("tiny_mce.js")!=-1||elements[i].src.indexOf("tiny_mce_dev.js")!=-1||elements[i].src.indexOf("tiny_mce_src.js")!=-1||elements[i].src.indexOf("tiny_mce_gzip")!=-1)){var src=elements[i].src;tinyMCE.srcMode=(src.indexOf('_src')!=-1||src.indexOf('_dev')!=-1)?'_src':'';tinyMCE.gzipMode=src.indexOf('_gzip')!=-1;src=src.substring(0,src.lastIndexOf('/'));if(settings.exec_mode=="src"||settings.exec_mode=="normal")tinyMCE.srcMode=settings.exec_mode=="src"?'_src':'';tinyMCE.baseURL=src;break;}}}this.documentBasePath=document.location.href;if(this.documentBasePath.indexOf('?')!=-1)this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.indexOf('?'));this.documentURL=this.documentBasePath;this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.lastIndexOf('/'));if(tinyMCE.baseURL.indexOf('://')==-1&&tinyMCE.baseURL.charAt(0)!='/'){tinyMCE.baseURL=this.documentBasePath+"/"+tinyMCE.baseURL;}this._def("mode","none");this._def("theme","advanced");this._def("plugins","",true);this._def("language","en");this._def("docs_language",this.settings['language']);this._def("elements","");this._def("textarea_trigger","mce_editable");this._def("editor_selector","");this._def("editor_deselector","mceNoEditor");this._def("valid_elements","+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]");this._def("extended_valid_elements","");this._def("invalid_elements","");this._def("encoding","");this._def("urlconverter_callback",tinyMCE.getParam("urlconvertor_callback","TinyMCE_Engine.prototype.convertURL"));this._def("save_callback","");this._def("debug",false);this._def("force_br_newlines",false);this._def("force_p_newlines",true);this._def("add_form_submit_trigger",true);this._def("relative_urls",true);this._def("remove_script_host",true);this._def("focus_alert",true);this._def("document_base_url",this.documentURL);this._def("visual",true);this._def("visual_table_class","mceVisualAid");this._def("setupcontent_callback","");this._def("fix_content_duplication",true);this._def("custom_undo_redo",true);this._def("custom_undo_redo_levels",-1);this._def("custom_undo_redo_keyboard_shortcuts",true);this._def("custom_undo_redo_restore_selection",true);this._def("verify_html",true);this._def("apply_source_formatting",false);this._def("directionality","ltr");this._def("cleanup_on_startup",false);this._def("inline_styles",false);this._def("convert_newlines_to_brs",false);this._def("auto_reset_designmode",true);this._def("entities","39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",true);this._def("entity_encoding","named");this._def("cleanup_callback","");this._def("add_unload_trigger",true);this._def("ask",false);this._def("nowrap",false);this._def("auto_resize",false);this._def("auto_focus",false);this._def("cleanup",true);this._def("remove_linebreaks",true);this._def("button_tile_map",false);this._def("submit_patch",true);this._def("browsers","msie,safari,gecko,opera",true);this._def("dialog_type","window");this._def("accessibility_warnings",true);this._def("accessibility_focus",true);this._def("merge_styles_invalid_parents","");this._def("force_hex_style_colors",true);this._def("trim_span_elements",true);this._def("convert_fonts_to_spans",false);this._def("doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');this._def("font_size_classes",'');this._def("font_size_style_values",'xx-small,x-small,small,medium,large,x-large,xx-large',true);this._def("event_elements",'a,img',true);this._def("convert_urls",true);this._def("table_inline_editing",false);this._def("object_resizing",true);this._def("custom_shortcuts",true);this._def("convert_on_click",false);this._def("content_css",'');this._def("fix_list_elements",false);this._def("fix_table_elements",false);this._def("strict_loading_mode",document.contentType=='application/xhtml+xml');this._def("hidden_tab_class",'');this._def("display_tab_class",'');if(this.isMSIE&&!this.isOpera)this.settings.strict_loading_mode=false;if(this.isMSIE&&this.settings['browsers'].indexOf('msie')==-1)return;if(this.isGecko&&this.settings['browsers'].indexOf('gecko')==-1)return;if(this.isSafari&&this.settings['browsers'].indexOf('safari')==-1)return;if(this.isOpera&&this.settings['browsers'].indexOf('opera')==-1)return;var baseHREF=tinyMCE.settings['document_base_url'];var h=document.location.href;var p=h.indexOf('://');if(p>0&&document.location.protocol!="file:"){p=h.indexOf('/',p+3);h=h.substring(0,p);if(baseHREF.indexOf('://')==-1)baseHREF=h+baseHREF;tinyMCE.settings['document_base_url']=baseHREF;tinyMCE.settings['document_base_prefix']=h;}if(baseHREF.indexOf('?')!=-1)baseHREF=baseHREF.substring(0,baseHREF.indexOf('?'));this.settings['base_href']=baseHREF.substring(0,baseHREF.lastIndexOf('/'))+"/";theme=this.settings['theme'];this.blockRegExp=new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$","i");this.posKeyCodes=new Array(13,45,36,35,33,34,37,38,39,40);this.uniqueURL='javascript:TINYMCE_UNIQUEURL();';this.uniqueTag='<div id="mceTMPElement" style="display: none">TMP</div>';this.callbacks=new Array('onInit','getInfo','getEditorTemplate','setupContent','onChange','onPageLoad','handleNodeChange','initInstance','execCommand','getControlHTML','handleEvent','cleanup');this.settings['theme_href']=tinyMCE.baseURL+"/themes/"+theme;if(!tinyMCE.isMSIE)this.settings['force_br_newlines']=false;if(tinyMCE.getParam("popups_css",false)){var cssPath=tinyMCE.getParam("popups_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['popups_css']=this.documentBasePath+"/"+cssPath;else this.settings['popups_css']=cssPath;}else this.settings['popups_css']=tinyMCE.baseURL+"/themes/"+theme+"/css/editor_popup.css";if(tinyMCE.getParam("editor_css",false)){var cssPath=tinyMCE.getParam("editor_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['editor_css']=this.documentBasePath+"/"+cssPath;else this.settings['editor_css']=cssPath;}else this.settings['editor_css']=tinyMCE.baseURL+"/themes/"+theme+"/css/editor_ui.css";if(tinyMCE.settings['debug']){var msg="Debug: \n";msg+="baseURL: "+this.baseURL+"\n";msg+="documentBasePath: "+this.documentBasePath+"\n";msg+="content_css: "+this.settings['content_css']+"\n";msg+="popups_css: "+this.settings['popups_css']+"\n";msg+="editor_css: "+this.settings['editor_css']+"\n";alert(msg);}if(this.configs.length==0){if(this.isSafari&&this.getParam('safari_warning',false))alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false");if(typeof(TinyMCECompressed)=="undefined"){tinyMCE.addEvent(window,"DOMContentLoaded",TinyMCE_Engine.prototype.onLoad);if(tinyMCE.isMSIE&&!tinyMCE.isOpera){if(document.body)tinyMCE.addEvent(document.body,"readystatechange",TinyMCE_Engine.prototype.onLoad);else tinyMCE.addEvent(document,"readystatechange",TinyMCE_Engine.prototype.onLoad);}tinyMCE.addEvent(window,"load",TinyMCE_Engine.prototype.onLoad);tinyMCE._addUnloadEvents();}}this.loadScript(tinyMCE.baseURL+'/themes/'+this.settings['theme']+'/editor_template'+tinyMCE.srcMode+'.js');this.loadScript(tinyMCE.baseURL+'/langs/'+this.settings['language']+'.js');this.loadCSS(this.settings['editor_css']);var p=tinyMCE.getParam('plugins','',true,',');if(p.length>0){for(var i=0;i<p.length;i++){if(p[i].charAt(0)!='-')this.loadScript(tinyMCE.baseURL+'/plugins/'+p[i]+'/editor_plugin'+tinyMCE.srcMode+'.js');}}settings['cleanup_entities']=new Array();var entities=tinyMCE.getParam('entities','',true,',');for(var i=0;i<entities.length;i+=2)settings['cleanup_entities']['c'+entities[i]]=entities[i+1];settings['index']=this.configs.length;this.configs[this.configs.length]=settings;this.loadNextScript();},_addUnloadEvents:function(){if(tinyMCE.isMSIE){if(tinyMCE.settings['add_unload_trigger']){tinyMCE.addEvent(window,"unload",TinyMCE_Engine.prototype.unloadHandler);tinyMCE.addEvent(window.document,"beforeunload",TinyMCE_Engine.prototype.unloadHandler);}}else{if(tinyMCE.settings['add_unload_trigger'])tinyMCE.addEvent(window,"unload",function(){tinyMCE.triggerSave(true,true);});}},_def:function(key,def_val,t){var v=tinyMCE.getParam(key,def_val);v=t?v.replace(/\s+/g,""):v;this.settings[key]=v;},hasPlugin:function(n){return typeof(this.plugins[n])!="undefined"&&this.plugins[n]!=null;},addPlugin:function(n,p){var op=this.plugins[n];p.baseURL=op?op.baseURL:tinyMCE.baseURL+"/plugins/"+n;this.plugins[n]=p;this.loadNextScript();},setPluginBaseURL:function(n,u){var op=this.plugins[n];if(op)op.baseURL=u;else this.plugins[n]={baseURL:u};},loadPlugin:function(n,u){u=u.indexOf('.js')!=-1?u.substring(0,u.lastIndexOf('/')):u;u=u.charAt(u.length-1)=='/'?u.substring(0,u.length-1):u;this.plugins[n]={baseURL:u};this.loadScript(u+"/editor_plugin"+(tinyMCE.srcMode?'_src':'')+".js");},hasTheme:function(n){return typeof(this.themes[n])!="undefined"&&this.themes[n]!=null;},addTheme:function(n,t){this.themes[n]=t;this.loadNextScript();},addMenu:function(n,m){this.menus[n]=m;},hasMenu:function(n){return typeof(this.plugins[n])!="undefined"&&this.plugins[n]!=null;},loadScript:function(url){var i;for(i=0;i<this.loadedFiles.length;i++){if(this.loadedFiles[i]==url)return;}if(tinyMCE.settings.strict_loading_mode)this.pendingFiles[this.pendingFiles.length]=url;else document.write('<sc'+'ript language="javascript" type="text/javascript" src="'+url+'"></script>');this.loadedFiles[this.loadedFiles.length]=url;},loadNextScript:function(){var d=document,se;if(!tinyMCE.settings.strict_loading_mode)return;if(this.loadingIndex<this.pendingFiles.length){se=d.createElementNS('http://www.w3.org/1999/xhtml','script');se.setAttribute('language','javascript');se.setAttribute('type','text/javascript');se.setAttribute('src',this.pendingFiles[this.loadingIndex++]);d.getElementsByTagName("head")[0].appendChild(se);}else this.loadingIndex=-1;},loadCSS:function(url){var ar=url.replace(/\s+/,'').split(',');var lflen=0,csslen=0;var skip=false;var x=0,i=0,nl,le;for(x=0,csslen=ar.length;x<csslen;x++){ignore_css=false;if(ar[x]!=null&&ar[x]!='null'&&ar[x].length>0){for(i=0,lflen=this.loadedFiles.length;i<lflen;i++){if(this.loadedFiles[i]==ar[x]){skip=true;break;}}if(!skip){if(tinyMCE.settings.strict_loading_mode){nl=document.getElementsByTagName("head");le=document.createElement('link');le.setAttribute('href',ar[x]);le.setAttribute('rel','stylesheet');le.setAttribute('type','text/css');nl[0].appendChild(le);}else document.write('<link href="'+ar[x]+'" rel="stylesheet" type="text/css" />');this.loadedFiles[this.loadedFiles.length]=ar[x];}}}},importCSS:function(doc,css){var css_ary=css.replace(/\s+/,'').split(',');var csslen,elm,headArr,x,css_file;for(x=0,csslen=css_ary.length;x<csslen;x++){css_file=css_ary[x];if(css_file!=null&&css_file!='null'&&css_file.length>0){if(css_file.indexOf('://')==-1&&css_file.charAt(0)!='/')css_file=this.documentBasePath+"/"+css_file;if(typeof(doc.createStyleSheet)=="undefined"){elm=doc.createElement("link");elm.rel="stylesheet";elm.href=css_file;if((headArr=doc.getElementsByTagName("head"))!=null&&headArr.length>0)headArr[0].appendChild(elm);}else doc.createStyleSheet(css_file);}}},confirmAdd:function(e,settings){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var elementId=elm.name?elm.name:elm.id;tinyMCE.settings=settings;if(tinyMCE.settings['convert_on_click']||(!elm.getAttribute('mce_noask')&&confirm(tinyMCELang['lang_edit_confirm'])))tinyMCE.addMCEControl(elm,elementId);elm.setAttribute('mce_noask','true');},updateContent:function(form_element_name){var formElement=document.getElementById(form_element_name);for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.switchSettings();if(inst.formElement==formElement){var doc=inst.getDoc();tinyMCE._setHTML(doc,inst.formElement.value);if(!tinyMCE.isMSIE)doc.body.innerHTML=tinyMCE._cleanupHTML(inst,doc,this.settings,doc.body,inst.visualAid);}}},addMCEControl:function(replace_element,form_element_name,target_document){var id="mce_editor_"+tinyMCE.idCounter++;var inst=new TinyMCE_Control(tinyMCE.settings);inst.editorId=id;this.instances[id]=inst;inst._onAdd(replace_element,form_element_name,target_document);},removeMCEControl:function(editor_id){var inst=tinyMCE.getInstanceById(editor_id);if(inst){inst.switchSettings();editor_id=inst.editorId;var html=tinyMCE.getContent(editor_id);var tmpInstances=new Array();for(var instanceName in tinyMCE.instances){var instance=tinyMCE.instances[instanceName];if(!tinyMCE.isInstance(instance))continue;if(instanceName!=editor_id)tmpInstances[instanceName]=instance;}tinyMCE.instances=tmpInstances;tinyMCE.selectedElement=null;tinyMCE.selectedInstance=null;var replaceElement=document.getElementById(editor_id+"_parent");var oldTargetElement=inst.oldTargetElement;var targetName=oldTargetElement.nodeName.toLowerCase();if(targetName=="textarea"||targetName=="input"){replaceElement.parentNode.removeChild(replaceElement);oldTargetElement.style.display="inline";oldTargetElement.value=html;}else{oldTargetElement.innerHTML=html;oldTargetElement.style.display='block';replaceElement.parentNode.insertBefore(oldTargetElement,replaceElement);replaceElement.parentNode.removeChild(replaceElement);}}},triggerSave:function(skip_cleanup,skip_callback){var inst,n;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.triggerSave(skip_cleanup,skip_callback);}},resetForm:function(form_index){var i,inst,n,formObj=document.forms[form_index];for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.switchSettings();for(i=0;i<formObj.elements.length;i++){if(inst.formTargetElementId==formObj.elements[i].name)inst.getBody().innerHTML=inst.startContent;}}},execInstanceCommand:function(editor_id,command,user_interface,value,focus){var inst=tinyMCE.getInstanceById(editor_id);if(inst){if(typeof(focus)=="undefined")focus=true;if(focus)inst.contentWindow.focus();inst.autoResetDesignMode();this.selectedElement=inst.getFocusElement();this.selectedInstance=inst;tinyMCE.execCommand(command,user_interface,value);if(tinyMCE.isMSIE&&window.event!=null)tinyMCE.cancelEvent(window.event);}},execCommand:function(command,user_interface,value){user_interface=user_interface?user_interface:false;value=value?value:null;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();switch(command){case'mceHelp':tinyMCE.openWindow({file:'about.htm',width:480,height:380},{tinymce_version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion,tinymce_releasedate:tinyMCE.releaseDate,inline:"yes"});return;case'mceFocus':var inst=tinyMCE.getInstanceById(value);if(inst)inst.contentWindow.focus();return;case"mceAddControl":case"mceAddEditor":tinyMCE.addMCEControl(tinyMCE._getElementById(value),value);return;case"mceAddFrameControl":tinyMCE.addMCEControl(tinyMCE._getElementById(value['element'],value['document']),value['element'],value['document']);return;case"mceRemoveControl":case"mceRemoveEditor":tinyMCE.removeMCEControl(value);return;case"mceResetDesignMode":if(!tinyMCE.isMSIE){for(var n in tinyMCE.instances){if(!tinyMCE.isInstance(tinyMCE.instances[n]))continue;try{tinyMCE.instances[n].getDoc().designMode="on";}catch(e){}}}return;}if(this.selectedInstance){this.selectedInstance.execCommand(command,user_interface,value);}else if(tinyMCE.settings['focus_alert'])alert(tinyMCELang['lang_focus_alert']);},_createIFrame:function(replace_element,doc,win){var iframe,id=replace_element.getAttribute("id");var aw,ah;if(typeof(doc)=="undefined")doc=document;if(typeof(win)=="undefined")win=window;iframe=doc.createElement("iframe");aw=""+tinyMCE.settings['area_width'];ah=""+tinyMCE.settings['area_height'];if(aw.indexOf('%')==-1){aw=parseInt(aw);aw=aw<0?300:aw;aw=aw+"px";}if(ah.indexOf('%')==-1){ah=parseInt(ah);ah=ah<0?240:ah;ah=ah+"px";}iframe.setAttribute("id",id);iframe.setAttribute("class","mceEditorIframe");iframe.setAttribute("border","0");iframe.setAttribute("frameBorder","0");iframe.setAttribute("marginWidth","0");iframe.setAttribute("marginHeight","0");iframe.setAttribute("leftMargin","0");iframe.setAttribute("topMargin","0");iframe.setAttribute("width",aw);iframe.setAttribute("height",ah);iframe.setAttribute("allowtransparency","true");iframe.className='mceEditorIframe';if(tinyMCE.settings["auto_resize"])iframe.setAttribute("scrolling","no");if(tinyMCE.isMSIE&&!tinyMCE.isOpera)iframe.setAttribute("src",this.settings['default_document']);iframe.style.width=aw;iframe.style.height=ah;if(tinyMCE.settings.strict_loading_mode)iframe.style.marginBottom='-5px';if(tinyMCE.isMSIE&&!tinyMCE.isOpera)replace_element.outerHTML=iframe.outerHTML;else replace_element.parentNode.replaceChild(iframe,replace_element);if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return win.frames[id];else return iframe;},setupContent:function(editor_id){var inst=tinyMCE.instances[editor_id];var doc=inst.getDoc();var head=doc.getElementsByTagName('head').item(0);var content=inst.startContent;if(tinyMCE.settings.strict_loading_mode){content=content.replace(/&lt;/g,'<');content=content.replace(/&gt;/g,'>');content=content.replace(/&quot;/g,'"');content=content.replace(/&amp;/g,'&');}inst.switchSettings();if(!tinyMCE.isMSIE&&tinyMCE.getParam("setupcontent_reload",false)&&doc.title!="blank_page"){try{doc.location.href=tinyMCE.baseURL+"/blank.htm";}catch(ex){}window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",1000);return;}if(!head){window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",10);return;}tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/themes/"+inst.settings['theme']+"/css/editor_content.css");tinyMCE.importCSS(inst.getDoc(),inst.settings['content_css']);tinyMCE.dispatchCallback(inst,'init_instance_callback','initInstance',inst);if(tinyMCE.getParam('custom_undo_redo_keyboard_shortcuts')){inst.addShortcut('ctrl','z','lang_undo_desc','Undo');inst.addShortcut('ctrl','y','lang_redo_desc','Redo');}if(tinyMCE.isGecko){inst.addShortcut('ctrl','b','lang_bold_desc','Bold');inst.addShortcut('ctrl','i','lang_italic_desc','Italic');inst.addShortcut('ctrl','u','lang_underline_desc','Underline');}if(tinyMCE.getParam("convert_fonts_to_spans"))inst.getDoc().body.setAttribute('id','mceSpanFonts');if(tinyMCE.settings['nowrap'])doc.body.style.whiteSpace="nowrap";doc.body.dir=this.settings['directionality'];doc.editorId=editor_id;if(!tinyMCE.isMSIE)doc.documentElement.editorId=editor_id;inst.setBaseHREF(tinyMCE.settings['base_href']);if(tinyMCE.settings['convert_newlines_to_brs']){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}content=tinyMCE.storeAwayURLs(content);content=tinyMCE._customCleanup(inst,"insert_to_editor",content);if(tinyMCE.isMSIE){window.setInterval('try{tinyMCE.getCSSClasses(tinyMCE.instances["'+editor_id+'"].getDoc(), "'+editor_id+'");}catch(e){}',500);if(tinyMCE.settings["force_br_newlines"])doc.styleSheets[0].addRule("p","margin: 0;");var body=inst.getBody();body.editorId=editor_id;}content=tinyMCE.cleanupHTMLCode(content);if(!tinyMCE.isMSIE){var contentElement=inst.getDoc().createElement("body");var doc=inst.getDoc();contentElement.innerHTML=content;if(tinyMCE.isGecko&&tinyMCE.settings['remove_lt_gt'])content=content.replace(new RegExp('&lt;&gt;','g'),"");if(tinyMCE.settings['cleanup_on_startup'])tinyMCE.setInnerHTML(inst.getBody(),tinyMCE._cleanupHTML(inst,doc,this.settings,contentElement));else{content=tinyMCE.regexpReplace(content,"<strong","<b","gi");content=tinyMCE.regexpReplace(content,"<em(/?)>","<i$1>","gi");content=tinyMCE.regexpReplace(content,"<em ","<i ","gi");content=tinyMCE.regexpReplace(content,"</strong>","</b>","gi");content=tinyMCE.regexpReplace(content,"</em>","</i>","gi");tinyMCE.setInnerHTML(inst.getBody(),content);}tinyMCE.convertAllRelativeURLs(inst.getBody());}else{if(tinyMCE.settings['cleanup_on_startup']){tinyMCE._setHTML(inst.getDoc(),content);eval('try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}');}else tinyMCE._setHTML(inst.getDoc(),content);}var parentElm=inst.targetDoc.getElementById(inst.editorId+'_parent');inst.formElement=tinyMCE.isGecko?parentElm.previousSibling:parentElm.nextSibling;tinyMCE.handleVisualAid(inst.getBody(),true,tinyMCE.settings['visual'],inst);tinyMCE.dispatchCallback(inst,'setupcontent_callback','setupContent',editor_id,inst.getBody(),inst.getDoc());if(!tinyMCE.isMSIE)tinyMCE.addEventHandlers(inst);if(tinyMCE.isMSIE){tinyMCE.addEvent(inst.getBody(),"blur",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(inst.getBody(),"beforedeactivate",TinyMCE_Engine.prototype._eventPatch);if(!tinyMCE.isOpera){tinyMCE.addEvent(doc.body,"mousemove",TinyMCE_Engine.prototype.onMouseMove);tinyMCE.addEvent(doc.body,"beforepaste",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc.body,"drop",TinyMCE_Engine.prototype._eventPatch);}}tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=inst.contentWindow.document.body;tinyMCE._customCleanup(inst,"insert_to_editor_dom",inst.getBody());tinyMCE._customCleanup(inst,"setup_content_dom",inst.getBody());tinyMCE._setEventsEnabled(inst.getBody(),false);tinyMCE.cleanupAnchors(inst.getDoc());if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(inst.getDoc());inst.startContent=tinyMCE.trim(inst.getBody().innerHTML);inst.undoRedo.add({content:inst.startContent});if(tinyMCE.isGecko){tinyMCE.selectNodes(inst.getBody(),function(n){if(n.nodeType==3||n.nodeType==8){n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");}return false;});}tinyMCE._removeInternal(inst.getBody());tinyMCE.selectedInstance=inst;tinyMCE.triggerNodeChange(false,true);},storeAwayURLs:function(s){if(!s.match(/(mce_src|mce_href)/gi,s)){s=s.replace(new RegExp('src\\s*=\\s*\"([^ >\"]*)\"','gi'),'src="$1" mce_src="$1"');s=s.replace(new RegExp('href\\s*=\\s*\"([^ >\"]*)\"','gi'),'href="$1" mce_href="$1"');}return s;},_removeInternal:function(n){if(tinyMCE.isGecko){tinyMCE.selectNodes(n,function(n){if(n.nodeType==3||n.nodeType==8){n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");n.nodeValue=n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");}return false;});}},removeTinyMCEFormElements:function(form_obj){if(typeof(form_obj)=="undefined"||form_obj==null)return;if(form_obj.nodeName!="FORM"){if(form_obj.form)form_obj=form_obj.form;else form_obj=tinyMCE.getParentElement(form_obj,"form");}if(form_obj==null)return;for(var i=0;i<form_obj.elements.length;i++){var elementId=form_obj.elements[i].name?form_obj.elements[i].name:form_obj.elements[i].id;if(elementId.indexOf('mce_editor_')==0)form_obj.elements[i].disabled=true;}},handleEvent:function(e){var inst=tinyMCE.selectedInstance;if(typeof(tinyMCE)=="undefined")return true;if(tinyMCE.executeCallback(tinyMCE.selectedInstance,'handle_event_callback','handleEvent',e))return false;switch(e.type){case"beforedeactivate":case"blur":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.execCommand('mceEndTyping');tinyMCE.hideMenus();return;case"drop":case"beforepaste":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.setBaseHREF(null);if(tinyMCE.isMSIE&&!tinyMCE.isOpera){var ife=tinyMCE.selectedInstance.iframeElement;if(ife.style.height.indexOf('%')!=-1){ife._oldHeight=ife.style.height;ife.style.height=ife.clientHeight;}}window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();",1);return;case"submit":tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE?window.event.srcElement:e.target);tinyMCE.triggerSave();tinyMCE.isNotDirty=true;return;case"reset":var formObj=tinyMCE.isMSIE?window.event.srcElement:e.target;for(var i=0;i<document.forms.length;i++){if(document.forms[i]==formObj)window.setTimeout('tinyMCE.resetForm('+i+');',10);}return;case"keypress":if(inst&&inst.handleShortcut(e))return false;if(e.target.editorId){tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];}else{if(e.target.ownerDocument.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.ownerDocument.editorId];}if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&e.keyCode==13&&!e.shiftKey){if(TinyMCE_ForceParagraphs._insertPara(tinyMCE.selectedInstance,e)){tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.cancelEvent(e);return false;}}if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance,e.type)){tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.cancelEvent(e);return false;}}if(tinyMCE.isMSIE&&tinyMCE.settings['force_br_newlines']&&e.keyCode==13){if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];if(tinyMCE.selectedInstance){var sel=tinyMCE.selectedInstance.getDoc().selection;var rng=sel.createRange();if(tinyMCE.getParentElement(rng.parentElement(),"li")!=null)return false;e.returnValue=false;e.cancelBubble=true;rng.pasteHTML("<br />");rng.collapse(false);rng.select();tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.triggerNodeChange(false);return false;}}if(e.keyCode==8||e.keyCode==46){tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(e.target,"a");tinyMCE.imgElement=tinyMCE.getParentElement(e.target,"img");tinyMCE.triggerNodeChange(false);}return false;break;case"keyup":case"keydown":tinyMCE.hideMenus();tinyMCE.hasMouseMoved=false;if(inst&&inst.handleShortcut(e))return false;if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];else return;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();var inst=tinyMCE.selectedInstance;if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance,e.type)){tinyMCE.execCommand("mceAddUndoLevel");e.preventDefault();return false;}}tinyMCE.selectedElement=null;tinyMCE.selectedNode=null;var elm=tinyMCE.selectedInstance.getFocusElement();tinyMCE.linkElement=tinyMCE.getParentElement(elm,"a");tinyMCE.imgElement=tinyMCE.getParentElement(elm,"img");tinyMCE.selectedElement=elm;if(tinyMCE.isGecko&&e.type=="keyup"&&e.keyCode==9)tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(),true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);if(tinyMCE.isMSIE&&e.type=="keydown"&&e.keyCode==13)tinyMCE.enterKeyElement=tinyMCE.selectedInstance.getFocusElement();if(tinyMCE.isMSIE&&e.type=="keyup"&&e.keyCode==13){var elm=tinyMCE.enterKeyElement;if(elm){var re=new RegExp('^HR|IMG|BR$','g');var dre=new RegExp('^H[1-6]$','g');if(!elm.hasChildNodes()&&!re.test(elm.nodeName)){if(dre.test(elm.nodeName))elm.innerHTML="&nbsp;&nbsp;";else elm.innerHTML="&nbsp;";}}}var keys=tinyMCE.posKeyCodes;var posKey=false;for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){posKey=true;break;}}if(tinyMCE.isMSIE&&tinyMCE.settings['custom_undo_redo']){var keys=new Array(8,46);for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){if(e.type=="keyup")tinyMCE.triggerNodeChange(false);}}}if(e.keyCode==17)return true;if(!posKey&&e.type=="keyup")tinyMCE.execCommand("mceStartTyping");if(e.type=="keydown"&&(posKey||e.ctrlKey)&&inst)inst.undoBookmark=inst.selection.getBookmark();if(e.type=="keyup"&&(posKey||e.ctrlKey))tinyMCE.execCommand("mceEndTyping");if(posKey&&e.type=="keyup")tinyMCE.triggerNodeChange(false);if(tinyMCE.isMSIE&&e.ctrlKey)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);break;case"mousedown":case"mouseup":case"click":case"focus":tinyMCE.hideMenus();if(tinyMCE.selectedInstance){tinyMCE.selectedInstance.switchSettings();tinyMCE.selectedInstance.isFocused=true;}var targetBody=tinyMCE.getParentElement(e.target,"body");for(var instanceName in tinyMCE.instances){if(!tinyMCE.isInstance(tinyMCE.instances[instanceName]))continue;var inst=tinyMCE.instances[instanceName];inst.autoResetDesignMode();if(inst.getBody()==targetBody){tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");tinyMCE.imgElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"img");break;}}if(!tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark)tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark=tinyMCE.selectedInstance.selection.getBookmark();if(tinyMCE.isSafari){tinyMCE.selectedInstance.lastSafariSelection=tinyMCE.selectedInstance.selection.getBookmark();tinyMCE.selectedInstance.lastSafariSelectedElement=tinyMCE.selectedElement;var lnk=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");if(lnk&&e.type=="mousedown"){lnk.setAttribute("mce_real_href",lnk.getAttribute("href"));lnk.setAttribute("href","javascript:void(0);");}if(lnk&&e.type=="click"){window.setTimeout(function(){lnk.setAttribute("href",lnk.getAttribute("mce_real_href"));lnk.removeAttribute("mce_real_href");},10);}}if(e.type!="focus")tinyMCE.selectedNode=null;tinyMCE.triggerNodeChange(false);tinyMCE.execCommand("mceEndTyping");if(e.type=="mouseup")tinyMCE.execCommand("mceAddUndoLevel");if(!tinyMCE.selectedInstance&&e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];return false;break;}},getButtonHTML:function(id,lang,img,cmd,ui,val){var h='',m,x;cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+cmd+'\'';if(typeof(ui)!="undefined"&&ui!=null)cmd+=','+ui;if(typeof(val)!="undefined"&&val!=null)cmd+=",'"+val+"'";cmd+=');';if(tinyMCE.getParam('button_tile_map')&&(!tinyMCE.isMSIE||tinyMCE.isOpera)&&(m=this.buttonMap[id])!=null&&(tinyMCE.getParam("language")=="en"||img.indexOf('$lang')==-1)){x=0-(m*20)==0?'0':0-(m*20);h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';h+='<img src="{$themeurl}/images/spacer.gif" style="background-position: '+x+'px 0" title="{$'+lang+'}" />';h+='</a>';}else{h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceButtonNormal" target="_self">';h+='<img src="'+img+'" title="{$'+lang+'}" />';h+='</a>';}return h;},addButtonMap:function(m){var i,a=m.replace(/\s+/,'').split(',');for(i=0;i<a.length;i++)this.buttonMap[a[i]]=i;},submitPatch:function(){tinyMCE.removeTinyMCEFormElements(this);tinyMCE.triggerSave();this.mceOldSubmit();tinyMCE.isNotDirty=true;},onLoad:function(){if(tinyMCE.settings.strict_loading_mode&&this.loadingIndex!=-1){window.setTimeout('tinyMCE.onLoad();',1);return;}if(tinyMCE.isMSIE&&!tinyMCE.isOpera&&window.event.type=="readystatechange"&&document.readyState!="complete")return true;if(tinyMCE.isLoaded)return true;tinyMCE.isLoaded=true;tinyMCE.dispatchCallback(null,'onpageload','onPageLoad');for(var c=0;c<tinyMCE.configs.length;c++){tinyMCE.settings=tinyMCE.configs[c];var selector=tinyMCE.getParam("editor_selector");var deselector=tinyMCE.getParam("editor_deselector");var elementRefAr=new Array();if(document.forms&&tinyMCE.settings['add_form_submit_trigger']&&!tinyMCE.submitTriggers){for(var i=0;i<document.forms.length;i++){var form=document.forms[i];tinyMCE.addEvent(form,"submit",TinyMCE_Engine.prototype.handleEvent);tinyMCE.addEvent(form,"reset",TinyMCE_Engine.prototype.handleEvent);tinyMCE.submitTriggers=true;if(tinyMCE.settings['submit_patch']){try{form.mceOldSubmit=form.submit;form.submit=TinyMCE_Engine.prototype.submitPatch;}catch(e){}}}}var mode=tinyMCE.settings['mode'];switch(mode){case"exact":var elements=tinyMCE.getParam('elements','',true,',');for(var i=0;i<elements.length;i++){var element=tinyMCE._getElementById(elements[i]);var trigger=element?element.getAttribute(tinyMCE.settings['textarea_trigger']):"";if(tinyMCE.getAttrib(element,"class").indexOf(deselector)!=-1)continue;if(trigger=="false")continue;if((tinyMCE.settings['ask']||tinyMCE.settings['convert_on_click'])&&element){elementRefAr[elementRefAr.length]=element;continue;}if(element)tinyMCE.addMCEControl(element,elements[i]);else if(tinyMCE.settings['debug'])alert("Error: Could not find element by id or name: "+elements[i]);}break;case"specific_textareas":case"textareas":var nodeList=document.getElementsByTagName("textarea");for(var i=0;i<nodeList.length;i++){var elm=nodeList.item(i);var trigger=elm.getAttribute(tinyMCE.settings['textarea_trigger']);if(selector!=''&&tinyMCE.getAttrib(elm,"class").indexOf(selector)==-1)continue;if(selector!='')trigger=selector!=""?"true":"";if(tinyMCE.getAttrib(elm,"class").indexOf(deselector)!=-1)continue;if((mode=="specific_textareas"&&trigger=="true")||(mode=="textareas"&&trigger!="false"))elementRefAr[elementRefAr.length]=elm;}break;}for(var i=0;i<elementRefAr.length;i++){var element=elementRefAr[i];var elementId=element.name?element.name:element.id;if(tinyMCE.settings['ask']||tinyMCE.settings['convert_on_click']){if(tinyMCE.isGecko){var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(e){window.setTimeout(function(){TinyMCE_Engine.prototype.confirmAdd(e,settings);},10);});if(element.nodeName!="TEXTAREA"&&element.nodeName!="INPUT")tinyMCE.addEvent(element,"click",function(e){window.setTimeout(function(){TinyMCE_Engine.prototype.confirmAdd(e,settings);},10);});}else{var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(){TinyMCE_Engine.prototype.confirmAdd(null,settings);});tinyMCE.addEvent(element,"click",function(){TinyMCE_Engine.prototype.confirmAdd(null,settings);});}}else tinyMCE.addMCEControl(element,elementId);}if(tinyMCE.settings['auto_focus']){window.setTimeout(function(){var inst=tinyMCE.getInstanceById(tinyMCE.settings['auto_focus']);inst.selection.selectNode(inst.getBody(),true,true);inst.contentWindow.focus();},10);}tinyMCE.dispatchCallback(null,'oninit','onInit');}},isInstance:function(o){return o!=null&&typeof(o)=="object"&&o.isTinyMCE_Control;},getParam:function(name,default_value,strip_whitespace,split_chr){var value=(typeof(this.settings[name])=="undefined")?default_value:this.settings[name];if(value=="true"||value=="false")return(value=="true");if(strip_whitespace)value=tinyMCE.regexpReplace(value,"[ \t\r\n]","");if(typeof(split_chr)!="undefined"&&split_chr!=null){value=value.split(split_chr);var outArray=new Array();for(var i=0;i<value.length;i++){if(value[i]&&value[i]!="")outArray[outArray.length]=value[i];}value=outArray;}return value;},getLang:function(name,default_value,parse_entities,va){var v=(typeof(tinyMCELang[name])=="undefined")?default_value:tinyMCELang[name],n;if(parse_entities)v=tinyMCE.entityDecode(v);if(va){for(n in va)v=this.replaceVar(v,n,va[n]);}return v;},entityDecode:function(s){var e=document.createElement("div");e.innerHTML=s;return e.innerHTML;},addToLang:function(prefix,ar){for(var key in ar){if(typeof(ar[key])=='function')continue;tinyMCELang[(key.indexOf('lang_')==-1?'lang_':'')+(prefix!=''?(prefix+"_"):'')+key]=ar[key];}this.loadNextScript();},triggerNodeChange:function(focus,setup_content){if(tinyMCE.selectedInstance){var inst=tinyMCE.selectedInstance;var editorId=inst.editorId;var elm=(typeof(setup_content)!="undefined"&&setup_content)?tinyMCE.selectedElement:inst.getFocusElement();var undoIndex=-1;var undoLevels=-1;var anySelection=false;var selectedText=inst.selection.getSelectedText();if(setup_content&&tinyMCE.isGecko&&inst.isHidden())elm=inst.getBody();inst.switchSettings();if(tinyMCE.settings["auto_resize"]){var doc=inst.getDoc();inst.iframeElement.style.width=doc.body.offsetWidth+"px";inst.iframeElement.style.height=doc.body.offsetHeight+"px";}if(tinyMCE.selectedElement)anySelection=(tinyMCE.selectedElement.nodeName.toLowerCase()=="img")||(selectedText&&selectedText.length>0);if(tinyMCE.settings['custom_undo_redo']){undoIndex=inst.undoRedo.undoIndex;undoLevels=inst.undoRedo.undoLevels.length;}tinyMCE.dispatchCallback(inst,'handle_node_change_callback','handleNodeChange',editorId,elm,undoIndex,undoLevels,inst.visualAid,anySelection,setup_content);}if(this.selectedInstance&&(typeof(focus)=="undefined"||focus))this.selectedInstance.contentWindow.focus();},_customCleanup:function(inst,type,content){var pl,po,i;var customCleanup=tinyMCE.settings['cleanup_callback'];if(customCleanup!=""&&eval("typeof("+customCleanup+")")!="undefined")content=eval(customCleanup+"(type, content, inst);");pl=inst.plugins;for(i=0;i<pl.length;i++){po=tinyMCE.plugins[pl[i]];if(po&&po.cleanup)content=po.cleanup(type,content,inst);}return content;},setContent:function(h){if(tinyMCE.selectedInstance){tinyMCE.selectedInstance.execCommand('mceSetContent',false,h);tinyMCE.selectedInstance.repaint();}},importThemeLanguagePack:function(name){if(typeof(name)=="undefined")name=tinyMCE.settings['theme'];tinyMCE.loadScript(tinyMCE.baseURL+'/themes/'+name+'/langs/'+tinyMCE.settings['language']+'.js');},importPluginLanguagePack:function(name,valid_languages){var lang="en",b=tinyMCE.baseURL+'/plugins/'+name;valid_languages=valid_languages.split(',');for(var i=0;i<valid_languages.length;i++){if(tinyMCE.settings['language']==valid_languages[i])lang=tinyMCE.settings['language'];}if(this.plugins[name])b=this.plugins[name].baseURL;tinyMCE.loadScript(b+'/langs/'+lang+'.js');},applyTemplate:function(h,as){var i,s,ar=h.match(new RegExp('\\{\\$[a-z0-9_]+\\}','gi'));if(ar&&ar.length>0){for(i=ar.length-1;i>=0;i--){s=ar[i].substring(2,ar[i].length-1);if(s.indexOf('lang_')==0&&tinyMCELang[s])h=tinyMCE.replaceVar(h,s,tinyMCELang[s]);else if(as&&as[s])h=tinyMCE.replaceVar(h,s,as[s]);else if(tinyMCE.settings[s])h=tinyMCE.replaceVar(h,s,tinyMCE.settings[s]);}}h=tinyMCE.replaceVar(h,"themeurl",tinyMCE.themeURL);return h;},replaceVar:function(h,r,v){return h.replace(new RegExp('{\\\$'+r+'}','g'),v);},openWindow:function(template,args){var html,width,height,x,y,resizable,scrollbars,url;args['mce_template_file']=template['file'];args['mce_width']=template['width'];args['mce_height']=template['height'];tinyMCE.windowArgs=args;html=template['html'];if(!(width=parseInt(template['width'])))width=320;if(!(height=parseInt(template['height'])))height=200;if(tinyMCE.isMSIE)height+=40;else height+=20;x=parseInt(screen.width/2.0)-(width/2.0);y=parseInt(screen.height/2.0)-(height/2.0);resizable=(args&&args['resizable'])?args['resizable']:"no";scrollbars=(args&&args['scrollbars'])?args['scrollbars']:"no";if(template['file'].charAt(0)!='/'&&template['file'].indexOf('://')==-1)url=tinyMCE.baseURL+"/themes/"+tinyMCE.getParam("theme")+"/"+template['file'];else url=template['file'];for(var name in args){if(typeof(args[name])=='function')continue;url=tinyMCE.replaceVar(url,name,escape(args[name]));}if(html){html=tinyMCE.replaceVar(html,"css",this.settings['popups_css']);html=tinyMCE.applyTemplate(html,args);var win=window.open("","mcePopup"+new Date().getTime(),"top="+y+",left="+x+",scrollbars="+scrollbars+",dialog=yes,minimizable="+resizable+",modal=yes,width="+width+",height="+height+",resizable="+resizable);if(win==null){alert(tinyMCELang['lang_popup_blocked']);return;}win.document.write(html);win.document.close();win.resizeTo(width,height);win.focus();}else{if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&resizable!='yes'&&tinyMCE.settings["dialog_type"]=="modal"){height+=10;var features="resizable:"+resizable+";scroll:"+scrollbars+";status:yes;center:yes;help:no;dialogWidth:"+width+"px;dialogHeight:"+height+"px;";window.showModalDialog(url,window,features);}else{var modal=(resizable=="yes")?"no":"yes";if(tinyMCE.isGecko&&tinyMCE.isMac)modal="no";if(template['close_previous']!="no")try{tinyMCE.lastWindow.close();}catch(ex){}var win=window.open(url,"mcePopup"+new Date().getTime(),"top="+y+",left="+x+",scrollbars="+scrollbars+",dialog="+modal+",minimizable="+resizable+",modal="+modal+",width="+width+",height="+height+",resizable="+resizable);if(win==null){alert(tinyMCELang['lang_popup_blocked']);return;}if(template['close_previous']!="no")tinyMCE.lastWindow=win;eval('try { win.resizeTo(width, height); } catch(e) { }');if(tinyMCE.isGecko){if(win.document.defaultView.statusbar.visible)win.resizeBy(0,tinyMCE.isMac?10:24);}win.focus();}}},closeWindow:function(win){win.close();},getVisualAidClass:function(class_name,state){var aidClass=tinyMCE.settings['visual_table_class'];if(typeof(state)=="undefined")state=tinyMCE.settings['visual'];var classNames=new Array();var ar=class_name.split(' ');for(var i=0;i<ar.length;i++){if(ar[i]==aidClass)ar[i]="";if(ar[i]!="")classNames[classNames.length]=ar[i];}if(state)classNames[classNames.length]=aidClass;var className="";for(var i=0;i<classNames.length;i++){if(i>0)className+=" ";className+=classNames[i];}return className;},handleVisualAid:function(el,deep,state,inst,skip_dispatch){if(!el)return;if(!skip_dispatch)tinyMCE.dispatchCallback(inst,'handle_visual_aid_callback','handleVisualAid',el,deep,state,inst);var tableElement=null;switch(el.nodeName){case"TABLE":var oldW=el.style.width;var oldH=el.style.height;var bo=tinyMCE.getAttrib(el,"border");bo=bo==""||bo=="0"?true:false;tinyMCE.setAttrib(el,"class",tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el,"class"),state&&bo));el.style.width=oldW;el.style.height=oldH;for(var y=0;y<el.rows.length;y++){for(var x=0;x<el.rows[y].cells.length;x++){var cn=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el.rows[y].cells[x],"class"),state&&bo);tinyMCE.setAttrib(el.rows[y].cells[x],"class",cn);}}break;case"A":var anchorName=tinyMCE.getAttrib(el,"name");if(anchorName!=''&&state){el.title=anchorName;el.className='mceItemAnchor';}else if(anchorName!=''&&!state)el.className='';break;}if(deep&&el.hasChildNodes()){for(var i=0;i<el.childNodes.length;i++)tinyMCE.handleVisualAid(el.childNodes[i],deep,state,inst,true);}},fixGeckoBaseHREFBug:function(m,e,h){var nl,i,a,n,xsrc,xhref,el;if(tinyMCE.isGecko){if(m==1){h=h.replace(/\ssrc=/gi," mce_tsrc=");h=h.replace(/\shref=/gi," mce_thref=");return h;}else{el=new Array('a','img','select','area','iframe','base','input','script','embed','object','link');for(a=0;a<el.length;a++){n=e.getElementsByTagName(el[a]);for(i=0;i<n.length;i++){xsrc=tinyMCE.getAttrib(n[i],"mce_tsrc");xhref=tinyMCE.getAttrib(n[i],"mce_thref");if(xsrc!=""){try{n[i].src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],xsrc);}catch(e){}n[i].removeAttribute("mce_tsrc");}if(xhref!=""){try{n[i].href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],xhref);}catch(e){}n[i].removeAttribute("mce_thref");}}}el=tinyMCE.selectNodes(e,function(n){if(n.nodeType==3||n.nodeType==8){n.nodeValue=n.nodeValue.replace(/\smce_tsrc=/gi," src=");n.nodeValue=n.nodeValue.replace(/\smce_thref=/gi," href=");}return false;});}}return h;},_setHTML:function(doc,html_content){html_content=tinyMCE.cleanupHTMLCode(html_content);try{tinyMCE.setInnerHTML(doc.body,html_content);}catch(e){if(this.isMSIE)doc.body.createTextRange().pasteHTML(html_content);}if(tinyMCE.isMSIE&&tinyMCE.settings['fix_content_duplication']){var paras=doc.getElementsByTagName("P");for(var i=0;i<paras.length;i++){var node=paras[i];while((node=node.parentNode)!=null){if(node.nodeName=="P")node.outerHTML=node.innerHTML;}}var html=doc.body.innerHTML;tinyMCE.setInnerHTML(doc.body,html);}tinyMCE.cleanupAnchors(doc);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);},getEditorId:function(form_element){var inst=this.getInstanceById(form_element);if(!inst)return null;return inst.editorId;},getInstanceById:function(editor_id){var inst=this.instances[editor_id];if(!inst){for(var n in tinyMCE.instances){var instance=tinyMCE.instances[n];if(!tinyMCE.isInstance(instance))continue;if(instance.formTargetElementId==editor_id){inst=instance;break;}}}return inst;},queryInstanceCommandValue:function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandValue(command);return false;},queryInstanceCommandState:function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandState(command);return null;},setWindowArg:function(n,v){this.windowArgs[n]=v;},getWindowArg:function(n,d){return(typeof(this.windowArgs[n])=="undefined")?d:this.windowArgs[n];},getCSSClasses:function(editor_id,doc){var output=new Array();if(typeof(tinyMCE.cssClasses)!="undefined")return tinyMCE.cssClasses;if(typeof(editor_id)=="undefined"&&typeof(doc)=="undefined"){var instance;for(var instanceName in tinyMCE.instances){instance=tinyMCE.instances[instanceName];if(!tinyMCE.isInstance(instance))continue;break;}doc=instance.getDoc();}if(typeof(doc)=="undefined"){var instance=tinyMCE.getInstanceById(editor_id);doc=instance.getDoc();}if(doc){var styles=doc.styleSheets;if(styles&&styles.length>0){for(var x=0;x<styles.length;x++){var csses=null;eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets("+x+").rules : styles["+x+"].cssRules;} catch(e) {}");if(!csses)return new Array();for(var i=0;i<csses.length;i++){var selectorText=csses[i].selectorText;if(selectorText){var rules=selectorText.split(',');for(var c=0;c<rules.length;c++){var rule=rules[c];while(rule.indexOf(' ')==0)rule=rule.substring(1);if(rule.indexOf(' ')!=-1||rule.indexOf(':')!=-1||rule.indexOf('mceItem')!=-1)continue;if(rule.indexOf(tinyMCE.settings['visual_table_class'])!=-1||rule.indexOf('mceEditable')!=-1||rule.indexOf('mceNonEditable')!=-1)continue;if(rule.indexOf('.')!=-1){var cssClass=rule.substring(rule.indexOf('.')+1);var addClass=true;for(var p=0;p<output.length&&addClass;p++){if(output[p]==cssClass)addClass=false;}if(addClass)output[output.length]=cssClass;}}}}}}}if(output.length>0)tinyMCE.cssClasses=output;return output;},regexpReplace:function(in_str,reg_exp,replace_str,opts){if(in_str==null)return in_str;if(typeof(opts)=="undefined")opts='g';var re=new RegExp(reg_exp,opts);return in_str.replace(re,replace_str);},trim:function(s){return s.replace(/^\s*|\s*$/g,"");},cleanupEventStr:function(s){s=""+s;s=s.replace('function anonymous()\n{\n','');s=s.replace('\n}','');s=s.replace(/^return true;/gi,'');return s;},getControlHTML:function(c){var i,l,n,o,v;l=tinyMCE.plugins;for(n in l){o=l[n];if(o.getControlHTML&&(v=o.getControlHTML(c))!='')return tinyMCE.replaceVar(v,"pluginurl",o.baseURL);}o=tinyMCE.themes[tinyMCE.settings['theme']];if(o.getControlHTML&&(v=o.getControlHTML(c))!='')return v;return'';},evalFunc:function(f,idx,a){var s='(',i;for(i=idx;i<a.length;i++){s+='a['+i+']';if(i<a.length-1)s+=',';}s+=');';return eval("f"+s);},dispatchCallback:function(i,p,n){return this.callFunc(i,p,n,0,this.dispatchCallback.arguments);},executeCallback:function(i,p,n){return this.callFunc(i,p,n,1,this.executeCallback.arguments);},execCommandCallback:function(i,p,n){return this.callFunc(i,p,n,2,this.execCommandCallback.arguments);},callFunc:function(ins,p,n,m,a){var l,i,on,o,s,v;s=m==2;l=tinyMCE.getParam(p,'');if(l!=''&&(v=tinyMCE.evalFunc(typeof(l)=="function"?l:eval(l),3,a))==s&&m>0)return true;if(ins!=null){for(i=0,l=ins.plugins;i<l.length;i++){o=tinyMCE.plugins[l[i]];if(o[n]&&(v=tinyMCE.evalFunc(o[n],3,a))==s&&m>0)return true;}}l=tinyMCE.themes;for(on in l){o=l[on];if(o[n]&&(v=tinyMCE.evalFunc(o[n],3,a))==s&&m>0)return true;}return false;},xmlEncode:function(s){s=""+s;s=s.replace(/&/g,'&amp;');s=s.replace(new RegExp('"','g'),'&quot;');s=s.replace(/\'/g,'&#39;');s=s.replace(/</g,'&lt;');s=s.replace(/>/g,'&gt;');return s;},extend:function(p,np){var o={};o.parent=p;for(n in p)o[n]=p[n];for(n in np)o[n]=np[n];return o;},hideMenus:function(){var e=tinyMCE.lastSelectedMenuBtn;if(tinyMCE.lastMenu){tinyMCE.lastMenu.hide();tinyMCE.lastMenu=null;}if(e){tinyMCE.switchClass(e,tinyMCE.lastMenuBtnClass);tinyMCE.lastSelectedMenuBtn=null;}},explode:function(d,s){var ar=s.split(d),oar=new Array(),i;for(i=0;i<ar.length;i++){if(ar[i]!="")oar[oar.length]=ar[i];}return oar;}};var TinyMCE=TinyMCE_Engine;var tinyMCE=new TinyMCE_Engine();var tinyMCELang={};function TinyMCE_Control(settings){var t,i,to,fu,p,x,fn,fu,pn,s=settings;this.undoRedoLevel=true;this.isTinyMCE_Control=true;this.settings=s;this.settings['theme']=tinyMCE.getParam("theme","default");this.settings['width']=tinyMCE.getParam("width",-1);this.settings['height']=tinyMCE.getParam("height",-1);this.selection=new TinyMCE_Selection(this);this.undoRedo=new TinyMCE_UndoRedo(this);this.cleanup=new TinyMCE_Cleanup();this.shortcuts=new Array();this.hasMouseMoved=false;this.cleanup.init({valid_elements:s.valid_elements,extended_valid_elements:s.extended_valid_elements,entities:s.entities,entity_encoding:s.entity_encoding,debug:s.cleanup_debug,url_converter:'TinyMCE_Cleanup.prototype._urlConverter',indent:s.apply_source_formatting,invalid_elements:s.invalid_elements,verify_html:s.verify_html,fix_content_duplication:s.fix_content_duplication});t=this.settings['theme'];if(!tinyMCE.hasTheme(t)){fn=tinyMCE.callbacks;to={};for(i=0;i<fn.length;i++){if((fu=window['TinyMCE_'+t+"_"+fn[i]]))to[fn[i]]=fu;}tinyMCE.addTheme(t,to);}this.plugins=new Array();p=tinyMCE.getParam('plugins','',true,',');if(p.length>0){for(i=0;i<p.length;i++){pn=p[i];if(pn.charAt(0)=='-')pn=pn.substring(1);if(!tinyMCE.hasPlugin(pn)){fn=tinyMCE.callbacks;to={};for(x=0;x<fn.length;x++){if((fu=window['TinyMCE_'+pn+"_"+fn[x]]))to[fn[x]]=fu;}tinyMCE.addPlugin(pn,to);}this.plugins[this.plugins.length]=pn;}}};TinyMCE_Control.prototype={hasPlugin:function(n){var i;for(i=0;i<this.plugins.length;i++){if(this.plugins[i]==n)return true;}return false;},addPlugin:function(n,p){if(!this.hasPlugin(n)){tinyMCE.addPlugin(n,p);this.plugins[this.plugins.length]=n;}},repaint:function(){if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return;try{var s=this.selection;var b=s.getBookmark(true);this.getBody().style.display='none';this.getDoc().execCommand('selectall',false,null);this.getSel().collapseToStart();this.getBody().style.display='block';s.moveToBookmark(b);}catch(ex){}},switchSettings:function(){if(tinyMCE.configs.length>1&&tinyMCE.currentConfig!=this.settings['index']){tinyMCE.settings=this.settings;tinyMCE.currentConfig=this.settings['index'];}},getBody:function(){return this.getDoc().body;},getDoc:function(){return this.contentWindow.document;},getWin:function(){return this.contentWindow;},addShortcut:function(m,k,d,cmd,ui,va){var n=typeof(k)=="number",ie=tinyMCE.isMSIE,c,sc,i;var scl=this.shortcuts;if(!tinyMCE.getParam('custom_shortcuts'))return false;m=m.toLowerCase();k=ie&&!n?k.toUpperCase():k;c=n?null:k.charCodeAt(0);d=d&&d.indexOf('lang_')==0?tinyMCE.getLang(d):d;sc={alt:m.indexOf('alt')!=-1,ctrl:m.indexOf('ctrl')!=-1,shift:m.indexOf('shift')!=-1,charCode:c,keyCode:n?k:(ie?c:null),desc:d,cmd:cmd,ui:ui,val:va};for(i=0;i<scl.length;i++){if(sc.alt==scl[i].alt&&sc.ctrl==scl[i].ctrl&&sc.shift==scl[i].shift&&sc.charCode==scl[i].charCode&&sc.keyCode==scl[i].keyCode){return false;}}scl[scl.length]=sc;return true;},handleShortcut:function(e){var i,s=this.shortcuts,o;for(i=0;i<s.length;i++){o=s[i];if(o.alt==e.altKey&&o.ctrl==e.ctrlKey&&(o.keyCode==e.keyCode||o.charCode==e.charCode)){if(o.cmd&&(e.type=="keydown"||(e.type=="keypress"&&!tinyMCE.isOpera)))tinyMCE.execCommand(o.cmd,o.ui,o.val);tinyMCE.cancelEvent(e);return true;}}return false;},autoResetDesignMode:function(){if(!tinyMCE.isMSIE&&this.isHidden()&&tinyMCE.getParam('auto_reset_designmode'))eval('try { this.getDoc().designMode = "On"; } catch(e) {}');},isHidden:function(){if(tinyMCE.isMSIE)return false;var s=this.getSel();return(!s||!s.rangeCount||s.rangeCount==0);},isDirty:function(){return this.startContent!=tinyMCE.trim(this.getBody().innerHTML)&&!tinyMCE.isNotDirty;},_mergeElements:function(scmd,pa,ch,override){if(scmd=="removeformat"){pa.className="";pa.style.cssText="";ch.className="";ch.style.cssText="";return;}var st=tinyMCE.parseStyle(tinyMCE.getAttrib(pa,"style"));var stc=tinyMCE.parseStyle(tinyMCE.getAttrib(ch,"style"));var className=tinyMCE.getAttrib(pa,"class");className+=" "+tinyMCE.getAttrib(ch,"class");if(override){for(var n in st){if(typeof(st[n])=='function')continue;stc[n]=st[n];}}else{for(var n in stc){if(typeof(stc[n])=='function')continue;st[n]=stc[n];}}tinyMCE.setAttrib(pa,"style",tinyMCE.serializeStyle(st));tinyMCE.setAttrib(pa,"class",tinyMCE.trim(className));ch.className="";ch.style.cssText="";ch.removeAttribute("class");ch.removeAttribute("style");},_setUseCSS:function(b){var d=this.getDoc();try{d.execCommand("useCSS",false,!b);}catch(ex){}try{d.execCommand("styleWithCSS",false,b);}catch(ex){}if(!tinyMCE.getParam("table_inline_editing"))try{d.execCommand('enableInlineTableEditing',false,"false");}catch(ex){}if(!tinyMCE.getParam("object_resizing"))try{d.execCommand('enableObjectResizing',false,"false");}catch(ex){}},execCommand:function(command,user_interface,value){var doc=this.getDoc();var win=this.getWin();var focusElm=this.getFocusElement();if(!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel','gi').test(command))this.undoBookmark=null;if(this.lastSafariSelection&&!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel','gi').test(command)){this.selection.moveToBookmark(this.lastSafariSelection);tinyMCE.selectedElement=this.lastSafariSelectedElement;}if(!tinyMCE.isMSIE&&!this.useCSS){this._setUseCSS(false);this.useCSS=true;}this.contentDocument=doc;if(tinyMCE.execCommandCallback(this,'execcommand_callback','execCommand',this.editorId,this.getBody(),command,user_interface,value))return;if(focusElm&&focusElm.nodeName=="IMG"){var align=focusElm.getAttribute('align');var img=command=="JustifyCenter"?focusElm.cloneNode(false):focusElm;switch(command){case"JustifyLeft":if(align=='left')img.removeAttribute('align');else img.setAttribute('align','left');var div=focusElm.parentNode;if(div&&div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;case"JustifyCenter":img.removeAttribute('align');var div=tinyMCE.getParentElement(focusElm,"div");if(div&&div.style.textAlign=="center"){if(div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);}else{var div=this.getDoc().createElement("div");div.style.textAlign='center';div.appendChild(img);focusElm.parentNode.replaceChild(div,focusElm);}this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;case"JustifyRight":if(align=='right')img.removeAttribute('align');else img.setAttribute('align','right');var div=focusElm.parentNode;if(div&&div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;}}if(tinyMCE.settings['force_br_newlines']){var alignValue="";if(doc.selection.type!="Control"){switch(command){case"JustifyLeft":alignValue="left";break;case"JustifyCenter":alignValue="center";break;case"JustifyFull":alignValue="justify";break;case"JustifyRight":alignValue="right";break;}if(alignValue!=""){var rng=doc.selection.createRange();if((divElm=tinyMCE.getParentElement(rng.parentElement(),"div"))!=null)divElm.setAttribute("align",alignValue);else if(rng.pasteHTML&&rng.htmlText.length>0)rng.pasteHTML('<div align="'+alignValue+'">'+rng.htmlText+"</div>");tinyMCE.triggerNodeChange();return;}}}switch(command){case"mceRepaint":this.repaint();return true;case"InsertUnorderedList":case"InsertOrderedList":var tag=(command=="InsertUnorderedList")?"ul":"ol";if(tinyMCE.isSafari)this.execCommand("mceInsertContent",false,"<"+tag+"><li>&nbsp;</li><"+tag+">");else this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();break;case"Strikethrough":if(tinyMCE.isSafari)this.execCommand("mceInsertContent",false,"<strike>"+this.selection.getSelectedHTML()+"</strike>");else this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();break;case"mceSelectNode":this.selection.selectNode(value);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=value;break;case"FormatBlock":if(value==null||value==""){var elm=tinyMCE.getParentElement(this.getFocusElement(),"p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp");if(elm)this.execCommand("mceRemoveNode",false,elm);}else{if(tinyMCE.isGecko&&new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>','gi').test(value))value=value.replace(/[^a-z]/gi,'');if(tinyMCE.isMSIE&&new RegExp('blockquote|code|samp','gi').test(value)){var b=this.selection.getBookmark();this.getDoc().execCommand("FormatBlock",false,'<p>');tinyMCE.renameElement(tinyMCE.getParentBlockElement(this.getFocusElement()),value);this.selection.moveToBookmark(b);}else this.getDoc().execCommand("FormatBlock",false,value);}tinyMCE.triggerNodeChange();break;case"mceRemoveNode":if(!value)value=tinyMCE.getParentElement(this.getFocusElement());if(tinyMCE.isMSIE){value.outerHTML=value.innerHTML;}else{var rng=value.ownerDocument.createRange();rng.setStartBefore(value);rng.setEndAfter(value);rng.deleteContents();rng.insertNode(rng.createContextualFragment(value.innerHTML));}tinyMCE.triggerNodeChange();break;case"mceSelectNodeDepth":var parentNode=this.getFocusElement();for(var i=0;parentNode;i++){if(parentNode.nodeName.toLowerCase()=="body")break;if(parentNode.nodeName.toLowerCase()=="#text"){i--;parentNode=parentNode.parentNode;continue;}if(i==value){this.selection.selectNode(parentNode,false);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=parentNode;return;}parentNode=parentNode.parentNode;}break;case"SetStyleInfo":var rng=this.getRng();var sel=this.getSel();var scmd=value['command'];var sname=value['name'];var svalue=value['value']==null?'':value['value'];var wrapper=value['wrapper']?value['wrapper']:"span";var parentElm=null;var invalidRe=new RegExp("^BODY|HTML$","g");var invalidParentsRe=tinyMCE.settings['merge_styles_invalid_parents']!=''?new RegExp(tinyMCE.settings['merge_styles_invalid_parents'],"gi"):null;if(tinyMCE.isMSIE){if(rng.item)parentElm=rng.item(0);else{var pelm=rng.parentElement();var prng=doc.selection.createRange();prng.moveToElementText(pelm);if(rng.htmlText==prng.htmlText||rng.boundingWidth==0){if(invalidParentsRe==null||!invalidParentsRe.test(pelm.nodeName))parentElm=pelm;}}}else{var felm=this.getFocusElement();if(sel.isCollapsed||(new RegExp('td|tr|tbody|table','gi').test(felm.nodeName)&&sel.anchorNode==felm.parentNode))parentElm=felm;}if(parentElm&&!invalidRe.test(parentElm.nodeName)){if(scmd=="setstyle")tinyMCE.setStyleAttrib(parentElm,sname,svalue);if(scmd=="setattrib")tinyMCE.setAttrib(parentElm,sname,svalue);if(scmd=="removeformat"){parentElm.style.cssText='';tinyMCE.setAttrib(parentElm,'class','');}var ch=tinyMCE.getNodeTree(parentElm,new Array(),1);for(var z=0;z<ch.length;z++){if(ch[z]==parentElm)continue;if(scmd=="setstyle")tinyMCE.setStyleAttrib(ch[z],sname,'');if(scmd=="setattrib")tinyMCE.setAttrib(ch[z],sname,'');if(scmd=="removeformat"){ch[z].style.cssText='';tinyMCE.setAttrib(ch[z],'class','');}}}else{this._setUseCSS(false);doc.execCommand("FontName",false,"#mce_temp_font#");var elementArray=tinyMCE.getElementsByAttributeValue(this.getBody(),"font","face","#mce_temp_font#");for(var x=0;x<elementArray.length;x++){elm=elementArray[x];if(elm){var spanElm=doc.createElement(wrapper);if(scmd=="setstyle")tinyMCE.setStyleAttrib(spanElm,sname,svalue);if(scmd=="setattrib")tinyMCE.setAttrib(spanElm,sname,svalue);if(scmd=="removeformat"){spanElm.style.cssText='';tinyMCE.setAttrib(spanElm,'class','');}if(elm.hasChildNodes()){for(var i=0;i<elm.childNodes.length;i++)spanElm.appendChild(elm.childNodes[i].cloneNode(true));}spanElm.setAttribute("mce_new","true");elm.parentNode.replaceChild(spanElm,elm);var ch=tinyMCE.getNodeTree(spanElm,new Array(),1);for(var z=0;z<ch.length;z++){if(ch[z]==spanElm)continue;if(scmd=="setstyle")tinyMCE.setStyleAttrib(ch[z],sname,'');if(scmd=="setattrib")tinyMCE.setAttrib(ch[z],sname,'');if(scmd=="removeformat"){ch[z].style.cssText='';tinyMCE.setAttrib(ch[z],'class','');}}}}}var nodes=doc.getElementsByTagName(wrapper);for(var i=nodes.length-1;i>=0;i--){var elm=nodes[i];var isNew=tinyMCE.getAttrib(elm,"mce_new")=="true";elm.removeAttribute("mce_new");if(elm.childNodes&&elm.childNodes.length==1&&elm.childNodes[0].nodeType==1){this._mergeElements(scmd,elm,elm.childNodes[0],isNew);continue;}if(elm.parentNode.childNodes.length==1&&!invalidRe.test(elm.nodeName)&&!invalidRe.test(elm.parentNode.nodeName)){if(invalidParentsRe==null||!invalidParentsRe.test(elm.parentNode.nodeName))this._mergeElements(scmd,elm.parentNode,elm,false);}}var nodes=doc.getElementsByTagName(wrapper);for(var i=nodes.length-1;i>=0;i--){var elm=nodes[i];var isEmpty=true;var tmp=doc.createElement("body");tmp.appendChild(elm.cloneNode(false));tmp.innerHTML=tmp.innerHTML.replace(new RegExp('style=""|class=""','gi'),'');if(new RegExp('<span>','gi').test(tmp.innerHTML)){for(var x=0;x<elm.childNodes.length;x++){if(elm.parentNode!=null)elm.parentNode.insertBefore(elm.childNodes[x].cloneNode(true),elm);}elm.parentNode.removeChild(elm);}}if(scmd=="removeformat")tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE.triggerNodeChange();break;case"FontName":if(value==null){var s=this.getSel();if(tinyMCE.isGecko&&s.isCollapsed){var f=tinyMCE.getParentElement(this.getFocusElement(),"font");if(f!=null)this.selection.selectNode(f,false);}this.getDoc().execCommand("RemoveFormat",false,null);if(f!=null&&tinyMCE.isGecko){var r=this.getRng().cloneRange();r.collapse(true);s.removeAllRanges();s.addRange(r);}}else this.getDoc().execCommand('FontName',false,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);return;case"FontSize":this.getDoc().execCommand('FontSize',false,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);return;case"forecolor":this.getDoc().execCommand('forecolor',false,value);break;case"HiliteColor":if(tinyMCE.isGecko){this._setUseCSS(true);this.getDoc().execCommand('hilitecolor',false,value);this._setUseCSS(false);}else this.getDoc().execCommand('BackColor',false,value);break;case"Cut":case"Copy":case"Paste":var cmdFailed=false;eval('try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}');if(tinyMCE.isOpera&&cmdFailed)alert('Currently not supported by your browser, use keyboard shortcuts instead.');if(tinyMCE.isGecko&&cmdFailed){if(confirm(tinyMCE.entityDecode(tinyMCE.getLang('lang_clipboard_msg'))))window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html','mceExternal');return;}else tinyMCE.triggerNodeChange();break;case"mceSetContent":if(!value)value="";value=tinyMCE.storeAwayURLs(value);value=tinyMCE._customCleanup(this,"insert_to_editor",value);tinyMCE._setHTML(doc,value);tinyMCE.setInnerHTML(doc.body,tinyMCE._cleanupHTML(this,doc,tinyMCE.settings,doc.body));tinyMCE.convertAllRelativeURLs(doc.body);tinyMCE._removeInternal(this.getBody());if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);tinyMCE.handleVisualAid(doc.body,true,this.visualAid,this);tinyMCE._setEventsEnabled(doc.body,false);return true;case"mceCleanup":var b=this.selection.getBookmark();tinyMCE._setHTML(this.contentDocument,this.getBody().innerHTML);tinyMCE.setInnerHTML(this.getBody(),tinyMCE._cleanupHTML(this,this.contentDocument,this.settings,this.getBody(),this.visualAid));tinyMCE.convertAllRelativeURLs(doc.body);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE._setEventsEnabled(this.getBody(),false);this.repaint();this.selection.moveToBookmark(b);tinyMCE.triggerNodeChange();break;case"mceReplaceContent":if(!value)value='';this.getWin().focus();var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=this.getSel().toString();if(selectedText.length>0){value=tinyMCE.replaceVar(value,"selection",selectedText);tinyMCE.execCommand('mceInsertContent',false,value);}tinyMCE.triggerNodeChange();break;case"mceSetAttribute":if(typeof(value)=='object'){var targetElms=(typeof(value['targets'])=="undefined")?"p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address":value['targets'];var targetNode=tinyMCE.getParentElement(this.getFocusElement(),targetElms);if(targetNode){targetNode.setAttribute(value['name'],value['value']);tinyMCE.triggerNodeChange();}}break;case"mceSetCSSClass":this.execCommand("SetStyleInfo",false,{command:"setattrib",name:"class",value:value});break;case"mceInsertRawHTML":var key='tiny_mce_marker';this.execCommand('mceBeginUndoLevel');this.execCommand('mceInsertContent',false,key);var scrollX=this.getDoc().body.scrollLeft+this.getDoc().documentElement.scrollLeft;var scrollY=this.getDoc().body.scrollTop+this.getDoc().documentElement.scrollTop;var html=this.getBody().innerHTML;if((pos=html.indexOf(key))!=-1)tinyMCE.setInnerHTML(this.getBody(),html.substring(0,pos)+value+html.substring(pos+key.length));this.contentWindow.scrollTo(scrollX,scrollY);this.execCommand('mceEndUndoLevel');break;case"mceInsertContent":if(!value)value='';var insertHTMLFailed=false;this.getWin().focus();if(tinyMCE.isGecko||tinyMCE.isOpera){try{if(value.indexOf('<')==-1&&!value.match(/(&#38;|&#160;|&#60;|&#62;)/g)){var r=this.getRng();var n=this.getDoc().createTextNode(tinyMCE.entityDecode(value));var s=this.getSel();var r2=r.cloneRange();s.removeAllRanges();r.deleteContents();r.insertNode(n);r2.selectNode(n);r2.collapse(false);s.removeAllRanges();s.addRange(r2);}else{value=tinyMCE.fixGeckoBaseHREFBug(1,this.getDoc(),value);this.getDoc().execCommand('inserthtml',false,value);tinyMCE.fixGeckoBaseHREFBug(2,this.getDoc(),value);}}catch(ex){insertHTMLFailed=true;}if(!insertHTMLFailed){tinyMCE.triggerNodeChange();return;}}if(tinyMCE.isOpera&&insertHTMLFailed){this.getDoc().execCommand("insertimage",false,tinyMCE.uniqueURL);var ar=tinyMCE.getElementsByAttributeValue(this.getBody(),"img","src",tinyMCE.uniqueURL);ar[0].outerHTML=value;return;}if(!tinyMCE.isMSIE){var isHTML=value.indexOf('<')!=-1;var sel=this.getSel();var rng=this.getRng();if(isHTML){if(tinyMCE.isSafari){var tmpRng=this.getDoc().createRange();tmpRng.setStart(this.getBody(),0);tmpRng.setEnd(this.getBody(),0);value=tmpRng.createContextualFragment(value);}else value=rng.createContextualFragment(value);}else{var el=document.createElement("div");el.innerHTML=value;value=el.firstChild.nodeValue;value=doc.createTextNode(value);}if(tinyMCE.isSafari&&!isHTML){this.execCommand('InsertText',false,value.nodeValue);tinyMCE.triggerNodeChange();return true;}else if(tinyMCE.isSafari&&isHTML){rng.deleteContents();rng.insertNode(value);tinyMCE.triggerNodeChange();return true;}rng.deleteContents();if(rng.startContainer.nodeType==3){var node=rng.startContainer.splitText(rng.startOffset);node.parentNode.insertBefore(value,node);}else rng.insertNode(value);if(!isHTML){sel.selectAllChildren(doc.body);sel.removeAllRanges();var rng=doc.createRange();rng.selectNode(value);rng.collapse(false);sel.addRange(rng);}else rng.collapse(false);tinyMCE.fixGeckoBaseHREFBug(2,this.getDoc(),value);}else{var rng=doc.selection.createRange();var c=value.indexOf('<!--')!=-1;if(c)value=tinyMCE.uniqueTag+value;if(rng.item)rng.item(0).outerHTML=value;else rng.pasteHTML(value);if(c){var e=this.getDoc().getElementById('mceTMPElement');e.parentNode.removeChild(e);}}tinyMCE.triggerNodeChange();break;case"mceStartTyping":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedo.typingUndoIndex==-1){this.undoRedo.typingUndoIndex=this.undoRedo.undoIndex;this.execCommand('mceAddUndoLevel');}break;case"mceEndTyping":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedo.typingUndoIndex!=-1){this.execCommand('mceAddUndoLevel');this.undoRedo.typingUndoIndex=-1;}break;case"mceBeginUndoLevel":this.undoRedoLevel=false;break;case"mceEndUndoLevel":this.undoRedoLevel=true;this.execCommand('mceAddUndoLevel');break;case"mceAddUndoLevel":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedoLevel){if(this.undoRedo.add())tinyMCE.triggerNodeChange(false);}break;case"Undo":if(tinyMCE.settings['custom_undo_redo']){tinyMCE.execCommand("mceEndTyping");this.undoRedo.undo();tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case"Redo":if(tinyMCE.settings['custom_undo_redo']){tinyMCE.execCommand("mceEndTyping");this.undoRedo.redo();tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case"mceToggleVisualAid":this.visualAid=!this.visualAid;tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE.triggerNodeChange();break;case"Indent":this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();if(tinyMCE.isMSIE){var n=tinyMCE.getParentElement(this.getFocusElement(),"blockquote");do{if(n&&n.nodeName=="BLOCKQUOTE"){n.removeAttribute("dir");n.removeAttribute("style");}}while(n!=null&&(n=n.parentNode)!=null);}break;case"removeformat":var text=this.selection.getSelectedText();if(tinyMCE.isOpera){this.getDoc().execCommand("RemoveFormat",false,null);return;}if(tinyMCE.isMSIE){try{var rng=doc.selection.createRange();rng.execCommand("RemoveFormat",false,null);}catch(e){}this.execCommand("SetStyleInfo",false,{command:"removeformat"});}else{this.getDoc().execCommand(command,user_interface,value);this.execCommand("SetStyleInfo",false,{command:"removeformat"});}if(text.length==0)this.execCommand("mceSetCSSClass",false,"");tinyMCE.triggerNodeChange();break;default:this.getDoc().execCommand(command,user_interface,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);else tinyMCE.triggerNodeChange();}if(command!="mceAddUndoLevel"&&command!="Undo"&&command!="Redo"&&command!="mceStartTyping"&&command!="mceEndTyping")tinyMCE.execCommand("mceAddUndoLevel");},queryCommandValue:function(c){try{return this.getDoc().queryCommandValue(c);}catch(e){return null;}},queryCommandState:function(c){return this.getDoc().queryCommandState(c);},_onAdd:function(replace_element,form_element_name,target_document){var hc,th,to,editorTemplate;th=this.settings['theme'];to=tinyMCE.themes[th];var targetDoc=target_document?target_document:document;this.targetDoc=targetDoc;tinyMCE.themeURL=tinyMCE.baseURL+"/themes/"+this.settings['theme'];this.settings['themeurl']=tinyMCE.themeURL;if(!replace_element){alert("Error: Could not find the target element.");return false;}if(to.getEditorTemplate)editorTemplate=to.getEditorTemplate(this.settings,this.editorId);var deltaWidth=editorTemplate['delta_width']?editorTemplate['delta_width']:0;var deltaHeight=editorTemplate['delta_height']?editorTemplate['delta_height']:0;var html='<span id="'+this.editorId+'_parent" class="mceEditorContainer">'+editorTemplate['html'];html=tinyMCE.replaceVar(html,"editor_id",this.editorId);this.settings['default_document']=tinyMCE.baseURL+"/blank.htm";this.settings['old_width']=this.settings['width'];this.settings['old_height']=this.settings['height'];if(this.settings['width']==-1)this.settings['width']=replace_element.offsetWidth;if(this.settings['height']==-1)this.settings['height']=replace_element.offsetHeight;if(this.settings['width']==0)this.settings['width']=replace_element.style.width;if(this.settings['height']==0)this.settings['height']=replace_element.style.height;if(this.settings['width']==0)this.settings['width']=320;if(this.settings['height']==0)this.settings['height']=240;this.settings['area_width']=parseInt(this.settings['width']);this.settings['area_height']=parseInt(this.settings['height']);this.settings['area_width']+=deltaWidth;this.settings['area_height']+=deltaHeight;if((""+this.settings['width']).indexOf('%')!=-1)this.settings['area_width']="100%";if((""+this.settings['height']).indexOf('%')!=-1)this.settings['area_height']="100%";if((""+replace_element.style.width).indexOf('%')!=-1){this.settings['width']=replace_element.style.width;this.settings['area_width']="100%";}if((""+replace_element.style.height).indexOf('%')!=-1){this.settings['height']=replace_element.style.height;this.settings['area_height']="100%";}html=tinyMCE.applyTemplate(html);this.settings['width']=this.settings['old_width'];this.settings['height']=this.settings['old_height'];this.visualAid=this.settings['visual'];this.formTargetElementId=form_element_name;if(replace_element.nodeName=="TEXTAREA"||replace_element.nodeName=="INPUT")this.startContent=replace_element.value;else this.startContent=replace_element.innerHTML;if(replace_element.nodeName!="TEXTAREA"&&replace_element.nodeName!="INPUT"){this.oldTargetElement=replace_element;if(tinyMCE.settings['debug']){hc='<textarea wrap="off" id="'+form_element_name+'" name="'+form_element_name+'" cols="100" rows="15"></textarea>';}else{hc='<input type="hidden" id="'+form_element_name+'" name="'+form_element_name+'" />';this.oldTargetElement.style.display="none";}html+='</span>';if(tinyMCE.isGecko)html=hc+html;else html+=hc;if(tinyMCE.isGecko){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);tinyMCE.insertAfter(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}else{html+='</span>';this.oldTargetElement=replace_element;if(!tinyMCE.settings['debug'])this.oldTargetElement.style.display="none";if(tinyMCE.isGecko){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);tinyMCE.insertAfter(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}var dynamicIFrame=false;var tElm=targetDoc.getElementById(this.editorId);if(!tinyMCE.isMSIE){if(tElm&&(tElm.nodeName=="SPAN"||tElm.nodeName=="span")){tElm=tinyMCE._createIFrame(tElm,targetDoc);dynamicIFrame=true;}this.targetElement=tElm;this.iframeElement=tElm;this.contentDocument=tElm.contentDocument;this.contentWindow=tElm.contentWindow;}else{if(tElm&&tElm.nodeName=="SPAN")tElm=tinyMCE._createIFrame(tElm,targetDoc,targetDoc.parentWindow);else tElm=targetDoc.frames[this.editorId];this.targetElement=tElm;this.iframeElement=targetDoc.getElementById(this.editorId);if(tinyMCE.isOpera){this.contentDocument=this.iframeElement.contentDocument;this.contentWindow=this.iframeElement.contentWindow;dynamicIFrame=true;}else{this.contentDocument=tElm.window.document;this.contentWindow=tElm.window;}this.getDoc().designMode="on";}var doc=this.contentDocument;if(dynamicIFrame){var html=tinyMCE.getParam('doctype')+'<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="'+tinyMCE.settings['base_href']+'" /><title>blank_page</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body class="mceContentBody"></body></html>';try{if(!this.isHidden())this.getDoc().designMode="on";doc.open();doc.write(html);doc.close();}catch(e){this.getDoc().location.href=tinyMCE.baseURL+"/blank.htm";}}if(tinyMCE.isMSIE)window.setTimeout("tinyMCE.addEventHandlers(tinyMCE.instances[\""+this.editorId+"\"]);",1);tinyMCE.setupContent(this.editorId,true);return true;},setBaseHREF:function(u){var h,b,d,nl;d=this.getDoc();nl=d.getElementsByTagName("base");b=nl.length>0?nl[0]:null;if(!b){nl=d.getElementsByTagName("head");h=nl.length>0?nl[0]:null;b=d.createElement("base");b.setAttribute('href',u);h.appendChild(b);}else{if(u==""||u==null)b.parentNode.removeChild(b);else b.setAttribute('href',u);}},getFocusElement:function(){return this.selection.getFocusElement();},getSel:function(){return this.selection.getSel();},getRng:function(){return this.selection.getRng();},triggerSave:function(skip_cleanup,skip_callback){var e,nl=new Array(),i,s;this.switchSettings();s=tinyMCE.settings;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){e=this.iframeElement;do{if(e.style&&e.style.display=='none'){e.style.display='block';nl[nl.length]={elm:e,type:'style'};}if(e.style&&s.hidden_tab_class.length>0&&e.className.indexOf(s.hidden_tab_class)!=-1){e.className=s.display_tab_class;nl[nl.length]={elm:e,type:'class'};}}while((e=e.parentNode)!=null)}tinyMCE.settings['preformatted']=false;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;tinyMCE._setHTML(this.getDoc(),this.getBody().innerHTML);if(this.settings['cleanup']==false){tinyMCE.handleVisualAid(this.getBody(),true,false,this);tinyMCE._setEventsEnabled(this.getBody(),true);}tinyMCE._customCleanup(this,"submit_content_dom",this.contentWindow.document.body);var htm=skip_cleanup?this.getBody().innerHTML:tinyMCE._cleanupHTML(this,this.getDoc(),this.settings,this.getBody(),tinyMCE.visualAid,true,true);htm=tinyMCE._customCleanup(this,"submit_content",htm);if(!skip_callback&&tinyMCE.settings['save_callback']!="")var content=eval(tinyMCE.settings['save_callback']+"(this.formTargetElementId,htm,this.getBody());");if((typeof(content)!="undefined")&&content!=null)htm=content;htm=tinyMCE.regexpReplace(htm,"&#40;","(","gi");htm=tinyMCE.regexpReplace(htm,"&#41;",")","gi");htm=tinyMCE.regexpReplace(htm,"&#59;",";","gi");htm=tinyMCE.regexpReplace(htm,"&#34;","&quot;","gi");htm=tinyMCE.regexpReplace(htm,"&#94;","^","gi");if(this.formElement)this.formElement.value=htm;if(tinyMCE.isSafari&&this.formElement)this.formElement.innerText=htm;for(i=0;i<nl.length;i++){if(nl[i].type=='style')nl[i].elm.style.display='none';else nl[i].elm.className=s.hidden_tab_class;}}};TinyMCE_Engine.prototype.cleanupHTMLCode=function(s){s=s.replace(new RegExp('<p \\/>','gi'),'<p>&nbsp;</p>');s=s.replace(new RegExp('<p>\\s*<\\/p>','gi'),'<p>&nbsp;</p>');s=s.replace(new RegExp('<br>\\s*<\\/br>','gi'),'<br />');s=s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>','gi'),'<$1$2$3></$1$2>');s=s.replace(new RegExp('\\s+></','gi'),'></');s=s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>','gi'),'<$1$2 />');if(tinyMCE.isMSIE)s=s.replace(new RegExp('<p><hr \\/><\\/p>','gi'),"<hr>");if(tinyMCE.getParam('convert_urls'))s=s.replace(new RegExp('(href=\"{0,1})(\\s*#)','gi'),'$1'+tinyMCE.settings['document_base_url']+"#");return s;};TinyMCE_Engine.prototype.parseStyle=function(str){var ar=new Array();if(str==null)return ar;var st=str.split(';');tinyMCE.clearArray(ar);for(var i=0;i<st.length;i++){if(st[i]=='')continue;var re=new RegExp('^\\s*([^:]*):\\s*(.*)\\s*$');var pa=st[i].replace(re,'$1||$2').split('||');if(pa.length==2)ar[pa[0].toLowerCase()]=pa[1];}return ar;};TinyMCE_Engine.prototype.compressStyle=function(ar,pr,sf,res){var box=new Array();box[0]=ar[pr+'-top'+sf];box[1]=ar[pr+'-left'+sf];box[2]=ar[pr+'-right'+sf];box[3]=ar[pr+'-bottom'+sf];for(var i=0;i<box.length;i++){if(box[i]==null)return;for(var a=0;a<box.length;a++){if(box[a]!=box[i])return;}}ar[res]=box[0];ar[pr+'-top'+sf]=null;ar[pr+'-left'+sf]=null;ar[pr+'-right'+sf]=null;ar[pr+'-bottom'+sf]=null;};TinyMCE_Engine.prototype.serializeStyle=function(ar){var str="";tinyMCE.compressStyle(ar,"border","","border");tinyMCE.compressStyle(ar,"border","-width","border-width");tinyMCE.compressStyle(ar,"border","-color","border-color");tinyMCE.compressStyle(ar,"border","-style","border-style");tinyMCE.compressStyle(ar,"padding","","padding");tinyMCE.compressStyle(ar,"margin","","margin");for(var key in ar){var val=ar[key];if(typeof(val)=='function')continue;if(key.indexOf('mso-')==0)continue;if(val!=null&&val!=''){val=''+val;val=val.replace(new RegExp("url\\(\\'?([^\\']*)\\'?\\)",'gi'),"url('$1')");if(val.indexOf('url(')!=-1&&tinyMCE.getParam('convert_urls')){var m=new RegExp("url\\('(.*?)'\\)").exec(val);if(m.length>1)val="url('"+eval(tinyMCE.getParam('urlconverter_callback')+"(m[1], null, true);")+"')";}if(tinyMCE.getParam("force_hex_style_colors"))val=tinyMCE.convertRGBToHex(val,true);if(val!="url('')")str+=key.toLowerCase()+": "+val+"; ";}}if(new RegExp('; $').test(str))str=str.substring(0,str.length-2);return str;};TinyMCE_Engine.prototype.convertRGBToHex=function(s,k){if(s.toLowerCase().indexOf('rgb')!=-1){var re=new RegExp("(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)","gi");var rgb=s.replace(re,"$1,$2,$3,$4,$5").split(',');if(rgb.length==5){r=parseInt(rgb[1]).toString(16);g=parseInt(rgb[2]).toString(16);b=parseInt(rgb[3]).toString(16);r=r.length==1?'0'+r:r;g=g.length==1?'0'+g:g;b=b.length==1?'0'+b:b;s="#"+r+g+b;if(k)s=rgb[0]+s+rgb[4];}}return s;};TinyMCE_Engine.prototype.convertHexToRGB=function(s){if(s.indexOf('#')!=-1){s=s.replace(new RegExp('[^0-9A-F]','gi'),'');return"rgb("+parseInt(s.substring(0,2),16)+","+parseInt(s.substring(2,4),16)+","+parseInt(s.substring(4,6),16)+")";}return s;};TinyMCE_Engine.prototype.convertSpansToFonts=function(doc){var sizes=tinyMCE.getParam('font_size_style_values').replace(/\s+/,'').split(',');var h=doc.body.innerHTML;h=h.replace(/<span/gi,'<font');h=h.replace(/<\/span/gi,'</font');doc.body.innerHTML=h;var s=doc.getElementsByTagName("font");for(var i=0;i<s.length;i++){var size=tinyMCE.trim(s[i].style.fontSize).toLowerCase();var fSize=0;for(var x=0;x<sizes.length;x++){if(sizes[x]==size){fSize=x+1;break;}}if(fSize>0){tinyMCE.setAttrib(s[i],'size',fSize);s[i].style.fontSize='';}var fFace=s[i].style.fontFamily;if(fFace!=null&&fFace!=""){tinyMCE.setAttrib(s[i],'face',fFace);s[i].style.fontFamily='';}var fColor=s[i].style.color;if(fColor!=null&&fColor!=""){tinyMCE.setAttrib(s[i],'color',tinyMCE.convertRGBToHex(fColor));s[i].style.color='';}}};TinyMCE_Engine.prototype.convertFontsToSpans=function(doc){var sizes=tinyMCE.getParam('font_size_style_values').replace(/\s+/,'').split(',');var h=doc.body.innerHTML;h=h.replace(/<font/gi,'<span');h=h.replace(/<\/font/gi,'</span');doc.body.innerHTML=h;var fsClasses=tinyMCE.getParam('font_size_classes');if(fsClasses!='')fsClasses=fsClasses.replace(/\s+/,'').split(',');else fsClasses=null;var s=doc.getElementsByTagName("span");for(var i=0;i<s.length;i++){var fSize,fFace,fColor;fSize=tinyMCE.getAttrib(s[i],'size');fFace=tinyMCE.getAttrib(s[i],'face');fColor=tinyMCE.getAttrib(s[i],'color');if(fSize!=""){fSize=parseInt(fSize);if(fSize>0&&fSize<8){if(fsClasses!=null)tinyMCE.setAttrib(s[i],'class',fsClasses[fSize-1]);else s[i].style.fontSize=sizes[fSize-1];}s[i].removeAttribute('size');}if(fFace!=""){s[i].style.fontFamily=fFace;s[i].removeAttribute('face');}if(fColor!=""){s[i].style.color=fColor;s[i].removeAttribute('color');}}};TinyMCE_Engine.prototype.cleanupAnchors=function(doc){var i,cn,x,an=doc.getElementsByTagName("a");for(i=an.length-1;i>=0;i--){if(tinyMCE.getAttrib(an[i],"name")!=""&&tinyMCE.getAttrib(an[i],"href")==""){cn=an[i].childNodes;for(x=cn.length-1;x>=0;x--)tinyMCE.insertAfter(cn[x],an[i]);}}};TinyMCE_Engine.prototype.getContent=function(editor_id){var h;if(typeof(editor_id)!="undefined")tinyMCE.selectedInstance=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedInstance){h=tinyMCE._cleanupHTML(this.selectedInstance,this.selectedInstance.getDoc(),tinyMCE.settings,this.selectedInstance.getBody(),false,true);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(this.selectedInstance.getDoc());return h;}return null;};TinyMCE_Engine.prototype._fixListElements=function(d){var nl,x,a=['ol','ul'],i,n,p,r=new RegExp('^(OL|UL)$'),np;for(x=0;x<a.length;x++){nl=d.getElementsByTagName(a[x]);for(i=0;i<nl.length;i++){n=nl[i];p=n.parentNode;if(r.test(p.nodeName)){np=tinyMCE.prevNode(n,'LI');if(!np){np=d.createElement('li');np.innerHTML='&nbsp;';np.appendChild(n);p.insertBefore(np,p.firstChild);}else np.appendChild(n);}}}};TinyMCE_Engine.prototype._fixTables=function(d){var nl,i,n,p,np,x,t;nl=d.getElementsByTagName('table');for(i=0;i<nl.length;i++){n=nl[i];if((p=tinyMCE.getParentElement(n,'p,div,h1,h2,h3,h4,h5,h6'))!=null){np=p.cloneNode(false);np.removeAttribute('id');t=n;while((n=n.nextSibling))np.appendChild(n);tinyMCE.insertAfter(np,p);tinyMCE.insertAfter(t,p);}}};TinyMCE_Engine.prototype._cleanupHTML=function(inst,doc,config,elm,visual,on_save,on_submit){var h,d,t1,t2,t3,t4,t5,c,s;if(!tinyMCE.getParam('cleanup'))return elm.innerHTML;on_save=typeof(on_save)=='undefined'?false:on_save;c=inst.cleanup;s=inst.settings;d=c.settings.debug;if(d)t1=new Date().getTime();if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertFontsToSpans(doc);if(tinyMCE.getParam("fix_list_elements"))tinyMCE._fixListElements(doc);if(tinyMCE.getParam("fix_table_elements"))tinyMCE._fixTables(doc);tinyMCE._customCleanup(inst,on_save?"get_from_editor_dom":"insert_to_editor_dom",doc.body);if(d)t2=new Date().getTime();c.settings.on_save=on_save;c.idCount=0;c.serializationId++;c.serializedNodes=new Array();c.sourceIndex=-1;if(s.cleanup_serializer=="xml")h=c.serializeNodeAsXML(elm);else h=c.serializeNodeAsHTML(elm);if(d)t3=new Date().getTime();h=h.replace(/<\/?(body|head|html)[^>]*>/gi,'');h=h.replace(new RegExp(' (rowspan="1"|colspan="1")','g'),'');h=h.replace(/<p><hr \/><\/p>/g,'<hr />');h=h.replace(/<p>(&nbsp;|&#160;)<\/p><hr \/><p>(&nbsp;|&#160;)<\/p>/g,'<hr />');h=h.replace(/<td>\s*<br \/>\s*<\/td>/g,'<td>&nbsp;</td>');h=h.replace(/<p>\s*<br \/>\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*(&nbsp;|&#160;)\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*<br \/>\s*&nbsp;\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(new RegExp('<a>(.*?)<\\/a>','g'),'$1');h=h.replace(/<p([^>]*)>\s*<\/p>/g,'<p$1>&nbsp;</p>');if(/^\s*(<br \/>|<p>&nbsp;<\/p>|<p>&#160;<\/p>|<p><\/p>)\s*$/.test(h))h='';if(s.preformatted){h=h.replace(/^<pre>/,'');h=h.replace(/<\/pre>$/,'');h='<pre>'+h+'</pre>';}if(tinyMCE.isGecko){h=h.replace(/<o:p _moz-userdefined="" \/>/g,'');h=h.replace(/<td([^>]*)>\s*<br \/>\s*<\/td>/g,'<td$1>&nbsp;</td>');}if(s.force_br_newlines)h=h.replace(/<p>(&nbsp;|&#160;)<\/p>/g,'<br />');h=tinyMCE._customCleanup(inst,on_save?"get_from_editor":"insert_to_editor",h);if(on_save){h=h.replace(new RegExp(' ?(mceItem[a-zA-Z0-9]*|'+s.visual_table_class+')','g'),'');h=h.replace(new RegExp(' ?class=""','g'),'');}if(s.remove_linebreaks&&!c.settings.indent)h=h.replace(/\n|\r/g,' ');if(d)t4=new Date().getTime();if(on_save&&c.settings.indent)h=c.formatHTML(h);if(on_submit&&(s.encoding=="xml"||s.encoding=="html"))h=c.xmlEncode(h);if(d)t5=new Date().getTime();if(c.settings.debug)tinyMCE.debug("Cleanup in ms: Pre="+(t2-t1)+", Serialize: "+(t3-t2)+", Post: "+(t4-t3)+", Format: "+(t5-t4)+", Sum: "+(t5-t1)+".");return h;};function TinyMCE_Cleanup(){this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.rules=tinyMCE.clearArray(new Array());this.settings={indent_elements:'head,table,tbody,thead,tfoot,form,tr,ul,ol,blockquote,object',newline_before_elements:'h1,h2,h3,h4,h5,h6,pre,address,div,ul,ol,li,meta,option,area,title,link,base,script,td',newline_after_elements:'br,hr,p,pre,address,div,ul,ol,meta,option,area,link,base,script',newline_before_after_elements:'html,head,body,table,thead,tbody,tfoot,tr,form,ul,ol,blockquote,p,object,param,hr,div',indent_char:'\t',indent_levels:1,entity_encoding:'raw',valid_elements:'*[*]',entities:'',url_converter:'',invalid_elements:'',verify_html:false};this.vElements=tinyMCE.clearArray(new Array());this.vElementsRe='';this.closeElementsRe=/^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON|AREA)$/;this.codeElementsRe=/^(SCRIPT|STYLE)$/;this.serializationId=0;this.mceAttribs={href:'mce_href',src:'mce_src',type:'mce_type'};}TinyMCE_Cleanup.prototype={init:function(s){var n,a,i,ir,or,st;for(n in s)this.settings[n]=s[n];s=this.settings;this.inRe=this._arrayToRe(s.indent_elements.split(','),'','^<(',')[^>]*');this.ouRe=this._arrayToRe(s.indent_elements.split(','),'','^<\\/(',')[^>]*');this.nlBeforeRe=this._arrayToRe(s.newline_before_elements.split(','),'gi','<(',')([^>]*)>');this.nlAfterRe=this._arrayToRe(s.newline_after_elements.split(','),'gi','<(',')([^>]*)>');this.nlBeforeAfterRe=this._arrayToRe(s.newline_before_after_elements.split(','),'gi','<(\\/?)(',')([^>]*)>');if(s.invalid_elements!='')this.iveRe=this._arrayToRe(s.invalid_elements.toUpperCase().split(','),'g','^(',')$');else this.iveRe=null;st='';for(i=0;i<s.indent_levels;i++)st+=s.indent_char;this.inStr=st;if(!s.verify_html){s.valid_elements='*[*]';s.extended_valid_elements='';}this.fillStr=s.entity_encoding=="named"?"&nbsp;":"&#160;";this.idCount=0;},addRuleStr:function(s){var r=this.parseRuleStr(s);var n;for(n in r){if(r[n])this.rules[n]=r[n];}this.vElements=tinyMCE.clearArray(new Array());for(n in this.rules){if(this.rules[n])this.vElements[this.vElements.length]=this.rules[n].tag;}this.vElementsRe=this._arrayToRe(this.vElements,'');},parseRuleStr:function(s){var ta,p,r,a,i,x,px,t,tn,y,av,or=tinyMCE.clearArray(new Array()),dv;if(s==null||s.length==0)return or;ta=s.split(',');for(x=0;x<ta.length;x++){s=ta[x];if(s.length==0)continue;p=this.split(/\[|\]/,s);if(p==null||p.length<1)t=s.toUpperCase();else t=p[0].toUpperCase();tn=this.split('/',t);for(y=0;y<tn.length;y++){r={};r.tag=tn[y];r.forceAttribs=null;r.defaultAttribs=null;r.validAttribValues=null;px=r.tag.charAt(0);r.forceOpen=px=='+';r.removeEmpty=px=='-';r.fill=px=='#';r.tag=r.tag.replace(/\+|-|#/g,'');r.oTagName=tn[0].replace(/\+|-|#/g,'').toLowerCase();r.isWild=new RegExp('\\*|\\?|\\+','g').test(r.tag);r.validRe=new RegExp(this._wildcardToRe('^'+r.tag+'$'));if(p.length>1){r.vAttribsRe='^(';a=this.split(/\|/,p[1]);for(i=0;i<a.length;i++){t=a[i];av=new RegExp('(=|:|<)(.*?)$').exec(t);t=t.replace(new RegExp('(=|:|<).*?$'),'');if(av&&av.length>0){if(av[0].charAt(0)==':'){if(!r.forceAttribs)r.forceAttribs=tinyMCE.clearArray(new Array());r.forceAttribs[t.toLowerCase()]=av[0].substring(1);}else if(av[0].charAt(0)=='='){if(!r.defaultAttribs)r.defaultAttribs=tinyMCE.clearArray(new Array());dv=av[0].substring(1);r.defaultAttribs[t.toLowerCase()]=dv==""?"mce_empty":dv;}else if(av[0].charAt(0)=='<'){if(!r.validAttribValues)r.validAttribValues=tinyMCE.clearArray(new Array());r.validAttribValues[t.toLowerCase()]=this._arrayToRe(this.split('?',av[0].substring(1)),'');}}r.vAttribsRe+=''+t.toLowerCase()+(i!=a.length-1?'|':'');a[i]=t.toLowerCase();}r.vAttribsRe+=')$';r.vAttribsRe=this._wildcardToRe(r.vAttribsRe);r.vAttribsReIsWild=new RegExp('\\*|\\?|\\+','g').test(r.vAttribsRe);r.vAttribsRe=new RegExp(r.vAttribsRe);r.vAttribs=a.reverse();}else{r.vAttribsRe='';r.vAttribs=tinyMCE.clearArray(new Array());r.vAttribsReIsWild=false;}or[r.tag]=r;}}return or;},serializeNodeAsXML:function(n){var s,b;if(!this.xmlDoc){if(this.isMSIE){try{this.xmlDoc=new ActiveXObject('MSXML2.DOMDocument');}catch(e){}if(!this.xmlDoc)try{this.xmlDoc=new ActiveXObject('Microsoft.XmlDom');}catch(e){}}else this.xmlDoc=document.implementation.createDocument('','',null);if(!this.xmlDoc)alert("Error XML Parser could not be found.");}if(this.xmlDoc.firstChild)this.xmlDoc.removeChild(this.xmlDoc.firstChild);b=this.xmlDoc.createElement("html");b=this.xmlDoc.appendChild(b);this._convertToXML(n,b);if(this.isMSIE)return this.xmlDoc.xml;else return new XMLSerializer().serializeToString(this.xmlDoc);},_convertToXML:function(n,xn){var xd,el,i,l,cn,at,no,hc=false;if(this._isDuplicate(n))return;xd=this.xmlDoc;switch(n.nodeType){case 1:hc=n.hasChildNodes();el=xd.createElement(n.nodeName.toLowerCase());at=n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified&&no.nodeValue)el.setAttribute(no.nodeName.toLowerCase(),no.nodeValue);}if(!hc&&!this.closeElementsRe.test(n.nodeName))el.appendChild(xd.createTextNode(""));xn=xn.appendChild(el);break;case 3:xn.appendChild(xd.createTextNode(n.nodeValue));return;case 8:xn.appendChild(xd.createComment(n.nodeValue));return;}if(hc){cn=n.childNodes;for(i=0,l=cn.length;i<l;i++)this._convertToXML(cn[i],xn);}},serializeNodeAsHTML:function(n){var en,no,h='',i,l,r,cn,va=false,f=false,at,hc;this._setupRules();if(this._isDuplicate(n))return'';switch(n.nodeType){case 1:hc=n.hasChildNodes();if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&n.nodeName.indexOf('/')!=-1)break;if(this.vElementsRe.test(n.nodeName)&&(!this.iveRe||!this.iveRe.test(n.nodeName))){va=true;r=this.rules[n.nodeName];if(!r){at=this.rules;for(no in at){if(at[no]&&at[no].validRe.test(n.nodeName)){r=at[no];break;}}}en=r.isWild?n.nodeName.toLowerCase():r.oTagName;f=r.fill;if(r.removeEmpty&&!hc)return"";h+='<'+en;if(r.vAttribsReIsWild){at=n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified&&r.vAttribsRe.test(no.nodeName))h+=this._serializeAttribute(n,r,no.nodeName);}}else{for(i=r.vAttribs.length-1;i>-1;i--)h+=this._serializeAttribute(n,r,r.vAttribs[i]);}if(!this.settings.on_save){at=this.mceAttribs;for(no in at){if(at[no])h+=this._serializeAttribute(n,r,at[no]);}}if(this.closeElementsRe.test(n.nodeName))return h+' />';h+='>';if(this.isMSIE&&this.codeElementsRe.test(n.nodeName))h+=n.innerHTML;}break;case 3:if(n.parentNode&&this.codeElementsRe.test(n.parentNode.nodeName))return this.isMSIE?'':n.nodeValue;return this.xmlEncode(n.nodeValue);case 8:return"<!--"+this._trimComment(n.nodeValue)+"-->";}if(hc){cn=n.childNodes;for(i=0,l=cn.length;i<l;i++)h+=this.serializeNodeAsHTML(cn[i]);}if(f&&!hc)h+=this.fillStr;if(va)h+='</'+en+'>';return h;},_serializeAttribute:function(n,r,an){var av='',t,os=this.settings.on_save;if(os&&(an.indexOf('mce_')==0||an.indexOf('_moz')==0))return'';if(os&&this.mceAttribs[an])av=this._getAttrib(n,this.mceAttribs[an]);if(av.length==0)av=this._getAttrib(n,an);if(av.length==0&&r.defaultAttribs&&(t=r.defaultAttribs[an])){av=t;if(av=="mce_empty")return" "+an+'=""';}if(r.forceAttribs&&(t=r.forceAttribs[an]))av=t;if(os&&av.length!=0&&this.settings.url_converter.length!=0&&/^(src|href|longdesc)$/.test(an))av=eval(this.settings.url_converter+'(this, n, av)');if(av.length!=0&&r.validAttribValues&&r.validAttribValues[an]&&!r.validAttribValues[an].test(av))return"";if(av.length!=0&&av=="{$uid}")av="uid_"+(this.idCount++);if(av.length!=0)return" "+an+"="+'"'+this.xmlEncode(av)+'"';return"";},formatHTML:function(h){var s=this.settings,p='',i=0,li=0,o='',l;h=h.replace(/\r/g,'');h='\n'+h;h=h.replace(new RegExp('\\n\\s+','gi'),'\n');h=h.replace(this.nlBeforeRe,'\n<$1$2>');h=h.replace(this.nlAfterRe,'<$1$2>\n');h=h.replace(this.nlBeforeAfterRe,'\n<$1$2$3>\n');h+='\n';while((i=h.indexOf('\n',i+1))!=-1){if((l=h.substring(li+1,i)).length!=0){if(this.ouRe.test(l)&&p.length>=s.indent_levels)p=p.substring(s.indent_levels);o+=p+l+'\n';if(this.inRe.test(l))p+=this.inStr;}li=i;}return o;},xmlEncode:function(s){var i,l,e,o='',c;this._setupEntities();switch(this.settings.entity_encoding){case"raw":return tinyMCE.xmlEncode(s);case"named":for(i=0,l=s.length;i<l;i++){c=s.charCodeAt(i);e=this.entities[c];if(e&&e!='')o+='&'+e+';';else o+=String.fromCharCode(c);}return o;case"numeric":for(i=0,l=s.length;i<l;i++){c=s.charCodeAt(i);if(c>127||c==60||c==62||c==38||c==39||c==34)o+='&#'+c+";";else o+=String.fromCharCode(c);}return o;}return s;},split:function(re,s){var c=s.split(re);var i,l,o=new Array();for(i=0,l=c.length;i<l;i++){if(c[i]!='')o[i]=c[i];}return o;},_trimComment:function(s){s=s.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");s=s.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");return s;},_getAttrib:function(e,n,d){if(typeof(d)=="undefined")d="";if(!e||e.nodeType!=1)return d;var v=e.getAttribute(n,0);if(n=="class"&&!v)v=e.className;if(this.isMSIE&&n=="http-equiv")v=e.httpEquiv;if(this.isMSIE&&e.nodeName=="FORM"&&n=="enctype"&&v=="application/x-www-form-urlencoded")v="";if(this.isMSIE&&e.nodeName=="INPUT"&&n=="size"&&v=="20")v="";if(this.isMSIE&&e.nodeName=="INPUT"&&n=="maxlength"&&v=="2147483647")v="";if(n=="style"&&!tinyMCE.isOpera)v=e.style.cssText;if(n=='style')v=tinyMCE.serializeStyle(tinyMCE.parseStyle(v));if(this.settings.on_save&&n.indexOf('on')!=-1&&this.settings.on_save&&v&&v!="")v=tinyMCE.cleanupEventStr(v);return(v&&v!="")?''+v:d;},_urlConverter:function(c,n,v){if(!c.settings.on_save)return tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href,v);else if(tinyMCE.getParam('convert_urls'))return eval(tinyMCE.settings.urlconverter_callback+"(v, n, true);");return v;},_arrayToRe:function(a,op,be,af){var i,r;op=typeof(op)=="undefined"?"gi":op;be=typeof(be)=="undefined"?"^(":be;af=typeof(af)=="undefined"?")$":af;r=be;for(i=0;i<a.length;i++)r+=this._wildcardToRe(a[i])+(i!=a.length-1?"|":"");r+=af;return new RegExp(r,op);},_wildcardToRe:function(s){s=s.replace(/\?/g,'(\\S?)');s=s.replace(/\+/g,'(\\S+)');s=s.replace(/\*/g,'(\\S*)');return s;},_setupEntities:function(){var n,a,i,s=this.settings;if(!this.entitiesDone){if(s.entity_encoding=="named"){n=tinyMCE.clearArray(new Array());a=this.split(',',s.entities);for(i=0;i<a.length;i+=2)n[a[i]]=a[i+1];this.entities=n;}this.entitiesDone=true;}},_setupRules:function(){var s=this.settings;if(!this.rulesDone){this.addRuleStr(s.valid_elements);this.addRuleStr(s.extended_valid_elements);this.rulesDone=true;}},_isDuplicate:function(n){var i;if(!this.settings.fix_content_duplication)return false;if(tinyMCE.isMSIE&&!tinyMCE.isOpera&&n.nodeType==1){if(n.mce_serialized==this.serializationId)return true;n.setAttribute('mce_serialized',this.serializationId);}else{for(i=0;i<this.serializedNodes.length;i++){if(this.serializedNodes[i]==n)return true;}this.serializedNodes[this.serializedNodes.length]=n;}return false;}};TinyMCE_Engine.prototype.getElementByAttributeValue=function(n,e,a,v){return(n=this.getElementsByAttributeValue(n,e,a,v)).length==0?null:n[0];};TinyMCE_Engine.prototype.getElementsByAttributeValue=function(n,e,a,v){var i,nl=n.getElementsByTagName(e),o=new Array();for(i=0;i<nl.length;i++){if(tinyMCE.getAttrib(nl[i],a).indexOf(v)!=-1)o[o.length]=nl[i];}return o;};TinyMCE_Engine.prototype.isBlockElement=function(n){return n!=null&&n.nodeType==1&&this.blockRegExp.test(n.nodeName);};TinyMCE_Engine.prototype.getParentBlockElement=function(n){while(n){if(this.isBlockElement(n))return n;n=n.parentNode;}return null;};TinyMCE_Engine.prototype.insertAfter=function(n,r){if(r.nextSibling)r.parentNode.insertBefore(n,r.nextSibling);else r.parentNode.appendChild(n);};TinyMCE_Engine.prototype.setInnerHTML=function(e,h){var i,nl,n;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){h=h.replace(/\s\/>/g,'>');h=h.replace(/<p([^>]*)>\u00A0?<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');h=h.replace(/<p([^>]*)>\s*&nbsp;\s*<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');h=h.replace(/<p([^>]*)>\s+<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');e.innerHTML=tinyMCE.uniqueTag+h;e.firstChild.removeNode(true);nl=e.getElementsByTagName("p");for(i=nl.length-1;i>=0;i--){n=nl[i];if(n.nodeName=='P'&&!n.hasChildNodes()&&!n.mce_keep)n.parentNode.removeChild(n);}}else{h=this.fixGeckoBaseHREFBug(1,e,h);e.innerHTML=h;this.fixGeckoBaseHREFBug(2,e,h);}};TinyMCE_Engine.prototype.getOuterHTML=function(e){if(tinyMCE.isMSIE)return e.outerHTML;var d=e.ownerDocument.createElement("body");d.appendChild(e);return d.innerHTML;};TinyMCE_Engine.prototype.setOuterHTML=function(e,h){if(tinyMCE.isMSIE){e.outerHTML=h;return;}var d=e.ownerDocument.createElement("body");d.innerHTML=h;e.parentNode.replaceChild(d.firstChild,e);};TinyMCE_Engine.prototype._getElementById=function(id,d){var e,i,j,f;if(typeof(d)=="undefined")d=document;e=d.getElementById(id);if(!e){f=d.forms;for(i=0;i<f.length;i++){for(j=0;j<f[i].elements.length;j++){if(f[i].elements[j].name==id){e=f[i].elements[j];break;}}}}return e;};TinyMCE_Engine.prototype.getNodeTree=function(n,na,t,nn){var i;if(typeof(t)=="undefined"||n.nodeType==t&&(typeof(nn)=="undefined"||n.nodeName==nn))na[na.length]=n;if(n.hasChildNodes()){for(i=0;i<n.childNodes.length;i++)tinyMCE.getNodeTree(n.childNodes[i],na,t,nn);}return na;};TinyMCE_Engine.prototype.getParentElement=function(node,names,attrib_name,attrib_value){if(typeof(names)=="undefined"){if(node.nodeType==1)return node;while((node=node.parentNode)!=null&&node.nodeType!=1);return node;}if(node==null)return null;var namesAr=names.toUpperCase().split(',');do{for(var i=0;i<namesAr.length;i++){if(node.nodeName==namesAr[i]||names=="*"){if(typeof(attrib_name)=="undefined")return node;else if(node.getAttribute(attrib_name)){if(typeof(attrib_value)=="undefined"){if(node.getAttribute(attrib_name)!="")return node;}else if(node.getAttribute(attrib_name)==attrib_value)return node;}}}}while((node=node.parentNode)!=null);return null;};TinyMCE_Engine.prototype.getParentNode=function(n,f){while(n){if(f(n))return n;n=n.parentNode;}return null;};TinyMCE_Engine.prototype.getAttrib=function(elm,name,default_value){if(typeof(default_value)=="undefined")default_value="";if(!elm||elm.nodeType!=1)return default_value;var v=elm.getAttribute(name);if(name=="class"&&!v)v=elm.className;if(tinyMCE.isGecko&&name=="src"&&elm.src!=null&&elm.src!="")v=elm.src;if(tinyMCE.isGecko&&name=="href"&&elm.href!=null&&elm.href!="")v=elm.href;if(name=="http-equiv"&&tinyMCE.isMSIE)v=elm.httpEquiv;if(name=="style"&&!tinyMCE.isOpera)v=elm.style.cssText;return(v&&v!="")?v:default_value;};TinyMCE_Engine.prototype.setAttrib=function(element,name,value,fix_value){if(typeof(value)=="number"&&value!=null)value=""+value;if(fix_value){if(value==null)value="";var re=new RegExp('[^0-9%]','g');value=value.replace(re,'');}if(name=="style")element.style.cssText=value;if(name=="class")element.className=value;if(value!=null&&value!=""&&value!=-1)element.setAttribute(name,value);else element.removeAttribute(name);};TinyMCE_Engine.prototype.setStyleAttrib=function(elm,name,value){eval('elm.style.'+name+'=value;');if(tinyMCE.isMSIE&&value==null||value==''){var str=tinyMCE.serializeStyle(tinyMCE.parseStyle(elm.style.cssText));elm.style.cssText=str;elm.setAttribute("style",str);}};TinyMCE_Engine.prototype.switchClass=function(ei,c){var e;if(tinyMCE.switchClassCache[ei])e=tinyMCE.switchClassCache[ei];else e=tinyMCE.switchClassCache[ei]=document.getElementById(ei);if(e){if(tinyMCE.settings.button_tile_map&&e.className&&e.className.indexOf('mceTiledButton')==0)c='mceTiledButton '+c;e.className=c;}};TinyMCE_Engine.prototype.getAbsPosition=function(n){var p={absLeft:0,absTop:0};while(n){p.absLeft+=n.offsetLeft;p.absTop+=n.offsetTop;n=n.offsetParent;}return p;};TinyMCE_Engine.prototype.prevNode=function(e,n){var a=n.split(','),i;while((e=e.previousSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};TinyMCE_Engine.prototype.nextNode=function(e,n){var a=n.split(','),i;while((e=e.nextSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};TinyMCE_Engine.prototype.selectNodes=function(n,f,a){var i;if(!a)a=new Array();if(f(n))a[a.length]=n;if(n.hasChildNodes()){for(i=0;i<n.childNodes.length;i++)tinyMCE.selectNodes(n.childNodes[i],f,a);}return a;};TinyMCE_Engine.prototype.addCSSClass=function(e,c,b){var o=this.removeCSSClass(e,c);return e.className=b?c+(o!=''?(' '+o):''):(o!=''?(o+' '):'')+c;};TinyMCE_Engine.prototype.removeCSSClass=function(e,c){var a=this.explode(' ',e.className),i;for(i=0;i<a.length;i++){if(a[i]==c)a[i]='';}return e.className=a.join(' ');};TinyMCE_Engine.prototype.renameElement=function(e,n,d){var ne,i,ar;d=typeof(d)=="undefined"?tinyMCE.selectedInstance.getDoc():d;if(e){ne=d.createElement(n);ar=e.attributes;for(i=ar.length-1;i>-1;i--){if(ar[i].specified&&ar[i].nodeValue)ne.setAttribute(ar[i].nodeName.toLowerCase(),ar[i].nodeValue);}ar=e.childNodes;for(i=0;i<ar.length;i++)ne.appendChild(ar[i].cloneNode(true));e.parentNode.replaceChild(ne,e);}};TinyMCE_Engine.prototype.parseURL=function(url_str){var urlParts=new Array();if(url_str){var pos,lastPos;pos=url_str.indexOf('://');if(pos!=-1){urlParts['protocol']=url_str.substring(0,pos);lastPos=pos+3;}for(var i=lastPos;i<url_str.length;i++){var chr=url_str.charAt(i);if(chr==':')break;if(chr=='/')break;}pos=i;urlParts['host']=url_str.substring(lastPos,pos);urlParts['port']="";lastPos=pos;if(url_str.charAt(pos)==':'){pos=url_str.indexOf('/',lastPos);urlParts['port']=url_str.substring(lastPos+1,pos);}lastPos=pos;pos=url_str.indexOf('?',lastPos);if(pos==-1)pos=url_str.indexOf('#',lastPos);if(pos==-1)pos=url_str.length;urlParts['path']=url_str.substring(lastPos,pos);lastPos=pos;if(url_str.charAt(pos)=='?'){pos=url_str.indexOf('#');pos=(pos==-1)?url_str.length:pos;urlParts['query']=url_str.substring(lastPos+1,pos);}lastPos=pos;if(url_str.charAt(pos)=='#'){pos=url_str.length;urlParts['anchor']=url_str.substring(lastPos+1,pos);}}return urlParts;};TinyMCE_Engine.prototype.serializeURL=function(up){var o="";if(up['protocol'])o+=up['protocol']+"://";if(up['host'])o+=up['host'];if(up['port'])o+=":"+up['port'];if(up['path'])o+=up['path'];if(up['query'])o+="?"+up['query'];if(up['anchor'])o+="#"+up['anchor'];return o;};TinyMCE_Engine.prototype.convertAbsoluteURLToRelativeURL=function(base_url,url_to_relative){var baseURL=this.parseURL(base_url);var targetURL=this.parseURL(url_to_relative);var strTok1;var strTok2;var breakPoint=0;var outPath="";var forceSlash=false;if(targetURL.path=="")targetURL.path="/";else forceSlash=true;base_url=baseURL.path.substring(0,baseURL.path.lastIndexOf('/'));strTok1=base_url.split('/');strTok2=targetURL.path.split('/');if(strTok1.length>=strTok2.length){for(var i=0;i<strTok1.length;i++){if(i>=strTok2.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(strTok1.length<strTok2.length){for(var i=0;i<strTok2.length;i++){if(i>=strTok1.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(breakPoint==1)return targetURL.path;for(var i=0;i<(strTok1.length-(breakPoint-1));i++)outPath+="../";for(var i=breakPoint-1;i<strTok2.length;i++){if(i!=(breakPoint-1))outPath+="/"+strTok2[i];else outPath+=strTok2[i];}targetURL.protocol=null;targetURL.host=null;targetURL.port=null;targetURL.path=outPath==""&&forceSlash?"/":outPath;var fileName=baseURL.path;var pos;if((pos=fileName.lastIndexOf('/'))!=-1)fileName=fileName.substring(pos+1);if(fileName==targetURL.path&&targetURL.anchor!="")targetURL.path="";if(targetURL.path==""&&!targetURL.anchor)targetURL.path=fileName!=""?fileName:"/";return this.serializeURL(targetURL);};TinyMCE_Engine.prototype.convertRelativeToAbsoluteURL=function(base_url,relative_url){var baseURL=this.parseURL(base_url);var relURL=this.parseURL(relative_url);if(relative_url==""||relative_url.charAt(0)=='/'||relative_url.indexOf('://')!=-1||relative_url.indexOf('mailto:')!=-1||relative_url.indexOf('javascript:')!=-1)return relative_url;baseURLParts=baseURL['path'].split('/');relURLParts=relURL['path'].split('/');var newBaseURLParts=new Array();for(var i=baseURLParts.length-1;i>=0;i--){if(baseURLParts[i].length==0)continue;newBaseURLParts[newBaseURLParts.length]=baseURLParts[i];}baseURLParts=newBaseURLParts.reverse();var newRelURLParts=new Array();var numBack=0;for(var i=relURLParts.length-1;i>=0;i--){if(relURLParts[i].length==0||relURLParts[i]==".")continue;if(relURLParts[i]=='..'){numBack++;continue;}if(numBack>0){numBack--;continue;}newRelURLParts[newRelURLParts.length]=relURLParts[i];}relURLParts=newRelURLParts.reverse();var len=baseURLParts.length-numBack;var absPath=(len<=0?"":"/")+baseURLParts.slice(0,len).join('/')+"/"+relURLParts.join('/');var start="",end="";relURL.protocol=baseURL.protocol;relURL.host=baseURL.host;relURL.port=baseURL.port;if(relURL.path.charAt(relURL.path.length-1)=="/")absPath+="/";relURL.path=absPath;return this.serializeURL(relURL);};TinyMCE_Engine.prototype.convertURL=function(url,node,on_save){var prot=document.location.protocol;var host=document.location.hostname;var port=document.location.port;if(prot=="file:")return url;url=tinyMCE.regexpReplace(url,'(http|https):///','/');if(url.indexOf('mailto:')!=-1||url.indexOf('javascript:')!=-1||tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0)=="#")return url;if(!tinyMCE.isMSIE&&!on_save&&url.indexOf("://")==-1&&url.charAt(0)!='/')return tinyMCE.settings['base_href']+url;if(on_save&&tinyMCE.getParam('relative_urls')){var curl=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],url);if(curl.charAt(0)=='/')curl=tinyMCE.settings['document_base_prefix']+curl;var urlParts=tinyMCE.parseURL(curl);var tmpUrlParts=tinyMCE.parseURL(tinyMCE.settings['document_base_url']);if(urlParts['host']==tmpUrlParts['host']&&(urlParts['port']==tmpUrlParts['port']))return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'],curl);}if(!tinyMCE.getParam('relative_urls')){var urlParts=tinyMCE.parseURL(url);var baseUrlParts=tinyMCE.parseURL(tinyMCE.settings['base_href']);url=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],url);if(urlParts['anchor']&&urlParts['path']==baseUrlParts['path'])return"#"+urlParts['anchor'];}if(tinyMCE.getParam('remove_script_host')){var start="",portPart="";if(port!="")portPart=":"+port;start=prot+"//"+host+portPart+"/";if(url.indexOf(start)==0)url=url.substring(start.length-1);}return url;};TinyMCE_Engine.prototype.convertAllRelativeURLs=function(body){var elms=body.getElementsByTagName("img");for(var i=0;i<elms.length;i++){var src=tinyMCE.getAttrib(elms[i],'src');var msrc=tinyMCE.getAttrib(elms[i],'mce_src');if(msrc!="")src=msrc;if(src!=""){src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],src);elms[i].setAttribute("src",src);}}var elms=body.getElementsByTagName("a");for(var i=0;i<elms.length;i++){var href=tinyMCE.getAttrib(elms[i],'href');var mhref=tinyMCE.getAttrib(elms[i],'mce_href');if(mhref!="")href=mhref;if(href&&href!=""){href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],href);elms[i].setAttribute("href",href);}}};TinyMCE_Engine.prototype.clearArray=function(a){for(var k in a)a[k]=null;return a;};TinyMCE_Engine.prototype._setEventsEnabled=function(node,state){var events=new Array('onfocus','onblur','onclick','ondblclick','onmousedown','onmouseup','onmouseover','onmousemove','onmouseout','onkeypress','onkeydown','onkeydown','onkeyup');var evs=tinyMCE.settings['event_elements'].split(',');for(var y=0;y<evs.length;y++){var elms=node.getElementsByTagName(evs[y]);for(var i=0;i<elms.length;i++){var event="";for(var x=0;x<events.length;x++){if((event=tinyMCE.getAttrib(elms[i],events[x]))!=''){event=tinyMCE.cleanupEventStr(""+event);if(!state)event="return true;"+event;else event=event.replace(/^return true;/gi,'');elms[i].removeAttribute(events[x]);elms[i].setAttribute(events[x],event);}}}}};TinyMCE_Engine.prototype._eventPatch=function(editor_id){var n,inst,win,e;if(typeof(tinyMCE)=="undefined")return true;try{if(tinyMCE.selectedInstance){win=tinyMCE.selectedInstance.getWin();if(win&&win.event){e=win.event;if(!e.target)e.target=e.srcElement;TinyMCE_Engine.prototype.handleEvent(e);return;}}for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;tinyMCE.selectedInstance=inst;win=inst.getWin();if(win&&win.event){e=win.event;if(!e.target)e.target=e.srcElement;TinyMCE_Engine.prototype.handleEvent(e);return;}}}catch(ex){}};TinyMCE_Engine.prototype.unloadHandler=function(){tinyMCE.triggerSave(true,true);};TinyMCE_Engine.prototype.addEventHandlers=function(inst){var doc=inst.getDoc();inst.switchSettings();if(tinyMCE.isMSIE){tinyMCE.addEvent(doc,"keypress",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"keyup",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"keydown",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"mouseup",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"mousedown",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"click",TinyMCE_Engine.prototype._eventPatch);}else{tinyMCE.addEvent(doc,"keypress",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keydown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keyup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"click",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mouseup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mousedown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"focus",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"blur",tinyMCE.handleEvent);eval('try { doc.designMode = "On"; } catch(e) {}');}};TinyMCE_Engine.prototype.onMouseMove=function(){var inst;if(!tinyMCE.hasMouseMoved){inst=tinyMCE.selectedInstance;if(inst.isFocused){inst.undoBookmark=inst.selection.getBookmark();tinyMCE.hasMouseMoved=true;}}};TinyMCE_Engine.prototype.cancelEvent=function(e){if(tinyMCE.isMSIE){e.returnValue=false;e.cancelBubble=true;}else e.preventDefault();};TinyMCE_Engine.prototype.addEvent=function(o,n,h){if(o.attachEvent)o.attachEvent("on"+n,h);else o.addEventListener(n,h,false);};TinyMCE_Engine.prototype.addSelectAccessibility=function(e,s,w){if(!s._isAccessible){s.onkeydown=tinyMCE.accessibleEventHandler;s.onblur=tinyMCE.accessibleEventHandler;s._isAccessible=true;s._win=w;}return false;};TinyMCE_Engine.prototype.accessibleEventHandler=function(e){var win=this._win;e=tinyMCE.isMSIE?win.event:e;var elm=tinyMCE.isMSIE?e.srcElement:e.target;if(e.type=="blur"){if(elm.oldonchange){elm.onchange=elm.oldonchange;elm.oldonchange=null;}return true;}if(elm.nodeName=="SELECT"&&!elm.oldonchange){elm.oldonchange=elm.onchange;elm.onchange=null;}if(e.keyCode==13||e.keyCode==32){elm.onchange=elm.oldonchange;elm.onchange();elm.oldonchange=null;tinyMCE.cancelEvent(e);return false;}return true;};TinyMCE_Engine.prototype._resetIframeHeight=function(){var ife;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){ife=tinyMCE.selectedInstance.iframeElement;if(ife._oldHeight){ife.style.height=ife._oldHeight;ife.height=ife._oldHeight;}}};function TinyMCE_Selection(inst){this.instance=inst;};TinyMCE_Selection.prototype={getSelectedHTML:function(){var inst=this.instance;var e,r=this.getRng(),h;if(tinyMCE.isSafari){return r.toString();}e=document.createElement("body");if(tinyMCE.isGecko)e.appendChild(r.cloneContents());else e.innerHTML=r.item?r.item(0).outerHTML:r.htmlText;h=tinyMCE._cleanupHTML(inst,inst.contentDocument,inst.settings,e,e,false,true,false);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(inst.getDoc());return h;},getSelectedText:function(){var inst=this.instance;var d,r,s,t;if(tinyMCE.isMSIE){d=inst.getDoc();if(d.selection.type=="Text"){r=d.selection.createRange();t=r.text;}else t='';}else{s=this.getSel();if(s&&s.toString)t=s.toString();else t='';}return t;},getBookmark:function(simple){var rng=this.getRng();var doc=this.instance.getDoc();var sp,le,s,e,nl,i,si,ei;var trng,sx,sy,xx=-999999999;if(tinyMCE.isOpera)return null;sx=doc.body.scrollLeft+doc.documentElement.scrollLeft;sy=doc.body.scrollTop+doc.documentElement.scrollTop;if(tinyMCE.isSafari||tinyMCE.isGecko)return{rng:rng,scrollX:sx,scrollY:sy};if(tinyMCE.isMSIE){if(simple)return{rng:rng};if(rng.item){e=rng.item(0);nl=doc.getElementsByTagName(e.nodeName);for(i=0;i<nl.length;i++){if(e==nl[i]){sp=i;break;}}return{tag:e.nodeName,index:sp,scrollX:sx,scrollY:sy};}else{trng=rng.duplicate();trng.collapse(true);sp=Math.abs(trng.move('character',xx));trng=rng.duplicate();trng.collapse(false);le=Math.abs(trng.move('character',xx))-sp;return{start:sp,length:le,scrollX:sx,scrollY:sy};}}if(tinyMCE.isGecko){s=tinyMCE.getParentElement(rng.startContainer);for(si=0;si<s.childNodes.length&&s.childNodes[si]!=rng.startContainer;si++);nl=doc.getElementsByTagName(s.nodeName);for(i=0;i<nl.length;i++){if(s==nl[i]){sp=i;break;}}e=tinyMCE.getParentElement(rng.endContainer);for(ei=0;ei<e.childNodes.length&&e.childNodes[ei]!=rng.endContainer;ei++);nl=doc.getElementsByTagName(e.nodeName);for(i=0;i<nl.length;i++){if(e==nl[i]){le=i;break;}}return{startTag:s.nodeName,start:sp,startIndex:si,endTag:e.nodeName,end:le,endIndex:ei,startOffset:rng.startOffset,endOffset:rng.endOffset,scrollX:sx,scrollY:sy};}return null;},moveToBookmark:function(bookmark){var rng,nl,i;var inst=this.instance;var doc=inst.getDoc();var win=inst.getWin();var sel=this.getSel();if(!bookmark)return false;if(tinyMCE.isSafari){sel.setBaseAndExtent(bookmark.startContainer,bookmark.startOffset,bookmark.endContainer,bookmark.endOffset);return true;}if(tinyMCE.isMSIE){if(bookmark.rng){bookmark.rng.select();return true;}win.focus();if(bookmark.tag){rng=inst.getBody().createControlRange();nl=doc.getElementsByTagName(bookmark.tag);if(nl.length>bookmark.index){try{rng.addElement(nl[bookmark.index]);}catch(ex){}}}else{rng=inst.getSel().createRange();rng.moveToElementText(inst.getBody());rng.collapse(true);rng.moveStart('character',bookmark.start);rng.moveEnd('character',bookmark.length);}rng.select();win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}if(tinyMCE.isGecko&&bookmark.rng){sel.removeAllRanges();sel.addRange(bookmark.rng);win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}if(tinyMCE.isGecko){rng=doc.createRange();nl=doc.getElementsByTagName(bookmark.startTag);if(nl.length>bookmark.start)rng.setStart(nl[bookmark.start].childNodes[bookmark.startIndex],bookmark.startOffset);nl=doc.getElementsByTagName(bookmark.endTag);if(nl.length>bookmark.end)rng.setEnd(nl[bookmark.end].childNodes[bookmark.endIndex],bookmark.endOffset);sel.removeAllRanges();sel.addRange(rng);win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}return false;},selectNode:function(node,collapse,select_text_node,to_start){var inst=this.instance,sel,rng,nodes;if(!node)return;if(typeof(collapse)=="undefined")collapse=true;if(typeof(select_text_node)=="undefined")select_text_node=false;if(typeof(to_start)=="undefined")to_start=true;if(tinyMCE.isMSIE){rng=inst.getBody().createTextRange();try{rng.moveToElementText(node);if(collapse)rng.collapse(to_start);rng.select();}catch(e){}}else{sel=this.getSel();if(!sel)return;if(tinyMCE.isSafari){sel.setBaseAndExtent(node,0,node,node.innerText.length);if(collapse){if(to_start)sel.collapseToStart();else sel.collapseToEnd();}this.scrollToNode(node);return;}rng=inst.getDoc().createRange();if(select_text_node){nodes=tinyMCE.getNodeTree(node,new Array(),3);if(nodes.length>0)rng.selectNodeContents(nodes[0]);else rng.selectNodeContents(node);}else rng.selectNode(node);if(collapse){if(!to_start&&node.nodeType==3){rng.setStart(node,node.nodeValue.length);rng.setEnd(node,node.nodeValue.length);}else rng.collapse(to_start);}sel.removeAllRanges();sel.addRange(rng);}this.scrollToNode(node);tinyMCE.selectedElement=null;if(node.nodeType==1)tinyMCE.selectedElement=node;},scrollToNode:function(node){var inst=this.instance;var pos,doc,scrollX,scrollY,height;pos=tinyMCE.getAbsPosition(node);doc=inst.getDoc();scrollX=doc.body.scrollLeft+doc.documentElement.scrollLeft;scrollY=doc.body.scrollTop+doc.documentElement.scrollTop;height=tinyMCE.isMSIE?document.getElementById(inst.editorId).style.pixelHeight:inst.targetElement.clientHeight;if(!tinyMCE.settings['auto_resize']&&!(pos.absTop>scrollY&&pos.absTop<(scrollY-25+height)))inst.contentWindow.scrollTo(pos.absLeft,pos.absTop-height+25);},getSel:function(){var inst=this.instance;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return inst.getDoc().selection;return inst.contentWindow.getSelection();},getRng:function(){var inst=this.instance;var sel=this.getSel();if(sel==null)return null;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return sel.createRange();if(tinyMCE.isSafari&&!sel.getRangeAt)return''+window.getSelection();return sel.getRangeAt(0);},getFocusElement:function(){var inst=this.instance;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){var doc=inst.getDoc();var rng=doc.selection.createRange();var elm=rng.item?rng.item(0):rng.parentElement();}else{if(inst.isHidden())return inst.getBody();var sel=this.getSel();var rng=this.getRng();if(!sel||!rng)return null;var elm=rng.commonAncestorContainer;if(!rng.collapsed){if(rng.startContainer==rng.endContainer){if(rng.startOffset-rng.endOffset<2){if(rng.startContainer.hasChildNodes())elm=rng.startContainer.childNodes[rng.startOffset];}}}elm=tinyMCE.getParentElement(elm);}return elm;}};function TinyMCE_UndoRedo(inst){this.instance=inst;this.undoLevels=new Array();this.undoIndex=0;this.typingUndoIndex=-1;this.undoRedo=true;};TinyMCE_UndoRedo.prototype={add:function(l){var b;if(l){this.undoLevels[this.undoLevels.length]=l;return true;}var inst=this.instance;if(this.typingUndoIndex!=-1){this.undoIndex=this.typingUndoIndex;}var newHTML=tinyMCE.trim(inst.getBody().innerHTML);if(this.undoLevels[this.undoIndex]&&newHTML!=this.undoLevels[this.undoIndex].content){tinyMCE.dispatchCallback(inst,'onchange_callback','onChange',inst);var customUndoLevels=tinyMCE.settings['custom_undo_redo_levels'];if(customUndoLevels!=-1&&this.undoLevels.length>customUndoLevels){for(var i=0;i<this.undoLevels.length-1;i++){this.undoLevels[i]=this.undoLevels[i+1];}this.undoLevels.length--;this.undoIndex--;}b=inst.undoBookmark;if(!b)b=inst.selection.getBookmark();this.undoIndex++;this.undoLevels[this.undoIndex]={content:newHTML,bookmark:b};this.undoLevels.length=this.undoIndex+1;return true;}return false;},undo:function(){var inst=this.instance;if(this.undoIndex>0){this.undoIndex--;tinyMCE.setInnerHTML(inst.getBody(),this.undoLevels[this.undoIndex].content);inst.repaint();if(inst.settings.custom_undo_redo_restore_selection)inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);}},redo:function(){var inst=this.instance;tinyMCE.execCommand("mceEndTyping");if(this.undoIndex<(this.undoLevels.length-1)){this.undoIndex++;tinyMCE.setInnerHTML(inst.getBody(),this.undoLevels[this.undoIndex].content);inst.repaint();if(inst.settings.custom_undo_redo_restore_selection)inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);}tinyMCE.triggerNodeChange();}};var TinyMCE_ForceParagraphs={_insertPara:function(inst,e){function isEmpty(para){function isEmptyHTML(html){return html.replace(new RegExp('[ \t\r\n]+','g'),'').toLowerCase()=="";}if(para.getElementsByTagName("img").length>0)return false;if(para.getElementsByTagName("table").length>0)return false;if(para.getElementsByTagName("hr").length>0)return false;var nodes=tinyMCE.getNodeTree(para,new Array(),3);for(var i=0;i<nodes.length;i++){if(!isEmptyHTML(nodes[i].nodeValue))return false;}return true;}var doc=inst.getDoc();var sel=inst.getSel();var win=inst.contentWindow;var rng=sel.getRangeAt(0);var body=doc.body;var rootElm=doc.documentElement;var blockName="P";var rngBefore=doc.createRange();rngBefore.setStart(sel.anchorNode,sel.anchorOffset);rngBefore.collapse(true);var rngAfter=doc.createRange();rngAfter.setStart(sel.focusNode,sel.focusOffset);rngAfter.collapse(true);var direct=rngBefore.compareBoundaryPoints(rngBefore.START_TO_END,rngAfter)<0;var startNode=direct?sel.anchorNode:sel.focusNode;var startOffset=direct?sel.anchorOffset:sel.focusOffset;var endNode=direct?sel.focusNode:sel.anchorNode;var endOffset=direct?sel.focusOffset:sel.anchorOffset;startNode=startNode.nodeName=="BODY"?startNode.firstChild:startNode;endNode=endNode.nodeName=="BODY"?endNode.firstChild:endNode;var startBlock=tinyMCE.getParentBlockElement(startNode);var endBlock=tinyMCE.getParentBlockElement(endNode);if(startBlock&&new RegExp('absolute|relative|static','gi').test(startBlock.style.position))startBlock=null;if(endBlock&&new RegExp('absolute|relative|static','gi').test(endBlock.style.position))endBlock=null;if(startBlock!=null){blockName=startBlock.nodeName;if(blockName=="TD"||blockName=="TABLE"||(blockName=="DIV"&&new RegExp('left|right','gi').test(startBlock.style.cssFloat)))blockName="P";}if(tinyMCE.getParentElement(startBlock,"OL,UL")!=null)return false;if((startBlock!=null&&startBlock.nodeName=="TABLE")||(endBlock!=null&&endBlock.nodeName=="TABLE"))startBlock=endBlock=null;var paraBefore=(startBlock!=null&&startBlock.nodeName==blockName)?startBlock.cloneNode(false):doc.createElement(blockName);var paraAfter=(endBlock!=null&&endBlock.nodeName==blockName)?endBlock.cloneNode(false):doc.createElement(blockName);if(/^(H[1-6])$/.test(blockName))paraAfter=doc.createElement("p");var startChop=startNode;var endChop=endNode;node=startChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;startChop=node;}while((node=node.previousSibling?node.previousSibling:node.parentNode));node=endChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;endChop=node;}while((node=node.nextSibling?node.nextSibling:node.parentNode));if(startChop.nodeName=="TD")startChop=startChop.firstChild;if(endChop.nodeName=="TD")endChop=endChop.lastChild;if(startBlock==null){rng.deleteContents();sel.removeAllRanges();if(startChop!=rootElm&&endChop!=rootElm){rngBefore=rng.cloneRange();if(startChop==body)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);paraBefore.appendChild(rngBefore.cloneContents());if(endChop.parentNode.nodeName==blockName)endChop=endChop.parentNode;rng.setEndAfter(endChop);if(endChop.nodeName!="#text"&&endChop.nodeName!="BODY")rngBefore.setEndAfter(endChop);var contents=rng.cloneContents();if(contents.firstChild&&(contents.firstChild.nodeName==blockName||contents.firstChild.nodeName=="BODY"))paraAfter.innerHTML=contents.firstChild.innerHTML;else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";rng.deleteContents();rngAfter.deleteContents();rngBefore.deleteContents();paraAfter.normalize();rngBefore.insertNode(paraAfter);paraBefore.normalize();rngBefore.insertNode(paraBefore);}else{body.innerHTML="<"+blockName+">&nbsp;</"+blockName+"><"+blockName+">&nbsp;</"+blockName+">";paraAfter=body.childNodes[1];}inst.selection.selectNode(paraAfter,true,true);return true;}if(startChop.nodeName==blockName)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);rngBefore.setEnd(startNode,startOffset);paraBefore.appendChild(rngBefore.cloneContents());rngAfter.setEndAfter(endChop);rngAfter.setStart(endNode,endOffset);var contents=rngAfter.cloneContents();if(contents.firstChild&&contents.firstChild.nodeName==blockName){paraAfter.innerHTML=contents.firstChild.innerHTML;}else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";var rng=doc.createRange();if(!startChop.previousSibling&&startChop.parentNode.nodeName.toUpperCase()==blockName){rng.setStartBefore(startChop.parentNode);}else{if(rngBefore.startContainer.nodeName.toUpperCase()==blockName&&rngBefore.startOffset==0)rng.setStartBefore(rngBefore.startContainer);else rng.setStart(rngBefore.startContainer,rngBefore.startOffset);}if(!endChop.nextSibling&&endChop.parentNode.nodeName.toUpperCase()==blockName)rng.setEndAfter(endChop.parentNode);else rng.setEnd(rngAfter.endContainer,rngAfter.endOffset);rng.deleteContents();rng.insertNode(paraAfter);rng.insertNode(paraBefore);paraAfter.normalize();paraBefore.normalize();inst.selection.selectNode(paraAfter,true,true);return true;},_handleBackSpace:function(inst){var r=inst.getRng(),sn=r.startContainer,nv,s=false;if(sn&&sn.nextSibling&&sn.nextSibling.nodeName=="BR"){nv=sn.nodeValue;if(nv!=null&&nv.length>=r.startOffset&&nv.charAt(r.startOffset-1)==' ')s=true;if(nv!=null&&r.startOffset==nv.length)sn.nextSibling.parentNode.removeChild(sn.nextSibling);}return s;}};function TinyMCE_Layer(id,bm){this.id=id;this.blockerElement=null;this.events=false;this.element=null;this.blockMode=typeof(bm)!='undefined'?bm:true;this.doc=document;};TinyMCE_Layer.prototype={moveRelativeTo:function(re,p){var rep=this.getAbsPosition(re);var w=parseInt(re.offsetWidth);var h=parseInt(re.offsetHeight);var e=this.getElement();var ew=parseInt(e.offsetWidth);var eh=parseInt(e.offsetHeight);var x,y;switch(p){case"tl":x=rep.absLeft;y=rep.absTop;break;case"tr":x=rep.absLeft+w;y=rep.absTop;break;case"bl":x=rep.absLeft;y=rep.absTop+h;break;case"br":x=rep.absLeft+w;y=rep.absTop+h;break;case"cc":x=rep.absLeft+(w/2)-(ew/2);y=rep.absTop+(h/2)-(eh/2);break;}this.moveTo(x,y);},moveBy:function(x,y){var e=this.getElement();this.moveTo(parseInt(e.style.left)+x,parseInt(e.style.top)+y);},moveTo:function(x,y){var e=this.getElement();e.style.left=x+"px";e.style.top=y+"px";this.updateBlocker();},resizeBy:function(w,h){var e=this.getElement();this.resizeTo(parseInt(e.style.width)+w,parseInt(e.style.height)+h);},resizeTo:function(w,h){var e=this.getElement();if(w!=null)e.style.width=w+"px";if(h!=null)e.style.height=h+"px";this.updateBlocker();},show:function(){this.getElement().style.display='block';this.updateBlocker();},hide:function(){this.getElement().style.display='none';this.updateBlocker();},isVisible:function(){return this.getElement().style.display=='block';},getElement:function(){if(!this.element)this.element=this.doc.getElementById(this.id);return this.element;},setBlockMode:function(s){this.blockMode=s;},updateBlocker:function(){var e,b,x,y,w,h;b=this.getBlocker();if(b){if(this.blockMode){e=this.getElement();x=this.parseInt(e.style.left);y=this.parseInt(e.style.top);w=this.parseInt(e.offsetWidth);h=this.parseInt(e.offsetHeight);b.style.left=x+'px';b.style.top=y+'px';b.style.width=w+'px';b.style.height=h+'px';b.style.display=e.style.display;}else b.style.display='none';}},getBlocker:function(){var d,b;if(!this.blockerElement&&this.blockMode){d=this.doc;b=d.createElement("iframe");b.style.cssText='display: none; position: absolute; left: 0; top: 0';b.src='javascript:false;';b.frameBorder='0';b.scrolling='no';d.body.appendChild(b);this.blockerElement=b;}return this.blockerElement;},getAbsPosition:function(n){var p={absLeft:0,absTop:0};while(n){p.absLeft+=n.offsetLeft;p.absTop+=n.offsetTop;n=n.offsetParent;}return p;},create:function(n,c,p){var d=this.doc,e=d.createElement(n);e.setAttribute('id',this.id);if(c)e.className=c;if(!p)p=d.body;p.appendChild(e);return this.element=e;},parseInt:function(s){if(s==null||s=='')return 0;return parseInt(s);}};function TinyMCE_Menu(){var id;if(typeof(tinyMCE.menuCounter)=="undefined")tinyMCE.menuCounter=0;id="mc_menu_"+tinyMCE.menuCounter++;TinyMCE_Layer.call(this,id,true);this.id=id;this.items=new Array();this.needsUpdate=true;};TinyMCE_Menu.prototype=tinyMCE.extend(TinyMCE_Layer.prototype,{init:function(s){var n;this.settings={separator_class:'mceMenuSeparator',title_class:'mceMenuTitle',disabled_class:'mceMenuDisabled',menu_class:'mceMenu',drop_menu:true};for(n in s)this.settings[n]=s[n];this.create('div',this.settings.menu_class);},clear:function(){this.items=new Array();},addTitle:function(t){this.add({type:'title',text:t});},addDisabled:function(t){this.add({type:'disabled',text:t});},addSeparator:function(){this.add({type:'separator'});},addItem:function(t,js){this.add({text:t,js:js});},add:function(mi){this.items[this.items.length]=mi;this.needsUpdate=true;},update:function(){var e=this.getElement(),h='',i,t,m=this.items,s=this.settings;if(this.settings.drop_menu)h+='<span class="mceMenuLine"></span>';h+='<table border="0" cellpadding="0" cellspacing="0">';for(i=0;i<m.length;i++){t=tinyMCE.xmlEncode(m[i].text);c=m[i].class_name?' class="'+m[i].class_name+'"':'';switch(m[i].type){case'separator':h+='<tr class="'+s.separator_class+'"><td>';break;case'title':h+='<tr class="'+s.title_class+'"><td><span'+c+'>'+t+'</span>';break;case'disabled':h+='<tr class="'+s.disabled_class+'"><td><span'+c+'>'+t+'</span>';break;default:h+='<tr><td><a href="javascript:void(0);" onmousedown="'+tinyMCE.xmlEncode(m[i].js)+';return false;"><span'+c+'>'+t+'</span></a>';}h+='</td></tr>';}h+='</table>';e.innerHTML=h;this.needsUpdate=false;this.updateBlocker();},show:function(){var nl,i;if(tinyMCE.lastMenu==this)return;if(this.needsUpdate)this.update();if(tinyMCE.lastMenu&&tinyMCE.lastMenu!=this)tinyMCE.lastMenu.hide();TinyMCE_Layer.prototype.show.call(this);if(!tinyMCE.isOpera){}tinyMCE.lastMenu=this;}});TinyMCE_Engine.prototype.debug=function(){var m="",e,a,i;e=document.getElementById("tinymce_debug");if(!e){var d=document.createElement("div");d.setAttribute("className","debugger");d.className="debugger";d.innerHTML='Debug output:<textarea id="tinymce_debug" style="width: 100%; height: 300px" wrap="nowrap" mce_editable="false"></textarea>';document.body.appendChild(d);e=document.getElementById("tinymce_debug");}a=this.debug.arguments;for(i=0;i<a.length;i++){m+=a[i];if(i<a.length-1)m+=', ';}e.value+=m+"\n";};
\ No newline at end of file
+function TinyMCE_Engine(){this.majorVersion="2";this.minorVersion="0.5.1";this.releaseDate="2006-03-22";this.instances=new Array();this.switchClassCache=new Array();this.windowArgs=new Array();this.loadedFiles=new Array();this.configs=new Array();this.currentConfig=0;this.eventHandlers=new Array();var ua=navigator.userAgent;this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.isMSIE5=this.isMSIE&&(ua.indexOf('MSIE 5')!=-1);this.isMSIE5_0=this.isMSIE&&(ua.indexOf('MSIE 5.0')!=-1);this.isGecko=ua.indexOf('Gecko')!=-1;this.isSafari=ua.indexOf('Safari')!=-1;this.isOpera=ua.indexOf('Opera')!=-1;this.isMac=ua.indexOf('Mac')!=-1;this.isNS7=ua.indexOf('Netscape/7')!=-1;this.isNS71=ua.indexOf('Netscape/7.1')!=-1;this.dialogCounter=0;this.plugins=new Array();this.themes=new Array();this.menus=new Array();this.loadedPlugins=new Array();this.buttonMap=new Array();this.isLoaded=false;if(this.isOpera){this.isMSIE=true;this.isGecko=false;this.isSafari=false;}this.idCounter=0;};TinyMCE_Engine.prototype={init:function(settings){var theme;this.settings=settings;if(typeof(document.execCommand)=='undefined')return;if(!tinyMCE.baseURL){var elements=document.getElementsByTagName('script');for(var i=0;i<elements.length;i++){if(elements[i].src&&(elements[i].src.indexOf("tiny_mce.js")!=-1||elements[i].src.indexOf("tiny_mce_dev.js")!=-1||elements[i].src.indexOf("tiny_mce_src.js")!=-1||elements[i].src.indexOf("tiny_mce_gzip")!=-1)){var src=elements[i].src;tinyMCE.srcMode=(src.indexOf('_src')!=-1||src.indexOf('_dev')!=-1)?'_src':'';tinyMCE.gzipMode=src.indexOf('_gzip')!=-1;src=src.substring(0,src.lastIndexOf('/'));if(settings.exec_mode=="src"||settings.exec_mode=="normal")tinyMCE.srcMode=settings.exec_mode=="src"?'_src':'';tinyMCE.baseURL=src;break;}}}this.documentBasePath=document.location.href;if(this.documentBasePath.indexOf('?')!=-1)this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.indexOf('?'));this.documentURL=this.documentBasePath;this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.lastIndexOf('/'));if(tinyMCE.baseURL.indexOf('://')==-1&&tinyMCE.baseURL.charAt(0)!='/'){tinyMCE.baseURL=this.documentBasePath+"/"+tinyMCE.baseURL;}this._def("mode","none");this._def("theme","advanced");this._def("plugins","",true);this._def("language","en");this._def("docs_language",this.settings['language']);this._def("elements","");this._def("textarea_trigger","mce_editable");this._def("editor_selector","");this._def("editor_deselector","mceNoEditor");this._def("valid_elements","+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]");this._def("extended_valid_elements","");this._def("invalid_elements","");this._def("encoding","");this._def("urlconverter_callback",tinyMCE.getParam("urlconvertor_callback","TinyMCE_Engine.prototype.convertURL"));this._def("save_callback","");this._def("debug",false);this._def("force_br_newlines",false);this._def("force_p_newlines",true);this._def("add_form_submit_trigger",true);this._def("relative_urls",true);this._def("remove_script_host",true);this._def("focus_alert",true);this._def("document_base_url",this.documentURL);this._def("visual",true);this._def("visual_table_class","mceVisualAid");this._def("setupcontent_callback","");this._def("fix_content_duplication",true);this._def("custom_undo_redo",true);this._def("custom_undo_redo_levels",-1);this._def("custom_undo_redo_keyboard_shortcuts",true);this._def("custom_undo_redo_restore_selection",true);this._def("verify_html",true);this._def("apply_source_formatting",false);this._def("directionality","ltr");this._def("cleanup_on_startup",false);this._def("inline_styles",false);this._def("convert_newlines_to_brs",false);this._def("auto_reset_designmode",true);this._def("entities","160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",true);this._def("entity_encoding","named");this._def("cleanup_callback","");this._def("add_unload_trigger",true);this._def("ask",false);this._def("nowrap",false);this._def("auto_resize",false);this._def("auto_focus",false);this._def("cleanup",true);this._def("remove_linebreaks",true);this._def("button_tile_map",false);this._def("submit_patch",true);this._def("browsers","msie,safari,gecko,opera",true);this._def("dialog_type","window");this._def("accessibility_warnings",true);this._def("accessibility_focus",true);this._def("merge_styles_invalid_parents","");this._def("force_hex_style_colors",true);this._def("trim_span_elements",true);this._def("convert_fonts_to_spans",false);this._def("doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');this._def("font_size_classes",'');this._def("font_size_style_values",'xx-small,x-small,small,medium,large,x-large,xx-large',true);this._def("event_elements",'a,img',true);this._def("convert_urls",true);this._def("table_inline_editing",false);this._def("object_resizing",true);this._def("custom_shortcuts",true);this._def("convert_on_click",false);this._def("content_css",'');this._def("fix_list_elements",false);this._def("fix_table_elements",false);if(this.isMSIE&&this.settings['browsers'].indexOf('msie')==-1)return;if(this.isGecko&&this.settings['browsers'].indexOf('gecko')==-1)return;if(this.isSafari&&this.settings['browsers'].indexOf('safari')==-1)return;if(this.isOpera&&this.settings['browsers'].indexOf('opera')==-1)return;var baseHREF=tinyMCE.settings['document_base_url'];var h=document.location.href;var p=h.indexOf('://');if(p>0&&document.location.protocol!="file:"){p=h.indexOf('/',p+3);h=h.substring(0,p);if(baseHREF.indexOf('://')==-1)baseHREF=h+baseHREF;tinyMCE.settings['document_base_url']=baseHREF;tinyMCE.settings['document_base_prefix']=h;}if(baseHREF.indexOf('?')!=-1)baseHREF=baseHREF.substring(0,baseHREF.indexOf('?'));this.settings['base_href']=baseHREF.substring(0,baseHREF.lastIndexOf('/'))+"/";theme=this.settings['theme'];this.blockRegExp=new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dir|fieldset|form|noscript|noframes|menu|isindex)$","i");this.posKeyCodes=new Array(13,45,36,35,33,34,37,38,39,40);this.uniqueURL='http://tinymce.moxiecode.cp/mce_temp_url';this.uniqueTag='<div id="mceTMPElement" style="display: none">TMP</div>';this.callbacks=new Array('onInit','getInfo','getEditorTemplate','setupContent','onChange','onPageLoad','handleNodeChange','initInstance','execCommand','getControlHTML','handleEvent','cleanup');this.settings['theme_href']=tinyMCE.baseURL+"/themes/"+theme;if(!tinyMCE.isMSIE)this.settings['force_br_newlines']=false;if(tinyMCE.getParam("popups_css",false)){var cssPath=tinyMCE.getParam("popups_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['popups_css']=this.documentBasePath+"/"+cssPath;else this.settings['popups_css']=cssPath;}else this.settings['popups_css']=tinyMCE.baseURL+"/themes/"+theme+"/css/editor_popup.css";if(tinyMCE.getParam("editor_css",false)){var cssPath=tinyMCE.getParam("editor_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['editor_css']=this.documentBasePath+"/"+cssPath;else this.settings['editor_css']=cssPath;}else this.settings['editor_css']=tinyMCE.baseURL+"/themes/"+theme+"/css/editor_ui.css";if(tinyMCE.settings['debug']){var msg="Debug: \n";msg+="baseURL: "+this.baseURL+"\n";msg+="documentBasePath: "+this.documentBasePath+"\n";msg+="content_css: "+this.settings['content_css']+"\n";msg+="popups_css: "+this.settings['popups_css']+"\n";msg+="editor_css: "+this.settings['editor_css']+"\n";alert(msg);}if(this.configs.length==0){if(this.isSafari&&this.getParam('safari_warning',false))alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false");if(typeof(TinyMCECompressed)=="undefined"){tinyMCE.addEvent(window,"DOMContentLoaded",TinyMCE_Engine.prototype.onLoad);if(tinyMCE.isMSIE&&!tinyMCE.isOpera){if(document.body)tinyMCE.addEvent(document.body,"readystatechange",TinyMCE_Engine.prototype.onLoad);else tinyMCE.addEvent(document,"readystatechange",TinyMCE_Engine.prototype.onLoad);}tinyMCE.addEvent(window,"load",TinyMCE_Engine.prototype.onLoad);tinyMCE._addUnloadEvents();}}this.loadScript(tinyMCE.baseURL+'/themes/'+this.settings['theme']+'/editor_template'+tinyMCE.srcMode+'.js');this.loadScript(tinyMCE.baseURL+'/langs/'+this.settings['language']+'.js');this.loadCSS(this.settings['editor_css']);var p=tinyMCE.getParam('plugins','',true,',');if(p.length>0){for(var i=0;i<p.length;i++){if(p[i].charAt(0)!='-')this.loadScript(tinyMCE.baseURL+'/plugins/'+p[i]+'/editor_plugin'+tinyMCE.srcMode+'.js');}}settings['cleanup_entities']=new Array();var entities=tinyMCE.getParam('entities','',true,',');for(var i=0;i<entities.length;i+=2)settings['cleanup_entities']['c'+entities[i]]=entities[i+1];settings['index']=this.configs.length;this.configs[this.configs.length]=settings;},_addUnloadEvents:function(){if(tinyMCE.isMSIE){if(tinyMCE.settings['add_unload_trigger']){tinyMCE.addEvent(window,"unload",TinyMCE_Engine.prototype.unloadHandler);tinyMCE.addEvent(window.document,"beforeunload",TinyMCE_Engine.prototype.unloadHandler);}}else{if(tinyMCE.settings['add_unload_trigger'])tinyMCE.addEvent(window,"unload",function(){tinyMCE.triggerSave(true,true);});}},_def:function(key,def_val,t){var v=tinyMCE.getParam(key,def_val);v=t?v.replace(/\s+/g,""):v;this.settings[key]=v;},hasPlugin:function(n){return typeof(this.plugins[n])!="undefined"&&this.plugins[n]!=null;},addPlugin:function(n,p){var op=this.plugins[n];p.baseURL=op?op.baseURL:tinyMCE.baseURL+"/plugins/"+n;this.plugins[n]=p;},setPluginBaseURL:function(n,u){var op=this.plugins[n];if(op)op.baseURL=u;else this.plugins[n]={baseURL:u};},loadPlugin:function(n,u){u=u.indexOf('.js')!=-1?u.substring(0,u.lastIndexOf('/')):u;u=u.charAt(u.length-1)=='/'?u.substring(0,u.length-1):u;this.plugins[n]={baseURL:u};this.loadScript(u+"/editor_plugin"+(tinyMCE.srcMode?'_src':'')+".js");},hasTheme:function(n){return typeof(this.themes[n])!="undefined"&&this.themes[n]!=null;},addTheme:function(n,t){this.themes[n]=t;},addMenu:function(n,m){this.menus[n]=m;},hasMenu:function(n){return typeof(this.plugins[n])!="undefined"&&this.plugins[n]!=null;},loadScript:function(url){for(var i=0;i<this.loadedFiles.length;i++){if(this.loadedFiles[i]==url)return;}document.write('<sc'+'ript language="javascript" type="text/javascript" src="'+url+'"></script>');this.loadedFiles[this.loadedFiles.length]=url;},loadCSS:function(url){var ar=url.replace(/\s+/,'').split(',');var lflen=0,csslen=0;var skip=false;var x=0,i=0;for(x=0,csslen=ar.length;x<csslen;x++){ignore_css=false;if(ar[x]!=null&&ar[x]!='null'&&ar[x].length>0){for(i=0,lflen=this.loadedFiles.length;i<lflen;i++){if(this.loadedFiles[i]==ar[x]){skip=true;break;}}if(!skip){document.write('<link href="'+ar[x]+'" rel="stylesheet" type="text/css" />');this.loadedFiles[this.loadedFiles.length]=ar[x];}}}},importCSS:function(doc,css){var css_ary=css.replace(/\s+/,'').split(',');var csslen,elm,headArr,x,css_file;for(x=0,csslen=css_ary.length;x<csslen;x++){css_file=css_ary[x];if(css_file!=null&&css_file!='null'&&css_file.length>0){if(css_file.indexOf('://')==-1&&css_file.charAt(0)!='/')css_file=this.documentBasePath+"/"+css_file;if(typeof(doc.createStyleSheet)=="undefined"){elm=doc.createElement("link");elm.rel="stylesheet";elm.href=css_file;if((headArr=doc.getElementsByTagName("head"))!=null&&headArr.length>0)headArr[0].appendChild(elm);}else doc.createStyleSheet(css_file);}}},confirmAdd:function(e,settings){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var elementId=elm.name?elm.name:elm.id;tinyMCE.settings=settings;if(tinyMCE.settings['convert_on_click']||(!elm.getAttribute('mce_noask')&&confirm(tinyMCELang['lang_edit_confirm'])))tinyMCE.addMCEControl(elm,elementId);elm.setAttribute('mce_noask','true');},updateContent:function(form_element_name){var formElement=document.getElementById(form_element_name);for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.switchSettings();if(inst.formElement==formElement){var doc=inst.getDoc();tinyMCE._setHTML(doc,inst.formElement.value);if(!tinyMCE.isMSIE)doc.body.innerHTML=tinyMCE._cleanupHTML(inst,doc,this.settings,doc.body,inst.visualAid);}}},addMCEControl:function(replace_element,form_element_name,target_document){var id="mce_editor_"+tinyMCE.idCounter++;var inst=new TinyMCE_Control(tinyMCE.settings);inst.editorId=id;this.instances[id]=inst;inst._onAdd(replace_element,form_element_name,target_document);},removeMCEControl:function(editor_id){var inst=tinyMCE.getInstanceById(editor_id);if(inst){inst.switchSettings();editor_id=inst.editorId;var html=tinyMCE.getContent(editor_id);var tmpInstances=new Array();for(var instanceName in tinyMCE.instances){var instance=tinyMCE.instances[instanceName];if(!tinyMCE.isInstance(instance))continue;if(instanceName!=editor_id)tmpInstances[instanceName]=instance;}tinyMCE.instances=tmpInstances;tinyMCE.selectedElement=null;tinyMCE.selectedInstance=null;var replaceElement=document.getElementById(editor_id+"_parent");var oldTargetElement=inst.oldTargetElement;var targetName=oldTargetElement.nodeName.toLowerCase();if(targetName=="textarea"||targetName=="input"){replaceElement.parentNode.removeChild(replaceElement);oldTargetElement.style.display="inline";oldTargetElement.value=html;}else{oldTargetElement.innerHTML=html;oldTargetElement.style.display='block';replaceElement.parentNode.insertBefore(oldTargetElement,replaceElement);replaceElement.parentNode.removeChild(replaceElement);}}},triggerSave:function(skip_cleanup,skip_callback){var inst,n;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.triggerSave(skip_cleanup,skip_callback);}},resetForm:function(form_index){var i,inst,n,formObj=document.forms[form_index];for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;inst.switchSettings();for(i=0;i<formObj.elements.length;i++){if(inst.formTargetElementId==formObj.elements[i].name)inst.getBody().innerHTML=inst.startContent;}}},execInstanceCommand:function(editor_id,command,user_interface,value,focus){var inst=tinyMCE.getInstanceById(editor_id);if(inst){if(typeof(focus)=="undefined")focus=true;if(focus)inst.contentWindow.focus();inst.autoResetDesignMode();this.selectedElement=inst.getFocusElement();this.selectedInstance=inst;tinyMCE.execCommand(command,user_interface,value);if(tinyMCE.isMSIE&&window.event!=null)tinyMCE.cancelEvent(window.event);}},execCommand:function(command,user_interface,value){user_interface=user_interface?user_interface:false;value=value?value:null;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();switch(command){case'mceHelp':tinyMCE.openWindow({file:'about.htm',width:480,height:380},{tinymce_version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion,tinymce_releasedate:tinyMCE.releaseDate,inline:"yes"});return;case'mceFocus':var inst=tinyMCE.getInstanceById(value);if(inst)inst.contentWindow.focus();return;case"mceAddControl":case"mceAddEditor":tinyMCE.addMCEControl(tinyMCE._getElementById(value),value);return;case"mceAddFrameControl":tinyMCE.addMCEControl(tinyMCE._getElementById(value['element'],value['document']),value['element'],value['document']);return;case"mceRemoveControl":case"mceRemoveEditor":tinyMCE.removeMCEControl(value);return;case"mceResetDesignMode":if(!tinyMCE.isMSIE){for(var n in tinyMCE.instances){if(!tinyMCE.isInstance(tinyMCE.instances[n]))continue;try{tinyMCE.instances[n].getDoc().designMode="on";}catch(e){}}}return;}if(this.selectedInstance){this.selectedInstance.execCommand(command,user_interface,value);}else if(tinyMCE.settings['focus_alert'])alert(tinyMCELang['lang_focus_alert']);},_createIFrame:function(replace_element,doc,win){var iframe,id=replace_element.getAttribute("id");var aw,ah;if(typeof(doc)=="undefined")doc=document;if(typeof(win)=="undefined")win=window;iframe=doc.createElement("iframe");aw=""+tinyMCE.settings['area_width'];ah=""+tinyMCE.settings['area_height'];if(aw.indexOf('%')==-1){aw=parseInt(aw);aw=aw<0?300:aw;aw=aw+"px";}if(ah.indexOf('%')==-1){ah=parseInt(ah);ah=ah<0?240:ah;ah=ah+"px";}iframe.setAttribute("id",id);iframe.setAttribute("className","mceEditorIframe");iframe.setAttribute("border","0");iframe.setAttribute("frameBorder","0");iframe.setAttribute("marginWidth","0");iframe.setAttribute("marginHeight","0");iframe.setAttribute("leftMargin","0");iframe.setAttribute("topMargin","0");iframe.setAttribute("width",aw);iframe.setAttribute("height",ah);iframe.setAttribute("allowtransparency","true");if(tinyMCE.settings["auto_resize"])iframe.setAttribute("scrolling","no");if(tinyMCE.isMSIE&&!tinyMCE.isOpera)iframe.setAttribute("src",this.settings['default_document']);iframe.style.width=aw;iframe.style.height=ah;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)replace_element.outerHTML=iframe.outerHTML;else replace_element.parentNode.replaceChild(iframe,replace_element);if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return win.frames[id];else return iframe;},setupContent:function(editor_id){var inst=tinyMCE.instances[editor_id];var doc=inst.getDoc();var head=doc.getElementsByTagName('head').item(0);var content=inst.startContent;inst.switchSettings();if(!tinyMCE.isMSIE&&tinyMCE.getParam("setupcontent_reload",false)&&doc.title!="blank_page"){try{doc.location.href=tinyMCE.baseURL+"/blank.htm";}catch(ex){}window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",1000);return;}if(!head){window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",10);return;}tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/themes/"+inst.settings['theme']+"/css/editor_content.css");tinyMCE.importCSS(inst.getDoc(),inst.settings['content_css']);tinyMCE.dispatchCallback(inst,'init_instance_callback','initInstance',inst);if(tinyMCE.getParam('custom_undo_redo_keyboard_shortcuts')){inst.addShortcut('ctrl','z','lang_undo_desc','Undo');inst.addShortcut('ctrl','y','lang_redo_desc','Redo');}if(tinyMCE.isGecko){inst.addShortcut('ctrl','b','lang_bold_desc','Bold');inst.addShortcut('ctrl','i','lang_italic_desc','Italic');inst.addShortcut('ctrl','u','lang_underline_desc','Underline');}if(tinyMCE.getParam("convert_fonts_to_spans"))inst.getDoc().body.setAttribute('id','mceSpanFonts');if(tinyMCE.settings['nowrap'])doc.body.style.whiteSpace="nowrap";doc.body.dir=this.settings['directionality'];doc.editorId=editor_id;if(!tinyMCE.isMSIE)doc.documentElement.editorId=editor_id;inst.setBaseHREF(tinyMCE.settings['base_href']);if(tinyMCE.settings['convert_newlines_to_brs']){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}content=tinyMCE.storeAwayURLs(content);content=tinyMCE._customCleanup(inst,"insert_to_editor",content);if(tinyMCE.isMSIE){window.setInterval('try{tinyMCE.getCSSClasses(tinyMCE.instances["'+editor_id+'"].getDoc(), "'+editor_id+'");}catch(e){}',500);if(tinyMCE.settings["force_br_newlines"])doc.styleSheets[0].addRule("p","margin: 0;");var body=inst.getBody();body.editorId=editor_id;}content=tinyMCE.cleanupHTMLCode(content);if(!tinyMCE.isMSIE){var contentElement=inst.getDoc().createElement("body");var doc=inst.getDoc();contentElement.innerHTML=content;if(tinyMCE.isGecko&&tinyMCE.settings['remove_lt_gt'])content=content.replace(new RegExp('&lt;&gt;','g'),"");if(tinyMCE.settings['cleanup_on_startup'])tinyMCE.setInnerHTML(inst.getBody(),tinyMCE._cleanupHTML(inst,doc,this.settings,contentElement));else{content=tinyMCE.regexpReplace(content,"<strong","<b","gi");content=tinyMCE.regexpReplace(content,"<em(/?)>","<i$1>","gi");content=tinyMCE.regexpReplace(content,"<em ","<i ","gi");content=tinyMCE.regexpReplace(content,"</strong>","</b>","gi");content=tinyMCE.regexpReplace(content,"</em>","</i>","gi");tinyMCE.setInnerHTML(inst.getBody(),content);}tinyMCE.convertAllRelativeURLs(inst.getBody());}else{if(tinyMCE.settings['cleanup_on_startup']){tinyMCE._setHTML(inst.getDoc(),content);eval('try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}');}else tinyMCE._setHTML(inst.getDoc(),content);}var parentElm=inst.targetDoc.getElementById(inst.editorId+'_parent');inst.formElement=tinyMCE.isGecko?parentElm.previousSibling:parentElm.nextSibling;tinyMCE.handleVisualAid(inst.getBody(),true,tinyMCE.settings['visual'],inst);tinyMCE.dispatchCallback(inst,'setupcontent_callback','setupContent',editor_id,inst.getBody(),inst.getDoc());if(!tinyMCE.isMSIE)tinyMCE.addEventHandlers(inst);if(tinyMCE.isMSIE){tinyMCE.addEvent(inst.getBody(),"blur",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(inst.getBody(),"beforedeactivate",TinyMCE_Engine.prototype._eventPatch);if(!tinyMCE.isOpera){tinyMCE.addEvent(doc.body,"mousemove",TinyMCE_Engine.prototype.onMouseMove);tinyMCE.addEvent(doc.body,"beforepaste",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc.body,"drop",TinyMCE_Engine.prototype._eventPatch);}}tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=inst.contentWindow.document.body;tinyMCE._customCleanup(inst,"insert_to_editor_dom",inst.getBody());tinyMCE._customCleanup(inst,"setup_content_dom",inst.getBody());tinyMCE._setEventsEnabled(inst.getBody(),false);tinyMCE.cleanupAnchors(inst.getDoc());if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(inst.getDoc());inst.startContent=tinyMCE.trim(inst.getBody().innerHTML);inst.undoRedo.add({content:inst.startContent});tinyMCE.selectedInstance=inst;tinyMCE.triggerNodeChange(false,true);},storeAwayURLs:function(s){if(!s.match(/(mce_src|mce_href)/gi,s)){s=s.replace(new RegExp('src\\s*=\\s*\"([^ >\"]*)\"','gi'),'src="$1" mce_src="$1"');s=s.replace(new RegExp('href\\s*=\\s*\"([^ >\"]*)\"','gi'),'href="$1" mce_href="$1"');}return s;},removeTinyMCEFormElements:function(form_obj){if(typeof(form_obj)=="undefined"||form_obj==null)return;if(form_obj.nodeName!="FORM"){if(form_obj.form)form_obj=form_obj.form;else form_obj=tinyMCE.getParentElement(form_obj,"form");}if(form_obj==null)return;for(var i=0;i<form_obj.elements.length;i++){var elementId=form_obj.elements[i].name?form_obj.elements[i].name:form_obj.elements[i].id;if(elementId.indexOf('mce_editor_')==0)form_obj.elements[i].disabled=true;}},handleEvent:function(e){var inst=tinyMCE.selectedInstance;if(typeof(tinyMCE)=="undefined")return true;if(tinyMCE.executeCallback(tinyMCE.selectedInstance,'handle_event_callback','handleEvent',e))return false;switch(e.type){case"beforedeactivate":case"blur":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.execCommand('mceEndTyping');tinyMCE.hideMenus();return;case"drop":case"beforepaste":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.setBaseHREF(null);window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);",1);return;case"submit":tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE?window.event.srcElement:e.target);tinyMCE.triggerSave();tinyMCE.isNotDirty=true;return;case"reset":var formObj=tinyMCE.isMSIE?window.event.srcElement:e.target;for(var i=0;i<document.forms.length;i++){if(document.forms[i]==formObj)window.setTimeout('tinyMCE.resetForm('+i+');',10);}return;case"keypress":if(inst&&inst.handleShortcut(e))return false;if(e.target.editorId){tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];}else{if(e.target.ownerDocument.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.ownerDocument.editorId];}if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&e.keyCode==13&&!e.shiftKey){if(TinyMCE_ForceParagraphs._insertPara(tinyMCE.selectedInstance,e)){tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.cancelEvent(e);return false;}}if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance,e.type)){tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.cancelEvent(e);return false;}}if(tinyMCE.isMSIE&&tinyMCE.settings['force_br_newlines']&&e.keyCode==13){if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];if(tinyMCE.selectedInstance){var sel=tinyMCE.selectedInstance.getDoc().selection;var rng=sel.createRange();if(tinyMCE.getParentElement(rng.parentElement(),"li")!=null)return false;e.returnValue=false;e.cancelBubble=true;rng.pasteHTML("<br />");rng.collapse(false);rng.select();tinyMCE.execCommand("mceAddUndoLevel");tinyMCE.triggerNodeChange(false);return false;}}if(e.keyCode==8||e.keyCode==46){tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(e.target,"a");tinyMCE.imgElement=tinyMCE.getParentElement(e.target,"img");tinyMCE.triggerNodeChange(false);}return false;break;case"keyup":case"keydown":tinyMCE.hideMenus();tinyMCE.hasMouseMoved=false;if(inst&&inst.handleShortcut(e))return false;if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];else return;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();var inst=tinyMCE.selectedInstance;if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance,e.type)){tinyMCE.execCommand("mceAddUndoLevel");e.preventDefault();return false;}}tinyMCE.selectedElement=null;tinyMCE.selectedNode=null;var elm=tinyMCE.selectedInstance.getFocusElement();tinyMCE.linkElement=tinyMCE.getParentElement(elm,"a");tinyMCE.imgElement=tinyMCE.getParentElement(elm,"img");tinyMCE.selectedElement=elm;if(tinyMCE.isGecko&&e.type=="keyup"&&e.keyCode==9)tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(),true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);if(tinyMCE.isMSIE&&e.type=="keydown"&&e.keyCode==13)tinyMCE.enterKeyElement=tinyMCE.selectedInstance.getFocusElement();if(tinyMCE.isMSIE&&e.type=="keyup"&&e.keyCode==13){var elm=tinyMCE.enterKeyElement;if(elm){var re=new RegExp('^HR|IMG|BR$','g');var dre=new RegExp('^H[1-6]$','g');if(!elm.hasChildNodes()&&!re.test(elm.nodeName)){if(dre.test(elm.nodeName))elm.innerHTML="&nbsp;&nbsp;";else elm.innerHTML="&nbsp;";}}}var keys=tinyMCE.posKeyCodes;var posKey=false;for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){posKey=true;break;}}if(tinyMCE.isMSIE&&tinyMCE.settings['custom_undo_redo']){var keys=new Array(8,46);for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){if(e.type=="keyup")tinyMCE.triggerNodeChange(false);}}}if(e.keyCode==17)return true;if(!posKey&&e.type=="keyup")tinyMCE.execCommand("mceStartTyping");if(e.type=="keydown"&&(posKey||e.ctrlKey)&&inst)inst.undoBookmark=inst.selection.getBookmark();if(e.type=="keyup"&&(posKey||e.ctrlKey))tinyMCE.execCommand("mceEndTyping");if(posKey&&e.type=="keyup")tinyMCE.triggerNodeChange(false);if(tinyMCE.isMSIE&&e.ctrlKey)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);break;case"mousedown":case"mouseup":case"click":case"focus":tinyMCE.hideMenus();if(tinyMCE.selectedInstance){tinyMCE.selectedInstance.switchSettings();tinyMCE.selectedInstance.isFocused=true;}var targetBody=tinyMCE.getParentElement(e.target,"body");for(var instanceName in tinyMCE.instances){if(!tinyMCE.isInstance(tinyMCE.instances[instanceName]))continue;var inst=tinyMCE.instances[instanceName];inst.autoResetDesignMode();if(inst.getBody()==targetBody){tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");tinyMCE.imgElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"img");break;}}if(!tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark)tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark=tinyMCE.selectedInstance.selection.getBookmark();if(tinyMCE.isSafari){tinyMCE.selectedInstance.lastSafariSelection=tinyMCE.selectedInstance.selection.getBookmark();tinyMCE.selectedInstance.lastSafariSelectedElement=tinyMCE.selectedElement;var lnk=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");if(lnk&&e.type=="mousedown"){lnk.setAttribute("mce_real_href",lnk.getAttribute("href"));lnk.setAttribute("href","javascript:void(0);");}if(lnk&&e.type=="click"){window.setTimeout(function(){lnk.setAttribute("href",lnk.getAttribute("mce_real_href"));lnk.removeAttribute("mce_real_href");},10);}}if(e.type!="focus")tinyMCE.selectedNode=null;tinyMCE.triggerNodeChange(false);tinyMCE.execCommand("mceEndTyping");if(e.type=="mouseup")tinyMCE.execCommand("mceAddUndoLevel");if(!tinyMCE.selectedInstance&&e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];return false;break;}},getButtonHTML:function(id,lang,img,cmd,ui,val){var h='',m,x;cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+cmd+'\'';if(typeof(ui)!="undefined"&&ui!=null)cmd+=','+ui;if(typeof(val)!="undefined"&&val!=null)cmd+=",'"+val+"'";cmd+=');';if(tinyMCE.getParam('button_tile_map')&&(!tinyMCE.isMSIE||tinyMCE.isOpera)&&(m=this.buttonMap[id])!=null&&(tinyMCE.getParam("language")=="en"||img.indexOf('$lang')==-1)){x=0-(m*20)==0?'0':0-(m*20);h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';h+='<img src="{$themeurl}/images/spacer.gif" style="background-position: '+x+'px 0" title="{$'+lang+'}" />';h+='</a>';}else{h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceButtonNormal" target="_self">';h+='<img src="'+img+'" title="{$'+lang+'}" />';h+='</a>';}return h;},addButtonMap:function(m){var i,a=m.replace(/\s+/,'').split(',');for(i=0;i<a.length;i++)this.buttonMap[a[i]]=i;},submitPatch:function(){tinyMCE.removeTinyMCEFormElements(this);tinyMCE.triggerSave();this.mceOldSubmit();tinyMCE.isNotDirty=true;},onLoad:function(){if(tinyMCE.isMSIE&&!tinyMCE.isOpera&&window.event.type=="readystatechange"&&document.readyState!="complete")return true;if(tinyMCE.isLoaded)return true;tinyMCE.isLoaded=true;tinyMCE.dispatchCallback(null,'onpageload','onPageLoad');for(var c=0;c<tinyMCE.configs.length;c++){tinyMCE.settings=tinyMCE.configs[c];var selector=tinyMCE.getParam("editor_selector");var deselector=tinyMCE.getParam("editor_deselector");var elementRefAr=new Array();if(document.forms&&tinyMCE.settings['add_form_submit_trigger']&&!tinyMCE.submitTriggers){for(var i=0;i<document.forms.length;i++){var form=document.forms[i];tinyMCE.addEvent(form,"submit",TinyMCE_Engine.prototype.handleEvent);tinyMCE.addEvent(form,"reset",TinyMCE_Engine.prototype.handleEvent);tinyMCE.submitTriggers=true;if(tinyMCE.settings['submit_patch']){try{form.mceOldSubmit=form.submit;form.submit=TinyMCE_Engine.prototype.submitPatch;}catch(e){}}}}var mode=tinyMCE.settings['mode'];switch(mode){case"exact":var elements=tinyMCE.getParam('elements','',true,',');for(var i=0;i<elements.length;i++){var element=tinyMCE._getElementById(elements[i]);var trigger=element?element.getAttribute(tinyMCE.settings['textarea_trigger']):"";if(tinyMCE.getAttrib(element,"class").indexOf(deselector)!=-1)continue;if(trigger=="false")continue;if((tinyMCE.settings['ask']||tinyMCE.settings['convert_on_click'])&&element){elementRefAr[elementRefAr.length]=element;continue;}if(element)tinyMCE.addMCEControl(element,elements[i]);else if(tinyMCE.settings['debug'])alert("Error: Could not find element by id or name: "+elements[i]);}break;case"specific_textareas":case"textareas":var nodeList=document.getElementsByTagName("textarea");for(var i=0;i<nodeList.length;i++){var elm=nodeList.item(i);var trigger=elm.getAttribute(tinyMCE.settings['textarea_trigger']);if(selector!=''&&tinyMCE.getAttrib(elm,"class").indexOf(selector)==-1)continue;if(selector!='')trigger=selector!=""?"true":"";if(tinyMCE.getAttrib(elm,"class").indexOf(deselector)!=-1)continue;if((mode=="specific_textareas"&&trigger=="true")||(mode=="textareas"&&trigger!="false"))elementRefAr[elementRefAr.length]=elm;}break;}for(var i=0;i<elementRefAr.length;i++){var element=elementRefAr[i];var elementId=element.name?element.name:element.id;if(tinyMCE.settings['ask']||tinyMCE.settings['convert_on_click']){if(tinyMCE.isGecko){var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(e){window.setTimeout(function(){TinyMCE_Engine.prototype.confirmAdd(e,settings);},10);});if(element.nodeName!="TEXTAREA"&&element.nodeName!="INPUT")tinyMCE.addEvent(element,"click",function(e){window.setTimeout(function(){TinyMCE_Engine.prototype.confirmAdd(e,settings);},10);});}else{var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(){TinyMCE_Engine.prototype.confirmAdd(null,settings);});tinyMCE.addEvent(element,"click",function(){TinyMCE_Engine.prototype.confirmAdd(null,settings);});}}else tinyMCE.addMCEControl(element,elementId);}if(tinyMCE.settings['auto_focus']){window.setTimeout(function(){var inst=tinyMCE.getInstanceById(tinyMCE.settings['auto_focus']);inst.selection.selectNode(inst.getBody(),true,true);inst.contentWindow.focus();},10);}tinyMCE.dispatchCallback(null,'oninit','onInit');}},isInstance:function(o){return o!=null&&typeof(o)=="object"&&o.isTinyMCE_Control;},getParam:function(name,default_value,strip_whitespace,split_chr){var value=(typeof(this.settings[name])=="undefined")?default_value:this.settings[name];if(value=="true"||value=="false")return(value=="true");if(strip_whitespace)value=tinyMCE.regexpReplace(value,"[ \t\r\n]","");if(typeof(split_chr)!="undefined"&&split_chr!=null){value=value.split(split_chr);var outArray=new Array();for(var i=0;i<value.length;i++){if(value[i]&&value[i]!="")outArray[outArray.length]=value[i];}value=outArray;}return value;},getLang:function(name,default_value,parse_entities,va){var v=(typeof(tinyMCELang[name])=="undefined")?default_value:tinyMCELang[name],n;if(parse_entities)v=tinyMCE.entityDecode(v);if(va){for(n in va)v=this.replaceVar(v,n,va[n]);}return v;},entityDecode:function(s){var e=document.createElement("div");e.innerHTML=s;return e.innerHTML;},addToLang:function(prefix,ar){for(var key in ar){if(typeof(ar[key])=='function')continue;tinyMCELang[(key.indexOf('lang_')==-1?'lang_':'')+(prefix!=''?(prefix+"_"):'')+key]=ar[key];}},triggerNodeChange:function(focus,setup_content){if(tinyMCE.selectedInstance){var inst=tinyMCE.selectedInstance;var editorId=inst.editorId;var elm=(typeof(setup_content)!="undefined"&&setup_content)?tinyMCE.selectedElement:inst.getFocusElement();var undoIndex=-1;var undoLevels=-1;var anySelection=false;var selectedText=inst.selection.getSelectedText();if(setup_content&&tinyMCE.isGecko&&inst.isHidden())elm=inst.getBody();inst.switchSettings();if(tinyMCE.settings["auto_resize"]){var doc=inst.getDoc();inst.iframeElement.style.width=doc.body.offsetWidth+"px";inst.iframeElement.style.height=doc.body.offsetHeight+"px";}if(tinyMCE.selectedElement)anySelection=(tinyMCE.selectedElement.nodeName.toLowerCase()=="img")||(selectedText&&selectedText.length>0);if(tinyMCE.settings['custom_undo_redo']){undoIndex=inst.undoRedo.undoIndex;undoLevels=inst.undoRedo.undoLevels.length;}tinyMCE.dispatchCallback(inst,'handle_node_change_callback','handleNodeChange',editorId,elm,undoIndex,undoLevels,inst.visualAid,anySelection,setup_content);}if(this.selectedInstance&&(typeof(focus)=="undefined"||focus))this.selectedInstance.contentWindow.focus();},_customCleanup:function(inst,type,content){var pl,po,i;var customCleanup=tinyMCE.settings['cleanup_callback'];if(customCleanup!=""&&eval("typeof("+customCleanup+")")!="undefined")content=eval(customCleanup+"(type, content, inst);");pl=inst.plugins;for(i=0;i<pl.length;i++){po=tinyMCE.plugins[pl[i]];if(po&&po.cleanup)content=po.cleanup(type,content,inst);}return content;},setContent:function(h){if(tinyMCE.selectedInstance){tinyMCE.selectedInstance.execCommand('mceSetContent',false,h);tinyMCE.selectedInstance.repaint();}},importThemeLanguagePack:function(name){if(typeof(name)=="undefined")name=tinyMCE.settings['theme'];tinyMCE.loadScript(tinyMCE.baseURL+'/themes/'+name+'/langs/'+tinyMCE.settings['language']+'.js');},importPluginLanguagePack:function(name,valid_languages){var lang="en",b=tinyMCE.baseURL+'/plugins/'+name;valid_languages=valid_languages.split(',');for(var i=0;i<valid_languages.length;i++){if(tinyMCE.settings['language']==valid_languages[i])lang=tinyMCE.settings['language'];}if(this.plugins[name])b=this.plugins[name].baseURL;tinyMCE.loadScript(b+'/langs/'+lang+'.js');},applyTemplate:function(h,as){var i,s,ar=h.match(new RegExp('\\{\\$[a-z0-9_]+\\}','gi'));if(ar&&ar.length>0){for(i=ar.length-1;i>=0;i--){s=ar[i].substring(2,ar[i].length-1);if(s.indexOf('lang_')==0&&tinyMCELang[s])h=tinyMCE.replaceVar(h,s,tinyMCELang[s]);else if(as&&as[s])h=tinyMCE.replaceVar(h,s,as[s]);else if(tinyMCE.settings[s])h=tinyMCE.replaceVar(h,s,tinyMCE.settings[s]);}}h=tinyMCE.replaceVar(h,"themeurl",tinyMCE.themeURL);return h;},replaceVar:function(h,r,v){return h.replace(new RegExp('{\\\$'+r+'}','g'),v);},openWindow:function(template,args){var html,width,height,x,y,resizable,scrollbars,url;args['mce_template_file']=template['file'];args['mce_width']=template['width'];args['mce_height']=template['height'];tinyMCE.windowArgs=args;html=template['html'];if(!(width=parseInt(template['width'])))width=320;if(!(height=parseInt(template['height'])))height=200;if(tinyMCE.isMSIE)height+=40;else height+=20;x=parseInt(screen.width/2.0)-(width/2.0);y=parseInt(screen.height/2.0)-(height/2.0);resizable=(args&&args['resizable'])?args['resizable']:"no";scrollbars=(args&&args['scrollbars'])?args['scrollbars']:"no";if(template['file'].charAt(0)!='/'&&template['file'].indexOf('://')==-1)url=tinyMCE.baseURL+"/themes/"+tinyMCE.getParam("theme")+"/"+template['file'];else url=template['file'];for(var name in args){if(typeof(args[name])=='function')continue;url=tinyMCE.replaceVar(url,name,escape(args[name]));}if(html){html=tinyMCE.replaceVar(html,"css",this.settings['popups_css']);html=tinyMCE.applyTemplate(html,args);var win=window.open("","mcePopup"+new Date().getTime(),"top="+y+",left="+x+",scrollbars="+scrollbars+",dialog=yes,minimizable="+resizable+",modal=yes,width="+width+",height="+height+",resizable="+resizable);if(win==null){alert(tinyMCELang['lang_popup_blocked']);return;}win.document.write(html);win.document.close();win.resizeTo(width,height);win.focus();}else{if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&resizable!='yes'&&tinyMCE.settings["dialog_type"]=="modal"){height+=10;var features="resizable:"+resizable+";scroll:"+scrollbars+";status:yes;center:yes;help:no;dialogWidth:"+width+"px;dialogHeight:"+height+"px;";window.showModalDialog(url,window,features);}else{var modal=(resizable=="yes")?"no":"yes";if(tinyMCE.isGecko&&tinyMCE.isMac)modal="no";if(template['close_previous']!="no")try{tinyMCE.lastWindow.close();}catch(ex){}var win=window.open(url,"mcePopup"+new Date().getTime(),"top="+y+",left="+x+",scrollbars="+scrollbars+",dialog="+modal+",minimizable="+resizable+",modal="+modal+",width="+width+",height="+height+",resizable="+resizable);if(win==null){alert(tinyMCELang['lang_popup_blocked']);return;}if(template['close_previous']!="no")tinyMCE.lastWindow=win;eval('try { win.resizeTo(width, height); } catch(e) { }');if(tinyMCE.isGecko){if(win.document.defaultView.statusbar.visible)win.resizeBy(0,tinyMCE.isMac?10:24);}win.focus();}}},closeWindow:function(win){win.close();},getVisualAidClass:function(class_name,state){var aidClass=tinyMCE.settings['visual_table_class'];if(typeof(state)=="undefined")state=tinyMCE.settings['visual'];var classNames=new Array();var ar=class_name.split(' ');for(var i=0;i<ar.length;i++){if(ar[i]==aidClass)ar[i]="";if(ar[i]!="")classNames[classNames.length]=ar[i];}if(state)classNames[classNames.length]=aidClass;var className="";for(var i=0;i<classNames.length;i++){if(i>0)className+=" ";className+=classNames[i];}return className;},handleVisualAid:function(el,deep,state,inst){if(!el)return;var tableElement=null;switch(el.nodeName){case"TABLE":var oldW=el.style.width;var oldH=el.style.height;var bo=tinyMCE.getAttrib(el,"border");bo=bo==""||bo=="0"?true:false;tinyMCE.setAttrib(el,"class",tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el,"class"),state&&bo));el.style.width=oldW;el.style.height=oldH;for(var y=0;y<el.rows.length;y++){for(var x=0;x<el.rows[y].cells.length;x++){var cn=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el.rows[y].cells[x],"class"),state&&bo);tinyMCE.setAttrib(el.rows[y].cells[x],"class",cn);}}break;case"A":var anchorName=tinyMCE.getAttrib(el,"name");if(anchorName!=''&&state){el.title=anchorName;el.className='mceItemAnchor';}else if(anchorName!=''&&!state)el.className='';break;}if(deep&&el.hasChildNodes()){for(var i=0;i<el.childNodes.length;i++)tinyMCE.handleVisualAid(el.childNodes[i],deep,state,inst);}},fixGeckoBaseHREFBug:function(m,e,h){var nl,i;if(tinyMCE.isGecko){if(m==1){h=h.replace(/\ssrc=/gi," xsrc=");h=h.replace(/\shref=/gi," xhref=");return h;}else{var el=new Array('a','img','select','area','iframe','base','input','script','embed','object','link');for(var a=0;a<el.length;a++){var n=e.getElementsByTagName(el[a]);for(i=0;i<n.length;i++){var xsrc=tinyMCE.getAttrib(n[i],"xsrc");var xhref=tinyMCE.getAttrib(n[i],"xhref");if(xsrc!=""){n[i].src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],xsrc);n[i].removeAttribute("xsrc");}if(xhref!=""){n[i].href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],xhref);n[i].removeAttribute("xhref");}}}}}return h;},_setHTML:function(doc,html_content){html_content=tinyMCE.cleanupHTMLCode(html_content);try{tinyMCE.setInnerHTML(doc.body,html_content);}catch(e){if(this.isMSIE)doc.body.createTextRange().pasteHTML(html_content);}if(tinyMCE.isMSIE&&tinyMCE.settings['fix_content_duplication']){var paras=doc.getElementsByTagName("P");for(var i=0;i<paras.length;i++){var node=paras[i];while((node=node.parentNode)!=null){if(node.nodeName=="P")node.outerHTML=node.innerHTML;}}var html=doc.body.innerHTML;tinyMCE.setInnerHTML(doc.body,html);}tinyMCE.cleanupAnchors(doc);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);},getEditorId:function(form_element){var inst=this.getInstanceById(form_element);if(!inst)return null;return inst.editorId;},getInstanceById:function(editor_id){var inst=this.instances[editor_id];if(!inst){for(var n in tinyMCE.instances){var instance=tinyMCE.instances[n];if(!tinyMCE.isInstance(instance))continue;if(instance.formTargetElementId==editor_id){inst=instance;break;}}}return inst;},queryInstanceCommandValue:function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandValue(command);return false;},queryInstanceCommandState:function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandState(command);return null;},setWindowArg:function(n,v){this.windowArgs[n]=v;},getWindowArg:function(n,d){return(typeof(this.windowArgs[n])=="undefined")?d:this.windowArgs[n];},getCSSClasses:function(editor_id,doc){var output=new Array();if(typeof(tinyMCE.cssClasses)!="undefined")return tinyMCE.cssClasses;if(typeof(editor_id)=="undefined"&&typeof(doc)=="undefined"){var instance;for(var instanceName in tinyMCE.instances){instance=tinyMCE.instances[instanceName];if(!tinyMCE.isInstance(instance))continue;break;}doc=instance.getDoc();}if(typeof(doc)=="undefined"){var instance=tinyMCE.getInstanceById(editor_id);doc=instance.getDoc();}if(doc){var styles=tinyMCE.isMSIE?doc.styleSheets:doc.styleSheets;if(styles&&styles.length>0){for(var x=0;x<styles.length;x++){var csses=null;eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets("+x+").rules : doc.styleSheets["+x+"].cssRules;} catch(e) {}");if(!csses)return new Array();for(var i=0;i<csses.length;i++){var selectorText=csses[i].selectorText;if(selectorText){var rules=selectorText.split(',');for(var c=0;c<rules.length;c++){if(rules[c].indexOf(' ')!=-1||rules[c].indexOf(':')!=-1||rules[c].indexOf('mceItem')!=-1)continue;if(rules[c]=="."+tinyMCE.settings['visual_table_class']||rules[c].indexOf('mceEditable')!=-1||rules[c].indexOf('mceNonEditable')!=-1)continue;if(rules[c].indexOf('.')!=-1){output[output.length]=rules[c].substring(rules[c].indexOf('.')+1);}}}}}}}if(output.length>0)tinyMCE.cssClasses=output;return output;},regexpReplace:function(in_str,reg_exp,replace_str,opts){if(in_str==null)return in_str;if(typeof(opts)=="undefined")opts='g';var re=new RegExp(reg_exp,opts);return in_str.replace(re,replace_str);},trim:function(s){return s.replace(/^\s*|\s*$/g,"");},cleanupEventStr:function(s){s=""+s;s=s.replace('function anonymous()\n{\n','');s=s.replace('\n}','');s=s.replace(/^return true;/gi,'');return s;},getControlHTML:function(c){var i,l,n,o,v;l=tinyMCE.plugins;for(n in l){o=l[n];if(o.getControlHTML&&(v=o.getControlHTML(c))!='')return tinyMCE.replaceVar(v,"pluginurl",o.baseURL);}o=tinyMCE.themes[tinyMCE.settings['theme']];if(o.getControlHTML&&(v=o.getControlHTML(c))!='')return v;return'';},evalFunc:function(f,idx,a){var s='(',i;for(i=idx;i<a.length;i++){s+='a['+i+']';if(i<a.length-1)s+=',';}s+=');';return eval("f"+s);},dispatchCallback:function(i,p,n){return this.callFunc(i,p,n,0,this.dispatchCallback.arguments);},executeCallback:function(i,p,n){return this.callFunc(i,p,n,1,this.executeCallback.arguments);},execCommandCallback:function(i,p,n){return this.callFunc(i,p,n,2,this.execCommandCallback.arguments);},callFunc:function(ins,p,n,m,a){var l,i,on,o,s,v;s=m==2;l=tinyMCE.getParam(p,'');if(l!=''&&(v=tinyMCE.evalFunc(typeof(l)=="function"?l:eval(l),3,a))==s&&m>0)return true;if(ins!=null){for(i=0,l=ins.plugins;i<l.length;i++){o=tinyMCE.plugins[l[i]];if(o[n]&&(v=tinyMCE.evalFunc(o[n],3,a))==s&&m>0)return true;}}l=tinyMCE.themes;for(on in l){o=l[on];if(o[n]&&(v=tinyMCE.evalFunc(o[n],3,a))==s&&m>0)return true;}return false;},xmlEncode:function(s){s=""+s;s=s.replace(/&/g,'&amp;');s=s.replace(new RegExp('"','g'),'&quot;');s=s.replace(/\'/g,'&#39;');s=s.replace(/</g,'&lt;');s=s.replace(/>/g,'&gt;');return s;},extend:function(p,np){var o={};o.parent=p;for(n in p)o[n]=p[n];for(n in np)o[n]=np[n];return o;},hideMenus:function(){var e=tinyMCE.lastSelectedMenuBtn;if(tinyMCE.lastMenu){tinyMCE.lastMenu.hide();tinyMCE.lastMenu=null;}if(e){tinyMCE.switchClass(e,tinyMCE.lastMenuBtnClass);tinyMCE.lastSelectedMenuBtn=null;}}};var TinyMCE=TinyMCE_Engine;var tinyMCE=new TinyMCE_Engine();var tinyMCELang={};function TinyMCE_Control(settings){var t,i,to,fu,p,x,fn,fu,pn,s=settings;this.undoRedoLevel=true;this.isTinyMCE_Control=true;this.settings=s;this.settings['theme']=tinyMCE.getParam("theme","default");this.settings['width']=tinyMCE.getParam("width",-1);this.settings['height']=tinyMCE.getParam("height",-1);this.selection=new TinyMCE_Selection(this);this.undoRedo=new TinyMCE_UndoRedo(this);this.cleanup=new TinyMCE_Cleanup();this.shortcuts=new Array();this.hasMouseMoved=false;this.cleanup.init({valid_elements:s.valid_elements,extended_valid_elements:s.extended_valid_elements,entities:s.entities,entity_encoding:s.entity_encoding,debug:s.cleanup_debug,url_converter:'TinyMCE_Cleanup.prototype._urlConverter',indent:s.apply_source_formatting,invalid_elements:s.invalid_elements,verify_html:s.verify_html,fix_content_duplication:s.fix_content_duplication});t=this.settings['theme'];if(!tinyMCE.hasTheme(t)){fn=tinyMCE.callbacks;to={};for(i=0;i<fn.length;i++){if((fu=window['TinyMCE_'+t+"_"+fn[i]]))to[fn[i]]=fu;}tinyMCE.addTheme(t,to);}this.plugins=new Array();p=tinyMCE.getParam('plugins','',true,',');if(p.length>0){for(i=0;i<p.length;i++){pn=p[i];if(pn.charAt(0)=='-')pn=pn.substring(1);if(!tinyMCE.hasPlugin(pn)){fn=tinyMCE.callbacks;to={};for(x=0;x<fn.length;x++){if((fu=window['TinyMCE_'+pn+"_"+fn[x]]))to[fn[x]]=fu;}tinyMCE.addPlugin(pn,to);}this.plugins[this.plugins.length]=pn;}}};TinyMCE_Control.prototype={hasPlugin:function(n){var i;for(i=0;i<this.plugins.length;i++){if(this.plugins[i]==n)return true;}return false;},addPlugin:function(n,p){if(!this.hasPlugin(n)){tinyMCE.addPlugin(n,p);this.plugins[this.plugins.length]=n;}},repaint:function(){if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return;try{var s=this.selection;var b=s.getBookmark(true);this.getBody().style.display='none';this.getDoc().execCommand('selectall',false,null);this.getSel().collapseToStart();this.getBody().style.display='block';s.moveToBookmark(b);}catch(ex){}},switchSettings:function(){if(tinyMCE.configs.length>1&&tinyMCE.currentConfig!=this.settings['index']){tinyMCE.settings=this.settings;tinyMCE.currentConfig=this.settings['index'];}},getBody:function(){return this.getDoc().body;},getDoc:function(){return this.contentWindow.document;},getWin:function(){return this.contentWindow;},addShortcut:function(m,k,d,cmd,ui,va){var n=typeof(k)=="number",ie=tinyMCE.isMSIE,c,sc,i;var scl=this.shortcuts;if(!tinyMCE.getParam('custom_shortcuts'))return false;m=m.toLowerCase();k=ie&&!n?k.toUpperCase():k;c=n?null:k.charCodeAt(0);d=d&&d.indexOf('lang_')==0?tinyMCE.getLang(d):d;sc={alt:m.indexOf('alt')!=-1,ctrl:m.indexOf('ctrl')!=-1,shift:m.indexOf('shift')!=-1,charCode:c,keyCode:n?k:(ie?c:null),desc:d,cmd:cmd,ui:ui,val:va};for(i=0;i<scl.length;i++){if(sc.alt==scl[i].alt&&sc.ctrl==scl[i].ctrl&&sc.shift==scl[i].shift&&sc.charCode==scl[i].charCode&&sc.keyCode==scl[i].keyCode){return false;}}scl[scl.length]=sc;return true;},handleShortcut:function(e){var i,s=this.shortcuts,o;for(i=0;i<s.length;i++){o=s[i];if(o.alt==e.altKey&&o.ctrl==e.ctrlKey&&(o.keyCode==e.keyCode||o.charCode==e.charCode)){if(o.cmd&&(e.type=="keydown"||(e.type=="keypress"&&!tinyMCE.isOpera)))tinyMCE.execCommand(o.cmd,o.ui,o.val);tinyMCE.cancelEvent(e);return true;}}return false;},autoResetDesignMode:function(){if(!tinyMCE.isMSIE&&this.isHidden()&&tinyMCE.getParam('auto_reset_designmode'))eval('try { this.getDoc().designMode = "On"; } catch(e) {}');},isHidden:function(){if(tinyMCE.isMSIE)return false;var s=this.getSel();return(!s||!s.rangeCount||s.rangeCount==0);},isDirty:function(){return this.startContent!=tinyMCE.trim(this.getBody().innerHTML)&&!tinyMCE.isNotDirty;},_mergeElements:function(scmd,pa,ch,override){if(scmd=="removeformat"){pa.className="";pa.style.cssText="";ch.className="";ch.style.cssText="";return;}var st=tinyMCE.parseStyle(tinyMCE.getAttrib(pa,"style"));var stc=tinyMCE.parseStyle(tinyMCE.getAttrib(ch,"style"));var className=tinyMCE.getAttrib(pa,"class");className+=" "+tinyMCE.getAttrib(ch,"class");if(override){for(var n in st){if(typeof(st[n])=='function')continue;stc[n]=st[n];}}else{for(var n in stc){if(typeof(stc[n])=='function')continue;st[n]=stc[n];}}tinyMCE.setAttrib(pa,"style",tinyMCE.serializeStyle(st));tinyMCE.setAttrib(pa,"class",tinyMCE.trim(className));ch.className="";ch.style.cssText="";ch.removeAttribute("class");ch.removeAttribute("style");},_setUseCSS:function(b){var d=this.getDoc();try{d.execCommand("useCSS",false,!b);}catch(ex){}try{d.execCommand("styleWithCSS",false,b);}catch(ex){}if(!tinyMCE.getParam("table_inline_editing"))try{d.execCommand('enableInlineTableEditing',false,"false");}catch(ex){}if(!tinyMCE.getParam("object_resizing"))try{d.execCommand('enableObjectResizing',false,"false");}catch(ex){}},execCommand:function(command,user_interface,value){var doc=this.getDoc();var win=this.getWin();var focusElm=this.getFocusElement();if(!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel','gi').test(command))this.undoBookmark=null;if(this.lastSafariSelection&&!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel','gi').test(command)){this.selection.moveToBookmark(this.lastSafariSelection);tinyMCE.selectedElement=this.lastSafariSelectedElement;}if(!tinyMCE.isMSIE&&!this.useCSS){this._setUseCSS(false);this.useCSS=true;}this.contentDocument=doc;if(tinyMCE.execCommandCallback(this,'execcommand_callback','execCommand',this.editorId,this.getBody(),command,user_interface,value))return;if(focusElm&&focusElm.nodeName=="IMG"){var align=focusElm.getAttribute('align');var img=command=="JustifyCenter"?focusElm.cloneNode(false):focusElm;switch(command){case"JustifyLeft":if(align=='left')img.removeAttribute('align');else img.setAttribute('align','left');var div=focusElm.parentNode;if(div&&div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;case"JustifyCenter":img.removeAttribute('align');var div=tinyMCE.getParentElement(focusElm,"div");if(div&&div.style.textAlign=="center"){if(div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);}else{var div=this.getDoc().createElement("div");div.style.textAlign='center';div.appendChild(img);focusElm.parentNode.replaceChild(div,focusElm);}this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;case"JustifyRight":if(align=='right')img.removeAttribute('align');else img.setAttribute('align','right');var div=focusElm.parentNode;if(div&&div.nodeName=="DIV"&&div.childNodes.length==1&&div.parentNode)div.parentNode.replaceChild(img,div);this.selection.selectNode(img);this.repaint();tinyMCE.triggerNodeChange();return;}}if(tinyMCE.settings['force_br_newlines']){var alignValue="";if(doc.selection.type!="Control"){switch(command){case"JustifyLeft":alignValue="left";break;case"JustifyCenter":alignValue="center";break;case"JustifyFull":alignValue="justify";break;case"JustifyRight":alignValue="right";break;}if(alignValue!=""){var rng=doc.selection.createRange();if((divElm=tinyMCE.getParentElement(rng.parentElement(),"div"))!=null)divElm.setAttribute("align",alignValue);else if(rng.pasteHTML&&rng.htmlText.length>0)rng.pasteHTML('<div align="'+alignValue+'">'+rng.htmlText+"</div>");tinyMCE.triggerNodeChange();return;}}}switch(command){case"mceRepaint":this.repaint();return true;case"InsertUnorderedList":case"InsertOrderedList":var tag=(command=="InsertUnorderedList")?"ul":"ol";if(tinyMCE.isSafari)this.execCommand("mceInsertContent",false,"<"+tag+"><li>&nbsp;</li><"+tag+">");else this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();break;case"Strikethrough":if(tinyMCE.isSafari)this.execCommand("mceInsertContent",false,"<strike>"+this.selection.getSelectedHTML()+"</strike>");else this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();break;case"mceSelectNode":this.selection.selectNode(value);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=value;break;case"FormatBlock":if(value==null||value==""){var elm=tinyMCE.getParentElement(this.getFocusElement(),"p,div,h1,h2,h3,h4,h5,h6,pre,address");if(elm)this.execCommand("mceRemoveNode",false,elm);}else{if(value=='<div>'&&tinyMCE.isGecko)value='div';this.getDoc().execCommand("FormatBlock",false,value);}tinyMCE.triggerNodeChange();break;case"mceRemoveNode":if(!value)value=tinyMCE.getParentElement(this.getFocusElement());if(tinyMCE.isMSIE){value.outerHTML=value.innerHTML;}else{var rng=value.ownerDocument.createRange();rng.setStartBefore(value);rng.setEndAfter(value);rng.deleteContents();rng.insertNode(rng.createContextualFragment(value.innerHTML));}tinyMCE.triggerNodeChange();break;case"mceSelectNodeDepth":var parentNode=this.getFocusElement();for(var i=0;parentNode;i++){if(parentNode.nodeName.toLowerCase()=="body")break;if(parentNode.nodeName.toLowerCase()=="#text"){i--;parentNode=parentNode.parentNode;continue;}if(i==value){this.selection.selectNode(parentNode,false);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=parentNode;return;}parentNode=parentNode.parentNode;}break;case"SetStyleInfo":var rng=this.getRng();var sel=this.getSel();var scmd=value['command'];var sname=value['name'];var svalue=value['value']==null?'':value['value'];var wrapper=value['wrapper']?value['wrapper']:"span";var parentElm=null;var invalidRe=new RegExp("^BODY|HTML$","g");var invalidParentsRe=tinyMCE.settings['merge_styles_invalid_parents']!=''?new RegExp(tinyMCE.settings['merge_styles_invalid_parents'],"gi"):null;if(tinyMCE.isMSIE){if(rng.item)parentElm=rng.item(0);else{var pelm=rng.parentElement();var prng=doc.selection.createRange();prng.moveToElementText(pelm);if(rng.htmlText==prng.htmlText||rng.boundingWidth==0){if(invalidParentsRe==null||!invalidParentsRe.test(pelm.nodeName))parentElm=pelm;}}}else{var felm=this.getFocusElement();if(sel.isCollapsed||(new RegExp('td|tr|tbody|table','gi').test(felm.nodeName)&&sel.anchorNode==felm.parentNode))parentElm=felm;}if(parentElm&&!invalidRe.test(parentElm.nodeName)){if(scmd=="setstyle")tinyMCE.setStyleAttrib(parentElm,sname,svalue);if(scmd=="setattrib")tinyMCE.setAttrib(parentElm,sname,svalue);if(scmd=="removeformat"){parentElm.style.cssText='';tinyMCE.setAttrib(parentElm,'class','');}var ch=tinyMCE.getNodeTree(parentElm,new Array(),1);for(var z=0;z<ch.length;z++){if(ch[z]==parentElm)continue;if(scmd=="setstyle")tinyMCE.setStyleAttrib(ch[z],sname,'');if(scmd=="setattrib")tinyMCE.setAttrib(ch[z],sname,'');if(scmd=="removeformat"){ch[z].style.cssText='';tinyMCE.setAttrib(ch[z],'class','');}}}else{this._setUseCSS(false);doc.execCommand("FontName",false,"#mce_temp_font#");var elementArray=tinyMCE.getElementsByAttributeValue(this.getBody(),"font","face","#mce_temp_font#");for(var x=0;x<elementArray.length;x++){elm=elementArray[x];if(elm){var spanElm=doc.createElement(wrapper);if(scmd=="setstyle")tinyMCE.setStyleAttrib(spanElm,sname,svalue);if(scmd=="setattrib")tinyMCE.setAttrib(spanElm,sname,svalue);if(scmd=="removeformat"){spanElm.style.cssText='';tinyMCE.setAttrib(spanElm,'class','');}if(elm.hasChildNodes()){for(var i=0;i<elm.childNodes.length;i++)spanElm.appendChild(elm.childNodes[i].cloneNode(true));}spanElm.setAttribute("mce_new","true");elm.parentNode.replaceChild(spanElm,elm);var ch=tinyMCE.getNodeTree(spanElm,new Array(),1);for(var z=0;z<ch.length;z++){if(ch[z]==spanElm)continue;if(scmd=="setstyle")tinyMCE.setStyleAttrib(ch[z],sname,'');if(scmd=="setattrib")tinyMCE.setAttrib(ch[z],sname,'');if(scmd=="removeformat"){ch[z].style.cssText='';tinyMCE.setAttrib(ch[z],'class','');}}}}}var nodes=doc.getElementsByTagName(wrapper);for(var i=nodes.length-1;i>=0;i--){var elm=nodes[i];var isNew=tinyMCE.getAttrib(elm,"mce_new")=="true";elm.removeAttribute("mce_new");if(elm.childNodes&&elm.childNodes.length==1&&elm.childNodes[0].nodeType==1){this._mergeElements(scmd,elm,elm.childNodes[0],isNew);continue;}if(elm.parentNode.childNodes.length==1&&!invalidRe.test(elm.nodeName)&&!invalidRe.test(elm.parentNode.nodeName)){if(invalidParentsRe==null||!invalidParentsRe.test(elm.parentNode.nodeName))this._mergeElements(scmd,elm.parentNode,elm,false);}}var nodes=doc.getElementsByTagName(wrapper);for(var i=nodes.length-1;i>=0;i--){var elm=nodes[i];var isEmpty=true;var tmp=doc.createElement("body");tmp.appendChild(elm.cloneNode(false));tmp.innerHTML=tmp.innerHTML.replace(new RegExp('style=""|class=""','gi'),'');if(new RegExp('<span>','gi').test(tmp.innerHTML)){for(var x=0;x<elm.childNodes.length;x++){if(elm.parentNode!=null)elm.parentNode.insertBefore(elm.childNodes[x].cloneNode(true),elm);}elm.parentNode.removeChild(elm);}}if(scmd=="removeformat")tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE.triggerNodeChange();break;case"FontName":if(value==null){var s=this.getSel();if(tinyMCE.isGecko&&s.isCollapsed){var f=tinyMCE.getParentElement(this.getFocusElement(),"font");if(f!=null)this.selection.selectNode(f,false);}this.getDoc().execCommand("RemoveFormat",false,null);if(f!=null&&tinyMCE.isGecko){var r=this.getRng().cloneRange();r.collapse(true);s.removeAllRanges();s.addRange(r);}}else this.getDoc().execCommand('FontName',false,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);return;case"FontSize":this.getDoc().execCommand('FontSize',false,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);return;case"forecolor":this.getDoc().execCommand('forecolor',false,value);break;case"HiliteColor":if(tinyMCE.isGecko){this._setUseCSS(true);this.getDoc().execCommand('hilitecolor',false,value);this._setUseCSS(false);}else this.getDoc().execCommand('BackColor',false,value);break;case"Cut":case"Copy":case"Paste":var cmdFailed=false;eval('try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}');if(tinyMCE.isOpera&&cmdFailed)alert('Currently not supported by your browser, use keyboard shortcuts instead.');if(tinyMCE.isGecko&&cmdFailed){if(confirm(tinyMCE.entityDecode(tinyMCE.getLang('lang_clipboard_msg'))))window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html','mceExternal');return;}else tinyMCE.triggerNodeChange();break;case"mceSetContent":if(!value)value="";value=tinyMCE.storeAwayURLs(value);value=tinyMCE._customCleanup(this,"insert_to_editor",value);tinyMCE._setHTML(doc,value);tinyMCE.setInnerHTML(doc.body,tinyMCE._cleanupHTML(this,doc,tinyMCE.settings,doc.body));tinyMCE.convertAllRelativeURLs(doc.body);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);tinyMCE.handleVisualAid(doc.body,true,this.visualAid,this);tinyMCE._setEventsEnabled(doc.body,false);return true;case"mceCleanup":var b=this.selection.getBookmark();tinyMCE._setHTML(this.contentDocument,this.getBody().innerHTML);tinyMCE.setInnerHTML(this.getBody(),tinyMCE._cleanupHTML(this,this.contentDocument,this.settings,this.getBody(),this.visualAid));tinyMCE.convertAllRelativeURLs(doc.body);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(doc);tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE._setEventsEnabled(this.getBody(),false);this.repaint();this.selection.moveToBookmark(b);tinyMCE.triggerNodeChange();break;case"mceReplaceContent":if(!value)value='';this.getWin().focus();var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=this.getSel().toString();if(selectedText.length>0){value=tinyMCE.replaceVar(value,"selection",selectedText);tinyMCE.execCommand('mceInsertContent',false,value);}tinyMCE.triggerNodeChange();break;case"mceSetAttribute":if(typeof(value)=='object'){var targetElms=(typeof(value['targets'])=="undefined")?"p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address":value['targets'];var targetNode=tinyMCE.getParentElement(this.getFocusElement(),targetElms);if(targetNode){targetNode.setAttribute(value['name'],value['value']);tinyMCE.triggerNodeChange();}}break;case"mceSetCSSClass":this.execCommand("SetStyleInfo",false,{command:"setattrib",name:"class",value:value});break;case"mceInsertRawHTML":var key='tiny_mce_marker';this.execCommand('mceBeginUndoLevel');this.execCommand('mceInsertContent',false,key);var scrollX=this.getDoc().body.scrollLeft+this.getDoc().documentElement.scrollLeft;var scrollY=this.getDoc().body.scrollTop+this.getDoc().documentElement.scrollTop;var html=this.getBody().innerHTML;if((pos=html.indexOf(key))!=-1)tinyMCE.setInnerHTML(this.getBody(),html.substring(0,pos)+value+html.substring(pos+key.length));this.contentWindow.scrollTo(scrollX,scrollY);this.execCommand('mceEndUndoLevel');break;case"mceInsertContent":if(!value)value='';var insertHTMLFailed=false;this.getWin().focus();if(tinyMCE.isGecko||tinyMCE.isOpera){try{if(value.indexOf('<')==-1&&!value.match(/(&#38;|&#160;|&#60;|&#62;)/g)){var r=this.getRng();var n=this.getDoc().createTextNode(tinyMCE.entityDecode(value));var s=this.getSel();var r2=r.cloneRange();s.removeAllRanges();r.deleteContents();r.insertNode(n);r2.selectNode(n);r2.collapse(false);s.removeAllRanges();s.addRange(r2);}else{value=tinyMCE.fixGeckoBaseHREFBug(1,this.getDoc(),value);this.getDoc().execCommand('inserthtml',false,value);tinyMCE.fixGeckoBaseHREFBug(2,this.getDoc(),value);}}catch(ex){insertHTMLFailed=true;}if(!insertHTMLFailed){tinyMCE.triggerNodeChange();return;}}if(tinyMCE.isOpera&&insertHTMLFailed){this.getDoc().execCommand("insertimage",false,tinyMCE.uniqueURL);var ar=tinyMCE.getElementsByAttributeValue(this.getBody(),"img","src",tinyMCE.uniqueURL);ar[0].outerHTML=value;return;}if(!tinyMCE.isMSIE){var isHTML=value.indexOf('<')!=-1;var sel=this.getSel();var rng=this.getRng();if(isHTML){if(tinyMCE.isSafari){var tmpRng=this.getDoc().createRange();tmpRng.setStart(this.getBody(),0);tmpRng.setEnd(this.getBody(),0);value=tmpRng.createContextualFragment(value);}else value=rng.createContextualFragment(value);}else{var el=document.createElement("div");el.innerHTML=value;value=el.firstChild.nodeValue;value=doc.createTextNode(value);}if(tinyMCE.isSafari&&!isHTML){this.execCommand('InsertText',false,value.nodeValue);tinyMCE.triggerNodeChange();return true;}else if(tinyMCE.isSafari&&isHTML){rng.deleteContents();rng.insertNode(value);tinyMCE.triggerNodeChange();return true;}rng.deleteContents();if(rng.startContainer.nodeType==3){var node=rng.startContainer.splitText(rng.startOffset);node.parentNode.insertBefore(value,node);}else rng.insertNode(value);if(!isHTML){sel.selectAllChildren(doc.body);sel.removeAllRanges();var rng=doc.createRange();rng.selectNode(value);rng.collapse(false);sel.addRange(rng);}else rng.collapse(false);tinyMCE.fixGeckoBaseHREFBug(2,this.getDoc(),value);}else{var rng=doc.selection.createRange();var c=value.indexOf('<!--')!=-1;if(c)value=tinyMCE.uniqueTag+value;if(rng.item)rng.item(0).outerHTML=value;else rng.pasteHTML(value);if(c){var e=this.getDoc().getElementById('mceTMPElement');e.parentNode.removeChild(e);}}tinyMCE.triggerNodeChange();break;case"mceStartTyping":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedo.typingUndoIndex==-1){this.undoRedo.typingUndoIndex=this.undoRedo.undoIndex;this.execCommand('mceAddUndoLevel');}break;case"mceEndTyping":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedo.typingUndoIndex!=-1){this.execCommand('mceAddUndoLevel');this.undoRedo.typingUndoIndex=-1;}break;case"mceBeginUndoLevel":this.undoRedoLevel=false;break;case"mceEndUndoLevel":this.undoRedoLevel=true;this.execCommand('mceAddUndoLevel');break;case"mceAddUndoLevel":if(tinyMCE.settings['custom_undo_redo']&&this.undoRedoLevel){if(this.undoRedo.add())tinyMCE.triggerNodeChange(false);}break;case"Undo":if(tinyMCE.settings['custom_undo_redo']){tinyMCE.execCommand("mceEndTyping");this.undoRedo.undo();tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case"Redo":if(tinyMCE.settings['custom_undo_redo']){tinyMCE.execCommand("mceEndTyping");this.undoRedo.redo();tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case"mceToggleVisualAid":this.visualAid=!this.visualAid;tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid,this);tinyMCE.triggerNodeChange();break;case"Indent":this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();if(tinyMCE.isMSIE){var n=tinyMCE.getParentElement(this.getFocusElement(),"blockquote");do{if(n&&n.nodeName=="BLOCKQUOTE"){n.removeAttribute("dir");n.removeAttribute("style");}}while(n!=null&&(n=n.parentNode)!=null);}break;case"removeformat":var text=this.selection.getSelectedText();if(tinyMCE.isOpera){this.getDoc().execCommand("RemoveFormat",false,null);return;}if(tinyMCE.isMSIE){try{var rng=doc.selection.createRange();rng.execCommand("RemoveFormat",false,null);}catch(e){}this.execCommand("SetStyleInfo",false,{command:"removeformat"});}else{this.getDoc().execCommand(command,user_interface,value);this.execCommand("SetStyleInfo",false,{command:"removeformat"});}if(text.length==0)this.execCommand("mceSetCSSClass",false,"");tinyMCE.triggerNodeChange();break;default:this.getDoc().execCommand(command,user_interface,value);if(tinyMCE.isGecko)window.setTimeout('tinyMCE.triggerNodeChange(false);',1);else tinyMCE.triggerNodeChange();}if(command!="mceAddUndoLevel"&&command!="Undo"&&command!="Redo"&&command!="mceStartTyping"&&command!="mceEndTyping")tinyMCE.execCommand("mceAddUndoLevel");},queryCommandValue:function(c){try{return this.getDoc().queryCommandValue(c);}catch(e){return null;}},queryCommandState:function(c){return this.getDoc().queryCommandState(c);},_onAdd:function(replace_element,form_element_name,target_document){var hc,th,to,editorTemplate;th=this.settings['theme'];to=tinyMCE.themes[th];var targetDoc=target_document?target_document:document;this.targetDoc=targetDoc;tinyMCE.themeURL=tinyMCE.baseURL+"/themes/"+this.settings['theme'];this.settings['themeurl']=tinyMCE.themeURL;if(!replace_element){alert("Error: Could not find the target element.");return false;}if(to.getEditorTemplate)editorTemplate=to.getEditorTemplate(this.settings,this.editorId);var deltaWidth=editorTemplate['delta_width']?editorTemplate['delta_width']:0;var deltaHeight=editorTemplate['delta_height']?editorTemplate['delta_height']:0;var html='<span id="'+this.editorId+'_parent" class="mceEditorContainer">'+editorTemplate['html'];html=tinyMCE.replaceVar(html,"editor_id",this.editorId);this.settings['default_document']=tinyMCE.baseURL+"/blank.htm";this.settings['old_width']=this.settings['width'];this.settings['old_height']=this.settings['height'];if(this.settings['width']==-1)this.settings['width']=replace_element.offsetWidth;if(this.settings['height']==-1)this.settings['height']=replace_element.offsetHeight;if(this.settings['width']==0)this.settings['width']=replace_element.style.width;if(this.settings['height']==0)this.settings['height']=replace_element.style.height;if(this.settings['width']==0)this.settings['width']=320;if(this.settings['height']==0)this.settings['height']=240;this.settings['area_width']=parseInt(this.settings['width']);this.settings['area_height']=parseInt(this.settings['height']);this.settings['area_width']+=deltaWidth;this.settings['area_height']+=deltaHeight;if((""+this.settings['width']).indexOf('%')!=-1)this.settings['area_width']="100%";if((""+this.settings['height']).indexOf('%')!=-1)this.settings['area_height']="100%";if((""+replace_element.style.width).indexOf('%')!=-1){this.settings['width']=replace_element.style.width;this.settings['area_width']="100%";}if((""+replace_element.style.height).indexOf('%')!=-1){this.settings['height']=replace_element.style.height;this.settings['area_height']="100%";}html=tinyMCE.applyTemplate(html);this.settings['width']=this.settings['old_width'];this.settings['height']=this.settings['old_height'];this.visualAid=this.settings['visual'];this.formTargetElementId=form_element_name;if(replace_element.nodeName=="TEXTAREA"||replace_element.nodeName=="INPUT")this.startContent=replace_element.value;else this.startContent=replace_element.innerHTML;if(replace_element.nodeName!="TEXTAREA"&&replace_element.nodeName!="INPUT"){this.oldTargetElement=replace_element;if(tinyMCE.settings['debug']){hc='<textarea wrap="off" id="'+form_element_name+'" name="'+form_element_name+'" cols="100" rows="15"></textarea>';}else{hc='<input type="hidden" type="text" id="'+form_element_name+'" name="'+form_element_name+'" />';this.oldTargetElement.style.display="none";}html+='</span>';if(tinyMCE.isGecko)html=hc+html;else html+=hc;if(tinyMCE.isGecko){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);tinyMCE.insertAfter(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}else{html+='</span>';this.oldTargetElement=replace_element;if(!tinyMCE.settings['debug'])this.oldTargetElement.style.display="none";if(tinyMCE.isGecko){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);tinyMCE.insertAfter(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}var dynamicIFrame=false;var tElm=targetDoc.getElementById(this.editorId);if(!tinyMCE.isMSIE){if(tElm&&tElm.nodeName=="SPAN"){tElm=tinyMCE._createIFrame(tElm,targetDoc);dynamicIFrame=true;}this.targetElement=tElm;this.iframeElement=tElm;this.contentDocument=tElm.contentDocument;this.contentWindow=tElm.contentWindow;}else{if(tElm&&tElm.nodeName=="SPAN")tElm=tinyMCE._createIFrame(tElm,targetDoc,targetDoc.parentWindow);else tElm=targetDoc.frames[this.editorId];this.targetElement=tElm;this.iframeElement=targetDoc.getElementById(this.editorId);if(tinyMCE.isOpera){this.contentDocument=this.iframeElement.contentDocument;this.contentWindow=this.iframeElement.contentWindow;dynamicIFrame=true;}else{this.contentDocument=tElm.window.document;this.contentWindow=tElm.window;}this.getDoc().designMode="on";}var doc=this.contentDocument;if(dynamicIFrame){var html=tinyMCE.getParam('doctype')+'<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="'+tinyMCE.settings['base_href']+'" /><title>blank_page</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body class="mceContentBody"></body></html>';try{if(!this.isHidden())this.getDoc().designMode="on";doc.open();doc.write(html);doc.close();}catch(e){this.getDoc().location.href=tinyMCE.baseURL+"/blank.htm";}}if(tinyMCE.isMSIE)window.setTimeout("tinyMCE.addEventHandlers(tinyMCE.instances[\""+this.editorId+"\"]);",1);tinyMCE.setupContent(this.editorId,true);return true;},setBaseHREF:function(u){var h,b,d,nl;d=this.getDoc();nl=d.getElementsByTagName("base");b=nl.length>0?nl[0]:null;if(!b){nl=d.getElementsByTagName("head");h=nl.length>0?nl[0]:null;b=d.createElement("base");b.setAttribute('href',u);h.appendChild(b);}else{if(u==""||u==null)b.parentNode.removeChild(b);else b.setAttribute('href',u);}},getFocusElement:function(){return this.selection.getFocusElement();},getSel:function(){return this.selection.getSel();},getRng:function(){return this.selection.getRng();},triggerSave:function(skip_cleanup,skip_callback){this.switchSettings();tinyMCE.settings['preformatted']=false;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;tinyMCE._setHTML(this.getDoc(),this.getBody().innerHTML);if(this.settings['cleanup']==false){tinyMCE.handleVisualAid(this.getBody(),true,false,this);tinyMCE._setEventsEnabled(this.getBody(),true);}tinyMCE._customCleanup(this,"submit_content_dom",this.contentWindow.document.body);var htm=skip_cleanup?this.getBody().innerHTML:tinyMCE._cleanupHTML(this,this.getDoc(),this.settings,this.getBody(),tinyMCE.visualAid,true,true);htm=tinyMCE._customCleanup(this,"submit_content",htm);if(!skip_callback&&tinyMCE.settings['save_callback']!="")var content=eval(tinyMCE.settings['save_callback']+"(this.formTargetElementId,htm,this.getBody());");if((typeof(content)!="undefined")&&content!=null)htm=content;htm=tinyMCE.regexpReplace(htm,"&#40;","(","gi");htm=tinyMCE.regexpReplace(htm,"&#41;",")","gi");htm=tinyMCE.regexpReplace(htm,"&#59;",";","gi");htm=tinyMCE.regexpReplace(htm,"&#34;","&quot;","gi");htm=tinyMCE.regexpReplace(htm,"&#94;","^","gi");if(this.formElement)this.formElement.value=htm;if(tinyMCE.isSafari&&this.formElement)this.formElement.innerText=htm;}};TinyMCE_Engine.prototype.cleanupHTMLCode=function(s){s=s.replace(/<p \/>/gi,'<p>&nbsp;</p>');s=s.replace(/<p>\s*<\/p>/gi,'<p>&nbsp;</p>');s=s.replace(/<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\|>]*?)\/>/gi,'<$1$2$3></$1$2>');s=s.replace(new RegExp('\\s+></','gi'),'></');s=s.replace(/<(img|br|hr)(.*?)><\/(img|br|hr)>/gi,'<$1$2 />');if(tinyMCE.isMSIE)s=s.replace(/<p><hr \/><\/p>/gi,"<hr>");if(tinyMCE.getParam('convert_urls'))s=s.replace(new RegExp('(href=\"?)(\\s*?#)','gi'),'$1'+tinyMCE.settings['document_base_url']+"#");return s;};TinyMCE_Engine.prototype.parseStyle=function(str){var ar=new Array();if(str==null)return ar;var st=str.split(';');tinyMCE.clearArray(ar);for(var i=0;i<st.length;i++){if(st[i]=='')continue;var re=new RegExp('^\\s*([^:]*):\\s*(.*)\\s*$');var pa=st[i].replace(re,'$1||$2').split('||');if(pa.length==2)ar[pa[0].toLowerCase()]=pa[1];}return ar;};TinyMCE_Engine.prototype.compressStyle=function(ar,pr,sf,res){var box=new Array();box[0]=ar[pr+'-top'+sf];box[1]=ar[pr+'-left'+sf];box[2]=ar[pr+'-right'+sf];box[3]=ar[pr+'-bottom'+sf];for(var i=0;i<box.length;i++){if(box[i]==null)return;for(var a=0;a<box.length;a++){if(box[a]!=box[i])return;}}ar[res]=box[0];ar[pr+'-top'+sf]=null;ar[pr+'-left'+sf]=null;ar[pr+'-right'+sf]=null;ar[pr+'-bottom'+sf]=null;};TinyMCE_Engine.prototype.serializeStyle=function(ar){var str="";tinyMCE.compressStyle(ar,"border","","border");tinyMCE.compressStyle(ar,"border","-width","border-width");tinyMCE.compressStyle(ar,"border","-color","border-color");for(var key in ar){var val=ar[key];if(typeof(val)=='function')continue;if(key.indexOf('mso-')==0)continue;if(val!=null&&val!=''){val=''+val;val=val.replace(new RegExp("url\\(\\'?([^\\']*)\\'?\\)",'gi'),"url('$1')");if(val.indexOf('url(')!=-1&&tinyMCE.getParam('convert_urls')){var m=new RegExp("url\\('(.*?)'\\)").exec(val);if(m.length>1)val="url('"+eval(tinyMCE.getParam('urlconverter_callback')+"(m[1], null, true);")+"')";}if(tinyMCE.getParam("force_hex_style_colors"))val=tinyMCE.convertRGBToHex(val,true);if(val!="url('')")str+=key.toLowerCase()+": "+val+"; ";}}if(new RegExp('; $').test(str))str=str.substring(0,str.length-2);return str;};TinyMCE_Engine.prototype.convertRGBToHex=function(s,k){if(s.toLowerCase().indexOf('rgb')!=-1){var re=new RegExp("(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)","gi");var rgb=s.replace(re,"$1,$2,$3,$4,$5").split(',');if(rgb.length==5){r=parseInt(rgb[1]).toString(16);g=parseInt(rgb[2]).toString(16);b=parseInt(rgb[3]).toString(16);r=r.length==1?'0'+r:r;g=g.length==1?'0'+g:g;b=b.length==1?'0'+b:b;s="#"+r+g+b;if(k)s=rgb[0]+s+rgb[4];}}return s;};TinyMCE_Engine.prototype.convertHexToRGB=function(s){if(s.indexOf('#')!=-1){s=s.replace(new RegExp('[^0-9A-F]','gi'),'');return"rgb("+parseInt(s.substring(0,2),16)+","+parseInt(s.substring(2,4),16)+","+parseInt(s.substring(4,6),16)+")";}return s;};TinyMCE_Engine.prototype.convertSpansToFonts=function(doc){var sizes=tinyMCE.getParam('font_size_style_values').replace(/\s+/,'').split(',');var h=doc.body.innerHTML;h=h.replace(/<span/gi,'<font');h=h.replace(/<\/span/gi,'</font');doc.body.innerHTML=h;var s=doc.getElementsByTagName("font");for(var i=0;i<s.length;i++){var size=tinyMCE.trim(s[i].style.fontSize).toLowerCase();var fSize=0;for(var x=0;x<sizes.length;x++){if(sizes[x]==size){fSize=x+1;break;}}if(fSize>0){tinyMCE.setAttrib(s[i],'size',fSize);s[i].style.fontSize='';}var fFace=s[i].style.fontFamily;if(fFace!=null&&fFace!=""){tinyMCE.setAttrib(s[i],'face',fFace);s[i].style.fontFamily='';}var fColor=s[i].style.color;if(fColor!=null&&fColor!=""){tinyMCE.setAttrib(s[i],'color',tinyMCE.convertRGBToHex(fColor));s[i].style.color='';}}};TinyMCE_Engine.prototype.convertFontsToSpans=function(doc){var sizes=tinyMCE.getParam('font_size_style_values').replace(/\s+/,'').split(',');var h=doc.body.innerHTML;h=h.replace(/<font/gi,'<span');h=h.replace(/<\/font/gi,'</span');doc.body.innerHTML=h;var fsClasses=tinyMCE.getParam('font_size_classes');if(fsClasses!='')fsClasses=fsClasses.replace(/\s+/,'').split(',');else fsClasses=null;var s=doc.getElementsByTagName("span");for(var i=0;i<s.length;i++){var fSize,fFace,fColor;fSize=tinyMCE.getAttrib(s[i],'size');fFace=tinyMCE.getAttrib(s[i],'face');fColor=tinyMCE.getAttrib(s[i],'color');if(fSize!=""){fSize=parseInt(fSize);if(fSize>0&&fSize<8){if(fsClasses!=null)tinyMCE.setAttrib(s[i],'class',fsClasses[fSize-1]);else s[i].style.fontSize=sizes[fSize-1];}s[i].removeAttribute('size');}if(fFace!=""){s[i].style.fontFamily=fFace;s[i].removeAttribute('face');}if(fColor!=""){s[i].style.color=fColor;s[i].removeAttribute('color');}}};TinyMCE_Engine.prototype.cleanupAnchors=function(doc){var i,cn,x,an=doc.getElementsByTagName("a");for(i=0;i<an.length;i++){if(tinyMCE.getAttrib(an[i],"name")!=""&&tinyMCE.getAttrib(an[i],"href")==""){cn=an[i].childNodes;for(x=cn.length-1;x>=0;x--)tinyMCE.insertAfter(cn[x],an[i]);}}};TinyMCE_Engine.prototype.getContent=function(editor_id){var h;if(typeof(editor_id)!="undefined")tinyMCE.selectedInstance=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedInstance){h=tinyMCE._cleanupHTML(this.selectedInstance,this.selectedInstance.getDoc(),tinyMCE.settings,this.selectedInstance.getBody(),false,true);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(this.selectedInstance.getDoc());return h;}return null;};TinyMCE_Engine.prototype._fixListElements=function(d){var nl,x,a=['ol','ul'],i,n,p,r=new RegExp('^(OL|UL)$'),np;for(x=0;x<a.length;x++){nl=d.getElementsByTagName(a[x]);for(i=0;i<nl.length;i++){n=nl[i];p=n.parentNode;if(r.test(p.nodeName)){np=tinyMCE.prevNode(n,'LI');if(!np){np=d.createElement('li');np.innerHTML='&nbsp;';np.appendChild(n);p.insertBefore(np,p.firstChild);}else np.appendChild(n);}}}};TinyMCE_Engine.prototype._fixTables=function(d){var nl,i,n,p,np,x,t;nl=d.getElementsByTagName('table');for(i=0;i<nl.length;i++){n=nl[i];if((p=tinyMCE.getParentElement(n,'p,div,h1,h2,h3,h4,h5,h6'))!=null){np=p.cloneNode(false);np.removeAttribute('id');t=n;while((n=n.nextSibling))np.appendChild(n);tinyMCE.insertAfter(np,p);tinyMCE.insertAfter(t,p);}}};TinyMCE_Engine.prototype._cleanupHTML=function(inst,doc,config,elm,visual,on_save,on_submit){var h,d,t1,t2,t3,t4,t5,c,s;if(!tinyMCE.getParam('cleanup'))return elm.innerHTML;on_save=typeof(on_save)=='undefined'?false:on_save;c=inst.cleanup;s=inst.settings;d=c.settings.debug;if(d)t1=new Date().getTime();if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertFontsToSpans(doc);if(tinyMCE.getParam("fix_list_elements"))tinyMCE._fixListElements(doc);if(tinyMCE.getParam("fix_table_elements"))tinyMCE._fixTables(doc);tinyMCE._customCleanup(inst,on_save?"get_from_editor_dom":"insert_to_editor_dom",doc.body);if(d)t2=new Date().getTime();c.settings.on_save=on_save;c.idCount=0;c.serializationId++;c.serializedNodes=new Array();c.sourceIndex=-1;if(s.cleanup_serializer=="xml")h=c.serializeNodeAsXML(elm);else h=c.serializeNodeAsHTML(elm);if(d)t3=new Date().getTime();h=h.replace(/<\/?(body|head|html)[^>]*>/gi,'');h=h.replace(new RegExp(' (rowspan="1"|colspan="1")','g'),'');h=h.replace(/<p><hr \/><\/p>/g,'<hr />');h=h.replace(/<p>(&nbsp;|&#160;)<\/p><hr \/><p>(&nbsp;|&#160;)<\/p>/g,'<hr />');h=h.replace(/<td>\s*<br \/>\s*<\/td>/g,'<td>&nbsp;</td>');h=h.replace(/<p>\s*<br \/>\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*(&nbsp;|&#160;)\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<p>\s*<br \/>\s*&nbsp;\s*<\/p>/g,'<p>&nbsp;</p>');h=h.replace(/<a>(.*?)<\/a>/g,'$1');h=h.replace(/<p([^>]*)>\s*<\/p>/g,'<p$1>&nbsp;</p>');if(/^\s*(<br \/>|<p>&nbsp;<\/p>|<p>&#160;<\/p>|<p><\/p>)\s*$/.test(h))h='';if(s.preformatted){h=h.replace(/^<pre>/,'');h=h.replace(/<\/pre>$/,'');h='<pre>'+h+'</pre>';}if(tinyMCE.isGecko){h=h.replace(/<o:p _moz-userdefined="" \/>/g,'');h=h.replace(/<td([^>]*)>\s*<br \/>\s*<\/td>/g,'<td$1>&nbsp;</td>');}if(s.force_br_newlines)h=h.replace(/<p>(&nbsp;|&#160;)<\/p>/g,'<br />');h=tinyMCE._customCleanup(inst,on_save?"get_from_editor":"insert_to_editor",h);if(on_save){h=h.replace(new RegExp(' ?(mceItem[a-zA-Z0-9]*|'+s.visual_table_class+')','g'),'');h=h.replace(new RegExp(' ?class=""','g'),'');}if(s.remove_linebreaks&&!c.settings.indent)h=h.replace(/\n|\r/g,' ');if(d)t4=new Date().getTime();if(on_save&&c.settings.indent)h=c.formatHTML(h);if(on_submit&&(s.encoding=="xml"||s.encoding=="html"))h=c.xmlEncode(h);if(d)t5=new Date().getTime();if(c.settings.debug)tinyMCE.debug("Cleanup in ms: Pre="+(t2-t1)+", Serialize: "+(t3-t2)+", Post: "+(t4-t3)+", Format: "+(t5-t4)+", Sum: "+(t5-t1)+".");return h;};function TinyMCE_Cleanup(){this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.rules=tinyMCE.clearArray(new Array());this.settings={indent_elements:'head,table,tbody,thead,tfoot,form,tr,ul,ol,blockquote,object',newline_before_elements:'h1,h2,h3,h4,h5,h6,pre,address,div,ul,ol,li,meta,option,area,title,link,base,script,td',newline_after_elements:'br,hr,p,pre,address,div,ul,ol,meta,option,area,link,base,script',newline_before_after_elements:'html,head,body,table,thead,tbody,tfoot,tr,form,ul,ol,blockquote,p,object,param,hr,div',indent_char:'\t',indent_levels:1,entity_encoding:'raw',valid_elements:'*[*]',entities:'',url_converter:'',invalid_elements:'',verify_html:false};this.vElements=tinyMCE.clearArray(new Array());this.vElementsRe='';this.closeElementsRe=/^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON)$/;this.codeElementsRe=/^(SCRIPT|STYLE)$/;this.serializationId=0;this.mceAttribs={href:'mce_href',src:'mce_src',type:'mce_type'};}TinyMCE_Cleanup.prototype={init:function(s){var n,a,i,ir,or,st;for(n in s)this.settings[n]=s[n];s=this.settings;this.inRe=this._arrayToRe(s.indent_elements.split(','),'','^<(',')[^>]*');this.ouRe=this._arrayToRe(s.indent_elements.split(','),'','^<\\/(',')[^>]*');this.nlBeforeRe=this._arrayToRe(s.newline_before_elements.split(','),'gi','<(',')([^>]*)>');this.nlAfterRe=this._arrayToRe(s.newline_after_elements.split(','),'gi','<(',')([^>]*)>');this.nlBeforeAfterRe=this._arrayToRe(s.newline_before_after_elements.split(','),'gi','<(\\/?)(',')([^>]*)>');if(s.invalid_elements!='')this.iveRe=this._arrayToRe(s.invalid_elements.toUpperCase().split(','),'g','^(',')$');else this.iveRe=null;st='';for(i=0;i<s.indent_levels;i++)st+=s.indent_char;this.inStr=st;if(!s.verify_html){s.valid_elements='*[*]';s.extended_valid_elements='';}this.fillStr=s.entity_encoding=="named"?"&nbsp;":"&#160;";this.idCount=0;},addRuleStr:function(s){var r=this.parseRuleStr(s);var n;for(n in r){if(r[n])this.rules[n]=r[n];}this.vElements=tinyMCE.clearArray(new Array());for(n in this.rules){if(this.rules[n])this.vElements[this.vElements.length]=this.rules[n].tag;}this.vElementsRe=this._arrayToRe(this.vElements,'');},parseRuleStr:function(s){var ta,p,r,a,i,x,px,t,tn,y,av,or=tinyMCE.clearArray(new Array()),dv;if(s==null||s.length==0)return or;ta=s.split(',');for(x=0;x<ta.length;x++){s=ta[x];if(s.length==0)continue;p=this.split(/\[|\]/,s);if(p==null||p.length<1)t=s.toUpperCase();else t=p[0].toUpperCase();tn=this.split('/',t);for(y=0;y<tn.length;y++){r={};r.tag=tn[y];r.forceAttribs=null;r.defaultAttribs=null;r.validAttribValues=null;px=r.tag.charAt(0);r.forceOpen=px=='+';r.removeEmpty=px=='-';r.fill=px=='#';r.tag=r.tag.replace(/\+|-|#/g,'');r.oTagName=tn[0].replace(/\+|-|#/g,'').toLowerCase();r.isWild=new RegExp('\\*|\\?|\\+','g').test(r.tag);r.validRe=new RegExp(this._wildcardToRe('^'+r.tag+'$'));if(p.length>1){r.vAttribsRe='^(';a=this.split(/\|/,p[1]);for(i=0;i<a.length;i++){t=a[i];av=/(=|:|<)(.*?)$/.exec(t);t=t.replace(/(=|:|<).*?$/,'');if(av&&av.length>0){if(av[0].charAt(0)==':'){if(!r.forceAttribs)r.forceAttribs=tinyMCE.clearArray(new Array());r.forceAttribs[t.toLowerCase()]=av[0].substring(1);}else if(av[0].charAt(0)=='='){if(!r.defaultAttribs)r.defaultAttribs=tinyMCE.clearArray(new Array());dv=av[0].substring(1);r.defaultAttribs[t.toLowerCase()]=dv==""?"mce_empty":dv;}else if(av[0].charAt(0)=='<'){if(!r.validAttribValues)r.validAttribValues=tinyMCE.clearArray(new Array());r.validAttribValues[t.toLowerCase()]=this._arrayToRe(this.split('?',av[0].substring(1)),'');}}r.vAttribsRe+=''+t.toLowerCase()+(i!=a.length-1?'|':'');a[i]=t.toLowerCase();}r.vAttribsRe+=')$';r.vAttribsRe=this._wildcardToRe(r.vAttribsRe);r.vAttribsReIsWild=new RegExp('\\*|\\?|\\+','g').test(r.vAttribsRe);r.vAttribsRe=new RegExp(r.vAttribsRe);r.vAttribs=a.reverse();}else{r.vAttribsRe='';r.vAttribs=tinyMCE.clearArray(new Array());r.vAttribsReIsWild=false;}or[r.tag]=r;}}return or;},serializeNodeAsXML:function(n){var s,b;if(!this.xmlDoc){if(this.isMSIE){try{this.xmlDoc=new ActiveXObject('MSXML2.DOMDocument');}catch(e){}if(!this.xmlDoc)try{this.xmlDoc=new ActiveXObject('Microsoft.XmlDom');}catch(e){}}else this.xmlDoc=document.implementation.createDocument('','',null);if(!this.xmlDoc)alert("Error XML Parser could not be found.");}if(this.xmlDoc.firstChild)this.xmlDoc.removeChild(this.xmlDoc.firstChild);b=this.xmlDoc.createElement("html");b=this.xmlDoc.appendChild(b);this._convertToXML(n,b);if(this.isMSIE)return this.xmlDoc.xml;else return new XMLSerializer().serializeToString(this.xmlDoc);},_convertToXML:function(n,xn){var xd,el,i,l,cn,at,no,hc=false;if(this._isDuplicate(n))return;xd=this.xmlDoc;switch(n.nodeType){case 1:hc=n.hasChildNodes();el=xd.createElement(n.nodeName.toLowerCase());at=n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified&&no.nodeValue)el.setAttribute(no.nodeName.toLowerCase(),no.nodeValue);}if(!hc&&!this.closeElementsRe.test(n.nodeName))el.appendChild(xd.createTextNode(""));xn=xn.appendChild(el);break;case 3:xn.appendChild(xd.createTextNode(n.nodeValue));return;case 8:xn.appendChild(xd.createComment(n.nodeValue));return;}if(hc){cn=n.childNodes;for(i=0,l=cn.length;i<l;i++)this._convertToXML(cn[i],xn);}},serializeNodeAsHTML:function(n){var en,no,h='',i,l,r,cn,va=false,f=false,at,hc;this._setupRules();if(this._isDuplicate(n))return'';switch(n.nodeType){case 1:hc=n.hasChildNodes();if((tinyMCE.isMSIE&&!tinyMCE.isOpera)&&n.nodeName.indexOf('/')!=-1)break;if(this.vElementsRe.test(n.nodeName)&&(!this.iveRe||!this.iveRe.test(n.nodeName))){va=true;r=this.rules[n.nodeName];if(!r){at=this.rules;for(no in at){if(at[no]&&at[no].validRe.test(n.nodeName)){r=at[no];break;}}}en=r.isWild?n.nodeName.toLowerCase():r.oTagName;f=r.fill;if(r.removeEmpty&&!hc)return"";h+='<'+en;if(r.vAttribsReIsWild){at=n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified&&r.vAttribsRe.test(no.nodeName))h+=this._serializeAttribute(n,r,no.nodeName);}}else{for(i=r.vAttribs.length-1;i>-1;i--)h+=this._serializeAttribute(n,r,r.vAttribs[i]);}if(!this.settings.on_save){at=this.mceAttribs;for(no in at){if(at[no])h+=this._serializeAttribute(n,r,at[no]);}}if(this.closeElementsRe.test(n.nodeName))return h+' />';h+='>';if(this.isMSIE&&this.codeElementsRe.test(n.nodeName))h+=n.innerHTML;}break;case 3:if(n.parentNode&&this.codeElementsRe.test(n.parentNode.nodeName))return this.isMSIE?'':n.nodeValue;return this.xmlEncode(n.nodeValue);case 8:return"<!--"+this._trimComment(n.nodeValue)+"-->";}if(hc){cn=n.childNodes;for(i=0,l=cn.length;i<l;i++)h+=this.serializeNodeAsHTML(cn[i]);}if(f&&!hc)h+=this.fillStr;if(va)h+='</'+en+'>';return h;},_serializeAttribute:function(n,r,an){var av='',t,os=this.settings.on_save;if(os&&(an.indexOf('mce_')==0||an.indexOf('_moz')==0))return'';if(os&&this.mceAttribs[an])av=this._getAttrib(n,this.mceAttribs[an]);if(av.length==0)av=this._getAttrib(n,an);if(av.length==0&&r.defaultAttribs&&(t=r.defaultAttribs[an])){av=t;if(av=="mce_empty")return" "+an+'=""';}if(r.forceAttribs&&(t=r.forceAttribs[an]))av=t;if(os&&av.length!=0&&this.settings.url_converter.length!=0&&/^(src|href|longdesc)$/.test(an))av=eval(this.settings.url_converter+'(this, n, av)');if(av.length!=0&&r.validAttribValues&&r.validAttribValues[an]&&!r.validAttribValues[an].test(av))return"";if(av.length!=0&&av=="{$uid}")av="uid_"+(this.idCount++);if(av.length!=0)return" "+an+"="+'"'+this.xmlEncode(av)+'"';return"";},formatHTML:function(h){var s=this.settings,p='',i=0,li=0,o='',l;h=h.replace(/\r/g,'');h='\n'+h;h=h.replace(new RegExp('\\n\\s+','gi'),'\n');h=h.replace(this.nlBeforeRe,'\n<$1$2>');h=h.replace(this.nlAfterRe,'<$1$2>\n');h=h.replace(this.nlBeforeAfterRe,'\n<$1$2$3>\n');h+='\n';while((i=h.indexOf('\n',i+1))!=-1){if((l=h.substring(li+1,i)).length!=0){if(this.ouRe.test(l)&&p.length>=s.indent_levels)p=p.substring(s.indent_levels);o+=p+l+'\n';if(this.inRe.test(l))p+=this.inStr;}li=i;}return o;},xmlEncode:function(s){var i,l,e,o='',c;this._setupEntities();switch(this.settings.entity_encoding){case"raw":return tinyMCE.xmlEncode(s);case"named":for(i=0,l=s.length;i<l;i++){c=s.charCodeAt(i);e=this.entities[c];if(c==39){o+="&#39;";continue;}if(e&&e!='')o+='&'+e+';';else o+=String.fromCharCode(c);}return o;case"numeric":for(i=0,l=s.length;i<l;i++){c=s.charCodeAt(i);if(c>127||c==60||c==62||c==38||c==39||c==34)o+='&#'+c+";";else o+=String.fromCharCode(c);}return o;}return s;},split:function(re,s){var c=s.split(re);var i,l,o=new Array();for(i=0,l=c.length;i<l;i++){if(c[i]!='')o[i]=c[i];}return o;},_trimComment:function(s){if(tinyMCE.isGecko){s=s.replace(/\sxsrc=/gi," src=");s=s.replace(/\sxhref=/gi," href=");}s=s.replace(new RegExp('\\smce_src=\"[^\"]*\"','gi'),"");s=s.replace(new RegExp('\\smce_href=\"[^\"]*\"','gi'),"");return s;},_getAttrib:function(e,n,d){if(typeof(d)=="undefined")d="";if(!e||e.nodeType!=1)return d;var v=e.getAttribute(n,0);if(n=="class"&&!v)v=e.className;if(this.isMSIE&&n=="http-equiv")v=e.httpEquiv;if(n=="style"&&!tinyMCE.isOpera)v=e.style.cssText;if(n=='style')v=tinyMCE.serializeStyle(tinyMCE.parseStyle(v));if(this.settings.on_save&&n.indexOf('on')!=-1&&this.settings.on_save&&v&&v!="")v=tinyMCE.cleanupEventStr(v);return(v&&v!="")?''+v:d;},_urlConverter:function(c,n,v){if(!c.settings.on_save)return tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href,v);else if(tinyMCE.getParam('convert_urls'))return eval(tinyMCE.settings.urlconverter_callback+"(v, n, true);");return v;},_arrayToRe:function(a,op,be,af){var i,r;op=typeof(op)=="undefined"?"gi":op;be=typeof(be)=="undefined"?"^(":be;af=typeof(af)=="undefined"?")$":af;r=be;for(i=0;i<a.length;i++)r+=this._wildcardToRe(a[i])+(i!=a.length-1?"|":"");r+=af;return new RegExp(r,op);},_wildcardToRe:function(s){s=s.replace(/\?/g,'(\\S?)');s=s.replace(/\+/g,'(\\S+)');s=s.replace(/\*/g,'(\\S*)');return s;},_setupEntities:function(){var n,a,i,s=this.settings;if(!this.entitiesDone){if(s.entity_encoding=="named"){n=tinyMCE.clearArray(new Array());a=this.split(',',s.entities);for(i=0;i<a.length;i+=2)n[a[i]]=a[i+1];this.entities=n;}this.entitiesDone=true;}},_setupRules:function(){var s=this.settings;if(!this.rulesDone){this.addRuleStr(s.valid_elements);this.addRuleStr(s.extended_valid_elements);this.rulesDone=true;}},_isDuplicate:function(n){var i;if(!this.settings.fix_content_duplication)return false;if(tinyMCE.isMSIE&&!tinyMCE.isOpera&&n.nodeType==1){if(n.mce_serialized==this.serializationId)return true;n.setAttribute('mce_serialized',this.serializationId);}else{for(i=0;i<this.serializedNodes.length;i++){if(this.serializedNodes[i]==n)return true;}this.serializedNodes[this.serializedNodes.length]=n;}return false;}};TinyMCE_Engine.prototype.getElementByAttributeValue=function(n,e,a,v){return(n=this.getElementsByAttributeValue(n,e,a,v)).length==0?null:n[0];};TinyMCE_Engine.prototype.getElementsByAttributeValue=function(n,e,a,v){var i,nl=n.getElementsByTagName(e),o=new Array();for(i=0;i<nl.length;i++){if(tinyMCE.getAttrib(nl[i],a).indexOf(v)!=-1)o[o.length]=nl[i];}return o;};TinyMCE_Engine.prototype.isBlockElement=function(n){return n!=null&&n.nodeType==1&&this.blockRegExp.test(n.nodeName);};TinyMCE_Engine.prototype.getParentBlockElement=function(n){while(n){if(this.isBlockElement(n))return n;n=n.parentNode;}return null;};TinyMCE_Engine.prototype.insertAfter=function(n,r){if(r.nextSibling)r.parentNode.insertBefore(n,r.nextSibling);else r.parentNode.appendChild(n);};TinyMCE_Engine.prototype.setInnerHTML=function(e,h){var i,nl,n;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){h=h.replace(/\s\/>/g,'>');h=h.replace(/<p([^>]*)>\u00A0?<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');h=h.replace(/<p([^>]*)>&nbsp;<\/p>/gi,'<p$1 mce_keep="true">&nbsp;</p>');e.innerHTML=tinyMCE.uniqueTag+h;e.firstChild.removeNode(true);nl=e.getElementsByTagName("p");for(i=nl.length-1;i>=0;i--){n=nl[i];if(n.nodeName=='P'&&!n.hasChildNodes()&&!n.mce_keep)n.parentNode.removeChild(n);}}else{h=this.fixGeckoBaseHREFBug(1,e,h);e.innerHTML=h;this.fixGeckoBaseHREFBug(2,e,h);}};TinyMCE_Engine.prototype.getOuterHTML=function(e){if(tinyMCE.isMSIE)return e.outerHTML;var d=e.ownerDocument.createElement("body");d.appendChild(e);return d.innerHTML;};TinyMCE_Engine.prototype.setOuterHTML=function(e,h){if(tinyMCE.isMSIE){e.outerHTML=h;return;}var d=e.ownerDocument.createElement("body");d.innerHTML=h;e.parentNode.replaceChild(d.firstChild,e);};TinyMCE_Engine.prototype._getElementById=function(id,d){var e,i,j,f;if(typeof(d)=="undefined")d=document;e=d.getElementById(id);if(!e){f=d.forms;for(i=0;i<f.length;i++){for(j=0;j<f[i].elements.length;j++){if(f[i].elements[j].name==id){e=f[i].elements[j];break;}}}}return e;};TinyMCE_Engine.prototype.getNodeTree=function(n,na,t,nn){var i;if(typeof(t)=="undefined"||n.nodeType==t&&(typeof(nn)=="undefined"||n.nodeName==nn))na[na.length]=n;if(n.hasChildNodes()){for(i=0;i<n.childNodes.length;i++)tinyMCE.getNodeTree(n.childNodes[i],na,t,nn);}return na;};TinyMCE_Engine.prototype.getParentElement=function(node,names,attrib_name,attrib_value){if(typeof(names)=="undefined"){if(node.nodeType==1)return node;while((node=node.parentNode)!=null&&node.nodeType!=1);return node;}if(node==null)return null;var namesAr=names.toUpperCase().split(',');do{for(var i=0;i<namesAr.length;i++){if(node.nodeName==namesAr[i]||names=="*"){if(typeof(attrib_name)=="undefined")return node;else if(node.getAttribute(attrib_name)){if(typeof(attrib_value)=="undefined"){if(node.getAttribute(attrib_name)!="")return node;}else if(node.getAttribute(attrib_name)==attrib_value)return node;}}}}while((node=node.parentNode)!=null);return null;};TinyMCE_Engine.prototype.getAttrib=function(elm,name,default_value){if(typeof(default_value)=="undefined")default_value="";if(!elm||elm.nodeType!=1)return default_value;var v=elm.getAttribute(name);if(name=="class"&&!v)v=elm.className;if(tinyMCE.isGecko&&name=="src"&&elm.src!=null&&elm.src!="")v=elm.src;if(tinyMCE.isGecko&&name=="href"&&elm.href!=null&&elm.href!="")v=elm.href;if(name=="http-equiv"&&tinyMCE.isMSIE)v=elm.httpEquiv;if(name=="style"&&!tinyMCE.isOpera)v=elm.style.cssText;return(v&&v!="")?v:default_value;};TinyMCE_Engine.prototype.setAttrib=function(element,name,value,fix_value){if(typeof(value)=="number"&&value!=null)value=""+value;if(fix_value){if(value==null)value="";var re=new RegExp('[^0-9%]','g');value=value.replace(re,'');}if(name=="style")element.style.cssText=value;if(name=="class")element.className=value;if(value!=null&&value!=""&&value!=-1)element.setAttribute(name,value);else element.removeAttribute(name);};TinyMCE_Engine.prototype.setStyleAttrib=function(elm,name,value){eval('elm.style.'+name+'=value;');if(tinyMCE.isMSIE&&value==null||value==''){var str=tinyMCE.serializeStyle(tinyMCE.parseStyle(elm.style.cssText));elm.style.cssText=str;elm.setAttribute("style",str);}};TinyMCE_Engine.prototype.switchClass=function(ei,c){var e;if(tinyMCE.switchClassCache[ei])e=tinyMCE.switchClassCache[ei];else e=tinyMCE.switchClassCache[ei]=document.getElementById(ei);if(e){if(tinyMCE.settings.button_tile_map&&e.className&&e.className.indexOf('mceTiledButton')==0)c='mceTiledButton '+c;e.className=c;}};TinyMCE_Engine.prototype.getAbsPosition=function(n){var p={absLeft:0,absTop:0};while(n){p.absLeft+=n.offsetLeft;p.absTop+=n.offsetTop;n=n.offsetParent;}return p;};TinyMCE_Engine.prototype.prevNode=function(e,n){var a=n.split(','),i;while((e=e.previousSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};TinyMCE_Engine.prototype.nextNode=function(e,n){var a=n.split(','),i;while((e=e.nextSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};TinyMCE_Engine.prototype.parseURL=function(url_str){var urlParts=new Array();if(url_str){var pos,lastPos;pos=url_str.indexOf('://');if(pos!=-1){urlParts['protocol']=url_str.substring(0,pos);lastPos=pos+3;}for(var i=lastPos;i<url_str.length;i++){var chr=url_str.charAt(i);if(chr==':')break;if(chr=='/')break;}pos=i;urlParts['host']=url_str.substring(lastPos,pos);urlParts['port']="";lastPos=pos;if(url_str.charAt(pos)==':'){pos=url_str.indexOf('/',lastPos);urlParts['port']=url_str.substring(lastPos+1,pos);}lastPos=pos;pos=url_str.indexOf('?',lastPos);if(pos==-1)pos=url_str.indexOf('#',lastPos);if(pos==-1)pos=url_str.length;urlParts['path']=url_str.substring(lastPos,pos);lastPos=pos;if(url_str.charAt(pos)=='?'){pos=url_str.indexOf('#');pos=(pos==-1)?url_str.length:pos;urlParts['query']=url_str.substring(lastPos+1,pos);}lastPos=pos;if(url_str.charAt(pos)=='#'){pos=url_str.length;urlParts['anchor']=url_str.substring(lastPos+1,pos);}}return urlParts;};TinyMCE_Engine.prototype.serializeURL=function(up){var o="";if(up['protocol'])o+=up['protocol']+"://";if(up['host'])o+=up['host'];if(up['port'])o+=":"+up['port'];if(up['path'])o+=up['path'];if(up['query'])o+="?"+up['query'];if(up['anchor'])o+="#"+up['anchor'];return o;};TinyMCE_Engine.prototype.convertAbsoluteURLToRelativeURL=function(base_url,url_to_relative){var baseURL=this.parseURL(base_url);var targetURL=this.parseURL(url_to_relative);var strTok1;var strTok2;var breakPoint=0;var outPath="";var forceSlash=false;if(targetURL.path=="")targetURL.path="/";else forceSlash=true;base_url=baseURL.path.substring(0,baseURL.path.lastIndexOf('/'));strTok1=base_url.split('/');strTok2=targetURL.path.split('/');if(strTok1.length>=strTok2.length){for(var i=0;i<strTok1.length;i++){if(i>=strTok2.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(strTok1.length<strTok2.length){for(var i=0;i<strTok2.length;i++){if(i>=strTok1.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(breakPoint==1)return targetURL.path;for(var i=0;i<(strTok1.length-(breakPoint-1));i++)outPath+="../";for(var i=breakPoint-1;i<strTok2.length;i++){if(i!=(breakPoint-1))outPath+="/"+strTok2[i];else outPath+=strTok2[i];}targetURL.protocol=null;targetURL.host=null;targetURL.port=null;targetURL.path=outPath==""&&forceSlash?"/":outPath;var fileName=baseURL.path;var pos;if((pos=fileName.lastIndexOf('/'))!=-1)fileName=fileName.substring(pos+1);if(fileName==targetURL.path&&targetURL.anchor!="")targetURL.path="";if(targetURL.path==""&&!targetURL.anchor)targetURL.path="/";return this.serializeURL(targetURL);};TinyMCE_Engine.prototype.convertRelativeToAbsoluteURL=function(base_url,relative_url){var baseURL=this.parseURL(base_url);var relURL=this.parseURL(relative_url);if(relative_url==""||relative_url.charAt(0)=='/'||relative_url.indexOf('://')!=-1||relative_url.indexOf('mailto:')!=-1||relative_url.indexOf('javascript:')!=-1)return relative_url;baseURLParts=baseURL['path'].split('/');relURLParts=relURL['path'].split('/');var newBaseURLParts=new Array();for(var i=baseURLParts.length-1;i>=0;i--){if(baseURLParts[i].length==0)continue;newBaseURLParts[newBaseURLParts.length]=baseURLParts[i];}baseURLParts=newBaseURLParts.reverse();var newRelURLParts=new Array();var numBack=0;for(var i=relURLParts.length-1;i>=0;i--){if(relURLParts[i].length==0||relURLParts[i]==".")continue;if(relURLParts[i]=='..'){numBack++;continue;}if(numBack>0){numBack--;continue;}newRelURLParts[newRelURLParts.length]=relURLParts[i];}relURLParts=newRelURLParts.reverse();var len=baseURLParts.length-numBack;var absPath=(len<=0?"":"/")+baseURLParts.slice(0,len).join('/')+"/"+relURLParts.join('/');var start="",end="";relURL.protocol=baseURL.protocol;relURL.host=baseURL.host;relURL.port=baseURL.port;if(relURL.path.charAt(relURL.path.length-1)=="/")absPath+="/";relURL.path=absPath;return this.serializeURL(relURL);};TinyMCE_Engine.prototype.convertURL=function(url,node,on_save){var prot=document.location.protocol;var host=document.location.hostname;var port=document.location.port;if(prot=="file:")return url;url=tinyMCE.regexpReplace(url,'(http|https):///','/');if(url.indexOf('mailto:')!=-1||url.indexOf('javascript:')!=-1||tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0)=="#")return url;if(!tinyMCE.isMSIE&&!on_save&&url.indexOf("://")==-1&&url.charAt(0)!='/')return tinyMCE.settings['base_href']+url;if(on_save&&tinyMCE.getParam('relative_urls')){var curl=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],url);if(curl.charAt(0)=='/')curl=tinyMCE.settings['document_base_prefix']+curl;var urlParts=tinyMCE.parseURL(curl);var tmpUrlParts=tinyMCE.parseURL(tinyMCE.settings['document_base_url']);if(urlParts['host']==tmpUrlParts['host']&&(urlParts['port']==tmpUrlParts['port']))return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'],curl);}if(!tinyMCE.getParam('relative_urls')){var urlParts=tinyMCE.parseURL(url);var baseUrlParts=tinyMCE.parseURL(tinyMCE.settings['base_href']);url=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],url);if(urlParts['anchor']&&urlParts['path']==baseUrlParts['path'])return"#"+urlParts['anchor'];}if(tinyMCE.getParam('remove_script_host')){var start="",portPart="";if(port!="")portPart=":"+port;start=prot+"//"+host+portPart+"/";if(url.indexOf(start)==0)url=url.substring(start.length-1);}return url;};TinyMCE_Engine.prototype.convertAllRelativeURLs=function(body){var elms=body.getElementsByTagName("img");for(var i=0;i<elms.length;i++){var src=tinyMCE.getAttrib(elms[i],'src');var msrc=tinyMCE.getAttrib(elms[i],'mce_src');if(msrc!="")src=msrc;if(src!=""){src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],src);elms[i].setAttribute("src",src);}}var elms=body.getElementsByTagName("a");for(var i=0;i<elms.length;i++){var href=tinyMCE.getAttrib(elms[i],'href');var mhref=tinyMCE.getAttrib(elms[i],'mce_href');if(mhref!="")href=mhref;if(href&&href!=""){href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],href);elms[i].setAttribute("href",href);}}};TinyMCE_Engine.prototype.clearArray=function(a){for(var k in a)a[k]=null;return a;};TinyMCE_Engine.prototype._setEventsEnabled=function(node,state){var events=new Array('onfocus','onblur','onclick','ondblclick','onmousedown','onmouseup','onmouseover','onmousemove','onmouseout','onkeypress','onkeydown','onkeydown','onkeyup');var evs=tinyMCE.settings['event_elements'].split(',');for(var y=0;y<evs.length;y++){var elms=node.getElementsByTagName(evs[y]);for(var i=0;i<elms.length;i++){var event="";for(var x=0;x<events.length;x++){if((event=tinyMCE.getAttrib(elms[i],events[x]))!=''){event=tinyMCE.cleanupEventStr(""+event);if(!state)event="return true;"+event;else event=event.replace(/^return true;/gi,'');elms[i].removeAttribute(events[x]);elms[i].setAttribute(events[x],event);}}}}};TinyMCE_Engine.prototype._eventPatch=function(editor_id){var n,inst,win,e;if(typeof(tinyMCE)=="undefined")return true;try{if(tinyMCE.selectedInstance){win=tinyMCE.selectedInstance.getWin();if(win&&win.event){e=win.event;if(!e.target)e.target=e.srcElement;TinyMCE_Engine.prototype.handleEvent(e);return;}}for(n in tinyMCE.instances){inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;tinyMCE.selectedInstance=inst;win=inst.getWin();if(win&&win.event){e=win.event;if(!e.target)e.target=e.srcElement;TinyMCE_Engine.prototype.handleEvent(e);return;}}}catch(ex){}};TinyMCE_Engine.prototype.unloadHandler=function(){tinyMCE.triggerSave(true,true);};TinyMCE_Engine.prototype.addEventHandlers=function(inst){var doc=inst.getDoc();inst.switchSettings();if(tinyMCE.isMSIE){tinyMCE.addEvent(doc,"keypress",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"keyup",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"keydown",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"mouseup",TinyMCE_Engine.prototype._eventPatch);tinyMCE.addEvent(doc,"click",TinyMCE_Engine.prototype._eventPatch);}else{tinyMCE.addEvent(doc,"keypress",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keydown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keyup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"click",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mouseup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mousedown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"focus",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"blur",tinyMCE.handleEvent);eval('try { doc.designMode = "On"; } catch(e) {}');}};TinyMCE_Engine.prototype.onMouseMove=function(){var inst;if(!tinyMCE.hasMouseMoved){inst=tinyMCE.selectedInstance;if(inst.isFocused){inst.undoBookmark=inst.selection.getBookmark();tinyMCE.hasMouseMoved=true;}}};TinyMCE_Engine.prototype.cancelEvent=function(e){if(tinyMCE.isMSIE){e.returnValue=false;e.cancelBubble=true;}else e.preventDefault();};TinyMCE_Engine.prototype.addEvent=function(o,n,h){if(o.attachEvent)o.attachEvent("on"+n,h);else o.addEventListener(n,h,false);};TinyMCE_Engine.prototype.addSelectAccessibility=function(e,s,w){if(!s._isAccessible){s.onkeydown=tinyMCE.accessibleEventHandler;s.onblur=tinyMCE.accessibleEventHandler;s._isAccessible=true;s._win=w;}return false;};TinyMCE_Engine.prototype.accessibleEventHandler=function(e){var win=this._win;e=tinyMCE.isMSIE?win.event:e;var elm=tinyMCE.isMSIE?e.srcElement:e.target;if(e.type=="blur"){if(elm.oldonchange){elm.onchange=elm.oldonchange;elm.oldonchange=null;}return true;}if(elm.nodeName=="SELECT"&&!elm.oldonchange){elm.oldonchange=elm.onchange;elm.onchange=null;}if(e.keyCode==13||e.keyCode==32){elm.onchange=elm.oldonchange;elm.onchange();elm.oldonchange=null;tinyMCE.cancelEvent(e);return false;}return true;};function TinyMCE_Selection(inst){this.instance=inst;};TinyMCE_Selection.prototype={getSelectedHTML:function(){var inst=this.instance;var e,r=this.getRng(),h;if(tinyMCE.isSafari){return r.toString();}e=document.createElement("body");if(tinyMCE.isGecko)e.appendChild(r.cloneContents());else e.innerHTML=r.htmlText;h=tinyMCE._cleanupHTML(inst,inst.contentDocument,inst.settings,e,e,false,true,false);if(tinyMCE.getParam("convert_fonts_to_spans"))tinyMCE.convertSpansToFonts(inst.getDoc());return h;},getSelectedText:function(){var inst=this.instance;var d,r,s,t;if(tinyMCE.isMSIE){d=inst.getDoc();if(d.selection.type=="Text"){r=d.selection.createRange();t=r.text;}else t='';}else{s=this.getSel();if(s&&s.toString)t=s.toString();else t='';}return t;},getBookmark:function(simple){var rng=this.getRng();var doc=this.instance.getDoc();var sp,le,s,e,nl,i,si,ei;var trng,sx,sy,xx=-999999999;if(tinyMCE.isOpera)return null;sx=doc.body.scrollLeft+doc.documentElement.scrollLeft;sy=doc.body.scrollTop+doc.documentElement.scrollTop;if(tinyMCE.isSafari||tinyMCE.isGecko)return{rng:rng,scrollX:sx,scrollY:sy};if(tinyMCE.isMSIE){if(simple)return{rng:rng};if(rng.item){e=rng.item(0);nl=doc.getElementsByTagName(e.nodeName);for(i=0;i<nl.length;i++){if(e==nl[i]){sp=i;break;}}return{tag:e.nodeName,index:sp,scrollX:sx,scrollY:sy};}else{trng=rng.duplicate();trng.collapse(true);sp=Math.abs(trng.move('character',xx));trng=rng.duplicate();trng.collapse(false);le=Math.abs(trng.move('character',xx))-sp;return{start:sp,length:le,scrollX:sx,scrollY:sy};}}if(tinyMCE.isGecko){s=tinyMCE.getParentElement(rng.startContainer);for(si=0;si<s.childNodes.length&&s.childNodes[si]!=rng.startContainer;si++);nl=doc.getElementsByTagName(s.nodeName);for(i=0;i<nl.length;i++){if(s==nl[i]){sp=i;break;}}e=tinyMCE.getParentElement(rng.endContainer);for(ei=0;ei<e.childNodes.length&&e.childNodes[ei]!=rng.endContainer;ei++);nl=doc.getElementsByTagName(e.nodeName);for(i=0;i<nl.length;i++){if(e==nl[i]){le=i;break;}}return{startTag:s.nodeName,start:sp,startIndex:si,endTag:e.nodeName,end:le,endIndex:ei,startOffset:rng.startOffset,endOffset:rng.endOffset,scrollX:sx,scrollY:sy};}return null;},moveToBookmark:function(bookmark){var rng,nl,i;var inst=this.instance;var doc=inst.getDoc();var win=inst.getWin();var sel=this.getSel();if(!bookmark)return false;if(tinyMCE.isSafari){sel.setBaseAndExtent(bookmark.startContainer,bookmark.startOffset,bookmark.endContainer,bookmark.endOffset);return true;}if(tinyMCE.isMSIE){if(bookmark.rng){bookmark.rng.select();return true;}win.focus();if(bookmark.tag){rng=inst.getBody().createControlRange();nl=doc.getElementsByTagName(bookmark.tag);if(nl.length>bookmark.index)rng.addElement(nl[bookmark.index]);}else{rng=inst.getSel().createRange();rng.moveToElementText(inst.getBody());rng.collapse(true);rng.moveStart('character',bookmark.start);rng.moveEnd('character',bookmark.length);}rng.select();win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}if(tinyMCE.isGecko&&bookmark.rng){sel.removeAllRanges();sel.addRange(bookmark.rng);win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}if(tinyMCE.isGecko){rng=doc.createRange();nl=doc.getElementsByTagName(bookmark.startTag);if(nl.length>bookmark.start)rng.setStart(nl[bookmark.start].childNodes[bookmark.startIndex],bookmark.startOffset);nl=doc.getElementsByTagName(bookmark.endTag);if(nl.length>bookmark.end)rng.setEnd(nl[bookmark.end].childNodes[bookmark.endIndex],bookmark.endOffset);sel.removeAllRanges();sel.addRange(rng);win.scrollTo(bookmark.scrollX,bookmark.scrollY);return true;}return false;},selectNode:function(node,collapse,select_text_node,to_start){var inst=this.instance,sel,rng,nodes;if(!node)return;if(typeof(collapse)=="undefined")collapse=true;if(typeof(select_text_node)=="undefined")select_text_node=false;if(typeof(to_start)=="undefined")to_start=true;if(tinyMCE.isMSIE){rng=inst.getBody().createTextRange();try{rng.moveToElementText(node);if(collapse)rng.collapse(to_start);rng.select();}catch(e){}}else{sel=this.getSel();if(!sel)return;if(tinyMCE.isSafari){sel.setBaseAndExtent(node,0,node,node.innerText.length);if(collapse){if(to_start)sel.collapseToStart();else sel.collapseToEnd();}this.scrollToNode(node);return;}rng=inst.getDoc().createRange();if(select_text_node){nodes=tinyMCE.getNodeTree(node,new Array(),3);if(nodes.length>0)rng.selectNodeContents(nodes[0]);else rng.selectNodeContents(node);}else rng.selectNode(node);if(collapse){if(!to_start&&node.nodeType==3){rng.setStart(node,node.nodeValue.length);rng.setEnd(node,node.nodeValue.length);}else rng.collapse(to_start);}sel.removeAllRanges();sel.addRange(rng);}this.scrollToNode(node);tinyMCE.selectedElement=null;if(node.nodeType==1)tinyMCE.selectedElement=node;},scrollToNode:function(node){var inst=this.instance;var pos,doc,scrollX,scrollY,height;pos=tinyMCE.getAbsPosition(node);doc=inst.getDoc();scrollX=doc.body.scrollLeft+doc.documentElement.scrollLeft;scrollY=doc.body.scrollTop+doc.documentElement.scrollTop;height=tinyMCE.isMSIE?document.getElementById(inst.editorId).style.pixelHeight:inst.targetElement.clientHeight;if(!tinyMCE.settings['auto_resize']&&!(pos.absTop>scrollY&&pos.absTop<(scrollY-25+height)))inst.contentWindow.scrollTo(pos.absLeft,pos.absTop-height+25);},getSel:function(){var inst=this.instance;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return inst.getDoc().selection;return inst.contentWindow.getSelection();},getRng:function(){var inst=this.instance;var sel=this.getSel();if(sel==null)return null;if(tinyMCE.isMSIE&&!tinyMCE.isOpera)return sel.createRange();if(tinyMCE.isSafari&&!sel.getRangeAt)return''+window.getSelection();return sel.getRangeAt(0);},getFocusElement:function(){var inst=this.instance;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){var doc=inst.getDoc();var rng=doc.selection.createRange();var elm=rng.item?rng.item(0):rng.parentElement();}else{if(inst.isHidden())return inst.getBody();var sel=this.getSel();var rng=this.getRng();if(!sel||!rng)return null;var elm=rng.commonAncestorContainer;if(!rng.collapsed){if(rng.startContainer==rng.endContainer){if(rng.startOffset-rng.endOffset<2){if(rng.startContainer.hasChildNodes())elm=rng.startContainer.childNodes[rng.startOffset];}}}elm=tinyMCE.getParentElement(elm);}return elm;}};function TinyMCE_UndoRedo(inst){this.instance=inst;this.undoLevels=new Array();this.undoIndex=0;this.typingUndoIndex=-1;this.undoRedo=true;};TinyMCE_UndoRedo.prototype={add:function(l){var b;if(l){this.undoLevels[this.undoLevels.length]=l;return true;}var inst=this.instance;if(this.typingUndoIndex!=-1){this.undoIndex=this.typingUndoIndex;}var newHTML=tinyMCE.trim(inst.getBody().innerHTML);if(this.undoLevels[this.undoIndex]&&newHTML!=this.undoLevels[this.undoIndex].content){tinyMCE.dispatchCallback(inst,'onchange_callback','onChange',inst);var customUndoLevels=tinyMCE.settings['custom_undo_redo_levels'];if(customUndoLevels!=-1&&this.undoLevels.length>customUndoLevels){for(var i=0;i<this.undoLevels.length-1;i++){this.undoLevels[i]=this.undoLevels[i+1];}this.undoLevels.length--;this.undoIndex--;}b=inst.undoBookmark;if(!b)b=inst.selection.getBookmark();this.undoIndex++;this.undoLevels[this.undoIndex]={content:newHTML,bookmark:b};this.undoLevels.length=this.undoIndex+1;return true;}return false;},undo:function(){var inst=this.instance;if(this.undoIndex>0){this.undoIndex--;tinyMCE.setInnerHTML(inst.getBody(),this.undoLevels[this.undoIndex].content);inst.repaint();if(inst.settings.custom_undo_redo_restore_selection)inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);}},redo:function(){var inst=this.instance;tinyMCE.execCommand("mceEndTyping");if(this.undoIndex<(this.undoLevels.length-1)){this.undoIndex++;tinyMCE.setInnerHTML(inst.getBody(),this.undoLevels[this.undoIndex].content);inst.repaint();if(inst.settings.custom_undo_redo_restore_selection)inst.selection.moveToBookmark(this.undoLevels[this.undoIndex].bookmark);}tinyMCE.triggerNodeChange();}};var TinyMCE_ForceParagraphs={_insertPara:function(inst,e){function isEmpty(para){function isEmptyHTML(html){return html.replace(new RegExp('[ \t\r\n]+','g'),'').toLowerCase()=="";}if(para.getElementsByTagName("img").length>0)return false;if(para.getElementsByTagName("table").length>0)return false;if(para.getElementsByTagName("hr").length>0)return false;var nodes=tinyMCE.getNodeTree(para,new Array(),3);for(var i=0;i<nodes.length;i++){if(!isEmptyHTML(nodes[i].nodeValue))return false;}return true;}var doc=inst.getDoc();var sel=inst.getSel();var win=inst.contentWindow;var rng=sel.getRangeAt(0);var body=doc.body;var rootElm=doc.documentElement;var blockName="P";var rngBefore=doc.createRange();rngBefore.setStart(sel.anchorNode,sel.anchorOffset);rngBefore.collapse(true);var rngAfter=doc.createRange();rngAfter.setStart(sel.focusNode,sel.focusOffset);rngAfter.collapse(true);var direct=rngBefore.compareBoundaryPoints(rngBefore.START_TO_END,rngAfter)<0;var startNode=direct?sel.anchorNode:sel.focusNode;var startOffset=direct?sel.anchorOffset:sel.focusOffset;var endNode=direct?sel.focusNode:sel.anchorNode;var endOffset=direct?sel.focusOffset:sel.anchorOffset;startNode=startNode.nodeName=="BODY"?startNode.firstChild:startNode;endNode=endNode.nodeName=="BODY"?endNode.firstChild:endNode;var startBlock=tinyMCE.getParentBlockElement(startNode);var endBlock=tinyMCE.getParentBlockElement(endNode);if(startBlock!=null){blockName=startBlock.nodeName;if(blockName=="TD"||blockName=="TABLE"||(blockName=="DIV"&&new RegExp('left|right','gi').test(startBlock.style.cssFloat)))blockName="P";}if(tinyMCE.getParentElement(startBlock,"OL,UL")!=null)return false;if((startBlock!=null&&startBlock.nodeName=="TABLE")||(endBlock!=null&&endBlock.nodeName=="TABLE"))startBlock=endBlock=null;var paraBefore=(startBlock!=null&&startBlock.nodeName==blockName)?startBlock.cloneNode(false):doc.createElement(blockName);var paraAfter=(endBlock!=null&&endBlock.nodeName==blockName)?endBlock.cloneNode(false):doc.createElement(blockName);if(/^(H[1-6])$/.test(blockName))paraAfter=doc.createElement("p");var startChop=startNode;var endChop=endNode;node=startChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;startChop=node;}while((node=node.previousSibling?node.previousSibling:node.parentNode));node=endChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;endChop=node;}while((node=node.nextSibling?node.nextSibling:node.parentNode));if(startChop.nodeName=="TD")startChop=startChop.firstChild;if(endChop.nodeName=="TD")endChop=endChop.lastChild;if(startBlock==null){rng.deleteContents();sel.removeAllRanges();if(startChop!=rootElm&&endChop!=rootElm){rngBefore=rng.cloneRange();if(startChop==body)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);paraBefore.appendChild(rngBefore.cloneContents());if(endChop.parentNode.nodeName==blockName)endChop=endChop.parentNode;rng.setEndAfter(endChop);if(endChop.nodeName!="#text"&&endChop.nodeName!="BODY")rngBefore.setEndAfter(endChop);var contents=rng.cloneContents();if(contents.firstChild&&(contents.firstChild.nodeName==blockName||contents.firstChild.nodeName=="BODY"))paraAfter.innerHTML=contents.firstChild.innerHTML;else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";rng.deleteContents();rngAfter.deleteContents();rngBefore.deleteContents();paraAfter.normalize();rngBefore.insertNode(paraAfter);paraBefore.normalize();rngBefore.insertNode(paraBefore);}else{body.innerHTML="<"+blockName+">&nbsp;</"+blockName+"><"+blockName+">&nbsp;</"+blockName+">";paraAfter=body.childNodes[1];}inst.selection.selectNode(paraAfter,true,true);return true;}if(startChop.nodeName==blockName)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);rngBefore.setEnd(startNode,startOffset);paraBefore.appendChild(rngBefore.cloneContents());rngAfter.setEndAfter(endChop);rngAfter.setStart(endNode,endOffset);var contents=rngAfter.cloneContents();if(contents.firstChild&&contents.firstChild.nodeName==blockName){paraAfter.innerHTML=contents.firstChild.innerHTML;}else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";var rng=doc.createRange();if(!startChop.previousSibling&&startChop.parentNode.nodeName.toUpperCase()==blockName){rng.setStartBefore(startChop.parentNode);}else{if(rngBefore.startContainer.nodeName.toUpperCase()==blockName&&rngBefore.startOffset==0)rng.setStartBefore(rngBefore.startContainer);else rng.setStart(rngBefore.startContainer,rngBefore.startOffset);}if(!endChop.nextSibling&&endChop.parentNode.nodeName.toUpperCase()==blockName)rng.setEndAfter(endChop.parentNode);else rng.setEnd(rngAfter.endContainer,rngAfter.endOffset);rng.deleteContents();rng.insertNode(paraAfter);rng.insertNode(paraBefore);paraAfter.normalize();paraBefore.normalize();inst.selection.selectNode(paraAfter,true,true);return true;},_handleBackSpace:function(inst){var r=inst.getRng();var sn=r.startContainer;if(sn&&sn.nextSibling&&sn.nextSibling.nodeName=="BR")sn.nextSibling.parentNode.removeChild(sn.nextSibling);return false;}};function TinyMCE_Layer(id,bm){this.id=id;this.blockerElement=null;this.events=false;this.element=null;this.blockMode=typeof(bm)!='undefined'?bm:true;};TinyMCE_Layer.prototype={moveRelativeTo:function(re,p){var rep=this.getAbsPosition(re);var w=parseInt(re.offsetWidth);var h=parseInt(re.offsetHeight);var e=this.getElement();var ew=parseInt(e.offsetWidth);var eh=parseInt(e.offsetHeight);var x,y;switch(p){case"tl":x=rep.absLeft;y=rep.absTop;break;case"tr":x=rep.absLeft+w;y=rep.absTop;break;case"bl":x=rep.absLeft;y=rep.absTop+h;break;case"br":x=rep.absLeft+w;y=rep.absTop+h;break;case"cc":x=rep.absLeft+(w/2)-(ew/2);y=rep.absTop+(h/2)-(eh/2);break;}this.moveTo(x,y);},moveBy:function(x,y){var e=this.getElement();this.moveTo(parseInt(e.style.left)+x,parseInt(e.style.top)+y);},moveTo:function(x,y){var e=this.getElement();e.style.left=x+"px";e.style.top=y+"px";this.updateBlocker();},resizeBy:function(w,h){var e=this.getElement();this.resizeTo(parseInt(e.style.width)+w,parseInt(e.style.height)+h);},resizeTo:function(w,h){var e=this.getElement();e.style.width=w+"px";e.style.height=h+"px";this.updateBlocker();},show:function(){this.getElement().style.display='block';this.updateBlocker();},hide:function(){this.getElement().style.display='none';this.updateBlocker();},isVisible:function(){return this.getElement().style.display=='block';},getElement:function(){if(!this.element)this.element=document.getElementById(this.id);return this.element;},setBlockMode:function(s){this.blockMode=s;},updateBlocker:function(){var e,b,x,y,w,h;b=this.getBlocker();if(b){if(this.blockMode){e=this.getElement();x=this.parseInt(e.style.left);y=this.parseInt(e.style.top);w=this.parseInt(e.offsetWidth);h=this.parseInt(e.offsetHeight);b.style.left=x+'px';b.style.top=y+'px';b.style.width=w+'px';b.style.height=h+'px';b.style.display=e.style.display;}else b.style.display='none';}},getBlocker:function(){var d,b;if(!this.blockerElement&&this.blockMode){d=document;b=d.createElement("iframe");b.style.cssText='display: none; position: absolute; left: 0; top: 0';b.src='javascript:false;';b.frameBorder='0';b.scrolling='no';d.body.appendChild(b);this.blockerElement=b;}return this.blockerElement;},getAbsPosition:function(n){var p={absLeft:0,absTop:0};while(n){p.absLeft+=n.offsetLeft;p.absTop+=n.offsetTop;n=n.offsetParent;}return p;},create:function(n,c,p){var d=document,e=d.createElement(n);e.setAttribute('id',this.id);if(c)e.className=c;if(!p)p=d.body;p.appendChild(e);return this.element=e;},parseInt:function(s){if(s==null||s=='')return 0;return parseInt(s);}};function TinyMCE_Menu(){var id;if(typeof(tinyMCE.menuCounter)=="undefined")tinyMCE.menuCounter=0;id="mc_menu_"+tinyMCE.menuCounter++;TinyMCE_Layer.call(this,id,true);this.id=id;this.items=new Array();this.needsUpdate=true;};TinyMCE_Menu.prototype=tinyMCE.extend(TinyMCE_Layer.prototype,{init:function(s){var n;this.settings={separator_class:'mceMenuSeparator',title_class:'mceMenuTitle',disabled_class:'mceMenuDisabled',menu_class:'mceMenu',drop_menu:true};for(n in s)this.settings[n]=s[n];this.create('div',this.settings.menu_class);},clear:function(){this.items=new Array();},addTitle:function(t){this.add({type:'title',text:t});},addDisabled:function(t){this.add({type:'disabled',text:t});},addSeparator:function(){this.add({type:'separator'});},addItem:function(t,js){this.add({text:t,js:js});},add:function(mi){this.items[this.items.length]=mi;this.needsUpdate=true;},update:function(){var e=this.getElement(),h='',i,t,m=this.items,s=this.settings;if(this.settings.drop_menu)h+='<span class="mceMenuLine"></span>';h+='<table border="0" cellpadding="0" cellspacing="0">';for(i=0;i<m.length;i++){t=tinyMCE.xmlEncode(m[i].text);c=m[i].class_name?' class="'+m[i].class_name+'"':'';switch(m[i].type){case'separator':h+='<tr class="'+s.separator_class+'"><td>';break;case'title':h+='<tr class="'+s.title_class+'"><td><span'+c+'>'+t+'</span>';break;case'disabled':h+='<tr class="'+s.disabled_class+'"><td><span'+c+'>'+t+'</span>';break;default:h+='<tr><td><a href="javascript:void(0);" onmousedown="'+tinyMCE.xmlEncode(m[i].js)+';return false;"><span'+c+'>'+t+'</span></a>';}h+='</td></tr>';}h+='</table>';e.innerHTML=h;this.needsUpdate=false;this.updateBlocker();},show:function(){var nl,i;if(tinyMCE.lastMenu==this)return;if(this.needsUpdate)this.update();if(tinyMCE.lastMenu&&tinyMCE.lastMenu!=this)tinyMCE.lastMenu.hide();this.parent.show.call(this);if(!tinyMCE.isOpera){}tinyMCE.lastMenu=this;}});TinyMCE_Engine.prototype.debug=function(){var m="",e,a,i;e=document.getElementById("tinymce_debug");if(!e){var d=document.createElement("div");d.setAttribute("className","debugger");d.className="debugger";d.innerHTML='Debug output:<textarea id="tinymce_debug" style="width: 100%; height: 300px" wrap="nowrap" mce_editable="false"></textarea>';document.body.appendChild(d);e=document.getElementById("tinymce_debug");}a=this.debug.arguments;for(i=0;i<a.length;i++){m+=a[i];if(i<a.length-1)m+=', ';}e.value+=m+"\n";};
\ No newline at end of file
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1,268 @@
+<?php
+/**
+ * $RCSfile: tiny_mce_gzip.php,v $
+ * $Revision: $
+ * $Date: $
+ *
+ * @version 1.08
+ * @author Moxiecode
+ * @copyright Copyright  2005-2006, Moxiecode Systems AB, All rights reserved.
+ *
+ * This file compresses the TinyMCE JavaScript using GZip and
+ * enables the browser to do two requests instead of one for each .js file.
+ * Notice: This script defaults the button_tile_map option to true for extra performance.
+ */
+
+// General options
+$suffix = "";							// Set to "_src" to use source version
+$expiresOffset = 3600 * 24 * 10;		// 10 days util client cache expires
+$diskCache = false;						// If you enable this option gzip files will be cached on disk.
+$cacheDir = realpath(".");				// Absolute directory path to where cached gz files will be stored
+$debug = false;							// Enable this option if you need debuging info
+
+// Headers
+header("Content-type: text/javascript; charset: UTF-8");
+// header("Cache-Control: must-revalidate");
+header("Vary: Accept-Encoding"); // Handle proxies
+header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+
+// Get data to load
+$theme = isset($_GET['theme']) ? TinyMCE_cleanInput($_GET['theme']) : "";
+$language = isset($_GET['language']) ? TinyMCE_cleanInput($_GET['language']) : "";
+$plugins = isset($_GET['plugins']) ? TinyMCE_cleanInput($_GET['plugins']) : "";
+$lang = isset($_GET['lang']) ? TinyMCE_cleanInput($_GET['lang']) : "en";
+$index = isset($_GET['index']) ? TinyMCE_cleanInput($_GET['index']) : -1;
+$cacheKey = md5($theme . $language . $plugins . $lang . $index . $debug);
+$cacheFile = $cacheDir == "" ? "" : $cacheDir . "/" . "tinymce_" .  $cacheKey . ".gz";
+$cacheData = "";
+
+// Patch older versions of PHP < 4.3.0
+if (!function_exists('file_get_contents')) {
+	function file_get_contents($filename) {
+		$fd = fopen($filename, 'rb');
+		$content = fread($fd, filesize($filename));
+		fclose($fd);
+		return $content;
+	}
+}
+
+// Security check function, can only contain a-z 0-9 , _ - and whitespace.
+function TinyMCE_cleanInput($str) {
+	return preg_replace("/[^0-9a-z\-_,]+/i", "", $str); // Remove anything but 0-9,a-z,-_
+}
+
+function TinyMCE_echo($str) {
+	global $cacheData, $diskCache;
+
+	if ($diskCache)
+		$cacheData .= $str;
+	else
+		echo $str;
+}
+
+// Only gzip the contents if clients and server support it
+$encodings = array();
+
+if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+	$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+
+// Check for gzip header or northon internet securities
+if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+	$enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+
+	// Use cached file if it exists but not in debug mode
+	if (file_exists($cacheFile) && !$debug) {
+		header("Content-Encoding: " . $enc);
+		echo file_get_contents($cacheFile);
+		die;
+	}
+
+	if (!$diskCache)
+		ob_start("ob_gzhandler");
+} else
+	$diskCache = false;
+
+if ($index > -1) {
+	// Write main script and patch some things
+	if ($index == 0) {
+		TinyMCE_echo(file_get_contents(realpath("tiny_mce" . $suffix . ".js")));
+		TinyMCE_echo('TinyMCE.prototype.orgLoadScript = TinyMCE.prototype.loadScript;');
+		TinyMCE_echo('TinyMCE.prototype.loadScript = function() {};var realTinyMCE = tinyMCE;');
+	} else
+		TinyMCE_echo('tinyMCE = realTinyMCE;');
+
+	// Do init based on index
+	TinyMCE_echo("tinyMCE.init(tinyMCECompressed.configs[" . $index . "]);");
+
+	// Load external plugins
+	if ($index == 0)
+		TinyMCE_echo("tinyMCECompressed.loadPlugins();");
+
+	// Load theme, language pack and theme language packs
+	if ($theme) {
+		TinyMCE_echo(file_get_contents(realpath("themes/" . $theme . "/editor_template" . $suffix . ".js")));
+		TinyMCE_echo(file_get_contents(realpath("themes/" . $theme . "/langs/" . $lang . ".js")));
+	}
+
+	if ($language)
+		TinyMCE_echo(file_get_contents(realpath("langs/" . $language . ".js")));
+
+	// Load all plugins and their language packs
+	$plugins = explode(",", $plugins);
+	foreach ($plugins as $plugin) {
+		$pluginFile = realpath("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js");
+		$languageFile = realpath("plugins/" . $plugin . "/langs/" . $lang . ".js");
+
+		if ($pluginFile)
+			TinyMCE_echo(file_get_contents($pluginFile));
+
+		if ($languageFile)
+			TinyMCE_echo(file_get_contents($languageFile));
+	}
+
+	// Reset tinyMCE compressor engine
+	TinyMCE_echo("tinyMCE = tinyMCECompressed;");
+
+	// Write to cache
+	if ($diskCache) {
+		// Calculate compression ratio and debug target output path
+		if ($debug) {
+			$ratio = round(100 - strlen(gzencode($cacheData, 9, FORCE_GZIP)) / strlen($cacheData) * 100.0);
+			TinyMCE_echo("alert('TinyMCE was compressed by " . $ratio . "%.\\nOutput cache file: " . $cacheFile . "');");
+		}
+
+		$cacheData = gzencode($cacheData, 9, FORCE_GZIP);
+
+		// Write to file if possible
+		$fp = @fopen($cacheFile, "wb");
+		if ($fp) {
+			fwrite($fp, $cacheData);
+			fclose($fp);
+		}
+
+		// Output
+		header("Content-Encoding: " . $enc);
+		echo $cacheData;
+	}
+
+	die;
+}
+?>
+
+function TinyMCECompressed() {
+	this.configs = new Array();
+	this.loadedFiles = new Array();
+	this.externalPlugins = new Array();
+	this.loadAdded = false;
+	this.isLoaded = false;
+}
+
+TinyMCECompressed.prototype.init = function(settings) {
+	var elements = document.getElementsByTagName('script');
+	var scriptURL = "";
+
+	for (var i=0; i<elements.length; i++) {
+		if (elements[i].src && elements[i].src.indexOf("tiny_mce_gzip.php") != -1) {
+			scriptURL = elements[i].src;
+			break;
+		}
+	}
+
+	settings["theme"] = typeof(settings["theme"]) != "undefined" ? settings["theme"] : "default";
+	settings["plugins"] = typeof(settings["plugins"]) != "undefined" ? settings["plugins"] : "";
+	settings["language"] = typeof(settings["language"]) != "undefined" ? settings["language"] : "en";
+	settings["button_tile_map"] = typeof(settings["button_tile_map"]) != "undefined" ? settings["button_tile_map"] : true;
+	this.configs[this.configs.length] = settings;
+	this.settings = settings;
+
+	scriptURL += "?theme=" + escape(this.getOnce(settings["theme"])) + "&language=" + escape(this.getOnce(settings["language"])) + "&plugins=" + escape(this.getOnce(settings["plugins"])) + "&lang=" + settings["language"] + "&index=" + escape(this.configs.length-1);
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + scriptURL + '"></script>');
+
+	if (!this.loadAdded) {
+		tinyMCE.addEvent(window, "DOMContentLoaded", TinyMCECompressed.prototype.onLoad);
+		tinyMCE.addEvent(window, "load", TinyMCECompressed.prototype.onLoad);
+		this.loadAdded = true;
+	}
+}
+
+TinyMCECompressed.prototype.onLoad = function() {
+	if (tinyMCE.isLoaded)
+		return true;
+
+	tinyMCE = realTinyMCE;
+	TinyMCE_Engine.prototype.onLoad();
+	tinyMCE._addUnloadEvents();
+
+	tinyMCE.isLoaded = true;
+}
+
+TinyMCECompressed.prototype.addEvent = function(o, n, h) {
+	if (o.attachEvent)
+		o.attachEvent("on" + n, h);
+	else
+		o.addEventListener(n, h, false);
+}
+
+TinyMCECompressed.prototype.getOnce = function(str) {
+	var ar = str.replace(/\s+/g, '').split(',');
+
+	for (var i=0; i<ar.length; i++) {
+		if (ar[i] == '' || ar[i].charAt(0) == '-') {
+			ar[i] = null;
+			continue;
+		}
+
+		// Skip load
+		for (var x=0; x<this.loadedFiles.length; x++) {
+			if (this.loadedFiles[x] == ar[i])
+				ar[i] = null;
+		}
+
+		this.loadedFiles[this.loadedFiles.length] = ar[i];
+	}
+
+	// Glue
+	str = "";
+	for (var i=0; i<ar.length; i++) {
+		if (ar[i] == null)
+			continue;
+
+		str += ar[i];
+
+		if (i != ar.length-1)
+			str += ",";
+	}
+
+	return str;
+};
+
+TinyMCECompressed.prototype.loadPlugins = function() {
+	var i, ar;
+
+	TinyMCE.prototype.loadScript = TinyMCE.prototype.orgLoadScript;
+	tinyMCE = realTinyMCE;
+
+	ar = tinyMCECompressed.externalPlugins;
+	for (i=0; i<ar.length; i++)
+		tinyMCE.loadPlugin(ar[i].name, ar[i].url);
+
+	TinyMCE.prototype.loadScript = function() {};
+};
+
+TinyMCECompressed.prototype.loadPlugin = function(n, u) {
+	this.externalPlugins[this.externalPlugins.length] = {name : n, url : u};
+};
+
+TinyMCECompressed.prototype.importPluginLanguagePack = function(n, v) {
+	tinyMCE = realTinyMCE;
+	TinyMCE.prototype.loadScript = TinyMCE.prototype.orgLoadScript;
+	tinyMCE.importPluginLanguagePack(n, v);
+};
+
+TinyMCECompressed.prototype.addPlugin = function(n, p) {
+	tinyMCE = realTinyMCE;
+	tinyMCE.addPlugin(n, p);
+};
+
+var tinyMCE = new TinyMCECompressed();
+var tinyMCECompressed = tinyMCE;
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_popup.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_popup.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_popup.js	2006-04-30 15:27:06.000000000 -0500
@@ -256,16 +256,6 @@
 		eval("tinyMCEPopup.windowOpener." + cb + "(element_id, url, type, window);");
 };
 
-
-TinyMCE_Popup.prototype.importClass = function(c) {
-	window[c] = function() {};
-
-	for (var n in window.opener[c].prototype)
-		window[c].prototype[n] = window.opener[c].prototype[n];
-
-	window[c].constructor = window.opener[c].constructor;
-};
-
 // Setup global instance
 var tinyMCEPopup = new TinyMCE_Popup();
 
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_src.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_src.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_src.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce_src.js	2006-04-30 15:27:06.000000000 -0500
@@ -3,15 +3,13 @@
 
 function TinyMCE_Engine() {
 	this.majorVersion = "2";
-	this.minorVersion = "0.6.1";
-	this.releaseDate = "2006-05-04";
+	this.minorVersion = "0.5.1";
+	this.releaseDate = "2006-03-22";
 
 	this.instances = new Array();
 	this.switchClassCache = new Array();
 	this.windowArgs = new Array();
 	this.loadedFiles = new Array();
-	this.pendingFiles = new Array();
-	this.loadingIndex = 0;
 	this.configs = new Array();
 	this.currentConfig = 0;
 	this.eventHandlers = new Array();
@@ -129,7 +127,7 @@
 		this._def("inline_styles", false);
 		this._def("convert_newlines_to_brs", false);
 		this._def("auto_reset_designmode", true);
-		this._def("entities", "39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro", true);
+		this._def("entities", "160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro", true);
 		this._def("entity_encoding", "named");
 		this._def("cleanup_callback", "");
 		this._def("add_unload_trigger", true);
@@ -161,13 +159,6 @@
 		this._def("content_css", '');
 		this._def("fix_list_elements", false);
 		this._def("fix_table_elements", false);
-		this._def("strict_loading_mode", document.contentType == 'application/xhtml+xml');
-		this._def("hidden_tab_class", '');
-		this._def("display_tab_class", '');
-
-		// Force strict loading mode to false on non Gecko browsers
-		if (this.isMSIE && !this.isOpera)
-			this.settings.strict_loading_mode = false;
 
 		// Browser check IE
 		if (this.isMSIE && this.settings['browsers'].indexOf('msie') == -1)
@@ -207,9 +198,9 @@
 		this.settings['base_href'] = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/";
 
 		theme = this.settings['theme'];
-		this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$", "i");
+		this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dir|fieldset|form|noscript|noframes|menu|isindex)$", "i");
 		this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
-		this.uniqueURL = 'javascript:TINYMCE_UNIQUEURL();'; // Make unique URL non real URL
+		this.uniqueURL = 'http://tinymce.moxiecode.cp/mce_temp_url'; // Make unique URL non real URL
 		this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
 		this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup');
 
@@ -296,9 +287,6 @@
 		// Save away this config
 		settings['index'] = this.configs.length;
 		this.configs[this.configs.length] = settings;
-
-		// Start loading first one in chain
-		this.loadNextScript();
 	},
 
 	_addUnloadEvents : function() {
@@ -331,8 +319,6 @@
 		// Use the previous plugin object base URL used when loading external plugins
 		p.baseURL = op ? op.baseURL : tinyMCE.baseURL + "/plugins/" + n;
 		this.plugins[n] = p;
-
-		this.loadNextScript();
 	},
 
 	setPluginBaseURL : function(n, u) {
@@ -357,8 +343,6 @@
 
 	addTheme : function(n, t) {
 		this.themes[n] = t;
-
-		this.loadNextScript();
 	},
 
 	addMenu : function(n, m) {
@@ -370,43 +354,21 @@
 	},
 
 	loadScript : function(url) {
-		var i;
-
-		for (i=0; i<this.loadedFiles.length; i++) {
+		for (var i=0; i<this.loadedFiles.length; i++) {
 			if (this.loadedFiles[i] == url)
 				return;
 		}
 
-		if (tinyMCE.settings.strict_loading_mode)
-			this.pendingFiles[this.pendingFiles.length] = url;
-		else
-			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
+		document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
 
 		this.loadedFiles[this.loadedFiles.length] = url;
 	},
 
-	loadNextScript : function() {
-		var d = document, se;
-
-		if (!tinyMCE.settings.strict_loading_mode)
-			return;
-
-		if (this.loadingIndex < this.pendingFiles.length) {
-			se = d.createElementNS('http://www.w3.org/1999/xhtml', 'script');
-			se.setAttribute('language', 'javascript');
-			se.setAttribute('type', 'text/javascript');
-			se.setAttribute('src', this.pendingFiles[this.loadingIndex++]);
-
-			d.getElementsByTagName("head")[0].appendChild(se);
-		} else
-			this.loadingIndex = -1; // Done with loading
-	},
-
 	loadCSS : function(url) {
 		var ar = url.replace(/\s+/, '').split(',');
 		var lflen = 0, csslen = 0;
 		var skip = false;
-		var x = 0, i = 0, nl, le;
+		var x = 0, i = 0;
 
 		for (x = 0,csslen = ar.length; x<csslen; x++) {
 			ignore_css = false;
@@ -421,18 +383,7 @@
 				}
 
 				if (!skip) {
-					if (tinyMCE.settings.strict_loading_mode) {
-						nl = document.getElementsByTagName("head");
-
-						le = document.createElement('link');
-						le.setAttribute('href', ar[x]);
-						le.setAttribute('rel', 'stylesheet');
-						le.setAttribute('type', 'text/css');
-
-						nl[0].appendChild(le);			
-					} else
-						document.write('<link href="' + ar[x] + '" rel="stylesheet" type="text/css" />');
-
+					document.write('<link href="' + ar[x] + '" rel="stylesheet" type="text/css" />');
 					this.loadedFiles[this.loadedFiles.length] = ar[x];
 				}
 			}
@@ -707,7 +658,7 @@
 		}
 
 		iframe.setAttribute("id", id);
-		iframe.setAttribute("class", "mceEditorIframe");
+		iframe.setAttribute("className", "mceEditorIframe");
 		iframe.setAttribute("border", "0");
 		iframe.setAttribute("frameBorder", "0");
 		iframe.setAttribute("marginWidth", "0");
@@ -717,7 +668,6 @@
 		iframe.setAttribute("width", aw);
 		iframe.setAttribute("height", ah);
 		iframe.setAttribute("allowtransparency", "true");
-		iframe.className = 'mceEditorIframe';
 
 		if (tinyMCE.settings["auto_resize"])
 			iframe.setAttribute("scrolling", "no");
@@ -729,10 +679,6 @@
 		iframe.style.width = aw;
 		iframe.style.height = ah;
 
-		// Ugly hack for Gecko problem in strict mode
-		if (tinyMCE.settings.strict_loading_mode)
-			iframe.style.marginBottom = '-5px';
-
 		// MSIE 5.0 issue
 		if (tinyMCE.isMSIE && !tinyMCE.isOpera)
 			replace_element.outerHTML = iframe.outerHTML;
@@ -751,14 +697,6 @@
 		var head = doc.getElementsByTagName('head').item(0);
 		var content = inst.startContent;
 
-		// HTML values get XML encoded in strict mode
-		if (tinyMCE.settings.strict_loading_mode) {
-			content = content.replace(/&lt;/g, '<');
-			content = content.replace(/&gt;/g, '>');
-			content = content.replace(/&quot;/g, '"');
-			content = content.replace(/&amp;/g, '&');
-		}
-
 		inst.switchSettings();
 
 		// Not loaded correctly hit it again, Mozilla bug #997860
@@ -913,22 +851,6 @@
 		inst.startContent = tinyMCE.trim(inst.getBody().innerHTML);
 		inst.undoRedo.add({ content : inst.startContent });
 
-		// Cleanup any mess left from storyAwayURLs
-		if (tinyMCE.isGecko) {
-			// Remove mce_src from textnodes and comments
-			tinyMCE.selectNodes(inst.getBody(), function(n) {
-				if (n.nodeType == 3 || n.nodeType == 8) {
-					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
-					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
-				}
-
-				return false;
-			});
-		}
-
-		// Cleanup any mess left from storyAwayURLs
-		tinyMCE._removeInternal(inst.getBody());
-
 		tinyMCE.selectedInstance = inst;
 		tinyMCE.triggerNodeChange(false, true);
 	},
@@ -946,20 +868,6 @@
 		return s;
 	},
 
-	_removeInternal : function(n) {
-		if (tinyMCE.isGecko) {
-			// Remove mce_src from textnodes and comments
-			tinyMCE.selectNodes(n, function(n) {
-				if (n.nodeType == 3 || n.nodeType == 8) {
-					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
-					n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
-				}
-
-				return false;
-			});
-		}
-	},
-
 	removeTinyMCEFormElements : function(form_obj) {
 		// Check if form is valid
 		if (typeof(form_obj) == "undefined" || form_obj == null)
@@ -1014,23 +922,7 @@
 				if (tinyMCE.selectedInstance)
 					tinyMCE.selectedInstance.setBaseHREF(null);
 
-				// Fixes odd MSIE bug where drag/droping elements in a iframe with height 100% breaks
-				// This logic forces the width/height to be in pixels while the user is drag/dropping
-				if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
-					var ife = tinyMCE.selectedInstance.iframeElement;
-
-					/*if (ife.style.width.indexOf('%') != -1) {
-						ife._oldWidth = ife.width.height;
-						ife.style.width = ife.clientWidth;
-					}*/
-
-					if (ife.style.height.indexOf('%') != -1) {
-						ife._oldHeight = ife.style.height;
-						ife.style.height = ife.clientHeight;
-					}
-				}
-
-				window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();", 1);
+				window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);", 1);
 				return;
 
 			case "submit":
@@ -1349,12 +1241,6 @@
 	},
 
 	onLoad : function() {
-		// Wait for everything to be loaded first
-		if (tinyMCE.settings.strict_loading_mode && this.loadingIndex != -1) {
-			window.setTimeout('tinyMCE.onLoad();', 1);
-			return;
-		}
-
 		if (tinyMCE.isMSIE && !tinyMCE.isOpera && window.event.type == "readystatechange" && document.readyState != "complete")
 			return true;
 
@@ -1539,8 +1425,6 @@
 			tinyMCELang[(key.indexOf('lang_') == -1 ? 'lang_' : '') + (prefix != '' ? (prefix + "_") : '') + key] = ar[key];
 		}
 
-		this.loadNextScript();
-
 	//	for (var key in ar)
 	//		tinyMCELang[(key.indexOf('lang_') == -1 ? 'lang_' : '') + (prefix != '' ? (prefix + "_") : '') + key] = "|" + ar[key] + "|";
 	},
@@ -1787,13 +1671,10 @@
 		return className;
 	},
 
-	handleVisualAid : function(el, deep, state, inst, skip_dispatch) {
+	handleVisualAid : function(el, deep, state, inst) {
 		if (!el)
 			return;
 
-		if (!skip_dispatch)
-			tinyMCE.dispatchCallback(inst, 'handle_visual_aid_callback', 'handleVisualAid', el, deep, state, inst);
-
 		var tableElement = null;
 
 		switch (el.nodeName) {
@@ -1832,7 +1713,7 @@
 
 		if (deep && el.hasChildNodes()) {
 			for (var i=0; i<el.childNodes.length; i++)
-				tinyMCE.handleVisualAid(el.childNodes[i], deep, state, inst, true);
+				tinyMCE.handleVisualAid(el.childNodes[i], deep, state, inst);
 		}
 	},
 
@@ -1870,54 +1751,35 @@
 	*/
 
 	fixGeckoBaseHREFBug : function(m, e, h) {
-		var nl, i, a, n, xsrc, xhref, el;
+		var nl, i;
 
 		if (tinyMCE.isGecko) {
 			if (m == 1) {
-				h = h.replace(/\ssrc=/gi, " mce_tsrc=");
-				h = h.replace(/\shref=/gi, " mce_thref=");
+				h = h.replace(/\ssrc=/gi, " xsrc=");
+				h = h.replace(/\shref=/gi, " xhref=");
 
 				return h;
 			} else {
-				el = new Array('a','img','select','area','iframe','base','input','script','embed','object','link');
+				var el = new Array('a','img','select','area','iframe','base','input','script','embed','object','link');
 
-				for (a=0; a<el.length; a++) {
-					n = e.getElementsByTagName(el[a]);
+				for (var a=0; a<el.length; a++) {
+					var n = e.getElementsByTagName(el[a]);
 
 					for (i=0; i<n.length; i++) {
-						xsrc = tinyMCE.getAttrib(n[i], "mce_tsrc");
-						xhref = tinyMCE.getAttrib(n[i], "mce_thref");
+						var xsrc = tinyMCE.getAttrib(n[i], "xsrc");
+						var xhref = tinyMCE.getAttrib(n[i], "xhref");
 
 						if (xsrc != "") {
-							try {
-								n[i].src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xsrc);
-							} catch (e) {
-								// Ignore, Firefox cast exception if local file wasn't found
-							}
-
-							n[i].removeAttribute("mce_tsrc");
+							n[i].src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xsrc);
+							n[i].removeAttribute("xsrc");
 						}
 
 						if (xhref != "") {
-							try {
-								n[i].href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xhref);
-							} catch (e) {
-								// Ignore, Firefox cast exception if local file wasn't found
-							}
-
-							n[i].removeAttribute("mce_thref");
+							n[i].href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], xhref);
+							n[i].removeAttribute("xhref");
 						}
 					}
 				}
-
-				el = tinyMCE.selectNodes(e, function(n) {
-					if (n.nodeType == 3 || n.nodeType == 8) {
-						n.nodeValue = n.nodeValue.replace(/\smce_tsrc=/gi, " src=");
-						n.nodeValue = n.nodeValue.replace(/\smce_thref=/gi, " href=");
-					}
-
-					return false;
-				});
 			}
 		}
 
@@ -2058,14 +1920,14 @@
 		}
 
 		if (doc) {
-			var styles = doc.styleSheets;
+			var styles = tinyMCE.isMSIE ? doc.styleSheets : doc.styleSheets;
 
 			if (styles && styles.length > 0) {
 				for (var x=0; x<styles.length; x++) {
 					var csses = null;
 
 					// Just ignore any errors
-					eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(" + x + ").rules : styles[" + x + "].cssRules;} catch(e) {}");
+					eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(" + x + ").rules : doc.styleSheets[" + x + "].cssRules;} catch(e) {}");
 					if (!csses)
 						return new Array();
 
@@ -2076,31 +1938,17 @@
 						if (selectorText) {
 							var rules = selectorText.split(',');
 							for (var c=0; c<rules.length; c++) {
-								var rule = rules[c];
-
-								// Strip spaces between selectors
-								while (rule.indexOf(' ') == 0)
-									rule = rule.substring(1);
-
 								// Invalid rule
-								if (rule.indexOf(' ') != -1 || rule.indexOf(':') != -1 || rule.indexOf('mceItem') != -1)
+								if (rules[c].indexOf(' ') != -1 || rules[c].indexOf(':') != -1 || rules[c].indexOf('mceItem') != -1)
 									continue;
 
-								if (rule.indexOf(tinyMCE.settings['visual_table_class']) != -1 || rule.indexOf('mceEditable') != -1 || rule.indexOf('mceNonEditable') != -1)
+								if (rules[c] == "." + tinyMCE.settings['visual_table_class'] || rules[c].indexOf('mceEditable') != -1 || rules[c].indexOf('mceNonEditable') != -1)
 									continue;
 
 								// Is class rule
-								if (rule.indexOf('.') != -1) {
-									var cssClass = rule.substring(rule.indexOf('.') + 1);
-									var addClass = true;
-
-									for (var p=0; p<output.length && addClass; p++) {
-										if (output[p] == cssClass)
-											addClass = false;
-									}
-
-									if (addClass)
-										output[output.length] = cssClass;
+								if (rules[c].indexOf('.') != -1) {
+									//alert(rules[c].substring(rules[c].indexOf('.')));
+									output[output.length] = rules[c].substring(rules[c].indexOf('.')+1);
 								}
 							}
 						}
@@ -2252,17 +2100,6 @@
 			tinyMCE.switchClass(e, tinyMCE.lastMenuBtnClass);
 			tinyMCE.lastSelectedMenuBtn = null;
 		}
-	},
-
-	explode : function(d, s) {
-		var ar = s.split(d), oar = new Array(), i;
-	
-		for (i = 0; i<ar.length; i++) {
-			if (ar[i] != "")
-				oar[oar.length] = ar[i];
-		}
-	
-		return oar;
 	}
 };
 
@@ -2683,21 +2520,15 @@
 
 			case "FormatBlock":
 				if (value == null || value == "") {
-					var elm = tinyMCE.getParentElement(this.getFocusElement(), "p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp");
+					var elm = tinyMCE.getParentElement(this.getFocusElement(), "p,div,h1,h2,h3,h4,h5,h6,pre,address");
 
 					if (elm)
 						this.execCommand("mceRemoveNode", false, elm);
 				} else {
-					if (tinyMCE.isGecko && new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>', 'gi').test(value))
-						value = value.replace(/[^a-z]/gi, '');
+					if (value == '<div>' && tinyMCE.isGecko)
+						value = 'div';
 
-					if (tinyMCE.isMSIE && new RegExp('blockquote|code|samp', 'gi').test(value)) {
-						var b = this.selection.getBookmark();
-						this.getDoc().execCommand("FormatBlock", false, '<p>');
-						tinyMCE.renameElement(tinyMCE.getParentBlockElement(this.getFocusElement()), value);
-						this.selection.moveToBookmark(b);
-					} else
-						this.getDoc().execCommand("FormatBlock", false, value);
+					this.getDoc().execCommand("FormatBlock", false, value);
 				}
 
 				tinyMCE.triggerNodeChange();
@@ -2998,9 +2829,6 @@
 				tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(this, doc, tinyMCE.settings, doc.body));
 				tinyMCE.convertAllRelativeURLs(doc.body);
 
-				// Cleanup any mess left from storyAwayURLs
-				tinyMCE._removeInternal(this.getBody());
-
 				// When editing always use fonts internaly
 				if (tinyMCE.getParam("convert_fonts_to_spans"))
 					tinyMCE.convertSpansToFonts(doc);
@@ -3445,7 +3273,7 @@
 			if (tinyMCE.settings['debug']) {
 				hc = '<textarea wrap="off" id="' + form_element_name + '" name="' + form_element_name + '" cols="100" rows="15"></textarea>';
 			} else {
-				hc = '<input type="hidden" id="' + form_element_name + '" name="' + form_element_name + '" />';
+				hc = '<input type="hidden" type="text" id="' + form_element_name + '" name="' + form_element_name + '" />';
 				this.oldTargetElement.style.display = "none";
 			}
 
@@ -3490,8 +3318,7 @@
 		var tElm = targetDoc.getElementById(this.editorId);
 
 		if (!tinyMCE.isMSIE) {
-			// Node case is preserved in XML strict mode
-			if (tElm && (tElm.nodeName == "SPAN" || tElm.nodeName == "span")) {
+			if (tElm && tElm.nodeName == "SPAN") {
 				tElm = tinyMCE._createIFrame(tElm, targetDoc);
 				dynamicIFrame = true;
 			}
@@ -3586,27 +3413,7 @@
 	},
 
 	triggerSave : function(skip_cleanup, skip_callback) {
-		var e, nl = new Array(), i, s;
-
 		this.switchSettings();
-		s = tinyMCE.settings;
-
-		// Force hidden tabs visible while serializing
-		if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
-			e = this.iframeElement;
-
-			do {
-				if (e.style && e.style.display == 'none') {
-					e.style.display = 'block';
-					nl[nl.length] = {elm : e, type : 'style'};
-				}
-
-				if (e.style && s.hidden_tab_class.length > 0 && e.className.indexOf(s.hidden_tab_class) != -1) {
-					e.className = s.display_tab_class;
-					nl[nl.length] = {elm : e, type : 'class'};
-				}
-			} while ((e = e.parentNode) != null)
-		}
 
 		tinyMCE.settings['preformatted'] = false;
 
@@ -3649,42 +3456,33 @@
 
 		if (tinyMCE.isSafari && this.formElement)
 			this.formElement.innerText = htm;
-
-		// Hide them again (tabs in MSIE)
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].type == 'style')
-				nl[i].elm.style.display = 'none';
-			else
-				nl[i].elm.className = s.hidden_tab_class;
-		}
 	}
 };
 
 /* file:jscripts/tiny_mce/classes/TinyMCE_Cleanup.class.js */
 
 TinyMCE_Engine.prototype.cleanupHTMLCode = function(s) {
-	s = s.replace(new RegExp('<p \\/>', 'gi'), '<p>&nbsp;</p>');
-	s = s.replace(new RegExp('<p>\\s*<\\/p>', 'gi'), '<p>&nbsp;</p>');
-
-	// Fix close BR elements
-	s = s.replace(new RegExp('<br>\\s*<\\/br>', 'gi'), '<br />');
+	s = s.replace(/<p \/>/gi, '<p>&nbsp;</p>');
+	s = s.replace(/<p>\s*<\/p>/gi, '<p>&nbsp;</p>');
 
 	// Open closed tags like <b/> to <b></b>
-	s = s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>', 'gi'), '<$1$2$3></$1$2>');
+//	tinyMCE.debug("f:" + s);
+	s = s.replace(/<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\|>]*?)\/>/gi, '<$1$2$3></$1$2>');
+//	tinyMCE.debug("e:" + s);
 
 	// Remove trailing space <b > to <b>
 	s = s.replace(new RegExp('\\s+></', 'gi'), '></');
 
 	// Close tags <img></img> to <img/>
-	s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />');
+	s = s.replace(/<(img|br|hr)(.*?)><\/(img|br|hr)>/gi, '<$1$2 />');
 
 	// Weird MSIE bug, <p><hr /></p> breaks runtime?
 	if (tinyMCE.isMSIE)
-		s = s.replace(new RegExp('<p><hr \\/><\\/p>', 'gi'), "<hr>");
+		s = s.replace(/<p><hr \/><\/p>/gi, "<hr>");
 
 	// Convert relative anchors to absolute URLs ex: #something to file.htm#something
 	if (tinyMCE.getParam('convert_urls'))
-		s = s.replace(new RegExp('(href=\"{0,1})(\\s*#)', 'gi'), '$1' + tinyMCE.settings['document_base_url'] + "#");
+		s = s.replace(new RegExp('(href=\"?)(\\s*?#)', 'gi'), '$1' + tinyMCE.settings['document_base_url'] + "#");
 
 	return s;
 };
@@ -3746,9 +3544,6 @@
 	tinyMCE.compressStyle(ar, "border", "", "border");
 	tinyMCE.compressStyle(ar, "border", "-width", "border-width");
 	tinyMCE.compressStyle(ar, "border", "-color", "border-color");
-	tinyMCE.compressStyle(ar, "border", "-style", "border-style");
-	tinyMCE.compressStyle(ar, "padding", "", "padding");
-	tinyMCE.compressStyle(ar, "margin", "", "margin");
 
 	for (var key in ar) {
 		var val = ar[key];
@@ -3909,8 +3704,7 @@
 TinyMCE_Engine.prototype.cleanupAnchors = function(doc) {
 	var i, cn, x, an = doc.getElementsByTagName("a");
 
-	// Loops backwards due to bug #1467987
-	for (i=an.length-1; i>=0; i--) {
+	for (i=0; i<an.length; i++) {
 		if (tinyMCE.getAttrib(an[i], "name") != "" && tinyMCE.getAttrib(an[i], "href") == "") {
 			cn = an[i].childNodes;
 
@@ -4042,7 +3836,7 @@
 	h = h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*(&nbsp;|&#160;)\s*<\/p>/g, '<p>&nbsp;</p>');
 	h = h.replace(/<p>\s*(&nbsp;|&#160;)\s*<br \/>\s*<\/p>/g, '<p>&nbsp;</p>');
 	h = h.replace(/<p>\s*<br \/>\s*&nbsp;\s*<\/p>/g, '<p>&nbsp;</p>');
-	h = h.replace(new RegExp('<a>(.*?)<\\/a>', 'g'), '$1');
+	h = h.replace(/<a>(.*?)<\/a>/g, '$1');
 	h = h.replace(/<p([^>]*)>\s*<\/p>/g, '<p$1>&nbsp;</p>');
 
 	// Clean body
@@ -4118,7 +3912,7 @@
 
 	this.vElements = tinyMCE.clearArray(new Array());
 	this.vElementsRe = '';
-	this.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON|AREA)$/;
+	this.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|BUTTON)$/;
 	this.codeElementsRe = /^(SCRIPT|STYLE)$/;
 	this.serializationId = 0;
 	this.mceAttribs = {
@@ -4233,8 +4027,8 @@
 					for (i=0; i<a.length; i++) {
 						t = a[i];
 
-						av = new RegExp('(=|:|<)(.*?)$').exec(t);
-						t = t.replace(new RegExp('(=|:|<).*?$'), '');
+						av = /(=|:|<)(.*?)$/.exec(t);
+						t = t.replace(/(=|:|<).*?$/, '');
 						if (av && av.length > 0) {
 							if (av[0].charAt(0) == ':') {
 								if (!r.forceAttribs)
@@ -4540,6 +4334,13 @@
 					c = s.charCodeAt(i);
 					e = this.entities[c];
 
+					// &apos; is not working in MSIE
+					// More info: http://www.w3.org/TR/xhtml1/#C_16
+					if (c == 39) {
+						o += "&#39;";
+						continue;
+					}
+
 					if (e && e != '')
 						o += '&' + e + ';';
 					else
@@ -4577,6 +4378,12 @@
 	},
 
 	_trimComment : function(s) {
+		// Make xsrc, xhref as src and href again
+		if (tinyMCE.isGecko) {
+			s = s.replace(/\sxsrc=/gi, " src=");
+			s = s.replace(/\sxhref=/gi, " href=");
+		}
+
 		// Remove mce_src, mce_href
 		s = s.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
 		s = s.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
@@ -4599,15 +4406,6 @@
 		if (this.isMSIE && n == "http-equiv")
 			v = e.httpEquiv;
 
-		if (this.isMSIE && e.nodeName == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
-			v = "";
-
-		if (this.isMSIE && e.nodeName == "INPUT" && n == "size" && v == "20")
-			v = "";
-
-		if (this.isMSIE && e.nodeName == "INPUT" && n == "maxlength" && v == "2147483647")
-			v = "";
-
 		if (n == "style" && !tinyMCE.isOpera)
 			v = e.style.cssText;
 
@@ -4759,8 +4557,7 @@
 
 		// Since MSIE auto generated emtpy P tags some times we must tell it to keep the real ones
 		h = h.replace(/<p([^>]*)>\u00A0?<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
-		h = h.replace(/<p([^>]*)>\s*&nbsp;\s*<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
-		h = h.replace(/<p([^>]*)>\s+<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
+		h = h.replace(/<p([^>]*)>&nbsp;<\/p>/gi, '<p$1 mce_keep="true">&nbsp;</p>'); // Keep empty paragraphs
 
 		// Remove first comment
 		e.innerHTML = tinyMCE.uniqueTag + h;
@@ -4873,17 +4670,6 @@
 	return null;
 };
 
-TinyMCE_Engine.prototype.getParentNode = function(n, f) {
-	while (n) {
-		if (f(n))
-			return n;
-
-		n = n.parentNode;
-	}
-
-	return null;
-};
-
 TinyMCE_Engine.prototype.getAttrib = function(elm, name, default_value) {
 	if (typeof(default_value) == "undefined")
 		default_value = "";
@@ -5005,62 +4791,6 @@
 	return null;
 };
 
-TinyMCE_Engine.prototype.selectNodes = function(n, f, a) {
-	var i;
-
-	if (!a)
-		a = new Array();
-
-	if (f(n))
-		a[a.length] = n;
-
-	if (n.hasChildNodes()) {
-		for (i=0; i<n.childNodes.length; i++)
-			tinyMCE.selectNodes(n.childNodes[i], f, a);
-	}
-
-	return a;
-};
-
-TinyMCE_Engine.prototype.addCSSClass = function(e, c, b) {
-	var o = this.removeCSSClass(e, c);
-
-	return e.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
-};
-
-TinyMCE_Engine.prototype.removeCSSClass = function(e, c) {
-	var a = this.explode(' ', e.className), i;
-
-	for (i=0; i<a.length; i++) {
-		if (a[i] == c)
-			a[i] = '';
-	}
-
-	return e.className = a.join(' ');
-};
-
-TinyMCE_Engine.prototype.renameElement = function(e, n, d) {
-	var ne, i, ar;
-
-	d = typeof(d) == "undefined" ? tinyMCE.selectedInstance.getDoc() : d;
-
-	if (e) {
-		ne = d.createElement(n);
-
-		ar = e.attributes;
-		for (i=ar.length-1; i>-1; i--) {
-			if (ar[i].specified && ar[i].nodeValue)
-				ne.setAttribute(ar[i].nodeName.toLowerCase(), ar[i].nodeValue);
-		}
-
-		ar = e.childNodes;
-		for (i=0; i<ar.length; i++)
-			ne.appendChild(ar[i].cloneNode(true));
-
-		e.parentNode.replaceChild(ne, e);
-	}
-};
-
 /* file:jscripts/tiny_mce/classes/TinyMCE_URL.class.js */
 
 TinyMCE_Engine.prototype.parseURL = function(url_str) {
@@ -5220,9 +4950,9 @@
 	if (fileName == targetURL.path && targetURL.anchor != "")
 		targetURL.path = "";
 
-	// If empty and not local anchor force filename or slash
+	// If empty and not local anchor force slash
 	if (targetURL.path == "" && !targetURL.anchor)
-		targetURL.path = fileName != "" ? fileName : "/";
+		targetURL.path = "/";
 
 	return this.serializeURL(targetURL);
 };
@@ -5485,7 +5215,6 @@
 		tinyMCE.addEvent(doc, "keyup", TinyMCE_Engine.prototype._eventPatch);
 		tinyMCE.addEvent(doc, "keydown", TinyMCE_Engine.prototype._eventPatch);
 		tinyMCE.addEvent(doc, "mouseup", TinyMCE_Engine.prototype._eventPatch);
-		tinyMCE.addEvent(doc, "mousedown", TinyMCE_Engine.prototype._eventPatch);
 		tinyMCE.addEvent(doc, "click", TinyMCE_Engine.prototype._eventPatch);
 	} else {
 		tinyMCE.addEvent(doc, "keypress", tinyMCE.handleEvent);
@@ -5579,24 +5308,6 @@
 	return true;
 };
 
-TinyMCE_Engine.prototype._resetIframeHeight = function() {
-	var ife;
-
-	if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
-		ife = tinyMCE.selectedInstance.iframeElement;
-
-/*		if (ife._oldWidth) {
-			ife.style.width = ife._oldWidth;
-			ife.width = ife._oldWidth;
-		}*/
-
-		if (ife._oldHeight) {
-			ife.style.height = ife._oldHeight;
-			ife.height = ife._oldHeight;
-		}
-	}
-};
-
 /* file:jscripts/tiny_mce/classes/TinyMCE_Selection.class.js */
 
 function TinyMCE_Selection(inst) {
@@ -5617,8 +5328,8 @@
 
 		if (tinyMCE.isGecko)
 			e.appendChild(r.cloneContents());
-		else 
-			e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
+		else
+			e.innerHTML = r.htmlText;
 
 		h = tinyMCE._cleanupHTML(inst, inst.contentDocument, inst.settings, e, e, false, true, false);
 
@@ -5779,13 +5490,8 @@
 
 				nl = doc.getElementsByTagName(bookmark.tag);
 
-				if (nl.length > bookmark.index) {
-					try {
-						rng.addElement(nl[bookmark.index]);
-					} catch (ex) {
-						// Might be thrown if the node no longer exists
-					}
-				}
+				if (nl.length > bookmark.index)
+					rng.addElement(nl[bookmark.index]);
 			} else {
 				rng = inst.getSel().createRange();
 				rng.moveToElementText(inst.getBody());
@@ -6171,13 +5877,6 @@
 		var startBlock = tinyMCE.getParentBlockElement(startNode);
 		var endBlock = tinyMCE.getParentBlockElement(endNode);
 
-		// If absolute force paragraph generation within
-		if (startBlock && new RegExp('absolute|relative|static', 'gi').test(startBlock.style.position))
-			startBlock = null;
-
-		if (endBlock && new RegExp('absolute|relative|static', 'gi').test(endBlock.style.position))
-			endBlock = null;
-
 		// Use current block name
 		if (startBlock != null) {
 			blockName = startBlock.nodeName;
@@ -6363,21 +6062,13 @@
 	},
 
 	_handleBackSpace : function(inst) {
-		var r = inst.getRng(), sn = r.startContainer, nv, s = false;
+		var r = inst.getRng();
+		var sn = r.startContainer;
 
-		if (sn && sn.nextSibling && sn.nextSibling.nodeName == "BR") {
-			nv = sn.nodeValue;
-
-			// Handle if a backspace is pressed after a space character #bug 1466054
-			if (nv != null && nv.length >= r.startOffset && nv.charAt(r.startOffset - 1) == ' ')
-				s = true;
-
-			// Only remove BRs if we are at the end of line #bug 1464152
-			if (nv != null && r.startOffset == nv.length)
-				sn.nextSibling.parentNode.removeChild(sn.nextSibling);
-		}
+		if (sn && sn.nextSibling && sn.nextSibling.nodeName == "BR")
+			sn.nextSibling.parentNode.removeChild(sn.nextSibling);
 
-		return s;
+		return false;
 	}
 };
 
@@ -6389,7 +6080,6 @@
 	this.events = false;
 	this.element = null;
 	this.blockMode = typeof(bm) != 'undefined' ? bm : true;
-	this.doc = document;
 };
 
 TinyMCE_Layer.prototype = {
@@ -6454,11 +6144,8 @@
 	resizeTo : function(w, h) {
 		var e = this.getElement();
 
-		if (w != null)
-			e.style.width = w + "px";
-
-		if (h != null)
-			e.style.height = h + "px";
+		e.style.width = w + "px";
+		e.style.height = h + "px";
 
 		this.updateBlocker();
 	},
@@ -6479,7 +6166,7 @@
 
 	getElement : function() {
 		if (!this.element)
-			this.element = this.doc.getElementById(this.id);
+			this.element = document.getElementById(this.id);
 
 		return this.element;
 	},
@@ -6514,7 +6201,7 @@
 		var d, b;
 
 		if (!this.blockerElement && this.blockMode) {
-			d = this.doc;
+			d = document;
 			b = d.createElement("iframe");
 
 			b.style.cssText = 'display: none; position: absolute; left: 0; top: 0';
@@ -6542,7 +6229,7 @@
 	},
 
 	create : function(n, c, p) {
-		var d = this.doc, e = d.createElement(n);
+		var d = document, e = d.createElement(n);
 
 		e.setAttribute('id', this.id);
 
@@ -6556,6 +6243,37 @@
 
 		return this.element = e;
 	},
+/*
+	addCSSClass : function(e, c) {
+		this.removeCSSClass(e, c);
+		var a = this.explode(' ', e.className);
+		a[a.length] = c;
+		e.className = a.join(' ');
+	},
+
+	removeCSSClass : function(e, c) {
+		var a = this.explode(' ', e.className), i;
+
+		for (i=0; i<a.length; i++) {
+			if (a[i] == c)
+				a[i] = '';
+		}
+
+		e.className = a.join(' ');
+	},
+
+	explode : function(d, s) {
+		var ar = s.split(d);
+		var oar = new Array();
+
+		for (var i = 0; i<ar.length; i++) {
+			if (ar[i] != "")
+				oar[oar.length] = ar[i];
+		}
+
+		return oar;
+	},
+*/
 
 	parseInt : function(s) {
 		if (s == null || s == '')
@@ -6679,7 +6397,7 @@
 		if (tinyMCE.lastMenu && tinyMCE.lastMenu != this)
 			tinyMCE.lastMenu.hide();
 
-		TinyMCE_Layer.prototype.show.call(this);
+		this.parent.show.call(this);
 
 		if (!tinyMCE.isOpera) {
 			// Accessibility stuff
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/utils/editable_selects.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/utils/editable_selects.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/utils/editable_selects.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/utils/editable_selects.js	1969-12-31 18:00:00.000000000 -0600
@@ -1,63 +0,0 @@
-/**
- * $RCSfile: editable_selects.js,v $
- * $Revision: 1.1 $
- * $Date: 2006/04/10 09:30:19 $
- *
- * Makes select boxes editable.
- *
- * @author Moxiecode
- * @copyright Copyright  2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-
-var TinyMCE_EditableSelects = {
-	editSelectElm : null,
-
-	init : function() {
-		var nl = document.getElementsByTagName("select"), i, d = document, o;
-
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
-				o = new Option('(value)', '__mce_add_custom__');
-
-				o.className = 'mceAddSelectValue';
-
-				nl[i].options[nl[i].options.length] = o;
-				nl[i].setAttribute('onchange', 'TinyMCE_EditableSelects.onChangeEditableSelect(this);');
-			}
-		}
-	},
-
-	onChangeEditableSelect : function(se) {
-		var d = document, ne;
-
-		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
-			ne = d.createElement("input");
-			ne.id = se.id + "_custom";
-			ne.name = se.name + "_custom";
-			ne.type = "text";
-
-			ne.style.width = se.clientWidth;
-			se.parentNode.insertBefore(ne, se);
-			se.style.display = 'none';
-			ne.focus();
-			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
-			TinyMCE_EditableSelects.editSelectElm = se;
-		}
-	},
-
-	onBlurEditableSelectInput : function() {
-		var se = TinyMCE_EditableSelects.editSelectElm;
-
-		if (se) {
-			if (se.previousSibling.value != '') {
-				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
-				selectByValue(document.forms[0], se.id, se.previousSibling.value);
-			} else
-				selectByValue(document.forms[0], se.id, '');
-
-			se.style.display = 'inline';
-			se.parentNode.removeChild(se.previousSibling);
-			TinyMCE_EditableSelects.editSelectElm = null;
-		}
-	}
-};
diff -ruN 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/utils/form_utils.js 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/utils/form_utils.js
--- 4.5.4/mambots/editors/tinymce/jscripts/tiny_mce/utils/form_utils.js	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce/jscripts/tiny_mce/utils/form_utils.js	2006-04-30 15:27:06.000000000 -0500
@@ -1,7 +1,7 @@
 /**
  * $RCSfile: form_utils.js,v $
- * $Revision: 1.11 $
- * $Date: 2006/04/07 15:53:12 $
+ * $Revision: 1.10 $
+ * $Date: 2006/03/22 12:21:24 $
  *
  * Various form utilitiy functions.
  *
@@ -92,10 +92,9 @@
 	}
 
 	if (!found && add_custom && value != '') {
-		var option = new Option(value, value);
+		var option = new Option('Value: ' + value, value);
 		option.selected = true;
 		sel.options[sel.options.length] = option;
-		sel.selectedIndex = sel.options.length - 1;
 	}
 
 	return found;
diff -ruN 4.5.4/mambots/editors/tinymce/lgpl.txt 4.6rc2/mambots/editors/tinymce/lgpl.txt
--- 4.5.4/mambots/editors/tinymce/lgpl.txt	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/mambots/editors/tinymce/lgpl.txt	2006-04-30 15:27:06.000000000 -0500
@@ -0,0 +1,437 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff -ruN 4.5.4/mambots/editors/tinymce.php 4.6rc2/mambots/editors/tinymce.php
--- 4.5.4/mambots/editors/tinymce.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,118 +1,120 @@
-<?php
-/**
-* @version $Id: tinymce.php,v 1.2 2005/10/27 08:19:34 lang3 Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-$_MAMBOTS->registerFunction( 'onInitEditor', 'botTinymceEditorInit' );
-$_MAMBOTS->registerFunction( 'onGetEditorContents', 'botTinymceEditorGetContents' );
-$_MAMBOTS->registerFunction( 'onEditorArea', 'botTinymceEditorEditorArea' );
-
-/**
-* TinyMCE WYSIWYG Editor - javascript initialisation
-*/
-function botTinymceEditorInit() {
-	global $mosConfig_live_site, $database, $mosConfig_absolute_path;
-
-	// load tinymce info
-	$query = "SELECT id FROM #__mambots WHERE element = 'tinymce' AND folder = 'editors'";
-	$database->setQuery( $query );
-	$id = $database->loadResult();
-	$mambot = new mosMambot( $database );
-	$mambot->load( $id );
-	$params =& new mosParameters( $mambot->params );
-
-	$theme = $params->get( 'theme', 'advanced' );
-	// Check for old default option and set to advanced
-	if ($theme == 'default' ) {
-		$theme = 'simple';
-	}
-
- 	$toolbar 			= $params->def( 'toolbar', 'top' );
- 	$html_height		= $params->def( 'html_height', '550' );
- 	$html_width			= $params->def( 'html_width', '750' );
- 	$text_direction		= $params->def( 'text_direction', 'ltr' );
-	$content_css		= $params->def( 'content_css', 1 );
- 	$content_css_custom	= $params->def( 'content_css_custom', '' );
- 	$invalid_elements	= $params->def( 'invalid_elements', 'script,object,applet,iframe' );
- 	$newlines			= $params->def( 'newlines', 'false' );
- 	
- 	if ( $content_css ) {
- 		$query = "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'";
- 		$database->setQuery( $query );
- 		$template 		= $database->loadResult();
- 		$content_css	= 'content_css : "'. $mosConfig_live_site .'/templates/'. $template .'/css/template_css.css"';
- 	} else {
- 		if ( $content_css_custom ) {
- 			$content_css = 'content_css : "'. $content_css_custom .'"';
- 		} else {
- 			$content_css = '';
- 		}
- 	}
- 	
-	return <<<EOD
-<script type="text/javascript" src="$mosConfig_live_site/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript">
-	tinyMCE.init({
-		theme : "$theme",
-		language : "en",
-		mode : "specific_textareas",
-		remove_script_host : false,
-		relative_urls : false,
-		document_base_url : "$mosConfig_live_site/mambots/editors/tinymce/",
- 		invalid_elements : "$invalid_elements",
- 		theme_advanced_toolbar_location : "$toolbar",
- 		theme_advanced_source_editor_height : "$html_height",
-		theme_advanced_source_editor_width : "$html_width",
- 		directionality: "$text_direction",
- 		force_br_newlines : "$newlines",
- 		$content_css,		
-		debug : false
-	});
-</script>
-EOD;
-}
-/**
-* TinyMCE WYSIWYG Editor - copy editor contents to form field
-* @param string The name of the editor area
-* @param string The name of the form field
-*/
-function botTinymceEditorGetContents( $editorArea, $hiddenField ) {
-	return <<<EOD
-
-		tinyMCE.triggerSave();
-EOD;
-}
-/**
-* TinyMCE WYSIWYG Editor - display the editor
-* @param string The name of the editor area
-* @param string The content of the field
-* @param string The name of the form field
-* @param string The width of the editor area
-* @param string The height of the editor area
-* @param int The number of columns for the editor area
-* @param int The number of rows for the editor area
-*/
-function botTinymceEditorEditorArea( $name, $content, $hiddenField, $width, $height, $col, $row ) {
-	global $mosConfig_live_site, $_MAMBOTS;
-
-	$results = $_MAMBOTS->trigger( 'onCustomEditorButton' );
-	$buttons = array();
-	foreach ($results as $result) {
-	    $buttons[] = '<img src="'.$mosConfig_live_site.'/mambots/editors-xtd/'.$result[0].'" onclick="tinyMCE.execCommand(\'mceInsertContent\',false,\''.$result[1].'\')" />';
-	}
-	$buttons = implode( "", $buttons );
-
-	return <<<EOD
-
-<textarea id="$hiddenField" name="$hiddenField" cols="$col" rows="$row" style="width:{$width}px; height:{$height}px;" mce_editable="true">$content</textarea>
-<br />$buttons
-EOD;
-}
-?>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+$_MAMBOTS->registerFunction( 'onInitEditor', 'botTinymceEditorInit' );
+$_MAMBOTS->registerFunction( 'onGetEditorContents', 'botTinymceEditorGetContents' );
+$_MAMBOTS->registerFunction( 'onEditorArea', 'botTinymceEditorEditorArea' );
+
+/**
+* TinyMCE WYSIWYG Editor - javascript initialisation
+*/
+function botTinymceEditorInit() {
+	global $mosConfig_live_site, $database, $mosConfig_absolute_path;
+
+	// load tinymce info
+	$query = "SELECT id FROM #__mambots WHERE element = 'tinymce' AND folder = 'editors'";
+	$database->setQuery( $query );
+	$id = $database->loadResult();
+	$mambot = new mosMambot( $database );
+	$mambot->load( $id );
+	$params =& new mosParameters( $mambot->params );
+
+	$theme = $params->get( 'theme', 'advanced' );
+	// Check for old default option and set to advanced
+	if ($theme == 'default' ) {
+		$theme = 'simple';
+	}
+
+ 	$toolbar 			= $params->def( 'toolbar', 'top' );
+ 	$html_height		= $params->def( 'html_height', '550' );
+ 	$html_width			= $params->def( 'html_width', '750' );
+ 	$text_direction		= $params->def( 'text_direction', 'ltr' );
+	$content_css		= $params->def( 'content_css', 1 );
+ 	$content_css_custom	= $params->def( 'content_css_custom', '' );
+ 	$invalid_elements	= $params->def( 'invalid_elements', 'script,object,applet,iframe' );
+ 	$newlines			= $params->def( 'newlines', 'false' );
+ 	
+ 	if ( $content_css ) {
+ 		$query = "SELECT template FROM #__templates_menu WHERE client_id='0' AND menuid='0'";
+ 		$database->setQuery( $query );
+ 		$template 		= $database->loadResult();
+ 		$content_css	= 'content_css : "'. $mosConfig_live_site .'/templates/'. $template .'/css/template_css.css"';
+ 	} else {
+ 		if ( $content_css_custom ) {
+ 			$content_css = 'content_css : "'. $content_css_custom .'"';
+ 		} else {
+ 			$content_css = '';
+ 		}
+ 	}
+ 	
+	return <<<EOD
+<script type="text/javascript" src="$mosConfig_live_site/mambots/editors/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript">
+	tinyMCE.init({
+		theme : "$theme",
+		language : "en",
+		mode : "specific_textareas",
+		remove_script_host : false,
+		relative_urls : false,
+		document_base_url : "$mosConfig_live_site/mambots/editors/tinymce/",
+ 		invalid_elements : "$invalid_elements",
+ 		theme_advanced_toolbar_location : "$toolbar",
+ 		theme_advanced_source_editor_height : "$html_height",
+		theme_advanced_source_editor_width : "$html_width",
+ 		directionality: "$text_direction",
+ 		force_br_newlines : "$newlines",
+ 		$content_css,		
+		debug : false
+	});
+</script>
+EOD;
+}
+/**
+* TinyMCE WYSIWYG Editor - copy editor contents to form field
+* @param string The name of the editor area
+* @param string The name of the form field
+*/
+function botTinymceEditorGetContents( $editorArea, $hiddenField ) {
+	return <<<EOD
+
+		tinyMCE.triggerSave();
+EOD;
+}
+/**
+* TinyMCE WYSIWYG Editor - display the editor
+* @param string The name of the editor area
+* @param string The content of the field
+* @param string The name of the form field
+* @param string The width of the editor area
+* @param string The height of the editor area
+* @param int The number of columns for the editor area
+* @param int The number of rows for the editor area
+*/
+function botTinymceEditorEditorArea( $name, $content, $hiddenField, $width, $height, $col, $row ) {
+	global $mosConfig_live_site, $_MAMBOTS;
+
+	$results = $_MAMBOTS->trigger( 'onCustomEditorButton' );
+	$buttons = array();
+	foreach ($results as $result) {
+	    $buttons[] = '<img src="'.$mosConfig_live_site.'/mambots/editors-xtd/'.$result[0].'" onclick="tinyMCE.execCommand(\'mceInsertContent\',false,\''.$result[1].'\')" />';
+	}
+	$buttons = implode( "", $buttons );
+
+	return <<<EOD
+
+<textarea id="$hiddenField" name="$hiddenField" cols="$col" rows="$row" style="width:{$width}px; height:{$height}px;" mce_editable="true">$content</textarea>
+<br />$buttons
+EOD;
+}
+?>
diff -ruN 4.5.4/mambots/editors/tinymce.xml 4.6rc2/mambots/editors/tinymce.xml
--- 4.5.4/mambots/editors/tinymce.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors/tinymce.xml	2006-04-30 13:23:50.000000000 -0500
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
-<mosinstall version="4.5.3" type="mambot" group="editors">
+<mosinstall version="4.6" type="mambot" group="editors">
     <name>TinyMCE</name>
-    <version>2.0.1</version>
-    <creationDate>Dec 2005</creationDate>
+    <version>2.0.5.1</version>
+    <creationDate>April 2006</creationDate>
     <author>Moxiecode Systems AB</author>
     <authorEmail>N/A</authorEmail>
     <authorUrl>tinymce.moxiecode.com/</authorUrl>
diff -ruN 4.5.4/mambots/editors-xtd/mosimage.btn.php 4.6rc2/mambots/editors-xtd/mosimage.btn.php
--- 4.5.4/mambots/editors-xtd/mosimage.btn.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors-xtd/mosimage.btn.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mosimage.btn.php,v 1.1 2005/07/22 01:57:50 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/mambots/editors-xtd/mosimage.btn.xml 4.6rc2/mambots/editors-xtd/mosimage.btn.xml
--- 4.5.4/mambots/editors-xtd/mosimage.btn.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors-xtd/mosimage.btn.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mosimage.btn</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Provides button to insert {mosimage} into content edit box</description>
 	<files>
diff -ruN 4.5.4/mambots/editors-xtd/mospage.btn.php 4.6rc2/mambots/editors-xtd/mospage.btn.php
--- 4.5.4/mambots/editors-xtd/mospage.btn.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors-xtd/mospage.btn.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mospage.btn.php,v 1.1 2005/07/22 01:57:50 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/mambots/editors-xtd/mospage.btn.xml 4.6rc2/mambots/editors-xtd/mospage.btn.xml
--- 4.5.4/mambots/editors-xtd/mospage.btn.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/editors-xtd/mospage.btn.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>mospage.btn</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Provides button to insert {mospagebreak} into content edit box</description>
 	<files>
diff -ruN 4.5.4/mambots/search/categories.searchbot.php 4.6rc2/mambots/search/categories.searchbot.php
--- 4.5.4/mambots/search/categories.searchbot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/categories.searchbot.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: categories.searchbot.php,v 1.1 2005/07/22 01:58:23 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -67,11 +69,11 @@
 	for ( $i = 0; $i < $count; $i++ ) {
 		if ( $rows[$i]->menutype == 'content_category' ) {
 			$rows[$i]->href = 'index.php?option=com_content&task=category&sectionid='. $rows[$i]->secid .'&id='. $rows[$i]->catid .'&Itemid='. $rows[$i]->menuid;
-			$rows[$i]->section 	= 'Category List';
+			$rows[$i]->section 	= T_('Category List');
 		}
 		if ( $rows[$i]->menutype == 'content_blog_category' ) {
 			$rows[$i]->href = 'index.php?option=com_content&task=blogcategory&id='. $rows[$i]->catid .'&Itemid='. $rows[$i]->menuid;
-			$rows[$i]->section 	= 'Category Blog';
+			$rows[$i]->section 	= T_('Category Blog');
 		}
 	}
 
diff -ruN 4.5.4/mambots/search/categories.searchbot.xml 4.6rc2/mambots/search/categories.searchbot.xml
--- 4.5.4/mambots/search/categories.searchbot.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/categories.searchbot.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>categories searchbot</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Allows Searching of Categories information</description>
 	<files>
diff -ruN 4.5.4/mambots/search/contacts.searchbot.php 4.6rc2/mambots/search/contacts.searchbot.php
--- 4.5.4/mambots/search/contacts.searchbot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/contacts.searchbot.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: contacts.searchbot.php,v 1.1 2005/07/22 01:58:25 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -29,7 +31,7 @@
 		return array();
 	}
 
-	$section = _CONTACT_TITLE;
+	$section = T_('Contact');
 
 	switch ( $ordering ) {
 		case 'alpha':
diff -ruN 4.5.4/mambots/search/contacts.searchbot.xml 4.6rc2/mambots/search/contacts.searchbot.xml
--- 4.5.4/mambots/search/contacts.searchbot.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/contacts.searchbot.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>contacts searchbot</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Allows Searching of Contacts Component</description>
 	<files>
diff -ruN 4.5.4/mambots/search/content.searchbot.php 4.6rc2/mambots/search/content.searchbot.php
--- 4.5.4/mambots/search/content.searchbot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/content.searchbot.php	2006-04-21 08:10:48.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: content.searchbot.php,v 1.2 2005/10/13 05:03:24 cauld Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -143,6 +145,12 @@
 	if ($list) $result = array_merge($result, $list);
 	if ($list2) $result = array_merge($result, $list2);
 	if ($list3) $result = array_merge($result, $list3);
+	$menuhandler = mosMenuHandler::getInstance();
+	foreach ($result as $key=>$item) {
+		$Itemid = $menuhandler->getIDLikeLink($item->href);
+		if ($Itemid == 0) $Itemid = 1;
+		if ($Itemid) $result[$key]->href = $item->href.'&Itemid='.$Itemid;
+	}
 	return $result;
 }
 ?>
diff -ruN 4.5.4/mambots/search/content.searchbot.xml 4.6rc2/mambots/search/content.searchbot.xml
--- 4.5.4/mambots/search/content.searchbot.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/content.searchbot.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>content searchbot</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Allows Searching of all Content items</description>
 	<files>
diff -ruN 4.5.4/mambots/search/newsfeeds.searchbot.php 4.6rc2/mambots/search/newsfeeds.searchbot.php
--- 4.5.4/mambots/search/newsfeeds.searchbot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/newsfeeds.searchbot.php	2006-05-14 16:46:22.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: newsfeeds.searchbot.php,v 1.1 2005/07/22 01:58:25 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -28,6 +30,9 @@
 	if ($text == '') {
 		return array();
 	}
+	
+	$menuhandler = mosMenuHandler::getInstance();
+	$Itemid = $menuhandler->getIDByTypeLink('*', 'index.php?option=com_newsfeeds');
 
 	$wheres = array();
 	switch ($phrase) {
@@ -72,9 +77,9 @@
 	$query = "SELECT a.name AS title,"
 	. "\n a.link AS text,"
 	. "\n '' AS created,"
-	. "\n CONCAT_WS( ' / ','Newsfeeds', b.title )AS section,"
+	. "\n CONCAT_WS( ' / ','News Feeds', b.title )AS section,"
 	. "\n '1' AS browsernav,"
-	. "\n CONCAT( 'index.php?option=com_newsfeeds&task=view&feedid=', a.id ) AS href"
+	. "\n CONCAT( 'index.php?option=com_newsfeeds&task=view&Itemid=$Itemid&feedid=', a.id ) AS href"
 	. "\n FROM #__newsfeeds AS a"
 	. "\n INNER JOIN #__categories AS b ON b.id = a.catid AND b.access <= '$my->gid'"
 	. "\n WHERE ( $where )"
diff -ruN 4.5.4/mambots/search/newsfeeds.searchbot.xml 4.6rc2/mambots/search/newsfeeds.searchbot.xml
--- 4.5.4/mambots/search/newsfeeds.searchbot.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/newsfeeds.searchbot.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>contacts searchbot</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Allows Searching of Newsfeeds</description>
 	<files>
diff -ruN 4.5.4/mambots/search/sections.searchbot.php 4.6rc2/mambots/search/sections.searchbot.php
--- 4.5.4/mambots/search/sections.searchbot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/sections.searchbot.php	2006-02-26 11:51:15.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: sections.searchbot.php,v 1.1 2005/07/22 01:58:25 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -63,11 +65,11 @@
 	for ( $i = 0; $i < $count; $i++ ) {
 		if ( $rows[$i]->menutype == 'content_section' ) {
 			$rows[$i]->href 	= 'index.php?option=com_content&task=section&id='. $rows[$i]->secid .'&Itemid='. $rows[$i]->menuid;
-			$rows[$i]->section 	= 'Section List';
+			$rows[$i]->section 	= T_('Section List');
 		}
 		if ( $rows[$i]->menutype == 'content_blog_section' ) {
 			$rows[$i]->href 	= 'index.php?option=com_content&task=blogsection&id='. $rows[$i]->secid .'&Itemid='. $rows[$i]->menuid;
-			$rows[$i]->section 	= 'Section Blog';
+			$rows[$i]->section 	= T_('Section Blog');
 		}
 	}
 	return $rows;
diff -ruN 4.5.4/mambots/search/sections.searchbot.xml 4.6rc2/mambots/search/sections.searchbot.xml
--- 4.5.4/mambots/search/sections.searchbot.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/sections.searchbot.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>sections searchbot</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Allows Searching of Content Section information</description>
 	<files>
diff -ruN 4.5.4/mambots/search/weblinks.searchbot.php 4.6rc2/mambots/search/weblinks.searchbot.php
--- 4.5.4/mambots/search/weblinks.searchbot.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/weblinks.searchbot.php	2006-05-14 15:48:05.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: weblinks.searchbot.php,v 1.1 2005/07/22 01:58:25 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -13,7 +15,7 @@
 $_MAMBOTS->registerFunction( 'onSearch', 'botSearchWeblinks' );
 
 /**
-* Weblink Search method
+* Web Link Search method
 *
 * The sql must return the following fields that are used in a common display
 * routine: href, title, section, created, text, browsernav
@@ -28,7 +30,7 @@
 	if ($text == '') {
 		return array();
 	}
-	$section 	= _WEBLINKS_TITLE;
+	$section 	= T_('Web Links');
 
 	$wheres 	= array();
 	switch ($phrase) {
diff -ruN 4.5.4/mambots/search/weblinks.searchbot.xml 4.6rc2/mambots/search/weblinks.searchbot.xml
--- 4.5.4/mambots/search/weblinks.searchbot.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/mambots/search/weblinks.searchbot.xml	2006-05-14 15:48:05.000000000 -0500
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <mosinstall version="4.5.2" type="mambot" group="search">
-	<name>weblinks searchbot</name>
+	<name>web links searchbot</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
-	<description>Allows Searching of Weblinks Component</description>
+	<description>Allows Searching of Web Links Component</description>
 	<files>
 		<filename mambot="weblinks.searchbot">weblinks.searchbot.php</filename>
 	</files>
diff -ruN 4.5.4/modules/custom.xml 4.6rc2/modules/custom.xml
--- 4.5.4/modules/custom.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/custom.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Custom Module</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Custom Module</description>
 	<params>
diff -ruN 4.5.4/modules/mod_archive.php 4.6rc2/modules/mod_archive.php
--- 4.5.4/modules/mod_archive.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_archive.php	2006-03-29 02:20:05.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_archive.php,v 1.1 2005/07/22 01:58:29 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -22,6 +24,8 @@
 . "\n GROUP BY created_year DESC, created_month DESC LIMIT $count";
 $database->setQuery( $query );
 $rows = $database->loadObjectList();
+
+if (is_array($rows)) {
 ?>
 <ul>
 <?php
@@ -41,3 +45,6 @@
 }
 ?>
 </ul>
+<?php
+}
+?>
diff -ruN 4.5.4/modules/mod_archive.xml 4.6rc2/modules/mod_archive.xml
--- 4.5.4/modules/mod_archive.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_archive.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Archived Content</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows a list of the calendar months, which contain Archived items. After you have changed the status of a Content Item to 'Archived' this list will be automatically generated.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_banners.php 4.6rc2/modules/mod_banners.php
--- 4.5.4/modules/mod_banners.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_banners.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_banners.php,v 1.1 2005/07/22 01:58:29 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -70,7 +72,7 @@
 			echo $banner->custombannercode;
 		} else if (eregi( "(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$", $banner->imageurl )) {
 			$imageurl = "$mosConfig_live_site/images/banners/$banner->imageurl";
-			echo "<a href=\"".sefRelToAbs("index.php?option=com_banners&amp;task=click&amp;bid=$banner->bid")."\" target=\"_blank\"><img src=\"$imageurl\" border=\"0\" alt=\"Advertisement\" /></a>";
+			echo "<a href=\"".sefRelToAbs("index.php?option=com_banners&amp;task=click&amp;bid=$banner->bid")."\" target=\"_blank\"><img src=\"$imageurl\" border=\"0\" alt=\"".T_('Advertisement')."\" /></a>";
 			
 		} else if (eregi("\.swf$", $banner->imageurl)) {
 			$imageurl = "$mosConfig_live_site/images/banners/".$banner->imageurl;
diff -ruN 4.5.4/modules/mod_banners.xml 4.6rc2/modules/mod_banners.xml
--- 4.5.4/modules/mod_banners.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_banners.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Banner</name>
 	<author>Mambo Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>The banner module allows to show the active banners out of the component within your site.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_latestcontent.php 4.6rc2/modules/mod_latestcontent.php
--- 4.5.4/modules/mod_latestcontent.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/modules/mod_latestcontent.php	2006-03-30 13:19:21.000000000 -0600
@@ -0,0 +1,243 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+global $mosConfig_offset, $mosConfig_live_site, $mainframe;
+
+$type 		= intval( $params->get( 'type', 1 ) );
+$count 		= intval( $params->get( 'count', 5 ) );
+$catid 		= trim( $params->get( 'catid' ) );
+$secid 		= trim( $params->get( 'secid' ) );
+$show_front	= $params->get( 'show_front', 1 );
+$class_sfx	= $params->get( 'moduleclass_sfx' );
+$style 		= $params->get( 'style' );
+$readmore 	= $params->get( 'readmore',0 );
+$image 		= $params->get( 'image' );
+
+$params->set( 'intro_only', 1 );
+$params->set( 'hide_author', 1 );
+$params->set( 'hide_createdate', 0 );
+$params->set( 'hide_modifydate', 1 );
+
+
+$now 		= date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
+
+$access = !$mainframe->getCfg( 'shownoauth' );
+
+// select between Content Items, Static Content or both
+switch ( $type ) {
+	case 2: //Static Content only
+		$query = "SELECT a.id, a.title"
+		. "\n FROM #__content AS a"
+		. "\n WHERE ( a.state = '1' AND a.checked_out = '0' AND a.sectionid = '0' )"
+		. "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+		. "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
+    	. ( $access ? "\n AND a.access <= '". $my->gid ."'" : '' )
+		. "\n ORDER BY a.created DESC LIMIT $count"
+		;
+		$database->setQuery( $query );
+		$rows = $database->loadObjectList();
+		break;
+
+	case 3: //Both
+		$query = "SELECT a.id, a.title, a.sectionid"
+		. "\n FROM #__content AS a"
+		. "\n WHERE ( a.state = '1' AND a.checked_out = '0' )"
+		. "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+		. "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
+    	. ( $access ? "\n AND a.access <= '". $my->gid ."'" : '' )
+		. "\n ORDER BY a.created DESC LIMIT $count"
+		;
+		$database->setQuery( $query );
+		$rows = $database->loadObjectList();
+		break;
+
+	case 1:  //Content Items only
+	default:
+		$query = "SELECT a.id, a.title, a.sectionid, a.catid"
+		. "\n FROM #__content AS a"
+		. "\n LEFT JOIN #__content_frontpage AS f ON f.content_id = a.id"
+		. "\n WHERE ( a.state = '1' AND a.checked_out = '0' AND a.sectionid > '0' )"
+		. "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+		. "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
+    	. ( $access ? "\n AND a.access <= '". $my->gid ."'" : '' )
+		. ( $catid ? "\n AND ( a.catid IN (". $catid .") )" : '' )
+		. ( $secid ? "\n AND ( a.sectionid IN (". $secid .") )" : '' )
+		. ( $show_front == "0" ? "\n AND f.content_id IS NULL" : '' )
+		. "\n ORDER BY a.created DESC LIMIT $count"
+		;
+		$database->setQuery( $query );
+		$rows = $database->loadObjectList();
+		break;
+}
+
+// needed to reduce queries used by getItemid for Content Items
+if ( ( $type == 1 ) || ( $type == 3 ) ) {
+	require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+	$handler =& new contentHandler();
+	$bs 	= $handler->getBlogSectionCount();
+	$bc 	= $handler->getBlogCategoryCount();
+	$gbs 	= $handler->getGlobalBlogSectionCount();
+}
+
+// Output
+
+$newrow = new mosContent( $database );
+
+if ($rows) {
+
+	switch ( $style ) {
+		case 'vert':
+			echo "\n<table class=\"moduletable" . $moduleclass_sfx . "\">\n";
+
+
+			foreach ( $rows as $row ) {
+				// get Itemid
+				switch ( $type ) {
+					case 2://Static Content only
+						$query = "SELECT id"
+						. "\n FROM #__menu"
+						. "\n WHERE type = 'content_typed'"
+						. "\n AND componentid = $row->id"
+						;
+						$database->setQuery( $query );
+						$Itemid = $database->loadResult();
+						break;
+
+					case 3://Both
+						if ( $row->sectionid ) {
+							$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
+						} else {
+							$query = "SELECT id"
+							. "\n FROM #__menu"
+							. "\n WHERE type = 'content_typed'"
+							. "\n AND componentid = $row->id"
+							;
+							$database->setQuery( $query );
+							$Itemid = $database->loadResult();
+						}
+						break;
+
+					case 1://Content Items only
+					default:
+						//$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
+						$query = "SELECT id"
+							. "\n FROM #__menu"
+							. "\n WHERE "
+							. "\n link LIKE '%task=section&id=".$row->sectionid."%'"
+							. "\n OR link LIKE '%sectionid=".$row->sectionid."%'"
+							;
+							$database->setQuery( $query );
+							$Itemid = $database->loadResult();
+						break;
+				}
+
+				// Blank itemid checker for SEF
+				/*
+				if ($Itemid == NULL) {
+					$Itemid = '';
+				} else {
+					$Itemid = '&amp;Itemid='. $Itemid;
+				}
+				*/
+
+				$link = sefRelToAbs( 'index.php?option=com_content&amp;task=view&amp;id='. $row->id . $Itemid);
+				echo "<tr>\n<td valign=top>\n";
+				//echo '<a href="'.$link.'">'.$row->title.'</a>'."\n";
+				$newrow->load( $row->id );
+				$newrow->text = $newrow->introtext;
+				$newrow->groups = '';
+				$ItemidCount = array('bc'=>$bc, 'bs'=>$bs, 'gbs'=>$gbs);
+				HTML_content::show( $newrow, $params, $access, 0, 'com_content',$ItemidCount);
+				//print_r($ItemidCount);
+				//echo '<a href="'.$link.'">Read More..</a>'."\n";
+				echo "<td>\n<tr>\n";
+			}
+			echo "</table>\n";
+		break;
+
+
+		case 'horiz':
+		default:
+
+			echo "\n<table class=\"moduletable" . $moduleclass_sfx . "\">\n";
+			echo "<tr>\n";
+			foreach ( $rows as $row ) {
+				// get Itemid
+				switch ( $type ) {
+					case 2://Static Content only
+						$query = "SELECT id"
+						. "\n FROM #__menu"
+						. "\n WHERE type = 'content_typed'"
+						. "\n AND componentid = $row->id"
+						;
+						$database->setQuery( $query );
+						$Itemid = $database->loadResult();
+						break;
+
+					case 3://Both
+						if ( $row->sectionid ) {
+							$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
+						} else {
+							$query = "SELECT id"
+							. "\n FROM #__menu"
+							. "\n WHERE type = 'content_typed'"
+							. "\n AND componentid = $row->id"
+							;
+							$database->setQuery( $query );
+							$Itemid = $database->loadResult();
+						}
+						break;
+
+					case 1://Content Items only
+					default:
+						//$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
+						$query = "SELECT id"
+							. "\n FROM #__menu"
+							. "\n WHERE "
+							. "\n link LIKE '%task=section&id=".$row->sectionid."%'"
+							. "\n OR link LIKE '%sectionid=".$row->sectionid."%'"
+							;
+							$database->setQuery( $query );
+							$Itemid = $database->loadResult();
+						break;
+				}
+
+				// Blank itemid checker for SEF
+				/*
+				if ($Itemid == NULL) {
+					$Itemid = '';
+				} else {
+					$Itemid = '&amp;Itemid='. $Itemid;
+				}
+				*/
+
+				$link = sefRelToAbs( 'index.php?option=com_content&amp;task=view&amp;id='. $row->id . $Itemid);
+				echo "<td valign=top>\n";
+				//echo '<a href="'.$link.'">'.$row->title.'</a>'."\n";
+				$newrow->load( $row->id );
+				$newrow->text = $newrow->introtext;
+				$newrow->groups = '';
+				$ItemidCount = array('bc'=>$bc, 'bs'=>$bs, 'gbs'=>$gbs);
+				//$params->set( 'readmore', 0 );
+				HTML_content::show( $newrow, $params, $access, 0, 'com_content', $ItemidCount);
+				//print_r($ItemidCount);
+				//echo '<a class="readon" href="'.$link.'">Read More..</a>'."\n";
+				echo "</td>\n";
+			}
+			echo "</tr>\n</table>\n";
+		break;
+	}
+
+}
+?>
\ No newline at end of file
diff -ruN 4.5.4/modules/mod_latestcontent.xml 4.6rc2/modules/mod_latestcontent.xml
--- 4.5.4/modules/mod_latestcontent.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/modules/mod_latestcontent.xml	2006-02-26 22:32:34.000000000 -0600
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="module" version="4.6">
+	<name>Latest Content</name>
+	<author>Mambo Foundation</author>
+	<creationDate>February 2006</creationDate>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
+	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
+	<authorEmail>adi@mambo-foundation.org</authorEmail>
+	<authorUrl>mambo-foundation.org</authorUrl>
+	<version>1.1</version>
+	<description>This module shows a list of content with intro text in vertical or horizontal of the most recently published Items that are still current (some may have expired even though they are the most recent). Items that are displayed on the Front Page Component are not included in the list.</description>
+	<files>
+		<filename module="mod_latestcontent">mod_latestcontent.php</filename>
+	</files>
+	<params>
+		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="A suffix to be applied to the css class of the module (table.moduletable), this allows individual module styling" />
+		<param name="@spacer" type="spacer" default="" label="" description="" />
+		<param name="cache" type="radio" default="0" label="Enable Cache" description="Select whether to cache the content of this module">
+			<option value="0">No</option>
+			<option value="1">Yes</option>
+		</param>
+		<param name="@spacer" type="spacer" default="" label="" description="" />
+		<param name="type" type="list" default="0" label="Module Mode" description="Allows you to control which type of Content to display in the module">
+			<option value="1">Content Items only</option>
+			<option value="2">Static Content only</option>
+			<option value="3">Both</option>
+		</param>
+		<param name="@spacer" type="spacer" default="" label="" description="" />
+		<param name="show_front" type="radio" default="1" label="Frontpage Items" description="Show/Hide items designated for the Frontpage - only works when in Content Items only mode">
+			<option value="1">show</option>
+			<option value="0">hide</option>
+		</param>
+		  <param name="readmore" type="radio" default="0" label="Read More" description="Show/Hide the Read More button">
+            <option value="0">Hide</option>
+            <option value="1">Show</option>
+        </param>
+		<param name="item_title" type="list" default="0" label="Item Title" description="Show item title">
+                <option value="0">No</option>
+                <option value="1">Yes</option>
+        </param>
+		<param name="image" type="radio" default="0" label="Show images" description="Display content item images">
+			<option value="1">Yes</option>
+			<option value="0">No</option>
+		</param>
+		<param name="style" type="list" default="random" label="Style" description="The style to display the content">
+		    <option value="horiz">Horizontal</option>
+		    <option value="vert">Vertical</option>
+		</param>
+		<param name="count" type="text" default="5" label="Count" description="The number of items to display (default 5)" />
+		<param name="catid" type="text" default="" label="Category ID" description="Selects items from a specific Category or set of Categories (to specify more than one Category, seperate with a comma , )." />
+		<param name="secid" type="text" default="" label="Section ID" description="Selects items from a specific Secion or set of Sections (to specify more than one Section, seperate with a comma , )." />
+	</params>
+</mosinstall>
diff -ruN 4.5.4/modules/mod_latestnews.php 4.6rc2/modules/mod_latestnews.php
--- 4.5.4/modules/mod_latestnews.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_latestnews.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,13 @@
 <?php
 /**
-* @version $Id: mod_latestnews.php,v 1.1 2005/07/22 01:58:29 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/
+*/ 
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -71,65 +73,61 @@
 		break;		
 }
 
-// needed to reduce queries used by getItemid for Content Items
-if ( ( $type == 1 ) || ( $type == 3 ) ) {
-	$bs 	= $mainframe->getBlogSectionCount();
-	$bc 	= $mainframe->getBlogCategoryCount();
-	$gbs 	= $mainframe->getGlobalBlogSectionCount();
-}
-
 // Output
 ?>
-<ul class="latestnews<?php echo $class_sfx; ?>">
+
 <?php
-foreach ( $rows as $row ) {
-	// get Itemid
-	switch ( $type ) {
-		case 2:
-			$query = "SELECT id"
-			. "\n FROM #__menu"
-			. "\n WHERE type = 'content_typed'"
-			. "\n AND componentid = $row->id"
-			;
-			$database->setQuery( $query );	
-			$Itemid = $database->loadResult();
-			break;
-			
-		case 3:
-			if ( $row->sectionid ) {
-				$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
-			} else {
-				$query = "SELECT id"
-				. "\n FROM #__menu"
-				. "\n WHERE type = 'content_typed'"
-				. "\n AND componentid = $row->id"
-				;
-				$database->setQuery( $query );	
-				$Itemid = $database->loadResult();				
-			}
-			break;
-
-		case 1:
-		default:
-			$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
-			break;
+if (is_array($rows)) {
+	// needed to reduce queries used by getItemid for Content Items
+	if ( ( $type == 1 ) || ( $type == 3 ) ) {
+		require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+		$handler =& new contentHandler();
+		$bs 	= $handler->getBlogSectionCount();
+		$bc 	= $handler->getBlogCategoryCount();
+		$gbs 	= $handler->getGlobalBlogSectionCount();
 	}
 	
-	// Blank itemid checker for SEF
-	if ($Itemid == NULL) {
-		$Itemid = '';
-	} else {
-		$Itemid = '&amp;Itemid='. $Itemid;
+	$menuhandler =& mosMenuHandler::getInstance();
+	
+	echo '<ul class="latestnews'.$class_sfx.'">';
+	
+	foreach ( $rows as $row ) {
+		// get Itemid
+		switch ( $type ) {
+			case 2:
+				$Itemid = $menuhandler->getIDByTypeCid ('content_typed', $row->id);
+				break;
+				
+			case 3:
+				if ( $row->sectionid ) {
+					$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
+				}
+				else $Itemid = $menuhandler->getIDByTypeCid ('content_typed', $row->id);
+				break;
+
+			case 1:
+			default:
+				$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
+				break;
+		}
+		
+		// Blank itemid checker for SEF
+		if ($Itemid == NULL) {
+			$Itemid = '';
+		} else {
+			$Itemid = '&amp;Itemid='. $Itemid;
+		}
+		
+		$link = sefRelToAbs( 'index.php?option=com_content&amp;task=view&amp;id='. $row->id . $Itemid );
+		?>
+		<li class="latestnews<?php echo $class_sfx; ?>">
+		<a href="<?php echo $link; ?>" class="latestnews<?php echo $class_sfx; ?>">
+		<?php echo $row->title; ?>
+		</a>
+		</li>
+		<?php
 	}
 	
-	$link = sefRelToAbs( 'index.php?option=com_content&amp;task=view&amp;id='. $row->id . $Itemid );
-	?>
-	<li class="latestnews<?php echo $class_sfx; ?>">
-	<a href="<?php echo $link; ?>" class="latestnews<?php echo $class_sfx; ?>">
-	<?php echo $row->title; ?>
-	</a>
-	</li>
-	<?php
+	echo '</ul>';
 }
-?>
-</ul>
\ No newline at end of file
+?>
\ No newline at end of file
diff -ruN 4.5.4/modules/mod_latestnews.xml 4.6rc2/modules/mod_latestnews.xml
--- 4.5.4/modules/mod_latestnews.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_latestnews.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Latest News</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows a list of the most recently published Items that are still current (some may have expired even though they are the most recent). Items that are displayed on the Front Page Component are not included in the list.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_login.php 4.6rc2/modules/mod_login.php
--- 4.5.4/modules/mod_login.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_login.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,16 +1,20 @@
 <?php
 /**
-* @version $Id: mod_login.php,v 1.1 2005/07/22 01:58:29 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-$return = mosGetParam( $_SERVER, 'REQUEST_URI', null );
+if (isset($_SERVER['QUERY_STRING']) AND $_SERVER['QUERY_STRING']) $return = 'index.php?'.$_SERVER['QUERY_STRING'];
+else $return = 'index.php';
+
 // converts & to &amp; for xtml compliance
 $return = str_replace( '&', '&amp;', $return );
 
@@ -24,7 +28,7 @@
 $name 		= $params->def( 'name', 1 );
 $greeting 	= $params->def( 'greeting', 1 );
 
-if ( $name ) {
+if ( $name AND $my->id ) {
 	$query = "SELECT name FROM #__users WHERE id = ". $my->id;
 	$database->setQuery( $query );
 	$name = $database->loadResult();
@@ -34,18 +38,18 @@
 
 if ( $my->id ) {
 	?>
-	<form action="<?php echo sefRelToAbs( 'index.php?option=logout' ); ?>" method="post" name="login" >
+	<form action="<?php echo sefRelToAbs('index.php'); ?>" method="post" name="login" >
 	<?php
 	if ( $greeting ) {
-		echo _HI;
-		echo $name;
+	    printf(T_('Hi, %s'), $name);
 	}
 	?>
 	<br />
 	<div align="center">
-	<input type="submit" name="Submit" class="button" value="<?php echo _BUTTON_LOGOUT; ?>" />
+	<input type="submit" class="button" value="<?php echo T_('Logout'); ?>" />
 	</div>
 
+	<input type="hidden" name="option" value="logout" />
 	<input type="hidden" name="op2" value="logout" />
 	<input type="hidden" name="lang" value="<?php echo $mosConfig_lang; ?>" />
 	<input type="hidden" name="return" value="<?php echo sefRelToAbs( $logout ); ?>" />
@@ -54,32 +58,32 @@
 	<?php
 } else {
 	?>
-	<form action="<?php echo sefRelToAbs( 'index.php' ); ?>" method="post" name="login" >
+	<form action="<?php echo sefRelToAbs('index.php'); ?>" method="post" name="login" >
 	<?php
 	echo $pretext;
 	?>
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
 	<tr>
 		<td>
-		<?php echo _USERNAME; ?>
+		<?php echo T_('Username'); ?>
 		<br />
-		<input name="username" type="text" class="inputbox" alt="username" size="10" />
+		<input name="username" type="text" class="inputbox" alt="<?php echo T_('username') ?>" size="10" />
 		<br />
-		<?php echo _PASSWORD; ?>
+		<?php echo T_('Password'); ?>
 		<br />
-		<input type="password" name="passwd" class="inputbox" size="10" alt="password" />
+		<input type="password" name="passwd" class="inputbox" size="10" alt="<?php echo T_('password') ?>" />
 		<br />
-		<input type="checkbox" name="remember" class="inputbox" value="yes" alt="Remember Me" /> 
-		<?php echo _REMEMBER_ME; ?>
+		<input type="checkbox" name="remember" class="inputbox" value="yes" alt="<?php echo T_('Remember Me'); ?>" /> 
+		<?php echo T_('Remember me'); ?>
 		<br />
 		<input type="hidden" name="option" value="login" />
-		<input type="submit" name="Submit" class="button" value="<?php echo _BUTTON_LOGIN; ?>" />
+		<input type="submit" name="Submit" class="button" value="<?php echo T_('Login'); ?>" />
 		</td>
 	</tr>
 	<tr>
 		<td>
 		<a href="<?php echo sefRelToAbs( 'index.php?option=com_registration&amp;task=lostPassword' ); ?>">
-		<?php echo _LOST_PASSWORD; ?>
+		<?php echo T_('Password Reminder'); ?>
 		</a>
 		</td>
 	</tr>
@@ -88,9 +92,9 @@
 		?>
 		<tr>
 			<td>
-			<?php echo _NO_ACCOUNT; ?>
+			<?php echo T_('No account yet?'); ?>
 			<a href="<?php echo sefRelToAbs( 'index.php?option=com_registration&amp;task=register' ); ?>">
-			<?php echo _CREATE_ACCOUNT; ?>
+			<?php echo T_('Create one'); ?>
 			</a>
 			</td>
 		</tr>
diff -ruN 4.5.4/modules/mod_login.xml 4.6rc2/modules/mod_login.xml
--- 4.5.4/modules/mod_login.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_login.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Login Form</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module displays a Username and Password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled, (refer to the Configuration settings), then another link will be shown to invite users to self-register.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_mainmenu.php 4.6rc2/modules/mod_mainmenu.php
--- 4.5.4/modules/mod_mainmenu.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_mainmenu.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,309 +1,18 @@
 <?php
 /**
-* @version $Id: mod_mainmenu.php,v 1.2 2005/08/02 08:21:53 akede Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
-if (!defined( '_MOS_MAINMENU_MODULE' )) {
-	/** ensure that functions are declared only once */
-	define( '_MOS_MAINMENU_MODULE', 1 );
-
-	/**
-	* Utility function for writing a menu link
-	*/
-	function mosGetMenuLink( $mitem, $level=0, &$params ) {
-		global $Itemid, $mosConfig_live_site, $mainframe;
-		$txt = '';
-
-		switch ($mitem->type) {
-			case 'separator':
-			case 'component_item_link':
-			break;
-			case 'content_item_link':
-			$temp = split("&task=view&id=", $mitem->link);
-			$mitem->link .= '&Itemid='. $mainframe->getItemid($temp[1]);
-			break;
-			case 'url':
-			if ( eregi( 'index.php\?', $mitem->link ) ) {
-				if ( !eregi( 'Itemid=', $mitem->link ) ) {
-					$mitem->link .= '&Itemid='. $mitem->id;
-				}
-			}
-			break;
-			case 'content_typed':
-			default:
-			$mitem->link .= '&Itemid='. $mitem->id;
-			break;
-		}
-
-		// Active Menu highlighting
-		$current_itemid = $Itemid;
-		if ( !$current_itemid ) {
-			$id = '';
-		} else if ( $current_itemid == $mitem->id ) {
-			$id = 'id="active_menu'. $params->get( 'class_sfx' ) .'"';
-		} else {
-			$id = '';
-		}
-
-		$mitem->link = ampReplace( $mitem->link );
-
-		if ( strcasecmp( substr( $mitem->link,0,4 ), 'http' ) ) {
-			$mitem->link = sefRelToAbs( $mitem->link );
-		}
-
-		$menuclass = 'mainlevel'. $params->get( 'class_sfx' );
-		if ($level > 0) {
-			$menuclass = 'sublevel'. $params->get( 'class_sfx');
-		}
-
-		switch ($mitem->browserNav) {
-			// cases are slightly different
-			case 1:
-			// open in a new window
-			$txt = '<a href="'. $mitem->link .'" target="_blank" class="'. $menuclass .'" '. $id .'>'. $mitem->name .'</a>';
-			break;
-
-			case 2:
-			// open in a popup window
-			$txt = "<a href=\"#\" onclick=\"javascript: window.open('". $mitem->link ."', '', 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550'); return false\" class=\"$menuclass\" ". $id .">". $mitem->name ."</a>\n";
-			break;
-
-			case 3:
-			// don't link it
-			$txt = '<span class="'. $menuclass .'" '. $id .'>'. $mitem->name .'</span>';
-			break;
-
-			default:	// formerly case 2
-			// open in parent window
-			$txt = '<a href="'. $mitem->link .'" class="'. $menuclass .'" '. $id .'>'. $mitem->name .'</a>';
-			break;
-		}
-
-		if ( $params->get( 'menu_images' ) ) {
-			$menu_params = new stdClass();
-			$menu_params =& new mosParameters( $mitem->params );
-			$menu_image = $menu_params->def( 'menu_image', -1 );
-			if ( ( $menu_image <> '-1' ) && $menu_image ) {
-				$image = '<img src="'. $mosConfig_live_site .'/images/stories/'. $menu_image .'" border="0" alt="'. $mitem->name .'"/>';
-				if ( $params->get( 'menu_images_align' ) ) {
-					$txt = $txt .' '. $image;
-				} else {
-					$txt = $image .' '. $txt;
-				}
-			}
-		}
-
-		return $txt;
-	}
-
-	/**
-	* Vertically Indented Menu
-	*/
-	function mosShowVIMenu(  &$params ) {
-		global $database, $my, $cur_template, $Itemid;
-		global $mosConfig_absolute_path, $mosConfig_live_site, $mosConfig_shownoauth;
-
-		/* If a user has signed in, get their user type */
-		$intUserType = 0;
-		if($my->gid){
-			switch ($my->usertype) {
-				case 'Super Administrator':
-				$intUserType = 0;
-				break;
-				case 'Administrator':
-				$intUserType = 1;
-				break;
-				case 'Editor':
-				$intUserType = 2;
-				break;
-				case 'Registered':
-				$intUserType = 3;
-				break;
-				case 'Author':
-				$intUserType = 4;
-				break;
-				case 'Publisher':
-				$intUserType = 5;
-				break;
-				case 'Manager':
-				$intUserType = 6;
-				break;
-			}
-		} else {
-			/* user isn't logged in so make their usertype 0 */
-			$intUserType = 0;
-		}
-
-		if ($mosConfig_shownoauth) {
-			$sql = "SELECT m.* FROM #__menu AS m"
-			. "\nWHERE menutype='". $params->get( 'menutype' ) ."' AND published='1'"
-			. "\nORDER BY parent,ordering";
-		} else {
-			$sql = "SELECT m.* FROM #__menu AS m"
-			. "\nWHERE menutype='". $params->get( 'menutype' ) ."' AND published='1' AND access <= '$my->gid'"
-			. "\nORDER BY parent,ordering";
-		}
-		$database->setQuery( $sql );
-		$rows = $database->loadObjectList( 'id' );
-
-		// indent icons
-		switch ( $params->get( 'indent_image' ) ) {
-			case '1':
-			// Default images
-			$imgpath = $mosConfig_live_site .'/images/M_images';
-			for ( $i = 1; $i < 7; $i++ ) {
-				$img[$i] = '<img src="'. $imgpath .'/indent'. $i .'.png" alt="" />';
-			}
-			break;
-			case '2':
-			// Use Params
-			$imgpath = $mosConfig_live_site .'/images/M_images';
-			for ( $i = 1; $i < 7; $i++ ) {
-				if ( $params->get( 'indent_image'. $i ) == '-1' ) {
-					$img[$i] = NULL;
-				} else {
-					$img[$i] = '<img src="'. $imgpath .'/'. $params->get( 'indent_image'. $i ) .'" alt="" />';
-				}
-			}
-			break;
-			case '3':
-			// None
-			for ( $i = 1; $i < 7; $i++ ) {
-				$img[$i] = NULL;
-			}
-			break;
-			default:
-			// Template
-			$imgpath = $mosConfig_live_site .'/templates/'. $cur_template .'/images';
-			for ( $i = 1; $i < 7; $i++ ) {
-				$img[$i] = '<img src="'. $imgpath .'/indent'. $i .'.png" alt="" />';
-			}
-			break;
-		}
-
-		$indents = array(
-		// block prefix / item prefix / item suffix / block suffix
-		array( '<table width="100%" border="0" cellpadding="0" cellspacing="0">', '<tr align="left"><td>' , '</td></tr>', '</table>' ),
-		array( '', '<div style="padding-left: 4px">'. $img[1] , '</div>', '' ),
-		array( '', '<div style="padding-left: 8px">'. $img[2] , '</div>', '' ),
-		array( '', '<div style="padding-left: 12px">'. $img[3] , '</div>', '' ),
-		array( '', '<div style="padding-left: 16px">'. $img[4] , '</div>', '' ),
-		array( '', '<div style="padding-left: 20px">'. $img[5] , '</div>', '' ),
-		array( '', '<div style="padding-left: 24px">'. $img[6] , '</div>', '' ),
-		);
-
-		// establish the hierarchy of the menu
-		$children = array();
-		// first pass - collect children
-		foreach ($rows as $v ) {
-			$pt = $v->parent;
-			$list = @$children[$pt] ? $children[$pt] : array();
-			array_push( $list, $v );
-			$children[$pt] = $list;
-		}
-
-		// second pass - collect 'open' menus
-		$open = array( $Itemid );
-		$count = 20; // maximum levels - to prevent runaway loop
-		$id = $Itemid;
-		while (--$count) {
-			if (isset($rows[$id]) && $rows[$id]->parent > 0) {
-				$id = $rows[$id]->parent;
-				$open[] = $id;
-			} else {
-				break;
-			}
-		}
-		mosRecurseVIMenu( 0, 0, $children, $open, $indents, $params );
-
-	}
-
-	/**
-	* Utility function to recursively work through a vertically indented
-	* hierarchial menu
-	*/
-	function mosRecurseVIMenu( $id, $level, &$children, &$open, &$indents, &$params ) {
-		global $Itemid;
-		if (@$children[$id]) {
-			$n = min( $level, count( $indents )-1 );
-
-			echo "\n".$indents[$n][0];
-			foreach ($children[$id] as $row) {
-
-				echo "\n".$indents[$n][1];
-
-				echo mosGetMenuLink( $row, $level, $params );
-
-				// show menu with menu expanded - submenus visible
-				if ( !$params->get( 'expand_menu' ) ) {
-					if ( in_array( $row->id, $open )) {
-						mosRecurseVIMenu( $row->id, $level+1, $children, $open, $indents, $params );
-					}
-				} else {
-					mosRecurseVIMenu( $row->id, $level+1, $children, $open, $indents, $params );
-				}
-				echo $indents[$n][2];
-			}
-			echo "\n".$indents[$n][3];
-		}
-	}
-
-	/**
-	* Draws a horizontal 'flat' style menu (very simple case)
-	*/
-	function mosShowHFMenu(  &$params, $style=0 ) {
-		global $database, $my, $cur_template, $Itemid;
-		global $mosConfig_absolute_path, $mosConfig_shownoauth;
-
-		if ($mosConfig_shownoauth) {
-			$sql = "SELECT m.* FROM #__menu AS m"
-			. "\nWHERE menutype='". $params->get( 'menutype' ) ."' AND published='1' AND parent='0'"
-			. "\nORDER BY ordering";
-		} else {
-			$sql = "SELECT m.* FROM #__menu AS m"
-			. "\nWHERE menutype='". $params->get( 'menutype' ) ."' AND published='1' AND access <= '$my->gid' AND parent='0'"
-			. "\nORDER BY ordering";
-		}
-		$database->setQuery( $sql );
-
-		$rows = $database->loadObjectList( 'id' );
-
-		$links = array();
-		foreach ($rows as $row) {
-			$links[] = mosGetMenuLink( $row, 0, $params );
-		}
-
-		$menuclass = 'mainlevel'. $params->get( 'class_sfx' );
-		if (count( $links )) {
-			switch ($style) {
-				case 1:
-				echo '<ul id="'. $menuclass .'">';
-				foreach ($links as $link) {
-					echo '<li>' . $link . '</li>';
-				}
-				echo '</ul>';
-				break;
-				default:
-				echo '<table width="100%" border="0" cellpadding="0" cellspacing="1">';
-				echo '<tr>';
-				echo '<td nowrap="nowrap">';
-				echo '<span class="'. $menuclass .'"> '. $params->get( 'end_spacer' ) .' </span>';
-				echo implode( '<span class="'. $menuclass .'"> '. $params->get( 'spacer' ) .' </span>', $links );
-				echo '<span class="'. $menuclass .'"> '. $params->get( 'end_spacer' ) .' </span>';
-				echo '</td></tr>';
-				echo '</table>';
-				break;
-			}
-		}
-	}
-}
+$menuhandler =& mosMenuHandler::getInstance();
 $params->def( 'menutype', 'mainmenu' );
 $params->def( 'class_sfx', '' );
 $params->def( 'menu_images', 0 );
@@ -323,15 +32,15 @@
 
 switch ( $menu_style ) {
 	case 'list_flat':
-	mosShowHFMenu( $params, 1 );
+	$menuhandler->mosShowHFMenu( $params, 1 );
 	break;
 
 	case 'horiz_flat':
-	mosShowHFMenu( $params, 0 );
+	$menuhandler->mosShowHFMenu( $params, 0 );
 	break;
 
 	default:
-	mosShowVIMenu( $params );
+	$menuhandler->mosShowVIMenu( $params );
 	break;
 }
 ?>
diff -ruN 4.5.4/modules/mod_mainmenu.xml 4.6rc2/modules/mod_mainmenu.xml
--- 4.5.4/modules/mod_mainmenu.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_mainmenu.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Main Menu</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>Displays a menu.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_mostread.php 4.6rc2/modules/mod_mostread.php
--- 4.5.4/modules/mod_mostread.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_mostread.php	2006-03-08 11:50:42.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_mostread.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -73,40 +75,30 @@
 
 // needed to reduce queries used by getItemid for Content Items
 if ( ( $type == 1 ) || ( $type == 3 ) ) {
-	$bs 	= $mainframe->getBlogSectionCount();
-	$bc 	= $mainframe->getBlogCategoryCount();
-	$gbs 	= $mainframe->getGlobalBlogSectionCount();
+	require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+	$handler =& new contentHandler();
+	$bs 	= $handler->getBlogSectionCount();
+	$bc 	= $handler->getBlogCategoryCount();
+	$gbs 	= $handler->getGlobalBlogSectionCount();
 }
 
 // Output
 ?>
 <ul class="mostread<?php echo $class_sfx; ?>">
 <?php
-foreach ($rows as $row) {
+$menuhandler =& mosMenuHandler::getInstance();
+if ($rows) foreach ($rows as $row) {
 	// get Itemid
 	switch ( $type ) {
 		case 2:
-			$query = "SELECT id"
-			. "\n FROM #__menu"
-			. "\n WHERE type = 'content_typed'"
-			. "\n AND componentid = $row->id"
-			;
-			$database->setQuery( $query );	
-			$Itemid = $database->loadResult();
+			$Itemid = $menuhandler->getIDByTypeCid ('content_typed', $row->id);
 			break;
 			
 		case 3:
 			if ( $row->sectionid ) {
 				$Itemid = $mainframe->getItemid( $row->id, 0, 0, $bs, $bc, $gbs );
-			} else {
-				$query = "SELECT id"
-				. "\n FROM #__menu"
-				. "\n WHERE type = 'content_typed'"
-				. "\n AND componentid = $row->id"
-				;
-				$database->setQuery( $query );	
-				$Itemid = $database->loadResult();				
 			}
+			else $Itemid = $menuhandler->getIDByTypeCid ('content_typed', $row->id);
 			break;
 
 		case 1:
@@ -132,4 +124,4 @@
  	<?php
 }
 ?>
-</ul>
\ No newline at end of file
+</ul>
diff -ruN 4.5.4/modules/mod_mostread.xml 4.6rc2/modules/mod_mostread.xml
--- 4.5.4/modules/mod_mostread.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_mostread.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Most Read Content</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows a list of the currently published Items that have been viewed the most - determined by the number of times the page has been viewed.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_newsflash.php 4.6rc2/modules/mod_newsflash.php
--- 4.5.4/modules/mod_newsflash.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_newsflash.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_newsflash.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -11,6 +13,7 @@
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
 
 require_once( $mainframe->getPath( 'front_html', 'com_content') );
+require_once($mosConfig_absolute_path.'/components/com_content/content.class.php');
 
 global $my, $mosConfig_shownoauth, $mosConfig_offset, $acl;
 
diff -ruN 4.5.4/modules/mod_newsflash.xml 4.6rc2/modules/mod_newsflash.xml
--- 4.5.4/modules/mod_newsflash.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_newsflash.xml	2006-03-06 20:26:20.000000000 -0600
@@ -3,17 +3,17 @@
 	<name>Newsflash</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>The Newsflash module randomly selects one of the published items from a category upon each page refresh.  It may also dislpay multiple items in horizontal or vertical configurations.</description>
 	<files>
 		<filename module="mod_newsflash">mod_newsflash.php</filename>
 	</files>
 	<params>
-		<param name="catid" type="mos_category" default="0" label="Category" description="A content cateogry" />
+		<param name="catid" type="mos_category" default="0" label="Category" description="A content category" />
 		<param name="style" type="list" default="random" label="Style" description="The style to display the category">
 		    <option value="random">Randomly choose one at a time</option>
 		    <option value="horiz">Horizontal</option>
@@ -41,6 +41,6 @@
 			<option value="0">No</option>
 			<option value="1">Yes</option>
 		</param>
-		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="A suffix to be aapplied to the css class of the module (table.moduletable), this allows individual module styling" />
+		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="A suffix to be applied to the css class of the module (table.moduletable), this allows individual module styling" />
 	</params>
 </mosinstall>
diff -ruN 4.5.4/modules/mod_poll.php 4.6rc2/modules/mod_poll.php
--- 4.5.4/modules/mod_poll.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_poll.php	2006-03-08 11:50:42.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_poll.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -32,7 +34,7 @@
 			return;
 		}
 
-		foreach ($polls as $poll) {
+		if ($polls) foreach ($polls as $poll) {
 			if ($poll->id && $poll->title) {
 
 				$query = "SELECT id, text FROM #__poll_data"
@@ -80,8 +82,8 @@
 			</tr>
 			<tr>
 			  <td colspan="2" align="center">
-			  <input type="submit" name="task_button" class="button" value="<?php echo _BUTTON_VOTE; ?>" />&nbsp;&nbsp;
-			  <input type="button" name="option" class="button" value="<?php echo _BUTTON_RESULTS; ?>" onclick="document.location.href='<?php echo sefRelToAbs("index.php?option=com_poll&amp;task=results&amp;id=$poll->id"); ?>';" />
+			  <input type="submit" name="task_button" class="button" value="<?php echo T_('Vote'); ?>" />&nbsp;&nbsp;
+			  <input type="button" name="option" class="button" value="<?php echo T_('Results'); ?>" onclick="document.location.href='<?php echo sefRelToAbs("index.php?option=com_poll&amp;task=results&amp;id=$poll->id"); ?>';" />
 			  </td>
 			</tr>
 		</table>
diff -ruN 4.5.4/modules/mod_poll.xml 4.6rc2/modules/mod_poll.xml
--- 4.5.4/modules/mod_poll.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_poll.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Poll</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module compliments the Polls component. It is used to display the configured polls. The module differs from other modules in as much as the Component supports linking between Menu Items and Polls. This means that the module shows only those Polls, which are configured for a certain Menu Item.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_random_image.php 4.6rc2/modules/mod_random_image.php
--- 4.5.4/modules/mod_random_image.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_random_image.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_random_image.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/modules/mod_random_image.xml 4.6rc2/modules/mod_random_image.xml
--- 4.5.4/modules/mod_random_image.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_random_image.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Random Image</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module display a random image from your chosen directory</description>
 	<files>
@@ -15,7 +15,7 @@
 	<params>
 		<param name="type" type="text" default="jpg" label="Image Type" description="Type of image PNG/GIF/JPG etc. (default is JPG)" />
 		<param name="folder" type="text" default="" label="Image Folder" description="Path to the image folder relative to the site url, eg: images/stories" />
-		<param name="link" type="text" default="" label="Link" description="A URL to redirect to if image is clicked on, eg: http://www.mamboserver.com" />
+		<param name="link" type="text" default="" label="Link" description="A URL to redirect to if image is clicked on, eg: http://www.mambo-foundation.org" />
 		<param name="width" type="text" default="" label="Width (px)" description="Image width (forces all images to be displayed with this width)" />
 		<param name="height" type="text" default="" label="Height (px)" description="Image height (forces all images to be displayed with the height)" />
 		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="A suffix to be applied to the css class of the module (table.moduletable), this allows individual module styling" />
diff -ruN 4.5.4/modules/mod_related_items.php 4.6rc2/modules/mod_related_items.php
--- 4.5.4/modules/mod_related_items.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_related_items.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_related_items.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/modules/mod_related_items.xml 4.6rc2/modules/mod_related_items.xml
--- 4.5.4/modules/mod_related_items.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_related_items.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Related Items</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module displays other Content Items that are related to the Item currently displayed. These are based on the keywords Metadata. All the keywords of the current Content Item are searched against all the keywords of all other published items. For example, you may have an Item on 'Breeding Parrots' and you may have another on 'Hand Raising Black Cockatoos'. If you include the keyword 'parrot' in both Items, then the Related Items module will list the 'Breeding Parrots' Item when viewing 'Hand Raising Black Cockatoos' and vice-versa.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_rssfeed.php 4.6rc2/modules/mod_rssfeed.php
--- 4.5.4/modules/mod_rssfeed.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_rssfeed.php	2006-04-13 04:52:39.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_rssfeed.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @pacakge Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -28,6 +30,8 @@
 $t_path 			= $mosConfig_live_site .'/templates/'. $cur_template .'/images/';
 $d_path			= $mosConfig_live_site .'/images/M_images/';
 
+$mainframe =& mosMainFrame::getInstance();
+
 ?>
 
 <div class="syndicate<?php echo $moduleclass_sfx;?>">
@@ -45,7 +49,7 @@
 <?php
 // rss091 link
 if ( $rss091 ) {
-	$img = mosAdminMenus::ImageCheck( 'rss091.gif', '/images/M_images/', $rss091_image, '/images/M_images/', 'RSS 0.91' );
+	$img = $mainframe->ImageCheck( 'rss091.gif', '/images/M_images/', $rss091_image, '/images/M_images/', 'RSS 0.91' );
 	?>
 	<div align="center">
 	<a href="<?php echo $mosConfig_live_site ?>/index2.php?option=com_rss&amp;feed=RSS0.91&amp;no_html=1">
@@ -59,7 +63,7 @@
 <?php
 // rss10 link
 if ( $rss10 ) {
-	$img = mosAdminMenus::ImageCheck( 'rss10.gif', '/images/M_images/', $rss10_image, '/images/M_images/', 'RSS 1.0' );
+	$img = $mainframe->ImageCheck( 'rss10.gif', '/images/M_images/', $rss10_image, '/images/M_images/', 'RSS 1.0' );
 	?>
 	<div align="center">
 	<a href="<?php echo $mosConfig_live_site ?>/index2.php?option=com_rss&amp;feed=RSS1.0&amp;no_html=1">
@@ -73,7 +77,7 @@
 <?php
 // rss20 link
 if ( $rss20 ) {
-	$img = mosAdminMenus::ImageCheck( 'rss20.gif', '/images/M_images/', $rss20_image, '/images/M_images/', 'RSS 2.0' );
+	$img = $mainframe->ImageCheck( 'rss20.gif', '/images/M_images/', $rss20_image, '/images/M_images/', 'RSS 2.0' );
 	?>
 	<div align="center">
 	<a href="<?php echo $mosConfig_live_site ?>/index2.php?option=com_rss&amp;feed=RSS2.0&amp;no_html=1">
@@ -87,10 +91,10 @@
 <?php
 // atom link
 if ( $atom ) {
-	$img = mosAdminMenus::ImageCheck( 'atom03.gif', '/images/M_images/', $atom_image, '/images/M_images/', 'ATOM 0.3' );
+	$img = $mainframe->ImageCheck( 'atom10.gif', '/images/M_images/', $atom_image, '/images/M_images/', 'ATOM 1.0' );
 	?>
 	<div align="center">
-	<a href="<?php echo $mosConfig_live_site ?>/index2.php?option=com_rss&amp;feed=ATOM0.3&amp;no_html=1">
+	<a href="<?php echo $mosConfig_live_site ?>/index2.php?option=com_rss&amp;feed=ATOM1.0&amp;no_html=1">
 	<?php echo $img ?>
 	</a>
 	</div>
@@ -101,7 +105,7 @@
 <?php
 // opml link
 if ( $opml ) {
-	$img = mosAdminMenus::ImageCheck( 'opml.png', '/images/M_images/', $opml_image, '/images/M_images/', 'OPML' );
+	$img = $mainframe->ImageCheck( 'opml.png', '/images/M_images/', $opml_image, '/images/M_images/', 'OPML' );
 	?>
 	<div align="center">
 	<a href="<?php echo $mosConfig_live_site ?>/index2.php?option=com_rss&amp;feed=OPML&amp;no_html=1">
@@ -111,4 +115,4 @@
 	<?php
 }
 ?>
-</div>
\ No newline at end of file
+</div>
diff -ruN 4.5.4/modules/mod_rssfeed.xml 4.6rc2/modules/mod_rssfeed.xml
--- 4.5.4/modules/mod_rssfeed.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_rssfeed.xml	2006-04-13 04:52:39.000000000 -0500
@@ -3,10 +3,10 @@
 	<name>Syndicate</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>The Syndicate module will display a link whereby people can syndicate your site for all your latest news. When you click on the RSS icon, you will be redirected to a new page that will list all the latest news in XML format. In order to use the Newsfeed in another Mambo site or a Newsfeed reader, you need to cut and paste the URL.</description>
 	<files>
@@ -31,7 +31,7 @@
 			<option value="0">Hide</option>
 			<option value="1">Show</option>
 		</param>
-		<param name="atom" type="radio" default="1" label="Atom" description="Show/Hide Atom 0.3 Link">
+		<param name="atom" type="radio" default="1" label="Atom" description="Show/Hide Atom 1.0 Link">
 			<option value="0">Hide</option>
 			<option value="1">Show</option>
 		</param>
diff -ruN 4.5.4/modules/mod_search.php 4.6rc2/modules/mod_search.php
--- 4.5.4/modules/mod_search.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_search.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_search.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -12,12 +14,12 @@
 
 $button			= $params->get( 'button', '' );
 $button_pos		= $params->get( 'button_pos', 'left' );
-$button_text	= $params->get( 'button_text', _SEARCH_TITLE );
+$button_text	= $params->get( 'button_text', T_('Search') );
 $width 			= intval( $params->get( 'width', 20 ) );
-$text 			= $params->get( 'text', _SEARCH_BOX );
+$text 			= $params->get( 'text', T_('search...') );
 $moduleclass_sfx 	= $params->get( 'moduleclass_sfx' );
 
-$output = '<input alt="search" class="inputbox'. $moduleclass_sfx .'" type="text" name="searchword" size="'. $width .'" value="'. $text .'"  onblur="if(this.value==\'\') this.value=\''. $text .'\';" onfocus="if(this.value==\''. $text .'\') this.value=\'\';" />';
+$output = '<input alt="'.T_('search').'" class="inputbox'. $moduleclass_sfx .'" type="text" name="searchword" size="'. $width .'" value="'. $text .'"  onblur="if(this.value==\'\') this.value=\''. $text .'\';" onfocus="if(this.value==\''. $text .'\') this.value=\'\';" />';
 
 if ( $button ) {
 	$button = '<input type="submit" value="'. $button_text .'" class="button'. $moduleclass_sfx .'"/>';
@@ -45,11 +47,11 @@
 }
 ?>
 
-<form action="<?php echo sefRelToAbs("index.php"); ?>" method="post">
+<form action="<?php echo sefRelToAbs('index.php'); ?>" method="post">
 
 <div align="left" class="search<?php echo $moduleclass_sfx; ?>">	
 <?php echo $output; ?>
 </div>
 
 <input type="hidden" name="option" value="search" />
-</form>
\ No newline at end of file
+</form>
diff -ruN 4.5.4/modules/mod_search.xml 4.6rc2/modules/mod_search.xml
--- 4.5.4/modules/mod_search.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_search.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Search Module</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module will display a search box</description>
 	<files>
diff -ruN 4.5.4/modules/mod_sections.php 4.6rc2/modules/mod_sections.php
--- 4.5.4/modules/mod_sections.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_sections.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,11 +1,14 @@
 <?php
 /**
-* @version $Id: mod_sections.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
+
 global $mosConfig_offset;
 
 //** ensure this file is being included by a parent file */
diff -ruN 4.5.4/modules/mod_sections.xml 4.6rc2/modules/mod_sections.xml
--- 4.5.4/modules/mod_sections.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_sections.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,12 +3,12 @@
 	<name>Sections</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
-	<description>The Section module shows a list of all Sections configured in your database. The Sections refer here to the Item Sections only. If the configuration 'Show Unauthorized Links' is set, the list will be limited to the sections the user is allowed to see.</description>
+	<description>The Section module shows a list of all Sections configured in your database. The Sections refer here to the Item Sections only. If the configuration 'Show Unauthorized Links' is set to 'NO', the list will be limited to the sections the user is allowed to see.</description>
 	<files>
 	<filename module="mod_sections">mod_sections.php</filename>
 	</files>
diff -ruN 4.5.4/modules/mod_stats.php 4.6rc2/modules/mod_stats.php
--- 4.5.4/modules/mod_stats.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_stats.php	2006-05-14 15:48:05.000000000 -0500
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_stats.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -22,25 +24,25 @@
 	echo "<strong>OS:</strong> "  . substr(php_uname(),0,7) . "<br />\n";
 	echo "<strong>PHP:</strong> " .phpversion() . "<br />\n";
 	echo "<strong>MySQL:</strong> " .mysql_get_server_info() . "<br />\n";
-	echo "<strong>"._TIME_STAT.": </strong> " .date("H:i",time()+($mosConfig_offset*60*60)) . "<br />\n";
-	$c = $mosConfig_caching ? 'Enabled':'Disabled';
+	echo "<strong>".T_('Time').": </strong> " .date("H:i",time()+($mosConfig_offset*60*60)) . "<br />\n";
+	$c = $mosConfig_caching ? T_('Enabled'):T_('Disabled');
 	echo "<strong>Caching:</strong> " . $c . "<br />\n";
-	$z = $mosConfig_gzip ? 'Enabled':'Disabled';
+	$z = $mosConfig_gzip ? T_('Enabled'):T_('Disabled');
 	echo "<strong>GZIP:</strong> " . $z . "<br />\n";
 }
 
 if ($siteinfo) {
 	$query="SELECT count(id) AS count_users FROM #__users";
 	$database->setQuery($query);
-	echo "<strong>"._MEMBERS_STAT.":</strong> " .$database->loadResult() . "<br />\n";
+	echo "<strong>".T_('Members').":</strong> " .$database->loadResult() . "<br />\n";
 
 	$query="SELECT count(id) as count_items from #__content";
 	$database->setQuery($query);
-	echo "<strong>"._NEWS_STAT.":</strong> ".$database->loadResult() . "<br />\n";
+	echo "<strong>".T_('News').":</strong> ".$database->loadResult() . "<br />\n";
 
 	$query="SELECT count(id) as count_links FROM #__weblinks WHERE published='1'";
 	$database->setQuery($query);
-	echo "<strong>"._LINKS_STAT.":</strong> ".$database->loadResult() . "<br />\n";
+	echo "<strong>".T_('Web Links').":</strong> ".$database->loadResult() . "<br />\n";
 }
 
 if ($mosConfig_enable_stats) {
@@ -54,9 +56,9 @@
 		$hits = $hits + $increase;
 
 		if ($hits == NULL) {
-			$content .= "<strong>" . _VISITORS . ":</strong> 0\n";
+			$content .= "<strong>" . T_('Visitors') . ":</strong> 0\n";
 		} else {
-			$content .= "<strong>" . _VISITORS . ":</strong> " . $hits . "\n";
+			$content .= "<strong>" .  T_('Visitors') . ":</strong> " . $hits . "\n";
 		}
 	}
 }
diff -ruN 4.5.4/modules/mod_stats.xml 4.6rc2/modules/mod_stats.xml
--- 4.5.4/modules/mod_stats.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_stats.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Statistics</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>The Statistics module shows information about your server installation and statistics on the web site users, number of contents in your database, and number of web links you provide.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_templatechooser.php 4.6rc2/modules/mod_templatechooser.php
--- 4.5.4/modules/mod_templatechooser.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_templatechooser.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_templatechooser.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -72,5 +74,5 @@
 <?php
 echo mosHTML::selectList( $darray, 'mos_change_template', "class=\"button\" onchange=\"$onchange\"",'value', 'text', $cur_template );
 ?>
-<input class="button" type="submit" value="<?php echo _CMN_SELECT;?>" />
+<input class="button" type="submit" value="<?php echo T_('Select');?>" />
 </form>
diff -ruN 4.5.4/modules/mod_templatechooser.xml 4.6rc2/modules/mod_templatechooser.xml
--- 4.5.4/modules/mod_templatechooser.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_templatechooser.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Template Chooser</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>The Template Chooser module allows the user (visitor) to change the template on the fly from the front-end via a drop down selection list.</description>
 	<files>
diff -ruN 4.5.4/modules/mod_whosonline.php 4.6rc2/modules/mod_whosonline.php
--- 4.5.4/modules/mod_whosonline.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_whosonline.php	2006-02-20 21:47:49.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_whosonline.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
@@ -25,57 +27,16 @@
 	$user_array = $database->loadResult();
 
 	if ($guest_array<>0 && $user_array==0) {
-		if ($guest_array==1) {
-			$content.=_WE_HAVE;
-			$content.=_GUEST_COUNT;
-			$content.=_ONLINE;
-			eval ("\$content = \"$content\";");
-		} else {
-			$content.=_WE_HAVE;
-			$content.=_GUESTS_COUNT;
-			$content.=_ONLINE;
-			eval ("\$content = \"$content\";");
-		}
+		$content .= sprintf(Tdn_('frontend', 'We have %d guest online', 'We have %d guests online', $guest_array), $guest_array);
 	}
 
 	if ($guest_array==0 && $user_array<>0) {
-		if ($user_array==1) {
-			$content.=_WE_HAVE;
-			$content.=_MEMBER_COUNT;
-			$content.=_ONLINE;
-			eval ("\$content = \"$content\";");
-		} else {
-			$content.=_WE_HAVE;
-			$content.=_MEMBERS_COUNT;
-			$content.=_ONLINE;
-			eval ("\$content = \"$content\";");
-		}
+		$content .= sprintf(Tdn_('frontend','We have %d member online', 'We have %d members online', $user_array), $user_array);
 	}
 
 	if ($guest_array<>0 && $user_array<>0) {
-		if ($guest_array==1) {
-			$content.=_WE_HAVE;
-			$content.=_GUEST_COUNT;
-			$content.=_AND;
-			eval ("\$content = \"$content\";");
-		} else {
-			$content.=_WE_HAVE;
-			$content.=_GUESTS_COUNT;
-			$content.=_ONLINE;
-			$content.=_AND;
-			eval ("\$content = \"$content\";");
-		}
-
-		if ($user_array==1) {
-			$content.=_MEMBER_COUNT;
-			$content.=_ONLINE;
-			eval ("\$content = \"$content\";");
-		} else {
-			$content.=_MEMBERS_COUNT;
-			$content.=_ONLINE;
-			eval ("\$content = \"$content\";");
-		}
-
+	    $content .= sprintf(Tdn_('frontend','We have %d guest online and ', 'We have %d guests online and ', $guest_array), $guest_array);
+        $content .= sprintf(Tdn_('frontend',' %d member online', ' %d members online', $user_array), $user_array);
 	}
 }
 
@@ -85,14 +46,15 @@
 	."\n WHERE (a.guest=0)";
 	$database->setQuery($query);
 	$rows = $database->loadObjectList();
-	foreach($rows as $row) {
-		$content .= "<ul>\n";
-		$content .= "<li><strong>" . $row->username . "</strong></li>\n";
-		$content .= "</ul>\n";
+	if (is_array($rows)) {
+		foreach($rows as $row) {
+			$content .= "<ul>\n";
+			$content .= "<li><strong>" . $row->username . "</strong></li>\n";
+			$content .= "</ul>\n";
+		}
 	}
-
 	if ($content == "") {
-		echo _NONE ."\n";
+		echo Td_('frontend', 'No Users Online') ."\n";
 	}
 }
 ?>
\ No newline at end of file
diff -ruN 4.5.4/modules/mod_whosonline.xml 4.6rc2/modules/mod_whosonline.xml
--- 4.5.4/modules/mod_whosonline.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_whosonline.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Who's Online</name>
 	<author>Mambo Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>The Who's Online module displays the number of anonymous (that is, Guest) users and Registered users, (those that are logged in) that are currently accessing the web site.</description>
 	<files>
@@ -14,8 +14,8 @@
 	</files>
 	<params>
 	  <param name="showmode" type="radio" default="0" label="Display" description="Select what shall be shown">
-		<option value="0"># of Guests/Members&lt;br&gt;</option>
-		<option value="1">Member Names&lt;br&gt;</option>
+		<option value="0"># of Guests/Members</option>
+		<option value="1">Member Names</option>
 		<option value="2">Both</option>
 	  </param>
 	  <param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="A suffix to be applied to the css class of the module (table.moduletable), this allows individual module styling" />
diff -ruN 4.5.4/modules/mod_wrapper.php 4.6rc2/modules/mod_wrapper.php
--- 4.5.4/modules/mod_wrapper.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_wrapper.php	2006-02-16 15:43:38.000000000 -0600
@@ -1,9 +1,11 @@
 <?php
 /**
-* @version $Id: mod_wrapper.php,v 1.1 2005/07/22 01:58:30 eddieajau Exp $
-* @package Mambo_4.5.2
-* @copyright (C) 2000 - 2004 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/modules/mod_wrapper.xml 4.6rc2/modules/mod_wrapper.xml
--- 4.5.4/modules/mod_wrapper.xml	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/modules/mod_wrapper.xml	2006-03-01 13:18:50.000000000 -0600
@@ -3,10 +3,10 @@
 	<name>Wrapper Module</name>
 	<author>Mambo Project</author>
 	<creationDate>October 2004</creationDate>
-	<copyright>(C) 2000 - 2005 Miro International Pty Ltd</copyright>
+	<copyright>copyright (C) 2005 - 2006 Mambo Foundation Inc.</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<authorEmail>admin@mamboserver.com</authorEmail>
-	<authorUrl>www.mamboserver.com</authorUrl>
+	<authorEmail>core@mambo-foundation.org</authorEmail>
+	<authorUrl>www.mambo-foundation.org</authorUrl>
 	<version>4.5.2</version>
 	<description>This module shows an IFrame window to specified location</description>
 	<files>
diff -ruN 4.5.4/offline.php 4.6rc2/offline.php
--- 4.5.4/offline.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/offline.php	2006-05-20 15:57:10.000000000 -0500
@@ -1,83 +1,81 @@
-<?php
-/**
-* @version $Id: offline.php,v 1.1 2005/07/22 01:57:42 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-* Mambo is Free Software
-*/
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-@include_once ('language/'.$mosConfig_lang.'.php');
-
-$cur_template = 'rhuk_solarflare';
-
-// needed to seperate the ISO number from the language file constant _ISO
-$iso = split( '=', _ISO );
-// xml prolog
-echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
-global $mosConfig_live_site;
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php echo $mosConfig_sitename; ?> - Offline</title>
-<link rel="stylesheet" href="<?php echo $mosConfig_live_site; ?>/templates/<?php echo $cur_template;?>/css/template_css.css" type="text/css" />
-<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
-</head>
-<body>
-
-<p>&nbsp;</p>
-<table width="550" align="center" style="background-color: #ffffff; border: 1px solid">
-<tr>
-	<td width="60%" height="50" align="center">
-	<img src="<?php echo $mosConfig_live_site; ?>/images/logo.png" alt="Mambo Logo" align="middle" />
-	</td>
-</tr>
-<tr> 
-	<td align="center">
-	<h1>
-	<?php echo $mosConfig_sitename; ?>
-	</h1>
-	</td>
-</tr>
-<?php
-if ( $mosConfig_offline == 1 ) {
-	?>
-	<tr> 
-		<td width="39%" align="center">
-		<h2>
-		<?php echo $mosConfig_offline_message; ?>
-		</h2>
-		</td>
-	</tr>
-	<?php
-} else if (@$mosSystemError) {
-	?>
-	<tr> 
-		<td width="39%" align="center">
-		<h2>
-		<?php echo $mosConfig_error_message; ?>
-		</h2>
-		<?php echo $mosSystemError; ?>
-		</td>
-	</tr>
-	<?php
-} else {
-	?>
-	<tr> 
-		<td width="39%" align="center">
-		<h2>
-		<?php echo _INSTALL_WARN; ?>
-		</h2>
-		</td>
-	</tr>
-	<?php
-}
-?>
-</table>
-
-</body>
-</html>
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+//$mainframe = mosMainFrame::getInstance();
+
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = split( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php echo mamboCore::get('mosConfig_sitename'); ?> - <?php echo T_('Offline') ?></title>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+</head>
+<body>
+
+<p>&nbsp;</p>
+<table width="550" align="center" style="background-color: #ffffff; border: 1px solid">
+<tr>
+	<td width="60%" height="50" align="center">
+	<img src="<?php echo mamboCore::get('mosConfig_live_site'); ?>/images/logo.png" alt="<?php echo T_('Mambo Logo') ?>" align="middle" />
+	</td>
+</tr>
+<tr> 
+	<td align="center">
+	<h1>
+	<?php echo mamboCore::get('mosConfig_sitename'); ?>
+	</h1>
+	</td>
+</tr>
+<?php
+if ( mamboCore::get('mosConfig_offline') == 1 ) {
+	?>
+	<tr> 
+		<td width="39%" align="center">
+		<h2>
+		<?php echo mamboCore::get('mosConfig_offline_message'); ?>
+		</h2>
+		</td>
+	</tr>
+	<?php
+} else if (@$mosSystemError) {
+	?>
+	<tr> 
+		<td width="39%" align="center">
+		<h2>
+		<?php echo mamboCore::get('mosConfig_error_message'); ?>
+		</h2>
+		<?php echo $mosSystemError; ?>
+		</td>
+	</tr>
+	<?php
+} else {
+	?>
+	<tr> 
+		<td width="39%" align="center">
+		<h2>
+		<?php echo T_('For your security please completely remove the installation directory including all files and sub-folders  - then refresh this page'); ?>
+		</h2>
+		</td>
+	</tr>
+	<?php
+}
+?>
+</table>
+
+</body>
+</html>
diff -ruN 4.5.4/page404.php 4.6rc2/page404.php
--- 4.5.4/page404.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/page404.php	2006-02-16 15:43:38.000000000 -0600
@@ -0,0 +1,18 @@
+<?php
+/**
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
+* Mambo is Free Software
+*/ 
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+echo T_('The page you are trying to access does not exist.<br />Please select a page from the main menu.');
+echo '<br />'.T_('This is from page404.php');
+
+?>
diff -ruN 4.5.4/parameters/index.html 4.6rc2/parameters/index.html
--- 4.5.4/parameters/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/parameters/index.html	2006-02-07 12:03:58.000000000 -0600
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff -ruN 4.5.4/pathway.php 4.6rc2/pathway.php
--- 4.5.4/pathway.php	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/pathway.php	2006-04-02 15:07:50.000000000 -0500
@@ -1,9 +1,11 @@
-<?
+<?php
 /**
-* @version $Id: pathway.php,v 1.1 2005/07/22 01:57:42 eddieajau Exp $
-* @package Mambo
-* @copyright (C) 2000 - 2005 Miro International Pty Ltd
+* @package Mambo Open Source
+* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
 * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+* that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
 */
 
diff -ruN 4.5.4/templates/waterandstone/css/template_css.css 4.6rc2/templates/waterandstone/css/template_css.css
--- 4.5.4/templates/waterandstone/css/template_css.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/templates/waterandstone/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -307,13 +307,15 @@
 	background-color:inherit;
 }
 
-.sectiontableentry1 {
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
 	background-color: #EFEFEF;
 	padding: 2px;
 	color:#333333;
 }
 
-.sectiontableentry2 {
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
 	background-color: #FFFFFF;
 	padding: 2px;
 	color:#333333;
@@ -669,8 +671,7 @@
 /** generic menu item **/
 .mainlevel  {
 	display:block;
-	height:25px;
-	line-height:25px;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
 	padding-left:15px;
 	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
 	font-weight:bold;
@@ -806,7 +807,8 @@
 
  /*
 specific right column menu item. position:right
-you need to add menu class suffix: right
+you need to add menu class suffix: -right and
+module class suffix: -right
  */
 .mainlevel-right {
 	display:block;
Binary files 4.5.4/templates/waterandstone/images/bg_inside.jpg and 4.6rc2/templates/waterandstone/images/bg_inside.jpg differ
diff -ruN 4.5.4/templates/waterandstone800/css/template_css.css 4.6rc2/templates/waterandstone800/css/template_css.css
--- 4.5.4/templates/waterandstone800/css/template_css.css	2006-08-01 01:34:25.000000000 -0500
+++ 4.6rc2/templates/waterandstone800/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -315,14 +315,16 @@
 	background-color:inherit;
 }
 
-.sectiontableentry1 {
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
 	background-color: #EFEFEF;
 	padding: 2px;
 	color:#333333;
 	
 }
 
-.sectiontableentry2 {
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
 	background-color: #FFFFFF;
 	padding: 2px;
 	color:#333333;
@@ -693,10 +695,10 @@
 }
 
 /** generic menu item **/
+
 .mainlevel  {
 	display:block;
-	height:25px;
-	line-height:25px;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
 	padding-left:15px;
 	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
 	font-weight:bold;
@@ -740,7 +742,7 @@
 
 /** search field in search div **/
 .search .inputbox {
-	width:130px;
+	width:145px;
 	border: 1px solid #000000;
 }
 
@@ -834,7 +836,8 @@
 
  /*
 specific right column menu item. position:right
-you need to add menu class suffix: right
+you need to add menu class suffix: -right and
+module class suffix: -right
  */
 .mainlevel-right {
 	display:block;
diff -ruN 4.5.4/templates/waterandstone800_blue/css/template_css.css 4.6rc2/templates/waterandstone800_blue/css/template_css.css
--- 4.5.4/templates/waterandstone800_blue/css/template_css.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_blue/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,931 @@
+/* ---------------------
+basic layout
+--------------------- */
+
+* {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+.waterbody {
+	background:#F8F7F2 url(../images/bg_body.jpg) repeat-x left top;
+	margin:0;
+	color:#333333;
+}
+
+div,
+td,
+p {
+	font-size:12px;
+	line-height:18px;
+	color:#333333;
+}
+
+a,
+a:link,
+a:active,
+a:visited {
+	text-decoration:underline;
+	color:#000000;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+ul {
+	margin: 5px;
+	padding: 5px;
+	list-style: none;
+	list-style-type: square;
+}
+
+li {
+	line-height: 18px;
+	padding-left: 5px;
+	padding-top: 0px;
+	list-style-position: inside;
+}
+
+/** To center the objects **/
+.center {
+	text-align:center!important;
+}
+
+/** clear the banner to make it sit in the bottom **/
+.clear {
+	clear:both;
+}
+
+/* ---------------------
+template layout
+--------------------- */
+
+/** wrapper to make the page center **/
+#container {
+	width:760px;
+	margin: 55px auto;
+	padding:0;
+	text-align: left;
+}
+
+/**
+hold background, it should be float:left
+that's way we can not put it in #container
+**/
+#containerbg {
+	width: 760px;
+	background:transparent url(../images/bg_inside.jpg) repeat-y left top;
+	float:left;
+}
+
+#outerleft {
+	position:relative;
+	float:left;
+	clear:left;
+	width:590px;
+	
+}
+
+#outerright {
+	position:relative;
+	width:170px;
+	float:right;
+	clear:right;
+}
+
+#logo {
+	position:relative;
+	width:100%;
+	height:74px;
+	float:left;
+	background:#FFFFFF url(../images/bg_header.jpg) no-repeat left top;
+}
+
+/** div container for top menu. position:top **/
+#topmenu {
+	position:relative;
+	float:left;
+	clear:left;
+	background-color:#000000;
+	width: 100%;
+}
+
+/** div container for image header **/
+#imgheader {
+	position:relative;
+	float:left;
+	clear:left;
+	width:100%;
+	height:99px;
+	background-color: #000000;
+}
+
+#container_inner {
+	position:relative;
+	float:left;
+	clear:left;
+	width:590px;
+}
+
+/** div container for left column **/
+#leftcol {
+	position:relative;
+	float:left;
+	clear:left;
+	width:170px;
+}
+
+#leftcolmenu {
+	position:relative;
+	overflow:auto;
+}
+
+
+/** div wrapper for user2 & user3 **/
+#content_top_wrapper {
+	position:relative;
+	float:right;
+	clear:right;
+	width:405px;
+	display:inline;
+	margin: 4px 6px 0 0;
+}
+
+/** div container for position:user2 **/
+#content_top1 {
+	position:relative;
+	float:left;
+	clear:left;
+	width:200px;
+}
+
+/** div container for position:user3 **/
+#content_top2 {
+	position:relative;
+	float:right;
+	clear:right;
+	width:200px;
+}
+
+/** div container for mainbody **/
+#content_main {
+	position:relative;
+	float:left;
+	width:400px;
+	margin:10px 0 20px 10px;
+	background-color:#FFFFFF;
+	overflow:auto;
+	word-wrap:break-word;
+}
+
+/** div container for right column **/
+#rightcol_top,
+#rightcol {
+	float:left;
+	clear:left;
+	width:168px;
+	margin:0 0 0 1px;
+	display:inline;
+	overflow:auto;
+}
+
+/** div container for right column position:header **/
+#rightcol_top {
+	height:70px;
+	min-height:70px;
+	background:transparent url(../images/bg_topright.jpg) no-repeat center top;
+}
+
+/** div container for banner position:banner **/
+#banner {
+	position:relative;
+	clear:left;
+	float:left;
+	width:590px;
+	height:65px;
+	min-height:65px;
+	color:#FFFFFF;
+	font-size:9px;
+	background-color: #333333;
+	display:block;
+	text-align:center!important;
+	vertical-align:middle;
+	padding:5px 0 0 0;
+	margin-top:20px;
+}
+
+#blackline {
+	position:relative;
+	clear:left;
+	float:left;
+	width:590px;
+	height:10px;
+	min-height:10px;
+	background-color: #000000;
+	color:#FFFFFF;
+	font-size:10px;
+	margin-top:20px;
+}
+
+
+/** copyright **/
+#copyright {
+	position:relative;
+	width:760px;
+	display:block;
+	clear:both;
+	float:left;
+}
+
+#copyright div {
+	color:#666666;
+	font-size:10px;
+	font-weight:bold;
+	display:block!important;
+	width:760px;
+	float:left;
+	clear:left;
+	margin:-5px 0 0 0;
+	text-align:left;
+}
+
+
+/* ---------------------
+mambo content layout
+--------------------- */
+
+/** pathway block **/
+span.pathway {
+	display:block;
+	text-align:left;
+	color:#000000;
+	font-size:10px;
+	font-weight:bold;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #E5E5E5;
+	height:20px;
+	margin-bottom:10px;
+}
+
+/** content title **/
+.componentheading {
+	font-family:Georgia, "Times New Roman", Times, serif;
+	color:#000000;
+	font-size: 20px;
+	line-height:25px;
+	padding: 5px 0 5px 0;
+	display:block;
+}
+
+.contentheading,
+.contentpagetitle,
+a.contentpagetitle:link,
+a.contentpagetitle:active,
+a.contentpagetitle:visited {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size:16px;
+	color:#3973AC;
+	font-weight: bold;
+	padding-top: 25px;
+	background-color:inherit;
+	display:block;
+}
+
+.contentpaneopen {
+	width:100%;
+}
+
+
+.buttonheading {
+	width: 16px!important;
+	text-align:right;
+}
+
+
+td.sectiontableheader {
+	font-weight: bold;
+}
+
+.category, .categorytitle {
+	font-weight: bold;
+	color:#3973AC;
+	background-color:inherit;
+}
+
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
+	background-color: #FBFBF4;
+	padding: 2px;
+	color:#333333;
+	
+}
+
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
+	background-color: #FFFFFF;
+	padding: 2px;
+	color:#333333;
+}
+
+tr.sectiontableentry1 td,
+tr.sectiontableentry2 td {
+	word-wrap:break-word;
+}
+
+/** blog Styles **/
+.blogsection {
+	color:#3973AC;
+	background-color:inherit;
+}
+
+.blog_more {
+	font-weight: bold;
+	line-height: 25px;
+	padding-top: 20px;
+	color: #3973AC;
+	border-bottom: 1px solid #E5E5E5;
+	background-color:inherit;
+}
+
+/** small text in content **/
+.small {
+	color:#999999;
+	font-size:10px;
+	font-weight: bold;
+	background-color:inherit;
+}
+
+/** date info in content **/
+#content_main .createdate {
+	color:#4A87C4;
+	font-size:10px;
+	padding: 0 0 15px 0;
+	line-height:8px;
+	background-color:inherit;
+}
+
+#content_main .modifydate {
+	color:#999999;
+	font-size:10px;
+	padding: 0;
+	background-color:inherit;
+}
+
+
+
+/** toc page navigation  **/
+.pagenav_prev,
+.pagenav_next {
+	font-size:11px;
+}
+
+
+/** content item navigation  **/
+.pagenavbar  {
+	display:block;
+	width:100%;
+	background-color:inherit;
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999!important;
+	clear:both;
+	font-size: 11px!important;
+	margin-top: 10px;
+	background-image: url(../images/bg_pagenav.jpg);
+	background-repeat: repeat-x;
+	background-position: center bottom;	
+}
+
+.pagenav {
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999;
+	clear:both;
+	font-size: 11px;
+	margin-left: 0;
+	margin-right: 0;
+	background-color:inherit;
+	
+}
+
+.back_button {
+	display:block;
+	text-align:left;
+	font-weight:bold;
+	font-size:12px;
+	width:100%;
+	margin-bottom:10px;
+	letter-spacing:2px;
+}
+
+/** highlight word search result **/
+.highlight {
+	font-weight:bold;
+	background-color: #FFFF00;
+	padding: 2px 0 2px 0;
+	
+}
+
+/** table of content layout **/
+table.contenttoc {
+	border:1px solid #000000;
+	padding:1px;
+	display:block;
+	width:130px;
+	margin: 0 0 10px 10px;
+}
+
+/** table of content header **/
+.contenttoc th {
+	color:#FFFFFF;
+	background-color:#666666;
+	font-size:11px;
+	display:block;
+	width:124px;
+}
+
+/** unordered list for latest news module **/
+ul.latestnews li,ul.mostread li {
+    line-height: 18px;
+	font-size:11px;
+	font-weight:bold;
+	list-style-type: none;
+	list-style-position: outside;
+}
+
+
+/** fix opera table width for content list in table category**/
+table.contentpane td.contentdescription {
+	width:100%!important;
+}
+
+
+/* ---------------------
+Links
+--------------------- */
+
+/** any left column link **/
+#leftcol a:link,
+#leftcol a:active,
+#leftcol a:visited,
+#leftcolmenu a:link,
+#leftcolmenu a:active,
+#leftcolmenu a:visited
+ {
+	color:#FFFFFF;
+}
+
+a.pagenav:link ,
+a.pagenav_next:link,
+a.pagenav_pre:link,
+div.back_button a,
+div.back_button a:link,
+a.latestnews:link,
+a.latestnews:active,
+a.latestnews:visited,
+a.mostread:link,
+a.mostread:active,
+a.mostread:visited {
+	text-decoration:none;
+}
+
+/*** read more link ***/
+.readon,
+a.readon:link,
+a.readon:active,
+a.readon:visited {
+	color:#666666;
+	font-weight:bold;
+	text-align:left;
+	margin-top:10px;
+	letter-spacing: 2px;
+	font-size:10px;
+	text-decoration:none;
+}
+
+/*** blog links ***/
+a.blogsection:link,
+a.blogsection:active,
+a.blogsection:visited {
+	color:#3973AC;
+	text-decoration:none;
+}
+
+/** generic menu item link **/
+a.mainlevel:link,
+a.mainlevel:active,
+a.mainlevel:visited,
+a.sublevel:link,
+a.sublevel:active,
+a.sublevel:visited {
+	color:#FFFFFF;
+	text-decoration:none;
+	font-size:11px;
+	line-height: 27px;
+}
+
+/** generic menu item link on mouseover **/
+a.mainlevel:hover,
+#leftcol a.mainlevel:hover,
+#leftcolmenu a.mainlevel:hover {
+	background-color:#326A99;
+	color:#FFFFFF!important;
+	text-decoration:none!important;
+}
+
+
+ /*
+specific right column menu item. position:right
+you need to add menu class suffix: -right and
+module class suffix: -right
+ */
+.mainlevel-right {
+	display:block;
+	height:25px;
+	line-height:25px;
+	padding-left:15px;
+	background:#E9E8D3 url(../images/bg_mainlevel_right.gif) repeat-x center top;
+	font-weight:bold;
+}
+
+a.mainlevel-right:link,
+a.mainlevel-right:active,
+a.mainlevel-right:visited,
+a.sublevel-right:link,
+a.sublevel-right:active,
+a.sublevel-right:visited {
+	color:#000000;
+	text-decoration:none;
+	font-size:11px;
+	background-color:#E9E8D3;
+}
+
+/** specific top right column menu item link on mouseover **/
+a.mainlevel-right:hover {
+	background-color:#DFDDC6;
+	text-decoration:none;
+}
+
+
+/** pathway link item **/
+a.pathway:link,
+a.pathway:link,
+a.pathway:active,
+a.pathway:visited {
+	color:#999999;
+	text-decoration:none;
+}
+
+/** table of content list **/
+a.toclink:link,
+a.toclink:active,
+a.toclink:visited {
+	color:#3973AC;
+	font-size:11px;
+	padding:2px 10px 2px 10px;
+	display:block;
+	text-decoration:none;
+}
+
+.pagenavbar a:link,
+.pagenavbar a:active,
+.pagenavbar a:visited  {
+	letter-spacing:2px;
+	color:#000000;
+	font-size: 11px;
+	text-decoration: none;
+	
+	
+}
+
+.pagenavbar a:hover {
+	color:#3973AC;
+}
+
+/** latestnews and popular **/
+.latestnews,
+.mostread {
+	color:#000000;
+}
+
+a.latestnews:link,
+.mostread a:link,
+.latestnews a:active,
+.mostread a:active,
+.latestnews a:hover,
+.mostread a:hover,
+.latestnews a:visited,
+.mostread a:visited {
+	color:#000000;
+	text-decoration:underline;
+}
+
+/** underline on hover **/
+a.toclink:hover,
+a.latestnews:hover,
+a.mostread:hover,
+a.pathway:hover,
+a.sublevel:hover,
+a.sublevel-right:hover,
+a.blogsection:hover,
+a.readon:hover,
+a.pagenav:hover ,
+a.pagenav_next:hover,
+a.pagenav_pre:hover,
+a.latestnews:hover {
+	text-decoration:underline;
+	/*color:#3973AC;*/
+	background-color:inherit;
+}
+
+#leftcolmenu a:hover,
+#leftcol a:hover {
+	color: #93B7DB;
+	text-decoration:underline;
+}
+
+
+/* ---------------------
+mambo module layout
+--------------------- */
+
+/** general module table **/
+table.moduletable,
+#leftcol table,
+#rightcol table {
+	width:100%;
+	float:left;
+	clear:left;
+}
+
+/** general module table **/
+#leftcol table,
+#leftcol table td {
+	font-size:11px !important;
+	color:#FFFFFF !important;
+}
+
+#rightcol table,
+#rightcol table td {
+	font-size:11px !important;
+	color:#030303;
+}
+
+/** general module title **/
+table.moduletable th {
+	border-bottom: 1px solid #000000;	
+	color:#000000;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size:13px;
+	line-height:25px;
+	background: #E3E2C6 url(../images/bg_leftcol_module_th.gif) repeat-y left top;
+	height:22px;
+	text-align:left;
+	padding-left:15px;
+	font-weight:normal;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+#leftcol table.moduletable th {
+	background: #ACCCE6 url(../images/bg_leftcol_module_th.gif) repeat-y left top;
+}
+
+#rightcol table.moduletable th {
+	background-color:#B3AE88;
+}
+
+
+/** specific module td table for content top 1 and 2. 
+position:user2 an user3 **/
+#content_top1 table.moduletable td,
+#content_top2 table.moduletable td {
+	background-color:#F7F7EE;
+	height:100px;
+	min-height:100px;
+	vertical-align:top;
+}
+
+/** right column module td **/
+#rightcol table.moduletable td   {
+	padding:5px;
+}
+
+/** generic menu item **/
+
+.mainlevel  {
+	display:block;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
+	padding-left:15px;
+	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
+	font-weight:bold;
+	text-decoration:none;
+}
+
+/** specific left column form **/
+#leftcol form {
+	margin-left:15px;
+}
+
+/** specific left column form **/
+#leftcol .button {
+	font-size:11px;
+	color:#FFFFFF;
+	background-color:#5F9BCD;
+	border-right: 1px solid #49779D;
+	border-bottom: 1px solid #49779D;
+	border-left: 1px solid #7CADD6;
+	border-top: 1px solid #7CADD6;
+	width:140px;
+}
+
+
+/** specific left column form **/
+#leftcol .inputbox {
+	font-size:11px;
+	font-weight: bold;
+}
+
+/** module styles in #leftcol **/
+#leftcol table.moduletable td {
+	color:#DADADA;
+	font-size:11px;
+}
+
+
+/** search div in top right column. position:user4 **/
+div.search {
+	margin-left:10px;
+}
+
+/** search field in search div **/
+.search .inputbox {
+	width:145px;
+	border: 1px solid #000000;
+}
+
+/* ---------------------
+mambo form layout
+--------------------- */
+
+/** left column input form **/
+#leftcol .inputbox {
+	font-size:11px;
+	/*border: 1px solid #000000;*/
+	margin-bottom:2px;
+}
+
+
+
+/** input button html tag **/
+.button,
+#rightcol .button {
+	font-size:11px;
+	text-transform:uppercase;
+	color:#726C49;
+	font-weight:bold;
+	background-color:#F7F7EE;
+	border-top: 1px solid #D0CDB6;
+	border-right: 1px solid #5E5B47;
+	border-bottom: 1px solid #5E5B47;
+	border-left: 1px solid #D0CDB6;
+}
+
+.search  {
+	margin-top:30px;
+}
+
+
+
+/* 
+mambo top menu layout
+you need to add menu class suffix: -nav
+*/
+
+/** unordered list top menu **/
+ul#mainlevel-nav
+{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	font-size: 0.8em;
+}
+
+/** unordered list item for top menu **/
+ul#mainlevel-nav li
+{
+	display: block;
+	padding-left: 0px;
+	padding-right: 0px;
+	float: left;
+	margin: 0;
+	width: auto !important;
+	font-size: 11px;
+	line-height: 23px;
+	white-space: nowrap;
+}
+
+/** unordered list item link for top menu **/
+ul#mainlevel-nav li a
+{
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: none;
+	color: #FFFFFF;
+	font-weight:bold;
+}
+
+/** unordered list item link for top menu for firefox only **/
+#topmenu>ul#mainlevel-nav li a {
+	width: auto;
+}
+
+/** unordered list item for top menu for firefox only **/
+ul#mainlevel-nav li a:hover {
+	background: #535353;
+	text-decoration:none;
+}
+
+
+/** for polls **/
+.poll {
+	font-size:11px;
+	line-height: 16px;
+}
+
+table.pollstableborder .sectiontableentry2 {
+	background-color:transparent; 
+	text-align:left; 
+}
+table.pollstableborder .sectiontableentry1 {
+	background-color:#E3E2C6; 
+	text-align:left;
+}
+
+.moduletable_bgimg table.pollstableborder td.sectiontableentry2,
+.moduletable_bgimg table.pollstableborder td.sectiontableentry1 {
+	background-color:transparent!important; 
+	text-align:left!important; 
+}
+
+/** hack to make any div or table inside content will not stretcg outside area*/
+table.contentpane  table table input.inputbox {
+	max-width:80px;
+	width:80px;
+}
+
+table.contentpane {
+	width:390px!important;
+}
+
+.contentpaneopen {
+	width:100%!important;
+}
+
+.contentpaneopen tr.sectiontableentry2 td,
+.contentpaneopen tr.sectiontableentry1 td{
+	display:block;
+	width:390px!important;
+}
+
+#con_global div, #con_global table,
+#hp_view_standard_photo_con1 div div,
+#hp_view_agen_con {
+	width:390px!important;
+	text-align:left;
+}
+
+#hp_view_standard_photo_con1 div div,
+#hp_view_standard_photo_con2,
+#hp_view_standard_photo_con3,
+#hp_view_agen_con {
+	width:390px!important;
+	text-align:left;
+}
+
+table.contentpane  table  {
+	width:390px!important;
+	text-align:left;
+}
+
+table.contentpane  td.contentheading  {
+	width:200px!important;
+}
+
+table.contentpane  td.buttonheading  {
+	width:150px!important;
+}
+
+#bottompadding	{
+	position:relative;
+	width:760px;
+	display:block;
+	height:20px;
+	margin-top:-100px;
+}
\ No newline at end of file
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_body.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_body.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_header.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_header.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_inside.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_inside.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_leftcol.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_leftcol.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_leftcol_module_th.gif and 4.6rc2/templates/waterandstone800_blue/images/bg_leftcol_module_th.gif differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_mainlevel.gif and 4.6rc2/templates/waterandstone800_blue/images/bg_mainlevel.gif differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_mainlevel_right.gif and 4.6rc2/templates/waterandstone800_blue/images/bg_mainlevel_right.gif differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_module.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_module.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_module_contenttop.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_module_contenttop.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_pagenav.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_pagenav.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_spacer.gif and 4.6rc2/templates/waterandstone800_blue/images/bg_spacer.gif differ
Binary files 4.5.4/templates/waterandstone800_blue/images/bg_topright.jpg and 4.6rc2/templates/waterandstone800_blue/images/bg_topright.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/img_header.jpg and 4.6rc2/templates/waterandstone800_blue/images/img_header.jpg differ
Binary files 4.5.4/templates/waterandstone800_blue/images/indent1.png and 4.6rc2/templates/waterandstone800_blue/images/indent1.png differ
Binary files 4.5.4/templates/waterandstone800_blue/images/indent2.png and 4.6rc2/templates/waterandstone800_blue/images/indent2.png differ
Binary files 4.5.4/templates/waterandstone800_blue/images/indent3.png and 4.6rc2/templates/waterandstone800_blue/images/indent3.png differ
Binary files 4.5.4/templates/waterandstone800_blue/images/indent4.png and 4.6rc2/templates/waterandstone800_blue/images/indent4.png differ
Binary files 4.5.4/templates/waterandstone800_blue/images/indent5.png and 4.6rc2/templates/waterandstone800_blue/images/indent5.png differ
Binary files 4.5.4/templates/waterandstone800_blue/images/indent6.png and 4.6rc2/templates/waterandstone800_blue/images/indent6.png differ
Binary files 4.5.4/templates/waterandstone800_blue/images/logo.gif and 4.6rc2/templates/waterandstone800_blue/images/logo.gif differ
diff -ruN 4.5.4/templates/waterandstone800_blue/index.php 4.6rc2/templates/waterandstone800_blue/index.php
--- 4.5.4/templates/waterandstone800_blue/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_blue/index.php	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,132 @@
+<?php
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php mosShowHead(); ?>
+<?php
+if ( $my->id ) {
+	initEditor();
+}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<link href="<?php echo $mosConfig_live_site;?>/templates/waterandstone800_blue/css/template_css.css" rel="stylesheet" type="text/css"/>
+</head>
+<body class="waterbody">
+
+<div align="center">
+<div id="container">
+	<div id="containerbg">
+		<div id="outerleft">
+			<!-- start logo -->
+			<div id="logo">
+			  <a href="index.php"><img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone800_blue/images/logo.gif" alt="logo image" border="0" align="top" /></a>
+			</div>
+			<!-- end logo -->
+			<!-- start top menu. position:top -->
+			<div id="topmenu">
+			<?php mosLoadModules('top',-1); ?>
+			</div>
+			<!-- end top menu. position:top -->
+			<!-- start image header -->
+			<div id="imgheader">
+			<img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone800_blue/images/img_header.jpg" alt="header image" />
+			</div>
+			<!-- end image header -->
+			<div id="container_inner">
+				<!-- start left column.position:left,user1 -->
+				<div id="leftcol">
+				<?php mosLoadModules('left'); ?>
+				</div>
+				<div id="leftcolmenu">
+				<?php mosLoadModules('user1'); ?>
+				</div>
+				<!-- end left column.position:left -->
+				<!-- start content top wrapper -->
+				<?php
+				if (mosCountModules('user2') >= 1 OR mosCountModules('user3') >= 1 ) {
+				?>
+				<div id="content_top_wrapper">
+					<!-- start content top 1. position:user2 -->
+					<div id="content_top1">
+					<?php mosLoadModules('user2'); ?>
+					</div>
+					<!-- end content top 1 -->
+					<!-- start content top 2. position:user3 -->
+					<div id="content_top2">
+					<?php mosLoadModules('user3'); ?>
+					</div>
+					<!-- end content top 2 -->
+				</div>
+				<?php
+				}
+				?>
+				<!-- end content top wrapper -->
+				<!-- start main body -->
+				<div id="content_main">
+				<?php mosPathWay(); ?>
+				<table width="395" border="0" cellspacing="0" cellpadding="0">
+				  <tr>
+					<td>
+					<?php mosMainBody(); ?>
+					</td>
+				  </tr>
+				</table>
+				</div>
+				<!-- end main body -->
+			</div>
+		</div>
+		<div id="outerright">
+			<!-- start right top header. position:header -->
+			<div id="rightcol_top">
+			<?php mosLoadModules('header'); ?>
+			</div>
+			<!-- end right top header.-->
+			<!-- start right column. position:newsflash,right,user4 -->
+			<div id="rightcol">
+			<?php mosLoadModules('newsflash'); ?>
+			<?php mosLoadModules('right'); ?>
+			<?php mosLoadModules('user4'); ?>
+			</div>
+			<!-- end right column. -->
+		</div>
+		<!-- start banner. position:banner -->
+		<div class="clear">
+		</div>
+		<?php
+		if (mosCountModules('banner') >= 1) {
+		?>
+		<div id="banner">
+			<div align="left">
+			<?php mosLoadModules('banner'); ?>
+			</div>
+		</div>
+		<?php
+		} else {
+		?>
+		<div id="blackline">
+		</div>
+		<?php
+		}
+		?>
+		<!-- end banner. -->
+		<div class="clear">
+		</div>
+		<div id="bottompadding">
+		</div>
+	</div>
+	<!-- copyright notice -->
+	<div id="copyright">
+	<?php include_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/footer.php' ); ?>
+	</div>
+
+</div>
+</div>
+<?php mosLoadModules('debug', -1);?>
+</body>
+</html>
diff -ruN 4.5.4/templates/waterandstone800_blue/templateDetails.xml 4.6rc2/templates/waterandstone800_blue/templateDetails.xml
--- 4.5.4/templates/waterandstone800_blue/templateDetails.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_blue/templateDetails.xml	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="template" version="4.5.3">
+	<name>waterandstone800_blue</name>
+	<creationDate>07/05/06</creationDate>
+	<author>waterandstone</author>
+	<copyright>GNU/GPL</copyright>
+	<authorEmail>info@waterandstone.com</authorEmail>
+	<authorUrl>http://www.waterandstone.com</authorUrl>
+	<version>1.1</version>
+	<description>The Water and Stone Blue Template optimized for 800px x 600px screen resolution for use with any type of website with easy customization</description>
+	<files>
+		<filename>index.php</filename>
+		<filename>template_thumbnail.png</filename>
+	</files>
+	<images>
+		<filename>images/bg_body.jpg</filename>
+		<filename>images/bg_header.jpg</filename>
+		<filename>images/bg_inside.jpg</filename>
+		<filename>images/bg_leftcol.jpg</filename>
+		<filename>images/bg_leftcol_module_th.gif</filename>
+		<filename>images/bg_mainlevel.gif</filename>
+		<filename>images/bg_mainlevel_right.gif</filename>
+		<filename>images/bg_module.jpg</filename>
+		<filename>images/bg_module_contenttop.jpg</filename>
+		<filename>images/bg_pagenav.jpg</filename>
+		<filename>images/bg_spacer.gif</filename>
+		<filename>images/bg_topright.jpg</filename>
+		<filename>images/img_header.jpg</filename>
+		<filename>images/indent1.png</filename>
+		<filename>images/indent2.png</filename>
+		<filename>images/indent3.png</filename>
+		<filename>images/indent4.png</filename>
+		<filename>images/indent5.png</filename>
+		<filename>images/indent6.png</filename>
+		<filename>images/logo.gif</filename>
+		</images>
+	<css>
+		<filename>css/template_css.css</filename>
+	</css>
+</mosinstall>
Binary files 4.5.4/templates/waterandstone800_blue/template_thumbnail.png and 4.6rc2/templates/waterandstone800_blue/template_thumbnail.png differ
diff -ruN 4.5.4/templates/waterandstone800_green/css/template_css.css 4.6rc2/templates/waterandstone800_green/css/template_css.css
--- 4.5.4/templates/waterandstone800_green/css/template_css.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_green/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,935 @@
+/* ---------------------
+basic layout
+--------------------- */
+
+* {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+.waterbody {
+	background:#FFFFFF url(../images/bg_body.jpg) repeat-x left top;
+	margin:0;
+	color:#333333;
+}
+
+div,
+td,
+p {
+	font-size:12px;
+	line-height:18px;
+	color:#333333;
+}
+
+a,
+a:link,
+a:active,
+a:visited {
+	text-decoration:underline;
+	color:#000000;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+ul {
+	margin: 5px;
+	padding: 5px;
+	list-style: none;
+	list-style-type: square;
+}
+
+li {
+	line-height: 18px;
+	padding-left: 5px;
+	padding-top: 0px;
+	list-style-position: inside;
+}
+
+/** To center the objects **/
+.center {
+	text-align:center!important;
+}
+
+/** clear the banner to make it sit in the bottom **/
+.clear {
+	clear:both;
+}
+
+/* ---------------------
+template layout
+--------------------- */
+
+/** wrapper to make the page center **/
+#container {
+	width:760px;
+	margin: 0px auto;
+	padding:0;
+	text-align: left;
+}
+
+/**
+hold background, it should be float:left
+that's way we can not put it in #container
+**/
+#containerbg {
+	width: 760px;
+	background:transparent url(../images/bg_inside.jpg) repeat-y left top;
+	float:left;
+}
+
+#outerleft {
+	position:relative;
+	float:left;
+	clear:left;
+	width:590px;
+	
+}
+
+#outerright {
+	position:relative;
+	width:170px;
+	float:right;
+	clear:right;
+}
+
+#logo {
+	position:relative;
+	width:100%;
+	height:74px;
+	float:left;
+	background:#FFFFFF url(../images/bg_header.jpg) no-repeat left top;
+}
+
+/** div container for top menu. position:top **/
+#topmenu {
+	position:relative;
+	float:left;
+	clear:left;
+	background-color:#000000;
+	width: 100%;
+}
+
+/** div container for image header **/
+#imgheader {
+	position:relative;
+	float:left;
+	clear:left;
+	width:100%;
+	height:99px;
+	background-color: #000000;
+}
+
+#container_inner {
+	position:relative;
+	float:left;
+	clear:left;
+	width:590px;
+}
+
+/** div container for left column **/
+#leftcol {
+	position:relative;
+	float:left;
+	clear:left;
+	width:170px;
+}
+
+#leftcolmenu {
+	position:relative;
+	overflow:auto;
+}
+
+
+/** div wrapper for user2 & user3 **/
+#content_top_wrapper {
+	position:relative;
+	float:right;
+	clear:right;
+	width:405px;
+	display:inline;
+	margin: 4px 6px 0 0;
+}
+
+/** div container for position:user2 **/
+#content_top1 {
+	position:relative;
+	float:left;
+	clear:left;
+	width:200px;
+}
+
+/** div container for position:user3 **/
+#content_top2 {
+	position:relative;
+	float:right;
+	clear:right;
+	width:200px;
+}
+
+/** div container for mainbody **/
+#content_main {
+	position:relative;
+	float:left;
+	width:400px;
+	margin:10px 0 20px 10px;
+	background-color:#FFFFFF;
+	overflow:auto;
+	word-wrap:break-word;
+}
+
+/** div container for right column **/
+#rightcol_top,
+#rightcol {
+	float:left;
+	clear:left;
+	width:168px;
+	margin:0 0 0 1px;
+	display:inline;
+	overflow:auto;
+}
+
+/** div container for right column position:header **/
+#rightcol_top {
+	height:70px;
+	min-height:70px;
+}
+
+/** div container for banner position:banner **/
+#banner {
+	position:relative;
+	clear:left;
+	float:left;
+	width:590px;
+	height:65px;
+	min-height:65px;
+	color:#FFFFFF;
+	font-size:9px;
+	background-color: #333333;
+	display:block;
+	text-align:center!important;
+	vertical-align:middle;
+	padding:5px 0 0 0;
+	margin-top:20px;
+}
+
+#blackline {
+	position:relative;
+	clear:left;
+	float:left;
+	width:590px;
+	height:10px;
+	min-height:10px;
+	background-color: #000000;
+	color:#FFFFFF;
+	font-size:10px;
+	margin-top:20px;
+}
+
+
+/** copyright **/
+#copyright {
+	position:relative;
+	width:760px;
+	display:block;
+	clear:both;
+	float:left;
+}
+
+#copyright div {
+	color:#666666;
+	font-size:10px;
+	font-weight:bold;
+	display:block!important;
+	width:760px;
+	float:left;
+	clear:left;
+	margin:-5px 0 0 0;
+	text-align:left;
+}
+
+
+/* ---------------------
+mambo content layout
+--------------------- */
+
+/** pathway block **/
+span.pathway {
+	display:block;
+	text-align:left;
+	color:#000000;
+	font-size:10px;
+	font-weight:bold;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #E5E5E5;
+	height:20px;
+	margin-bottom:10px;
+}
+
+/** content title **/
+.componentheading {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	color:#000000;
+	font-size: 20px;
+	line-height:25px;
+	padding: 5px 0 5px 0;
+	display:block;
+}
+
+.contentheading,
+.contentpagetitle,
+a.contentpagetitle:link,
+a.contentpagetitle:active,
+a.contentpagetitle:visited {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	font-size:18px;
+	font-weight: normal;
+	color:#0C362D;
+	padding-top: 25px;
+	background-color:inherit;
+	display:block;
+}
+
+.contentpaneopen {
+	width:100%;
+}
+
+
+.buttonheading {
+	width: 16px!important;
+	text-align:right;
+}
+
+
+td.sectiontableheader {
+	font-weight: bold;
+}
+
+.category, .categorytitle {
+	font-weight: bold;
+	color:#0C362D;
+	background-color:inherit;
+}
+
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
+	background-color: #FBFBF4;
+	padding: 2px;
+	color:#333333;
+}
+
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
+	background-color: #FFFFFF;
+	padding: 2px;
+	color:#333333;
+}
+
+tr.sectiontableentry1 td,
+tr.sectiontableentry2 td {
+	word-wrap:break-word;
+}
+
+/** blog Styles **/
+.blogsection {
+	color:#0C362D;
+	background-color:inherit;
+}
+
+.blog_more {
+	font-weight: bold;
+	line-height: 25px;
+	padding-top: 20px;
+	color: #0C362D;
+	border-bottom: 1px solid #E5E5E5;
+	background-color:inherit;
+}
+
+/** small text in content **/
+.small {
+	color:#8B721D;
+	font-size:10px;
+	font-weight: normal;
+	background-color:inherit;
+}
+
+/** date info in content **/
+#content_main .createdate {
+	color:#6EB28A;
+	font-size:10px;
+	padding: 0 0 15px 0;
+	line-height:8px;
+	background-color:inherit;
+}
+
+#content_main .modifydate {
+	color:#8B721D;
+	font-size:10px;
+	padding: 0;
+	background-color:inherit;
+}
+
+
+/** toc page navigation  **/
+.pagenav_prev,
+.pagenav_next {
+	font-size:11px;
+}
+
+
+/** content item navigation  **/
+.pagenavbar  {
+	display:block;
+	width:100%;
+	background-color:inherit;
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999!important;
+	clear:both;
+	font-size: 11px!important;
+	margin-top: 10px;
+	background-image: url(../images/bg_pagenav.jpg);
+	background-repeat: repeat-x;
+	background-position: center bottom;	
+}
+
+.pagenav {
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999;
+	clear:both;
+	font-size: 11px;
+	margin-left: 0;
+	margin-right: 0;
+	background-color:inherit;
+	
+}
+
+.back_button {
+	display:block;
+	text-align:left;
+	font-weight:bold;
+	font-size:12px;
+	width:100%;
+	margin-bottom:10px;
+	letter-spacing:2px;
+}
+
+/** highlight word search result **/
+.highlight {
+	font-weight:bold;
+	background-color: #FFFF00;
+	padding: 2px 0 2px 0;
+	
+}
+
+/** table of content layout **/
+table.contenttoc {
+	border:1px solid #000000;
+	padding:1px;
+	display:block;
+	width:130px;
+	margin: 0 0 10px 10px;
+}
+
+/** table of content header **/
+.contenttoc th {
+	color:#FFFFFF;
+	background-color:#666666;
+	font-size:11px;
+	display:block;
+	width:124px;
+}
+
+/** unordered list for latest news module **/
+ul.latestnews li,ul.mostread li {
+    line-height: 18px;
+	font-size:11px;
+	font-weight:bold;
+	list-style-type: none;
+	list-style-position: outside;
+}
+
+
+/** fix opera table width for content list in table category**/
+table.contentpane td.contentdescription {
+	width:100%!important;
+}
+
+
+/* ---------------------
+Links
+--------------------- */
+
+/** any left column link **/
+#leftcol a:link,
+#leftcol a:active,
+#leftcol a:visited,
+#leftcolmenu a:link,
+#leftcolmenu a:active,
+#leftcolmenu a:visited,
+#rightcol a:link,
+#rightcol a:active,
+#rightcol a:visited,
+#rightcolmenu a:link,
+#rightcolmenu a:active,
+#rightcolmenu a:visited
+ {
+	color:#FFFFFF;
+}
+
+a.pagenav:link ,
+a.pagenav_next:link,
+a.pagenav_pre:link,
+div.back_button a,
+div.back_button a:link,
+a.latestnews:link,
+a.latestnews:active,
+a.latestnews:visited,
+a.mostread:link,
+a.mostread:active,
+a.mostread:visited {
+	text-decoration:none;
+}
+
+/*** read more link ***/
+.readon,
+a.readon:link,
+a.readon:active,
+a.readon:visited {
+	color:#666666;
+	font-weight:bold;
+	text-align:left;
+	margin-top:10px;
+	letter-spacing: 2px;
+	font-size:10px;
+	text-decoration:none;
+}
+
+/*** blog links ***/
+a.blogsection:link,
+a.blogsection:active,
+a.blogsection:visited {
+	color:#0C362D;
+	text-decoration:none;
+}
+
+/** generic menu item link **/
+a.mainlevel:link,
+a.mainlevel:active,
+a.mainlevel:visited,
+a.sublevel:link,
+a.sublevel:active,
+a.sublevel:visited {
+	color:#FFFFFF;
+	text-decoration:none;
+	font-size:11px;
+	line-height: 27px;
+}
+
+a.sublevel:hover {
+	color: #000000;
+}
+
+/** generic menu item link on mouseover **/
+a.mainlevel:hover,
+#leftcol a.mainlevel:hover,
+#leftcolmenu a.mainlevel:hover {
+	background-color:#B8B35C;
+	color:#000000!important;
+	text-decoration:none!important;
+}
+
+/** specific top right column menu item link **/
+a.mainlevel-right:link,
+a.mainlevel-right:active,
+a.mainlevel-right:visited,
+a.sublevel-right:link,
+a.sublevel-right:active,
+a.sublevel-right:visited {
+	color:#FFFFFF;
+	text-decoration:none;
+	font-size:11px;
+}
+
+/** specific top right column menu item link on mouseover **/
+a.mainlevel-right:hover {
+	background-color:#15604F;
+	text-decoration:none;
+}
+
+
+/** pathway link item **/
+a.pathway:link,
+a.pathway:link,
+a.pathway:active,
+a.pathway:visited {
+	color:#999999;
+	text-decoration:none;
+}
+
+/** table of content list **/
+a.toclink:link,
+a.toclink:active,
+a.toclink:visited {
+	color:#0C362D;
+	font-size:11px;
+	padding:2px 10px 2px 10px;
+	display:block;
+	text-decoration:none;
+}
+
+.pagenavbar a:link,
+.pagenavbar a:active,
+.pagenavbar a:visited  {
+	letter-spacing:2px;
+	color:#000000;
+	font-size: 11px;
+	text-decoration: none;
+	
+	
+}
+
+.pagenavbar a:hover {
+	color:#0C362D;
+}
+
+/** latestnews and popular **/
+.latestnews,
+.mostread {
+	color:#000000;
+}
+
+a.latestnews:link,
+.mostread a:link,
+.latestnews a:active,
+.mostread a:active,
+.latestnews a:hover,
+.mostread a:hover,
+.latestnews a:visited,
+.mostread a:visited {
+	color:#000000;
+	text-decoration:underline;
+}
+
+/** underline on hover **/
+a.toclink:hover,
+a.latestnews:hover,
+a.mostread:hover,
+a.pathway:hover,
+a.sublevel:hover,
+a.sublevel-right:hover,
+a.blogsection:hover,
+a.readon:hover,
+a.pagenav:hover ,
+a.pagenav_next:hover,
+a.pagenav_pre:hover,
+a.latestnews:hover {
+	text-decoration:underline;
+	/*color:#0C362D;*/
+	background-color:inherit;
+}
+
+#leftcolmenu a:hover,
+#leftcol a:hover {
+	color: #000000;
+	text-decoration:underline;
+}
+
+
+/* ---------------------
+mambo module layout
+--------------------- */
+
+/** general module table **/
+table.moduletable,
+#leftcol table,
+#rightcol table {
+	width:100%;
+	float:left;
+	clear:left;
+}
+
+/** general module table **/
+#rightcol table,
+#leftcol table td {
+	font-size:11px !important;
+	color:#FFFFFF;
+}
+
+#rightcol table,
+#rightcol table td {
+	font-size:11px !important;
+	color:#FFFFFF;
+}
+
+/** general module title **/
+table.moduletable th {
+	border: solid 1px #000000;
+	color:#FFFFFF;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size:13px;
+	line-height:25px;
+	background-color: #6EB28A;
+	height:22px;
+	text-align:left;
+	padding-left:15px;
+	font-weight:normal;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+#leftcol table.moduletable th {
+	background-color: #8F8A2C;
+	color: #000000;
+	border: solid 1px #000000;
+}
+
+#rightcol table.moduletable th {
+	background-color:#6EB28A;
+	border: solid 1px #000000;
+}
+
+
+/** specific module td table for content top 1 and 2. 
+position:user2 an user3 **/
+#content_top1 table.moduletable td,
+#content_top2 table.moduletable td {
+	background-color:#F2FFF2;
+	height:100px;
+	min-height:100px;
+	vertical-align:top;
+}
+
+/** right column module td **/
+#rightcol table.moduletable td   {
+	padding:5px;
+	
+}
+
+/** generic menu item **/
+
+.mainlevel  {
+	display:block;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
+	padding-left:15px;
+	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
+	font-weight:bold;
+	text-decoration:none;
+}
+
+/** specific left column form **/
+#leftcol form {
+	margin-left:15px;
+}
+
+/** specific left column form **/
+#leftcol .button {
+	font-size:11px;
+	color:#FFFFFF;
+	background-color:#C4BD40;
+	border: 1px solid #746A39;
+	width:140px;
+}
+
+
+/** specific left column form **/
+#leftcol .inputbox {
+	font-size:11px;
+	font-weight: bold;
+}
+
+/** module styles in #leftcol **/
+#leftcol table.moduletable td {
+	color:#FFFFFF;
+	font-size:11px;
+}
+
+/** search div in top right column. position:user4 **/
+div.search {
+	margin-left:10px;
+}
+
+/** search field in search div **/
+.search .inputbox {
+	width:145px;
+	border: 1px solid #000000;
+}
+
+/* ---------------------
+mambo form layout
+--------------------- */
+
+/** left column input form **/
+#leftcol .inputbox {
+	font-size:11px;
+	/*border: 1px solid #000000;*/
+	margin-bottom:2px;
+}
+
+
+
+/** input button html tag **/
+.button,
+#rightcol .button {
+	font-size:11px;
+	text-transform:uppercase;
+	color:#FFFFFF;
+	font-weight:bold;
+	background-color:#000000;
+	border: 1px solid #666666;
+}
+
+.search  {
+	margin-top:30px;
+}
+
+
+
+/* 
+mambo top menu layout
+you need to add menu class suffix: -nav
+*/
+
+/** unordered list top menu **/
+ul#mainlevel-nav
+{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	font-size: 0.8em;
+}
+
+/** unordered list item for top menu **/
+ul#mainlevel-nav li
+{
+	display: block;
+	padding-left: 0px;
+	padding-right: 0px;
+	float: left;
+	margin: 0;
+	width: auto !important;
+	font-size: 11px;
+	line-height: 23px;
+	white-space: nowrap;
+}
+
+/** unordered list item link for top menu **/
+ul#mainlevel-nav li a
+{
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: none;
+	color: #FFFFFF;
+	font-weight:bold;
+}
+
+/** unordered list item link for top menu for firefox only **/
+#topmenu>ul#mainlevel-nav li a {
+	width: auto;
+}
+
+/** unordered list item for top menu for firefox only **/
+ul#mainlevel-nav li a:hover {
+	background: #535353;
+	text-decoration:none;
+}
+
+
+ /*
+specific right column menu item. position:right
+you need to add menu class suffix: -right and
+module class suffix: -right
+ */
+.mainlevel-right {
+	display:block;
+	height:25px;
+	line-height:25px;
+	padding-left:15px;
+	background:#0C362D url(../images/bg_mainlevel_right.gif) repeat-x center top;
+	font-weight:bold;
+}
+
+
+/** for polls **/
+.poll {
+	font-size:11px;
+	line-height: 16px;
+}
+
+table.pollstableborder .sectiontableentry2 {
+	background-color:transparent; 
+	text-align:left; 
+}
+table.pollstableborder .sectiontableentry1 {
+	background-color:#092620; 
+	text-align:left;
+}
+
+.moduletable_bgimg table.pollstableborder td.sectiontableentry2,
+.moduletable_bgimg table.pollstableborder td.sectiontableentry1 {
+	background-color:transparent!important; 
+	text-align:left!important; 
+}
+
+/** hack to make any div or table inside content will not stretcg outside area*/
+table.contentpane  table table input.inputbox {
+	max-width:80px;
+	width:80px;
+}
+
+table.contentpane {
+	width:390px!important;
+}
+
+.contentpaneopen {
+	width:100%!important;
+}
+
+.contentpaneopen tr.sectiontableentry2 td,
+.contentpaneopen tr.sectiontableentry1 td{
+	display:block;
+	width:390px!important;
+}
+
+#con_global div, #con_global table,
+#hp_view_standard_photo_con1 div div,
+#hp_view_agen_con {
+	width:390px!important;
+	text-align:left;
+}
+
+#hp_view_standard_photo_con1 div div,
+#hp_view_standard_photo_con2,
+#hp_view_standard_photo_con3,
+#hp_view_agen_con {
+	width:390px!important;
+	text-align:left;
+}
+
+table.contentpane  table  {
+	width:390px!important;
+	text-align:left;
+}
+
+table.contentpane  td.contentheading  {
+	width:200px!important;
+}
+
+table.contentpane  td.buttonheading  {
+	width:150px!important;
+}
+
+#bottompadding	{
+	position:relative;
+	width:760px;
+	display:block;
+	height:20px;
+	margin-top:-100px;
+}
\ No newline at end of file
Binary files 4.5.4/templates/waterandstone800_green/images/bg_body.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_body.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_header.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_header.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_inside.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_inside.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_leftcol.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_leftcol.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_leftcol_module_th.gif and 4.6rc2/templates/waterandstone800_green/images/bg_leftcol_module_th.gif differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_mainlevel.gif and 4.6rc2/templates/waterandstone800_green/images/bg_mainlevel.gif differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_mainlevel_right.gif and 4.6rc2/templates/waterandstone800_green/images/bg_mainlevel_right.gif differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_module.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_module.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_module_contenttop.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_module_contenttop.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_pagenav.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_pagenav.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_spacer.gif and 4.6rc2/templates/waterandstone800_green/images/bg_spacer.gif differ
Binary files 4.5.4/templates/waterandstone800_green/images/bg_topright.jpg and 4.6rc2/templates/waterandstone800_green/images/bg_topright.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/img_header.jpg and 4.6rc2/templates/waterandstone800_green/images/img_header.jpg differ
Binary files 4.5.4/templates/waterandstone800_green/images/indent1.png and 4.6rc2/templates/waterandstone800_green/images/indent1.png differ
Binary files 4.5.4/templates/waterandstone800_green/images/indent2.png and 4.6rc2/templates/waterandstone800_green/images/indent2.png differ
Binary files 4.5.4/templates/waterandstone800_green/images/indent3.png and 4.6rc2/templates/waterandstone800_green/images/indent3.png differ
Binary files 4.5.4/templates/waterandstone800_green/images/indent4.png and 4.6rc2/templates/waterandstone800_green/images/indent4.png differ
Binary files 4.5.4/templates/waterandstone800_green/images/indent5.png and 4.6rc2/templates/waterandstone800_green/images/indent5.png differ
Binary files 4.5.4/templates/waterandstone800_green/images/indent6.png and 4.6rc2/templates/waterandstone800_green/images/indent6.png differ
Binary files 4.5.4/templates/waterandstone800_green/images/logo.gif and 4.6rc2/templates/waterandstone800_green/images/logo.gif differ
diff -ruN 4.5.4/templates/waterandstone800_green/index.php 4.6rc2/templates/waterandstone800_green/index.php
--- 4.5.4/templates/waterandstone800_green/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_green/index.php	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,132 @@
+<?php
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php mosShowHead(); ?>
+<?php
+if ( $my->id ) {
+	initEditor();
+}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<link href="<?php echo $mosConfig_live_site;?>/templates/waterandstone800_green/css/template_css.css" rel="stylesheet" type="text/css"/>
+</head>
+<body class="waterbody">
+
+<div align="center">
+<div id="container">
+	<div id="containerbg">
+		<div id="outerleft">
+			<!-- start logo -->
+			<div id="logo">
+			  <a href="index.php"><img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone800_green/images/logo.gif" alt="logo image" border="0" align="top" /></a>
+			</div>
+			<!-- end logo -->
+			<!-- start top menu. position:top -->
+			<div id="topmenu">
+			<?php mosLoadModules('top',-1); ?>
+			</div>
+			<!-- end top menu. position:top -->
+			<!-- start image header -->
+			<div id="imgheader">
+			<img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone800_green/images/img_header.jpg" alt="header image" />
+			</div>
+			<!-- end image header -->
+			<div id="container_inner">
+				<!-- start left column.position:left,user1 -->
+				<div id="leftcol">
+				<?php mosLoadModules('left'); ?>
+				</div>
+				<div id="leftcolmenu">
+				<?php mosLoadModules('user1'); ?>
+				</div>
+				<!-- end left column.position:left -->
+				<!-- start content top wrapper -->
+				<?php
+				if (mosCountModules('user2') >= 1 OR mosCountModules('user3') >= 1 ) {
+				?>
+				<div id="content_top_wrapper">
+					<!-- start content top 1. position:user2 -->
+					<div id="content_top1">
+					<?php mosLoadModules('user2'); ?>
+					</div>
+					<!-- end content top 1 -->
+					<!-- start content top 2. position:user3 -->
+					<div id="content_top2">
+					<?php mosLoadModules('user3'); ?>
+					</div>
+					<!-- end content top 2 -->
+				</div>
+				<?php
+				}
+				?>
+				<!-- end content top wrapper -->
+				<!-- start main body -->
+				<div id="content_main">
+				<?php mosPathWay(); ?>
+				<table width="395" border="0" cellspacing="0" cellpadding="0">
+				  <tr>
+					<td>
+					<?php mosMainBody(); ?>
+					</td>
+				  </tr>
+				</table>
+				</div>
+				<!-- end main body -->
+			</div>
+		</div>
+		<div id="outerright">
+			<!-- start right top header. position:header -->
+			<div id="rightcol_top">
+			<?php mosLoadModules('header'); ?>
+			</div>
+			<!-- end right top header.-->
+			<!-- start right column. position:newsflash,right,user4 -->
+			<div id="rightcol">
+			<?php mosLoadModules('newsflash'); ?>
+			<?php mosLoadModules('right'); ?>
+			<?php mosLoadModules('user4'); ?>
+			</div>
+			<!-- end right column. -->
+		</div>
+		<!-- start banner. position:banner -->
+		<div class="clear">
+		</div>
+		<?php
+		if (mosCountModules('banner') >= 1) {
+		?>
+		<div id="banner">
+			<div align="left">
+			<?php mosLoadModules('banner'); ?>
+			</div>
+		</div>
+		<?php
+		} else {
+		?>
+		<div id="blackline">
+		</div>
+		<?php
+		}
+		?>
+		<!-- end banner. -->
+		<div class="clear">
+		</div>
+		<div id="bottompadding">
+		</div>
+	</div>
+	<!-- copyright notice -->
+	<div id="copyright">
+	<?php include_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/footer.php' ); ?>
+	</div>
+
+</div>
+</div>
+<?php mosLoadModules('debug', -1);?>
+</body>
+</html>
diff -ruN 4.5.4/templates/waterandstone800_green/templateDetails.xml 4.6rc2/templates/waterandstone800_green/templateDetails.xml
--- 4.5.4/templates/waterandstone800_green/templateDetails.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_green/templateDetails.xml	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="template" version="4.5.3">
+	<name>waterandstone800_green</name>
+	<creationDate>07/05/06</creationDate>
+	<author>waterandstone</author>
+	<copyright>GNU/GPL</copyright>
+	<authorEmail>info@waterandstone.com</authorEmail>
+	<authorUrl>http://www.waterandstone.com</authorUrl>
+	<version>1.1</version>
+	<description>The Water and Stone Green Template optimized for 800px x 600px screen resolution for use with any type of website with easy customization</description>
+	<files>
+		<filename>index.php</filename>
+		<filename>template_thumbnail.png</filename>
+	</files>
+	<images>
+		<filename>images/bg_body.jpg</filename>
+		<filename>images/bg_header.jpg</filename>
+		<filename>images/bg_inside.jpg</filename>
+		<filename>images/bg_leftcol.jpg</filename>
+		<filename>images/bg_leftcol_module_th.gif</filename>
+		<filename>images/bg_mainlevel.gif</filename>
+		<filename>images/bg_mainlevel_right.gif</filename>
+		<filename>images/bg_module.jpg</filename>
+		<filename>images/bg_module_contenttop.jpg</filename>
+		<filename>images/bg_pagenav.jpg</filename>
+		<filename>images/bg_spacer.gif</filename>
+		<filename>images/bg_topright.jpg</filename>
+		<filename>images/img_header.jpg</filename>
+		<filename>images/indent1.png</filename>
+		<filename>images/indent2.png</filename>
+		<filename>images/indent3.png</filename>
+		<filename>images/indent4.png</filename>
+		<filename>images/indent5.png</filename>
+		<filename>images/indent6.png</filename>
+		<filename>images/logo.gif</filename>
+		</images>
+	<css>
+		<filename>css/template_css.css</filename>
+	</css>
+</mosinstall>
Binary files 4.5.4/templates/waterandstone800_green/template_thumbnail.png and 4.6rc2/templates/waterandstone800_green/template_thumbnail.png differ
diff -ruN 4.5.4/templates/waterandstone800_greenandblack/css/template_css.css 4.6rc2/templates/waterandstone800_greenandblack/css/template_css.css
--- 4.5.4/templates/waterandstone800_greenandblack/css/template_css.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_greenandblack/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,976 @@
+/* ---------------------
+basic layout
+--------------------- */
+
+* {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+.waterbody {
+	background:#E8E8E8 url(../images/bg_body.jpg) repeat left top;
+	margin:0;
+	color:#333333;
+}
+
+div,
+td,
+p {
+	font-size:12px;
+	line-height:18px;
+	color:#333333;
+}
+
+a,
+a:link,
+a:active,
+a:visited {
+	color:#000000;
+}
+
+a:hover {
+	color:#96C600;
+}
+
+#leftcol a,
+#leftcol a:link,
+#leftcol a:active,
+#leftcol a:visited {
+	text-decoration:none !important;
+	border-bottom: 1px dotted #000000;
+	color:#000000;
+}
+
+#leftcol a:hover {
+	text-decoration:none;
+	color:#000000;
+	border-bottom: 1px solid #000000;
+	text-decoration:none !important;
+}
+
+#rightcol a,
+#rightcol a:link,
+#rightcol a:active,
+#rightcol a:visited {
+	text-decoration:none !important;
+	border-bottom: 1px dotted #FFFFFF;
+	color:#FFFFFF;
+}
+
+#rightcol a:hover {
+	border-bottom: 1px solid #FFFFFF;
+	color:#FFFFFF;
+	text-decoration:none !important;
+}
+ul {
+	margin: 5px;
+	padding: 5px;
+	list-style: none;
+	list-style-type: square;
+}
+
+li {
+	line-height: 18px;
+	padding-left: 5px;
+	padding-top: 0px;
+	list-style-position: inside;
+}
+
+/** To center the objects **/
+.center {
+	text-align:center!important;
+}
+
+/** clear the banner to make it sit in the bottom **/
+.clear {
+	clear:both;
+}
+
+/* ---------------------
+template layout
+--------------------- */
+
+/** wrapper to make the page center **/
+#container {
+	width:760px;
+	margin: 0px auto;
+	padding:0;
+	text-align: left;
+}
+
+/**
+hold background, it should be float:left
+that's way we can not put it in #container
+**/
+#containerbg {
+	width: 760px;
+	background:transparent url(../images/bg_inside.jpg) repeat-y left top;
+	float:left;
+}
+
+#outerleft {
+	position:relative;
+	float:left;
+	clear:left;
+	width:590px;
+	
+}
+
+#outerright {
+	position:relative;
+	width:170px;
+	float:right;
+	clear:right;
+}
+
+#logo {
+	position:relative;
+	width:100%;
+	height:74px;
+	float:left;
+	background:#FFFFFF url(../images/bg_header.jpg) no-repeat left top;
+}
+
+/** div container for top menu. position:top **/
+#topmenu {
+	position:relative;
+	float:left;
+	clear:left;
+	background-color:#000000;
+	width: 100%;
+}
+
+/** div container for image header **/
+#imgheader {
+	position:relative;
+	float:left;
+	clear:left;
+	width:100%;
+	height:99px;
+	background-color: #000000;
+}
+
+#container_inner {
+	position:relative;
+	float:left;
+	clear:left;
+	width:590px;
+}
+
+/** div container for left column **/
+#leftcol {
+	position:relative;
+	float:left;
+	clear:left;
+	width:170px;
+}
+
+#leftcolmenu {
+	position:relative;
+	overflow:auto;
+}
+
+
+/** div wrapper for user2 & user3 **/
+#content_top_wrapper {
+	position:relative;
+	float:right;
+	clear:right;
+	width:405px;
+	display:inline;
+	margin: 4px 6px 0 0;
+}
+
+/** div container for position:user2 **/
+#content_top1 {
+	position:relative;
+	float:left;
+	clear:left;
+	width:200px;
+}
+
+/** div container for position:user3 **/
+#content_top2 {
+	position:relative;
+	float:right;
+	clear:right;
+	width:200px;
+}
+
+/** div container for mainbody **/
+#content_main {
+	position:relative;
+	float:left;
+	width:400px;
+	margin:10px 0 20px 10px;
+	background-color:#FFFFFF;
+	overflow:auto;
+	word-wrap:break-word;
+}
+
+/** div container for right column **/
+#rightcol_top,
+#rightcol {
+	float:left;
+	clear:left;
+	width:168px;
+	margin:0 0 0 1px;
+	display:inline;
+	overflow:auto;
+}
+
+/** div container for right column position:header **/
+#rightcol_top {
+	height:70px;
+	min-height:70px;
+}
+
+/** div container for banner position:banner **/
+#banner {
+	position:relative;
+	clear:left;
+	float:left;
+	width:590px;
+	height:65px;
+	min-height:65px;
+	color:#FFFFFF;
+	font-size:9px;
+	background-color: #333333;
+	display:block;
+	text-align:center!important;
+	vertical-align:middle;
+	padding:5px 0 0 0;
+	margin-top:20px;
+}
+
+#blackline {
+	position:relative;
+	clear:left;
+	float:left;
+	width:590px;
+	height:10px;
+	min-height:10px;
+	background-color: #000000;
+	color:#FFFFFF;
+	font-size:10px;
+	margin-top:20px;
+}
+
+
+/** copyright **/
+#copyright {
+	position:relative;
+	width:760px;
+	display:block;
+	clear:both;
+	float:left;
+}
+
+#copyright div {
+	color:#666666;
+	font-size:10px;
+	font-weight:bold;
+	display:block!important;
+	width:760px;
+	float:left;
+	clear:left;
+	margin:-5px 0 0 0;
+	text-align:left;
+}
+
+
+/* ---------------------
+mambo content layout
+--------------------- */
+
+
+/** pathway block **/
+span.pathway {
+	display:block;
+	text-align:left;
+	color:#000000;
+	font-size:10px;
+	font-weight:bold;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #E5E5E5;
+	height:20px;
+	margin-bottom:10px;
+}
+
+/** content title **/
+.componentheading {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	color:#000000;
+	font-size: 20px;
+	line-height:25px;
+	padding: 5px 0 5px 0;
+	display:block;
+}
+
+.contentheading,
+.contentpagetitle,
+a.contentpagetitle:link,
+a.contentpagetitle:active,
+a.contentpagetitle:visited {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	font-size:18px;
+	font-weight: normal;
+	color:#0C362D;
+	padding-top: 25px;
+	background-color:inherit;
+	display:block;
+}
+
+.contentpaneopen {
+	width:100%;
+}
+
+
+.buttonheading {
+	width: 16px!important;
+	text-align:right;
+}
+
+
+td.sectiontableheader {
+	font-weight: bold;
+}
+
+.category, .categorytitle {
+	font-weight: bold;
+	color:#000000;
+	background-color:inherit;
+}
+
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
+	background-color: #F9FFEA;
+	padding: 2px;
+	color:#333333;
+	
+}
+
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
+	background-color: #FFFFFF;
+	padding: 2px;
+	color:#333333;
+}
+
+tr.sectiontableentry1 td,
+tr.sectiontableentry2 td {
+	word-wrap:break-word;
+}
+
+
+/** blog Styles **/
+.blogsection {
+	color:#000000;
+	background-color:inherit;
+}
+
+.blog_more {
+	font-weight: bold;
+	line-height: 25px;
+	padding-top: 20px;
+	color: #000000;
+	border-bottom: 1px solid #E5E5E5;
+	background-color:inherit;
+}
+
+/** small text in content **/
+.small {
+	color:#336600;
+	font-size:10px;
+	font-weight: normal;
+	background-color:inherit;
+}
+
+/** date info in content **/
+#content_main .createdate {
+	color:#99CC00;
+	font-size:10px;
+	padding: 0 0 15px 0;
+	line-height:8px;
+	background-color:inherit;
+}
+
+#content_main .modifydate {
+	color:#999999;
+	font-size:10px;
+	padding: 0;
+	background-color:inherit;
+}
+
+
+/** toc page navigation  **/
+.pagenav_prev,
+.pagenav_next {
+	font-size:11px;
+}
+
+
+/** content item navigation  **/
+.pagenavbar  {
+	display:block;
+	width:100%;
+	background-color:inherit;
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999!important;
+	clear:both;
+	font-size: 11px!important;
+	margin-top: 10px;
+	background-image: url(../images/bg_pagenav.jpg);
+	background-repeat: repeat-x;
+	background-position: center bottom;	
+}
+
+.pagenav {
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999;
+	clear:both;
+	font-size: 11px;
+	margin-left: 0;
+	margin-right: 0;
+	background-color:inherit;
+}
+
+.back_button {
+	display:block;
+	text-align:left;
+	font-weight:bold;
+	font-size:12px;
+	width:100%;
+	margin-bottom:10px;
+	letter-spacing:2px;
+}
+
+
+/** highlight word search result **/
+.highlight {
+	font-weight:bold;
+	background-color: #FFFF00;
+	padding: 2px 0 2px 0;
+	
+}
+
+/** table of content layout **/
+table.contenttoc {
+	border:1px solid #000000;
+	padding:1px;
+	width:130px;
+	margin: 0 0 10px 10px;
+}
+
+/** table of content header **/
+.contenttoc th {
+	color:#FFFFFF;
+	background-color:#666666;
+	font-size:11px;
+	display:block;
+	width:124px;
+}
+
+/** unordered list for latest news module **/
+ul.latestnews li,ul.mostread li {
+	line-height: 18px;
+	font-size:11px;
+	font-weight:bold;
+	list-style-type: none;
+	list-style-position: outside;
+}
+
+
+/** fix opera table width for content list in table category**/
+table.contentpane td.contentdescription {
+	width:100%!important;
+}
+
+/* ---------------------
+Links
+--------------------- */
+
+/** any left column link **/
+
+a.pagenav:link ,
+a.pagenav_next:link,
+a.pagenav_pre:link,
+div.back_button a,
+div.back_button a:link,
+a.latestnews:link,
+a.latestnews:active,
+a.latestnews:visited,
+a.mostread:link,
+a.mostread:active,
+a.mostread:visited {
+	text-decoration: none !important;
+	border-bottom: 1px dotted #000000 !important;
+}
+
+a.latestnews:hover,
+a.mostread:hover {
+	color: #000000 !important;
+	text-decoration: none !important;
+	border-bottom: 1px solid #000000 !important;
+}
+
+a.pagenav:hover ,
+a.pagenav_next:hover,
+a.pagenav_pre:hover,
+div.back_button a:hover {
+	text-decoration: none !important;
+	border-bottom: 1px solid #000000 !important;
+}
+
+/*** read more link ***/
+.readon,
+a.readon:link,
+a.readon:active,
+a.readon:visited {
+	color:#99CC00;
+	font-weight:bold;
+	text-align:left;
+	margin-top:10px;
+	letter-spacing: 2px;
+	font-size:10px;
+	text-decoration:none;
+}
+
+a.readon:hover {
+	color:#666666;
+}
+
+
+/*** blog links ***/
+a.blogsection:link,
+a.blogsection:active,
+a.blogsection:visited {
+	color:#000000;
+	text-decoration:none;
+}
+
+/** generic menu item link **/
+a.mainlevel:link,
+a.mainlevel:active,
+a.mainlevel:visited,
+a.sublevel:link,
+a.sublevel:active,
+a.sublevel:visited {
+	color:#000000;
+	text-decoration:none;
+	border: none !important;
+	font-size:11px;
+	line-height: 27px;
+}
+
+a.sublevel:hover {
+	color: #E0FF33 !important;
+}
+
+/** generic menu item link on mouseover **/
+
+a.mainlevel:hover,
+#leftcol a.mainlevel:hover,
+#leftcolmenu a.mainlevel:hover {
+	background:#E0FF33 url(../images/bg_mainlevel.gif) repeat-x center top;
+	color:#000000!important;
+	text-decoration:none!important;
+	border: none !important;
+}
+
+/** specific top right column menu item link **/
+a.mainlevel-right:link,
+a.mainlevel-right:active,
+a.mainlevel-right:visited,
+a.sublevel-right:link,
+a.sublevel-right:active,
+a.sublevel-right:visited {
+	color:#000000;
+	text-decoration:none !important;
+	font-size:11px;
+	border: none !important;
+}
+
+/** specific top right column menu item link on mouseover **/
+a.mainlevel-right:hover {
+	background:#666666;
+	text-decoration:none;
+	border: none !important;
+}
+
+/** pathway link item **/
+a.pathway:link,
+a.pathway:link,
+a.pathway:active,
+a.pathway:visited {
+	color:#999999;
+	text-decoration:none;
+	border: none;
+}
+
+
+/** table of content list **/
+a.toclink:link,
+a.toclink:active,
+a.toclink:visited {
+	color:#000000;
+	font-size:11px;
+	padding:2px 10px 2px 10px;
+	display:block;
+	text-decoration:none;
+}
+
+.pagenavbar a:link,
+.pagenavbar a:active,
+.pagenavbar a:visited  {
+	letter-spacing:2px;
+	color:#000000;
+	font-size: 11px;
+	text-decoration: none;
+}
+
+.pagenavbar a:hover {
+	color:#000000;
+}
+
+
+/** latestnews and popular **/
+.latestnews,
+.mostread {
+	color:#000000;
+}
+
+a.latestnews:hover,
+.mostread a:hover,
+.latestnews a:hover,
+.mostread a:active,
+.latestnews a:hover,
+.mostread a:hover,{
+	border-bottom: 1px solid #000000;
+}
+
+
+/* ---------------------
+mambo module layout
+--------------------- */
+
+/** general module table **/
+table.moduletable,
+#leftcol table,
+#rightcol table {
+	width:100%;
+	float:left;
+	clear:left;
+}
+
+/** general module table **/
+#leftcol table,
+#leftcol table td {
+	font-size:11px !important;
+	color:#000000;
+}
+
+#rightcol table,
+#rightcol table td {
+	font-size:11px !important;
+	color:#FFFFFF;
+}
+
+/** general module title **/
+table.moduletable th {
+	border: solid 1px #000000;
+	color:#000000;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size:13px;
+	line-height:25px;
+	background: #B5B5B5 url(../images/bg_leftcol_module_th.gif) repeat-y left top;
+	height:22px;
+	text-align:left;
+	padding-left:15px;
+	font-weight:normal;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+#leftcol table.moduletable th {
+	background-color: #B8F400;
+	color: #000000;
+	border: none;
+	border-top: solid 1px #000000;
+	border-bottom: solid 1px #000000;
+}
+
+#rightcol table.moduletable th {
+	background-color:#B5B5B5;
+	border: solid 1px #000000;
+}
+/** specific module td table for content top 1 and 2. 
+position:user2 an user3 **/
+#content_top1 table.moduletable td,
+#content_top2 table.moduletable td {
+	background-color:#EFEFEF;
+	height:100px;
+	min-height:100px;
+	vertical-align:top;
+}
+
+/** right column module td **/
+#rightcol table.moduletable td   {
+	padding:5px;
+}
+
+/** generic menu item **/
+
+.mainlevel  {
+	display:block;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
+	color: #000000 !important;
+	padding-left:15px;
+	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
+	font-weight:bold;
+	text-decoration:none;
+}
+
+/** specific left column form **/
+#leftcol form {
+	margin-left:15px;
+}
+
+/** specific left column form **/
+#leftcol .button {
+	font-size:11px;
+	color:#FFFFFF;
+	background-color:#A8DF00;
+	border: 1px solid #CCFF00;
+	width:140px;
+}
+
+
+/** specific left column form **/
+#leftcol .inputbox {
+	font-size:11px;
+	font-weight: bold;
+}
+
+/** module styles in #leftcol **/
+#leftcol table.moduletable td {
+	color:#000000;
+	font-size:11px;
+}
+
+/** search div in top right column. position:user4 **/
+div.search {
+	margin-left:10px;
+}
+
+/** search field in search div **/
+.search .inputbox {
+	width:145px;
+	border: 1px solid #000000;
+}
+
+/* ---------------------
+mambo form layout
+--------------------- */
+
+/** left column input form **/
+#leftcol .inputbox {
+	font-size:11px;
+	margin-bottom:2px;
+}
+
+
+
+/** input button html tag **/
+.button,
+#rightcol .button {
+	font-size:11px;
+	text-transform:uppercase;
+	color:#FFFFFF;
+	font-weight:bold;
+	background-color:#000000;
+	border: 1px solid #666666;
+}
+
+.search  {
+	margin-top:30px;
+}
+
+
+/* 
+mambo top menu layout
+you need to add menu class suffix: -nav
+*/
+
+/** unordered list top menu **/
+ul#mainlevel-nav
+{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	font-size: 0.8em;
+}
+
+/** unordered list item for top menu **/
+ul#mainlevel-nav li
+{
+	display: block;
+	padding-left: 0px;
+	padding-right: 0px;
+	float: left;
+	margin: 0;
+	width: auto !important;
+	font-size: 11px;
+	line-height: 23px;
+	white-space: nowrap;
+}
+
+/** unordered list item link for top menu **/
+ul#mainlevel-nav li a
+{
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: none;
+	color: #FFFFFF;
+	font-weight:bold;
+}
+
+/** unordered list item link for top menu for firefox only **/
+#topmenu>ul#mainlevel-nav li a {
+	width: auto;
+}
+
+/** unordered list item for top menu for firefox only **/
+ul#mainlevel-nav li a:hover {
+	background: #535353;
+	text-decoration:none;
+}
+
+
+ /*
+specific right column menu item. position:right
+you need to add menu class suffix: -right and
+module class suffix: -right
+ */
+.mainlevel-right {
+	display:block;
+	height:25px;
+	line-height:25px;
+	padding-left:15px;
+	color: #FFFFFF;
+	background:#333333 url(../images/bg_mainlevel_right.gif) repeat-x center top;
+	font-weight:bold;
+}
+
+/** 
+moduletable specific with background image
+you need to add modules class suffix: -bgimg
+ **/
+table.moduletable-bgimg {
+	background:transparent url(../images/bg_module.jpg) no-repeat center bottom;
+	float:left;
+	clear:left;
+	width:100%;
+}
+
+table.moduletable-bgimg td {
+	padding: 5px ;
+	font-size:11px;
+}
+
+table.moduletable-bgimg td td {
+	padding: 0!important;
+}
+
+/** for polls **/
+.poll {
+	font-size:11px;
+	line-height: 16px;
+}
+
+table.pollstableborder .sectiontableentry2 {
+	background-color:transparent; 
+	text-align:left; 
+}
+table.pollstableborder .sectiontableentry1 {
+	background-color:#333333; 
+	text-align:left;
+}
+
+.moduletable_bgimg table.pollstableborder td.sectiontableentry2,
+.moduletable_bgimg table.pollstableborder td.sectiontableentry1 {
+	background-color:transparent!important; 
+	text-align:left!important; 
+}
+
+
+#bottompadding	{
+	position:relative;
+	width:900px;
+	display:block;
+	height:0px;
+	margin-top:-100px;
+}
+
+/** hack to make any div or table inside content will not stretcg outside area*/
+table.contentpane  table table input.inputbox {
+	max-width:80px;
+	width:80px;
+}
+
+table.contentpane {
+	width:390px!important;
+}
+
+.contentpaneopen {
+	width:100%!important;
+}
+
+.contentpaneopen tr.sectiontableentry2 td,
+.contentpaneopen tr.sectiontableentry1 td{
+	display:block;
+	width:390px!important;
+}
+
+#con_global div, #con_global table,
+#hp_view_standard_photo_con1 div div,
+#hp_view_agen_con {
+	width:390px!important;
+	text-align:left;
+}
+
+#hp_view_standard_photo_con1 div div,
+#hp_view_standard_photo_con2,
+#hp_view_standard_photo_con3,
+#hp_view_agen_con {
+	width:390px!important;
+	text-align:left;
+}
+
+table.contentpane  table  {
+	width:390px!important;
+	text-align:left;
+}
+
+table.contentpane  td.contentheading  {
+	width:200px!important;
+}
+
+table.contentpane  td.buttonheading  {
+	width:150px!important;
+}
+
+#bottompadding	{
+	position:relative;
+	width:760px;
+	display:block;
+	height:20px;
+	margin-top:-100px;
+}
\ No newline at end of file
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_body.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_body.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_header.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_header.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_inside.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_inside.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_leftcol.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_leftcol.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_leftcol_module_th.gif and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_leftcol_module_th.gif differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_mainlevel.gif and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_mainlevel.gif differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_mainlevel_right.gif and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_mainlevel_right.gif differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_module.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_module.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_module_contenttop.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_module_contenttop.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_pagenav.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_pagenav.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_spacer.gif and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_spacer.gif differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/bg_topright.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/bg_topright.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/img_header.jpg and 4.6rc2/templates/waterandstone800_greenandblack/images/img_header.jpg differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/indent1.png and 4.6rc2/templates/waterandstone800_greenandblack/images/indent1.png differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/indent2.png and 4.6rc2/templates/waterandstone800_greenandblack/images/indent2.png differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/indent3.png and 4.6rc2/templates/waterandstone800_greenandblack/images/indent3.png differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/indent4.png and 4.6rc2/templates/waterandstone800_greenandblack/images/indent4.png differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/indent5.png and 4.6rc2/templates/waterandstone800_greenandblack/images/indent5.png differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/indent6.png and 4.6rc2/templates/waterandstone800_greenandblack/images/indent6.png differ
Binary files 4.5.4/templates/waterandstone800_greenandblack/images/logo.gif and 4.6rc2/templates/waterandstone800_greenandblack/images/logo.gif differ
diff -ruN 4.5.4/templates/waterandstone800_greenandblack/index.php 4.6rc2/templates/waterandstone800_greenandblack/index.php
--- 4.5.4/templates/waterandstone800_greenandblack/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_greenandblack/index.php	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,132 @@
+<?php
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php mosShowHead(); ?>
+<?php
+if ( $my->id ) {
+	initEditor();
+}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<link href="<?php echo $mosConfig_live_site;?>/templates/waterandstone800_greenandblack/css/template_css.css" rel="stylesheet" type="text/css"/>
+</head>
+<body class="waterbody">
+
+<div align="center">
+<div id="container">
+	<div id="containerbg">
+		<div id="outerleft">
+			<!-- start logo -->
+			<div id="logo">
+			  <a href="index.php"><img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone800_greenandblack/images/logo.gif" alt="logo image" border="0" align="top" /></a>
+			</div>
+			<!-- end logo -->
+			<!-- start top menu. position:top -->
+			<div id="topmenu">
+			<?php mosLoadModules('top',-1); ?>
+			</div>
+			<!-- end top menu. position:top -->
+			<!-- start image header -->
+			<div id="imgheader">
+			<img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone800_greenandblack/images/img_header.jpg" alt="header image" />
+			</div>
+			<!-- end image header -->
+			<div id="container_inner">
+				<!-- start left column.position:left,user1 -->
+				<div id="leftcol">
+				<?php mosLoadModules('left'); ?>
+				</div>
+				<div id="leftcolmenu">
+				<?php mosLoadModules('user1'); ?>
+				</div>
+				<!-- end left column.position:left -->
+				<!-- start content top wrapper -->
+				<?php
+				if (mosCountModules('user2') >= 1 OR mosCountModules('user3') >= 1 ) {
+				?>
+				<div id="content_top_wrapper">
+					<!-- start content top 1. position:user2 -->
+					<div id="content_top1">
+					<?php mosLoadModules('user2'); ?>
+					</div>
+					<!-- end content top 1 -->
+					<!-- start content top 2. position:user3 -->
+					<div id="content_top2">
+					<?php mosLoadModules('user3'); ?>
+					</div>
+					<!-- end content top 2 -->
+				</div>
+				<?php
+				}
+				?>
+				<!-- end content top wrapper -->
+				<!-- start main body -->
+				<div id="content_main">
+				<?php mosPathWay(); ?>
+				<table width="395" border="0" cellspacing="0" cellpadding="0">
+				  <tr>
+					<td>
+					<?php mosMainBody(); ?>
+					</td>
+				  </tr>
+				</table>
+				</div>
+				<!-- end main body -->
+			</div>
+		</div>
+		<div id="outerright">
+			<!-- start right top header. position:header -->
+			<div id="rightcol_top">
+			<?php mosLoadModules('header'); ?>
+			</div>
+			<!-- end right top header.-->
+			<!-- start right column. position:newsflash,right,user4 -->
+			<div id="rightcol">
+			<?php mosLoadModules('newsflash'); ?>
+			<?php mosLoadModules('right'); ?>
+			<?php mosLoadModules('user4'); ?>
+			</div>
+			<!-- end right column. -->
+		</div>
+		<!-- start banner. position:banner -->
+		<div class="clear">
+		</div>
+		<?php
+		if (mosCountModules('banner') >= 1) {
+		?>
+		<div id="banner">
+			<div align="left">
+			<?php mosLoadModules('banner'); ?>
+			</div>
+		</div>
+		<?php
+		} else {
+		?>
+		<div id="blackline">
+		</div>
+		<?php
+		}
+		?>
+		<!-- end banner. -->
+		<div class="clear">
+		</div>
+		<div id="bottompadding">
+		</div>
+	</div>
+	<!-- copyright notice -->
+	<div id="copyright">
+	<?php include_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/footer.php' ); ?>
+	</div>
+
+</div>
+</div>
+<?php mosLoadModules('debug', -1);?>
+</body>
+</html>
diff -ruN 4.5.4/templates/waterandstone800_greenandblack/templateDetails.xml 4.6rc2/templates/waterandstone800_greenandblack/templateDetails.xml
--- 4.5.4/templates/waterandstone800_greenandblack/templateDetails.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone800_greenandblack/templateDetails.xml	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="template" version="4.5.3">
+	<name>waterandstone800_greenandblack</name>
+	<creationDate>21/05/06</creationDate>
+	<author>waterandstone</author>
+	<copyright>GNU/GPL</copyright>
+	<authorEmail>info@waterandstone.com</authorEmail>
+	<authorUrl>http://www.waterandstone.com</authorUrl>
+	<version>1.1</version>
+	<description>The Water and Stone Green and Black Template optimized for 800px x 600px screen resolution for use with any type of website with easy customization</description>
+	<files>
+		<filename>index.php</filename>
+		<filename>template_thumbnail.png</filename>
+	</files>
+	<images>
+		<filename>images/bg_body.jpg</filename>
+		<filename>images/bg_header.jpg</filename>
+		<filename>images/bg_inside.jpg</filename>
+		<filename>images/bg_leftcol.jpg</filename>
+		<filename>images/bg_leftcol_module_th.gif</filename>
+		<filename>images/bg_mainlevel.gif</filename>
+		<filename>images/bg_mainlevel_right.gif</filename>
+		<filename>images/bg_module.jpg</filename>
+		<filename>images/bg_module_contenttop.jpg</filename>
+		<filename>images/bg_pagenav.jpg</filename>
+		<filename>images/bg_spacer.gif</filename>
+		<filename>images/bg_topright.jpg</filename>
+		<filename>images/img_header.jpg</filename>
+		<filename>images/indent1.png</filename>
+		<filename>images/indent2.png</filename>
+		<filename>images/indent3.png</filename>
+		<filename>images/indent4.png</filename>
+		<filename>images/indent5.png</filename>
+		<filename>images/indent6.png</filename>
+		<filename>images/logo.gif</filename>
+		</images>
+	<css>
+		<filename>css/template_css.css</filename>
+	</css>
+</mosinstall>
Binary files 4.5.4/templates/waterandstone800_greenandblack/template_thumbnail.png and 4.6rc2/templates/waterandstone800_greenandblack/template_thumbnail.png differ
diff -ruN 4.5.4/templates/waterandstone_blue/css/template_css.css 4.6rc2/templates/waterandstone_blue/css/template_css.css
--- 4.5.4/templates/waterandstone_blue/css/template_css.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_blue/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,879 @@
+* {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+.waterbody {
+	background:#F8F7F2 url(../images/bg_body.jpg) repeat-x left top;
+	margin:0;
+	color:#333333;
+}
+
+div,
+td,
+p {
+	font-size:12px;
+	line-height:18px;
+	color:#333333;
+}
+
+a,
+a:link,
+a:active,
+a:visited {
+	text-decoration:underline;
+	color:#000000;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+ul {
+	margin: 5px;
+	padding: 5px;
+	list-style: none;
+	list-style-type: square;
+}
+
+li {
+	line-height: 18px;
+	padding-left: 5px;
+	padding-top: 0px;
+	list-style-position: inside;
+}
+
+/** To center the objects **/
+.center {
+	text-align:center!important;
+}
+
+/* ---------------------
+template layout
+--------------------- */
+
+/** wrapper to make the page center **/
+#container {
+	width:900px;
+	margin: 55px auto;
+	padding:0;
+	text-align: left;
+}
+
+/**
+hold background, it should be float:left
+that's way we can not put it in #container
+**/
+#containerbg {
+	position:relative;
+	width: 900px;
+	background:transparent url(../images/bg_inside.jpg) repeat-y left top;
+	float:left;
+	top:0;
+	left:0;
+}
+
+#outerleft {
+	position:relative;
+	float:left;
+	clear:left;
+	width:730px;
+	
+}
+
+#outerright {
+	position:relative;
+	width:170px;
+	float:right;
+	clear:right;
+}
+
+#logo {
+	position:relative;
+	width:100%;
+	height:74px;
+	float:left;
+	background:#FFFFFF url(../images/bg_header.jpg) no-repeat left top;
+}
+
+/** div container for top menu. position:top **/
+#topmenu {
+	position:relative;
+	float:left;
+	clear:left;
+	background-color:#000000;
+	width: 100%;
+}
+
+/** div container for image header **/
+#imgheader {
+	position:relative;
+	float:left;
+	clear:left;
+	width:100%;
+	height:99px;
+	background-color: #000000;
+}
+
+#container_inner {
+	position:relative;
+	float:left;
+	clear:left;
+	width:730px;
+}
+
+/** div container for left column **/
+#leftcol {
+	position:relative;
+	float:left;
+	clear:left;
+	width:172px;
+}
+
+#leftcolmenu {
+	position:relative;
+	overflow:auto;
+}
+
+
+/** div wrapper for user2 & user3 **/
+#content_top_wrapper {
+	position:relative;
+	float:right;
+	clear:right;
+	width:542px;
+	display:inline;
+	margin: 4px 8px 0 0;
+}
+
+/** div container for position:user2 **/
+#content_top1 {
+	position:relative;
+	float:left;
+	clear:left;
+	width:269px;
+}
+
+/** div container for position:user3 **/
+#content_top2 {
+	position:relative;
+	float:right;
+	clear:right;
+	width:269px;
+}
+
+/** div container for mainbody **/
+#content_main {
+	position:relative;
+	float:left;
+	width:520px;
+	margin:15px 0 20px 20px;
+	background-color:#FFFFFF;
+}
+
+/** div container for right column **/
+#rightcol_top,
+#rightcol {
+	float:left;
+	clear:left;
+	width:168px;
+	margin:0 0 0 1px;
+	display:inline;
+	overflow:auto;
+}
+
+/** div container for right column position:header **/
+#rightcol_top {
+	height:70px;
+	min-height:70px;
+	background:transparent url(../images/bg_topright.jpg) no-repeat center top;
+}
+
+/** div container for banner position:banner **/
+#banner {
+	position:relative;
+	clear:left;
+	float:left;
+	width:515px;
+	height:65px;
+	min-height:65px;
+	color:#FFFFFF;
+	font-size:10px;
+	padding: 20px 0 0 215px;
+}
+
+#blackline {
+	position:relative;
+	clear:left;
+	float:left;
+	width:730px;;
+	height:10px;
+	min-height:10px;
+	background-color: #000000;
+	color:#FFFFFF;
+	font-size:10px;
+}
+
+/** copyright **/
+
+#copyright {
+	position:relative;
+	width:900px;
+	display:block;
+	clear:both;
+	float:left;
+}
+
+#copyright div {
+	color:#666666;
+	font-size:10px;
+	font-weight:bold;
+	display:block!important;
+	width:900px;
+	float:left;
+	clear:left;
+	margin:-10px 0 0 0;
+	text-align:left;
+}
+
+
+
+/* ---------------------
+mambo content layout
+--------------------- */
+
+/** pathway block **/
+span.pathway {
+	display:block;
+	text-align:left;
+	color:#000000;
+	font-size:10px;
+	font-weight:bold;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #E5E5E5;
+	height:20px;
+	margin-bottom:10px;
+}
+
+/** content title **/
+.componentheading {
+	font-family:Georgia, "Times New Roman", Times, serif;
+	color:#000000;
+	font-size: 20px;
+	line-height:25px;
+	padding: 5px 0 5px 0;
+	display:block;
+}
+
+.contentheading,
+.contentpagetitle,
+a.contentpagetitle:link,
+a.contentpagetitle:active,
+a.contentpagetitle:visited {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size:16px;
+	color:#3973AC;
+	font-weight: bold;
+	padding-top: 25px;
+	background-color:inherit;
+	display:block;
+}
+
+.contentpaneopen {
+	width:100%;
+}
+
+
+.buttonheading {
+	width: 16px!important;
+	text-align:right;
+}
+
+
+td.sectiontableheader {
+	font-weight: bold;
+}
+
+.category, .categorytitle {
+	font-weight: bold;
+	color:#3973AC;
+	background-color:inherit;
+}
+
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
+	background-color: #FBFBF4;
+	padding: 2px;
+	color:#333333;
+	
+}
+
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
+	background-color: #FFFFFF;
+	padding: 2px;
+	color:#333333;
+}
+
+tr.sectiontableentry1 td,
+tr.sectiontableentry2 td {
+	word-wrap:break-word;
+}
+
+/** blog Styles **/
+.blogsection {
+	color:#3973AC;
+	background-color:inherit;
+}
+
+.blog_more {
+	font-weight: bold;
+	line-height: 25px;
+	padding-top: 20px;
+	color: #3973AC;
+	border-bottom: 1px solid #E5E5E5;
+	background-color:inherit;
+}
+
+/** small text in content **/
+.small {
+	color:#999999;
+	font-size:10px;
+	font-weight: bold;
+	background-color:inherit;
+}
+
+/** date info in content **/
+#content_main .createdate {
+	color:#4A87C4;
+	font-size:10px;
+	padding: 0 0 15px 0;
+	line-height:8px;
+	background-color:inherit;
+}
+
+#content_main .modifydate {
+	color:#999999;
+	font-size:10px;
+	padding: 0;
+	background-color:inherit;
+}
+
+
+/** content item navigation  **/
+.pagenavbar  {
+	display:block;
+	width:100%;
+	background-color:inherit;
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999!important;
+	clear:both;
+	font-size: 11px!important;
+	margin-top: 10px;
+	background-image: url(../images/bg_pagenav.jpg);
+	background-repeat: repeat-x;
+	background-position: center bottom;	
+}
+
+.pagenav {
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999;
+	clear:both;
+	font-size: 11px;
+	margin-left: 0;
+	margin-right: 0;
+	background-color:inherit;
+}
+
+.back_button {
+	display:block;
+	text-align:left;
+	font-weight:bold;
+	font-size:12px;
+	width:100%;
+	margin-bottom:10px;
+	letter-spacing:2px;
+}
+
+/** highlight word search result **/
+.highlight {
+	font-weight:bold;
+	background-color: #FFFF00;
+	padding: 2px 0 2px 0;
+	
+}
+
+/** table of content layout **/
+table.contenttoc {
+	border:1px solid #000000;
+	padding:1px;
+	width:130px;
+	margin: 0 0 10px 10px;
+}
+
+/** table of content header **/
+.contenttoc th {
+	color:#FFFFFF;
+	background-color:#666666;
+	font-size:11px;
+	display:block;
+	width:124px;
+}
+
+/** unordered list for latest news module **/
+ul.latestnews li,ul.mostread li {
+	line-height: 18px;
+	font-size:11px;
+	font-weight:bold;
+	list-style-type: none;
+	list-style-position: outside;
+}
+
+
+/** fix opera table width for content list in table category**/
+table.contentpane td.contentdescription {
+	width:100%!important;
+}
+
+
+/* ---------------------
+Links
+--------------------- */
+
+/** any left column link **/
+#leftcol a:link,
+#leftcol a:active,
+#leftcol a:visited,
+#leftcolmenu a:link,
+#leftcolmenu a:active,
+#leftcolmenu a:visited
+ {
+	color:#FFFFFF;
+}
+
+a.pagenav:link ,
+a.pagenav_next:link,
+a.pagenav_pre:link,
+div.back_button a,
+div.back_button a:link,
+a.latestnews:link,
+a.latestnews:active,
+a.latestnews:visited,
+a.mostread:link,
+a.mostread:active,
+a.mostread:visited {
+	text-decoration:none;
+}
+
+/*** read more link ***/
+.readon,
+a.readon:link,
+a.readon:active,
+a.readon:visited {
+	color:#666666;
+	font-weight:bold;
+	text-align:left;
+	margin-top:10px;
+	letter-spacing: 2px;
+	font-size:10px;
+	text-decoration:none;
+}
+
+/*** blog links ***/
+a.blogsection:link,
+a.blogsection:active,
+a.blogsection:visited {
+	color:#3973AC;
+	text-decoration:none;
+}
+
+/** generic menu item link **/
+a.mainlevel:link,
+a.mainlevel:active,
+a.mainlevel:visited,
+a.sublevel:link,
+a.sublevel:active,
+a.sublevel:visited {
+	color:#FFFFFF;
+	text-decoration:none;
+	font-size:11px;
+	line-height: 27px;
+}
+
+/** generic menu item link on mouseover **/
+a.mainlevel:hover,
+#leftcol a.mainlevel:hover,
+#leftcolmenu a.mainlevel:hover {
+	background-color:#326A99;
+	color:#FFFFFF!important;
+	text-decoration:none!important;
+}
+
+
+ /*
+specific right column menu item. position:right
+you need to add menu class suffix: -right and
+module class suffix: -right
+ */
+.mainlevel-right {
+	display:block;
+	height:25px;
+	line-height:25px;
+	padding-left:15px;
+	background:#E9E8D3 url(../images/bg_mainlevel_right.gif) repeat-x center top;
+	font-weight:bold;
+}
+
+a.mainlevel-right:link,
+a.mainlevel-right:active,
+a.mainlevel-right:visited,
+a.sublevel-right:link,
+a.sublevel-right:active,
+a.sublevel-right:visited {
+	color:#000000;
+	text-decoration:none;
+	font-size:11px;
+	background-color:#E9E8D3;
+}
+
+/** specific top right column menu item link on mouseover **/
+a.mainlevel-right:hover {
+	background-color:#DFDDC6;
+	text-decoration:none;
+}
+
+
+/** pathway link item **/
+a.pathway:link,
+a.pathway:link,
+a.pathway:active,
+a.pathway:visited {
+	color:#999999;
+	text-decoration:none;
+}
+
+
+/** table of content list **/
+a.toclink:link,
+a.toclink:active,
+a.toclink:visited {
+	color:#3973AC;
+	font-size:11px;
+	padding:2px 10px 2px 10px;
+	display:block;
+	text-decoration:none;
+}
+
+.pagenavbar a:link,
+.pagenavbar a:active,
+.pagenavbar a:visited  {
+	letter-spacing:2px;
+	color:#000000;
+	font-size: 11px;
+	text-decoration: none;
+}
+
+.pagenavbar a:hover {
+	color:#3973AC;
+}
+
+/** latestnews and popular **/
+.latestnews,
+.mostread {
+	color:#000000;
+}
+
+a.latestnews:link,
+.mostread a:link,
+.latestnews a:active,
+.mostread a:active,
+.latestnews a:hover,
+.mostread a:hover,
+.latestnews a:visited,
+.mostread a:visited {
+	color:#000000;
+	text-decoration:underline;
+}
+
+/** underline on hover **/
+a.toclink:hover,
+a.latestnews:hover,
+a.mostread:hover,
+a.pathway:hover,
+a.sublevel:hover,
+a.sublevel-right:hover,
+a.blogsection:hover,
+a.readon:hover,
+a.pagenav:hover ,
+a.pagenav_next:hover,
+a.pagenav_pre:hover,
+a.latestnews:hover {
+	text-decoration:underline;
+	color:#3973AC;
+	background-color:inherit;
+}
+
+#leftcol a:hover {
+	color: #93B7DB;
+	text-decoration:underline;
+}
+
+
+/* ---------------------
+mambo module layout
+--------------------- */
+
+/** general module table **/
+table.moduletable,
+#leftcol table,
+#rightcol table {
+	width:100%;
+	float:left;
+	clear:left;
+}
+
+/** general module table **/
+#leftcol table,
+#leftcol table td {
+	font-size:11px !important;
+	color:#FFFFFF !important;
+}
+
+#rightcol table,
+#rightcol table td {
+	font-size:11px !important;
+	color:#030303;
+}
+
+/** general module title **/
+table.moduletable th {
+	border-bottom: 1px solid #000000;	
+	color:#000000;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size:13px;
+	line-height:25px;
+	background: #E3E2C6 url(../images/bg_leftcol_module_th.gif) repeat-y left top;
+	height:22px;
+	text-align:left;
+	padding-left:15px;
+	font-weight:normal;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+#leftcol table.moduletable th {
+	background: #ACCCE6 url(../images/bg_leftcol_module_th.gif) repeat-y left top;
+}
+
+#rightcol table.moduletable th {
+	background-color:#B3AE88;
+}
+
+
+/** specific module td table for content top 1 and 2. 
+position:user2 an user3 **/
+#content_top1 table.moduletable td,
+#content_top2 table.moduletable td {
+	background-color:#F7F7EE;
+	height:100px;
+	min-height:100px;
+	vertical-align:top;
+}
+
+/** right column module td **/
+#rightcol table.moduletable td   {
+	padding:5px;
+}
+
+/** generic menu item **/
+
+.mainlevel  {
+	display:block;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
+	padding-left:15px;
+	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
+	font-weight:bold;
+	text-decoration:none;
+}
+
+/** specific left column form **/
+#leftcol form {
+	margin-left:15px;
+}
+
+/** specific left column form **/
+#leftcol .button {
+	font-size:11px;
+	color:#FFFFFF;
+	background-color:#5F9BCD;
+	border-right: 1px solid #49779D;
+	border-bottom: 1px solid #49779D;
+	border-left: 1px solid #7CADD6;
+	border-top: 1px solid #7CADD6;
+	width:140px;
+}
+
+
+/** specific left column form **/
+#leftcol .inputbox {
+	font-size:11px;
+	font-weight: bold;
+}
+
+/** module styles in #leftcol **/
+#leftcol table.moduletable td {
+	color:#DADADA;
+	font-size:11px;
+}
+
+/** search div in top right column. position:user4 **/
+div.search {
+	margin-left:10px;
+}
+
+/** search field in search div **/
+.search .inputbox {
+	width:145px;
+	border: 1px solid #000000;
+}
+
+/* ---------------------
+mambo form layout
+--------------------- */
+
+/** left column input form **/
+#leftcol .inputbox {
+	font-size:11px;
+	/*border: 1px solid #000000;*/
+	margin-bottom:2px;
+}
+
+
+
+/** input button html tag **/
+.button,
+#rightcol .button {
+	font-size:11px;
+	text-transform:uppercase;
+	color:#726C49;
+	font-weight:bold;
+	background-color:#F7F7EE;
+	border-top: 1px solid #D0CDB6;
+	border-right: 1px solid #5E5B47;
+	border-bottom: 1px solid #5E5B47;
+	border-left: 1px solid #D0CDB6;
+}
+
+.search  {
+	margin-top:30px;
+}
+
+
+
+
+/* 
+mambo top menu layout
+you need to add menu class suffix: -nav
+*/
+
+/** unordered list top menu **/
+ul#mainlevel-nav
+{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	font-size: 0.8em;
+}
+
+/** unordered list item for top menu **/
+ul#mainlevel-nav li
+{
+	display: block;
+	padding-left: 0px;
+	padding-right: 0px;
+	float: left;
+	margin: 0;
+	width: auto !important;
+	font-size: 11px;
+	line-height: 23px;
+	white-space: nowrap;
+}
+
+/** unordered list item link for top menu **/
+ul#mainlevel-nav li a
+{
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: none;
+	color: #FFFFFF;
+	font-weight:bold;
+}
+
+/** unordered list item link for top menu for firefox only **/
+#topmenu>ul#mainlevel-nav li a {
+	width: auto;
+}
+
+/** unordered list item for top menu for firefox only **/
+ul#mainlevel-nav li a:hover {
+	background: #535353;
+	text-decoration:none;
+}
+
+
+/** 
+moduletable specific with background image
+you need to add modules class suffix: -bgimg
+ **/
+table.moduletable-bgimg {
+	background:transparent url(../images/bg_module.jpg) no-repeat center bottom;
+	float:left;
+	clear:left;
+	width:100%;
+}
+
+table.moduletable-bgimg td {
+	padding: 5px ;
+	font-size:11px;
+}
+
+table.moduletable-bgimg td td {
+	padding: 0!important;
+}
+
+/** for polls **/
+.poll {
+	font-size:11px;
+	line-height: 16px;
+}
+
+table.pollstableborder .sectiontableentry2 {
+	background-color:transparent; 
+	text-align:left; 
+}
+table.pollstableborder .sectiontableentry1 {
+	background-color:#E3E2C6; 
+	text-align:left;
+}
+
+.moduletable_bgimg table.pollstableborder td.sectiontableentry2,
+.moduletable_bgimg table.pollstableborder td.sectiontableentry1 {
+	background-color:transparent!important; 
+	text-align:left!important; 
+}
+
+
+#bottompadding	{
+	position:relative;
+	width:900px;
+	display:block;
+	height:0px;
+	margin-top:-100px;
+}
\ No newline at end of file
Binary files 4.5.4/templates/waterandstone_blue/images/bg_body.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_body.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_header.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_header.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_inside.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_inside.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_leftcol.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_leftcol.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_leftcol_module_th.gif and 4.6rc2/templates/waterandstone_blue/images/bg_leftcol_module_th.gif differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_mainlevel.gif and 4.6rc2/templates/waterandstone_blue/images/bg_mainlevel.gif differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_mainlevel_right.gif and 4.6rc2/templates/waterandstone_blue/images/bg_mainlevel_right.gif differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_module.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_module.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_module_contenttop.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_module_contenttop.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_pagenav.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_pagenav.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_spacer.gif and 4.6rc2/templates/waterandstone_blue/images/bg_spacer.gif differ
Binary files 4.5.4/templates/waterandstone_blue/images/bg_topright.jpg and 4.6rc2/templates/waterandstone_blue/images/bg_topright.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/img_header.jpg and 4.6rc2/templates/waterandstone_blue/images/img_header.jpg differ
Binary files 4.5.4/templates/waterandstone_blue/images/indent1.png and 4.6rc2/templates/waterandstone_blue/images/indent1.png differ
Binary files 4.5.4/templates/waterandstone_blue/images/indent2.png and 4.6rc2/templates/waterandstone_blue/images/indent2.png differ
Binary files 4.5.4/templates/waterandstone_blue/images/indent3.png and 4.6rc2/templates/waterandstone_blue/images/indent3.png differ
Binary files 4.5.4/templates/waterandstone_blue/images/indent4.png and 4.6rc2/templates/waterandstone_blue/images/indent4.png differ
Binary files 4.5.4/templates/waterandstone_blue/images/indent5.png and 4.6rc2/templates/waterandstone_blue/images/indent5.png differ
Binary files 4.5.4/templates/waterandstone_blue/images/indent6.png and 4.6rc2/templates/waterandstone_blue/images/indent6.png differ
Binary files 4.5.4/templates/waterandstone_blue/images/logo.gif and 4.6rc2/templates/waterandstone_blue/images/logo.gif differ
diff -ruN 4.5.4/templates/waterandstone_blue/index.php 4.6rc2/templates/waterandstone_blue/index.php
--- 4.5.4/templates/waterandstone_blue/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_blue/index.php	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,129 @@
+<?php
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php mosShowHead(); ?>
+<?php
+if ( $my->id ) {
+	initEditor();
+}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<link href="<?php echo $mosConfig_live_site;?>/templates/waterandstone_blue/css/template_css.css" rel="stylesheet" type="text/css"/>
+</head>
+<body class="waterbody">
+
+<div align="center">
+<div id="container">
+	<div id="containerbg">
+		<div id="outerleft">
+			<!-- start logo -->
+			<div id="logo">
+			  <a href="index.php"><img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone_blue/images/logo.gif" alt="logo image" border="0" align="top" /></a>
+			</div>
+			<!-- end logo -->
+			<!-- start top menu -->
+			<div id="topmenu">
+			<?php mosLoadModules('top',-1); ?>
+			</div>
+			<!-- end top menu.  -->
+			<!-- start image header -->
+			<div id="imgheader">
+			<img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone_blue/images/img_header.jpg" alt="header image" />
+			</div>
+			<!-- end image header -->
+			<div id="container_inner">
+				<!-- start left column. -->
+				<div id="leftcol">
+				<?php mosLoadModules('left'); ?>
+				</div>
+				<div id="leftcolmenu">
+				<?php mosLoadModules('user1'); ?>
+				</div>
+				<!-- end left column. -->
+				<!-- start content top wrapper -->
+				<?php
+				if (mosCountModules('user2') >= 1 OR mosCountModules('user3') >= 1 ) {
+				?>
+				<div id="content_top_wrapper">
+					<!-- start content top 1.  -->
+					<div id="content_top1">
+					<?php mosLoadModules('user2'); ?>
+					</div>
+					<!-- end content top 1 -->
+					<!-- start content top 2.  -->
+					<div id="content_top2">
+					<?php mosLoadModules('user3'); ?>
+					</div>
+					<!-- end content top 2 -->
+				</div>
+				<?php
+				}
+				?>
+				<!-- end content top wrapper -->
+				<!-- start main body -->
+				<div id="content_main">
+					<?php mosPathWay(); ?>
+					<table width="519" border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td>
+						<?php mosMainBody(); ?>
+						</td>
+					  </tr>
+					</table>
+				</div>
+				<!-- end main body -->
+			</div>
+		</div>
+		<div id="outerright">
+			<!-- start right top header.  -->
+			<div id="rightcol_top">
+			<?php mosLoadModules('header'); ?>
+			</div>
+			<!-- end right top header.-->
+			<!-- start right column. -->
+			<div id="rightcol">
+			<?php mosLoadModules('newsflash'); ?>
+			<?php mosLoadModules('right'); ?>
+			<?php mosLoadModules('user4'); ?>
+			</div>
+			<!-- end right column. -->
+		</div>
+		
+		<div class="clear">
+		</div>
+		<?php
+		if (mosCountModules('banner') >= 1) {
+		?>
+			<!-- start banner.  -->
+			<div id="banner">
+			<?php mosLoadModules('banner'); ?>
+			</div>
+			<!-- end banner. -->
+		<?php
+		}
+		?>
+		
+		<div id="blackline">
+		</div>
+		<div class="clear">
+		</div>
+		<div id="bottompadding"></div>
+	</div>
+	<!-- copyright notice -->
+	<div id="copyright">
+	<?php include_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/footer.php' ); ?>
+	</div>
+
+</div>
+</div>
+
+<?php mosLoadModules('debug', -1);?>
+</body>
+</html>
diff -ruN 4.5.4/templates/waterandstone_blue/templateDetails.xml 4.6rc2/templates/waterandstone_blue/templateDetails.xml
--- 4.5.4/templates/waterandstone_blue/templateDetails.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_blue/templateDetails.xml	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="template" version="4.5.3">
+	<name>waterandstone_blue</name>
+	<creationDate>07/05/06</creationDate>
+	<author>waterandstone</author>
+	<copyright>GNU/GPL</copyright>
+	<authorEmail>info@waterandstone.com</authorEmail>
+	<authorUrl>http://www.waterandstone.com</authorUrl>
+	<version>1.1</version>
+	<description>The Water and Stone Blue Template optimized for 1024px x 768px screen resolution for use with any type of website with easy customization</description>
+	<files>
+		<filename>index.php</filename>
+		<filename>template_thumbnail.png</filename>
+	</files>
+	<images>
+		<filename>images/bg_body.jpg</filename>
+		<filename>images/bg_header.jpg</filename>
+		<filename>images/bg_inside.jpg</filename>
+		<filename>images/bg_leftcol.jpg</filename>
+		<filename>images/bg_leftcol_module_th.gif</filename>
+		<filename>images/bg_mainlevel.gif</filename>
+		<filename>images/bg_mainlevel_right.gif</filename>
+		<filename>images/bg_module.jpg</filename>
+		<filename>images/bg_module_contenttop.jpg</filename>
+		<filename>images/bg_pagenav.jpg</filename>
+		<filename>images/bg_spacer.gif</filename>
+		<filename>images/bg_topright.jpg</filename>
+		<filename>images/img_header.jpg</filename>
+		<filename>images/indent1.png</filename>
+		<filename>images/indent2.png</filename>
+		<filename>images/indent3.png</filename>
+		<filename>images/indent4.png</filename>
+		<filename>images/indent5.png</filename>
+		<filename>images/indent6.png</filename>
+		<filename>images/logo.gif</filename>
+		</images>
+	<css>
+		<filename>css/template_css.css</filename>
+	</css>
+</mosinstall>
Binary files 4.5.4/templates/waterandstone_blue/template_thumbnail.png and 4.6rc2/templates/waterandstone_blue/template_thumbnail.png differ
diff -ruN 4.5.4/templates/waterandstone_green/css/template_css.css 4.6rc2/templates/waterandstone_green/css/template_css.css
--- 4.5.4/templates/waterandstone_green/css/template_css.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_green/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,882 @@
+* {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+.waterbody {
+	background:#FFFFFF url(../images/bg_body.jpg) repeat-x left top;
+	margin:0;
+	color:#333333;
+}
+
+div,
+td,
+p {
+	font-size:12px;
+	line-height:18px;
+	color:#333333;
+}
+
+a,
+a:link,
+a:active,
+a:visited {
+	text-decoration:underline;
+	color:#000000;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+ul {
+	margin: 5px;
+	padding: 5px;
+	list-style: none;
+	list-style-type: square;
+}
+
+li {
+	line-height: 18px;
+	padding-left: 5px;
+	padding-top: 0px;
+	list-style-position: inside;
+}
+
+/** To center the objects **/
+.center {
+	text-align:center!important;
+}
+
+/* ---------------------
+template layout
+--------------------- */
+
+/** wrapper to make the page center **/
+#container {
+	width:900px;
+	margin: 0px auto;
+	padding:0;
+	text-align: left;
+}
+
+/**
+hold background, it should be float:left
+that's way we can not put it in #container
+**/
+#containerbg {
+	position:relative;
+	width: 900px;
+	background:transparent url(../images/bg_inside.jpg) repeat-y left top;
+	float:left;
+	top:0;
+	left:0;
+}
+
+#outerleft {
+	position:relative;
+	float:left;
+	clear:left;
+	width:730px;
+	
+}
+
+#outerright {
+	position:relative;
+	width:170px;
+	float:right;
+	clear:right;
+}
+
+#logo {
+	position:relative;
+	width:100%;
+	height:74px;
+	float:left;
+	background:#FFFFFF url(../images/bg_header.jpg) no-repeat left top;
+}
+
+/** div container for top menu. position:top **/
+#topmenu {
+	position:relative;
+	float:left;
+	clear:left;
+	background-color:#000000;
+	width: 100%;
+}
+
+/** div container for image header **/
+#imgheader {
+	position:relative;
+	float:left;
+	clear:left;
+	width:100%;
+	height:99px;
+	background-color: #000000;
+}
+
+#container_inner {
+	position:relative;
+	float:left;
+	clear:left;
+	width:730px;
+}
+
+/** div container for left column **/
+#leftcol {
+	position:relative;
+	float:left;
+	clear:left;
+	width:172px;
+}
+
+#leftcolmenu {
+	position:relative;
+	overflow:auto;
+}
+
+
+/** div wrapper for user2 & user3 **/
+#content_top_wrapper {
+	position:relative;
+	float:right;
+	clear:right;
+	width:542px;
+	display:inline;
+	margin: 4px 8px 0 0;
+}
+
+/** div container for position:user2 **/
+#content_top1 {
+	position:relative;
+	float:left;
+	clear:left;
+	width:269px;
+}
+
+/** div container for position:user3 **/
+#content_top2 {
+	position:relative;
+	float:right;
+	clear:right;
+	width:269px;
+}
+
+/** div container for mainbody **/
+#content_main {
+	position:relative;
+	float:left;
+	width:520px;
+	margin:15px 0 20px 20px;
+	background-color:#FFFFFF;
+}
+
+/** div container for right column **/
+#rightcol_top,
+#rightcol {
+	float:left;
+	clear:left;
+	width:168px;
+	margin:0 0 0 1px;
+	display:inline;
+	overflow:auto;
+}
+
+/** div container for right column position:header **/
+#rightcol_top {
+	height:70px;
+	min-height:70px;
+}
+
+/** div container for banner position:banner **/
+#banner {
+	position:relative;
+	clear:left;
+	float:left;
+	width:515px;
+	height:65px;
+	min-height:65px;
+	color:#FFFFFF;
+	font-size:10px;
+	padding: 20px 0 0 215px;
+}
+
+#blackline {
+	position:relative;
+	clear:left;
+	float:left;
+	width:730px;;
+	height:10px;
+	min-height:10px;
+	background-color: #000000;
+	color:#FFFFFF;
+	font-size:10px;
+}
+
+/** copyright **/
+
+#copyright {
+	position:relative;
+	width:900px;
+	display:block;
+	clear:both;
+	float:left;
+}
+
+#copyright div {
+	color:#666666;
+	font-size:10px;
+	font-weight:bold;
+	display:block!important;
+	width:900px;
+	float:left;
+	clear:left;
+	margin:-10px 0 0 0;
+	text-align:left;
+}
+
+
+
+/* ---------------------
+mambo content layout
+--------------------- */
+
+/** pathway block **/
+span.pathway {
+	display:block;
+	text-align:left;
+	color:#000000;
+	font-size:10px;
+	font-weight:bold;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #E5E5E5;
+	height:20px;
+	margin-bottom:10px;
+}
+
+/** content title **/
+.componentheading {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	color:#000000;
+	font-size: 20px;
+	line-height:25px;
+	padding: 5px 0 5px 0;
+	display:block;
+}
+
+.contentheading,
+.contentpagetitle,
+a.contentpagetitle:link,
+a.contentpagetitle:active,
+a.contentpagetitle:visited {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	font-size:18px;
+	color:#0C362D;
+	padding-top: 25px;
+	background-color:inherit;
+	display:block;
+}
+
+.contentpaneopen {
+	width:100%;
+}
+
+
+.buttonheading {
+	width: 16px!important;
+	text-align:right;
+}
+
+
+td.sectiontableheader {
+	font-weight: bold;
+}
+
+.category, .categorytitle {
+	font-weight: bold;
+	color:#0C362D;
+	background-color:inherit;
+}
+
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
+	background-color: #FBFBF4;
+	padding: 2px;
+	color:#333333;
+	
+}
+
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
+	background-color: #FFFFFF;
+	padding: 2px;
+	color:#333333;
+}
+
+tr.sectiontableentry1 td,
+tr.sectiontableentry2 td {
+	word-wrap:break-word;
+}
+
+/** blog Styles **/
+.blogsection {
+	color:#0C362D;
+	background-color:inherit;
+}
+
+.blog_more {
+	font-weight: bold;
+	line-height: 25px;
+	padding-top: 20px;
+	color: #0C362D;
+	border-bottom: 1px solid #E5E5E5;
+	background-color:inherit;
+}
+
+/** small text in content **/
+.small {
+	color:#8B721D;
+	font-size:10px;
+	font-weight: normal;
+	background-color:inherit;
+}
+
+/** date info in content **/
+#content_main .createdate {
+	color:#6EB28A;
+	font-size:10px;
+	padding: 0 0 15px 0;
+	line-height:8px;
+	background-color:inherit;
+}
+
+#content_main .modifydate {
+	color:#8B721D;
+	font-size:10px;
+	padding: 0;
+	background-color:inherit;
+}
+
+
+/** content item navigation  **/
+.pagenavbar  {
+	display:block;
+	width:100%;
+	background-color:inherit;
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999!important;
+	clear:both;
+	font-size: 11px!important;
+	margin-top: 10px;
+	background-image: url(../images/bg_pagenav.jpg);
+	background-repeat: repeat-x;
+	background-position: center bottom;	
+}
+
+.pagenav {
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999;
+	clear:both;
+	font-size: 11px;
+	margin-left: 0;
+	margin-right: 0;
+	background-color:inherit;
+}
+
+.back_button {
+	display:block;
+	text-align:left;
+	font-weight:bold;
+	font-size:12px;
+	width:100%;
+	margin-bottom:10px;
+	letter-spacing:2px;
+}
+
+/** highlight word search result **/
+.highlight {
+	font-weight:bold;
+	background-color: #FFFF00;
+	padding: 2px 0 2px 0;
+	
+}
+
+/** table of content layout **/
+table.contenttoc {
+	border:1px solid #000000;
+	padding:1px;
+	width:130px;
+	margin: 0 0 10px 10px;
+}
+
+/** table of content header **/
+.contenttoc th {
+	color:#FFFFFF;
+	background-color:#666666;
+	font-size:11px;
+	display:block;
+	width:124px;
+}
+
+/** unordered list for latest news module **/
+ul.latestnews li,ul.mostread li {
+	line-height: 18px;
+	font-size:11px;
+	font-weight:bold;
+	list-style-type: none;
+	list-style-position: outside;
+}
+
+
+/** fix opera table width for content list in table category**/
+table.contentpane td.contentdescription {
+	width:100%!important;
+}
+
+
+/* ---------------------
+Links
+--------------------- */
+
+/** any left column link **/
+#leftcol a:link,
+#leftcol a:active,
+#leftcol a:visited,
+#leftcolmenu a:link,
+#leftcolmenu a:active,
+#leftcolmenu a:visited,
+#rightcol a:link,
+#rightcol a:active,
+#rightcol a:visited,
+#rightcolmenu a:link,
+#rightcolmenu a:active,
+#rightcolmenu a:visited
+ {
+	color:#FFFFFF;
+}
+
+a.pagenav:link ,
+a.pagenav_next:link,
+a.pagenav_pre:link,
+div.back_button a,
+div.back_button a:link,
+a.latestnews:link,
+a.latestnews:active,
+a.latestnews:visited,
+a.mostread:link,
+a.mostread:active,
+a.mostread:visited {
+	text-decoration:none;
+}
+
+/*** read more link ***/
+.readon,
+a.readon:link,
+a.readon:active,
+a.readon:visited {
+	color:#666666;
+	font-weight:bold;
+	text-align:left;
+	margin-top:10px;
+	letter-spacing: 2px;
+	font-size:10px;
+	text-decoration:none;
+}
+
+/*** blog links ***/
+a.blogsection:link,
+a.blogsection:active,
+a.blogsection:visited {
+	color:#0C362D;
+	text-decoration:none;
+}
+
+/** generic menu item link **/
+a.mainlevel:link,
+a.mainlevel:active,
+a.mainlevel:visited,
+a.sublevel:link,
+a.sublevel:active,
+a.sublevel:visited {
+	color:#FFFFFF;
+	text-decoration:none;
+	font-size:11px;
+	line-height: 27px;
+}
+
+a.sublevel:hover {
+	color: #000000;
+}
+
+/** generic menu item link on mouseover **/
+a.mainlevel:hover,
+#leftcol a.mainlevel:hover,
+#leftcolmenu a.mainlevel:hover {
+	background-color:#B8B35C;
+	color:#000000!important;
+	text-decoration:none!important;
+}
+
+/** specific top right column menu item link **/
+a.mainlevel-right:link,
+a.mainlevel-right:active,
+a.mainlevel-right:visited,
+a.sublevel-right:link,
+a.sublevel-right:active,
+a.sublevel-right:visited {
+	color:#FFFFFF;
+	text-decoration:none;
+	font-size:11px;
+}
+
+/** specific top right column menu item link on mouseover **/
+a.mainlevel-right:hover {
+	background-color:#15604F;
+	text-decoration:none;
+}
+
+
+/** pathway link item **/
+a.pathway:link,
+a.pathway:link,
+a.pathway:active,
+a.pathway:visited {
+	color:#999999;
+	text-decoration:none;
+}
+
+
+/** table of content list **/
+a.toclink:link,
+a.toclink:active,
+a.toclink:visited {
+	color:#0C362D;
+	font-size:11px;
+	padding:2px 10px 2px 10px;
+	display:block;
+	text-decoration:none;
+}
+
+.pagenavbar a:link,
+.pagenavbar a:active,
+.pagenavbar a:visited  {
+	letter-spacing:2px;
+	color:#000000;
+	font-size: 11px;
+	text-decoration: none;
+}
+
+.pagenavbar a:hover {
+	color:#0C362D;
+}
+
+/** latestnews and popular **/
+.latestnews,
+.mostread {
+	color:#000000;
+}
+
+a.latestnews:link,
+.mostread a:link,
+.latestnews a:active,
+.mostread a:active,
+.latestnews a:hover,
+.mostread a:hover,
+.latestnews a:visited,
+.mostread a:visited {
+	color:#000000;
+	text-decoration:underline;
+}
+
+/** underline on hover **/
+a.toclink:hover,
+a.latestnews:hover,
+a.mostread:hover,
+a.pathway:hover,
+a.sublevel:hover,
+a.sublevel-right:hover,
+a.blogsection:hover,
+a.readon:hover,
+a.pagenav:hover ,
+a.pagenav_next:hover,
+a.pagenav_pre:hover,
+a.latestnews:hover {
+	text-decoration:underline;
+	color:#0C362D;
+	background-color:inherit;
+}
+
+#leftcol a:hover {
+	color: #000000;
+	text-decoration:underline;
+}
+
+
+/* ---------------------
+mambo module layout
+--------------------- */
+
+/** general module table **/
+table.moduletable,
+#leftcol table,
+#rightcol table {
+	width:100%;
+	float:left;
+	clear:left;
+}
+
+/** general module table **/
+#rightcol table,
+#leftcol table td {
+	font-size:11px !important;
+	color:#FFFFFF;
+}
+
+#rightcol table,
+#rightcol table td {
+	font-size:11px !important;
+	color:#FFFFFF;
+}
+
+/** general module title **/
+table.moduletable th {
+	border: solid 1px #000000;
+	color:#FFFFFF;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size:13px;
+	line-height:25px;
+	background-color: #6EB28A;
+	height:22px;
+	text-align:left;
+	padding-left:15px;
+	font-weight:normal;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+#leftcol table.moduletable th {
+	background-color: #8F8A2C;
+	color: #000000;
+	border: solid 1px #000000;
+}
+
+#rightcol table.moduletable th {
+	background-color:#6EB28A;
+	border: solid 1px #000000;
+}
+
+
+/** specific module td table for content top 1 and 2. 
+position:user2 an user3 **/
+#content_top1 table.moduletable td,
+#content_top2 table.moduletable td {
+	background-color:#F2FFF2;
+	height:100px;
+	min-height:100px;
+	vertical-align:top;
+}
+
+/** right column module td **/
+#rightcol table.moduletable td   {
+	padding:5px;
+}
+
+/** generic menu item **/
+
+.mainlevel  {
+	display:block;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
+	padding-left:15px;
+	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
+	font-weight:bold;
+	text-decoration:none;
+}
+
+/** specific left column form **/
+#leftcol form {
+	margin-left:15px;
+}
+
+/** specific left column form **/
+#leftcol .button {
+	font-size:11px;
+	color:#FFFFFF;
+	background-color:#C4BD40;
+	border: 1px solid #746A39;
+	width:140px;
+}
+
+
+/** specific left column form **/
+#leftcol .inputbox {
+	font-size:11px;
+	font-weight: bold;
+}
+
+/** module styles in #leftcol **/
+#leftcol table.moduletable td {
+	color:#FFFFFF;
+	font-size:11px;
+}
+
+/** search div in top right column. position:user4 **/
+div.search {
+	margin-left:10px;
+}
+
+/** search field in search div **/
+.search .inputbox {
+	width:145px;
+	border: 1px solid #000000;
+}
+
+/* ---------------------
+mambo form layout
+--------------------- */
+
+/** left column input form **/
+#leftcol .inputbox {
+	font-size:11px;
+	margin-bottom:2px;
+}
+
+
+
+/** input button html tag **/
+.button,
+#rightcol .button {
+	font-size:11px;
+	text-transform:uppercase;
+	color:#FFFFFF;
+	font-weight:bold;
+	background-color:#000000;
+	border: 1px solid #666666;
+}
+
+.search  {
+	margin-top:30px;
+}
+
+
+
+
+/* 
+mambo top menu layout
+you need to add menu class suffix: -nav
+*/
+
+/** unordered list top menu **/
+ul#mainlevel-nav
+{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	font-size: 0.8em;
+}
+
+/** unordered list item for top menu **/
+ul#mainlevel-nav li
+{
+	display: block;
+	padding-left: 0px;
+	padding-right: 0px;
+	float: left;
+	margin: 0;
+	width: auto !important;
+	font-size: 11px;
+	line-height: 23px;
+	white-space: nowrap;
+}
+
+/** unordered list item link for top menu **/
+ul#mainlevel-nav li a
+{
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: none;
+	color: #FFFFFF;
+	font-weight:bold;
+}
+
+/** unordered list item link for top menu for firefox only **/
+#topmenu>ul#mainlevel-nav li a {
+	width: auto;
+}
+
+/** unordered list item for top menu for firefox only **/
+ul#mainlevel-nav li a:hover {
+	background: #535353;
+	text-decoration:none;
+}
+
+
+ /*
+specific right column menu item. position:right
+you need to add menu class suffix: -right and
+module class suffix: -right
+ */
+.mainlevel-right {
+	display:block;
+	height:25px;
+	line-height:25px;
+	padding-left:15px;
+	background:#0C362D url(../images/bg_mainlevel_right.gif) repeat-x center top;
+	font-weight:bold;
+}
+
+/** 
+moduletable specific with background image
+you need to add modules class suffix: -bgimg
+ **/
+table.moduletable-bgimg {
+	background:transparent url(../images/bg_module.jpg) no-repeat center bottom;
+	float:left;
+	clear:left;
+	width:100%;
+}
+
+table.moduletable-bgimg td {
+	padding: 5px ;
+	font-size:11px;
+}
+
+table.moduletable-bgimg td td {
+	padding: 0!important;
+}
+
+/** for polls **/
+.poll {
+	font-size:11px;
+	line-height: 16px;
+}
+
+table.pollstableborder .sectiontableentry2 {
+	background-color:transparent; 
+	text-align:left; 
+}
+table.pollstableborder .sectiontableentry1 {
+	background-color:#092620; 
+	text-align:left;
+}
+
+.moduletable_bgimg table.pollstableborder td.sectiontableentry2,
+.moduletable_bgimg table.pollstableborder td.sectiontableentry1 {
+	background-color:transparent!important; 
+	text-align:left!important; 
+}
+
+
+#bottompadding	{
+	position:relative;
+	width:900px;
+	display:block;
+	height:0px;
+	margin-top:-100px;
+}
\ No newline at end of file
Binary files 4.5.4/templates/waterandstone_green/images/bg_body.jpg and 4.6rc2/templates/waterandstone_green/images/bg_body.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_header.jpg and 4.6rc2/templates/waterandstone_green/images/bg_header.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_inside.jpg and 4.6rc2/templates/waterandstone_green/images/bg_inside.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_leftcol.jpg and 4.6rc2/templates/waterandstone_green/images/bg_leftcol.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_leftcol_module_th.gif and 4.6rc2/templates/waterandstone_green/images/bg_leftcol_module_th.gif differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_mainlevel.gif and 4.6rc2/templates/waterandstone_green/images/bg_mainlevel.gif differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_mainlevel_right.gif and 4.6rc2/templates/waterandstone_green/images/bg_mainlevel_right.gif differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_module.jpg and 4.6rc2/templates/waterandstone_green/images/bg_module.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_module_contenttop.jpg and 4.6rc2/templates/waterandstone_green/images/bg_module_contenttop.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_pagenav.jpg and 4.6rc2/templates/waterandstone_green/images/bg_pagenav.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_spacer.gif and 4.6rc2/templates/waterandstone_green/images/bg_spacer.gif differ
Binary files 4.5.4/templates/waterandstone_green/images/bg_topright.jpg and 4.6rc2/templates/waterandstone_green/images/bg_topright.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/img_header.jpg and 4.6rc2/templates/waterandstone_green/images/img_header.jpg differ
Binary files 4.5.4/templates/waterandstone_green/images/indent1.png and 4.6rc2/templates/waterandstone_green/images/indent1.png differ
Binary files 4.5.4/templates/waterandstone_green/images/indent2.png and 4.6rc2/templates/waterandstone_green/images/indent2.png differ
Binary files 4.5.4/templates/waterandstone_green/images/indent3.png and 4.6rc2/templates/waterandstone_green/images/indent3.png differ
Binary files 4.5.4/templates/waterandstone_green/images/indent4.png and 4.6rc2/templates/waterandstone_green/images/indent4.png differ
Binary files 4.5.4/templates/waterandstone_green/images/indent5.png and 4.6rc2/templates/waterandstone_green/images/indent5.png differ
Binary files 4.5.4/templates/waterandstone_green/images/indent6.png and 4.6rc2/templates/waterandstone_green/images/indent6.png differ
Binary files 4.5.4/templates/waterandstone_green/images/logo.gif and 4.6rc2/templates/waterandstone_green/images/logo.gif differ
diff -ruN 4.5.4/templates/waterandstone_green/index.php 4.6rc2/templates/waterandstone_green/index.php
--- 4.5.4/templates/waterandstone_green/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_green/index.php	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,129 @@
+<?php
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php mosShowHead(); ?>
+<?php
+if ( $my->id ) {
+	initEditor();
+}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<link href="<?php echo $mosConfig_live_site;?>/templates/waterandstone_green/css/template_css.css" rel="stylesheet" type="text/css"/>
+</head>
+<body class="waterbody">
+
+<div align="center">
+<div id="container">
+	<div id="containerbg">
+		<div id="outerleft">
+			<!-- start logo -->
+			<div id="logo">
+			  <a href="index.php"><img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone_green/images/logo.gif" alt="logo image" border="0" align="top" /></a>
+			</div>
+			<!-- end logo -->
+			<!-- start top menu -->
+			<div id="topmenu">
+			<?php mosLoadModules('top',-1); ?>
+			</div>
+			<!-- end top menu.  -->
+			<!-- start image header -->
+			<div id="imgheader">
+			<img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone_green/images/img_header.jpg" alt="header image" />
+			</div>
+			<!-- end image header -->
+			<div id="container_inner">
+				<!-- start left column. -->
+				<div id="leftcol">
+				<?php mosLoadModules('left'); ?>
+				</div>
+				<div id="leftcolmenu">
+				<?php mosLoadModules('user1'); ?>
+				</div>
+				<!-- end left column. -->
+				<!-- start content top wrapper -->
+				<?php
+				if (mosCountModules('user2') >= 1 OR mosCountModules('user3') >= 1 ) {
+				?>
+				<div id="content_top_wrapper">
+					<!-- start content top 1.  -->
+					<div id="content_top1">
+					<?php mosLoadModules('user2'); ?>
+					</div>
+					<!-- end content top 1 -->
+					<!-- start content top 2.  -->
+					<div id="content_top2">
+					<?php mosLoadModules('user3'); ?>
+					</div>
+					<!-- end content top 2 -->
+				</div>
+				<?php
+				}
+				?>
+				<!-- end content top wrapper -->
+				<!-- start main body -->
+				<div id="content_main">
+					<?php mosPathWay(); ?>
+					<table width="519" border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td>
+						<?php mosMainBody(); ?>
+						</td>
+					  </tr>
+					</table>
+				</div>
+				<!-- end main body -->
+			</div>
+		</div>
+		<div id="outerright">
+			<!-- start right top header.  -->
+			<div id="rightcol_top">
+			<?php mosLoadModules('header'); ?>
+			</div>
+			<!-- end right top header.-->
+			<!-- start right column. -->
+			<div id="rightcol">
+			<?php mosLoadModules('newsflash'); ?>
+			<?php mosLoadModules('right'); ?>
+			<?php mosLoadModules('user4'); ?>
+			</div>
+			<!-- end right column. -->
+		</div>
+		
+		<div class="clear">
+		</div>
+		<?php
+		if (mosCountModules('banner') >= 1) {
+		?>
+			<!-- start banner.  -->
+			<div id="banner">
+			<?php mosLoadModules('banner'); ?>
+			</div>
+			<!-- end banner. -->
+		<?php
+		}
+		?>
+		
+		<div id="blackline">
+		</div>
+		<div class="clear">
+		</div>
+		<div id="bottompadding"></div>
+	</div>
+	<!-- copyright notice -->
+	<div id="copyright">
+	<?php include_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/footer.php' ); ?>
+	</div>
+
+</div>
+</div>
+
+<?php mosLoadModules('debug', -1);?>
+</body>
+</html>
diff -ruN 4.5.4/templates/waterandstone_green/templateDetails.xml 4.6rc2/templates/waterandstone_green/templateDetails.xml
--- 4.5.4/templates/waterandstone_green/templateDetails.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_green/templateDetails.xml	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="template" version="4.5.3">
+	<name>waterandstone_green</name>
+	<creationDate>07/05/06</creationDate>
+	<author>waterandstone</author>
+	<copyright>GNU/GPL</copyright>
+	<authorEmail>info@waterandstone.com</authorEmail>
+	<authorUrl>http://www.waterandstone.com</authorUrl>
+	<version>1.1</version>
+	<description>The Water and Stone Green Template optimized for 1024px x 768px screen resolution for use with any type of website with easy customization</description>
+	<files>
+		<filename>index.php</filename>
+		<filename>template_thumbnail.png</filename>
+	</files>
+	<images>
+		<filename>images/bg_body.jpg</filename>
+		<filename>images/bg_header.jpg</filename>
+		<filename>images/bg_inside.jpg</filename>
+		<filename>images/bg_leftcol.jpg</filename>
+		<filename>images/bg_leftcol_module_th.gif</filename>
+		<filename>images/bg_mainlevel.gif</filename>
+		<filename>images/bg_mainlevel_right.gif</filename>
+		<filename>images/bg_module.jpg</filename>
+		<filename>images/bg_module_contenttop.jpg</filename>
+		<filename>images/bg_pagenav.jpg</filename>
+		<filename>images/bg_spacer.gif</filename>
+		<filename>images/bg_topright.jpg</filename>
+		<filename>images/img_header.jpg</filename>
+		<filename>images/indent1.png</filename>
+		<filename>images/indent2.png</filename>
+		<filename>images/indent3.png</filename>
+		<filename>images/indent4.png</filename>
+		<filename>images/indent5.png</filename>
+		<filename>images/indent6.png</filename>
+		<filename>images/logo.gif</filename>
+		</images>
+	<css>
+		<filename>css/template_css.css</filename>
+	</css>
+</mosinstall>
Binary files 4.5.4/templates/waterandstone_green/template_thumbnail.png and 4.6rc2/templates/waterandstone_green/template_thumbnail.png differ
diff -ruN 4.5.4/templates/waterandstone_greenandblack/css/template_css.css 4.6rc2/templates/waterandstone_greenandblack/css/template_css.css
--- 4.5.4/templates/waterandstone_greenandblack/css/template_css.css	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_greenandblack/css/template_css.css	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,901 @@
+* {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+.waterbody {
+	background:#E8E8E8 url(../images/bg_body.jpg) repeat left top;
+	margin:0;
+	color:#333333;
+}
+
+div,
+td,
+p {
+	font-size:12px;
+	line-height:18px;
+	color:#333333;
+}
+
+a,
+a:link,
+a:active,
+a:visited {
+	color:#000000;
+}
+
+a:hover {
+	color:#96C600;
+}
+
+#leftcol a,
+#leftcol a:link,
+#leftcol a:active,
+#leftcol a:visited {
+	text-decoration:none !important;
+	border-bottom: 1px dotted #000000;
+	color:#000000;
+}
+
+#leftcol a:hover {
+	text-decoration:none;
+	color:#000000;
+	border-bottom: 1px solid #000000;
+	text-decoration:none !important;
+}
+
+#rightcol a,
+#rightcol a:link,
+#rightcol a:active,
+#rightcol a:visited {
+	text-decoration:none !important;
+	border-bottom: 1px dotted #FFFFFF;
+	color:#FFFFFF;
+}
+
+#rightcol a:hover {
+	border-bottom: 1px solid #FFFFFF;
+	color:#FFFFFF;
+	text-decoration:none !important;
+}
+
+
+ul {
+	margin: 5px;
+	padding: 5px;
+	list-style: none;
+	list-style-type: square;
+}
+
+li {
+	line-height: 18px;
+	padding-left: 5px;
+	padding-top: 0px;
+	list-style-position: inside;
+}
+
+/** To center the objects **/
+.center {
+	text-align:center!important;
+}
+
+/* ---------------------
+template layout
+--------------------- */
+
+/** wrapper to make the page center **/
+#container {
+	width:900px;
+	margin: 0px auto;
+	padding:0;
+	text-align: left;
+}
+
+/**
+hold background, it should be float:left
+that's way we can not put it in #container
+**/
+#containerbg {
+	position:relative;
+	width: 900px;
+	background:transparent url(../images/bg_inside.jpg) repeat-y left top;
+	float:left;
+	top:0;
+	left:0;
+}
+
+#outerleft {
+	position:relative;
+	float:left;
+	clear:left;
+	width:730px;
+	
+}
+
+#outerright {
+	position:relative;
+	width:170px;
+	float:right;
+	clear:right;
+}
+
+#logo {
+	position:relative;
+	width:100%;
+	height:74px;
+	float:left;
+	background:#FFFFFF url(../images/bg_header.jpg) no-repeat left top;
+}
+
+/** div container for top menu. position:top **/
+#topmenu {
+	position:relative;
+	float:left;
+	clear:left;
+	background-color:#000000;
+	width: 100%;
+}
+
+/** div container for image header **/
+#imgheader {
+	position:relative;
+	float:left;
+	clear:left;
+	width:100%;
+	height:99px;
+	background-color: #000000;
+}
+
+#container_inner {
+	position:relative;
+	float:left;
+	clear:left;
+	width:730px;
+}
+
+/** div container for left column **/
+#leftcol {
+	position:relative;
+	float:left;
+	clear:left;
+	width:172px;
+}
+
+#leftcolmenu {
+	position:relative;
+	overflow:auto;
+}
+
+
+/** div wrapper for user2 & user3 **/
+#content_top_wrapper {
+	position:relative;
+	float:right;
+	clear:right;
+	width:542px;
+	display:inline;
+	margin: 4px 8px 0 0;
+}
+
+/** div container for position:user2 **/
+#content_top1 {
+	position:relative;
+	float:left;
+	clear:left;
+	width:269px;
+}
+
+/** div container for position:user3 **/
+#content_top2 {
+	position:relative;
+	float:right;
+	clear:right;
+	width:269px;
+}
+
+/** div container for mainbody **/
+#content_main {
+	position:relative;
+	float:left;
+	width:520px;
+	margin:15px 0 20px 20px;
+	background-color:#FFFFFF;
+}
+
+/** div container for right column **/
+#rightcol_top,
+#rightcol {
+	float:left;
+	clear:left;
+	width:168px;
+	margin:0 0 0 1px;
+	display:inline;
+	overflow:auto;
+}
+
+/** div container for right column position:header **/
+#rightcol_top {
+	height:70px;
+	min-height:70px;
+}
+
+/** div container for banner position:banner **/
+#banner {
+	position:relative;
+	clear:left;
+	float:left;
+	width:515px;
+	height:65px;
+	min-height:65px;
+	color:#FFFFFF;
+	font-size:10px;
+	padding: 20px 0 0 215px;
+}
+
+#blackline {
+	position:relative;
+	clear:left;
+	float:left;
+	width:730px;;
+	height:10px;
+	min-height:10px;
+	background-color: #000000;
+	color:#FFFFFF;
+	font-size:10px;
+}
+
+/** copyright **/
+
+#copyright {
+	position:relative;
+	width:900px;
+	display:block;
+	clear:both;
+	float:left;
+}
+
+#copyright div {
+	color:#666666;
+	font-size:10px;
+	font-weight:bold;
+	display:block!important;
+	width:900px;
+	float:left;
+	clear:left;
+	margin:-10px 0 0 0;
+	text-align:left;
+}
+
+
+
+/* ---------------------
+mambo content layout
+--------------------- */
+
+/** pathway block **/
+span.pathway {
+	display:block;
+	text-align:left;
+	color:#000000;
+	font-size:10px;
+	font-weight:bold;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #E5E5E5;
+	height:20px;
+	margin-bottom:10px;
+}
+
+/** content title **/
+.componentheading {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	color:#000000;
+	font-size: 20px;
+	line-height:25px;
+	padding: 5px 0 5px 0;
+	display:block;
+}
+
+.contentheading,
+.contentpagetitle,
+a.contentpagetitle:link,
+a.contentpagetitle:active,
+a.contentpagetitle:visited {
+	font-family:Georgia, "Times New Roman", Times, serif !important;
+	font-size:18px;
+	color:#000000;
+	padding-top: 25px;
+	background-color:inherit;
+	display:block;
+}
+
+.contentpaneopen {
+	width:100%;
+}
+
+
+.buttonheading {
+	width: 16px!important;
+	text-align:right;
+}
+
+
+td.sectiontableheader {
+	font-weight: bold;
+}
+
+.category, .categorytitle {
+	font-weight: bold;
+	color:#000000;
+	background-color:inherit;
+}
+
+.sectiontableentry1,
+table.pollstableborder tr.sectiontableentry1 {
+	background-color: #F9FFEA;
+	padding: 2px;
+	color:#333333;
+	
+}
+
+.sectiontableentry2,
+table.pollstableborder tr.sectiontableentry2 {
+	background-color: #FFFFFF;
+	padding: 2px;
+	color:#333333;
+}
+
+tr.sectiontableentry1 td,
+tr.sectiontableentry2 td {
+	word-wrap:break-word;
+}
+
+/** blog Styles **/
+.blogsection {
+	color:#000000;
+	background-color:inherit;
+}
+
+.blog_more {
+	font-weight: bold;
+	line-height: 25px;
+	padding-top: 20px;
+	color: #000000;
+	border-bottom: 1px solid #E5E5E5;
+	background-color:inherit;
+}
+
+/** small text in content **/
+.small {
+	color:#336600;
+	font-size:10px;
+	font-weight: normal;
+	background-color:inherit;
+}
+
+/** date info in content **/
+#content_main .createdate {
+	color:#99CC00;
+	font-size:10px;
+	padding: 0 0 15px 0;
+	line-height:8px;
+	background-color:inherit;
+}
+
+#content_main .modifydate {
+	color:#999999;
+	font-size:10px;
+	padding: 0;
+	background-color:inherit;
+}
+
+
+/** content item navigation  **/
+.pagenavbar  {
+	display:block;
+	width:100%;
+	background-color:inherit;
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999!important;
+	clear:both;
+	font-size: 11px!important;
+	margin-top: 10px;
+	background-image: url(../images/bg_pagenav.jpg);
+	background-repeat: repeat-x;
+	background-position: center bottom;	
+}
+
+.pagenav {
+	height:20px;
+	line-height:25px;
+	text-align:right;
+	letter-spacing:2px;
+	color:#999999;
+	clear:both;
+	font-size: 11px;
+	margin-left: 0;
+	margin-right: 0;
+	background-color:inherit;
+}
+
+.back_button {
+	display:block;
+	text-align:left;
+	font-weight:bold;
+	font-size:12px;
+	width:100%;
+	margin-bottom:10px;
+	letter-spacing:2px;
+}
+
+/** highlight word search result **/
+.highlight {
+	font-weight:bold;
+	background-color: #FFFF00;
+	padding: 2px 0 2px 0;
+	
+}
+
+/** table of content layout **/
+table.contenttoc {
+	border:1px solid #000000;
+	padding:1px;
+	width:130px;
+	margin: 0 0 10px 10px;
+}
+
+/** table of content header **/
+.contenttoc th {
+	color:#FFFFFF;
+	background-color:#666666;
+	font-size:11px;
+	display:block;
+	width:124px;
+}
+
+/** unordered list for latest news module **/
+ul.latestnews li,ul.mostread li {
+	line-height: 18px;
+	font-size:11px;
+	font-weight:bold;
+	list-style-type: none;
+	list-style-position: outside;
+}
+
+
+/** fix opera table width for content list in table category**/
+table.contentpane td.contentdescription {
+	width:100%!important;
+}
+
+
+/* ---------------------
+Links
+--------------------- */
+
+/** any left column link **/
+
+a.pagenav:link ,
+a.pagenav_next:link,
+a.pagenav_pre:link,
+div.back_button a,
+div.back_button a:link,
+a.latestnews:link,
+a.latestnews:active,
+a.latestnews:visited,
+a.mostread:link,
+a.mostread:active,
+a.mostread:visited {
+	text-decoration: none !important;
+	border-bottom: 1px dotted #000000 !important;
+}
+
+a.latestnews:hover,
+a.mostread:hover {
+	color: #000000 !important;
+	text-decoration: none !important;
+	border-bottom: 1px solid #000000 !important;
+}
+
+a.pagenav:hover ,
+a.pagenav_next:hover,
+a.pagenav_pre:hover,
+div.back_button a:hover {
+	text-decoration: none !important;
+	border-bottom: 1px solid #000000 !important;
+}
+
+/*** read more link ***/
+.readon,
+a.readon:link,
+a.readon:active,
+a.readon:visited {
+	color:#99CC00;
+	font-weight:bold;
+	text-align:left;
+	margin-top:10px;
+	letter-spacing: 2px;
+	font-size:10px;
+	text-decoration:none;
+}
+
+a.readon:hover {
+	color:#666666;
+}
+
+/*** blog links ***/
+a.blogsection:link,
+a.blogsection:active,
+a.blogsection:visited {
+	color:#000000;
+	text-decoration:none;
+}
+
+/** generic menu item link **/
+a.mainlevel:link,
+a.mainlevel:active,
+a.mainlevel:visited,
+a.sublevel:link,
+a.sublevel:active,
+a.sublevel:visited {
+	color:#000000;
+	text-decoration:none;
+	border: none !important;
+	font-size:11px;
+	line-height: 27px;
+}
+
+a.sublevel:hover {
+	color: #E0FF33 !important;
+}
+
+/** generic menu item link on mouseover **/
+a.mainlevel:hover,
+#leftcol a.mainlevel:hover,
+#leftcolmenu a.mainlevel:hover {
+	background:#E0FF33 url(../images/bg_mainlevel.gif) repeat-x center top;
+	color:#000000!important;
+	text-decoration:none!important;
+	border: none !important;
+}
+
+/** specific top right column menu item link **/
+a.mainlevel-right:link,
+a.mainlevel-right:active,
+a.mainlevel-right:visited,
+a.sublevel-right:link,
+a.sublevel-right:active,
+a.sublevel-right:visited {
+	color:#000000;
+	text-decoration:none !important;
+	font-size:11px;
+	border: none !important;
+}
+
+/** specific top right column menu item link on mouseover **/
+a.mainlevel-right:hover {
+	background:#666666;
+	text-decoration:none;
+	border: none !important;
+}
+
+
+/** pathway link item **/
+a.pathway:link,
+a.pathway:link,
+a.pathway:active,
+a.pathway:visited {
+	color:#999999;
+	text-decoration:none;
+	border: none;
+}
+
+
+/** table of content list **/
+a.toclink:link,
+a.toclink:active,
+a.toclink:visited {
+	color:#000000;
+	font-size:11px;
+	padding:2px 10px 2px 10px;
+	display:block;
+	text-decoration:none;
+}
+
+.pagenavbar a:link,
+.pagenavbar a:active,
+.pagenavbar a:visited  {
+	letter-spacing:2px;
+	color:#000000;
+	font-size: 11px;
+	text-decoration: none;
+}
+
+.pagenavbar a:hover {
+	color:#000000;
+}
+
+/** latestnews and popular **/
+.latestnews,
+.mostread {
+	color:#000000;
+}
+
+a.latestnews:hover,
+.mostread a:hover,
+.latestnews a:hover,
+.mostread a:active,
+.latestnews a:hover,
+.mostread a:hover,{
+	border-bottom: 1px solid #000000;
+}
+
+
+/* ---------------------
+mambo module layout
+--------------------- */
+
+/** general module table **/
+table.moduletable,
+#leftcol table,
+#rightcol table {
+	width:100%;
+	float:left;
+	clear:left;
+}
+
+/** general module table **/
+#leftcol table,
+#leftcol table td {
+	font-size:11px !important;
+	color:#000000;
+}
+
+#rightcol table,
+#rightcol table td {
+	font-size:11px !important;
+	color:#FFFFFF;
+}
+
+/** general module title **/
+table.moduletable th {
+	border: solid 1px #000000;
+	color:#000000;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size:13px;
+	line-height:25px;
+	background: #B5B5B5 url(../images/bg_leftcol_module_th.gif) repeat-y left top;
+	height:22px;
+	text-align:left;
+	padding-left:15px;
+	font-weight:normal;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+#leftcol table.moduletable th {
+	background-color: #B8F400;
+	color: #000000;
+	border: none;
+	border-top: solid 1px #000000;
+	border-bottom: solid 1px #000000;
+}
+
+#rightcol table.moduletable th {
+	background-color:#B5B5B5;
+	border: solid 1px #000000;
+}
+
+
+/** specific module td table for content top 1 and 2. 
+position:user2 an user3 **/
+#content_top1 table.moduletable td,
+#content_top2 table.moduletable td {
+	background-color:#EFEFEF;
+	height:100px;
+	min-height:100px;
+	vertical-align:top;
+}
+
+/** right column module td **/
+#rightcol table.moduletable td   {
+	padding:5px;
+}
+
+/** generic menu item **/
+
+.mainlevel  {
+	display:block;
+	font: bold 11px/25px Arial, Helvetica, sans-serif !important;
+	color: #000000 !important;
+	padding-left:15px;
+	background:transparent url(../images/bg_mainlevel.gif) repeat-x center top;
+	font-weight:bold;
+	text-decoration:none;
+}
+
+/** specific left column form **/
+#leftcol form {
+	margin-left:15px;
+}
+
+/** specific left column form **/
+#leftcol .button {
+	font-size:11px;
+	color:#FFFFFF;
+	background-color:#A8DF00;
+	border: 1px solid #CCFF00;
+	width:140px;
+}
+
+
+/** specific left column form **/
+#leftcol .inputbox {
+	font-size:11px;
+	font-weight: bold;
+}
+
+/** module styles in #leftcol **/
+#leftcol table.moduletable td {
+	color:#000000;
+	font-size:11px;
+}
+
+/** search div in top right column. position:user4 **/
+div.search {
+	margin-left:10px;
+}
+
+/** search field in search div **/
+.search .inputbox {
+	width:145px;
+	border: 1px solid #000000;
+}
+
+/* ---------------------
+mambo form layout
+--------------------- */
+
+/** left column input form **/
+#leftcol .inputbox {
+	font-size:11px;
+	margin-bottom:2px;
+}
+
+
+
+/** input button html tag **/
+.button,
+#rightcol .button {
+	font-size:11px;
+	text-transform:uppercase;
+	color:#FFFFFF;
+	font-weight:bold;
+	background-color:#000000;
+	border: 1px solid #666666;
+}
+
+.search  {
+	margin-top:30px;
+}
+
+
+
+
+/* 
+mambo top menu layout
+you need to add menu class suffix: -nav
+*/
+
+/** unordered list top menu **/
+ul#mainlevel-nav
+{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	font-size: 0.8em;
+}
+
+/** unordered list item for top menu **/
+ul#mainlevel-nav li
+{
+	display: block;
+	padding-left: 0px;
+	padding-right: 0px;
+	float: left;
+	margin: 0;
+	width: auto !important;
+	font-size: 11px;
+	line-height: 23px;
+	white-space: nowrap;
+}
+
+/** unordered list item link for top menu **/
+ul#mainlevel-nav li a
+{
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: none;
+	color: #FFFFFF;
+	font-weight:bold;
+}
+
+/** unordered list item link for top menu for firefox only **/
+#topmenu>ul#mainlevel-nav li a {
+	width: auto;
+}
+
+/** unordered list item for top menu for firefox only **/
+ul#mainlevel-nav li a:hover {
+	background: #535353;
+	text-decoration:none;
+}
+
+
+ /*
+specific right column menu item. position:right
+you need to add menu class suffix: -right and
+module class suffix: -right
+ */
+.mainlevel-right {
+	display:block;
+	height:25px;
+	line-height:25px;
+	padding-left:15px;
+	color: #FFFFFF;
+	background:#333333 url(../images/bg_mainlevel_right.gif) repeat-x center top;
+	font-weight:bold;
+}
+
+/** 
+moduletable specific with background image
+you need to add modules class suffix: -bgimg
+ **/
+table.moduletable-bgimg {
+	background:transparent url(../images/bg_module.jpg) no-repeat center bottom;
+	float:left;
+	clear:left;
+	width:100%;
+}
+
+table.moduletable-bgimg td {
+	padding: 5px ;
+	font-size:11px;
+}
+
+table.moduletable-bgimg td td {
+	padding: 0!important;
+}
+
+/** for polls **/
+.poll {
+	font-size:11px;
+	line-height: 16px;
+}
+
+table.pollstableborder .sectiontableentry2 {
+	background-color:transparent; 
+	text-align:left; 
+}
+table.pollstableborder .sectiontableentry1 {
+	background-color:#333333; 
+	text-align:left;
+}
+
+.moduletable_bgimg table.pollstableborder td.sectiontableentry2,
+.moduletable_bgimg table.pollstableborder td.sectiontableentry1 {
+	background-color:transparent!important; 
+	text-align:left!important; 
+}
+
+
+#bottompadding	{
+	position:relative;
+	width:900px;
+	display:block;
+	height:0px;
+	margin-top:-100px;
+}
\ No newline at end of file
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_body.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_body.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_header.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_header.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_inside.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_inside.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_leftcol.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_leftcol.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_leftcol_module_th.gif and 4.6rc2/templates/waterandstone_greenandblack/images/bg_leftcol_module_th.gif differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_mainlevel.gif and 4.6rc2/templates/waterandstone_greenandblack/images/bg_mainlevel.gif differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_mainlevel_right.gif and 4.6rc2/templates/waterandstone_greenandblack/images/bg_mainlevel_right.gif differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_module.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_module.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_module_contenttop.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_module_contenttop.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_pagenav.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_pagenav.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_spacer.gif and 4.6rc2/templates/waterandstone_greenandblack/images/bg_spacer.gif differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/bg_topright.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/bg_topright.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/img_header.jpg and 4.6rc2/templates/waterandstone_greenandblack/images/img_header.jpg differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/indent1.png and 4.6rc2/templates/waterandstone_greenandblack/images/indent1.png differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/indent2.png and 4.6rc2/templates/waterandstone_greenandblack/images/indent2.png differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/indent3.png and 4.6rc2/templates/waterandstone_greenandblack/images/indent3.png differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/indent4.png and 4.6rc2/templates/waterandstone_greenandblack/images/indent4.png differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/indent5.png and 4.6rc2/templates/waterandstone_greenandblack/images/indent5.png differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/indent6.png and 4.6rc2/templates/waterandstone_greenandblack/images/indent6.png differ
Binary files 4.5.4/templates/waterandstone_greenandblack/images/logo.gif and 4.6rc2/templates/waterandstone_greenandblack/images/logo.gif differ
diff -ruN 4.5.4/templates/waterandstone_greenandblack/index.php 4.6rc2/templates/waterandstone_greenandblack/index.php
--- 4.5.4/templates/waterandstone_greenandblack/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_greenandblack/index.php	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,129 @@
+<?php
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+// needed to seperate the ISO number from the language file constant _ISO
+$iso = explode( '=', _ISO );
+// xml prolog
+echo '<?xml version="1.0" encoding="'. $iso[1] .'"?' .'>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php mosShowHead(); ?>
+<?php
+if ( $my->id ) {
+	initEditor();
+}
+?>
+<meta http-equiv="Content-Type" content="text/html; <?php echo _ISO; ?>" />
+<link href="<?php echo $mosConfig_live_site;?>/templates/waterandstone_greenandblack/css/template_css.css" rel="stylesheet" type="text/css"/>
+</head>
+<body class="waterbody">
+
+<div align="center">
+<div id="container">
+	<div id="containerbg">
+		<div id="outerleft">
+			<!-- start logo -->
+			<div id="logo">
+			  <a href="index.php"><img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone_greenandblack/images/logo.gif" alt="logo image" border="0" align="top" /></a>
+			</div>
+			<!-- end logo -->
+			<!-- start top menu -->
+			<div id="topmenu">
+			<?php mosLoadModules('top',-1); ?>
+			</div>
+			<!-- end top menu.  -->
+			<!-- start image header -->
+			<div id="imgheader">
+			<img src="<?php echo $mosConfig_live_site; ?>/templates/waterandstone_greenandblack/images/img_header.jpg" alt="header image" />
+			</div>
+			<!-- end image header -->
+			<div id="container_inner">
+				<!-- start left column. -->
+				<div id="leftcol">
+				<?php mosLoadModules('left'); ?>
+				</div>
+				<div id="leftcolmenu">
+				<?php mosLoadModules('user1'); ?>
+				</div>
+				<!-- end left column. -->
+				<!-- start content top wrapper -->
+				<?php
+				if (mosCountModules('user2') >= 1 OR mosCountModules('user3') >= 1 ) {
+				?>
+				<div id="content_top_wrapper">
+					<!-- start content top 1.  -->
+					<div id="content_top1">
+					<?php mosLoadModules('user2'); ?>
+					</div>
+					<!-- end content top 1 -->
+					<!-- start content top 2.  -->
+					<div id="content_top2">
+					<?php mosLoadModules('user3'); ?>
+					</div>
+					<!-- end content top 2 -->
+				</div>
+				<?php
+				}
+				?>
+				<!-- end content top wrapper -->
+				<!-- start main body -->
+				<div id="content_main">
+					<?php mosPathWay(); ?>
+					<table width="519" border="0" cellspacing="0" cellpadding="0">
+					  <tr>
+						<td>
+						<?php mosMainBody(); ?>
+						</td>
+					  </tr>
+					</table>
+				</div>
+				<!-- end main body -->
+			</div>
+		</div>
+		<div id="outerright">
+			<!-- start right top header.  -->
+			<div id="rightcol_top">
+			<?php mosLoadModules('header'); ?>
+			</div>
+			<!-- end right top header.-->
+			<!-- start right column. -->
+			<div id="rightcol">
+			<?php mosLoadModules('newsflash'); ?>
+			<?php mosLoadModules('right'); ?>
+			<?php mosLoadModules('user4'); ?>
+			</div>
+			<!-- end right column. -->
+		</div>
+		
+		<div class="clear">
+		</div>
+		<?php
+		if (mosCountModules('banner') >= 1) {
+		?>
+			<!-- start banner.  -->
+			<div id="banner">
+			<?php mosLoadModules('banner'); ?>
+			</div>
+			<!-- end banner. -->
+		<?php
+		}
+		?>
+		
+		<div id="blackline">
+		</div>
+		<div class="clear">
+		</div>
+		<div id="bottompadding"></div>
+	</div>
+	<!-- copyright notice -->
+	<div id="copyright">
+	<?php include_once( $GLOBALS['mosConfig_absolute_path'] . '/includes/footer.php' ); ?>
+	</div>
+
+</div>
+</div>
+
+<?php mosLoadModules('debug', -1);?>
+</body>
+</html>
diff -ruN 4.5.4/templates/waterandstone_greenandblack/templateDetails.xml 4.6rc2/templates/waterandstone_greenandblack/templateDetails.xml
--- 4.5.4/templates/waterandstone_greenandblack/templateDetails.xml	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/templates/waterandstone_greenandblack/templateDetails.xml	2006-05-26 21:05:58.000000000 -0500
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<mosinstall type="template" version="4.5.3">
+	<name>waterandstone_greenandblack</name>
+	<creationDate>21/05/06</creationDate>
+	<author>waterandstone</author>
+	<copyright>GNU/GPL</copyright>
+	<authorEmail>info@waterandstone.com</authorEmail>
+	<authorUrl>http://www.waterandstone.com</authorUrl>
+	<version>1.1</version>
+	<description>The Water and Stone Green and Black Template optimized for 1024px x 768px screen resolution for use with any type of website with easy customization</description>
+	<files>
+		<filename>index.php</filename>
+		<filename>template_thumbnail.png</filename>
+	</files>
+	<images>
+		<filename>images/bg_body.jpg</filename>
+		<filename>images/bg_header.jpg</filename>
+		<filename>images/bg_inside.jpg</filename>
+		<filename>images/bg_leftcol.jpg</filename>
+		<filename>images/bg_leftcol_module_th.gif</filename>
+		<filename>images/bg_mainlevel.gif</filename>
+		<filename>images/bg_mainlevel_right.gif</filename>
+		<filename>images/bg_module.jpg</filename>
+		<filename>images/bg_module_contenttop.jpg</filename>
+		<filename>images/bg_pagenav.jpg</filename>
+		<filename>images/bg_spacer.gif</filename>
+		<filename>images/bg_topright.jpg</filename>
+		<filename>images/img_header.jpg</filename>
+		<filename>images/indent1.png</filename>
+		<filename>images/indent2.png</filename>
+		<filename>images/indent3.png</filename>
+		<filename>images/indent4.png</filename>
+		<filename>images/indent5.png</filename>
+		<filename>images/indent6.png</filename>
+		<filename>images/logo.gif</filename>
+		</images>
+	<css>
+		<filename>css/template_css.css</filename>
+	</css>
+</mosinstall>
Binary files 4.5.4/templates/waterandstone_greenandblack/template_thumbnail.png and 4.6rc2/templates/waterandstone_greenandblack/template_thumbnail.png differ
diff -ruN 4.5.4/uploadfiles/index.html 4.6rc2/uploadfiles/index.html
--- 4.5.4/uploadfiles/index.html	1969-12-31 18:00:00.000000000 -0600
+++ 4.6rc2/uploadfiles/index.html	2006-05-18 13:57:48.000000000 -0500
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
